futtta /
autoptimize
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | // -- Protected Instance Methods --------------------------------------------- |
| 75 | 75 | |
| 76 | 76 | protected function action($d) {
|
| 77 | - switch($d) {
|
|
| 77 | + switch ($d) {
|
|
| 78 | 78 | case 1: |
| 79 | 79 | $this->output .= $this->a; |
| 80 | 80 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | $this->a === ':' || $this->a === '[' || $this->a === '!' || |
| 110 | 110 | $this->a === '&' || $this->a === '|' || $this->a === '?')) {
|
| 111 | 111 | |
| 112 | - $this->output .= $this->a . $this->b; |
|
| 112 | + $this->output .= $this->a.$this->b; |
|
| 113 | 113 | |
| 114 | 114 | for (;;) {
|
| 115 | 115 | $this->a = $this->get(); |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | $c = $this->get(); |
| 246 | 246 | |
| 247 | 247 | if ($c === '/') {
|
| 248 | - switch($this->peek()) {
|
|
| 248 | + switch ($this->peek()) {
|
|
| 249 | 249 | case '/': |
| 250 | 250 | for (;;) {
|
| 251 | 251 | $c = $this->get(); |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | $this->get(); |
| 260 | 260 | |
| 261 | 261 | for (;;) {
|
| 262 | - switch($this->get()) {
|
|
| 262 | + switch ($this->get()) {
|
|
| 263 | 263 | case '*': |
| 264 | 264 | if ($this->peek() === '/') {
|
| 265 | 265 | $this->get(); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | {
|
| 71 | 71 | $this->_html = str_replace("\r\n", "\n", trim($html));
|
| 72 | 72 | if (isset($options['xhtml'])) {
|
| 73 | - $this->_isXhtml = (bool)$options['xhtml']; |
|
| 73 | + $this->_isXhtml = (bool) $options['xhtml']; |
|
| 74 | 74 | } |
| 75 | 75 | if (isset($options['cssMinifier'])) {
|
| 76 | 76 | $this->_cssMinifier = $options['cssMinifier']; |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | $this->_jsMinifier = $options['jsMinifier']; |
| 80 | 80 | } |
| 81 | 81 | if (isset($options['jsCleanComments'])) {
|
| 82 | - $this->_jsCleanComments = (bool)$options['jsCleanComments']; |
|
| 82 | + $this->_jsCleanComments = (bool) $options['jsCleanComments']; |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML')); |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']); |
|
| 98 | + $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']); |
|
| 99 | 99 | $this->_placeholders = array(); |
| 100 | 100 | |
| 101 | 101 | // replace SCRIPTs (and minify) with placeholders |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | |
| 172 | 172 | protected function _reservePlace($content) |
| 173 | 173 | {
|
| 174 | - $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%'; |
|
| 174 | + $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%'; |
|
| 175 | 175 | $this->_placeholders[$placeholder] = $content; |
| 176 | 176 | return $placeholder; |
| 177 | 177 | } |
@@ -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[', ']]>'), '', $str) |
|
| 260 | + ? str_replace(array('/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str) |
|
| 261 | 261 | : $str; |
| 262 | 262 | } |
| 263 | 263 | |
@@ -245,6 +245,6 @@ |
||
| 245 | 245 | ) |
| 246 | 246 | \\s* |
| 247 | 247 | /x', '$1', $m[1]); |
| 248 | - return 'font-family:' . $m[1] . $m[2]; |
|
| 248 | + return 'font-family:'.$m[1].$m[2]; |
|
| 249 | 249 | } |
| 250 | 250 | } |
@@ -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 | |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $css = preg_replace('/\!important/i', ' !important', $css); |
| 301 | 301 | |
| 302 | 302 | // bring back the colon |
| 303 | - $css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css); |
|
| 303 | + $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css); |
|
| 304 | 304 | |
| 305 | 305 | // retain space for special IE6 cases |
| 306 | 306 | $css = preg_replace_callback('/\:first\-(line|letter)(\{|,)/i', array($this, 'lowercase_pseudo_first'), $css); |
@@ -373,20 +373,20 @@ discard block |
||
| 373 | 373 | |
| 374 | 374 | // Find a fraction that is used for Opera's -o-device-pixel-ratio query |
| 375 | 375 | // Add token to add the "\" back in later |
| 376 | - $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css); |
|
| 376 | + $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css); |
|
| 377 | 377 | |
| 378 | 378 | // Remove empty rules. |
| 379 | 379 | $css = preg_replace('/[^\};\{\/]+\{\}/S', '', $css); |
| 380 | 380 | |
| 381 | 381 | // Add "/" back to fix Opera -o-device-pixel-ratio query |
| 382 | - $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css); |
|
| 382 | + $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css); |
|
| 383 | 383 | |
| 384 | 384 | // Replace multiple semi-colons in a row by a single one |
| 385 | 385 | // See SF bug #1980989 |
| 386 | 386 | $css = preg_replace('/;;+/', ';', $css); |
| 387 | 387 | |
| 388 | 388 | // Restore new lines for /*! important comments |
| 389 | - $css = preg_replace('/'. self::NL .'/', "\n", $css); |
|
| 389 | + $css = preg_replace('/'.self::NL.'/', "\n", $css); |
|
| 390 | 390 | |
| 391 | 391 | // Lowercase all uppercase properties |
| 392 | 392 | $css = preg_replace_callback('/(\{|\;)([A-Z\-]+)(\:)/', array($this, 'lowercase_properties'), $css); |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | while ($i < strlen($css)) { |
| 401 | 401 | $i++; |
| 402 | 402 | if ($css[$i - 1] === '}' && $i - $start_index > $linebreak_pos) { |
| 403 | - $css = $this->str_slice($css, 0, $i) . "\n" . $this->str_slice($css, $i); |
|
| 403 | + $css = $this->str_slice($css, 0, $i)."\n".$this->str_slice($css, $i); |
|
| 404 | 404 | $start_index = $i; |
| 405 | 405 | } |
| 406 | 406 | } |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | |
| 409 | 409 | // restore preserved comments and strings in reverse order |
| 410 | 410 | for ($i = count($this->preserved_tokens) - 1; $i >= 0; $i--) { |
| 411 | - $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1); |
|
| 411 | + $css = preg_replace('/'.self::TOKEN.$i.'___/', $this->preserved_tokens[$i], $css, 1); |
|
| 412 | 412 | } |
| 413 | 413 | |
| 414 | 414 | // Trim the final string (for any leading or trailing white spaces) |
@@ -448,7 +448,7 @@ discard block |
||
| 448 | 448 | $terminator = ')'; |
| 449 | 449 | } |
| 450 | 450 | |
| 451 | - while ($found_terminator === FALSE && $end_index+1 <= $max_index) { |
|
| 451 | + while ($found_terminator === FALSE && $end_index + 1 <= $max_index) { |
|
| 452 | 452 | $end_index = $this->index_of($css, $terminator, $end_index + 1); |
| 453 | 453 | |
| 454 | 454 | // endIndex == 0 doesn't really apply here |
@@ -468,7 +468,7 @@ discard block |
||
| 468 | 468 | $token = preg_replace('/\s+/', '', $token); |
| 469 | 469 | $this->preserved_tokens[] = $token; |
| 470 | 470 | |
| 471 | - $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)'; |
|
| 471 | + $preserver = 'url('.self::TOKEN.(count($this->preserved_tokens) - 1).'___)'; |
|
| 472 | 472 | $sb[] = $preserver; |
| 473 | 473 | |
| 474 | 474 | $append_index = $end_index + 1; |
@@ -530,16 +530,16 @@ discard block |
||
| 530 | 530 | |
| 531 | 531 | if ($is_filter) { |
| 532 | 532 | // Restore, maintain case, otherwise filter will break |
| 533 | - $sb[] = $m[1] . '#' . $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]; |
|
| 533 | + $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7]; |
|
| 534 | 534 | } else { |
| 535 | 535 | if (strtolower($m[2]) == strtolower($m[3]) && |
| 536 | 536 | strtolower($m[4]) == strtolower($m[5]) && |
| 537 | 537 | strtolower($m[6]) == strtolower($m[7])) { |
| 538 | 538 | // Compress. |
| 539 | - $hex = '#' . strtolower($m[3] . $m[5] . $m[7]); |
|
| 539 | + $hex = '#'.strtolower($m[3].$m[5].$m[7]); |
|
| 540 | 540 | } else { |
| 541 | 541 | // Non compressible color, restore but lower case. |
| 542 | - $hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]); |
|
| 542 | + $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]); |
|
| 543 | 543 | } |
| 544 | 544 | // replace Hex colors to short safe color names |
| 545 | 545 | $sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex; |
@@ -568,7 +568,7 @@ discard block |
||
| 568 | 568 | // one, maybe more? put'em back then |
| 569 | 569 | if (($pos = $this->index_of($match, self::COMMENT)) >= 0) { |
| 570 | 570 | for ($i = 0, $max = count($this->comments); $i < $max; $i++) { |
| 571 | - $match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1); |
|
| 571 | + $match = preg_replace('/'.self::COMMENT.$i.'___/', $this->comments[$i], $match, 1); |
|
| 572 | 572 | } |
| 573 | 573 | } |
| 574 | 574 | |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | $match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match); |
| 577 | 577 | |
| 578 | 578 | $this->preserved_tokens[] = $match; |
| 579 | - return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote; |
|
| 579 | + return $quote.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.$quote; |
|
| 580 | 580 | } |
| 581 | 581 | |
| 582 | 582 | private function replace_colon($matches) |
@@ -587,27 +587,27 @@ discard block |
||
| 587 | 587 | private function replace_calc($matches) |
| 588 | 588 | { |
| 589 | 589 | $this->preserved_tokens[] = trim(preg_replace('/\s*([\*\/\(\),])\s*/', '$1', $matches[2])); |
| 590 | - return 'calc('. self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 590 | + return 'calc('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')'; |
|
| 591 | 591 | } |
| 592 | 592 | |
| 593 | 593 | private function preserve_old_IE_specific_matrix_definition($matches) |
| 594 | 594 | { |
| 595 | 595 | $this->preserved_tokens[] = $matches[1]; |
| 596 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . ')'; |
|
| 596 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix('.self::TOKEN.(count($this->preserved_tokens) - 1).'___'.')'; |
|
| 597 | 597 | } |
| 598 | 598 | |
| 599 | 599 | private function replace_keyframe_zero($matches) |
| 600 | 600 | { |
| 601 | - return $matches[1] . preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]) . $matches[3]; |
|
| 601 | + return $matches[1].preg_replace('/0(\{|,[^\)\{]+\{)/', '0%$1', $matches[2]).$matches[3]; |
|
| 602 | 602 | } |
| 603 | 603 | |
| 604 | 604 | private function rgb_to_hex($matches) |
| 605 | 605 | { |
| 606 | 606 | // Support for percentage values rgb(100%, 0%, 45%); |
| 607 | - if ($this->index_of($matches[1], '%') >= 0){ |
|
| 607 | + if ($this->index_of($matches[1], '%') >= 0) { |
|
| 608 | 608 | $rgbcolors = explode(',', str_replace('%', '', $matches[1])); |
| 609 | 609 | for ($i = 0; $i < count($rgbcolors); $i++) { |
| 610 | - $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55); |
|
| 610 | + $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i])*2.55); |
|
| 611 | 611 | } |
| 612 | 612 | } else { |
| 613 | 613 | $rgbcolors = explode(',', $matches[1]); |
@@ -620,11 +620,11 @@ discard block |
||
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | // Fix for issue #2528093 |
| 623 | - if (!preg_match('/[\s\,\);\}]/', $matches[2])){ |
|
| 624 | - $matches[2] = ' ' . $matches[2]; |
|
| 623 | + if (!preg_match('/[\s\,\);\}]/', $matches[2])) { |
|
| 624 | + $matches[2] = ' '.$matches[2]; |
|
| 625 | 625 | } |
| 626 | 626 | |
| 627 | - return '#' . implode('', $rgbcolors) . $matches[2]; |
|
| 627 | + return '#'.implode('', $rgbcolors).$matches[2]; |
|
| 628 | 628 | } |
| 629 | 629 | |
| 630 | 630 | private function hsl_to_hex($matches) |
@@ -635,18 +635,18 @@ discard block |
||
| 635 | 635 | $l = floatval($values[2]); |
| 636 | 636 | |
| 637 | 637 | // Wrap and clamp, then fraction! |
| 638 | - $h = ((($h % 360) + 360) % 360) / 360; |
|
| 639 | - $s = $this->clamp_number($s, 0, 100) / 100; |
|
| 640 | - $l = $this->clamp_number($l, 0, 100) / 100; |
|
| 638 | + $h = ((($h%360) + 360)%360)/360; |
|
| 639 | + $s = $this->clamp_number($s, 0, 100)/100; |
|
| 640 | + $l = $this->clamp_number($l, 0, 100)/100; |
|
| 641 | 641 | |
| 642 | 642 | if ($s == 0) { |
| 643 | - $r = $g = $b = $this->round_number(255 * $l); |
|
| 643 | + $r = $g = $b = $this->round_number(255*$l); |
|
| 644 | 644 | } else { |
| 645 | - $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l); |
|
| 646 | - $v1 = (2 * $l) - $v2; |
|
| 647 | - $r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3))); |
|
| 648 | - $g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h)); |
|
| 649 | - $b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3))); |
|
| 645 | + $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l); |
|
| 646 | + $v1 = (2*$l) - $v2; |
|
| 647 | + $r = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h + (1/3))); |
|
| 648 | + $g = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h)); |
|
| 649 | + $b = $this->round_number(255*$this->hue_to_rgb($v1, $v2, $h - (1/3))); |
|
| 650 | 650 | } |
| 651 | 651 | |
| 652 | 652 | return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2])); |
@@ -654,27 +654,27 @@ discard block |
||
| 654 | 654 | |
| 655 | 655 | private function lowercase_pseudo_first($matches) |
| 656 | 656 | { |
| 657 | - return ':first-'. strtolower($matches[1]) .' '. $matches[2]; |
|
| 657 | + return ':first-'.strtolower($matches[1]).' '.$matches[2]; |
|
| 658 | 658 | } |
| 659 | 659 | |
| 660 | 660 | private function lowercase_directives($matches) |
| 661 | 661 | { |
| 662 | - return '@'. strtolower($matches[1]); |
|
| 662 | + return '@'.strtolower($matches[1]); |
|
| 663 | 663 | } |
| 664 | 664 | |
| 665 | 665 | private function lowercase_pseudo_elements($matches) |
| 666 | 666 | { |
| 667 | - return ':'. strtolower($matches[1]); |
|
| 667 | + return ':'.strtolower($matches[1]); |
|
| 668 | 668 | } |
| 669 | 669 | |
| 670 | 670 | private function lowercase_common_functions($matches) |
| 671 | 671 | { |
| 672 | - return ':'. strtolower($matches[1]) .'('; |
|
| 672 | + return ':'.strtolower($matches[1]).'('; |
|
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | private function lowercase_common_functions_values($matches) |
| 676 | 676 | { |
| 677 | - return $matches[1] . strtolower($matches[2]); |
|
| 677 | + return $matches[1].strtolower($matches[2]); |
|
| 678 | 678 | } |
| 679 | 679 | |
| 680 | 680 | private function lowercase_properties($matches) |
@@ -689,9 +689,9 @@ discard block |
||
| 689 | 689 | private function hue_to_rgb($v1, $v2, $vh) |
| 690 | 690 | { |
| 691 | 691 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
| 692 | - if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 693 | - if ($vh * 2 < 1) return $v2; |
|
| 694 | - if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6; |
|
| 692 | + if ($vh*6 < 1) return $v1 + ($v2 - $v1)*6*$vh; |
|
| 693 | + if ($vh*2 < 1) return $v2; |
|
| 694 | + if ($vh*3 < 2) return $v1 + ($v2 - $v1)*((2/3) - $vh)*6; |
|
| 695 | 695 | return $v1; |
| 696 | 696 | } |
| 697 | 697 | |
@@ -766,9 +766,9 @@ discard block |
||
| 766 | 766 | { |
| 767 | 767 | if (is_string($size)) { |
| 768 | 768 | switch (substr($size, -1)) { |
| 769 | - case 'M': case 'm': return $size * 1048576; |
|
| 770 | - case 'K': case 'k': return $size * 1024; |
|
| 771 | - case 'G': case 'g': return $size * 1073741824; |
|
| 769 | + case 'M': case 'm': return $size*1048576; |
|
| 770 | + case 'K': case 'k': return $size*1024; |
|
| 771 | + case 'G': case 'g': return $size*1073741824; |
|
| 772 | 772 | } |
| 773 | 773 | } |
| 774 | 774 | |
@@ -1,36 +1,36 @@ 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 autoptimizeToolbar { |
| 5 | 5 | |
| 6 | 6 | public function __construct() |
| 7 | 7 | { |
| 8 | 8 | // If Cache is not available we don't add the Autoptimize Toolbar |
| 9 | - if( !autoptimizeCache::cacheavail() ) return; |
|
| 9 | + if (!autoptimizeCache::cacheavail()) 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 | // We check that the current user has the appropriate permissions |
| 18 | - if( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) && is_admin_bar_showing() ) |
|
| 18 | + if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true) && is_admin_bar_showing()) |
|
| 19 | 19 | { |
| 20 | 20 | // Load custom styles and scripts |
| 21 | - if( is_admin() ) { |
|
| 21 | + if (is_admin()) { |
|
| 22 | 22 | // in the case of back-end |
| 23 | - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 23 | + add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 24 | 24 | } else { |
| 25 | 25 | // in the case of front-end |
| 26 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 26 | + add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | // Create a handler for the AJAX toolbar requests |
| 30 | - add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) ); |
|
| 30 | + add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache')); |
|
| 31 | 31 | |
| 32 | 32 | // Add the Autoptimize Toolbar to the Admin bar |
| 33 | - add_action( 'admin_bar_menu', array($this, 'add_toolbar'), 100 ); |
|
| 33 | + add_action('admin_bar_menu', array($this, 'add_toolbar'), 100); |
|
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
@@ -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,55 +52,55 @@ 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 ) $percentage = 100; |
|
| 55 | + $percentage = ceil($bytes/$max_size*100); |
|
| 56 | + if ($percentage > 100) $percentage = 100; |
|
| 57 | 57 | |
| 58 | 58 | // We define the type of color indicator for the current state of cache size. |
| 59 | 59 | // "green" if the size is less than 80% of the total recommended |
| 60 | 60 | // "orange" if over 80% |
| 61 | 61 | // "red" if over 100% |
| 62 | - $color = ( $percentage == 100 ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' ); |
|
| 62 | + $color = ($percentage == 100) ? 'red' : (($percentage > 80) ? 'orange' : 'green'); |
|
| 63 | 63 | |
| 64 | 64 | // Create or add new items into the Admin Toolbar. |
| 65 | 65 | // Main Autoptimize node |
| 66 | - $wp_admin_bar->add_node( array( |
|
| 66 | + $wp_admin_bar->add_node(array( |
|
| 67 | 67 | 'id' => 'autoptimize', |
| 68 | - 'title' => '<span class="ab-icon"></span><span class="ab-label">' . __("Autoptimize",'autoptimize') . '</span>', |
|
| 69 | - 'href' => admin_url( 'options-general.php?page=autoptimize' ), |
|
| 70 | - 'meta' => array( 'class' => 'bullet-' . $color ) |
|
| 68 | + 'title' => '<span class="ab-icon"></span><span class="ab-label">'.__("Autoptimize", 'autoptimize').'</span>', |
|
| 69 | + 'href' => admin_url('options-general.php?page=autoptimize'), |
|
| 70 | + 'meta' => array('class' => 'bullet-'.$color) |
|
| 71 | 71 | )); |
| 72 | 72 | |
| 73 | 73 | // Cache Info node |
| 74 | - $wp_admin_bar->add_node( array( |
|
| 74 | + $wp_admin_bar->add_node(array( |
|
| 75 | 75 | 'id' => 'autoptimize-cache-info', |
| 76 | - 'title' => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' . |
|
| 77 | - '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
| 76 | + 'title' => '<p>'.__("Cache Info", 'autoptimize').'</p>'. |
|
| 77 | + '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'. |
|
| 78 | 78 | '<div class="circle">'. |
| 79 | - '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 80 | - '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 79 | + '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 80 | + '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 81 | 81 | '<div class="shadow"></div>'. |
| 82 | 82 | '</div>'. |
| 83 | - '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'. |
|
| 84 | - '</div>' . |
|
| 85 | - '<table>' . |
|
| 86 | - '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
| 87 | - '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
| 83 | + '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'. |
|
| 84 | + '</div>'. |
|
| 85 | + '<table>'. |
|
| 86 | + '<tr><td>'.__("Size", 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'. |
|
| 87 | + '<tr><td>'.__("Files", 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'. |
|
| 88 | 88 | '</table>', |
| 89 | 89 | 'parent'=> 'autoptimize' |
| 90 | 90 | )); |
| 91 | 91 | |
| 92 | 92 | // Delete Cache node |
| 93 | - $wp_admin_bar->add_node( array( |
|
| 93 | + $wp_admin_bar->add_node(array( |
|
| 94 | 94 | 'id' => 'autoptimize-delete-cache', |
| 95 | - 'title' => __("Delete Cache",'autoptimize'), |
|
| 95 | + 'title' => __("Delete Cache", 'autoptimize'), |
|
| 96 | 96 | 'parent'=> 'autoptimize' |
| 97 | 97 | )); |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | public function delete_cache() |
| 101 | 101 | { |
| 102 | - check_ajax_referer( 'ao_delcache_nonce', 'nonce' ); |
|
| 103 | - if( current_user_can( 'manage_options' )) |
|
| 102 | + check_ajax_referer('ao_delcache_nonce', 'nonce'); |
|
| 103 | + if (current_user_can('manage_options')) |
|
| 104 | 104 | { |
| 105 | 105 | // We call the function for cleaning the Autoptimize cache |
| 106 | 106 | autoptimizeCache::clearall(); |
@@ -113,24 +113,24 @@ discard block |
||
| 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 | |
| 118 | 118 | // Autoptimize Toolbar Javascript |
| 119 | - wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array('jquery'), time(), true ); |
|
| 119 | + wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), time(), true); |
|
| 120 | 120 | |
| 121 | 121 | // Localizes a registered script with data for a JavaScript variable. (We need this for the AJAX work properly in the front-end mode) |
| 122 | - wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 123 | - 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
|
| 124 | - 'error_msg' => __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=' . admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;">Autoptimize settings page</a>.', 'autoptimize' ), |
|
| 125 | - 'dismiss_msg' => __( 'Dismiss this notice.' ), |
|
| 126 | - 'nonce' => wp_create_nonce( 'ao_delcache_nonce' ) |
|
| 127 | - ) ); |
|
| 122 | + wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 123 | + 'ajaxurl' => admin_url('admin-ajax.php'), |
|
| 124 | + 'error_msg' => __('Your Autoptimize cache might not have been purged successfully, please check on the <a href='.admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;">Autoptimize settings page</a>.', 'autoptimize'), |
|
| 125 | + 'dismiss_msg' => __('Dismiss this notice.'), |
|
| 126 | + 'nonce' => wp_create_nonce('ao_delcache_nonce') |
|
| 127 | + )); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | public function format_filesize($bytes, $decimals = 2) |
| 131 | 131 | { |
| 132 | - $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ); |
|
| 133 | - for ($i = 0; ($bytes / 1024) > 0.9; $i++, $bytes /= 1024) {} |
|
| 134 | - return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[$i] ); |
|
| 132 | + $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); |
|
| 133 | + for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} |
|
| 134 | + return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]); |
|
| 135 | 135 | } |
| 136 | 136 | } |
@@ -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,59 +54,59 @@ 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.1.0"; |
|
| 58 | -$autoptimize_db_version=get_option('autoptimize_version','none'); |
|
| 57 | +$autoptimize_version = "2.1.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"); |
|
| 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"); |
|
| 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 | |
@@ -126,21 +126,21 @@ discard block |
||
| 126 | 126 | $ao_noptimize = false; |
| 127 | 127 | |
| 128 | 128 | // noptimize in qs to get non-optimized page for debugging |
| 129 | - if (array_key_exists("ao_noptimize",$_GET)) { |
|
| 130 | - if ( ($_GET["ao_noptimize"]==="1") && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) { |
|
| 129 | + if (array_key_exists("ao_noptimize", $_GET)) { |
|
| 130 | + if (($_GET["ao_noptimize"] === "1") && (apply_filters('autoptimize_filter_honor_qs_noptimize', true))) { |
|
| 131 | 131 | $ao_noptimize = true; |
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | // check for DONOTMINIFY constant as used by e.g. WooCommerce POS |
| 136 | - if (defined('DONOTMINIFY') && (constant('DONOTMINIFY')===true || constant('DONOTMINIFY')==="true")) { |
|
| 136 | + if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === "true")) { |
|
| 137 | 137 | $ao_noptimize = true; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | // filter you can use to block autoptimization on your own terms |
| 141 | - $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize ); |
|
| 141 | + $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize); |
|
| 142 | 142 | |
| 143 | - if (!is_feed() && !$ao_noptimize && !is_admin() && ( !function_exists('is_customize_preview') || !is_customize_preview() ) ) { |
|
| 143 | + if (!is_feed() && !$ao_noptimize && !is_admin() && (!function_exists('is_customize_preview') || !is_customize_preview())) { |
|
| 144 | 144 | // Config element |
| 145 | 145 | $conf = autoptimizeConfig::instance(); |
| 146 | 146 | |
@@ -148,7 +148,7 @@ discard block |
||
| 148 | 148 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeBase.php'); |
| 149 | 149 | |
| 150 | 150 | // Load extra classes and set some vars |
| 151 | - if($conf->get('autoptimize_html')) { |
|
| 151 | + if ($conf->get('autoptimize_html')) { |
|
| 152 | 152 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeHTML.php'); |
| 153 | 153 | // BUG: new minify-html does not support keeping HTML comments, skipping for now |
| 154 | 154 | // if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | // } |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - if($conf->get('autoptimize_js')) { |
|
| 161 | + if ($conf->get('autoptimize_js')) { |
|
| 162 | 162 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeScripts.php'); |
| 163 | 163 | if (!class_exists('JSMin')) { |
| 164 | 164 | if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
@@ -167,15 +167,15 @@ discard block |
||
| 167 | 167 | @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/minify-2.3.1-jsmin.php'); |
| 168 | 168 | } |
| 169 | 169 | } |
| 170 | - if ( ! defined( 'CONCATENATE_SCRIPTS' )) { |
|
| 171 | - define('CONCATENATE_SCRIPTS',false); |
|
| 170 | + if (!defined('CONCATENATE_SCRIPTS')) { |
|
| 171 | + define('CONCATENATE_SCRIPTS', false); |
|
| 172 | 172 | } |
| 173 | - if ( ! defined( 'COMPRESS_SCRIPTS' )) { |
|
| 174 | - define('COMPRESS_SCRIPTS',false); |
|
| 173 | + if (!defined('COMPRESS_SCRIPTS')) { |
|
| 174 | + define('COMPRESS_SCRIPTS', false); |
|
| 175 | 175 | } |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - if($conf->get('autoptimize_css')) { |
|
| 178 | + if ($conf->get('autoptimize_css')) { |
|
| 179 | 179 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeStyles.php'); |
| 180 | 180 | if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
| 181 | 181 | if (!class_exists('Minify_CSS_Compressor')) { |
@@ -186,13 +186,13 @@ discard block |
||
| 186 | 186 | @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-4_fgo.php'); |
| 187 | 187 | } |
| 188 | 188 | } |
| 189 | - if ( ! defined( 'COMPRESS_CSS' )) { |
|
| 190 | - define('COMPRESS_CSS',false); |
|
| 189 | + if (!defined('COMPRESS_CSS')) { |
|
| 190 | + define('COMPRESS_CSS', false); |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | // filter to be used with care, kills all output buffers when true. use with extreme caution. you have been warned! |
| 195 | - if (apply_filters('autoptimize_filter_obkiller',false)) { |
|
| 195 | + if (apply_filters('autoptimize_filter_obkiller', false)) { |
|
| 196 | 196 | while (ob_get_level() > 0) { |
| 197 | 197 | ob_end_clean(); |
| 198 | 198 | } |
@@ -205,35 +205,35 @@ discard block |
||
| 205 | 205 | |
| 206 | 206 | // Action on end, this is where the magic happens |
| 207 | 207 | function autoptimize_end_buffering($content) { |
| 208 | - if ( ((stripos($content,"<html") === false) && (stripos($content,"<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/',$content) === 1 || stripos($content,"<xsl:stylesheet") !== false ) { return $content; } |
|
| 208 | + if (((stripos($content, "<html") === false) && (stripos($content, "<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/', $content) === 1 || stripos($content, "<xsl:stylesheet") !== false) { return $content; } |
|
| 209 | 209 | |
| 210 | 210 | // load URL constants as late as possible to allow domain mapper to kick in |
| 211 | 211 | if (function_exists("domain_mapping_siteurl")) { |
| 212 | - define('AUTOPTIMIZE_WP_SITE_URL',domain_mapping_siteurl(get_current_blog_id())); |
|
| 213 | - define('AUTOPTIMIZE_WP_CONTENT_URL',str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL),AUTOPTIMIZE_WP_SITE_URL,content_url())); |
|
| 212 | + define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id())); |
|
| 213 | + define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url())); |
|
| 214 | 214 | } else { |
| 215 | - define('AUTOPTIMIZE_WP_SITE_URL',site_url()); |
|
| 216 | - define('AUTOPTIMIZE_WP_CONTENT_URL',content_url()); |
|
| 215 | + define('AUTOPTIMIZE_WP_SITE_URL', site_url()); |
|
| 216 | + define('AUTOPTIMIZE_WP_CONTENT_URL', content_url()); |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | - if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true ) ) { |
|
| 219 | + if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
| 220 | 220 | $blog_id = get_current_blog_id(); |
| 221 | - define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' ); |
|
| 221 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/'); |
|
| 222 | 222 | } else { |
| 223 | - define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
| 223 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
| 224 | 224 | } |
| 225 | - define('AUTOPTIMIZE_WP_ROOT_URL',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',AUTOPTIMIZE_WP_CONTENT_URL)); |
|
| 225 | + define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL)); |
|
| 226 | 226 | |
| 227 | 227 | // Config element |
| 228 | 228 | $conf = autoptimizeConfig::instance(); |
| 229 | 229 | |
| 230 | 230 | // Choose the classes |
| 231 | 231 | $classes = array(); |
| 232 | - if($conf->get('autoptimize_js')) |
|
| 232 | + if ($conf->get('autoptimize_js')) |
|
| 233 | 233 | $classes[] = 'autoptimizeScripts'; |
| 234 | - if($conf->get('autoptimize_css')) |
|
| 234 | + if ($conf->get('autoptimize_css')) |
|
| 235 | 235 | $classes[] = 'autoptimizeStyles'; |
| 236 | - if($conf->get('autoptimize_html')) |
|
| 236 | + if ($conf->get('autoptimize_html')) |
|
| 237 | 237 | $classes[] = 'autoptimizeHTML'; |
| 238 | 238 | |
| 239 | 239 | // Set some options |
@@ -262,12 +262,12 @@ discard block |
||
| 262 | 262 | ) |
| 263 | 263 | ); |
| 264 | 264 | |
| 265 | - $content = apply_filters( 'autoptimize_filter_html_before_minify', $content ); |
|
| 265 | + $content = apply_filters('autoptimize_filter_html_before_minify', $content); |
|
| 266 | 266 | |
| 267 | 267 | // Run the classes |
| 268 | - foreach($classes as $name) { |
|
| 268 | + foreach ($classes as $name) { |
|
| 269 | 269 | $instance = new $name($content); |
| 270 | - if($instance->read($classoptions[$name])) { |
|
| 270 | + if ($instance->read($classoptions[$name])) { |
|
| 271 | 271 | $instance->minify(); |
| 272 | 272 | $instance->cache(); |
| 273 | 273 | $content = $instance->getcontent(); |
@@ -275,19 +275,19 @@ discard block |
||
| 275 | 275 | unset($instance); |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - $content = apply_filters( 'autoptimize_html_after_minify', $content ); |
|
| 278 | + $content = apply_filters('autoptimize_html_after_minify', $content); |
|
| 279 | 279 | return $content; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | -if ( autoptimizeCache::cacheavail() ) { |
|
| 282 | +if (autoptimizeCache::cacheavail()) { |
|
| 283 | 283 | $conf = autoptimizeConfig::instance(); |
| 284 | - if( $conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') ) { |
|
| 284 | + if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) { |
|
| 285 | 285 | // Hook to wordpress |
| 286 | 286 | if (defined('AUTOPTIMIZE_INIT_EARLIER')) { |
| 287 | - add_action('init','autoptimize_start_buffering',-1); |
|
| 287 | + add_action('init', 'autoptimize_start_buffering', -1); |
|
| 288 | 288 | } else { |
| 289 | 289 | if (!defined('AUTOPTIMIZE_HOOK_INTO')) { define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); } |
| 290 | - add_action(constant("AUTOPTIMIZE_HOOK_INTO"),'autoptimize_start_buffering',2); |
|
| 290 | + add_action(constant("AUTOPTIMIZE_HOOK_INTO"), 'autoptimize_start_buffering', 2); |
|
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | } else { |
@@ -295,9 +295,9 @@ discard block |
||
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | function autoptimize_activate() { |
| 298 | - register_uninstall_hook( __FILE__, 'autoptimize_uninstall' ); |
|
| 298 | + register_uninstall_hook(__FILE__, 'autoptimize_uninstall'); |
|
| 299 | 299 | } |
| 300 | -register_activation_hook( __FILE__, 'autoptimize_activate' ); |
|
| 300 | +register_activation_hook(__FILE__, 'autoptimize_activate'); |
|
| 301 | 301 | |
| 302 | 302 | include_once('classlesses/autoptimizeCacheChecker.php'); |
| 303 | 303 | |
@@ -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 | |
@@ -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', "" ); |
|
| 28 | + $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', ""); |
|
| 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', ''); |
|
| 34 | + $removableJS = apply_filters('autoptimize_filter_js_removables', ''); |
|
| 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 ); |
|
| 62 | - if ($excludeJS!=="") { |
|
| 61 | + $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS); |
|
| 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 | 116 | |
| 117 | - $url = current(explode('?',$source[2],2)); |
|
| 117 | + $url = current(explode('?', $source[2], 2)); |
|
| 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 { |
@@ -125,22 +125,22 @@ discard block |
||
| 125 | 125 | // should we add flags? |
| 126 | 126 | $origTag = $tag; |
| 127 | 127 | foreach ($excludeJS as $exclTag => $exclFlags) { |
| 128 | - if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) { |
|
| 129 | - $tag = str_replace('<script ','<script '.$exclFlags.' ',$tag); |
|
| 128 | + if (strpos($origTag, $exclTag) !== false && in_array($exclFlags, array("async", "defer"))) { |
|
| 129 | + $tag = str_replace('<script ', '<script '.$exclFlags.' ', $tag); |
|
| 130 | 130 | } |
| 131 | 131 | } |
| 132 | 132 | } |
| 133 | - if($this->ismovable($tag)) { |
|
| 133 | + if ($this->ismovable($tag)) { |
|
| 134 | 134 | // can be moved, flags and all |
| 135 | - if($this->movetolast($tag)) { |
|
| 135 | + if ($this->movetolast($tag)) { |
|
| 136 | 136 | $this->move['last'][] = $tag; |
| 137 | 137 | } else { |
| 138 | 138 | $this->move['first'][] = $tag; |
| 139 | 139 | } |
| 140 | 140 | } else { |
| 141 | 141 | // cannot be moved, so if flag was added re-inject altered tag immediately |
| 142 | - if ( !empty($origTag) && $origTag !== $tag ) { |
|
| 143 | - $this->content = str_replace($origTag,$tag,$this->content); |
|
| 142 | + if (!empty($origTag) && $origTag !== $tag) { |
|
| 143 | + $this->content = str_replace($origTag, $tag, $this->content); |
|
| 144 | 144 | $origTag = ''; |
| 145 | 145 | } |
| 146 | 146 | // and forget about the $tag (not to be touched any more) |
@@ -149,23 +149,23 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | } else { |
| 151 | 151 | // Inline script |
| 152 | - if ($this->isremovable($tag,$this->jsremovables)) { |
|
| 153 | - $this->content = str_replace($tag,'',$this->content); |
|
| 152 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 153 | + $this->content = str_replace($tag, '', $this->content); |
|
| 154 | 154 | continue; |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | // unhide comments, as javascript may be wrapped in comment-tags for old times' sake |
| 158 | 158 | $tag = $this->restore_comments($tag); |
| 159 | - if($this->ismergeable($tag) && ( $this->include_inline )) { |
|
| 160 | - preg_match('#<script.*>(.*)</script>#Usmi',$tag,$code); |
|
| 161 | - $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm','$1',$code[1]); |
|
| 162 | - $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/','',$code); |
|
| 159 | + if ($this->ismergeable($tag) && ($this->include_inline)) { |
|
| 160 | + preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code); |
|
| 161 | + $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]); |
|
| 162 | + $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code); |
|
| 163 | 163 | $this->scripts[] = 'INLINE;'.$code; |
| 164 | 164 | } else { |
| 165 | 165 | // Can we move this? |
| 166 | - $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag ); |
|
| 167 | - if( $this->ismovable($tag) || $autoptimize_js_moveable !== '' ) { |
|
| 168 | - if( $this->movetolast($tag) || $autoptimize_js_moveable === 'last' ) { |
|
| 166 | + $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag); |
|
| 167 | + if ($this->ismovable($tag) || $autoptimize_js_moveable !== '') { |
|
| 168 | + if ($this->movetolast($tag) || $autoptimize_js_moveable === 'last') { |
|
| 169 | 169 | $this->move['last'][] = $tag; |
| 170 | 170 | } else { |
| 171 | 171 | $this->move['first'][] = $tag; |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | //Remove the original script tag |
| 183 | - $this->content = str_replace($tag,'',$this->content); |
|
| 183 | + $this->content = str_replace($tag, '', $this->content); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | return true; |
@@ -192,37 +192,37 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | //Joins and optimizes JS |
| 194 | 194 | public function minify() { |
| 195 | - foreach($this->scripts as $script) { |
|
| 196 | - if(preg_match('#^INLINE;#',$script)) { |
|
| 195 | + foreach ($this->scripts as $script) { |
|
| 196 | + if (preg_match('#^INLINE;#', $script)) { |
|
| 197 | 197 | //Inline script |
| 198 | - $script = preg_replace('#^INLINE;#','',$script); |
|
| 199 | - $script = rtrim( $script, ";\n\t\r" ) . ';'; |
|
| 198 | + $script = preg_replace('#^INLINE;#', '', $script); |
|
| 199 | + $script = rtrim($script, ";\n\t\r").';'; |
|
| 200 | 200 | //Add try-catch? |
| 201 | - if($this->trycatch) { |
|
| 201 | + if ($this->trycatch) { |
|
| 202 | 202 | $script = 'try{'.$script.'}catch(e){}'; |
| 203 | 203 | } |
| 204 | - $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, "" ); |
|
| 205 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscript) ) { |
|
| 206 | - $script=$tmpscript; |
|
| 207 | - $this->alreadyminified=true; |
|
| 204 | + $tmpscript = apply_filters('autoptimize_js_individual_script', $script, ""); |
|
| 205 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) { |
|
| 206 | + $script = $tmpscript; |
|
| 207 | + $this->alreadyminified = true; |
|
| 208 | 208 | } |
| 209 | - $this->jscode .= "\n" . $script; |
|
| 209 | + $this->jscode .= "\n".$script; |
|
| 210 | 210 | } else { |
| 211 | 211 | //External script |
| 212 | - if($script !== false && file_exists($script) && is_readable($script)) { |
|
| 212 | + if ($script !== false && file_exists($script) && is_readable($script)) { |
|
| 213 | 213 | $scriptsrc = file_get_contents($script); |
| 214 | - $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$scriptsrc); |
|
| 215 | - $scriptsrc = rtrim($scriptsrc,";\n\t\r").';'; |
|
| 214 | + $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc); |
|
| 215 | + $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';'; |
|
| 216 | 216 | //Add try-catch? |
| 217 | - if($this->trycatch) { |
|
| 217 | + if ($this->trycatch) { |
|
| 218 | 218 | $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}'; |
| 219 | 219 | } |
| 220 | - $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script ); |
|
| 221 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc) ) { |
|
| 222 | - $scriptsrc=$tmpscriptsrc; |
|
| 223 | - $this->alreadyminified=true; |
|
| 224 | - } else if ((( strpos($script,"min.js") !== false ) || ( strpos($script,"wp-includes/js/jquery/jquery.js") !== false )) && ( $this->inject_min_late === true )) { |
|
| 225 | - $scriptsrc="%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%"; |
|
| 220 | + $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script); |
|
| 221 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) { |
|
| 222 | + $scriptsrc = $tmpscriptsrc; |
|
| 223 | + $this->alreadyminified = true; |
|
| 224 | + } else if (((strpos($script, "min.js") !== false) || (strpos($script, "wp-includes/js/jquery/jquery.js") !== false)) && ($this->inject_min_late === true)) { |
|
| 225 | + $scriptsrc = "%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%"; |
|
| 226 | 226 | } |
| 227 | 227 | $this->jscode .= "\n".$scriptsrc; |
| 228 | 228 | }/*else{ |
@@ -233,24 +233,24 @@ discard block |
||
| 233 | 233 | |
| 234 | 234 | //Check for already-minified code |
| 235 | 235 | $this->md5hash = md5($this->jscode); |
| 236 | - $ccheck = new autoptimizeCache($this->md5hash,'js'); |
|
| 237 | - if($ccheck->check()) { |
|
| 236 | + $ccheck = new autoptimizeCache($this->md5hash, 'js'); |
|
| 237 | + if ($ccheck->check()) { |
|
| 238 | 238 | $this->jscode = $ccheck->retrieve(); |
| 239 | 239 | return true; |
| 240 | 240 | } |
| 241 | 241 | unset($ccheck); |
| 242 | 242 | |
| 243 | 243 | //$this->jscode has all the uncompressed code now. |
| 244 | - if ($this->alreadyminified!==true) { |
|
| 245 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 246 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 244 | + if ($this->alreadyminified !== true) { |
|
| 245 | + if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) { |
|
| 246 | + if (@is_callable(array("JSMin", "minify"))) { |
|
| 247 | 247 | $tmp_jscode = trim(JSMin::minify($this->jscode)); |
| 248 | 248 | if (!empty($tmp_jscode)) { |
| 249 | 249 | $this->jscode = $tmp_jscode; |
| 250 | 250 | unset($tmp_jscode); |
| 251 | 251 | } |
| 252 | 252 | $this->jscode = $this->inject_minified($this->jscode); |
| 253 | - $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
|
| 253 | + $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode); |
|
| 254 | 254 | return true; |
| 255 | 255 | } else { |
| 256 | 256 | $this->jscode = $this->inject_minified($this->jscode); |
@@ -265,11 +265,11 @@ discard block |
||
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | //Caches the JS in uncompressed, deflated and gzipped form. |
| 268 | - public function cache() { |
|
| 269 | - $cache = new autoptimizeCache($this->md5hash,'js'); |
|
| 270 | - if(!$cache->check()) { |
|
| 268 | + public function cache() { |
|
| 269 | + $cache = new autoptimizeCache($this->md5hash, 'js'); |
|
| 270 | + if (!$cache->check()) { |
|
| 271 | 271 | //Cache our code |
| 272 | - $cache->cache($this->jscode,'text/javascript'); |
|
| 272 | + $cache->cache($this->jscode, 'text/javascript'); |
|
| 273 | 273 | } |
| 274 | 274 | $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 275 | 275 | $this->url = $this->url_replace_cdn($this->url); |
@@ -278,32 +278,32 @@ discard block |
||
| 278 | 278 | // Returns the content |
| 279 | 279 | public function getcontent() { |
| 280 | 280 | // Restore the full content |
| 281 | - if(!empty($this->restofcontent)) { |
|
| 281 | + if (!empty($this->restofcontent)) { |
|
| 282 | 282 | $this->content .= $this->restofcontent; |
| 283 | 283 | $this->restofcontent = ''; |
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | // Add the scripts taking forcehead/ deferred (default) into account |
| 287 | - if($this->forcehead == true) { |
|
| 288 | - $replaceTag=array("</head>","before"); |
|
| 289 | - $defer=""; |
|
| 287 | + if ($this->forcehead == true) { |
|
| 288 | + $replaceTag = array("</head>", "before"); |
|
| 289 | + $defer = ""; |
|
| 290 | 290 | } else { |
| 291 | - $replaceTag=array("</body>","before"); |
|
| 292 | - $defer="defer "; |
|
| 291 | + $replaceTag = array("</body>", "before"); |
|
| 292 | + $defer = "defer "; |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | - $defer = apply_filters( 'autoptimize_filter_js_defer', $defer ); |
|
| 295 | + $defer = apply_filters('autoptimize_filter_js_defer', $defer); |
|
| 296 | 296 | $bodyreplacementpayload = '<script type="text/javascript" '.$defer.'src="'.$this->url.'"></script>'; |
| 297 | - $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload',$bodyreplacementpayload); |
|
| 297 | + $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload); |
|
| 298 | 298 | |
| 299 | - $bodyreplacement = implode('',$this->move['first']); |
|
| 299 | + $bodyreplacement = implode('', $this->move['first']); |
|
| 300 | 300 | $bodyreplacement .= $bodyreplacementpayload; |
| 301 | - $bodyreplacement .= implode('',$this->move['last']); |
|
| 301 | + $bodyreplacement .= implode('', $this->move['last']); |
|
| 302 | 302 | |
| 303 | - $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag ); |
|
| 303 | + $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag); |
|
| 304 | 304 | |
| 305 | - if (strlen($this->jscode)>0) { |
|
| 306 | - $this->inject_in_html($bodyreplacement,$replaceTag); |
|
| 305 | + if (strlen($this->jscode) > 0) { |
|
| 306 | + $this->inject_in_html($bodyreplacement, $replaceTag); |
|
| 307 | 307 | } |
| 308 | 308 | |
| 309 | 309 | // restore comments |
@@ -323,15 +323,15 @@ discard block |
||
| 323 | 323 | private function ismergeable($tag) { |
| 324 | 324 | if (!empty($this->whitelist)) { |
| 325 | 325 | foreach ($this->whitelist as $match) { |
| 326 | - if(strpos($tag,$match)!==false) { |
|
| 326 | + if (strpos($tag, $match) !== false) { |
|
| 327 | 327 | return true; |
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | 330 | // no match with whitelist |
| 331 | 331 | return false; |
| 332 | 332 | } else { |
| 333 | - foreach($this->domove as $match) { |
|
| 334 | - if(strpos($tag,$match)!==false) { |
|
| 333 | + foreach ($this->domove as $match) { |
|
| 334 | + if (strpos($tag, $match) !== false) { |
|
| 335 | 335 | // Matched something |
| 336 | 336 | return false; |
| 337 | 337 | } |
@@ -341,8 +341,8 @@ discard block |
||
| 341 | 341 | return false; |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - foreach($this->dontmove as $match) { |
|
| 345 | - if(strpos($tag,$match)!==false) { |
|
| 344 | + foreach ($this->dontmove as $match) { |
|
| 345 | + if (strpos($tag, $match) !== false) { |
|
| 346 | 346 | //Matched something |
| 347 | 347 | return false; |
| 348 | 348 | } |
@@ -355,12 +355,12 @@ discard block |
||
| 355 | 355 | |
| 356 | 356 | // Checks againstt the blacklist |
| 357 | 357 | private function ismovable($tag) { |
| 358 | - if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',true)) { |
|
| 358 | + if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable', true)) { |
|
| 359 | 359 | return false; |
| 360 | 360 | } |
| 361 | 361 | |
| 362 | - foreach($this->domove as $match) { |
|
| 363 | - if(strpos($tag,$match)!==false) { |
|
| 362 | + foreach ($this->domove as $match) { |
|
| 363 | + if (strpos($tag, $match) !== false) { |
|
| 364 | 364 | // Matched something |
| 365 | 365 | return true; |
| 366 | 366 | } |
@@ -370,8 +370,8 @@ discard block |
||
| 370 | 370 | return true; |
| 371 | 371 | } |
| 372 | 372 | |
| 373 | - foreach($this->dontmove as $match) { |
|
| 374 | - if(strpos($tag,$match)!==false) { |
|
| 373 | + foreach ($this->dontmove as $match) { |
|
| 374 | + if (strpos($tag, $match) !== false) { |
|
| 375 | 375 | // Matched something |
| 376 | 376 | return false; |
| 377 | 377 | } |
@@ -382,8 +382,8 @@ discard block |
||
| 382 | 382 | } |
| 383 | 383 | |
| 384 | 384 | private function movetolast($tag) { |
| 385 | - foreach($this->domovelast as $match) { |
|
| 386 | - if(strpos($tag,$match)!==false) { |
|
| 385 | + foreach ($this->domovelast as $match) { |
|
| 386 | + if (strpos($tag, $match) !== false) { |
|
| 387 | 387 | // Matched, return true |
| 388 | 388 | return true; |
| 389 | 389 | } |
@@ -409,10 +409,10 @@ discard block |
||
| 409 | 409 | * original function by https://github.com/zytzagoo/ on his AO fork, thanks Tomas! |
| 410 | 410 | */ |
| 411 | 411 | public function should_aggregate($tag) { |
| 412 | - preg_match('#<(script[^>]*)>#i',$tag,$scripttag); |
|
| 413 | - if ( strpos($scripttag[1], 'type')===false ) { |
|
| 412 | + preg_match('#<(script[^>]*)>#i', $tag, $scripttag); |
|
| 413 | + if (strpos($scripttag[1], 'type') === false) { |
|
| 414 | 414 | return true; |
| 415 | - } else if ( preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1]) ) { |
|
| 415 | + } else if (preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1])) { |
|
| 416 | 416 | return true; |
| 417 | 417 | } else { |
| 418 | 418 | return false; |
