diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 252100f0f1..f6ff36c17c 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2013-04-24 Miguel de Dios + + * extensions/agents_alerts.php, extensions/agents_modules.php, + godmode/menu.php, operation/menu.php: fixed old references to the + config refr. + + Fixes: #3611361 + 2013-04-24 Miguel de Dios * godmode/events/event_responses.editor.php: set the sizes of diff --git a/pandora_console/extensions/agents_alerts.php b/pandora_console/extensions/agents_alerts.php index 92cab69fe7..8f16d30405 100755 --- a/pandora_console/extensions/agents_alerts.php +++ b/pandora_console/extensions/agents_alerts.php @@ -82,7 +82,7 @@ function mainAgentsAlerts() { (string)SECONDS_2MINUTES => __('2 minutes'), (string)SECONDS_5MINUTES => __('5 minutes'), (string)SECONDS_10MINUTES => __('10 minutes')) - , 'refr', $config['refr'], $script = 'this.form.submit()', '', 0, true, false, false, '', false, 'width: 100px; margin-right: 10px; margin-top: 5px;'); + , 'refr', (int)get_parameter('refr', 0), $script = 'this.form.submit()', '', 0, true, false, false, '', false, 'width: 100px; margin-right: 10px; margin-top: 5px;'); $comborefr .= ""; if ($config["pure"] == 0) { diff --git a/pandora_console/extensions/agents_modules.php b/pandora_console/extensions/agents_modules.php index 7663e776f1..da20d119e0 100644 --- a/pandora_console/extensions/agents_modules.php +++ b/pandora_console/extensions/agents_modules.php @@ -90,7 +90,7 @@ function mainAgentsModules() { (string)SECONDS_2MINUTES => __('2 minutes'), (string)SECONDS_5MINUTES => __('5 minutes'), (string)SECONDS_10MINUTES => __('10 minutes')), - 'refr', $config['refr'], $script = 'this.form.submit()', '', 0, true, false, false, '', false, 'width: 100px; margin-right: 10px; margin-top: 5px;'); + 'refr', (int)get_parameter('refr', 0), $script = 'this.form.submit()', '', 0, true, false, false, '', false, 'width: 100px; margin-right: 10px; margin-top: 5px;'); $comborefr .= ""; if ($config["pure"] == 0) { diff --git a/pandora_console/godmode/menu.php b/pandora_console/godmode/menu.php index fe167b20ff..af9f506d0a 100644 --- a/pandora_console/godmode/menu.php +++ b/pandora_console/godmode/menu.php @@ -138,12 +138,7 @@ if (check_acl ($config['id_user'], 0, "IW")) { if ($config['activate_gis']) { $menu_godmode["godgismaps"]["text"] = __('GIS Maps builder'); $menu_godmode["godgismaps"]["sec2"] = "godmode/gis_maps/index"; - if (!empty($config['refr'])) { - $menu_godmode["godgismaps"]["refr"] = $config['refr']; - } - else { - $menu_godmode["godgismaps"]["refr"] = 60; - } + $menu_godmode["godgismaps"]["refr"] = (int)get_parameter('refr', 60); $menu_godmode["godgismaps"]["id"] = "god-gismaps"; } } diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php index f91eaea7dc..a03f8dbcb2 100644 --- a/pandora_console/operation/menu.php +++ b/pandora_console/operation/menu.php @@ -111,8 +111,8 @@ if (check_acl ($config['id_user'], 0, "RR")) { if (!empty($config['vc_refr'])) { $sub["godmode/reporting/map_builder"]["refr"] = $config['vc_refr']; } - else if (!empty($config['refr'])) { - $sub["godmode/reporting/map_builder"]["refr"] = $config['refr']; + else if (((int)get_parameter('refr', 0)) > 0) { + $sub["godmode/reporting/map_builder"]["refr"] = (int)get_parameter('refr', 0); } else { $sub["godmode/reporting/map_builder"]["refr"] = 60; @@ -149,8 +149,8 @@ if (check_acl ($config['id_user'], 0, "RR")) { if (!empty($config['vc_refr'])) { $sub2["operation/visual_console/render_view&id=".$layout["id"]]["refr"] = $config['vc_refr']; } - elseif (!empty($config['refr'])) { - $sub2["operation/visual_console/render_view&id=".$layout["id"]]["refr"] = $config['refr']; + elseif (((int)get_parameter('refr', 0)) > 0) { + $sub2["operation/visual_console/render_view&id=".$layout["id"]]["refr"] = (int)get_parameter('refr', 0); } else { $sub2["operation/visual_console/render_view&id=".$layout["id"]]["refr"] = 0;