tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-5386-9454-Graficas-en-tiempo-real-modulos-snmp-no-funcionan-con-caracteres-especiales-en-comunidad' into 'develop'

Browse Source 
fix broken snmp modules real time graphs when community string has certain chars

See merge request artica/pandorafms!3131
This commit is contained in:
Daniel Rodriguez 2020-06-26 13:28:04 +02:00
commit 1adcce21af
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/extensions/realtime_graphs.php
View File

@ -199,8 +199,8 @@ function pandora_realtime_graphs()
html_print_input_hidden('custom_action', urlencode(base64_encode('&nbsp;<a href="javascript:realtimeGraphs.setOID();"><img src="'.ui_get_full_url('images').'/input_filter.disabled.png" title="'.__('Use this OID').'" style="vertical-align: middle;"></img></a>')), false); html_print_input_hidden('custom_action', urlencode(base64_encode('&nbsp;<a href="javascript:realtimeGraphs.setOID();"><img src="'.ui_get_full_url('images').'/input_filter.disabled.png" title="'.__('Use this OID').'" style="vertical-align: middle;"></img></a>')), false);
html_print_input_hidden('incremental_base', '0'); html_print_input_hidden('incremental_base', '0');
echo '<script type="text/javascript" src="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.js').'"></script>';
echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/pandora_snmp_browser.js').'"></script>'; echo '<script type="text/javascript" src="'.ui_get_full_url('include/javascript/pandora_snmp_browser.js').'"></script>';
echo '<script type="text/javascript" src="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.js').'"></script>';
echo '<link rel="stylesheet" type="text/css" href="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.css').'"></style>'; echo '<link rel="stylesheet" type="text/css" href="'.ui_get_full_url('extensions/realtime_graphs/realtime_graphs.css').'"></style>';
// Store servers timezone offset to be retrieved from js // Store servers timezone offset to be retrieved from js

2
pandora_console/include/functions_modules.php
View File

@ -3436,7 +3436,7 @@ function get_module_realtime_link_graph($module)
'agent_alias' => urlencode(modules_get_agentmodule_agent_alias($module['id_agente_modulo'])), 'agent_alias' => urlencode(modules_get_agentmodule_agent_alias($module['id_agente_modulo'])),
'module_name' => urlencode($module['nombre']), 'module_name' => urlencode($module['nombre']),
'snmp_address' => $module['ip_target'], 'snmp_address' => $module['ip_target'],
'snmp_community' => $module['snmp_community'], 'snmp_community' => urlencode($module['snmp_community']),
'snmp_oid' => $module['snmp_oid'], 'snmp_oid' => $module['snmp_oid'],
'snmp_ver' => $module['tcp_send'], 'snmp_ver' => $module['tcp_send'],
'hide_header' => 1, 'hide_header' => 1,