if _error() is invoked from cmd-line, it should not display html-errors
authorAndreas Unterkircher <unki@netshadow.at>
Mon, 29 Dec 2008 20:58:40 +0000 (21:58 +0100)
committerAndreas Unterkircher <unki@netshadow.at>
Mon, 29 Dec 2008 20:58:40 +0000 (21:58 +0100)
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
phpfspot.class.php

index 4acb647..f3f78a7 100644 (file)
@@ -2061,7 +2061,7 @@ class PHPFSPOT {
          $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
 
          if(!file_exists($full_path)) {
-            $this->_error("File ". $full_path ." does not exist\n");
+            $this->_error("File ". $full_path ." does not exist");
             return;
          }
 
@@ -2578,8 +2578,12 @@ class PHPFSPOT {
       switch($this->cfg->logging) {
          default:
          case 'display':
-            print "<img src=\"resources/green_info.png\" alt=\"warning\" />\n";
-            print $text ."<br />\n";
+            if(isset($this->fromcmd))
+               print $text ."\n";
+            else {
+               print "<img src=\"resources/green_info.png\" alt=\"warning\" />\n";
+               print $text ."<br />\n";
+            }
             break;
          case 'errorlog':  
             error_log($text);