From e54c7f79ac641514a236dd7246818edf988ec3b8 Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 31 Aug 2010 08:51:49 +0000 Subject: [PATCH] 2010-08-31 Sergio Martin * extensions/users_connected.php: Clean code and added additional ACL condition git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3199 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 ++ .../extensions/users_connected.php | 56 +++---------------- 2 files changed, 13 insertions(+), 48 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9da5c9b367..a552e9e70d 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-08-31 Sergio Martin + + * extensions/users_connected.php: Clean code and added + additional ACL condition + 2010-08-31 Sergio Martin * operation/search_reports.php: Added the description diff --git a/pandora_console/extensions/users_connected.php b/pandora_console/extensions/users_connected.php index 6f0cd791a2..fe21c175dc 100644 --- a/pandora_console/extensions/users_connected.php +++ b/pandora_console/extensions/users_connected.php @@ -12,53 +12,13 @@ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. -function users_extension_main () { - - // Header - print_page_header (__("Users connected"), "images/extensions.png", false, "", false); - - $sql = "SELECT id_usuario, ip_origen, fecha, accion FROM tsesion WHERE descripcion = 'Logged in' AND utimestamp > (UNIX_TIMESTAMP(NOW()) - 3600) GROUP BY id_usuario, ip_origen, accion"; - - $rows = get_db_all_rows_sql ($sql); - if (empty ($rows)) { - $rows = array (); - } - - $table->cellpadding = 4; - $table->cellspacing = 4; - $table->width = 600; - $table->class = "databox"; - $table->size = array (); - $table->data = array (); - $table->head = array (); - - $table->head[0] = __('User'); - $table->head[1] = __('IP'); - $table->head[2] = __('Date'); - - $rowPair = true; - $iterator = 0; - - // Get data - foreach ($rows as $row) { - if ($rowPair) - $table->rowclass[$iterator] = 'rowPair'; - else - $table->rowclass[$iterator] = 'rowOdd'; - $rowPair = !$rowPair; - $iterator++; - - $data = array (); - $data[0] = $row["id_usuario"]; - $data[1] = $row["ip_origen"]; - $data[2] = $row["fecha"]; - array_push ($table->data, $data); - } - - print_table ($table); - -} function users_extension_main_god () { + if (isset($config["id_user"])) { + if (!!give_acl ($config["id_user"], 0, "UM")) { + return; + } + } + // Header print_page_header (__("Users connected"), "images/extensions.png", false, "", true); @@ -105,12 +65,12 @@ function users_extension_main_god () { } add_godmode_menu_option (__('Users connected'), 'UM','gusuarios',"users/icon.png"); -if (isset($config["id_user"])) +if (isset($config["id_user"])) { if (give_acl ($config["id_user"], 0, "UM")) { add_operation_menu_option(__('Users connected'), 'usuarios',"users/icon.png"); } +} add_extension_godmode_function ('users_extension_main_god'); -add_extension_main_function ('users_extension_main'); ?>