[geeklog-cvs] geeklog: token bug

[geeklog-cvs at lists.geeklog.net]

changeset 7637:1d042dc8746a
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/1d042dc8746a
user: stan <yankees26an at gmail.com>
date: Mon Jul 20 13:55:04 2009 -0400
description:
token bug

diffstat:

 system/lib-security.php |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r bbe74acb618e -r 1d042dc8746a system/lib-security.php
--- a/system/lib-security.php	Sat Jul 18 12:59:09 2009 -0400
+++ b/system/lib-security.php	Mon Jul 20 13:55:04 2009 -0400
@@ -1098,7 +1098,7 @@
            . " AND (ttl > 0)";
     $sql['mysql'] = "DELETE FROM {$_TABLES['tokens']} WHERE (DATE_ADD(created, INTERVAL ttl SECOND) < NOW())"
            . " AND (ttl > 0)";
-    $sql['pgsql'] = "DELETE FROM {$_TABLES['tokens']} WHERE ROUND(EXTRACT(EPOCH FROM ABSTIME(created)))::int4 + (SELECT ttl from tokens LIMIT 1) < ROUND(EXTRACT(EPOCH FROM ABSTIME(NOW())))::int4"
+    $sql['pgsql'] = "DELETE FROM {$_TABLES['tokens']} WHERE ROUND(EXTRACT(EPOCH FROM ABSTIME(created)))::int4 + (SELECT ttl from {$_TABLES['tokens']} LIMIT 1) < ROUND(EXTRACT(EPOCH FROM ABSTIME(NOW())))::int4"
            . " AND (ttl > 0)";                           
     DB_query($sql);
     
@@ -1143,7 +1143,7 @@
         if($_DB_dbms != 'mssql') {
             $sql['mysql'] = "SELECT ((DATE_ADD(created, INTERVAL ttl SECOND) < NOW()) AND ttl > 0) as expired, owner_id, urlfor FROM "
                . "{$_TABLES['tokens']} WHERE token='$token'";
-            $sql['pgsql'] = "SELECT ((ROUND(EXTRACT(EPOCH FROM ABSTIME(created))) + (SELECT ttl from tokens LIMIT 1)) < ROUND(EXTRACT(EPOCH FROM ABSTIME(NOW()))) AND ttl > 0) as expired, owner_id, urlfor FROM "
+            $sql['pgsql'] = "SELECT ((ROUND(EXTRACT(EPOCH FROM ABSTIME(created))) + (SELECT ttl from {$_TABLES['tokens']} LIMIT 1)) < ROUND(EXTRACT(EPOCH FROM ABSTIME(NOW()))) AND ttl > 0) as expired, owner_id, urlfor FROM "
                . "{$_TABLES['tokens']} WHERE token='$token'";
         } else {
             $sql['mssql'] = "SELECT owner_id, urlfor, expired =