X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=AssetTrait.php;h=1d186aadfc21fe3f0d5310541cc1224dd94b7b33;hb=e6eb2122a2c49c78628944680de6b01f7439bed7;hp=9fc559ab3999c747bbccb321afcae35644932bd7;hpb=90655ef02992e47b19c2a09dccabf184f00cd422;p=Pman.Core

diff --git a/AssetTrait.php b/AssetTrait.php
index 9fc559ab..1d186aad 100644
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -66,19 +66,12 @@ trait Pman_Core_AssetTrait {
         
         ksort($arfiles); // just sort by name so it's consistant for serialize..
         
-        $ui = posix_getpwuid(posix_geteuid());
-       
-        
-        $compiledir = session_save_path() . '/' .
-                $ui['name'] . '-' . $ff->project . '-' . $ff->version . '-jscompile';
-        
-        if (!file_exists($compiledir)) {
-            mkdir($compiledir,0700,true);
-        }
+        require_once 'Pman/Core/Asset.php';
+        $compiledir = Pman_Core_Asset::getCompileDir('js', '', true);
         
          
         
-        $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
+        $lsort = function($a,$b) { return strlen($a) > strlen($b) ? 1 : -1; };
         usort($files, $lsort);
         
         $ff = HTML_FlexyFramework::get();
@@ -217,13 +210,11 @@ trait Pman_Core_AssetTrait {
         
          
         //print_r($relfiles);
+      
+        require_once 'Pman/Core/Asset.php';
+        $compiledir = Pman_Core_Asset::getCompileDir('css', '', true);
         
-        $ui = posix_getpwuid(posix_geteuid());
-       
-        
-        $compiledir = session_save_path() . '/' .
-                $ui['name'] . '-' . $ff->project . '-'. $ff->version . '-csscompile';
-        
+         
         if (!file_exists($compiledir)) {
             mkdir($compiledir,0700,true);
         }
@@ -232,14 +223,18 @@ trait Pman_Core_AssetTrait {
         
         
         // yes sort... if includes are used - they have to be in the first file...
-        $lsort = create_function('$a,$b','return strlen($a) > strlen($b) ? 1 : -1;');
+        $lsort = function($a,$b ) {
+                return strlen($a) > strlen($b) ? 1 : -1;
+        };
         usort($files, $lsort);
         usort($relfiles,$lsort);
        // print_R($relfiles);
         
         $ff = HTML_FlexyFramework::get();
         
-        if (!empty($ff->Pman['isDev']) && !empty($_REQUEST['isDev'])) {
+        // isDev set
+        
+        if ((!empty($ff->Pman['isDev']) || $_SERVER['HTTP_HOST'] == 'localhost' )&& !empty($_REQUEST['isDev'])) {
             echo "<!-- CSS compile turned off (isDev on) -->\n";
             $this->assetArrayToHtml($files,'css');
             return;