Version 3.4.5

upload/public/min/index.php

@@ -10,12 +10,12 @@
 define('MINIFY_MIN_DIR', dirname(__FILE__));
 
 // load config
-require MINIFY_MIN_DIR . '/config.php';/*noLibHook*/
+require MINIFY_MIN_DIR . '/config.php';
 
 // setup include path
-set_include_path($min_libPath . PATH_SEPARATOR . get_include_path());/*noLibHook*/
+set_include_path($min_libPath . PATH_SEPARATOR . get_include_path());
 
-require 'Minify.php';/*noLibHook*/
+require 'Minify.php';
 
 Minify::$uploaderHoursBehind = $min_uploaderHoursBehind;
 Minify::setCache(
@@ -25,24 +25,27 @@ Minify::setCache(
 
 if ($min_documentRoot) {
     $_SERVER['DOCUMENT_ROOT'] = $min_documentRoot;
-} elseif (0 === stripos(PHP_OS, 'win')) {
-    Minify::setDocRoot(); // IIS may need help
+    Minify::$isDocRootSet = true;
 }
 
 $min_serveOptions['minifierOptions']['text/css']['symlinks'] = $min_symlinks;
+// auto-add targets to allowDirs
+foreach ($min_symlinks as $uri => $target) {
+    $min_serveOptions['minApp']['allowDirs'][] = $target;
+}
 
-if ($min_allowDebugFlag && isset($_GET['debug'])) {
-    $min_serveOptions['debug'] = true;
+if ($min_allowDebugFlag) {
+    require_once 'Minify/DebugDetector.php';
+    $min_serveOptions['debug'] = Minify_DebugDetector::shouldDebugRequest($_COOKIE, $_GET, $_SERVER['REQUEST_URI']);
 }
 
 if ($min_errorLogger) {
-    require_once 'Minify/Logger.php';/*noLibHook*/
+    require_once 'Minify/Logger.php';
     if (true === $min_errorLogger) {
-        require_once 'FirePHP.php';/*noLibHook*/
-        Minify_Logger::setLogger(FirePHP::getInstance(true));
-    } else {
-        Minify_Logger::setLogger($min_errorLogger);
+        require_once 'FirePHP.php';
+        $min_errorLogger = FirePHP::getInstance(true);
     }
+    Minify_Logger::setLogger($min_errorLogger);
 }
 
 // check for URI versioning
@@ -51,11 +54,16 @@ if (preg_match('/&\\d/', $_SERVER['QUERY_STRING'])) {
 }
 if (isset($_GET['g'])) {
     // well need groups config
-    $min_serveOptions['minApp']['groups'] = (require MINIFY_MIN_DIR . '/groupsConfig.php');/*noLibHook*/
+    $min_serveOptions['minApp']['groups'] = (require MINIFY_MIN_DIR . '/groupsConfig.php');
 }
 if (isset($_GET['f']) || isset($_GET['g'])) {
     // serve!   
-    Minify::serve('MinApp', $min_serveOptions);
+
+    if (! isset($min_serveController)) {
+        require 'Minify/Controller/MinApp.php';
+        $min_serveController = new Minify_Controller_MinApp();
+    }
+    Minify::serve($min_serveController, $min_serveOptions);
         
 } elseif ($min_enableBuilder) {
     header('Location: builder/');
@@ -63,4 +71,4 @@ if (isset($_GET['f']) || isset($_GET['g'])) {
 } else {
     header("Location: /");
     exit();
-}
+}