From 74facd9b6cdbbda60345f644576cac8e8a3d7e3f Mon Sep 17 00:00:00 2001 From: darode Date: Mon, 23 Apr 2012 07:56:23 +0000 Subject: [PATCH] 2012-04-23 Dario Rodriguez *extensions/snmp_explorer.php, operation/agentes/estado_monitores.php, operation/agentes/ver_agente.php, operation/snmpconsole/snmp_view.php, operation/gis_maps/render_view.php, godmode/agentes/fields_manager.php, godmode/agentes/configure_field.php, godmode/agentes/planned_downtime.php: Fixed a problem with agent sec param changed from gagente to estado in order to display new menus properly MERGED FROM 4.0.2 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6080 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 14 ++++++++++++++ pandora_console/extensions/snmp_explorer.php | 4 ++-- .../godmode/agentes/configure_field.php | 2 +- .../godmode/agentes/fields_manager.php | 6 +++--- .../godmode/agentes/planned_downtime.php | 16 ++++++++-------- .../operation/agentes/estado_monitores.php | 2 +- pandora_console/operation/agentes/ver_agente.php | 2 +- .../operation/gis_maps/render_view.php | 2 +- .../operation/snmpconsole/snmp_view.php | 2 +- 9 files changed, 32 insertions(+), 18 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 45e12e24fe..f1733e27a4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2012-04-23 Dario Rodriguez + + *extensions/snmp_explorer.php, + operation/agentes/estado_monitores.php, + operation/agentes/ver_agente.php, + operation/snmpconsole/snmp_view.php, + operation/gis_maps/render_view.php, + godmode/agentes/fields_manager.php, + godmode/agentes/configure_field.php, + godmode/agentes/planned_downtime.php: Fixed a problem with agent sec + param changed from gagente to estado in order to display new menus properly + + MERGED FROM 4.0.2 + 2012-04-21 Junichi Satoh * include/functions_config.php: Fixed SQL error with PostgreSQL. diff --git a/pandora_console/extensions/snmp_explorer.php b/pandora_console/extensions/snmp_explorer.php index eed59ec33e..f1d51de02e 100755 --- a/pandora_console/extensions/snmp_explorer.php +++ b/pandora_console/extensions/snmp_explorer.php @@ -270,7 +270,7 @@ function snmp_explorer() { } echo ''; - echo "
"; + echo ""; $table->width = '98%'; @@ -351,7 +351,7 @@ function snmp_explorer() { if(!empty($interfaces_list)){ echo ''; echo ''; - echo ""; + echo ""; $id_snmp_serialize = serialize_in_temp($interfaces, $config['id_user']."_snmp"); html_print_input_hidden('id_snmp_serialize', $id_snmp_serialize); diff --git a/pandora_console/godmode/agentes/configure_field.php b/pandora_console/godmode/agentes/configure_field.php index 154c1c6e0f..c37143c69e 100755 --- a/pandora_console/godmode/agentes/configure_field.php +++ b/pandora_console/godmode/agentes/configure_field.php @@ -46,7 +46,7 @@ $table->data[0][1] = html_print_input_text ('name', $name, '', 35, 100, true); $table->data[1][0] = __('Display on front').ui_print_help_tip (__('The fields with display on front enabled will be displayed into the agent details'), true); $table->data[1][1] = html_print_checkbox ('display_on_front', 1, $display_on_front, true); -echo ''; +echo ''; html_print_table ($table); echo '
'; diff --git a/pandora_console/godmode/agentes/fields_manager.php b/pandora_console/godmode/agentes/fields_manager.php index fd7c984188..001d0a0029 100644 --- a/pandora_console/godmode/agentes/fields_manager.php +++ b/pandora_console/godmode/agentes/fields_manager.php @@ -110,8 +110,8 @@ foreach ($fields as $field) { $data[1] = html_print_image('images/delete.png', true); } - $data[2] = '' . html_print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0')) . ''; - $data[2] .= '  ' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "title" => __('Delete'), "border" => '0')) . ''; + $data[2] = '' . html_print_image("images/config.png", true, array("alt" => __('Edit'), "title" => __('Edit'), "border" => '0')) . ''; + $data[2] .= '  ' . html_print_image("images/cross.png", true, array("alt" => __('Delete'), "title" => __('Delete'), "border" => '0')) . ''; array_push ($table->data, $data); } @@ -119,7 +119,7 @@ foreach ($fields as $field) { if($fields) html_print_table ($table); -echo ''; +echo ''; echo '
'; html_print_submit_button (__('Create field'), 'crt', false, 'class="sub next"'); echo '
'; diff --git a/pandora_console/godmode/agentes/planned_downtime.php b/pandora_console/godmode/agentes/planned_downtime.php index 8e3cc86007..bf3d00e765 100644 --- a/pandora_console/godmode/agentes/planned_downtime.php +++ b/pandora_console/godmode/agentes/planned_downtime.php @@ -246,7 +246,7 @@ if ($create_downtime || $update_downtime) { $table->data[5][1] = html_print_select_groups(false, "AR", true, 'id_group', $id_group, '', '', 0, true); $table->data[6][0] = __('Only alerts'); $table->data[6][1] = html_print_checkbox('only_alerts', 1, $only_alerts, true); - echo ''; + echo ''; if ($id_downtime > 0){ echo ""; @@ -305,7 +305,7 @@ if ($create_downtime || $update_downtime) { $disabled_add_button = true; } - echo ""; + echo ""; html_print_select_groups(false, "AR", true, 'filter_group', $filter_group, '', '', '', false, false, true, '', false, 'width:180px'); @@ -313,7 +313,7 @@ if ($create_downtime || $update_downtime) { html_print_submit_button (__('Filter by group'), '', false, 'class="sub next"',false); echo ""; - echo ""; + echo ""; echo html_print_select ($data, "id_agent[]", '', '', '', 0, false, true, true, '', false, 'width: 180px;'); echo "


"; @@ -359,7 +359,7 @@ if ($create_downtime || $update_downtime) { $data[3] = $downtime["ultimo_contacto"]; - $data[4] = '' . html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))); @@ -422,10 +422,10 @@ else { $data[5] = __('All'); } if ($downtime["executed"] == 0){ - $data[6] = '' . html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))); - $data[7] = '' . + $data[7] = '' . html_print_image("images/config.png", true, array("border" => '0', "alt" => __('Update'))) . ''; } else { @@ -439,7 +439,7 @@ else { $data[8] = html_print_image ("images/pixel_red.png", true, array ('width' => 20, 'height' => 20, 'alt' => __('Not executed'))); if ($downtime["executed"] != 0) { - $data[9] = '' . + $data[9] = '' . html_print_image("images/cancel.png", true, array("border" => '0', "alt" => __('Stop downtime'))); } @@ -449,7 +449,7 @@ else { } echo '
'; - echo ''; + echo ''; html_print_input_hidden ("first_create", 1); html_print_submit_button (__('Create'), 'create', false, 'class="sub next"'); echo ''; diff --git a/pandora_console/operation/agentes/estado_monitores.php b/pandora_console/operation/agentes/estado_monitores.php index 5fda27b484..d63ab4293f 100644 --- a/pandora_console/operation/agentes/estado_monitores.php +++ b/pandora_console/operation/agentes/estado_monitores.php @@ -313,7 +313,7 @@ foreach ($modules as $module) { $data[2] = servers_show_type ($module['id_modulo']) . ' '; if (check_acl ($config['id_user'], $id_grupo, "AW")) - $data[2] .= '' . html_print_image("images/config.png", true, array("alt" => '0', "border" => "")) . ''; + $data[2] .= '' . html_print_image("images/config.png", true, array("alt" => '0', "border" => "")) . ''; $data[3] = ui_print_string_substr ($module["nombre"], 30, true); if (!empty($module["extended_info"])) { diff --git a/pandora_console/operation/agentes/ver_agente.php b/pandora_console/operation/agentes/ver_agente.php index 57badb9dfe..824ef4d0d6 100644 --- a/pandora_console/operation/agentes/ver_agente.php +++ b/pandora_console/operation/agentes/ver_agente.php @@ -515,7 +515,7 @@ $tab = get_parameter ("tab", "main"); $managetab = ""; if (check_acl ($config['id_user'],$id_grupo, "AW") || $is_extra) { - $managetab['text'] ='' + $managetab['text'] ='' . html_print_image("images/setup.png", true, array ("title" => __('Manage'))) . ''; diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php index a8fbfcc531..4609bc2eb0 100644 --- a/pandora_console/operation/gis_maps/render_view.php +++ b/pandora_console/operation/gis_maps/render_view.php @@ -98,7 +98,7 @@ else { if (check_acl ($config["id_user"], $map['group_id'], "IW")) $buttons [] = ''.html_print_image ("images/setup.png", true, array ("title" => __('Setup'))).''; -$buttonsString = '' . html_print_image("images/bricks.png", true, array("class" => "top", "border" => '0')) . '  Agent - test_gis1