Pman/Login.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index 407f007..44759cb 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -17,7 +17,8 @@
  *  ?? arrayClean.. what's it doing here?!? ;)
  * 
  * Usefull implemetors
- * DB_DataObject::toEventString (for logging - this is generically prefixed to all database operations.)
+ * DB_DataObject*:*toEventString (for logging - this is generically prefixed to all database operations.)
+ *   - any data object where this method exists, the result will get prefixed to the log remarks
  */
 
 class Pman extends HTML_FlexyFramework_Page 
@@ -396,6 +397,9 @@ class Pman extends HTML_FlexyFramework_Page
         require_once 'Services/JSON.php';
         $json = new Services_JSON();
         
+        // log all errors!!!
+        $this->addEvent("ERROR", false, $str);
+        
         if (!empty($_REQUEST['returnHTML']) || 
             (isset($_SERVER['CONTENT_TYPE']) && preg_match('#multipart/form-data#i', $_SERVER['CONTENT_TYPE']))
         ) {
@@ -404,7 +408,7 @@ class Pman extends HTML_FlexyFramework_Page
             echo  $json->encodeUnsafe(array(
                     'success'=> false, 
                     'errorMsg' => $str,
-                     'message' => $str, // compate with exeption / loadexception.
+                    'message' => $str, // compate with exeption / loadexception.
 
                     'errors' => $errors ? $errors : true, // used by forms to flag errors.
                     'authFailure' => !empty($errors['authFailure']),
@@ -412,7 +416,7 @@ class Pman extends HTML_FlexyFramework_Page
             echo "</BODY></HTML>";
             exit;
         }
-       
+        
         echo $json->encode(array(
             'success'=> false, 
             'data'=> array(), 
@@ -486,10 +490,12 @@ class Pman extends HTML_FlexyFramework_Page
     {
         
         $mods = explode(',', $this->appModules);
-        array_unshift($mods,   'Core');
-        $mods = array_unique($mods);
-        
+        if (in_array('Core',$mods)) { // core has to be the first  modules loaded as it contains Pman.js
+            array_unshift($mods,   'Core');
+        }
         
+        $mods = array_unique($mods);
+         
         $disabled =  explode(',', $this->appDisable ? $this->appDisable: '');
         
         foreach($mods as $mod) {
@@ -659,7 +665,7 @@ class Pman extends HTML_FlexyFramework_Page
             mkdir(dirname($file),0700,true);
         }
         file_put_contents($file, var_export(array(
-            'REQUEST_URI' => $_SERVER['REQUEST_URI'],
+            'REQUEST_URI' => empty($_SERVER['REQUEST_URI']) ? 'cli' : $_SERVER['REQUEST_URI'],
             'GET' => empty($_GET) ? array() : $_GET,
             'POST' => empty($_POST) ? array() : $_POST,
         ), true));