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 | |
@@ -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 $size * 1048576; |
|
| 782 | - case 'K': case 'k': return $size * 1024; |
|
| 783 | - case 'G': case 'g': return $size * 1073741824; |
|
| 781 | + case 'M': case 'm': return $size*1048576; |
|
| 782 | + case 'K': case 'k': return $size*1024; |
|
| 783 | + case 'G': case 'g': return $size*1073741824; |
|
| 784 | 784 | } |
| 785 | 785 | } |
| 786 | 786 | |
@@ -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,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | |
| 4 | 4 | class autoptimizeConfig { |
| 5 | 5 | private $config = null; |
@@ -7,25 +7,25 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | //Singleton: private construct |
| 9 | 9 | private function __construct() { |
| 10 | - if( is_admin() ) { |
|
| 10 | + if (is_admin()) { |
|
| 11 | 11 | //Add the admin page and settings |
| 12 | - add_action('admin_menu',array($this,'addmenu')); |
|
| 13 | - add_action('admin_init',array($this,'registersettings')); |
|
| 12 | + add_action('admin_menu', array($this, 'addmenu')); |
|
| 13 | + add_action('admin_init', array($this, 'registersettings')); |
|
| 14 | 14 | |
| 15 | 15 | //Set meta info |
| 16 | - if(function_exists('plugin_row_meta')) { |
|
| 16 | + if (function_exists('plugin_row_meta')) { |
|
| 17 | 17 | //2.8+ |
| 18 | - add_filter('plugin_row_meta',array($this,'setmeta'),10,2); |
|
| 19 | - } elseif(function_exists('post_class')) { |
|
| 18 | + add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2); |
|
| 19 | + } elseif (function_exists('post_class')) { |
|
| 20 | 20 | //2.7 |
| 21 | 21 | $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
| 22 | - add_filter('plugin_action_links_'.$plugin,array($this,'setmeta')); |
|
| 22 | + add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta')); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | //Clean cache? |
| 26 | - if(get_option('autoptimize_cache_clean')) { |
|
| 26 | + if (get_option('autoptimize_cache_clean')) { |
|
| 27 | 27 | autoptimizeCache::clearall(); |
| 28 | - update_option('autoptimize_cache_clean',0); |
|
| 28 | + update_option('autoptimize_cache_clean', 0); |
|
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | |
@@ -151,27 +151,27 @@ discard block |
||
| 151 | 151 | <div class="wrap"> |
| 152 | 152 | |
| 153 | 153 | <?php if (version_compare(PHP_VERSION, '5.3.0') < 0) { ?> |
| 154 | -<div class="notice-error notice"><?php _e('<p><strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href="http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank">serious security and performance issues</a>. Please ask your hoster to provide you with an upgrade path to 5.6 or 7.0</p>','autoptimize'); ?></div> |
|
| 154 | +<div class="notice-error notice"><?php _e('<p><strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href="http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank">serious security and performance issues</a>. Please ask your hoster to provide you with an upgrade path to 5.6 or 7.0</p>', 'autoptimize'); ?></div> |
|
| 155 | 155 | <?php } ?> |
| 156 | 156 | |
| 157 | 157 | <div id="autoptimize_main"> |
| 158 | 158 | <div id="ao_title_and_button"> |
| 159 | - <h1 id="ao_title"><?php _e('Autoptimize Settings','autoptimize'); ?> |
|
| 159 | + <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?> |
|
| 160 | 160 | <span id="ao_adv_button"> |
| 161 | 161 | <?php |
| 162 | - if (get_option('autoptimize_show_adv','0')=='1') { |
|
| 162 | + if (get_option('autoptimize_show_adv', '0') == '1') { |
|
| 163 | 163 | ?> |
| 164 | - <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings","autoptimize") ?></span></a> |
|
| 165 | - <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a> |
|
| 164 | + <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a> |
|
| 165 | + <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a> |
|
| 166 | 166 | <style>tr.ao_adv{display:table-row;} li.ao_adv{display:list-item;}</style> |
| 167 | 167 | <?php |
| 168 | - $hiddenClass=""; |
|
| 168 | + $hiddenClass = ""; |
|
| 169 | 169 | } else { |
| 170 | 170 | ?> |
| 171 | - <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings","autoptimize") ?></span></a> |
|
| 172 | - <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a> |
|
| 171 | + <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a> |
|
| 172 | + <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a> |
|
| 173 | 173 | <?php |
| 174 | - $hiddenClass="hidden "; |
|
| 174 | + $hiddenClass = "hidden "; |
|
| 175 | 175 | } |
| 176 | 176 | ?> |
| 177 | 177 | </span> |
@@ -186,153 +186,153 @@ discard block |
||
| 186 | 186 | <ul> |
| 187 | 187 | |
| 188 | 188 | <li class="itemDetail"> |
| 189 | -<h2 class="itemTitle"><?php _e('HTML Options','autoptimize'); ?></h2> |
|
| 189 | +<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2> |
|
| 190 | 190 | <table class="form-table"> |
| 191 | 191 | <tr valign="top"> |
| 192 | -<th scope="row"><?php _e('Optimize HTML Code?','autoptimize'); ?></th> |
|
| 193 | -<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html')?'checked="checked" ':''; ?>/></td> |
|
| 192 | +<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th> |
|
| 193 | +<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 194 | 194 | </tr> |
| 195 | -<tr class="<?php echo $hiddenClass;?>html_sub ao_adv" valign="top"> |
|
| 196 | -<th scope="row"><?php _e('Keep HTML comments?','autoptimize'); ?></th> |
|
| 197 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments')?'checked="checked" ':''; ?>/> |
|
| 198 | -<?php _e('Enable this if you want HTML comments to remain in the page.','autoptimize'); ?></label></td> |
|
| 195 | +<tr class="<?php echo $hiddenClass; ?>html_sub ao_adv" valign="top"> |
|
| 196 | +<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th> |
|
| 197 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/> |
|
| 198 | +<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td> |
|
| 199 | 199 | </tr> |
| 200 | 200 | </table> |
| 201 | 201 | </li> |
| 202 | 202 | |
| 203 | 203 | <li class="itemDetail"> |
| 204 | -<h2 class="itemTitle"><?php _e('JavaScript Options','autoptimize'); ?></h2> |
|
| 204 | +<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2> |
|
| 205 | 205 | <table class="form-table"> |
| 206 | 206 | <tr valign="top"> |
| 207 | -<th scope="row"><?php _e('Optimize JavaScript Code?','autoptimize'); ?></th> |
|
| 208 | -<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js')?'checked="checked" ':''; ?>/></td> |
|
| 207 | +<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th> |
|
| 208 | +<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 209 | 209 | </tr> |
| 210 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 211 | -<th scope="row"><?php _e('Force JavaScript in <head>?','autoptimize'); ?></th> |
|
| 212 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead')?'checked="checked" ':''; ?>/> |
|
| 213 | -<?php _e('Load JavaScript early, reducing the chance of JS-errors but making it render blocking. You can disable this if you\'re not aggregating inline JS and you want JS to be deferred.','autoptimize'); ?></label></td> |
|
| 210 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 211 | +<th scope="row"><?php _e('Force JavaScript in <head>?', 'autoptimize'); ?></th> |
|
| 212 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/> |
|
| 213 | +<?php _e('Load JavaScript early, reducing the chance of JS-errors but making it render blocking. You can disable this if you\'re not aggregating inline JS and you want JS to be deferred.', 'autoptimize'); ?></label></td> |
|
| 214 | 214 | </tr> |
| 215 | 215 | <?php if (get_option('autoptimize_js_justhead')) { ?> |
| 216 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 217 | -<th scope="row"><?php _e('Look for scripts only in <head>?','autoptimize'); _e(' <i>(deprecated)</i>','autoptimize'); ?></th> |
|
| 218 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead')?'checked="checked" ':''; ?>/> |
|
| 219 | -<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.','autoptimize'); ?></label></td> |
|
| 216 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 217 | +<th scope="row"><?php _e('Look for scripts only in <head>?', 'autoptimize'); _e(' <i>(deprecated)</i>', 'autoptimize'); ?></th> |
|
| 218 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
| 219 | +<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td> |
|
| 220 | 220 | </tr> |
| 221 | 221 | <?php } ?> |
| 222 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 223 | -<th scope="row"><?php _e('Also aggregate inline JS?','autoptimize'); ?></th> |
|
| 224 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline')?'checked="checked" ':''; ?>/> |
|
| 225 | -<?php _e('Check this option for Autoptimize to also aggregate JS in the HTML. If this option is not enabled, you might have to "force JavaScript in head".','autoptimize'); ?></label></td> |
|
| 222 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 223 | +<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th> |
|
| 224 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/> |
|
| 225 | +<?php _e('Check this option for Autoptimize to also aggregate JS in the HTML. If this option is not enabled, you might have to "force JavaScript in head".', 'autoptimize'); ?></label></td> |
|
| 226 | 226 | </tr> |
| 227 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 228 | -<th scope="row"><?php _e('Exclude scripts from Autoptimize:','autoptimize'); ?></th> |
|
| 229 | -<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude',"seal.js, js/jquery/jquery.js"); ?>"/><br /> |
|
| 230 | -<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.','autoptimize'); ?></label></td> |
|
| 227 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 228 | +<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th> |
|
| 229 | +<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude', "seal.js, js/jquery/jquery.js"); ?>"/><br /> |
|
| 230 | +<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.', 'autoptimize'); ?></label></td> |
|
| 231 | 231 | </tr> |
| 232 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 233 | -<th scope="row"><?php _e('Add try-catch wrapping?','autoptimize'); ?></th> |
|
| 234 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch')?'checked="checked" ':''; ?>/> |
|
| 235 | -<?php _e('If your scripts break because of a JS-error, you might want to try this.','autoptimize'); ?></label></td> |
|
| 232 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 233 | +<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th> |
|
| 234 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/> |
|
| 235 | +<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td> |
|
| 236 | 236 | </tr> |
| 237 | 237 | </table> |
| 238 | 238 | </li> |
| 239 | 239 | |
| 240 | 240 | <li class="itemDetail"> |
| 241 | -<h2 class="itemTitle"><?php _e('CSS Options','autoptimize'); ?></h2> |
|
| 241 | +<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2> |
|
| 242 | 242 | <table class="form-table"> |
| 243 | 243 | <tr valign="top"> |
| 244 | -<th scope="row"><?php _e('Optimize CSS Code?','autoptimize'); ?></th> |
|
| 245 | -<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css')?'checked="checked" ':''; ?>/></td> |
|
| 244 | +<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th> |
|
| 245 | +<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 246 | 246 | </tr> |
| 247 | -<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top"> |
|
| 248 | -<th scope="row"><?php _e('Generate data: URIs for images?','autoptimize'); ?></th> |
|
| 249 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris')?'checked="checked" ':''; ?>/> |
|
| 250 | -<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.','autoptimize'); ?></label></td> |
|
| 247 | +<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top"> |
|
| 248 | +<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th> |
|
| 249 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/> |
|
| 250 | +<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td> |
|
| 251 | 251 | </tr> |
| 252 | -<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top"> |
|
| 253 | -<th scope="row"><?php _e('Remove Google Fonts?','autoptimize'); ?></th> |
|
| 254 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont')?'checked="checked" ':''; ?>/> |
|
| 255 | -<?php _e('Check this if you don\'t need or want Google Fonts being loaded.','autoptimize'); ?></label></td> |
|
| 252 | +<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top"> |
|
| 253 | +<th scope="row"><?php _e('Remove Google Fonts?', 'autoptimize'); ?></th> |
|
| 254 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont') ? 'checked="checked" ' : ''; ?>/> |
|
| 255 | +<?php _e('Check this if you don\'t need or want Google Fonts being loaded.', 'autoptimize'); ?></label></td> |
|
| 256 | 256 | </tr> |
| 257 | 257 | <?php if (get_option('autoptimize_css_justhead')) { ?> |
| 258 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
|
| 259 | -<th scope="row"><?php _e('Look for styles only in <head>?','autoptimize'); _e(' <i>(deprecated)</i>','autoptimize'); ?></th> |
|
| 260 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead')?'checked="checked" ':''; ?>/> |
|
| 261 | -<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.','autoptimize'); ?></label></td> |
|
| 258 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv"> |
|
| 259 | +<th scope="row"><?php _e('Look for styles only in <head>?', 'autoptimize'); _e(' <i>(deprecated)</i>', 'autoptimize'); ?></th> |
|
| 260 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
| 261 | +<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td> |
|
| 262 | 262 | </tr> |
| 263 | 263 | <?php } ?> |
| 264 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
|
| 265 | -<th scope="row"><?php _e('Also aggregate inline CSS?','autoptimize'); ?></th> |
|
| 266 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline','1')?'checked="checked" ':''; ?>/> |
|
| 267 | -<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.','autoptimize'); ?></label></td> |
|
| 264 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv"> |
|
| 265 | +<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th> |
|
| 266 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 267 | +<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td> |
|
| 268 | 268 | </tr> |
| 269 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
|
| 270 | -<th scope="row"><?php _e('Inline and Defer CSS?','autoptimize'); ?></th> |
|
| 271 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer')?'checked="checked" ':''; ?>/> |
|
| 272 | -<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!','autoptimize'); ?></label></td> |
|
| 269 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv"> |
|
| 270 | +<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th> |
|
| 271 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/> |
|
| 272 | +<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!', 'autoptimize'); ?></label></td> |
|
| 273 | 273 | </tr> |
| 274 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv" id="autoptimize_css_defer_inline"> |
|
| 274 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv" id="autoptimize_css_defer_inline"> |
|
| 275 | 275 | <th scope="row"></th> |
| 276 | -<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.','autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td> |
|
| 276 | +<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td> |
|
| 277 | 277 | </tr> |
| 278 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub"> |
|
| 279 | -<th scope="row"><?php _e('Inline all CSS?','autoptimize'); ?></th> |
|
| 280 | -<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline')?'checked="checked" ':''; ?>/> |
|
| 281 | -<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.','autoptimize'); ?></label></td> |
|
| 278 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub"> |
|
| 279 | +<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th> |
|
| 280 | +<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/> |
|
| 281 | +<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.', 'autoptimize'); ?></label></td> |
|
| 282 | 282 | </tr> |
| 283 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub"> |
|
| 284 | -<th scope="row"><?php _e('Exclude CSS from Autoptimize:','autoptimize'); ?></th> |
|
| 285 | -<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude','admin-bar.min.css, dashicons.min.css'); ?>"/><br /> |
|
| 286 | -<?php _e('A comma-separated list of CSS you want to exclude from being optimized.','autoptimize'); ?></label></td> |
|
| 283 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub"> |
|
| 284 | +<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th> |
|
| 285 | +<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude', 'admin-bar.min.css, dashicons.min.css'); ?>"/><br /> |
|
| 286 | +<?php _e('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize'); ?></label></td> |
|
| 287 | 287 | </tr> |
| 288 | 288 | </table> |
| 289 | 289 | </li> |
| 290 | 290 | |
| 291 | 291 | <li class="itemDetail"> |
| 292 | -<h2 class="itemTitle"><?php _e('CDN Options','autoptimize'); ?></h2> |
|
| 292 | +<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2> |
|
| 293 | 293 | <table class="form-table"> |
| 294 | 294 | <tr valign="top"> |
| 295 | -<th scope="row"><?php _e('CDN Base URL','autoptimize'); ?></th> |
|
| 296 | -<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url',''),array("http","https")); ?>" /><br /> |
|
| 297 | -<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>).','autoptimize'); ?></label></td> |
|
| 295 | +<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th> |
|
| 296 | +<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url', ''), array("http", "https")); ?>" /><br /> |
|
| 297 | +<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>).', 'autoptimize'); ?></label></td> |
|
| 298 | 298 | </tr> |
| 299 | 299 | </table> |
| 300 | 300 | </li> |
| 301 | 301 | |
| 302 | -<li class="<?php echo $hiddenClass;?>itemDetail ao_adv"> |
|
| 303 | -<h2 class="itemTitle"><?php _e('Cache Info','autoptimize'); ?></h2> |
|
| 302 | +<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv"> |
|
| 303 | +<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2> |
|
| 304 | 304 | <table class="form-table" > |
| 305 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 306 | -<th scope="row"><?php _e('Cache folder','autoptimize'); ?></th> |
|
| 305 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 306 | +<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th> |
|
| 307 | 307 | <td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td> |
| 308 | 308 | </tr> |
| 309 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 310 | -<th scope="row"><?php _e('Can we write?','autoptimize'); ?></th> |
|
| 311 | -<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes','autoptimize') : __('No','autoptimize')); ?></td> |
|
| 309 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 310 | +<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th> |
|
| 311 | +<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td> |
|
| 312 | 312 | </tr> |
| 313 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 314 | -<th scope="row"><?php _e('Cached styles and scripts','autoptimize'); ?></th> |
|
| 313 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 314 | +<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th> |
|
| 315 | 315 | <td><?php |
| 316 | - $AOstatArr=autoptimizeCache::stats(); |
|
| 317 | - $AOcacheSize=round($AOstatArr[1]/1024); |
|
| 318 | - echo $AOstatArr[0].__(' files, totalling ','autoptimize').$AOcacheSize.__(' Kbytes (calculated at ','autoptimize').date("H:i e", $AOstatArr[2]).')'; |
|
| 316 | + $AOstatArr = autoptimizeCache::stats(); |
|
| 317 | + $AOcacheSize = round($AOstatArr[1]/1024); |
|
| 318 | + echo $AOstatArr[0].__(' files, totalling ', 'autoptimize').$AOcacheSize.__(' Kbytes (calculated at ', 'autoptimize').date("H:i e", $AOstatArr[2]).')'; |
|
| 319 | 319 | ?></td> |
| 320 | 320 | </tr> |
| 321 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 322 | -<th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th> |
|
| 323 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/> |
|
| 324 | -<?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.','autoptimize'); ?></label></td> |
|
| 321 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 322 | +<th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th> |
|
| 323 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 324 | +<?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label></td> |
|
| 325 | 325 | </tr> |
| 326 | 326 | </table> |
| 327 | 327 | </li> |
| 328 | 328 | |
| 329 | 329 | </ul> |
| 330 | 330 | |
| 331 | -<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv','0'); ?>"> |
|
| 331 | +<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv', '0'); ?>"> |
|
| 332 | 332 | |
| 333 | 333 | <p class="submit"> |
| 334 | -<input type="submit" class="button-secondary" value="<?php _e('Save Changes','autoptimize') ?>" /> |
|
| 335 | -<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache','autoptimize') ?>" /> |
|
| 334 | +<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize') ?>" /> |
|
| 335 | +<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize') ?>" /> |
|
| 336 | 336 | </p> |
| 337 | 337 | |
| 338 | 338 | </form> |
@@ -341,31 +341,31 @@ discard block |
||
| 341 | 341 | <div class="autoptimize_banner hidden"> |
| 342 | 342 | <ul> |
| 343 | 343 | <?php |
| 344 | - if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) { |
|
| 345 | - $AO_banner=get_transient("autoptimize_banner"); |
|
| 344 | + if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) { |
|
| 345 | + $AO_banner = get_transient("autoptimize_banner"); |
|
| 346 | 346 | if (empty($AO_banner)) { |
| 347 | 347 | $banner_resp = wp_remote_get("http://misc.optimizingmatters.com/autoptimize_news.html"); |
| 348 | 348 | if (!is_wp_error($banner_resp)) { |
| 349 | - if (wp_remote_retrieve_response_code($banner_resp)=="200") { |
|
| 349 | + if (wp_remote_retrieve_response_code($banner_resp) == "200") { |
|
| 350 | 350 | $AO_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp)); |
| 351 | - set_transient("autoptimize_banner",$AO_banner,DAY_IN_SECONDS); |
|
| 351 | + set_transient("autoptimize_banner", $AO_banner, DAY_IN_SECONDS); |
|
| 352 | 352 | } |
| 353 | 353 | } |
| 354 | 354 | } |
| 355 | 355 | echo $AO_banner; |
| 356 | 356 | } |
| 357 | 357 | ?> |
| 358 | - <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ</a> or post your question on <a href='http://wordpress.org/support/plugin/autoptimize'>the support-forum</a>.","autoptimize"); ?></li> |
|
| 359 | - <li><?php _e("Happy with Autoptimize?","autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!","autoptimize"); ?></a></li> |
|
| 358 | + <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ</a> or post your question on <a href='http://wordpress.org/support/plugin/autoptimize'>the support-forum</a>.", "autoptimize"); ?></li> |
|
| 359 | + <li><?php _e("Happy with Autoptimize?", "autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!", "autoptimize"); ?></a></li> |
|
| 360 | 360 | </ul> |
| 361 | 361 | </div> |
| 362 | 362 | <div style="margin-left:10px;margin-top:-5px;"> |
| 363 | 363 | <h2> |
| 364 | - <?php _e("futtta about","autoptimize") ?> |
|
| 364 | + <?php _e("futtta about", "autoptimize") ?> |
|
| 365 | 365 | <select id="feed_dropdown" > |
| 366 | - <option value="1"><?php _e("Autoptimize","autoptimize") ?></option> |
|
| 367 | - <option value="2"><?php _e("WordPress","autoptimize") ?></option> |
|
| 368 | - <option value="3"><?php _e("Web Technology","autoptimize") ?></option> |
|
| 366 | + <option value="1"><?php _e("Autoptimize", "autoptimize") ?></option> |
|
| 367 | + <option value="2"><?php _e("WordPress", "autoptimize") ?></option> |
|
| 368 | + <option value="3"><?php _e("Web Technology", "autoptimize") ?></option> |
|
| 369 | 369 | </select> |
| 370 | 370 | </h2> |
| 371 | 371 | <div id="futtta_feed"> |
@@ -519,14 +519,14 @@ discard block |
||
| 519 | 519 | } |
| 520 | 520 | |
| 521 | 521 | public function addmenu() { |
| 522 | - $hook=add_options_page(__('Autoptimize Options','autoptimize'),'Autoptimize','manage_options','autoptimize',array($this,'show')); |
|
| 523 | - add_action( 'admin_print_scripts-'.$hook,array($this,'autoptimize_admin_scripts')); |
|
| 524 | - add_action( 'admin_print_styles-'.$hook,array($this,'autoptimize_admin_styles')); |
|
| 522 | + $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show')); |
|
| 523 | + add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts')); |
|
| 524 | + add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles')); |
|
| 525 | 525 | } |
| 526 | 526 | |
| 527 | 527 | public function autoptimize_admin_scripts() { |
| 528 | - wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'),null,true); |
|
| 529 | - wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'),null,true); |
|
| 528 | + wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true); |
|
| 529 | + wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true); |
|
| 530 | 530 | } |
| 531 | 531 | |
| 532 | 532 | public function autoptimize_admin_styles() { |
@@ -535,46 +535,46 @@ discard block |
||
| 535 | 535 | } |
| 536 | 536 | |
| 537 | 537 | public function registersettings() { |
| 538 | - register_setting('autoptimize','autoptimize_html'); |
|
| 539 | - register_setting('autoptimize','autoptimize_html_keepcomments'); |
|
| 540 | - register_setting('autoptimize','autoptimize_js'); |
|
| 541 | - register_setting('autoptimize','autoptimize_js_exclude'); |
|
| 542 | - register_setting('autoptimize','autoptimize_js_trycatch'); |
|
| 543 | - register_setting('autoptimize','autoptimize_js_justhead'); |
|
| 544 | - register_setting('autoptimize','autoptimize_js_forcehead'); |
|
| 545 | - register_setting('autoptimize','autoptimize_js_include_inline'); |
|
| 546 | - register_setting('autoptimize','autoptimize_css'); |
|
| 547 | - register_setting('autoptimize','autoptimize_css_exclude'); |
|
| 548 | - register_setting('autoptimize','autoptimize_css_justhead'); |
|
| 549 | - register_setting('autoptimize','autoptimize_css_datauris'); |
|
| 550 | - register_setting('autoptimize','autoptimize_css_defer'); |
|
| 551 | - register_setting('autoptimize','autoptimize_css_defer_inline'); |
|
| 552 | - register_setting('autoptimize','autoptimize_css_inline'); |
|
| 553 | - register_setting('autoptimize','autoptimize_css_include_inline'); |
|
| 554 | - register_setting('autoptimize','autoptimize_css_nogooglefont'); |
|
| 555 | - register_setting('autoptimize','autoptimize_cdn_url'); |
|
| 556 | - register_setting('autoptimize','autoptimize_cache_clean'); |
|
| 557 | - register_setting('autoptimize','autoptimize_cache_nogzip'); |
|
| 558 | - register_setting('autoptimize','autoptimize_show_adv'); |
|
| 538 | + register_setting('autoptimize', 'autoptimize_html'); |
|
| 539 | + register_setting('autoptimize', 'autoptimize_html_keepcomments'); |
|
| 540 | + register_setting('autoptimize', 'autoptimize_js'); |
|
| 541 | + register_setting('autoptimize', 'autoptimize_js_exclude'); |
|
| 542 | + register_setting('autoptimize', 'autoptimize_js_trycatch'); |
|
| 543 | + register_setting('autoptimize', 'autoptimize_js_justhead'); |
|
| 544 | + register_setting('autoptimize', 'autoptimize_js_forcehead'); |
|
| 545 | + register_setting('autoptimize', 'autoptimize_js_include_inline'); |
|
| 546 | + register_setting('autoptimize', 'autoptimize_css'); |
|
| 547 | + register_setting('autoptimize', 'autoptimize_css_exclude'); |
|
| 548 | + register_setting('autoptimize', 'autoptimize_css_justhead'); |
|
| 549 | + register_setting('autoptimize', 'autoptimize_css_datauris'); |
|
| 550 | + register_setting('autoptimize', 'autoptimize_css_defer'); |
|
| 551 | + register_setting('autoptimize', 'autoptimize_css_defer_inline'); |
|
| 552 | + register_setting('autoptimize', 'autoptimize_css_inline'); |
|
| 553 | + register_setting('autoptimize', 'autoptimize_css_include_inline'); |
|
| 554 | + register_setting('autoptimize', 'autoptimize_css_nogooglefont'); |
|
| 555 | + register_setting('autoptimize', 'autoptimize_cdn_url'); |
|
| 556 | + register_setting('autoptimize', 'autoptimize_cache_clean'); |
|
| 557 | + register_setting('autoptimize', 'autoptimize_cache_nogzip'); |
|
| 558 | + register_setting('autoptimize', 'autoptimize_show_adv'); |
|
| 559 | 559 | } |
| 560 | 560 | |
| 561 | - public function setmeta($links,$file=null) { |
|
| 561 | + public function setmeta($links, $file = null) { |
|
| 562 | 562 | //Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/ |
| 563 | 563 | //Do it only once - saves time |
| 564 | 564 | static $plugin; |
| 565 | - if(empty($plugin)) |
|
| 565 | + if (empty($plugin)) |
|
| 566 | 566 | $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
| 567 | 567 | |
| 568 | - if($file===null) { |
|
| 568 | + if ($file === null) { |
|
| 569 | 569 | //2.7 |
| 570 | 570 | $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')); |
| 571 | - array_unshift($links,$settings_link); |
|
| 571 | + array_unshift($links, $settings_link); |
|
| 572 | 572 | } else { |
| 573 | 573 | //2.8 |
| 574 | 574 | //If it's us, add the link |
| 575 | - if($file === $plugin) { |
|
| 576 | - $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>',__('Settings'))); |
|
| 577 | - $links = array_merge($links,$newlink); |
|
| 575 | + if ($file === $plugin) { |
|
| 576 | + $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'))); |
|
| 577 | + $links = array_merge($links, $newlink); |
|
| 578 | 578 | } |
| 579 | 579 | } |
| 580 | 580 | |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | } |
| 583 | 583 | |
| 584 | 584 | public function get($key) { |
| 585 | - if(!is_array($this->config)) { |
|
| 585 | + if (!is_array($this->config)) { |
|
| 586 | 586 | //Default config |
| 587 | 587 | $config = array('autoptimize_html' => 0, |
| 588 | 588 | 'autoptimize_html_keepcomments' => 0, |
@@ -607,9 +607,9 @@ discard block |
||
| 607 | 607 | ); |
| 608 | 608 | |
| 609 | 609 | //Override with user settings |
| 610 | - foreach(array_keys($config) as $name) { |
|
| 610 | + foreach (array_keys($config) as $name) { |
|
| 611 | 611 | $conf = get_option($name); |
| 612 | - if($conf!==false) { |
|
| 612 | + if ($conf !== false) { |
|
| 613 | 613 | //It was set before! |
| 614 | 614 | $config[$name] = $conf; |
| 615 | 615 | } |
@@ -619,31 +619,31 @@ discard block |
||
| 619 | 619 | $this->config = $config; |
| 620 | 620 | } |
| 621 | 621 | |
| 622 | - if(isset($this->config[$key])) |
|
| 622 | + if (isset($this->config[$key])) |
|
| 623 | 623 | return $this->config[$key]; |
| 624 | 624 | |
| 625 | 625 | return false; |
| 626 | 626 | } |
| 627 | 627 | |
| 628 | 628 | private function getFutttaFeeds($url) { |
| 629 | - if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) { |
|
| 630 | - $rss = fetch_feed( $url ); |
|
| 629 | + if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) { |
|
| 630 | + $rss = fetch_feed($url); |
|
| 631 | 631 | $maxitems = 0; |
| 632 | 632 | |
| 633 | - if ( ! is_wp_error( $rss ) ) { |
|
| 634 | - $maxitems = $rss->get_item_quantity( 7 ); |
|
| 635 | - $rss_items = $rss->get_items( 0, $maxitems ); |
|
| 633 | + if (!is_wp_error($rss)) { |
|
| 634 | + $maxitems = $rss->get_item_quantity(7); |
|
| 635 | + $rss_items = $rss->get_items(0, $maxitems); |
|
| 636 | 636 | } |
| 637 | 637 | ?> |
| 638 | 638 | <ul> |
| 639 | - <?php if ( $maxitems == 0 ) : ?> |
|
| 640 | - <li><?php _e( 'No items', 'autoptimize' ); ?></li> |
|
| 639 | + <?php if ($maxitems == 0) : ?> |
|
| 640 | + <li><?php _e('No items', 'autoptimize'); ?></li> |
|
| 641 | 641 | <?php else : ?> |
| 642 | - <?php foreach ( $rss_items as $item ) : ?> |
|
| 642 | + <?php foreach ($rss_items as $item) : ?> |
|
| 643 | 643 | <li> |
| 644 | - <a href="<?php echo esc_url( $item->get_permalink() ); ?>" |
|
| 645 | - title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>"> |
|
| 646 | - <?php echo esc_html( $item->get_title() ); ?> |
|
| 644 | + <a href="<?php echo esc_url($item->get_permalink()); ?>" |
|
| 645 | + title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>"> |
|
| 646 | + <?php echo esc_html($item->get_title()); ?> |
|
| 647 | 647 | </a> |
| 648 | 648 | </li> |
| 649 | 649 | <?php endforeach; ?> |
@@ -654,20 +654,20 @@ discard block |
||
| 654 | 654 | } |
| 655 | 655 | |
| 656 | 656 | // based on http://wordpress.stackexchange.com/a/58826 |
| 657 | - static function ao_admin_tabs(){ |
|
| 658 | - $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs',array('autoptimize' => __('Main','autoptimize'))); |
|
| 659 | - $tabContent=""; |
|
| 660 | - if (count($tabs)>1) { |
|
| 661 | - if(isset($_GET['page'])){ |
|
| 657 | + static function ao_admin_tabs() { |
|
| 658 | + $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('Main', 'autoptimize'))); |
|
| 659 | + $tabContent = ""; |
|
| 660 | + if (count($tabs) > 1) { |
|
| 661 | + if (isset($_GET['page'])) { |
|
| 662 | 662 | $currentId = $_GET['page']; |
| 663 | 663 | } else { |
| 664 | 664 | $currentId = "autoptimize"; |
| 665 | 665 | } |
| 666 | 666 | $tabContent .= "<h2 class=\"nav-tab-wrapper\">"; |
| 667 | - foreach($tabs as $tabId => $tabName){ |
|
| 668 | - if($currentId == $tabId){ |
|
| 667 | + foreach ($tabs as $tabId => $tabName) { |
|
| 668 | + if ($currentId == $tabId) { |
|
| 669 | 669 | $class = " nav-tab-active"; |
| 670 | - } else{ |
|
| 670 | + } else { |
|
| 671 | 671 | $class = ""; |
| 672 | 672 | } |
| 673 | 673 | $tabContent .= '<a class="nav-tab'.$class.'" href="?page='.$tabId.'">'.$tabName.'</a>'; |
@@ -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 | } |
@@ -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,14 +125,14 @@ 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; |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | } else { |
| 141 | 141 | // cannot be moved, so if flag was added re-inject altered tag immediately |
| 142 | 142 | if ($origTag && $origTag !== $tag) { |
| 143 | - $this->content = str_replace($origTag,$tag,$this->content); |
|
| 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; |
