From 5ad6901d4ac40260acf883126136cdf3ad976abf Mon Sep 17 00:00:00 2001 From: vgilc Date: Mon, 12 Mar 2012 14:53:20 +0000 Subject: [PATCH] 2012-03-12 Vanessa Gil * index.php: Fixed problem to display "sec2" in menu. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5736 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 4 ++++ pandora_console/index.php | 11 ++++++++++- pandora_console/operation/users/user_edit.php | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 35ca4a14f8..b1804da581 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2012-03-12 Vanessa Gil + + * index.php: Fixed problem to display "sec2" in menu. + 2012-03-12 Vanessa Gil * index.php: Fixed problem to display "sec" in menu. diff --git a/pandora_console/index.php b/pandora_console/index.php index 0362150d04..49e1ca10b9 100644 --- a/pandora_console/index.php +++ b/pandora_console/index.php @@ -184,26 +184,32 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) { break; case __('Group view'): $_GET["sec"] = "estado"; + $_GET["sec2"] = "operation/agentes/group_view"; break; case __('Alert detail'): $_GET["sec"] = "estado"; + $_GET["sec2"] = "operation/agentes/alerts_status"; break; case __('Tactical view'): $_GET["sec"] = "estado"; + $_GET["sec2"] = "operation/agentes/tactical"; break; case __('Default'): $_GET["sec"] = "general/logon_ok"; break; case __('Dashboard'): $_GET["sec"] = "dashboard"; + $_GET["sec2"] = ENTERPRISE_DIR.'/dashboard/main_dashboard'; break; case __('Visual console'): $_GET["sec"] = "visualc"; + $_GET["sec2"] = "operation/visual_console/index"; break; case __('Other'): $home_url = io_safe_output($home_url); parse_str ($home_url, $res); $_GET["sec"] = $res["sec"]; + $_GET["sec2"] = $res["sec2"]; break; } @@ -342,12 +348,15 @@ else { break; case __('Visual console'): $id_visualc = db_get_value('id', 'tlayout', 'name', $home_url); + if (($home_url == '') || ($id_visualc == false)) { + $str = 'sec=visualc&sec2=operation/visual_console/index&refr=60'; + } else $str = 'sec=visualc&sec2=operation/visual_console/render_view&id='.$id_visualc .'&refr=60'; parse_str($str, $res); foreach ($res as $key => $param) { $_GET[$key] = $param; } - require('operation/visual_console/render_view.php'); + require($_GET["sec2"].'.php'); break; case __('Other'): $home_url = io_safe_output($home_url); diff --git a/pandora_console/operation/users/user_edit.php b/pandora_console/operation/users/user_edit.php index 56172e101a..0475750cec 100644 --- a/pandora_console/operation/users/user_edit.php +++ b/pandora_console/operation/users/user_edit.php @@ -258,8 +258,9 @@ if ($dashboards === false) { echo html_print_select ($dashboards_aux, 'dashboard', $user_info["data_section"], '', '', '', true); $layouts = visual_map_get_user_layouts ($user_info['id_user'], true); +$layouts_aux = array(); if ($layouts === false) { - $layouts = array('None'=>'None'); + $layouts_aux = array('None'=>'None'); } else { foreach ($layouts as $layout) { $layouts_aux[$layout] = $layout;