From 3bdd4849813d955d461aafb5586715c0821252a4 Mon Sep 17 00:00:00 2001 From: raulmateos Date: Sat, 19 Jun 2010 09:52:12 +0000 Subject: [PATCH] 2010-06-19 Raul Mateos * operation/agentes/networkmap.php: Added text if twopi binary not found. * include/functions/functions_networkmap.php: Fixed url to group_view. Solves bug 3013775. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2916 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 +++++++- .../include/functions_networkmap.php | 4 ++-- .../operation/agentes/networkmap.php | 23 ++++++++++--------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 502f49d86c..9811b69778 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2010-06-19 Raúl Mateos + + * operation/agentes/networkmap.php: Added text if twopi binary not + found. + + * include/functions/functions_networkmap.php: Fixed url to group_view. + Solves bug 3013775. + 2010-06-18 Sergio Martin * godmode/users/user_list.php: Fixed the bug of @@ -20,7 +28,7 @@ * godmode/reporting/map_builder.php: Fixed the ACL permissions for bug: 3017262 -2010-06-10 Sergio Martin +2010-06-14 Sergio Martin * include/functions_reporting.php: Fixed the colspan into the Custom Graph report item for bug: 3013859 diff --git a/pandora_console/include/functions_networkmap.php b/pandora_console/include/functions_networkmap.php index 2973558638..8cdc9c52e6 100644 --- a/pandora_console/include/functions_networkmap.php +++ b/pandora_console/include/functions_networkmap.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -192,7 +192,7 @@ function create_pandora_node ($name, $font_size = 10, $simple = 0) { } $node = '0 [ color="#364D1F", fontsize='.$font_size.', style="filled", fixedsize=true, width=0.8, height=0.6, label=<'.$label.'>, - shape="ellipse", URL="index.php?sec=estado&sec2=operation/agentes/estado_grupo" ];'; + shape="ellipse", URL="index.php?sec=estado&sec2=operation/agentes/group_view" ];'; return $node; } diff --git a/pandora_console/operation/agentes/networkmap.php b/pandora_console/operation/agentes/networkmap.php index aac0ff6a52..953c0b3839 100644 --- a/pandora_console/operation/agentes/networkmap.php +++ b/pandora_console/operation/agentes/networkmap.php @@ -2,7 +2,7 @@ // Pandora FMS - http://pandorafms.com // ================================================== -// Copyright (c) 2005-2009 Artica Soluciones Tecnologicas +// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas // Please see http://pandorafms.org for full contribution list // This program is free software; you can redistribute it and/or @@ -66,22 +66,22 @@ $layout_array = array ( echo '
'; echo ''; echo ''; -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; @@ -114,7 +114,7 @@ echo __('Font') . '
'; print_input_text ('font_size', $font_size, $alt = 'Font size (in pt)', 2, 4, 0); echo ""; -//echo ' Display groups '; +//echo ' Display groups '; echo ''; @@ -170,8 +170,9 @@ if ($result !== false) { if (! file_exists ($filename_map)) { print_error_message (__('Map could not be generated')); echo $result; - echo "
Apparently something went wrong reading the output.
"; - echo "
Is ".$config["attachment_store"]." readable by the webserver process?"; + echo "
Apparently something went wrong reading the output.
"; + echo "
Is ".$config["attachment_store"]." readable by the webserver process?"; + echo "

Is ".$filter." (usually part of GraphViz) and echo installed and able to be executed by the webserver process?"; return; } print_image ($filename_img, false, array ("alt" => __('Network map'), "usemap" => "#networkmap")); @@ -179,8 +180,8 @@ if ($result !== false) { } else { print_error_message (__('Map could not be generated')); echo $result; - echo "
Apparently something went wrong executing the command or writing the output."; - echo "

Is ".$filter." (usually part of GraphViz) and echo installed and able to be executed by the webserver process?"; + echo "
Apparently something went wrong executing the command or writing the output.
"; + echo "
Is ".$filter." (usually part of GraphViz) and echo installed and able to be executed by the webserver process?"; echo "

Is your webserver restricted from executing command line tools through the system() call (PHP Safe Mode or SELinux)"; echo "

Is ".$config["attachment_store"]." writeable by the webserver process? To change this do the following (POSIX-based systems): chown <apache user> ".$config["attachment_store"]; return;
' . __('Group') . '
'; +echo '		' . __('Group') . '
'; print_select_from_sql ('SELECT id_grupo, nombre FROM tgrupo WHERE id_grupo > 0 ORDER BY nombre', 'group', $group, '', 'All', 0, false); echo '		' . __('Layout') . '
'; +echo '		' . __('Layout') . '
'; print_select ($layout_array, 'layout', $layout, '', '', ''); echo '		' . __('No Overlap') . '
'; +echo '		' . __('No Overlap') . '
'; print_checkbox ('nooverlap', '1', $nooverlap); echo '		' . __('Simple') . '
'; +echo '		' . __('Simple') . '
'; print_checkbox ('simple', '1', $simple); echo '		' . __('Regenerate') . '
'; +echo '		' . __('Regenerate') . '
'; print_checkbox ('regen', '1', $regen); echo '		'; print_submit_button (__('Update'), "updbutton", false, 'class="sub upd"'); echo '