diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index ed2f6bfb81..4482e55b9c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2011-02-18 Javier Lanz + + * operation/servers/view_server.php: Fixed ACL permissions + * operation/servers/view_server_detail.php: Fixed ACL permissions + * operation/menu.php: Let an "AR" user view 'Pandora servers' menu + + Fix: #3183477 + 2011-02-18 Miguel de Dios * include/ajax/visual_console_builder.ajax.php, diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index e4c262dce3..4fdb1bb7a5 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -132,7 +132,7 @@ if (give_acl ($config['id_user'], 0, "AR")) { } // Agent read, Server read -if (give_acl ($config['id_user'], 0, "PM")) { +if (give_acl ($config['id_user'], 0, "AR")) { // Server view $menu["estado_server"]["text"] = __('Pandora servers'); @@ -146,12 +146,12 @@ if (give_acl ($config['id_user'], 0, "PM")) { if ($servers === false) { $servers = array (); } - - foreach ($servers as $serverItem) { - $sub["operation/servers/view_server_detail&server_id=".$serverItem["id_server"]]["text"] = $serverItem["name"]; + if (give_acl ($config['id_user'], 0, "PM")) { + foreach ($servers as $serverItem) { + $sub["operation/servers/view_server_detail&server_id=".$serverItem["id_server"]]["text"] = $serverItem["name"]; + } + $menu["estado_server"]["sub"] = $sub; } - - $menu["estado_server"]["sub"] = $sub; //End of server view //End of server view diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php index f3ddb6883a..1e46c84e7b 100644 --- a/pandora_console/operation/servers/view_server.php +++ b/pandora_console/operation/servers/view_server.php @@ -21,7 +21,7 @@ require_once ("include/functions_servers.php"); check_login (); -if (! give_acl ($config['id_user'], 0, "AR") && ! give_acl ($config['id_user'], 0, "AW")) { +if (! give_acl ($config['id_user'], 0, "AR")) { pandora_audit("ACL Violation", "Trying to access Server view"); require ("general/noaccess.php"); diff --git a/pandora_console/operation/servers/view_server_detail.php b/pandora_console/operation/servers/view_server_detail.php index 07dbfac65b..119991a22d 100644 --- a/pandora_console/operation/servers/view_server_detail.php +++ b/pandora_console/operation/servers/view_server_detail.php @@ -26,10 +26,10 @@ $options = "