Found by bookmarklet: /' - + location.hash.substr(1).split(',').join(' | /') - + '
' + $('#bmUris').html('Found by bookmarklet: /' + + location.hash.substr(1).split(',').join(' | /') + + '
' ); $('#bmUris a').click(function () { MUB.addButtonClick(); - $('#sources li:last input').val(this.innerHTML) + $('#sources li:last input').val(this.innerHTML); MUB.liUpdateTestLink.call($('#sources li:last')[0]); $('#results').hide(); return false; @@ -228,24 +228,26 @@ var MUB = { } else { // setup bookmarklet 1 $.ajax({ - url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm.js').substr(1) - ,success : function (code) { + url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm.js').substr(1), + success : function (code) { $('#bm')[0].href = code .replace('%BUILDER_URL%', location.href) .replace(/\n/g, ' '); - } - ,dataType : 'text' + }, + dataType : 'text' }); - $.browser.msie && $('#getBm p:last').append(' Sorry, not supported in MSIE!'); + if ($.browser.msie) { + $('#getBm p:last').append(' Sorry, not supported in MSIE!'); + } MUB.addButtonClick(); } // setup bookmarklet 2 $.ajax({ - url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm2.js').substr(1) - ,success : function (code) { + url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm2.js').substr(1), + success : function (code) { $('#bm2')[0].href = code.replace(/\n/g, ' '); - } - ,dataType : 'text' + }, + dataType : 'text' }); MUB.checkRewrite(); } diff --git a/min/builder/bm2.js b/min/builder/bm2.js index db92172..6b558ce 100644 --- a/min/builder/bm2.js +++ b/min/builder/bm2.js @@ -1,15 +1,15 @@ javascript:(function(){ var d = document ,c = d.cookie - ,m = c.match(/\bminDebug=([^; ]+)/) + ,m = c.match(/\bminifyDebug=([^; ]+)/) ,v = m ? decodeURIComponent(m[1]) : '' ,p = prompt('Debug Minify URIs on ' + location.hostname + ' which contain:' - + '\n(empty for none, space = OR)', v) + + '\n(empty for none, space = OR, * = any string, ? = any char)', v) ; if (p === null) return; p = p.replace(/^\s+|\s+$/, ''); v = (p === '') - ? 'minDebug=; expires=Fri, 27 Jul 2001 02:47:11 UTC; path=/' - : 'minDebug=' + encodeURIComponent(p) + '; path=/'; + ? 'minifyDebug=; expires=Fri, 27 Jul 2001 02:47:11 UTC; path=/' + : 'minifyDebug=' + encodeURIComponent(p) + '; path=/'; d.cookie = v; })(); \ No newline at end of file diff --git a/min/builder/index.php b/min/builder/index.php index deb0fea..a3c4e2f 100644 --- a/min/builder/index.php +++ b/min/builder/index.php @@ -228,9 +228,6 @@ $(function () { $content = ob_get_clean(); // setup Minify -if (0 === stripos(PHP_OS, 'win')) { - Minify::setDocRoot(); // we may be on IIS -} Minify::setCache( isset($min_cachePath) ? $min_cachePath : '' ,$min_cacheFileLocking diff --git a/min/index.php b/min/index.php index 165c8d5..501c8a0 100644 --- a/min/index.php +++ b/min/index.php @@ -25,8 +25,7 @@ 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; @@ -36,18 +35,8 @@ foreach ($min_symlinks as $uri => $target) { } if ($min_allowDebugFlag) { - if (! empty($_COOKIE['minDebug'])) { - foreach (preg_split('/\\s+/', $_COOKIE['minDebug']) as $debugUri) { - if (false !== strpos($_SERVER['REQUEST_URI'], $debugUri)) { - $min_serveOptions['debug'] = true; - break; - } - } - } - // allow GET to override - if (isset($_GET['debug'])) { - $min_serveOptions['debug'] = true; - } + require_once 'Minify/DebugDetector.php'; + $min_serveOptions['debug'] = Minify_DebugDetector::shouldDebugRequest($_COOKIE, $_GET, $_SERVER['REQUEST_URI']); } if ($min_errorLogger) { diff --git a/min/lib/Minify.php b/min/lib/Minify.php index d70e32d..5baa181 100644 --- a/min/lib/Minify.php +++ b/min/lib/Minify.php @@ -59,7 +59,14 @@ class Minify { * @var string $importWarning */ public static $importWarning = "/* See http://code.google.com/p/minify/wiki/CommonProblems#@imports_can_appear_in_invalid_locations_in_combined_CSS_files */\n"; - + + /** + * Has the DOCUMENT_ROOT been set in user code? + * + * @var bool + */ + public static $isDocRootSet = false; + /** * Specify a cache object (with identical interface as Minify_Cache_File) or * a path to use with Minify_Cache_File. @@ -160,6 +167,10 @@ class Minify { */ public static function serve($controller, $options = array()) { + if (! self::$isDocRootSet && 0 === stripos(PHP_OS, 'win')) { + self::setDocRoot(); + } + if (is_string($controller)) { // make $controller into object $class = 'Minify_Controller_' . $controller; @@ -252,7 +263,6 @@ class Minify { if (self::$_options['contentType'] === self::TYPE_CSS && self::$_options['rewriteCssUris']) { - reset($controller->sources); foreach($controller->sources as $key => $source) { if ($source->filepath && !isset($source->minifyOptions['currentDir']) @@ -401,6 +411,7 @@ class Minify { require_once 'Minify/Logger.php'; Minify_Logger::log("setDocRoot() set DOCUMENT_ROOT to \"{$_SERVER['DOCUMENT_ROOT']}\""); } + self::$isDocRootSet = true; } /** diff --git a/min/lib/Minify/Controller/MinApp.php b/min/lib/Minify/Controller/MinApp.php index 986ef2c..2fb10f7 100644 --- a/min/lib/Minify/Controller/MinApp.php +++ b/min/lib/Minify/Controller/MinApp.php @@ -35,7 +35,7 @@ class Minify_Controller_MinApp extends Minify_Controller_Base { unset($options['minApp']); $sources = array(); $this->selectionId = ''; - $missingUri = ''; + $firstMissingResource = null; if (isset($_GET['g'])) { // add group(s) @@ -45,7 +45,8 @@ class Minify_Controller_MinApp extends Minify_Controller_Base { $this->log("Duplicate group key found."); return $options; } - foreach (explode(',', $_GET['g']) as $key) { + $keys = explode(',', $_GET['g']); + foreach ($keys as $key) { if (! isset($cOptions['groups'][$key])) { $this->log("A group configuration for \"{$key}\" was not found"); return $options; @@ -70,7 +71,14 @@ class Minify_Controller_MinApp extends Minify_Controller_Base { $sources[] = $this->_getFileSource($realpath, $cOptions); } else { $this->log("The path \"{$file}\" (realpath \"{$realpath}\") could not be found (or was not a file)"); - return $options; + if (null === $firstMissingResource) { + $firstMissingResource = basename($file); + continue; + } else { + $secondMissingResource = basename($file); + $this->log("More than one file was missing: '$firstMissingResource', '$secondMissingResource'"); + return $options; + } } } if ($sources) { @@ -135,11 +143,12 @@ class Minify_Controller_MinApp extends Minify_Controller_Base { $realpath = realpath($path); if (false === $realpath || ! is_file($realpath)) { $this->log("The path \"{$path}\" (realpath \"{$realpath}\") could not be found (or was not a file)"); - if (! $missingUri) { - $missingUri = $uri; + if (null === $firstMissingResource) { + $firstMissingResource = $uri; continue; } else { - $this->log("More than one file was missing: '$missingUri', '$uri'"); + $secondMissingResource = $uri; + $this->log("More than one file was missing: '$firstMissingResource', '$secondMissingResource`'"); return $options; } } @@ -159,11 +168,13 @@ class Minify_Controller_MinApp extends Minify_Controller_Base { $this->selectionId .= implode(',', $basenames) . $ext; } if ($sources) { - if ($missingUri) { + if (null !== $firstMissingResource) { array_unshift($sources, new Minify_Source(array( 'id' => 'missingFile' + // should not cause cache invalidation ,'lastModified' => 0 - ,'content' => "/* Minify: missing file '" . ltrim($missingUri, '/') . "' */\n" + // due to caching, filename is unreliable. + ,'content' => "/* Minify: at least one missing file. See " . Minify::URL_DEBUG . " */\n" ,'minifier' => '' ))); } diff --git a/min/lib/Minify/DebugDetector.php b/min/lib/Minify/DebugDetector.php new file mode 100644 index 0000000..1def974 --- /dev/null +++ b/min/lib/Minify/DebugDetector.php @@ -0,0 +1,26 @@ + + */ +class Minify_DebugDetector { + public static function shouldDebugRequest($cookie, $get, $requestUri) + { + if (isset($get['debug'])) { + return true; + } + if (! empty($cookie['minifyDebug'])) { + foreach (preg_split('/\\s+/', $cookie['minifyDebug']) as $debugUri) { + $pattern = '@' . preg_quote($debugUri, '@') . '@i'; + $pattern = str_replace(array('\\*', '\\?'), array('.*', '.'), $pattern); + if (preg_match($pattern, $requestUri)) { + return true; + } + } + } + return false; + } +}