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

2012-03-12 Vanessa Gil <vanessa.gil@artica.es> 

* 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
This commit is contained in:
vgilc 2012-03-12 14:53:20 +00:00
parent 25aba79c97
commit 633bb9296b
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/ChangeLog
View File

@ -1,3 +1,7 @@
2012-03-12 Vanessa Gil <vanessa.gil@artica.es>
* index.php: Fixed problem to display "sec2" in menu.
2012-03-12 Vanessa Gil <vanessa.gil@artica.es> 2012-03-12 Vanessa Gil <vanessa.gil@artica.es>
* index.php: Fixed problem to display "sec" in menu. * index.php: Fixed problem to display "sec" in menu.

11
pandora_console/index.php
View File

@ -184,26 +184,32 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) {
break; break;
case __('Group view'): case __('Group view'):
$_GET["sec"] = "estado"; $_GET["sec"] = "estado";
$_GET["sec2"] = "operation/agentes/group_view";
break; break;
case __('Alert detail'): case __('Alert detail'):
$_GET["sec"] = "estado"; $_GET["sec"] = "estado";
$_GET["sec2"] = "operation/agentes/alerts_status";
break; break;
case __('Tactical view'): case __('Tactical view'):
$_GET["sec"] = "estado"; $_GET["sec"] = "estado";
$_GET["sec2"] = "operation/agentes/tactical";
break; break;
case __('Default'): case __('Default'):
$_GET["sec"] = "general/logon_ok"; $_GET["sec"] = "general/logon_ok";
break; break;
case __('Dashboard'): case __('Dashboard'):
$_GET["sec"] = "dashboard"; $_GET["sec"] = "dashboard";
$_GET["sec2"] = ENTERPRISE_DIR.'/dashboard/main_dashboard';
break; break;
case __('Visual console'): case __('Visual console'):
$_GET["sec"] = "visualc"; $_GET["sec"] = "visualc";
$_GET["sec2"] = "operation/visual_console/index";
break; break;
case __('Other'): case __('Other'):
$home_url = io_safe_output($home_url); $home_url = io_safe_output($home_url);
parse_str ($home_url, $res); parse_str ($home_url, $res);
$_GET["sec"] = $res["sec"]; $_GET["sec"] = $res["sec"];
$_GET["sec2"] = $res["sec2"];
break; break;
} }
@ -342,12 +348,15 @@ else {
break; break;
case __('Visual console'): case __('Visual console'):
$id_visualc = db_get_value('id', 'tlayout', 'name', $home_url); $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'; $str = 'sec=visualc&sec2=operation/visual_console/render_view&id='.$id_visualc .'&refr=60';
parse_str($str, $res); parse_str($str, $res);
foreach ($res as $key => $param) { foreach ($res as $key => $param) {
$_GET[$key] = $param; $_GET[$key] = $param;
} }
require('operation/visual_console/render_view.php'); require($_GET["sec2"].'.php');
break; break;
case __('Other'): case __('Other'):
$home_url = io_safe_output($home_url); $home_url = io_safe_output($home_url);

3
pandora_console/operation/users/user_edit.php
View File

@ -258,8 +258,9 @@ if ($dashboards === false) {
echo html_print_select ($dashboards_aux, 'dashboard', $user_info["data_section"], '', '', '', true); echo html_print_select ($dashboards_aux, 'dashboard', $user_info["data_section"], '', '', '', true);
$layouts = visual_map_get_user_layouts ($user_info['id_user'], true); $layouts = visual_map_get_user_layouts ($user_info['id_user'], true);
$layouts_aux = array();
if ($layouts === false) { if ($layouts === false) {
$layouts = array('None'=>'None'); $layouts_aux = array('None'=>'None');
} else { } else {
foreach ($layouts as $layout) { foreach ($layouts as $layout) {
$layouts_aux[$layout] = $layout; $layouts_aux[$layout] = $layout;