Pman/Login.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index 29483b3..77683de 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -132,25 +132,27 @@ class Pman extends HTML_FlexyFramework_Page
         
     }
     /*
-     * module init is only loaded on main page call, and includes checks for configuration settings.
+     * call a method on {module}/Pman.php
+     * * initially used on the main page load to call init();
+     * * also used for ccsIncludes?? 
      *
-     * // callModules('init', $base)
+     * // usage: $this->callModules('init', $base)
      * 
      */
      
-     function callModules($fn) 
-     {
+    function callModules($fn) 
+    {
         $args = func_get_args();
         array_shift($args);
         foreach(explode(',',$this->appModules) as $m) {
-             $cls = 'Pman_'. $m . '_Pman';
-             if (!file_exists($this->rootDir . '/'.str_replace('_','/', $cls). '.php')) {
-                 continue;
-             }
-             require_once str_replace('_','/', $cls). '.php';
-             $c = new $cls();
-             if (method_exists($c, $fn)) {
-                call_user_funct_array(array($c,$fn),$args);
+            $cls = 'Pman_'. $m . '_Pman';
+            if (!file_exists($this->rootDir . '/'.str_replace('_','/', $cls). '.php')) {
+                continue;
+            }
+            require_once str_replace('_','/', $cls). '.php';
+            $c = new $cls();
+            if (method_exists($c, $fn)) {
+                call_user_func_array(array($c,$fn),$args);
             }
          }
      }
@@ -159,7 +161,7 @@ class Pman extends HTML_FlexyFramework_Page
     {
         $this->init();
         if (empty($base)) {
-            $this->callModules('init', $base);
+            $this->callModules('init', $this, $base);
         }
         
             //$this->allowSignup= empty($opts['allowSignup']) ? 0 : 1;
@@ -460,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)){
@@ -472,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.
         }
         
@@ -721,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);
          
     }
     
@@ -734,15 +742,18 @@ class Pman extends HTML_FlexyFramework_Page
      */
     function outputCSSIncludes() // includes on CSS links.
     {
+       
         
         $mods = $this->modulesList();
         
+        $this->callModules('outputCSSIncludes', $this);
+        
         foreach($mods as $mod) {
             // add the css file..
             $this->outputCSSDir("Pman/$mod","*.css");
         }
         
-        $this->callModules('outputCSSIncludes', false);
+        
     }