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

2014-03-19 Miguel de Dios <miguel.dedios@artica.es> 

* operation/snmpconsole/snmp_view.php,
	include/functions_ui.php: fixed the view in fullscreen.
	
	Incident: #675




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9615 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-03-19 11:21:11 +00:00
parent ce6628c3f7
commit 3f8daab6f3
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2014-03-19 Miguel de Dios <miguel.dedios@artica.es>
* operation/snmpconsole/snmp_view.php,
include/functions_ui.php: fixed the view in fullscreen.
Incident: #675
2014-03-18 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.oracle.sql

9
pandora_console/include/functions_ui.php
View File

@ -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 .= '<meta http-equiv="refresh" content="' .

29
pandora_console/operation/snmpconsole/snmp_view.php
View File

@ -41,7 +41,8 @@ $free_search_string = (string) get_parameter ("free_search_string", '');
$pagination = (int) get_parameter ("pagination", $config["block_size"]);
$offset = (int) get_parameter ('offset',0);
$trap_type = (int) get_parameter ('trap_type', -1);
$group_by = (int) get_parameter('group_by', 0);
$group_by = (int)get_parameter('group_by', 0);
$refr = (int)get_parameter("refr", 0);
$user_groups = users_get_groups ($config['id_user'],"AR", false);
$str_user_groups = '';
@ -55,19 +56,31 @@ foreach ($user_groups as $id=>$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'] = '<a target="_top" href="'.$url.'&pure=0&refr=30">' . html_print_image("images/normal_screen.png", true, array("title" => __('Normal screen'))) . '</a>';
$link['text'] = '<a target="_top" href="'.$url.'&pure=0&refr=' . $refr . '">' . html_print_image("images/normal_screen.png", true, array("title" => __('Normal screen'))) . '</a>';
}
else {
// Fullscreen
$link['text'] = '<a target="_top" href="'.$url.'&pure=1&refr=0">' . html_print_image("images/full_screen.png", true, array("title" => __('Full screen'))) . '</a>';
$link['text'] = '<a target="_top" href="'.$url.'&pure=1&refr=' . $refr . '">' . html_print_image("images/full_screen.png", true, array("title" => __('Full screen'))) . '</a>';
}
// 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] = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente='.$agent["id_agente"].'" title="'.__('View agent details').'">';
$data[1] .= '<strong>'.$agent["nombre"].'</strong></a>';
}
//OID
$table->cellclass[$idx][2] = get_priority_class ($severity);
$data[2] = '<a href="javascript: toggleVisibleExtendedInfo(' . $trap["id_trap"] . ');">' . (empty($trap["oid"]) ? __('N/A') : $trap["oid"]) .'</a>';
@ -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 .= '<tr><td align="left" valign="top">' . '<b>' . __('Type:') . '</td><td align="left">' . $desc_trap_type . '</td></tr>';
}
if ($group_by) {
$sql = "SELECT * FROM ttrap WHERE 1=1
$where_without_group