mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-19 20:04:52 +02:00
2013-01-29 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components_form.php, godmode/servers/manage_recontask.php, godmode/servers/manage_recontask_form.php, operation/menu.php, operation/agentes/status_monitor.php, operation/agentes/exportdata.excel.php, operation/agentes/datos_agente.php, operation/agentes/estado_generalagente.php, operation/agentes/estado_agente.php, general/login_help_dialog.php, general/shortcut_bar.php: uploaded a lost changes for to clean the source code structure. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7538 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
parent
8c5ac783bd
commit
c4b33db131
@ -1,3 +1,16 @@
|
|||||||
|
2013-01-29 Miguel de Dios <miguel.dedios@artica.es>
|
||||||
|
|
||||||
|
* godmode/modules/manage_network_components_form.php,
|
||||||
|
godmode/servers/manage_recontask.php,
|
||||||
|
godmode/servers/manage_recontask_form.php, operation/menu.php,
|
||||||
|
operation/agentes/status_monitor.php,
|
||||||
|
operation/agentes/exportdata.excel.php,
|
||||||
|
operation/agentes/datos_agente.php,
|
||||||
|
operation/agentes/estado_generalagente.php,
|
||||||
|
operation/agentes/estado_agente.php, general/login_help_dialog.php,
|
||||||
|
general/shortcut_bar.php: uploaded a lost changes for to clean the
|
||||||
|
source code structure.
|
||||||
|
|
||||||
2013-01-28 Miguel de Dios <miguel.dedios@artica.es>
|
2013-01-28 Miguel de Dios <miguel.dedios@artica.es>
|
||||||
|
|
||||||
* include/functions_reporting.php: fixed the calculate the min,
|
* include/functions_reporting.php: fixed the calculate the min,
|
||||||
|
@ -101,16 +101,16 @@ echo '</div>';
|
|||||||
$(document).ready (function () {
|
$(document).ready (function () {
|
||||||
|
|
||||||
$("#login_help_dialog").dialog({
|
$("#login_help_dialog").dialog({
|
||||||
resizable: true,
|
resizable: true,
|
||||||
draggable: true,
|
draggable: true,
|
||||||
modal: true,
|
modal: true,
|
||||||
height: 400,
|
height: 400,
|
||||||
width: 600,
|
width: 600,
|
||||||
overlay: {
|
overlay: {
|
||||||
opacity: 0.5,
|
opacity: 0.5,
|
||||||
background: "black"
|
background: "black"
|
||||||
},
|
},
|
||||||
bgiframe: jQuery.browser.msie
|
bgiframe: jQuery.browser.msie
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -190,7 +190,7 @@ if ($shortcut_events == false)
|
|||||||
|
|
||||||
$critical_events = 0;
|
$critical_events = 0;
|
||||||
foreach($shortcut_events as $event){
|
foreach($shortcut_events as $event){
|
||||||
if ($event['criticity'] == 4 and $event['estado'] == 0){
|
if ($event['criticity'] == 4 and $event['estado'] == 0) {
|
||||||
$critical_events++;
|
$critical_events++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -147,7 +147,7 @@ if (isset($_GET["update"])) {
|
|||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
echo '<h3 class="error">'.__('Error updating recon task').'</h3>';
|
echo '<h3 class="error">'.__('Error updating recon task').'</h3>';
|
||||||
echo $reason;
|
echo $reason;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -251,8 +251,9 @@ foreach ($result as $row) {
|
|||||||
// I dont why, but using index (value) method, data is automatically converted to html entities ¿?
|
// I dont why, but using index (value) method, data is automatically converted to html entities ¿?
|
||||||
$data[$attr[1]]=$datos;
|
$data[$attr[1]]=$datos;
|
||||||
|
|
||||||
} else {
|
}
|
||||||
// Just a string of alphanumerical data... just do print
|
else {
|
||||||
|
// Just a string of alphanumerical data... just do print
|
||||||
|
|
||||||
$data[$attr[1]]=$row[$attr[0]];
|
$data[$attr[1]]=$row[$attr[0]];
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user