tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-02-11 Sergio Martin <sergio.martin@artica.es> 

* godmode/users/user_list.php: Fix pagination on users list



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7619 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-02-11 11:50:06 +00:00
parent 182e5a32a2
commit 33f977980e
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2013-02-11 Sergio Martin <sergio.martin@artica.es>
* godmode/users/user_list.php: Fix pagination on users list
2013-02-11 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_servers.php, extensions/plugin_registration.php:

30
pandora_console/godmode/users/user_list.php
View File

@ -203,17 +203,17 @@ $table->size[5] = '65px';
$info1 = array ();
$info1 = get_users ($order, array ('offset' => (int) get_parameter ('offset'),
'limit' => (int) $config['block_size']));
$info1 = get_users ($order);
$info = array();
$own_info = get_user_info ($config['id_user']);
$own_groups = users_get_groups ($config['id_user'], 'AR', $own_info['is_admin']);
if ($own_info['is_admin'])
if ($own_info['is_admin']) {
$info = $info1;
}
// If user is not admin then don't display admin users and user of others groups.
else
else {
foreach ($info1 as $key => $usr) {
$u = get_user_info ($key);
$g = users_get_groups ($key, 'AR', $u['is_admin']);
@ -223,13 +223,31 @@ else
unset($u);
unset($g);
}
}
// Prepare pagination
ui_pagination (count(get_users ()));
ui_pagination (count($info));
$offset = (int) get_parameter ('offset');
$limit = (int) $config['block_size'];
$rowPair = true;
$iterator = 0;
$cont = 0;
foreach ($info as $user_id => $user_info) {
$cont++;
////////////////////
// Manual pagination due the complicated process of the ACL data
if ($cont <= $offset) {
continue;
}
if ($cont > ($limit + $offset)) {
break;
}
////////////////////
if ($rowPair)
$table->rowclass[$iterator] = 'rowPair';
else