Changeset 6605 for branches/2.1/include

Timestamp:

Jun 25, 2010, 9:45:19 PM (14 years ago)

Author:

nikrou

Message:

Bug 1744 fixed : Incorrect use of timezone with SQLite
Fixed anti-flood system.

Merge from trunk

Location:

branches/2.1/include

Files:

• dblayer/functions_mysql.inc.php (modified) (2 diffs)
• dblayer/functions_pdo-sqlite.inc.php (modified) (1 diff)
• dblayer/functions_pgsql.inc.php (modified) (1 diff)
• dblayer/functions_sqlite.inc.php (modified) (1 diff)
• functions_comment.inc.php (modified) (1 diff)

branches/2.1/include/dblayer/functions_mysql.inc.php

@@ -561 +561 @@
  */
 
-
 function pwg_db_get_recent_period_expression($period, $date='CURRENT_DATE')
 {
@@ -581 +580 @@
 }
 
+function pwg_db_get_flood_period_expression($seconds)
+{
+  return 'SUBDATE(now(), INTERVAL '.$seconds.' SECOND)';
+}
+
 function pwg_db_get_hour($date) 
 {

branches/2.1/include/dblayer/functions_pdo-sqlite.inc.php

@@ -500 +500 @@
 }
 
+function pwg_db_get_flood_period_expression($seconds)
+{
+  return 'datetime(\'now\', \'localtime\', \''.-$seconds.' seconds\')';
+}
+
 function pwg_db_get_hour($date)
 {

branches/2.1/include/dblayer/functions_pgsql.inc.php

@@ -547 +547 @@
 }
 
+function pwg_db_get_flood_period_expression($seconds)
+{
+  return 'now() - \''.$seconds.' SECOND\'::interval';
+}
+
 function pwg_db_get_hour($date)
 {

branches/2.1/include/dblayer/functions_sqlite.inc.php

@@ -512 +512 @@
 }
 
+function pwg_db_get_flood_period_expression($seconds)
+{
+  return 'datetime(\'now\', \'localtime\', \''.-$seconds.' seconds\')';
+}
+
 function pwg_db_get_hour($date)
 {

branches/2.1/include/functions_comment.inc.php

@@ -134 +134 @@
   if ($comment_action!='reject' and $conf['anti-flood_time']>0 )
   { // anti-flood system
-    $reference_date = date('c', time() - $conf['anti-flood_time']);
+    $reference_date = pwg_db_get_flood_period_expression($conf['anti-flood_time']);
+
     $query = '
-SELECT id FROM '.COMMENTS_TABLE.'
-  WHERE date > \''.$reference_date.'\'
+SELECT count(1) FROM '.COMMENTS_TABLE.'
+  WHERE date > '.$reference_date.'
     AND author_id = '.$comm['author_id'];
-    if ( pwg_db_num_rows( pwg_query( $query ) ) > 0 )
+    list($counter) = pwg_db_fetch_row(pwg_query($query));
+    if ( $counter > 0 )
     {
       array_push( $infos, l10n('Anti-flood system : please wait for a moment before trying to post another comment') );