webcraftmedia/system
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

saimod security tab improvement

Browse Source
This commit is contained in:
Ulf Gebhardt 2014-01-25 18:43:23 +01:00
parent d3a5b693a5
commit 6f7f455ac3
6 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbd/qq/SYS_SAIMOD_SECURITY_USERS.php
View File

@ -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;'
);}}

4
dbd/qq/SYS_SAIMOD_SECURITY_USER_COUNT.php
View File

@ -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 ?;'
);}}

2
sai/modules/saimod_sys_log/saimod_sys_log.js
View File

@ -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);});

25
sai/modules/saimod_sys_security/saimod_sys_security.js
View File

@ -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'));
})
};
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();
}
}

19
sai/modules/saimod_sys_security/saimod_sys_security.php
View File

@ -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);

12
sai/modules/saimod_sys_security/saimod_sys_security.tpl
View File

@ -1,12 +1,12 @@
<div class="tabbable">
<ul class="nav nav-tabs" id="securitytab">
<li class="active"><a href="#tab_users">Users</a></li>
<li><a href="#tab_rights">Rights</a></li>
<li><a href="#tab_groups">Groups</a></li>
<li class="active"><a href="#tab_users" action="users">Users</a></li>
<li><a href="#tab_rights" action="rights">Rights</a></li>
<li><a href="#tab_groups" action="groups">Groups</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tab_users">${content_users}</div>
<div class="tab-pane" id="tab_rights">${content_rights}</div>
<div class="tab-pane" id="tab_groups">${content_groups}</div>
<div class="tab-pane active" id="tab_users"></div>
<div class="tab-pane" id="tab_rights"></div>
<div class="tab-pane" id="tab_groups"></div>
</div>
</div>