Changed Pman/Roo.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index a43d1ce..aa65cda 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 self::staticGetAuthUser($this);
     }
     /**
      * hasPerm:
@@ -293,8 +297,7 @@ class Pman extends HTML_FlexyFramework_Page
         $au = $this->getAuthUser();
         return $au && $au->hasPerm($name,$lvl);
         
-    }
-   
+    }   
     /**
      * modulesList:  List the modules in the application
      *
@@ -775,6 +778,8 @@ class Pman extends HTML_FlexyFramework_Page
                 continue;
             }
             $this->outputCSSDir("Pman/$mod","*.css");
+            $this->outputSCSS($mod);
+            
         }
         
         
@@ -864,11 +869,22 @@ 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';
         
         if (PHP_VERSION_ID < 70000 ) {
             $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
@@ -1157,10 +1173,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)