Changed Pman.php

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index 06b707e..de79ee8 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= "";
@@ -755,9 +755,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');
             }
@@ -768,6 +770,10 @@ 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");
         }
         
@@ -858,15 +864,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);