php-blog-cvs

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31574/include

Modified Files:
	functions.inc.php 
Log Message:
fix SQLite suppress query, thanks Riscky!


Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- functions.inc.php	1 Jan 2005 18:12:54 -0000	1.16
+++ functions.inc.php	2 Jan 2005 15:47:59 -0000	1.17
@@ -418,12 +418,14 @@
             serendipity_track_referrer_gc();
         }
 
-        if(preg_match('/^mysqli?/', $serendipity['dbType'])) {
+        if (preg_match('/^(mysqli?|sqlite)/', $serendipity['dbType'])) {
             $interval = 900;
         } else {
             $interval = "interval '900'";
         }
 
+        $ts = time();
+
         $suppressq = "SELECT count(1)
                       FROM $serendipity[dbPrefix]suppress
                       WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'
@@ -432,7 +434,7 @@
                       AND host = '" . serendipity_db_escape_string($url_parts['host']) . "'
                       AND path = '" . serendipity_db_escape_string($url_parts['path']) . "'
                       AND query = '" . serendipity_db_escape_string($url_parts['query']) . "'
-                      AND last > now() - $interval";
+                      AND last > $ts - $interval";
 
         $suppressp = "DELETE FROM $serendipity[dbPrefix]suppress
                       WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'
@@ -445,7 +447,7 @@
                       (ip, last, scheme, host, port, path, query)
                       VALUES (
                       '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "',
-                      now(),
+                      $ts,
                       '" . serendipity_db_escape_string($url_parts['scheme']) . "',
                       '" . serendipity_db_escape_string($url_parts['host']) . "',
                       '" . serendipity_db_escape_string($url_parts['port']) . "',
@@ -470,13 +472,15 @@
 function serendipity_track_referrer_gc() {
     global $serendipity;
 
-    if (preg_match('/^mysqli?/', $serendipity['dbType'])) {
+    if (preg_match('/^(mysqli?|sqlite)/', $serendipity['dbType'])) {
         $interval = 900;
     } else {
         $interval = "interval '900'";
     }
 
-    $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < now() - $interval";
+    $ts = time();
+
+    $gc = "DELETE FROM $serendipity[dbPrefix]suppress where last < $ts - $interval";
     serendipity_db_query($gc);
 }