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

2010-06-23 Sergio Martin <sergio.martin@artica.es> 

* include/auth/mysql.php
	operation/users/user.php
	godmode/users/user_list.php: Added pagination
	to users list in operations and administration



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2920 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-06-23 09:15:45 +00:00
parent 658387f4da
commit f4efe80f28
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2010-06-23 Sergio Martin <sergio.martin@artica.es>
* include/auth/mysql.php
operation/users/user.php
godmode/users/user_list.php: Added pagination
to users list in operations and administration
2010-06-22 Raúl Mateos <raulofpandora@gmail.com> 2010-06-22 Raúl Mateos <raulofpandora@gmail.com>
* godmode/reporting/graph_builder.main.php * godmode/reporting/graph_builder.main.php

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

@ -30,7 +30,6 @@ print_page_header (__('User management').' &raquo; '.__('Users defined in Pandor
if (isset ($_GET["user_del"])) { //delete user if (isset ($_GET["user_del"])) { //delete user
$id_user = get_parameter ("delete_user", 0); $id_user = get_parameter ("delete_user", 0);
//debugPrint($_POST);
// Only allow delete user if is not the actual user // Only allow delete user if is not the actual user
if($id_user != $config['id_user']){ if($id_user != $config['id_user']){
$result = delete_user ($id_user); $result = delete_user ($id_user);
@ -76,7 +75,11 @@ $table->size[5] = 40;
$info = array (); $info = array ();
// Get users ordered by id_user // Get users ordered by id_user
$info = get_users ("id_user"); $info = get_users ("id_user",array ('offset' => (int) get_parameter ('offset'),
'limit' => (int) $config['block_size']));
// Prepare pagination
pagination (count(get_users ()));
$rowPair = true; $rowPair = true;
$iterator = 0; $iterator = 0;

7
pandora_console/include/auth/mysql.php
View File

@ -191,7 +191,7 @@ function get_user_info ($user) {
* *
* @return array An array of user information * @return array An array of user information
*/ */
function get_users ($order = "fullname") { function get_users ($order = "fullname", $filter = false, $fields = false) {
switch ($order) { switch ($order) {
case "id_user": case "id_user":
case "registered": case "registered":
@ -202,9 +202,12 @@ function get_users ($order = "fullname") {
$order = "fullname"; $order = "fullname";
} }
$filter['order'] = $order." ASC";
$output = array(); $output = array();
$result = get_db_all_rows_in_table ("tusuario", $order); $result = get_db_all_rows_filter ("tusuario", $filter, $fields);
if ($result !== false) { if ($result !== false) {
foreach ($result as $row) { foreach ($result as $row) {
$output[$row["id_user"]] = $row; $output[$row["id_user"]] = $row;

6
pandora_console/operation/users/user.php
View File

@ -43,7 +43,8 @@ $table->align[3] = "center";
$info = array (); $info = array ();
// Get users ordered by id_user // Get users ordered by id_user
$info = get_users ("id_user"); $info = get_users ("id_user",array ('offset' => (int) get_parameter ('offset'),
'limit' => (int) $config['block_size']));
//Only the users from the user groups are visible //Only the users from the user groups are visible
@ -63,6 +64,9 @@ foreach($users_hidden as $user_hidden){
unset($info[$user_hidden]); unset($info[$user_hidden]);
} }
// Prepare pagination
pagination (count(get_users ()));
$rowPair = true; $rowPair = true;
$iterator = 0; $iterator = 0;
foreach ($info as $user_id => $user_info) { foreach ($info as $user_id => $user_info) {