tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

2010-06-19 Raul Mateos <raulofpandora@gmail.com>

Browse Source 
* 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
This commit is contained in:
raulmateos 2010-06-19 09:52:12 +00:00
parent ee3c3a6992
commit f2fbcbc7d2
3 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2010-06-19 Raúl Mateos <raulofpandora@gmail.com>
* 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 <sergio.martin@artica.es> 2010-06-18 Sergio Martin <sergio.martin@artica.es>
* godmode/users/user_list.php: Fixed the bug of * godmode/users/user_list.php: Fixed the bug of
@ -20,7 +28,7 @@
* godmode/reporting/map_builder.php: Fixed the ACL * godmode/reporting/map_builder.php: Fixed the ACL
permissions for bug: 3017262 permissions for bug: 3017262
2010-06-10 Sergio Martin <sergio.martin@artica.es> 2010-06-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_reporting.php: Fixed the colspan * include/functions_reporting.php: Fixed the colspan
into the Custom Graph report item for bug: 3013859 into the Custom Graph report item for bug: 3013859

4
pandora_console/include/functions_networkmap.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com // 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 // Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or // 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.'>, $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; return $node;
} }

11
pandora_console/operation/agentes/networkmap.php
View File

@ -2,7 +2,7 @@
// Pandora FMS - http://pandorafms.com // 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 // Please see http://pandorafms.org for full contribution list
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
@ -170,8 +170,9 @@ if ($result !== false) {
if (! file_exists ($filename_map)) { if (! file_exists ($filename_map)) {
print_error_message (__('Map could not be generated')); print_error_message (__('Map could not be generated'));
echo $result; echo $result;
echo "<br /> Apparently something went wrong reading the output.<br />"; echo "<div class='warn'>Apparently something went wrong reading the output.</div>";
echo "<br /> Is ".$config["attachment_store"]." readable by the webserver process?"; echo "<br />Is ".$config["attachment_store"]." readable by the webserver process?";
echo "<br /><br /> Is ".$filter." (usually part of GraphViz) and echo installed and able to be executed by the webserver process?";
return; return;
} }
print_image ($filename_img, false, array ("alt" => __('Network map'), "usemap" => "#networkmap")); print_image ($filename_img, false, array ("alt" => __('Network map'), "usemap" => "#networkmap"));
@ -179,8 +180,8 @@ if ($result !== false) {
} else { } else {
print_error_message (__('Map could not be generated')); print_error_message (__('Map could not be generated'));
echo $result; echo $result;
echo "<br /> Apparently something went wrong executing the command or writing the output."; echo "<div class='warn'>Apparently something went wrong executing the command or writing the output.</div>";
echo "<br /><br /> Is ".$filter." (usually part of GraphViz) and echo installed and able to be executed by the webserver process?"; echo "<br />Is ".$filter." (usually part of GraphViz) and echo installed and able to be executed by the webserver process?";
echo "<br /><br /> Is your webserver restricted from executing command line tools through the <code>system()</code> call (PHP Safe Mode or SELinux)"; echo "<br /><br /> Is your webserver restricted from executing command line tools through the <code>system()</code> call (PHP Safe Mode or SELinux)";
echo "<br /><br /> Is ".$config["attachment_store"]." writeable by the webserver process? To change this do the following (POSIX-based systems): chown &lt;apache user&gt; ".$config["attachment_store"]; echo "<br /><br /> Is ".$config["attachment_store"]." writeable by the webserver process? To change this do the following (POSIX-based systems): chown &lt;apache user&gt; ".$config["attachment_store"];
return; return;