X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Asset.php;h=92e43cbba844120cd4a1481d8489fcd7caa342bf;hp=b65dca0c6a79fcd30b668aa3471adfecc4c69f65;hb=c1af5e6bb6064e88469651271f4d9aaff34d69c0;hpb=c0f7a39502614600799930b603b9cdcbb5c77cdb

diff --git a/Asset.php b/Asset.php
index b65dca0c..92e43cbb 100644
--- a/Asset.php
+++ b/Asset.php
@@ -36,8 +36,6 @@ class Pman_Core_Asset extends Pman {
     
     function get($s='', $opts = Array())
     {
-
-        
         $this->sessionState(0);
         
         $bits = explode('/', $s);
@@ -51,9 +49,8 @@ class Pman_Core_Asset extends Pman {
         $ui = posix_getpwuid(posix_geteuid());
         $ff = HTML_FlexyFramework::get();
         
-        $compile = session_save_path() . '/' .
-                $ui['name'] . '-' . $ff->project . '-' . $ff->version .  '-'. $bits[0] . 'compile';
-     
+        $compile = self::getCompileDir($bits[0], '', false);
+        
         $fn = $compile . '/'. $s .'.'. $bits[0];
         
         if (!file_exists($fn)) {
@@ -133,7 +130,10 @@ class Pman_Core_Asset extends Pman {
         
         $compile_dir = session_save_path() . "/";
         
-        $module = (empty($module)) ? $ff->project : $module;
+        if (empty($module)) {
+            $module = $ff->project . (isset($ff->appNameShort) ?  '_' . $ff->appNameShort : '');
+        }
+        
         
         switch($type) {
             case 'js':
@@ -168,24 +168,27 @@ class Pman_Core_Asset extends Pman {
     function clearCompiledFilesCache()
     {
         $au = $this->getAuthUser();
-        if (!$au && !in_array($_SERVER['REMOTE_ADDR'] , array('127.0.0.1','::1')) {
+        if (!$au && !in_array($_SERVER['REMOTE_ADDR'] , array('127.0.0.1','::1'))) {
             $this->jerr("Cache can only be cleared by authenticated users");
         }
         
-        
         require_once 'System.php';
+        $ff = HTML_FlexyFramework::get();
+        
         $mods = $this->modulesList();
+        $mods[] = $ff->project; // Pman - this was the old format...
+        $mods[] = ''; // Pman + appshortname..
         
-        foreach ($mods as $mod) {
+        foreach ($mods as $module) {
             $compile_dir = $this->getCompileDir('js', $module, false);
         
             if(!empty($compile_dir)) {
-                System::rm(array('-r', $compiledir));
+                System::rm(array('-r', $compile_dir));
             }
             $compile_dir = $this->getCompileDir('css', $module, false);
         
             if(!empty($compile_dir)) {
-                System::rm(array('-r', $compiledir));
+                System::rm(array('-r', $compile_dir));
             }
         }