diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9f521711bb..7d1260b432 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2008-07-17 Esteban Sanchez + + * 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 * include/functions.php: Minimal style correction. diff --git a/pandora_console/include/functions_db.php b/pandora_console/include/functions_db.php index 5854869c86..8455de1518 100644 --- a/pandora_console/include/functions_db.php +++ b/pandora_console/include/functions_db.php @@ -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 (); } diff --git a/pandora_console/operation/agentes/networkmap.php b/pandora_console/operation/agentes/networkmap.php index 0749895987..159b71f7f5 100644 --- a/pandora_console/operation/agentes/networkmap.php +++ b/pandora_console/operation/agentes/networkmap.php @@ -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 "
Apparently something went wrong reading the output.
Is ".$filter." (usually part of GraphViz) installed and able to be executed by the webserver?"; echo "
Is ".$config["attachment_store"]." writeable by the webserver?"; - return; + return; } echo ''; include $filename_map;