From 2636584aa8901e33840238fdd75995645e95d18e Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Mon, 28 Feb 2011 16:57:28 +0000 Subject: [PATCH] 2011-02-28 Miguel de Dios * include/functions_db.php: cleaned source code, and erased the deprecated function "dame_admin". * operation/reporting/reporting_xml.php: replaced obsolete "dame_admin" to "is_user_admin". git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4029 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/functions_db.php | 10 ++-------- pandora_console/operation/reporting/reporting_xml.php | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index f57890b745..177e3cf408 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2011-02-28 Miguel de Dios + * include/functions_db.php: cleaned source code, and erased the deprecated + function "dame_admin". + + * operation/reporting/reporting_xml.php: replaced obsolete "dame_admin" + to "is_user_admin". + 2011-02-28 Juan Manuel Ramon * include/functions_html.php: new parameter in function print_image in diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index b98be1db90..6d8e6a9090 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -1465,7 +1465,8 @@ function get_agent_modules_data_count ($id_agent = 0) { if (empty ($id_agent)) { $id_agent = array (); - } else { + } + else { $id_agent = (array) $id_agent; } @@ -1512,13 +1513,6 @@ function get_os_name ($id_os) { return (string) get_db_value ('name', 'tconfig_os', 'id_os', (int) $id_os); } -/** - * @deprecated Use is_user_admin - */ -function dame_admin ($id_user) { - return is_user_admin ($id_user); -} - /** * Check if an agent has alerts fired. * diff --git a/pandora_console/operation/reporting/reporting_xml.php b/pandora_console/operation/reporting/reporting_xml.php index 69a113d423..9cdab85984 100644 --- a/pandora_console/operation/reporting/reporting_xml.php +++ b/pandora_console/operation/reporting/reporting_xml.php @@ -122,7 +122,7 @@ if (! check_acl ($config['id_user'], $report['id_group'], "AR")) { } /* Check if the user can see the graph */ -if ($report['private'] && ($report['id_user'] != $config['id_user'] && ! dame_admin ($config['id_user']))) { +if ($report['private'] && ($report['id_user'] != $config['id_user'] && ! is_user_admin($config['id_user']))) { return; }