Pman.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index 02e194a..95612b8 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') 
         ) {
@@ -113,6 +115,7 @@ class Pman extends HTML_FlexyFramework_Page
         if (
             !empty($_REQUEST['isDev'])
             &&
+            !empty($_SERVER['SERVER_ADDR']) &&
             (
                 (($_SERVER['SERVER_ADDR'] == '127.0.0.1') && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1'))
                 ||
@@ -152,10 +155,10 @@ class Pman extends HTML_FlexyFramework_Page
             require_once str_replace('_','/', $cls). '.php';
             $c = new $cls();
             if (method_exists($c, $fn)) {
-                print_r($args);
                 call_user_func_array(array($c,$fn),$args);
             }
-         }
+        }
+        return $args;
      }
     
     function get($base, $opts=array()) 
@@ -244,7 +247,9 @@ class Pman extends HTML_FlexyFramework_Page
         if (!is_a($this->company, 'DB_DataObject')) { // non-core pman projects
             return false; 
         }
-        $this->company->get('comptype', 'OWNER');
+        $e = DB_DataObject::Factory('core_enum')->lookupObject('COMPTYPE', 'OWNER');
+
+        $this->company->get('comptype_id', $e->id);
         return $this->company;
     }
     
@@ -463,6 +468,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)){
@@ -475,7 +485,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.
         }
         
@@ -724,9 +733,11 @@ 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);
          
     }
-    
+    var $css_includes = array();
      /**
      * outputCSSIncludes:
      *
@@ -737,15 +748,21 @@ class Pman extends HTML_FlexyFramework_Page
      */
     function outputCSSIncludes() // includes on CSS links.
     {
+       
         
         $mods = $this->modulesList();
         
+        $val = $this->callModules('applyCSSIncludes', $this, array());
+        print_r($val);
+        
+        $this->callModules('outputCSSIncludes', $this);
+        
         foreach($mods as $mod) {
             // add the css file..
             $this->outputCSSDir("Pman/$mod","*.css");
         }
         
-        $this->callModules('outputCSSIncludes', $this);
+        
     }