diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 968e38a153..3e08dd0aec 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2014-03-19 Miguel de Dios + + * operation/snmpconsole/snmp_view.php, + include/functions_ui.php: fixed the view in fullscreen. + + Incident: #675 + 2014-03-18 Vanessa Gil * pandoradb.oracle.sql diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php index 972b9a86d1..163a9e54e7 100644 --- a/pandora_console/include/functions_ui.php +++ b/pandora_console/include/functions_ui.php @@ -1206,11 +1206,12 @@ function ui_process_page_head ($string, $bitfield) { (isset($config['id_user']) || $vc_public_view == 1)) { if ($config['enable_refr'] || - $_GET['sec2'] == "operation/agentes/estado_agente" || - $_GET['sec2'] == "operation/agentes/tactical"|| - $_GET['sec2'] == "operation/agentes/group_view" || + $_GET['sec2'] == 'operation/agentes/estado_agente' || + $_GET['sec2'] == 'operation/agentes/tactical' || + $_GET['sec2'] == 'operation/agentes/group_view' || $_GET['sec2'] == 'operation/events/events' || - $_GET['sec2'] == "enterprise/dashboard/main_dashboard") { + $_GET['sec2'] == 'operation/snmpconsole/snmp_view' || + $_GET['sec2'] == 'enterprise/dashboard/main_dashboard') { $query = ui_get_url_refresh (false); $output .= '$name) { $i++; } -$url = "index.php?sec=estado&sec2=operation/snmpconsole/snmp_view&filter_agent=".$filter_agent."&filter_oid=".$filter_oid."&filter_severity=".$filter_severity."&filter_fired=".$filter_fired."&search_string=".$search_string."&free_search_string=".$free_search_string."&pagination=".$pagination."&offset=".$offset . "&trap_type=" . $trap_type ."&group_by=" .$group_by; +$url = "index.php?sec=estado&" . + "sec2=operation/snmpconsole/snmp_view&" . + "filter_agent=" . $filter_agent . "&" . + "filter_oid=" . $filter_oid . "&" . + "filter_severity=" . $filter_severity . "&" . + "filter_fired=" . $filter_fired . "&" . + "search_string=" . $search_string . "&" . + "free_search_string=" . $free_search_string . "&" . + "pagination=" . $pagination . "&" . + "offset=" . $offset . "&" . + "trap_type=" . $trap_type . "&" . + "group_by=" .$group_by; if ($config["pure"]) { - $link['text'] = '' . html_print_image("images/normal_screen.png", true, array("title" => __('Normal screen'))) . ''; + $link['text'] = '' . html_print_image("images/normal_screen.png", true, array("title" => __('Normal screen'))) . ''; } else { // Fullscreen - $link['text'] = '' . html_print_image("images/full_screen.png", true, array("title" => __('Full screen'))) . ''; + $link['text'] = '' . html_print_image("images/full_screen.png", true, array("title" => __('Full screen'))) . ''; } // Header -ui_print_page_header (__("SNMP Console"), "images/op_snmp.png", false, "", false, array($link)); +ui_print_page_header(__("SNMP Console"), "images/op_snmp.png", false, + "", false, array($link)); // OPERATIONS @@ -561,7 +574,7 @@ if ($traps !== false) { $data[1] = ''; $data[1] .= ''.$agent["nombre"].''; } - + //OID $table->cellclass[$idx][2] = get_priority_class ($severity); $data[2] = '' . (empty($trap["oid"]) ? __('N/A') : $trap["oid"]) .''; @@ -623,7 +636,7 @@ if ($traps !== false) { $data[8] = html_print_checkbox_extended ("snmptrapid[]", $trap["id_trap"], false, false, '', 'class="chk"', true); - + array_push ($table->data, $data); //Hiden file for description @@ -680,7 +693,7 @@ if ($traps !== false) { } $string .= '' . '' . __('Type:') . '' . $desc_trap_type . ''; } - + if ($group_by) { $sql = "SELECT * FROM ttrap WHERE 1=1 $where_without_group