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

diff --git a/AssetTrait.php b/AssetTrait.php
index d37d9459..1d186aad 100644
--- a/AssetTrait.php
+++ b/AssetTrait.php
@@ -15,8 +15,6 @@ trait Pman_Core_AssetTrait {
     
     function outputJavascriptDir($path)
     {
-        print_r($path);
-        
         
         $relpath = $this->rootURL . '/' . $path .'/';
         $ff = HTML_FlexyFramework::get();
@@ -68,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();
@@ -219,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);
         }
@@ -234,7 +223,9 @@ 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);