Version 3.4.5

upload/public/min/lib/Minify/Controller/Base.php

@@ -27,7 +27,7 @@ abstract class Minify_Controller_Base {
      * 
      * @param array $options controller and Minify options
      * 
-     * return array $options Minify::serve options
+     * @return array $options Minify::serve options
      */
     abstract public function setupSources($options);
     
@@ -52,15 +52,16 @@ abstract class Minify_Controller_Base {
             ,'quiet' => false // serve() will send headers and output
             ,'debug' => false
             
-            // if you override this, the response code MUST be directly after 
+            // if you override these, the response codes MUST be directly after
             // the first space.
             ,'badRequestHeader' => 'HTTP/1.0 400 Bad Request'
+            ,'errorHeader'      => 'HTTP/1.0 500 Internal Server Error'
             
             // callback function to see/modify content of all sources
             ,'postprocessor' => null
             // file to require to load preprocessor
             ,'postprocessorRequire' => null
-        );/*noLibHook*/
+        );
     }  
 
     /**
@@ -100,7 +101,7 @@ abstract class Minify_Controller_Base {
             && is_string($minifierCallback[0])
             && !class_exists($minifierCallback[0], false)) {
             
-            require str_replace('_', '/', $minifierCallback[0]) . '.php';/*noLibHook*/
+            require str_replace('_', '/', $minifierCallback[0]) . '.php';
         }
     }
     
@@ -117,6 +118,8 @@ abstract class Minify_Controller_Base {
      * be in subdirectories of these directories.
      * 
      * @return bool file is safe
+     *
+     * @deprecated use checkAllowDirs, checkNotHidden instead
      */
     public static function _fileIsSafe($file, $safeDirs)
     {
@@ -134,15 +137,58 @@ abstract class Minify_Controller_Base {
         list($revExt) = explode('.', strrev($base));
         return in_array(strrev($revExt), array('js', 'css', 'html', 'txt'));
     }
-    
+
     /**
-     * @var array instances of Minify_Source, which provide content and
-     * any individual minification needs.
+     * @param string $file
+     * @param array $allowDirs
+     * @param string $uri
+     * @return bool
+     * @throws Exception
+     */
+    public static function checkAllowDirs($file, $allowDirs, $uri)
+    {
+        foreach ((array)$allowDirs as $allowDir) {
+            if (strpos($file, $allowDir) === 0) {
+                return true;
+            }
+        }
+        throw new Exception("File '$file' is outside \$allowDirs. If the path is"
+            . " resolved via an alias/symlink, look into the \$min_symlinks option."
+            . " E.g. \$min_symlinks['/" . dirname($uri) . "'] = '" . dirname($file) . "';");
+    }
+
+    /**
+     * @param string $file
+     * @throws Exception
+     */
+    public static function checkNotHidden($file)
+    {
+        $b = basename($file);
+        if (0 === strpos($b, '.')) {
+            throw new Exception("Filename '$b' starts with period (may be hidden)");
+        }
+    }
+
+    /**
+     * instances of Minify_Source, which provide content and any individual minification needs.
+     *
+     * @var array
      * 
      * @see Minify_Source
      */
     public $sources = array();
     
+    /**
+     * Short name to place inside cache id
+     *
+     * The setupSources() method may choose to set this, making it easier to
+     * recognize a particular set of sources/settings in the cache folder. It
+     * will be filtered and truncated to make the final cache id <= 250 bytes.
+     * 
+     * @var string
+     */
+    public $selectionId = '';
+
     /**
      * Mix in default controller options with user-given options
      * 
@@ -192,11 +238,13 @@ abstract class Minify_Controller_Base {
 
     /**
      * Send message to the Minify logger
+     *
      * @param string $msg
+     *
      * @return null
      */
-    protected function log($msg) {
-        require_once 'Minify/Logger.php';/*noLibHook*/
+    public function log($msg) {
+        require_once 'Minify/Logger.php';
         Minify_Logger::log($msg);
     }
 }