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

2011-02-28 Miguel de Dios <miguel.dedios@artica.es> 

* 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
This commit is contained in:
mdtrooper 2011-02-28 16:57:28 +00:00
parent f9e506892b
commit 768bc674b9
3 changed files with 10 additions and 9 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 @@
2011-02-28 Miguel de Dios <miguel.dedios@artica.es>
* 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 <juanmanuel.ramon@artica.es>
* include/functions_html.php: new parameter in function print_image in

10
pandora_console/include/functions_db.php
View File

@ -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.
*

2
pandora_console/operation/reporting/reporting_xml.php
View File

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