fix sending from non dataobject source

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index a1a6170..7c5c906 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -31,8 +31,7 @@
  */
 
  
-    
- 
+     
  
 require_once 'Pman/Core/AssetTrait.php';
 
@@ -54,7 +53,7 @@ class Pman extends HTML_FlexyFramework_Page
     var $appModules = '';
     var $appDisabled = array(); // array of disabled modules..
                     // (based on config option disable)
-    
+     
     var $authUser; // always contains the authenticated user..
     
     var $disable_jstemplate = false; /// disable inclusion of jstemplate code..
@@ -64,6 +63,13 @@ class Pman extends HTML_FlexyFramework_Page
     
     
     var $transObj = false; // used to rollback or commit in JOK/JERR
+    
+    // these are used somewhere - 
+    var $builderJs = false;//
+    var $serverName = false;
+    var $lang = false;
+    var $allowSignup = false;
+    
     /**
      * ------------- Standard getAuth/get/post methods of framework.
      * 
@@ -115,11 +121,19 @@ 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'))
+                (
+                    !empty($_SERVER['SERVER_ADDR']) &&
+                    (
+                        (($_SERVER['SERVER_ADDR'] == '127.0.0.1') && ($_SERVER['REMOTE_ADDR'] == '127.0.0.1'))
+                        ||
+                        (($_SERVER['SERVER_ADDR'] == '::1') && ($_SERVER['REMOTE_ADDR'] == '::1'))
+                        ||
+                        (preg_match('/^192\.168/', $_SERVER['SERVER_ADDR']) && $_SERVER['SERVER_ADDR'] == $_SERVER['HTTP_HOST'])
+                    )
+                )
                 ||
-                (($_SERVER['SERVER_ADDR'] == '::1') && ($_SERVER['REMOTE_ADDR'] == '::1'))
+                !empty($boot->Pman['enable_isdev_url'])
             )
             
         ) {
@@ -255,17 +269,9 @@ class Pman extends HTML_FlexyFramework_Page
     }
     
     
-    
-    /**
-     * getAuthUser: - get the authenticated user..
-     *
-     * @return {DB_DataObject} of type Pman[authTable] if authenticated.
-     */
-    
-    function getAuthUser()
-    {
-        if (!empty($this->authUser)) {
-            return $this->authUser;
+    static function staticGetAuthUser($t) {
+        if (!empty($t->authUser)) {
+            return $t->authUser;
         }
         $ff = HTML_FlexyFramework::get();
         $tbl = empty($ff->Pman['authTable']) ? 'core_person' : $ff->Pman['authTable'];
@@ -275,8 +281,20 @@ class Pman extends HTML_FlexyFramework_Page
         if (is_a($u,'PEAR_Error') || !$u->isAuth()) {
             return false;
         }
-        $this->authUser =$u->getAuthUser();
-        return $this->authUser ;
+        $t->authUser =$u->getAuthUser();
+        return $t->authUser ;
+        
+    }
+    
+    /**
+     * getAuthUser: - get the authenticated user..
+     *
+     * @return {DB_DataObject} of type Pman[authTable] if authenticated.
+     */
+    
+    function getAuthUser()
+    {
+        return self::staticGetAuthUser($this);
     }
     /**
      * hasPerm:
@@ -293,8 +311,7 @@ class Pman extends HTML_FlexyFramework_Page
         $au = $this->getAuthUser();
         return $au && $au->hasPerm($name,$lvl);
         
-    }
-   
+    }   
     /**
      * modulesList:  List the modules in the application
      *
@@ -551,7 +568,8 @@ class Pman extends HTML_FlexyFramework_Page
         
         echo $this->jsencode(array(
             'success'=> false, 
-            'data'=> array(), 
+            'data'=> array(),
+            'code' => $type,
             'errorMsg' => $str,
             'message' => $str, // compate with exeption / loadexception.
             'errors' => $errors ? $errors : true, // used by forms to flag errors.
@@ -706,8 +724,9 @@ class Pman extends HTML_FlexyFramework_Page
      */
     function outputJavascriptIncludes()  
     {
-        // BC support - currently 1 project still relies on this.. (MO portal) 
-        $o = HTML_FlexyFramework::get()->Pman_Core;
+        // BC support - currently 1 project still relies on this.. (MO portal)
+        $ff = HTML_FlexyFramework::get();
+        $o = isset($ff->Pman_Core)  ? $ff->Pman_Core : array();
         if (isset($o['packseed'])) {
             return $this->outputJavascriptIncludesBC();
         }
@@ -739,7 +758,7 @@ class Pman extends HTML_FlexyFramework_Page
         }
         
         $this->callModules('outputJavascriptIncludes', $this);
-         
+        return '';
     }
     var $css_includes = array();
      /**
@@ -778,7 +797,7 @@ class Pman extends HTML_FlexyFramework_Page
             $this->outputSCSS($mod);
             
         }
-        
+        return ''; // needs to return something as we output it..
         
     }
     
@@ -789,14 +808,7 @@ class Pman extends HTML_FlexyFramework_Page
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+     
     
     // --- OLD CODE - in for BC on MO project.... - needs removing...
     
@@ -825,7 +837,7 @@ class Pman extends HTML_FlexyFramework_Page
         // and finally the JsTemplate...
             echo '<script type="text/javascript" src="'. $this->baseURL. '/Core/JsTemplate"></script>'."\n";
         }
-         
+        return '';
     }
     /**
      * Gather infor for javascript files..
@@ -1170,10 +1182,7 @@ class Pman extends HTML_FlexyFramework_Page
     // DEPRECITAED - use moduleslist
     function modules()  { return $this->modulesList();  }
     
-    // DEPRECIATED.. - use getAuthUser...
-    function staticGetAuthUser()  { $x = new Pman(); return $x->getAuthUser();  }
-     
-    
+   
     // DEPRICATED  USE Pman_Core_Mailer
     
     function emailTemplate($templateFile, $args)