X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Asset.php;h=92e43cbba844120cd4a1481d8489fcd7caa342bf;hp=e720c30eccfe4c03aaad22ac02e1c9d81692f609;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=8288f33ff541c9394c4b94b0c798d1536ff751fa

diff --git a/Asset.php b/Asset.php
index e720c30e..92e43cbb 100644
--- a/Asset.php
+++ b/Asset.php
@@ -3,6 +3,8 @@
  /**
   * Generic cached assset server... -- No security om this.. should only return compressed CSS/JS
   *
+  * Does a few tricks with headers to improve caching...
+  *
   *
   * Also includes code to generate assets...
   *
@@ -20,8 +22,7 @@
 require_once 'Pman.php';
 
 class Pman_Core_Asset extends Pman {
-    
-    
+     
     var $types = array(
         'css' => 'text/css',
         'js' => 'text/javascript',
@@ -33,9 +34,10 @@ class Pman_Core_Asset extends Pman {
     }
     
     
-    function get($s='')
+    function get($s='', $opts = Array())
     {
-       
+        $this->sessionState(0);
+        
         $bits = explode('/', $s);
         
         if (empty($bits[0]) || empty($bits[1])  || !isset($this->types[$bits[0]])) {
@@ -47,13 +49,9 @@ 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';
-     
-        $fn = $compile . '/'. $s .'.'. $bits[0];
-        
-        
+        $compile = self::getCompileDir($bits[0], '', false);
         
+        $fn = $compile . '/'. $s .'.'. $bits[0];
         
         if (!file_exists($fn)) {
             header('Content-Type: '. $this->types[$bits[0]]);
@@ -62,6 +60,9 @@ class Pman_Core_Asset extends Pman {
             exit;
         }
         
+        $supportsGzip = !empty($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) !== false;
+
+        
         $last_modified_time = filemtime($fn);
         
         
@@ -83,21 +84,114 @@ class Pman_Core_Asset extends Pman {
         
         
         header("Pragma: public");
-        header('Content-Length: '. filesize($fn));
+        
         header('Cache-Control: max-age=2592000, public');
         header('Expires: '.gmdate('D, d M Y H:i:s \G\M\T', time() + 2592000));
         header('Last-Modified: '.gmdate('D, d M Y H:i:s \G\M\T', $last_modified_time));
         header('Etag: '. md5($fn)); 
         
-        $fh = fopen($fn,'r');
-        fpassthru($fh);
-        fclose($fh);
+         if ( $supportsGzip ) {
+            $content = gzencode( file_get_contents($fn) , 9);
+            
+            header('Content-Encoding: gzip');
+            header('Vary: Accept-Encoding');
+            header('Content-Length: '. strlen($content));
+            
+            echo $content;
+            
+        } else {
+            
+            
+            $fh = fopen($fn,'r');
+            fpassthru($fh);
+            fclose($fh);
+            $content = $data;
+        }
+        
+        
+        
         exit;
         
     }
+    
     function post($s='') {
+        if(!empty($_REQUEST['_clear_cache'])) {
+            $this->clearCompiledFilesCache();
+        }
+        
         die('invalid');
     }
      
+    static function getCompileDir($type, $module = '', $is_mkdir = true)
+    {
+        $ff = HTML_FlexyFramework::get();
+        
+        $ui = posix_getpwuid(posix_geteuid());
+        
+        $compile_dir = session_save_path() . "/";
+        
+        if (empty($module)) {
+            $module = $ff->project . (isset($ff->appNameShort) ?  '_' . $ff->appNameShort : '');
+        }
+        
+        
+        switch($type) {
+            case 'js':
+            case 'css':
+                $compile_dir .= implode("-", array(
+                    $ui['name'],
+                    $module,
+                    $ff->version,
+                    "{$type}compile"
+                ));
+                break;
+            // template config?
+            default:
+                return false;
+        }
+        
+        if (file_exists($compile_dir)) {
+            return $compile_dir;
+        }
+        
+        if(!$is_mkdir) {
+            return false;
+        }
+        
+        if(mkdir($compile_dir, 0700, true)) {
+            return $compile_dir;
+        }
+        
+        return false;
+    }
     
+    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 $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');
+    }
 }