X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Asset.php;h=eb5c0538de30ffc395121bf6ff6c9b9fe56b6250;hb=dff7116c31985c523f927df3e8e7cf50670ef428;hp=d0331517ff7ae6468e1b0cd676745771caec9228;hpb=e0a3a066db328668281778074b870200d1ce3181;p=Pman.Core

diff --git a/Asset.php b/Asset.php
index d0331517..eb5c0538 100644
--- a/Asset.php
+++ b/Asset.php
@@ -36,14 +36,6 @@ class Pman_Core_Asset extends Pman {
     
     function get($s='', $opts = Array())
     {
-        if(
-            !empty($_REQUEST['_clear_cache']) &&
-            !empty($_REQUEST['_clear_module'])
-        ) {
-            $this->clearCompiledFilesCache($_REQUEST['_clear_module']);
-        }
-        
-        
         $this->sessionState(0);
         
         $bits = explode('/', $s);
@@ -57,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)) {
@@ -124,6 +115,10 @@ class Pman_Core_Asset extends Pman {
     }
     
     function post($s='') {
+        if(!empty($_REQUEST['_clear_cache'])) {
+            $this->clearCompiledFilesCache();
+        }
+        
         die('invalid');
     }
      
@@ -135,11 +130,15 @@ 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':
             case 'css':
+            case 'scss':
                 $compile_dir .= implode("-", array(
                     $ui['name'],
                     $module,
@@ -167,21 +166,30 @@ class Pman_Core_Asset extends Pman {
         return false;
     }
     
-    function clearCompiledFilesCache($module)
+    function clearCompiledFilesCache()
     {
+        $au = $this->getAuthUser();
+        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));
             }
         }