futtta /
autoptimize
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected $inputLength = 0; |
| 69 | 69 | protected $lookAhead = null; |
| 70 | 70 | protected $output = ''; |
| 71 | - protected $lastByteOut = ''; |
|
| 71 | + protected $lastByteOut = ''; |
|
| 72 | 72 | protected $keptComment = ''; |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $mbIntEnc = null; |
| 107 | - if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
|
|
| 107 | + if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {
|
|
| 108 | 108 | $mbIntEnc = mb_internal_encoding(); |
| 109 | 109 | mb_internal_encoding('8bit');
|
| 110 | 110 | } |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | && ($this->b === $this->lastByteOut)) {
|
| 122 | 122 | // Don't delete this space. If we do, the addition/subtraction |
| 123 | 123 | // could be parsed as a post-increment |
| 124 | - } elseif (! $this->isAlphaNum($this->b)) {
|
|
| 124 | + } elseif (!$this->isAlphaNum($this->b)) {
|
|
| 125 | 125 | $command = self::ACTION_DELETE_A; |
| 126 | 126 | } |
| 127 | 127 | } elseif ($this->a === "\n") {
|
@@ -132,10 +132,10 @@ discard block |
||
| 132 | 132 | // otherwise mb_strpos will give WARNING |
| 133 | 133 | } elseif ($this->b === null |
| 134 | 134 | || (false === strpos('{[(+-!~', $this->b)
|
| 135 | - && ! $this->isAlphaNum($this->b))) {
|
|
| 135 | + && !$this->isAlphaNum($this->b))) {
|
|
| 136 | 136 | $command = self::ACTION_DELETE_A; |
| 137 | 137 | } |
| 138 | - } elseif (! $this->isAlphaNum($this->a)) {
|
|
| 138 | + } elseif (!$this->isAlphaNum($this->a)) {
|
|
| 139 | 139 | if ($this->b === ' ' |
| 140 | 140 | || ($this->b === "\n" |
| 141 | 141 | && (false === strpos('}])+-"\'', $this->a)))) {
|
@@ -191,7 +191,7 @@ discard block |
||
| 191 | 191 | $this->a = $this->b; |
| 192 | 192 | if ($this->a === "'" || $this->a === '"') { // string literal
|
| 193 | 193 | $str = $this->a; // in case needed for exception |
| 194 | - for(;;) {
|
|
| 194 | + for (;;) {
|
|
| 195 | 195 | $this->output .= $this->a; |
| 196 | 196 | $this->lastByteOut = $this->a; |
| 197 | 197 | |
@@ -218,13 +218,13 @@ discard block |
||
| 218 | 218 | case self::ACTION_DELETE_A_B: // 3 |
| 219 | 219 | $this->b = $this->next(); |
| 220 | 220 | if ($this->b === '/' && $this->isRegexpLiteral()) {
|
| 221 | - $this->output .= $this->a . $this->b; |
|
| 221 | + $this->output .= $this->a.$this->b; |
|
| 222 | 222 | $pattern = '/'; // keep entire pattern in case we need to report it in the exception |
| 223 | - for(;;) {
|
|
| 223 | + for (;;) {
|
|
| 224 | 224 | $this->a = $this->get(); |
| 225 | 225 | $pattern .= $this->a; |
| 226 | 226 | if ($this->a === '[') {
|
| 227 | - for(;;) {
|
|
| 227 | + for (;;) {
|
|
| 228 | 228 | $this->output .= $this->a; |
| 229 | 229 | $this->a = $this->get(); |
| 230 | 230 | $pattern .= $this->a; |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | if ($this->isEOF($this->a)) {
|
| 240 | 240 | throw new JSMin_UnterminatedRegExpException( |
| 241 | 241 | "JSMin: Unterminated set in RegExp at byte " |
| 242 | - . $this->inputIndex .": {$pattern}");
|
|
| 242 | + . $this->inputIndex.": {$pattern}");
|
|
| 243 | 243 | } |
| 244 | 244 | } |
| 245 | 245 | } |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | // certainly wasn't keyword |
| 284 | 284 | continue; |
| 285 | 285 | } |
| 286 | - if (preg_match("~(^|[\\s\\S])" . substr($keyword, 0, -1) . "$~", $recentOutput, $m)) {
|
|
| 286 | + if (preg_match("~(^|[\\s\\S])".substr($keyword, 0, -1)."$~", $recentOutput, $m)) {
|
|
| 287 | 287 | if ($m[1] === '' || !$this->isAlphaNum($m[1])) {
|
| 288 | 288 | return true; |
| 289 | 289 | } |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | {
|
| 393 | 393 | $this->get(); |
| 394 | 394 | $comment = ''; |
| 395 | - for(;;) {
|
|
| 395 | + for (;;) {
|
|
| 396 | 396 | $get = $this->get(); |
| 397 | 397 | if ($get === '*') {
|
| 398 | 398 | if ($this->peek() === '/') { // end of comment reached
|
@@ -403,7 +403,7 @@ discard block |
||
| 403 | 403 | // don't prepend a newline if two comments right after one another |
| 404 | 404 | $this->keptComment = "\n"; |
| 405 | 405 | } |
| 406 | - $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n"; |
|
| 406 | + $this->keptComment .= "/*!".substr($comment, 1)."*/\n"; |
|
| 407 | 407 | } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
|
| 408 | 408 | // IE conditional |
| 409 | 409 | $this->keptComment .= "/*{$comment}*/";
|
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | protected $inputLength = 0; |
| 69 | 69 | protected $lookAhead = null; |
| 70 | 70 | protected $output = ''; |
| 71 | - protected $lastByteOut = ''; |
|
| 71 | + protected $lastByteOut = ''; |
|
| 72 | 72 | protected $keptComment = ''; |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | $mbIntEnc = null; |
| 107 | - if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) { |
|
| 107 | + if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) { |
|
| 108 | 108 | $mbIntEnc = mb_internal_encoding(); |
| 109 | 109 | mb_internal_encoding('8bit'); |
| 110 | 110 | } |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | && ($this->b === $this->lastByteOut)) { |
| 127 | 127 | // Don't delete this space. If we do, the addition/subtraction |
| 128 | 128 | // could be parsed as a post-increment |
| 129 | - } elseif (! $this->isAlphaNum($this->b)) { |
|
| 129 | + } elseif (!$this->isAlphaNum($this->b)) { |
|
| 130 | 130 | $command = self::ACTION_DELETE_A; |
| 131 | 131 | } |
| 132 | 132 | } elseif ($this->a === "\n") { |
@@ -137,10 +137,10 @@ discard block |
||
| 137 | 137 | // otherwise mb_strpos will give WARNING |
| 138 | 138 | } elseif ($this->b === null |
| 139 | 139 | || (false === strpos('{[(+-!~', $this->b) |
| 140 | - && ! $this->isAlphaNum($this->b))) { |
|
| 140 | + && !$this->isAlphaNum($this->b))) { |
|
| 141 | 141 | $command = self::ACTION_DELETE_A; |
| 142 | 142 | } |
| 143 | - } elseif (! $this->isAlphaNum($this->a)) { |
|
| 143 | + } elseif (!$this->isAlphaNum($this->a)) { |
|
| 144 | 144 | if ($this->b === ' ' |
| 145 | 145 | || ($this->b === "\n" |
| 146 | 146 | && (false === strpos('}])+-"\'', $this->a)))) { |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | if ($this->a === "'" || $this->a === '"' || $this->a === '`') { // string/template literal |
| 198 | 198 | $delimiter = $this->a; |
| 199 | 199 | $str = $this->a; // in case needed for exception |
| 200 | - for(;;) { |
|
| 200 | + for (;;) { |
|
| 201 | 201 | $this->output .= $this->a; |
| 202 | 202 | $this->lastByteOut = $this->a; |
| 203 | 203 | $this->a = $this->get(); |
@@ -225,13 +225,13 @@ discard block |
||
| 225 | 225 | case self::ACTION_DELETE_A_B: // 3 |
| 226 | 226 | $this->b = $this->next(); |
| 227 | 227 | if ($this->b === '/' && $this->isRegexpLiteral()) { |
| 228 | - $this->output .= $this->a . $this->b; |
|
| 228 | + $this->output .= $this->a.$this->b; |
|
| 229 | 229 | $pattern = '/'; // keep entire pattern in case we need to report it in the exception |
| 230 | - for(;;) { |
|
| 230 | + for (;;) { |
|
| 231 | 231 | $this->a = $this->get(); |
| 232 | 232 | $pattern .= $this->a; |
| 233 | 233 | if ($this->a === '[') { |
| 234 | - for(;;) { |
|
| 234 | + for (;;) { |
|
| 235 | 235 | $this->output .= $this->a; |
| 236 | 236 | $this->a = $this->get(); |
| 237 | 237 | $pattern .= $this->a; |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | if ($this->isEOF($this->a)) { |
| 247 | 247 | throw new JSMin_UnterminatedRegExpException( |
| 248 | 248 | "JSMin: Unterminated set in RegExp at byte " |
| 249 | - . $this->inputIndex .": {$pattern}"); |
|
| 249 | + . $this->inputIndex.": {$pattern}"); |
|
| 250 | 250 | } |
| 251 | 251 | } |
| 252 | 252 | } |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | |
| 292 | 292 | // if the "/" follows a keyword, it must be a regexp, otherwise it's best to assume division |
| 293 | 293 | |
| 294 | - $subject = $this->output . trim($this->a); |
|
| 294 | + $subject = $this->output.trim($this->a); |
|
| 295 | 295 | if (!preg_match('/(?:case|else|in|return|typeof)$/', $subject, $m)) { |
| 296 | 296 | // not a keyword |
| 297 | 297 | return false; |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | { |
| 403 | 403 | $this->get(); |
| 404 | 404 | $comment = ''; |
| 405 | - for(;;) { |
|
| 405 | + for (;;) { |
|
| 406 | 406 | $get = $this->get(); |
| 407 | 407 | if ($get === '*') { |
| 408 | 408 | if ($this->peek() === '/') { // end of comment reached |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | // don't prepend a newline if two comments right after one another |
| 414 | 414 | $this->keptComment = "\n"; |
| 415 | 415 | } |
| 416 | - $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n"; |
|
| 416 | + $this->keptComment .= "/*!".substr($comment, 1)."*/\n"; |
|
| 417 | 417 | } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) { |
| 418 | 418 | // IE conditional |
| 419 | 419 | $this->keptComment .= "/*{$comment}*/"; |
@@ -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 autoptimizeStyles extends autoptimizeBase {
|
| 5 | 5 | private $css = array(); |
@@ -21,12 +21,12 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | //Reads the page and collects style tags |
| 23 | 23 | public function read($options) {
|
| 24 | - $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content ); |
|
| 24 | + $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
|
|
| 25 | 25 | if ($noptimizeCSS) return false; |
| 26 | 26 | |
| 27 | - $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '' ); |
|
| 27 | + $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '');
|
|
| 28 | 28 | if (!empty($whitelistCSS)) {
|
| 29 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));
|
|
| 29 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));
|
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | if ($options['nogooglefont'] == true) {
|
@@ -34,33 +34,33 @@ discard block |
||
| 34 | 34 | } else {
|
| 35 | 35 | $removableCSS = ""; |
| 36 | 36 | } |
| 37 | - $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS); |
|
| 37 | + $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);
|
|
| 38 | 38 | if (!empty($removableCSS)) {
|
| 39 | - $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));
|
|
| 39 | + $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));
|
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | - $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);
|
|
| 42 | + $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
|
|
| 43 | 43 | |
| 44 | 44 | // filter to "late inject minified CSS", default to true for now (it is faster) |
| 45 | - $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);
|
|
| 45 | + $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
|
|
| 46 | 46 | |
| 47 | 47 | // Remove everything that's not the header |
| 48 | - if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {
|
|
| 49 | - $content = explode('</head>',$this->content,2);
|
|
| 48 | + if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {
|
|
| 49 | + $content = explode('</head>', $this->content, 2);
|
|
| 50 | 50 | $this->content = $content[0].'</head>'; |
| 51 | 51 | $this->restofcontent = $content[1]; |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | // include inline? |
| 55 | - if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {
|
|
| 55 | + if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {
|
|
| 56 | 56 | $this->include_inline = true; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | // what CSS shouldn't be autoptimized |
| 60 | 60 | $excludeCSS = $options['css_exclude']; |
| 61 | - $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS ); |
|
| 62 | - if ($excludeCSS!=="") {
|
|
| 63 | - $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));
|
|
| 61 | + $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS);
|
|
| 62 | + if ($excludeCSS !== "") {
|
|
| 63 | + $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));
|
|
| 64 | 64 | } else {
|
| 65 | 65 | $this->dontmove = ""; |
| 66 | 66 | } |
@@ -68,17 +68,17 @@ discard block |
||
| 68 | 68 | // should we defer css? |
| 69 | 69 | // value: true/ false |
| 70 | 70 | $this->defer = $options['defer']; |
| 71 | - $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer ); |
|
| 71 | + $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer);
|
|
| 72 | 72 | |
| 73 | 73 | // should we inline while deferring? |
| 74 | 74 | // value: inlined CSS |
| 75 | 75 | $this->defer_inline = $options['defer_inline']; |
| 76 | - $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline ); |
|
| 76 | + $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline);
|
|
| 77 | 77 | |
| 78 | 78 | // should we inline? |
| 79 | 79 | // value: true/ false |
| 80 | 80 | $this->inline = $options['inline']; |
| 81 | - $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline ); |
|
| 81 | + $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline);
|
|
| 82 | 82 | |
| 83 | 83 | // get cdn url |
| 84 | 84 | $this->cdn_url = $options['cdn_url']; |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | $this->content = $this->hide_noptimize($this->content); |
| 91 | 91 | |
| 92 | 92 | // exclude (no)script, as those may contain CSS which should be left as is |
| 93 | - if ( strpos( $this->content, '<script' ) !== false ) {
|
|
| 93 | + if (strpos($this->content, '<script') !== false) {
|
|
| 94 | 94 | $this->content = preg_replace_callback( |
| 95 | 95 | '#<(?:no)?script.*?<\/(?:no)?script>#is', |
| 96 | 96 | create_function( |
@@ -108,56 +108,56 @@ discard block |
||
| 108 | 108 | $this->content = $this->hide_comments($this->content); |
| 109 | 109 | |
| 110 | 110 | // Get <style> and <link> |
| 111 | - if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {
|
|
| 112 | - foreach($matches[0] as $tag) {
|
|
| 113 | - if ($this->isremovable($tag,$this->cssremovables)) {
|
|
| 114 | - $this->content = str_replace($tag,'',$this->content); |
|
| 111 | + if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
|
|
| 112 | + foreach ($matches[0] as $tag) {
|
|
| 113 | + if ($this->isremovable($tag, $this->cssremovables)) {
|
|
| 114 | + $this->content = str_replace($tag, '', $this->content); |
|
| 115 | 115 | } else if ($this->ismovable($tag)) {
|
| 116 | 116 | // Get the media |
| 117 | - if(strpos($tag,'media=')!==false) {
|
|
| 118 | - preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);
|
|
| 119 | - $medias = explode(',',$medias[1]);
|
|
| 117 | + if (strpos($tag, 'media=') !== false) {
|
|
| 118 | + preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
|
|
| 119 | + $medias = explode(',', $medias[1]);
|
|
| 120 | 120 | $media = array(); |
| 121 | - foreach($medias as $elem) {
|
|
| 122 | - if (empty($elem)) { $elem="all"; }
|
|
| 121 | + foreach ($medias as $elem) {
|
|
| 122 | + if (empty($elem)) { $elem = "all"; }
|
|
| 123 | 123 | $media[] = $elem; |
| 124 | 124 | } |
| 125 | 125 | } else {
|
| 126 | 126 | // No media specified - applies to all |
| 127 | 127 | $media = array('all');
|
| 128 | 128 | } |
| 129 | - $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag ); |
|
| 129 | + $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
|
|
| 130 | 130 | |
| 131 | - if(preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 131 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 132 | 132 | // <link> |
| 133 | - $url = current(explode('?',$source[2],2));
|
|
| 133 | + $url = current(explode('?', $source[2], 2));
|
|
| 134 | 134 | $path = $this->getpath($url); |
| 135 | 135 | |
| 136 | - if($path!==false && preg_match('#\.css$#',$path)) {
|
|
| 136 | + if ($path !== false && preg_match('#\.css$#', $path)) {
|
|
| 137 | 137 | // Good link |
| 138 | - $this->css[] = array($media,$path); |
|
| 139 | - }else{
|
|
| 138 | + $this->css[] = array($media, $path); |
|
| 139 | + } else {
|
|
| 140 | 140 | // Link is dynamic (.php etc) |
| 141 | 141 | $tag = ''; |
| 142 | 142 | } |
| 143 | 143 | } else {
|
| 144 | 144 | // inline css in style tags can be wrapped in comment tags, so restore comments |
| 145 | 145 | $tag = $this->restore_comments($tag); |
| 146 | - preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);
|
|
| 146 | + preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
|
|
| 147 | 147 | |
| 148 | 148 | // and re-hide them to be able to to the removal based on tag |
| 149 | 149 | $tag = $this->hide_comments($tag); |
| 150 | 150 | |
| 151 | - if ( $this->include_inline ) {
|
|
| 152 | - $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);
|
|
| 153 | - $this->css[] = array($media,'INLINE;'.$code); |
|
| 151 | + if ($this->include_inline) {
|
|
| 152 | + $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
|
|
| 153 | + $this->css[] = array($media, 'INLINE;'.$code); |
|
| 154 | 154 | } else {
|
| 155 | 155 | $tag = ''; |
| 156 | 156 | } |
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | // Remove the original style tag |
| 160 | - $this->content = str_replace($tag,'',$this->content); |
|
| 160 | + $this->content = str_replace($tag, '', $this->content); |
|
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | return true; |
@@ -168,29 +168,29 @@ discard block |
||
| 168 | 168 | |
| 169 | 169 | // Joins and optimizes CSS |
| 170 | 170 | public function minify() {
|
| 171 | - foreach($this->css as $group) {
|
|
| 172 | - list($media,$css) = $group; |
|
| 173 | - if(preg_match('#^INLINE;#',$css)) {
|
|
| 171 | + foreach ($this->css as $group) {
|
|
| 172 | + list($media, $css) = $group; |
|
| 173 | + if (preg_match('#^INLINE;#', $css)) {
|
|
| 174 | 174 | // <style> |
| 175 | - $css = preg_replace('#^INLINE;#','',$css);
|
|
| 176 | - $css = $this->fixurls(ABSPATH.'/index.php',$css); |
|
| 177 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" ); |
|
| 178 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {
|
|
| 179 | - $css=$tmpstyle; |
|
| 180 | - $this->alreadyminified=true; |
|
| 175 | + $css = preg_replace('#^INLINE;#', '', $css);
|
|
| 176 | + $css = $this->fixurls(ABSPATH.'/index.php', $css); |
|
| 177 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");
|
|
| 178 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 179 | + $css = $tmpstyle; |
|
| 180 | + $this->alreadyminified = true; |
|
| 181 | 181 | } |
| 182 | 182 | } else {
|
| 183 | 183 | //<link> |
| 184 | - if($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 184 | + if ($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 185 | 185 | $cssPath = $css; |
| 186 | - $css = $this->fixurls($cssPath,file_get_contents($cssPath)); |
|
| 187 | - $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);
|
|
| 188 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath ); |
|
| 186 | + $css = $this->fixurls($cssPath, file_get_contents($cssPath)); |
|
| 187 | + $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
|
|
| 188 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
|
|
| 189 | 189 | if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
| 190 | - $css=$tmpstyle; |
|
| 191 | - $this->alreadyminified=true; |
|
| 192 | - } else if ($this->can_inject_late($cssPath,$css)) {
|
|
| 193 | - $css="%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%"; |
|
| 190 | + $css = $tmpstyle; |
|
| 191 | + $this->alreadyminified = true; |
|
| 192 | + } else if ($this->can_inject_late($cssPath, $css)) {
|
|
| 193 | + $css = "%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%"; |
|
| 194 | 194 | } |
| 195 | 195 | } else {
|
| 196 | 196 | // Couldn't read CSS. Maybe getpath isn't working? |
@@ -198,8 +198,8 @@ discard block |
||
| 198 | 198 | } |
| 199 | 199 | } |
| 200 | 200 | |
| 201 | - foreach($media as $elem) {
|
|
| 202 | - if(!isset($this->csscode[$elem])) |
|
| 201 | + foreach ($media as $elem) {
|
|
| 202 | + if (!isset($this->csscode[$elem])) |
|
| 203 | 203 | $this->csscode[$elem] = ''; |
| 204 | 204 | $this->csscode[$elem] .= "\n/*FILESTART*/".$css; |
| 205 | 205 | } |
@@ -208,12 +208,12 @@ discard block |
||
| 208 | 208 | // Check for duplicate code |
| 209 | 209 | $md5list = array(); |
| 210 | 210 | $tmpcss = $this->csscode; |
| 211 | - foreach($tmpcss as $media => $code) {
|
|
| 211 | + foreach ($tmpcss as $media => $code) {
|
|
| 212 | 212 | $md5sum = md5($code); |
| 213 | 213 | $medianame = $media; |
| 214 | - foreach($md5list as $med => $sum) {
|
|
| 214 | + foreach ($md5list as $med => $sum) {
|
|
| 215 | 215 | // If same code |
| 216 | - if($sum === $md5sum) {
|
|
| 216 | + if ($sum === $md5sum) {
|
|
| 217 | 217 | //Add the merged code |
| 218 | 218 | $medianame = $med.', '.$media; |
| 219 | 219 | $this->csscode[$medianame] = $code; |
@@ -233,29 +233,29 @@ discard block |
||
| 233 | 233 | $external_imports = ""; |
| 234 | 234 | |
| 235 | 235 | // remove comments to avoid importing commented-out imports |
| 236 | - $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 237 | - while(preg_match_all('#@import.*(?:;|$)#Um',$thiscss_nocomments,$matches)) {
|
|
| 238 | - foreach($matches[0] as $import) {
|
|
| 239 | - if ($this->isremovable($import,$this->cssremovables)) {
|
|
| 240 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 236 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 237 | + while (preg_match_all('#@import.*(?:;|$)#Um', $thiscss_nocomments, $matches)) {
|
|
| 238 | + foreach ($matches[0] as $import) {
|
|
| 239 | + if ($this->isremovable($import, $this->cssremovables)) {
|
|
| 240 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 241 | 241 | $import_ok = true; |
| 242 | 242 | } else {
|
| 243 | - $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");
|
|
| 243 | + $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
|
|
| 244 | 244 | $path = $this->getpath($url); |
| 245 | 245 | $import_ok = false; |
| 246 | 246 | if (file_exists($path) && is_readable($path)) {
|
| 247 | - $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\"); |
|
| 248 | - $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);
|
|
| 249 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" ); |
|
| 250 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 251 | - $code=$tmpstyle; |
|
| 252 | - $this->alreadyminified=true; |
|
| 253 | - } else if ($this->can_inject_late($path,$code)) {
|
|
| 254 | - $code="%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%"; |
|
| 247 | + $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\"); |
|
| 248 | + $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
|
|
| 249 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");
|
|
| 250 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 251 | + $code = $tmpstyle; |
|
| 252 | + $this->alreadyminified = true; |
|
| 253 | + } else if ($this->can_inject_late($path, $code)) {
|
|
| 254 | + $code = "%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%"; |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | - if(!empty($code)) {
|
|
| 258 | - $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);
|
|
| 257 | + if (!empty($code)) {
|
|
| 258 | + $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
|
|
| 259 | 259 | if (!empty($tmp_thiscss)) {
|
| 260 | 260 | $thiscss = $tmp_thiscss; |
| 261 | 261 | $import_ok = true; |
@@ -269,32 +269,32 @@ discard block |
||
| 269 | 269 | if (!$import_ok) {
|
| 270 | 270 | // external imports and general fall-back |
| 271 | 271 | $external_imports .= $import; |
| 272 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 272 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 273 | 273 | $fiximports = true; |
| 274 | 274 | } |
| 275 | 275 | } |
| 276 | - $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);
|
|
| 277 | - $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);
|
|
| 276 | + $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
|
|
| 277 | + $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
|
|
| 278 | 278 | |
| 279 | 279 | // and update $thiscss_nocomments before going into next iteration in while loop |
| 280 | - $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 280 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 281 | 281 | } |
| 282 | 282 | unset($thiscss_nocomments); |
| 283 | 283 | |
| 284 | 284 | // add external imports to top of aggregated CSS |
| 285 | - if($fiximports) {
|
|
| 286 | - $thiscss=$external_imports.$thiscss; |
|
| 285 | + if ($fiximports) {
|
|
| 286 | + $thiscss = $external_imports.$thiscss; |
|
| 287 | 287 | } |
| 288 | 288 | } |
| 289 | 289 | unset($thiscss); |
| 290 | 290 | |
| 291 | 291 | // $this->csscode has all the uncompressed code now. |
| 292 | 292 | $mhtmlcount = 0; |
| 293 | - foreach($this->csscode as &$code) {
|
|
| 293 | + foreach ($this->csscode as &$code) {
|
|
| 294 | 294 | // Check for already-minified code |
| 295 | 295 | $hash = md5($code); |
| 296 | - $ccheck = new autoptimizeCache($hash,'css'); |
|
| 297 | - if($ccheck->check()) {
|
|
| 296 | + $ccheck = new autoptimizeCache($hash, 'css'); |
|
| 297 | + if ($ccheck->check()) {
|
|
| 298 | 298 | $code = $ccheck->retrieve(); |
| 299 | 299 | $this->hashmap[md5($code)] = $hash; |
| 300 | 300 | continue; |
@@ -303,44 +303,44 @@ discard block |
||
| 303 | 303 | |
| 304 | 304 | // Do the imaging! |
| 305 | 305 | $imgreplace = array(); |
| 306 | - preg_match_all('#(background[^;{}]*url\((?!\s?"?\'?\s?data)(.*)\)[^;}]*)(?:;|$|})#Usm',$code,$matches);
|
|
| 306 | + preg_match_all('#(background[^;{}]*url\((?!\s?"?\'?\s?data)(.*)\)[^;}]*)(?:;|$|})#Usm', $code, $matches);
|
|
| 307 | 307 | |
| 308 | - if(($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
|
|
| 309 | - foreach($matches[2] as $count => $quotedurl) {
|
|
| 310 | - $iurl = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 308 | + if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
|
|
| 309 | + foreach ($matches[2] as $count => $quotedurl) {
|
|
| 310 | + $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 311 | 311 | |
| 312 | 312 | // if querystring, remove it from url |
| 313 | - if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }
|
|
| 313 | + if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }
|
|
| 314 | 314 | |
| 315 | 315 | $ipath = $this->getpath($iurl); |
| 316 | 316 | |
| 317 | 317 | $datauri_max_size = 4096; |
| 318 | - $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size ); |
|
| 319 | - $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', ""); |
|
| 318 | + $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);
|
|
| 319 | + $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");
|
|
| 320 | 320 | if (!empty($datauri_exclude)) {
|
| 321 | - $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));
|
|
| 321 | + $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));
|
|
| 322 | 322 | foreach ($no_datauris as $no_datauri) {
|
| 323 | - if (strpos($iurl,$no_datauri)!==false) {
|
|
| 324 | - $ipath=false; |
|
| 323 | + if (strpos($iurl, $no_datauri) !== false) {
|
|
| 324 | + $ipath = false; |
|
| 325 | 325 | break; |
| 326 | 326 | } |
| 327 | 327 | } |
| 328 | 328 | } |
| 329 | 329 | |
| 330 | - if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 331 | - $ihash=md5($ipath); |
|
| 332 | - $icheck = new autoptimizeCache($ihash,'img'); |
|
| 333 | - if($icheck->check()) {
|
|
| 330 | + if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 331 | + $ihash = md5($ipath); |
|
| 332 | + $icheck = new autoptimizeCache($ihash, 'img'); |
|
| 333 | + if ($icheck->check()) {
|
|
| 334 | 334 | // we have the base64 image in cache |
| 335 | - $headAndData=$icheck->retrieve(); |
|
| 336 | - $_base64data=explode(";base64,",$headAndData);
|
|
| 337 | - $base64data=$_base64data[1]; |
|
| 335 | + $headAndData = $icheck->retrieve(); |
|
| 336 | + $_base64data = explode(";base64,", $headAndData);
|
|
| 337 | + $base64data = $_base64data[1]; |
|
| 338 | 338 | } else {
|
| 339 | 339 | // It's an image and we don't have it in cache, get the type |
| 340 | - $explA=explode('.',$ipath);
|
|
| 341 | - $type=end($explA); |
|
| 340 | + $explA = explode('.', $ipath);
|
|
| 341 | + $type = end($explA); |
|
| 342 | 342 | |
| 343 | - switch($type) {
|
|
| 343 | + switch ($type) {
|
|
| 344 | 344 | case 'jpeg': |
| 345 | 345 | $dataurihead = 'data:image/jpeg;base64,'; |
| 346 | 346 | break; |
@@ -362,15 +362,15 @@ discard block |
||
| 362 | 362 | |
| 363 | 363 | // Encode the data |
| 364 | 364 | $base64data = base64_encode(file_get_contents($ipath)); |
| 365 | - $headAndData=$dataurihead.$base64data; |
|
| 365 | + $headAndData = $dataurihead.$base64data; |
|
| 366 | 366 | |
| 367 | 367 | // Save in cache |
| 368 | - $icheck->cache($headAndData,"text/plain"); |
|
| 368 | + $icheck->cache($headAndData, "text/plain"); |
|
| 369 | 369 | } |
| 370 | 370 | unset($icheck); |
| 371 | 371 | |
| 372 | 372 | // Add it to the list for replacement |
| 373 | - $imgreplace[$matches[1][$count]] = str_replace($quotedurl,$headAndData,$matches[1][$count]).";\n*".str_replace($quotedurl,'mhtml:%%MHTML%%!'.$mhtmlcount,$matches[1][$count]).";\n_".$matches[1][$count].';'; |
|
| 373 | + $imgreplace[$matches[1][$count]] = str_replace($quotedurl, $headAndData, $matches[1][$count]).";\n*".str_replace($quotedurl, 'mhtml:%%MHTML%%!'.$mhtmlcount, $matches[1][$count]).";\n_".$matches[1][$count].';'; |
|
| 374 | 374 | |
| 375 | 375 | // Store image on the mhtml document |
| 376 | 376 | $this->mhtml .= "--_\r\nContent-Location:{$mhtmlcount}\r\nContent-Transfer-Encoding:base64\r\n\r\n{$base64data}\r\n";
|
@@ -378,52 +378,52 @@ discard block |
||
| 378 | 378 | } else {
|
| 379 | 379 | // just cdn the URL if applicable |
| 380 | 380 | if (!empty($this->cdn_url)) {
|
| 381 | - $url = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 382 | - $cdn_url=$this->url_replace_cdn($url); |
|
| 383 | - $imgreplace[$matches[1][$count]] = str_replace($quotedurl,$cdn_url,$matches[1][$count]); |
|
| 381 | + $url = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 382 | + $cdn_url = $this->url_replace_cdn($url); |
|
| 383 | + $imgreplace[$matches[1][$count]] = str_replace($quotedurl, $cdn_url, $matches[1][$count]); |
|
| 384 | 384 | } |
| 385 | 385 | } |
| 386 | 386 | } |
| 387 | 387 | } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
|
| 388 | 388 | // change background image urls to cdn-url |
| 389 | - foreach($matches[2] as $count => $quotedurl) {
|
|
| 390 | - $url = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 391 | - $cdn_url=$this->url_replace_cdn($url); |
|
| 392 | - $imgreplace[$matches[1][$count]] = str_replace($quotedurl,$cdn_url,$matches[1][$count]); |
|
| 389 | + foreach ($matches[2] as $count => $quotedurl) {
|
|
| 390 | + $url = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 391 | + $cdn_url = $this->url_replace_cdn($url); |
|
| 392 | + $imgreplace[$matches[1][$count]] = str_replace($quotedurl, $cdn_url, $matches[1][$count]); |
|
| 393 | 393 | } |
| 394 | 394 | } |
| 395 | 395 | |
| 396 | - if(!empty($imgreplace)) {
|
|
| 397 | - $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code); |
|
| 396 | + if (!empty($imgreplace)) {
|
|
| 397 | + $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code); |
|
| 398 | 398 | } |
| 399 | 399 | |
| 400 | 400 | // CDN the fonts! |
| 401 | - if ( (!empty($this->cdn_url)) && (apply_filters('autoptimize_filter_css_fonts_cdn',false)) && (version_compare(PHP_VERSION, '5.3.0') >= 0) ) {
|
|
| 401 | + if ((!empty($this->cdn_url)) && (apply_filters('autoptimize_filter_css_fonts_cdn', false)) && (version_compare(PHP_VERSION, '5.3.0') >= 0)) {
|
|
| 402 | 402 | $fontreplace = array(); |
| 403 | 403 | include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeFontRegex.php'); |
| 404 | 404 | |
| 405 | - preg_match_all($fonturl_regex,$code,$matches); |
|
| 405 | + preg_match_all($fonturl_regex, $code, $matches); |
|
| 406 | 406 | if (is_array($matches)) {
|
| 407 | - foreach($matches[8] as $count => $quotedurl) {
|
|
| 408 | - $url = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 409 | - $cdn_url=$this->url_replace_cdn($url); |
|
| 410 | - $fontreplace[$matches[8][$count]] = str_replace($quotedurl,$cdn_url,$matches[8][$count]); |
|
| 407 | + foreach ($matches[8] as $count => $quotedurl) {
|
|
| 408 | + $url = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 409 | + $cdn_url = $this->url_replace_cdn($url); |
|
| 410 | + $fontreplace[$matches[8][$count]] = str_replace($quotedurl, $cdn_url, $matches[8][$count]); |
|
| 411 | 411 | } |
| 412 | - if(!empty($fontreplace)) {
|
|
| 413 | - $code = str_replace(array_keys($fontreplace),array_values($fontreplace),$code); |
|
| 412 | + if (!empty($fontreplace)) {
|
|
| 413 | + $code = str_replace(array_keys($fontreplace), array_values($fontreplace), $code); |
|
| 414 | 414 | } |
| 415 | 415 | } |
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | // Minify |
| 419 | - if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {
|
|
| 419 | + if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {
|
|
| 420 | 420 | if (class_exists('Minify_CSS_Compressor')) {
|
| 421 | 421 | $tmp_code = trim(Minify_CSS_Compressor::process($code)); |
| 422 | - } else if(class_exists('CSSmin')) {
|
|
| 422 | + } else if (class_exists('CSSmin')) {
|
|
| 423 | 423 | $cssmin = new CSSmin(); |
| 424 | - if (method_exists($cssmin,"run")) {
|
|
| 424 | + if (method_exists($cssmin, "run")) {
|
|
| 425 | 425 | $tmp_code = trim($cssmin->run($code)); |
| 426 | - } elseif (@is_callable(array($cssmin,"minify"))) {
|
|
| 426 | + } elseif (@is_callable(array($cssmin, "minify"))) {
|
|
| 427 | 427 | $tmp_code = trim(CssMin::minify($code)); |
| 428 | 428 | } |
| 429 | 429 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | |
| 436 | 436 | $code = $this->inject_minified($code); |
| 437 | 437 | |
| 438 | - $tmp_code = apply_filters( 'autoptimize_css_after_minify',$code ); |
|
| 438 | + $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
|
|
| 439 | 439 | if (!empty($tmp_code)) {
|
| 440 | 440 | $code = $tmp_code; |
| 441 | 441 | unset($tmp_code); |
@@ -449,31 +449,31 @@ discard block |
||
| 449 | 449 | |
| 450 | 450 | //Caches the CSS in uncompressed, deflated and gzipped form. |
| 451 | 451 | public function cache() {
|
| 452 | - if($this->datauris) {
|
|
| 452 | + if ($this->datauris) {
|
|
| 453 | 453 | // MHTML Preparation |
| 454 | 454 | $this->mhtml = "/*\r\nContent-Type: multipart/related; boundary=\"_\"\r\n\r\n".$this->mhtml."*/\r\n"; |
| 455 | 455 | $md5 = md5($this->mhtml); |
| 456 | - $cache = new autoptimizeCache($md5,'txt'); |
|
| 457 | - if(!$cache->check()) {
|
|
| 456 | + $cache = new autoptimizeCache($md5, 'txt'); |
|
| 457 | + if (!$cache->check()) {
|
|
| 458 | 458 | // Cache our images for IE |
| 459 | - $cache->cache($this->mhtml,'text/plain'); |
|
| 459 | + $cache->cache($this->mhtml, 'text/plain'); |
|
| 460 | 460 | } |
| 461 | 461 | $mhtml = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 462 | 462 | } |
| 463 | 463 | |
| 464 | 464 | // CSS cache |
| 465 | - foreach($this->csscode as $media => $code) {
|
|
| 465 | + foreach ($this->csscode as $media => $code) {
|
|
| 466 | 466 | $md5 = $this->hashmap[md5($code)]; |
| 467 | 467 | |
| 468 | - if($this->datauris) {
|
|
| 468 | + if ($this->datauris) {
|
|
| 469 | 469 | // Images for ie! Get the right url |
| 470 | - $code = str_replace('%%MHTML%%',$mhtml,$code);
|
|
| 470 | + $code = str_replace('%%MHTML%%', $mhtml, $code);
|
|
| 471 | 471 | } |
| 472 | 472 | |
| 473 | - $cache = new autoptimizeCache($md5,'css'); |
|
| 474 | - if(!$cache->check()) {
|
|
| 473 | + $cache = new autoptimizeCache($md5, 'css'); |
|
| 474 | + if (!$cache->check()) {
|
|
| 475 | 475 | // Cache our code |
| 476 | - $cache->cache($code,'text/css'); |
|
| 476 | + $cache->cache($code, 'text/css'); |
|
| 477 | 477 | } |
| 478 | 478 | $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 479 | 479 | } |
@@ -488,7 +488,7 @@ discard block |
||
| 488 | 488 | $this->content = $this->restore_comments($this->content); |
| 489 | 489 | |
| 490 | 490 | // restore (no)script |
| 491 | - if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) {
|
|
| 491 | + if (strpos($this->content, '%%SCRIPT%%') !== false) {
|
|
| 492 | 492 | $this->content = preg_replace_callback( |
| 493 | 493 | '#%%SCRIPT%%(.*?)%%SCRIPT%%#is', |
| 494 | 494 | create_function( |
@@ -503,71 +503,71 @@ discard block |
||
| 503 | 503 | $this->content = $this->restore_noptimize($this->content); |
| 504 | 504 | |
| 505 | 505 | //Restore the full content |
| 506 | - if(!empty($this->restofcontent)) {
|
|
| 506 | + if (!empty($this->restofcontent)) {
|
|
| 507 | 507 | $this->content .= $this->restofcontent; |
| 508 | 508 | $this->restofcontent = ''; |
| 509 | 509 | } |
| 510 | 510 | |
| 511 | 511 | // Inject the new stylesheets |
| 512 | - $replaceTag = array("<title","before");
|
|
| 513 | - $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag ); |
|
| 512 | + $replaceTag = array("<title", "before");
|
|
| 513 | + $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag);
|
|
| 514 | 514 | |
| 515 | 515 | if ($this->inline == true) {
|
| 516 | - foreach($this->csscode as $media => $code) {
|
|
| 517 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);
|
|
| 516 | + foreach ($this->csscode as $media => $code) {
|
|
| 517 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
|
|
| 518 | 518 | } |
| 519 | 519 | } else {
|
| 520 | 520 | if ($this->defer == true) {
|
| 521 | 521 | $deferredCssBlock = "<script data-cfasync='false'>function lCss(url,media) {var d=document;var l=d.createElement('link');l.rel='stylesheet';l.type='text/css';l.href=url;l.media=media;aoin=d.getElementById('aonoscrcss');aoin.parentNode.insertBefore(l,aoin.nextSibling);}function deferredCSS() {";
|
| 522 | 522 | $noScriptCssBlock = "<noscript id=\"aonoscrcss\">"; |
| 523 | - $defer_inline_code=$this->defer_inline; |
|
| 524 | - if(!empty($defer_inline_code)){
|
|
| 525 | - if ( apply_filters( 'autoptimize_filter_css_critcss_minify',true ) ) {
|
|
| 526 | - $iCssHash=md5($defer_inline_code); |
|
| 527 | - $iCssCache = new autoptimizeCache($iCssHash,'css'); |
|
| 528 | - if($iCssCache->check()) {
|
|
| 523 | + $defer_inline_code = $this->defer_inline; |
|
| 524 | + if (!empty($defer_inline_code)) {
|
|
| 525 | + if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
|
|
| 526 | + $iCssHash = md5($defer_inline_code); |
|
| 527 | + $iCssCache = new autoptimizeCache($iCssHash, 'css'); |
|
| 528 | + if ($iCssCache->check()) {
|
|
| 529 | 529 | // we have the optimized inline CSS in cache |
| 530 | - $defer_inline_code=$iCssCache->retrieve(); |
|
| 530 | + $defer_inline_code = $iCssCache->retrieve(); |
|
| 531 | 531 | } else {
|
| 532 | 532 | if (class_exists('Minify_CSS_Compressor')) {
|
| 533 | 533 | $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code)); |
| 534 | - } else if(class_exists('CSSmin')) {
|
|
| 534 | + } else if (class_exists('CSSmin')) {
|
|
| 535 | 535 | $cssmin = new CSSmin(); |
| 536 | 536 | $tmp_code = trim($cssmin->run($defer_inline_code)); |
| 537 | 537 | } |
| 538 | 538 | if (!empty($tmp_code)) {
|
| 539 | 539 | $defer_inline_code = $tmp_code; |
| 540 | - $iCssCache->cache($defer_inline_code,"text/css"); |
|
| 540 | + $iCssCache->cache($defer_inline_code, "text/css"); |
|
| 541 | 541 | unset($tmp_code); |
| 542 | 542 | } |
| 543 | 543 | } |
| 544 | 544 | } |
| 545 | - $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 546 | - $this->inject_in_html($code_out,$replaceTag); |
|
| 545 | + $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 546 | + $this->inject_in_html($code_out, $replaceTag); |
|
| 547 | 547 | } |
| 548 | 548 | } |
| 549 | 549 | |
| 550 | - foreach($this->url as $media => $url) {
|
|
| 550 | + foreach ($this->url as $media => $url) {
|
|
| 551 | 551 | $url = $this->url_replace_cdn($url); |
| 552 | 552 | |
| 553 | 553 | //Add the stylesheet either deferred (import at bottom) or normal links in head |
| 554 | - if($this->defer == true) {
|
|
| 554 | + if ($this->defer == true) {
|
|
| 555 | 555 | $deferredCssBlock .= "lCss('".$url."','".$media."');";
|
| 556 | 556 | $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />'; |
| 557 | 557 | } else {
|
| 558 | 558 | if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
|
| 559 | - $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);
|
|
| 560 | - } else if (strlen($this->csscode[$media])>0) {
|
|
| 561 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);
|
|
| 559 | + $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
|
|
| 560 | + } else if (strlen($this->csscode[$media]) > 0) {
|
|
| 561 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
|
|
| 562 | 562 | } |
| 563 | 563 | } |
| 564 | 564 | } |
| 565 | 565 | |
| 566 | - if($this->defer == true) {
|
|
| 566 | + if ($this->defer == true) {
|
|
| 567 | 567 | $deferredCssBlock .= "}if(window.addEventListener){window.addEventListener('DOMContentLoaded',deferredCSS,false);}else{window.onload = deferredCSS;}</script>";
|
| 568 | 568 | $noScriptCssBlock .= "</noscript>"; |
| 569 | - $this->inject_in_html($noScriptCssBlock,$replaceTag); |
|
| 570 | - $this->inject_in_html($deferredCssBlock,array('</body>','before'));
|
|
| 569 | + $this->inject_in_html($noScriptCssBlock, $replaceTag); |
|
| 570 | + $this->inject_in_html($deferredCssBlock, array('</body>', 'before'));
|
|
| 571 | 571 | } |
| 572 | 572 | } |
| 573 | 573 | |
@@ -575,34 +575,34 @@ discard block |
||
| 575 | 575 | return $this->content; |
| 576 | 576 | } |
| 577 | 577 | |
| 578 | - static function fixurls($file,$code) {
|
|
| 579 | - $file = str_replace(WP_ROOT_DIR,'/',$file); |
|
| 578 | + static function fixurls($file, $code) {
|
|
| 579 | + $file = str_replace(WP_ROOT_DIR, '/', $file); |
|
| 580 | 580 | $dir = dirname($file); //Like /wp-content |
| 581 | 581 | |
| 582 | 582 | // quick fix for import-troubles in e.g. arras theme |
| 583 | - $code=preg_replace('#@import ("|\')(.+?)\.css("|\')#','@import url("${2}.css")',$code);
|
|
| 583 | + $code = preg_replace('#@import ("|\')(.+?)\.css("|\')#', '@import url("${2}.css")', $code);
|
|
| 584 | 584 | |
| 585 | - if(preg_match_all('#url\((?!data)(?!\#)(?!"\#)(.*)\)#Usi',$code,$matches)) {
|
|
| 585 | + if (preg_match_all('#url\((?!data)(?!\#)(?!"\#)(.*)\)#Usi', $code, $matches)) {
|
|
| 586 | 586 | $replace = array(); |
| 587 | - foreach($matches[1] as $k => $url) {
|
|
| 587 | + foreach ($matches[1] as $k => $url) {
|
|
| 588 | 588 | // Remove quotes |
| 589 | - $url = trim($url," \t\n\r\0\x0B\"'"); |
|
| 590 | - $noQurl = trim($url,"\"'"); |
|
| 591 | - if ($url!==$noQurl) {
|
|
| 592 | - $removedQuotes=true; |
|
| 589 | + $url = trim($url, " \t\n\r\0\x0B\"'"); |
|
| 590 | + $noQurl = trim($url, "\"'"); |
|
| 591 | + if ($url !== $noQurl) {
|
|
| 592 | + $removedQuotes = true; |
|
| 593 | 593 | } else {
|
| 594 | - $removedQuotes=false; |
|
| 594 | + $removedQuotes = false; |
|
| 595 | 595 | } |
| 596 | - $url=$noQurl; |
|
| 597 | - if(substr($url,0,1)=='/' || preg_match('#^(https?://|ftp://|data:)#i',$url)) {
|
|
| 596 | + $url = $noQurl; |
|
| 597 | + if (substr($url, 0, 1) == '/' || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
|
|
| 598 | 598 | //URL is absolute |
| 599 | 599 | continue; |
| 600 | 600 | } else {
|
| 601 | 601 | // relative URL |
| 602 | - $newurl = preg_replace('/https?:/','',str_replace(" ","%20",AUTOPTIMIZE_WP_ROOT_URL.str_replace('//','/',$dir.'/'.$url)));
|
|
| 602 | + $newurl = preg_replace('/https?:/', '', str_replace(" ", "%20", AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
|
|
| 603 | 603 | |
| 604 | 604 | $hash = md5($url); |
| 605 | - $code = str_replace($matches[0][$k],$hash,$code); |
|
| 605 | + $code = str_replace($matches[0][$k], $hash, $code); |
|
| 606 | 606 | |
| 607 | 607 | if (!empty($removedQuotes)) {
|
| 608 | 608 | $replace[$hash] = 'url(\''.$newurl.'\')'; |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | } |
| 613 | 613 | } |
| 614 | 614 | //Do the replacing here to avoid breaking URLs |
| 615 | - $code = str_replace(array_keys($replace),array_values($replace),$code); |
|
| 615 | + $code = str_replace(array_keys($replace), array_values($replace), $code); |
|
| 616 | 616 | } |
| 617 | 617 | return $code; |
| 618 | 618 | } |
@@ -620,7 +620,7 @@ discard block |
||
| 620 | 620 | private function ismovable($tag) {
|
| 621 | 621 | if (!empty($this->whitelist)) {
|
| 622 | 622 | foreach ($this->whitelist as $match) {
|
| 623 | - if(strpos($tag,$match)!==false) {
|
|
| 623 | + if (strpos($tag, $match) !== false) {
|
|
| 624 | 624 | return true; |
| 625 | 625 | } |
| 626 | 626 | } |
@@ -628,8 +628,8 @@ discard block |
||
| 628 | 628 | return false; |
| 629 | 629 | } else {
|
| 630 | 630 | if (is_array($this->dontmove)) {
|
| 631 | - foreach($this->dontmove as $match) {
|
|
| 632 | - if(strpos($tag,$match)!==false) {
|
|
| 631 | + foreach ($this->dontmove as $match) {
|
|
| 632 | + if (strpos($tag, $match) !== false) {
|
|
| 633 | 633 | //Matched something |
| 634 | 634 | return false; |
| 635 | 635 | } |
@@ -641,17 +641,17 @@ discard block |
||
| 641 | 641 | } |
| 642 | 642 | } |
| 643 | 643 | |
| 644 | - private function can_inject_late($cssPath,$css) {
|
|
| 645 | - if ((strpos($cssPath,"min.css")===false) || ($this->inject_min_late!==true)) {
|
|
| 644 | + private function can_inject_late($cssPath, $css) {
|
|
| 645 | + if ((strpos($cssPath, "min.css") === false) || ($this->inject_min_late !== true)) {
|
|
| 646 | 646 | // late-inject turned off or file not minified based on filename |
| 647 | 647 | return false; |
| 648 | - } else if (strpos($css,"@import")!==false) {
|
|
| 648 | + } else if (strpos($css, "@import") !== false) {
|
|
| 649 | 649 | // can't late-inject files with imports as those need to be aggregated |
| 650 | 650 | return false; |
| 651 | - } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {
|
|
| 651 | + } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {
|
|
| 652 | 652 | // don't late-inject CSS with font-src's if fonts are set to be CDN'ed |
| 653 | 653 | return false; |
| 654 | - } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {
|
|
| 654 | + } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {
|
|
| 655 | 655 | // don't late-inject CSS with images if CDN is set OR is image inlining is on |
| 656 | 656 | return false; |
| 657 | 657 | } else {
|
