Pman.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index 915af66..8cc13fc 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -62,6 +62,8 @@ class Pman extends HTML_FlexyFramework_Page
     
     var $css_path = ''; // can inject a specific path into the base HTML page.
     
+    
+    var $transObj = false; // used to rollback or commit in JOK/JERR
     /**
      * ------------- Standard getAuth/get/post methods of framework.
      * 
@@ -85,11 +87,11 @@ class Pman extends HTML_FlexyFramework_Page
          // move away from doing this ... you can access bootLoader.XXXXXX in the master template..
         $boot = HTML_FlexyFramework::get();
         // echo'<PRE>';print_R($boot);exit;
-        $this->appName= $boot->appName;
-        $this->appNameShort= $boot->appNameShort;
+        $this->appName      = $boot->appName;
         
+        $this->appNameShort = $boot->appNameShort;
         
-        $this->appModules= $boot->enable;
+        $this->appModules   = $boot->enable;
         
 //        echo $this->arrayToJsInclude($files);        
         $this->isDev = empty($boot->Pman['isDev']) ? false : $boot->Pman['isDev'];
@@ -130,33 +132,36 @@ 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?? 
+     *
+     * // usage: $this->callModules('init', $base)
+     * 
      */
-    function initModules()
+     
+    function callModules($fn) 
     {
+        $args = func_get_args();
+        array_shift($args);
         foreach(explode(',',$this->appModules) as $m) {
             $cls = 'Pman_'. $m . '_Pman';
-            //echo $cls;
-            //echo $this->rootDir . '/'.str_replace('_','/', $cls). '.php';
-            
             if (!file_exists($this->rootDir . '/'.str_replace('_','/', $cls). '.php')) {
                 continue;
             }
             require_once str_replace('_','/', $cls). '.php';
             $c = new $cls();
-            if (method_exists($c,'init')) {
-                $c->init($this);
+            if (method_exists($c, $fn)) {
+                call_user_func_array(array($c,$fn),$args);
             }
-        }
-    }
-    
-    
+         }
+     }
     
     function get($base, $opts=array()) 
     {
         $this->init();
         if (empty($base)) {
-            $this->initModules();
+            $this->callModules('init', $this, $base);
         }
         
             //$this->allowSignup= empty($opts['allowSignup']) ? 0 : 1;
@@ -453,6 +458,10 @@ class Pman extends HTML_FlexyFramework_Page
     
     function jerror($type, $str, $errors=array(), $content_type = false) // standard error reporting..
     {
+        if ($this->transObj) {
+            $this->transObj->query('ROLLBACK');
+        }
+        
         if ($type !== false) {
             
             if(!empty($errors)){
@@ -539,6 +548,10 @@ class Pman extends HTML_FlexyFramework_Page
     }
     function jok($str)
     {
+        if ($this->transObj ) {
+            $this->transObj->query( connection_aborted() ? 'ROLLBACK' :  'COMMIT');
+        }
+        
         $cli = HTML_FlexyFramework::get()->cli;
         if ($cli) {
             echo "OK: " .$str . "\n";
@@ -723,17 +736,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");
-            
-            
         }
-         
+        
+        
     }
     
     
@@ -990,14 +1004,17 @@ class Pman extends HTML_FlexyFramework_Page
         
         
         $reported = true;
-        var_dump($ex);
-        $out = is_a($ex,'Exception') ? $ex->getMessage() : $ex->toString();
+        
+        $out = is_a($ex,'Exception') || is_a($ex, 'Error') ? $ex->getMessage() : $ex->toString();
         
         
         //print_R($bt); exit;
         $ret = array();
         $n = 0;
-        $bt = is_a($ex,'Exception') ? $ex->getTrace() : $ex->backtrace;
+        $bt = is_a($ex,'Exception')|| is_a($ex, 'Error')  ? $ex->getTrace() : $ex->backtrace;
+        if (is_a($ex,'Exception')|| is_a($ex, 'Error') ) {
+            $ret[] = $ex->getFile() . '('. $ex->getLine() . ')';
+        }
         foreach( $bt as $b) {
             $ret[] = @$b['file'] . '(' . @$b['line'] . ')@' .   @$b['class'] . '::' . @$b['function'];
             if ($n > 20) {