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

2009-05-29 Esteban Sanchez <estebans@artica.es> 

* godmode/agentes/massive_edit_modules.php: Renamed ff_event field
        to min_ff_event to match tagente_modulo field name. Better code for
        process_manage_edit(). Fixes #2785011.

        * include/functions_modules.php: Fixed an error on
        update_agente_module() when no name was given, also added extra
        check for empty values.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1724 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Esteban Sanchez 2009-05-29 10:32:26 +00:00
parent cfa7020fb2
commit de7d19e27a
3 changed files with 29 additions and 8 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 @@
2009-05-29 Esteban Sanchez <estebans@artica.es>
* godmode/agentes/massive_edit_modules.php: Renamed ff_event field
to min_ff_event to match tagente_modulo field name. Better code for
process_manage_edit(). Fixes #2785011.
* include/functions_modules.php: Fixed an error on
update_agente_module() when no name was given, also added extra
check for empty values.
2009-05-29 Esteban Sanchez <estebans@artica.es>
* include/functions_menu.php: Added menu_icon class.

23
pandora_console/godmode/agentes/massive_edit_modules.php
View File

@ -39,7 +39,7 @@ function process_manage_edit ($module_name) {
$agents = array_keys (get_group_agents (array_keys (get_user_groups ()), false, "none"));
/* List of fields which can be updated */
$fields = array ('min_warning', 'max_warning', 'min_critical', 'max_critical', 'ff_event');
$fields = array ('min_warning', 'max_warning', 'min_critical', 'max_critical', 'min_ff_event');
$values = array ();
foreach ($fields as $field) {
$value = get_parameter ($field);
@ -57,12 +57,18 @@ function process_manage_edit ($module_name) {
if ($modules === false)
return false;
foreach ($modules as $module) {
update_agent_module ($module['id_agente_modulo'], $values);
$result = update_agent_module ($module['id_agente_modulo'], $values);
if ($result === false) {
process_sql_rollback ();
return false;
}
}
echo '<h3 class="suc">'.__('Successfully updated').'</h3>';
process_sql_commit ();
return true;
}
$module_type = (int) get_parameter ('module_type');
@ -71,7 +77,12 @@ $module_name = (string) get_parameter ('module_name');
$update = (bool) get_parameter_post ('update');
if ($update) {
process_manage_edit ($module_name);
$result = process_manage_edit ($module_name);
print_result_message ($result,
__('Successfuly updated'),
__('Could not be updated'));
}
$table->id = 'delete_table';
@ -141,7 +152,7 @@ $table->data['edit1'][3] .= print_input_text ('max_critical', '', '', 5, 15, tru
/* FF stands for Flip-flop */
$table->data['edit2'][0] = __('FF threshold').' '.print_help_icon ('ff_threshold', true);
$table->data['edit2'][1] = print_input_text ('ff_event', '', '', 5, 15, true);
$table->data['edit2'][1] = print_input_text ('min_ff_event', '', '', 5, 15, true);
$table->data['edit2'][2] = __('Historical data');
$table->data['edit2'][3] = print_checkbox ("history_data", 1, '', true);

4
pandora_console/include/functions_modules.php
View File

@ -106,9 +106,9 @@ function delete_agent_module ($id_agent_module) {
* @return True if the module was updated. False if not.
*/
function update_agent_module ($id, $values) {
if (! is_array ($values))
if (! is_array ($values) || empty ($values))
return false;
if (! isset ($values['nombre']) && empty ($values['nombre']))
if (isset ($values['nombre']) && empty ($values['nombre']))
return false;
return (@process_sql_update ('tagente_modulo', $values,