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

diff --git a/Asset.php b/Asset.php
index dec21199..3e49f8eb 100644
--- a/Asset.php
+++ b/Asset.php
@@ -26,6 +26,7 @@ class Pman_Core_Asset extends Pman {
     var $types = array(
         'css' => 'text/css',
         'js' => 'text/javascript',
+        'map' => 'application/json'
     );
     
     function getAuth()
@@ -36,14 +37,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);
@@ -52,18 +45,23 @@ class Pman_Core_Asset extends Pman {
             $this->jerr("invalid url");
         }
        
+        $ext = $bits[0];
+        if (preg_match('/\.map$/',$_SERVER['REQUEST_URI'])) {
+            $ext = 'map';
+        }
+       
         $s = str_replace('/', '-', $bits[1]);
         
+        
         $ui = posix_getpwuid(posix_geteuid());
         $ff = HTML_FlexyFramework::get();
         
-        $compile = session_save_path() . '/' .
-                $ui['name'] . '-' . $ff->project . '-' . $ff->version .  '-'. $bits[0] . 'compile';
-     
-        $fn = $compile . '/'. $s .'.'. $bits[0];
+        $compile = self::getCompileDir($bits[0], '', false);
+        
+        $fn = $compile . '/'. $s .'.'. $ext;
         
         if (!file_exists($fn)) {
-            header('Content-Type: '. $this->types[$bits[0]]);
+            header('Content-Type: '. $this->types[$ext]);
         
             echo "// compiled file not found = $fn";
             exit;
@@ -114,7 +112,7 @@ class Pman_Core_Asset extends Pman {
             $fh = fopen($fn,'r');
             fpassthru($fh);
             fclose($fh);
-            $content = $data;
+             
         }
         
         
@@ -124,6 +122,10 @@ class Pman_Core_Asset extends Pman {
     }
     
     function post($s='') {
+        if(!empty($_REQUEST['_clear_cache'])) {
+            $this->clearCompiledFilesCache();
+        }
+        
         die('invalid');
     }
      
@@ -135,11 +137,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,
@@ -152,6 +158,7 @@ class Pman_Core_Asset extends Pman {
                 return false;
         }
         
+        
         if (file_exists($compile_dir)) {
             return $compile_dir;
         }
@@ -167,18 +174,33 @@ class Pman_Core_Asset extends Pman {
         return false;
     }
     
-    function clearCompiledFilesCache($module)
+    function clearCompiledFilesCache()
     {
-        $compile_dir = $this->getCompileDir('js', $module, false);
-        
-        if(empty($compile_dir)) {
-            $this->jok('EMPTY');
+        $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");
         }
         
-        foreach(glob($compile_dir.'/*.*') as $v){
-            unlink($v);
-        }
+        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 $module) {
+            $compile_dir = $this->getCompileDir('js', $module, false);
         
+            if(!empty($compile_dir)) {
+                System::rm(array('-r', $compile_dir));
+            }
+            $compile_dir = $this->getCompileDir('css', $module, false);
+        
+            if(!empty($compile_dir)) {
+                System::rm(array('-r', $compile_dir));
+            }
+        }
+         
         $this->jok('DONE');
     }
 }