aboutsummaryrefslogtreecommitdiffstats
path: root/include/dblayer
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2010-06-25 19:45:19 +0000
committernikrou <nikrou@piwigo.org>2010-06-25 19:45:19 +0000
commitd7fa727afabf29f8f14824d4b1fc2f2be65bfbc3 (patch)
tree701dd822383a93073cb7115fb7ce491ea7aef087 /include/dblayer
parent6394613e9f99f466fb1ba98c95286a828a3cee36 (diff)
Bug 1744 fixed : Incorrect use of timezone with SQLite
Fixed anti-flood system. Merge from trunk git-svn-id: http://piwigo.org/svn/branches/2.1@6605 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/dblayer')
-rw-r--r--include/dblayer/functions_mysql.inc.php6
-rw-r--r--include/dblayer/functions_pdo-sqlite.inc.php5
-rw-r--r--include/dblayer/functions_pgsql.inc.php5
-rw-r--r--include/dblayer/functions_sqlite.inc.php5
4 files changed, 20 insertions, 1 deletions
diff --git a/include/dblayer/functions_mysql.inc.php b/include/dblayer/functions_mysql.inc.php
index 5e0c4dcd4..aa56e1f98 100644
--- a/include/dblayer/functions_mysql.inc.php
+++ b/include/dblayer/functions_mysql.inc.php
@@ -560,7 +560,6 @@ function boolean_to_string($var)
*
*/
-
function pwg_db_get_recent_period_expression($period, $date='CURRENT_DATE')
{
if ($date!='CURRENT_DATE')
@@ -580,6 +579,11 @@ SELECT '.pwg_db_get_recent_period_expression($period);
return $d;
}
+function pwg_db_get_flood_period_expression($seconds)
+{
+ return 'SUBDATE(now(), INTERVAL '.$seconds.' SECOND)';
+}
+
function pwg_db_get_hour($date)
{
return 'hour('.$date.')';
diff --git a/include/dblayer/functions_pdo-sqlite.inc.php b/include/dblayer/functions_pdo-sqlite.inc.php
index ea47564f0..ce02af55c 100644
--- a/include/dblayer/functions_pdo-sqlite.inc.php
+++ b/include/dblayer/functions_pdo-sqlite.inc.php
@@ -499,6 +499,11 @@ function pwg_db_get_recent_period($period, $date='CURRENT_DATE')
return $d;
}
+function pwg_db_get_flood_period_expression($seconds)
+{
+ return 'datetime(\'now\', \'localtime\', \''.-$seconds.' seconds\')';
+}
+
function pwg_db_get_hour($date)
{
return 'strftime(\'%H\', '.$date.')';
diff --git a/include/dblayer/functions_pgsql.inc.php b/include/dblayer/functions_pgsql.inc.php
index a9f033fc3..598a699f5 100644
--- a/include/dblayer/functions_pgsql.inc.php
+++ b/include/dblayer/functions_pgsql.inc.php
@@ -546,6 +546,11 @@ function pwg_db_get_recent_period($period, $date='CURRENT_DATE')
return $d;
}
+function pwg_db_get_flood_period_expression($seconds)
+{
+ return 'now() - \''.$seconds.' SECOND\'::interval';
+}
+
function pwg_db_get_hour($date)
{
return 'EXTRACT(HOUR FROM '.$date.')';
diff --git a/include/dblayer/functions_sqlite.inc.php b/include/dblayer/functions_sqlite.inc.php
index 7e21e128c..109f5f21d 100644
--- a/include/dblayer/functions_sqlite.inc.php
+++ b/include/dblayer/functions_sqlite.inc.php
@@ -511,6 +511,11 @@ function pwg_db_get_recent_period($period, $date='CURRENT_DATE')
return $d;
}
+function pwg_db_get_flood_period_expression($seconds)
+{
+ return 'datetime(\'now\', \'localtime\', \''.-$seconds.' seconds\')';
+}
+
function pwg_db_get_hour($date)
{
return 'strftime(\'%H\', '.$date.')';