Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

[quix0rs-gnu-social.git] / plugins / Minify / minify.php

diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php
index f8c17767c3f8b8d091b04493973016ee5a910fc4..b7bee7c8815e572b6a4fa301a7b608fe951383df 100644 (file)
--- a/plugins/Minify/minify.php
+++ b/plugins/Minify/minify.php
@@ -19,9 +19,6 @@
 
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
-// We bundle the minify library...
-set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/extlib/minify/min/lib');
-
 class MinifyAction extends Action
 {
     const TYPE_CSS = 'text/css';
@@ -30,8 +27,6 @@ class MinifyAction extends Action
     // Apache default and what Yahoo! uses..
     const TYPE_JS = 'application/x-javascript';
 
-    const cacheKey = 'minify';
-
     var $file;
     var $v;
 
@@ -51,16 +46,18 @@ class MinifyAction extends Action
             if(file_exists($this->file)) {
                 return true;
             } else {
-                $this->clientError(_('f parameter is not a valid path'),404);
+                // TRANS: Client error displayed when not providing a valid path in parameter "f".
+                $this->clientError(_m('The parameter "f" is not a valid path.'),404);
                 return false;
             }
         }else{
-            $this->clientError(_('f parameter is required'),500);
+            // TRANS: Client error displayed when not providing parameter "f".
+            $this->clientError(_m('The parameter "f" is required but missing.'),500);
             return false;
         }
     }
 
-    function etag() 
+    function etag()
     {
         if(isset($this->v)) {
             return "\"" . crc32($this->file . $this->v) . "\"";
@@ -78,10 +75,10 @@ class MinifyAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        
-        $c = common_memcache();
+
+        $c = Cache::instance();
         if (!empty($c)) {
-            $cacheKey = common_cache_key(self::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
+            $cacheKey = Cache::key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
             $out = $c->get($cacheKey);
         }
         if(empty($out)) {
@@ -102,23 +99,21 @@ class MinifyAction extends Action
         $info = pathinfo($file);
         switch(strtolower($info['extension'])){
             case 'js':
-                require_once('JSMin.php');
-                $out = JSMin::minify(file_get_contents($file));
+                $out = MinifyPlugin::minifyJs(file_get_contents($file));
                 header('Content-Type: ' . self::TYPE_JS);
                 break;
             case 'css':
-                require_once('Minify/CSS.php');
                 $options = array();
                 $options['currentDir'] = dirname($file);
                 $options['docRoot'] = INSTALLDIR;
-                $out = Minify_CSS::minify(file_get_contents($file),$options);
+                $out = MinifyPlugin::minifyCss(file_get_contents($file),$options);
                 header('Content-Type: ' . self::TYPE_CSS);
                 break;
             default:
-                $this->clientError(_('File type not supported'),500);
+                // TRANS: Client error displayed when trying to minify an unsupported file type.
+                $this->clientError(_m('File type not supported.'),500);
                 return false;
         }
         return $out;
     }
 }
-