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

2008-10-06 Evi Vanoost <vanooste@rcbi.rochester.edu> 

* godmode/agentes/configurar_agente.php: Double values in query removed
        
        * godmode/agentes/agent_manager.php: WMI Server now properly displays 
        None if no WMI server is present

        * include/functions_html.php: If the query returns empty for
        print_select_from_sql, a box should still be printed. Fixed.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1132 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
guruevi 2008-10-06 13:14:49 +00:00
parent 5a93b8d4c8
commit 1ff31c5a1a
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2008-10-06 Evi Vanoost <vanooste@rcbi.rochester.edu>
* godmode/agentes/configurar_agente.php: Double values in query removed
* godmode/agentes/agent_manager.php: WMI Server now properly displays
None if no WMI server is present
* include/functions_html.php: If the query returns empty for
print_select_from_sql, a box should still be printed. Fixed.
2008-10-05 Raul Mateos <raulofpandora@gmail.com>
* install.php: Updated PHP version dependency.

2
pandora_console/godmode/agentes/agent_manager.php
View File

@ -155,7 +155,7 @@ echo '<a href="#" class="tip">&nbsp;<span>'.__('You must select a WMI Server for
echo '</td><td class="datos2">';
$none = '';
$none_value = '';
if ($id_plugin_server == 0) {
if ($id_wmi_server == 0) {
$none = $none_str;
$none_value = 0;
}

10
pandora_console/godmode/agentes/configurar_agente.php
View File

@ -397,7 +397,7 @@ if (isset($_POST["add_alert_combined"])){ // Update an existing alert
// Update ALERT
// =============
if (isset($_POST["update_alert"])){ // Update an existing alert
if (isset($_POST["update_alert"])) { // Update an existing alert
$id_agente_modulo = get_parameter ("agente_modulo",0);
$id_aam = get_parameter ("id_aam",0);
$maximo = get_parameter ("maximo",0);
@ -466,10 +466,10 @@ if (isset($_POST["update_alert"])){ // Update an existing alert
recovery_notify = %d,
priority = %d,
al_f2_recovery = '%s',
al_f3_recovery = '%s',
id_alerta = %d WHERE id_aam = %d", $tipo_alerta, $max_alerts, $min_alerts, $time_threshold, $minimo, $maximo, $campo_3, $campo_2, $campo_1, $descripcion, $alert_text,
$time_to, $time_from, $disable_alert, $alert_d1, $alert_d2, $alert_d3, $alert_d4, $alert_d5, $alert_d5, $alert_d6, $alert_d7, $alert_recovery, $alert_priority,
$campo2_rec, $campo3_rec, $tipo_alerta, $id_aam);
al_f3_recovery = '%s'
WHERE id_aam = %d", $tipo_alerta, $max_alerts, $min_alerts, $time_threshold, $minimo, $maximo, $campo_3, $campo_2, $campo_1, $descripcion, $alert_text,
$time_to, $time_from, $disable_alert, $alert_d1, $alert_d2, $alert_d3, $alert_d4, $alert_d5, $alert_d6, $alert_d7, $alert_recovery, $alert_priority,
$campo2_rec, $campo3_rec, $id_aam);
$result = process_sql ($sql);
if ($result === false) {
echo '<h3 class="error">'.__('There was a problem updating alert').'</h3>';

2
pandora_console/include/functions_html.php
View File

@ -104,7 +104,7 @@ function print_select_from_sql ($sql, $name, $selected = '', $script = '', $noth
$fields = array ();
$result = get_db_all_rows_sql ($sql);
if ($result === false)
return "";
$result = array ();
foreach ($result as $row) {
$fields[$row[0]] = $row[1];