From 49c5b2630c0e6559e798fe09dfbaa850740f829e Mon Sep 17 00:00:00 2001 From: rylon Date: Sat, 25 Jan 2014 20:28:48 +0100 Subject: [PATCH] fixed pg related errors and saimod_sys_security table coloration --- db/connection/ConnectionPG.php | 2 +- dbd/qq/SYS_SAIMOD_SECURITY_USERS.php | 2 +- sai/modules/saimod_sys_security/saimod_sys_security.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db/connection/ConnectionPG.php b/db/connection/ConnectionPG.php index 149515a..aaa0e73 100644 --- a/db/connection/ConnectionPG.php +++ b/db/connection/ConnectionPG.php @@ -55,7 +55,7 @@ class ConnectionPG extends ConnectionAbstr { if($result === TRUE){ return TRUE;} - return new ResultPostgres($result); + return new ResultPostgres($result,$this); } } \ No newline at end of file diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_USERS.php b/dbd/qq/SYS_SAIMOD_SECURITY_USERS.php index c60f6a6..39261f3 100644 --- a/dbd/qq/SYS_SAIMOD_SECURITY_USERS.php +++ b/dbd/qq/SYS_SAIMOD_SECURITY_USERS.php @@ -5,7 +5,7 @@ class SYS_SAIMOD_SECURITY_USERS extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT id,username,email,joindate,locale,last_active,account_flag FROM system.user WHERE username LIKE $1 OR email LIKE $1 ORDER BY last_active DESC LIMIT 100;', +'SELECT id,username,email,joindate,locale, EXTRACT(EPOCH FROM last_active) as last_active ,account_flag FROM system.user WHERE username LIKE $1 OR email LIKE $1 ORDER BY last_active DESC LIMIT 100;', //mys 'SELECT id,username,email,joindate,locale,last_active,account_flag FROM system_user WHERE username LIKE ? OR email LIKE ? ORDER BY last_active DESC LIMIT 100;' );}} diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php index d02e2fd..f890959 100644 --- a/sai/modules/saimod_sys_security/saimod_sys_security.php +++ b/sai/modules/saimod_sys_security/saimod_sys_security.php @@ -31,7 +31,7 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule { return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/saimod_sys_security.tpl'), array());} private static function tablerow_class($last_active){ - $time = time() - strtotime($last_active); + $time = time() - $last_active; if($time <= 60*60){ return 'success';}