From 6f7f455ac313495ba64caba9ee0169a31fd1f406 Mon Sep 17 00:00:00 2001 From: rylon Date: Sat, 25 Jan 2014 18:43:23 +0100 Subject: [PATCH] saimod security tab improvement --- dbd/qq/SYS_SAIMOD_SECURITY_USERS.php | 4 +-- dbd/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php | 4 +-- sai/modules/saimod_sys_log/saimod_sys_log.js | 2 +- .../saimod_sys_security.js | 25 ++++++++++++++++++- .../saimod_sys_security.php | 19 ++++++-------- .../saimod_sys_security.tpl | 12 ++++----- 6 files changed, 42 insertions(+), 24 deletions(-) diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_USERS.php b/dbd/qq/SYS_SAIMOD_SECURITY_USERS.php index fac0f69..c60f6a6 100644 --- a/dbd/qq/SYS_SAIMOD_SECURITY_USERS.php +++ b/dbd/qq/SYS_SAIMOD_SECURITY_USERS.php @@ -5,8 +5,8 @@ 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,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 ? ORDER BY last_active DESC LIMIT 100;' +'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/dbd/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php b/dbd/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php index 9efc209..812d74e 100644 --- a/dbd/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php +++ b/dbd/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php @@ -5,8 +5,8 @@ class SYS_SAIMOD_SECURITY_USER_COUNT extends \SYSTEM\DB\QP { protected static function query(){ return new \SYSTEM\DB\QQuery(get_class(), //pg -'SELECT count(*) as count FROM system.user WHERE username LIKE "%$1%" OR email LIKE "%$1%";', +'SELECT count(*) as count FROM system.user WHERE username LIKE $1 OR email LIKE $1;', //mys -'SELECT count(*) as count FROM system_user WHERE username LIKE ?;' +'SELECT count(*) as count FROM system_user WHERE username LIKE ? OR email LIKE ?;' );}} diff --git a/sai/modules/saimod_sys_log/saimod_sys_log.js b/sai/modules/saimod_sys_log/saimod_sys_log.js index 7076bc1..93bd3c7 100644 --- a/sai/modules/saimod_sys_log/saimod_sys_log.js +++ b/sai/modules/saimod_sys_log/saimod_sys_log.js @@ -46,7 +46,7 @@ function load_table_log(filter){ $('img#loader').hide();}); } -var filter = ""; +var filter = "%"; function register_log(){ $('#refresh_error_table').click(function(){ load_table_log(filter);}); diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.js b/sai/modules/saimod_sys_security/saimod_sys_security.js index c168eb7..b5e5f3f 100644 --- a/sai/modules/saimod_sys_security/saimod_sys_security.js +++ b/sai/modules/saimod_sys_security/saimod_sys_security.js @@ -2,5 +2,28 @@ function init__SYSTEM_SAI_saimod_sys_security() { $('#securitytab a').click(function (e) { e.preventDefault(); $(this).tab('show'); + load_security_tab($(this).attr('action')); }) -}; \ No newline at end of file + + load_security_tab('users'); +}; + +function load_security_tab(action){ + $('img#loader').show(); + switch(action){ + case 'users': + $('#tab_users').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action, function(){ + $('img#loader').hide();}); + return; + case 'rights': + $('#tab_rights').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action, function(){ + $('img#loader').hide();}); + return; + case 'groups': + $('#tab_groups').load(SAI_ENDPOINT+'sai_mod=.SYSTEM.SAI.saimod_sys_security&action='+action, function(){ + $('img#loader').hide();}); + return; + default: + $('img#loader').hide(); + } +} \ No newline at end of file diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php index 7e6a2ec..d02e2fd 100644 --- a/sai/modules/saimod_sys_security/saimod_sys_security.php +++ b/sai/modules/saimod_sys_security/saimod_sys_security.php @@ -3,10 +3,10 @@ namespace SYSTEM\SAI; class saimod_sys_security extends \SYSTEM\SAI\SaiModule { - public static function html_content_groups(){ + public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_groups(){ return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/saimod_sys_security_groups.tpl'),array());} - public static function html_content_rights(){ + public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_rights(){ $rows = ''; $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHTS::QQ(); while($r = $res->next()){ @@ -14,11 +14,11 @@ 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_rights.tpl'),array('rows' => $rows)); } - public static function html_content_users($search = null){ + public static function sai_mod__SYSTEM_SAI_saimod_sys_security_action_users($search = null){ $search = '%'.$search.'%'; - $count = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_COUNT::Q1(array($search)); + $count = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USER_COUNT::Q1(array($search),array($search,$search)); $rows = ''; - $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USERS::QQ(array($search)); + $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_USERS::QQ(array($search),array($search,$search)); while($r = $res->next()){ $r['class'] = self::tablerow_class($r['last_active']); $r['time_elapsed'] = self::time_elapsed_string($r['last_active']); @@ -27,13 +27,8 @@ 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_users.tpl'),array('rows' => $rows, 'count' => $count['count'])); } - public static function sai_mod__SYSTEM_SAI_saimod_sys_security(){ - $vars = array(); - $vars['content_users'] = self::html_content_users(); - $vars['content_rights'] = self::html_content_rights(); - $vars['content_groups'] = self::html_content_groups(); - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/saimod_sys_security.tpl'), $vars); - } + public static function sai_mod__SYSTEM_SAI_saimod_sys_security(){ + 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); diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.tpl b/sai/modules/saimod_sys_security/saimod_sys_security.tpl index 9c793ca..a5cb30e 100644 --- a/sai/modules/saimod_sys_security/saimod_sys_security.tpl +++ b/sai/modules/saimod_sys_security/saimod_sys_security.tpl @@ -1,12 +1,12 @@
-
${content_users}
-
${content_rights}
-
${content_groups}
+
+
+
\ No newline at end of file