From b6e9cc80571a79d443d962e5bb8c5fbe0e6e0804 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Fri, 23 Aug 2013 06:24:42 +0000 Subject: [PATCH] 2013-08-23 Miguel de Dios * godmode/agentes/modificar_agente.php, include/functions_snmp_browser.php, include/functions_api.php: fixed PHP warnings and PHP notices. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8690 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 ++++++ pandora_console/godmode/agentes/modificar_agente.php | 2 +- pandora_console/include/functions_api.php | 2 +- pandora_console/include/functions_snmp_browser.php | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 27182ba2c7..1505a4a537 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2013-08-23 Miguel de Dios + + * godmode/agentes/modificar_agente.php, + include/functions_snmp_browser.php, include/functions_api.php: fixed + PHP warnings and PHP notices. + 2013-08-20 Miguel de Dios * godmode/servers/servers.build_table.php, include/functions_db.php, diff --git a/pandora_console/godmode/agentes/modificar_agente.php b/pandora_console/godmode/agentes/modificar_agente.php index cd7f71f142..355e5b84d3 100644 --- a/pandora_console/godmode/agentes/modificar_agente.php +++ b/pandora_console/godmode/agentes/modificar_agente.php @@ -480,7 +480,7 @@ if ($agents !== false) { // Has remote configuration ? if (enterprise_installed()) { enterprise_include_once('include/functions_config_agents.php'); - if (enterprise_hook('config_agents_has_remote_configuration', $agent["id_agente"])) { + if (config_agents_has_remote_configuration($agent["id_agente"])) { echo ""; echo html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config'))); echo ""; diff --git a/pandora_console/include/functions_api.php b/pandora_console/include/functions_api.php index a6e4197c9a..86fcd2b03d 100644 --- a/pandora_console/include/functions_api.php +++ b/pandora_console/include/functions_api.php @@ -4079,7 +4079,7 @@ function api_get_graph_module_data($id, $thrash1, $other, $thrash2) { $date, '', 0, 0,true, false, $homeurl, $ttl); - // Extract url of the image from img tag + // Extract url of the image from img tag preg_match("/src='([^']*)'/i",$image, $match); if (empty($match[1])) { diff --git a/pandora_console/include/functions_snmp_browser.php b/pandora_console/include/functions_snmp_browser.php index 402b90742e..9db6cc6253 100644 --- a/pandora_console/include/functions_snmp_browser.php +++ b/pandora_console/include/functions_snmp_browser.php @@ -505,6 +505,9 @@ function snmp_browser_print_container ($return = false, $width = '95%', $height $output .= '
'; $output .= html_print_table($table, true); $output .= '
'; + if (!isset($snmp_version)) { + $snmp_version = null; + } if ($snmp_version == 3) { $output .= '
'; }