undefined isDev

[Pman.Base] / Pman.php

diff --git a/Pman.php b/Pman.php
index bc37742..84d0a4f 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= "";
@@ -394,24 +394,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 +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');
             }
@@ -763,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");
         }
         
@@ -859,9 +870,12 @@ class Pman extends HTML_FlexyFramework_Page
         
        
         
-        
-        $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);