Pman/Login.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index 8cc13fc..77683de 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -462,6 +462,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 +479,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.
         }
         
@@ -723,6 +727,8 @@ class Pman extends HTML_FlexyFramework_Page
         // and finally the JsTemplate...
             echo '<script type="text/javascript" src="'. $this->baseURL. '/Core/JsTemplate"></script>'."\n";
         }
+        
+        $this->callModules('outputJavascriptIncludes', $this);
          
     }