diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 8036fab855..88437bfa33 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2013-07-16 Sergio Martin + + * godmode/agentes/agent_wizard.snmp_explorer.php + godmode/agentes/configurar_agente.php: Add missing + javascript to show snmp v3 options and other little + fixes and improvements + + * godmode/reporting/reporting_builder.list_items.php + godmode/reporting/reporting_builder.item_editor.php + godmode/netflow/nf_edit_form.php + godmode/netflow/nf_item_list.php: Deleted homedir from sec2 + in url links due old system of reuse code from metaconsole + 2013-07-16 Miguel de Dios * include/functions.php, diff --git a/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php b/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php index 989a7bede1..1edbc84709 100644 --- a/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php +++ b/pandora_console/godmode/agentes/agent_wizard.snmp_explorer.php @@ -663,7 +663,7 @@ if (!$fail) { $modes['processes'] = __('Processes'); $modes['disks'] = __('Free space on disk'); $modes['temperatures'] = __('Temperature sensors'); - $modes['snmpdata'] = __('SNMP data'); + $modes['snmpdata'] = __('Other SNMP data'); $table->data[1][0] = __('Wizard mode') . ': '; $table->data[1][0] .= html_print_select ($modes, @@ -762,10 +762,19 @@ ui_require_javascript_file ('pandora_modules'); var separator = ''; $(document).ready (function () { - $("#wmi_form").submit(function() { + $("#walk_form").submit(function() { $("#oid_loading").show (); }); + $("#snmp_version").change(function () { + if (this.value == "3") { + $("#snmp3_options").css("display", ""); + } + else { + $("#snmp3_options").css("display", "none"); + } + }); + network_component_group_change_event(); $('#network_component_group').trigger('change'); diff --git a/pandora_console/godmode/agentes/configurar_agente.php b/pandora_console/godmode/agentes/configurar_agente.php index 3b24baf3a3..89cb14d0b4 100644 --- a/pandora_console/godmode/agentes/configurar_agente.php +++ b/pandora_console/godmode/agentes/configurar_agente.php @@ -448,6 +448,19 @@ if ($id_agente) { case "incident": $tab_description = '- ' . __('Incidents'); break; + case "agent_wizard": + switch(get_parameter('wizard_section')) { + case 'snmp_explorer': + $tab_description = '- ' . __('SNMP Wizard'); + break; + case 'snmp_interfaces_explorer': + $tab_description = '- ' . __('SNMP Interfaces wizard'); + break; + case 'wmi_explorer': + $tab_description = '- ' . __('WMI Wizard'); + break; + } + break; case "extension": $id_extension = get_parameter('id_extension', ''); switch ($id_extension) { diff --git a/pandora_console/godmode/netflow/nf_edit_form.php b/pandora_console/godmode/netflow/nf_edit_form.php index 2e31bb64ae..cddc999ecb 100644 --- a/pandora_console/godmode/netflow/nf_edit_form.php +++ b/pandora_console/godmode/netflow/nf_edit_form.php @@ -60,8 +60,8 @@ if (! defined ('METACONSOLE')) { } else { $nav_bar = array(array('link' => 'index.php?sec=main', 'text' => __('Main')), - array('link' => 'index.php?sec=netf&sec2=' . $config['homedir'] . '/godmode/netflow/nf_edit', 'text' => __('Netflow filters')), - array('link' => 'index.php?sec=netf&sec2=' . $config['homedir'] . '/godmode/netflow/nf_edit_form', 'text' => __('Add filter'))); + array('link' => 'index.php?sec=netf&sec2=godmode/netflow/nf_edit', 'text' => __('Netflow filters')), + array('link' => 'index.php?sec=netf&sec2=godmode/netflow/nf_edit_form', 'text' => __('Add filter'))); ui_meta_print_page_header($nav_bar); @@ -217,7 +217,7 @@ $table->data[9][0] = ''.__('Output format').''; $show_output = array ('kilobytes' => __('Kilobytes'), 'megabytes' => __('Megabytes'), 'kilobytespersecond' => __('Kilobytes per second'), 'megabytespersecond' => __('Megabytes per second')); $table->data[9][1] = html_print_select ($show_output, 'output', $output, '', '', 0, true, false, true, '', false); -echo '
'; +echo ''; html_print_table ($table); echo '
'; if ($id) { diff --git a/pandora_console/godmode/netflow/nf_item_list.php b/pandora_console/godmode/netflow/nf_item_list.php index 32465b8a9c..76a97d4e4f 100644 --- a/pandora_console/godmode/netflow/nf_item_list.php +++ b/pandora_console/godmode/netflow/nf_item_list.php @@ -35,17 +35,17 @@ if (! check_acl ($config["id_user"], 0, "IW")) { $id = (int)get_parameter('id'); $buttons['report_list']['active'] = false; -$buttons['report_list'] = '' +$buttons['report_list'] = '' . html_print_image ("images/edit.png", true, array ("title" => __('Report list'))) . ''; $buttons['report_items']['active'] = true; -$buttons['report_items']['text'] = '' +$buttons['report_items']['text'] = '' . html_print_image ("images/god6.png", true, array ("title" => __('Report items'))) . ''; $buttons['edit_report']['active'] = false; -$buttons['edit_report']['text'] = '' +$buttons['edit_report']['text'] = '' . html_print_image ("images/config.png", true, array ("title" => __('Edit report'))) . ''; @@ -55,8 +55,8 @@ if (! defined ('METACONSOLE')) { } else { $nav_bar = array(array('link' => 'index.php?sec=main', 'text' => __('Main')), - array('link' => 'index.php?sec=netf&sec2=' . $config['homedir'] . '/operation/netflow/nf_reporting', 'text' => __('Netflow reports')), - array('link' => 'index.php?sec=netf&sec2=' . $config['homedir'] . '/godmode/netflow/nf_item_list&id=' . $id, 'text' => __('Item list'))); + array('link' => 'index.php?sec=netf&sec2=operation/netflow/nf_reporting', 'text' => __('Netflow reports')), + array('link' => 'index.php?sec=netf&sec2=godmode/netflow/nf_item_list&id=' . $id, 'text' => __('Item list'))); ui_meta_print_page_header($nav_bar); } @@ -200,18 +200,18 @@ foreach ($reports_item as $item) { } else if (($item['id_rc'] == $first_item) && ($item['id_rc'] != $last_item)){ $data[0] = ' '; - $data[0] .= '' . html_print_image("images/down.png", true, array("title" => __('Move to down'))) . ''; + $data[0] .= '' . html_print_image("images/down.png", true, array("title" => __('Move to down'))) . ''; } else if (($item['id_rc'] == $last_item) && ($item['id_rc'] != $first_item)){ - $data[0] = '' . html_print_image("images/up.png", true, array("title" => __('Move to up'))) . ''; + $data[0] = '' . html_print_image("images/up.png", true, array("title" => __('Move to up'))) . ''; } else { - $data[0] = '' . html_print_image("images/up.png", true, array("title" => __('Move to up'))) . ''; - $data[0] .= '' . html_print_image("images/down.png", true, array("title" => __('Move to down'))) . ''; + $data[0] = '' . html_print_image("images/up.png", true, array("title" => __('Move to up'))) . ''; + $data[0] .= '' . html_print_image("images/down.png", true, array("title" => __('Move to down'))) . ''; } $name_filter = db_get_value('id_name', 'tnetflow_filter', 'id_sg', $item['id_filter']); - $data[1] = ''.$name_filter.''; + $data[1] = ''.$name_filter.''; $data[2] = $item['description']; $data[3] = $item['max']; @@ -235,7 +235,7 @@ foreach ($reports_item as $item) { } $data[5] = "" . + href='" . $config['homeurl'] . "index.php?sec=netf&sec2=godmode/netflow/nf_item_list&delete=1&id_rc=".$item['id_rc']."&id=".$id."&offset=0'>" . html_print_image('images/cross.png', true, array('title' => __('Delete'))) . "" . html_print_checkbox_extended ('delete_multiple[]', $item['id_rc'], false, false, '', 'class="check_delete"', true); @@ -243,7 +243,7 @@ foreach ($reports_item as $item) { } if (isset($data)) { - echo ''; + echo ''; html_print_input_hidden('multiple_delete', 1); html_print_table ($table); echo "
"; @@ -255,7 +255,7 @@ else { echo "
".__('There are no defined items')."
"; } -echo ''; +echo ''; echo "
"; html_print_submit_button (__('Create item'), 'crt', false, 'class="sub wand"'); echo "
"; diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 52cddf3835..2debb11fe5 100644 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -450,7 +450,7 @@ switch ($action) { break; } -$urlForm = $config['homeurl'] . 'index.php?sec=reporting&sec2=' . $config['homedir'] . '/godmode/reporting/reporting_builder&tab=item_editor&action=' . $actionParameter . '&id_report=' . $idReport; +$urlForm = $config['homeurl'] . 'index.php?sec=reporting&sec2=godmode/reporting/reporting_builder&tab=item_editor&action=' . $actionParameter . '&id_report=' . $idReport; echo ''; html_print_input_hidden('id_item', $idItem); diff --git a/pandora_console/godmode/reporting/reporting_builder.list_items.php b/pandora_console/godmode/reporting/reporting_builder.list_items.php index 5ec404f993..fc0ca25ba0 100644 --- a/pandora_console/godmode/reporting/reporting_builder.list_items.php +++ b/pandora_console/godmode/reporting/reporting_builder.list_items.php @@ -157,7 +157,7 @@ $table->data[1][0] = __('Type'); $table->data[1][1] = html_print_select($types, 'type_filter', $typeFilter, '', __('All'), 0, true); echo '