enable statick access to getAuthUser

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index bc37742..ba45a32 100644 (file)
--- a/Pman.php
+++ b/Pman.php
@@ -41,7 +41,7 @@ class Pman extends HTML_FlexyFramework_Page
     use Pman_Core_AssetTrait;
     //outputJavascriptDir()
     //outputCssDir();
-    
+    var $isDev = false;
     var $appName= "";
     var $appLogo= "";
     var $appShortName= "";
@@ -255,17 +255,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 +267,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 staticGetAuthUser($this);
     }
     /**
      * hasPerm:
@@ -394,24 +398,29 @@ class Pman extends HTML_FlexyFramework_Page
      * generate a tempory file with an extension (dont forget to delete it)
      */
     
-    function tempName($ext, $deleteOnExit=false)
+    function deleteOnExitAdd($name)
     {
-        if ($deleteOnExit && self::$deleteOnExit === false) {
+        if (self::$deleteOnExit === false) {
             register_shutdown_function(array('Pman','deleteOnExit'));
             self::$deleteOnExit  = array();
         }
+        self::$deleteOnExit[] = $name;
+    }
+    
+    function tempName($ext, $deleteOnExit=false)
+    {
+        
         $x = tempnam(ini_get('session.save_path'), HTML_FlexyFramework::get()->appNameShort.'TMP');
         unlink($x);
         $ret = $x .'.'. $ext;
         if ($deleteOnExit) {
-            self::$deleteOnExit[] = $ret;
+            $this->deleteOnExitAdd($ret);
         }
         return $ret;
     
     }
    
-    static $deleteOnExit = false;
-    static function deleteOnExit()
+     static function deleteOnExit()
     {
         
         foreach(self::$deleteOnExit as $fn) {
@@ -750,9 +759,11 @@ class Pman extends HTML_FlexyFramework_Page
        
         
         $mods = $this->modulesList();
-        
+        $is_bootstrap = in_array('BAdmin', $mods);
+
         $this->callModules('applyCSSIncludes', $this);
         foreach($this->css_includes as $module => $ar) {
+            
             if ($ar) {
                 $this->assetArrayToHtml( $ar , 'css');
             }
@@ -763,7 +774,13 @@ class Pman extends HTML_FlexyFramework_Page
         
         foreach($mods as $mod) {
             // add the css file..
+            if ($is_bootstrap  && !file_exists($this->rootDir."/Pman/$mod/is_bootstrap")) {
+                echo '<!-- missing '. $this->rootDir."/Pman/$mod/is_bootstrap  - skipping -->";
+                continue;
+            }
             $this->outputCSSDir("Pman/$mod","*.css");
+            $this->outputSCSS($mod);
+            
         }
         
         
@@ -853,15 +870,29 @@ class Pman extends HTML_FlexyFramework_Page
         
         ksort($arfiles); // just sort by name so it's consistant for serialize..
         
+        // The original idea of this was to serve the files direct from a publicly available 'cache' directory.
+        // but that doesnt really make sense - as we can just serve it from the session directory where we stick
+        // cached data anyway.
+        
+        /*
         $compile  = empty($ff->Pman['public_cache_dir']) ? 0 : 1;
         $basedir = $compile ? $ff->Pman['public_cache_dir'] : false;
         $baseurl = $compile ? $ff->Pman['public_cache_url'] : false;
-        
+        */
        
+        $compile = 1;
+        $basedir = session_save_path().   '/translate-cache/';
+        if (!file_exists($basedir)) {
+            mkdir($basedir,0755);
+        }
+        $baseurl = $this->baseURL .  '/Admin/Translations';
         
-        
-        $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
-        usort($files, $lsort);
+        if (PHP_VERSION_ID < 70000 ) {
+            $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
+            usort($files, $lsort);
+        } else {
+            usort($files, function($a,$b) { return strlen($a) > strlen($b) ? 1 : -1; });
+        }
         
         $smod = str_replace('/','.',$mod);