Pman.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index 128bd78..fd0f032 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -103,7 +103,9 @@ class Pman extends HTML_FlexyFramework_Page
         $this->version = $boot->version; 
         $this->uiConfig = empty($boot->Pman['uiConfig']) ? false : $boot->Pman['uiConfig']; 
         
-        if (!empty($boot->Pman['local_autoauth']) && 
+        if (!empty($boot->Pman['local_autoauth']) &&
+            !empty($_SERVER['SERVER_ADDR']) &&
+            !empty($_SERVER['REMOTE_ADDR']) &&            
             ($_SERVER['SERVER_ADDR'] == '127.0.0.1') &&
             ($_SERVER['REMOTE_ADDR'] == '127.0.0.1') 
         ) {
@@ -462,6 +464,11 @@ class Pman extends HTML_FlexyFramework_Page
             $this->transObj->query('ROLLBACK');
         }
         
+        $cli = HTML_FlexyFramework::get()->cli;
+        if ($cli) {
+            echo "ERROR: " .$str . "\n"; // print the error first, as DB might fail..
+        }
+        
         if ($type !== false) {
             
             if(!empty($errors)){
@@ -474,7 +481,6 @@ class Pman extends HTML_FlexyFramework_Page
          
         $cli = HTML_FlexyFramework::get()->cli;
         if ($cli) {
-            echo "ERROR: " .$str . "\n";
             exit(1); // cli --- exit code to stop shell execution if necessary.
         }