X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FMinify%2Fminify.php;h=9a59c4223c8ec1f613b995eefc01a66275a748ef;hb=2a02c5470e92050fe167cf418d0226cfeae732fe;hp=2de2d6d26f28191e61723f75c9fa9c3a16e50c3b;hpb=01b089d9be046db1253cb3bb90e8635b50fddd84;p=quix0rs-gnu-social.git

diff --git a/plugins/Minify/minify.php b/plugins/Minify/minify.php
index 2de2d6d26f..9a59c4223c 100644
--- 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,9 +27,8 @@ class MinifyAction extends Action
     // Apache default and what Yahoo! uses..
     const TYPE_JS = 'application/x-javascript';
 
-    const cacheKey = 'minify';
-
     var $file;
+    var $v;
 
     function isReadOnly($args)
     {
@@ -50,11 +46,11 @@ class MinifyAction extends Action
             if(file_exists($this->file)) {
                 return true;
             } else {
-                $this->clientError(_('f parameter is not a valid path'),404);
+                $this->clientError(_m('The parameter "f" is not a valid path.'),404);
                 return false;
             }
         }else{
-            $this->clientError(_('f parameter is required'),500);
+            $this->clientError(_m('The parameter "f" is required but missing.'),500);
             return false;
         }
     }
@@ -80,13 +76,14 @@ class MinifyAction extends Action
         
         $c = common_memcache();
         if (!empty($c)) {
-            $out = $c->get(common_cache_key(self::cacheKey . ':' . $this->file));
+            $cacheKey = common_cache_key(MinifyPlugin::cacheKey . ':' . $this->file . '?v=' . empty($this->v)?'':$this->v);
+            $out = $c->get($cacheKey);
         }
         if(empty($out)) {
             $out = $this->minify($this->file);
         }
         if (!empty($c)) {
-            $c->set(common_cache_key(self::cacheKey . ':' . $this->file), $out);
+            $c->set($cacheKey, $out);
         }
 
         $sec = session_cache_expire() * 60;
@@ -100,23 +97,20 @@ 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);
+                $this->clientError(_m('File type not supported.'),500);
                 return false;
         }
         return $out;
     }
 }
-