futtta /
autoptimize
@@ -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 | } |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | * |
| 34 | 34 | * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If |
| 35 | 35 | * unset, minify will sniff for an XHTML doctype. |
| 36 | - * |
|
| 36 | + * |
|
| 37 | 37 | * 'keepComments' : (optional boolean) should the HTML comments be kept |
| 38 | 38 | * in the HTML Code? |
| 39 | 39 | * |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | * |
| 61 | 61 | * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If |
| 62 | 62 | * unset, minify will sniff for an XHTML doctype. |
| 63 | - * |
|
| 63 | + * |
|
| 64 | 64 | * 'xhtml' : (optional boolean) should content be treated as XHTML1.0? If |
| 65 | 65 | * unset, minify will sniff for an XHTML doctype. |
| 66 | 66 | * |
@@ -111,11 +111,11 @@ discard block |
||
| 111 | 111 | ,$this->_html); |
| 112 | 112 | |
| 113 | 113 | // remove HTML comments (not containing IE conditional comments). |
| 114 | - if ($this->_keepComments == false) { |
|
| 115 | - $this->_html = preg_replace_callback( |
|
| 116 | - '/<!--([\\s\\S]*?)-->/' |
|
| 117 | - ,array($this, '_commentCB') |
|
| 118 | - ,$this->_html); |
|
| 114 | + if ($this->_keepComments == false) { |
|
| 115 | + $this->_html = preg_replace_callback( |
|
| 116 | + '/<!--([\\s\\S]*?)-->/' |
|
| 117 | + ,array($this, '_commentCB') |
|
| 118 | + ,$this->_html); |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // replace PREs with placeholders |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | ,array($this, '_removeTextareaCB') |
| 130 | 130 | ,$this->_html); |
| 131 | 131 | |
| 132 | - // replace data: URIs with placeholders |
|
| 132 | + // replace data: URIs with placeholders |
|
| 133 | 133 | $this->_html = preg_replace_callback( |
| 134 | 134 | '/(=("|\')data:.*\\2)/Ui' |
| 135 | 135 | ,array($this, '_removeDataURICB') |
@@ -183,7 +183,7 @@ discard block |
||
| 183 | 183 | protected $_placeholders = array(); |
| 184 | 184 | protected $_cssMinifier = null; |
| 185 | 185 | protected $_jsMinifier = null; |
| 186 | - protected $_keepComments = false; |
|
| 186 | + protected $_keepComments = false; |
|
| 187 | 187 | |
| 188 | 188 | protected function _outsideTagCB($m) |
| 189 | 189 | { |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | return $this->_reservePlace($m[1]); |
| 201 | 201 | } |
| 202 | 202 | |
| 203 | - protected function _removeDataURICB($m) |
|
| 203 | + protected function _removeDataURICB($m) |
|
| 204 | 204 | { |
| 205 | 205 | return $this->_reservePlace($m[1]); |
| 206 | 206 | } |
@@ -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) |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | protected function _removeCdata($str) |
| 258 | 258 | { |
| 259 | 259 | return (false !== strpos($str, '<![CDATA[')) |
| 260 | - ? str_replace(array('/* <![CDATA[ */','/* ]]> */','/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str) |
|
| 260 | + ? str_replace(array('/* <![CDATA[ */', '/* ]]> */', '/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str) |
|
| 261 | 261 | : $str; |
| 262 | 262 | } |
| 263 | 263 | |
@@ -264,11 +264,11 @@ discard block |
||
| 264 | 264 | // Normalize all whitespace strings to single spaces. Easier to work with that way. |
| 265 | 265 | $css = preg_replace('/\s+/', ' ', $css); |
| 266 | 266 | |
| 267 | - // preserve flex, keeping percentage even if 0 |
|
| 268 | - $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i',array($this, 'replace_flex'),$css); |
|
| 267 | + // preserve flex, keeping percentage even if 0 |
|
| 268 | + $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i',array($this, 'replace_flex'),$css); |
|
| 269 | 269 | |
| 270 | - // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
|
| 271 | - $css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css); |
|
| 270 | + // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
|
| 271 | + $css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css); |
|
| 272 | 272 | |
| 273 | 273 | // Shorten & preserve calculations calc(...) since spaces are important |
| 274 | 274 | $css = preg_replace_callback('/calc(\(((?:[^\(\)]+|(?1))*)\))/i', array($this, 'replace_calc'), $css); |
@@ -344,8 +344,8 @@ discard block |
||
| 344 | 344 | // <percentage> data type: https://developer.mozilla.org/en-US/docs/Web/CSS/percentage |
| 345 | 345 | $css = preg_replace('/([^\\\\]\:|\s)0(?:em|ex|ch|rem|vw|vh|vm|vmin|cm|mm|in|px|pt|pc|%)/iS', '${1}0', $css); |
| 346 | 346 | |
| 347 | - // 0% step in a keyframe? restore the % unit |
|
| 348 | - $css = preg_replace_callback('/(@[a-z\-]*?keyframes[^\{]+\{)(.*?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css); |
|
| 347 | + // 0% step in a keyframe? restore the % unit |
|
| 348 | + $css = preg_replace_callback('/(@[a-z\-]*?keyframes[^\{]+\{)(.*?)(\}\})/iS', array($this, 'replace_keyframe_zero'), $css); |
|
| 349 | 349 | |
| 350 | 350 | // Replace 0 0; or 0 0 0; or 0 0 0 0; with 0. |
| 351 | 351 | $css = preg_replace('/\:0(?: 0){1,3}(;|\}| \!)/', ':0$1', $css); |
@@ -384,7 +384,7 @@ discard block |
||
| 384 | 384 | // Add "/" back to fix Opera -o-device-pixel-ratio query |
| 385 | 385 | $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css); |
| 386 | 386 | |
| 387 | - // Replace multiple semi-colons in a row by a single one |
|
| 387 | + // Replace multiple semi-colons in a row by a single one |
|
| 388 | 388 | // See SF bug #1980989 |
| 389 | 389 | $css = preg_replace('/;;+/', ';', $css); |
| 390 | 390 | |
@@ -411,8 +411,8 @@ discard block |
||
| 411 | 411 | |
| 412 | 412 | // restore preserved comments and strings in reverse order |
| 413 | 413 | for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) { |
| 414 | - $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1); |
|
| 415 | - // $css.=$this->preserved_tokens[$i]; |
|
| 414 | + $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1); |
|
| 415 | + // $css.=$this->preserved_tokens[$i]; |
|
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | // Trim the final string (for any leading or trailing white spaces) |
@@ -469,9 +469,9 @@ discard block |
||
| 469 | 469 | |
| 470 | 470 | if ($found_terminator) { |
| 471 | 471 | $token = $this->str_slice($css, $start_index, $end_index); |
| 472 | - if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) { |
|
| 473 | - $token = preg_replace('/\s+/', '', $token); |
|
| 474 | - } |
|
| 472 | + if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) { |
|
| 473 | + $token = preg_replace('/\s+/', '', $token); |
|
| 474 | + } |
|
| 475 | 475 | $this->preserved_tokens[] = $token; |
| 476 | 476 | |
| 477 | 477 | $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)'; |
@@ -602,13 +602,13 @@ discard block |
||
| 602 | 602 | return 'flex:'.self::TOKEN . (count($this->preserved_tokens) - 1) . '___'; |
| 603 | 603 | } |
| 604 | 604 | |
| 605 | - private function preserve_old_IE_specific_matrix_definition($matches) |
|
| 606 | - { |
|
| 607 | - $this->preserved_tokens[] = $matches[1]; |
|
| 608 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 605 | + private function preserve_old_IE_specific_matrix_definition($matches) |
|
| 606 | + { |
|
| 607 | + $this->preserved_tokens[] = $matches[1]; |
|
| 608 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 609 | 609 | } |
| 610 | 610 | |
| 611 | - private function replace_keyframe_zero($matches) |
|
| 611 | + private function replace_keyframe_zero($matches) |
|
| 612 | 612 | { |
| 613 | 613 | return $matches[1] . preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3]; |
| 614 | 614 | } |
@@ -701,9 +701,15 @@ |
||
| 701 | 701 | private function hue_to_rgb($v1, $v2, $vh) |
| 702 | 702 | { |
| 703 | 703 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
| 704 | - if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 705 | - if ($vh * 2 < 1) return $v2; |
|
| 706 | - if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6; |
|
| 704 | + if ($vh * 6 < 1) { |
|
| 705 | + return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 706 | + } |
|
| 707 | + if ($vh * 2 < 1) { |
|
| 708 | + return $v2; |
|
| 709 | + } |
|
| 710 | + if ($vh * 3 < 2) { |
|
| 711 | + return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6; |
|
| 712 | + } |
|
| 707 | 713 | return $v1; |
| 708 | 714 | } |
| 709 | 715 | |
@@ -43,10 +43,10 @@ discard block |
||
| 43 | 43 | public function __construct($raise_php_limits = TRUE) |
| 44 | 44 | { |
| 45 | 45 | // Set suggested PHP limits |
| 46 | - $this->memory_limit = 128 * 1048576; // 128MB in bytes |
|
| 46 | + $this->memory_limit = 128*1048576; // 128MB in bytes |
|
| 47 | 47 | $this->max_execution_time = 60; // 1 min |
| 48 | - $this->pcre_backtrack_limit = 1000 * 1000; |
|
| 49 | - $this->pcre_recursion_limit = 500 * 1000; |
|
| 48 | + $this->pcre_backtrack_limit = 1000*1000; |
|
| 49 | + $this->pcre_recursion_limit = 500*1000; |
|
| 50 | 50 | |
| 51 | 51 | $this->raise_php_limits = (bool) $raise_php_limits; |
| 52 | 52 | } |
@@ -83,8 +83,8 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | $comment_found = $this->str_slice($css, $start_index + 2, $end_index); |
| 85 | 85 | $this->comments[] = $comment_found; |
| 86 | - $comment_preserve_string = self::COMMENT . (count($this->comments) - 1) . '___'; |
|
| 87 | - $css = $this->str_slice($css, 0, $start_index + 2) . $comment_preserve_string . $this->str_slice($css, $end_index); |
|
| 86 | + $comment_preserve_string = self::COMMENT.(count($this->comments) - 1).'___'; |
|
| 87 | + $css = $this->str_slice($css, 0, $start_index + 2).$comment_preserve_string.$this->str_slice($css, $end_index); |
|
| 88 | 88 | // Set correct start_index: Fixes issue #2528130 |
| 89 | 89 | $start_index = $end_index + 2 + strlen($comment_preserve_string) - strlen($comment_found); |
| 90 | 90 | } |
@@ -137,14 +137,14 @@ discard block |
||
| 137 | 137 | $css_chunks[$i] = $this->minify($css_chunks[$i], $linebreak_pos); |
| 138 | 138 | // Keep the first @charset at-rule found |
| 139 | 139 | if (empty($charset) && preg_match($charset_regexp, $css_chunks[$i], $matches)) { |
| 140 | - $charset = strtolower($matches[1]) . $matches[2]; |
|
| 140 | + $charset = strtolower($matches[1]).$matches[2]; |
|
| 141 | 141 | } |
| 142 | 142 | // Delete all @charset at-rules |
| 143 | 143 | $css_chunks[$i] = preg_replace($charset_regexp, '', $css_chunks[$i]); |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | 146 | // Update the first chunk and push the charset to the top of the file. |
| 147 | - $css_chunks[0] = $charset . $css_chunks[0]; |
|
| 147 | + $css_chunks[0] = $charset.$css_chunks[0]; |
|
| 148 | 148 | |
| 149 | 149 | return implode('', $css_chunks); |
| 150 | 150 | } |
@@ -219,17 +219,17 @@ discard block |
||
| 219 | 219 | for ($i = 0, $max = count($this->comments); $i < $max; $i++) { |
| 220 | 220 | |
| 221 | 221 | $token = $this->comments[$i]; |
| 222 | - $placeholder = '/' . self::COMMENT . $i . '___/'; |
|
| 222 | + $placeholder = '/'.self::COMMENT.$i.'___/'; |
|
| 223 | 223 | |
| 224 | 224 | // ! in the first position of the comment means preserve |
| 225 | 225 | // so push to the preserved tokens keeping the ! |
| 226 | 226 | if (substr($token, 0, 1) === '!') { |
| 227 | 227 | $this->preserved_tokens[] = $token; |
| 228 | - $token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___'; |
|
| 228 | + $token_tring = self::TOKEN.(count($this->preserved_tokens) - 1).'___'; |
|
| 229 | 229 | $css = preg_replace($placeholder, $token_tring, $css, 1); |
| 230 | 230 | // Preserve new lines for /*! important comments |
| 231 | - $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'. $token_tring .')/S', self::NL.'$1', $css); |
|
| 232 | - $css = preg_replace('/('. $token_tring .'\*\/)\s*[\n\r\f]+\s*/', '$1'.self::NL, $css); |
|
| 231 | + $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'.$token_tring.')/S', self::NL.'$1', $css); |
|
| 232 | + $css = preg_replace('/('.$token_tring.'\*\/)\s*[\n\r\f]+\s*/', '$1'.self::NL, $css); |
|
| 233 | 233 | continue; |
| 234 | 234 | } |
| 235 | 235 | |
@@ -237,10 +237,10 @@ discard block |
||
| 237 | 237 | // shorten that to /*\*/ and the next one to /**/ |
| 238 | 238 | if (substr($token, (strlen($token) - 1), 1) === '\\') { |
| 239 | 239 | $this->preserved_tokens[] = '\\'; |
| 240 | - $css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1); |
|
| 240 | + $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1); |
|
| 241 | 241 | $i = $i + 1; // attn: advancing the loop |
| 242 | 242 | $this->preserved_tokens[] = ''; |
| 243 | - $css = preg_replace('/' . self::COMMENT . $i . '___/', self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1); |
|
| 243 | + $css = preg_replace('/'.self::COMMENT.$i.'___/', self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1); |
|
| 244 | 244 | continue; |
| 245 | 245 | } |
| 246 | 246 | |
@@ -251,13 +251,13 @@ discard block |
||
| 251 | 251 | if ($start_index > 2) { |
| 252 | 252 | if (substr($css, $start_index - 3, 1) === '>') { |
| 253 | 253 | $this->preserved_tokens[] = ''; |
| 254 | - $css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1); |
|
| 254 | + $css = preg_replace($placeholder, self::TOKEN.(count($this->preserved_tokens) - 1).'___', $css, 1); |
|
| 255 | 255 | } |
| 256 | 256 | } |
| 257 | 257 | } |
| 258 | 258 | |
| 259 | 259 | // in all other cases kill the comment |
| 260 | - $css = preg_replace('/\/\*' . $this->str_slice($placeholder, 1, -1) . '\*\//', '', $css, 1); |
|
| 260 | + $css = preg_replace('/\/\*'.$this->str_slice($placeholder, 1, -1).'\*\//', '', $css, 1); |
|
| 261 | 261 | } |
| 262 | 262 | |
| 263 | 263 | |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | $css = preg_replace('/\s+/', ' ', $css); |
| 266 | 266 | |
| 267 | 267 | // preserve flex, keeping percentage even if 0 |
| 268 | - $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i',array($this, 'replace_flex'),$css); |
|
| 268 | + $css = preg_replace_callback('/flex\s?:\s?((?:[0-9 ]*)\s?(?:px|em|auto|%)?(?:calc\(.*\))?)/i', array($this, 'replace_flex'), $css); |
|
| 269 | 269 | |
| 270 | 270 | // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
| 271 | 271 | $css = preg_replace_callback('/\s*filter\:\s*progid:DXImageTransform\.Microsoft\.Matrix\(([^\)]+)\)/', array($this, 'preserve_old_IE_specific_matrix_definition'), $css); |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | $css = preg_replace('/\!important/i', ' !important', $css); |
| 304 | 304 | |
| 305 | 305 | // bring back the colon |
| 306 | - $css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css); |
|
| 306 | + $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css); |
|
| 307 | 307 | |
| 308 | 308 | // retain space for special IE6 cases |
| 309 | 309 | $css = preg_replace_callback('/\:first\-(line|letter)(\{|,)/i', array($this, 'lowercase_pseudo_first'), $css); |
@@ -376,20 +376,20 @@ discard block |
||
| 376 | 376 | |
| 377 | 377 | // Find a fraction that is used for Opera's -o-device-pixel-ratio query |
| 378 | 378 | // Add token to add the "\" back in later |
| 379 | - $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css); |
|
| 379 | + $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css); |
|
| 380 | 380 | |
| 381 | 381 | // Remove empty rules. |
| 382 | 382 | $css = preg_replace('/[^\};\{\/]+\{\}/S', '', $css); |
| 383 | 383 | |
| 384 | 384 | // Add "/" back to fix Opera -o-device-pixel-ratio query |
| 385 | - $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css); |
|
| 385 | + $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css); |
|
| 386 | 386 | |
| 387 | 387 | // Replace multiple semi-colons in a row by a single one |
| 388 | 388 | // See SF bug #1980989 |
| 389 | 389 | $css = preg_replace('/;;+/', ';', $css); |
| 390 | 390 | |
| 391 | 391 | // Restore new lines for /*! important comments |
| 392 | - $css = preg_replace('/'. self::NL .'/', "\n", $css); |
|
| 392 | + $css = preg_replace('/'.self::NL.'/', "\n", $css); |
|
| 393 | 393 | |
| 394 | 394 | // Lowercase all uppercase properties |
| 395 | 395 | $css = preg_replace_callback('/(\{|\;)([A-Z\-]+)(\:)/', array($this, 'lowercase_properties'), $css); |
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | while ($i < strlen($css)) { |
| 404 | 404 | $i++; |
| 405 | 405 | if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) { |
| 406 | - $css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i); |
|
| 406 | + $css = $this->str_slice($css, 0, $i)."\n".$this->str_slice($css, $i); |
|
| 407 | 407 | $start_index = $i; |
| 408 | 408 | } |
| 409 | 409 | } |
@@ -411,7 +411,7 @@ discard block |
||
| 411 | 411 | |
| 412 | 412 | // restore preserved comments and strings in reverse order |
| 413 | 413 | for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) { |
| 414 | - $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1); |
|
| 414 | + $css = preg_replace('/'.self::TOKEN.$i.'___/', $this->preserved_tokens[$i], $css, 1); |
|
| 415 | 415 | // $css.=$this->preserved_tokens[$i]; |
| 416 | 416 | } |
| 417 | 417 | |
@@ -452,7 +452,7 @@ discard block |
||
| 452 | 452 | $terminator = ')'; |
| 453 | 453 | } |
| 454 | 454 | |
| 455 | - while ($found_terminator === FALSE && $end_index+1 <= $max_index) { |
|
| 455 | + while ($found_terminator === FALSE && $end_index + 1 <= $max_index) { |
|
| 456 | 456 | $end_index = $this->index_of($css, $terminator, $end_index + 1); |
| 457 | 457 | |
| 458 | 458 | // endIndex == 0 doesn't really apply here |
@@ -469,12 +469,12 @@ discard block |
||
| 469 | 469 | |
| 470 | 470 | if ($found_terminator) { |
| 471 | 471 | $token = $this->str_slice($css, $start_index, $end_index); |
| 472 | - if (strpos($token,"<svg")===false && strpos($token,'svg+xml')===false) { |
|
| 472 | + if (strpos($token, "<svg") === false && strpos($token, 'svg+xml') === false) { |
|
| 473 | 473 | $token = preg_replace('/\s+/', '', $token); |
| 474 | 474 | } |
| 475 | 475 | $this->preserved_tokens[] = $token; |
| 476 | 476 | |
| 477 | - $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)'; |
|
| 477 | + $preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)'; |
|
| 478 | 478 | $sb[] = $preserver; |
| 479 | 479 | |
| 480 | 480 | $append_index = $end_index + 1; |
@@ -536,16 +536,16 @@ discard block |
||
| 536 | 536 | |
| 537 | 537 | if ($is_filter) { |
| 538 | 538 | // Restore, maintain case, otherwise filter will break |
| 539 | - $sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]; |
|
| 539 | + $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7]; |
|
| 540 | 540 | } else { |
| 541 | 541 | if (strtolower($m[2]) == strtolower($m[3]) && |
| 542 | 542 | strtolower($m[4]) == strtolower($m[5]) && |
| 543 | 543 | strtolower($m[6]) == strtolower($m[7])) { |
| 544 | 544 | // Compress. |
| 545 | - $hex = '#' . strtolower($m[3] . $m[5] . $m[7]); |
|
| 545 | + $hex = '#'.strtolower($m[3].$m[5].$m[7]); |
|
| 546 | 546 | } else { |
| 547 | 547 | // Non compressible color, restore but lower case. |
| 548 | - $hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]); |
|
| 548 | + $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]); |
|
| 549 | 549 | } |
| 550 | 550 | // replace Hex colors to short safe color names |
| 551 | 551 | $sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex; |
@@ -574,7 +574,7 @@ discard block |
||
| 574 | 574 | // one, maybe more? put'em back then |
| 575 | 575 | if (($pos = $this->index_of($match, self::COMMENT)) >= 0) { |
| 576 | 576 | for ($i = 0, $max = count($this->comments); $i < $max; $i++) { |
| 577 | - $match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1); |
|
| 577 | + $match = preg_replace('/'.self::COMMENT.$i.'___/', $this->comments[$i], $match, 1); |
|
| 578 | 578 | } |
| 579 | 579 | } |
| 580 | 580 | |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | $match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match); |
| 583 | 583 | |
| 584 | 584 | $this->preserved_tokens[] = $match; |
| 585 | - return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote; |
|
| 585 | + return $quote.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.$quote; |
|
| 586 | 586 | } |
| 587 | 587 | |
| 588 | 588 | private function replace_colon($matches) |
@@ -592,34 +592,34 @@ discard block |
||
| 592 | 592 | |
| 593 | 593 | private function replace_calc($matches) |
| 594 | 594 | { |
| 595 | - $this->preserved_tokens[] = preg_replace('/\)([\+\-]{1})/',') $1',preg_replace('/([\+\-]{1})\(/','$1 (',trim(preg_replace('/\s*([\*\/\(\),])\s*/', '$1', $matches[2])))); |
|
| 596 | - return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 595 | + $this->preserved_tokens[] = preg_replace('/\)([\+\-]{1})/', ') $1', preg_replace('/([\+\-]{1})\(/', '$1 (', trim(preg_replace('/\s*([\*\/\(\),])\s*/', '$1', $matches[2])))); |
|
| 596 | + return 'calc('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')'; |
|
| 597 | 597 | } |
| 598 | 598 | |
| 599 | 599 | private function replace_flex($matches) |
| 600 | 600 | { |
| 601 | 601 | $this->preserved_tokens[] = trim($matches[1]); |
| 602 | - return 'flex:'.self::TOKEN . (count($this->preserved_tokens) - 1) . '___'; |
|
| 602 | + return 'flex:'.self::TOKEN.(count($this->preserved_tokens) - 1).'___'; |
|
| 603 | 603 | } |
| 604 | 604 | |
| 605 | 605 | private function preserve_old_IE_specific_matrix_definition($matches) |
| 606 | 606 | { |
| 607 | 607 | $this->preserved_tokens[] = $matches[1]; |
| 608 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 608 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')'; |
|
| 609 | 609 | } |
| 610 | 610 | |
| 611 | 611 | private function replace_keyframe_zero($matches) |
| 612 | 612 | { |
| 613 | - return $matches[1] . preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3]; |
|
| 613 | + return $matches[1].preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]).$matches[3]; |
|
| 614 | 614 | } |
| 615 | 615 | |
| 616 | 616 | private function rgb_to_hex($matches) |
| 617 | 617 | { |
| 618 | 618 | // Support for percentage values rgb(100%, 0%, 45%); |
| 619 | - if ($this->index_of($matches[1], '%') >= 0){ |
|
| 619 | + if ($this->index_of($matches[1], '%') >= 0) { |
|
| 620 | 620 | $rgbcolors = explode(',', str_replace('%', '', $matches[1])); |
| 621 | 621 | for ($i = 0; $i < count($rgbcolors); $i++) { |
| 622 | - $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55); |
|
| 622 | + $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i])*2.55); |
|
| 623 | 623 | } |
| 624 | 624 | } else { |
| 625 | 625 | $rgbcolors = explode(',', $matches[1]); |
@@ -632,11 +632,11 @@ discard block |
||
| 632 | 632 | } |
| 633 | 633 | |
| 634 | 634 | // Fix for issue #2528093 |
| 635 | - if (!preg_match('/[\s\,\);\}]/', $matches[2])){ |
|
| 636 | - $matches[2] = ' ' . $matches[2]; |
|
| 635 | + if (!preg_match('/[\s\,\);\}]/', $matches[2])) { |
|
| 636 | + $matches[2] = ' '.$matches[2]; |
|
| 637 | 637 | } |
| 638 | 638 | |
| 639 | - return '#' . implode('', $rgbcolors) . $matches[2]; |
|
| 639 | + return '#'.implode('', $rgbcolors).$matches[2]; |
|
| 640 | 640 | } |
| 641 | 641 | |
| 642 | 642 | private function hsl_to_hex($matches) |
@@ -647,18 +647,18 @@ discard block |
||
| 647 | 647 | $l = floatval($values[2]); |
| 648 | 648 | |
| 649 | 649 | // Wrap and clamp, then fraction! |
| 650 | - $h = ((($h % 360) + 360) % 360) / 360; |
|
| 651 | - $s = $this->clamp_number($s, 0, 100) / 100; |
|
| 652 | - $l = $this->clamp_number($l, 0, 100) / 100; |
|
| 650 | + $h = ((($h%360) + 360)%360)/360; |
|
| 651 | + $s = $this->clamp_number($s, 0, 100)/100; |
|
| 652 | + $l = $this->clamp_number($l, 0, 100)/100; |
|
| 653 | 653 | |
| 654 | 654 | if ($s == 0) { |
| 655 | - $r = $g = $b = $this->round_number(255 * $l); |
|
| 655 | + $r = $g = $b = $this->round_number(255*$l); |
|
| 656 | 656 | } else { |
| 657 | - $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l); |
|
| 658 | - $v1 = (2 * $l) - $v2; |
|
| 659 | - $r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3))); |
|
| 660 | - $g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h)); |
|
| 661 | - $b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3))); |
|
| 657 | + $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l); |
|
| 658 | + $v1 = (2*$l) - $v2; |
|
| 659 | + $r = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h + (1/3))); |
|
| 660 | + $g = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h)); |
|
| 661 | + $b = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h - (1/3))); |
|
| 662 | 662 | } |
| 663 | 663 | |
| 664 | 664 | return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2])); |
@@ -666,27 +666,27 @@ discard block |
||
| 666 | 666 | |
| 667 | 667 | private function lowercase_pseudo_first($matches) |
| 668 | 668 | { |
| 669 | - return ':first-'. strtolower($matches[1]) .' '. $matches[2]; |
|
| 669 | + return ':first-'.strtolower($matches[1]).' '.$matches[2]; |
|
| 670 | 670 | } |
| 671 | 671 | |
| 672 | 672 | private function lowercase_directives($matches) |
| 673 | 673 | { |
| 674 | - return '@'. strtolower($matches[1]); |
|
| 674 | + return '@'.strtolower($matches[1]); |
|
| 675 | 675 | } |
| 676 | 676 | |
| 677 | 677 | private function lowercase_pseudo_elements($matches) |
| 678 | 678 | { |
| 679 | - return ':'. strtolower($matches[1]); |
|
| 679 | + return ':'.strtolower($matches[1]); |
|
| 680 | 680 | } |
| 681 | 681 | |
| 682 | 682 | private function lowercase_common_functions($matches) |
| 683 | 683 | { |
| 684 | - return ':'. strtolower($matches[1]) .'('; |
|
| 684 | + return ':'.strtolower($matches[1]).'('; |
|
| 685 | 685 | } |
| 686 | 686 | |
| 687 | 687 | private function lowercase_common_functions_values($matches) |
| 688 | 688 | { |
| 689 | - return $matches[1] . strtolower($matches[2]); |
|
| 689 | + return $matches[1].strtolower($matches[2]); |
|
| 690 | 690 | } |
| 691 | 691 | |
| 692 | 692 | private function lowercase_properties($matches) |
@@ -701,9 +701,9 @@ discard block |
||
| 701 | 701 | private function hue_to_rgb($v1, $v2, $vh) |
| 702 | 702 | { |
| 703 | 703 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
| 704 | - if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 705 | - if ($vh * 2 < 1) return $v2; |
|
| 706 | - if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6; |
|
| 704 | + if ($vh*6 < 1) return $v1 + ($v2 - $v1)*6*$vh; |
|
| 705 | + if ($vh*2 < 1) return $v2; |
|
| 706 | + if ($vh*3 < 2) return $v1 + ($v2 - $v1)*((2/3) - $vh)*6; |
|
| 707 | 707 | return $v1; |
| 708 | 708 | } |
| 709 | 709 | |
@@ -778,9 +778,9 @@ discard block |
||
| 778 | 778 | { |
| 779 | 779 | if (is_string($size)) { |
| 780 | 780 | switch (substr($size, -1)) { |
| 781 | - case 'M': case 'm': return (int) $size * 1048576; |
|
| 782 | - case 'K': case 'k': return (int) $size * 1024; |
|
| 783 | - case 'G': case 'g': return (int) $size * 1073741824; |
|
| 781 | + case 'M': case 'm': return (int) $size*1048576; |
|
| 782 | + case 'K': case 'k': return (int) $size*1024; |
|
| 783 | + case 'G': case 'g': return (int) $size*1073741824; |
|
| 784 | 784 | } |
| 785 | 785 | } |
| 786 | 786 | |
@@ -686,6 +686,11 @@ discard block |
||
| 686 | 686 | * --------------------------------------------------------------------------------------------- |
| 687 | 687 | */ |
| 688 | 688 | |
| 689 | + /** |
|
| 690 | + * @param double $v1 |
|
| 691 | + * @param double $v2 |
|
| 692 | + * @param integer $vh |
|
| 693 | + */ |
|
| 689 | 694 | private function hue_to_rgb($v1, $v2, $vh) |
| 690 | 695 | { |
| 691 | 696 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
@@ -700,6 +705,10 @@ discard block |
||
| 700 | 705 | return intval(floor(floatval($n) + 0.5), 10); |
| 701 | 706 | } |
| 702 | 707 | |
| 708 | + /** |
|
| 709 | + * @param integer $min |
|
| 710 | + * @param integer $max |
|
| 711 | + */ |
|
| 703 | 712 | private function clamp_number($n, $min, $max) |
| 704 | 713 | { |
| 705 | 714 | return min(max($n, $min), $max); |
@@ -728,7 +737,7 @@ discard block |
||
| 728 | 737 | * |
| 729 | 738 | * @param string $str |
| 730 | 739 | * @param int $start index |
| 731 | - * @param int|bool $end index (optional) |
|
| 740 | + * @param integer $end index (optional) |
|
| 732 | 741 | * @return string |
| 733 | 742 | */ |
| 734 | 743 | private function str_slice($str, $start = 0, $end = FALSE) |
@@ -12,7 +12,10 @@ discard block |
||
| 12 | 12 | http://www.gnu.org/licenses/gpl.txt |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 15 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 16 | + exit; |
|
| 17 | +} |
|
| 18 | +// Exit if accessed directly |
|
| 16 | 19 | |
| 17 | 20 | define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__)); |
| 18 | 21 | |
@@ -224,12 +227,15 @@ discard block |
||
| 224 | 227 | |
| 225 | 228 | // Choose the classes |
| 226 | 229 | $classes = array(); |
| 227 | - if($conf->get('autoptimize_js')) |
|
| 228 | - $classes[] = 'autoptimizeScripts'; |
|
| 229 | - if($conf->get('autoptimize_css')) |
|
| 230 | - $classes[] = 'autoptimizeStyles'; |
|
| 231 | - if($conf->get('autoptimize_html')) |
|
| 232 | - $classes[] = 'autoptimizeHTML'; |
|
| 230 | + if($conf->get('autoptimize_js')) { |
|
| 231 | + $classes[] = 'autoptimizeScripts'; |
|
| 232 | + } |
|
| 233 | + if($conf->get('autoptimize_css')) { |
|
| 234 | + $classes[] = 'autoptimizeStyles'; |
|
| 235 | + } |
|
| 236 | + if($conf->get('autoptimize_html')) { |
|
| 237 | + $classes[] = 'autoptimizeHTML'; |
|
| 238 | + } |
|
| 233 | 239 | |
| 234 | 240 | // Set some options |
| 235 | 241 | $classoptions = array( |
@@ -132,21 +132,21 @@ |
||
| 132 | 132 | $ao_noptimize = true; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - // if setting says not to optimize logged in user and user is logged in |
|
| 136 | - if ( get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts') ) { |
|
| 137 | - $ao_noptimize = true; |
|
| 138 | - } |
|
| 139 | - |
|
| 140 | - // if setting says not to optimize cart/ checkout |
|
| 141 | - if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) { |
|
| 142 | - // checking for woocommerce, easy digital downloads and wp ecommerce |
|
| 143 | - foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) { |
|
| 144 | - if ( function_exists($shopCond) && $shopCond() ) { |
|
| 145 | - $ao_noptimize = true; |
|
| 146 | - break; |
|
| 147 | - } |
|
| 148 | - } |
|
| 149 | - } |
|
| 135 | + // if setting says not to optimize logged in user and user is logged in |
|
| 136 | + if ( get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts') ) { |
|
| 137 | + $ao_noptimize = true; |
|
| 138 | + } |
|
| 139 | + |
|
| 140 | + // if setting says not to optimize cart/ checkout |
|
| 141 | + if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) { |
|
| 142 | + // checking for woocommerce, easy digital downloads and wp ecommerce |
|
| 143 | + foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) { |
|
| 144 | + if ( function_exists($shopCond) && $shopCond() ) { |
|
| 145 | + $ao_noptimize = true; |
|
| 146 | + break; |
|
| 147 | + } |
|
| 148 | + } |
|
| 149 | + } |
|
| 150 | 150 | |
| 151 | 151 | // filter you can use to block autoptimization on your own terms |
| 152 | 152 | $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize ); |
@@ -12,15 +12,15 @@ discard block |
||
| 12 | 12 | http://www.gnu.org/licenses/gpl.txt |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 15 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 16 | 16 | |
| 17 | -define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__)); |
|
| 17 | +define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__)); |
|
| 18 | 18 | |
| 19 | 19 | // Load config class |
| 20 | 20 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeConfig.php'); |
| 21 | 21 | |
| 22 | 22 | // Load toolbar class |
| 23 | -include( AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php' ); |
|
| 23 | +include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php'); |
|
| 24 | 24 | |
| 25 | 25 | // Load partners tab if admin |
| 26 | 26 | if (is_admin()) { |
@@ -28,25 +28,25 @@ discard block |
||
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | // Do we gzip when caching (needed early to load autoptimizeCache.php) |
| 31 | -define('AUTOPTIMIZE_CACHE_NOGZIP',(bool) get_option('autoptimize_cache_nogzip')); |
|
| 31 | +define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip')); |
|
| 32 | 32 | |
| 33 | 33 | // Load cache class |
| 34 | 34 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCache.php'); |
| 35 | 35 | |
| 36 | 36 | // wp-content dir name (automagically set, should not be needed), dirname of AO cache dir and AO-prefix can be overridden in wp-config.php |
| 37 | -if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME','/'.wp_basename( WP_CONTENT_DIR )); } |
|
| 38 | -if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR','/cache/autoptimize/'); } |
|
| 37 | +if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); } |
|
| 38 | +if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); } |
|
| 39 | 39 | if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); } |
| 40 | 40 | |
| 41 | 41 | // Plugin dir constants (plugin url's defined later to accomodate domain mapped sites) |
| 42 | -if (is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true )) { |
|
| 42 | +if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
| 43 | 43 | $blog_id = get_current_blog_id(); |
| 44 | - define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' ); |
|
| 44 | + define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/'); |
|
| 45 | 45 | } else { |
| 46 | 46 | define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR); |
| 47 | 47 | } |
| 48 | -define('AUTOPTIMIZE_CACHE_DELAY',true); |
|
| 49 | -define('WP_ROOT_DIR',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',WP_CONTENT_DIR)); |
|
| 48 | +define('AUTOPTIMIZE_CACHE_DELAY', true); |
|
| 49 | +define('WP_ROOT_DIR', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', WP_CONTENT_DIR)); |
|
| 50 | 50 | |
| 51 | 51 | // Initialize the cache at least once |
| 52 | 52 | $conf = autoptimizeConfig::instance(); |
@@ -54,65 +54,65 @@ discard block |
||
| 54 | 54 | /* Check if we're updating, in which case we might need to do stuff and flush the cache |
| 55 | 55 | to avoid old versions of aggregated files lingering around */ |
| 56 | 56 | |
| 57 | -$autoptimize_version="2.2.0"; |
|
| 58 | -$autoptimize_db_version=get_option('autoptimize_version','none'); |
|
| 57 | +$autoptimize_version = "2.2.0"; |
|
| 58 | +$autoptimize_db_version = get_option('autoptimize_version', 'none'); |
|
| 59 | 59 | |
| 60 | 60 | if ($autoptimize_db_version !== $autoptimize_version) { |
| 61 | - if ($autoptimize_db_version==="none") { |
|
| 61 | + if ($autoptimize_db_version === "none") { |
|
| 62 | 62 | add_action('admin_notices', 'autoptimize_install_config_notice'); |
| 63 | 63 | } else { |
| 64 | 64 | // updating, include the update-code |
| 65 | 65 | include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeUpdateCode.php'); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - update_option('autoptimize_version',$autoptimize_version); |
|
| 69 | - $autoptimize_db_version=$autoptimize_version; |
|
| 68 | + update_option('autoptimize_version', $autoptimize_version); |
|
| 69 | + $autoptimize_db_version = $autoptimize_version; |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | // Load translations |
| 73 | 73 | function autoptimize_load_plugin_textdomain() { |
| 74 | - load_plugin_textdomain('autoptimize',false,plugin_basename(dirname( __FILE__ )).'/localization'); |
|
| 74 | + load_plugin_textdomain('autoptimize', false, plugin_basename(dirname(__FILE__)).'/localization'); |
|
| 75 | 75 | } |
| 76 | -add_action( 'init', 'autoptimize_load_plugin_textdomain' ); |
|
| 76 | +add_action('init', 'autoptimize_load_plugin_textdomain'); |
|
| 77 | 77 | |
| 78 | -function autoptimize_uninstall(){ |
|
| 78 | +function autoptimize_uninstall() { |
|
| 79 | 79 | autoptimizeCache::clearall(); |
| 80 | 80 | |
| 81 | - $delete_options=array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice","autoptimize_css_include_inline","autoptimize_js_include_inline","autoptimize_css_nogooglefont","autoptimize_optimize_logged","autoptimize_optimize_checkout"); |
|
| 81 | + $delete_options = array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice", "autoptimize_css_include_inline", "autoptimize_js_include_inline", "autoptimize_css_nogooglefont", "autoptimize_optimize_logged", "autoptimize_optimize_checkout"); |
|
| 82 | 82 | |
| 83 | - if ( !is_multisite() ) { |
|
| 84 | - foreach ($delete_options as $del_opt) { delete_option( $del_opt ); } |
|
| 83 | + if (!is_multisite()) { |
|
| 84 | + foreach ($delete_options as $del_opt) { delete_option($del_opt); } |
|
| 85 | 85 | } else { |
| 86 | 86 | global $wpdb; |
| 87 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 87 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 88 | 88 | $original_blog_id = get_current_blog_id(); |
| 89 | - foreach ( $blog_ids as $blog_id ) { |
|
| 90 | - switch_to_blog( $blog_id ); |
|
| 91 | - foreach ($delete_options as $del_opt) { delete_option( $del_opt ); } |
|
| 89 | + foreach ($blog_ids as $blog_id) { |
|
| 90 | + switch_to_blog($blog_id); |
|
| 91 | + foreach ($delete_options as $del_opt) { delete_option($del_opt); } |
|
| 92 | 92 | } |
| 93 | - switch_to_blog( $original_blog_id ); |
|
| 93 | + switch_to_blog($original_blog_id); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - if ( wp_get_schedule( 'ao_cachechecker' ) ) { |
|
| 97 | - wp_clear_scheduled_hook( 'ao_cachechecker' ); |
|
| 96 | + if (wp_get_schedule('ao_cachechecker')) { |
|
| 97 | + wp_clear_scheduled_hook('ao_cachechecker'); |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | function autoptimize_install_config_notice() { |
| 102 | 102 | echo '<div class="updated"><p>'; |
| 103 | - _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' ); |
|
| 103 | + _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize'); |
|
| 104 | 104 | echo '</p></div>'; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | function autoptimize_update_config_notice() { |
| 108 | 108 | echo '<div class="updated"><p>'; |
| 109 | - _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' ); |
|
| 109 | + _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize'); |
|
| 110 | 110 | echo '</p></div>'; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | function autoptimize_cache_unavailable_notice() { |
| 114 | 114 | echo '<div class="error"><p>'; |
| 115 | - printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR ); |
|
| 115 | + printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR); |
|
| 116 | 116 | echo '</p></div>'; |
| 117 | 117 | } |
| 118 | 118 | |
@@ -121,27 +121,27 @@ discard block |
||
| 121 | 121 | $ao_noptimize = false; |
| 122 | 122 | |
| 123 | 123 | // noptimize in qs to get non-optimized page for debugging |
| 124 | - if (array_key_exists("ao_noptimize",$_GET) || array_key_exists("ao_noptirocket",$_GET)) { |
|
| 125 | - if ( ( ($_GET["ao_noptimize"]==="1") || ($_GET["ao_noptirocket"]==="1") ) && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) { |
|
| 124 | + if (array_key_exists("ao_noptimize", $_GET) || array_key_exists("ao_noptirocket", $_GET)) { |
|
| 125 | + if ((($_GET["ao_noptimize"] === "1") || ($_GET["ao_noptirocket"] === "1")) && (apply_filters('autoptimize_filter_honor_qs_noptimize', true))) { |
|
| 126 | 126 | $ao_noptimize = true; |
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | // check for DONOTMINIFY constant as used by e.g. WooCommerce POS |
| 131 | - if (defined('DONOTMINIFY') && (constant('DONOTMINIFY')===true || constant('DONOTMINIFY')==="true")) { |
|
| 131 | + if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === "true")) { |
|
| 132 | 132 | $ao_noptimize = true; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | // if setting says not to optimize logged in user and user is logged in |
| 136 | - if ( get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts') ) { |
|
| 136 | + if (get_option('autoptimize_optimize_logged', 'on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts')) { |
|
| 137 | 137 | $ao_noptimize = true; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | // if setting says not to optimize cart/ checkout |
| 141 | - if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) { |
|
| 141 | + if (get_option('autoptimize_optimize_checkout', 'on') !== 'on') { |
|
| 142 | 142 | // checking for woocommerce, easy digital downloads and wp ecommerce |
| 143 | - foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) { |
|
| 144 | - if ( function_exists($shopCond) && $shopCond() ) { |
|
| 143 | + foreach (array("is_checkout", "is_cart", "edd_is_checkout", "wpsc_is_cart", "wpsc_is_checkout") as $shopCond) { |
|
| 144 | + if (function_exists($shopCond) && $shopCond()) { |
|
| 145 | 145 | $ao_noptimize = true; |
| 146 | 146 | break; |
| 147 | 147 | } |
@@ -149,11 +149,11 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // filter you can use to block autoptimization on your own terms |
| 152 | - $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize ); |
|
| 152 | + $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize); |
|
| 153 | 153 | |
| 154 | - if (!is_feed() && !$ao_noptimize && !is_admin() && ( !function_exists('is_customize_preview') || !is_customize_preview() ) ) { |
|
| 154 | + if (!is_feed() && !$ao_noptimize && !is_admin() && (!function_exists('is_customize_preview') || !is_customize_preview())) { |
|
| 155 | 155 | // load speedupper conditionally (true by default?) |
| 156 | - if ( apply_filters('autoptimize_filter_speedupper', true) ) { |
|
| 156 | + if (apply_filters('autoptimize_filter_speedupper', true)) { |
|
| 157 | 157 | include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeSpeedupper.php'); |
| 158 | 158 | } |
| 159 | 159 | |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeBase.php'); |
| 165 | 165 | |
| 166 | 166 | // Load extra classes and set some vars |
| 167 | - if($conf->get('autoptimize_html')) { |
|
| 167 | + if ($conf->get('autoptimize_html')) { |
|
| 168 | 168 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeHTML.php'); |
| 169 | 169 | // BUG: new minify-html does not support keeping HTML comments, skipping for now |
| 170 | 170 | // if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | // } |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - if($conf->get('autoptimize_js')) { |
|
| 177 | + if ($conf->get('autoptimize_js')) { |
|
| 178 | 178 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeScripts.php'); |
| 179 | 179 | if (!class_exists('JSMin')) { |
| 180 | 180 | if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
@@ -183,15 +183,15 @@ discard block |
||
| 183 | 183 | @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/minify-2.3.1-jsmin.php'); |
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | - if ( ! defined( 'CONCATENATE_SCRIPTS' )) { |
|
| 187 | - define('CONCATENATE_SCRIPTS',false); |
|
| 186 | + if (!defined('CONCATENATE_SCRIPTS')) { |
|
| 187 | + define('CONCATENATE_SCRIPTS', false); |
|
| 188 | 188 | } |
| 189 | - if ( ! defined( 'COMPRESS_SCRIPTS' )) { |
|
| 190 | - define('COMPRESS_SCRIPTS',false); |
|
| 189 | + if (!defined('COMPRESS_SCRIPTS')) { |
|
| 190 | + define('COMPRESS_SCRIPTS', false); |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | - if($conf->get('autoptimize_css')) { |
|
| 194 | + if ($conf->get('autoptimize_css')) { |
|
| 195 | 195 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeStyles.php'); |
| 196 | 196 | if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
| 197 | 197 | if (!class_exists('Minify_CSS_Compressor')) { |
@@ -202,13 +202,13 @@ discard block |
||
| 202 | 202 | @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-4_fgo.php'); |
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | - if ( ! defined( 'COMPRESS_CSS' )) { |
|
| 206 | - define('COMPRESS_CSS',false); |
|
| 205 | + if (!defined('COMPRESS_CSS')) { |
|
| 206 | + define('COMPRESS_CSS', false); |
|
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | // filter to be used with care, kills all output buffers when true. use with extreme caution. you have been warned! |
| 211 | - if (apply_filters('autoptimize_filter_obkiller',false)) { |
|
| 211 | + if (apply_filters('autoptimize_filter_obkiller', false)) { |
|
| 212 | 212 | while (ob_get_level() > 0) { |
| 213 | 213 | ob_end_clean(); |
| 214 | 214 | } |
@@ -220,36 +220,36 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | // Action on end, this is where the magic happens |
| 222 | 222 | function autoptimize_end_buffering($content) { |
| 223 | - if ( ((stripos($content,"<html") === false) && (stripos($content,"<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/',$content) === 1 || stripos($content,"<xsl:stylesheet") !== false ) { return $content; } |
|
| 223 | + if (((stripos($content, "<html") === false) && (stripos($content, "<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/', $content) === 1 || stripos($content, "<xsl:stylesheet") !== false) { return $content; } |
|
| 224 | 224 | |
| 225 | 225 | // load URL constants as late as possible to allow domain mapper to kick in |
| 226 | 226 | if (function_exists("domain_mapping_siteurl")) { |
| 227 | - define('AUTOPTIMIZE_WP_SITE_URL',domain_mapping_siteurl(get_current_blog_id())); |
|
| 228 | - define('AUTOPTIMIZE_WP_CONTENT_URL',str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL),AUTOPTIMIZE_WP_SITE_URL,content_url())); |
|
| 227 | + define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id())); |
|
| 228 | + define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url())); |
|
| 229 | 229 | } else { |
| 230 | - define('AUTOPTIMIZE_WP_SITE_URL',site_url()); |
|
| 231 | - define('AUTOPTIMIZE_WP_CONTENT_URL',content_url()); |
|
| 230 | + define('AUTOPTIMIZE_WP_SITE_URL', site_url()); |
|
| 231 | + define('AUTOPTIMIZE_WP_CONTENT_URL', content_url()); |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true ) ) { |
|
| 234 | + if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
| 235 | 235 | $blog_id = get_current_blog_id(); |
| 236 | - define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' ); |
|
| 236 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/'); |
|
| 237 | 237 | } else { |
| 238 | - define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
| 238 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
| 239 | 239 | } |
| 240 | - define('AUTOPTIMIZE_WP_ROOT_URL',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',AUTOPTIMIZE_WP_CONTENT_URL)); |
|
| 241 | - define('AUTOPTIMIZE_HASH',wp_hash(AUTOPTIMIZE_CACHE_DIR)); |
|
| 240 | + define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL)); |
|
| 241 | + define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_DIR)); |
|
| 242 | 242 | |
| 243 | 243 | // Config element |
| 244 | 244 | $conf = autoptimizeConfig::instance(); |
| 245 | 245 | |
| 246 | 246 | // Choose the classes |
| 247 | 247 | $classes = array(); |
| 248 | - if($conf->get('autoptimize_js')) |
|
| 248 | + if ($conf->get('autoptimize_js')) |
|
| 249 | 249 | $classes[] = 'autoptimizeScripts'; |
| 250 | - if($conf->get('autoptimize_css')) |
|
| 250 | + if ($conf->get('autoptimize_css')) |
|
| 251 | 251 | $classes[] = 'autoptimizeStyles'; |
| 252 | - if($conf->get('autoptimize_html')) |
|
| 252 | + if ($conf->get('autoptimize_html')) |
|
| 253 | 253 | $classes[] = 'autoptimizeHTML'; |
| 254 | 254 | |
| 255 | 255 | // Set some options |
@@ -278,12 +278,12 @@ discard block |
||
| 278 | 278 | ) |
| 279 | 279 | ); |
| 280 | 280 | |
| 281 | - $content = apply_filters( 'autoptimize_filter_html_before_minify', $content ); |
|
| 281 | + $content = apply_filters('autoptimize_filter_html_before_minify', $content); |
|
| 282 | 282 | |
| 283 | 283 | // Run the classes |
| 284 | - foreach($classes as $name) { |
|
| 284 | + foreach ($classes as $name) { |
|
| 285 | 285 | $instance = new $name($content); |
| 286 | - if($instance->read($classoptions[$name])) { |
|
| 286 | + if ($instance->read($classoptions[$name])) { |
|
| 287 | 287 | $instance->minify(); |
| 288 | 288 | $instance->cache(); |
| 289 | 289 | $content = $instance->getcontent(); |
@@ -291,19 +291,19 @@ discard block |
||
| 291 | 291 | unset($instance); |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | - $content = apply_filters( 'autoptimize_html_after_minify', $content ); |
|
| 294 | + $content = apply_filters('autoptimize_html_after_minify', $content); |
|
| 295 | 295 | return $content; |
| 296 | 296 | } |
| 297 | 297 | |
| 298 | -if ( autoptimizeCache::cacheavail() ) { |
|
| 298 | +if (autoptimizeCache::cacheavail()) { |
|
| 299 | 299 | $conf = autoptimizeConfig::instance(); |
| 300 | - if( $conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') ) { |
|
| 300 | + if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) { |
|
| 301 | 301 | // Hook to wordpress |
| 302 | 302 | if (defined('AUTOPTIMIZE_INIT_EARLIER')) { |
| 303 | - add_action('init','autoptimize_start_buffering',-1); |
|
| 303 | + add_action('init', 'autoptimize_start_buffering', -1); |
|
| 304 | 304 | } else { |
| 305 | 305 | if (!defined('AUTOPTIMIZE_HOOK_INTO')) { define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); } |
| 306 | - add_action(constant("AUTOPTIMIZE_HOOK_INTO"),'autoptimize_start_buffering',2); |
|
| 306 | + add_action(constant("AUTOPTIMIZE_HOOK_INTO"), 'autoptimize_start_buffering', 2); |
|
| 307 | 307 | } |
| 308 | 308 | } |
| 309 | 309 | } else { |
@@ -311,9 +311,9 @@ discard block |
||
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | function autoptimize_activate() { |
| 314 | - register_uninstall_hook( __FILE__, 'autoptimize_uninstall' ); |
|
| 314 | + register_uninstall_hook(__FILE__, 'autoptimize_uninstall'); |
|
| 315 | 315 | } |
| 316 | -register_activation_hook( __FILE__, 'autoptimize_activate' ); |
|
| 316 | +register_activation_hook(__FILE__, 'autoptimize_activate'); |
|
| 317 | 317 | |
| 318 | 318 | include_once('classlesses/autoptimizeCacheChecker.php'); |
| 319 | 319 | |
@@ -75,18 +75,18 @@ |
||
| 75 | 75 | $wp_admin_bar->add_node( array( |
| 76 | 76 | 'id' => 'autoptimize-cache-info', |
| 77 | 77 | 'title' => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' . |
| 78 | - '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
| 79 | - '<div class="circle">'. |
|
| 80 | - '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 81 | - '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 82 | - '<div class="shadow"></div>'. |
|
| 83 | - '</div>'. |
|
| 84 | - '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'. |
|
| 85 | - '</div>' . |
|
| 86 | - '<table>' . |
|
| 87 | - '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
| 88 | - '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
| 89 | - '</table>', |
|
| 78 | + '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
| 79 | + '<div class="circle">'. |
|
| 80 | + '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 81 | + '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 82 | + '<div class="shadow"></div>'. |
|
| 83 | + '</div>'. |
|
| 84 | + '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'. |
|
| 85 | + '</div>' . |
|
| 86 | + '<table>' . |
|
| 87 | + '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
| 88 | + '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
| 89 | + '</table>', |
|
| 90 | 90 | 'parent' => 'autoptimize' |
| 91 | 91 | )); |
| 92 | 92 | |
@@ -1,35 +1,35 @@ 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 | class autoptimizeToolbar |
| 4 | 4 | { |
| 5 | 5 | public function __construct() |
| 6 | 6 | { |
| 7 | 7 | // If Cache is not available we don't add the Autoptimize Toolbar |
| 8 | - if( ! autoptimizeCache::cacheavail() ) { |
|
| 8 | + if (!autoptimizeCache::cacheavail()) { |
|
| 9 | 9 | return; |
| 10 | 10 | } |
| 11 | 11 | // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated. |
| 12 | - add_action( 'wp_loaded', array( $this, 'load_toolbar' ) ); |
|
| 12 | + add_action('wp_loaded', array($this, 'load_toolbar')); |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | public function load_toolbar() |
| 16 | 16 | { |
| 17 | 17 | // Check permissions and that toolbar is not hidden via filter |
| 18 | - if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) { |
|
| 18 | + if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) { |
|
| 19 | 19 | // Create a handler for the AJAX toolbar requests |
| 20 | - add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) ); |
|
| 20 | + add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache')); |
|
| 21 | 21 | |
| 22 | 22 | // Load custom styles, scripts and menu only when needed |
| 23 | - if ( is_admin_bar_showing() ) { |
|
| 24 | - if ( is_admin() ) { |
|
| 23 | + if (is_admin_bar_showing()) { |
|
| 24 | + if (is_admin()) { |
|
| 25 | 25 | // in the case of back-end |
| 26 | - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 26 | + add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 27 | 27 | } else { |
| 28 | 28 | // in the case of front-end |
| 29 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 29 | + add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 30 | 30 | } |
| 31 | 31 | // Add the Autoptimize Toolbar to the Admin bar |
| 32 | - add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 ); |
|
| 32 | + add_action('admin_bar_menu', array($this, 'add_toolbar'), 100); |
|
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $stats = autoptimizeCache::stats(); |
| 43 | 43 | |
| 44 | 44 | // Set the Max Size recommended for cache files |
| 45 | - $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 ); |
|
| 45 | + $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024); |
|
| 46 | 46 | |
| 47 | 47 | // Retrieve the current Total Files in cache |
| 48 | 48 | $files = $stats[0]; |
@@ -52,83 +52,83 @@ discard block |
||
| 52 | 52 | $size = $this->format_filesize($bytes); |
| 53 | 53 | |
| 54 | 54 | // We calculated the percentage of cache used |
| 55 | - $percentage = ceil( $bytes / $max_size * 100 ); |
|
| 56 | - if ( $percentage > 100 ) { |
|
| 55 | + $percentage = ceil($bytes/$max_size*100); |
|
| 56 | + if ($percentage > 100) { |
|
| 57 | 57 | $percentage = 100; |
| 58 | 58 | } |
| 59 | 59 | // We define the type of color indicator for the current state of cache size. |
| 60 | 60 | // "green" if the size is less than 80% of the total recommended |
| 61 | 61 | // "orange" if over 80% |
| 62 | 62 | // "red" if over 100% |
| 63 | - $color = ( $percentage == 100 ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' ); |
|
| 63 | + $color = ($percentage == 100) ? 'red' : (($percentage > 80) ? 'orange' : 'green'); |
|
| 64 | 64 | |
| 65 | 65 | // Create or add new items into the Admin Toolbar. |
| 66 | 66 | // Main Autoptimize node |
| 67 | - $wp_admin_bar->add_node( array( |
|
| 67 | + $wp_admin_bar->add_node(array( |
|
| 68 | 68 | 'id' => 'autoptimize', |
| 69 | - 'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( "Autoptimize", 'autoptimize' ) . '</span>', |
|
| 70 | - 'href' => admin_url( 'options-general.php?page=autoptimize' ), |
|
| 71 | - 'meta' => array( 'class' => 'bullet-' . $color ) |
|
| 69 | + 'title' => '<span class="ab-icon"></span><span class="ab-label">'.__("Autoptimize", 'autoptimize').'</span>', |
|
| 70 | + 'href' => admin_url('options-general.php?page=autoptimize'), |
|
| 71 | + 'meta' => array('class' => 'bullet-'.$color) |
|
| 72 | 72 | )); |
| 73 | 73 | |
| 74 | 74 | // Cache Info node |
| 75 | - $wp_admin_bar->add_node( array( |
|
| 75 | + $wp_admin_bar->add_node(array( |
|
| 76 | 76 | 'id' => 'autoptimize-cache-info', |
| 77 | - 'title' => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' . |
|
| 78 | - '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
| 77 | + 'title' => '<p>'.__("Cache Info", 'autoptimize').'</p>'. |
|
| 78 | + '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'. |
|
| 79 | 79 | '<div class="circle">'. |
| 80 | - '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 81 | - '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 80 | + '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 81 | + '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 82 | 82 | '<div class="shadow"></div>'. |
| 83 | 83 | '</div>'. |
| 84 | - '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'. |
|
| 85 | - '</div>' . |
|
| 86 | - '<table>' . |
|
| 87 | - '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
| 88 | - '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
| 84 | + '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'. |
|
| 85 | + '</div>'. |
|
| 86 | + '<table>'. |
|
| 87 | + '<tr><td>'.__("Size", 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'. |
|
| 88 | + '<tr><td>'.__("Files", 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'. |
|
| 89 | 89 | '</table>', |
| 90 | 90 | 'parent' => 'autoptimize' |
| 91 | 91 | )); |
| 92 | 92 | |
| 93 | 93 | // Delete Cache node |
| 94 | - $wp_admin_bar->add_node( array( |
|
| 94 | + $wp_admin_bar->add_node(array( |
|
| 95 | 95 | 'id' => 'autoptimize-delete-cache', |
| 96 | - 'title' => __( "Delete Cache", 'autoptimize' ), |
|
| 96 | + 'title' => __("Delete Cache", 'autoptimize'), |
|
| 97 | 97 | 'parent' => 'autoptimize' |
| 98 | 98 | )); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | public function delete_cache() |
| 102 | 102 | { |
| 103 | - check_ajax_referer( 'ao_delcache_nonce', 'nonce' ); |
|
| 103 | + check_ajax_referer('ao_delcache_nonce', 'nonce'); |
|
| 104 | 104 | $result = false; |
| 105 | - if ( current_user_can( 'manage_options' ) ) |
|
| 105 | + if (current_user_can('manage_options')) |
|
| 106 | 106 | { |
| 107 | 107 | // We call the function for cleaning the Autoptimize cache |
| 108 | 108 | $result = autoptimizeCache::clearall(); |
| 109 | 109 | } |
| 110 | - wp_send_json( $result ); |
|
| 110 | + wp_send_json($result); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | public function enqueue_scripts() |
| 114 | 114 | { |
| 115 | 115 | // Autoptimize Toolbar Styles |
| 116 | - wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), time(), 'all' ); |
|
| 116 | + wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), time(), 'all'); |
|
| 117 | 117 | // Autoptimize Toolbar Javascript |
| 118 | - wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), time(), true ); |
|
| 118 | + wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), time(), true); |
|
| 119 | 119 | // Localizes a registered script with data for a JavaScript variable. (We need this for the AJAX work properly in the front-end mode) |
| 120 | - wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 121 | - 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
|
| 122 | - 'error_msg' => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ), |
|
| 123 | - 'dismiss_msg' => __( 'Dismiss this notice.' ), |
|
| 124 | - 'nonce' => wp_create_nonce( 'ao_delcache_nonce' ) |
|
| 125 | - ) ); |
|
| 120 | + wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 121 | + 'ajaxurl' => admin_url('admin-ajax.php'), |
|
| 122 | + 'error_msg' => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'), |
|
| 123 | + 'dismiss_msg' => __('Dismiss this notice.'), |
|
| 124 | + 'nonce' => wp_create_nonce('ao_delcache_nonce') |
|
| 125 | + )); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | public function format_filesize($bytes, $decimals = 2) |
| 129 | 129 | { |
| 130 | - $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ); |
|
| 131 | - for ($i = 0; ($bytes / 1024) > 0.9; $i++, $bytes /= 1024) {} |
|
| 132 | - return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[$i] ); |
|
| 130 | + $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); |
|
| 131 | + for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} |
|
| 132 | + return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]); |
|
| 133 | 133 | } |
| 134 | 134 | } |
@@ -1,5 +1,8 @@ |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | class autoptimizeToolbar |
| 4 | 7 | { |
| 5 | 8 | public function __construct() |
@@ -1,5 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | abstract class autoptimizeBase { |
| 5 | 8 | protected $content = ''; |
@@ -122,7 +125,9 @@ discard block |
||
| 122 | 125 | $out = parse_url($in,PHP_URL_HOST); |
| 123 | 126 | |
| 124 | 127 | // fallback if parse_url does not understand the url is in fact a url |
| 125 | - if (empty($out)) $out=$in; |
|
| 128 | + if (empty($out)) { |
|
| 129 | + $out=$in; |
|
| 130 | + } |
|
| 126 | 131 | |
| 127 | 132 | return $out; |
| 128 | 133 | } |
@@ -359,7 +364,9 @@ discard block |
||
| 359 | 364 | |
| 360 | 365 | // read file, return false if empty |
| 361 | 366 | $_toMinify = file_get_contents($pathIn); |
| 362 | - if ( empty($_toMinify) ) return false; |
|
| 367 | + if ( empty($_toMinify) ) { |
|
| 368 | + return false; |
|
| 369 | + } |
|
| 363 | 370 | |
| 364 | 371 | // check cache |
| 365 | 372 | $_md5hash = "single_".md5($_toMinify); |
@@ -341,43 +341,43 @@ discard block |
||
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | protected function minify_single($pathIn) { |
| 344 | - // determine JS or CSS and set var (also mimetype), return false if neither |
|
| 345 | - if ( $this->str_ends_in($pathIn,".js") === true ) { |
|
| 346 | - $codeType="js"; |
|
| 347 | - $codeMime="text/javascript"; |
|
| 348 | - } else if ( $this->str_ends_in($pathIn,".css") === true ) { |
|
| 349 | - $codeType="css"; |
|
| 350 | - $codeMime="text/css"; |
|
| 351 | - } else { |
|
| 352 | - return false; |
|
| 353 | - } |
|
| 344 | + // determine JS or CSS and set var (also mimetype), return false if neither |
|
| 345 | + if ( $this->str_ends_in($pathIn,".js") === true ) { |
|
| 346 | + $codeType="js"; |
|
| 347 | + $codeMime="text/javascript"; |
|
| 348 | + } else if ( $this->str_ends_in($pathIn,".css") === true ) { |
|
| 349 | + $codeType="css"; |
|
| 350 | + $codeMime="text/css"; |
|
| 351 | + } else { |
|
| 352 | + return false; |
|
| 353 | + } |
|
| 354 | 354 | |
| 355 | - // if min.js or min.css return false |
|
| 356 | - if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) { |
|
| 357 | - return false; |
|
| 358 | - } |
|
| 355 | + // if min.js or min.css return false |
|
| 356 | + if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) { |
|
| 357 | + return false; |
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - // read file, return false if empty |
|
| 361 | - $_toMinify = file_get_contents($pathIn); |
|
| 362 | - if ( empty($_toMinify) ) return false; |
|
| 360 | + // read file, return false if empty |
|
| 361 | + $_toMinify = file_get_contents($pathIn); |
|
| 362 | + if ( empty($_toMinify) ) return false; |
|
| 363 | 363 | |
| 364 | - // check cache |
|
| 365 | - $_md5hash = "single_".md5($_toMinify); |
|
| 366 | - $_cache = new autoptimizeCache($_md5hash,$codeType); |
|
| 367 | - if ($_cache->check() ) { |
|
| 368 | - $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
| 369 | - } else { |
|
| 370 | - // if not in cache first minify |
|
| 371 | - $_Minified = $_toMinify; |
|
| 372 | - if ($codeType === "js") { |
|
| 373 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 374 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 375 | - $tmp_code = trim(JSMin::minify($_toMinify)); |
|
| 376 | - } |
|
| 377 | - } |
|
| 378 | - } else if ($codeType === "css") { |
|
| 364 | + // check cache |
|
| 365 | + $_md5hash = "single_".md5($_toMinify); |
|
| 366 | + $_cache = new autoptimizeCache($_md5hash,$codeType); |
|
| 367 | + if ($_cache->check() ) { |
|
| 368 | + $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
| 369 | + } else { |
|
| 370 | + // if not in cache first minify |
|
| 371 | + $_Minified = $_toMinify; |
|
| 372 | + if ($codeType === "js") { |
|
| 373 | + if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 374 | + if (@is_callable(array("JSMin","minify"))) { |
|
| 375 | + $tmp_code = trim(JSMin::minify($_toMinify)); |
|
| 376 | + } |
|
| 377 | + } |
|
| 378 | + } else if ($codeType === "css") { |
|
| 379 | 379 | if (class_exists('Minify_CSS_Compressor')) { |
| 380 | - $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify)); |
|
| 380 | + $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify)); |
|
| 381 | 381 | } else if(class_exists('CSSmin')) { |
| 382 | 382 | $cssmin = new CSSmin(); |
| 383 | 383 | if (method_exists($cssmin,"run")) { |
@@ -386,31 +386,31 @@ discard block |
||
| 386 | 386 | $tmp_code = trim(CssMin::minify($_toMinify)); |
| 387 | 387 | } |
| 388 | 388 | } |
| 389 | - } |
|
| 390 | - if (!empty($tmp_code)) { |
|
| 391 | - $_Minified = $tmp_code; |
|
| 392 | - unset($tmp_code); |
|
| 393 | - } |
|
| 394 | - // and then cache |
|
| 395 | - $_cache->cache($_Minified,$codeMime); |
|
| 396 | - $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
| 397 | - } |
|
| 398 | - unset($_cache); |
|
| 389 | + } |
|
| 390 | + if (!empty($tmp_code)) { |
|
| 391 | + $_Minified = $tmp_code; |
|
| 392 | + unset($tmp_code); |
|
| 393 | + } |
|
| 394 | + // and then cache |
|
| 395 | + $_cache->cache($_Minified,$codeMime); |
|
| 396 | + $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
|
| 397 | + } |
|
| 398 | + unset($_cache); |
|
| 399 | 399 | |
| 400 | - // if CDN, then CDN |
|
| 401 | - $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl); |
|
| 400 | + // if CDN, then CDN |
|
| 401 | + $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl); |
|
| 402 | 402 | |
| 403 | - return $_CachedMinifiedUrl; |
|
| 404 | - } |
|
| 403 | + return $_CachedMinifiedUrl; |
|
| 404 | + } |
|
| 405 | 405 | |
| 406 | - protected function str_ends_in($haystack,$needle) { |
|
| 407 | - $needleLength = strlen($needle); |
|
| 408 | - $haystackLength = strlen($haystack); |
|
| 409 | - $lastPos=strrpos($haystack,$needle); |
|
| 410 | - if ($lastPos === $haystackLength - $needleLength) { |
|
| 411 | - return true; |
|
| 412 | - } else { |
|
| 413 | - return false; |
|
| 414 | - } |
|
| 415 | - } |
|
| 406 | + protected function str_ends_in($haystack,$needle) { |
|
| 407 | + $needleLength = strlen($needle); |
|
| 408 | + $haystackLength = strlen($haystack); |
|
| 409 | + $lastPos=strrpos($haystack,$needle); |
|
| 410 | + if ($lastPos === $haystackLength - $needleLength) { |
|
| 411 | + return true; |
|
| 412 | + } else { |
|
| 413 | + return false; |
|
| 414 | + } |
|
| 415 | + } |
|
| 416 | 416 | } |
@@ -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 | abstract class autoptimizeBase { |
| 5 | 5 | protected $content = ''; |
@@ -23,37 +23,37 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | //Converts an URL to a full path |
| 25 | 25 | protected function getpath($url) { |
| 26 | - $url=apply_filters( 'autoptimize_filter_cssjs_alter_url', $url); |
|
| 26 | + $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url); |
|
| 27 | 27 | |
| 28 | - if (strpos($url,'%')!==false) { |
|
| 29 | - $url=urldecode($url); |
|
| 28 | + if (strpos($url, '%') !== false) { |
|
| 29 | + $url = urldecode($url); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - $siteHost=parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST); |
|
| 33 | - $contentHost=parse_url(AUTOPTIMIZE_WP_ROOT_URL,PHP_URL_HOST); |
|
| 32 | + $siteHost = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST); |
|
| 33 | + $contentHost = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST); |
|
| 34 | 34 | |
| 35 | 35 | // normalize |
| 36 | - if (strpos($url,'//')===0) { |
|
| 36 | + if (strpos($url, '//') === 0) { |
|
| 37 | 37 | if (is_ssl()) { |
| 38 | 38 | $url = "https:".$url; |
| 39 | 39 | } else { |
| 40 | 40 | $url = "http:".$url; |
| 41 | 41 | } |
| 42 | - } else if ((strpos($url,'//')===false) && (strpos($url,$siteHost)===false)) { |
|
| 42 | + } else if ((strpos($url, '//') === false) && (strpos($url, $siteHost) === false)) { |
|
| 43 | 43 | if (AUTOPTIMIZE_WP_SITE_URL === $siteHost) { |
| 44 | 44 | $url = AUTOPTIMIZE_WP_SITE_URL.$url; |
| 45 | 45 | } else { |
| 46 | - $subdir_levels=substr_count(preg_replace("/https?:\/\//","",AUTOPTIMIZE_WP_SITE_URL),"/"); |
|
| 47 | - $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..",$subdir_levels).$url; |
|
| 46 | + $subdir_levels = substr_count(preg_replace("/https?:\/\//", "", AUTOPTIMIZE_WP_SITE_URL), "/"); |
|
| 47 | + $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..", $subdir_levels).$url; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if ($siteHost !== $contentHost) { |
| 52 | - $url=str_replace(AUTOPTIMIZE_WP_CONTENT_URL,AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME,$url); |
|
| 52 | + $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // first check; hostname wp site should be hostname of url |
| 56 | - $thisHost=@parse_url($url,PHP_URL_HOST); |
|
| 56 | + $thisHost = @parse_url($url, PHP_URL_HOST); |
|
| 57 | 57 | if ($thisHost !== $siteHost) { |
| 58 | 58 | /* |
| 59 | 59 | * first try to get all domains from WPML (if available) |
@@ -65,18 +65,18 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | $multidomainsWPML = apply_filters('wpml_setting', array(), 'language_domains'); |
| 67 | 67 | if (!empty($multidomainsWPML)) { |
| 68 | - $multidomains = array_map(array($this,"ao_getDomain"),$multidomainsWPML); |
|
| 68 | + $multidomains = array_map(array($this, "ao_getDomain"), $multidomainsWPML); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | if (!empty($this->cdn_url)) { |
| 72 | - $multidomains[]=parse_url($this->cdn_url,PHP_URL_HOST); |
|
| 72 | + $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains); |
| 76 | 76 | |
| 77 | 77 | if (!empty($multidomains)) { |
| 78 | - if (in_array($thisHost,$multidomains)) { |
|
| 79 | - $url=str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST), $url); |
|
| 78 | + if (in_array($thisHost, $multidomains)) { |
|
| 79 | + $url = str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST), $url); |
|
| 80 | 80 | } else { |
| 81 | 81 | return false; |
| 82 | 82 | } |
@@ -86,22 +86,22 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | // try to remove "wp root url" from url while not minding http<>https |
| 89 | - $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_ROOT_URL); |
|
| 89 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL); |
|
| 90 | 90 | if ($siteHost !== $contentHost) { |
| 91 | 91 | // as we replaced the content-domain with the site-domain, we should match against that |
| 92 | - $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_SITE_URL); |
|
| 92 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL); |
|
| 93 | 93 | } |
| 94 | - $tmp_url = preg_replace('/https?:/','',$url); |
|
| 95 | - $path = str_replace($tmp_ao_root,'',$tmp_url); |
|
| 94 | + $tmp_url = preg_replace('/https?:/', '', $url); |
|
| 95 | + $path = str_replace($tmp_ao_root, '', $tmp_url); |
|
| 96 | 96 | |
| 97 | 97 | // if path starts with :// or //, this is not a URL in the WP context and we have to assume we can't aggregate |
| 98 | - if (preg_match('#^:?//#',$path)) { |
|
| 98 | + if (preg_match('#^:?//#', $path)) { |
|
| 99 | 99 | /** External script/css (adsense, etc) */ |
| 100 | 100 | return false; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | // prepend with WP_ROOT_DIR to have full path to file |
| 104 | - $path = str_replace('//','/',WP_ROOT_DIR.$path); |
|
| 104 | + $path = str_replace('//', '/', WP_ROOT_DIR.$path); |
|
| 105 | 105 | |
| 106 | 106 | // final check: does file exist and is it readable |
| 107 | 107 | if (file_exists($path) && is_file($path) && is_readable($path)) { |
@@ -114,25 +114,25 @@ discard block |
||
| 114 | 114 | // needed for WPML-filter |
| 115 | 115 | protected function ao_getDomain($in) { |
| 116 | 116 | // make sure the url starts with something vaguely resembling a protocol |
| 117 | - if ((strpos($in,"http")!==0) && (strpos($in,"//")!==0)) { |
|
| 118 | - $in="http://".$in; |
|
| 117 | + if ((strpos($in, "http") !== 0) && (strpos($in, "//") !== 0)) { |
|
| 118 | + $in = "http://".$in; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // do the actual parse_url |
| 122 | - $out = parse_url($in,PHP_URL_HOST); |
|
| 122 | + $out = parse_url($in, PHP_URL_HOST); |
|
| 123 | 123 | |
| 124 | 124 | // fallback if parse_url does not understand the url is in fact a url |
| 125 | - if (empty($out)) $out=$in; |
|
| 125 | + if (empty($out)) $out = $in; |
|
| 126 | 126 | |
| 127 | 127 | return $out; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | |
| 131 | 131 | // logger |
| 132 | - protected function ao_logger($logmsg,$appendHTML=true) { |
|
| 132 | + protected function ao_logger($logmsg, $appendHTML = true) { |
|
| 133 | 133 | if ($appendHTML) { |
| 134 | - $logmsg="<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->"; |
|
| 135 | - $this->content.=$logmsg; |
|
| 134 | + $logmsg = "<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->"; |
|
| 135 | + $this->content .= $logmsg; |
|
| 136 | 136 | } else { |
| 137 | 137 | error_log("Autoptimize: ".$logmsg); |
| 138 | 138 | } |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | // hide everything between noptimize-comment tags |
| 142 | 142 | protected function hide_noptimize($noptimize_in) { |
| 143 | - if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { |
|
| 143 | + if (preg_match('/<!--\s?noptimize\s?-->/', $noptimize_in)) { |
|
| 144 | 144 | $noptimize_out = preg_replace_callback( |
| 145 | 145 | '#<!--\s?noptimize\s?-->.*?<!--\s?/\s?noptimize\s?-->#is', |
| 146 | 146 | create_function( |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | // unhide noptimize-tags |
| 159 | 159 | protected function restore_noptimize($noptimize_in) { |
| 160 | - if ( strpos( $noptimize_in, '%%NOPTIMIZE%%' ) !== false ) { |
|
| 160 | + if (strpos($noptimize_in, '%%NOPTIMIZE%%') !== false) { |
|
| 161 | 161 | $noptimize_out = preg_replace_callback( |
| 162 | 162 | '#%%NOPTIMIZE'.AUTOPTIMIZE_HASH.'%%(.*?)%%NOPTIMIZE%%#is', |
| 163 | 163 | create_function( |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | protected function hide_iehacks($iehacks_in) { |
| 176 | - if ( strpos( $iehacks_in, '<!--[if' ) !== false ) { |
|
| 176 | + if (strpos($iehacks_in, '<!--[if') !== false) { |
|
| 177 | 177 | $iehacks_out = preg_replace_callback( |
| 178 | 178 | '#<!--\[if.*?\[endif\]-->#is', |
| 179 | 179 | create_function( |
@@ -189,7 +189,7 @@ discard block |
||
| 189 | 189 | } |
| 190 | 190 | |
| 191 | 191 | protected function restore_iehacks($iehacks_in) { |
| 192 | - if ( strpos( $iehacks_in, '%%IEHACK%%' ) !== false ) { |
|
| 192 | + if (strpos($iehacks_in, '%%IEHACK%%') !== false) { |
|
| 193 | 193 | $iehacks_out = preg_replace_callback( |
| 194 | 194 | '#%%IEHACK'.AUTOPTIMIZE_HASH.'%%(.*?)%%IEHACK%%#is', |
| 195 | 195 | create_function( |
@@ -199,13 +199,13 @@ discard block |
||
| 199 | 199 | $iehacks_in |
| 200 | 200 | ); |
| 201 | 201 | } else { |
| 202 | - $iehacks_out=$iehacks_in; |
|
| 202 | + $iehacks_out = $iehacks_in; |
|
| 203 | 203 | } |
| 204 | 204 | return $iehacks_out; |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | protected function hide_comments($comments_in) { |
| 208 | - if ( strpos( $comments_in, '<!--' ) !== false ) { |
|
| 208 | + if (strpos($comments_in, '<!--') !== false) { |
|
| 209 | 209 | $comments_out = preg_replace_callback( |
| 210 | 210 | '#<!--.*?-->#is', |
| 211 | 211 | create_function( |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | protected function restore_comments($comments_in) { |
| 224 | - if ( strpos( $comments_in, '%%COMMENTS%%' ) !== false ) { |
|
| 224 | + if (strpos($comments_in, '%%COMMENTS%%') !== false) { |
|
| 225 | 225 | $comments_out = preg_replace_callback( |
| 226 | 226 | '#%%COMMENTS'.AUTOPTIMIZE_HASH.'%%(.*?)%%COMMENTS%%#is', |
| 227 | 227 | create_function( |
@@ -231,31 +231,31 @@ discard block |
||
| 231 | 231 | $comments_in |
| 232 | 232 | ); |
| 233 | 233 | } else { |
| 234 | - $comments_out=$comments_in; |
|
| 234 | + $comments_out = $comments_in; |
|
| 235 | 235 | } |
| 236 | 236 | return $comments_out; |
| 237 | 237 | } |
| 238 | 238 | |
| 239 | - protected function url_replace_cdn( $url ) { |
|
| 239 | + protected function url_replace_cdn($url) { |
|
| 240 | 240 | // API filter to change base CDN URL |
| 241 | - $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $this->cdn_url ); |
|
| 241 | + $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $this->cdn_url); |
|
| 242 | 242 | |
| 243 | - if ( !empty($cdn_url) ) { |
|
| 243 | + if (!empty($cdn_url)) { |
|
| 244 | 244 | // prepend domain-less absolute URL's |
| 245 | - if ( ( substr( $url, 0, 1 ) === '/' ) && ( substr( $url, 1, 1 ) !== '/' ) ) { |
|
| 246 | - $url = rtrim( $cdn_url, '/' ) . $url; |
|
| 245 | + if ((substr($url, 0, 1) === '/') && (substr($url, 1, 1) !== '/')) { |
|
| 246 | + $url = rtrim($cdn_url, '/').$url; |
|
| 247 | 247 | } else { |
| 248 | 248 | // get wordpress base URL |
| 249 | - $WPSiteBreakdown = parse_url( AUTOPTIMIZE_WP_SITE_URL ); |
|
| 250 | - $WPBaseUrl = $WPSiteBreakdown['scheme'] . '://' . $WPSiteBreakdown['host']; |
|
| 251 | - if ( ! empty( $WPSiteBreakdown['port'] ) ) { |
|
| 252 | - $WPBaseUrl .= ":" . $WPSiteBreakdown['port']; |
|
| 249 | + $WPSiteBreakdown = parse_url(AUTOPTIMIZE_WP_SITE_URL); |
|
| 250 | + $WPBaseUrl = $WPSiteBreakdown['scheme'].'://'.$WPSiteBreakdown['host']; |
|
| 251 | + if (!empty($WPSiteBreakdown['port'])) { |
|
| 252 | + $WPBaseUrl .= ":".$WPSiteBreakdown['port']; |
|
| 253 | 253 | } |
| 254 | 254 | // replace full url's with scheme |
| 255 | - $tmp_url = str_replace( $WPBaseUrl, rtrim( $cdn_url, '/' ), $url ); |
|
| 256 | - if ( $tmp_url === $url ) { |
|
| 255 | + $tmp_url = str_replace($WPBaseUrl, rtrim($cdn_url, '/'), $url); |
|
| 256 | + if ($tmp_url === $url) { |
|
| 257 | 257 | // last attempt; replace scheme-less URL's |
| 258 | - $url = str_replace( preg_replace( '/https?:/', '', $WPBaseUrl ), rtrim( $cdn_url, '/' ), $url ); |
|
| 258 | + $url = str_replace(preg_replace('/https?:/', '', $WPBaseUrl), rtrim($cdn_url, '/'), $url); |
|
| 259 | 259 | } else { |
| 260 | 260 | $url = $tmp_url; |
| 261 | 261 | } |
@@ -263,32 +263,32 @@ discard block |
||
| 263 | 263 | } |
| 264 | 264 | |
| 265 | 265 | // allow API filter to alter URL after CDN replacement |
| 266 | - $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url ); |
|
| 266 | + $url = apply_filters('autoptimize_filter_base_replace_cdn', $url); |
|
| 267 | 267 | return $url; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | - protected function inject_in_html($payload,$replaceTag) { |
|
| 271 | - if (strpos($this->content,$replaceTag[0])!== false) { |
|
| 272 | - if ($replaceTag[1]==="after") { |
|
| 273 | - $replaceBlock=$replaceTag[0].$payload; |
|
| 274 | - } else if ($replaceTag[1]==="replace"){ |
|
| 275 | - $replaceBlock=$payload; |
|
| 270 | + protected function inject_in_html($payload, $replaceTag) { |
|
| 271 | + if (strpos($this->content, $replaceTag[0]) !== false) { |
|
| 272 | + if ($replaceTag[1] === "after") { |
|
| 273 | + $replaceBlock = $replaceTag[0].$payload; |
|
| 274 | + } else if ($replaceTag[1] === "replace") { |
|
| 275 | + $replaceBlock = $payload; |
|
| 276 | 276 | } else { |
| 277 | - $replaceBlock=$payload.$replaceTag[0]; |
|
| 277 | + $replaceBlock = $payload.$replaceTag[0]; |
|
| 278 | 278 | } |
| 279 | - $this->content = substr_replace($this->content,$replaceBlock,strpos($this->content,$replaceTag[0]),strlen($replaceTag[0])); |
|
| 279 | + $this->content = substr_replace($this->content, $replaceBlock, strpos($this->content, $replaceTag[0]), strlen($replaceTag[0])); |
|
| 280 | 280 | } else { |
| 281 | 281 | $this->content .= $payload; |
| 282 | 282 | if (!$this->tagWarning) { |
| 283 | - $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<",">"),"",$replaceTag[0])."\" missing --><!--/noptimize-->"; |
|
| 284 | - $this->tagWarning=true; |
|
| 283 | + $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<", ">"), "", $replaceTag[0])."\" missing --><!--/noptimize-->"; |
|
| 284 | + $this->tagWarning = true; |
|
| 285 | 285 | } |
| 286 | 286 | } |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | protected function isremovable($tag, $removables) { |
| 290 | 290 | foreach ($removables as $match) { |
| 291 | - if (strpos($tag,$match)!==false) { |
|
| 291 | + if (strpos($tag, $match) !== false) { |
|
| 292 | 292 | return true; |
| 293 | 293 | } |
| 294 | 294 | } |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | |
| 298 | 298 | // inject already minified code in optimized JS/CSS |
| 299 | 299 | protected function inject_minified($in) { |
| 300 | - if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) { |
|
| 300 | + if (strpos($in, '%%INJECTLATER%%') !== false) { |
|
| 301 | 301 | $out = preg_replace_callback( |
| 302 | 302 | '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is', |
| 303 | 303 | create_function( |
@@ -349,47 +349,47 @@ discard block |
||
| 349 | 349 | |
| 350 | 350 | protected function minify_single($pathIn) { |
| 351 | 351 | // determine JS or CSS and set var (also mimetype), return false if neither |
| 352 | - if ( $this->str_ends_in($pathIn,".js") === true ) { |
|
| 353 | - $codeType="js"; |
|
| 354 | - $codeMime="text/javascript"; |
|
| 355 | - } else if ( $this->str_ends_in($pathIn,".css") === true ) { |
|
| 356 | - $codeType="css"; |
|
| 357 | - $codeMime="text/css"; |
|
| 352 | + if ($this->str_ends_in($pathIn, ".js") === true) { |
|
| 353 | + $codeType = "js"; |
|
| 354 | + $codeMime = "text/javascript"; |
|
| 355 | + } else if ($this->str_ends_in($pathIn, ".css") === true) { |
|
| 356 | + $codeType = "css"; |
|
| 357 | + $codeMime = "text/css"; |
|
| 358 | 358 | } else { |
| 359 | 359 | return false; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | // if min.js or min.css return false |
| 363 | - if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) { |
|
| 363 | + if (($this->str_ends_in($pathIn, "-min.".$codeType) === true) || ($this->str_ends_in($pathIn, ".min.".$codeType) === true) || ($this->str_ends_in($pathIn, "js/jquery/jquery.js") === true)) { |
|
| 364 | 364 | return false; |
| 365 | 365 | } |
| 366 | 366 | |
| 367 | 367 | // read file, return false if empty |
| 368 | 368 | $_toMinify = file_get_contents($pathIn); |
| 369 | - if ( empty($_toMinify) ) return false; |
|
| 369 | + if (empty($_toMinify)) return false; |
|
| 370 | 370 | |
| 371 | 371 | // check cache |
| 372 | 372 | $_md5hash = "single_".md5($_toMinify); |
| 373 | - $_cache = new autoptimizeCache($_md5hash,$codeType); |
|
| 374 | - if ($_cache->check() ) { |
|
| 373 | + $_cache = new autoptimizeCache($_md5hash, $codeType); |
|
| 374 | + if ($_cache->check()) { |
|
| 375 | 375 | $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
| 376 | 376 | } else { |
| 377 | 377 | // if not in cache first minify |
| 378 | 378 | $_Minified = $_toMinify; |
| 379 | 379 | if ($codeType === "js") { |
| 380 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 381 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 380 | + if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) { |
|
| 381 | + if (@is_callable(array("JSMin", "minify"))) { |
|
| 382 | 382 | $tmp_code = trim(JSMin::minify($_toMinify)); |
| 383 | 383 | } |
| 384 | 384 | } |
| 385 | 385 | } else if ($codeType === "css") { |
| 386 | 386 | if (class_exists('Minify_CSS_Compressor')) { |
| 387 | 387 | $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify)); |
| 388 | - } else if(class_exists('CSSmin')) { |
|
| 388 | + } else if (class_exists('CSSmin')) { |
|
| 389 | 389 | $cssmin = new CSSmin(); |
| 390 | - if (method_exists($cssmin,"run")) { |
|
| 390 | + if (method_exists($cssmin, "run")) { |
|
| 391 | 391 | $tmp_code = trim($cssmin->run($_toMinify)); |
| 392 | - } elseif (@is_callable(array($cssmin,"minify"))) { |
|
| 392 | + } elseif (@is_callable(array($cssmin, "minify"))) { |
|
| 393 | 393 | $tmp_code = trim(CssMin::minify($_toMinify)); |
| 394 | 394 | } |
| 395 | 395 | } |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | unset($tmp_code); |
| 400 | 400 | } |
| 401 | 401 | // and then cache |
| 402 | - $_cache->cache($_Minified,$codeMime); |
|
| 402 | + $_cache->cache($_Minified, $codeMime); |
|
| 403 | 403 | $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
| 404 | 404 | } |
| 405 | 405 | unset($_cache); |
@@ -410,10 +410,10 @@ discard block |
||
| 410 | 410 | return $_CachedMinifiedUrl; |
| 411 | 411 | } |
| 412 | 412 | |
| 413 | - protected function str_ends_in($haystack,$needle) { |
|
| 413 | + protected function str_ends_in($haystack, $needle) { |
|
| 414 | 414 | $needleLength = strlen($needle); |
| 415 | 415 | $haystackLength = strlen($haystack); |
| 416 | - $lastPos=strrpos($haystack,$needle); |
|
| 416 | + $lastPos = strrpos($haystack, $needle); |
|
| 417 | 417 | if ($lastPos === $haystackLength - $needleLength) { |
| 418 | 418 | return true; |
| 419 | 419 | } else { |
@@ -139,6 +139,10 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | // hide everything between noptimize-comment tags |
| 142 | + |
|
| 143 | + /** |
|
| 144 | + * @param string $noptimize_in |
|
| 145 | + */ |
|
| 142 | 146 | protected function hide_noptimize($noptimize_in) { |
| 143 | 147 | if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { |
| 144 | 148 | $noptimize_out = preg_replace_callback( |
@@ -286,6 +290,9 @@ discard block |
||
| 286 | 290 | } |
| 287 | 291 | } |
| 288 | 292 | |
| 293 | + /** |
|
| 294 | + * @param string $tag |
|
| 295 | + */ |
|
| 289 | 296 | protected function isremovable($tag, $removables) { |
| 290 | 297 | foreach ($removables as $match) { |
| 291 | 298 | if (strpos($tag,$match)!==false) { |
@@ -296,6 +303,10 @@ discard block |
||
| 296 | 303 | } |
| 297 | 304 | |
| 298 | 305 | // inject already minified code in optimized JS/CSS |
| 306 | + |
|
| 307 | + /** |
|
| 308 | + * @return string |
|
| 309 | + */ |
|
| 299 | 310 | protected function inject_minified($in) { |
| 300 | 311 | if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) { |
| 301 | 312 | $out = preg_replace_callback( |
@@ -342,6 +353,9 @@ discard block |
||
| 342 | 353 | return $out; |
| 343 | 354 | } |
| 344 | 355 | |
| 356 | + /** |
|
| 357 | + * @param string $pathIn |
|
| 358 | + */ |
|
| 345 | 359 | protected function minify_single($pathIn) { |
| 346 | 360 | // determine JS or CSS and set var (also mimetype), return false if neither |
| 347 | 361 | if ( $this->str_ends_in($pathIn,".js") === true ) { |
@@ -405,6 +419,9 @@ discard block |
||
| 405 | 419 | return $_CachedMinifiedUrl; |
| 406 | 420 | } |
| 407 | 421 | |
| 422 | + /** |
|
| 423 | + * @param string $needle |
|
| 424 | + */ |
|
| 408 | 425 | protected function str_ends_in($haystack,$needle) { |
| 409 | 426 | $needleLength = strlen($needle); |
| 410 | 427 | $haystackLength = strlen($haystack); |
@@ -49,13 +49,13 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function __construct($raisePhpLimits = true) |
| 51 | 51 | { |
| 52 | - $this->memoryLimit = 128 * 1048576; // 128MB in bytes |
|
| 53 | - $this->pcreBacktrackLimit = 1000 * 1000; |
|
| 54 | - $this->pcreRecursionLimit = 500 * 1000; |
|
| 52 | + $this->memoryLimit = 128*1048576; // 128MB in bytes |
|
| 53 | + $this->pcreBacktrackLimit = 1000*1000; |
|
| 54 | + $this->pcreRecursionLimit = 500*1000; |
|
| 55 | 55 | |
| 56 | 56 | $this->raisePhpLimits = (bool) $raisePhpLimits; |
| 57 | 57 | |
| 58 | - $this->numRegex = '(?:\+|-)?\d*\.?\d+' . $this->unitsGroupRegex .'?'; |
|
| 58 | + $this->numRegex = '(?:\+|-)?\d*\.?\d+'.$this->unitsGroupRegex.'?'; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -134,14 +134,14 @@ discard block |
||
| 134 | 134 | $cssChunks[$i] = $this->minify($cssChunks[$i], $linebreakPos); |
| 135 | 135 | // Keep the first @charset at-rule found |
| 136 | 136 | if (empty($charset) && preg_match($charsetRegexp, $cssChunks[$i], $matches)) { |
| 137 | - $charset = strtolower($matches[1]) . $matches[2]; |
|
| 137 | + $charset = strtolower($matches[1]).$matches[2]; |
|
| 138 | 138 | } |
| 139 | 139 | // Delete all @charset at-rules |
| 140 | 140 | $cssChunks[$i] = preg_replace($charsetRegexp, '', $cssChunks[$i]); |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | // Update the first chunk and push the charset to the top of the file. |
| 144 | - $cssChunks[0] = $charset . $cssChunks[0]; |
|
| 144 | + $cssChunks[0] = $charset.$cssChunks[0]; |
|
| 145 | 145 | |
| 146 | 146 | return trim(implode('', $cssChunks)); |
| 147 | 147 | } |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | private function registerPreservedToken($token) |
| 236 | 236 | { |
| 237 | 237 | $this->preservedTokens[] = $token; |
| 238 | - return self::TOKEN . (count($this->preservedTokens) - 1) .'___'; |
|
| 238 | + return self::TOKEN.(count($this->preservedTokens) - 1).'___'; |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | /** |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | private function getPreservedTokenPlaceholderRegexById($id) |
| 247 | 247 | { |
| 248 | - return '/'. self::TOKEN . $id .'___/'; |
|
| 248 | + return '/'.self::TOKEN.$id.'___/'; |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /** |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | private function registerComment($comment) |
| 257 | 257 | { |
| 258 | 258 | $this->comments[] = $comment; |
| 259 | - return '/*'. self::COMMENT . (count($this->comments) - 1) .'___*/'; |
|
| 259 | + return '/*'.self::COMMENT.(count($this->comments) - 1).'___*/'; |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | /** |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | */ |
| 267 | 267 | private function getCommentPlaceholderById($id) |
| 268 | 268 | { |
| 269 | - return self::COMMENT . $id .'___'; |
|
| 269 | + return self::COMMENT.$id.'___'; |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | /** |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | */ |
| 277 | 277 | private function getCommentPlaceholderRegexById($id) |
| 278 | 278 | { |
| 279 | - return '/'. $this->getCommentPlaceholderById($id) .'/'; |
|
| 279 | + return '/'.$this->getCommentPlaceholderById($id).'/'; |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | /** |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | private function registerAtRuleBlock($block) |
| 288 | 288 | { |
| 289 | 289 | $this->atRuleBlocks[] = $block; |
| 290 | - return self::AT_RULE_BLOCK . (count($this->atRuleBlocks) - 1) .'___'; |
|
| 290 | + return self::AT_RULE_BLOCK.(count($this->atRuleBlocks) - 1).'___'; |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | /** |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | */ |
| 298 | 298 | private function getAtRuleBlockPlaceholderRegexById($id) |
| 299 | 299 | { |
| 300 | - return '/'. self::AT_RULE_BLOCK . $id .'___/'; |
|
| 300 | + return '/'.self::AT_RULE_BLOCK.$id.'___/'; |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | /** |
@@ -330,8 +330,8 @@ discard block |
||
| 330 | 330 | $preservedTokenPlaceholder = $this->registerPreservedToken($comment); |
| 331 | 331 | $css = preg_replace($commentPlaceholderRegex, $preservedTokenPlaceholder, $css, 1); |
| 332 | 332 | // Preserve new lines for /*! important comments |
| 333 | - $css = preg_replace('/\R+\s*(\/\*'. $preservedTokenPlaceholder .')/', self::NL.'$1', $css); |
|
| 334 | - $css = preg_replace('/('. $preservedTokenPlaceholder .'\*\/)\s*\R+/', '$1'.self::NL, $css); |
|
| 333 | + $css = preg_replace('/\R+\s*(\/\*'.$preservedTokenPlaceholder.')/', self::NL.'$1', $css); |
|
| 334 | + $css = preg_replace('/('.$preservedTokenPlaceholder.'\*\/)\s*\R+/', '$1'.self::NL, $css); |
|
| 335 | 335 | continue; |
| 336 | 336 | } |
| 337 | 337 | |
@@ -360,14 +360,14 @@ discard block |
||
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | // in all other cases kill the comment |
| 363 | - $css = preg_replace('/\/\*' . $commentPlaceholder . '\*\//', '', $css, 1); |
|
| 363 | + $css = preg_replace('/\/\*'.$commentPlaceholder.'\*\//', '', $css, 1); |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | // Normalize all whitespace strings to single spaces. Easier to work with that way. |
| 367 | 367 | $css = preg_replace('/\s+/', ' ', $css); |
| 368 | 368 | |
| 369 | 369 | // Remove spaces before & after newlines |
| 370 | - $css = preg_replace('/\s*'. self::NL .'\s*/', self::NL, $css); |
|
| 370 | + $css = preg_replace('/\s*'.self::NL.'\s*/', self::NL, $css); |
|
| 371 | 371 | |
| 372 | 372 | // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
| 373 | 373 | $css = preg_replace_callback( |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | $css = preg_replace('/!important/i', ' !important', $css); |
| 410 | 410 | |
| 411 | 411 | // bring back the colon |
| 412 | - $css = preg_replace('/'. self::CLASSCOLON .'/', ':', $css); |
|
| 412 | + $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css); |
|
| 413 | 413 | |
| 414 | 414 | // retain space for special IE6 cases |
| 415 | 415 | $css = preg_replace_callback('/:first-(line|letter)(\{|,)/i', array($this, 'lowercasePseudoFirst'), $css); |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | |
| 420 | 420 | // lowercase some popular @directives |
| 421 | 421 | $css = preg_replace_callback( |
| 422 | - '/@(document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|namespace|page|' . |
|
| 422 | + '/@(document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|namespace|page|'. |
|
| 423 | 423 | 'supports|viewport)/i', |
| 424 | 424 | array($this, 'lowercaseDirectives'), |
| 425 | 425 | $css |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | |
| 428 | 428 | // lowercase some more common pseudo-elements |
| 429 | 429 | $css = preg_replace_callback( |
| 430 | - '/:(active|after|before|checked|disabled|empty|enabled|first-(?:child|of-type)|focus|hover|' . |
|
| 430 | + '/:(active|after|before|checked|disabled|empty|enabled|first-(?:child|of-type)|focus|hover|'. |
|
| 431 | 431 | 'last-(?:child|of-type)|link|only-(?:child|of-type)|root|:selection|target|visited)/i', |
| 432 | 432 | array($this, 'lowercasePseudoElements'), |
| 433 | 433 | $css |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | // lower case some common function that can be values |
| 444 | 444 | // NOTE: rgb() isn't useful as we replace with #hex later, as well as and() is already done for us |
| 445 | 445 | $css = preg_replace_callback( |
| 446 | - '/([:,( ]\s*)(attr|color-stop|from|rgba|to|url|-webkit-gradient|' . |
|
| 446 | + '/([:,( ]\s*)(attr|color-stop|from|rgba|to|url|-webkit-gradient|'. |
|
| 447 | 447 | '(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?(?:calc|max|min|(?:repeating-)?(?:linear|radial)-gradient))/iS', |
| 448 | 448 | array($this, 'lowercaseCommonFunctionsValues'), |
| 449 | 449 | $css |
@@ -500,19 +500,19 @@ discard block |
||
| 500 | 500 | |
| 501 | 501 | // Find a fraction that is used for Opera's -o-device-pixel-ratio query |
| 502 | 502 | // Add token to add the "\" back in later |
| 503 | - $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css); |
|
| 503 | + $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css); |
|
| 504 | 504 | |
| 505 | 505 | // Patch new lines to avoid being removed when followed by empty rules cases |
| 506 | - $css = preg_replace('/'. self::NL .'/', self::NL .'}', $css); |
|
| 506 | + $css = preg_replace('/'.self::NL.'/', self::NL.'}', $css); |
|
| 507 | 507 | |
| 508 | 508 | // Remove empty rules. |
| 509 | 509 | $css = preg_replace('/[^{};\/]+\{\}/S', '', $css); |
| 510 | 510 | |
| 511 | 511 | // Restore new lines for /*! important comments |
| 512 | - $css = preg_replace('/'. self::NL .'}/', "\n", $css); |
|
| 512 | + $css = preg_replace('/'.self::NL.'}/', "\n", $css); |
|
| 513 | 513 | |
| 514 | 514 | // Add "/" back to fix Opera -o-device-pixel-ratio query |
| 515 | - $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css); |
|
| 515 | + $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css); |
|
| 516 | 516 | |
| 517 | 517 | // Replace multiple semi-colons in a row by a single one |
| 518 | 518 | // See SF bug #1980989 |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | $linebreakPos = (int) $linebreakPos; |
| 529 | 529 | for ($startIndex = $i = 1, $l = strlen($css); $i < $l; $i++) { |
| 530 | 530 | if ($css[$i - 1] === '}' && $i - $startIndex > $linebreakPos) { |
| 531 | - $css = $this->strSlice($css, 0, $i) . "\n" . $this->strSlice($css, $i); |
|
| 531 | + $css = $this->strSlice($css, 0, $i)."\n".$this->strSlice($css, $i); |
|
| 532 | 532 | $l = strlen($css); |
| 533 | 533 | $startIndex = $i; |
| 534 | 534 | } |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | $terminator = ')'; |
| 582 | 582 | } |
| 583 | 583 | |
| 584 | - while ($terminatorFound === false && $endIndex+1 <= $maxIndex) { |
|
| 584 | + while ($terminatorFound === false && $endIndex + 1 <= $maxIndex) { |
|
| 585 | 585 | $endIndex = $this->indexOf($css, $terminator, $endIndex + 1); |
| 586 | 586 | // endIndex == 0 doesn't really apply here |
| 587 | 587 | if ($endIndex > 0 && substr($css, $endIndex - 1, 1) !== '\\') { |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | trim($token) |
| 605 | 605 | ); |
| 606 | 606 | $preservedTokenPlaceholder = $this->registerPreservedToken($token); |
| 607 | - $sb[] = 'url('. $preservedTokenPlaceholder .')'; |
|
| 607 | + $sb[] = 'url('.$preservedTokenPlaceholder.')'; |
|
| 608 | 608 | $appenIndex = $endIndex + 1; |
| 609 | 609 | } else { |
| 610 | 610 | // No end terminator found, re-add the whole match. Should we throw/warn here? |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | private function shortenZeroValues($css) |
| 631 | 631 | { |
| 632 | 632 | $unitsGroupReg = $this->unitsGroupRegex; |
| 633 | - $numOrPosReg = '('. $this->numRegex .'|top|left|bottom|right|center)'; |
|
| 633 | + $numOrPosReg = '('.$this->numRegex.'|top|left|bottom|right|center)'; |
|
| 634 | 634 | $oneZeroSafeProperties = array( |
| 635 | 635 | '(?:line-)?height', |
| 636 | 636 | '(?:(?:min|max)-)?width', |
@@ -656,17 +656,17 @@ discard block |
||
| 656 | 656 | $regEnd = '/i'; |
| 657 | 657 | |
| 658 | 658 | // First zero regex start |
| 659 | - $oneZeroRegStart = $regStart .'('. implode('|', $oneZeroSafeProperties) .'):'; |
|
| 659 | + $oneZeroRegStart = $regStart.'('.implode('|', $oneZeroSafeProperties).'):'; |
|
| 660 | 660 | |
| 661 | 661 | // Multiple zeros regex start |
| 662 | - $nZerosRegStart = $regStart .'('. implode('|', $nZeroSafeProperties) .'):'; |
|
| 662 | + $nZerosRegStart = $regStart.'('.implode('|', $nZeroSafeProperties).'):'; |
|
| 663 | 663 | |
| 664 | 664 | $css = preg_replace( |
| 665 | 665 | array( |
| 666 | - $oneZeroRegStart .'0'. $unitsGroupReg . $regEnd, |
|
| 667 | - $nZerosRegStart . $numOrPosReg .' 0'. $unitsGroupReg . $regEnd, |
|
| 668 | - $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd, |
|
| 669 | - $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd |
|
| 666 | + $oneZeroRegStart.'0'.$unitsGroupReg.$regEnd, |
|
| 667 | + $nZerosRegStart.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd, |
|
| 668 | + $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd, |
|
| 669 | + $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd |
|
| 670 | 670 | ), |
| 671 | 671 | array( |
| 672 | 672 | '$1$2:0', |
@@ -682,13 +682,13 @@ discard block |
||
| 682 | 682 | |
| 683 | 683 | // Replace 0 0; or 0 0 0; or 0 0 0 0; with 0 for safe properties only. |
| 684 | 684 | $css = preg_replace( |
| 685 | - '/('. implode('|', $nZeroSafeProperties) .'):0(?: 0){1,3}(;|\}| !)'. $regEnd, |
|
| 685 | + '/('.implode('|', $nZeroSafeProperties).'):0(?: 0){1,3}(;|\}| !)'.$regEnd, |
|
| 686 | 686 | '$1:0$2', |
| 687 | 687 | $css |
| 688 | 688 | ); |
| 689 | 689 | |
| 690 | 690 | // Replace 0 0 0; or 0 0 0 0; with 0 0 for background-position property. |
| 691 | - $css = preg_replace('/(background-position):0(?: 0){2,3}(;|\}| !)'. $regEnd, '$1:0 0$2', $css); |
|
| 691 | + $css = preg_replace('/(background-position):0(?: 0){2,3}(;|\}| !)'.$regEnd, '$1:0 0$2', $css); |
|
| 692 | 692 | |
| 693 | 693 | return $css; |
| 694 | 694 | } |
@@ -712,12 +712,12 @@ discard block |
||
| 712 | 712 | '(?:text|box)-shadow' |
| 713 | 713 | ); |
| 714 | 714 | |
| 715 | - $regStart = '/(;|\{)('. implode('|', $propertiesWithColors) .'):([^;}]*)\b'; |
|
| 715 | + $regStart = '/(;|\{)('.implode('|', $propertiesWithColors).'):([^;}]*)\b'; |
|
| 716 | 716 | $regEnd = '\b/iS'; |
| 717 | 717 | |
| 718 | 718 | foreach ($longNamedColors as $colorName => $colorCode) { |
| 719 | - $patterns[] = $regStart . $colorName . $regEnd; |
|
| 720 | - $replacements[] = '$1$2:$3'. $colorCode; |
|
| 719 | + $patterns[] = $regStart.$colorName.$regEnd; |
|
| 720 | + $replacements[] = '$1$2:$3'.$colorCode; |
|
| 721 | 721 | } |
| 722 | 722 | |
| 723 | 723 | // Run at least 4 times to cover most cases (same color used several times for the same property) |
@@ -762,16 +762,16 @@ discard block |
||
| 762 | 762 | |
| 763 | 763 | if ($isFilter) { |
| 764 | 764 | // Restore, maintain case, otherwise filter will break |
| 765 | - $sb[] = $m[1] .'#'. $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]; |
|
| 765 | + $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7]; |
|
| 766 | 766 | } else { |
| 767 | 767 | if (strtolower($m[2]) == strtolower($m[3]) && |
| 768 | 768 | strtolower($m[4]) == strtolower($m[5]) && |
| 769 | 769 | strtolower($m[6]) == strtolower($m[7])) { |
| 770 | 770 | // Compress. |
| 771 | - $hex = '#'. strtolower($m[3] . $m[5] . $m[7]); |
|
| 771 | + $hex = '#'.strtolower($m[3].$m[5].$m[7]); |
|
| 772 | 772 | } else { |
| 773 | 773 | // Non compressible color, restore but lower case. |
| 774 | - $hex = '#'. strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]); |
|
| 774 | + $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]); |
|
| 775 | 775 | } |
| 776 | 776 | // replace Hex colors with shorter color names |
| 777 | 777 | $sb[] = array_key_exists($hex, $longHexColors) ? $longHexColors[$hex] : $hex; |
@@ -818,7 +818,7 @@ discard block |
||
| 818 | 818 | $match = preg_replace('/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/i', 'alpha(opacity=', $match); |
| 819 | 819 | |
| 820 | 820 | $preservedTokenPlaceholder = $this->registerPreservedToken($match); |
| 821 | - return $quote . $preservedTokenPlaceholder . $quote; |
|
| 821 | + return $quote.$preservedTokenPlaceholder.$quote; |
|
| 822 | 822 | } |
| 823 | 823 | |
| 824 | 824 | private function processAtRuleBlocks($matches) |
@@ -838,13 +838,13 @@ discard block |
||
| 838 | 838 | ) |
| 839 | 839 | ); |
| 840 | 840 | $preservedTokenPlaceholder = $this->registerPreservedToken($token); |
| 841 | - return 'calc('. $preservedTokenPlaceholder .')'; |
|
| 841 | + return 'calc('.$preservedTokenPlaceholder.')'; |
|
| 842 | 842 | } |
| 843 | 843 | |
| 844 | 844 | private function processOldIeSpecificMatrixDefinition($matches) |
| 845 | 845 | { |
| 846 | 846 | $preservedTokenPlaceholder = $this->registerPreservedToken($matches[1]); |
| 847 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $preservedTokenPlaceholder .')'; |
|
| 847 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix('.$preservedTokenPlaceholder.')'; |
|
| 848 | 848 | } |
| 849 | 849 | |
| 850 | 850 | private function processColon($matches) |
@@ -869,10 +869,10 @@ discard block |
||
| 869 | 869 | |
| 870 | 870 | // Fix for issue #2528093 |
| 871 | 871 | if (!preg_match('/[\s,);}]/', $matches[2])) { |
| 872 | - $matches[2] = ' '. $matches[2]; |
|
| 872 | + $matches[2] = ' '.$matches[2]; |
|
| 873 | 873 | } |
| 874 | 874 | |
| 875 | - return '#'. implode('', $hexColors) . $matches[2]; |
|
| 875 | + return '#'.implode('', $hexColors).$matches[2]; |
|
| 876 | 876 | } |
| 877 | 877 | |
| 878 | 878 | private function hslToHex($matches) |
@@ -886,37 +886,37 @@ discard block |
||
| 886 | 886 | |
| 887 | 887 | private function processAtRulesOperators($matches) |
| 888 | 888 | { |
| 889 | - return $matches[1] . strtolower($matches[2]) .' ('; |
|
| 889 | + return $matches[1].strtolower($matches[2]).' ('; |
|
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | private function lowercasePseudoFirst($matches) |
| 893 | 893 | { |
| 894 | - return ':first-'. strtolower($matches[1]) .' '. $matches[2]; |
|
| 894 | + return ':first-'.strtolower($matches[1]).' '.$matches[2]; |
|
| 895 | 895 | } |
| 896 | 896 | |
| 897 | 897 | private function lowercaseDirectives($matches) |
| 898 | 898 | { |
| 899 | - return '@'. strtolower($matches[1]); |
|
| 899 | + return '@'.strtolower($matches[1]); |
|
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | private function lowercasePseudoElements($matches) |
| 903 | 903 | { |
| 904 | - return ':'. strtolower($matches[1]); |
|
| 904 | + return ':'.strtolower($matches[1]); |
|
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | private function lowercaseCommonFunctions($matches) |
| 908 | 908 | { |
| 909 | - return ':'. strtolower($matches[1]) .'('; |
|
| 909 | + return ':'.strtolower($matches[1]).'('; |
|
| 910 | 910 | } |
| 911 | 911 | |
| 912 | 912 | private function lowercaseCommonFunctionsValues($matches) |
| 913 | 913 | { |
| 914 | - return $matches[1] . strtolower($matches[2]); |
|
| 914 | + return $matches[1].strtolower($matches[2]); |
|
| 915 | 915 | } |
| 916 | 916 | |
| 917 | 917 | private function lowercaseProperties($matches) |
| 918 | 918 | { |
| 919 | - return $matches[1] . strtolower($matches[2]) . $matches[3]; |
|
| 919 | + return $matches[1].strtolower($matches[2]).$matches[3]; |
|
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | // --------------------------------------------------------------------------------------------- |
@@ -967,18 +967,18 @@ discard block |
||
| 967 | 967 | $l = floatval(str_replace('%', '', $hslValues[2])); |
| 968 | 968 | |
| 969 | 969 | // Wrap and clamp, then fraction! |
| 970 | - $h = ((($h % 360) + 360) % 360) / 360; |
|
| 971 | - $s = $this->clampNumber($s, 0, 100) / 100; |
|
| 972 | - $l = $this->clampNumber($l, 0, 100) / 100; |
|
| 970 | + $h = ((($h%360) + 360)%360)/360; |
|
| 971 | + $s = $this->clampNumber($s, 0, 100)/100; |
|
| 972 | + $l = $this->clampNumber($l, 0, 100)/100; |
|
| 973 | 973 | |
| 974 | 974 | if ($s == 0) { |
| 975 | - $r = $g = $b = $this->roundNumber(255 * $l); |
|
| 975 | + $r = $g = $b = $this->roundNumber(255*$l); |
|
| 976 | 976 | } else { |
| 977 | - $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l); |
|
| 978 | - $v1 = (2 * $l) - $v2; |
|
| 979 | - $r = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h + (1/3))); |
|
| 980 | - $g = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h)); |
|
| 981 | - $b = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h - (1/3))); |
|
| 977 | + $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l); |
|
| 978 | + $v1 = (2*$l) - $v2; |
|
| 979 | + $r = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h + (1/3))); |
|
| 980 | + $g = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h)); |
|
| 981 | + $b = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h - (1/3))); |
|
| 982 | 982 | } |
| 983 | 983 | |
| 984 | 984 | return array($r, $g, $b); |
@@ -995,16 +995,16 @@ discard block |
||
| 995 | 995 | { |
| 996 | 996 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
| 997 | 997 | |
| 998 | - if ($vh * 6 < 1) { |
|
| 999 | - return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 998 | + if ($vh*6 < 1) { |
|
| 999 | + return $v1 + ($v2 - $v1)*6*$vh; |
|
| 1000 | 1000 | } |
| 1001 | 1001 | |
| 1002 | - if ($vh * 2 < 1) { |
|
| 1002 | + if ($vh*2 < 1) { |
|
| 1003 | 1003 | return $v2; |
| 1004 | 1004 | } |
| 1005 | 1005 | |
| 1006 | - if ($vh * 3 < 2) { |
|
| 1007 | - return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6; |
|
| 1006 | + if ($vh*3 < 2) { |
|
| 1007 | + return $v1 + ($v2 - $v1)*((2/3) - $vh)*6; |
|
| 1008 | 1008 | } |
| 1009 | 1009 | |
| 1010 | 1010 | return $v1; |
@@ -1039,13 +1039,13 @@ discard block |
||
| 1039 | 1039 | switch ($letter) { |
| 1040 | 1040 | case 'M': |
| 1041 | 1041 | case 'm': |
| 1042 | - return (int) $size * 1048576; |
|
| 1042 | + return (int) $size*1048576; |
|
| 1043 | 1043 | case 'K': |
| 1044 | 1044 | case 'k': |
| 1045 | - return (int) $size * 1024; |
|
| 1045 | + return (int) $size*1024; |
|
| 1046 | 1046 | case 'G': |
| 1047 | 1047 | case 'g': |
| 1048 | - return (int) $size * 1073741824; |
|
| 1048 | + return (int) $size*1073741824; |
|
| 1049 | 1049 | } |
| 1050 | 1050 | } |
| 1051 | 1051 | return (int) $size; |
@@ -1059,7 +1059,7 @@ discard block |
||
| 1059 | 1059 | private function rgbPercentageToRgbInteger($rgbPercentage) |
| 1060 | 1060 | { |
| 1061 | 1061 | if (strpos($rgbPercentage, '%') !== false) { |
| 1062 | - $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage)) * 2.55); |
|
| 1062 | + $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage))*2.55); |
|
| 1063 | 1063 | } |
| 1064 | 1064 | |
| 1065 | 1065 | return intval($rgbPercentage, 10); |
@@ -1,5 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | class autoptimizeScripts extends autoptimizeBase { |
| 5 | 8 | private $scripts = array(); |
@@ -22,7 +25,9 @@ discard block |
||
| 22 | 25 | //Reads the page and collects script tags |
| 23 | 26 | public function read($options) { |
| 24 | 27 | $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content ); |
| 25 | - if ($noptimizeJS) return false; |
|
| 28 | + if ($noptimizeJS) { |
|
| 29 | + return false; |
|
| 30 | + } |
|
| 26 | 31 | |
| 27 | 32 | // only optimize known good JS? |
| 28 | 33 | $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content ); |
@@ -75,8 +80,9 @@ discard block |
||
| 75 | 80 | } |
| 76 | 81 | |
| 77 | 82 | //Should we add try-catch? |
| 78 | - if($options['trycatch'] == true) |
|
| 79 | - $this->trycatch = true; |
|
| 83 | + if($options['trycatch'] == true) { |
|
| 84 | + $this->trycatch = true; |
|
| 85 | + } |
|
| 80 | 86 | |
| 81 | 87 | // force js in head? |
| 82 | 88 | if($options['forcehead'] == true) { |
@@ -128,27 +128,27 @@ discard block |
||
| 128 | 128 | // should we add flags? |
| 129 | 129 | foreach ($excludeJS as $exclTag => $exclFlags) { |
| 130 | 130 | if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) { |
| 131 | - $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag); |
|
| 131 | + $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | - // should we minify the non-aggregated script? |
|
| 137 | - if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) { |
|
| 138 | - $_CachedMinifiedUrl = $this->minify_single($path); |
|
| 136 | + // should we minify the non-aggregated script? |
|
| 137 | + if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) { |
|
| 138 | + $_CachedMinifiedUrl = $this->minify_single($path); |
|
| 139 | 139 | |
| 140 | - // replace orig URL with minified URL from cache if so |
|
| 141 | - if (!empty($_CachedMinifiedUrl)) { |
|
| 142 | - $newTag = str_replace($url, $_CachedMinifiedUrl, $newTag); |
|
| 143 | - } |
|
| 140 | + // replace orig URL with minified URL from cache if so |
|
| 141 | + if (!empty($_CachedMinifiedUrl)) { |
|
| 142 | + $newTag = str_replace($url, $_CachedMinifiedUrl, $newTag); |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | - // remove querystring from URL in newTag |
|
| 146 | - if ( !empty($explUrl[1]) ) { |
|
| 147 | - $newTag = str_replace("?".$explUrl[1],"",$newTag); |
|
| 148 | - } |
|
| 149 | - } |
|
| 145 | + // remove querystring from URL in newTag |
|
| 146 | + if ( !empty($explUrl[1]) ) { |
|
| 147 | + $newTag = str_replace("?".$explUrl[1],"",$newTag); |
|
| 148 | + } |
|
| 149 | + } |
|
| 150 | 150 | |
| 151 | - // should we move the non-aggregated script? |
|
| 151 | + // should we move the non-aggregated script? |
|
| 152 | 152 | if( $this->ismovable($newTag) ) { |
| 153 | 153 | // can be moved, flags and all |
| 154 | 154 | if( $this->movetolast($newTag) ) { |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | |
| 262 | 262 | //$this->jscode has all the uncompressed code now. |
| 263 | 263 | if ($this->alreadyminified!==true) { |
| 264 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 264 | + if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 265 | 265 | if (@is_callable(array("JSMin","minify"))) { |
| 266 | 266 | $tmp_jscode = trim(JSMin::minify($this->jscode)); |
| 267 | 267 | if (!empty($tmp_jscode)) { |
@@ -275,10 +275,10 @@ discard block |
||
| 275 | 275 | $this->jscode = $this->inject_minified($this->jscode); |
| 276 | 276 | return false; |
| 277 | 277 | } |
| 278 | - } else { |
|
| 279 | - $this->jscode = $this->inject_minified($this->jscode); |
|
| 280 | - return false; |
|
| 281 | - } |
|
| 278 | + } else { |
|
| 279 | + $this->jscode = $this->inject_minified($this->jscode); |
|
| 280 | + return false; |
|
| 281 | + } |
|
| 282 | 282 | } |
| 283 | 283 | $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
| 284 | 284 | return true; |
@@ -341,8 +341,8 @@ discard block |
||
| 341 | 341 | |
| 342 | 342 | // Checks against the white- and blacklists |
| 343 | 343 | private function ismergeable($tag) { |
| 344 | - if (apply_filters('autoptimize_filter_js_dontaggregate',false)) { |
|
| 345 | - return false; |
|
| 344 | + if (apply_filters('autoptimize_filter_js_dontaggregate',false)) { |
|
| 345 | + return false; |
|
| 346 | 346 | } else if (!empty($this->whitelist)) { |
| 347 | 347 | foreach ($this->whitelist as $match) { |
| 348 | 348 | if(strpos($tag,$match)!==false) { |
@@ -450,15 +450,15 @@ discard block |
||
| 450 | 450 | * |
| 451 | 451 | * @param string $jsPath |
| 452 | 452 | * @return bool |
| 453 | - */ |
|
| 454 | - private function can_inject_late($jsPath) { |
|
| 455 | - $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false); |
|
| 453 | + */ |
|
| 454 | + private function can_inject_late($jsPath) { |
|
| 455 | + $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false); |
|
| 456 | 456 | if ( $this->inject_min_late !== true ) { |
| 457 | 457 | // late-inject turned off |
| 458 | 458 | return false; |
| 459 | 459 | } else if ( (strpos($jsPath,"min.js") === false) && ( strpos($jsPath,"wp-includes/js/jquery/jquery.js") === false ) && ( str_replace($consider_minified_array, '', $jsPath) === $jsPath ) ) { |
| 460 | - // file not minified based on filename & filter |
|
| 461 | - return false; |
|
| 460 | + // file not minified based on filename & filter |
|
| 461 | + return false; |
|
| 462 | 462 | } else { |
| 463 | 463 | // phew, all is safe, we can late-inject |
| 464 | 464 | return true; |
@@ -1,11 +1,11 @@ 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 | class autoptimizeScripts extends autoptimizeBase { |
| 5 | 5 | private $scripts = array(); |
| 6 | - private $dontmove = array('document.write','html5.js','show_ads.js','google_ad','blogcatalog.com/w','tweetmeme.com/i','mybloglog.com/','histats.com/js','ads.smowtion.com/ad.js','statcounter.com/counter/counter.js','widgets.amung.us','ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar','intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject','plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize'); |
|
| 7 | - private $domove = array('gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go'); |
|
| 8 | - private $domovelast = array('addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/','jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go'); |
|
| 6 | + private $dontmove = array('document.write', 'html5.js', 'show_ads.js', 'google_ad', 'blogcatalog.com/w', 'tweetmeme.com/i', 'mybloglog.com/', 'histats.com/js', 'ads.smowtion.com/ad.js', 'statcounter.com/counter/counter.js', 'widgets.amung.us', 'ws.amazon.com/widgets', 'media.fastclick.net', '/ads/', 'comment-form-quicktags/quicktags.php', 'edToolbar', 'intensedebate.com', 'scripts.chitika.net/', '_gaq.push', 'jotform.com/', 'admin-bar.min.js', 'GoogleAnalyticsObject', 'plupload.full.min.js', 'syntaxhighlighter', 'adsbygoogle', 'gist.github.com', '_stq', 'nonce', 'post_id', 'data-noptimize'); |
|
| 7 | + private $domove = array('gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go'); |
|
| 8 | + private $domovelast = array('addthis.com', '/afsonline/show_afs_search.js', 'disqus.js', 'networkedblogs.com/getnetworkwidget', 'infolinks.com/js/', 'jd.gallery.js.php', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'linkwithin.com/widget.js', 'tiny_mce.js', 'tinyMCEPreInit.go'); |
|
| 9 | 9 | private $trycatch = false; |
| 10 | 10 | private $alreadyminified = false; |
| 11 | 11 | private $forcehead = true; |
@@ -21,70 +21,70 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | //Reads the page and collects script tags |
| 23 | 23 | public function read($options) { |
| 24 | - $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content ); |
|
| 24 | + $noptimizeJS = apply_filters('autoptimize_filter_js_noptimize', false, $this->content); |
|
| 25 | 25 | if ($noptimizeJS) return false; |
| 26 | 26 | |
| 27 | 27 | // only optimize known good JS? |
| 28 | - $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content ); |
|
| 28 | + $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', '', $this->content); |
|
| 29 | 29 | if (!empty($whitelistJS)) { |
| 30 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistJS))); |
|
| 30 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistJS))); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | // is there JS we should simply remove |
| 34 | - $removableJS = apply_filters( 'autoptimize_filter_js_removables', '', $this->content ); |
|
| 34 | + $removableJS = apply_filters('autoptimize_filter_js_removables', '', $this->content); |
|
| 35 | 35 | if (!empty($removableJS)) { |
| 36 | - $this->jsremovables = array_filter(array_map('trim',explode(",",$removableJS))); |
|
| 36 | + $this->jsremovables = array_filter(array_map('trim', explode(",", $removableJS))); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // only header? |
| 40 | - if( apply_filters('autoptimize_filter_js_justhead', $options['justhead']) == true ) { |
|
| 41 | - $content = explode('</head>',$this->content,2); |
|
| 40 | + if (apply_filters('autoptimize_filter_js_justhead', $options['justhead']) == true) { |
|
| 41 | + $content = explode('</head>', $this->content, 2); |
|
| 42 | 42 | $this->content = $content[0].'</head>'; |
| 43 | 43 | $this->restofcontent = $content[1]; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // include inline? |
| 47 | - if( apply_filters('autoptimize_js_include_inline', $options['include_inline']) == true ) { |
|
| 47 | + if (apply_filters('autoptimize_js_include_inline', $options['include_inline']) == true) { |
|
| 48 | 48 | $this->include_inline = true; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // filter to "late inject minified JS", default to true for now (it is faster) |
| 52 | - $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late',true); |
|
| 52 | + $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true); |
|
| 53 | 53 | |
| 54 | 54 | // filters to override hardcoded do(nt)move(last) array contents (array in, array out!) |
| 55 | - $this->dontmove = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove ); |
|
| 56 | - $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast ); |
|
| 57 | - $this->domove = apply_filters( 'autoptimize_filter_js_domove', $this->domove ); |
|
| 55 | + $this->dontmove = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove); |
|
| 56 | + $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast); |
|
| 57 | + $this->domove = apply_filters('autoptimize_filter_js_domove', $this->domove); |
|
| 58 | 58 | |
| 59 | 59 | // get extra exclusions settings or filter |
| 60 | 60 | $excludeJS = $options['js_exclude']; |
| 61 | - $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS, $this->content ); |
|
| 62 | - if ($excludeJS!=="") { |
|
| 61 | + $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS, $this->content); |
|
| 62 | + if ($excludeJS !== "") { |
|
| 63 | 63 | if (is_array($excludeJS)) { |
| 64 | - if(($removeKeys = array_keys($excludeJS,"remove")) !== false) { |
|
| 64 | + if (($removeKeys = array_keys($excludeJS, "remove")) !== false) { |
|
| 65 | 65 | foreach ($removeKeys as $removeKey) { |
| 66 | 66 | unset($excludeJS[$removeKey]); |
| 67 | - $this->jsremovables[]=$removeKey; |
|
| 67 | + $this->jsremovables[] = $removeKey; |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | $exclJSArr = array_keys($excludeJS); |
| 71 | 71 | } else { |
| 72 | - $exclJSArr = array_filter(array_map('trim',explode(",",$excludeJS))); |
|
| 72 | + $exclJSArr = array_filter(array_map('trim', explode(",", $excludeJS))); |
|
| 73 | 73 | } |
| 74 | - $this->dontmove = array_merge($exclJSArr,$this->dontmove); |
|
| 74 | + $this->dontmove = array_merge($exclJSArr, $this->dontmove); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | //Should we add try-catch? |
| 78 | - if($options['trycatch'] == true) |
|
| 78 | + if ($options['trycatch'] == true) |
|
| 79 | 79 | $this->trycatch = true; |
| 80 | 80 | |
| 81 | 81 | // force js in head? |
| 82 | - if($options['forcehead'] == true) { |
|
| 82 | + if ($options['forcehead'] == true) { |
|
| 83 | 83 | $this->forcehead = true; |
| 84 | 84 | } else { |
| 85 | 85 | $this->forcehead = false; |
| 86 | 86 | } |
| 87 | - $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead ); |
|
| 87 | + $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead); |
|
| 88 | 88 | |
| 89 | 89 | // get cdn url |
| 90 | 90 | $this->cdn_url = $options['cdn_url']; |
@@ -99,24 +99,24 @@ discard block |
||
| 99 | 99 | $this->content = $this->hide_comments($this->content); |
| 100 | 100 | |
| 101 | 101 | // Get script files |
| 102 | - if (preg_match_all('#<script.*</script>#Usmi',$this->content,$matches)) { |
|
| 103 | - foreach($matches[0] as $tag) { |
|
| 102 | + if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) { |
|
| 103 | + foreach ($matches[0] as $tag) { |
|
| 104 | 104 | // only consider script aggregation for types whitelisted in should_aggregate-function |
| 105 | - if( !$this->should_aggregate($tag) ) { |
|
| 106 | - $tag=''; |
|
| 105 | + if (!$this->should_aggregate($tag)) { |
|
| 106 | + $tag = ''; |
|
| 107 | 107 | continue; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi',$tag,$source)) { |
|
| 110 | + if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) { |
|
| 111 | 111 | // non-inline script |
| 112 | - if ($this->isremovable($tag,$this->jsremovables)) { |
|
| 113 | - $this->content = str_replace($tag,'',$this->content); |
|
| 112 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 113 | + $this->content = str_replace($tag, '', $this->content); |
|
| 114 | 114 | continue; |
| 115 | 115 | } |
| 116 | - $explUrl = explode('?',$source[2],2); |
|
| 116 | + $explUrl = explode('?', $source[2], 2); |
|
| 117 | 117 | $url = $explUrl[0]; |
| 118 | 118 | $path = $this->getpath($url); |
| 119 | - if($path !== false && preg_match('#\.js$#',$path) && $this->ismergeable($tag)) { |
|
| 119 | + if ($path !== false && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) { |
|
| 120 | 120 | // ok to optimize, add to array |
| 121 | 121 | $this->scripts[] = $path; |
| 122 | 122 | } else { |
@@ -127,14 +127,14 @@ discard block |
||
| 127 | 127 | if (is_array($excludeJS)) { |
| 128 | 128 | // should we add flags? |
| 129 | 129 | foreach ($excludeJS as $exclTag => $exclFlags) { |
| 130 | - if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) { |
|
| 131 | - $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag); |
|
| 130 | + if (strpos($origTag, $exclTag) !== false && in_array($exclFlags, array("async", "defer"))) { |
|
| 131 | + $newTag = str_replace('<script ', '<script '.$exclFlags.' ', $newTag); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | // should we minify the non-aggregated script? |
| 137 | - if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) { |
|
| 137 | + if ($path && apply_filters('autoptimize_filter_js_minify_excluded', false)) { |
|
| 138 | 138 | $_CachedMinifiedUrl = $this->minify_single($path); |
| 139 | 139 | |
| 140 | 140 | // replace orig URL with minified URL from cache if so |
@@ -143,23 +143,23 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | // remove querystring from URL in newTag |
| 146 | - if ( !empty($explUrl[1]) ) { |
|
| 147 | - $newTag = str_replace("?".$explUrl[1],"",$newTag); |
|
| 146 | + if (!empty($explUrl[1])) { |
|
| 147 | + $newTag = str_replace("?".$explUrl[1], "", $newTag); |
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // should we move the non-aggregated script? |
| 152 | - if( $this->ismovable($newTag) ) { |
|
| 152 | + if ($this->ismovable($newTag)) { |
|
| 153 | 153 | // can be moved, flags and all |
| 154 | - if( $this->movetolast($newTag) ) { |
|
| 154 | + if ($this->movetolast($newTag)) { |
|
| 155 | 155 | $this->move['last'][] = $newTag; |
| 156 | 156 | } else { |
| 157 | 157 | $this->move['first'][] = $newTag; |
| 158 | 158 | } |
| 159 | 159 | } else { |
| 160 | 160 | // cannot be moved, so if flag was added re-inject altered tag immediately |
| 161 | - if ( $origTag !== $newTag ) { |
|
| 162 | - $this->content = str_replace($origTag,$newTag,$this->content); |
|
| 161 | + if ($origTag !== $newTag) { |
|
| 162 | + $this->content = str_replace($origTag, $newTag, $this->content); |
|
| 163 | 163 | $origTag = ''; |
| 164 | 164 | } |
| 165 | 165 | // and forget about the $tag (not to be touched any more) |
@@ -168,23 +168,23 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | } else { |
| 170 | 170 | // Inline script |
| 171 | - if ($this->isremovable($tag,$this->jsremovables)) { |
|
| 172 | - $this->content = str_replace($tag,'',$this->content); |
|
| 171 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 172 | + $this->content = str_replace($tag, '', $this->content); |
|
| 173 | 173 | continue; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | // unhide comments, as javascript may be wrapped in comment-tags for old times' sake |
| 177 | 177 | $tag = $this->restore_comments($tag); |
| 178 | - if($this->ismergeable($tag) && ( $this->include_inline )) { |
|
| 179 | - preg_match('#<script.*>(.*)</script>#Usmi',$tag,$code); |
|
| 180 | - $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm','$1',$code[1]); |
|
| 181 | - $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/','',$code); |
|
| 178 | + if ($this->ismergeable($tag) && ($this->include_inline)) { |
|
| 179 | + preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code); |
|
| 180 | + $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]); |
|
| 181 | + $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code); |
|
| 182 | 182 | $this->scripts[] = 'INLINE;'.$code; |
| 183 | 183 | } else { |
| 184 | 184 | // Can we move this? |
| 185 | - $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag ); |
|
| 186 | - if( $this->ismovable($tag) || $autoptimize_js_moveable !== '' ) { |
|
| 187 | - if( $this->movetolast($tag) || $autoptimize_js_moveable === 'last' ) { |
|
| 185 | + $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag); |
|
| 186 | + if ($this->ismovable($tag) || $autoptimize_js_moveable !== '') { |
|
| 187 | + if ($this->movetolast($tag) || $autoptimize_js_moveable === 'last') { |
|
| 188 | 188 | $this->move['last'][] = $tag; |
| 189 | 189 | } else { |
| 190 | 190 | $this->move['first'][] = $tag; |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | //Remove the original script tag |
| 202 | - $this->content = str_replace($tag,'',$this->content); |
|
| 202 | + $this->content = str_replace($tag, '', $this->content); |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | return true; |
@@ -211,39 +211,39 @@ discard block |
||
| 211 | 211 | |
| 212 | 212 | //Joins and optimizes JS |
| 213 | 213 | public function minify() { |
| 214 | - foreach($this->scripts as $script) { |
|
| 215 | - if(preg_match('#^INLINE;#',$script)) { |
|
| 214 | + foreach ($this->scripts as $script) { |
|
| 215 | + if (preg_match('#^INLINE;#', $script)) { |
|
| 216 | 216 | //Inline script |
| 217 | - $script = preg_replace('#^INLINE;#','',$script); |
|
| 218 | - $script = rtrim( $script, ";\n\t\r" ) . ';'; |
|
| 217 | + $script = preg_replace('#^INLINE;#', '', $script); |
|
| 218 | + $script = rtrim($script, ";\n\t\r").';'; |
|
| 219 | 219 | //Add try-catch? |
| 220 | - if($this->trycatch) { |
|
| 220 | + if ($this->trycatch) { |
|
| 221 | 221 | $script = 'try{'.$script.'}catch(e){}'; |
| 222 | 222 | } |
| 223 | - $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, '' ); |
|
| 224 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscript) ) { |
|
| 225 | - $script=$tmpscript; |
|
| 226 | - $this->alreadyminified=true; |
|
| 223 | + $tmpscript = apply_filters('autoptimize_js_individual_script', $script, ''); |
|
| 224 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) { |
|
| 225 | + $script = $tmpscript; |
|
| 226 | + $this->alreadyminified = true; |
|
| 227 | 227 | } |
| 228 | - $this->jscode .= "\n" . $script; |
|
| 228 | + $this->jscode .= "\n".$script; |
|
| 229 | 229 | } else { |
| 230 | 230 | //External script |
| 231 | - if($script !== false && file_exists($script) && is_readable($script)) { |
|
| 231 | + if ($script !== false && file_exists($script) && is_readable($script)) { |
|
| 232 | 232 | $scriptsrc = file_get_contents($script); |
| 233 | 233 | $scripthash = md5($scriptsrc); |
| 234 | - $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$scriptsrc); |
|
| 235 | - $scriptsrc = rtrim($scriptsrc,";\n\t\r").';'; |
|
| 234 | + $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc); |
|
| 235 | + $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';'; |
|
| 236 | 236 | |
| 237 | 237 | //Add try-catch? |
| 238 | - if($this->trycatch) { |
|
| 238 | + if ($this->trycatch) { |
|
| 239 | 239 | $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}'; |
| 240 | 240 | } |
| 241 | - $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script ); |
|
| 242 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc) ) { |
|
| 243 | - $scriptsrc=$tmpscriptsrc; |
|
| 244 | - $this->alreadyminified=true; |
|
| 241 | + $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script); |
|
| 242 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) { |
|
| 243 | + $scriptsrc = $tmpscriptsrc; |
|
| 244 | + $this->alreadyminified = true; |
|
| 245 | 245 | } else if ($this->can_inject_late($script)) { |
| 246 | - $scriptsrc="/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($script)."|".$scripthash."%%INJECTLATER%%*/"; |
|
| 246 | + $scriptsrc = "/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($script)."|".$scripthash."%%INJECTLATER%%*/"; |
|
| 247 | 247 | } |
| 248 | 248 | $this->jscode .= "\n".$scriptsrc; |
| 249 | 249 | }/*else{ |
@@ -254,24 +254,24 @@ discard block |
||
| 254 | 254 | |
| 255 | 255 | //Check for already-minified code |
| 256 | 256 | $this->md5hash = md5($this->jscode); |
| 257 | - $ccheck = new autoptimizeCache($this->md5hash,'js'); |
|
| 258 | - if($ccheck->check()) { |
|
| 257 | + $ccheck = new autoptimizeCache($this->md5hash, 'js'); |
|
| 258 | + if ($ccheck->check()) { |
|
| 259 | 259 | $this->jscode = $ccheck->retrieve(); |
| 260 | 260 | return true; |
| 261 | 261 | } |
| 262 | 262 | unset($ccheck); |
| 263 | 263 | |
| 264 | 264 | //$this->jscode has all the uncompressed code now. |
| 265 | - if ($this->alreadyminified!==true) { |
|
| 266 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 267 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 265 | + if ($this->alreadyminified !== true) { |
|
| 266 | + if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) { |
|
| 267 | + if (@is_callable(array("JSMin", "minify"))) { |
|
| 268 | 268 | $tmp_jscode = trim(JSMin::minify($this->jscode)); |
| 269 | 269 | if (!empty($tmp_jscode)) { |
| 270 | 270 | $this->jscode = $tmp_jscode; |
| 271 | 271 | unset($tmp_jscode); |
| 272 | 272 | } |
| 273 | 273 | $this->jscode = $this->inject_minified($this->jscode); |
| 274 | - $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
|
| 274 | + $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode); |
|
| 275 | 275 | return true; |
| 276 | 276 | } else { |
| 277 | 277 | $this->jscode = $this->inject_minified($this->jscode); |
@@ -282,16 +282,16 @@ discard block |
||
| 282 | 282 | return false; |
| 283 | 283 | } |
| 284 | 284 | } |
| 285 | - $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
|
| 285 | + $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode); |
|
| 286 | 286 | return true; |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | //Caches the JS in uncompressed, deflated and gzipped form. |
| 290 | - public function cache() { |
|
| 291 | - $cache = new autoptimizeCache($this->md5hash,'js'); |
|
| 292 | - if(!$cache->check()) { |
|
| 290 | + public function cache() { |
|
| 291 | + $cache = new autoptimizeCache($this->md5hash, 'js'); |
|
| 292 | + if (!$cache->check()) { |
|
| 293 | 293 | //Cache our code |
| 294 | - $cache->cache($this->jscode,'text/javascript'); |
|
| 294 | + $cache->cache($this->jscode, 'text/javascript'); |
|
| 295 | 295 | } |
| 296 | 296 | $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 297 | 297 | $this->url = $this->url_replace_cdn($this->url); |
@@ -300,32 +300,32 @@ discard block |
||
| 300 | 300 | // Returns the content |
| 301 | 301 | public function getcontent() { |
| 302 | 302 | // Restore the full content |
| 303 | - if(!empty($this->restofcontent)) { |
|
| 303 | + if (!empty($this->restofcontent)) { |
|
| 304 | 304 | $this->content .= $this->restofcontent; |
| 305 | 305 | $this->restofcontent = ''; |
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | // Add the scripts taking forcehead/ deferred (default) into account |
| 309 | - if($this->forcehead == true) { |
|
| 310 | - $replaceTag=array("</head>","before"); |
|
| 311 | - $defer=""; |
|
| 309 | + if ($this->forcehead == true) { |
|
| 310 | + $replaceTag = array("</head>", "before"); |
|
| 311 | + $defer = ""; |
|
| 312 | 312 | } else { |
| 313 | - $replaceTag=array("</body>","before"); |
|
| 314 | - $defer="defer "; |
|
| 313 | + $replaceTag = array("</body>", "before"); |
|
| 314 | + $defer = "defer "; |
|
| 315 | 315 | } |
| 316 | 316 | |
| 317 | - $defer = apply_filters( 'autoptimize_filter_js_defer', $defer ); |
|
| 317 | + $defer = apply_filters('autoptimize_filter_js_defer', $defer); |
|
| 318 | 318 | $bodyreplacementpayload = '<script type="text/javascript" '.$defer.'src="'.$this->url.'"></script>'; |
| 319 | - $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload',$bodyreplacementpayload); |
|
| 319 | + $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload); |
|
| 320 | 320 | |
| 321 | - $bodyreplacement = implode('',$this->move['first']); |
|
| 321 | + $bodyreplacement = implode('', $this->move['first']); |
|
| 322 | 322 | $bodyreplacement .= $bodyreplacementpayload; |
| 323 | - $bodyreplacement .= implode('',$this->move['last']); |
|
| 323 | + $bodyreplacement .= implode('', $this->move['last']); |
|
| 324 | 324 | |
| 325 | - $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag ); |
|
| 325 | + $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag); |
|
| 326 | 326 | |
| 327 | - if (strlen($this->jscode)>0) { |
|
| 328 | - $this->inject_in_html($bodyreplacement,$replaceTag); |
|
| 327 | + if (strlen($this->jscode) > 0) { |
|
| 328 | + $this->inject_in_html($bodyreplacement, $replaceTag); |
|
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | // restore comments |
@@ -343,19 +343,19 @@ discard block |
||
| 343 | 343 | |
| 344 | 344 | // Checks against the white- and blacklists |
| 345 | 345 | private function ismergeable($tag) { |
| 346 | - if (apply_filters('autoptimize_filter_js_dontaggregate',false)) { |
|
| 346 | + if (apply_filters('autoptimize_filter_js_dontaggregate', false)) { |
|
| 347 | 347 | return false; |
| 348 | 348 | } else if (!empty($this->whitelist)) { |
| 349 | 349 | foreach ($this->whitelist as $match) { |
| 350 | - if(strpos($tag,$match)!==false) { |
|
| 350 | + if (strpos($tag, $match) !== false) { |
|
| 351 | 351 | return true; |
| 352 | 352 | } |
| 353 | 353 | } |
| 354 | 354 | // no match with whitelist |
| 355 | 355 | return false; |
| 356 | 356 | } else { |
| 357 | - foreach($this->domove as $match) { |
|
| 358 | - if(strpos($tag,$match)!==false) { |
|
| 357 | + foreach ($this->domove as $match) { |
|
| 358 | + if (strpos($tag, $match) !== false) { |
|
| 359 | 359 | // Matched something |
| 360 | 360 | return false; |
| 361 | 361 | } |
@@ -365,8 +365,8 @@ discard block |
||
| 365 | 365 | return false; |
| 366 | 366 | } |
| 367 | 367 | |
| 368 | - foreach($this->dontmove as $match) { |
|
| 369 | - if(strpos($tag,$match)!==false) { |
|
| 368 | + foreach ($this->dontmove as $match) { |
|
| 369 | + if (strpos($tag, $match) !== false) { |
|
| 370 | 370 | //Matched something |
| 371 | 371 | return false; |
| 372 | 372 | } |
@@ -379,12 +379,12 @@ discard block |
||
| 379 | 379 | |
| 380 | 380 | // Checks againstt the blacklist |
| 381 | 381 | private function ismovable($tag) { |
| 382 | - if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',true)) { |
|
| 382 | + if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable', true)) { |
|
| 383 | 383 | return false; |
| 384 | 384 | } |
| 385 | 385 | |
| 386 | - foreach($this->domove as $match) { |
|
| 387 | - if(strpos($tag,$match)!==false) { |
|
| 386 | + foreach ($this->domove as $match) { |
|
| 387 | + if (strpos($tag, $match) !== false) { |
|
| 388 | 388 | // Matched something |
| 389 | 389 | return true; |
| 390 | 390 | } |
@@ -394,8 +394,8 @@ discard block |
||
| 394 | 394 | return true; |
| 395 | 395 | } |
| 396 | 396 | |
| 397 | - foreach($this->dontmove as $match) { |
|
| 398 | - if(strpos($tag,$match)!==false) { |
|
| 397 | + foreach ($this->dontmove as $match) { |
|
| 398 | + if (strpos($tag, $match) !== false) { |
|
| 399 | 399 | // Matched something |
| 400 | 400 | return false; |
| 401 | 401 | } |
@@ -406,8 +406,8 @@ discard block |
||
| 406 | 406 | } |
| 407 | 407 | |
| 408 | 408 | private function movetolast($tag) { |
| 409 | - foreach($this->domovelast as $match) { |
|
| 410 | - if(strpos($tag,$match)!==false) { |
|
| 409 | + foreach ($this->domovelast as $match) { |
|
| 410 | + if (strpos($tag, $match) !== false) { |
|
| 411 | 411 | // Matched, return true |
| 412 | 412 | return true; |
| 413 | 413 | } |
@@ -433,10 +433,10 @@ discard block |
||
| 433 | 433 | * original function by https://github.com/zytzagoo/ on his AO fork, thanks Tomas! |
| 434 | 434 | */ |
| 435 | 435 | public function should_aggregate($tag) { |
| 436 | - preg_match('#<(script[^>]*)>#i',$tag,$scripttag); |
|
| 437 | - if ( strpos($scripttag[1], 'type')===false ) { |
|
| 436 | + preg_match('#<(script[^>]*)>#i', $tag, $scripttag); |
|
| 437 | + if (strpos($scripttag[1], 'type') === false) { |
|
| 438 | 438 | return true; |
| 439 | - } else if ( preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1]) ) { |
|
| 439 | + } else if (preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1])) { |
|
| 440 | 440 | return true; |
| 441 | 441 | } else { |
| 442 | 442 | return false; |
@@ -454,11 +454,11 @@ discard block |
||
| 454 | 454 | * @return bool |
| 455 | 455 | */ |
| 456 | 456 | private function can_inject_late($jsPath) { |
| 457 | - $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false); |
|
| 458 | - if ( $this->inject_min_late !== true ) { |
|
| 457 | + $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false); |
|
| 458 | + if ($this->inject_min_late !== true) { |
|
| 459 | 459 | // late-inject turned off |
| 460 | 460 | return false; |
| 461 | - } else if ( (strpos($jsPath,"min.js") === false) && ( strpos($jsPath,"wp-includes/js/jquery/jquery.js") === false ) && ( str_replace($consider_minified_array, '', $jsPath) === $jsPath ) ) { |
|
| 461 | + } else if ((strpos($jsPath, "min.js") === false) && (strpos($jsPath, "wp-includes/js/jquery/jquery.js") === false) && (str_replace($consider_minified_array, '', $jsPath) === $jsPath)) { |
|
| 462 | 462 | // file not minified based on filename & filter |
| 463 | 463 | return false; |
| 464 | 464 | } else { |
@@ -610,6 +610,9 @@ |
||
| 610 | 610 | return $code; |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | + /** |
|
| 614 | + * @param string $tag |
|
| 615 | + */ |
|
| 613 | 616 | private function ismovable($tag) {
|
| 614 | 617 | if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
|
| 615 | 618 | return false; |
@@ -162,32 +162,32 @@ discard block |
||
| 162 | 162 | // Remove the original style tag |
| 163 | 163 | $this->content = str_replace($tag,'',$this->content); |
| 164 | 164 | } else {
|
| 165 | - // excluded CSS, minify if getpath |
|
| 166 | - if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 167 | - $explUrl = explode('?',$source[2],2);
|
|
| 165 | + // excluded CSS, minify if getpath |
|
| 166 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 167 | + $explUrl = explode('?',$source[2],2);
|
|
| 168 | 168 | $url = $explUrl[0]; |
| 169 | 169 | $path = $this->getpath($url); |
| 170 | 170 | |
| 171 | - if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
|
|
| 172 | - $_CachedMinifiedUrl = $this->minify_single($path); |
|
| 173 | - |
|
| 174 | - if (!empty($_CachedMinifiedUrl)) {
|
|
| 175 | - // replace orig URL with URL to cache |
|
| 176 | - $newTag = str_replace($url, $_CachedMinifiedUrl, $tag); |
|
| 177 | - } else {
|
|
| 178 | - $newTag = $tag; |
|
| 179 | - } |
|
| 171 | + if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
|
|
| 172 | + $_CachedMinifiedUrl = $this->minify_single($path); |
|
| 173 | + |
|
| 174 | + if (!empty($_CachedMinifiedUrl)) {
|
|
| 175 | + // replace orig URL with URL to cache |
|
| 176 | + $newTag = str_replace($url, $_CachedMinifiedUrl, $tag); |
|
| 177 | + } else {
|
|
| 178 | + $newTag = $tag; |
|
| 179 | + } |
|
| 180 | 180 | |
| 181 | - // remove querystring from URL |
|
| 182 | - if ( !empty($explUrl[1]) ) {
|
|
| 183 | - $newTag = str_replace("?".$explUrl[1],"",$newTag);
|
|
| 184 | - } |
|
| 185 | - |
|
| 186 | - // and replace |
|
| 187 | - $this->content = str_replace($tag,$newTag,$this->content); |
|
| 188 | - } |
|
| 189 | - } |
|
| 190 | - } |
|
| 181 | + // remove querystring from URL |
|
| 182 | + if ( !empty($explUrl[1]) ) {
|
|
| 183 | + $newTag = str_replace("?".$explUrl[1],"",$newTag);
|
|
| 184 | + } |
|
| 185 | + |
|
| 186 | + // and replace |
|
| 187 | + $this->content = str_replace($tag,$newTag,$this->content); |
|
| 188 | + } |
|
| 189 | + } |
|
| 190 | + } |
|
| 191 | 191 | } |
| 192 | 192 | return true; |
| 193 | 193 | } |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | // just cdn the URL if applicable |
| 405 | 405 | if (!empty($this->cdn_url)) {
|
| 406 | 406 | $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
| 407 | - } |
|
| 407 | + } |
|
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | 410 | } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
|
@@ -611,8 +611,8 @@ discard block |
||
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | private function ismovable($tag) {
|
| 614 | - if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
|
|
| 615 | - return false; |
|
| 614 | + if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
|
|
| 615 | + return false; |
|
| 616 | 616 | } else if (!empty($this->whitelist)) {
|
| 617 | 617 | foreach ($this->whitelist as $match) {
|
| 618 | 618 | if(strpos($tag,$match)!==false) {
|
@@ -637,13 +637,13 @@ discard block |
||
| 637 | 637 | } |
| 638 | 638 | |
| 639 | 639 | private function can_inject_late($cssPath,$css) {
|
| 640 | - $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
|
|
| 640 | + $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
|
|
| 641 | 641 | if ( $this->inject_min_late !== true ) {
|
| 642 | 642 | // late-inject turned off |
| 643 | 643 | return false; |
| 644 | 644 | } else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {
|
| 645 | - // file not minified based on filename & filter |
|
| 646 | - return false; |
|
| 645 | + // file not minified based on filename & filter |
|
| 646 | + return false; |
|
| 647 | 647 | } else if ( strpos($css,"@import") !== false ) {
|
| 648 | 648 | // can't late-inject files with imports as those need to be aggregated |
| 649 | 649 | return false; |
@@ -1,5 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if ( ! defined( 'ABSPATH' ) ) { |
|
| 3 | + exit; |
|
| 4 | +} |
|
| 5 | +// Exit if accessed directly |
|
| 3 | 6 | |
| 4 | 7 | class autoptimizeStyles extends autoptimizeBase {
|
| 5 | 8 | |
@@ -24,7 +27,9 @@ discard block |
||
| 24 | 27 | //Reads the page and collects style tags |
| 25 | 28 | public function read($options) {
|
| 26 | 29 | $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content ); |
| 27 | - if ($noptimizeCSS) return false; |
|
| 30 | + if ($noptimizeCSS) { |
|
| 31 | + return false; |
|
| 32 | + } |
|
| 28 | 33 | |
| 29 | 34 | $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content ); |
| 30 | 35 | if (!empty($whitelistCSS)) {
|
@@ -139,7 +144,7 @@ discard block |
||
| 139 | 144 | if($path!==false && preg_match('#\.css$#',$path)) {
|
| 140 | 145 | // Good link |
| 141 | 146 | $this->css[] = array($media,$path); |
| 142 | - }else{
|
|
| 147 | + } else{
|
|
| 143 | 148 | // Link is dynamic (.php etc) |
| 144 | 149 | $tag = ''; |
| 145 | 150 | } |
@@ -228,8 +233,9 @@ discard block |
||
| 228 | 233 | } |
| 229 | 234 | |
| 230 | 235 | foreach($media as $elem) {
|
| 231 | - if(!isset($this->csscode[$elem])) |
|
| 232 | - $this->csscode[$elem] = ''; |
|
| 236 | + if(!isset($this->csscode[$elem])) { |
|
| 237 | + $this->csscode[$elem] = ''; |
|
| 238 | + } |
|
| 233 | 239 | $this->csscode[$elem] .= "\n/*FILESTART*/".$css; |
| 234 | 240 | } |
| 235 | 241 | } |
@@ -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 | class autoptimizeStyles extends autoptimizeBase {
|
| 5 | 5 | |
@@ -23,12 +23,12 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | //Reads the page and collects style tags |
| 25 | 25 | public function read($options) {
|
| 26 | - $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content ); |
|
| 26 | + $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
|
|
| 27 | 27 | if ($noptimizeCSS) return false; |
| 28 | 28 | |
| 29 | - $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content ); |
|
| 29 | + $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content);
|
|
| 30 | 30 | if (!empty($whitelistCSS)) {
|
| 31 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));
|
|
| 31 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));
|
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | if ($options['nogooglefont'] == true) {
|
@@ -36,54 +36,54 @@ discard block |
||
| 36 | 36 | } else {
|
| 37 | 37 | $removableCSS = ""; |
| 38 | 38 | } |
| 39 | - $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS); |
|
| 39 | + $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);
|
|
| 40 | 40 | if (!empty($removableCSS)) {
|
| 41 | - $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));
|
|
| 41 | + $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));
|
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);
|
|
| 44 | + $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
|
|
| 45 | 45 | |
| 46 | 46 | // filter to "late inject minified CSS", default to true for now (it is faster) |
| 47 | - $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);
|
|
| 47 | + $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
|
|
| 48 | 48 | |
| 49 | 49 | // Remove everything that's not the header |
| 50 | - if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {
|
|
| 51 | - $content = explode('</head>',$this->content,2);
|
|
| 50 | + if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {
|
|
| 51 | + $content = explode('</head>', $this->content, 2);
|
|
| 52 | 52 | $this->content = $content[0].'</head>'; |
| 53 | 53 | $this->restofcontent = $content[1]; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // include inline? |
| 57 | - if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {
|
|
| 57 | + if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {
|
|
| 58 | 58 | $this->include_inline = true; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | // what CSS shouldn't be autoptimized |
| 62 | 62 | $excludeCSS = $options['css_exclude']; |
| 63 | - $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS, $this->content ); |
|
| 64 | - if ($excludeCSS!=="") {
|
|
| 65 | - $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));
|
|
| 63 | + $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS, $this->content);
|
|
| 64 | + if ($excludeCSS !== "") {
|
|
| 65 | + $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));
|
|
| 66 | 66 | } else {
|
| 67 | 67 | $this->dontmove = array(); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | // forcefully exclude CSS with data-noptimize attrib |
| 71 | - $this->dontmove[]="data-noptimize"; |
|
| 71 | + $this->dontmove[] = "data-noptimize"; |
|
| 72 | 72 | |
| 73 | 73 | // should we defer css? |
| 74 | 74 | // value: true/ false |
| 75 | 75 | $this->defer = $options['defer']; |
| 76 | - $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content ); |
|
| 76 | + $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);
|
|
| 77 | 77 | |
| 78 | 78 | // should we inline while deferring? |
| 79 | 79 | // value: inlined CSS |
| 80 | 80 | $this->defer_inline = $options['defer_inline']; |
| 81 | - $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content ); |
|
| 81 | + $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content);
|
|
| 82 | 82 | |
| 83 | 83 | // should we inline? |
| 84 | 84 | // value: true/ false |
| 85 | 85 | $this->inline = $options['inline']; |
| 86 | - $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content ); |
|
| 86 | + $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);
|
|
| 87 | 87 | |
| 88 | 88 | // get cdn url |
| 89 | 89 | $this->cdn_url = $options['cdn_url']; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->content = $this->hide_noptimize($this->content); |
| 96 | 96 | |
| 97 | 97 | // exclude (no)script, as those may contain CSS which should be left as is |
| 98 | - if ( strpos( $this->content, '<script' ) !== false ) {
|
|
| 98 | + if (strpos($this->content, '<script') !== false) {
|
|
| 99 | 99 | $this->content = preg_replace_callback( |
| 100 | 100 | '#<(?:no)?script.*?<\/(?:no)?script>#is', |
| 101 | 101 | create_function( |
@@ -113,65 +113,65 @@ discard block |
||
| 113 | 113 | $this->content = $this->hide_comments($this->content); |
| 114 | 114 | |
| 115 | 115 | // Get <style> and <link> |
| 116 | - if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {
|
|
| 117 | - foreach($matches[0] as $tag) {
|
|
| 118 | - if ($this->isremovable($tag,$this->cssremovables)) {
|
|
| 119 | - $this->content = str_replace($tag,'',$this->content); |
|
| 116 | + if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
|
|
| 117 | + foreach ($matches[0] as $tag) {
|
|
| 118 | + if ($this->isremovable($tag, $this->cssremovables)) {
|
|
| 119 | + $this->content = str_replace($tag, '', $this->content); |
|
| 120 | 120 | } else if ($this->ismovable($tag)) {
|
| 121 | 121 | // Get the media |
| 122 | - if(strpos($tag,'media=')!==false) {
|
|
| 123 | - preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);
|
|
| 124 | - $medias = explode(',',$medias[1]);
|
|
| 122 | + if (strpos($tag, 'media=') !== false) {
|
|
| 123 | + preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
|
|
| 124 | + $medias = explode(',', $medias[1]);
|
|
| 125 | 125 | $media = array(); |
| 126 | - foreach($medias as $elem) {
|
|
| 127 | - if (empty($elem)) { $elem="all"; }
|
|
| 126 | + foreach ($medias as $elem) {
|
|
| 127 | + if (empty($elem)) { $elem = "all"; }
|
|
| 128 | 128 | $media[] = $elem; |
| 129 | 129 | } |
| 130 | 130 | } else {
|
| 131 | 131 | // No media specified - applies to all |
| 132 | 132 | $media = array('all');
|
| 133 | 133 | } |
| 134 | - $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag ); |
|
| 134 | + $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
|
|
| 135 | 135 | |
| 136 | - if(preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 136 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 137 | 137 | // <link> |
| 138 | - $explUrl = explode('?',$source[2],2);
|
|
| 138 | + $explUrl = explode('?', $source[2], 2);
|
|
| 139 | 139 | $url = $explUrl[0]; |
| 140 | 140 | $path = $this->getpath($url); |
| 141 | 141 | |
| 142 | - if($path!==false && preg_match('#\.css$#',$path)) {
|
|
| 142 | + if ($path !== false && preg_match('#\.css$#', $path)) {
|
|
| 143 | 143 | // Good link |
| 144 | - $this->css[] = array($media,$path); |
|
| 145 | - }else{
|
|
| 144 | + $this->css[] = array($media, $path); |
|
| 145 | + } else {
|
|
| 146 | 146 | // Link is dynamic (.php etc) |
| 147 | 147 | $tag = ''; |
| 148 | 148 | } |
| 149 | 149 | } else {
|
| 150 | 150 | // inline css in style tags can be wrapped in comment tags, so restore comments |
| 151 | 151 | $tag = $this->restore_comments($tag); |
| 152 | - preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);
|
|
| 152 | + preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
|
|
| 153 | 153 | |
| 154 | 154 | // and re-hide them to be able to to the removal based on tag |
| 155 | 155 | $tag = $this->hide_comments($tag); |
| 156 | 156 | |
| 157 | - if ( $this->include_inline ) {
|
|
| 158 | - $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);
|
|
| 159 | - $this->css[] = array($media,'INLINE;'.$code); |
|
| 157 | + if ($this->include_inline) {
|
|
| 158 | + $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
|
|
| 159 | + $this->css[] = array($media, 'INLINE;'.$code); |
|
| 160 | 160 | } else {
|
| 161 | 161 | $tag = ''; |
| 162 | 162 | } |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | // Remove the original style tag |
| 166 | - $this->content = str_replace($tag,'',$this->content); |
|
| 166 | + $this->content = str_replace($tag, '', $this->content); |
|
| 167 | 167 | } else {
|
| 168 | 168 | // excluded CSS, minify if getpath |
| 169 | - if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 170 | - $explUrl = explode('?',$source[2],2);
|
|
| 169 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 170 | + $explUrl = explode('?', $source[2], 2);
|
|
| 171 | 171 | $url = $explUrl[0]; |
| 172 | 172 | $path = $this->getpath($url); |
| 173 | 173 | |
| 174 | - if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
|
|
| 174 | + if ($path && apply_filters('autoptimize_filter_css_minify_excluded', false)) {
|
|
| 175 | 175 | $_CachedMinifiedUrl = $this->minify_single($path); |
| 176 | 176 | |
| 177 | 177 | if (!empty($_CachedMinifiedUrl)) {
|
@@ -182,12 +182,12 @@ discard block |
||
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | // remove querystring from URL |
| 185 | - if ( !empty($explUrl[1]) ) {
|
|
| 186 | - $newTag = str_replace("?".$explUrl[1],"",$newTag);
|
|
| 185 | + if (!empty($explUrl[1])) {
|
|
| 186 | + $newTag = str_replace("?".$explUrl[1], "", $newTag);
|
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | // and replace |
| 190 | - $this->content = str_replace($tag,$newTag,$this->content); |
|
| 190 | + $this->content = str_replace($tag, $newTag, $this->content); |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | } |
@@ -200,31 +200,31 @@ discard block |
||
| 200 | 200 | |
| 201 | 201 | // Joins and optimizes CSS |
| 202 | 202 | public function minify() {
|
| 203 | - foreach($this->css as $group) {
|
|
| 204 | - list($media,$css) = $group; |
|
| 205 | - if(preg_match('#^INLINE;#',$css)) {
|
|
| 203 | + foreach ($this->css as $group) {
|
|
| 204 | + list($media, $css) = $group; |
|
| 205 | + if (preg_match('#^INLINE;#', $css)) {
|
|
| 206 | 206 | // <style> |
| 207 | - $css = preg_replace('#^INLINE;#','',$css);
|
|
| 208 | - $css = $this->fixurls(ABSPATH.'/index.php',$css); |
|
| 209 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" ); |
|
| 210 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {
|
|
| 211 | - $css=$tmpstyle; |
|
| 212 | - $this->alreadyminified=true; |
|
| 207 | + $css = preg_replace('#^INLINE;#', '', $css);
|
|
| 208 | + $css = $this->fixurls(ABSPATH.'/index.php', $css); |
|
| 209 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");
|
|
| 210 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 211 | + $css = $tmpstyle; |
|
| 212 | + $this->alreadyminified = true; |
|
| 213 | 213 | } |
| 214 | 214 | } else {
|
| 215 | 215 | //<link> |
| 216 | - if($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 216 | + if ($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 217 | 217 | $cssPath = $css; |
| 218 | 218 | $cssContents = file_get_contents($cssPath); |
| 219 | 219 | $cssHash = md5($cssContents); |
| 220 | - $css = $this->fixurls($cssPath,$cssContents); |
|
| 221 | - $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);
|
|
| 222 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath ); |
|
| 220 | + $css = $this->fixurls($cssPath, $cssContents); |
|
| 221 | + $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
|
|
| 222 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
|
|
| 223 | 223 | if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
| 224 | - $css=$tmpstyle; |
|
| 225 | - $this->alreadyminified=true; |
|
| 226 | - } else if ($this->can_inject_late($cssPath,$css)) {
|
|
| 227 | - $css="/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/"; |
|
| 224 | + $css = $tmpstyle; |
|
| 225 | + $this->alreadyminified = true; |
|
| 226 | + } else if ($this->can_inject_late($cssPath, $css)) {
|
|
| 227 | + $css = "/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/"; |
|
| 228 | 228 | } |
| 229 | 229 | } else {
|
| 230 | 230 | // Couldn't read CSS. Maybe getpath isn't working? |
@@ -232,8 +232,8 @@ discard block |
||
| 232 | 232 | } |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | - foreach($media as $elem) {
|
|
| 236 | - if(!isset($this->csscode[$elem])) |
|
| 235 | + foreach ($media as $elem) {
|
|
| 236 | + if (!isset($this->csscode[$elem])) |
|
| 237 | 237 | $this->csscode[$elem] = ''; |
| 238 | 238 | $this->csscode[$elem] .= "\n/*FILESTART*/".$css; |
| 239 | 239 | } |
@@ -242,12 +242,12 @@ discard block |
||
| 242 | 242 | // Check for duplicate code |
| 243 | 243 | $md5list = array(); |
| 244 | 244 | $tmpcss = $this->csscode; |
| 245 | - foreach($tmpcss as $media => $code) {
|
|
| 245 | + foreach ($tmpcss as $media => $code) {
|
|
| 246 | 246 | $md5sum = md5($code); |
| 247 | 247 | $medianame = $media; |
| 248 | - foreach($md5list as $med => $sum) {
|
|
| 248 | + foreach ($md5list as $med => $sum) {
|
|
| 249 | 249 | // If same code |
| 250 | - if($sum === $md5sum) {
|
|
| 250 | + if ($sum === $md5sum) {
|
|
| 251 | 251 | //Add the merged code |
| 252 | 252 | $medianame = $med.', '.$media; |
| 253 | 253 | $this->csscode[$medianame] = $code; |
@@ -267,30 +267,30 @@ discard block |
||
| 267 | 267 | $external_imports = ""; |
| 268 | 268 | |
| 269 | 269 | // remove comments to avoid importing commented-out imports |
| 270 | - $thiscss_nocomments = preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 270 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 271 | 271 | |
| 272 | - while(preg_match_all('#@import.*(?:;|$)#Um',$thiscss_nocomments,$matches)) {
|
|
| 273 | - foreach($matches[0] as $import) {
|
|
| 274 | - if ($this->isremovable($import,$this->cssremovables)) {
|
|
| 275 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 272 | + while (preg_match_all('#@import.*(?:;|$)#Um', $thiscss_nocomments, $matches)) {
|
|
| 273 | + foreach ($matches[0] as $import) {
|
|
| 274 | + if ($this->isremovable($import, $this->cssremovables)) {
|
|
| 275 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 276 | 276 | $import_ok = true; |
| 277 | 277 | } else {
|
| 278 | - $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");
|
|
| 278 | + $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
|
|
| 279 | 279 | $path = $this->getpath($url); |
| 280 | 280 | $import_ok = false; |
| 281 | 281 | if (file_exists($path) && is_readable($path)) {
|
| 282 | - $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\"); |
|
| 283 | - $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);
|
|
| 284 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" ); |
|
| 285 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 286 | - $code=$tmpstyle; |
|
| 287 | - $this->alreadyminified=true; |
|
| 288 | - } else if ($this->can_inject_late($path,$code)) {
|
|
| 289 | - $code="/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/"; |
|
| 282 | + $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\"); |
|
| 283 | + $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
|
|
| 284 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");
|
|
| 285 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 286 | + $code = $tmpstyle; |
|
| 287 | + $this->alreadyminified = true; |
|
| 288 | + } else if ($this->can_inject_late($path, $code)) {
|
|
| 289 | + $code = "/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/"; |
|
| 290 | 290 | } |
| 291 | 291 | |
| 292 | - if(!empty($code)) {
|
|
| 293 | - $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);
|
|
| 292 | + if (!empty($code)) {
|
|
| 293 | + $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
|
|
| 294 | 294 | if (!empty($tmp_thiscss)) {
|
| 295 | 295 | $thiscss = $tmp_thiscss; |
| 296 | 296 | $import_ok = true; |
@@ -304,31 +304,31 @@ discard block |
||
| 304 | 304 | if (!$import_ok) {
|
| 305 | 305 | // external imports and general fall-back |
| 306 | 306 | $external_imports .= $import; |
| 307 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 307 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 308 | 308 | $fiximports = true; |
| 309 | 309 | } |
| 310 | 310 | } |
| 311 | - $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);
|
|
| 312 | - $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);
|
|
| 311 | + $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
|
|
| 312 | + $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
|
|
| 313 | 313 | |
| 314 | 314 | // and update $thiscss_nocomments before going into next iteration in while loop |
| 315 | - $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 315 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 316 | 316 | } |
| 317 | 317 | unset($thiscss_nocomments); |
| 318 | 318 | |
| 319 | 319 | // add external imports to top of aggregated CSS |
| 320 | - if($fiximports) {
|
|
| 321 | - $thiscss=$external_imports.$thiscss; |
|
| 320 | + if ($fiximports) {
|
|
| 321 | + $thiscss = $external_imports.$thiscss; |
|
| 322 | 322 | } |
| 323 | 323 | } |
| 324 | 324 | unset($thiscss); |
| 325 | 325 | |
| 326 | 326 | // $this->csscode has all the uncompressed code now. |
| 327 | - foreach($this->csscode as &$code) {
|
|
| 327 | + foreach ($this->csscode as &$code) {
|
|
| 328 | 328 | // Check for already-minified code |
| 329 | 329 | $hash = md5($code); |
| 330 | - $ccheck = new autoptimizeCache($hash,'css'); |
|
| 331 | - if($ccheck->check()) {
|
|
| 330 | + $ccheck = new autoptimizeCache($hash, 'css'); |
|
| 331 | + if ($ccheck->check()) {
|
|
| 332 | 332 | $code = $ccheck->retrieve(); |
| 333 | 333 | $this->hashmap[md5($code)] = $hash; |
| 334 | 334 | continue; |
@@ -337,44 +337,44 @@ discard block |
||
| 337 | 337 | |
| 338 | 338 | // Do the imaging! |
| 339 | 339 | $imgreplace = array(); |
| 340 | - preg_match_all( self::ASSETS_REGEX, $code, $matches ); |
|
| 340 | + preg_match_all(self::ASSETS_REGEX, $code, $matches); |
|
| 341 | 341 | |
| 342 | - if ( ($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches)) ) {
|
|
| 343 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 344 | - $iurl = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 342 | + if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
|
|
| 343 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 344 | + $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 345 | 345 | |
| 346 | 346 | // if querystring, remove it from url |
| 347 | - if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }
|
|
| 347 | + if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }
|
|
| 348 | 348 | |
| 349 | 349 | $ipath = $this->getpath($iurl); |
| 350 | 350 | |
| 351 | 351 | $datauri_max_size = 4096; |
| 352 | - $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size ); |
|
| 353 | - $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', ""); |
|
| 352 | + $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);
|
|
| 353 | + $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");
|
|
| 354 | 354 | if (!empty($datauri_exclude)) {
|
| 355 | - $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));
|
|
| 355 | + $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));
|
|
| 356 | 356 | foreach ($no_datauris as $no_datauri) {
|
| 357 | - if (strpos($iurl,$no_datauri)!==false) {
|
|
| 358 | - $ipath=false; |
|
| 357 | + if (strpos($iurl, $no_datauri) !== false) {
|
|
| 358 | + $ipath = false; |
|
| 359 | 359 | break; |
| 360 | 360 | } |
| 361 | 361 | } |
| 362 | 362 | } |
| 363 | 363 | |
| 364 | - if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 365 | - $ihash=md5($ipath); |
|
| 366 | - $icheck = new autoptimizeCache($ihash,'img'); |
|
| 367 | - if($icheck->check()) {
|
|
| 364 | + if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 365 | + $ihash = md5($ipath); |
|
| 366 | + $icheck = new autoptimizeCache($ihash, 'img'); |
|
| 367 | + if ($icheck->check()) {
|
|
| 368 | 368 | // we have the base64 image in cache |
| 369 | - $headAndData=$icheck->retrieve(); |
|
| 370 | - $_base64data=explode(";base64,",$headAndData);
|
|
| 371 | - $base64data=$_base64data[1]; |
|
| 369 | + $headAndData = $icheck->retrieve(); |
|
| 370 | + $_base64data = explode(";base64,", $headAndData);
|
|
| 371 | + $base64data = $_base64data[1]; |
|
| 372 | 372 | } else {
|
| 373 | 373 | // It's an image and we don't have it in cache, get the type |
| 374 | - $explA=explode('.',$ipath);
|
|
| 375 | - $type=end($explA); |
|
| 374 | + $explA = explode('.', $ipath);
|
|
| 375 | + $type = end($explA); |
|
| 376 | 376 | |
| 377 | - switch($type) {
|
|
| 377 | + switch ($type) {
|
|
| 378 | 378 | case 'jpeg': |
| 379 | 379 | $dataurihead = 'data:image/jpeg;base64,'; |
| 380 | 380 | break; |
@@ -396,42 +396,42 @@ discard block |
||
| 396 | 396 | |
| 397 | 397 | // Encode the data |
| 398 | 398 | $base64data = base64_encode(file_get_contents($ipath)); |
| 399 | - $headAndData=$dataurihead.$base64data; |
|
| 399 | + $headAndData = $dataurihead.$base64data; |
|
| 400 | 400 | |
| 401 | 401 | // Save in cache |
| 402 | - $icheck->cache($headAndData,"text/plain"); |
|
| 402 | + $icheck->cache($headAndData, "text/plain"); |
|
| 403 | 403 | } |
| 404 | 404 | unset($icheck); |
| 405 | 405 | |
| 406 | 406 | // Add it to the list for replacement |
| 407 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]); |
|
| 407 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]); |
|
| 408 | 408 | } else {
|
| 409 | 409 | // just cdn the URL if applicable |
| 410 | 410 | if (!empty($this->cdn_url)) {
|
| 411 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 411 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 412 | 412 | } |
| 413 | 413 | } |
| 414 | 414 | } |
| 415 | 415 | } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
|
| 416 | 416 | // change urls to cdn-url |
| 417 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 418 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 417 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 418 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 419 | 419 | } |
| 420 | 420 | } |
| 421 | 421 | |
| 422 | - if(!empty($imgreplace)) {
|
|
| 423 | - $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code); |
|
| 422 | + if (!empty($imgreplace)) {
|
|
| 423 | + $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code); |
|
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | // Minify |
| 427 | - if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {
|
|
| 427 | + if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {
|
|
| 428 | 428 | if (class_exists('Minify_CSS_Compressor')) {
|
| 429 | 429 | $tmp_code = trim(Minify_CSS_Compressor::process($code)); |
| 430 | - } else if(class_exists('CSSmin')) {
|
|
| 430 | + } else if (class_exists('CSSmin')) {
|
|
| 431 | 431 | $cssmin = new CSSmin(); |
| 432 | - if (method_exists($cssmin,"run")) {
|
|
| 432 | + if (method_exists($cssmin, "run")) {
|
|
| 433 | 433 | $tmp_code = trim($cssmin->run($code)); |
| 434 | - } elseif (@is_callable(array($cssmin,"minify"))) {
|
|
| 434 | + } elseif (@is_callable(array($cssmin, "minify"))) {
|
|
| 435 | 435 | $tmp_code = trim(CssMin::minify($code)); |
| 436 | 436 | } |
| 437 | 437 | } |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | |
| 444 | 444 | $code = $this->inject_minified($code); |
| 445 | 445 | |
| 446 | - $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code ); |
|
| 446 | + $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
|
|
| 447 | 447 | if (!empty($tmp_code)) {
|
| 448 | 448 | $code = $tmp_code; |
| 449 | 449 | unset($tmp_code); |
@@ -458,13 +458,13 @@ discard block |
||
| 458 | 458 | //Caches the CSS in uncompressed, deflated and gzipped form. |
| 459 | 459 | public function cache() {
|
| 460 | 460 | // CSS cache |
| 461 | - foreach($this->csscode as $media => $code) {
|
|
| 461 | + foreach ($this->csscode as $media => $code) {
|
|
| 462 | 462 | $md5 = $this->hashmap[md5($code)]; |
| 463 | 463 | |
| 464 | - $cache = new autoptimizeCache($md5,'css'); |
|
| 465 | - if(!$cache->check()) {
|
|
| 464 | + $cache = new autoptimizeCache($md5, 'css'); |
|
| 465 | + if (!$cache->check()) {
|
|
| 466 | 466 | // Cache our code |
| 467 | - $cache->cache($code,'text/css'); |
|
| 467 | + $cache->cache($code, 'text/css'); |
|
| 468 | 468 | } |
| 469 | 469 | $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 470 | 470 | } |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | $this->content = $this->restore_comments($this->content); |
| 480 | 480 | |
| 481 | 481 | // restore (no)script |
| 482 | - if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) {
|
|
| 482 | + if (strpos($this->content, '%%SCRIPT%%') !== false) {
|
|
| 483 | 483 | $this->content = preg_replace_callback( |
| 484 | 484 | '#%%SCRIPT'.AUTOPTIMIZE_HASH.'%%(.*?)%%SCRIPT%%#is', |
| 485 | 485 | create_function( |
@@ -494,55 +494,55 @@ discard block |
||
| 494 | 494 | $this->content = $this->restore_noptimize($this->content); |
| 495 | 495 | |
| 496 | 496 | //Restore the full content |
| 497 | - if(!empty($this->restofcontent)) {
|
|
| 497 | + if (!empty($this->restofcontent)) {
|
|
| 498 | 498 | $this->content .= $this->restofcontent; |
| 499 | 499 | $this->restofcontent = ''; |
| 500 | 500 | } |
| 501 | 501 | |
| 502 | 502 | // Inject the new stylesheets |
| 503 | - $replaceTag = array("<title","before");
|
|
| 504 | - $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content ); |
|
| 503 | + $replaceTag = array("<title", "before");
|
|
| 504 | + $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content);
|
|
| 505 | 505 | |
| 506 | 506 | if ($this->inline == true) {
|
| 507 | - foreach($this->csscode as $media => $code) {
|
|
| 508 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);
|
|
| 507 | + foreach ($this->csscode as $media => $code) {
|
|
| 508 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
|
|
| 509 | 509 | } |
| 510 | 510 | } else {
|
| 511 | 511 | if ($this->defer == true) {
|
| 512 | 512 | $preloadCssBlock = ""; |
| 513 | 513 | $noScriptCssBlock = "<noscript id=\"aonoscrcss\">"; |
| 514 | - $defer_inline_code=$this->defer_inline; |
|
| 515 | - if(!empty($defer_inline_code)){
|
|
| 516 | - if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
|
|
| 514 | + $defer_inline_code = $this->defer_inline; |
|
| 515 | + if (!empty($defer_inline_code)) {
|
|
| 516 | + if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
|
|
| 517 | 517 | $iCssHash = md5($defer_inline_code); |
| 518 | - $iCssCache = new autoptimizeCache($iCssHash,'css'); |
|
| 519 | - if($iCssCache->check()) {
|
|
| 518 | + $iCssCache = new autoptimizeCache($iCssHash, 'css'); |
|
| 519 | + if ($iCssCache->check()) {
|
|
| 520 | 520 | // we have the optimized inline CSS in cache |
| 521 | - $defer_inline_code=$iCssCache->retrieve(); |
|
| 521 | + $defer_inline_code = $iCssCache->retrieve(); |
|
| 522 | 522 | } else {
|
| 523 | 523 | if (class_exists('Minify_CSS_Compressor')) {
|
| 524 | 524 | $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code)); |
| 525 | - } else if(class_exists('CSSmin')) {
|
|
| 525 | + } else if (class_exists('CSSmin')) {
|
|
| 526 | 526 | $cssmin = new CSSmin(); |
| 527 | 527 | $tmp_code = trim($cssmin->run($defer_inline_code)); |
| 528 | 528 | } |
| 529 | 529 | if (!empty($tmp_code)) {
|
| 530 | 530 | $defer_inline_code = $tmp_code; |
| 531 | - $iCssCache->cache($defer_inline_code,"text/css"); |
|
| 531 | + $iCssCache->cache($defer_inline_code, "text/css"); |
|
| 532 | 532 | unset($tmp_code); |
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | } |
| 536 | - $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 537 | - $this->inject_in_html($code_out,$replaceTag); |
|
| 536 | + $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 537 | + $this->inject_in_html($code_out, $replaceTag); |
|
| 538 | 538 | } |
| 539 | 539 | } |
| 540 | 540 | |
| 541 | - foreach($this->url as $media => $url) {
|
|
| 541 | + foreach ($this->url as $media => $url) {
|
|
| 542 | 542 | $url = $this->url_replace_cdn($url); |
| 543 | 543 | |
| 544 | 544 | //Add the stylesheet either deferred (import at bottom) or normal links in head |
| 545 | - if($this->defer == true) {
|
|
| 545 | + if ($this->defer == true) {
|
|
| 546 | 546 | |
| 547 | 547 | // Filter to modify the onload attribute - passes value and the stylesheet url |
| 548 | 548 | $preloadOnLoad = apply_filters('autoptimize_filter_css_preload_onload', "this.rel='stylesheet'", $url);
|
@@ -552,25 +552,25 @@ discard block |
||
| 552 | 552 | |
| 553 | 553 | } else {
|
| 554 | 554 | if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
|
| 555 | - $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);
|
|
| 556 | - } else if (strlen($this->csscode[$media])>0) {
|
|
| 557 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);
|
|
| 555 | + $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
|
|
| 556 | + } else if (strlen($this->csscode[$media]) > 0) {
|
|
| 557 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
|
|
| 558 | 558 | } |
| 559 | 559 | } |
| 560 | 560 | } |
| 561 | 561 | |
| 562 | - if($this->defer == true) {
|
|
| 562 | + if ($this->defer == true) {
|
|
| 563 | 563 | $preloadPolyfill = '<script data-cfasync=\'false\'>/*! loadCSS. [c]2017 Filament Group, Inc. MIT License */ |
| 564 | 564 | !function(a){"use strict";var b=function(b,c,d){function e(a){return h.body?a():void setTimeout(function(){e(a)})}function f(){i.addEventListener&&i.removeEventListener("load",f),i.media=d||"all"}var g,h=a.document,i=h.createElement("link");if(c)g=c;else{var j=(h.body||h.getElementsByTagName("head")[0]).childNodes;g=j[j.length-1]}var k=h.styleSheets;i.rel="stylesheet",i.href=b,i.media="only x",e(function(){g.parentNode.insertBefore(i,c?g:g.nextSibling)});var l=function(a){for(var b=i.href,c=k.length;c--;)if(k[c].href===b)return a();setTimeout(function(){l(a)})};return i.addEventListener&&i.addEventListener("load",f),i.onloadcssdefined=l,l(f),i};"undefined"!=typeof exports?exports.loadCSS=b:a.loadCSS=b}("undefined"!=typeof global?global:this);
|
| 565 | 565 | /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */ |
| 566 | 566 | !function(a){if(a.loadCSS){var b=loadCSS.relpreload={};if(b.support=function(){try{return a.document.createElement("link").relList.supports("preload")}catch(b){return!1}},b.poly=function(){for(var b=a.document.getElementsByTagName("link"),c=0;c<b.length;c++){var d=b[c];"preload"===d.rel&&"style"===d.getAttribute("as")&&(a.loadCSS(d.href,d,d.getAttribute("media")),d.rel=null)}},!b.support()){b.poly();var c=a.setInterval(b.poly,300);a.addEventListener&&a.addEventListener("load",function(){b.poly(),a.clearInterval(c)}),a.attachEvent&&a.attachEvent("onload",function(){a.clearInterval(c)})}}}(this);</script>';
|
| 567 | 567 | $noScriptCssBlock .= "</noscript>"; |
| 568 | - $this->inject_in_html($preloadCssBlock.$noScriptCssBlock,$replaceTag); |
|
| 568 | + $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag); |
|
| 569 | 569 | |
| 570 | 570 | // Adds preload polyfill at end of body tag |
| 571 | 571 | $this->inject_in_html( |
| 572 | 572 | apply_filters('autoptimize_css_preload_polyfill', $preloadPolyfill),
|
| 573 | - array('</body>','before')
|
|
| 573 | + array('</body>', 'before')
|
|
| 574 | 574 | ); |
| 575 | 575 | } |
| 576 | 576 | } |
@@ -581,62 +581,62 @@ discard block |
||
| 581 | 581 | |
| 582 | 582 | static function fixurls($file, $code) {
|
| 583 | 583 | // Switch all imports to the url() syntax |
| 584 | - $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code );
|
|
| 584 | + $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code);
|
|
| 585 | 585 | |
| 586 | - if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
|
|
| 587 | - $file = str_replace( WP_ROOT_DIR, '/', $file ); |
|
| 588 | - $dir = dirname( $file ); // Like /themes/expound/css |
|
| 586 | + if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
|
|
| 587 | + $file = str_replace(WP_ROOT_DIR, '/', $file); |
|
| 588 | + $dir = dirname($file); // Like /themes/expound/css |
|
| 589 | 589 | |
| 590 | 590 | // $dir should not contain backslashes, since it's used to replace |
| 591 | 591 | // urls, but it can contain them when running on Windows because |
| 592 | 592 | // fixurls() is sometimes called with `ABSPATH . 'index.php'` |
| 593 | - $dir = str_replace( '\\', '/', $dir ); |
|
| 594 | - unset( $file ); // not used below at all |
|
| 593 | + $dir = str_replace('\\', '/', $dir);
|
|
| 594 | + unset($file); // not used below at all |
|
| 595 | 595 | |
| 596 | 596 | $replace = array(); |
| 597 | - foreach ( $matches[1] as $k => $url ) {
|
|
| 597 | + foreach ($matches[1] as $k => $url) {
|
|
| 598 | 598 | // Remove quotes |
| 599 | - $url = trim( $url," \t\n\r\0\x0B\"'" ); |
|
| 600 | - $noQurl = trim( $url, "\"'" ); |
|
| 601 | - if ( $url !== $noQurl ) {
|
|
| 599 | + $url = trim($url, " \t\n\r\0\x0B\"'"); |
|
| 600 | + $noQurl = trim($url, "\"'"); |
|
| 601 | + if ($url !== $noQurl) {
|
|
| 602 | 602 | $removedQuotes = true; |
| 603 | 603 | } else {
|
| 604 | 604 | $removedQuotes = false; |
| 605 | 605 | } |
| 606 | 606 | |
| 607 | - if ( '' === $noQurl ) {
|
|
| 607 | + if ('' === $noQurl) {
|
|
| 608 | 608 | continue; |
| 609 | 609 | } |
| 610 | 610 | |
| 611 | 611 | $url = $noQurl; |
| 612 | - if ( '/' === $url{0} || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) {
|
|
| 612 | + if ('/' === $url{0} || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
|
|
| 613 | 613 | // URL is protocol-relative, host-relative or something we don't touch |
| 614 | 614 | continue; |
| 615 | 615 | } else {
|
| 616 | 616 | // Relative URL |
| 617 | - $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) ); |
|
| 617 | + $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
|
|
| 618 | 618 | |
| 619 | 619 | // Hash the url + whatever was behind potentially for replacement |
| 620 | 620 | // We must do this, or different css classes referencing the same bg image (but |
| 621 | 621 | // different parts of it, say, in sprites and such) loose their stuff... |
| 622 | - $hash = md5( $url . $matches[2][$k] ); |
|
| 623 | - $code = str_replace( $matches[0][$k], $hash, $code ); |
|
| 622 | + $hash = md5($url.$matches[2][$k]); |
|
| 623 | + $code = str_replace($matches[0][$k], $hash, $code); |
|
| 624 | 624 | |
| 625 | - if ( $removedQuotes ) {
|
|
| 626 | - $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k];
|
|
| 625 | + if ($removedQuotes) {
|
|
| 626 | + $replace[$hash] = "url('".$newurl."')".$matches[2][$k];
|
|
| 627 | 627 | } else {
|
| 628 | - $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k];
|
|
| 628 | + $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];
|
|
| 629 | 629 | } |
| 630 | 630 | } |
| 631 | 631 | } |
| 632 | 632 | |
| 633 | - if ( ! empty( $replace ) ) {
|
|
| 633 | + if (!empty($replace)) {
|
|
| 634 | 634 | // Sort the replacements array by key length in desc order (so that the longest strings are replaced first) |
| 635 | - $keys = array_map( 'strlen', array_keys( $replace ) ); |
|
| 636 | - array_multisort( $keys, SORT_DESC, $replace ); |
|
| 635 | + $keys = array_map('strlen', array_keys($replace));
|
|
| 636 | + array_multisort($keys, SORT_DESC, $replace); |
|
| 637 | 637 | |
| 638 | 638 | // Replace URLs found within $code |
| 639 | - $code = str_replace( array_keys( $replace ), array_values( $replace ), $code ); |
|
| 639 | + $code = str_replace(array_keys($replace), array_values($replace), $code); |
|
| 640 | 640 | } |
| 641 | 641 | } |
| 642 | 642 | |
@@ -644,11 +644,11 @@ discard block |
||
| 644 | 644 | } |
| 645 | 645 | |
| 646 | 646 | private function ismovable($tag) {
|
| 647 | - if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
|
|
| 647 | + if (apply_filters('autoptimize_filter_css_dontaggregate', false)) {
|
|
| 648 | 648 | return false; |
| 649 | 649 | } else if (!empty($this->whitelist)) {
|
| 650 | 650 | foreach ($this->whitelist as $match) {
|
| 651 | - if(strpos($tag,$match)!==false) {
|
|
| 651 | + if (strpos($tag, $match) !== false) {
|
|
| 652 | 652 | return true; |
| 653 | 653 | } |
| 654 | 654 | } |
@@ -656,8 +656,8 @@ discard block |
||
| 656 | 656 | return false; |
| 657 | 657 | } else {
|
| 658 | 658 | if (is_array($this->dontmove)) {
|
| 659 | - foreach($this->dontmove as $match) {
|
|
| 660 | - if(strpos($tag,$match)!==false) {
|
|
| 659 | + foreach ($this->dontmove as $match) {
|
|
| 660 | + if (strpos($tag, $match) !== false) {
|
|
| 661 | 661 | //Matched something |
| 662 | 662 | return false; |
| 663 | 663 | } |
@@ -669,21 +669,21 @@ discard block |
||
| 669 | 669 | } |
| 670 | 670 | } |
| 671 | 671 | |
| 672 | - private function can_inject_late($cssPath,$css) {
|
|
| 672 | + private function can_inject_late($cssPath, $css) {
|
|
| 673 | 673 | $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
|
| 674 | - if ( $this->inject_min_late !== true ) {
|
|
| 674 | + if ($this->inject_min_late !== true) {
|
|
| 675 | 675 | // late-inject turned off |
| 676 | 676 | return false; |
| 677 | - } else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {
|
|
| 677 | + } else if ((strpos($cssPath, "min.css") === false) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) {
|
|
| 678 | 678 | // file not minified based on filename & filter |
| 679 | 679 | return false; |
| 680 | - } else if ( strpos($css,"@import") !== false ) {
|
|
| 680 | + } else if (strpos($css, "@import") !== false) {
|
|
| 681 | 681 | // can't late-inject files with imports as those need to be aggregated |
| 682 | 682 | return false; |
| 683 | - } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {
|
|
| 683 | + } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {
|
|
| 684 | 684 | // don't late-inject CSS with font-src's if fonts are set to be CDN'ed |
| 685 | 685 | return false; |
| 686 | - } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {
|
|
| 686 | + } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {
|
|
| 687 | 687 | // don't late-inject CSS with images if CDN is set OR is image inlining is on |
| 688 | 688 | return false; |
| 689 | 689 | } else {
|
@@ -693,11 +693,11 @@ discard block |
||
| 693 | 693 | } |
| 694 | 694 | |
| 695 | 695 | private function maybe_cdn_urls($inUrl) {
|
| 696 | - $url = trim($inUrl," \t\n\r\0\x0B\"'"); |
|
| 697 | - $urlPath = parse_url($url,PHP_URL_PATH); |
|
| 696 | + $url = trim($inUrl, " \t\n\r\0\x0B\"'"); |
|
| 697 | + $urlPath = parse_url($url, PHP_URL_PATH); |
|
| 698 | 698 | |
| 699 | 699 | // exclude fonts from CDN except if filter returns true |
| 700 | - if ( !preg_match('#\.(woff2?|eot|ttf|otf)$#i',$urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn',false) ) {
|
|
| 700 | + if (!preg_match('#\.(woff2?|eot|ttf|otf)$#i', $urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn', false)) {
|
|
| 701 | 701 | $cdn_url = $this->url_replace_cdn($url); |
| 702 | 702 | } else {
|
| 703 | 703 | $cdn_url = $url; |
