tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-04-24 Miguel de Dios <miguel.dedios@artica.es>

Browse Source 
* extensions/agents_alerts.php, extensions/agents_modules.php,
	godmode/menu.php, operation/menu.php: fixed old references to the
	config refr.
	
	Fixes: #3611361




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8049 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-04-24 14:46:57 +00:00
parent c9bd0d75ff
commit 40476d1fad
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2013-04-24 Miguel de Dios <miguel.dedios@artica.es>
* 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 <miguel.dedios@artica.es> 2013-04-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/events/event_responses.editor.php: set the sizes of * godmode/events/event_responses.editor.php: set the sizes of

2
pandora_console/extensions/agents_alerts.php
View File

@ -82,7 +82,7 @@ function mainAgentsAlerts() {
(string)SECONDS_2MINUTES => __('2 minutes'), (string)SECONDS_2MINUTES => __('2 minutes'),
(string)SECONDS_5MINUTES => __('5 minutes'), (string)SECONDS_5MINUTES => __('5 minutes'),
(string)SECONDS_10MINUTES => __('10 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 .= "</form>"; $comborefr .= "</form>";
if ($config["pure"] == 0) { if ($config["pure"] == 0) {

2
pandora_console/extensions/agents_modules.php
View File

@ -90,7 +90,7 @@ function mainAgentsModules() {
(string)SECONDS_2MINUTES => __('2 minutes'), (string)SECONDS_2MINUTES => __('2 minutes'),
(string)SECONDS_5MINUTES => __('5 minutes'), (string)SECONDS_5MINUTES => __('5 minutes'),
(string)SECONDS_10MINUTES => __('10 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 .= "</form>"; $comborefr .= "</form>";
if ($config["pure"] == 0) { if ($config["pure"] == 0) {

7
pandora_console/godmode/menu.php
View File

@ -138,12 +138,7 @@ if (check_acl ($config['id_user'], 0, "IW")) {
if ($config['activate_gis']) { if ($config['activate_gis']) {
$menu_godmode["godgismaps"]["text"] = __('GIS Maps builder'); $menu_godmode["godgismaps"]["text"] = __('GIS Maps builder');
$menu_godmode["godgismaps"]["sec2"] = "godmode/gis_maps/index"; $menu_godmode["godgismaps"]["sec2"] = "godmode/gis_maps/index";
if (!empty($config['refr'])) { $menu_godmode["godgismaps"]["refr"] = (int)get_parameter('refr', 60);
$menu_godmode["godgismaps"]["refr"] = $config['refr'];
}
else {
$menu_godmode["godgismaps"]["refr"] = 60;
}
$menu_godmode["godgismaps"]["id"] = "god-gismaps"; $menu_godmode["godgismaps"]["id"] = "god-gismaps";
} }
} }

8
pandora_console/operation/menu.php
View File

@ -111,8 +111,8 @@ if (check_acl ($config['id_user'], 0, "RR")) {
if (!empty($config['vc_refr'])) { if (!empty($config['vc_refr'])) {
$sub["godmode/reporting/map_builder"]["refr"] = $config['vc_refr']; $sub["godmode/reporting/map_builder"]["refr"] = $config['vc_refr'];
} }
else if (!empty($config['refr'])) { else if (((int)get_parameter('refr', 0)) > 0) {
$sub["godmode/reporting/map_builder"]["refr"] = $config['refr']; $sub["godmode/reporting/map_builder"]["refr"] = (int)get_parameter('refr', 0);
} }
else { else {
$sub["godmode/reporting/map_builder"]["refr"] = 60; $sub["godmode/reporting/map_builder"]["refr"] = 60;
@ -149,8 +149,8 @@ if (check_acl ($config['id_user'], 0, "RR")) {
if (!empty($config['vc_refr'])) { if (!empty($config['vc_refr'])) {
$sub2["operation/visual_console/render_view&amp;id=".$layout["id"]]["refr"] = $config['vc_refr']; $sub2["operation/visual_console/render_view&amp;id=".$layout["id"]]["refr"] = $config['vc_refr'];
} }
elseif (!empty($config['refr'])) { elseif (((int)get_parameter('refr', 0)) > 0) {
$sub2["operation/visual_console/render_view&amp;id=".$layout["id"]]["refr"] = $config['refr']; $sub2["operation/visual_console/render_view&amp;id=".$layout["id"]]["refr"] = (int)get_parameter('refr', 0);
} }
else { else {
$sub2["operation/visual_console/render_view&amp;id=".$layout["id"]]["refr"] = 0; $sub2["operation/visual_console/render_view&amp;id=".$layout["id"]]["refr"] = 0;