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,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 |
@@ -52,36 +52,36 @@ discard block |
||
| 52 | 52 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 53 | 53 | |
| 54 | 54 | if (($modTimeMatch)||($eTagMatch)) { |
| 55 | - header('HTTP/1.1 304 Not Modified'); |
|
| 56 | - header('Connection: close'); |
|
| 55 | + header('HTTP/1.1 304 Not Modified'); |
|
| 56 | + header('Connection: close'); |
|
| 57 | 57 | } else { |
| 58 | - // send all sorts of headers |
|
| 59 | - $expireTime=60*60*24*355; // 1y max according to RFC |
|
| 60 | - if ($encoding != 'none') { |
|
| 61 | - header('Content-Encoding: '.$encoding); |
|
| 62 | - } |
|
| 63 | - header('Vary: Accept-Encoding'); |
|
| 64 | - header('Content-Length: '.strlen($contents)); |
|
| 65 | - header('Content-type: %%CONTENT%%; charset=utf-8'); |
|
| 66 | - header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
|
| 67 | - header('Cache-Control: max-age='.$expireTime.', public, immutable'); |
|
| 68 | - header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
|
| 69 | - header('ETag: ' . $eTag); |
|
| 70 | - header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
|
| 58 | + // send all sorts of headers |
|
| 59 | + $expireTime=60*60*24*355; // 1y max according to RFC |
|
| 60 | + if ($encoding != 'none') { |
|
| 61 | + header('Content-Encoding: '.$encoding); |
|
| 62 | + } |
|
| 63 | + header('Vary: Accept-Encoding'); |
|
| 64 | + header('Content-Length: '.strlen($contents)); |
|
| 65 | + header('Content-type: %%CONTENT%%; charset=utf-8'); |
|
| 66 | + header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
|
| 67 | + header('Cache-Control: max-age='.$expireTime.', public, immutable'); |
|
| 68 | + header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
|
| 69 | + header('ETag: ' . $eTag); |
|
| 70 | + header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
|
| 71 | 71 | |
| 72 | - // send output |
|
| 73 | - echo $contents; |
|
| 72 | + // send output |
|
| 73 | + echo $contents; |
|
| 74 | 74 | |
| 75 | - //And write to filesystem cache if not done yet |
|
| 76 | - if($encoding != 'none' && $iscompressed == false) |
|
| 77 | - { |
|
| 78 | - //Write the content we sent |
|
| 79 | - file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
| 75 | + //And write to filesystem cache if not done yet |
|
| 76 | + if($encoding != 'none' && $iscompressed == false) |
|
| 77 | + { |
|
| 78 | + //Write the content we sent |
|
| 79 | + file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
| 80 | 80 | |
| 81 | - //And write the new content |
|
| 82 | - $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
|
| 83 | - $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
|
| 84 | - $contents = gzencode($code,9,$flag); |
|
| 85 | - file_put_contents(__FILE__.'.'.$ext,$contents); |
|
| 86 | - } |
|
| 81 | + //And write the new content |
|
| 82 | + $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
|
| 83 | + $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
|
| 84 | + $contents = gzencode($code,9,$flag); |
|
| 85 | + file_put_contents(__FILE__.'.'.$ext,$contents); |
|
| 86 | + } |
|
| 87 | 87 | } |
@@ -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,19 +44,19 @@ 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 | 50 | date_default_timezone_set("UTC"); |
| 51 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); |
|
| 51 | +$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag)); |
|
| 52 | 52 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 53 | 53 | |
| 54 | -if (($modTimeMatch)||($eTagMatch)) { |
|
| 54 | +if (($modTimeMatch) || ($eTagMatch)) { |
|
| 55 | 55 | header('HTTP/1.1 304 Not Modified'); |
| 56 | 56 | header('Connection: close'); |
| 57 | 57 | } else { |
| 58 | 58 | // send all sorts of headers |
| 59 | - $expireTime=60*60*24*355; // 1y max according to RFC |
|
| 59 | + $expireTime = 60*60*24*355; // 1y max according to RFC |
|
| 60 | 60 | if ($encoding != 'none') { |
| 61 | 61 | header('Content-Encoding: '.$encoding); |
| 62 | 62 | } |
@@ -66,22 +66,22 @@ discard block |
||
| 66 | 66 | header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
| 67 | 67 | header('Cache-Control: max-age='.$expireTime.', public, immutable'); |
| 68 | 68 | header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
| 69 | - header('ETag: ' . $eTag); |
|
| 69 | + header('ETag: '.$eTag); |
|
| 70 | 70 | header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
| 71 | 71 | |
| 72 | 72 | // send output |
| 73 | 73 | echo $contents; |
| 74 | 74 | |
| 75 | 75 | //And write to filesystem cache if not done yet |
| 76 | - if($encoding != 'none' && $iscompressed == false) |
|
| 76 | + if ($encoding != 'none' && $iscompressed == false) |
|
| 77 | 77 | { |
| 78 | 78 | //Write the content we sent |
| 79 | - file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
| 79 | + file_put_contents(__FILE__.'.'.$encoding, $contents); |
|
| 80 | 80 | |
| 81 | 81 | //And write the new content |
| 82 | 82 | $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
| 83 | 83 | $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
| 84 | - $contents = gzencode($code,9,$flag); |
|
| 85 | - file_put_contents(__FILE__.'.'.$ext,$contents); |
|
| 84 | + $contents = gzencode($code, 9, $flag); |
|
| 85 | + file_put_contents(__FILE__.'.'.$ext, $contents); |
|
| 86 | 86 | } |
| 87 | 87 | } |
@@ -38,18 +38,18 @@ discard block |
||
| 38 | 38 | $l = floatval(str_replace('%', '', $hslValues[2])); |
| 39 | 39 | |
| 40 | 40 | // Wrap and clamp, then fraction! |
| 41 | - $h = ((($h % 360) + 360) % 360) / 360; |
|
| 42 | - $s = self::clampNumber($s, 0, 100) / 100; |
|
| 43 | - $l = self::clampNumber($l, 0, 100) / 100; |
|
| 41 | + $h = ((($h%360) + 360)%360)/360; |
|
| 42 | + $s = self::clampNumber($s, 0, 100)/100; |
|
| 43 | + $l = self::clampNumber($l, 0, 100)/100; |
|
| 44 | 44 | |
| 45 | 45 | if ($s == 0) { |
| 46 | - $r = $g = $b = self::roundNumber(255 * $l); |
|
| 46 | + $r = $g = $b = self::roundNumber(255*$l); |
|
| 47 | 47 | } else { |
| 48 | - $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l); |
|
| 49 | - $v1 = (2 * $l) - $v2; |
|
| 50 | - $r = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h + (1/3))); |
|
| 51 | - $g = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h)); |
|
| 52 | - $b = self::roundNumber(255 * self::hueToRgb($v1, $v2, $h - (1/3))); |
|
| 48 | + $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l); |
|
| 49 | + $v1 = (2*$l) - $v2; |
|
| 50 | + $r = self::roundNumber(255*self::hueToRgb($v1, $v2, $h + (1/3))); |
|
| 51 | + $g = self::roundNumber(255*self::hueToRgb($v1, $v2, $h)); |
|
| 52 | + $b = self::roundNumber(255*self::hueToRgb($v1, $v2, $h - (1/3))); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | return array($r, $g, $b); |
@@ -66,16 +66,16 @@ discard block |
||
| 66 | 66 | { |
| 67 | 67 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
| 68 | 68 | |
| 69 | - if ($vh * 6 < 1) { |
|
| 70 | - return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 69 | + if ($vh*6 < 1) { |
|
| 70 | + return $v1 + ($v2 - $v1)*6*$vh; |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - if ($vh * 2 < 1) { |
|
| 73 | + if ($vh*2 < 1) { |
|
| 74 | 74 | return $v2; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - if ($vh * 3 < 2) { |
|
| 78 | - return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6; |
|
| 77 | + if ($vh*3 < 2) { |
|
| 78 | + return $v1 + ($v2 - $v1)*((2/3) - $vh)*6; |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | return $v1; |
@@ -94,13 +94,13 @@ discard block |
||
| 94 | 94 | switch ($letter) { |
| 95 | 95 | case 'M': |
| 96 | 96 | case 'm': |
| 97 | - return (int) $size * 1048576; |
|
| 97 | + return (int) $size*1048576; |
|
| 98 | 98 | case 'K': |
| 99 | 99 | case 'k': |
| 100 | - return (int) $size * 1024; |
|
| 100 | + return (int) $size*1024; |
|
| 101 | 101 | case 'G': |
| 102 | 102 | case 'g': |
| 103 | - return (int) $size * 1073741824; |
|
| 103 | + return (int) $size*1073741824; |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | return (int) $size; |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | public static function rgbPercentageToRgbInteger($rgbPercentage) |
| 115 | 115 | { |
| 116 | 116 | if (strpos($rgbPercentage, '%') !== false) { |
| 117 | - $rgbPercentage = self::roundNumber(floatval(str_replace('%', '', $rgbPercentage)) * 2.55); |
|
| 117 | + $rgbPercentage = self::roundNumber(floatval(str_replace('%', '', $rgbPercentage))*2.55); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | return intval($rgbPercentage, 10); |
@@ -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']; |
@@ -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 |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | ,$this->_html); |
| 112 | 112 | |
| 113 | 113 | // remove HTML comments (not containing IE conditional comments). |
| 114 | - if ($this->_keepComments == false) { |
|
| 114 | + if ($this->_keepComments == false) { |
|
| 115 | 115 | $this->_html = preg_replace_callback( |
| 116 | 116 | '/<!--([\\s\\S]*?)-->/' |
| 117 | 117 | ,array($this, '_commentCB') |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | protected function _reservePlace($content) |
| 175 | 175 | { |
| 176 | - $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%'; |
|
| 176 | + $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%'; |
|
| 177 | 177 | $this->_placeholders[$placeholder] = $content; |
| 178 | 178 | return $placeholder; |
| 179 | 179 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | protected function _outsideTagCB($m) |
| 189 | 189 | { |
| 190 | - return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<'; |
|
| 190 | + return '>'.preg_replace('/^\\s+|\\s+$/', ' ', $m[1]).'<'; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | protected function _removePreCB($m) |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | protected function _removeCdata($str) |
| 260 | 260 | { |
| 261 | 261 | return (false !== strpos($str, '<![CDATA[')) |
| 262 | - ? str_replace(array('/* <![CDATA[ */','/* ]]> */','/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str) |
|
| 262 | + ? str_replace(array('/* <![CDATA[ */', '/* ]]> */', '/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str) |
|
| 263 | 263 | : $str; |
| 264 | 264 | } |
| 265 | 265 | |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Handles minifying HTML markup. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -27,19 +27,19 @@ discard block |
||
| 27 | 27 | '<!--/noindex-->', |
| 28 | 28 | ); |
| 29 | 29 | |
| 30 | - public function read( $options ) |
|
| 30 | + public function read($options) |
|
| 31 | 31 | { |
| 32 | 32 | // Remove the HTML comments? |
| 33 | 33 | $this->keepcomments = (bool) $options['keepcomments']; |
| 34 | 34 | |
| 35 | 35 | // Filter to force xhtml. |
| 36 | - $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false ); |
|
| 36 | + $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false); |
|
| 37 | 37 | |
| 38 | 38 | // Filterable strings to be excluded from HTML minification. |
| 39 | - $exclude = apply_filters( 'autoptimize_filter_html_exclude', '' ); |
|
| 40 | - if ( '' !== $exclude ) { |
|
| 41 | - $exclude_arr = array_filter( array_map( 'trim', explode( ',', $exclude ) ) ); |
|
| 42 | - $this->exclude = array_merge( $exclude_arr, $this->exclude ); |
|
| 39 | + $exclude = apply_filters('autoptimize_filter_html_exclude', ''); |
|
| 40 | + if ('' !== $exclude) { |
|
| 41 | + $exclude_arr = array_filter(array_map('trim', explode(',', $exclude))); |
|
| 42 | + $this->exclude = array_merge($exclude_arr, $this->exclude); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | // Nothing else for HTML! |
@@ -53,49 +53,49 @@ discard block |
||
| 53 | 53 | */ |
| 54 | 54 | public function minify() |
| 55 | 55 | { |
| 56 | - $noptimize = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content ); |
|
| 57 | - if ( $noptimize ) { |
|
| 56 | + $noptimize = apply_filters('autoptimize_filter_html_noptimize', false, $this->content); |
|
| 57 | + if ($noptimize) { |
|
| 58 | 58 | return false; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | // Wrap the to-be-excluded strings in noptimize tags. |
| 62 | - foreach ( $this->exclude as $str ) { |
|
| 63 | - if ( false !== strpos( $this->content, $str ) ) { |
|
| 64 | - $replacement = '<!--noptimize-->' . $str . '<!--/noptimize-->'; |
|
| 65 | - $this->content = str_replace( $str, $replacement, $this->content ); |
|
| 62 | + foreach ($this->exclude as $str) { |
|
| 63 | + if (false !== strpos($this->content, $str)) { |
|
| 64 | + $replacement = '<!--noptimize-->'.$str.'<!--/noptimize-->'; |
|
| 65 | + $this->content = str_replace($str, $replacement, $this->content); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | // Noptimize. |
| 70 | - $this->content = $this->hide_noptimize( $this->content ); |
|
| 70 | + $this->content = $this->hide_noptimize($this->content); |
|
| 71 | 71 | |
| 72 | 72 | // Preparing options for Minify_HTML. |
| 73 | - $options = array( 'keepComments' => $this->keepcomments ); |
|
| 74 | - if ( $this->forcexhtml ) { |
|
| 73 | + $options = array('keepComments' => $this->keepcomments); |
|
| 74 | + if ($this->forcexhtml) { |
|
| 75 | 75 | $options['xhtml'] = true; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - $tmp_content = Minify_HTML::minify( $this->content, $options ); |
|
| 79 | - if ( ! empty( $tmp_content ) ) { |
|
| 78 | + $tmp_content = Minify_HTML::minify($this->content, $options); |
|
| 79 | + if (!empty($tmp_content)) { |
|
| 80 | 80 | $this->content = $tmp_content; |
| 81 | - unset( $tmp_content ); |
|
| 81 | + unset($tmp_content); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | // Restore noptimize. |
| 85 | - $this->content = $this->restore_noptimize( $this->content ); |
|
| 85 | + $this->content = $this->restore_noptimize($this->content); |
|
| 86 | 86 | |
| 87 | 87 | // Remove the noptimize-wrapper from around the excluded strings. |
| 88 | - foreach ( $this->exclude as $str ) { |
|
| 89 | - $replacement = '<!--noptimize-->' . $str . '<!--/noptimize-->'; |
|
| 90 | - if ( false !== strpos( $this->content, $replacement ) ) { |
|
| 91 | - $this->content = str_replace( $replacement, $str, $this->content ); |
|
| 88 | + foreach ($this->exclude as $str) { |
|
| 89 | + $replacement = '<!--noptimize-->'.$str.'<!--/noptimize-->'; |
|
| 90 | + if (false !== strpos($this->content, $replacement)) { |
|
| 91 | + $this->content = str_replace($replacement, $str, $this->content); |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | // Revslider data attribs somehow suffer from HTML optimization, this fixes that! |
| 96 | - if ( class_exists( 'RevSlider' ) && apply_filters( 'autoptimize_filter_html_dataattrib_cleanup', false ) ) { |
|
| 97 | - $this->content = preg_replace( '#\n(data-.*$)\n#Um', ' $1 ', $this->content ); |
|
| 98 | - $this->content = preg_replace( '#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content ); |
|
| 96 | + if (class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false)) { |
|
| 97 | + $this->content = preg_replace('#\n(data-.*$)\n#Um', ' $1 ', $this->content); |
|
| 98 | + $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | return true; |
@@ -3,12 +3,12 @@ discard block |
||
| 3 | 3 | * WP-CLI commands for Autoptimize. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
| 10 | 10 | // This is a WP-CLI command, so bail if it's not available. |
| 11 | -if ( ! defined( 'WP_CLI' ) ) { |
|
| 11 | +if (!defined('WP_CLI')) { |
|
| 12 | 12 | return; |
| 13 | 13 | } |
| 14 | 14 | |
@@ -24,11 +24,11 @@ discard block |
||
| 24 | 24 | * |
| 25 | 25 | * @return void |
| 26 | 26 | */ |
| 27 | - public function clear( $args, $args_assoc ) { |
|
| 28 | - WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) ); |
|
| 27 | + public function clear($args, $args_assoc) { |
|
| 28 | + WP_CLI::line(esc_html__('Flushing the cache...', 'autoptimize')); |
|
| 29 | 29 | autoptimizeCache::clearall(); |
| 30 | - WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) ); |
|
| 30 | + WP_CLI::success(esc_html__('Cache flushed.', 'autoptimize')); |
|
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | -WP_CLI::add_command( 'autoptimize', 'autoptimizeCLI' ); |
|
| 34 | +WP_CLI::add_command('autoptimize', 'autoptimizeCLI'); |
|
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Thin wrapper around css minifiers to avoid rewriting a bunch of existing code. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -21,9 +21,9 @@ discard block |
||
| 21 | 21 | * |
| 22 | 22 | * @param bool $raise_limits Whether to raise memory limits or not. Default true. |
| 23 | 23 | */ |
| 24 | - public function __construct( $raise_limits = true ) |
|
| 24 | + public function __construct($raise_limits = true) |
|
| 25 | 25 | { |
| 26 | - $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier( $raise_limits ); |
|
| 26 | + $this->minifier = new Autoptimize\tubalmartin\CssMin\Minifier($raise_limits); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |
@@ -34,9 +34,9 @@ discard block |
||
| 34 | 34 | * |
| 35 | 35 | * @return string |
| 36 | 36 | */ |
| 37 | - public function run( $css ) |
|
| 37 | + public function run($css) |
|
| 38 | 38 | { |
| 39 | - $result = $this->minifier->run( $css ); |
|
| 39 | + $result = $this->minifier->run($css); |
|
| 40 | 40 | |
| 41 | 41 | return $result; |
| 42 | 42 | } |
@@ -48,10 +48,10 @@ discard block |
||
| 48 | 48 | * |
| 49 | 49 | * @return string |
| 50 | 50 | */ |
| 51 | - public static function minify( $css ) |
|
| 51 | + public static function minify($css) |
|
| 52 | 52 | { |
| 53 | 53 | $minifier = new self(); |
| 54 | 54 | |
| 55 | - return $minifier->run( $css ); |
|
| 55 | + return $minifier->run($css); |
|
| 56 | 56 | } |
| 57 | 57 | } |
@@ -412,7 +412,7 @@ |
||
| 412 | 412 | * First element is the filepath, second is the md5 hash of contents |
| 413 | 413 | * the filepath had when it was being processed. |
| 414 | 414 | * If we don't have those, we'll bail out early. |
| 415 | - */ |
|
| 415 | + */ |
|
| 416 | 416 | $filepath = null; |
| 417 | 417 | $filehash = null; |
| 418 | 418 | |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | * Base class other (more-specific) classes inherit from. |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 6 | +if (!defined('ABSPATH')) { |
|
| 7 | 7 | exit; |
| 8 | 8 | } |
| 9 | 9 | |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public $cdn_url = ''; |
| 32 | 32 | |
| 33 | - public function __construct( $content ) |
|
| 33 | + public function __construct($content) |
|
| 34 | 34 | { |
| 35 | 35 | $this->content = $content; |
| 36 | 36 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | * |
| 43 | 43 | * @return bool |
| 44 | 44 | */ |
| 45 | - abstract public function read( $options ); |
|
| 45 | + abstract public function read($options); |
|
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | 48 | * Joins and optimizes collected things. |
@@ -73,40 +73,40 @@ discard block |
||
| 73 | 73 | * |
| 74 | 74 | * @return bool|string |
| 75 | 75 | */ |
| 76 | - public function getpath( $url ) |
|
| 76 | + public function getpath($url) |
|
| 77 | 77 | { |
| 78 | - $url = apply_filters( 'autoptimize_filter_cssjs_alter_url', $url ); |
|
| 78 | + $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url); |
|
| 79 | 79 | |
| 80 | - if ( false !== strpos( $url, '%' ) ) { |
|
| 81 | - $url = urldecode( $url ); |
|
| 80 | + if (false !== strpos($url, '%')) { |
|
| 81 | + $url = urldecode($url); |
|
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - $site_host = parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ); |
|
| 85 | - $content_host = parse_url( AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST ); |
|
| 84 | + $site_host = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST); |
|
| 85 | + $content_host = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST); |
|
| 86 | 86 | |
| 87 | 87 | // Normalizing attempts... |
| 88 | - $double_slash_position = strpos( $url, '//' ); |
|
| 89 | - if ( 0 === $double_slash_position ) { |
|
| 90 | - if ( is_ssl() ) { |
|
| 91 | - $url = 'https:' . $url; |
|
| 88 | + $double_slash_position = strpos($url, '//'); |
|
| 89 | + if (0 === $double_slash_position) { |
|
| 90 | + if (is_ssl()) { |
|
| 91 | + $url = 'https:'.$url; |
|
| 92 | 92 | } else { |
| 93 | - $url = 'http:' . $url; |
|
| 93 | + $url = 'http:'.$url; |
|
| 94 | 94 | } |
| 95 | - } elseif ( ( false === $double_slash_position ) && ( false === strpos( $url, $site_host ) ) ) { |
|
| 96 | - if ( AUTOPTIMIZE_WP_SITE_URL === $site_host ) { |
|
| 97 | - $url = AUTOPTIMIZE_WP_SITE_URL . $url; |
|
| 95 | + } elseif ((false === $double_slash_position) && (false === strpos($url, $site_host))) { |
|
| 96 | + if (AUTOPTIMIZE_WP_SITE_URL === $site_host) { |
|
| 97 | + $url = AUTOPTIMIZE_WP_SITE_URL.$url; |
|
| 98 | 98 | } else { |
| 99 | - $url = AUTOPTIMIZE_WP_SITE_URL . autoptimizeUtils::path_canonicalize( $url ); |
|
| 99 | + $url = AUTOPTIMIZE_WP_SITE_URL.autoptimizeUtils::path_canonicalize($url); |
|
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - if ( $site_host !== $content_host ) { |
|
| 104 | - $url = str_replace( AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL . AUTOPTIMIZE_WP_CONTENT_NAME, $url ); |
|
| 103 | + if ($site_host !== $content_host) { |
|
| 104 | + $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | // First check; hostname wp site should be hostname of url! |
| 108 | - $url_host = @parse_url( $url, PHP_URL_HOST ); // @codingStandardsIgnoreLine |
|
| 109 | - if ( $url_host !== $site_host ) { |
|
| 108 | + $url_host = @parse_url($url, PHP_URL_HOST); // @codingStandardsIgnoreLine |
|
| 109 | + if ($url_host !== $site_host) { |
|
| 110 | 110 | /** |
| 111 | 111 | * First try to get all domains from WPML (if available) |
| 112 | 112 | * then explicitely declare $this->cdn_url as OK as well |
@@ -115,20 +115,20 @@ discard block |
||
| 115 | 115 | */ |
| 116 | 116 | $multidomains = array(); |
| 117 | 117 | |
| 118 | - $multidomains_wpml = apply_filters( 'wpml_setting', array(), 'language_domains' ); |
|
| 119 | - if ( ! empty( $multidomains_wpml ) ) { |
|
| 120 | - $multidomains = array_map( array( $this, 'get_url_hostname' ), $multidomains_wpml ); |
|
| 118 | + $multidomains_wpml = apply_filters('wpml_setting', array(), 'language_domains'); |
|
| 119 | + if (!empty($multidomains_wpml)) { |
|
| 120 | + $multidomains = array_map(array($this, 'get_url_hostname'), $multidomains_wpml); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - if ( ! empty( $this->cdn_url ) ) { |
|
| 124 | - $multidomains[] = parse_url( $this->cdn_url, PHP_URL_HOST ); |
|
| 123 | + if (!empty($this->cdn_url)) { |
|
| 124 | + $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - $multidomains = apply_filters( 'autoptimize_filter_cssjs_multidomain', $multidomains ); |
|
| 127 | + $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains); |
|
| 128 | 128 | |
| 129 | - if ( ! empty( $multidomains ) ) { |
|
| 130 | - if ( in_array( $url_host, $multidomains ) ) { |
|
| 131 | - $url = str_replace( $url_host, $site_host, $url ); |
|
| 129 | + if (!empty($multidomains)) { |
|
| 130 | + if (in_array($url_host, $multidomains)) { |
|
| 131 | + $url = str_replace($url_host, $site_host, $url); |
|
| 132 | 132 | } else { |
| 133 | 133 | return false; |
| 134 | 134 | } |
@@ -138,28 +138,28 @@ discard block |
||
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | // Try to remove "wp root url" from url while not minding http<>https. |
| 141 | - $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL ); |
|
| 141 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL); |
|
| 142 | 142 | |
| 143 | - if ( $site_host !== $content_host ) { |
|
| 143 | + if ($site_host !== $content_host) { |
|
| 144 | 144 | // As we replaced the content-domain with the site-domain, we should match against that. |
| 145 | - $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_SITE_URL ); |
|
| 145 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - $tmp_url = preg_replace( '/https?:/', '', $url ); |
|
| 149 | - $path = str_replace( $tmp_ao_root, '', $tmp_url ); |
|
| 148 | + $tmp_url = preg_replace('/https?:/', '', $url); |
|
| 149 | + $path = str_replace($tmp_ao_root, '', $tmp_url); |
|
| 150 | 150 | |
| 151 | 151 | // If path starts with :// or //, this is not a URL in the WP context and |
| 152 | 152 | // we have to assume we can't aggregate. |
| 153 | - if ( preg_match( '#^:?//#', $path ) ) { |
|
| 153 | + if (preg_match('#^:?//#', $path)) { |
|
| 154 | 154 | // External script/css (adsense, etc). |
| 155 | 155 | return false; |
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | // Prepend with WP_ROOT_DIR to have full path to file. |
| 159 | - $path = str_replace( '//', '/', WP_ROOT_DIR . $path ); |
|
| 159 | + $path = str_replace('//', '/', WP_ROOT_DIR.$path); |
|
| 160 | 160 | |
| 161 | 161 | // Final check: does file exist and is it readable? |
| 162 | - if ( file_exists( $path ) && is_file( $path ) && is_readable( $path ) ) { |
|
| 162 | + if (file_exists($path) && is_file($path) && is_readable($path)) { |
|
| 163 | 163 | return $path; |
| 164 | 164 | } else { |
| 165 | 165 | return false; |
@@ -176,18 +176,18 @@ discard block |
||
| 176 | 176 | * |
| 177 | 177 | * @return string |
| 178 | 178 | */ |
| 179 | - protected function get_url_hostname( $url ) |
|
| 179 | + protected function get_url_hostname($url) |
|
| 180 | 180 | { |
| 181 | 181 | // Checking that the url starts with something vaguely resembling a protocol. |
| 182 | - if ( ( 0 !== strpos( $url, 'http' ) ) && ( 0 !== strpos( $url, '//' ) ) ) { |
|
| 183 | - $url = 'http://' . $url; |
|
| 182 | + if ((0 !== strpos($url, 'http')) && (0 !== strpos($url, '//'))) { |
|
| 183 | + $url = 'http://'.$url; |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | // Grab the hostname. |
| 187 | - $hostname = parse_url( $url, PHP_URL_HOST ); |
|
| 187 | + $hostname = parse_url($url, PHP_URL_HOST); |
|
| 188 | 188 | |
| 189 | 189 | // Fallback when parse_url() fails. |
| 190 | - if ( empty( $hostname ) ) { |
|
| 190 | + if (empty($hostname)) { |
|
| 191 | 191 | $hostname = $url; |
| 192 | 192 | } |
| 193 | 193 | |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | * |
| 202 | 202 | * @return string |
| 203 | 203 | */ |
| 204 | - protected function hide_noptimize( $markup ) |
|
| 204 | + protected function hide_noptimize($markup) |
|
| 205 | 205 | { |
| 206 | 206 | return $this->replace_contents_with_marker_if_exists( |
| 207 | 207 | 'NOPTIMIZE', |
@@ -218,9 +218,9 @@ discard block |
||
| 218 | 218 | * |
| 219 | 219 | * @return string |
| 220 | 220 | */ |
| 221 | - protected function restore_noptimize( $markup ) |
|
| 221 | + protected function restore_noptimize($markup) |
|
| 222 | 222 | { |
| 223 | - return $this->restore_marked_content( 'NOPTIMIZE', $markup ); |
|
| 223 | + return $this->restore_marked_content('NOPTIMIZE', $markup); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | /** |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | * |
| 231 | 231 | * @return string |
| 232 | 232 | */ |
| 233 | - protected function hide_iehacks( $markup ) |
|
| 233 | + protected function hide_iehacks($markup) |
|
| 234 | 234 | { |
| 235 | 235 | return $this->replace_contents_with_marker_if_exists( |
| 236 | 236 | 'IEHACK', // Marker name... |
@@ -247,9 +247,9 @@ discard block |
||
| 247 | 247 | * |
| 248 | 248 | * @return string |
| 249 | 249 | */ |
| 250 | - protected function restore_iehacks( $markup ) |
|
| 250 | + protected function restore_iehacks($markup) |
|
| 251 | 251 | { |
| 252 | - return $this->restore_marked_content( 'IEHACK', $markup ); |
|
| 252 | + return $this->restore_marked_content('IEHACK', $markup); |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | 255 | /** |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | * |
| 262 | 262 | * @return string |
| 263 | 263 | */ |
| 264 | - protected function hide_comments( $markup ) |
|
| 264 | + protected function hide_comments($markup) |
|
| 265 | 265 | { |
| 266 | 266 | return $this->replace_contents_with_marker_if_exists( |
| 267 | 267 | 'COMMENTS', |
@@ -279,9 +279,9 @@ discard block |
||
| 279 | 279 | * |
| 280 | 280 | * @return string |
| 281 | 281 | */ |
| 282 | - protected function restore_comments( $markup ) |
|
| 282 | + protected function restore_comments($markup) |
|
| 283 | 283 | { |
| 284 | - return $this->restore_marked_content( 'COMMENTS', $markup ); |
|
| 284 | + return $this->restore_marked_content('COMMENTS', $markup); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | /** |
@@ -292,44 +292,44 @@ discard block |
||
| 292 | 292 | * |
| 293 | 293 | * @return string |
| 294 | 294 | */ |
| 295 | - public function url_replace_cdn( $url ) |
|
| 295 | + public function url_replace_cdn($url) |
|
| 296 | 296 | { |
| 297 | 297 | // For 2.3 back-compat in which cdn-ing appeared to be automatically |
| 298 | 298 | // including WP subfolder/subdirectory into account as part of cdn-ing, |
| 299 | 299 | // even though it might've caused serious troubles in certain edge-cases. |
| 300 | - $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed( $this->cdn_url ); |
|
| 300 | + $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed($this->cdn_url); |
|
| 301 | 301 | |
| 302 | 302 | // Allows API/filter to further tweak the cdn url... |
| 303 | - $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $cdn_url ); |
|
| 304 | - if ( ! empty( $cdn_url ) ) { |
|
| 305 | - $this->debug_log( 'before=' . $url ); |
|
| 303 | + $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $cdn_url); |
|
| 304 | + if (!empty($cdn_url)) { |
|
| 305 | + $this->debug_log('before='.$url); |
|
| 306 | 306 | |
| 307 | 307 | // Simple str_replace-based approach fails when $url is protocol-or-host-relative. |
| 308 | - $is_protocol_relative = autoptimizeUtils::is_protocol_relative( $url ); |
|
| 309 | - $is_host_relative = ( ! $is_protocol_relative && ( '/' === $url[0] ) ); |
|
| 310 | - $cdn_url = rtrim( $cdn_url, '/' ); |
|
| 308 | + $is_protocol_relative = autoptimizeUtils::is_protocol_relative($url); |
|
| 309 | + $is_host_relative = (!$is_protocol_relative && ('/' === $url[0])); |
|
| 310 | + $cdn_url = rtrim($cdn_url, '/'); |
|
| 311 | 311 | |
| 312 | - if ( $is_host_relative ) { |
|
| 312 | + if ($is_host_relative) { |
|
| 313 | 313 | // Prepending host-relative urls with the cdn url. |
| 314 | - $url = $cdn_url . $url; |
|
| 314 | + $url = $cdn_url.$url; |
|
| 315 | 315 | } else { |
| 316 | 316 | // Either a protocol-relative or "regular" url, replacing it either way. |
| 317 | - if ( $is_protocol_relative ) { |
|
| 317 | + if ($is_protocol_relative) { |
|
| 318 | 318 | // Massage $site_url so that simple str_replace() still "works" by |
| 319 | 319 | // searching for the protocol-relative version of AUTOPTIMIZE_WP_SITE_URL. |
| 320 | - $site_url = str_replace( array( 'http:', 'https:' ), '', AUTOPTIMIZE_WP_SITE_URL ); |
|
| 320 | + $site_url = str_replace(array('http:', 'https:'), '', AUTOPTIMIZE_WP_SITE_URL); |
|
| 321 | 321 | } else { |
| 322 | 322 | $site_url = AUTOPTIMIZE_WP_SITE_URL; |
| 323 | 323 | } |
| 324 | - $this->debug_log( '`' . $site_url . '` -> `' . $cdn_url . '` in `' . $url . '`' ); |
|
| 325 | - $url = str_replace( $site_url, $cdn_url, $url ); |
|
| 324 | + $this->debug_log('`'.$site_url.'` -> `'.$cdn_url.'` in `'.$url.'`'); |
|
| 325 | + $url = str_replace($site_url, $cdn_url, $url); |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | - $this->debug_log( 'after=' . $url ); |
|
| 328 | + $this->debug_log('after='.$url); |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | // Allow API filter to take further care of CDN replacement. |
| 332 | - $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url ); |
|
| 332 | + $url = apply_filters('autoptimize_filter_base_replace_cdn', $url); |
|
| 333 | 333 | |
| 334 | 334 | return $url; |
| 335 | 335 | } |
@@ -347,18 +347,18 @@ discard block |
||
| 347 | 347 | * |
| 348 | 348 | * @return void |
| 349 | 349 | */ |
| 350 | - protected function inject_in_html( $payload, $where ) |
|
| 350 | + protected function inject_in_html($payload, $where) |
|
| 351 | 351 | { |
| 352 | 352 | $warned = false; |
| 353 | - $position = autoptimizeUtils::strpos( $this->content, $where[0] ); |
|
| 354 | - if ( false !== $position ) { |
|
| 353 | + $position = autoptimizeUtils::strpos($this->content, $where[0]); |
|
| 354 | + if (false !== $position) { |
|
| 355 | 355 | // Found the tag, setup content/injection as specified. |
| 356 | - if ( 'after' === $where[1] ) { |
|
| 357 | - $content = $where[0] . $payload; |
|
| 358 | - } elseif ( 'replace' === $where[1] ) { |
|
| 356 | + if ('after' === $where[1]) { |
|
| 357 | + $content = $where[0].$payload; |
|
| 358 | + } elseif ('replace' === $where[1]) { |
|
| 359 | 359 | $content = $payload; |
| 360 | 360 | } else { |
| 361 | - $content = $payload . $where[0]; |
|
| 361 | + $content = $payload.$where[0]; |
|
| 362 | 362 | } |
| 363 | 363 | // Place where specified. |
| 364 | 364 | $this->content = autoptimizeUtils::substr_replace( |
@@ -367,14 +367,14 @@ discard block |
||
| 367 | 367 | $position, |
| 368 | 368 | // Using plain strlen() should be safe here for now, since |
| 369 | 369 | // we're not searching for multibyte chars here still... |
| 370 | - strlen( $where[0] ) |
|
| 370 | + strlen($where[0]) |
|
| 371 | 371 | ); |
| 372 | 372 | } else { |
| 373 | 373 | // Couldn't find what was specified, just append and add a warning. |
| 374 | 374 | $this->content .= $payload; |
| 375 | - if ( ! $warned ) { |
|
| 376 | - $tag_display = str_replace( array( '<', '>' ), '', $where[0] ); |
|
| 377 | - $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `' . $tag_display . '` missing --><!--/noptimize-->'; |
|
| 375 | + if (!$warned) { |
|
| 376 | + $tag_display = str_replace(array('<', '>'), '', $where[0]); |
|
| 377 | + $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `'.$tag_display.'` missing --><!--/noptimize-->'; |
|
| 378 | 378 | $warned = true; |
| 379 | 379 | } |
| 380 | 380 | } |
@@ -388,10 +388,10 @@ discard block |
||
| 388 | 388 | * |
| 389 | 389 | * @return bool |
| 390 | 390 | */ |
| 391 | - protected function isremovable( $tag, $removables ) |
|
| 391 | + protected function isremovable($tag, $removables) |
|
| 392 | 392 | { |
| 393 | - foreach ( $removables as $match ) { |
|
| 394 | - if ( false !== strpos( $tag, $match ) ) { |
|
| 393 | + foreach ($removables as $match) { |
|
| 394 | + if (false !== strpos($tag, $match)) { |
|
| 395 | 395 | return true; |
| 396 | 396 | } |
| 397 | 397 | } |
@@ -406,10 +406,10 @@ discard block |
||
| 406 | 406 | * |
| 407 | 407 | * @return string |
| 408 | 408 | */ |
| 409 | - public function inject_minified_callback( $matches ) |
|
| 409 | + public function inject_minified_callback($matches) |
|
| 410 | 410 | { |
| 411 | 411 | static $conf = null; |
| 412 | - if ( null === $conf ) { |
|
| 412 | + if (null === $conf) { |
|
| 413 | 413 | $conf = autoptimizeConfig::instance(); |
| 414 | 414 | } |
| 415 | 415 | |
@@ -424,62 +424,62 @@ discard block |
||
| 424 | 424 | $filehash = null; |
| 425 | 425 | |
| 426 | 426 | // Grab the parts we need. |
| 427 | - $parts = explode( '|', $matches[1] ); |
|
| 428 | - if ( ! empty( $parts ) ) { |
|
| 429 | - $filepath = isset( $parts[0] ) ? base64_decode( $parts[0] ) : null; |
|
| 430 | - $filehash = isset( $parts[1] ) ? $parts[1] : null; |
|
| 427 | + $parts = explode('|', $matches[1]); |
|
| 428 | + if (!empty($parts)) { |
|
| 429 | + $filepath = isset($parts[0]) ? base64_decode($parts[0]) : null; |
|
| 430 | + $filehash = isset($parts[1]) ? $parts[1] : null; |
|
| 431 | 431 | } |
| 432 | 432 | |
| 433 | 433 | // Bail early if something's not right... |
| 434 | - if ( ! $filepath || ! $filehash ) { |
|
| 434 | + if (!$filepath || !$filehash) { |
|
| 435 | 435 | return "\n"; |
| 436 | 436 | } |
| 437 | 437 | |
| 438 | - $filecontent = file_get_contents( $filepath ); |
|
| 438 | + $filecontent = file_get_contents($filepath); |
|
| 439 | 439 | |
| 440 | 440 | // Some things are differently handled for css/js... |
| 441 | - $is_js_file = ( '.js' === substr( $filepath, -3, 3 ) ); |
|
| 441 | + $is_js_file = ('.js' === substr($filepath, -3, 3)); |
|
| 442 | 442 | |
| 443 | 443 | $is_css_file = false; |
| 444 | - if ( ! $is_js_file ) { |
|
| 445 | - $is_css_file = ( '.css' === substr( $filepath, -4, 4 ) ); |
|
| 444 | + if (!$is_js_file) { |
|
| 445 | + $is_css_file = ('.css' === substr($filepath, -4, 4)); |
|
| 446 | 446 | } |
| 447 | 447 | |
| 448 | 448 | // BOMs being nuked here unconditionally (regardless of where they are)! |
| 449 | - $filecontent = preg_replace( "#\x{EF}\x{BB}\x{BF}#", '', $filecontent ); |
|
| 449 | + $filecontent = preg_replace("#\x{EF}\x{BB}\x{BF}#", '', $filecontent); |
|
| 450 | 450 | |
| 451 | 451 | // Remove comments and blank lines. |
| 452 | - if ( $is_js_file ) { |
|
| 453 | - $filecontent = preg_replace( '#^\s*\/\/.*$#Um', '', $filecontent ); |
|
| 452 | + if ($is_js_file) { |
|
| 453 | + $filecontent = preg_replace('#^\s*\/\/.*$#Um', '', $filecontent); |
|
| 454 | 454 | } |
| 455 | 455 | |
| 456 | 456 | // Nuke un-important comments. |
| 457 | - $filecontent = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent ); |
|
| 457 | + $filecontent = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent); |
|
| 458 | 458 | |
| 459 | 459 | // Normalize newlines. |
| 460 | - $filecontent = preg_replace( '#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent ); |
|
| 460 | + $filecontent = preg_replace('#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent); |
|
| 461 | 461 | |
| 462 | 462 | // JS specifics. |
| 463 | - if ( $is_js_file ) { |
|
| 463 | + if ($is_js_file) { |
|
| 464 | 464 | // Append a semicolon at the end of js files if it's missing. |
| 465 | - $last_char = substr( $filecontent, -1, 1 ); |
|
| 466 | - if ( ';' !== $last_char && '}' !== $last_char ) { |
|
| 465 | + $last_char = substr($filecontent, -1, 1); |
|
| 466 | + if (';' !== $last_char && '}' !== $last_char) { |
|
| 467 | 467 | $filecontent .= ';'; |
| 468 | 468 | } |
| 469 | 469 | // Check if try/catch should be used. |
| 470 | - $opt_js_try_catch = $conf->get( 'autoptimize_js_trycatch' ); |
|
| 471 | - if ( 'on' === $opt_js_try_catch ) { |
|
| 470 | + $opt_js_try_catch = $conf->get('autoptimize_js_trycatch'); |
|
| 471 | + if ('on' === $opt_js_try_catch) { |
|
| 472 | 472 | // It should, wrap in try/catch. |
| 473 | - $filecontent = 'try{' . $filecontent . '}catch(e){}'; |
|
| 473 | + $filecontent = 'try{'.$filecontent.'}catch(e){}'; |
|
| 474 | 474 | } |
| 475 | - } elseif ( $is_css_file ) { |
|
| 476 | - $filecontent = autoptimizeStyles::fixurls( $filepath, $filecontent ); |
|
| 475 | + } elseif ($is_css_file) { |
|
| 476 | + $filecontent = autoptimizeStyles::fixurls($filepath, $filecontent); |
|
| 477 | 477 | } else { |
| 478 | 478 | $filecontent = ''; |
| 479 | 479 | } |
| 480 | 480 | |
| 481 | 481 | // Return modified (or empty!) code/content. |
| 482 | - return "\n" . $filecontent; |
|
| 482 | + return "\n".$filecontent; |
|
| 483 | 483 | } |
| 484 | 484 | |
| 485 | 485 | /** |
@@ -489,13 +489,13 @@ discard block |
||
| 489 | 489 | * |
| 490 | 490 | * @return string |
| 491 | 491 | */ |
| 492 | - protected function inject_minified( $in ) |
|
| 492 | + protected function inject_minified($in) |
|
| 493 | 493 | { |
| 494 | 494 | $out = $in; |
| 495 | - if ( false !== strpos( $in, '%%INJECTLATER%%' ) ) { |
|
| 495 | + if (false !== strpos($in, '%%INJECTLATER%%')) { |
|
| 496 | 496 | $out = preg_replace_callback( |
| 497 | - '#\/\*\!%%INJECTLATER' . AUTOPTIMIZE_HASH . '%%(.*?)%%INJECTLATER%%\*\/#is', |
|
| 498 | - array( $this, 'inject_minified_callback' ), |
|
| 497 | + '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is', |
|
| 498 | + array($this, 'inject_minified_callback'), |
|
| 499 | 499 | $in |
| 500 | 500 | ); |
| 501 | 501 | } |
@@ -515,9 +515,9 @@ discard block |
||
| 515 | 515 | * |
| 516 | 516 | * @return string |
| 517 | 517 | */ |
| 518 | - public static function build_injectlater_marker( $filepath, $hash ) |
|
| 518 | + public static function build_injectlater_marker($filepath, $hash) |
|
| 519 | 519 | { |
| 520 | - $contents = '/*!' . self::build_marker( 'INJECTLATER', $filepath, $hash ) . '*/'; |
|
| 520 | + $contents = '/*!'.self::build_marker('INJECTLATER', $filepath, $hash).'*/'; |
|
| 521 | 521 | |
| 522 | 522 | return $contents; |
| 523 | 523 | } |
@@ -535,18 +535,18 @@ discard block |
||
| 535 | 535 | * |
| 536 | 536 | * @return string |
| 537 | 537 | */ |
| 538 | - public static function build_marker( $name, $data, $hash = null ) |
|
| 538 | + public static function build_marker($name, $data, $hash = null) |
|
| 539 | 539 | { |
| 540 | 540 | // Start the marker, add the data. |
| 541 | - $marker = '%%' . $name . AUTOPTIMIZE_HASH . '%%' . base64_encode( $data ); |
|
| 541 | + $marker = '%%'.$name.AUTOPTIMIZE_HASH.'%%'.base64_encode($data); |
|
| 542 | 542 | |
| 543 | 543 | // Add the hash if provided. |
| 544 | - if ( null !== $hash ) { |
|
| 545 | - $marker .= '|' . $hash; |
|
| 544 | + if (null !== $hash) { |
|
| 545 | + $marker .= '|'.$hash; |
|
| 546 | 546 | } |
| 547 | 547 | |
| 548 | 548 | // Close the marker. |
| 549 | - $marker .= '%%' . $name . '%%'; |
|
| 549 | + $marker .= '%%'.$name.'%%'; |
|
| 550 | 550 | |
| 551 | 551 | return $marker; |
| 552 | 552 | } |
@@ -566,22 +566,22 @@ discard block |
||
| 566 | 566 | * |
| 567 | 567 | * @return string |
| 568 | 568 | */ |
| 569 | - public static function replace_contents_with_marker_if_exists( $marker, $search, $re_replace_pattern, $content ) |
|
| 569 | + public static function replace_contents_with_marker_if_exists($marker, $search, $re_replace_pattern, $content) |
|
| 570 | 570 | { |
| 571 | 571 | $found = false; |
| 572 | 572 | |
| 573 | - $is_regex = autoptimizeUtils::str_is_valid_regex( $search ); |
|
| 574 | - if ( $is_regex ) { |
|
| 575 | - $found = preg_match( $search, $content ); |
|
| 573 | + $is_regex = autoptimizeUtils::str_is_valid_regex($search); |
|
| 574 | + if ($is_regex) { |
|
| 575 | + $found = preg_match($search, $content); |
|
| 576 | 576 | } else { |
| 577 | - $found = ( false !== strpos( $content, $search ) ); |
|
| 577 | + $found = (false !== strpos($content, $search)); |
|
| 578 | 578 | } |
| 579 | 579 | |
| 580 | - if ( $found ) { |
|
| 580 | + if ($found) { |
|
| 581 | 581 | $content = preg_replace_callback( |
| 582 | 582 | $re_replace_pattern, |
| 583 | - function( $matches ) use ( $marker ) { |
|
| 584 | - return autoptimizeBase::build_marker( $marker, $matches[0] ); |
|
| 583 | + function($matches) use ($marker) { |
|
| 584 | + return autoptimizeBase::build_marker($marker, $matches[0]); |
|
| 585 | 585 | }, |
| 586 | 586 | $content |
| 587 | 587 | ); |
@@ -598,13 +598,13 @@ discard block |
||
| 598 | 598 | * |
| 599 | 599 | * @return string |
| 600 | 600 | */ |
| 601 | - public static function restore_marked_content( $marker, $content ) |
|
| 601 | + public static function restore_marked_content($marker, $content) |
|
| 602 | 602 | { |
| 603 | - if ( false !== strpos( $content, $marker ) ) { |
|
| 603 | + if (false !== strpos($content, $marker)) { |
|
| 604 | 604 | $content = preg_replace_callback( |
| 605 | - '#%%' . $marker . AUTOPTIMIZE_HASH . '%%(.*?)%%' . $marker . '%%#is', |
|
| 606 | - function ( $matches ) { |
|
| 607 | - return base64_decode( $matches[1] ); |
|
| 605 | + '#%%'.$marker.AUTOPTIMIZE_HASH.'%%(.*?)%%'.$marker.'%%#is', |
|
| 606 | + function($matches) { |
|
| 607 | + return base64_decode($matches[1]); |
|
| 608 | 608 | }, |
| 609 | 609 | $content |
| 610 | 610 | ); |
@@ -620,17 +620,17 @@ discard block |
||
| 620 | 620 | * |
| 621 | 621 | * @return void |
| 622 | 622 | */ |
| 623 | - protected function debug_log( $data ) |
|
| 623 | + protected function debug_log($data) |
|
| 624 | 624 | { |
| 625 | - if ( ! isset( $this->debug_log ) || ! $this->debug_log ) { |
|
| 625 | + if (!isset($this->debug_log) || !$this->debug_log) { |
|
| 626 | 626 | return; |
| 627 | 627 | } |
| 628 | 628 | |
| 629 | - if ( ! is_string( $data ) && ! is_resource( $data ) ) { |
|
| 630 | - $data = var_export( $data, true ); |
|
| 629 | + if (!is_string($data) && !is_resource($data)) { |
|
| 630 | + $data = var_export($data, true); |
|
| 631 | 631 | } |
| 632 | 632 | |
| 633 | - error_log( $data ); |
|
| 633 | + error_log($data); |
|
| 634 | 634 | } |
| 635 | 635 | |
| 636 | 636 | /** |
@@ -640,12 +640,12 @@ discard block |
||
| 640 | 640 | * |
| 641 | 641 | * @return bool|string to be minified code or false. |
| 642 | 642 | */ |
| 643 | - protected function prepare_minify_single( $filepath ) |
|
| 643 | + protected function prepare_minify_single($filepath) |
|
| 644 | 644 | { |
| 645 | 645 | // Decide what we're dealing with, return false if we don't know. |
| 646 | - if ( autoptimizeUtils::str_ends_in( $filepath, '.js' ) ) { |
|
| 646 | + if (autoptimizeUtils::str_ends_in($filepath, '.js')) { |
|
| 647 | 647 | $type = 'js'; |
| 648 | - } elseif ( autoptimizeUtils::str_ends_in( $filepath, '.css' ) ) { |
|
| 648 | + } elseif (autoptimizeUtils::str_ends_in($filepath, '.css')) { |
|
| 649 | 649 | $type = 'css'; |
| 650 | 650 | } else { |
| 651 | 651 | return false; |
@@ -654,18 +654,18 @@ discard block |
||
| 654 | 654 | // Bail if it looks like its already minifed (by having -min or .min |
| 655 | 655 | // in filename) or if it looks like WP jquery.js (which is minified). |
| 656 | 656 | $minified_variants = array( |
| 657 | - '-min.' . $type, |
|
| 658 | - '.min.' . $type, |
|
| 657 | + '-min.'.$type, |
|
| 658 | + '.min.'.$type, |
|
| 659 | 659 | 'js/jquery/jquery.js', |
| 660 | 660 | ); |
| 661 | - foreach ( $minified_variants as $ending ) { |
|
| 662 | - if ( autoptimizeUtils::str_ends_in( $filepath, $ending ) ) { |
|
| 661 | + foreach ($minified_variants as $ending) { |
|
| 662 | + if (autoptimizeUtils::str_ends_in($filepath, $ending)) { |
|
| 663 | 663 | return false; |
| 664 | 664 | } |
| 665 | 665 | } |
| 666 | 666 | |
| 667 | 667 | // Get file contents, bail if empty. |
| 668 | - $contents = file_get_contents( $filepath ); |
|
| 668 | + $contents = file_get_contents($filepath); |
|
| 669 | 669 | |
| 670 | 670 | return $contents; |
| 671 | 671 | } |
@@ -678,12 +678,12 @@ discard block |
||
| 678 | 678 | * |
| 679 | 679 | * @return string |
| 680 | 680 | */ |
| 681 | - protected function build_minify_single_url( autoptimizeCache $cache ) |
|
| 681 | + protected function build_minify_single_url(autoptimizeCache $cache) |
|
| 682 | 682 | { |
| 683 | - $url = AUTOPTIMIZE_CACHE_URL . $cache->getname(); |
|
| 683 | + $url = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
|
| 684 | 684 | |
| 685 | 685 | // CDN-replace the resulting URL if needed... |
| 686 | - $url = $this->url_replace_cdn( $url ); |
|
| 686 | + $url = $this->url_replace_cdn($url); |
|
| 687 | 687 | |
| 688 | 688 | return $url; |
| 689 | 689 | } |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | * new in Autoptimize 2.2 |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -if ( ! defined( 'ABSPATH' ) ) { |
|
| 7 | +if (!defined('ABSPATH')) { |
|
| 8 | 8 | exit; |
| 9 | 9 | } |
| 10 | 10 | |
@@ -17,94 +17,94 @@ discard block |
||
| 17 | 17 | |
| 18 | 18 | public function add_hooks() |
| 19 | 19 | { |
| 20 | - if ( apply_filters( 'autoptimize_js_do_minify', true ) ) { |
|
| 21 | - add_filter( 'autoptimize_js_individual_script', array( $this, 'js_snippetcacher' ), 10, 2 ); |
|
| 22 | - add_filter( 'autoptimize_js_after_minify', array( $this, 'js_cleanup' ), 10, 1 ); |
|
| 20 | + if (apply_filters('autoptimize_js_do_minify', true)) { |
|
| 21 | + add_filter('autoptimize_js_individual_script', array($this, 'js_snippetcacher'), 10, 2); |
|
| 22 | + add_filter('autoptimize_js_after_minify', array($this, 'js_cleanup'), 10, 1); |
|
| 23 | 23 | } |
| 24 | - if ( apply_filters( 'autoptimize_css_do_minify', true ) ) { |
|
| 25 | - add_filter( 'autoptimize_css_individual_style', array( $this, 'css_snippetcacher' ), 10, 2 ); |
|
| 26 | - add_filter( 'autoptimize_css_after_minify', array( $this, 'css_cleanup' ), 10, 1 ); |
|
| 24 | + if (apply_filters('autoptimize_css_do_minify', true)) { |
|
| 25 | + add_filter('autoptimize_css_individual_style', array($this, 'css_snippetcacher'), 10, 2); |
|
| 26 | + add_filter('autoptimize_css_after_minify', array($this, 'css_cleanup'), 10, 1); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | - public function js_snippetcacher( $jsin, $jsfilename ) |
|
| 30 | + public function js_snippetcacher($jsin, $jsfilename) |
|
| 31 | 31 | { |
| 32 | - $md5hash = 'snippet_' . md5( $jsin ); |
|
| 33 | - $ccheck = new autoptimizeCache( $md5hash, 'js' ); |
|
| 34 | - if ( $ccheck->check() ) { |
|
| 32 | + $md5hash = 'snippet_'.md5($jsin); |
|
| 33 | + $ccheck = new autoptimizeCache($md5hash, 'js'); |
|
| 34 | + if ($ccheck->check()) { |
|
| 35 | 35 | $scriptsrc = $ccheck->retrieve(); |
| 36 | 36 | } else { |
| 37 | - if ( false === ( strpos( $jsfilename, 'min.js' ) ) && ( false === strpos( $jsfilename, 'js/jquery/jquery.js' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_js_consider_minified', false ), '', $jsfilename ) === $jsfilename ) ) { |
|
| 38 | - $tmp_jscode = trim( JSMin::minify( $jsin ) ); |
|
| 39 | - if ( ! empty( $tmp_jscode ) ) { |
|
| 37 | + if (false === (strpos($jsfilename, 'min.js')) && (false === strpos($jsfilename, 'js/jquery/jquery.js')) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) { |
|
| 38 | + $tmp_jscode = trim(JSMin::minify($jsin)); |
|
| 39 | + if (!empty($tmp_jscode)) { |
|
| 40 | 40 | $scriptsrc = $tmp_jscode; |
| 41 | - unset( $tmp_jscode ); |
|
| 41 | + unset($tmp_jscode); |
|
| 42 | 42 | } else { |
| 43 | 43 | $scriptsrc = $jsin; |
| 44 | 44 | } |
| 45 | 45 | } else { |
| 46 | 46 | // Removing comments, linebreaks and stuff! |
| 47 | - $scriptsrc = preg_replace( '#^\s*\/\/.*$#Um', '', $jsin ); |
|
| 48 | - $scriptsrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc ); |
|
| 49 | - $scriptsrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc ); |
|
| 47 | + $scriptsrc = preg_replace('#^\s*\/\/.*$#Um', '', $jsin); |
|
| 48 | + $scriptsrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $scriptsrc); |
|
| 49 | + $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - $last_char = substr( $scriptsrc, -1, 1 ); |
|
| 53 | - if ( ';' !== $last_char && '}' !== $last_char ) { |
|
| 52 | + $last_char = substr($scriptsrc, -1, 1); |
|
| 53 | + if (';' !== $last_char && '}' !== $last_char) { |
|
| 54 | 54 | $scriptsrc .= ';'; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | - if ( ! empty( $jsfilename ) && str_replace( apply_filters( 'autoptimize_filter_js_speedup_cache', false ), '', $jsfilename ) === $jsfilename ) { |
|
| 57 | + if (!empty($jsfilename) && str_replace(apply_filters('autoptimize_filter_js_speedup_cache', false), '', $jsfilename) === $jsfilename) { |
|
| 58 | 58 | // Don't cache inline CSS or if filter says no! |
| 59 | - $ccheck->cache( $scriptsrc, 'text/javascript' ); |
|
| 59 | + $ccheck->cache($scriptsrc, 'text/javascript'); |
|
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | - unset( $ccheck ); |
|
| 62 | + unset($ccheck); |
|
| 63 | 63 | |
| 64 | 64 | return $scriptsrc; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - public function css_snippetcacher( $cssin, $cssfilename ) |
|
| 67 | + public function css_snippetcacher($cssin, $cssfilename) |
|
| 68 | 68 | { |
| 69 | - $md5hash = 'snippet_' . md5( $cssin ); |
|
| 70 | - $ccheck = new autoptimizeCache( $md5hash, 'css' ); |
|
| 71 | - if ( $ccheck->check() ) { |
|
| 69 | + $md5hash = 'snippet_'.md5($cssin); |
|
| 70 | + $ccheck = new autoptimizeCache($md5hash, 'css'); |
|
| 71 | + if ($ccheck->check()) { |
|
| 72 | 72 | $stylesrc = $ccheck->retrieve(); |
| 73 | 73 | } else { |
| 74 | - if ( ( false === strpos( $cssfilename, 'min.css' ) ) && ( str_replace( apply_filters( 'autoptimize_filter_css_consider_minified', false ), '', $cssfilename ) === $cssfilename ) ) { |
|
| 74 | + if ((false === strpos($cssfilename, 'min.css')) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) { |
|
| 75 | 75 | $cssmin = new autoptimizeCSSmin(); |
| 76 | - $tmp_code = trim( $cssmin->run( $cssin ) ); |
|
| 76 | + $tmp_code = trim($cssmin->run($cssin)); |
|
| 77 | 77 | |
| 78 | - if ( ! empty( $tmp_code ) ) { |
|
| 78 | + if (!empty($tmp_code)) { |
|
| 79 | 79 | $stylesrc = $tmp_code; |
| 80 | - unset( $tmp_code ); |
|
| 80 | + unset($tmp_code); |
|
| 81 | 81 | } else { |
| 82 | 82 | $stylesrc = $cssin; |
| 83 | 83 | } |
| 84 | 84 | } else { |
| 85 | 85 | // .min.css -> no heavy-lifting, just some cleanup! |
| 86 | - $stylesrc = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin ); |
|
| 87 | - $stylesrc = preg_replace( "#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc ); |
|
| 88 | - $stylesrc = autoptimizeStyles::fixurls( $cssfilename, $stylesrc ); |
|
| 86 | + $stylesrc = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Us', '', $cssin); |
|
| 87 | + $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc); |
|
| 88 | + $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc); |
|
| 89 | 89 | } |
| 90 | - if ( ! empty( $cssfilename ) && ( str_replace( apply_filters( 'autoptimize_filter_css_speedup_cache', false ), '', $cssfilename ) === $cssfilename ) ) { |
|
| 90 | + if (!empty($cssfilename) && (str_replace(apply_filters('autoptimize_filter_css_speedup_cache', false), '', $cssfilename) === $cssfilename)) { |
|
| 91 | 91 | // Only caching CSS if it's not inline and is allowed by filter! |
| 92 | - $ccheck->cache( $stylesrc, 'text/css' ); |
|
| 92 | + $ccheck->cache($stylesrc, 'text/css'); |
|
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | - unset( $ccheck ); |
|
| 95 | + unset($ccheck); |
|
| 96 | 96 | |
| 97 | 97 | return $stylesrc; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - public function css_cleanup( $cssin ) |
|
| 100 | + public function css_cleanup($cssin) |
|
| 101 | 101 | { |
| 102 | 102 | // Speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating needs to be removed. |
| 103 | - return trim( str_replace( array( '/*FILESTART*/', '/*FILESTART2*/' ), '', $cssin ) ); |
|
| 103 | + return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin)); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | - public function js_cleanup( $jsin ) |
|
| 106 | + public function js_cleanup($jsin) |
|
| 107 | 107 | { |
| 108 | - return trim( $jsin ); |
|
| 108 | + return trim($jsin); |
|
| 109 | 109 | } |
| 110 | 110 | } |
@@ -72,9 +72,9 @@ discard block |
||
| 72 | 72 | public function __construct($raisePhpLimits = true) |
| 73 | 73 | { |
| 74 | 74 | $this->raisePhpLimits = (bool) $raisePhpLimits; |
| 75 | - $this->memoryLimit = 128 * 1048576; // 128MB in bytes |
|
| 76 | - $this->pcreBacktrackLimit = 1000 * 1000; |
|
| 77 | - $this->pcreRecursionLimit = 500 * 1000; |
|
| 75 | + $this->memoryLimit = 128*1048576; // 128MB in bytes |
|
| 76 | + $this->pcreBacktrackLimit = 1000*1000; |
|
| 77 | + $this->pcreRecursionLimit = 500*1000; |
|
| 78 | 78 | $this->hexToNamedColorsMap = Colors::getHexToNamedMap(); |
| 79 | 79 | $this->namedToHexColorsMap = Colors::getNamedToHexMap(); |
| 80 | 80 | $this->namedToHexColorsRegex = sprintf( |
@@ -176,8 +176,8 @@ discard block |
||
| 176 | 176 | */ |
| 177 | 177 | private function setShortenZeroValuesRegexes() |
| 178 | 178 | { |
| 179 | - $zeroRegex = '0'. $this->unitsGroupRegex; |
|
| 180 | - $numOrPosRegex = '('. $this->numRegex .'|top|left|bottom|right|center) '; |
|
| 179 | + $zeroRegex = '0'.$this->unitsGroupRegex; |
|
| 180 | + $numOrPosRegex = '('.$this->numRegex.'|top|left|bottom|right|center) '; |
|
| 181 | 181 | $oneZeroSafeProperties = array( |
| 182 | 182 | '(?:line-)?height', |
| 183 | 183 | '(?:(?:min|max)-)?width', |
@@ -195,14 +195,14 @@ discard block |
||
| 195 | 195 | ); |
| 196 | 196 | |
| 197 | 197 | // First zero regex |
| 198 | - $regex = '/(^|;)('. implode('|', $oneZeroSafeProperties) .'):%s/Si'; |
|
| 198 | + $regex = '/(^|;)('.implode('|', $oneZeroSafeProperties).'):%s/Si'; |
|
| 199 | 199 | $this->shortenOneZeroesRegex = sprintf($regex, $zeroRegex); |
| 200 | 200 | |
| 201 | 201 | // Multiple zeroes regexes |
| 202 | 202 | $regex = '/(^|;)(margin|padding|border-(?:width|radius)|background-position):%s/Si'; |
| 203 | - $this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex . $zeroRegex); |
|
| 204 | - $this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $zeroRegex); |
|
| 205 | - $this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex . $numOrPosRegex . $numOrPosRegex . $zeroRegex); |
|
| 203 | + $this->shortenTwoZeroesRegex = sprintf($regex, $numOrPosRegex.$zeroRegex); |
|
| 204 | + $this->shortenThreeZeroesRegex = sprintf($regex, $numOrPosRegex.$numOrPosRegex.$zeroRegex); |
|
| 205 | + $this->shortenFourZeroesRegex = sprintf($regex, $numOrPosRegex.$numOrPosRegex.$numOrPosRegex.$zeroRegex); |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | /** |
@@ -389,7 +389,7 @@ discard block |
||
| 389 | 389 | $dataStartIndex = $matchStartIndex + 4; // url( length |
| 390 | 390 | $searchOffset = $matchStartIndex + strlen($m[0][0]); |
| 391 | 391 | $terminator = $m[1][0]; // ', " or empty (not quoted) |
| 392 | - $terminatorRegex = '/(?<!\\\\)'. (strlen($terminator) === 0 ? '' : $terminator.'\s*') .'(\))/S'; |
|
| 392 | + $terminatorRegex = '/(?<!\\\\)'.(strlen($terminator) === 0 ? '' : $terminator.'\s*').'(\))/S'; |
|
| 393 | 393 | |
| 394 | 394 | $ret .= substr($css, $substrOffset, $matchStartIndex - $substrOffset); |
| 395 | 395 | |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | $token = preg_replace('/\s+/S', '', $token); |
| 405 | 405 | } |
| 406 | 406 | |
| 407 | - $ret .= 'url('. $this->registerPreservedToken(trim($token)) .')'; |
|
| 407 | + $ret .= 'url('.$this->registerPreservedToken(trim($token)).')'; |
|
| 408 | 408 | // No end terminator found, re-add the whole match. Should we throw/warn here? |
| 409 | 409 | } else { |
| 410 | 410 | $ret .= substr($css, $matchStartIndex, $searchOffset - $matchStartIndex); |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | */ |
| 426 | 426 | private function processCommentsCallback($matches) |
| 427 | 427 | { |
| 428 | - return '/*'. $this->registerCommentToken($matches[1]) .'*/'; |
|
| 428 | + return '/*'.$this->registerCommentToken($matches[1]).'*/'; |
|
| 429 | 429 | } |
| 430 | 430 | |
| 431 | 431 | /** |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | */ |
| 436 | 436 | private function processOldIeSpecificMatrixDefinitionCallback($matches) |
| 437 | 437 | { |
| 438 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $this->registerPreservedToken($matches[1]) .')'; |
|
| 438 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix('.$this->registerPreservedToken($matches[1]).')'; |
|
| 439 | 439 | } |
| 440 | 440 | |
| 441 | 441 | /** |
@@ -458,7 +458,7 @@ discard block |
||
| 458 | 458 | // minify alpha opacity in filter strings |
| 459 | 459 | $match = str_ireplace('progid:DXImageTransform.Microsoft.Alpha(Opacity=', 'alpha(opacity=', $match); |
| 460 | 460 | |
| 461 | - return $quote . $this->registerPreservedToken($match) . $quote; |
|
| 461 | + return $quote.$this->registerPreservedToken($match).$quote; |
|
| 462 | 462 | } |
| 463 | 463 | |
| 464 | 464 | /** |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | */ |
| 470 | 470 | private function processImportUnquotedUrlAtRulesCallback($matches) |
| 471 | 471 | { |
| 472 | - return '@import url('. $this->registerPreservedToken($matches[1]) .')'. $matches[2]; |
|
| 472 | + return '@import url('.$this->registerPreservedToken($matches[1]).')'.$matches[2]; |
|
| 473 | 473 | } |
| 474 | 474 | |
| 475 | 475 | /** |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | private function processComments($css) |
| 481 | 481 | { |
| 482 | 482 | foreach ($this->comments as $commentId => $comment) { |
| 483 | - $commentIdString = '/*'. $commentId .'*/'; |
|
| 483 | + $commentIdString = '/*'.$commentId.'*/'; |
|
| 484 | 484 | |
| 485 | 485 | // ! in the first position of the comment means preserve |
| 486 | 486 | // so push to the preserved tokens keeping the ! |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | $blockEndPos = strpos($css, '}', $blockStartPos); |
| 532 | 532 | // When ending curly brace is missing, let's |
| 533 | 533 | // behave like there was one at the end of the block... |
| 534 | - if ( false === $blockEndPos ) { |
|
| 534 | + if (false === $blockEndPos) { |
|
| 535 | 535 | $blockEndPos = strlen($css) - 1; |
| 536 | 536 | } |
| 537 | 537 | $nextBlockStartPos = strpos($css, '{', $blockStartPos + 1); |
@@ -543,7 +543,7 @@ discard block |
||
| 543 | 543 | } else { |
| 544 | 544 | $ruleBody = substr($css, $blockStartPos + 1, $blockEndPos - $blockStartPos - 1); |
| 545 | 545 | $ruleBodyToken = $this->registerRuleBodyToken($this->processRuleBody($ruleBody)); |
| 546 | - $ret .= '{'. $ruleBodyToken .'}'; |
|
| 546 | + $ret .= '{'.$ruleBodyToken.'}'; |
|
| 547 | 547 | $searchOffset = $blockEndPos + 1; |
| 548 | 548 | } |
| 549 | 549 | |
@@ -643,8 +643,8 @@ discard block |
||
| 643 | 643 | $body = preg_replace('/([ :,(])\+(\.?\d+)/S', '$1$2', $body); |
| 644 | 644 | |
| 645 | 645 | // shorten ms to s |
| 646 | - $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function ($matches) { |
|
| 647 | - return $matches[1] . $matches[2] . ((int) $matches[3] / 1000) .'s'; |
|
| 646 | + $body = preg_replace_callback('/([ :,(])(-?)(\d{3,})ms/Si', function($matches) { |
|
| 647 | + return $matches[1].$matches[2].((int) $matches[3]/1000).'s'; |
|
| 648 | 648 | }, $body); |
| 649 | 649 | |
| 650 | 650 | // Remove leading zeros from integer and float numbers. |
@@ -756,13 +756,13 @@ discard block |
||
| 756 | 756 | $css = preg_replace('/::(before|after|first-(?:line|letter))(\{|,)/Si', ':$1$2', $css); |
| 757 | 757 | |
| 758 | 758 | // Retain space for special IE6 cases |
| 759 | - $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function ($matches) { |
|
| 760 | - return ':first-'. strtolower($matches[1]) .' '. $matches[2]; |
|
| 759 | + $css = preg_replace_callback('/:first-(line|letter)(\{|,)/Si', function($matches) { |
|
| 760 | + return ':first-'.strtolower($matches[1]).' '.$matches[2]; |
|
| 761 | 761 | }, $css); |
| 762 | 762 | |
| 763 | 763 | // Find a fraction that may used in some @media queries such as: (min-aspect-ratio: 1/1) |
| 764 | 764 | // Add token to add the "/" back in later |
| 765 | - $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'. self::QUERY_FRACTION .'$3)', $css); |
|
| 765 | + $css = preg_replace('/\(([a-z-]+):([0-9]+)\/([0-9]+)\)/Si', '($1:$2'.self::QUERY_FRACTION.'$3)', $css); |
|
| 766 | 766 | |
| 767 | 767 | // Remove empty rule blocks up to 2 levels deep. |
| 768 | 768 | $css = preg_replace(array_fill(0, 2, '/(\{)[^{};\/\n]+\{\}/S'), '$1', $css); |
@@ -810,7 +810,7 @@ discard block |
||
| 810 | 810 | } |
| 811 | 811 | |
| 812 | 812 | // @import handling |
| 813 | - $css = preg_replace_callback($this->importRegex, function ($matches) use (&$imports) { |
|
| 813 | + $css = preg_replace_callback($this->importRegex, function($matches) use (&$imports) { |
|
| 814 | 814 | // Keep all @import at-rules found for later |
| 815 | 815 | $imports .= $matches[0]; |
| 816 | 816 | // Delete all @import at-rules |
@@ -818,7 +818,7 @@ discard block |
||
| 818 | 818 | }, $css); |
| 819 | 819 | |
| 820 | 820 | // @namespace handling |
| 821 | - $css = preg_replace_callback($this->namespaceRegex, function ($matches) use (&$namespaces) { |
|
| 821 | + $css = preg_replace_callback($this->namespaceRegex, function($matches) use (&$namespaces) { |
|
| 822 | 822 | // Keep all @namespace at-rules found for later |
| 823 | 823 | $namespaces .= $matches[0]; |
| 824 | 824 | // Delete all @namespace at-rules |
@@ -829,7 +829,7 @@ discard block |
||
| 829 | 829 | // 1. @charset first |
| 830 | 830 | // 2. @imports below @charset |
| 831 | 831 | // 3. @namespaces below @imports |
| 832 | - $css = $charset . $imports . $namespaces . $css; |
|
| 832 | + $css = $charset.$imports.$namespaces.$css; |
|
| 833 | 833 | |
| 834 | 834 | return $css; |
| 835 | 835 | } |
@@ -883,10 +883,10 @@ discard block |
||
| 883 | 883 | // Restore space after rgb() or hsl() function in some cases such as: |
| 884 | 884 | // background-image: linear-gradient(to bottom, rgb(210,180,140) 10%, rgb(255,0,0) 90%); |
| 885 | 885 | if (!empty($terminator) && !preg_match('/[ ,);]/S', $terminator)) { |
| 886 | - $terminator = ' '. $terminator; |
|
| 886 | + $terminator = ' '.$terminator; |
|
| 887 | 887 | } |
| 888 | 888 | |
| 889 | - return '#'. implode('', $hexColors) . $terminator; |
|
| 889 | + return '#'.implode('', $hexColors).$terminator; |
|
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | /** |
@@ -900,16 +900,16 @@ discard block |
||
| 900 | 900 | |
| 901 | 901 | // Shorten suitable 6 chars HEX colors |
| 902 | 902 | if (strlen($hex) === 6 && preg_match('/^([0-9a-f])\1([0-9a-f])\2([0-9a-f])\3$/Si', $hex, $m)) { |
| 903 | - $hex = $m[1] . $m[2] . $m[3]; |
|
| 903 | + $hex = $m[1].$m[2].$m[3]; |
|
| 904 | 904 | } |
| 905 | 905 | |
| 906 | 906 | // Lowercase |
| 907 | - $hex = '#'. strtolower($hex); |
|
| 907 | + $hex = '#'.strtolower($hex); |
|
| 908 | 908 | |
| 909 | 909 | // Replace Hex colors with shorter color names |
| 910 | 910 | $color = array_key_exists($hex, $this->hexToNamedColorsMap) ? $this->hexToNamedColorsMap[$hex] : $hex; |
| 911 | 911 | |
| 912 | - return $color . $matches[2]; |
|
| 912 | + return $color.$matches[2]; |
|
| 913 | 913 | } |
| 914 | 914 | |
| 915 | 915 | /** |
@@ -920,7 +920,7 @@ discard block |
||
| 920 | 920 | */ |
| 921 | 921 | private function shortenNamedColorsCallback($matches) |
| 922 | 922 | { |
| 923 | - return $matches[1] . $this->namedToHexColorsMap[strtolower($matches[2])] . $matches[3]; |
|
| 923 | + return $matches[1].$this->namedToHexColorsMap[strtolower($matches[2])].$matches[3]; |
|
| 924 | 924 | } |
| 925 | 925 | |
| 926 | 926 | /** |
