Fixed the lost parameters when the user has a homepage and he tries to access a pandora section (for example lost session). TICKET: #1630

This commit is contained in:
mdtrooper 2015-01-19 15:17:58 +01:00
parent 24e7dabf03
commit c061326bc8

View File

@ -342,57 +342,65 @@ if (! isset ($config['id_user'])) {
echo "<script type='text/javascript'>var process_login_ok = 1;</script>"; echo "<script type='text/javascript'>var process_login_ok = 1;</script>";
unset ($_GET["sec2"]); if (!isset($_GET["sec2"]) && !isset($_GET["sec"])) {
$_GET["sec"] = "general/logon_ok"; // Avoid the show homepage when the user go to
$home_page =''; // a specific section of pandora
if (isset($nick)) { // for example when timeout the sesion
$user_info = users_get_user_by_id($nick);
$home_page = io_safe_output($user_info['section']); unset ($_GET["sec2"]);
$home_url = $user_info['data_section']; $_GET["sec"] = "general/logon_ok";
if ($home_page != '') { $home_page ='';
switch($home_page) { if (isset($nick)) {
case 'Event list': $user_info = users_get_user_by_id($nick);
$_GET["sec"] = "eventos"; $home_page = io_safe_output($user_info['section']);
$_GET["sec2"] = "operation/events/events"; $home_url = $user_info['data_section'];
break; if ($home_page != '') {
case 'Group view': switch ($home_page) {
$_GET["sec"] = "estado"; case 'Event list':
$_GET["sec2"] = "operation/agentes/group_view"; $_GET["sec"] = "eventos";
break; $_GET["sec2"] = "operation/events/events";
case 'Alert detail': break;
$_GET["sec"] = "estado"; case 'Group view':
$_GET["sec2"] = "operation/agentes/alerts_status"; $_GET["sec"] = "estado";
break; $_GET["sec2"] = "operation/agentes/group_view";
case 'Tactical view': break;
$_GET["sec"] = "estado"; case 'Alert detail':
$_GET["sec2"] = "operation/agentes/tactical"; $_GET["sec"] = "estado";
break; $_GET["sec2"] = "operation/agentes/alerts_status";
case 'Default': break;
$_GET["sec"] = "general/logon_ok"; case 'Tactical view':
break; $_GET["sec"] = "estado";
case 'Dashboard': $_GET["sec2"] = "operation/agentes/tactical";
$_GET["sec"] = "dashboard"; break;
$_GET["sec2"] = ENTERPRISE_DIR.'/dashboard/main_dashboard'; case 'Default':
$id_dashboard_select = $_GET["sec"] = "general/logon_ok";
db_get_value('id', 'tdashboard', 'name', $home_url); break;
$_GET['id_dashboard_select'] = $id_dashboard_select; case 'Dashboard':
break; $_GET["sec"] = "dashboard";
case 'Visual console': $_GET["sec2"] = ENTERPRISE_DIR.'/dashboard/main_dashboard';
$_GET["sec"] = "visualc"; $id_dashboard_select =
$_GET["sec2"] = "operation/visual_console/index"; db_get_value('id', 'tdashboard', 'name', $home_url);
break; $_GET['id_dashboard_select'] = $id_dashboard_select;
case 'Other': break;
$home_url = io_safe_output($home_url); case 'Visual console':
parse_str ($home_url, $res); $_GET["sec"] = "visualc";
$_GET["sec"] = $res["sec"]; $_GET["sec2"] = "operation/visual_console/index";
$_GET["sec2"] = $res["sec2"]; break;
break; case 'Other':
$home_url = io_safe_output($home_url);
parse_str ($home_url, $res);
$_GET["sec"] = $res["sec"];
$_GET["sec2"] = $res["sec2"];
break;
}
}
else {
$_GET["sec"] = "general/logon_ok";
} }
} }
else {
$_GET["sec"] = "general/logon_ok";
}
} }
db_logon ($nick_in_db, $_SERVER['REMOTE_ADDR']); db_logon ($nick_in_db, $_SERVER['REMOTE_ADDR']);
$_SESSION['id_usuario'] = $nick_in_db; $_SESSION['id_usuario'] = $nick_in_db;
$config['id_user'] = $nick_in_db; $config['id_user'] = $nick_in_db;
@ -491,8 +499,8 @@ if ($process_login) {
require_once("include/functions_update_manager.php"); require_once("include/functions_update_manager.php");
enterprise_include_once("include/functions_update_manager.php"); enterprise_include_once("include/functions_update_manager.php");
if ($config["autoupdate"] == 1) { if ($config["autoupdate"] == 1) {
if (enterprise_installed()) { if (enterprise_installed()) {
$result = update_manager_check_online_enterprise_packages_available(); $result = update_manager_check_online_enterprise_packages_available();
} }
@ -631,6 +639,8 @@ else {
$home_url = $user_info['data_section']; $home_url = $user_info['data_section'];
} }
if ($home_page != '') { if ($home_page != '') {
switch ($home_page) { switch ($home_page) {
case 'Event list': case 'Event list':