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

2013-08-23 Miguel de Dios <miguel.dedios@artica.es> 

* 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
This commit is contained in:
mdtrooper 2013-08-23 06:24:42 +00:00
parent bd5d827ba9
commit b6e9cc8057
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-08-23 Miguel de Dios <miguel.dedios@artica.es>
* 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 <miguel.dedios@artica.es> 2013-08-20 Miguel de Dios <miguel.dedios@artica.es>
* godmode/servers/servers.build_table.php, include/functions_db.php, * godmode/servers/servers.build_table.php, include/functions_db.php,

2
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -480,7 +480,7 @@ if ($agents !== false) {
// Has remote configuration ? // Has remote configuration ?
if (enterprise_installed()) { if (enterprise_installed()) {
enterprise_include_once('include/functions_config_agents.php'); 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 "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>"; echo "<a href='index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&tab=main&id_agente=".$agent["id_agente"]."&disk_conf=1'>";
echo html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config'))); echo html_print_image("images/application_edit.png", true, array("align" => 'middle', "title" => __('Edit remote config')));
echo "</a>"; echo "</a>";

2
pandora_console/include/functions_api.php
View File

@ -4079,7 +4079,7 @@ function api_get_graph_module_data($id, $thrash1, $other, $thrash2) {
$date, '', 0, 0,true, $date, '', 0, 0,true,
false, $homeurl, $ttl); 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); preg_match("/src='([^']*)'/i",$image, $match);
if (empty($match[1])) { if (empty($match[1])) {

3
pandora_console/include/functions_snmp_browser.php
View File

@ -505,6 +505,9 @@ function snmp_browser_print_container ($return = false, $width = '95%', $height
$output .= '<div style="width: 100%">'; $output .= '<div style="width: 100%">';
$output .= html_print_table($table, true); $output .= html_print_table($table, true);
$output .= '</div>'; $output .= '</div>';
if (!isset($snmp_version)) {
$snmp_version = null;
}
if ($snmp_version == 3) { if ($snmp_version == 3) {
$output .= '<div id="snmp3_browser_options">'; $output .= '<div id="snmp3_browser_options">';
} }