futtta /
autoptimize
@@ -2,9 +2,9 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | 4 | if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
| 5 | - $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
|
| 5 | + $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
|
| 6 | 6 | if(!isset($_SERVER['HTTP_USER_AGENT'])) |
| 7 | - $_SERVER['HTTP_USER_AGENT'] = ''; |
|
| 7 | + $_SERVER['HTTP_USER_AGENT'] = ''; |
|
| 8 | 8 | |
| 9 | 9 | // Determine supported compression method |
| 10 | 10 | $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'); |
@@ -15,20 +15,20 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | // Check for buggy versions of Internet Explorer |
| 17 | 17 | if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') && |
| 18 | - preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches)) |
|
| 18 | + preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches)) |
|
| 19 | 19 | { |
| 20 | - $version = floatval($matches[1]); |
|
| 20 | + $version = floatval($matches[1]); |
|
| 21 | 21 | |
| 22 | - if ($version < 6) |
|
| 23 | - $encoding = 'none'; |
|
| 22 | + if ($version < 6) |
|
| 23 | + $encoding = 'none'; |
|
| 24 | 24 | |
| 25 | - if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) |
|
| 26 | - $encoding = 'none'; |
|
| 25 | + if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) |
|
| 26 | + $encoding = 'none'; |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | 30 | if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
| 31 | - $encoding = 'none'; |
|
| 31 | + $encoding = 'none'; |
|
| 32 | 32 | |
| 33 | 33 | //Get data |
| 34 | 34 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
@@ -41,24 +41,24 @@ discard block |
||
| 41 | 41 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 42 | 42 | |
| 43 | 43 | if (($modTimeMatch)||($eTagMatch)) { |
| 44 | - header('HTTP/1.1 304 Not Modified'); |
|
| 45 | - header('Connection: close'); |
|
| 44 | + header('HTTP/1.1 304 Not Modified'); |
|
| 45 | + header('Connection: close'); |
|
| 46 | 46 | } else { |
| 47 | - // send all sorts of headers |
|
| 48 | - $expireTime=60*60*24*356; // 1y max according to RFC |
|
| 47 | + // send all sorts of headers |
|
| 48 | + $expireTime=60*60*24*356; // 1y max according to RFC |
|
| 49 | 49 | |
| 50 | - if(isset($encoding) && $encoding != 'none') |
|
| 51 | - { |
|
| 52 | - header('Content-Encoding: '.$encoding); |
|
| 53 | - } |
|
| 54 | - header('Vary: Accept-Encoding'); |
|
| 55 | - header('Content-Length: '.strlen($contents)); |
|
| 56 | - header('Content-type: %%CONTENT%%; charset=utf-8'); |
|
| 57 | - header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
|
| 58 | - header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years |
|
| 59 | - header('ETag: ' . $eTag); |
|
| 60 | - header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
|
| 50 | + if(isset($encoding) && $encoding != 'none') |
|
| 51 | + { |
|
| 52 | + header('Content-Encoding: '.$encoding); |
|
| 53 | + } |
|
| 54 | + header('Vary: Accept-Encoding'); |
|
| 55 | + header('Content-Length: '.strlen($contents)); |
|
| 56 | + header('Content-type: %%CONTENT%%; charset=utf-8'); |
|
| 57 | + header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
|
| 58 | + header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years |
|
| 59 | + header('ETag: ' . $eTag); |
|
| 60 | + header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
|
| 61 | 61 | |
| 62 | - // send output |
|
| 63 | - echo $contents; |
|
| 62 | + // send output |
|
| 63 | + echo $contents; |
|
| 64 | 64 | } |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php exit; |
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 4 | +if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
| 6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 6 | +if (!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 7 | 7 | $_SERVER['HTTP_USER_AGENT'] = ''; |
| 8 | 8 | |
| 9 | 9 | // Determine supported compression method |
@@ -27,27 +27,27 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 30 | +if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 31 | 31 | $encoding = 'none'; |
| 32 | 32 | |
| 33 | 33 | //Get data |
| 34 | 34 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
| 35 | 35 | |
| 36 | 36 | // first check if we have to send 304 |
| 37 | -$eTag=md5($contents); |
|
| 38 | -$modTime=filemtime(__FILE__.'.none'); |
|
| 37 | +$eTag = md5($contents); |
|
| 38 | +$modTime = filemtime(__FILE__.'.none'); |
|
| 39 | 39 | |
| 40 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); |
|
| 40 | +$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag)); |
|
| 41 | 41 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 42 | 42 | |
| 43 | -if (($modTimeMatch)||($eTagMatch)) { |
|
| 43 | +if (($modTimeMatch) || ($eTagMatch)) { |
|
| 44 | 44 | header('HTTP/1.1 304 Not Modified'); |
| 45 | 45 | header('Connection: close'); |
| 46 | 46 | } else { |
| 47 | 47 | // send all sorts of headers |
| 48 | - $expireTime=60*60*24*356; // 1y max according to RFC |
|
| 48 | + $expireTime = 60*60*24*356; // 1y max according to RFC |
|
| 49 | 49 | |
| 50 | - if(isset($encoding) && $encoding != 'none') |
|
| 50 | + if (isset($encoding) && $encoding != 'none') |
|
| 51 | 51 | { |
| 52 | 52 | header('Content-Encoding: '.$encoding); |
| 53 | 53 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | header('Content-type: %%CONTENT%%; charset=utf-8'); |
| 57 | 57 | header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
| 58 | 58 | header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years |
| 59 | - header('ETag: ' . $eTag); |
|
| 59 | + header('ETag: '.$eTag); |
|
| 60 | 60 | header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
| 61 | 61 | |
| 62 | 62 | // send output |
@@ -2,9 +2,9 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | 4 | if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
| 5 | - $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
|
| 5 | + $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
|
| 6 | 6 | if(!isset($_SERVER['HTTP_USER_AGENT'])) |
| 7 | - $_SERVER['HTTP_USER_AGENT'] = ''; |
|
| 7 | + $_SERVER['HTTP_USER_AGENT'] = ''; |
|
| 8 | 8 | |
| 9 | 9 | // Determine supported compression method |
| 10 | 10 | $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'); |
@@ -15,30 +15,30 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | // Check for buggy versions of Internet Explorer |
| 17 | 17 | if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') && |
| 18 | - preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches)) |
|
| 18 | + preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches)) |
|
| 19 | 19 | { |
| 20 | - $version = floatval($matches[1]); |
|
| 20 | + $version = floatval($matches[1]); |
|
| 21 | 21 | |
| 22 | - if ($version < 6) |
|
| 23 | - $encoding = 'none'; |
|
| 22 | + if ($version < 6) |
|
| 23 | + $encoding = 'none'; |
|
| 24 | 24 | |
| 25 | - if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) |
|
| 26 | - $encoding = 'none'; |
|
| 25 | + if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) |
|
| 26 | + $encoding = 'none'; |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | 30 | if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
| 31 | - $encoding = 'none'; |
|
| 31 | + $encoding = 'none'; |
|
| 32 | 32 | |
| 33 | 33 | $iscompressed = file_exists(__FILE__.'.'.$encoding); |
| 34 | 34 | if($encoding != 'none' && $iscompressed == false) |
| 35 | 35 | { |
| 36 | - $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
|
| 37 | - $code = file_get_contents(__FILE__.'.none'); |
|
| 38 | - $contents = gzencode($code,9,$flag); |
|
| 36 | + $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
|
| 37 | + $code = file_get_contents(__FILE__.'.none'); |
|
| 38 | + $contents = gzencode($code,9,$flag); |
|
| 39 | 39 | }else{ |
| 40 | - //Get data |
|
| 41 | - $contents = file_get_contents(__FILE__.'.'.$encoding); |
|
| 40 | + //Get data |
|
| 41 | + $contents = file_get_contents(__FILE__.'.'.$encoding); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | // first check if we have to send 304 |
@@ -51,35 +51,35 @@ discard block |
||
| 51 | 51 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 52 | 52 | |
| 53 | 53 | if (($modTimeMatch)||($eTagMatch)) { |
| 54 | - header('HTTP/1.1 304 Not Modified'); |
|
| 55 | - header('Connection: close'); |
|
| 54 | + header('HTTP/1.1 304 Not Modified'); |
|
| 55 | + header('Connection: close'); |
|
| 56 | 56 | } else { |
| 57 | - // send all sorts of headers |
|
| 58 | - $expireTime=60*60*24*355; // 1y max according to RFC |
|
| 59 | - if ($encoding != 'none') { |
|
| 60 | - header('Content-Encoding: '.$encoding); |
|
| 61 | - } |
|
| 62 | - header('Vary: Accept-Encoding'); |
|
| 63 | - header('Content-Length: '.strlen($contents)); |
|
| 64 | - header('Content-type: %%CONTENT%%; charset=utf-8'); |
|
| 65 | - header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
|
| 66 | - header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
|
| 67 | - header('ETag: ' . $eTag); |
|
| 68 | - header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
|
| 57 | + // send all sorts of headers |
|
| 58 | + $expireTime=60*60*24*355; // 1y max according to RFC |
|
| 59 | + if ($encoding != 'none') { |
|
| 60 | + header('Content-Encoding: '.$encoding); |
|
| 61 | + } |
|
| 62 | + header('Vary: Accept-Encoding'); |
|
| 63 | + header('Content-Length: '.strlen($contents)); |
|
| 64 | + header('Content-type: %%CONTENT%%; charset=utf-8'); |
|
| 65 | + header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
|
| 66 | + header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
|
| 67 | + header('ETag: ' . $eTag); |
|
| 68 | + header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
|
| 69 | 69 | |
| 70 | - // send output |
|
| 71 | - echo $contents; |
|
| 70 | + // send output |
|
| 71 | + echo $contents; |
|
| 72 | 72 | |
| 73 | - //And write to filesystem cache if not done yet |
|
| 74 | - if($encoding != 'none' && $iscompressed == false) |
|
| 75 | - { |
|
| 76 | - //Write the content we sent |
|
| 77 | - file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
| 73 | + //And write to filesystem cache if not done yet |
|
| 74 | + if($encoding != 'none' && $iscompressed == false) |
|
| 75 | + { |
|
| 76 | + //Write the content we sent |
|
| 77 | + file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
| 78 | 78 | |
| 79 | - //And write the new content |
|
| 80 | - $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
|
| 81 | - $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
|
| 82 | - $contents = gzencode($code,9,$flag); |
|
| 83 | - file_put_contents(__FILE__.'.'.$ext,$contents); |
|
| 84 | - } |
|
| 79 | + //And write the new content |
|
| 80 | + $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
|
| 81 | + $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
|
| 82 | + $contents = gzencode($code,9,$flag); |
|
| 83 | + file_put_contents(__FILE__.'.'.$ext,$contents); |
|
| 84 | + } |
|
| 85 | 85 | } |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php exit; |
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 4 | +if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
| 6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 6 | +if (!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 7 | 7 | $_SERVER['HTTP_USER_AGENT'] = ''; |
| 8 | 8 | |
| 9 | 9 | // Determine supported compression method |
@@ -27,16 +27,16 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 30 | +if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 31 | 31 | $encoding = 'none'; |
| 32 | 32 | |
| 33 | 33 | $iscompressed = file_exists(__FILE__.'.'.$encoding); |
| 34 | -if($encoding != 'none' && $iscompressed == false) |
|
| 34 | +if ($encoding != 'none' && $iscompressed == false) |
|
| 35 | 35 | { |
| 36 | 36 | $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
| 37 | 37 | $code = file_get_contents(__FILE__.'.none'); |
| 38 | - $contents = gzencode($code,9,$flag); |
|
| 39 | -}else{ |
|
| 38 | + $contents = gzencode($code, 9, $flag); |
|
| 39 | +} else { |
|
| 40 | 40 | //Get data |
| 41 | 41 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
| 42 | 42 | } |
@@ -44,18 +44,18 @@ discard block |
||
| 44 | 44 | // first check if we have to send 304 |
| 45 | 45 | // inspired by http://www.jonasjohn.de/snippets/php/caching.htm |
| 46 | 46 | |
| 47 | -$eTag=md5($contents); |
|
| 48 | -$modTime=filemtime(__FILE__.'.none'); |
|
| 47 | +$eTag = md5($contents); |
|
| 48 | +$modTime = filemtime(__FILE__.'.none'); |
|
| 49 | 49 | |
| 50 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); |
|
| 50 | +$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag)); |
|
| 51 | 51 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 52 | 52 | |
| 53 | -if (($modTimeMatch)||($eTagMatch)) { |
|
| 53 | +if (($modTimeMatch) || ($eTagMatch)) { |
|
| 54 | 54 | header('HTTP/1.1 304 Not Modified'); |
| 55 | 55 | header('Connection: close'); |
| 56 | 56 | } else { |
| 57 | 57 | // send all sorts of headers |
| 58 | - $expireTime=60*60*24*355; // 1y max according to RFC |
|
| 58 | + $expireTime = 60*60*24*355; // 1y max according to RFC |
|
| 59 | 59 | if ($encoding != 'none') { |
| 60 | 60 | header('Content-Encoding: '.$encoding); |
| 61 | 61 | } |
@@ -64,22 +64,22 @@ discard block |
||
| 64 | 64 | header('Content-type: %%CONTENT%%; charset=utf-8'); |
| 65 | 65 | header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
| 66 | 66 | header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
| 67 | - header('ETag: ' . $eTag); |
|
| 67 | + header('ETag: '.$eTag); |
|
| 68 | 68 | header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
| 69 | 69 | |
| 70 | 70 | // send output |
| 71 | 71 | echo $contents; |
| 72 | 72 | |
| 73 | 73 | //And write to filesystem cache if not done yet |
| 74 | - if($encoding != 'none' && $iscompressed == false) |
|
| 74 | + if ($encoding != 'none' && $iscompressed == false) |
|
| 75 | 75 | { |
| 76 | 76 | //Write the content we sent |
| 77 | - file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
| 77 | + file_put_contents(__FILE__.'.'.$encoding, $contents); |
|
| 78 | 78 | |
| 79 | 79 | //And write the new content |
| 80 | 80 | $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
| 81 | 81 | $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
| 82 | - $contents = gzencode($code,9,$flag); |
|
| 83 | - file_put_contents(__FILE__.'.'.$ext,$contents); |
|
| 82 | + $contents = gzencode($code, 9, $flag); |
|
| 83 | + file_put_contents(__FILE__.'.'.$ext, $contents); |
|
| 84 | 84 | } |
| 85 | 85 | } |
@@ -4,45 +4,45 @@ discard block |
||
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | 6 | $majorUp = false; |
| 7 | -$autoptimize_major_version=substr($autoptimize_db_version,0,3); |
|
| 7 | +$autoptimize_major_version = substr($autoptimize_db_version, 0, 3); |
|
| 8 | 8 | |
| 9 | -switch($autoptimize_major_version) { |
|
| 9 | +switch ($autoptimize_major_version) { |
|
| 10 | 10 | case "1.6": |
| 11 | 11 | // from back in the days when I did not yet consider multisite |
| 12 | 12 | // if user was on version 1.6.x, force advanced options to be shown by default |
| 13 | - update_option('autoptimize_show_adv','1'); |
|
| 13 | + update_option('autoptimize_show_adv', '1'); |
|
| 14 | 14 | |
| 15 | 15 | // and remove old options |
| 16 | - $to_delete_options=array("autoptimize_cdn_css","autoptimize_cdn_css_url","autoptimize_cdn_js","autoptimize_cdn_js_url","autoptimize_cdn_img","autoptimize_cdn_img_url","autoptimize_css_yui","autoptimize_js_yui"); |
|
| 16 | + $to_delete_options = array("autoptimize_cdn_css", "autoptimize_cdn_css_url", "autoptimize_cdn_js", "autoptimize_cdn_js_url", "autoptimize_cdn_img", "autoptimize_cdn_img_url", "autoptimize_css_yui", "autoptimize_js_yui"); |
|
| 17 | 17 | foreach ($to_delete_options as $del_opt) { |
| 18 | - delete_option( $del_opt ); |
|
| 18 | + delete_option($del_opt); |
|
| 19 | 19 | } |
| 20 | 20 | $majorUp = true; |
| 21 | 21 | case "1.7": |
| 22 | 22 | // force 3.8 dashicons in CSS exclude options when upgrading from 1.7 to 1.8 |
| 23 | - if ( !is_multisite() ) { |
|
| 23 | + if (!is_multisite()) { |
|
| 24 | 24 | $css_exclude = get_option('autoptimize_css_exclude'); |
| 25 | 25 | if (empty($css_exclude)) { |
| 26 | 26 | $css_exclude = "admin-bar.min.css, dashicons.min.css"; |
| 27 | - } else if (strpos($css_exclude,"dashicons.min.css")===false) { |
|
| 27 | + } else if (strpos($css_exclude, "dashicons.min.css") === false) { |
|
| 28 | 28 | $css_exclude .= ", dashicons.min.css"; |
| 29 | 29 | } |
| 30 | - update_option('autoptimize_css_exclude',$css_exclude); |
|
| 30 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 31 | 31 | } else { |
| 32 | 32 | global $wpdb; |
| 33 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 33 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 34 | 34 | $original_blog_id = get_current_blog_id(); |
| 35 | - foreach ( $blog_ids as $blog_id ) { |
|
| 36 | - switch_to_blog( $blog_id ); |
|
| 35 | + foreach ($blog_ids as $blog_id) { |
|
| 36 | + switch_to_blog($blog_id); |
|
| 37 | 37 | $css_exclude = get_option('autoptimize_css_exclude'); |
| 38 | 38 | if (empty($css_exclude)) { |
| 39 | 39 | $css_exclude = "admin-bar.min.css, dashicons.min.css"; |
| 40 | - } else if (strpos($css_exclude,"dashicons.min.css")===false) { |
|
| 40 | + } else if (strpos($css_exclude, "dashicons.min.css") === false) { |
|
| 41 | 41 | $css_exclude .= ", dashicons.min.css"; |
| 42 | 42 | } |
| 43 | - update_option('autoptimize_css_exclude',$css_exclude); |
|
| 43 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 44 | 44 | } |
| 45 | - switch_to_blog( $original_blog_id ); |
|
| 45 | + switch_to_blog($original_blog_id); |
|
| 46 | 46 | } |
| 47 | 47 | $majorUp = true; |
| 48 | 48 | case "1.9": |
@@ -50,24 +50,24 @@ discard block |
||
| 50 | 50 | * 2.0 will not aggregate inline CSS/JS by default, but we want users |
| 51 | 51 | * upgrading from 1.9 to keep their inline code aggregated by default. |
| 52 | 52 | */ |
| 53 | - if ( !is_multisite() ) { |
|
| 54 | - update_option('autoptimize_css_include_inline','on'); |
|
| 55 | - update_option('autoptimize_js_include_inline','on'); |
|
| 53 | + if (!is_multisite()) { |
|
| 54 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 55 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 56 | 56 | } else { |
| 57 | 57 | global $wpdb; |
| 58 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 58 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 59 | 59 | $original_blog_id = get_current_blog_id(); |
| 60 | - foreach ( $blog_ids as $blog_id ) { |
|
| 61 | - switch_to_blog( $blog_id ); |
|
| 62 | - update_option('autoptimize_css_include_inline','on'); |
|
| 63 | - update_option('autoptimize_js_include_inline','on'); |
|
| 60 | + foreach ($blog_ids as $blog_id) { |
|
| 61 | + switch_to_blog($blog_id); |
|
| 62 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 63 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 64 | 64 | } |
| 65 | - switch_to_blog( $original_blog_id ); |
|
| 65 | + switch_to_blog($original_blog_id); |
|
| 66 | 66 | } |
| 67 | 67 | $majorUp = true; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | -if ( $majorUp === true ) { |
|
| 70 | +if ($majorUp === true) { |
|
| 71 | 71 | // clear cache and notify user to check result if major upgrade |
| 72 | 72 | autoptimizeCache::clearall(); |
| 73 | 73 | add_action('admin_notices', 'autoptimize_update_config_notice'); |
@@ -3,52 +3,52 @@ |
||
| 3 | 3 | // hyper cache and gator cache hook into AO, so we don't need to :-) |
| 4 | 4 | |
| 5 | 5 | function autoptimize_flush_pagecache() { |
| 6 | - if(function_exists('wp_cache_clear_cache')) { |
|
| 6 | + if (function_exists('wp_cache_clear_cache')) { |
|
| 7 | 7 | if (is_multisite()) { |
| 8 | 8 | $blog_id = get_current_blog_id(); |
| 9 | 9 | wp_cache_clear_cache($blog_id); |
| 10 | 10 | } else { |
| 11 | 11 | wp_cache_clear_cache(); |
| 12 | 12 | } |
| 13 | - } else if ( has_action('cachify_flush_cache') ) { |
|
| 13 | + } else if (has_action('cachify_flush_cache')) { |
|
| 14 | 14 | do_action('cachify_flush_cache'); |
| 15 | - } else if ( function_exists('w3tc_pgcache_flush') ) { |
|
| 15 | + } else if (function_exists('w3tc_pgcache_flush')) { |
|
| 16 | 16 | w3tc_pgcache_flush(); |
| 17 | - } else if ( function_exists('wp_fast_cache_bulk_delete_all') ) { |
|
| 17 | + } else if (function_exists('wp_fast_cache_bulk_delete_all')) { |
|
| 18 | 18 | wp_fast_cache_bulk_delete_all(); // still to retest |
| 19 | 19 | } else if (class_exists("WpFastestCache")) { |
| 20 | 20 | $wpfc = new WpFastestCache(); |
| 21 | 21 | $wpfc -> deleteCache(); |
| 22 | - } else if ( class_exists("c_ws_plugin__qcache_purging_routines") ) { |
|
| 22 | + } else if (class_exists("c_ws_plugin__qcache_purging_routines")) { |
|
| 23 | 23 | c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache, still to retest |
| 24 | - } else if ( class_exists("zencache") ) { |
|
| 24 | + } else if (class_exists("zencache")) { |
|
| 25 | 25 | zencache::clear(); |
| 26 | - } else if ( class_exists("comet_cache") ) { |
|
| 26 | + } else if (class_exists("comet_cache")) { |
|
| 27 | 27 | comet_cache::clear(); |
| 28 | - } else if ( class_exists("WpeCommon") ) { |
|
| 29 | - if ( apply_filters('autoptimize_flush_wpengine_aggressive', false) ) { |
|
| 30 | - if ( method_exists( "WpeCommon", "purge_memcached" ) ) { |
|
| 28 | + } else if (class_exists("WpeCommon")) { |
|
| 29 | + if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) { |
|
| 30 | + if (method_exists("WpeCommon", "purge_memcached")) { |
|
| 31 | 31 | WpeCommon::purge_memcached(); |
| 32 | 32 | } |
| 33 | - if ( method_exists( "WpeCommon", "clear_maxcdn_cache" ) ) { |
|
| 33 | + if (method_exists("WpeCommon", "clear_maxcdn_cache")) { |
|
| 34 | 34 | WpeCommon::clear_maxcdn_cache(); |
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | - if ( method_exists( "WpeCommon", "purge_varnish_cache" ) ) { |
|
| 37 | + if (method_exists("WpeCommon", "purge_varnish_cache")) { |
|
| 38 | 38 | WpeCommon::purge_varnish_cache(); |
| 39 | 39 | } |
| 40 | - } else if ( function_exists('sg_cachepress_purge_cache') ) { |
|
| 40 | + } else if (function_exists('sg_cachepress_purge_cache')) { |
|
| 41 | 41 | sg_cachepress_purge_cache(); |
| 42 | - } else if(file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')){ |
|
| 42 | + } else if (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) { |
|
| 43 | 43 | // fallback for WP-Super-Cache |
| 44 | 44 | global $cache_path; |
| 45 | 45 | if (is_multisite()) { |
| 46 | 46 | $blog_id = get_current_blog_id(); |
| 47 | - prune_super_cache( get_supercache_dir( $blog_id ), true ); |
|
| 48 | - prune_super_cache( $cache_path . 'blogs/', true ); |
|
| 47 | + prune_super_cache(get_supercache_dir($blog_id), true); |
|
| 48 | + prune_super_cache($cache_path.'blogs/', true); |
|
| 49 | 49 | } else { |
| 50 | - prune_super_cache($cache_path.'supercache/',true); |
|
| 51 | - prune_super_cache($cache_path,true); |
|
| 50 | + prune_super_cache($cache_path.'supercache/', true); |
|
| 51 | + prune_super_cache($cache_path, true); |
|
| 52 | 52 | } |
| 53 | 53 | } |
| 54 | 54 | } |
| 55 | 55 | \ No newline at end of file |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | /* |
| 5 | 5 | * cachechecker code |
@@ -13,39 +13,39 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | if (is_admin()) { |
| 16 | - add_action('plugins_loaded','ao_cachechecker_setup'); |
|
| 16 | + add_action('plugins_loaded', 'ao_cachechecker_setup'); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | function ao_cachechecker_setup() { |
| 20 | - $doCacheCheck = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true); |
|
| 21 | - $cacheCheckSchedule = wp_get_schedule( 'ao_cachechecker' ); |
|
| 22 | - $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency','daily'); |
|
| 23 | - if (!in_array($AOCCfreq,array('hourly','daily','monthly'))) { |
|
| 24 | - $AOCCfreq='daily'; |
|
| 20 | + $doCacheCheck = (bool) apply_filters('autoptimize_filter_cachecheck_do', true); |
|
| 21 | + $cacheCheckSchedule = wp_get_schedule('ao_cachechecker'); |
|
| 22 | + $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency', 'daily'); |
|
| 23 | + if (!in_array($AOCCfreq, array('hourly', 'daily', 'monthly'))) { |
|
| 24 | + $AOCCfreq = 'daily'; |
|
| 25 | 25 | } |
| 26 | - if ( $doCacheCheck && ( !$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq ) ) { |
|
| 26 | + if ($doCacheCheck && (!$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq)) { |
|
| 27 | 27 | wp_schedule_event(time(), $AOCCfreq, 'ao_cachechecker'); |
| 28 | - } else if ( $cacheCheckSchedule && !$doCacheCheck ) { |
|
| 29 | - wp_clear_scheduled_hook( 'ao_cachechecker' ); |
|
| 28 | + } else if ($cacheCheckSchedule && !$doCacheCheck) { |
|
| 29 | + wp_clear_scheduled_hook('ao_cachechecker'); |
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | add_action('ao_cachechecker', 'ao_cachechecker_cronjob'); |
| 34 | 34 | function ao_cachechecker_cronjob() { |
| 35 | - $maxSize = (int) apply_filters( "autoptimize_filter_cachecheck_maxsize", 512000); |
|
| 36 | - $doCacheCheck = (bool) apply_filters( "autoptimize_filter_cachecheck_do", true); |
|
| 37 | - $statArr=autoptimizeCache::stats(); |
|
| 38 | - $cacheSize=round($statArr[1]/1024); |
|
| 39 | - if (($cacheSize>$maxSize) && ($doCacheCheck)) { |
|
| 40 | - update_option("autoptimize_cachesize_notice",true); |
|
| 41 | - if (apply_filters('autoptimize_filter_cachecheck_sendmail',true)) { |
|
| 42 | - $saniSiteUrl=esc_url(site_url()); |
|
| 43 | - $ao_mailto=apply_filters('autoptimize_filter_cachecheck_mailto',get_option('admin_email','')); |
|
| 44 | - $ao_mailsubject=__('Autoptimize cache size warning','autoptimize')." (".$saniSiteUrl.")"; |
|
| 45 | - $ao_mailbody=__('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")"; |
|
| 35 | + $maxSize = (int) apply_filters("autoptimize_filter_cachecheck_maxsize", 512000); |
|
| 36 | + $doCacheCheck = (bool) apply_filters("autoptimize_filter_cachecheck_do", true); |
|
| 37 | + $statArr = autoptimizeCache::stats(); |
|
| 38 | + $cacheSize = round($statArr[1]/1024); |
|
| 39 | + if (($cacheSize > $maxSize) && ($doCacheCheck)) { |
|
| 40 | + update_option("autoptimize_cachesize_notice", true); |
|
| 41 | + if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) { |
|
| 42 | + $saniSiteUrl = esc_url(site_url()); |
|
| 43 | + $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', get_option('admin_email', '')); |
|
| 44 | + $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize')." (".$saniSiteUrl.")"; |
|
| 45 | + $ao_mailbody = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")"; |
|
| 46 | 46 | |
| 47 | 47 | if (!empty($ao_mailto)) { |
| 48 | - $ao_mailresult=wp_mail($ao_mailto,$ao_mailsubject,$ao_mailbody); |
|
| 48 | + $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody); |
|
| 49 | 49 | if (!$ao_mailresult) { |
| 50 | 50 | error_log("Autoptimize could not send cache size warning mail."); |
| 51 | 51 | } |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | add_action('admin_notices', 'autoptimize_cachechecker_notice'); |
| 58 | 58 | function autoptimize_cachechecker_notice() { |
| 59 | - if ((bool) get_option("autoptimize_cachesize_notice",false)) { |
|
| 59 | + if ((bool) get_option("autoptimize_cachesize_notice", false)) { |
|
| 60 | 60 | echo '<div class="notice notice-warning"><p>'; |
| 61 | - _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' ); |
|
| 61 | + _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize'); |
|
| 62 | 62 | echo '</p></div>'; |
| 63 | - update_option("autoptimize_cachesize_notice",false); |
|
| 63 | + update_option("autoptimize_cachesize_notice", false); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -273,12 +273,12 @@ discard block |
||
| 273 | 273 | return true; |
| 274 | 274 | } |
| 275 | 275 | |
| 276 | - // we have to check for a preceding keyword, and we don't need to pattern |
|
| 277 | - // match over the whole output. |
|
| 278 | - $recentOutput = substr($this->output, -10); |
|
| 276 | + // we have to check for a preceding keyword, and we don't need to pattern |
|
| 277 | + // match over the whole output. |
|
| 278 | + $recentOutput = substr($this->output, -10); |
|
| 279 | 279 | |
| 280 | - // check if return/typeof directly precede a pattern without a space |
|
| 281 | - foreach (array('return', 'typeof') as $keyword) {
|
|
| 280 | + // check if return/typeof directly precede a pattern without a space |
|
| 281 | + foreach (array('return', 'typeof') as $keyword) {
|
|
| 282 | 282 | if ($this->a !== substr($keyword, -1)) {
|
| 283 | 283 | // certainly wasn't keyword |
| 284 | 284 | continue; |
@@ -290,13 +290,13 @@ discard block |
||
| 290 | 290 | } |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | - // check all keywords |
|
| 294 | - if ($this->a === ' ' || $this->a === "\n") {
|
|
| 295 | - if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {
|
|
| 296 | - if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
|
|
| 297 | - return true; |
|
| 298 | - } |
|
| 299 | - } |
|
| 293 | + // check all keywords |
|
| 294 | + if ($this->a === ' ' || $this->a === "\n") {
|
|
| 295 | + if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {
|
|
| 296 | + if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
|
|
| 297 | + return true; |
|
| 298 | + } |
|
| 299 | + } |
|
| 300 | 300 | } |
| 301 | 301 | |
| 302 | 302 | return false; |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected $inputLength = 0; |
| 69 | 69 | protected $lookAhead = null; |
| 70 | 70 | protected $output = ''; |
| 71 | - protected $lastByteOut = ''; |
|
| 71 | + protected $lastByteOut = ''; |
|
| 72 | 72 | protected $keptComment = ''; |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $mbIntEnc = null; |
| 107 | - if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
|
|
| 107 | + if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {
|
|
| 108 | 108 | $mbIntEnc = mb_internal_encoding(); |
| 109 | 109 | mb_internal_encoding('8bit');
|
| 110 | 110 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | && ($this->b === $this->lastByteOut)) {
|
| 122 | 122 | // Don't delete this space. If we do, the addition/subtraction |
| 123 | 123 | // could be parsed as a post-increment |
| 124 | - } elseif (! $this->isAlphaNum($this->b)) {
|
|
| 124 | + } elseif (!$this->isAlphaNum($this->b)) {
|
|
| 125 | 125 | $command = self::ACTION_DELETE_A; |
| 126 | 126 | } |
| 127 | 127 | } elseif ($this->a === "\n") {
|
@@ -132,10 +132,10 @@ discard block |
||
| 132 | 132 | // otherwise mb_strpos will give WARNING |
| 133 | 133 | } elseif ($this->b === null |
| 134 | 134 | || (false === strpos('{[(+-!~', $this->b)
|
| 135 | - && ! $this->isAlphaNum($this->b))) {
|
|
| 135 | + && !$this->isAlphaNum($this->b))) {
|
|
| 136 | 136 | $command = self::ACTION_DELETE_A; |
| 137 | 137 | } |
| 138 | - } elseif (! $this->isAlphaNum($this->a)) {
|
|
| 138 | + } elseif (!$this->isAlphaNum($this->a)) {
|
|
| 139 | 139 | if ($this->b === ' ' |
| 140 | 140 | || ($this->b === "\n" |
| 141 | 141 | && (false === strpos('}])+-"\'', $this->a)))) {
|
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $this->a = $this->b; |
| 192 | 192 | if ($this->a === "'" || $this->a === '"') { // string literal
|
| 193 | 193 | $str = $this->a; // in case needed for exception |
| 194 | - for(;;) {
|
|
| 194 | + for (;;) {
|
|
| 195 | 195 | $this->output .= $this->a; |
| 196 | 196 | $this->lastByteOut = $this->a; |
| 197 | 197 | |
@@ -218,13 +218,13 @@ discard block |
||
| 218 | 218 | case self::ACTION_DELETE_A_B: // 3 |
| 219 | 219 | $this->b = $this->next(); |
| 220 | 220 | if ($this->b === '/' && $this->isRegexpLiteral()) {
|
| 221 | - $this->output .= $this->a . $this->b; |
|
| 221 | + $this->output .= $this->a.$this->b; |
|
| 222 | 222 | $pattern = '/'; // keep entire pattern in case we need to report it in the exception |
| 223 | - for(;;) {
|
|
| 223 | + for (;;) {
|
|
| 224 | 224 | $this->a = $this->get(); |
| 225 | 225 | $pattern .= $this->a; |
| 226 | 226 | if ($this->a === '[') {
|
| 227 | - for(;;) {
|
|
| 227 | + for (;;) {
|
|
| 228 | 228 | $this->output .= $this->a; |
| 229 | 229 | $this->a = $this->get(); |
| 230 | 230 | $pattern .= $this->a; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | if ($this->isEOF($this->a)) {
|
| 240 | 240 | throw new JSMin_UnterminatedRegExpException( |
| 241 | 241 | "JSMin: Unterminated set in RegExp at byte " |
| 242 | - . $this->inputIndex .": {$pattern}");
|
|
| 242 | + . $this->inputIndex.": {$pattern}");
|
|
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | // certainly wasn't keyword |
| 284 | 284 | continue; |
| 285 | 285 | } |
| 286 | - if (preg_match("~(^|[\\s\\S])" . substr($keyword, 0, -1) . "$~", $recentOutput, $m)) {
|
|
| 286 | + if (preg_match("~(^|[\\s\\S])".substr($keyword, 0, -1)."$~", $recentOutput, $m)) {
|
|
| 287 | 287 | if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
|
| 288 | 288 | return true; |
| 289 | 289 | } |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | {
|
| 393 | 393 | $this->get(); |
| 394 | 394 | $comment = ''; |
| 395 | - for(;;) {
|
|
| 395 | + for (;;) {
|
|
| 396 | 396 | $get = $this->get(); |
| 397 | 397 | if ($get === '*') {
|
| 398 | 398 | if ($this->peek() === '/') { // end of comment reached
|
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | // don't prepend a newline if two comments right after one another |
| 404 | 404 | $this->keptComment = "\n"; |
| 405 | 405 | } |
| 406 | - $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n"; |
|
| 406 | + $this->keptComment .= "/*!".substr($comment, 1)."*/\n"; |
|
| 407 | 407 | } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
|
| 408 | 408 | // IE conditional |
| 409 | 409 | $this->keptComment .= "/*{$comment}*/";
|
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected $inputLength = 0; |
| 69 | 69 | protected $lookAhead = null; |
| 70 | 70 | protected $output = ''; |
| 71 | - protected $lastByteOut = ''; |
|
| 71 | + protected $lastByteOut = ''; |
|
| 72 | 72 | protected $keptComment = ''; |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $mbIntEnc = null; |
| 107 | - if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) { |
|
| 107 | + if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) { |
|
| 108 | 108 | $mbIntEnc = mb_internal_encoding(); |
| 109 | 109 | mb_internal_encoding('8bit'); |
| 110 | 110 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | && ($this->b === $this->lastByteOut)) { |
| 127 | 127 | // Don't delete this space. If we do, the addition/subtraction |
| 128 | 128 | // could be parsed as a post-increment |
| 129 | - } elseif (! $this->isAlphaNum($this->b)) { |
|
| 129 | + } elseif (!$this->isAlphaNum($this->b)) { |
|
| 130 | 130 | $command = self::ACTION_DELETE_A; |
| 131 | 131 | } |
| 132 | 132 | } elseif ($this->a === "\n") { |
@@ -137,10 +137,10 @@ discard block |
||
| 137 | 137 | // otherwise mb_strpos will give WARNING |
| 138 | 138 | } elseif ($this->b === null |
| 139 | 139 | || (false === strpos('{[(+-!~', $this->b) |
| 140 | - && ! $this->isAlphaNum($this->b))) { |
|
| 140 | + && !$this->isAlphaNum($this->b))) { |
|
| 141 | 141 | $command = self::ACTION_DELETE_A; |
| 142 | 142 | } |
| 143 | - } elseif (! $this->isAlphaNum($this->a)) { |
|
| 143 | + } elseif (!$this->isAlphaNum($this->a)) { |
|
| 144 | 144 | if ($this->b === ' ' |
| 145 | 145 | || ($this->b === "\n" |
| 146 | 146 | && (false === strpos('}])+-"\'', $this->a)))) { |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | if ($this->a === "'" || $this->a === '"' || $this->a === '`') { // string/template literal |
| 198 | 198 | $delimiter = $this->a; |
| 199 | 199 | $str = $this->a; // in case needed for exception |
| 200 | - for(;;) { |
|
| 200 | + for (;;) { |
|
| 201 | 201 | $this->output .= $this->a; |
| 202 | 202 | $this->lastByteOut = $this->a; |
| 203 | 203 | $this->a = $this->get(); |
@@ -225,13 +225,13 @@ discard block |
||
| 225 | 225 | case self::ACTION_DELETE_A_B: // 3 |
| 226 | 226 | $this->b = $this->next(); |
| 227 | 227 | if ($this->b === '/' && $this->isRegexpLiteral()) { |
| 228 | - $this->output .= $this->a . $this->b; |
|
| 228 | + $this->output .= $this->a.$this->b; |
|
| 229 | 229 | $pattern = '/'; // keep entire pattern in case we need to report it in the exception |
| 230 | - for(;;) { |
|
| 230 | + for (;;) { |
|
| 231 | 231 | $this->a = $this->get(); |
| 232 | 232 | $pattern .= $this->a; |
| 233 | 233 | if ($this->a === '[') { |
| 234 | - for(;;) { |
|
| 234 | + for (;;) { |
|
| 235 | 235 | $this->output .= $this->a; |
| 236 | 236 | $this->a = $this->get(); |
| 237 | 237 | $pattern .= $this->a; |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | if ($this->isEOF($this->a)) { |
| 247 | 247 | throw new JSMin_UnterminatedRegExpException( |
| 248 | 248 | "JSMin: Unterminated set in RegExp at byte " |
| 249 | - . $this->inputIndex .": {$pattern}"); |
|
| 249 | + . $this->inputIndex.": {$pattern}"); |
|
| 250 | 250 | } |
| 251 | 251 | } |
| 252 | 252 | } |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | |
| 292 | 292 | // if the "/" follows a keyword, it must be a regexp, otherwise it's best to assume division |
| 293 | 293 | |
| 294 | - $subject = $this->output . trim($this->a); |
|
| 294 | + $subject = $this->output.trim($this->a); |
|
| 295 | 295 | if (!preg_match('/(?:case|else|in|return|typeof)$/', $subject, $m)) { |
| 296 | 296 | // not a keyword |
| 297 | 297 | return false; |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | { |
| 403 | 403 | $this->get(); |
| 404 | 404 | $comment = ''; |
| 405 | - for(;;) { |
|
| 405 | + for (;;) { |
|
| 406 | 406 | $get = $this->get(); |
| 407 | 407 | if ($get === '*') { |
| 408 | 408 | if ($this->peek() === '/') { // end of comment reached |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | // don't prepend a newline if two comments right after one another |
| 414 | 414 | $this->keptComment = "\n"; |
| 415 | 415 | } |
| 416 | - $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n"; |
|
| 416 | + $this->keptComment .= "/*!".substr($comment, 1)."*/\n"; |
|
| 417 | 417 | } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) { |
| 418 | 418 | // IE conditional |
| 419 | 419 | $this->keptComment .= "/*{$comment}*/"; |
@@ -46,62 +46,62 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | |
| 48 | 48 | class JSMin {
|
| 49 | - const ORD_LF = 10; |
|
| 50 | - const ORD_SPACE = 32; |
|
| 49 | + const ORD_LF = 10; |
|
| 50 | + const ORD_SPACE = 32; |
|
| 51 | 51 | |
| 52 | - protected $a = ''; |
|
| 53 | - protected $b = ''; |
|
| 54 | - protected $input = ''; |
|
| 55 | - protected $inputIndex = 0; |
|
| 56 | - protected $inputLength = 0; |
|
| 57 | - protected $lookAhead = null; |
|
| 58 | - protected $output = ''; |
|
| 52 | + protected $a = ''; |
|
| 53 | + protected $b = ''; |
|
| 54 | + protected $input = ''; |
|
| 55 | + protected $inputIndex = 0; |
|
| 56 | + protected $inputLength = 0; |
|
| 57 | + protected $lookAhead = null; |
|
| 58 | + protected $output = ''; |
|
| 59 | 59 | |
| 60 | - // -- Public Static Methods -------------------------------------------------- |
|
| 60 | + // -- Public Static Methods -------------------------------------------------- |
|
| 61 | 61 | |
| 62 | - public static function minify($js) {
|
|
| 62 | + public static function minify($js) {
|
|
| 63 | 63 | $jsmin = new JSMin($js); |
| 64 | 64 | return $jsmin->min(); |
| 65 | - } |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - // -- Public Instance Methods ------------------------------------------------ |
|
| 67 | + // -- Public Instance Methods ------------------------------------------------ |
|
| 68 | 68 | |
| 69 | - public function __construct($input) {
|
|
| 69 | + public function __construct($input) {
|
|
| 70 | 70 | $this->input = str_replace("\r\n", "\n", $input);
|
| 71 | 71 | $this->inputLength = strlen($this->input); |
| 72 | - } |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - // -- Protected Instance Methods --------------------------------------------- |
|
| 74 | + // -- Protected Instance Methods --------------------------------------------- |
|
| 75 | 75 | |
| 76 | - protected function action($d) {
|
|
| 76 | + protected function action($d) {
|
|
| 77 | 77 | switch($d) {
|
| 78 | - case 1: |
|
| 78 | + case 1: |
|
| 79 | 79 | $this->output .= $this->a; |
| 80 | 80 | |
| 81 | - case 2: |
|
| 81 | + case 2: |
|
| 82 | 82 | $this->a = $this->b; |
| 83 | 83 | |
| 84 | 84 | if ($this->a === "'" || $this->a === '"') {
|
| 85 | - for (;;) {
|
|
| 85 | + for (;;) {
|
|
| 86 | 86 | $this->output .= $this->a; |
| 87 | 87 | $this->a = $this->get(); |
| 88 | 88 | |
| 89 | 89 | if ($this->a === $this->b) {
|
| 90 | - break; |
|
| 90 | + break; |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | if (ord($this->a) <= self::ORD_LF) {
|
| 94 | - throw new JSMinException('Unterminated string literal.');
|
|
| 94 | + throw new JSMinException('Unterminated string literal.');
|
|
| 95 | 95 | } |
| 96 | 96 | |
| 97 | 97 | if ($this->a === '\\') {
|
| 98 | - $this->output .= $this->a; |
|
| 99 | - $this->a = $this->get(); |
|
| 98 | + $this->output .= $this->a; |
|
| 99 | + $this->a = $this->get(); |
|
| 100 | + } |
|
| 100 | 101 | } |
| 101 | - } |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | - case 3: |
|
| 104 | + case 3: |
|
| 105 | 105 | $this->b = $this->next(); |
| 106 | 106 | |
| 107 | 107 | if ($this->b === '/' && ( |
@@ -109,70 +109,70 @@ discard block |
||
| 109 | 109 | $this->a === ':' || $this->a === '[' || $this->a === '!' || |
| 110 | 110 | $this->a === '&' || $this->a === '|' || $this->a === '?')) {
|
| 111 | 111 | |
| 112 | - $this->output .= $this->a . $this->b; |
|
| 112 | + $this->output .= $this->a . $this->b; |
|
| 113 | 113 | |
| 114 | - for (;;) {
|
|
| 114 | + for (;;) {
|
|
| 115 | 115 | $this->a = $this->get(); |
| 116 | 116 | |
| 117 | 117 | if ($this->a === '/') {
|
| 118 | - break; |
|
| 118 | + break; |
|
| 119 | 119 | } elseif ($this->a === '\\') {
|
| 120 | - $this->output .= $this->a; |
|
| 121 | - $this->a = $this->get(); |
|
| 120 | + $this->output .= $this->a; |
|
| 121 | + $this->a = $this->get(); |
|
| 122 | 122 | } elseif (ord($this->a) <= self::ORD_LF) {
|
| 123 | - throw new JSMinException('Unterminated regular expression '.
|
|
| 124 | - 'literal.'); |
|
| 123 | + throw new JSMinException('Unterminated regular expression '.
|
|
| 124 | + 'literal.'); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | $this->output .= $this->a; |
| 128 | - } |
|
| 128 | + } |
|
| 129 | 129 | |
| 130 | - $this->b = $this->next(); |
|
| 130 | + $this->b = $this->next(); |
|
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | - } |
|
| 133 | + } |
|
| 134 | 134 | |
| 135 | - protected function get() {
|
|
| 135 | + protected function get() {
|
|
| 136 | 136 | $c = $this->lookAhead; |
| 137 | 137 | $this->lookAhead = null; |
| 138 | 138 | |
| 139 | 139 | if ($c === null) {
|
| 140 | - if ($this->inputIndex < $this->inputLength) {
|
|
| 140 | + if ($this->inputIndex < $this->inputLength) {
|
|
| 141 | 141 | $c = $this->input[$this->inputIndex]; |
| 142 | 142 | $this->inputIndex += 1; |
| 143 | - } else {
|
|
| 143 | + } else {
|
|
| 144 | 144 | $c = null; |
| 145 | - } |
|
| 145 | + } |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | if ($c === "\r") {
|
| 149 | - return "\n"; |
|
| 149 | + return "\n"; |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
|
| 153 | - return $c; |
|
| 153 | + return $c; |
|
| 154 | 154 | } |
| 155 | 155 | |
| 156 | 156 | return ' '; |
| 157 | - } |
|
| 157 | + } |
|
| 158 | 158 | |
| 159 | - protected function isAlphaNum($c) {
|
|
| 159 | + protected function isAlphaNum($c) {
|
|
| 160 | 160 | return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
|
| 161 | - } |
|
| 161 | + } |
|
| 162 | 162 | |
| 163 | - protected function min() {
|
|
| 163 | + protected function min() {
|
|
| 164 | 164 | $this->a = "\n"; |
| 165 | 165 | $this->action(3); |
| 166 | 166 | |
| 167 | 167 | while ($this->a !== null) {
|
| 168 | - switch ($this->a) {
|
|
| 168 | + switch ($this->a) {
|
|
| 169 | 169 | case ' ': |
| 170 | 170 | if ($this->isAlphaNum($this->b)) {
|
| 171 | 171 | $this->action(1); |
| 172 | - } else {
|
|
| 172 | + } else {
|
|
| 173 | 173 | $this->action(2); |
| 174 | - } |
|
| 175 | - break; |
|
| 174 | + } |
|
| 175 | + break; |
|
| 176 | 176 | |
| 177 | 177 | case "\n": |
| 178 | 178 | switch ($this->b) {
|
@@ -182,21 +182,21 @@ discard block |
||
| 182 | 182 | case '+': |
| 183 | 183 | case '-': |
| 184 | 184 | $this->action(1); |
| 185 | - break; |
|
| 185 | + break; |
|
| 186 | 186 | |
| 187 | 187 | case ' ': |
| 188 | 188 | $this->action(3); |
| 189 | - break; |
|
| 189 | + break; |
|
| 190 | 190 | |
| 191 | 191 | default: |
| 192 | 192 | if ($this->isAlphaNum($this->b)) {
|
| 193 | 193 | $this->action(1); |
| 194 | - } |
|
| 195 | - else {
|
|
| 194 | + } |
|
| 195 | + else {
|
|
| 196 | 196 | $this->action(2); |
| 197 | - } |
|
| 198 | - } |
|
| 199 | - break; |
|
| 197 | + } |
|
| 198 | + } |
|
| 199 | + break; |
|
| 200 | 200 | |
| 201 | 201 | default: |
| 202 | 202 | switch ($this->b) {
|
@@ -204,10 +204,10 @@ discard block |
||
| 204 | 204 | if ($this->isAlphaNum($this->a)) {
|
| 205 | 205 | $this->action(1); |
| 206 | 206 | break; |
| 207 | - } |
|
| 207 | + } |
|
| 208 | 208 | |
| 209 | - $this->action(3); |
|
| 210 | - break; |
|
| 209 | + $this->action(3); |
|
| 210 | + break; |
|
| 211 | 211 | |
| 212 | 212 | case "\n": |
| 213 | 213 | switch ($this->a) {
|
@@ -219,71 +219,71 @@ discard block |
||
| 219 | 219 | case '"': |
| 220 | 220 | case "'": |
| 221 | 221 | $this->action(1); |
| 222 | - break; |
|
| 222 | + break; |
|
| 223 | 223 | |
| 224 | 224 | default: |
| 225 | 225 | if ($this->isAlphaNum($this->a)) {
|
| 226 | 226 | $this->action(1); |
| 227 | - } |
|
| 228 | - else {
|
|
| 227 | + } |
|
| 228 | + else {
|
|
| 229 | 229 | $this->action(3); |
| 230 | - } |
|
| 231 | - } |
|
| 232 | - break; |
|
| 230 | + } |
|
| 231 | + } |
|
| 232 | + break; |
|
| 233 | 233 | |
| 234 | 234 | default: |
| 235 | 235 | $this->action(1); |
| 236 | - break; |
|
| 237 | - } |
|
| 238 | - } |
|
| 236 | + break; |
|
| 237 | + } |
|
| 238 | + } |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | return $this->output; |
| 242 | - } |
|
| 242 | + } |
|
| 243 | 243 | |
| 244 | - protected function next() {
|
|
| 244 | + protected function next() {
|
|
| 245 | 245 | $c = $this->get(); |
| 246 | 246 | |
| 247 | 247 | if ($c === '/') {
|
| 248 | - switch($this->peek()) {
|
|
| 248 | + switch($this->peek()) {
|
|
| 249 | 249 | case '/': |
| 250 | 250 | for (;;) {
|
| 251 | 251 | $c = $this->get(); |
| 252 | 252 | |
| 253 | 253 | if (ord($c) <= self::ORD_LF) {
|
| 254 | - return $c; |
|
| 254 | + return $c; |
|
| 255 | + } |
|
| 255 | 256 | } |
| 256 | - } |
|
| 257 | 257 | |
| 258 | 258 | case '*': |
| 259 | 259 | $this->get(); |
| 260 | 260 | |
| 261 | - for (;;) {
|
|
| 261 | + for (;;) {
|
|
| 262 | 262 | switch($this->get()) {
|
| 263 | - case '*': |
|
| 263 | + case '*': |
|
| 264 | 264 | if ($this->peek() === '/') {
|
| 265 | - $this->get(); |
|
| 266 | - return ' '; |
|
| 265 | + $this->get(); |
|
| 266 | + return ' '; |
|
| 267 | 267 | } |
| 268 | 268 | break; |
| 269 | 269 | |
| 270 | - case null: |
|
| 270 | + case null: |
|
| 271 | 271 | throw new JSMinException('Unterminated comment.');
|
| 272 | 272 | } |
| 273 | - } |
|
| 273 | + } |
|
| 274 | 274 | |
| 275 | 275 | default: |
| 276 | 276 | return $c; |
| 277 | - } |
|
| 277 | + } |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | return $c; |
| 281 | - } |
|
| 281 | + } |
|
| 282 | 282 | |
| 283 | - protected function peek() {
|
|
| 283 | + protected function peek() {
|
|
| 284 | 284 | $this->lookAhead = $this->get(); |
| 285 | 285 | return $this->lookAhead; |
| 286 | - } |
|
| 286 | + } |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | // -- Exceptions --------------------------------------------------------------- |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | // -- Protected Instance Methods --------------------------------------------- |
| 75 | 75 | |
| 76 | 76 | protected function action($d) {
|
| 77 | - switch($d) {
|
|
| 77 | + switch ($d) {
|
|
| 78 | 78 | case 1: |
| 79 | 79 | $this->output .= $this->a; |
| 80 | 80 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | $this->a === ':' || $this->a === '[' || $this->a === '!' || |
| 110 | 110 | $this->a === '&' || $this->a === '|' || $this->a === '?')) {
|
| 111 | 111 | |
| 112 | - $this->output .= $this->a . $this->b; |
|
| 112 | + $this->output .= $this->a.$this->b; |
|
| 113 | 113 | |
| 114 | 114 | for (;;) {
|
| 115 | 115 | $this->a = $this->get(); |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | $c = $this->get(); |
| 246 | 246 | |
| 247 | 247 | if ($c === '/') {
|
| 248 | - switch($this->peek()) {
|
|
| 248 | + switch ($this->peek()) {
|
|
| 249 | 249 | case '/': |
| 250 | 250 | for (;;) {
|
| 251 | 251 | $c = $this->get(); |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | $this->get(); |
| 260 | 260 | |
| 261 | 261 | for (;;) {
|
| 262 | - switch($this->get()) {
|
|
| 262 | + switch ($this->get()) {
|
|
| 263 | 263 | case '*': |
| 264 | 264 | if ($this->peek() === '/') {
|
| 265 | 265 | $this->get(); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | {
|
| 71 | 71 | $this->_html = str_replace("\r\n", "\n", trim($html));
|
| 72 | 72 | if (isset($options['xhtml'])) {
|
| 73 | - $this->_isXhtml = (bool)$options['xhtml']; |
|
| 73 | + $this->_isXhtml = (bool) $options['xhtml']; |
|
| 74 | 74 | } |
| 75 | 75 | if (isset($options['cssMinifier'])) {
|
| 76 | 76 | $this->_cssMinifier = $options['cssMinifier']; |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $this->_jsMinifier = $options['jsMinifier']; |
| 80 | 80 | } |
| 81 | 81 | if (isset($options['jsCleanComments'])) {
|
| 82 | - $this->_jsCleanComments = (bool)$options['jsCleanComments']; |
|
| 82 | + $this->_jsCleanComments = (bool) $options['jsCleanComments']; |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML')); |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']); |
|
| 98 | + $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']); |
|
| 99 | 99 | $this->_placeholders = array(); |
| 100 | 100 | |
| 101 | 101 | // replace SCRIPTs (and minify) with placeholders |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | |
| 172 | 172 | protected function _reservePlace($content) |
| 173 | 173 | {
|
| 174 | - $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%'; |
|
| 174 | + $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%'; |
|
| 175 | 175 | $this->_placeholders[$placeholder] = $content; |
| 176 | 176 | return $placeholder; |
| 177 | 177 | } |
