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

2008-07-17 Esteban Sanchez <estebans@artica.es> 

* include/functions_db.php: Removed debug output to check use of
        deprecated function. Please don't add message like this since there
        are many people who use Pandora trunk and may find strange messages
        like that.

        * operation/agentes/networkmap.php: Removed warning message if file 
        doesn't exists on checking cache system.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@957 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
esanchezm 2008-07-17 06:51:22 +00:00
parent 899619e246
commit 83de4fabcc
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2008-07-17 Esteban Sanchez <estebans@artica.es>
* include/functions_db.php: Removed debug output to check use of
deprecated function. Please don't add message like this since there
are many people who use Pandora trunk and may find strange messages
like that.
* operation/agentes/networkmap.php: Removed warning message if file
doesn't exists on checking cache system.
2008-07-17 Esteban Sanchez <estebans@artica.es>
* include/functions.php: Minimal style correction.

3
pandora_console/include/functions_db.php
View File

@ -844,8 +844,7 @@ function dame_admin ($id_user) {
/**
* WARNING: This is a deprectad function and must not be used
*/
function comprueba_login() {
echo "DEBUG:: Still using comprueba_login eh...";
function comprueba_login() {
return check_login ();
}

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

@ -340,7 +340,7 @@ if($nooverlap) {
$filename_map .= ".map";
$filename_img .= ".png";
if($regen != 1 && filemtime($filename_img) > time() - 300) {
if ($regen != 1 && file_exists ($filename_img) && filemtime ($filename_img) > time () - 300) {
$result = true;
} else {
$cmd = "echo " . escapeshellarg($graph) . " | $filter -Tcmapx -o".$filename_map." -Tpng -o".$filename_img;
@ -353,7 +353,7 @@ if ($result !== false) {
echo $result;
echo "<br /> Apparently something went wrong reading the output.<br /> Is ".$filter." (usually part of GraphViz) installed and able to be executed by the webserver?";
echo "<br /> Is ".$config["attachment_store"]." writeable by the webserver?";
return;
return;
}
echo '<img src="'.$filename_img.'" usemap="#networkmap" />';
include $filename_map;