X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.php;h=84fb10631523a21aff706bac594e05c817e00168;hb=refs%2Fheads%2Fwip_edward_T5642_Report_designer_hebe;hp=8cc13fc99af95f23e37aef4b79f025782fd73cdf;hpb=33ac0d61a5fce3d82c7803350eb2636a54c1df3f;p=Pman.Base

diff --git a/Pman.php b/Pman.php
index 8cc13fc..84fb106 100644
--- 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'))
                 ||
@@ -154,7 +157,8 @@ class Pman extends HTML_FlexyFramework_Page
             if (method_exists($c, $fn)) {
                 call_user_func_array(array($c,$fn),$args);
             }
-         }
+        }
+         
      }
     
     function get($base, $opts=array()) 
@@ -169,12 +173,13 @@ class Pman extends HTML_FlexyFramework_Page
       
         
         // should really be moved to Login...
-        
+        /*
         if ($bits[0] == 'PasswordReset') {
             $this->linkFail = $this->resetPassword(@$bits[1],@$bits[2],@$bits[3]);
             header('Content-type: text/html; charset=utf-8');
             return;
-        } 
+        }
+        */
          
         $au = $this->getAuthUser();
         if ($au) {
@@ -191,7 +196,7 @@ class Pman extends HTML_FlexyFramework_Page
         }
         
         
-        if (strlen($base)) {
+        if (strlen($base) && $bits[0] != 'PasswordReset') {
             $this->jerror("BADURL","invalid url: $base");
         }
         // deliver template
@@ -243,7 +248,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;
     }
     
@@ -387,35 +394,6 @@ class Pman extends HTML_FlexyFramework_Page
      */
     
     
-    function resetPassword($id,$t, $key)
-    {
-        
-        $au = $this->getAuthUser();
-        if ($au) {
-            return "Already Logged in - no need to use Password Reset";
-        }
-        
-        $u = DB_DataObject::factory('core_person');
-        //$u->company_id = $this->company->id;
-        $u->active = 1;
-        if (!$u->get($id) || !strlen($u->passwd)) {
-            return "invalid id";
-        }
-        
-        // validate key.. 
-        if ($key != $u->genPassKey($t)) {
-            return "invalid key";
-        }
-        $uu = clone($u);
-        $u->no_reset_sent = 0;
-        $u->update($uu);
-        
-        if ($t < strtotime("NOW - 1 DAY")) {
-            return "expired";
-        }
-        $this->showNewPass = implode("/", array($id,$t,$key));
-        return false;
-    }
     
     /**
      * jerrAuth: standard auth failure - with data that let's the UI know..
@@ -462,6 +440,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 +457,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,9 +705,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:
      *
@@ -740,6 +724,14 @@ class Pman extends HTML_FlexyFramework_Page
         
         $mods = $this->modulesList();
         
+        $this->callModules('applyCSSIncludes', $this);
+        foreach($this->css_includes as $module => $ar) {
+            if ($ar) {
+                $this->assetArrayToHtml( $ar , 'css');
+            }
+        }
+        
+        // old style... - probably remove this...
         $this->callModules('outputCSSIncludes', $this);
         
         foreach($mods as $mod) {