diff options
41 files changed, 0 insertions, 8813 deletions
diff --git a/mod/minify/lib/min/.htaccess b/mod/minify/lib/min/.htaccess deleted file mode 100644 index 42f13eb23..000000000 --- a/mod/minify/lib/min/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ -<IfModule mod_rewrite.c> -RewriteEngine on -RewriteRule ^([a-z]=.*) index.php?$1 [L,NE] -</IfModule>
\ No newline at end of file diff --git a/mod/minify/lib/min/README.txt b/mod/minify/lib/min/README.txt deleted file mode 100644 index 0a9143018..000000000 --- a/mod/minify/lib/min/README.txt +++ /dev/null @@ -1,132 +0,0 @@ -The files in this directory represent the default Minify setup designed to ease -integration with your site. This app will combine and minify your Javascript or -CSS files and serve them with HTTP compression and cache headers. - - -RECOMMENDED - -It's recommended to edit config.php to set $min_cachePath to a writeable -(by PHP) directory on your system. This will improve performance. - - -GETTING STARTED - -The quickest way to get started is to use the Minify URI Builder application -on your website: http://example.com/min/builder/ - - -MINIFYING A SINGLE FILE - -Let's say you want to serve this file: - http://example.com/wp-content/themes/default/default.css - -Here's the "Minify URL" for this file: - http://example.com/min/?f=wp-content/themes/default/default.css - -In other words, the "f" argument is set to the file path from root without the -initial "/". As CSS files may contain relative URIs, Minify will automatically -"fix" these by rewriting them as root relative. - - -COMBINING MULTIPLE FILES IN ONE DOWNLOAD - -Separate the paths given to "f" with commas. - -Let's say you have CSS files at these URLs: - http://example.com/scripts/jquery-1.2.6.js - http://example.com/scripts/site.js - -You can combine these files through Minify by requesting this URL: - http://example.com/min/?f=scripts/jquery-1.2.6.js,scripts/site.js - - -SIMPLIFYING URLS WITH A BASE PATH - -If you're combining files that share the same ancestor directory, you can use -the "b" argument to set the base directory for the "f" argument. Do not include -the leading or trailing "/" characters. - -E.g., the following URLs will serve the exact same content: - http://example.com/min/?f=scripts/jquery-1.2.6.js,scripts/site.js,scripts/home.js - http://example.com/min/?b=scripts&f=jquery-1.2.6.js,site.js,home.js - - -MINIFY URLS IN HTML - -In (X)HTML files, don't forget to replace any "&" characters with "&". - - -SPECIFYING ALLOWED DIRECTORIES - -By default, Minify will serve any *.css/*.js files within the DOCUMENT_ROOT. If -you'd prefer to limit Minify's access to certain directories, set the -$min_serveOptions['minApp']['allowDirs'] array in config.php. E.g. to limit -to the /js and /themes/default directories, use: - -$min_serveOptions['minApp']['allowDirs'] = array('//js', '//themes/default'); - - -GROUPS: FASTER PERFORMANCE AND BETTER URLS - -For the best performance, edit groupsConfig.php to pre-specify groups of files -to be combined under preset keys. E.g., here's an example configuration in -groupsConfig.php: - -return array( - 'js' => array('//js/Class.js', '//js/email.js') -); - -This pre-selects the following files to be combined under the key "js": - http://example.com/js/Class.js - http://example.com/js/email.js - -You can now serve these files with this simple URL: - http://example.com/min/?g=js - - -GROUPS: SPECIFYING FILES OUTSIDE THE DOC_ROOT - -In the groupsConfig.php array, the "//" in the file paths is a shortcut for -the DOCUMENT_ROOT, but you can also specify paths from the root of the filesystem -or relative to the DOC_ROOT: - -return array( - 'js' => array( - '//js/file.js' // file within DOC_ROOT - ,'//../file.js' // file in parent directory of DOC_ROOT - ,'C:/Users/Steve/file.js' // file anywhere on filesystem - ) -); - - -FAR-FUTURE EXPIRES HEADERS - -Minify can send far-future (one year) Expires headers. To enable this you must -add a number to the querystring (e.g. /min/?g=js&1234 or /min/f=file.js&1234) -and alter it whenever a source file is changed. If you have a build process you -can use a build/source control revision number. - -If you serve files as a group, you can use the utility function Minify_groupUri() -to get a "versioned" Minify URI for use in your HTML. E.g.: - -<?php -// add /min/lib to your include_path first! -require $_SERVER['DOCUMENT_ROOT'] . '/min/utils.php'; - -$jsUri = Minify_groupUri('js'); -echo "<script type='text/javascript' src='{$jsUri}'></script>"; - - -DEBUG MODE - -In debug mode, instead of compressing files, Minify sends combined files with -comments prepended to each line to show the line number in the original source -file. To enable this, set $min_allowDebugFlag to true in config.php and append -"&debug=1" to your URIs. E.g. /min/?f=script1.js,script2.js&debug=1 - -Known issue: files with comment-like strings/regexps can cause problems in this mode. - - -QUESTIONS? - -http://groups.google.com/group/minify
\ No newline at end of file diff --git a/mod/minify/lib/min/builder/_index.js b/mod/minify/lib/min/builder/_index.js deleted file mode 100644 index 8e5313a3b..000000000 --- a/mod/minify/lib/min/builder/_index.js +++ /dev/null @@ -1,242 +0,0 @@ -var MUB = { - _uid : 0 - ,_minRoot : '/min/?' - ,checkRewrite : function () { - var testUri = location.pathname.replace(/\/[^\/]*$/, '/rewriteTest.js').substr(1); - function fail() { - $('#minRewriteFailed')[0].className = 'topNote'; - }; - $.ajax({ - url : '../f=' + testUri + '&' + (new Date()).getTime() - ,success : function (data) { - if (data === '1') { - MUB._minRoot = '/min/'; - $('span.minRoot').html('/min/'); - } else - fail(); - } - ,error : fail - }); - } - /** - * Get markup for new source LI element - */ - ,newLi : function () { - return '<li id="li' + MUB._uid + '">http://' + location.host + '/<input type=text size=20>' - + ' <button title="Remove">x</button> <button title="Include Earlier">↑</button>' - + ' <button title="Include Later">↓</button> <span></span></li>'; - } - /** - * Add new empty source LI and attach handlers to buttons - */ - ,addLi : function () { - $('#sources').append(MUB.newLi()); - var li = $('#li' + MUB._uid)[0]; - $('button[title=Remove]', li).click(function () { - $('#results').hide(); - var hadValue = !!$('input', li)[0].value; - $(li).remove(); - }); - $('button[title$=Earlier]', li).click(function () { - $(li).prev('li').find('input').each(function () { - $('#results').hide(); - // this = previous li input - var tmp = this.value; - this.value = $('input', li).val(); - $('input', li).val(tmp); - MUB.updateAllTestLinks(); - }); - }); - $('button[title$=Later]', li).click(function () { - $(li).next('li').find('input').each(function () { - $('#results').hide(); - // this = next li input - var tmp = this.value; - this.value = $('input', li).val(); - $('input', li).val(tmp); - MUB.updateAllTestLinks(); - }); - }); - ++MUB._uid; - } - /** - * In the context of a source LI element, this will analyze the URI in - * the INPUT and check the URL on the site. - */ - ,liUpdateTestLink : function () { // call in context of li element - if (! $('input', this)[0].value) - return; - var li = this; - $('span', this).html(''); - var url = 'http://' + location.host + '/' - + $('input', this)[0].value.replace(/^\//, ''); - $.ajax({ - url : url - ,complete : function (xhr, stat) { - if ('success' == stat) - $('span', li).html('✓'); - else { - $('span', li).html('<button><b>404! </b> recheck</button>') - .find('button').click(function () { - MUB.liUpdateTestLink.call(li); - }); - } - } - ,dataType : 'text' - }); - } - /** - * Check all source URLs - */ - ,updateAllTestLinks : function () { - $('#sources li').each(MUB.liUpdateTestLink); - } - /** - * In a given array of strings, find the character they all have at - * a particular index - * @param Array arr array of strings - * @param Number pos index to check - * @return mixed a common char or '' if any do not match - */ - ,getCommonCharAtPos : function (arr, pos) { - var i - ,l = arr.length - ,c = arr[0].charAt(pos); - if (c === '' || l === 1) - return c; - for (i = 1; i < l; ++i) - if (arr[i].charAt(pos) !== c) - return ''; - return c; - } - /** - * Get the shortest URI to minify the set of source files - * @param Array sources URIs - */ - ,getBestUri : function (sources) { - var pos = 0 - ,base = '' - ,c; - while (true) { - c = MUB.getCommonCharAtPos(sources, pos); - if (c === '') - break; - else - base += c; - ++pos; - } - base = base.replace(/[^\/]+$/, ''); - var uri = MUB._minRoot + 'f=' + sources.join(','); - if (base.charAt(base.length - 1) === '/') { - // we have a base dir! - var basedSources = sources - ,i - ,l = sources.length; - for (i = 0; i < l; ++i) { - basedSources[i] = sources[i].substr(base.length); - } - base = base.substr(0, base.length - 1); - var bUri = MUB._minRoot + 'b=' + base + '&f=' + basedSources.join(','); - //window.console && console.log([uri, bUri]); - uri = uri.length < bUri.length - ? uri - : bUri; - } - return uri; - } - /** - * Create the Minify URI for the sources - */ - ,update : function () { - MUB.updateAllTestLinks(); - var sources = [] - ,ext = false - ,fail = false; - $('#sources input').each(function () { - var m, val; - if (! fail && this.value && (m = this.value.match(/\.(css|js)$/))) { - var thisExt = m[1]; - if (ext === false) - ext = thisExt; - else if (thisExt !== ext) { - fail = true; - return alert('extensions must match!'); - } - this.value = this.value.replace(/^\//, ''); - if (-1 != $.inArray(this.value, sources)) { - fail = true; - return alert('duplicate file!'); - } - sources.push(this.value); - } - }); - if (fail || ! sources.length) - return; - $('#groupConfig').val(" 'keyName' => array('//" + sources.join("', '//") + "'),"); - var uri = MUB.getBestUri(sources) - ,uriH = uri.replace(/</, '<').replace(/>/, '>').replace(/&/, '&'); - $('#uriA').html(uriH)[0].href = uri; - $('#uriHtml').val( - ext === 'js' - ? '<script type="text/javascript" src="' + uriH + '"></script>' - : '<link type="text/css" rel="stylesheet" href="' + uriH + '" />' - ); - $('#results').show(); - } - /** - * Handler for the "Add file +" button - */ - ,addButtonClick : function () { - $('#results').hide(); - MUB.addLi(); - MUB.updateAllTestLinks(); - $('#update').show().click(MUB.update); - $('#sources li:last input')[0].focus(); - } - /** - * Runs on DOMready - */ - ,init : function () { - $('#app').show(); - $('#sources').html(''); - $('#add button').click(MUB.addButtonClick); - // make easier to copy text out of - $('#uriHtml, #groupConfig').click(function () { - this.select(); - }).focus(function () { - this.select(); - }); - $('a.ext').attr({target:'_blank'}); - if (location.hash) { - // make links out of URIs from bookmarklet - $('#getBm').hide(); - $('#bmUris').html('<p><strong>Found by bookmarklet:</strong> /<a href=#>' - + location.hash.substr(1).split(',').join('</a> | /<a href=#>') - + '</a></p>' - ); - $('#bmUris a').click(function () { - MUB.addButtonClick(); - $('#sources li:last input').val(this.innerHTML) - MUB.liUpdateTestLink.call($('#sources li:last')[0]); - $('#results').hide(); - return false; - }).attr({title:'Add file +'}); - } else { - // copy bookmarklet code into href - var bmUri = location.pathname.replace(/\/[^\/]*$/, '/bm.js').substr(1); - $.ajax({ - url : '../?f=' + bmUri - ,success : function (code) { - $('#bm')[0].href = code - .replace('%BUILDER_URL%', location.href) - .replace(/\n/g, ' '); - } - ,dataType : 'text' - }); - $.browser.msie && $('#getBm p:last').append(' Sorry, not supported in MSIE!'); - MUB.addButtonClick(); - } - MUB.checkRewrite(); - } -}; -window.onload = MUB.init;
\ No newline at end of file diff --git a/mod/minify/lib/min/builder/bm.js b/mod/minify/lib/min/builder/bm.js deleted file mode 100644 index 10d194381..000000000 --- a/mod/minify/lib/min/builder/bm.js +++ /dev/null @@ -1,36 +0,0 @@ -javascript:(function() { - var d = document - ,uris = [] - ,i = 0 - ,o - ,home = (location + '').split('/').splice(0, 3).join('/') + '/'; - function add(uri) { - return (0 === uri.indexOf(home)) - && (!/[\?&]/.test(uri)) - && uris.push(escape(uri.substr(home.length))); - }; - function sheet(ss) { - // we must check the domain with add() before accessing ss.cssRules - // otherwise a security exception will be thrown - if (ss.href && add(ss.href) && ss.cssRules) { - var i = 0, r; - while (r = ss.cssRules[i++]) - r.styleSheet && sheet(r.styleSheet); - } - }; - while (o = d.getElementsByTagName('script')[i++]) - o.src && !(o.type && /vbs/i.test(o.type)) && add(o.src); - i = 0; - while (o = d.styleSheets[i++]) - /* http://www.w3.org/TR/DOM-Level-2-Style/stylesheets.html#StyleSheets-DocumentStyle-styleSheets - document.styleSheet is a list property where [0] accesses the 1st element and - [outOfRange] returns null. In IE, styleSheets is a function, and also throws an - exception when you check the out of bounds index. (sigh) */ - sheet(o); - if (uris.length) - window.open('%BUILDER_URL%#' + uris.join(',')); - else - alert('No js/css files found with URLs within "' - + home.split('/')[2] - + '".\n(This tool is limited to URLs with the same domain.)'); -})();
\ No newline at end of file diff --git a/mod/minify/lib/min/builder/index.php b/mod/minify/lib/min/builder/index.php deleted file mode 100644 index b24286f09..000000000 --- a/mod/minify/lib/min/builder/index.php +++ /dev/null @@ -1,182 +0,0 @@ -<?php - -if (phpversion() < 5) { - exit('Minify requires PHP5 or greater.'); -} - -// check for auto-encoding -$encodeOutput = (function_exists('gzdeflate') - && !ini_get('zlib.output_compression')); - -require dirname(__FILE__) . '/../config.php'; - -if (! $min_enableBuilder) { - header('Location: /'); - exit(); -} - -ob_start(); -?> -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<head> - <meta name="ROBOTS" content="NOINDEX, NOFOLLOW"> - <title>Minify URI Builder</title> - <style type="text/css"> -body {margin:1em 60px;} -h1, h2, h3 {margin-left:-25px; position:relative;} -h1 {margin-top:0;} -#sources {margin:0; padding:0;} -#sources li {margin:0 0 0 40px} -#sources li input {margin-left:2px} -#add {margin:5px 0 1em 40px} -.hide {display:none} -#uriTable {border-collapse:collapse;} -#uriTable td, #uriTable th {padding-top:10px;} -#uriTable th {padding-right:10px;} -#groupConfig {font-family:monospace;} -b {color:#c00} -.topNote {background: #ff9; display:inline-block; padding:.5em .6em; margin:0 0 1em;} -.topWarning {background:#c00; color:#fff; padding:.5em .6em; margin:0 0 1em;} - </style> -</head> - -<?php if (! isset($min_cachePath)): ?> -<p class=topNote><strong>Note:</strong> Please set <code>$min_cachePath</code> -in /min/config.php to improve performance.</p> -<?php endIf; ?> - -<p id=minRewriteFailed class="hide"><strong>Note:</strong> Your webserver does not seem to -support mod_rewrite (used in /min/.htaccess). Your Minify URIs will contain "?", which -<a href="http://www.stevesouders.com/blog/2008/08/23/revving-filenames-dont-use-querystring/" ->may reduce the benefit of proxy cache servers</a>.</p> - -<h1>Minify URI Builder</h1> - -<noscript><p class="topNote">Javascript and a browser supported by jQuery 1.2.6 is required -for this application.</p></noscript> - -<div id=app class=hide> - -<p>Create a list of Javascript or CSS files (or 1 is fine) you'd like to combine -and click [Update].</p> - -<ol id=sources><li></li></ol> -<div id=add><button>Add file +</button></div> - -<div id=bmUris></div> - -<p><button id=update class=hide>Update</button></p> - -<div id=results class=hide> - -<h2>Minify URI</h2> -<p>Place this URI in your HTML to serve the files above combined, minified, compressed and -with cache headers.</p> -<table id=uriTable> - <tr><th>URI</th><td><a id=uriA class=ext>/min</a> <small>(opens in new window)</small></td></tr> - <tr><th>HTML</th><td><input id=uriHtml type=text size=100 readonly></td></tr> -</table> - -<h2>How to serve these files as a group</h2> -<p>For the best performance you can serve these files as a pre-defined group with a URI -like: <code><span class=minRoot>/min/?</span>g=keyName</code></p> -<p>To do this, add a line like this to /min/groupsConfig.php:</p> - -<pre><code>return array( - <span style="color:#666">... your existing groups here ...</span> -<input id=groupConfig size=100 type=text readonly> -);</code></pre> - -<p><em>Make sure to replace <code>keyName</code> with a unique key for this group.</em></p> -</div> - -<div id=getBm> -<h3>Find URIs on a Page</h3> -<p>You can use the bookmarklet below to fetch all CSS & Javascript URIs from a page -on your site. When you active it, this page will open in a new window with a list of -available URIs to add.</p> - -<p><a id=bm>Create Minify URIs</a> <small>(right-click, add to bookmarks)</small></p> -</div> - -<h3>Combining CSS files that contain <code>@import</code></h3> -<p>If your CSS files contain <code>@import</code> declarations, Minify will not -remove them. Therefore, you will want to remove those that point to files already -in your list, and move any others to the top of the first file in your list -(imports below any styles will be ignored by browsers as invalid).</p> -<p>If you desire, you can use Minify URIs in imports and they will not be touched -by Minify. E.g. <code>@import "<span class=minRoot>/min/?</span>g=css2";</code></p> - -</div><!-- #app --> - -<hr> -<p>Need help? Search or post to the <a class=ext -href="http://groups.google.com/group/minify">Minify discussion list</a>.</p> -<p><small>This app is minified :) <a class=ext -href="http://code.google.com/p/minify/source/browse/trunk/min/builder/index.php">view -source</a></small></p> - -<script type="text/javascript" -src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js"></script> - -<script type="text/javascript"> -$(function () { - // detection of double output encoding - var msg = '<\p class=topWarning><\strong>Warning:<\/strong> '; - var url = 'ocCheck.php?' + (new Date()).getTime(); - $.get(url, function (ocStatus) { - $.get(url + '&hello=1', function (ocHello) { - if (ocHello != 'World!') { - msg += 'It appears output is being automatically compressed, interfering ' - + ' with Minify\'s own compression. '; - if (ocStatus == '1') - msg += 'The option "zlib.output_compression" is enabled in your PHP configuration. ' - + 'Minify set this to "0", but it had no effect. This option must be disabled ' - + 'in php.ini or .htaccess.'; - else - msg += 'The option "zlib.output_compression" is disabled in your PHP configuration ' - + 'so this behavior is likely due to a server option.'; - $(document.body).prepend(msg + '<\/p>'); - } else - if (ocStatus == '1') - $(document.body).prepend('<\p class=topNote><\strong>Note:</\strong> The option ' - + '"zlib.output_compression" is enabled in your PHP configuration, but has been ' - + 'successfully disabled via ini_set(). If you experience mangled output you ' - + 'may want to consider disabling this option in your PHP configuration.<\/p>' - ); - }); - }); -}); -</script> -<script type="text/javascript"> - // workaround required to test when /min isn't child of web root - var src = location.pathname.replace(/\/[^\/]*$/, '/_index.js').substr(1); - document.write('<\script type="text/javascript" src="../?f=' + src + '"><\/script>'); -</script> - -<?php - -$serveOpts = array( - 'content' => ob_get_contents() - ,'id' => __FILE__ - ,'lastModifiedTime' => max( - // regenerate cache if either of these change - filemtime(__FILE__) - ,filemtime(dirname(__FILE__) . '/../config.php') - ) - ,'minifyAll' => true - ,'encodeOutput' => $encodeOutput -); -ob_end_clean(); - -set_include_path(dirname(__FILE__) . '/../lib' . PATH_SEPARATOR . get_include_path()); - -require 'Minify.php'; - -if (0 === stripos(PHP_OS, 'win')) { - Minify::setDocRoot(); // we may be on IIS -} -Minify::setCache(isset($min_cachePath) ? $min_cachePath : null); -Minify::$uploaderHoursBehind = $min_uploaderHoursBehind; - -Minify::serve('Page', $serveOpts); diff --git a/mod/minify/lib/min/builder/ocCheck.php b/mod/minify/lib/min/builder/ocCheck.php deleted file mode 100644 index 8cc19af8b..000000000 --- a/mod/minify/lib/min/builder/ocCheck.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php -/** - * AJAX checks for zlib.output_compression - * - * @package Minify - */ - -$_oc = ini_get('zlib.output_compression'); - -// allow access only if builder is enabled -require dirname(__FILE__) . '/../config.php'; -if (! $min_enableBuilder) { - header('Location: /'); - exit(); -} - -if (isset($_GET['hello'])) { - // echo 'World!' - - // try to prevent double encoding (may not have an effect) - ini_set('zlib.output_compression', '0'); - - require $min_libPath . '/HTTP/Encoder.php'; - HTTP_Encoder::$encodeToIe6 = true; // just in case - $he = new HTTP_Encoder(array( - 'content' => 'World!' - ,'method' => 'deflate' - )); - $he->encode(); - $he->sendAll(); - -} else { - // echo status "0" or "1" - header('Content-Type: text/plain'); - echo (int)$_oc; -} diff --git a/mod/minify/lib/min/builder/rewriteTest.js b/mod/minify/lib/min/builder/rewriteTest.js deleted file mode 100644 index 56a6051ca..000000000 --- a/mod/minify/lib/min/builder/rewriteTest.js +++ /dev/null @@ -1 +0,0 @@ -1
\ No newline at end of file diff --git a/mod/minify/lib/min/config.php b/mod/minify/lib/min/config.php deleted file mode 100644 index 00605f856..000000000 --- a/mod/minify/lib/min/config.php +++ /dev/null @@ -1,155 +0,0 @@ -<?php -/** - * Configuration for default Minify application - * @package Minify - */ - -/** - * In 'debug' mode, Minify can combine files with no minification and - * add comments to indicate line #s of the original files. - * - * To allow debugging, set this option to true and add "&debug=1" to - * a URI. E.g. /min/?f=script1.js,script2.js&debug=1 - */ -$min_allowDebugFlag = true; - - -/** - * Set to true to log messages to FirePHP (Firefox Firebug addon). - * Set to false for no error logging (Minify may be slightly faster). - * @link http://www.firephp.org/ - * - * If you want to use a custom error logger, set this to your logger - * instance. Your object should have a method log(string $message). - * - * @todo cache system does not have error logging yet. - */ -$min_errorLogger = false; - - -/** - * Allow use of the Minify URI Builder app. If you no longer need - * this, set to false. - **/ -$min_enableBuilder = true; - - -/** - * For best performance, specify your temp directory here. Otherwise Minify - * will have to load extra code to guess. Some examples below: - */ -//$min_cachePath = 'c:\\WINDOWS\\Temp'; -//$min_cachePath = '/tmp'; -//$min_cachePath = preg_replace('/^\\d+;/', '', session_save_path()); - - -/** - * Leave an empty string to use PHP's $_SERVER['DOCUMENT_ROOT']. - * - * On some servers, this value may be misconfigured or missing. If so, set this - * to your full document root path with no trailing slash. - * E.g. '/home/accountname/public_html' or 'c:\\xampp\\htdocs' - * - * If /min/ is directly inside your document root, just uncomment the - * second line. The third line might work on some Apache servers. - */ -$min_documentRoot = dirname(dirname(dirname(dirname(dirname(__FILE__))))); -//$min_documentRoot = substr(__FILE__, 0, strlen(__FILE__) - 15); -//$min_documentRoot = $_SERVER['SUBDOMAIN_DOCUMENT_ROOT']; - - -/** - * Cache file locking. Set to false if filesystem is NFS. On at least one - * NFS system flock-ing attempts stalled PHP for 30 seconds! - */ -$min_cacheFileLocking = true; - - -/** - * Combining multiple CSS files can place @import declarations after rules, which - * is invalid. Minify will attempt to detect when this happens and place a - * warning comment at the top of the CSS output. To resolve this you can either - * move the @imports within your CSS files, or enable this option, which will - * move all @imports to the top of the output. Note that moving @imports could - * affect CSS values (which is why this option is disabled by default). - */ -$min_serveOptions['bubbleCssImports'] = false; - - -/** - * Maximum age of browser cache in seconds. After this period, the browser - * will send another conditional GET. Use a longer period for lower traffic - * but you may want to shorten this before making changes if it's crucial - * those changes are seen immediately. - * - * Note: Despite this setting, if you include a number at the end of the - * querystring, maxAge will be set to one year. E.g. /min/f=hello.css&123456 - */ -$min_serveOptions['maxAge'] = 86400; - - -/** - * If you'd like to restrict the "f" option to files within/below - * particular directories below DOCUMENT_ROOT, set this here. - * You will still need to include the directory in the - * f or b GET parameters. - * - * // = shortcut for DOCUMENT_ROOT - */ -//$min_serveOptions['minApp']['allowDirs'] = array('//js', '//css'); - -/** - * Set to true to disable the "f" GET parameter for specifying files. - * Only the "g" parameter will be considered. - */ -$min_serveOptions['minApp']['groupsOnly'] = false; - -/** - * Maximum # of files that can be specified in the "f" GET parameter - */ -$min_serveOptions['minApp']['maxFiles'] = 10; - - -/** - * If you minify CSS files stored in symlink-ed directories, the URI rewriting - * algorithm can fail. To prevent this, provide an array of link paths to - * target paths, where the link paths are within the document root. - * - * Because paths need to be normalized for this to work, use "//" to substitute - * the doc root in the link paths (the array keys). E.g.: - * <code> - * array('//symlink' => '/real/target/path') // unix - * array('//static' => 'D:\\staticStorage') // Windows - * </code> - */ -$min_symlinks = array(); - - -/** - * If you upload files from Windows to a non-Windows server, Windows may report - * incorrect mtimes for the files. This may cause Minify to keep serving stale - * cache files when source file changes are made too frequently (e.g. more than - * once an hour). - * - * Immediately after modifying and uploading a file, use the touch command to - * update the mtime on the server. If the mtime jumps ahead by a number of hours, - * set this variable to that number. If the mtime moves back, this should not be - * needed. - * - * In the Windows SFTP client WinSCP, there's an option that may fix this - * issue without changing the variable below. Under login > environment, - * select the option "Adjust remote timestamp with DST". - * @link http://winscp.net/eng/docs/ui_login_environment#daylight_saving_time - */ -$min_uploaderHoursBehind = 0; - - -/** - * Path to Minify's lib folder. If you happen to move it, change - * this accordingly. - */ -$min_libPath = dirname(__FILE__) . '/lib'; - - -// try to disable output_compression (may not have an effect) -ini_set('zlib.output_compression', '0'); diff --git a/mod/minify/lib/min/groupsConfig.php b/mod/minify/lib/min/groupsConfig.php deleted file mode 100644 index 9e2514d7a..000000000 --- a/mod/minify/lib/min/groupsConfig.php +++ /dev/null @@ -1,34 +0,0 @@ -<?php -/** - * Groups configuration for default Minify implementation - * @package Minify - */ - -/** - * You may wish to use the Minify URI Builder app to suggest - * changes. http://yourdomain/min/builder/ - **/ - -return array( - // 'js' => array('//js/file1.js', '//js/file2.js'), - // 'css' => array('//css/file1.css', '//css/file2.css'), - - // custom source example - /*'js2' => array( - dirname(__FILE__) . '/../min_unit_tests/_test_files/js/before.js', - // do NOT process this file - new Minify_Source(array( - 'filepath' => dirname(__FILE__) . '/../min_unit_tests/_test_files/js/before.js', - 'minifier' => create_function('$a', 'return $a;') - )) - ),//*/ - - /*'js3' => array( - dirname(__FILE__) . '/../min_unit_tests/_test_files/js/before.js', - // do NOT process this file - new Minify_Source(array( - 'filepath' => dirname(__FILE__) . '/../min_unit_tests/_test_files/js/before.js', - 'minifier' => array('Minify_Packer', 'minify') - )) - ),//*/ -);
\ No newline at end of file diff --git a/mod/minify/lib/min/index.php b/mod/minify/lib/min/index.php deleted file mode 100644 index 51c352569..000000000 --- a/mod/minify/lib/min/index.php +++ /dev/null @@ -1,66 +0,0 @@ -<?php -/** - * Front controller for default Minify implementation - * - * DO NOT EDIT! Configure this utility via config.php and groupsConfig.php - * - * @package Minify - */ - -define('MINIFY_MIN_DIR', dirname(__FILE__)); - -// load config -require MINIFY_MIN_DIR . '/config.php'; - -// setup include path -set_include_path($min_libPath . PATH_SEPARATOR . get_include_path()); - -require 'Minify.php'; - -Minify::$uploaderHoursBehind = $min_uploaderHoursBehind; -Minify::setCache( - isset($min_cachePath) ? $min_cachePath : '' - ,$min_cacheFileLocking -); - -if ($min_documentRoot) { - $_SERVER['DOCUMENT_ROOT'] = $min_documentRoot; -} elseif (0 === stripos(PHP_OS, 'win')) { - Minify::setDocRoot(); // IIS may need help -} - -$min_serveOptions['minifierOptions']['text/css']['symlinks'] = $min_symlinks; - -if ($min_allowDebugFlag && isset($_GET['debug'])) { - $min_serveOptions['debug'] = true; -} - -if ($min_errorLogger) { - require_once 'Minify/Logger.php'; - if (true === $min_errorLogger) { - require_once 'FirePHP.php'; - Minify_Logger::setLogger(FirePHP::getInstance(true)); - } else { - Minify_Logger::setLogger($min_errorLogger); - } -} - -// check for URI versioning -if (preg_match('/&\\d/', $_SERVER['QUERY_STRING'])) { - $min_serveOptions['maxAge'] = 31536000; -} -if (isset($_GET['g'])) { - // well need groups config - $min_serveOptions['minApp']['groups'] = (require MINIFY_MIN_DIR . '/groupsConfig.php'); -} -if (isset($_GET['f']) || isset($_GET['g'])) { - // serve! - Minify::serve('MinApp', $min_serveOptions); - -} elseif ($min_enableBuilder) { - header('Location: builder/'); - exit(); -} else { - header("Location: /"); - exit(); -} diff --git a/mod/minify/lib/min/lib/CSS.php b/mod/minify/lib/min/lib/CSS.php deleted file mode 100644 index 9f1416e95..000000000 --- a/mod/minify/lib/min/lib/CSS.php +++ /dev/null @@ -1,83 +0,0 @@ -<?php -/** - * Class Minify_CSS - * @package Minify - */ - -/** - * Minify CSS - * - * This class uses Minify_CSS_Compressor and Minify_CSS_UriRewriter to - * minify CSS and rewrite relative URIs. - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - * @author http://code.google.com/u/1stvamp/ (Issue 64 patch) - */ -class Minify_CSS { - - /** - * Minify a CSS string - * - * @param string $css - * - * @param array $options available options: - * - * 'preserveComments': (default true) multi-line comments that begin - * with "/*!" will be preserved with newlines before and after to - * enhance readability. - * - * 'prependRelativePath': (default null) if given, this string will be - * prepended to all relative URIs in import/url declarations - * - * 'currentDir': (default null) if given, this is assumed to be the - * directory of the current CSS file. Using this, minify will rewrite - * all relative URIs in import/url declarations to correctly point to - * the desired files. For this to work, the files *must* exist and be - * visible by the PHP process. - * - * 'symlinks': (default = array()) If the CSS file is stored in - * a symlink-ed directory, provide an array of link paths to - * target paths, where the link paths are within the document root. Because - * paths need to be normalized for this to work, use "//" to substitute - * the doc root in the link paths (the array keys). E.g.: - * <code> - * array('//symlink' => '/real/target/path') // unix - * array('//static' => 'D:\\staticStorage') // Windows - * </code> - * - * @return string - */ - public static function minify($css, $options = array()) - { - require_once dirname(__FILE__).'/Minify/CSS/Compressor.php'; - if (isset($options['preserveComments']) - && !$options['preserveComments']) { - $css = Minify_CSS_Compressor::process($css, $options); - } else { - require_once 'Minify/CommentPreserver.php'; - $css = Minify_CommentPreserver::process( - $css - ,array('Minify_CSS_Compressor', 'process') - ,array($options) - ); - } - if (! isset($options['currentDir']) && ! isset($options['prependRelativePath'])) { - return $css; - } - require_once 'Minify/CSS/UriRewriter.php'; - if (isset($options['currentDir'])) { - return Minify_CSS_UriRewriter::rewrite( - $css - ,$options['currentDir'] - ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT'] - ,isset($options['symlinks']) ? $options['symlinks'] : array() - ); - } else { - return Minify_CSS_UriRewriter::prepend( - $css - ,$options['prependRelativePath'] - ); - } - } -} diff --git a/mod/minify/lib/min/lib/FirePHP.php b/mod/minify/lib/min/lib/FirePHP.php deleted file mode 100644 index d301a641a..000000000 --- a/mod/minify/lib/min/lib/FirePHP.php +++ /dev/null @@ -1,1370 +0,0 @@ -<?php -/** - * *** BEGIN LICENSE BLOCK ***** - * - * This file is part of FirePHP (http://www.firephp.org/). - * - * Software License Agreement (New BSD License) - * - * Copyright (c) 2006-2008, Christoph Dorn - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * * Neither the name of Christoph Dorn nor the names of its - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * ***** END LICENSE BLOCK ***** - * - * @copyright Copyright (C) 2007-2008 Christoph Dorn - * @author Christoph Dorn <christoph@christophdorn.com> - * @license http://www.opensource.org/licenses/bsd-license.php - * @package FirePHP - */ - - -/** - * Sends the given data to the FirePHP Firefox Extension. - * The data can be displayed in the Firebug Console or in the - * "Server" request tab. - * - * For more information see: http://www.firephp.org/ - * - * @copyright Copyright (C) 2007-2008 Christoph Dorn - * @author Christoph Dorn <christoph@christophdorn.com> - * @license http://www.opensource.org/licenses/bsd-license.php - * @package FirePHP - */ -class FirePHP { - - /** - * FirePHP version - * - * @var string - */ - const VERSION = '0.2.0'; - - /** - * Firebug LOG level - * - * Logs a message to firebug console. - * - * @var string - */ - const LOG = 'LOG'; - - /** - * Firebug INFO level - * - * Logs a message to firebug console and displays an info icon before the message. - * - * @var string - */ - const INFO = 'INFO'; - - /** - * Firebug WARN level - * - * Logs a message to firebug console, displays an warning icon before the message and colors the line turquoise. - * - * @var string - */ - const WARN = 'WARN'; - - /** - * Firebug ERROR level - * - * Logs a message to firebug console, displays an error icon before the message and colors the line yellow. Also increments the firebug error count. - * - * @var string - */ - const ERROR = 'ERROR'; - - /** - * Dumps a variable to firebug's server panel - * - * @var string - */ - const DUMP = 'DUMP'; - - /** - * Displays a stack trace in firebug console - * - * @var string - */ - const TRACE = 'TRACE'; - - /** - * Displays an exception in firebug console - * - * Increments the firebug error count. - * - * @var string - */ - const EXCEPTION = 'EXCEPTION'; - - /** - * Displays an table in firebug console - * - * @var string - */ - const TABLE = 'TABLE'; - - /** - * Starts a group in firebug console - * - * @var string - */ - const GROUP_START = 'GROUP_START'; - - /** - * Ends a group in firebug console - * - * @var string - */ - const GROUP_END = 'GROUP_END'; - - /** - * Singleton instance of FirePHP - * - * @var FirePHP - */ - protected static $instance = null; - - /** - * Wildfire protocol message index - * - * @var int - */ - protected $messageIndex = 1; - - /** - * Options for the library - * - * @var array - */ - protected $options = array(); - - /** - * Filters used to exclude object members when encoding - * - * @var array - */ - protected $objectFilters = array(); - - /** - * A stack of objects used to detect recursion during object encoding - * - * @var object - */ - protected $objectStack = array(); - - /** - * Flag to enable/disable logging - * - * @var boolean - */ - protected $enabled = true; - - /** - * The object constructor - */ - function __construct() { - $this->options['maxObjectDepth'] = 10; - $this->options['maxArrayDepth'] = 20; - $this->options['useNativeJsonEncode'] = true; - $this->options['includeLineNumbers'] = true; - } - - /** - * When the object gets serialized only include specific object members. - * - * @return array - */ - public function __sleep() { - return array('options','objectFilters','enabled'); - } - - /** - * Gets singleton instance of FirePHP - * - * @param boolean $AutoCreate - * @return FirePHP - */ - public static function getInstance($AutoCreate=false) { - if($AutoCreate===true && !self::$instance) { - self::init(); - } - return self::$instance; - } - - /** - * Creates FirePHP object and stores it for singleton access - * - * @return FirePHP - */ - public static function init() { - return self::$instance = new self(); - } - - /** - * Enable and disable logging to Firebug - * - * @param boolean $Enabled TRUE to enable, FALSE to disable - * @return void - */ - public function setEnabled($Enabled) { - $this->enabled = $Enabled; - } - - /** - * Check if logging is enabled - * - * @return boolean TRUE if enabled - */ - public function getEnabled() { - return $this->enabled; - } - - /** - * Specify a filter to be used when encoding an object - * - * Filters are used to exclude object members. - * - * @param string $Class The class name of the object - * @param array $Filter An array or members to exclude - * @return void - */ - public function setObjectFilter($Class, $Filter) { - $this->objectFilters[$Class] = $Filter; - } - - /** - * Set some options for the library - * - * Options: - * - maxObjectDepth: The maximum depth to traverse objects (default: 10) - * - maxArrayDepth: The maximum depth to traverse arrays (default: 20) - * - useNativeJsonEncode: If true will use json_encode() (default: true) - * - includeLineNumbers: If true will include line numbers and filenames (default: true) - * - * @param array $Options The options to be set - * @return void - */ - public function setOptions($Options) { - $this->options = array_merge($this->options,$Options); - } - - /** - * Register FirePHP as your error handler - * - * Will throw exceptions for each php error. - */ - public function registerErrorHandler() - { - //NOTE: The following errors will not be caught by this error handler: - // E_ERROR, E_PARSE, E_CORE_ERROR, - // E_CORE_WARNING, E_COMPILE_ERROR, - // E_COMPILE_WARNING, E_STRICT - - set_error_handler(array($this,'errorHandler')); - } - - /** - * FirePHP's error handler - * - * Throws exception for each php error that will occur. - * - * @param int $errno - * @param string $errstr - * @param string $errfile - * @param int $errline - * @param array $errcontext - */ - public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext) - { - // Don't throw exception if error reporting is switched off - if (error_reporting() == 0) { - return; - } - // Only throw exceptions for errors we are asking for - if (error_reporting() & $errno) { - throw new ErrorException($errstr, 0, $errno, $errfile, $errline); - } - } - - /** - * Register FirePHP as your exception handler - */ - public function registerExceptionHandler() - { - set_exception_handler(array($this,'exceptionHandler')); - } - - /** - * FirePHP's exception handler - * - * Logs all exceptions to your firebug console and then stops the script. - * - * @param Exception $Exception - * @throws Exception - */ - function exceptionHandler($Exception) { - $this->fb($Exception); - } - - /** - * Set custom processor url for FirePHP - * - * @param string $URL - */ - public function setProcessorUrl($URL) - { - $this->setHeader('X-FirePHP-ProcessorURL', $URL); - } - - /** - * Set custom renderer url for FirePHP - * - * @param string $URL - */ - public function setRendererUrl($URL) - { - $this->setHeader('X-FirePHP-RendererURL', $URL); - } - - /** - * Start a group for following messages - * - * @param string $Name - * @return true - * @throws Exception - */ - public function group($Name) { - return $this->fb(null, $Name, FirePHP::GROUP_START); - } - - /** - * Ends a group you have started before - * - * @return true - * @throws Exception - */ - public function groupEnd() { - return $this->fb(null, null, FirePHP::GROUP_END); - } - - /** - * Log object with label to firebug console - * - * @see FirePHP::LOG - * @param mixes $Object - * @param string $Label - * @return true - * @throws Exception - */ - public function log($Object, $Label=null) { - return $this->fb($Object, $Label, FirePHP::LOG); - } - - /** - * Log object with label to firebug console - * - * @see FirePHP::INFO - * @param mixes $Object - * @param string $Label - * @return true - * @throws Exception - */ - public function info($Object, $Label=null) { - return $this->fb($Object, $Label, FirePHP::INFO); - } - - /** - * Log object with label to firebug console - * - * @see FirePHP::WARN - * @param mixes $Object - * @param string $Label - * @return true - * @throws Exception - */ - public function warn($Object, $Label=null) { - return $this->fb($Object, $Label, FirePHP::WARN); - } - - /** - * Log object with label to firebug console - * - * @see FirePHP::ERROR - * @param mixes $Object - * @param string $Label - * @return true - * @throws Exception - */ - public function error($Object, $Label=null) { - return $this->fb($Object, $Label, FirePHP::ERROR); - } - - /** - * Dumps key and variable to firebug server panel - * - * @see FirePHP::DUMP - * @param string $Key - * @param mixed $Variable - * @return true - * @throws Exception - */ - public function dump($Key, $Variable) { - return $this->fb($Variable, $Key, FirePHP::DUMP); - } - - /** - * Log a trace in the firebug console - * - * @see FirePHP::TRACE - * @param string $Label - * @return true - * @throws Exception - */ - public function trace($Label) { - return $this->fb($Label, FirePHP::TRACE); - } - - /** - * Log a table in the firebug console - * - * @see FirePHP::TABLE - * @param string $Label - * @param string $Table - * @return true - * @throws Exception - */ - public function table($Label, $Table) { - return $this->fb($Table, $Label, FirePHP::TABLE); - } - - /** - * Check if FirePHP is installed on client - * - * @return boolean - */ - public function detectClientExtension() { - /* Check if FirePHP is installed on client */ - if(!@preg_match_all('/\sFirePHP\/([\.|\d]*)\s?/si',$this->getUserAgent(),$m) || - !version_compare($m[1][0],'0.0.6','>=')) { - return false; - } - return true; - } - - /** - * Log varible to Firebug - * - * @see http://www.firephp.org/Wiki/Reference/Fb - * @param mixed $Object The variable to be logged - * @return true Return TRUE if message was added to headers, FALSE otherwise - * @throws Exception - */ - public function fb($Object) { - - if(!$this->enabled) { - return false; - } - - if (headers_sent($filename, $linenum)) { - throw $this->newException('Headers already sent in '.$filename.' on line '.$linenum.'. Cannot send log data to FirePHP. You must have Output Buffering enabled via ob_start() or output_buffering ini directive.'); - } - - $Type = null; - $Label = null; - - if(func_num_args()==1) { - } else - if(func_num_args()==2) { - switch(func_get_arg(1)) { - case self::LOG: - case self::INFO: - case self::WARN: - case self::ERROR: - case self::DUMP: - case self::TRACE: - case self::EXCEPTION: - case self::TABLE: - case self::GROUP_START: - case self::GROUP_END: - $Type = func_get_arg(1); - break; - default: - $Label = func_get_arg(1); - break; - } - } else - if(func_num_args()==3) { - $Type = func_get_arg(2); - $Label = func_get_arg(1); - } else { - throw $this->newException('Wrong number of arguments to fb() function!'); - } - - - if(!$this->detectClientExtension()) { - return false; - } - - $meta = array(); - $skipFinalObjectEncode = false; - - if($Object instanceof Exception) { - - $meta['file'] = $this->_escapeTraceFile($Object->getFile()); - $meta['line'] = $Object->getLine(); - - $trace = $Object->getTrace(); - if($Object instanceof ErrorException - && isset($trace[0]['function']) - && $trace[0]['function']=='errorHandler' - && isset($trace[0]['class']) - && $trace[0]['class']=='FirePHP') { - - $severity = false; - switch($Object->getSeverity()) { - case E_WARNING: $severity = 'E_WARNING'; break; - case E_NOTICE: $severity = 'E_NOTICE'; break; - case E_USER_ERROR: $severity = 'E_USER_ERROR'; break; - case E_USER_WARNING: $severity = 'E_USER_WARNING'; break; - case E_USER_NOTICE: $severity = 'E_USER_NOTICE'; break; - case E_STRICT: $severity = 'E_STRICT'; break; - case E_RECOVERABLE_ERROR: $severity = 'E_RECOVERABLE_ERROR'; break; - case E_DEPRECATED: $severity = 'E_DEPRECATED'; break; - case E_USER_DEPRECATED: $severity = 'E_USER_DEPRECATED'; break; - } - - $Object = array('Class'=>get_class($Object), - 'Message'=>$severity.': '.$Object->getMessage(), - 'File'=>$this->_escapeTraceFile($Object->getFile()), - 'Line'=>$Object->getLine(), - 'Type'=>'trigger', - 'Trace'=>$this->_escapeTrace(array_splice($trace,2))); - $skipFinalObjectEncode = true; - } else { - $Object = array('Class'=>get_class($Object), - 'Message'=>$Object->getMessage(), - 'File'=>$this->_escapeTraceFile($Object->getFile()), - 'Line'=>$Object->getLine(), - 'Type'=>'throw', - 'Trace'=>$this->_escapeTrace($trace)); - $skipFinalObjectEncode = true; - } - $Type = self::EXCEPTION; - - } else - if($Type==self::TRACE) { - - $trace = debug_backtrace(); - if(!$trace) return false; - for( $i=0 ; $i<sizeof($trace) ; $i++ ) { - - if(isset($trace[$i]['class']) - && isset($trace[$i]['file']) - && ($trace[$i]['class']=='FirePHP' - || $trace[$i]['class']=='FB') - && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php' - || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) { - /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */ - } else - if(isset($trace[$i]['class']) - && isset($trace[$i+1]['file']) - && $trace[$i]['class']=='FirePHP' - && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') { - /* Skip fb() */ - } else - if($trace[$i]['function']=='fb' - || $trace[$i]['function']=='trace' - || $trace[$i]['function']=='send') { - $Object = array('Class'=>isset($trace[$i]['class'])?$trace[$i]['class']:'', - 'Type'=>isset($trace[$i]['type'])?$trace[$i]['type']:'', - 'Function'=>isset($trace[$i]['function'])?$trace[$i]['function']:'', - 'Message'=>$trace[$i]['args'][0], - 'File'=>isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):'', - 'Line'=>isset($trace[$i]['line'])?$trace[$i]['line']:'', - 'Args'=>isset($trace[$i]['args'])?$this->encodeObject($trace[$i]['args']):'', - 'Trace'=>$this->_escapeTrace(array_splice($trace,$i+1))); - - $skipFinalObjectEncode = true; - $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):''; - $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:''; - break; - } - } - - } else - if($Type==self::TABLE) { - - if(isset($Object[0]) && is_string($Object[0])) { - $Object[1] = $this->encodeTable($Object[1]); - } else { - $Object = $this->encodeTable($Object); - } - - $skipFinalObjectEncode = true; - - } else { - if($Type===null) { - $Type = self::LOG; - } - } - - if($this->options['includeLineNumbers']) { - if(!isset($meta['file']) || !isset($meta['line'])) { - - $trace = debug_backtrace(); - for( $i=0 ; $trace && $i<sizeof($trace) ; $i++ ) { - - if(isset($trace[$i]['class']) - && isset($trace[$i]['file']) - && ($trace[$i]['class']=='FirePHP' - || $trace[$i]['class']=='FB') - && (substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php' - || substr($this->_standardizePath($trace[$i]['file']),-29,29)=='FirePHPCore/FirePHP.class.php')) { - /* Skip - FB::trace(), FB::send(), $firephp->trace(), $firephp->fb() */ - } else - if(isset($trace[$i]['class']) - && isset($trace[$i+1]['file']) - && $trace[$i]['class']=='FirePHP' - && substr($this->_standardizePath($trace[$i+1]['file']),-18,18)=='FirePHPCore/fb.php') { - /* Skip fb() */ - } else - if(isset($trace[$i]['file']) - && substr($this->_standardizePath($trace[$i]['file']),-18,18)=='FirePHPCore/fb.php') { - /* Skip FB::fb() */ - } else { - $meta['file'] = isset($trace[$i]['file'])?$this->_escapeTraceFile($trace[$i]['file']):''; - $meta['line'] = isset($trace[$i]['line'])?$trace[$i]['line']:''; - break; - } - } - - } - } else { - unset($meta['file']); - unset($meta['line']); - } - - $this->setHeader('X-Wf-Protocol-1','http://meta.wildfirehq.org/Protocol/JsonStream/0.2'); - $this->setHeader('X-Wf-1-Plugin-1','http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'.self::VERSION); - - $structure_index = 1; - if($Type==self::DUMP) { - $structure_index = 2; - $this->setHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1'); - } else { - $this->setHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1'); - } - - if($Type==self::DUMP) { - $msg = '{"'.$Label.'":'.$this->jsonEncode($Object, $skipFinalObjectEncode).'}'; - } else { - $msg_meta = array('Type'=>$Type); - if($Label!==null) { - $msg_meta['Label'] = $Label; - } - if(isset($meta['file'])) { - $msg_meta['File'] = $meta['file']; - } - if(isset($meta['line'])) { - $msg_meta['Line'] = $meta['line']; - } - $msg = '['.$this->jsonEncode($msg_meta).','.$this->jsonEncode($Object, $skipFinalObjectEncode).']'; - } - - $parts = explode("\n",chunk_split($msg, 5000, "\n")); - - for( $i=0 ; $i<count($parts) ; $i++) { - - $part = $parts[$i]; - if ($part) { - - if(count($parts)>2) { - // Message needs to be split into multiple parts - $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex, - (($i==0)?strlen($msg):'') - . '|' . $part . '|' - . (($i<count($parts)-2)?'\\':'')); - } else { - $this->setHeader('X-Wf-1-'.$structure_index.'-'.'1-'.$this->messageIndex, - strlen($part) . '|' . $part . '|'); - } - - $this->messageIndex++; - - if ($this->messageIndex > 99999) { - throw new Exception('Maximum number (99,999) of messages reached!'); - } - } - } - - $this->setHeader('X-Wf-1-Index',$this->messageIndex-1); - - return true; - } - - /** - * Standardizes path for windows systems. - * - * @param string $Path - * @return string - */ - protected function _standardizePath($Path) { - return preg_replace('/\\\\+/','/',$Path); - } - - /** - * Escape trace path for windows systems - * - * @param array $Trace - * @return array - */ - protected function _escapeTrace($Trace) { - if(!$Trace) return $Trace; - for( $i=0 ; $i<sizeof($Trace) ; $i++ ) { - if(isset($Trace[$i]['file'])) { - $Trace[$i]['file'] = $this->_escapeTraceFile($Trace[$i]['file']); - } - if(isset($Trace[$i]['args'])) { - $Trace[$i]['args'] = $this->encodeObject($Trace[$i]['args']); - } - } - return $Trace; - } - - /** - * Escape file information of trace for windows systems - * - * @param string $File - * @return string - */ - protected function _escapeTraceFile($File) { - /* Check if we have a windows filepath */ - if(strpos($File,'\\')) { - /* First strip down to single \ */ - - $file = preg_replace('/\\\\+/','\\',$File); - - return $file; - } - return $File; - } - - /** - * Send header - * - * @param string $Name - * @param string_type $Value - */ - protected function setHeader($Name, $Value) { - return header($Name.': '.$Value); - } - - /** - * Get user agent - * - * @return string|false - */ - protected function getUserAgent() { - if(!isset($_SERVER['HTTP_USER_AGENT'])) return false; - return $_SERVER['HTTP_USER_AGENT']; - } - - /** - * Returns a new exception - * - * @param string $Message - * @return Exception - */ - protected function newException($Message) { - return new Exception($Message); - } - - /** - * Encode an object into a JSON string - * - * Uses PHP's jeson_encode() if available - * - * @param object $Object The object to be encoded - * @return string The JSON string - */ - protected function jsonEncode($Object, $skipObjectEncode=false) - { - if(!$skipObjectEncode) { - $Object = $this->encodeObject($Object); - } - - if(function_exists('json_encode') - && $this->options['useNativeJsonEncode']!=false) { - - return json_encode($Object); - } else { - return $this->json_encode($Object); - } - } - - /** - * Encodes a table by encoding each row and column with encodeObject() - * - * @param array $Table The table to be encoded - * @return array - */ - protected function encodeTable($Table) { - if(!$Table) return $Table; - for( $i=0 ; $i<count($Table) ; $i++ ) { - if(is_array($Table[$i])) { - for( $j=0 ; $j<count($Table[$i]) ; $j++ ) { - $Table[$i][$j] = $this->encodeObject($Table[$i][$j]); - } - } - } - return $Table; - } - - /** - * Encodes an object including members with - * protected and private visibility - * - * @param Object $Object The object to be encoded - * @param int $Depth The current traversal depth - * @return array All members of the object - */ - protected function encodeObject($Object, $ObjectDepth = 1, $ArrayDepth = 1) - { - $return = array(); - - if (is_object($Object)) { - - if ($ObjectDepth > $this->options['maxObjectDepth']) { - return '** Max Object Depth ('.$this->options['maxObjectDepth'].') **'; - } - - foreach ($this->objectStack as $refVal) { - if ($refVal === $Object) { - return '** Recursion ('.get_class($Object).') **'; - } - } - array_push($this->objectStack, $Object); - - $return['__className'] = $class = get_class($Object); - - $reflectionClass = new ReflectionClass($class); - $properties = array(); - foreach( $reflectionClass->getProperties() as $property) { - $properties[$property->getName()] = $property; - } - - $members = (array)$Object; - - foreach( $properties as $raw_name => $property ) { - - $name = $raw_name; - if($property->isStatic()) { - $name = 'static:'.$name; - } - if($property->isPublic()) { - $name = 'public:'.$name; - } else - if($property->isPrivate()) { - $name = 'private:'.$name; - $raw_name = "\0".$class."\0".$raw_name; - } else - if($property->isProtected()) { - $name = 'protected:'.$name; - $raw_name = "\0".'*'."\0".$raw_name; - } - - if(!(isset($this->objectFilters[$class]) - && is_array($this->objectFilters[$class]) - && in_array($raw_name,$this->objectFilters[$class]))) { - - if(array_key_exists($raw_name,$members) - && !$property->isStatic()) { - - $return[$name] = $this->encodeObject($members[$raw_name], $ObjectDepth + 1, 1); - - } else { - if(method_exists($property,'setAccessible')) { - $property->setAccessible(true); - $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1); - } else - if($property->isPublic()) { - $return[$name] = $this->encodeObject($property->getValue($Object), $ObjectDepth + 1, 1); - } else { - $return[$name] = '** Need PHP 5.3 to get value **'; - } - } - } else { - $return[$name] = '** Excluded by Filter **'; - } - } - - // Include all members that are not defined in the class - // but exist in the object - foreach( $members as $raw_name => $value ) { - - $name = $raw_name; - - if ($name{0} == "\0") { - $parts = explode("\0", $name); - $name = $parts[2]; - } - - if(!isset($properties[$name])) { - $name = 'undeclared:'.$name; - - if(!(isset($this->objectFilters[$class]) - && is_array($this->objectFilters[$class]) - && in_array($raw_name,$this->objectFilters[$class]))) { - - $return[$name] = $this->encodeObject($value, $ObjectDepth + 1, 1); - } else { - $return[$name] = '** Excluded by Filter **'; - } - } - } - - array_pop($this->objectStack); - - } elseif (is_array($Object)) { - - if ($ArrayDepth > $this->options['maxArrayDepth']) { - return '** Max Array Depth ('.$this->options['maxArrayDepth'].') **'; - } - - foreach ($Object as $key => $val) { - - // Encoding the $GLOBALS PHP array causes an infinite loop - // if the recursion is not reset here as it contains - // a reference to itself. This is the only way I have come up - // with to stop infinite recursion in this case. - if($key=='GLOBALS' - && is_array($val) - && array_key_exists('GLOBALS',$val)) { - $val['GLOBALS'] = '** Recursion (GLOBALS) **'; - } - - $return[$key] = $this->encodeObject($val, 1, $ArrayDepth + 1); - } - } else { - if(self::is_utf8($Object)) { - return $Object; - } else { - return utf8_encode($Object); - } - } - return $return; - } - - /** - * Returns true if $string is valid UTF-8 and false otherwise. - * - * @param mixed $str String to be tested - * @return boolean - */ - protected static function is_utf8($str) { - $c=0; $b=0; - $bits=0; - $len=strlen($str); - for($i=0; $i<$len; $i++){ - $c=ord($str[$i]); - if($c > 128){ - if(($c >= 254)) return false; - elseif($c >= 252) $bits=6; - elseif($c >= 248) $bits=5; - elseif($c >= 240) $bits=4; - elseif($c >= 224) $bits=3; - elseif($c >= 192) $bits=2; - else return false; - if(($i+$bits) > $len) return false; - while($bits > 1){ - $i++; - $b=ord($str[$i]); - if($b < 128 || $b > 191) return false; - $bits--; - } - } - } - return true; - } - - /** - * Converts to and from JSON format. - * - * JSON (JavaScript Object Notation) is a lightweight data-interchange - * format. It is easy for humans to read and write. It is easy for machines - * to parse and generate. It is based on a subset of the JavaScript - * Programming Language, Standard ECMA-262 3rd Edition - December 1999. - * This feature can also be found in Python. JSON is a text format that is - * completely language independent but uses conventions that are familiar - * to programmers of the C-family of languages, including C, C++, C#, Java, - * JavaScript, Perl, TCL, and many others. These properties make JSON an - * ideal data-interchange language. - * - * This package provides a simple encoder and decoder for JSON notation. It - * is intended for use with client-side Javascript applications that make - * use of HTTPRequest to perform server communication functions - data can - * be encoded into JSON notation for use in a client-side javascript, or - * decoded from incoming Javascript requests. JSON format is native to - * Javascript, and can be directly eval()'ed with no further parsing - * overhead - * - * All strings should be in ASCII or UTF-8 format! - * - * LICENSE: Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: Redistributions of source code must retain the - * above copyright notice, this list of conditions and the following - * disclaimer. Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following disclaimer - * in the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE - * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * @category - * @package Services_JSON - * @author Michal Migurski <mike-json@teczno.com> - * @author Matt Knapp <mdknapp[at]gmail[dot]com> - * @author Brett Stimmerman <brettstimmerman[at]gmail[dot]com> - * @author Christoph Dorn <christoph@christophdorn.com> - * @copyright 2005 Michal Migurski - * @version CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $ - * @license http://www.opensource.org/licenses/bsd-license.php - * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198 - */ - - - /** - * Keep a list of objects as we descend into the array so we can detect recursion. - */ - private $json_objectStack = array(); - - - /** - * convert a string from one UTF-8 char to one UTF-16 char - * - * Normally should be handled by mb_convert_encoding, but - * provides a slower PHP-only method for installations - * that lack the multibye string extension. - * - * @param string $utf8 UTF-8 character - * @return string UTF-16 character - * @access private - */ - private function json_utf82utf16($utf8) - { - // oh please oh please oh please oh please oh please - if(function_exists('mb_convert_encoding')) { - return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8'); - } - - switch(strlen($utf8)) { - case 1: - // this case should never be reached, because we are in ASCII range - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return $utf8; - - case 2: - // return a UTF-16 character from a 2-byte UTF-8 char - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0x07 & (ord($utf8{0}) >> 2)) - . chr((0xC0 & (ord($utf8{0}) << 6)) - | (0x3F & ord($utf8{1}))); - - case 3: - // return a UTF-16 character from a 3-byte UTF-8 char - // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr((0xF0 & (ord($utf8{0}) << 4)) - | (0x0F & (ord($utf8{1}) >> 2))) - . chr((0xC0 & (ord($utf8{1}) << 6)) - | (0x7F & ord($utf8{2}))); - } - - // ignoring UTF-32 for now, sorry - return ''; - } - - /** - * encodes an arbitrary variable into JSON format - * - * @param mixed $var any number, boolean, string, array, or object to be encoded. - * see argument 1 to Services_JSON() above for array-parsing behavior. - * if var is a strng, note that encode() always expects it - * to be in ASCII or UTF-8 format! - * - * @return mixed JSON string representation of input var or an error if a problem occurs - * @access public - */ - private function json_encode($var) - { - - if(is_object($var)) { - if(in_array($var,$this->json_objectStack)) { - return '"** Recursion **"'; - } - } - - switch (gettype($var)) { - case 'boolean': - return $var ? 'true' : 'false'; - - case 'NULL': - return 'null'; - - case 'integer': - return (int) $var; - - case 'double': - case 'float': - return (float) $var; - - case 'string': - // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT - $ascii = ''; - $strlen_var = strlen($var); - - /* - * Iterate over every character in the string, - * escaping with a slash or encoding to UTF-8 where necessary - */ - for ($c = 0; $c < $strlen_var; ++$c) { - - $ord_var_c = ord($var{$c}); - - switch (true) { - case $ord_var_c == 0x08: - $ascii .= '\b'; - break; - case $ord_var_c == 0x09: - $ascii .= '\t'; - break; - case $ord_var_c == 0x0A: - $ascii .= '\n'; - break; - case $ord_var_c == 0x0C: - $ascii .= '\f'; - break; - case $ord_var_c == 0x0D: - $ascii .= '\r'; - break; - - case $ord_var_c == 0x22: - case $ord_var_c == 0x2F: - case $ord_var_c == 0x5C: - // double quote, slash, slosh - $ascii .= '\\'.$var{$c}; - break; - - case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)): - // characters U-00000000 - U-0000007F (same as ASCII) - $ascii .= $var{$c}; - break; - - case (($ord_var_c & 0xE0) == 0xC0): - // characters U-00000080 - U-000007FF, mask 110XXXXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, ord($var{$c + 1})); - $c += 1; - $utf16 = $this->json_utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xF0) == 0xE0): - // characters U-00000800 - U-0000FFFF, mask 1110XXXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2})); - $c += 2; - $utf16 = $this->json_utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xF8) == 0xF0): - // characters U-00010000 - U-001FFFFF, mask 11110XXX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3})); - $c += 3; - $utf16 = $this->json_utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xFC) == 0xF8): - // characters U-00200000 - U-03FFFFFF, mask 111110XX - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3}), - ord($var{$c + 4})); - $c += 4; - $utf16 = $this->json_utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - - case (($ord_var_c & 0xFE) == 0xFC): - // characters U-04000000 - U-7FFFFFFF, mask 1111110X - // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3}), - ord($var{$c + 4}), - ord($var{$c + 5})); - $c += 5; - $utf16 = $this->json_utf82utf16($char); - $ascii .= sprintf('\u%04s', bin2hex($utf16)); - break; - } - } - - return '"'.$ascii.'"'; - - case 'array': - /* - * As per JSON spec if any array key is not an integer - * we must treat the the whole array as an object. We - * also try to catch a sparsely populated associative - * array with numeric keys here because some JS engines - * will create an array with empty indexes up to - * max_index which can cause memory issues and because - * the keys, which may be relevant, will be remapped - * otherwise. - * - * As per the ECMA and JSON specification an object may - * have any string as a property. Unfortunately due to - * a hole in the ECMA specification if the key is a - * ECMA reserved word or starts with a digit the - * parameter is only accessible using ECMAScript's - * bracket notation. - */ - - // treat as a JSON object - if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) { - - $this->json_objectStack[] = $var; - - $properties = array_map(array($this, 'json_name_value'), - array_keys($var), - array_values($var)); - - array_pop($this->json_objectStack); - - foreach($properties as $property) { - if($property instanceof Exception) { - return $property; - } - } - - return '{' . join(',', $properties) . '}'; - } - - $this->json_objectStack[] = $var; - - // treat it like a regular array - $elements = array_map(array($this, 'json_encode'), $var); - - array_pop($this->json_objectStack); - - foreach($elements as $element) { - if($element instanceof Exception) { - return $element; - } - } - - return '[' . join(',', $elements) . ']'; - - case 'object': - $vars = self::encodeObject($var); - - $this->json_objectStack[] = $var; - - $properties = array_map(array($this, 'json_name_value'), - array_keys($vars), - array_values($vars)); - - array_pop($this->json_objectStack); - - foreach($properties as $property) { - if($property instanceof Exception) { - return $property; - } - } - - return '{' . join(',', $properties) . '}'; - - default: - return null; - } - } - - /** - * array-walking function for use in generating JSON-formatted name-value pairs - * - * @param string $name name of key to use - * @param mixed $value reference to an array element to be encoded - * - * @return string JSON-formatted name-value pair, like '"name":value' - * @access private - */ - private function json_name_value($name, $value) - { - // Encoding the $GLOBALS PHP array causes an infinite loop - // if the recursion is not reset here as it contains - // a reference to itself. This is the only way I have come up - // with to stop infinite recursion in this case. - if($name=='GLOBALS' - && is_array($value) - && array_key_exists('GLOBALS',$value)) { - $value['GLOBALS'] = '** Recursion **'; - } - - $encoded_value = $this->json_encode($value); - - if($encoded_value instanceof Exception) { - return $encoded_value; - } - - return $this->json_encode(strval($name)) . ':' . $encoded_value; - } -} diff --git a/mod/minify/lib/min/lib/HTTP/ConditionalGet.php b/mod/minify/lib/min/lib/HTTP/ConditionalGet.php deleted file mode 100644 index 823db058f..000000000 --- a/mod/minify/lib/min/lib/HTTP/ConditionalGet.php +++ /dev/null @@ -1,348 +0,0 @@ -<?php -/** - * Class HTTP_ConditionalGet - * @package Minify - * @subpackage HTTP - */ - -/** - * Implement conditional GET via a timestamp or hash of content - * - * E.g. Content from DB with update time: - * <code> - * list($updateTime, $content) = getDbUpdateAndContent(); - * $cg = new HTTP_ConditionalGet(array( - * 'lastModifiedTime' => $updateTime - * ,'isPublic' => true - * )); - * $cg->sendHeaders(); - * if ($cg->cacheIsValid) { - * exit(); - * } - * echo $content; - * </code> - * - * E.g. Shortcut for the above - * <code> - * HTTP_ConditionalGet::check($updateTime, true); // exits if client has cache - * echo $content; - * </code> - * - * E.g. Content from DB with no update time: - * <code> - * $content = getContentFromDB(); - * $cg = new HTTP_ConditionalGet(array( - * 'contentHash' => md5($content) - * )); - * $cg->sendHeaders(); - * if ($cg->cacheIsValid) { - * exit(); - * } - * echo $content; - * </code> - * - * E.g. Static content with some static includes: - * <code> - * // before content - * $cg = new HTTP_ConditionalGet(array( - * 'lastUpdateTime' => max( - * filemtime(__FILE__) - * ,filemtime('/path/to/header.inc') - * ,filemtime('/path/to/footer.inc') - * ) - * )); - * $cg->sendHeaders(); - * if ($cg->cacheIsValid) { - * exit(); - * } - * </code> - * @package Minify - * @subpackage HTTP - * @author Stephen Clay <steve@mrclay.org> - */ -class HTTP_ConditionalGet { - - /** - * Does the client have a valid copy of the requested resource? - * - * You'll want to check this after instantiating the object. If true, do - * not send content, just call sendHeaders() if you haven't already. - * - * @var bool - */ - public $cacheIsValid = null; - - /** - * @param array $spec options - * - * 'isPublic': (bool) if true, the Cache-Control header will contain - * "public", allowing proxies to cache the content. Otherwise "private" will - * be sent, allowing only browser caching. (default false) - * - * 'lastModifiedTime': (int) if given, both ETag AND Last-Modified headers - * will be sent with content. This is recommended. - * - * 'encoding': (string) if set, the header "Vary: Accept-Encoding" will - * always be sent and a truncated version of the encoding will be appended - * to the ETag. E.g. "pub123456;gz". This will also trigger a more lenient - * checking of the client's If-None-Match header, as the encoding portion of - * the ETag will be stripped before comparison. - * - * 'contentHash': (string) if given, only the ETag header can be sent with - * content (only HTTP1.1 clients can conditionally GET). The given string - * should be short with no quote characters and always change when the - * resource changes (recommend md5()). This is not needed/used if - * lastModifiedTime is given. - * - * 'eTag': (string) if given, this will be used as the ETag header rather - * than values based on lastModifiedTime or contentHash. Also the encoding - * string will not be appended to the given value as described above. - * - * 'invalidate': (bool) if true, the client cache will be considered invalid - * without testing. Effectively this disables conditional GET. - * (default false) - * - * 'maxAge': (int) if given, this will set the Cache-Control max-age in - * seconds, and also set the Expires header to the equivalent GMT date. - * After the max-age period has passed, the browser will again send a - * conditional GET to revalidate its cache. - * - * @return null - */ - public function __construct($spec) - { - $scope = (isset($spec['isPublic']) && $spec['isPublic']) - ? 'public' - : 'private'; - $maxAge = 0; - // backwards compatibility (can be removed later) - if (isset($spec['setExpires']) - && is_numeric($spec['setExpires']) - && ! isset($spec['maxAge'])) { - $spec['maxAge'] = $spec['setExpires'] - $_SERVER['REQUEST_TIME']; - } - if (isset($spec['maxAge'])) { - $maxAge = $spec['maxAge']; - $this->_headers['Expires'] = self::gmtDate( - $_SERVER['REQUEST_TIME'] + $spec['maxAge'] - ); - } - $etagAppend = ''; - if (isset($spec['encoding'])) { - $this->_stripEtag = true; - $this->_headers['Vary'] = 'Accept-Encoding'; - if ('' !== $spec['encoding']) { - if (0 === strpos($spec['encoding'], 'x-')) { - $spec['encoding'] = substr($spec['encoding'], 2); - } - $etagAppend = ';' . substr($spec['encoding'], 0, 2); - } - } - if (isset($spec['lastModifiedTime'])) { - $this->_setLastModified($spec['lastModifiedTime']); - if (isset($spec['eTag'])) { // Use it - $this->_setEtag($spec['eTag'], $scope); - } else { // base both headers on time - $this->_setEtag($spec['lastModifiedTime'] . $etagAppend, $scope); - } - } elseif (isset($spec['eTag'])) { // Use it - $this->_setEtag($spec['eTag'], $scope); - } elseif (isset($spec['contentHash'])) { // Use the hash as the ETag - $this->_setEtag($spec['contentHash'] . $etagAppend, $scope); - } - $this->_headers['Cache-Control'] = "max-age={$maxAge}, {$scope}"; - // invalidate cache if disabled, otherwise check - $this->cacheIsValid = (isset($spec['invalidate']) && $spec['invalidate']) - ? false - : $this->_isCacheValid(); - } - - /** - * Get array of output headers to be sent - * - * In the case of 304 responses, this array will only contain the response - * code header: array('_responseCode' => 'HTTP/1.0 304 Not Modified') - * - * Otherwise something like: - * <code> - * array( - * 'Cache-Control' => 'max-age=0, public' - * ,'ETag' => '"foobar"' - * ) - * </code> - * - * @return array - */ - public function getHeaders() - { - return $this->_headers; - } - - /** - * Set the Content-Length header in bytes - * - * With most PHP configs, as long as you don't flush() output, this method - * is not needed and PHP will buffer all output and set Content-Length for - * you. Otherwise you'll want to call this to let the client know up front. - * - * @param int $bytes - * - * @return int copy of input $bytes - */ - public function setContentLength($bytes) - { - return $this->_headers['Content-Length'] = $bytes; - } - - /** - * Send headers - * - * @see getHeaders() - * - * Note this doesn't "clear" the headers. Calling sendHeaders() will - * call header() again (but probably have not effect) and getHeaders() will - * still return the headers. - * - * @return null - */ - public function sendHeaders() - { - $headers = $this->_headers; - if (array_key_exists('_responseCode', $headers)) { - header($headers['_responseCode']); - unset($headers['_responseCode']); - } - foreach ($headers as $name => $val) { - header($name . ': ' . $val); - } - } - - /** - * Exit if the client's cache is valid for this resource - * - * This is a convenience method for common use of the class - * - * @param int $lastModifiedTime if given, both ETag AND Last-Modified headers - * will be sent with content. This is recommended. - * - * @param bool $isPublic (default false) if true, the Cache-Control header - * will contain "public", allowing proxies to cache the content. Otherwise - * "private" will be sent, allowing only browser caching. - * - * @param array $options (default empty) additional options for constructor - * - * @return null - */ - public static function check($lastModifiedTime = null, $isPublic = false, $options = array()) - { - if (null !== $lastModifiedTime) { - $options['lastModifiedTime'] = (int)$lastModifiedTime; - } - $options['isPublic'] = (bool)$isPublic; - $cg = new HTTP_ConditionalGet($options); - $cg->sendHeaders(); - if ($cg->cacheIsValid) { - exit(); - } - } - - - /** - * Get a GMT formatted date for use in HTTP headers - * - * <code> - * header('Expires: ' . HTTP_ConditionalGet::gmtdate($time)); - * </code> - * - * @param int $time unix timestamp - * - * @return string - */ - public static function gmtDate($time) - { - return gmdate('D, d M Y H:i:s \G\M\T', $time); - } - - protected $_headers = array(); - protected $_lmTime = null; - protected $_etag = null; - protected $_stripEtag = false; - - protected function _setEtag($hash, $scope) - { - $this->_etag = '"' . substr($scope, 0, 3) . $hash . '"'; - $this->_headers['ETag'] = $this->_etag; - } - - protected function _setLastModified($time) - { - $this->_lmTime = (int)$time; - $this->_headers['Last-Modified'] = self::gmtDate($time); - } - - /** - * Determine validity of client cache and queue 304 header if valid - */ - protected function _isCacheValid() - { - if (null === $this->_etag) { - // lmTime is copied to ETag, so this condition implies that the - // server sent neither ETag nor Last-Modified, so the client can't - // possibly has a valid cache. - return false; - } - $isValid = ($this->resourceMatchedEtag() || $this->resourceNotModified()); - if ($isValid) { - $this->_headers['_responseCode'] = 'HTTP/1.0 304 Not Modified'; - } - return $isValid; - } - - protected function resourceMatchedEtag() - { - if (!isset($_SERVER['HTTP_IF_NONE_MATCH'])) { - return false; - } - $clientEtagList = get_magic_quotes_gpc() - ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) - : $_SERVER['HTTP_IF_NONE_MATCH']; - $clientEtags = explode(',', $clientEtagList); - - $compareTo = $this->normalizeEtag($this->_etag); - foreach ($clientEtags as $clientEtag) { - if ($this->normalizeEtag($clientEtag) === $compareTo) { - // respond with the client's matched ETag, even if it's not what - // we would've sent by default - $this->_headers['ETag'] = trim($clientEtag); - return true; - } - } - return false; - } - - protected function normalizeEtag($etag) { - $etag = trim($etag); - return $this->_stripEtag - ? preg_replace('/;\\w\\w"$/', '"', $etag) - : $etag; - } - - protected function resourceNotModified() - { - if (!isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) { - return false; - } - $ifModifiedSince = $_SERVER['HTTP_IF_MODIFIED_SINCE']; - if (false !== ($semicolon = strrpos($ifModifiedSince, ';'))) { - // IE has tacked on extra data to this header, strip it - $ifModifiedSince = substr($ifModifiedSince, 0, $semicolon); - } - if ($ifModifiedSince == self::gmtDate($this->_lmTime)) { - // Apache 2.2's behavior. If there was no ETag match, send the - // non-encoded version of the ETag value. - $this->_headers['ETag'] = $this->normalizeEtag($this->_etag); - return true; - } - return false; - } -} diff --git a/mod/minify/lib/min/lib/HTTP/Encoder.php b/mod/minify/lib/min/lib/HTTP/Encoder.php deleted file mode 100644 index 05ca552ec..000000000 --- a/mod/minify/lib/min/lib/HTTP/Encoder.php +++ /dev/null @@ -1,326 +0,0 @@ -<?php -/** - * Class HTTP_Encoder - * @package Minify - * @subpackage HTTP - */ - -/** - * Encode and send gzipped/deflated content - * - * The "Vary: Accept-Encoding" header is sent. If the client allows encoding, - * Content-Encoding and Content-Length are added. - * - * <code> - * // Send a CSS file, compressed if possible - * $he = new HTTP_Encoder(array( - * 'content' => file_get_contents($cssFile) - * ,'type' => 'text/css' - * )); - * $he->encode(); - * $he->sendAll(); - * </code> - * - * <code> - * // Shortcut to encoding output - * header('Content-Type: text/css'); // needed if not HTML - * HTTP_Encoder::output($css); - * </code> - * - * <code> - * // Just sniff for the accepted encoding - * $encoding = HTTP_Encoder::getAcceptedEncoding(); - * </code> - * - * For more control over headers, use getHeaders() and getData() and send your - * own output. - * - * Note: If you don't need header mgmt, use PHP's native gzencode, gzdeflate, - * and gzcompress functions for gzip, deflate, and compress-encoding - * respectively. - * - * @package Minify - * @subpackage HTTP - * @author Stephen Clay <steve@mrclay.org> - */ -class HTTP_Encoder { - - /** - * Should the encoder allow HTTP encoding to IE6? - * - * If you have many IE6 users and the bandwidth savings is worth troubling - * some of them, set this to true. - * - * By default, encoding is only offered to IE7+. When this is true, - * getAcceptedEncoding() will return an encoding for IE6 if its user agent - * string contains "SV1". This has been documented in many places as "safe", - * but there seem to be remaining, intermittent encoding bugs in patched - * IE6 on the wild web. - * - * @var bool - */ - public static $encodeToIe6 = false; - - - /** - * Default compression level for zlib operations - * - * This level is used if encode() is not given a $compressionLevel - * - * @var int - */ - public static $compressionLevel = 6; - - - /** - * Get an HTTP Encoder object - * - * @param array $spec options - * - * 'content': (string required) content to be encoded - * - * 'type': (string) if set, the Content-Type header will have this value. - * - * 'method: (string) only set this if you are forcing a particular encoding - * method. If not set, the best method will be chosen by getAcceptedEncoding() - * The available methods are 'gzip', 'deflate', 'compress', and '' (no - * encoding) - * - * @return null - */ - public function __construct($spec) - { - $this->_content = $spec['content']; - $this->_headers['Content-Length'] = (string)strlen($this->_content); - if (isset($spec['type'])) { - $this->_headers['Content-Type'] = $spec['type']; - } - if (isset($spec['method']) - && in_array($spec['method'], array('gzip', 'deflate', 'compress', ''))) - { - $this->_encodeMethod = array($spec['method'], $spec['method']); - } else { - $this->_encodeMethod = self::getAcceptedEncoding(); - } - } - - /** - * Get content in current form - * - * Call after encode() for encoded content. - * - * return string - */ - public function getContent() - { - return $this->_content; - } - - /** - * Get array of output headers to be sent - * - * E.g. - * <code> - * array( - * 'Content-Length' => '615' - * ,'Content-Encoding' => 'x-gzip' - * ,'Vary' => 'Accept-Encoding' - * ) - * </code> - * - * @return array - */ - public function getHeaders() - { - return $this->_headers; - } - - /** - * Send output headers - * - * You must call this before headers are sent and it probably cannot be - * used in conjunction with zlib output buffering / mod_gzip. Errors are - * not handled purposefully. - * - * @see getHeaders() - * - * @return null - */ - public function sendHeaders() - { - foreach ($this->_headers as $name => $val) { - header($name . ': ' . $val); - } - } - - /** - * Send output headers and content - * - * A shortcut for sendHeaders() and echo getContent() - * - * You must call this before headers are sent and it probably cannot be - * used in conjunction with zlib output buffering / mod_gzip. Errors are - * not handled purposefully. - * - * @return null - */ - public function sendAll() - { - $this->sendHeaders(); - echo $this->_content; - } - - /** - * Determine the client's best encoding method from the HTTP Accept-Encoding - * header. - * - * If no Accept-Encoding header is set, or the browser is IE before v6 SP2, - * this will return ('', ''), the "identity" encoding. - * - * A syntax-aware scan is done of the Accept-Encoding, so the method must - * be non 0. The methods are favored in order of gzip, deflate, then - * compress. Deflate is always smallest and generally faster, but is - * rarely sent by servers, so client support could be buggier. - * - * @param bool $allowCompress allow the older compress encoding - * - * @param bool $allowDeflate allow the more recent deflate encoding - * - * @return array two values, 1st is the actual encoding method, 2nd is the - * alias of that method to use in the Content-Encoding header (some browsers - * call gzip "x-gzip" etc.) - */ - public static function getAcceptedEncoding($allowCompress = true, $allowDeflate = true) - { - // @link http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html - - if (! isset($_SERVER['HTTP_ACCEPT_ENCODING']) - || self::_isBuggyIe()) - { - return array('', ''); - } - $ae = $_SERVER['HTTP_ACCEPT_ENCODING']; - // gzip checks (quick) - if (0 === strpos($ae, 'gzip,') // most browsers - || 0 === strpos($ae, 'deflate, gzip,') // opera - ) { - return array('gzip', 'gzip'); - } - // gzip checks (slow) - if (preg_match( - '@(?:^|,)\\s*((?:x-)?gzip)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@' - ,$ae - ,$m)) { - return array('gzip', $m[1]); - } - if ($allowDeflate) { - // deflate checks - $aeRev = strrev($ae); - if (0 === strpos($aeRev, 'etalfed ,') // ie, webkit - || 0 === strpos($aeRev, 'etalfed,') // gecko - || 0 === strpos($ae, 'deflate,') // opera - // slow parsing - || preg_match( - '@(?:^|,)\\s*deflate\\s*(?:$|,|;\\s*q=(?:0\\.|1))@', $ae)) { - return array('deflate', 'deflate'); - } - } - if ($allowCompress && preg_match( - '@(?:^|,)\\s*((?:x-)?compress)\\s*(?:$|,|;\\s*q=(?:0\\.|1))@' - ,$ae - ,$m)) { - return array('compress', $m[1]); - } - return array('', ''); - } - - /** - * Encode (compress) the content - * - * If the encode method is '' (none) or compression level is 0, or the 'zlib' - * extension isn't loaded, we return false. - * - * Then the appropriate gz_* function is called to compress the content. If - * this fails, false is returned. - * - * The header "Vary: Accept-Encoding" is added. If encoding is successful, - * the Content-Length header is updated, and Content-Encoding is also added. - * - * @param int $compressionLevel given to zlib functions. If not given, the - * class default will be used. - * - * @return bool success true if the content was actually compressed - */ - public function encode($compressionLevel = null) - { - $this->_headers['Vary'] = 'Accept-Encoding'; - if (null === $compressionLevel) { - $compressionLevel = self::$compressionLevel; - } - if ('' === $this->_encodeMethod[0] - || ($compressionLevel == 0) - || !extension_loaded('zlib')) - { - return false; - } - if ($this->_encodeMethod[0] === 'deflate') { - $encoded = gzdeflate($this->_content, $compressionLevel); - } elseif ($this->_encodeMethod[0] === 'gzip') { - $encoded = gzencode($this->_content, $compressionLevel); - } else { - $encoded = gzcompress($this->_content, $compressionLevel); - } - if (false === $encoded) { - return false; - } - $this->_headers['Content-Length'] = strlen($encoded); - $this->_headers['Content-Encoding'] = $this->_encodeMethod[1]; - $this->_content = $encoded; - return true; - } - - /** - * Encode and send appropriate headers and content - * - * This is a convenience method for common use of the class - * - * @param string $content - * - * @param int $compressionLevel given to zlib functions. If not given, the - * class default will be used. - * - * @return bool success true if the content was actually compressed - */ - public static function output($content, $compressionLevel = null) - { - if (null === $compressionLevel) { - $compressionLevel = self::$compressionLevel; - } - $he = new HTTP_Encoder(array('content' => $content)); - $ret = $he->encode($compressionLevel); - $he->sendAll(); - return $ret; - } - - protected $_content = ''; - protected $_headers = array(); - protected $_encodeMethod = array('', ''); - - /** - * Is the browser an IE version earlier than 6 SP2? - */ - protected static function _isBuggyIe() - { - $ua = $_SERVER['HTTP_USER_AGENT']; - // quick escape for non-IEs - if (0 !== strpos($ua, 'Mozilla/4.0 (compatible; MSIE ') - || false !== strpos($ua, 'Opera')) { - return false; - } - // no regex = faaast - $version = (float)substr($ua, 30); - return self::$encodeToIe6 - ? ($version < 6 || ($version == 6 && false === strpos($ua, 'SV1'))) - : ($version < 7); - } -} diff --git a/mod/minify/lib/min/lib/JSMin.php b/mod/minify/lib/min/lib/JSMin.php deleted file mode 100644 index 770e1c610..000000000 --- a/mod/minify/lib/min/lib/JSMin.php +++ /dev/null @@ -1,314 +0,0 @@ -<?php -/** - * jsmin.php - PHP implementation of Douglas Crockford's JSMin. - * - * This is a direct port of jsmin.c to PHP with a few PHP performance tweaks and - * modifications to preserve some comments (see below). Also, rather than using - * stdin/stdout, JSMin::minify() accepts a string as input and returns another - * string as output. - * - * Comments containing IE conditional compilation are preserved, as are multi-line - * comments that begin with "/*!" (for documentation purposes). In the latter case - * newlines are inserted around the comment to enhance readability. - * - * PHP 5 or higher is required. - * - * Permission is hereby granted to use this version of the library under the - * same terms as jsmin.c, which has the following license: - * - * -- - * Copyright (c) 2002 Douglas Crockford (www.crockford.com) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * The Software shall be used for Good, not Evil. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - * -- - * - * @package JSMin - * @author Ryan Grove <ryan@wonko.com> (PHP port) - * @author Steve Clay <steve@mrclay.org> (modifications + cleanup) - * @author Andrea Giammarchi <http://www.3site.eu> (spaceBeforeRegExp) - * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c) - * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port) - * @license http://opensource.org/licenses/mit-license.php MIT License - * @link http://code.google.com/p/jsmin-php/ - */ - -class JSMin { - const ORD_LF = 10; - const ORD_SPACE = 32; - const ACTION_KEEP_A = 1; - const ACTION_DELETE_A = 2; - const ACTION_DELETE_A_B = 3; - - protected $a = "\n"; - protected $b = ''; - protected $input = ''; - protected $inputIndex = 0; - protected $inputLength = 0; - protected $lookAhead = null; - protected $output = ''; - - /** - * Minify Javascript - * - * @param string $js Javascript to be minified - * @return string - */ - public static function minify($js) - { - $jsmin = new JSMin($js); - return $jsmin->min(); - } - - /** - * Setup process - */ - public function __construct($input) - { - $this->input = str_replace("\r\n", "\n", $input); - $this->inputLength = strlen($this->input); - } - - /** - * Perform minification, return result - */ - public function min() - { - if ($this->output !== '') { // min already run - return $this->output; - } - $this->action(self::ACTION_DELETE_A_B); - - while ($this->a !== null) { - // determine next command - $command = self::ACTION_KEEP_A; // default - if ($this->a === ' ') { - if (! $this->isAlphaNum($this->b)) { - $command = self::ACTION_DELETE_A; - } - } elseif ($this->a === "\n") { - if ($this->b === ' ') { - $command = self::ACTION_DELETE_A_B; - } elseif (false === strpos('{[(+-', $this->b) - && ! $this->isAlphaNum($this->b)) { - $command = self::ACTION_DELETE_A; - } - } elseif (! $this->isAlphaNum($this->a)) { - if ($this->b === ' ' - || ($this->b === "\n" - && (false === strpos('}])+-"\'', $this->a)))) { - $command = self::ACTION_DELETE_A_B; - } - } - $this->action($command); - } - $this->output = trim($this->output); - return $this->output; - } - - /** - * ACTION_KEEP_A = Output A. Copy B to A. Get the next B. - * ACTION_DELETE_A = Copy B to A. Get the next B. - * ACTION_DELETE_A_B = Get the next B. - */ - protected function action($command) - { - switch ($command) { - case self::ACTION_KEEP_A: - $this->output .= $this->a; - // fallthrough - case self::ACTION_DELETE_A: - $this->a = $this->b; - if ($this->a === "'" || $this->a === '"') { // string literal - $str = $this->a; // in case needed for exception - while (true) { - $this->output .= $this->a; - $this->a = $this->get(); - if ($this->a === $this->b) { // end quote - break; - } - if (ord($this->a) <= self::ORD_LF) { - throw new JSMin_UnterminatedStringException( - 'Unterminated String: ' . var_export($str, true)); - } - $str .= $this->a; - if ($this->a === '\\') { - $this->output .= $this->a; - $this->a = $this->get(); - $str .= $this->a; - } - } - } - // fallthrough - case self::ACTION_DELETE_A_B: - $this->b = $this->next(); - if ($this->b === '/' && $this->isRegexpLiteral()) { // RegExp literal - $this->output .= $this->a . $this->b; - $pattern = '/'; // in case needed for exception - while (true) { - $this->a = $this->get(); - $pattern .= $this->a; - if ($this->a === '/') { // end pattern - break; // while (true) - } elseif ($this->a === '\\') { - $this->output .= $this->a; - $this->a = $this->get(); - $pattern .= $this->a; - } elseif (ord($this->a) <= self::ORD_LF) { - throw new JSMin_UnterminatedRegExpException( - 'Unterminated RegExp: '. var_export($pattern, true)); - } - $this->output .= $this->a; - } - $this->b = $this->next(); - } - // end case ACTION_DELETE_A_B - } - } - - protected function isRegexpLiteral() - { - if (false !== strpos("\n{;(,=:[!&|?", $this->a)) { // we aren't dividing - return true; - } - if (' ' === $this->a) { - $length = strlen($this->output); - if ($length < 2) { // weird edge case - return true; - } - // you can't divide a keyword - if (preg_match('/(?:case|else|in|return|typeof)$/', $this->output, $m)) { - if ($this->output === $m[0]) { // odd but could happen - return true; - } - // make sure it's a keyword, not end of an identifier - $charBeforeKeyword = substr($this->output, $length - strlen($m[0]) - 1, 1); - if (! $this->isAlphaNum($charBeforeKeyword)) { - return true; - } - } - } - return false; - } - - /** - * Get next char. Convert ctrl char to space. - */ - protected function get() - { - $c = $this->lookAhead; - $this->lookAhead = null; - if ($c === null) { - if ($this->inputIndex < $this->inputLength) { - $c = $this->input[$this->inputIndex]; - $this->inputIndex += 1; - } else { - return null; - } - } - if ($c === "\r" || $c === "\n") { - return "\n"; - } - if (ord($c) < self::ORD_SPACE) { // control char - return ' '; - } - return $c; - } - - /** - * Get next char. If is ctrl character, translate to a space or newline. - */ - protected function peek() - { - $this->lookAhead = $this->get(); - return $this->lookAhead; - } - - /** - * Is $c a letter, digit, underscore, dollar sign, escape, or non-ASCII? - */ - protected function isAlphaNum($c) - { - return (preg_match('/^[0-9a-zA-Z_\\$\\\\]$/', $c) || ord($c) > 126); - } - - protected function singleLineComment() - { - $comment = ''; - while (true) { - $get = $this->get(); - $comment .= $get; - if (ord($get) <= self::ORD_LF) { // EOL reached - // if IE conditional comment - if (preg_match('/^\\/@(?:cc_on|if|elif|else|end)\\b/', $comment)) { - return "/{$comment}"; - } - return $get; - } - } - } - - protected function multipleLineComment() - { - $this->get(); - $comment = ''; - while (true) { - $get = $this->get(); - if ($get === '*') { - if ($this->peek() === '/') { // end of comment reached - $this->get(); - // if comment preserved by YUI Compressor - if (0 === strpos($comment, '!')) { - return "\n/*" . substr($comment, 1) . "*/\n"; - } - // if IE conditional comment - if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) { - return "/*{$comment}*/"; - } - return ' '; - } - } elseif ($get === null) { - throw new JSMin_UnterminatedCommentException('Unterminated Comment: ' . var_export('/*' . $comment, true)); - } - $comment .= $get; - } - } - - /** - * Get the next character, skipping over comments. - * Some comments may be preserved. - */ - protected function next() - { - $get = $this->get(); - if ($get !== '/') { - return $get; - } - switch ($this->peek()) { - case '/': return $this->singleLineComment(); - case '*': return $this->multipleLineComment(); - default: return $get; - } - } -} - -class JSMin_UnterminatedStringException extends Exception {} -class JSMin_UnterminatedCommentException extends Exception {} -class JSMin_UnterminatedRegExpException extends Exception {} diff --git a/mod/minify/lib/min/lib/JSMinPlus.php b/mod/minify/lib/min/lib/JSMinPlus.php deleted file mode 100644 index 31a1a5cb4..000000000 --- a/mod/minify/lib/min/lib/JSMinPlus.php +++ /dev/null @@ -1,1872 +0,0 @@ -<?php - -/** - * JSMinPlus version 1.1 - * - * Minifies a javascript file using a javascript parser - * - * This implements a PHP port of Brendan Eich's Narcissus open source javascript engine (in javascript) - * References: http://en.wikipedia.org/wiki/Narcissus_(JavaScript_engine) - * Narcissus sourcecode: http://mxr.mozilla.org/mozilla/source/js/narcissus/ - * JSMinPlus weblog: http://crisp.tweakblogs.net/blog/cat/716 - * - * Tino Zijdel <crisp@tweakers.net> - * - * Usage: $minified = JSMinPlus::minify($script [, $filename]) - * - * Versionlog (see also changelog.txt): - * 12-04-2009 - some small bugfixes and performance improvements - * 09-04-2009 - initial open sourced version 1.0 - * - * Latest version of this script: http://files.tweakers.net/jsminplus/jsminplus.zip - * - */ - -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is the Narcissus JavaScript engine. - * - * The Initial Developer of the Original Code is - * Brendan Eich <brendan@mozilla.org>. - * Portions created by the Initial Developer are Copyright (C) 2004 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): Tino Zijdel <crisp@tweakers.net> - * PHP port, modifications and minifier routine are (C) 2009 - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -define('TOKEN_END', 1); -define('TOKEN_NUMBER', 2); -define('TOKEN_IDENTIFIER', 3); -define('TOKEN_STRING', 4); -define('TOKEN_REGEXP', 5); -define('TOKEN_NEWLINE', 6); -define('TOKEN_CONDCOMMENT_MULTILINE', 7); - -define('JS_SCRIPT', 100); -define('JS_BLOCK', 101); -define('JS_LABEL', 102); -define('JS_FOR_IN', 103); -define('JS_CALL', 104); -define('JS_NEW_WITH_ARGS', 105); -define('JS_INDEX', 106); -define('JS_ARRAY_INIT', 107); -define('JS_OBJECT_INIT', 108); -define('JS_PROPERTY_INIT', 109); -define('JS_GETTER', 110); -define('JS_SETTER', 111); -define('JS_GROUP', 112); -define('JS_LIST', 113); - -define('DECLARED_FORM', 0); -define('EXPRESSED_FORM', 1); -define('STATEMENT_FORM', 2); - -class JSMinPlus -{ - private $parser; - private $reserved = array( - 'break', 'case', 'catch', 'continue', 'default', 'delete', 'do', - 'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof', - 'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var', - 'void', 'while', 'with', - // Words reserved for future use - 'abstract', 'boolean', 'byte', 'char', 'class', 'const', 'debugger', - 'double', 'enum', 'export', 'extends', 'final', 'float', 'goto', - 'implements', 'import', 'int', 'interface', 'long', 'native', - 'package', 'private', 'protected', 'public', 'short', 'static', - 'super', 'synchronized', 'throws', 'transient', 'volatile', - // These are not reserved, but should be taken into account - // in isValidIdentifier (See jslint source code) - 'arguments', 'eval', 'true', 'false', 'Infinity', 'NaN', 'null', 'undefined' - ); - - private function __construct() - { - $this->parser = new JSParser(); - } - - public static function minify($js, $filename='') - { - static $instance; - - // this is a singleton - if(!$instance) - $instance = new JSMinPlus(); - - return $instance->min($js, $filename); - } - - private function min($js, $filename) - { - try - { - $n = $this->parser->parse($js, $filename, 1); - return $this->parseTree($n); - } - catch(Exception $e) - { - echo $e->getMessage() . "\n"; - } - - return false; - } - - private function parseTree($n, $noBlockGrouping = false) - { - $s = ''; - - switch ($n->type) - { - case KEYWORD_FUNCTION: - $s .= 'function' . ($n->name ? ' ' . $n->name : '') . '('; - $params = $n->params; - for ($i = 0, $j = count($params); $i < $j; $i++) - $s .= ($i ? ',' : '') . $params[$i]; - $s .= '){' . $this->parseTree($n->body, true) . '}'; - break; - - case JS_SCRIPT: - // we do nothing with funDecls or varDecls - $noBlockGrouping = true; - // fall through - case JS_BLOCK: - $childs = $n->treeNodes; - for ($c = 0, $i = 0, $j = count($childs); $i < $j; $i++) - { - $t = $this->parseTree($childs[$i]); - if (strlen($t)) - { - if ($c) - { - if ($childs[$i]->type == KEYWORD_FUNCTION && $childs[$i]->functionForm == DECLARED_FORM) - $s .= "\n"; // put declared functions on a new line - else - $s .= ';'; - } - - $s .= $t; - - $c++; - } - } - - if ($c > 1 && !$noBlockGrouping) - { - $s = '{' . $s . '}'; - } - break; - - case KEYWORD_IF: - $s = 'if(' . $this->parseTree($n->condition) . ')'; - $thenPart = $this->parseTree($n->thenPart); - $elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null; - - // quite a rancid hack to see if we should enclose the thenpart in brackets - if ($thenPart[0] != '{') - { - if (strpos($thenPart, 'if(') !== false) - $thenPart = '{' . $thenPart . '}'; - elseif ($elsePart) - $thenPart .= ';'; - } - - $s .= $thenPart; - - if ($elsePart) - { - $s .= 'else'; - - if ($elsePart[0] != '{') - $s .= ' '; - - $s .= $elsePart; - } - break; - - case KEYWORD_SWITCH: - $s = 'switch(' . $this->parseTree($n->discriminant) . '){'; - $cases = $n->cases; - for ($i = 0, $j = count($cases); $i < $j; $i++) - { - $case = $cases[$i]; - if ($case->type == KEYWORD_CASE) - $s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':'; - else - $s .= 'default:'; - - $statement = $this->parseTree($case->statements); - if ($statement) - $s .= $statement . ';'; - } - $s = rtrim($s, ';') . '}'; - break; - - case KEYWORD_FOR: - $s = 'for(' . ($n->setup ? $this->parseTree($n->setup) : '') - . ';' . ($n->condition ? $this->parseTree($n->condition) : '') - . ';' . ($n->update ? $this->parseTree($n->update) : '') . ')' - . $this->parseTree($n->body); - break; - - case KEYWORD_WHILE: - $s = 'while(' . $this->parseTree($n->condition) . ')' . $this->parseTree($n->body); - break; - - case JS_FOR_IN: - $s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body); - break; - - case KEYWORD_DO: - $s = 'do{' . $this->parseTree($n->body, true) . '}while(' . $this->parseTree($n->condition) . ')'; - break; - - case KEYWORD_BREAK: - case KEYWORD_CONTINUE: - $s = $n->value . ($n->label ? ' ' . $n->label : ''); - break; - - case KEYWORD_TRY: - $s = 'try{' . $this->parseTree($n->tryBlock, true) . '}'; - $catchClauses = $n->catchClauses; - for ($i = 0, $j = count($catchClauses); $i < $j; $i++) - { - $t = $catchClauses[$i]; - $s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}'; - } - if ($n->finallyBlock) - $s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}'; - break; - - case KEYWORD_THROW: - $s = 'throw ' . $this->parseTree($n->exception); - break; - - case KEYWORD_RETURN: - $s = 'return' . ($n->value ? ' ' . $this->parseTree($n->value) : ''); - break; - - case KEYWORD_WITH: - $s = 'with(' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body); - break; - - case KEYWORD_VAR: - case KEYWORD_CONST: - $s = $n->value . ' '; - $childs = $n->treeNodes; - for ($i = 0, $j = count($childs); $i < $j; $i++) - { - $t = $childs[$i]; - $s .= ($i ? ',' : '') . $t->name; - $u = $t->initializer; - if ($u) - $s .= '=' . $this->parseTree($u); - } - break; - - case KEYWORD_DEBUGGER: - throw new Exception('NOT IMPLEMENTED: DEBUGGER'); - break; - - case TOKEN_CONDCOMMENT_MULTILINE: - $s = $n->value . ' '; - $childs = $n->treeNodes; - for ($i = 0, $j = count($childs); $i < $j; $i++) - $s .= $this->parseTree($childs[$i]); - break; - - case OP_SEMICOLON: - if ($expression = $n->expression) - $s = $this->parseTree($expression); - break; - - case JS_LABEL: - $s = $n->label . ':' . $this->parseTree($n->statement); - break; - - case OP_COMMA: - $childs = $n->treeNodes; - for ($i = 0, $j = count($childs); $i < $j; $i++) - $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]); - break; - - case OP_ASSIGN: - $s = $this->parseTree($n->treeNodes[0]) . $n->value . $this->parseTree($n->treeNodes[1]); - break; - - case OP_HOOK: - $s = $this->parseTree($n->treeNodes[0]) . '?' . $this->parseTree($n->treeNodes[1]) . ':' . $this->parseTree($n->treeNodes[2]); - break; - - case OP_OR: case OP_AND: - case OP_BITWISE_OR: case OP_BITWISE_XOR: case OP_BITWISE_AND: - case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE: - case OP_LT: case OP_LE: case OP_GE: case OP_GT: - case OP_LSH: case OP_RSH: case OP_URSH: - case OP_MUL: case OP_DIV: case OP_MOD: - $s = $this->parseTree($n->treeNodes[0]) . $n->type . $this->parseTree($n->treeNodes[1]); - break; - - case OP_PLUS: - case OP_MINUS: - $s = $this->parseTree($n->treeNodes[0]) . $n->type; - $nextTokenType = $n->treeNodes[1]->type; - if ( $nextTokenType == OP_PLUS || $nextTokenType == OP_MINUS || - $nextTokenType == OP_INCREMENT || $nextTokenType == OP_DECREMENT || - $nextTokenType == OP_UNARY_PLUS || $nextTokenType == OP_UNARY_MINUS - ) - $s .= ' '; - $s .= $this->parseTree($n->treeNodes[1]); - break; - - case KEYWORD_IN: - $s = $this->parseTree($n->treeNodes[0]) . ' in ' . $this->parseTree($n->treeNodes[1]); - break; - - case KEYWORD_INSTANCEOF: - $s = $this->parseTree($n->treeNodes[0]) . ' instanceof ' . $this->parseTree($n->treeNodes[1]); - break; - - case KEYWORD_DELETE: - $s = 'delete ' . $this->parseTree($n->treeNodes[0]); - break; - - case KEYWORD_VOID: - $s = 'void(' . $this->parseTree($n->treeNodes[0]) . ')'; - break; - - case KEYWORD_TYPEOF: - $s = 'typeof ' . $this->parseTree($n->treeNodes[0]); - break; - - case OP_NOT: - case OP_BITWISE_NOT: - case OP_UNARY_PLUS: - case OP_UNARY_MINUS: - $s = $n->value . $this->parseTree($n->treeNodes[0]); - break; - - case OP_INCREMENT: - case OP_DECREMENT: - if ($n->postfix) - $s = $this->parseTree($n->treeNodes[0]) . $n->value; - else - $s = $n->value . $this->parseTree($n->treeNodes[0]); - break; - - case OP_DOT: - $s = $this->parseTree($n->treeNodes[0]) . '.' . $this->parseTree($n->treeNodes[1]); - break; - - case JS_INDEX: - $s = $this->parseTree($n->treeNodes[0]); - // See if we can replace named index with a dot saving 3 bytes - if ( $n->treeNodes[0]->type == TOKEN_IDENTIFIER && - $n->treeNodes[1]->type == TOKEN_STRING && - $this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1)) - ) - $s .= '.' . substr($n->treeNodes[1]->value, 1, -1); - else - $s .= '[' . $this->parseTree($n->treeNodes[1]) . ']'; - break; - - case JS_LIST: - $childs = $n->treeNodes; - for ($i = 0, $j = count($childs); $i < $j; $i++) - $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]); - break; - - case JS_CALL: - $s = $this->parseTree($n->treeNodes[0]) . '(' . $this->parseTree($n->treeNodes[1]) . ')'; - break; - - case KEYWORD_NEW: - case JS_NEW_WITH_ARGS: - $s = 'new ' . $this->parseTree($n->treeNodes[0]) . '(' . ($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '') . ')'; - break; - - case JS_ARRAY_INIT: - $s = '['; - $childs = $n->treeNodes; - for ($i = 0, $j = count($childs); $i < $j; $i++) - { - $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]); - } - $s .= ']'; - break; - - case JS_OBJECT_INIT: - $s = '{'; - $childs = $n->treeNodes; - for ($i = 0, $j = count($childs); $i < $j; $i++) - { - $t = $childs[$i]; - if ($i) - $s .= ','; - if ($t->type == JS_PROPERTY_INIT) - { - // Ditch the quotes when the index is a valid identifier - if ( $t->treeNodes[0]->type == TOKEN_STRING && - $this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1)) - ) - $s .= substr($t->treeNodes[0]->value, 1, -1); - else - $s .= $t->treeNodes[0]->value; - - $s .= ':' . $this->parseTree($t->treeNodes[1]); - } - else - { - $s .= $t->type == JS_GETTER ? 'get' : 'set'; - $s .= ' ' . $t->name . '('; - $params = $t->params; - for ($i = 0, $j = count($params); $i < $j; $i++) - $s .= ($i ? ',' : '') . $params[$i]; - $s .= '){' . $this->parseTree($t->body, true) . '}'; - } - } - $s .= '}'; - break; - - case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE: - case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP: - $s = $n->value; - break; - - case JS_GROUP: - $s = '(' . $this->parseTree($n->treeNodes[0]) . ')'; - break; - - default: - throw new Exception('UNKNOWN TOKEN TYPE: ' . $n->type); - } - - return $s; - } - - private function isValidIdentifier($string) - { - return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $string) && !in_array($string, $this->reserved); - } -} - -class JSParser -{ - private $t; - - private $opPrecedence = array( - ';' => 0, - ',' => 1, - '=' => 2, '?' => 2, ':' => 2, - // The above all have to have the same precedence, see bug 330975. - '||' => 4, - '&&' => 5, - '|' => 6, - '^' => 7, - '&' => 8, - '==' => 9, '!=' => 9, '===' => 9, '!==' => 9, - '<' => 10, '<=' => 10, '>=' => 10, '>' => 10, 'in' => 10, 'instanceof' => 10, - '<<' => 11, '>>' => 11, '>>>' => 11, - '+' => 12, '-' => 12, - '*' => 13, '/' => 13, '%' => 13, - 'delete' => 14, 'void' => 14, 'typeof' => 14, - '!' => 14, '~' => 14, 'U+' => 14, 'U-' => 14, - '++' => 15, '--' => 15, - 'new' => 16, - '.' => 17, - JS_NEW_WITH_ARGS => 0, JS_INDEX => 0, JS_CALL => 0, - JS_ARRAY_INIT => 0, JS_OBJECT_INIT => 0, JS_GROUP => 0 - ); - - private $opArity = array( - ',' => -2, - '=' => 2, - '?' => 3, - '||' => 2, - '&&' => 2, - '|' => 2, - '^' => 2, - '&' => 2, - '==' => 2, '!=' => 2, '===' => 2, '!==' => 2, - '<' => 2, '<=' => 2, '>=' => 2, '>' => 2, 'in' => 2, 'instanceof' => 2, - '<<' => 2, '>>' => 2, '>>>' => 2, - '+' => 2, '-' => 2, - '*' => 2, '/' => 2, '%' => 2, - 'delete' => 1, 'void' => 1, 'typeof' => 1, - '!' => 1, '~' => 1, 'U+' => 1, 'U-' => 1, - '++' => 1, '--' => 1, - 'new' => 1, - '.' => 2, - JS_NEW_WITH_ARGS => 2, JS_INDEX => 2, JS_CALL => 2, - JS_ARRAY_INIT => 1, JS_OBJECT_INIT => 1, JS_GROUP => 1, - TOKEN_CONDCOMMENT_MULTILINE => 1 - ); - - public function __construct() - { - $this->t = new JSTokenizer(); - } - - public function parse($s, $f, $l) - { - // initialize tokenizer - $this->t->init($s, $f, $l); - - $x = new JSCompilerContext(false); - $n = $this->Script($x); - if (!$this->t->isDone()) - throw $this->t->newSyntaxError('Syntax error'); - - return $n; - } - - private function Script($x) - { - $n = $this->Statements($x); - $n->type = JS_SCRIPT; - $n->funDecls = $x->funDecls; - $n->varDecls = $x->varDecls; - - return $n; - } - - private function Statements($x) - { - $n = new JSNode($this->t, JS_BLOCK); - array_push($x->stmtStack, $n); - - while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY) - $n->addNode($this->Statement($x)); - - array_pop($x->stmtStack); - - return $n; - } - - private function Block($x) - { - $this->t->mustMatch(OP_LEFT_CURLY); - $n = $this->Statements($x); - $this->t->mustMatch(OP_RIGHT_CURLY); - - return $n; - } - - private function Statement($x) - { - $tt = $this->t->get(); - $n2 = null; - - // Cases for statements ending in a right curly return early, avoiding the - // common semicolon insertion magic after this switch. - switch ($tt) - { - case KEYWORD_FUNCTION: - return $this->FunctionDefinition( - $x, - true, - count($x->stmtStack) > 1 ? STATEMENT_FORM : DECLARED_FORM - ); - break; - - case OP_LEFT_CURLY: - $n = $this->Statements($x); - $this->t->mustMatch(OP_RIGHT_CURLY); - return $n; - - case KEYWORD_IF: - $n = new JSNode($this->t); - $n->condition = $this->ParenExpression($x); - array_push($x->stmtStack, $n); - $n->thenPart = $this->Statement($x); - $n->elsePart = $this->t->match(KEYWORD_ELSE) ? $this->Statement($x) : null; - array_pop($x->stmtStack); - return $n; - - case KEYWORD_SWITCH: - $n = new JSNode($this->t); - $this->t->mustMatch(OP_LEFT_PAREN); - $n->discriminant = $this->Expression($x); - $this->t->mustMatch(OP_RIGHT_PAREN); - $n->cases = array(); - $n->defaultIndex = -1; - - array_push($x->stmtStack, $n); - - $this->t->mustMatch(OP_LEFT_CURLY); - - while (($tt = $this->t->get()) != OP_RIGHT_CURLY) - { - switch ($tt) - { - case KEYWORD_DEFAULT: - if ($n->defaultIndex >= 0) - throw $this->t->newSyntaxError('More than one switch default'); - // FALL THROUGH - case KEYWORD_CASE: - $n2 = new JSNode($this->t); - if ($tt == KEYWORD_DEFAULT) - $n->defaultIndex = count($n->cases); - else - $n2->caseLabel = $this->Expression($x, OP_COLON); - break; - default: - throw $this->t->newSyntaxError('Invalid switch case'); - } - - $this->t->mustMatch(OP_COLON); - $n2->statements = new JSNode($this->t, JS_BLOCK); - while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY) - $n2->statements->addNode($this->Statement($x)); - - array_push($n->cases, $n2); - } - - array_pop($x->stmtStack); - return $n; - - case KEYWORD_FOR: - $n = new JSNode($this->t); - $n->isLoop = true; - $this->t->mustMatch(OP_LEFT_PAREN); - - if (($tt = $this->t->peek()) != OP_SEMICOLON) - { - $x->inForLoopInit = true; - if ($tt == KEYWORD_VAR || $tt == KEYWORD_CONST) - { - $this->t->get(); - $n2 = $this->Variables($x); - } - else - { - $n2 = $this->Expression($x); - } - $x->inForLoopInit = false; - } - - if ($n2 && $this->t->match(KEYWORD_IN)) - { - $n->type = JS_FOR_IN; - if ($n2->type == KEYWORD_VAR) - { - if (count($n2->treeNodes) != 1) - { - throw $this->t->SyntaxError( - 'Invalid for..in left-hand side', - $this->t->filename, - $n2->lineno - ); - } - - // NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name. - $n->iterator = $n2->treeNodes[0]; - $n->varDecl = $n2; - } - else - { - $n->iterator = $n2; - $n->varDecl = null; - } - - $n->object = $this->Expression($x); - } - else - { - $n->setup = $n2 ? $n2 : null; - $this->t->mustMatch(OP_SEMICOLON); - $n->condition = $this->t->peek() == OP_SEMICOLON ? null : $this->Expression($x); - $this->t->mustMatch(OP_SEMICOLON); - $n->update = $this->t->peek() == OP_RIGHT_PAREN ? null : $this->Expression($x); - } - - $this->t->mustMatch(OP_RIGHT_PAREN); - $n->body = $this->nest($x, $n); - return $n; - - case KEYWORD_WHILE: - $n = new JSNode($this->t); - $n->isLoop = true; - $n->condition = $this->ParenExpression($x); - $n->body = $this->nest($x, $n); - return $n; - - case KEYWORD_DO: - $n = new JSNode($this->t); - $n->isLoop = true; - $n->body = $this->nest($x, $n, KEYWORD_WHILE); - $n->condition = $this->ParenExpression($x); - if (!$x->ecmaStrictMode) - { - // <script language="JavaScript"> (without version hints) may need - // automatic semicolon insertion without a newline after do-while. - // See http://bugzilla.mozilla.org/show_bug.cgi?id=238945. - $this->t->match(OP_SEMICOLON); - return $n; - } - break; - - case KEYWORD_BREAK: - case KEYWORD_CONTINUE: - $n = new JSNode($this->t); - - if ($this->t->peekOnSameLine() == TOKEN_IDENTIFIER) - { - $this->t->get(); - $n->label = $this->t->currentToken()->value; - } - - $ss = $x->stmtStack; - $i = count($ss); - $label = $n->label; - if ($label) - { - do - { - if (--$i < 0) - throw $this->t->newSyntaxError('Label not found'); - } - while ($ss[$i]->label != $label); - } - else - { - do - { - if (--$i < 0) - throw $this->t->newSyntaxError('Invalid ' . $tt); - } - while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH)); - } - - $n->target = $ss[$i]; - break; - - case KEYWORD_TRY: - $n = new JSNode($this->t); - $n->tryBlock = $this->Block($x); - $n->catchClauses = array(); - - while ($this->t->match(KEYWORD_CATCH)) - { - $n2 = new JSNode($this->t); - $this->t->mustMatch(OP_LEFT_PAREN); - $n2->varName = $this->t->mustMatch(TOKEN_IDENTIFIER)->value; - - if ($this->t->match(KEYWORD_IF)) - { - if ($x->ecmaStrictMode) - throw $this->t->newSyntaxError('Illegal catch guard'); - - if (count($n->catchClauses) && !end($n->catchClauses)->guard) - throw $this->t->newSyntaxError('Guarded catch after unguarded'); - - $n2->guard = $this->Expression($x); - } - else - { - $n2->guard = null; - } - - $this->t->mustMatch(OP_RIGHT_PAREN); - $n2->block = $this->Block($x); - array_push($n->catchClauses, $n2); - } - - if ($this->t->match(KEYWORD_FINALLY)) - $n->finallyBlock = $this->Block($x); - - if (!count($n->catchClauses) && !$n->finallyBlock) - throw $this->t->newSyntaxError('Invalid try statement'); - return $n; - - case KEYWORD_CATCH: - case KEYWORD_FINALLY: - throw $this->t->newSyntaxError($tt + ' without preceding try'); - - case KEYWORD_THROW: - $n = new JSNode($this->t); - $n->exception = $this->Expression($x); - break; - - case KEYWORD_RETURN: - if (!$x->inFunction) - throw $this->t->newSyntaxError('Invalid return'); - - $n = new JSNode($this->t); - $tt = $this->t->peekOnSameLine(); - if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY) - $n->value = $this->Expression($x); - else - $n->value = null; - break; - - case KEYWORD_WITH: - $n = new JSNode($this->t); - $n->object = $this->ParenExpression($x); - $n->body = $this->nest($x, $n); - return $n; - - case KEYWORD_VAR: - case KEYWORD_CONST: - $n = $this->Variables($x); - break; - - case TOKEN_CONDCOMMENT_MULTILINE: - $n = new JSNode($this->t); - return $n; - - case KEYWORD_DEBUGGER: - $n = new JSNode($this->t); - break; - - case TOKEN_NEWLINE: - case OP_SEMICOLON: - $n = new JSNode($this->t, OP_SEMICOLON); - $n->expression = null; - return $n; - - default: - if ($tt == TOKEN_IDENTIFIER) - { - $this->t->scanOperand = false; - $tt = $this->t->peek(); - $this->t->scanOperand = true; - if ($tt == OP_COLON) - { - $label = $this->t->currentToken()->value; - $ss = $x->stmtStack; - for ($i = count($ss) - 1; $i >= 0; --$i) - { - if ($ss[$i]->label == $label) - throw $this->t->newSyntaxError('Duplicate label'); - } - - $this->t->get(); - $n = new JSNode($this->t, JS_LABEL); - $n->label = $label; - $n->statement = $this->nest($x, $n); - - return $n; - } - } - - $n = new JSNode($this->t, OP_SEMICOLON); - $this->t->unget(); - $n->expression = $this->Expression($x); - $n->end = $n->expression->end; - break; - } - - if ($this->t->lineno == $this->t->currentToken()->lineno) - { - $tt = $this->t->peekOnSameLine(); - if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY) - throw $this->t->newSyntaxError('Missing ; before statement'); - } - - $this->t->match(OP_SEMICOLON); - - return $n; - } - - private function FunctionDefinition($x, $requireName, $functionForm) - { - $f = new JSNode($this->t); - - if ($f->type != KEYWORD_FUNCTION) - $f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER; - - if ($this->t->match(TOKEN_IDENTIFIER)) - $f->name = $this->t->currentToken()->value; - elseif ($requireName) - throw $this->t->newSyntaxError('Missing function identifier'); - - $this->t->mustMatch(OP_LEFT_PAREN); - $f->params = array(); - - while (($tt = $this->t->get()) != OP_RIGHT_PAREN) - { - if ($tt != TOKEN_IDENTIFIER) - throw $this->t->newSyntaxError('Missing formal parameter'); - - array_push($f->params, $this->t->currentToken()->value); - - if ($this->t->peek() != OP_RIGHT_PAREN) - $this->t->mustMatch(OP_COMMA); - } - - $this->t->mustMatch(OP_LEFT_CURLY); - - $x2 = new JSCompilerContext(true); - $f->body = $this->Script($x2); - - $this->t->mustMatch(OP_RIGHT_CURLY); - $f->end = $this->t->currentToken()->end; - - $f->functionForm = $functionForm; - if ($functionForm == DECLARED_FORM) - array_push($x->funDecls, $f); - - return $f; - } - - private function Variables($x) - { - $n = new JSNode($this->t); - - do - { - $this->t->mustMatch(TOKEN_IDENTIFIER); - - $n2 = new JSNode($this->t); - $n2->name = $n2->value; - - if ($this->t->match(OP_ASSIGN)) - { - if ($this->t->currentToken()->assignOp) - throw $this->t->newSyntaxError('Invalid variable initialization'); - - $n2->initializer = $this->Expression($x, OP_COMMA); - } - - $n2->readOnly = $n->type == KEYWORD_CONST; - - $n->addNode($n2); - array_push($x->varDecls, $n2); - } - while ($this->t->match(OP_COMMA)); - - return $n; - } - - private function Expression($x, $stop=false) - { - $operators = array(); - $operands = array(); - $n = false; - - $bl = $x->bracketLevel; - $cl = $x->curlyLevel; - $pl = $x->parenLevel; - $hl = $x->hookLevel; - - while (($tt = $this->t->get()) != TOKEN_END) - { - if ($tt == $stop && - $x->bracketLevel == $bl && - $x->curlyLevel == $cl && - $x->parenLevel == $pl && - $x->hookLevel == $hl - ) - { - // Stop only if tt matches the optional stop parameter, and that - // token is not quoted by some kind of bracket. - break; - } - - switch ($tt) - { - case OP_SEMICOLON: - // NB: cannot be empty, Statement handled that. - break 2; - - case OP_ASSIGN: - case OP_HOOK: - case OP_COLON: - if ($this->t->scanOperand) - break 2; - - // Use >, not >=, for right-associative ASSIGN and HOOK/COLON. - while ( !empty($operators) && - ( $this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt] || - ($tt == OP_COLON && end($operators)->type == OP_ASSIGN) - ) - ) - $this->reduce($operators, $operands); - - if ($tt == OP_COLON) - { - $n = end($operators); - if ($n->type != OP_HOOK) - throw $this->t->newSyntaxError('Invalid label'); - - --$x->hookLevel; - } - else - { - array_push($operators, new JSNode($this->t)); - if ($tt == OP_ASSIGN) - end($operands)->assignOp = $this->t->currentToken()->assignOp; - else - ++$x->hookLevel; - } - - $this->t->scanOperand = true; - break; - - case KEYWORD_IN: - // An in operator should not be parsed if we're parsing the head of - // a for (...) loop, unless it is in the then part of a conditional - // expression, or parenthesized somehow. - if ($x->inForLoopInit && !$x->hookLevel && - !$x->bracketLevel && !$x->curlyLevel && - !$x->parenLevel - ) - { - break 2; - } - // FALL THROUGH - case OP_COMMA: - // Treat comma as left-associative so reduce can fold left-heavy - // COMMA trees into a single array. - // FALL THROUGH - case OP_OR: - case OP_AND: - case OP_BITWISE_OR: - case OP_BITWISE_XOR: - case OP_BITWISE_AND: - case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE: - case OP_LT: case OP_LE: case OP_GE: case OP_GT: - case KEYWORD_INSTANCEOF: - case OP_LSH: case OP_RSH: case OP_URSH: - case OP_PLUS: case OP_MINUS: - case OP_MUL: case OP_DIV: case OP_MOD: - case OP_DOT: - if ($this->t->scanOperand) - break 2; - - while ( !empty($operators) && - $this->opPrecedence[end($operators)->type] >= $this->opPrecedence[$tt] - ) - $this->reduce($operators, $operands); - - if ($tt == OP_DOT) - { - $this->t->mustMatch(TOKEN_IDENTIFIER); - array_push($operands, new JSNode($this->t, OP_DOT, array_pop($operands), new JSNode($this->t))); - } - else - { - array_push($operators, new JSNode($this->t)); - $this->t->scanOperand = true; - } - break; - - case KEYWORD_DELETE: case KEYWORD_VOID: case KEYWORD_TYPEOF: - case OP_NOT: case OP_BITWISE_NOT: case OP_UNARY_PLUS: case OP_UNARY_MINUS: - case KEYWORD_NEW: - if (!$this->t->scanOperand) - break 2; - - array_push($operators, new JSNode($this->t)); - break; - - case OP_INCREMENT: case OP_DECREMENT: - if ($this->t->scanOperand) - { - array_push($operators, new JSNode($this->t)); // prefix increment or decrement - } - else - { - // Don't cross a line boundary for postfix {in,de}crement. - $t = $this->t->tokens[($this->t->tokenIndex + $this->t->lookahead - 1) & 3]; - if ($t && $t->lineno != $this->t->lineno) - break 2; - - if (!empty($operators)) - { - // Use >, not >=, so postfix has higher precedence than prefix. - while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]) - $this->reduce($operators, $operands); - } - - $n = new JSNode($this->t, $tt, array_pop($operands)); - $n->postfix = true; - array_push($operands, $n); - } - break; - - case KEYWORD_FUNCTION: - if (!$this->t->scanOperand) - break 2; - - array_push($operands, $this->FunctionDefinition($x, false, EXPRESSED_FORM)); - $this->t->scanOperand = false; - break; - - case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE: - case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP: - if (!$this->t->scanOperand) - break 2; - - array_push($operands, new JSNode($this->t)); - $this->t->scanOperand = false; - break; - - case TOKEN_CONDCOMMENT_MULTILINE: - if ($this->t->scanOperand) - array_push($operators, new JSNode($this->t)); - else - array_push($operands, new JSNode($this->t)); - break; - - case OP_LEFT_BRACKET: - if ($this->t->scanOperand) - { - // Array initialiser. Parse using recursive descent, as the - // sub-grammar here is not an operator grammar. - $n = new JSNode($this->t, JS_ARRAY_INIT); - while (($tt = $this->t->peek()) != OP_RIGHT_BRACKET) - { - if ($tt == OP_COMMA) - { - $this->t->get(); - $n->addNode(null); - continue; - } - - $n->addNode($this->Expression($x, OP_COMMA)); - if (!$this->t->match(OP_COMMA)) - break; - } - - $this->t->mustMatch(OP_RIGHT_BRACKET); - array_push($operands, $n); - $this->t->scanOperand = false; - } - else - { - // Property indexing operator. - array_push($operators, new JSNode($this->t, JS_INDEX)); - $this->t->scanOperand = true; - ++$x->bracketLevel; - } - break; - - case OP_RIGHT_BRACKET: - if ($this->t->scanOperand || $x->bracketLevel == $bl) - break 2; - - while ($this->reduce($operators, $operands)->type != JS_INDEX) - continue; - - --$x->bracketLevel; - break; - - case OP_LEFT_CURLY: - if (!$this->t->scanOperand) - break 2; - - // Object initialiser. As for array initialisers (see above), - // parse using recursive descent. - ++$x->curlyLevel; - $n = new JSNode($this->t, JS_OBJECT_INIT); - while (!$this->t->match(OP_RIGHT_CURLY)) - { - do - { - $tt = $this->t->get(); - $tv = $this->t->currentToken()->value; - if (($tv == 'get' || $tv == 'set') && $this->t->peek() == TOKEN_IDENTIFIER) - { - if ($x->ecmaStrictMode) - throw $this->t->newSyntaxError('Illegal property accessor'); - - $n->addNode($this->FunctionDefinition($x, true, EXPRESSED_FORM)); - } - else - { - switch ($tt) - { - case TOKEN_IDENTIFIER: - case TOKEN_NUMBER: - case TOKEN_STRING: - $id = new JSNode($this->t); - break; - - case OP_RIGHT_CURLY: - if ($x->ecmaStrictMode) - throw $this->t->newSyntaxError('Illegal trailing ,'); - break 3; - - default: - throw $this->t->newSyntaxError('Invalid property name'); - } - - $this->t->mustMatch(OP_COLON); - $n->addNode(new JSNode($this->t, JS_PROPERTY_INIT, $id, $this->Expression($x, OP_COMMA))); - } - } - while ($this->t->match(OP_COMMA)); - - $this->t->mustMatch(OP_RIGHT_CURLY); - break; - } - - array_push($operands, $n); - $this->t->scanOperand = false; - --$x->curlyLevel; - break; - - case OP_RIGHT_CURLY: - if (!$this->t->scanOperand && $x->curlyLevel != $cl) - throw new Exception('PANIC: right curly botch'); - break 2; - - case OP_LEFT_PAREN: - if ($this->t->scanOperand) - { - array_push($operators, new JSNode($this->t, JS_GROUP)); - } - else - { - while ( !empty($operators) && - $this->opPrecedence[end($operators)->type] > $this->opPrecedence[KEYWORD_NEW] - ) - $this->reduce($operators, $operands); - - // Handle () now, to regularize the n-ary case for n > 0. - // We must set scanOperand in case there are arguments and - // the first one is a regexp or unary+/-. - $n = end($operators); - $this->t->scanOperand = true; - if ($this->t->match(OP_RIGHT_PAREN)) - { - if ($n && $n->type == KEYWORD_NEW) - { - array_pop($operators); - $n->addNode(array_pop($operands)); - } - else - { - $n = new JSNode($this->t, JS_CALL, array_pop($operands), new JSNode($this->t, JS_LIST)); - } - - array_push($operands, $n); - $this->t->scanOperand = false; - break; - } - - if ($n && $n->type == KEYWORD_NEW) - $n->type = JS_NEW_WITH_ARGS; - else - array_push($operators, new JSNode($this->t, JS_CALL)); - } - - ++$x->parenLevel; - break; - - case OP_RIGHT_PAREN: - if ($this->t->scanOperand || $x->parenLevel == $pl) - break 2; - - while (($tt = $this->reduce($operators, $operands)->type) != JS_GROUP && - $tt != JS_CALL && $tt != JS_NEW_WITH_ARGS - ) - { - continue; - } - - if ($tt != JS_GROUP) - { - $n = end($operands); - if ($n->treeNodes[1]->type != OP_COMMA) - $n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]); - else - $n->treeNodes[1]->type = JS_LIST; - } - - --$x->parenLevel; - break; - - // Automatic semicolon insertion means we may scan across a newline - // and into the beginning of another statement. If so, break out of - // the while loop and let the t.scanOperand logic handle errors. - default: - break 2; - } - } - - if ($x->hookLevel != $hl) - throw $this->t->newSyntaxError('Missing : after ?'); - - if ($x->parenLevel != $pl) - throw $this->t->newSyntaxError('Missing ) in parenthetical'); - - if ($x->bracketLevel != $bl) - throw $this->t->newSyntaxError('Missing ] in index expression'); - - if ($this->t->scanOperand) - throw $this->t->newSyntaxError('Missing operand'); - - // Resume default mode, scanning for operands, not operators. - $this->t->scanOperand = true; - $this->t->unget(); - - while (count($operators)) - $this->reduce($operators, $operands); - - return array_pop($operands); - } - - private function ParenExpression($x) - { - $this->t->mustMatch(OP_LEFT_PAREN); - $n = $this->Expression($x); - $this->t->mustMatch(OP_RIGHT_PAREN); - - return $n; - } - - // Statement stack and nested statement handler. - private function nest($x, $node, $end = false) - { - array_push($x->stmtStack, $node); - $n = $this->statement($x); - array_pop($x->stmtStack); - - if ($end) - $this->t->mustMatch($end); - - return $n; - } - - private function reduce(&$operators, &$operands) - { - $n = array_pop($operators); - $op = $n->type; - $arity = $this->opArity[$op]; - $c = count($operands); - if ($arity == -2) - { - // Flatten left-associative trees - if ($c >= 2) - { - $left = $operands[$c - 2]; - if ($left->type == $op) - { - $right = array_pop($operands); - $left->addNode($right); - return $left; - } - } - $arity = 2; - } - - // Always use push to add operands to n, to update start and end - $a = array_splice($operands, $c - $arity); - for ($i = 0; $i < $arity; $i++) - $n->addNode($a[$i]); - - // Include closing bracket or postfix operator in [start,end] - $te = $this->t->currentToken()->end; - if ($n->end < $te) - $n->end = $te; - - array_push($operands, $n); - - return $n; - } -} - -class JSCompilerContext -{ - public $inFunction = false; - public $inForLoopInit = false; - public $ecmaStrictMode = false; - public $bracketLevel = 0; - public $curlyLevel = 0; - public $parenLevel = 0; - public $hookLevel = 0; - - public $stmtStack = array(); - public $funDecls = array(); - public $varDecls = array(); - - public function __construct($inFunction) - { - $this->inFunction = $inFunction; - } -} - -class JSNode -{ - private $type; - private $value; - private $lineno; - private $start; - private $end; - - public $treeNodes = array(); - public $funDecls = array(); - public $varDecls = array(); - - public function __construct($t, $type=0) - { - if ($token = $t->currentToken()) - { - $this->type = $type ? $type : $token->type; - $this->value = $token->value; - $this->lineno = $token->lineno; - $this->start = $token->start; - $this->end = $token->end; - } - else - { - $this->type = $type; - $this->lineno = $t->lineno; - } - - if (($numargs = func_num_args()) > 2) - { - $args = func_get_args();; - for ($i = 2; $i < $numargs; $i++) - $this->addNode($args[$i]); - } - } - - // we don't want to bloat our object with all kind of specific properties, so we use overloading - public function __set($name, $value) - { - $this->$name = $value; - } - - public function __get($name) - { - if (isset($this->$name)) - return $this->$name; - - return null; - } - - public function addNode($node) - { - $this->treeNodes[] = $node; - } -} - -class JSTokenizer -{ - private $cursor = 0; - private $source; - - public $tokens = array(); - public $tokenIndex = 0; - public $lookahead = 0; - public $scanNewlines = false; - public $scanOperand = true; - - public $filename; - public $lineno; - - private $keywords = array( - 'break', - 'case', 'catch', 'const', 'continue', - 'debugger', 'default', 'delete', 'do', - 'else', 'enum', - 'false', 'finally', 'for', 'function', - 'if', 'in', 'instanceof', - 'new', 'null', - 'return', - 'switch', - 'this', 'throw', 'true', 'try', 'typeof', - 'var', 'void', - 'while', 'with' - ); - - private $opTypeNames = array( - ';' => 'SEMICOLON', - ',' => 'COMMA', - '?' => 'HOOK', - ':' => 'COLON', - '||' => 'OR', - '&&' => 'AND', - '|' => 'BITWISE_OR', - '^' => 'BITWISE_XOR', - '&' => 'BITWISE_AND', - '===' => 'STRICT_EQ', - '==' => 'EQ', - '=' => 'ASSIGN', - '!==' => 'STRICT_NE', - '!=' => 'NE', - '<<' => 'LSH', - '<=' => 'LE', - '<' => 'LT', - '>>>' => 'URSH', - '>>' => 'RSH', - '>=' => 'GE', - '>' => 'GT', - '++' => 'INCREMENT', - '--' => 'DECREMENT', - '+' => 'PLUS', - '-' => 'MINUS', - '*' => 'MUL', - '/' => 'DIV', - '%' => 'MOD', - '!' => 'NOT', - '~' => 'BITWISE_NOT', - '.' => 'DOT', - '[' => 'LEFT_BRACKET', - ']' => 'RIGHT_BRACKET', - '{' => 'LEFT_CURLY', - '}' => 'RIGHT_CURLY', - '(' => 'LEFT_PAREN', - ')' => 'RIGHT_PAREN', - '@*/' => 'CONDCOMMENT_END' - ); - - private $assignOps = array('|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%'); - private $opRegExp; - - public function __construct() - { - $this->opRegExp = '#^(' . implode('|', array_map('preg_quote', array_keys($this->opTypeNames))) . ')#'; - - // this is quite a hidden yet convenient place to create the defines for operators and keywords - foreach ($this->opTypeNames as $operand => $name) - define('OP_' . $name, $operand); - - define('OP_UNARY_PLUS', 'U+'); - define('OP_UNARY_MINUS', 'U-'); - - foreach ($this->keywords as $keyword) - define('KEYWORD_' . strtoupper($keyword), $keyword); - } - - public function init($source, $filename = '', $lineno = 1) - { - $this->source = $source; - $this->filename = $filename ? $filename : '[inline]'; - $this->lineno = $lineno; - - $this->cursor = 0; - $this->tokens = array(); - $this->tokenIndex = 0; - $this->lookahead = 0; - $this->scanNewlines = false; - $this->scanOperand = true; - } - - public function getInput($chunksize) - { - if ($chunksize) - return substr($this->source, $this->cursor, $chunksize); - - return substr($this->source, $this->cursor); - } - - public function isDone() - { - return $this->peek() == TOKEN_END; - } - - public function match($tt) - { - return $this->get() == $tt || $this->unget(); - } - - public function mustMatch($tt) - { - if (!$this->match($tt)) - throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected'); - - return $this->currentToken(); - } - - public function peek() - { - if ($this->lookahead) - { - $next = $this->tokens[($this->tokenIndex + $this->lookahead) & 3]; - if ($this->scanNewlines && $next->lineno != $this->lineno) - $tt = TOKEN_NEWLINE; - else - $tt = $next->type; - } - else - { - $tt = $this->get(); - $this->unget(); - } - - return $tt; - } - - public function peekOnSameLine() - { - $this->scanNewlines = true; - $tt = $this->peek(); - $this->scanNewlines = false; - - return $tt; - } - - public function currentToken() - { - if (!empty($this->tokens)) - return $this->tokens[$this->tokenIndex]; - } - - public function get($chunksize = 1000) - { - while($this->lookahead) - { - $this->lookahead--; - $this->tokenIndex = ($this->tokenIndex + 1) & 3; - $token = $this->tokens[$this->tokenIndex]; - if ($token->type != TOKEN_NEWLINE || $this->scanNewlines) - return $token->type; - } - - $conditional_comment = false; - - // strip whitespace and comments - while(true) - { - $input = $this->getInput($chunksize); - - // whitespace handling; gobble up \r as well (effectively we don't have support for MAC newlines!) - $re = $this->scanNewlines ? '/^[ \r\t]+/' : '/^\s+/'; - if (preg_match($re, $input, $match)) - { - $spaces = $match[0]; - $spacelen = strlen($spaces); - $this->cursor += $spacelen; - if (!$this->scanNewlines) - $this->lineno += substr_count($spaces, "\n"); - - if ($spacelen == $chunksize) - continue; // complete chunk contained whitespace - - $input = $this->getInput($chunksize); - if ($input == '' || $input[0] != '/') - break; - } - - // Comments - if (!preg_match('/^\/(?:\*(@(?:cc_on|if|elif|else|end))?(?:.|\n)*?\*\/|\/.*)/', $input, $match)) - { - if (!$chunksize) - break; - - // retry with a full chunk fetch; this also prevents breakage of long regular expressions (which will never match a comment) - $chunksize = null; - continue; - } - - // check if this is a conditional (JScript) comment - if (!empty($match[1])) - { - //$match[0] = '/*' . $match[1]; - $conditional_comment = true; - break; - } - else - { - $this->cursor += strlen($match[0]); - $this->lineno += substr_count($match[0], "\n"); - } - } - - if ($input == '') - { - $tt = TOKEN_END; - $match = array(''); - } - elseif ($conditional_comment) - { - $tt = TOKEN_CONDCOMMENT_MULTILINE; - } - else - { - switch ($input[0]) - { - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - if (preg_match('/^\d+\.\d*(?:[eE][-+]?\d+)?|^\d+(?:\.\d*)?[eE][-+]?\d+/', $input, $match)) - { - $tt = TOKEN_NUMBER; - } - elseif (preg_match('/^0[xX][\da-fA-F]+|^0[0-7]*|^\d+/', $input, $match)) - { - // this should always match because of \d+ - $tt = TOKEN_NUMBER; - } - break; - - case '"': - case "'": - if (preg_match('/^"(?:\\\\(?:.|\r?\n)|[^\\\\"\r\n])*"|^\'(?:\\\\(?:.|\r?\n)|[^\\\\\'\r\n])*\'/', $input, $match)) - { - $tt = TOKEN_STRING; - } - else - { - if ($chunksize) - return $this->get(null); // retry with a full chunk fetch - - throw $this->newSyntaxError('Unterminated string literal'); - } - break; - - case '/': - if ($this->scanOperand && preg_match('/^\/((?:\\\\.|\[(?:\\\\.|[^\]])*\]|[^\/])+)\/([gimy]*)/', $input, $match)) - { - $tt = TOKEN_REGEXP; - break; - } - // fall through - - case '|': - case '^': - case '&': - case '<': - case '>': - case '+': - case '-': - case '*': - case '%': - case '=': - case '!': - // should always match - preg_match($this->opRegExp, $input, $match); - $op = $match[0]; - if (in_array($op, $this->assignOps) && $input[strlen($op)] == '=') - { - $tt = OP_ASSIGN; - $match[0] .= '='; - } - else - { - $tt = $op; - if ($this->scanOperand) - { - if ($op == OP_PLUS) - $tt = OP_UNARY_PLUS; - elseif ($op == OP_MINUS) - $tt = OP_UNARY_MINUS; - } - $op = null; - } - break; - - case '.': - if (preg_match('/^\.\d+(?:[eE][-+]?\d+)?/', $input, $match)) - { - $tt = TOKEN_NUMBER; - break; - } - // fall through - - case ';': - case ',': - case '?': - case ':': - case '~': - case '[': - case ']': - case '{': - case '}': - case '(': - case ')': - // these are all single - $match = array($input[0]); - $tt = $input[0]; - break; - - case '@': - throw $this->newSyntaxError('Illegal token'); - break; - - case "\n": - if ($this->scanNewlines) - { - $match = array("\n"); - $tt = TOKEN_NEWLINE; - } - else - throw $this->newSyntaxError('Illegal token'); - break; - - default: - // FIXME: add support for unicode and unicode escape sequence \uHHHH - if (preg_match('/^[$\w]+/', $input, $match)) - { - $tt = in_array($match[0], $this->keywords) ? $match[0] : TOKEN_IDENTIFIER; - } - else - throw $this->newSyntaxError('Illegal token'); - } - } - - $this->tokenIndex = ($this->tokenIndex + 1) & 3; - - if (!isset($this->tokens[$this->tokenIndex])) - $this->tokens[$this->tokenIndex] = new JSToken(); - - $token = $this->tokens[$this->tokenIndex]; - $token->type = $tt; - - if ($tt == OP_ASSIGN) - $token->assignOp = $op; - - $token->start = $this->cursor; - - $token->value = $match[0]; - $this->cursor += strlen($match[0]); - - $token->end = $this->cursor; - $token->lineno = $this->lineno; - - return $tt; - } - - public function unget() - { - if (++$this->lookahead == 4) - throw $this->newSyntaxError('PANIC: too much lookahead!'); - - $this->tokenIndex = ($this->tokenIndex - 1) & 3; - } - - public function newSyntaxError($m) - { - return new Exception('Parse error: ' . $m . ' in file \'' . $this->filename . '\' on line ' . $this->lineno); - } -} - -class JSToken -{ - public $type; - public $value; - public $start; - public $end; - public $lineno; - public $assignOp; -} - -?>
\ No newline at end of file diff --git a/mod/minify/lib/min/lib/Minify.php b/mod/minify/lib/min/lib/Minify.php deleted file mode 100644 index 25f0827a0..000000000 --- a/mod/minify/lib/min/lib/Minify.php +++ /dev/null @@ -1,532 +0,0 @@ -<?php -/** - * Class Minify - * @package Minify - */ - -/** - * Minify_Source - */ -require_once 'Minify/Source.php'; - -/** - * Minify - Combines, minifies, and caches JavaScript and CSS files on demand. - * - * See README for usage instructions (for now). - * - * This library was inspired by {@link mailto:flashkot@mail.ru jscsscomp by Maxim Martynyuk} - * and by the article {@link http://www.hunlock.com/blogs/Supercharged_Javascript "Supercharged JavaScript" by Patrick Hunlock}. - * - * Requires PHP 5.1.0. - * Tested on PHP 5.1.6. - * - * @package Minify - * @author Ryan Grove <ryan@wonko.com> - * @author Stephen Clay <steve@mrclay.org> - * @copyright 2008 Ryan Grove, Stephen Clay. All rights reserved. - * @license http://opensource.org/licenses/bsd-license.php New BSD License - * @link http://code.google.com/p/minify/ - */ -class Minify { - - const VERSION = '2.1.3'; - const TYPE_CSS = 'text/css'; - const TYPE_HTML = 'text/html'; - // there is some debate over the ideal JS Content-Type, but this is the - // Apache default and what Yahoo! uses.. - const TYPE_JS = 'application/x-javascript'; - - /** - * How many hours behind are the file modification times of uploaded files? - * - * If you upload files from Windows to a non-Windows server, Windows may report - * incorrect mtimes for the files. Immediately after modifying and uploading a - * file, use the touch command to update the mtime on the server. If the mtime - * jumps ahead by a number of hours, set this variable to that number. If the mtime - * moves back, this should not be needed. - * - * @var int $uploaderHoursBehind - */ - public static $uploaderHoursBehind = 0; - - /** - * If this string is not empty AND the serve() option 'bubbleCssImports' is - * NOT set, then serve() will check CSS files for @import declarations that - * appear too late in the combined stylesheet. If found, serve() will prepend - * the output with this warning. - * - * @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"; - - /** - * Specify a cache object (with identical interface as Minify_Cache_File) or - * a path to use with Minify_Cache_File. - * - * If not called, Minify will not use a cache and, for each 200 response, will - * need to recombine files, minify and encode the output. - * - * @param mixed $cache object with identical interface as Minify_Cache_File or - * a directory path, or null to disable caching. (default = '') - * - * @param bool $fileLocking (default = true) This only applies if the first - * parameter is a string. - * - * @return null - */ - public static function setCache($cache = '', $fileLocking = true) - { - if (is_string($cache)) { - require_once 'Minify/Cache/File.php'; - self::$_cache = new Minify_Cache_File($cache, $fileLocking); - } else { - self::$_cache = $cache; - } - } - - /** - * Serve a request for a minified file. - * - * Here are the available options and defaults in the base controller: - * - * 'isPublic' : send "public" instead of "private" in Cache-Control - * headers, allowing shared caches to cache the output. (default true) - * - * 'quiet' : set to true to have serve() return an array rather than sending - * any headers/output (default false) - * - * 'encodeOutput' : set to false to disable content encoding, and not send - * the Vary header (default true) - * - * 'encodeMethod' : generally you should let this be determined by - * HTTP_Encoder (leave null), but you can force a particular encoding - * to be returned, by setting this to 'gzip' or '' (no encoding) - * - * 'encodeLevel' : level of encoding compression (0 to 9, default 9) - * - * 'contentTypeCharset' : appended to the Content-Type header sent. Set to a falsey - * value to remove. (default 'utf-8') - * - * 'maxAge' : set this to the number of seconds the client should use its cache - * before revalidating with the server. This sets Cache-Control: max-age and the - * Expires header. Unlike the old 'setExpires' setting, this setting will NOT - * prevent conditional GETs. Note this has nothing to do with server-side caching. - * - * 'rewriteCssUris' : If true, serve() will automatically set the 'currentDir' - * minifier option to enable URI rewriting in CSS files (default true) - * - * 'bubbleCssImports' : If true, all @import declarations in combined CSS - * files will be move to the top. Note this may alter effective CSS values - * due to a change in order. (default false) - * - * 'debug' : set to true to minify all sources with the 'Lines' controller, which - * eases the debugging of combined files. This also prevents 304 responses. - * @see Minify_Lines::minify() - * - * 'minifiers' : to override Minify's default choice of minifier function for - * a particular content-type, specify your callback under the key of the - * content-type: - * <code> - * // call customCssMinifier($css) for all CSS minification - * $options['minifiers'][Minify::TYPE_CSS] = 'customCssMinifier'; - * - * // don't minify Javascript at all - * $options['minifiers'][Minify::TYPE_JS] = ''; - * </code> - * - * 'minifierOptions' : to send options to the minifier function, specify your options - * under the key of the content-type. E.g. To send the CSS minifier an option: - * <code> - * // give CSS minifier array('optionName' => 'optionValue') as 2nd argument - * $options['minifierOptions'][Minify::TYPE_CSS]['optionName'] = 'optionValue'; - * </code> - * - * 'contentType' : (optional) this is only needed if your file extension is not - * js/css/html. The given content-type will be sent regardless of source file - * extension, so this should not be used in a Groups config with other - * Javascript/CSS files. - * - * Any controller options are documented in that controller's setupSources() method. - * - * @param mixed instance of subclass of Minify_Controller_Base or string name of - * controller. E.g. 'Files' - * - * @param array $options controller/serve options - * - * @return mixed null, or, if the 'quiet' option is set to true, an array - * with keys "success" (bool), "statusCode" (int), "content" (string), and - * "headers" (array). - */ - public static function serve($controller, $options = array()) - { - if (is_string($controller)) { - // make $controller into object - $class = 'Minify_Controller_' . $controller; - if (! class_exists($class, false)) { - require_once "Minify/Controller/" - . str_replace('_', '/', $controller) . ".php"; - } - $controller = new $class(); - } - - // set up controller sources and mix remaining options with - // controller defaults - $options = $controller->setupSources($options); - $options = $controller->analyzeSources($options); - self::$_options = $controller->mixInDefaultOptions($options); - - // check request validity - if (! $controller->sources) { - // invalid request! - if (! self::$_options['quiet']) { - header(self::$_options['badRequestHeader']); - echo self::$_options['badRequestHeader']; - return; - } else { - list(,$statusCode) = explode(' ', self::$_options['badRequestHeader']); - return array( - 'success' => false - ,'statusCode' => (int)$statusCode - ,'content' => '' - ,'headers' => array() - ); - } - } - - self::$_controller = $controller; - - if (self::$_options['debug']) { - self::_setupDebug($controller->sources); - self::$_options['maxAge'] = 0; - } - - // determine encoding - if (self::$_options['encodeOutput']) { - if (self::$_options['encodeMethod'] !== null) { - // controller specifically requested this - $contentEncoding = self::$_options['encodeMethod']; - } else { - // sniff request header - require_once 'HTTP/Encoder.php'; - // depending on what the client accepts, $contentEncoding may be - // 'x-gzip' while our internal encodeMethod is 'gzip'. Calling - // getAcceptedEncoding(false, false) leaves out compress and deflate as options. - list(self::$_options['encodeMethod'], $contentEncoding) = HTTP_Encoder::getAcceptedEncoding(false, false); - } - } else { - self::$_options['encodeMethod'] = ''; // identity (no encoding) - } - - // check client cache - require_once 'HTTP/ConditionalGet.php'; - $cgOptions = array( - 'lastModifiedTime' => self::$_options['lastModifiedTime'] - ,'isPublic' => self::$_options['isPublic'] - ,'encoding' => self::$_options['encodeMethod'] - ); - if (self::$_options['maxAge'] > 0) { - $cgOptions['maxAge'] = self::$_options['maxAge']; - } - $cg = new HTTP_ConditionalGet($cgOptions); - if ($cg->cacheIsValid) { - // client's cache is valid - if (! self::$_options['quiet']) { - $cg->sendHeaders(); - return; - } else { - return array( - 'success' => true - ,'statusCode' => 304 - ,'content' => '' - ,'headers' => $cg->getHeaders() - ); - } - } else { - // client will need output - $headers = $cg->getHeaders(); - unset($cg); - } - - if (self::$_options['contentType'] === self::TYPE_CSS - && self::$_options['rewriteCssUris']) { - reset($controller->sources); - while (list($key, $source) = each($controller->sources)) { - if ($source->filepath - && !isset($source->minifyOptions['currentDir']) - && !isset($source->minifyOptions['prependRelativePath']) - ) { - $source->minifyOptions['currentDir'] = dirname($source->filepath); - } - } - } - - // check server cache - if (null !== self::$_cache) { - // using cache - // the goal is to use only the cache methods to sniff the length and - // output the content, as they do not require ever loading the file into - // memory. - $cacheId = 'minify_' . self::_getCacheId(); - $fullCacheId = (self::$_options['encodeMethod']) - ? $cacheId . '.gz' - : $cacheId; - // check cache for valid entry - $cacheIsReady = self::$_cache->isValid($fullCacheId, self::$_options['lastModifiedTime']); - if ($cacheIsReady) { - $cacheContentLength = self::$_cache->getSize($fullCacheId); - } else { - // generate & cache content - $content = self::_combineMinify(); - self::$_cache->store($cacheId, $content); - if (function_exists('gzencode')) { - self::$_cache->store($cacheId . '.gz', gzencode($content, self::$_options['encodeLevel'])); - } - } - } else { - // no cache - $cacheIsReady = false; - $content = self::_combineMinify(); - } - if (! $cacheIsReady && self::$_options['encodeMethod']) { - // still need to encode - $content = gzencode($content, self::$_options['encodeLevel']); - } - - // add headers - $headers['Content-Length'] = $cacheIsReady - ? $cacheContentLength - : strlen($content); - $headers['Content-Type'] = self::$_options['contentTypeCharset'] - ? self::$_options['contentType'] . '; charset=' . self::$_options['contentTypeCharset'] - : self::$_options['contentType']; - if (self::$_options['encodeMethod'] !== '') { - $headers['Content-Encoding'] = $contentEncoding; - } - if (self::$_options['encodeOutput']) { - $headers['Vary'] = 'Accept-Encoding'; - } - - if (! self::$_options['quiet']) { - // output headers & content - foreach ($headers as $name => $val) { - header($name . ': ' . $val); - } - if ($cacheIsReady) { - self::$_cache->display($fullCacheId); - } else { - echo $content; - } - } else { - return array( - 'success' => true - ,'statusCode' => 200 - ,'content' => $cacheIsReady - ? self::$_cache->fetch($fullCacheId) - : $content - ,'headers' => $headers - ); - } - } - - /** - * Return combined minified content for a set of sources - * - * No internal caching will be used and the content will not be HTTP encoded. - * - * @param array $sources array of filepaths and/or Minify_Source objects - * - * @param array $options (optional) array of options for serve. By default - * these are already set: quiet = true, encodeMethod = '', lastModifiedTime = 0. - * - * @return string - */ - public static function combine($sources, $options = array()) - { - $cache = self::$_cache; - self::$_cache = null; - $options = array_merge(array( - 'files' => (array)$sources - ,'quiet' => true - ,'encodeMethod' => '' - ,'lastModifiedTime' => 0 - ), $options); - $out = self::serve('Files', $options); - self::$_cache = $cache; - return $out['content']; - } - - /** - * On IIS, create $_SERVER['DOCUMENT_ROOT'] - * - * @param bool $unsetPathInfo (default false) if true, $_SERVER['PATH_INFO'] - * will be unset (it is inconsistent with Apache's setting) - * - * @return null - */ - public static function setDocRoot($unsetPathInfo = false) - { - if (isset($_SERVER['SERVER_SOFTWARE']) - && 0 === strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/') - ) { - $_SERVER['DOCUMENT_ROOT'] = rtrim(substr( - $_SERVER['PATH_TRANSLATED'] - ,0 - ,strlen($_SERVER['PATH_TRANSLATED']) - strlen($_SERVER['SCRIPT_NAME']) - ), '\\'); - if ($unsetPathInfo) { - unset($_SERVER['PATH_INFO']); - } - require_once 'Minify/Logger.php'; - Minify_Logger::log("setDocRoot() set DOCUMENT_ROOT to \"{$_SERVER['DOCUMENT_ROOT']}\""); - } - } - - /** - * @var mixed Minify_Cache_* object or null (i.e. no server cache is used) - */ - private static $_cache = null; - - /** - * @var Minify_Controller active controller for current request - */ - protected static $_controller = null; - - /** - * @var array options for current request - */ - protected static $_options = null; - - /** - * Set up sources to use Minify_Lines - * - * @param array $sources Minify_Source instances - * - * @return null - */ - protected static function _setupDebug($sources) - { - foreach ($sources as $source) { - $source->minifier = array('Minify_Lines', 'minify'); - $id = $source->getId(); - $source->minifyOptions = array( - 'id' => (is_file($id) ? basename($id) : $id) - ); - } - } - - /** - * Combines sources and minifies the result. - * - * @return string - */ - protected static function _combineMinify() - { - $type = self::$_options['contentType']; // ease readability - - // when combining scripts, make sure all statements separated and - // trailing single line comment is terminated - $implodeSeparator = ($type === self::TYPE_JS) - ? "\n;" - : ''; - // allow the user to pass a particular array of options to each - // minifier (designated by type). source objects may still override - // these - $defaultOptions = isset(self::$_options['minifierOptions'][$type]) - ? self::$_options['minifierOptions'][$type] - : array(); - // if minifier not set, default is no minification. source objects - // may still override this - $defaultMinifier = isset(self::$_options['minifiers'][$type]) - ? self::$_options['minifiers'][$type] - : false; - - if (Minify_Source::haveNoMinifyPrefs(self::$_controller->sources)) { - // all source have same options/minifier, better performance - // to combine, then minify once - foreach (self::$_controller->sources as $source) { - $pieces[] = $source->getContent(); - } - $content = implode($implodeSeparator, $pieces); - if ($defaultMinifier) { - self::$_controller->loadMinifier($defaultMinifier); - $content = call_user_func($defaultMinifier, $content, $defaultOptions); - } - } else { - // minify each source with its own options and minifier, then combine - foreach (self::$_controller->sources as $source) { - // allow the source to override our minifier and options - $minifier = (null !== $source->minifier) - ? $source->minifier - : $defaultMinifier; - $options = (null !== $source->minifyOptions) - ? array_merge($defaultOptions, $source->minifyOptions) - : $defaultOptions; - if ($minifier) { - self::$_controller->loadMinifier($minifier); - // get source content and minify it - $pieces[] = call_user_func($minifier, $source->getContent(), $options); - } else { - $pieces[] = $source->getContent(); - } - } - $content = implode($implodeSeparator, $pieces); - } - - if ($type === self::TYPE_CSS && false !== strpos($content, '@import')) { - $content = self::_handleCssImports($content); - } - - // do any post-processing (esp. for editing build URIs) - if (self::$_options['postprocessorRequire']) { - require_once self::$_options['postprocessorRequire']; - } - if (self::$_options['postprocessor']) { - $content = call_user_func(self::$_options['postprocessor'], $content, $type); - } - return $content; - } - - /** - * Make a unique cache id for for this request. - * - * Any settings that could affect output are taken into consideration - * - * @return string - */ - protected static function _getCacheId() - { - return md5(serialize(array( - Minify_Source::getDigest(self::$_controller->sources) - ,self::$_options['minifiers'] - ,self::$_options['minifierOptions'] - ,self::$_options['postprocessor'] - ,self::$_options['bubbleCssImports'] - ))); - } - - /** - * Bubble CSS @imports to the top or prepend a warning if an - * @import is detected not at the top. - */ - protected static function _handleCssImports($css) - { - if (self::$_options['bubbleCssImports']) { - // bubble CSS imports - preg_match_all('/@import.*?;/', $css, $imports); - $css = implode('', $imports[0]) . preg_replace('/@import.*?;/', '', $css); - } else if ('' !== self::$importWarning) { - // remove comments so we don't mistake { in a comment as a block - $noCommentCss = preg_replace('@/\\*[\\s\\S]*?\\*/@', '', $css); - $lastImportPos = strrpos($noCommentCss, '@import'); - $firstBlockPos = strpos($noCommentCss, '{'); - if (false !== $lastImportPos - && false !== $firstBlockPos - && $firstBlockPos < $lastImportPos - ) { - // { appears before @import : prepend warning - $css = self::$importWarning . $css; - } - } - return $css; - } -} diff --git a/mod/minify/lib/min/lib/Minify/Build.php b/mod/minify/lib/min/lib/Minify/Build.php deleted file mode 100644 index e625165e5..000000000 --- a/mod/minify/lib/min/lib/Minify/Build.php +++ /dev/null @@ -1,103 +0,0 @@ -<?php -/** - * Class Minify_Build - * @package Minify - */ - -require_once 'Minify/Source.php'; - -/** - * Maintain a single last modification time for a group of Minify sources to - * allow use of far off Expires headers in Minify. - * - * <code> - * // in config file - * $groupSources = array( - * 'js' => array('file1.js', 'file2.js') - * ,'css' => array('file1.css', 'file2.css', 'file3.css') - * ) - * - * // during HTML generation - * $jsBuild = new Minify_Build($groupSources['js']); - * $cssBuild = new Minify_Build($groupSources['css']); - * - * $script = "<script type='text/javascript' src='" - * . $jsBuild->uri('/min.php/js') . "'></script>"; - * $link = "<link rel='stylesheet' type='text/css' href='" - * . $cssBuild->uri('/min.php/css') . "'>"; - * - * // in min.php - * Minify::serve('Groups', array( - * 'groups' => $groupSources - * ,'setExpires' => (time() + 86400 * 365) - * )); - * </code> - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_Build { - - /** - * Last modification time of all files in the build - * - * @var int - */ - public $lastModified = 0; - - /** - * String to use as ampersand in uri(). Set this to '&' if - * you are not HTML-escaping URIs. - * - * @var string - */ - public static $ampersand = '&'; - - /** - * Get a time-stamped URI - * - * <code> - * echo $b->uri('/site.js'); - * // outputs "/site.js?1678242" - * - * echo $b->uri('/scriptaculous.js?load=effects'); - * // outputs "/scriptaculous.js?load=effects&1678242" - * </code> - * - * @param string $uri - * @param boolean $forceAmpersand (default = false) Force the use of ampersand to - * append the timestamp to the URI. - * @return string - */ - public function uri($uri, $forceAmpersand = false) { - $sep = ($forceAmpersand || strpos($uri, '?') !== false) - ? self::$ampersand - : '?'; - return "{$uri}{$sep}{$this->lastModified}"; - } - - /** - * Create a build object - * - * @param array $sources array of Minify_Source objects and/or file paths - * - * @return null - */ - public function __construct($sources) - { - $max = 0; - foreach ((array)$sources as $source) { - if ($source instanceof Minify_Source) { - $max = max($max, $source->lastModified); - } elseif (is_string($source)) { - if (0 === strpos($source, '//')) { - $source = $_SERVER['DOCUMENT_ROOT'] . substr($source, 1); - } - if (is_file($source)) { - $max = max($max, filemtime($source)); - } - } - } - $this->lastModified = $max; - } -} diff --git a/mod/minify/lib/min/lib/Minify/CSS/Compressor.php b/mod/minify/lib/min/lib/Minify/CSS/Compressor.php deleted file mode 100644 index d483b2fed..000000000 --- a/mod/minify/lib/min/lib/Minify/CSS/Compressor.php +++ /dev/null @@ -1,250 +0,0 @@ -<?php -/** - * Class Minify_CSS_Compressor - * @package Minify - */ - -/** - * Compress CSS - * - * This is a heavy regex-based removal of whitespace, unnecessary - * comments and tokens, and some CSS value minimization, where practical. - * Many steps have been taken to avoid breaking comment-based hacks, - * including the ie5/mac filter (and its inversion), but expect tricky - * hacks involving comment tokens in 'content' value strings to break - * minimization badly. A test suite is available. - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - * @author http://code.google.com/u/1stvamp/ (Issue 64 patch) - */ -class Minify_CSS_Compressor { - - /** - * Minify a CSS string - * - * @param string $css - * - * @param array $options (currently ignored) - * - * @return string - */ - public static function process($css, $options = array()) - { - $obj = new Minify_CSS_Compressor($options); - return $obj->_process($css); - } - - /** - * @var array options - */ - protected $_options = null; - - /** - * @var bool Are we "in" a hack? - * - * I.e. are some browsers targetted until the next comment? - */ - protected $_inHack = false; - - - /** - * Constructor - * - * @param array $options (currently ignored) - * - * @return null - */ - private function __construct($options) { - $this->_options = $options; - } - - /** - * Minify a CSS string - * - * @param string $css - * - * @return string - */ - protected function _process($css) - { - $css = str_replace("\r\n", "\n", $css); - - // preserve empty comment after '>' - // http://www.webdevout.net/css-hacks#in_css-selectors - $css = preg_replace('@>/\\*\\s*\\*/@', '>/*keep*/', $css); - - // preserve empty comment between property and value - // http://css-discuss.incutio.com/?page=BoxModelHack - $css = preg_replace('@/\\*\\s*\\*/\\s*:@', '/*keep*/:', $css); - $css = preg_replace('@:\\s*/\\*\\s*\\*/@', ':/*keep*/', $css); - - // apply callback to all valid comments (and strip out surrounding ws - $css = preg_replace_callback('@\\s*/\\*([\\s\\S]*?)\\*/\\s*@' - ,array($this, '_commentCB'), $css); - - // remove ws around { } and last semicolon in declaration block - $css = preg_replace('/\\s*{\\s*/', '{', $css); - $css = preg_replace('/;?\\s*}\\s*/', '}', $css); - - // remove ws surrounding semicolons - $css = preg_replace('/\\s*;\\s*/', ';', $css); - - // remove ws around urls - $css = preg_replace('/ - url\\( # url( - \\s* - ([^\\)]+?) # 1 = the URL (really just a bunch of non right parenthesis) - \\s* - \\) # ) - /x', 'url($1)', $css); - - // remove ws between rules and colons - $css = preg_replace('/ - \\s* - ([{;]) # 1 = beginning of block or rule separator - \\s* - ([\\*_]?[\\w\\-]+) # 2 = property (and maybe IE filter) - \\s* - : - \\s* - (\\b|[#\'"]) # 3 = first character of a value - /x', '$1$2:$3', $css); - - // remove ws in selectors - $css = preg_replace_callback('/ - (?: # non-capture - \\s* - [^~>+,\\s]+ # selector part - \\s* - [,>+~] # combinators - )+ - \\s* - [^~>+,\\s]+ # selector part - { # open declaration block - /x' - ,array($this, '_selectorsCB'), $css); - - // minimize hex colors - $css = preg_replace('/([^=])#([a-f\\d])\\2([a-f\\d])\\3([a-f\\d])\\4([\\s;\\}])/i' - , '$1#$2$3$4$5', $css); - - // remove spaces between font families - $css = preg_replace_callback('/font-family:([^;}]+)([;}])/' - ,array($this, '_fontFamilyCB'), $css); - - $css = preg_replace('/@import\\s+url/', '@import url', $css); - - // replace any ws involving newlines with a single newline - $css = preg_replace('/[ \\t]*\\n+\\s*/', "\n", $css); - - // separate common descendent selectors w/ newlines (to limit line lengths) - $css = preg_replace('/([\\w#\\.\\*]+)\\s+([\\w#\\.\\*]+){/', "$1\n$2{", $css); - - // Use newline after 1st numeric value (to limit line lengths). - $css = preg_replace('/ - ((?:padding|margin|border|outline):\\d+(?:px|em)?) # 1 = prop : 1st numeric value - \\s+ - /x' - ,"$1\n", $css); - - // prevent triggering IE6 bug: http://www.crankygeek.com/ie6pebug/ - $css = preg_replace('/:first-l(etter|ine)\\{/', ':first-l$1 {', $css); - - return trim($css); - } - - /** - * Replace what looks like a set of selectors - * - * @param array $m regex matches - * - * @return string - */ - protected function _selectorsCB($m) - { - // remove ws around the combinators - return preg_replace('/\\s*([,>+~])\\s*/', '$1', $m[0]); - } - - /** - * Process a comment and return a replacement - * - * @param array $m regex matches - * - * @return string - */ - protected function _commentCB($m) - { - $hasSurroundingWs = (trim($m[0]) !== $m[1]); - $m = $m[1]; - // $m is the comment content w/o the surrounding tokens, - // but the return value will replace the entire comment. - if ($m === 'keep') { - return '/**/'; - } - if ($m === '" "') { - // component of http://tantek.com/CSS/Examples/midpass.html - return '/*" "*/'; - } - if (preg_match('@";\\}\\s*\\}/\\*\\s+@', $m)) { - // component of http://tantek.com/CSS/Examples/midpass.html - return '/*";}}/* */'; - } - if ($this->_inHack) { - // inversion: feeding only to one browser - if (preg_match('@ - ^/ # comment started like /*/ - \\s* - (\\S[\\s\\S]+?) # has at least some non-ws content - \\s* - /\\* # ends like /*/ or /**/ - @x', $m, $n)) { - // end hack mode after this comment, but preserve the hack and comment content - $this->_inHack = false; - return "/*/{$n[1]}/**/"; - } - } - if (substr($m, -1) === '\\') { // comment ends like \*/ - // begin hack mode and preserve hack - $this->_inHack = true; - return '/*\\*/'; - } - if ($m !== '' && $m[0] === '/') { // comment looks like /*/ foo */ - // begin hack mode and preserve hack - $this->_inHack = true; - return '/*/*/'; - } - if ($this->_inHack) { - // a regular comment ends hack mode but should be preserved - $this->_inHack = false; - return '/**/'; - } - // Issue 107: if there's any surrounding whitespace, it may be important, so - // replace the comment with a single space - return $hasSurroundingWs // remove all other comments - ? ' ' - : ''; - } - - /** - * Process a font-family listing and return a replacement - * - * @param array $m regex matches - * - * @return string - */ - protected function _fontFamilyCB($m) - { - $m[1] = preg_replace('/ - \\s* - ( - "[^"]+" # 1 = family in double qutoes - |\'[^\']+\' # or 1 = family in single quotes - |[\\w\\-]+ # or 1 = unquoted family - ) - \\s* - /x', '$1', $m[1]); - return 'font-family:' . $m[1] . $m[2]; - } -} diff --git a/mod/minify/lib/min/lib/Minify/CSS/UriRewriter.php b/mod/minify/lib/min/lib/Minify/CSS/UriRewriter.php deleted file mode 100644 index 2b47cfc1d..000000000 --- a/mod/minify/lib/min/lib/Minify/CSS/UriRewriter.php +++ /dev/null @@ -1,270 +0,0 @@ -<?php -/** - * Class Minify_CSS_UriRewriter - * @package Minify - */ - -/** - * Rewrite file-relative URIs as root-relative in CSS files - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_CSS_UriRewriter { - - /** - * Defines which class to call as part of callbacks, change this - * if you extend Minify_CSS_UriRewriter - * @var string - */ - protected static $className = 'Minify_CSS_UriRewriter'; - - /** - * rewrite() and rewriteRelative() append debugging information here - * @var string - */ - public static $debugText = ''; - - /** - * Rewrite file relative URIs as root relative in CSS files - * - * @param string $css - * - * @param string $currentDir The directory of the current CSS file. - * - * @param string $docRoot The document root of the web site in which - * the CSS file resides (default = $_SERVER['DOCUMENT_ROOT']). - * - * @param array $symlinks (default = array()) If the CSS file is stored in - * a symlink-ed directory, provide an array of link paths to - * target paths, where the link paths are within the document root. Because - * paths need to be normalized for this to work, use "//" to substitute - * the doc root in the link paths (the array keys). E.g.: - * <code> - * array('//symlink' => '/real/target/path') // unix - * array('//static' => 'D:\\staticStorage') // Windows - * </code> - * - * @return string - */ - public static function rewrite($css, $currentDir, $docRoot = null, $symlinks = array()) - { - self::$_docRoot = self::_realpath( - $docRoot ? $docRoot : $_SERVER['DOCUMENT_ROOT'] - ); - self::$_currentDir = self::_realpath($currentDir); - self::$_symlinks = array(); - - // normalize symlinks - foreach ($symlinks as $link => $target) { - $link = ($link === '//') - ? self::$_docRoot - : str_replace('//', self::$_docRoot . '/', $link); - $link = strtr($link, '/', DIRECTORY_SEPARATOR); - self::$_symlinks[$link] = self::_realpath($target); - } - - self::$debugText .= "docRoot : " . self::$_docRoot . "\n" - . "currentDir : " . self::$_currentDir . "\n"; - if (self::$_symlinks) { - self::$debugText .= "symlinks : " . var_export(self::$_symlinks, 1) . "\n"; - } - self::$debugText .= "\n"; - - $css = self::_trimUrls($css); - - // rewrite - $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/' - ,array(self::$className, '_processUriCB'), $css); - $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/' - ,array(self::$className, '_processUriCB'), $css); - - return $css; - } - - /** - * Prepend a path to relative URIs in CSS files - * - * @param string $css - * - * @param string $path The path to prepend. - * - * @return string - */ - public static function prepend($css, $path) - { - self::$_prependPath = $path; - - $css = self::_trimUrls($css); - - // append - $css = preg_replace_callback('/@import\\s+([\'"])(.*?)[\'"]/' - ,array(self::$className, '_processUriCB'), $css); - $css = preg_replace_callback('/url\\(\\s*([^\\)\\s]+)\\s*\\)/' - ,array(self::$className, '_processUriCB'), $css); - - self::$_prependPath = null; - return $css; - } - - - /** - * @var string directory of this stylesheet - */ - private static $_currentDir = ''; - - /** - * @var string DOC_ROOT - */ - private static $_docRoot = ''; - - /** - * @var array directory replacements to map symlink targets back to their - * source (within the document root) E.g. '/var/www/symlink' => '/var/realpath' - */ - private static $_symlinks = array(); - - /** - * @var string path to prepend - */ - private static $_prependPath = null; - - private static function _trimUrls($css) - { - return preg_replace('/ - url\\( # url( - \\s* - ([^\\)]+?) # 1 = URI (assuming does not contain ")") - \\s* - \\) # ) - /x', 'url($1)', $css); - } - - private static function _processUriCB($m) - { - // $m matched either '/@import\\s+([\'"])(.*?)[\'"]/' or '/url\\(\\s*([^\\)\\s]+)\\s*\\)/' - $isImport = ($m[0][0] === '@'); - // determine URI and the quote character (if any) - if ($isImport) { - $quoteChar = $m[1]; - $uri = $m[2]; - } else { - // $m[1] is either quoted or not - $quoteChar = ($m[1][0] === "'" || $m[1][0] === '"') - ? $m[1][0] - : ''; - $uri = ($quoteChar === '') - ? $m[1] - : substr($m[1], 1, strlen($m[1]) - 2); - } - // analyze URI - if ('/' !== $uri[0] // root-relative - && false === strpos($uri, '//') // protocol (non-data) - && 0 !== strpos($uri, 'data:') // data protocol - ) { - // URI is file-relative: rewrite depending on options - $uri = (self::$_prependPath !== null) - ? (self::$_prependPath . $uri) - : self::rewriteRelative($uri, self::$_currentDir, self::$_docRoot, self::$_symlinks); - } - return $isImport - ? "@import {$quoteChar}{$uri}{$quoteChar}" - : "url({$quoteChar}{$uri}{$quoteChar})"; - } - - /** - * Rewrite a file relative URI as root relative - * - * <code> - * Minify_CSS_UriRewriter::rewriteRelative( - * '../img/hello.gif' - * , '/home/user/www/css' // path of CSS file - * , '/home/user/www' // doc root - * ); - * // returns '/img/hello.gif' - * - * // example where static files are stored in a symlinked directory - * Minify_CSS_UriRewriter::rewriteRelative( - * 'hello.gif' - * , '/var/staticFiles/theme' - * , '/home/user/www' - * , array('/home/user/www/static' => '/var/staticFiles') - * ); - * // returns '/static/theme/hello.gif' - * </code> - * - * @param string $uri file relative URI - * - * @param string $realCurrentDir realpath of the current file's directory. - * - * @param string $realDocRoot realpath of the site document root. - * - * @param array $symlinks (default = array()) If the file is stored in - * a symlink-ed directory, provide an array of link paths to - * real target paths, where the link paths "appear" to be within the document - * root. E.g.: - * <code> - * array('/home/foo/www/not/real/path' => '/real/target/path') // unix - * array('C:\\htdocs\\not\\real' => 'D:\\real\\target\\path') // Windows - * </code> - * - * @return string - */ - public static function rewriteRelative($uri, $realCurrentDir, $realDocRoot, $symlinks = array()) - { - // prepend path with current dir separator (OS-independent) - $path = strtr($realCurrentDir, '/', DIRECTORY_SEPARATOR) - . DIRECTORY_SEPARATOR . strtr($uri, '/', DIRECTORY_SEPARATOR); - - self::$debugText .= "file-relative URI : {$uri}\n" - . "path prepended : {$path}\n"; - - // "unresolve" a symlink back to doc root - foreach ($symlinks as $link => $target) { - if (0 === strpos($path, $target)) { - // replace $target with $link - $path = $link . substr($path, strlen($target)); - - self::$debugText .= "symlink unresolved : {$path}\n"; - - break; - } - } - // strip doc root - $path = substr($path, strlen($realDocRoot)); - - self::$debugText .= "docroot stripped : {$path}\n"; - - // fix to root-relative URI - - $uri = strtr($path, '/\\', '//'); - - // remove /./ and /../ where possible - $uri = str_replace('/./', '/', $uri); - // inspired by patch from Oleg Cherniy - do { - $uri = preg_replace('@/[^/]+/\\.\\./@', '/', $uri, 1, $changed); - } while ($changed); - - self::$debugText .= "traversals removed : {$uri}\n\n"; - - return $uri; - } - - /** - * Get realpath with any trailing slash removed. If realpath() fails, - * just remove the trailing slash. - * - * @param string $path - * - * @return mixed path with no trailing slash - */ - protected static function _realpath($path) - { - $realPath = realpath($path); - if ($realPath !== false) { - $path = $realPath; - } - return rtrim($path, '/\\'); - } -} diff --git a/mod/minify/lib/min/lib/Minify/Cache/APC.php b/mod/minify/lib/min/lib/Minify/Cache/APC.php deleted file mode 100644 index ca84d2998..000000000 --- a/mod/minify/lib/min/lib/Minify/Cache/APC.php +++ /dev/null @@ -1,130 +0,0 @@ -<?php -/** - * Class Minify_Cache_APC - * @package Minify - */ - -/** - * APC-based cache class for Minify - * - * <code> - * Minify::setCache(new Minify_Cache_APC()); - * </code> - * - * @package Minify - * @author Chris Edwards - **/ -class Minify_Cache_APC { - - /** - * Create a Minify_Cache_APC object, to be passed to - * Minify::setCache(). - * - * - * @param int $expire seconds until expiration (default = 0 - * meaning the item will not get an expiration date) - * - * @return null - */ - public function __construct($expire = 0) - { - $this->_exp = $expire; - } - - /** - * Write data to cache. - * - * @param string $id cache id - * - * @param string $data - * - * @return bool success - */ - public function store($id, $data) - { - return apc_store($id, "{$_SERVER['REQUEST_TIME']}|{$data}", $this->_exp); - } - - /** - * Get the size of a cache entry - * - * @param string $id cache id - * - * @return int size in bytes - */ - public function getSize($id) - { - return $this->_fetch($id) - ? strlen($this->_data) - : false; - } - - /** - * Does a valid cache entry exist? - * - * @param string $id cache id - * - * @param int $srcMtime mtime of the original source file(s) - * - * @return bool exists - */ - public function isValid($id, $srcMtime) - { - return ($this->_fetch($id) && ($this->_lm >= $srcMtime)); - } - - /** - * Send the cached content to output - * - * @param string $id cache id - */ - public function display($id) - { - echo $this->_fetch($id) - ? $this->_data - : ''; - } - - /** - * Fetch the cached content - * - * @param string $id cache id - * - * @return string - */ - public function fetch($id) - { - return $this->_fetch($id) - ? $this->_data - : ''; - } - - private $_exp = null; - - // cache of most recently fetched id - private $_lm = null; - private $_data = null; - private $_id = null; - - /** - * Fetch data and timestamp from apc, store in instance - * - * @param string $id - * - * @return bool success - */ - private function _fetch($id) - { - if ($this->_id === $id) { - return true; - } - $ret = apc_fetch($id); - if (false === $ret) { - $this->_id = null; - return false; - } - list($this->_lm, $this->_data) = explode('|', $ret, 2); - $this->_id = $id; - return true; - } -} diff --git a/mod/minify/lib/min/lib/Minify/Cache/File.php b/mod/minify/lib/min/lib/Minify/Cache/File.php deleted file mode 100644 index 2753e6b8e..000000000 --- a/mod/minify/lib/min/lib/Minify/Cache/File.php +++ /dev/null @@ -1,125 +0,0 @@ -<?php -/** - * Class Minify_Cache_File - * @package Minify - */ - -class Minify_Cache_File { - - public function __construct($path = '', $fileLocking = false) - { - if (! $path) { - require_once 'Solar/Dir.php'; - $path = rtrim(Solar_Dir::tmp(), DIRECTORY_SEPARATOR); - } - $this->_locking = $fileLocking; - $this->_path = $path; - } - - /** - * Write data to cache. - * - * @param string $id cache id (e.g. a filename) - * - * @param string $data - * - * @return bool success - */ - public function store($id, $data) - { - $flag = $this->_locking - ? LOCK_EX - : null; - if (is_file($this->_path . '/' . $id)) { - @unlink($this->_path . '/' . $id); - } - if (! @file_put_contents($this->_path . '/' . $id, $data, $flag)) { - return false; - } - // write control - if ($data !== $this->fetch($id)) { - @unlink($file); - return false; - } - return true; - } - - /** - * Get the size of a cache entry - * - * @param string $id cache id (e.g. a filename) - * - * @return int size in bytes - */ - public function getSize($id) - { - return filesize($this->_path . '/' . $id); - } - - /** - * Does a valid cache entry exist? - * - * @param string $id cache id (e.g. a filename) - * - * @param int $srcMtime mtime of the original source file(s) - * - * @return bool exists - */ - public function isValid($id, $srcMtime) - { - $file = $this->_path . '/' . $id; - return (is_file($file) && (filemtime($file) >= $srcMtime)); - } - - /** - * Send the cached content to output - * - * @param string $id cache id (e.g. a filename) - */ - public function display($id) - { - if ($this->_locking) { - $fp = fopen($this->_path . '/' . $id, 'rb'); - flock($fp, LOCK_SH); - fpassthru($fp); - flock($fp, LOCK_UN); - fclose($fp); - } else { - readfile($this->_path . '/' . $id); - } - } - - /** - * Fetch the cached content - * - * @param string $id cache id (e.g. a filename) - * - * @return string - */ - public function fetch($id) - { - if ($this->_locking) { - $fp = fopen($this->_path . '/' . $id, 'rb'); - flock($fp, LOCK_SH); - $ret = stream_get_contents($fp); - flock($fp, LOCK_UN); - fclose($fp); - return $ret; - } else { - return file_get_contents($this->_path . '/' . $id); - } - } - - /** - * Fetch the cache path used - * - * @return string - */ - public function getPath() - { - return $this->_path; - } - - private $_path = null; - private $_locking = null; -} diff --git a/mod/minify/lib/min/lib/Minify/Cache/Memcache.php b/mod/minify/lib/min/lib/Minify/Cache/Memcache.php deleted file mode 100644 index 2b81e7a32..000000000 --- a/mod/minify/lib/min/lib/Minify/Cache/Memcache.php +++ /dev/null @@ -1,137 +0,0 @@ -<?php -/** - * Class Minify_Cache_Memcache - * @package Minify - */ - -/** - * Memcache-based cache class for Minify - * - * <code> - * // fall back to disk caching if memcache can't connect - * $memcache = new Memcache; - * if ($memcache->connect('localhost', 11211)) { - * Minify::setCache(new Minify_Cache_Memcache($memcache)); - * } else { - * Minify::setCache(); - * } - * </code> - **/ -class Minify_Cache_Memcache { - - /** - * Create a Minify_Cache_Memcache object, to be passed to - * Minify::setCache(). - * - * @param Memcache $memcache already-connected instance - * - * @param int $expire seconds until expiration (default = 0 - * meaning the item will not get an expiration date) - * - * @return null - */ - public function __construct($memcache, $expire = 0) - { - $this->_mc = $memcache; - $this->_exp = $expire; - } - - /** - * Write data to cache. - * - * @param string $id cache id - * - * @param string $data - * - * @return bool success - */ - public function store($id, $data) - { - return $this->_mc->set($id, "{$_SERVER['REQUEST_TIME']}|{$data}", 0, $this->_exp); - } - - - /** - * Get the size of a cache entry - * - * @param string $id cache id - * - * @return int size in bytes - */ - public function getSize($id) - { - return $this->_fetch($id) - ? strlen($this->_data) - : false; - } - - /** - * Does a valid cache entry exist? - * - * @param string $id cache id - * - * @param int $srcMtime mtime of the original source file(s) - * - * @return bool exists - */ - public function isValid($id, $srcMtime) - { - return ($this->_fetch($id) && ($this->_lm >= $srcMtime)); - } - - /** - * Send the cached content to output - * - * @param string $id cache id - */ - public function display($id) - { - echo $this->_fetch($id) - ? $this->_data - : ''; - } - - /** - * Fetch the cached content - * - * @param string $id cache id - * - * @return string - */ - public function fetch($id) - { - return $this->_fetch($id) - ? $this->_data - : ''; - } - - private $_mc = null; - private $_exp = null; - - // cache of most recently fetched id - private $_lm = null; - private $_data = null; - private $_id = null; - - /** - * Fetch data and timestamp from memcache, store in instance - * - * @param string $id - * - * @return bool success - */ - private function _fetch($id) - { - if ($this->_id === $id) { - return true; - } - $ret = $this->_mc->get($id); - if (false === $ret) { - $this->_id = null; - return false; - } - list($this->_lm, $this->_data) = explode('|', $ret, 2); - $this->_id = $id; - return true; - } -} diff --git a/mod/minify/lib/min/lib/Minify/CommentPreserver.php b/mod/minify/lib/min/lib/Minify/CommentPreserver.php deleted file mode 100644 index f56eb3461..000000000 --- a/mod/minify/lib/min/lib/Minify/CommentPreserver.php +++ /dev/null @@ -1,90 +0,0 @@ -<?php -/** - * Class Minify_CommentPreserver - * @package Minify - */ - -/** - * Process a string in pieces preserving C-style comments that begin with "/*!" - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_CommentPreserver { - - /** - * String to be prepended to each preserved comment - * - * @var string - */ - public static $prepend = "\n"; - - /** - * String to be appended to each preserved comment - * - * @var string - */ - public static $append = "\n"; - - /** - * Process a string outside of C-style comments that begin with "/*!" - * - * On each non-empty string outside these comments, the given processor - * function will be called. The first "!" will be removed from the - * preserved comments, and the comments will be surrounded by - * Minify_CommentPreserver::$preprend and Minify_CommentPreserver::$append. - * - * @param string $content - * @param callback $processor function - * @param array $args array of extra arguments to pass to the processor - * function (default = array()) - * @return string - */ - public static function process($content, $processor, $args = array()) - { - $ret = ''; - while (true) { - list($beforeComment, $comment, $afterComment) = self::_nextComment($content); - if ('' !== $beforeComment) { - $callArgs = $args; - array_unshift($callArgs, $beforeComment); - $ret .= call_user_func_array($processor, $callArgs); - } - if (false === $comment) { - break; - } - $ret .= $comment; - $content = $afterComment; - } - return $ret; - } - - /** - * Extract comments that YUI Compressor preserves. - * - * @param string $in input - * - * @return array 3 elements are returned. If a YUI comment is found, the - * 2nd element is the comment and the 1st and 2nd are the surrounding - * strings. If no comment is found, the entire string is returned as the - * 1st element and the other two are false. - */ - private static function _nextComment($in) - { - if ( - false === ($start = strpos($in, '/*!')) - || false === ($end = strpos($in, '*/', $start + 3)) - ) { - return array($in, false, false); - } - $ret = array( - substr($in, 0, $start) - ,self::$prepend . '/*' . substr($in, $start + 3, $end - $start - 1) . self::$append - ); - $endChars = (strlen($in) - $end - 2); - $ret[] = (0 === $endChars) - ? '' - : substr($in, -$endChars); - return $ret; - } -} diff --git a/mod/minify/lib/min/lib/Minify/Controller/Base.php b/mod/minify/lib/min/lib/Minify/Controller/Base.php deleted file mode 100644 index 84889b3f0..000000000 --- a/mod/minify/lib/min/lib/Minify/Controller/Base.php +++ /dev/null @@ -1,202 +0,0 @@ -<?php -/** - * Class Minify_Controller_Base - * @package Minify - */ - -/** - * Base class for Minify controller - * - * The controller class validates a request and uses it to create sources - * for minification and set options like contentType. It's also responsible - * for loading minifier code upon request. - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -abstract class Minify_Controller_Base { - - /** - * Setup controller sources and set an needed options for Minify::source - * - * You must override this method in your subclass controller to set - * $this->sources. If the request is NOT valid, make sure $this->sources - * is left an empty array. Then strip any controller-specific options from - * $options and return it. To serve files, $this->sources must be an array of - * Minify_Source objects. - * - * @param array $options controller and Minify options - * - * return array $options Minify::serve options - */ - abstract public function setupSources($options); - - /** - * Get default Minify options for this controller. - * - * Override in subclass to change defaults - * - * @return array options for Minify - */ - public function getDefaultMinifyOptions() { - return array( - 'isPublic' => true - ,'encodeOutput' => function_exists('gzdeflate') - ,'encodeMethod' => null // determine later - ,'encodeLevel' => 9 - ,'minifierOptions' => array() // no minifier options - ,'contentTypeCharset' => 'utf-8' - ,'maxAge' => 1800 // 30 minutes - ,'rewriteCssUris' => true - ,'bubbleCssImports' => false - ,'quiet' => false // serve() will send headers and output - ,'debug' => false - - // if you override this, the response code MUST be directly after - // the first space. - ,'badRequestHeader' => 'HTTP/1.0 400 Bad Request' - - // callback function to see/modify content of all sources - ,'postprocessor' => null - // file to require to load preprocessor - ,'postprocessorRequire' => null - ); - } - - /** - * Get default minifiers for this controller. - * - * Override in subclass to change defaults - * - * @return array minifier callbacks for common types - */ - public function getDefaultMinifers() { - $ret[Minify::TYPE_JS] = array('JSMin', 'minify'); - $ret[Minify::TYPE_CSS] = array('Minify_CSS', 'minify'); - $ret[Minify::TYPE_HTML] = array('Minify_HTML', 'minify'); - return $ret; - } - - /** - * Load any code necessary to execute the given minifier callback. - * - * The controller is responsible for loading minification code on demand - * via this method. This built-in function will only load classes for - * static method callbacks where the class isn't already defined. It uses - * the PEAR convention, so, given array('Jimmy_Minifier', 'minCss'), this - * function will include 'Jimmy/Minifier.php'. - * - * If you need code loaded on demand and this doesn't suit you, you'll need - * to override this function in your subclass. - * @see Minify_Controller_Page::loadMinifier() - * - * @param callback $minifierCallback callback of minifier function - * - * @return null - */ - public function loadMinifier($minifierCallback) - { - if (is_array($minifierCallback) - && is_string($minifierCallback[0]) - && !class_exists($minifierCallback[0], false)) { - - require str_replace('_', '/', $minifierCallback[0]) . '.php'; - } - } - - /** - * Is a user-given file within an allowable directory, existing, - * and having an extension js/css/html/txt ? - * - * This is a convenience function for controllers that have to accept - * user-given paths - * - * @param string $file full file path (already processed by realpath()) - * - * @param array $safeDirs directories where files are safe to serve. Files can also - * be in subdirectories of these directories. - * - * @return bool file is safe - */ - public static function _fileIsSafe($file, $safeDirs) - { - $pathOk = false; - foreach ((array)$safeDirs as $safeDir) { - if (strpos($file, $safeDir) === 0) { - $pathOk = true; - break; - } - } - $base = basename($file); - if (! $pathOk || ! is_file($file) || $base[0] === '.') { - return false; - } - 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. - * - * @see Minify_Source - */ - public $sources = array(); - - /** - * Mix in default controller options with user-given options - * - * @param array $options user options - * - * @return array mixed options - */ - public final function mixInDefaultOptions($options) - { - $ret = array_merge( - $this->getDefaultMinifyOptions(), $options - ); - if (! isset($options['minifiers'])) { - $options['minifiers'] = array(); - } - $ret['minifiers'] = array_merge( - $this->getDefaultMinifers(), $options['minifiers'] - ); - return $ret; - } - - /** - * Analyze sources (if there are any) and set $options 'contentType' - * and 'lastModifiedTime' if they already aren't. - * - * @param array $options options for Minify - * - * @return array options for Minify - */ - public final function analyzeSources($options = array()) - { - if ($this->sources) { - if (! isset($options['contentType'])) { - $options['contentType'] = Minify_Source::getContentType($this->sources); - } - // last modified is needed for caching, even if setExpires is set - if (! isset($options['lastModifiedTime'])) { - $max = 0; - foreach ($this->sources as $source) { - $max = max($source->lastModified, $max); - } - $options['lastModifiedTime'] = $max; - } - } - return $options; - } - - /** - * Send message to the Minify logger - * @param string $msg - * @return null - */ - protected function log($msg) { - require_once 'Minify/Logger.php'; - Minify_Logger::log($msg); - } -} diff --git a/mod/minify/lib/min/lib/Minify/Controller/Files.php b/mod/minify/lib/min/lib/Minify/Controller/Files.php deleted file mode 100644 index 83f028adf..000000000 --- a/mod/minify/lib/min/lib/Minify/Controller/Files.php +++ /dev/null @@ -1,78 +0,0 @@ -<?php -/** - * Class Minify_Controller_Files - * @package Minify - */ - -require_once 'Minify/Controller/Base.php'; - -/** - * Controller class for minifying a set of files - * - * E.g. the following would serve the minified Javascript for a site - * <code> - * Minify::serve('Files', array( - * 'files' => array( - * '//js/jquery.js' - * ,'//js/plugins.js' - * ,'/home/username/file.js' - * ) - * )); - * </code> - * - * As a shortcut, the controller will replace "//" at the beginning - * of a filename with $_SERVER['DOCUMENT_ROOT'] . '/'. - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_Controller_Files extends Minify_Controller_Base { - - /** - * Set up file sources - * - * @param array $options controller and Minify options - * @return array Minify options - * - * Controller options: - * - * 'files': (required) array of complete file paths, or a single path - */ - public function setupSources($options) { - // strip controller options - - $files = $options['files']; - // if $files is a single object, casting will break it - if (is_object($files)) { - $files = array($files); - } elseif (! is_array($files)) { - $files = (array)$files; - } - unset($options['files']); - - $sources = array(); - foreach ($files as $file) { - if ($file instanceof Minify_Source) { - $sources[] = $file; - continue; - } - if (0 === strpos($file, '//')) { - $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1); - } - $realPath = realpath($file); - if (is_file($realPath)) { - $sources[] = new Minify_Source(array( - 'filepath' => $realPath - )); - } else { - $this->log("The path \"{$file}\" could not be found (or was not a file)"); - return $options; - } - } - if ($sources) { - $this->sources = $sources; - } - return $options; - } -} - diff --git a/mod/minify/lib/min/lib/Minify/Controller/Groups.php b/mod/minify/lib/min/lib/Minify/Controller/Groups.php deleted file mode 100644 index 1ac57703a..000000000 --- a/mod/minify/lib/min/lib/Minify/Controller/Groups.php +++ /dev/null @@ -1,94 +0,0 @@ -<?php -/** - * Class Minify_Controller_Groups - * @package Minify - */ - -require_once 'Minify/Controller/Base.php'; - -/** - * Controller class for serving predetermined groups of minimized sets, selected - * by PATH_INFO - * - * <code> - * Minify::serve('Groups', array( - * 'groups' => array( - * 'css' => array('//css/type.css', '//css/layout.css') - * ,'js' => array('//js/jquery.js', '//js/site.js') - * ) - * )); - * </code> - * - * If the above code were placed in /serve.php, it would enable the URLs - * /serve.php/js and /serve.php/css - * - * As a shortcut, the controller will replace "//" at the beginning - * of a filename with $_SERVER['DOCUMENT_ROOT'] . '/'. - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_Controller_Groups extends Minify_Controller_Base { - - /** - * Set up groups of files as sources - * - * @param array $options controller and Minify options - * @return array Minify options - * - * Controller options: - * - * 'groups': (required) array mapping PATH_INFO strings to arrays - * of complete file paths. @see Minify_Controller_Groups - */ - public function setupSources($options) { - // strip controller options - $groups = $options['groups']; - unset($options['groups']); - - // mod_fcgid places PATH_INFO in ORIG_PATH_INFO - $pi = isset($_SERVER['ORIG_PATH_INFO']) - ? substr($_SERVER['ORIG_PATH_INFO'], 1) - : (isset($_SERVER['PATH_INFO']) - ? substr($_SERVER['PATH_INFO'], 1) - : false - ); - if (false === $pi || ! isset($groups[$pi])) { - // no PATH_INFO or not a valid group - $this->log("Missing PATH_INFO or no group set for \"$pi\""); - return $options; - } - $sources = array(); - - $files = $groups[$pi]; - // if $files is a single object, casting will break it - if (is_object($files)) { - $files = array($files); - } elseif (! is_array($files)) { - $files = (array)$files; - } - foreach ($files as $file) { - if ($file instanceof Minify_Source) { - $sources[] = $file; - continue; - } - if (0 === strpos($file, '//')) { - $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1); - } - $realPath = realpath($file); - if (is_file($realPath)) { - $sources[] = new Minify_Source(array( - 'filepath' => $realPath - )); - } else { - $this->log("The path \"{$file}\" could not be found (or was not a file)"); - return $options; - } - } - if ($sources) { - $this->sources = $sources; - } - return $options; - } -} - diff --git a/mod/minify/lib/min/lib/Minify/Controller/MinApp.php b/mod/minify/lib/min/lib/Minify/Controller/MinApp.php deleted file mode 100644 index 9582d292c..000000000 --- a/mod/minify/lib/min/lib/Minify/Controller/MinApp.php +++ /dev/null @@ -1,132 +0,0 @@ -<?php -/** - * Class Minify_Controller_MinApp - * @package Minify - */ - -require_once 'Minify/Controller/Base.php'; - -/** - * Controller class for requests to /min/index.php - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_Controller_MinApp extends Minify_Controller_Base { - - /** - * Set up groups of files as sources - * - * @param array $options controller and Minify options - * @return array Minify options - * - */ - public function setupSources($options) { - // filter controller options - $cOptions = array_merge( - array( - 'allowDirs' => '//' - ,'groupsOnly' => false - ,'groups' => array() - ,'maxFiles' => 10 - ) - ,(isset($options['minApp']) ? $options['minApp'] : array()) - ); - unset($options['minApp']); - $sources = array(); - if (isset($_GET['g'])) { - // try groups - if (! isset($cOptions['groups'][$_GET['g']])) { - $this->log("A group configuration for \"{$_GET['g']}\" was not set"); - return $options; - } - - $files = $cOptions['groups'][$_GET['g']]; - // if $files is a single object, casting will break it - if (is_object($files)) { - $files = array($files); - } elseif (! is_array($files)) { - $files = (array)$files; - } - foreach ($files as $file) { - if ($file instanceof Minify_Source) { - $sources[] = $file; - continue; - } - if (0 === strpos($file, '//')) { - $file = $_SERVER['DOCUMENT_ROOT'] . substr($file, 1); - } - $file = realpath($file); - if (is_file($file)) { - $sources[] = new Minify_Source(array( - 'filepath' => $file - )); - } else { - $this->log("The path \"{$file}\" could not be found (or was not a file)"); - return $options; - } - } - } elseif (! $cOptions['groupsOnly'] && isset($_GET['f'])) { - // try user files - // The following restrictions are to limit the URLs that minify will - // respond to. Ideally there should be only one way to reference a file. - if (// verify at least one file, files are single comma separated, - // and are all same extension - ! preg_match('/^[^,]+\\.(css|js)(?:,[^,]+\\.\\1)*$/', $_GET['f']) - // no "//" - || strpos($_GET['f'], '//') !== false - // no "\" - || strpos($_GET['f'], '\\') !== false - // no "./" - || preg_match('/(?:^|[^\\.])\\.\\//', $_GET['f']) - ) { - $this->log("GET param 'f' invalid (see MinApp.php line 63)"); - return $options; - } - $files = explode(',', $_GET['f']); - if (count($files) > $cOptions['maxFiles'] || $files != array_unique($files)) { - $this->log("Too many or duplicate files specified"); - return $options; - } - if (isset($_GET['b'])) { - // check for validity - if (preg_match('@^[^/]+(?:/[^/]+)*$@', $_GET['b']) - && false === strpos($_GET['b'], '..') - && $_GET['b'] !== '.') { - // valid base - $base = "/{$_GET['b']}/"; - } else { - $this->log("GET param 'b' invalid (see MinApp.php line 84)"); - return $options; - } - } else { - $base = '/'; - } - $allowDirs = array(); - foreach ((array)$cOptions['allowDirs'] as $allowDir) { - $allowDirs[] = realpath(str_replace('//', $_SERVER['DOCUMENT_ROOT'] . '/', $allowDir)); - } - foreach ($files as $file) { - $path = $_SERVER['DOCUMENT_ROOT'] . $base . $file; - $file = realpath($path); - if (false === $file) { - $this->log("Path \"{$path}\" failed realpath()"); - return $options; - } elseif (! parent::_fileIsSafe($file, $allowDirs)) { - $this->log("Path \"{$path}\" failed Minify_Controller_Base::_fileIsSafe()"); - return $options; - } else { - $sources[] = new Minify_Source(array( - 'filepath' => $file - )); - } - } - } - if ($sources) { - $this->sources = $sources; - } else { - $this->log("No sources to serve"); - } - return $options; - } -} diff --git a/mod/minify/lib/min/lib/Minify/Controller/Page.php b/mod/minify/lib/min/lib/Minify/Controller/Page.php deleted file mode 100644 index fa4599abd..000000000 --- a/mod/minify/lib/min/lib/Minify/Controller/Page.php +++ /dev/null @@ -1,82 +0,0 @@ -<?php -/** - * Class Minify_Controller_Page - * @package Minify - */ - -require_once 'Minify/Controller/Base.php'; - -/** - * Controller class for serving a single HTML page - * - * @link http://code.google.com/p/minify/source/browse/trunk/web/examples/1/index.php#59 - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_Controller_Page extends Minify_Controller_Base { - - /** - * Set up source of HTML content - * - * @param array $options controller and Minify options - * @return array Minify options - * - * Controller options: - * - * 'content': (required) HTML markup - * - * 'id': (required) id of page (string for use in server-side caching) - * - * 'lastModifiedTime': timestamp of when this content changed. This - * is recommended to allow both server and client-side caching. - * - * 'minifyAll': should all CSS and Javascript blocks be individually - * minified? (default false) - * - * @todo Add 'file' option to read HTML file. - */ - public function setupSources($options) { - if (isset($options['file'])) { - $sourceSpec = array( - 'filepath' => $options['file'] - ); - } else { - // strip controller options - $sourceSpec = array( - 'content' => $options['content'] - ,'id' => $options['id'] - ); - unset($options['content'], $options['id']); - } - if (isset($options['minifyAll'])) { - // this will be the 2nd argument passed to Minify_HTML::minify() - $sourceSpec['minifyOptions'] = array( - 'cssMinifier' => array('Minify_CSS', 'minify') - ,'jsMinifier' => array('JSMin', 'minify') - ); - $this->_loadCssJsMinifiers = true; - unset($options['minifyAll']); - } - $this->sources[] = new Minify_Source($sourceSpec); - - $options['contentType'] = Minify::TYPE_HTML; - return $options; - } - - protected $_loadCssJsMinifiers = false; - - /** - * @see Minify_Controller_Base::loadMinifier() - */ - public function loadMinifier($minifierCallback) - { - if ($this->_loadCssJsMinifiers) { - // Minify will not call for these so we must manually load - // them when Minify/HTML.php is called for. - require_once 'Minify/CSS.php'; - require_once 'JSMin.php'; - } - parent::loadMinifier($minifierCallback); // load Minify/HTML.php - } -} - diff --git a/mod/minify/lib/min/lib/Minify/Controller/Version1.php b/mod/minify/lib/min/lib/Minify/Controller/Version1.php deleted file mode 100644 index 1861aabc1..000000000 --- a/mod/minify/lib/min/lib/Minify/Controller/Version1.php +++ /dev/null @@ -1,118 +0,0 @@ -<?php -/** - * Class Minify_Controller_Version1 - * @package Minify - */ - -require_once 'Minify/Controller/Base.php'; - -/** - * Controller class for emulating version 1 of minify.php - * - * <code> - * Minify::serve('Version1'); - * </code> - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_Controller_Version1 extends Minify_Controller_Base { - - /** - * Set up groups of files as sources - * - * @param array $options controller and Minify options - * @return array Minify options - * - */ - public function setupSources($options) { - self::_setupDefines(); - if (MINIFY_USE_CACHE) { - $cacheDir = defined('MINIFY_CACHE_DIR') - ? MINIFY_CACHE_DIR - : ''; - Minify::setCache($cacheDir); - } - $options['badRequestHeader'] = 'HTTP/1.0 404 Not Found'; - $options['contentTypeCharset'] = MINIFY_ENCODING; - - // The following restrictions are to limit the URLs that minify will - // respond to. Ideally there should be only one way to reference a file. - if (! isset($_GET['files']) - // verify at least one file, files are single comma separated, - // and are all same extension - || ! preg_match('/^[^,]+\\.(css|js)(,[^,]+\\.\\1)*$/', $_GET['files'], $m) - // no "//" (makes URL rewriting easier) - || strpos($_GET['files'], '//') !== false - // no "\" - || strpos($_GET['files'], '\\') !== false - // no "./" - || preg_match('/(?:^|[^\\.])\\.\\//', $_GET['files']) - ) { - return $options; - } - $extension = $m[1]; - - $files = explode(',', $_GET['files']); - if (count($files) > MINIFY_MAX_FILES) { - return $options; - } - - // strings for prepending to relative/absolute paths - $prependRelPaths = dirname($_SERVER['SCRIPT_FILENAME']) - . DIRECTORY_SEPARATOR; - $prependAbsPaths = $_SERVER['DOCUMENT_ROOT']; - - $sources = array(); - $goodFiles = array(); - $hasBadSource = false; - - $allowDirs = isset($options['allowDirs']) - ? $options['allowDirs'] - : MINIFY_BASE_DIR; - - foreach ($files as $file) { - // prepend appropriate string for abs/rel paths - $file = ($file[0] === '/' ? $prependAbsPaths : $prependRelPaths) . $file; - // make sure a real file! - $file = realpath($file); - // don't allow unsafe or duplicate files - if (parent::_fileIsSafe($file, $allowDirs) - && !in_array($file, $goodFiles)) - { - $goodFiles[] = $file; - $srcOptions = array( - 'filepath' => $file - ); - $this->sources[] = new Minify_Source($srcOptions); - } else { - $hasBadSource = true; - break; - } - } - if ($hasBadSource) { - $this->sources = array(); - } - if (! MINIFY_REWRITE_CSS_URLS) { - $options['rewriteCssUris'] = false; - } - return $options; - } - - private static function _setupDefines() - { - $defaults = array( - 'MINIFY_BASE_DIR' => realpath($_SERVER['DOCUMENT_ROOT']) - ,'MINIFY_ENCODING' => 'utf-8' - ,'MINIFY_MAX_FILES' => 16 - ,'MINIFY_REWRITE_CSS_URLS' => true - ,'MINIFY_USE_CACHE' => true - ); - foreach ($defaults as $const => $val) { - if (! defined($const)) { - define($const, $val); - } - } - } -} - diff --git a/mod/minify/lib/min/lib/Minify/HTML.php b/mod/minify/lib/min/lib/Minify/HTML.php deleted file mode 100644 index fb5c1e982..000000000 --- a/mod/minify/lib/min/lib/Minify/HTML.php +++ /dev/null @@ -1,245 +0,0 @@ -<?php -/** - * Class Minify_HTML - * @package Minify - */ - -/** - * Compress HTML - * - * This is a heavy regex-based removal of whitespace, unnecessary comments and - * tokens. IE conditional comments are preserved. There are also options to have - * STYLE and SCRIPT blocks compressed by callback functions. - * - * A test suite is available. - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_HTML { - - /** - * "Minify" an HTML page - * - * @param string $html - * - * @param array $options - * - * 'cssMinifier' : (optional) callback function to process content of STYLE - * elements. - * - * 'jsMinifier' : (optional) callback function to process content of SCRIPT - * elements. Note: the type attribute is ignored. - * - * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If - * unset, minify will sniff for an XHTML doctype. - * - * @return string - */ - public static function minify($html, $options = array()) { - $min = new Minify_HTML($html, $options); - return $min->process(); - } - - - /** - * Create a minifier object - * - * @param string $html - * - * @param array $options - * - * 'cssMinifier' : (optional) callback function to process content of STYLE - * elements. - * - * 'jsMinifier' : (optional) callback function to process content of SCRIPT - * elements. Note: the type attribute is ignored. - * - * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If - * unset, minify will sniff for an XHTML doctype. - * - * @return null - */ - public function __construct($html, $options = array()) - { - $this->_html = str_replace("\r\n", "\n", trim($html)); - if (isset($options['xhtml'])) { - $this->_isXhtml = (bool)$options['xhtml']; - } - if (isset($options['cssMinifier'])) { - $this->_cssMinifier = $options['cssMinifier']; - } - if (isset($options['jsMinifier'])) { - $this->_jsMinifier = $options['jsMinifier']; - } - } - - - /** - * Minify the markeup given in the constructor - * - * @return string - */ - public function process() - { - if ($this->_isXhtml === null) { - $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML')); - } - - $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']); - $this->_placeholders = array(); - - // replace SCRIPTs (and minify) with placeholders - $this->_html = preg_replace_callback( - '/(\\s*)(<script\\b[^>]*?>)([\\s\\S]*?)<\\/script>(\\s*)/i' - ,array($this, '_removeScriptCB') - ,$this->_html); - - // replace STYLEs (and minify) with placeholders - $this->_html = preg_replace_callback( - '/\\s*(<style\\b[^>]*?>)([\\s\\S]*?)<\\/style>\\s*/i' - ,array($this, '_removeStyleCB') - ,$this->_html); - - // remove HTML comments (not containing IE conditional comments). - $this->_html = preg_replace_callback( - '/<!--([\\s\\S]*?)-->/' - ,array($this, '_commentCB') - ,$this->_html); - - // replace PREs with placeholders - $this->_html = preg_replace_callback('/\\s*(<pre\\b[^>]*?>[\\s\\S]*?<\\/pre>)\\s*/i' - ,array($this, '_removePreCB') - ,$this->_html); - - // replace TEXTAREAs with placeholders - $this->_html = preg_replace_callback( - '/\\s*(<textarea\\b[^>]*?>[\\s\\S]*?<\\/textarea>)\\s*/i' - ,array($this, '_removeTextareaCB') - ,$this->_html); - - // trim each line. - // @todo take into account attribute values that span multiple lines. - $this->_html = preg_replace('/^\\s+|\\s+$/m', '', $this->_html); - - // remove ws around block/undisplayed elements - $this->_html = preg_replace('/\\s+(<\\/?(?:area|base(?:font)?|blockquote|body' - .'|caption|center|cite|col(?:group)?|dd|dir|div|dl|dt|fieldset|form' - .'|frame(?:set)?|h[1-6]|head|hr|html|legend|li|link|map|menu|meta' - .'|ol|opt(?:group|ion)|p|param|t(?:able|body|head|d|h||r|foot|itle)' - .'|ul)\\b[^>]*>)/i', '$1', $this->_html); - - // remove ws outside of all elements - $this->_html = preg_replace_callback( - '/>([^<]+)</' - ,array($this, '_outsideTagCB') - ,$this->_html); - - // use newlines before 1st attribute in open tags (to limit line lengths) - $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html); - - // fill placeholders - $this->_html = str_replace( - array_keys($this->_placeholders) - ,array_values($this->_placeholders) - ,$this->_html - ); - return $this->_html; - } - - protected function _commentCB($m) - { - return (0 === strpos($m[1], '[') || false !== strpos($m[1], '<![')) - ? $m[0] - : ''; - } - - protected function _reservePlace($content) - { - $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%'; - $this->_placeholders[$placeholder] = $content; - return $placeholder; - } - - protected $_isXhtml = null; - protected $_replacementHash = null; - protected $_placeholders = array(); - protected $_cssMinifier = null; - protected $_jsMinifier = null; - - protected function _outsideTagCB($m) - { - return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<'; - } - - protected function _removePreCB($m) - { - return $this->_reservePlace($m[1]); - } - - protected function _removeTextareaCB($m) - { - return $this->_reservePlace($m[1]); - } - - protected function _removeStyleCB($m) - { - $openStyle = $m[1]; - $css = $m[2]; - // remove HTML comments - $css = preg_replace('/(?:^\\s*<!--|-->\\s*$)/', '', $css); - - // remove CDATA section markers - $css = $this->_removeCdata($css); - - // minify - $minifier = $this->_cssMinifier - ? $this->_cssMinifier - : 'trim'; - $css = call_user_func($minifier, $css); - - return $this->_reservePlace($this->_needsCdata($css) - ? "{$openStyle}/*<![CDATA[*/{$css}/*]]>*/</style>" - : "{$openStyle}{$css}</style>" - ); - } - - protected function _removeScriptCB($m) - { - $openScript = $m[2]; - $js = $m[3]; - - // whitespace surrounding? preserve at least one space - $ws1 = ($m[1] === '') ? '' : ' '; - $ws2 = ($m[4] === '') ? '' : ' '; - - // remove HTML comments (and ending "//" if present) - $js = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $js); - - // remove CDATA section markers - $js = $this->_removeCdata($js); - - // minify - $minifier = $this->_jsMinifier - ? $this->_jsMinifier - : 'trim'; - $js = call_user_func($minifier, $js); - - return $this->_reservePlace($this->_needsCdata($js) - ? "{$ws1}{$openScript}/*<![CDATA[*/{$js}/*]]>*/</script>{$ws2}" - : "{$ws1}{$openScript}{$js}</script>{$ws2}" - ); - } - - protected function _removeCdata($str) - { - return (false !== strpos($str, '<![CDATA[')) - ? str_replace(array('<![CDATA[', ']]>'), '', $str) - : $str; - } - - protected function _needsCdata($str) - { - return ($this->_isXhtml && preg_match('/(?:[<&]|\\-\\-|\\]\\]>)/', $str)); - } -} diff --git a/mod/minify/lib/min/lib/Minify/ImportProcessor.php b/mod/minify/lib/min/lib/Minify/ImportProcessor.php deleted file mode 100644 index 0d6d90a81..000000000 --- a/mod/minify/lib/min/lib/Minify/ImportProcessor.php +++ /dev/null @@ -1,157 +0,0 @@ -<?php -/** - * Class Minify_ImportProcessor - * @package Minify - */ - -/** - * Linearize a CSS/JS file by including content specified by CSS import - * declarations. In CSS files, relative URIs are fixed. - * - * @imports will be processed regardless of where they appear in the source - * files; i.e. @imports commented out or in string content will still be - * processed! - * - * This has a unit test but should be considered "experimental". - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_ImportProcessor { - - public static $filesIncluded = array(); - - public static function process($file) - { - self::$filesIncluded = array(); - self::$_isCss = (strtolower(substr($file, -4)) === '.css'); - $obj = new Minify_ImportProcessor(dirname($file)); - return $obj->_getContent($file); - } - - // allows callback funcs to know the current directory - private $_currentDir = null; - - // allows _importCB to write the fetched content back to the obj - private $_importedContent = ''; - - private static $_isCss = null; - - private function __construct($currentDir) - { - $this->_currentDir = $currentDir; - } - - private function _getContent($file) - { - $file = realpath($file); - if (! $file - || in_array($file, self::$filesIncluded) - || false === ($content = @file_get_contents($file)) - ) { - // file missing, already included, or failed read - return ''; - } - self::$filesIncluded[] = realpath($file); - $this->_currentDir = dirname($file); - - // remove UTF-8 BOM if present - if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) { - $content = substr($content, 3); - } - // ensure uniform EOLs - $content = str_replace("\r\n", "\n", $content); - - // process @imports - $content = preg_replace_callback( - '/ - @import\\s+ - (?:url\\(\\s*)? # maybe url( - [\'"]? # maybe quote - (.*?) # 1 = URI - [\'"]? # maybe end quote - (?:\\s*\\))? # maybe ) - ([a-zA-Z,\\s]*)? # 2 = media list - ; # end token - /x' - ,array($this, '_importCB') - ,$content - ); - - if (self::$_isCss) { - // rewrite remaining relative URIs - $content = preg_replace_callback( - '/url\\(\\s*([^\\)\\s]+)\\s*\\)/' - ,array($this, '_urlCB') - ,$content - ); - } - - return $this->_importedContent . $content; - } - - private function _importCB($m) - { - $url = $m[1]; - $mediaList = preg_replace('/\\s+/', '', $m[2]); - - if (strpos($url, '://') > 0) { - // protocol, leave in place for CSS, comment for JS - return self::$_isCss - ? $m[0] - : "/* Minify_ImportProcessor will not include remote content */"; - } - if ('/' === $url[0]) { - // protocol-relative or root path - $url = ltrim($url, '/'); - $file = realpath($_SERVER['DOCUMENT_ROOT']) . DIRECTORY_SEPARATOR - . strtr($url, '/', DIRECTORY_SEPARATOR); - } else { - // relative to current path - $file = $this->_currentDir . DIRECTORY_SEPARATOR - . strtr($url, '/', DIRECTORY_SEPARATOR); - } - $obj = new Minify_ImportProcessor(dirname($file)); - $content = $obj->_getContent($file); - if ('' === $content) { - // failed. leave in place for CSS, comment for JS - return self::$_isCss - ? $m[0] - : "/* Minify_ImportProcessor could not fetch '{$file}' */";; - } - return (!self::$_isCss || preg_match('@(?:^$|\\ball\\b)@', $mediaList)) - ? $content - : "@media {$mediaList} {\n{$content}\n}\n"; - } - - private function _urlCB($m) - { - // $m[1] is either quoted or not - $quote = ($m[1][0] === "'" || $m[1][0] === '"') - ? $m[1][0] - : ''; - $url = ($quote === '') - ? $m[1] - : substr($m[1], 1, strlen($m[1]) - 2); - if ('/' !== $url[0]) { - if (strpos($url, '//') > 0) { - // probably starts with protocol, do not alter - } else { - // prepend path with current dir separator (OS-independent) - $path = $this->_currentDir - . DIRECTORY_SEPARATOR . strtr($url, '/', DIRECTORY_SEPARATOR); - // strip doc root - $path = substr($path, strlen(realpath($_SERVER['DOCUMENT_ROOT']))); - // fix to absolute URL - $url = strtr($path, '/\\', '//'); - // remove /./ and /../ where possible - $url = str_replace('/./', '/', $url); - // inspired by patch from Oleg Cherniy - do { - $url = preg_replace('@/[^/]+/\\.\\./@', '/', $url, 1, $changed); - } while ($changed); - } - } - return "url({$quote}{$url}{$quote})"; - } -} diff --git a/mod/minify/lib/min/lib/Minify/Lines.php b/mod/minify/lib/min/lib/Minify/Lines.php deleted file mode 100644 index 186e7019d..000000000 --- a/mod/minify/lib/min/lib/Minify/Lines.php +++ /dev/null @@ -1,131 +0,0 @@ -<?php -/** - * Class Minify_Lines - * @package Minify - */ - -/** - * Add line numbers in C-style comments for easier debugging of combined content - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - * @author Adam Pedersen (Issue 55 fix) - */ -class Minify_Lines { - - /** - * Add line numbers in C-style comments - * - * This uses a very basic parser easily fooled by comment tokens inside - * strings or regexes, but, otherwise, generally clean code will not be - * mangled. URI rewriting can also be performed. - * - * @param string $content - * - * @param array $options available options: - * - * 'id': (optional) string to identify file. E.g. file name/path - * - * 'currentDir': (default null) if given, this is assumed to be the - * directory of the current CSS file. Using this, minify will rewrite - * all relative URIs in import/url declarations to correctly point to - * the desired files, and prepend a comment with debugging information about - * this process. - * - * @return string - */ - public static function minify($content, $options = array()) - { - $id = (isset($options['id']) && $options['id']) - ? $options['id'] - : ''; - $content = str_replace("\r\n", "\n", $content); - $lines = explode("\n", $content); - $numLines = count($lines); - // determine left padding - $padTo = strlen($numLines); - $inComment = false; - $i = 0; - $newLines = array(); - while (null !== ($line = array_shift($lines))) { - if (('' !== $id) && (0 == $i % 50)) { - array_push($newLines, '', "/* {$id} */", ''); - } - ++$i; - $newLines[] = self::_addNote($line, $i, $inComment, $padTo); - $inComment = self::_eolInComment($line, $inComment); - } - $content = implode("\n", $newLines) . "\n"; - - // check for desired URI rewriting - if (isset($options['currentDir'])) { - require_once 'Minify/CSS/UriRewriter.php'; - Minify_CSS_UriRewriter::$debugText = ''; - $content = Minify_CSS_UriRewriter::rewrite( - $content - ,$options['currentDir'] - ,isset($options['docRoot']) ? $options['docRoot'] : $_SERVER['DOCUMENT_ROOT'] - ,isset($options['symlinks']) ? $options['symlinks'] : array() - ); - $content = "/* Minify_CSS_UriRewriter::\$debugText\n\n" - . Minify_CSS_UriRewriter::$debugText . "*/\n" - . $content; - } - - return $content; - } - - /** - * Is the parser within a C-style comment at the end of this line? - * - * @param string $line current line of code - * - * @param bool $inComment was the parser in a comment at the - * beginning of the line? - * - * @return bool - */ - private static function _eolInComment($line, $inComment) - { - while (strlen($line)) { - $search = $inComment - ? '*/' - : '/*'; - $pos = strpos($line, $search); - if (false === $pos) { - return $inComment; - } else { - if ($pos == 0 - || ($inComment - ? substr($line, $pos, 3) - : substr($line, $pos-1, 3)) != '*/*') - { - $inComment = ! $inComment; - } - $line = substr($line, $pos + 2); - } - } - return $inComment; - } - - /** - * Prepend a comment (or note) to the given line - * - * @param string $line current line of code - * - * @param string $note content of note/comment - * - * @param bool $inComment was the parser in a comment at the - * beginning of the line? - * - * @param int $padTo minimum width of comment - * - * @return string - */ - private static function _addNote($line, $note, $inComment, $padTo) - { - return $inComment - ? '/* ' . str_pad($note, $padTo, ' ', STR_PAD_RIGHT) . ' *| ' . $line - : '/* ' . str_pad($note, $padTo, ' ', STR_PAD_RIGHT) . ' */ ' . $line; - } -} diff --git a/mod/minify/lib/min/lib/Minify/Logger.php b/mod/minify/lib/min/lib/Minify/Logger.php deleted file mode 100644 index 7844eea35..000000000 --- a/mod/minify/lib/min/lib/Minify/Logger.php +++ /dev/null @@ -1,45 +0,0 @@ -<?php -/** - * Class Minify_Logger - * @package Minify - */ - -/** - * Message logging class - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_Logger { - - /** - * Set logger object. - * - * The object should have a method "log" that accepts a value as 1st argument and - * an optional string label as the 2nd. - * - * @param mixed $obj or a "falsey" value to disable - * @return null - */ - public static function setLogger($obj = null) { - self::$_logger = $obj - ? $obj - : null; - } - - /** - * Pass a message to the logger (if set) - * - * @param string $msg message to log - * @return null - */ - public static function log($msg, $label = 'Minify') { - if (! self::$_logger) return; - self::$_logger->log($msg, $label); - } - - /** - * @var mixed logger object (like FirePHP) or null (i.e. no logger available) - */ - private static $_logger = null; -} diff --git a/mod/minify/lib/min/lib/Minify/Packer.php b/mod/minify/lib/min/lib/Minify/Packer.php deleted file mode 100644 index 949c3eef0..000000000 --- a/mod/minify/lib/min/lib/Minify/Packer.php +++ /dev/null @@ -1,37 +0,0 @@ -<?php -/** - * Class Minify_Packer - * - * To use this class you must first download the PHP port of Packer - * and place the file "class.JavaScriptPacker.php" in /lib (or your - * include_path). - * @link http://joliclic.free.fr/php/javascript-packer/en/ - * - * Be aware that, as long as HTTP encoding is used, scripts minified with JSMin - * will provide better client-side performance, as they need not be unpacked in - * client-side code. - * - * @package Minify - */ - -if (false === (@include 'class.JavaScriptPacker.php')) { - trigger_error( - 'The script "class.JavaScriptPacker.php" is required. Please see: http:' - .'//code.google.com/p/minify/source/browse/trunk/min/lib/Minify/Packer.php' - ,E_USER_ERROR - ); -} - -/** - * Minify Javascript using Dean Edward's Packer - * - * @package Minify - */ -class Minify_Packer { - public static function minify($code, $options = array()) - { - // @todo: set encoding options based on $options :) - $packer = new JavascriptPacker($code, 'Normal', true, false); - return trim($packer->pack()); - } -} diff --git a/mod/minify/lib/min/lib/Minify/Source.php b/mod/minify/lib/min/lib/Minify/Source.php deleted file mode 100644 index 5a85d10d0..000000000 --- a/mod/minify/lib/min/lib/Minify/Source.php +++ /dev/null @@ -1,187 +0,0 @@ -<?php -/** - * Class Minify_Source - * @package Minify - */ - -/** - * A content source to be minified by Minify. - * - * This allows per-source minification options and the mixing of files with - * content from other sources. - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_Source { - - /** - * @var int time of last modification - */ - public $lastModified = null; - - /** - * @var callback minifier function specifically for this source. - */ - public $minifier = null; - - /** - * @var array minification options specific to this source. - */ - public $minifyOptions = null; - - /** - * @var string full path of file - */ - public $filepath = null; - - /** - * @var string HTTP Content Type (Minify requires one of the constants Minify::TYPE_*) - */ - public $contentType = null; - - /** - * Create a Minify_Source - * - * In the $spec array(), you can either provide a 'filepath' to an existing - * file (existence will not be checked!) or give 'id' (unique string for - * the content), 'content' (the string content) and 'lastModified' - * (unixtime of last update). - * - * As a shortcut, the controller will replace "//" at the beginning - * of a filepath with $_SERVER['DOCUMENT_ROOT'] . '/'. - * - * @param array $spec options - */ - public function __construct($spec) - { - if (isset($spec['filepath'])) { - if (0 === strpos($spec['filepath'], '//')) { - $spec['filepath'] = $_SERVER['DOCUMENT_ROOT'] . substr($spec['filepath'], 1); - } - $segments = explode('.', $spec['filepath']); - $ext = strtolower(array_pop($segments)); - switch ($ext) { - case 'js' : $this->contentType = 'application/x-javascript'; - break; - case 'css' : $this->contentType = 'text/css'; - break; - case 'htm' : // fallthrough - case 'html' : $this->contentType = 'text/html'; - break; - } - $this->filepath = $spec['filepath']; - $this->_id = $spec['filepath']; - $this->lastModified = filemtime($spec['filepath']) - // offset for Windows uploaders with out of sync clocks - + round(Minify::$uploaderHoursBehind * 3600); - } elseif (isset($spec['id'])) { - $this->_id = 'id::' . $spec['id']; - if (isset($spec['content'])) { - $this->_content = $spec['content']; - } else { - $this->_getContentFunc = $spec['getContentFunc']; - } - $this->lastModified = isset($spec['lastModified']) - ? $spec['lastModified'] - : time(); - } - if (isset($spec['contentType'])) { - $this->contentType = $spec['contentType']; - } - if (isset($spec['minifier'])) { - $this->minifier = $spec['minifier']; - } - if (isset($spec['minifyOptions'])) { - $this->minifyOptions = $spec['minifyOptions']; - } - } - - /** - * Get content - * - * @return string - */ - public function getContent() - { - $content = (null !== $this->filepath) - ? file_get_contents($this->filepath) - : ((null !== $this->_content) - ? $this->_content - : call_user_func($this->_getContentFunc, $this->_id) - ); - // remove UTF-8 BOM if present - return (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) - ? substr($content, 3) - : $content; - } - - /** - * Get id - * - * @return string - */ - public function getId() - { - return $this->_id; - } - - /** - * Verifies a single minification call can handle all sources - * - * @param array $sources Minify_Source instances - * - * @return bool true iff there no sources with specific minifier preferences. - */ - public static function haveNoMinifyPrefs($sources) - { - foreach ($sources as $source) { - if (null !== $source->minifier - || null !== $source->minifyOptions) { - return false; - } - } - return true; - } - - /** - * Get unique string for a set of sources - * - * @param array $sources Minify_Source instances - * - * @return string - */ - public static function getDigest($sources) - { - foreach ($sources as $source) { - $info[] = array( - $source->_id, $source->minifier, $source->minifyOptions - ); - } - return md5(serialize($info)); - } - - /** - * Get content type from a group of sources - * - * This is called if the user doesn't pass in a 'contentType' options - * - * @param array $sources Minify_Source instances - * - * @return string content type. e.g. 'text/css' - */ - public static function getContentType($sources) - { - foreach ($sources as $source) { - if ($source->contentType !== null) { - return $source->contentType; - } - } - return 'text/plain'; - } - - protected $_content = null; - protected $_getContentFunc = null; - protected $_id = null; -} - diff --git a/mod/minify/lib/min/lib/Minify/YUICompressor.php b/mod/minify/lib/min/lib/Minify/YUICompressor.php deleted file mode 100644 index 7cb61adbe..000000000 --- a/mod/minify/lib/min/lib/Minify/YUICompressor.php +++ /dev/null @@ -1,139 +0,0 @@ -<?php -/** - * Class Minify_YUICompressor - * @package Minify - */ - -/** - * Compress Javascript/CSS using the YUI Compressor - * - * You must set $jarFile and $tempDir before calling the minify functions. - * Also, depending on your shell's environment, you may need to specify - * the full path to java in $javaExecutable or use putenv() to setup the - * Java environment. - * - * <code> - * Minify_YUICompressor::$jarFile = '/path/to/yuicompressor-2.3.5.jar'; - * Minify_YUICompressor::$tempDir = '/tmp'; - * $code = Minify_YUICompressor::minifyJs( - * $code - * ,array('nomunge' => true, 'line-break' => 1000) - * ); - * </code> - * - * @todo unit tests, $options docs - * - * @package Minify - * @author Stephen Clay <steve@mrclay.org> - */ -class Minify_YUICompressor { - - /** - * Filepath of the YUI Compressor jar file. This must be set before - * calling minifyJs() or minifyCss(). - * - * @var string - */ - public static $jarFile = null; - - /** - * Writable temp directory. This must be set before calling minifyJs() - * or minifyCss(). - * - * @var string - */ - public static $tempDir = null; - - /** - * Filepath of "java" executable (may be needed if not in shell's PATH) - * - * @var string - */ - public static $javaExecutable = 'java'; - - /** - * Minify a Javascript string - * - * @param string $js - * - * @param array $options (verbose is ignored) - * - * @see http://www.julienlecomte.net/yuicompressor/README - * - * @return string - */ - public static function minifyJs($js, $options = array()) - { - return self::_minify('js', $js, $options); - } - - /** - * Minify a CSS string - * - * @param string $css - * - * @param array $options (verbose is ignored) - * - * @see http://www.julienlecomte.net/yuicompressor/README - * - * @return string - */ - public static function minifyCss($css, $options = array()) - { - return self::_minify('css', $css, $options); - } - - private static function _minify($type, $content, $options) - { - self::_prepare(); - if (! ($tmpFile = tempnam(self::$tempDir, 'yuic_'))) { - throw new Exception('Minify_YUICompressor : could not create temp file.'); - } - file_put_contents($tmpFile, $content); - exec(self::_getCmd($options, $type, $tmpFile), $output); - unlink($tmpFile); - return implode("\n", $output); - } - - private static function _getCmd($userOptions, $type, $tmpFile) - { - $o = array_merge( - array( - 'charset' => '' - ,'line-break' => 5000 - ,'type' => $type - ,'nomunge' => false - ,'preserve-semi' => false - ,'disable-optimizations' => false - ) - ,$userOptions - ); - $cmd = self::$javaExecutable . ' -jar ' . escapeshellarg(self::$jarFile) - . " --type {$type}" - . (preg_match('/^[a-zA-Z\\-]+$/', $o['charset']) - ? " --charset {$o['charset']}" - : '') - . (is_numeric($o['line-break']) && $o['line-break'] >= 0 - ? ' --line-break ' . (int)$o['line-break'] - : ''); - if ($type === 'js') { - foreach (array('nomunge', 'preserve-semi', 'disable-optimizations') as $opt) { - $cmd .= $o[$opt] - ? " --{$opt}" - : ''; - } - } - return $cmd . ' ' . escapeshellarg($tmpFile); - } - - private static function _prepare() - { - if (! is_file(self::$jarFile) - || ! is_dir(self::$tempDir) - || ! is_writable(self::$tempDir) - ) { - throw new Exception('Minify_YUICompressor : $jarFile and $tempDir must be set.'); - } - } -} - diff --git a/mod/minify/lib/min/lib/Solar/Dir.php b/mod/minify/lib/min/lib/Solar/Dir.php deleted file mode 100644 index 37f716962..000000000 --- a/mod/minify/lib/min/lib/Solar/Dir.php +++ /dev/null @@ -1,199 +0,0 @@ -<?php -/** - * - * Utility class for static directory methods. - * - * @category Solar - * - * @package Solar - * - * @author Paul M. Jones <pmjones@solarphp.com> - * - * @license http://opensource.org/licenses/bsd-license.php BSD - * - * @version $Id: Dir.php 2926 2007-11-09 16:25:44Z pmjones $ - * - */ -class Solar_Dir { - - /** - * - * The OS-specific temporary directory location. - * - * @var string - * - */ - protected static $_tmp; - - /** - * - * Hack for [[php::is_dir() | ]] that checks the include_path. - * - * Use this to see if a directory exists anywhere in the include_path. - * - * {{code: php - * $dir = Solar_Dir::exists('path/to/dir') - * if ($dir) { - * $files = scandir($dir); - * } else { - * echo "Not found in the include-path."; - * } - * }} - * - * @param string $dir Check for this directory in the include_path. - * - * @return mixed If the directory exists in the include_path, returns the - * absolute path; if not, returns boolean false. - * - */ - public static function exists($dir) - { - // no file requested? - $dir = trim($dir); - if (! $dir) { - return false; - } - - // using an absolute path for the file? - // dual check for Unix '/' and Windows '\', - // or Windows drive letter and a ':'. - $abs = ($dir[0] == '/' || $dir[0] == '\\' || $dir[1] == ':'); - if ($abs && is_dir($dir)) { - return $dir; - } - - // using a relative path on the file - $path = explode(PATH_SEPARATOR, ini_get('include_path')); - foreach ($path as $base) { - // strip Unix '/' and Windows '\' - $target = rtrim($base, '\\/') . DIRECTORY_SEPARATOR . $dir; - if (is_dir($target)) { - return $target; - } - } - - // never found it - return false; - } - - /** - * - * "Fixes" a directory string for the operating system. - * - * Use slashes anywhere you need a directory separator. Then run the - * string through fixdir() and the slashes will be converted to the - * proper separator (for example '\' on Windows). - * - * Always adds a final trailing separator. - * - * @param string $dir The directory string to 'fix'. - * - * @return string The "fixed" directory string. - * - */ - public static function fix($dir) - { - $dir = str_replace('/', DIRECTORY_SEPARATOR, $dir); - return rtrim($dir, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; - } - - /** - * - * Convenience method for dirname() and higher-level directories. - * - * @param string $file Get the dirname() of this file. - * - * @param int $up Move up in the directory structure this many - * times, default 0. - * - * @return string The dirname() of the file. - * - */ - public static function name($file, $up = 0) - { - $dir = dirname($file); - while ($up --) { - $dir = dirname($dir); - } - return $dir; - } - - /** - * - * Returns the OS-specific directory for temporary files. - * - * @param string $sub Add this subdirectory to the returned temporary - * directory name. - * - * @return string The temporary directory path. - * - */ - public static function tmp($sub = '') - { - // find the tmp dir if needed - if (! Solar_Dir::$_tmp) { - - // use the system if we can - if (function_exists('sys_get_temp_dir')) { - $tmp = sys_get_temp_dir(); - } else { - $tmp = Solar_Dir::_tmp(); - } - - // remove trailing separator and save - Solar_Dir::$_tmp = rtrim($tmp, DIRECTORY_SEPARATOR); - } - - // do we have a subdirectory request? - $sub = trim($sub); - if ($sub) { - // remove leading and trailing separators, and force exactly - // one trailing separator - $sub = trim($sub, DIRECTORY_SEPARATOR) - . DIRECTORY_SEPARATOR; - } - - return Solar_Dir::$_tmp . DIRECTORY_SEPARATOR . $sub; - } - - /** - * - * Returns the OS-specific temporary directory location. - * - * @return string The temp directory path. - * - */ - protected static function _tmp() - { - // non-Windows system? - if (strtolower(substr(PHP_OS, 0, 3)) != 'win') { - $tmp = empty($_ENV['TMPDIR']) ? getenv('TMPDIR') : $_ENV['TMPDIR']; - if ($tmp) { - return $tmp; - } else { - return '/tmp'; - } - } - - // Windows 'TEMP' - $tmp = empty($_ENV['TEMP']) ? getenv('TEMP') : $_ENV['TEMP']; - if ($tmp) { - return $tmp; - } - - // Windows 'TMP' - $tmp = empty($_ENV['TMP']) ? getenv('TMP') : $_ENV['TMP']; - if ($tmp) { - return $tmp; - } - - // Windows 'windir' - $tmp = empty($_ENV['windir']) ? getenv('windir') : $_ENV['windir']; - if ($tmp) { - return $tmp; - } - - // final fallback for Windows - return getenv('SystemRoot') . '\\temp'; - } -}
\ No newline at end of file diff --git a/mod/minify/lib/min/utils.php b/mod/minify/lib/min/utils.php deleted file mode 100644 index c73594152..000000000 --- a/mod/minify/lib/min/utils.php +++ /dev/null @@ -1,90 +0,0 @@ -<?php -/** - * Utility functions for generating group URIs in HTML files - * - * Before including this file, /min/lib must be in your include_path. - * - * @package Minify - */ - -require_once 'Minify/Build.php'; - - -/** - * Get a timestamped URI to a minified resource using the default Minify install - * - * <code> - * <link rel="stylesheet" type="text/css" href="<?php echo Minify_groupUri('css'); ?>" /> - * <script type="text/javascript" src="<?php echo Minify_groupUri('js'); ?>"></script> - * </code> - * - * If you do not want ampersands as HTML entities, set Minify_Build::$ampersand = "&" - * before using this function. - * - * @param string $group a key from groupsConfig.php - * @param boolean $forceAmpersand (default false) Set to true if the RewriteRule - * directives in .htaccess are functional. This will remove the "?" from URIs, making them - * more cacheable by proxies. - * @return string - */ -function Minify_groupUri($group, $forceAmpersand = false) -{ - $path = $forceAmpersand - ? "/g={$group}" - : "/?g={$group}"; - return _Minify_getBuild($group)->uri( - '/' . basename(dirname(__FILE__)) . $path - ,$forceAmpersand - ); -} - - -/** - * Get the last modification time of the source js/css files used by Minify to - * build the page. - * - * If you're caching the output of Minify_groupUri(), you'll want to rebuild - * the cache if it's older than this timestamp. - * - * <code> - * // simplistic HTML cache system - * $file = '/path/to/cache/file'; - * if (! file_exists($file) || filemtime($file) < Minify_groupsMtime(array('js', 'css'))) { - * // (re)build cache - * $page = buildPage(); // this calls Minify_groupUri() for js and css - * file_put_contents($file, $page); - * echo $page; - * exit(); - * } - * readfile($file); - * </code> - * - * @param array $groups an array of keys from groupsConfig.php - * @return int Unix timestamp of the latest modification - */ -function Minify_groupsMtime($groups) -{ - $max = 0; - foreach ((array)$groups as $group) { - $max = max($max, _Minify_getBuild($group)->lastModified); - } - return $max; -} - -/** - * @param string $group a key from groupsConfig.php - * @return Minify_Build - * @private - */ -function _Minify_getBuild($group) -{ - static $builds = array(); - static $gc = false; - if (false === $gc) { - $gc = (require dirname(__FILE__) . '/groupsConfig.php'); - } - if (! isset($builds[$group])) { - $builds[$group] = new Minify_Build($gc[$group]); - } - return $builds[$group]; -} diff --git a/mod/minify/manifest.xml b/mod/minify/manifest.xml deleted file mode 100644 index bdf815b8b..000000000 --- a/mod/minify/manifest.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8"> - <name>Minify</name> - <author>Evan Winslow</author> - <version>0.2</version> - <description>Brings the power of js/css minification to Elgg</description> - <copyright>(C) Evan Winslow 2010</copyright> - <website>http://code.google.com/p/elgg-minify</website> - <requires> - <type>elgg_release</type> - <version>1.7</version> - </requires> -</plugin_manifest> diff --git a/mod/minify/start.php b/mod/minify/start.php deleted file mode 100644 index ed2867a14..000000000 --- a/mod/minify/start.php +++ /dev/null @@ -1,26 +0,0 @@ -<?php - -function minify_init() -{ - //make sure this runs after everyone else is done - register_plugin_hook('display', 'view', 'minify_views', 1000); -} - -function minify_views($hook, $type, $content, $params) -{ - $view = $params['view']; - - if (preg_match("/^js\//", $view)) { - if (include_once dirname(__FILE__).'/lib/min/lib/JSMin.php') { - return JSMin::minify($content); - } - } elseif ($view === 'css') { - if (include_once('lib/min/lib/CSS.php')) { - return Minify_CSS::minify($content); - } - } -} - -register_elgg_event_handler('init', 'system', 'minify_init'); - -?>
\ No newline at end of file |