From e10daef8400750d4f289e757fe98ec9bac84317b Mon Sep 17 00:00:00 2001 From: alexhigh Date: Tue, 3 Jun 2014 10:09:53 +0000 Subject: [PATCH] 2014-06-03 Alejandro Gallardo * include/functions_visual_map.php: Now the linked visual maps are opened as a popup. * include/functions_snmp.php: Added a best way to call the snmpwalk binary. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10090 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/include/functions_snmp.php | 18 ++++++++++++++++++ .../include/functions_visual_map.php | 7 +++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/functions_snmp.php b/pandora_console/include/functions_snmp.php index 440bc46aee..dc9141e7e9 100644 --- a/pandora_console/include/functions_snmp.php +++ b/pandora_console/include/functions_snmp.php @@ -25,6 +25,24 @@ * @param string Snmp especific OID. */ function snmp_generate_trap($snmp_host_address, $snmp_community, $snmp_oid, $snmp_agent, $snmp_data, $snmp_type) { + // Call snmptrap + if (empty($config['snmptrap'])) { + switch (PHP_OS) { + case "FreeBSD": + $snmpwalk_bin = '/usr/local/bin/snmptrap'; + break; + case "NetBSD": + $snmpwalk_bin = '/usr/pkg/bin/snmptrap'; + break; + default: + $snmpwalk_bin = 'snmptrap'; + break; + } + } + else { + $snmpwalk_bin = $config['snmptrap']; + } + $command = "snmptrap -v 1 -c " . escapeshellarg($snmp_community) . " " . escapeshellarg($snmp_host_address) . " " . escapeshellarg($snmp_oid) . " " . escapeshellarg($snmp_agent) . " " . escapeshellarg($snmp_type) . " " . escapeshellarg($snmp_data) . " 0 2>&1"; diff --git a/pandora_console/include/functions_visual_map.php b/pandora_console/include/functions_visual_map.php index dfa982a58e..71422ceff4 100644 --- a/pandora_console/include/functions_visual_map.php +++ b/pandora_console/include/functions_visual_map.php @@ -1283,13 +1283,12 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line elseif ($layout_data['id_layout_linked'] > 0) { // Link to a map if (empty($layout_data['id_metaconsole'])) { - echo ''; + $url_vc = $config['homeurl'] . "index.php?sec=reporting&sec2=operation/visual_console/render_view&pure=1&id=" . $layout_data["id_layout_linked"]; } else { - $pure = get_parameter('pure', 0); - echo ''; + $url_vc = "index.php?sec=screen&sec2=screens/screens&action=visualmap&pure=1&id_visualmap=" . $layout_data["id_layout_linked"] . "&refr=0"; } - + echo ""; } else { // A void object