fix sending from non dataobject source

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index a2821d4..7c5c906 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -53,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..
@@ -128,6 +128,8 @@ class Pman extends HTML_FlexyFramework_Page
                         (($_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'])
                     )
                 )
                 ||
@@ -756,7 +758,7 @@ class Pman extends HTML_FlexyFramework_Page
         }
         
         $this->callModules('outputJavascriptIncludes', $this);
-         
+        return '';
     }
     var $css_includes = array();
      /**
@@ -795,7 +797,7 @@ class Pman extends HTML_FlexyFramework_Page
             $this->outputSCSS($mod);
             
         }
-        
+        return ''; // needs to return something as we output it..
         
     }
     
@@ -806,14 +808,7 @@ class Pman extends HTML_FlexyFramework_Page
     
     
     
-    
-    
-    
-    
-    
-    
-    
-    
+     
     
     // --- OLD CODE - in for BC on MO project.... - needs removing...
     
@@ -842,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..