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 | } |
@@ -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 (int) $size * 1048576; |
|
| 782 | - case 'K': case 'k': return (int) $size * 1024; |
|
| 783 | - case 'G': case 'g': return (int) $size * 1073741824; |
|
| 781 | + case 'M': case 'm': return (int) $size*1048576; |
|
| 782 | + case 'K': case 'k': return (int) $size*1024; |
|
| 783 | + case 'G': case 'g': return (int) $size*1073741824; |
|
| 784 | 784 | } |
| 785 | 785 | } |
| 786 | 786 | |
@@ -1,35 +1,35 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | class autoptimizeToolbar |
| 4 | 4 | { |
| 5 | 5 | public function __construct() |
| 6 | 6 | { |
| 7 | 7 | // If Cache is not available we don't add the Autoptimize Toolbar |
| 8 | - if( ! autoptimizeCache::cacheavail() ) { |
|
| 8 | + if (!autoptimizeCache::cacheavail()) { |
|
| 9 | 9 | return; |
| 10 | 10 | } |
| 11 | 11 | // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated. |
| 12 | - add_action( 'wp_loaded', array( $this, 'load_toolbar' ) ); |
|
| 12 | + add_action('wp_loaded', array($this, 'load_toolbar')); |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | public function load_toolbar() |
| 16 | 16 | { |
| 17 | 17 | // Check permissions and that toolbar is not hidden via filter |
| 18 | - if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) { |
|
| 18 | + if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) { |
|
| 19 | 19 | // Create a handler for the AJAX toolbar requests |
| 20 | - add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) ); |
|
| 20 | + add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache')); |
|
| 21 | 21 | |
| 22 | 22 | // Load custom styles, scripts and menu only when needed |
| 23 | - if ( is_admin_bar_showing() ) { |
|
| 24 | - if ( is_admin() ) { |
|
| 23 | + if (is_admin_bar_showing()) { |
|
| 24 | + if (is_admin()) { |
|
| 25 | 25 | // in the case of back-end |
| 26 | - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 26 | + add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 27 | 27 | } else { |
| 28 | 28 | // in the case of front-end |
| 29 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 29 | + add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 30 | 30 | } |
| 31 | 31 | // Add the Autoptimize Toolbar to the Admin bar |
| 32 | - add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 ); |
|
| 32 | + add_action('admin_bar_menu', array($this, 'add_toolbar'), 100); |
|
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $stats = autoptimizeCache::stats(); |
| 43 | 43 | |
| 44 | 44 | // Set the Max Size recommended for cache files |
| 45 | - $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 ); |
|
| 45 | + $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024); |
|
| 46 | 46 | |
| 47 | 47 | // Retrieve the current Total Files in cache |
| 48 | 48 | $files = $stats[0]; |
@@ -52,83 +52,83 @@ discard block |
||
| 52 | 52 | $size = $this->format_filesize($bytes); |
| 53 | 53 | |
| 54 | 54 | // We calculated the percentage of cache used |
| 55 | - $percentage = ceil( $bytes / $max_size * 100 ); |
|
| 56 | - if ( $percentage > 100 ) { |
|
| 55 | + $percentage = ceil($bytes/$max_size*100); |
|
| 56 | + if ($percentage > 100) { |
|
| 57 | 57 | $percentage = 100; |
| 58 | 58 | } |
| 59 | 59 | // We define the type of color indicator for the current state of cache size. |
| 60 | 60 | // "green" if the size is less than 80% of the total recommended |
| 61 | 61 | // "orange" if over 80% |
| 62 | 62 | // "red" if over 100% |
| 63 | - $color = ( $percentage == 100 ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' ); |
|
| 63 | + $color = ($percentage == 100) ? 'red' : (($percentage > 80) ? 'orange' : 'green'); |
|
| 64 | 64 | |
| 65 | 65 | // Create or add new items into the Admin Toolbar. |
| 66 | 66 | // Main Autoptimize node |
| 67 | - $wp_admin_bar->add_node( array( |
|
| 67 | + $wp_admin_bar->add_node(array( |
|
| 68 | 68 | 'id' => 'autoptimize', |
| 69 | - 'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( "Autoptimize", 'autoptimize' ) . '</span>', |
|
| 70 | - 'href' => admin_url( 'options-general.php?page=autoptimize' ), |
|
| 71 | - 'meta' => array( 'class' => 'bullet-' . $color ) |
|
| 69 | + 'title' => '<span class="ab-icon"></span><span class="ab-label">'.__("Autoptimize", 'autoptimize').'</span>', |
|
| 70 | + 'href' => admin_url('options-general.php?page=autoptimize'), |
|
| 71 | + 'meta' => array('class' => 'bullet-'.$color) |
|
| 72 | 72 | )); |
| 73 | 73 | |
| 74 | 74 | // Cache Info node |
| 75 | - $wp_admin_bar->add_node( array( |
|
| 75 | + $wp_admin_bar->add_node(array( |
|
| 76 | 76 | 'id' => 'autoptimize-cache-info', |
| 77 | - 'title' => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' . |
|
| 78 | - '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
| 77 | + 'title' => '<p>'.__("Cache Info", 'autoptimize').'</p>'. |
|
| 78 | + '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'. |
|
| 79 | 79 | '<div class="circle">'. |
| 80 | - '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 81 | - '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 80 | + '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 81 | + '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 82 | 82 | '<div class="shadow"></div>'. |
| 83 | 83 | '</div>'. |
| 84 | - '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'. |
|
| 85 | - '</div>' . |
|
| 86 | - '<table>' . |
|
| 87 | - '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
| 88 | - '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
| 84 | + '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'. |
|
| 85 | + '</div>'. |
|
| 86 | + '<table>'. |
|
| 87 | + '<tr><td>'.__("Size", 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'. |
|
| 88 | + '<tr><td>'.__("Files", 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'. |
|
| 89 | 89 | '</table>', |
| 90 | 90 | 'parent' => 'autoptimize' |
| 91 | 91 | )); |
| 92 | 92 | |
| 93 | 93 | // Delete Cache node |
| 94 | - $wp_admin_bar->add_node( array( |
|
| 94 | + $wp_admin_bar->add_node(array( |
|
| 95 | 95 | 'id' => 'autoptimize-delete-cache', |
| 96 | - 'title' => __( "Delete Cache", 'autoptimize' ), |
|
| 96 | + 'title' => __("Delete Cache", 'autoptimize'), |
|
| 97 | 97 | 'parent' => 'autoptimize' |
| 98 | 98 | )); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | public function delete_cache() |
| 102 | 102 | { |
| 103 | - check_ajax_referer( 'ao_delcache_nonce', 'nonce' ); |
|
| 103 | + check_ajax_referer('ao_delcache_nonce', 'nonce'); |
|
| 104 | 104 | $result = false; |
| 105 | - if ( current_user_can( 'manage_options' ) ) |
|
| 105 | + if (current_user_can('manage_options')) |
|
| 106 | 106 | { |
| 107 | 107 | // We call the function for cleaning the Autoptimize cache |
| 108 | 108 | $result = autoptimizeCache::clearall(); |
| 109 | 109 | } |
| 110 | - wp_send_json( $result ); |
|
| 110 | + wp_send_json($result); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | public function enqueue_scripts() |
| 114 | 114 | { |
| 115 | 115 | // Autoptimize Toolbar Styles |
| 116 | - wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), time(), 'all' ); |
|
| 116 | + wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), time(), 'all'); |
|
| 117 | 117 | // Autoptimize Toolbar Javascript |
| 118 | - wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), time(), true ); |
|
| 118 | + wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), time(), true); |
|
| 119 | 119 | // Localizes a registered script with data for a JavaScript variable. (We need this for the AJAX work properly in the front-end mode) |
| 120 | - wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 121 | - 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
|
| 122 | - 'error_msg' => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ), |
|
| 123 | - 'dismiss_msg' => __( 'Dismiss this notice.' ), |
|
| 124 | - 'nonce' => wp_create_nonce( 'ao_delcache_nonce' ) |
|
| 125 | - ) ); |
|
| 120 | + wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 121 | + 'ajaxurl' => admin_url('admin-ajax.php'), |
|
| 122 | + 'error_msg' => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'), |
|
| 123 | + 'dismiss_msg' => __('Dismiss this notice.'), |
|
| 124 | + 'nonce' => wp_create_nonce('ao_delcache_nonce') |
|
| 125 | + )); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | public function format_filesize($bytes, $decimals = 2) |
| 129 | 129 | { |
| 130 | - $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ); |
|
| 131 | - for ($i = 0; ($bytes / 1024) > 0.9; $i++, $bytes /= 1024) {} |
|
| 132 | - return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[$i] ); |
|
| 130 | + $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); |
|
| 131 | + for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} |
|
| 132 | + return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]); |
|
| 133 | 133 | } |
| 134 | 134 | } |
@@ -49,13 +49,13 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function __construct($raisePhpLimits = true) |
| 51 | 51 | { |
| 52 | - $this->memoryLimit = 128 * 1048576; // 128MB in bytes |
|
| 53 | - $this->pcreBacktrackLimit = 1000 * 1000; |
|
| 54 | - $this->pcreRecursionLimit = 500 * 1000; |
|
| 52 | + $this->memoryLimit = 128*1048576; // 128MB in bytes |
|
| 53 | + $this->pcreBacktrackLimit = 1000*1000; |
|
| 54 | + $this->pcreRecursionLimit = 500*1000; |
|
| 55 | 55 | |
| 56 | 56 | $this->raisePhpLimits = (bool) $raisePhpLimits; |
| 57 | 57 | |
| 58 | - $this->numRegex = '(?:\+|-)?\d*\.?\d+' . $this->unitsGroupRegex .'?'; |
|
| 58 | + $this->numRegex = '(?:\+|-)?\d*\.?\d+'.$this->unitsGroupRegex.'?'; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -134,14 +134,14 @@ discard block |
||
| 134 | 134 | $cssChunks[$i] = $this->minify($cssChunks[$i], $linebreakPos); |
| 135 | 135 | // Keep the first @charset at-rule found |
| 136 | 136 | if (empty($charset) && preg_match($charsetRegexp, $cssChunks[$i], $matches)) { |
| 137 | - $charset = strtolower($matches[1]) . $matches[2]; |
|
| 137 | + $charset = strtolower($matches[1]).$matches[2]; |
|
| 138 | 138 | } |
| 139 | 139 | // Delete all @charset at-rules |
| 140 | 140 | $cssChunks[$i] = preg_replace($charsetRegexp, '', $cssChunks[$i]); |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | 143 | // Update the first chunk and push the charset to the top of the file. |
| 144 | - $cssChunks[0] = $charset . $cssChunks[0]; |
|
| 144 | + $cssChunks[0] = $charset.$cssChunks[0]; |
|
| 145 | 145 | |
| 146 | 146 | return trim(implode('', $cssChunks)); |
| 147 | 147 | } |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | private function registerPreservedToken($token) |
| 236 | 236 | { |
| 237 | 237 | $this->preservedTokens[] = $token; |
| 238 | - return self::TOKEN . (count($this->preservedTokens) - 1) .'___'; |
|
| 238 | + return self::TOKEN.(count($this->preservedTokens) - 1).'___'; |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | /** |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | private function getPreservedTokenPlaceholderRegexById($id) |
| 247 | 247 | { |
| 248 | - return '/'. self::TOKEN . $id .'___/'; |
|
| 248 | + return '/'.self::TOKEN.$id.'___/'; |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /** |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | private function registerComment($comment) |
| 257 | 257 | { |
| 258 | 258 | $this->comments[] = $comment; |
| 259 | - return '/*'. self::COMMENT . (count($this->comments) - 1) .'___*/'; |
|
| 259 | + return '/*'.self::COMMENT.(count($this->comments) - 1).'___*/'; |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | /** |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | */ |
| 267 | 267 | private function getCommentPlaceholderById($id) |
| 268 | 268 | { |
| 269 | - return self::COMMENT . $id .'___'; |
|
| 269 | + return self::COMMENT.$id.'___'; |
|
| 270 | 270 | } |
| 271 | 271 | |
| 272 | 272 | /** |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | */ |
| 277 | 277 | private function getCommentPlaceholderRegexById($id) |
| 278 | 278 | { |
| 279 | - return '/'. $this->getCommentPlaceholderById($id) .'/'; |
|
| 279 | + return '/'.$this->getCommentPlaceholderById($id).'/'; |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | /** |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | private function registerAtRuleBlock($block) |
| 288 | 288 | { |
| 289 | 289 | $this->atRuleBlocks[] = $block; |
| 290 | - return self::AT_RULE_BLOCK . (count($this->atRuleBlocks) - 1) .'___'; |
|
| 290 | + return self::AT_RULE_BLOCK.(count($this->atRuleBlocks) - 1).'___'; |
|
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | /** |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | */ |
| 298 | 298 | private function getAtRuleBlockPlaceholderRegexById($id) |
| 299 | 299 | { |
| 300 | - return '/'. self::AT_RULE_BLOCK . $id .'___/'; |
|
| 300 | + return '/'.self::AT_RULE_BLOCK.$id.'___/'; |
|
| 301 | 301 | } |
| 302 | 302 | |
| 303 | 303 | /** |
@@ -330,8 +330,8 @@ discard block |
||
| 330 | 330 | $preservedTokenPlaceholder = $this->registerPreservedToken($comment); |
| 331 | 331 | $css = preg_replace($commentPlaceholderRegex, $preservedTokenPlaceholder, $css, 1); |
| 332 | 332 | // Preserve new lines for /*! important comments |
| 333 | - $css = preg_replace('/\R+\s*(\/\*'. $preservedTokenPlaceholder .')/', self::NL.'$1', $css); |
|
| 334 | - $css = preg_replace('/('. $preservedTokenPlaceholder .'\*\/)\s*\R+/', '$1'.self::NL, $css); |
|
| 333 | + $css = preg_replace('/\R+\s*(\/\*'.$preservedTokenPlaceholder.')/', self::NL.'$1', $css); |
|
| 334 | + $css = preg_replace('/('.$preservedTokenPlaceholder.'\*\/)\s*\R+/', '$1'.self::NL, $css); |
|
| 335 | 335 | continue; |
| 336 | 336 | } |
| 337 | 337 | |
@@ -360,14 +360,14 @@ discard block |
||
| 360 | 360 | } |
| 361 | 361 | |
| 362 | 362 | // in all other cases kill the comment |
| 363 | - $css = preg_replace('/\/\*' . $commentPlaceholder . '\*\//', '', $css, 1); |
|
| 363 | + $css = preg_replace('/\/\*'.$commentPlaceholder.'\*\//', '', $css, 1); |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | // Normalize all whitespace strings to single spaces. Easier to work with that way. |
| 367 | 367 | $css = preg_replace('/\s+/', ' ', $css); |
| 368 | 368 | |
| 369 | 369 | // Remove spaces before & after newlines |
| 370 | - $css = preg_replace('/\s*'. self::NL .'\s*/', self::NL, $css); |
|
| 370 | + $css = preg_replace('/\s*'.self::NL.'\s*/', self::NL, $css); |
|
| 371 | 371 | |
| 372 | 372 | // Fix IE7 issue on matrix filters which browser accept whitespaces between Matrix parameters |
| 373 | 373 | $css = preg_replace_callback( |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | $css = preg_replace('/!important/i', ' !important', $css); |
| 410 | 410 | |
| 411 | 411 | // bring back the colon |
| 412 | - $css = preg_replace('/'. self::CLASSCOLON .'/', ':', $css); |
|
| 412 | + $css = preg_replace('/'.self::CLASSCOLON.'/', ':', $css); |
|
| 413 | 413 | |
| 414 | 414 | // retain space for special IE6 cases |
| 415 | 415 | $css = preg_replace_callback('/:first-(line|letter)(\{|,)/i', array($this, 'lowercasePseudoFirst'), $css); |
@@ -419,7 +419,7 @@ discard block |
||
| 419 | 419 | |
| 420 | 420 | // lowercase some popular @directives |
| 421 | 421 | $css = preg_replace_callback( |
| 422 | - '/@(document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|namespace|page|' . |
|
| 422 | + '/@(document|font-face|import|(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?keyframes|media|namespace|page|'. |
|
| 423 | 423 | 'supports|viewport)/i', |
| 424 | 424 | array($this, 'lowercaseDirectives'), |
| 425 | 425 | $css |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | |
| 428 | 428 | // lowercase some more common pseudo-elements |
| 429 | 429 | $css = preg_replace_callback( |
| 430 | - '/:(active|after|before|checked|disabled|empty|enabled|first-(?:child|of-type)|focus|hover|' . |
|
| 430 | + '/:(active|after|before|checked|disabled|empty|enabled|first-(?:child|of-type)|focus|hover|'. |
|
| 431 | 431 | 'last-(?:child|of-type)|link|only-(?:child|of-type)|root|:selection|target|visited)/i', |
| 432 | 432 | array($this, 'lowercasePseudoElements'), |
| 433 | 433 | $css |
@@ -443,7 +443,7 @@ discard block |
||
| 443 | 443 | // lower case some common function that can be values |
| 444 | 444 | // NOTE: rgb() isn't useful as we replace with #hex later, as well as and() is already done for us |
| 445 | 445 | $css = preg_replace_callback( |
| 446 | - '/([:,( ]\s*)(attr|color-stop|from|rgba|to|url|-webkit-gradient|' . |
|
| 446 | + '/([:,( ]\s*)(attr|color-stop|from|rgba|to|url|-webkit-gradient|'. |
|
| 447 | 447 | '(?:-(?:atsc|khtml|moz|ms|o|wap|webkit)-)?(?:calc|max|min|(?:repeating-)?(?:linear|radial)-gradient))/iS', |
| 448 | 448 | array($this, 'lowercaseCommonFunctionsValues'), |
| 449 | 449 | $css |
@@ -500,19 +500,19 @@ discard block |
||
| 500 | 500 | |
| 501 | 501 | // Find a fraction that is used for Opera's -o-device-pixel-ratio query |
| 502 | 502 | // Add token to add the "\" back in later |
| 503 | - $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'. self::QUERY_FRACTION .'$3)', $css); |
|
| 503 | + $css = preg_replace('/\(([a-z\-]+):([0-9]+)\/([0-9]+)\)/i', '($1:$2'.self::QUERY_FRACTION.'$3)', $css); |
|
| 504 | 504 | |
| 505 | 505 | // Patch new lines to avoid being removed when followed by empty rules cases |
| 506 | - $css = preg_replace('/'. self::NL .'/', self::NL .'}', $css); |
|
| 506 | + $css = preg_replace('/'.self::NL.'/', self::NL.'}', $css); |
|
| 507 | 507 | |
| 508 | 508 | // Remove empty rules. |
| 509 | 509 | $css = preg_replace('/[^{};\/]+\{\}/S', '', $css); |
| 510 | 510 | |
| 511 | 511 | // Restore new lines for /*! important comments |
| 512 | - $css = preg_replace('/'. self::NL .'}/', "\n", $css); |
|
| 512 | + $css = preg_replace('/'.self::NL.'}/', "\n", $css); |
|
| 513 | 513 | |
| 514 | 514 | // Add "/" back to fix Opera -o-device-pixel-ratio query |
| 515 | - $css = preg_replace('/'. self::QUERY_FRACTION .'/', '/', $css); |
|
| 515 | + $css = preg_replace('/'.self::QUERY_FRACTION.'/', '/', $css); |
|
| 516 | 516 | |
| 517 | 517 | // Replace multiple semi-colons in a row by a single one |
| 518 | 518 | // See SF bug #1980989 |
@@ -528,7 +528,7 @@ discard block |
||
| 528 | 528 | $linebreakPos = (int) $linebreakPos; |
| 529 | 529 | for ($startIndex = $i = 1, $l = strlen($css); $i < $l; $i++) { |
| 530 | 530 | if ($css[$i - 1] === '}' && $i - $startIndex > $linebreakPos) { |
| 531 | - $css = $this->strSlice($css, 0, $i) . "\n" . $this->strSlice($css, $i); |
|
| 531 | + $css = $this->strSlice($css, 0, $i)."\n".$this->strSlice($css, $i); |
|
| 532 | 532 | $l = strlen($css); |
| 533 | 533 | $startIndex = $i; |
| 534 | 534 | } |
@@ -581,7 +581,7 @@ discard block |
||
| 581 | 581 | $terminator = ')'; |
| 582 | 582 | } |
| 583 | 583 | |
| 584 | - while ($terminatorFound === false && $endIndex+1 <= $maxIndex) { |
|
| 584 | + while ($terminatorFound === false && $endIndex + 1 <= $maxIndex) { |
|
| 585 | 585 | $endIndex = $this->indexOf($css, $terminator, $endIndex + 1); |
| 586 | 586 | // endIndex == 0 doesn't really apply here |
| 587 | 587 | if ($endIndex > 0 && substr($css, $endIndex - 1, 1) !== '\\') { |
@@ -604,7 +604,7 @@ discard block |
||
| 604 | 604 | trim($token) |
| 605 | 605 | ); |
| 606 | 606 | $preservedTokenPlaceholder = $this->registerPreservedToken($token); |
| 607 | - $sb[] = 'url('. $preservedTokenPlaceholder .')'; |
|
| 607 | + $sb[] = 'url('.$preservedTokenPlaceholder.')'; |
|
| 608 | 608 | $appenIndex = $endIndex + 1; |
| 609 | 609 | } else { |
| 610 | 610 | // No end terminator found, re-add the whole match. Should we throw/warn here? |
@@ -630,7 +630,7 @@ discard block |
||
| 630 | 630 | private function shortenZeroValues($css) |
| 631 | 631 | { |
| 632 | 632 | $unitsGroupReg = $this->unitsGroupRegex; |
| 633 | - $numOrPosReg = '('. $this->numRegex .'|top|left|bottom|right|center)'; |
|
| 633 | + $numOrPosReg = '('.$this->numRegex.'|top|left|bottom|right|center)'; |
|
| 634 | 634 | $oneZeroSafeProperties = array( |
| 635 | 635 | '(?:line-)?height', |
| 636 | 636 | '(?:(?:min|max)-)?width', |
@@ -656,17 +656,17 @@ discard block |
||
| 656 | 656 | $regEnd = '/i'; |
| 657 | 657 | |
| 658 | 658 | // First zero regex start |
| 659 | - $oneZeroRegStart = $regStart .'('. implode('|', $oneZeroSafeProperties) .'):'; |
|
| 659 | + $oneZeroRegStart = $regStart.'('.implode('|', $oneZeroSafeProperties).'):'; |
|
| 660 | 660 | |
| 661 | 661 | // Multiple zeros regex start |
| 662 | - $nZerosRegStart = $regStart .'('. implode('|', $nZeroSafeProperties) .'):'; |
|
| 662 | + $nZerosRegStart = $regStart.'('.implode('|', $nZeroSafeProperties).'):'; |
|
| 663 | 663 | |
| 664 | 664 | $css = preg_replace( |
| 665 | 665 | array( |
| 666 | - $oneZeroRegStart .'0'. $unitsGroupReg . $regEnd, |
|
| 667 | - $nZerosRegStart . $numOrPosReg .' 0'. $unitsGroupReg . $regEnd, |
|
| 668 | - $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd, |
|
| 669 | - $nZerosRegStart . $numOrPosReg .' '. $numOrPosReg .' '. $numOrPosReg .' 0'. $unitsGroupReg . $regEnd |
|
| 666 | + $oneZeroRegStart.'0'.$unitsGroupReg.$regEnd, |
|
| 667 | + $nZerosRegStart.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd, |
|
| 668 | + $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd, |
|
| 669 | + $nZerosRegStart.$numOrPosReg.' '.$numOrPosReg.' '.$numOrPosReg.' 0'.$unitsGroupReg.$regEnd |
|
| 670 | 670 | ), |
| 671 | 671 | array( |
| 672 | 672 | '$1$2:0', |
@@ -682,13 +682,13 @@ discard block |
||
| 682 | 682 | |
| 683 | 683 | // Replace 0 0; or 0 0 0; or 0 0 0 0; with 0 for safe properties only. |
| 684 | 684 | $css = preg_replace( |
| 685 | - '/('. implode('|', $nZeroSafeProperties) .'):0(?: 0){1,3}(;|\}| !)'. $regEnd, |
|
| 685 | + '/('.implode('|', $nZeroSafeProperties).'):0(?: 0){1,3}(;|\}| !)'.$regEnd, |
|
| 686 | 686 | '$1:0$2', |
| 687 | 687 | $css |
| 688 | 688 | ); |
| 689 | 689 | |
| 690 | 690 | // Replace 0 0 0; or 0 0 0 0; with 0 0 for background-position property. |
| 691 | - $css = preg_replace('/(background-position):0(?: 0){2,3}(;|\}| !)'. $regEnd, '$1:0 0$2', $css); |
|
| 691 | + $css = preg_replace('/(background-position):0(?: 0){2,3}(;|\}| !)'.$regEnd, '$1:0 0$2', $css); |
|
| 692 | 692 | |
| 693 | 693 | return $css; |
| 694 | 694 | } |
@@ -712,12 +712,12 @@ discard block |
||
| 712 | 712 | '(?:text|box)-shadow' |
| 713 | 713 | ); |
| 714 | 714 | |
| 715 | - $regStart = '/(;|\{)('. implode('|', $propertiesWithColors) .'):([^;}]*)\b'; |
|
| 715 | + $regStart = '/(;|\{)('.implode('|', $propertiesWithColors).'):([^;}]*)\b'; |
|
| 716 | 716 | $regEnd = '\b/iS'; |
| 717 | 717 | |
| 718 | 718 | foreach ($longNamedColors as $colorName => $colorCode) { |
| 719 | - $patterns[] = $regStart . $colorName . $regEnd; |
|
| 720 | - $replacements[] = '$1$2:$3'. $colorCode; |
|
| 719 | + $patterns[] = $regStart.$colorName.$regEnd; |
|
| 720 | + $replacements[] = '$1$2:$3'.$colorCode; |
|
| 721 | 721 | } |
| 722 | 722 | |
| 723 | 723 | // Run at least 4 times to cover most cases (same color used several times for the same property) |
@@ -762,16 +762,16 @@ discard block |
||
| 762 | 762 | |
| 763 | 763 | if ($isFilter) { |
| 764 | 764 | // Restore, maintain case, otherwise filter will break |
| 765 | - $sb[] = $m[1] .'#'. $m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]; |
|
| 765 | + $sb[] = $m[1].'#'.$m[2].$m[3].$m[4].$m[5].$m[6].$m[7]; |
|
| 766 | 766 | } else { |
| 767 | 767 | if (strtolower($m[2]) == strtolower($m[3]) && |
| 768 | 768 | strtolower($m[4]) == strtolower($m[5]) && |
| 769 | 769 | strtolower($m[6]) == strtolower($m[7])) { |
| 770 | 770 | // Compress. |
| 771 | - $hex = '#'. strtolower($m[3] . $m[5] . $m[7]); |
|
| 771 | + $hex = '#'.strtolower($m[3].$m[5].$m[7]); |
|
| 772 | 772 | } else { |
| 773 | 773 | // Non compressible color, restore but lower case. |
| 774 | - $hex = '#'. strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]); |
|
| 774 | + $hex = '#'.strtolower($m[2].$m[3].$m[4].$m[5].$m[6].$m[7]); |
|
| 775 | 775 | } |
| 776 | 776 | // replace Hex colors with shorter color names |
| 777 | 777 | $sb[] = array_key_exists($hex, $longHexColors) ? $longHexColors[$hex] : $hex; |
@@ -818,7 +818,7 @@ discard block |
||
| 818 | 818 | $match = preg_replace('/progid:DXImageTransform\.Microsoft\.Alpha\(Opacity=/i', 'alpha(opacity=', $match); |
| 819 | 819 | |
| 820 | 820 | $preservedTokenPlaceholder = $this->registerPreservedToken($match); |
| 821 | - return $quote . $preservedTokenPlaceholder . $quote; |
|
| 821 | + return $quote.$preservedTokenPlaceholder.$quote; |
|
| 822 | 822 | } |
| 823 | 823 | |
| 824 | 824 | private function processAtRuleBlocks($matches) |
@@ -838,13 +838,13 @@ discard block |
||
| 838 | 838 | ) |
| 839 | 839 | ); |
| 840 | 840 | $preservedTokenPlaceholder = $this->registerPreservedToken($token); |
| 841 | - return 'calc('. $preservedTokenPlaceholder .')'; |
|
| 841 | + return 'calc('.$preservedTokenPlaceholder.')'; |
|
| 842 | 842 | } |
| 843 | 843 | |
| 844 | 844 | private function processOldIeSpecificMatrixDefinition($matches) |
| 845 | 845 | { |
| 846 | 846 | $preservedTokenPlaceholder = $this->registerPreservedToken($matches[1]); |
| 847 | - return 'filter:progid:DXImageTransform.Microsoft.Matrix('. $preservedTokenPlaceholder .')'; |
|
| 847 | + return 'filter:progid:DXImageTransform.Microsoft.Matrix('.$preservedTokenPlaceholder.')'; |
|
| 848 | 848 | } |
| 849 | 849 | |
| 850 | 850 | private function processColon($matches) |
@@ -869,10 +869,10 @@ discard block |
||
| 869 | 869 | |
| 870 | 870 | // Fix for issue #2528093 |
| 871 | 871 | if (!preg_match('/[\s,);}]/', $matches[2])) { |
| 872 | - $matches[2] = ' '. $matches[2]; |
|
| 872 | + $matches[2] = ' '.$matches[2]; |
|
| 873 | 873 | } |
| 874 | 874 | |
| 875 | - return '#'. implode('', $hexColors) . $matches[2]; |
|
| 875 | + return '#'.implode('', $hexColors).$matches[2]; |
|
| 876 | 876 | } |
| 877 | 877 | |
| 878 | 878 | private function hslToHex($matches) |
@@ -886,37 +886,37 @@ discard block |
||
| 886 | 886 | |
| 887 | 887 | private function processAtRulesOperators($matches) |
| 888 | 888 | { |
| 889 | - return $matches[1] . strtolower($matches[2]) .' ('; |
|
| 889 | + return $matches[1].strtolower($matches[2]).' ('; |
|
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | private function lowercasePseudoFirst($matches) |
| 893 | 893 | { |
| 894 | - return ':first-'. strtolower($matches[1]) .' '. $matches[2]; |
|
| 894 | + return ':first-'.strtolower($matches[1]).' '.$matches[2]; |
|
| 895 | 895 | } |
| 896 | 896 | |
| 897 | 897 | private function lowercaseDirectives($matches) |
| 898 | 898 | { |
| 899 | - return '@'. strtolower($matches[1]); |
|
| 899 | + return '@'.strtolower($matches[1]); |
|
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | private function lowercasePseudoElements($matches) |
| 903 | 903 | { |
| 904 | - return ':'. strtolower($matches[1]); |
|
| 904 | + return ':'.strtolower($matches[1]); |
|
| 905 | 905 | } |
| 906 | 906 | |
| 907 | 907 | private function lowercaseCommonFunctions($matches) |
| 908 | 908 | { |
| 909 | - return ':'. strtolower($matches[1]) .'('; |
|
| 909 | + return ':'.strtolower($matches[1]).'('; |
|
| 910 | 910 | } |
| 911 | 911 | |
| 912 | 912 | private function lowercaseCommonFunctionsValues($matches) |
| 913 | 913 | { |
| 914 | - return $matches[1] . strtolower($matches[2]); |
|
| 914 | + return $matches[1].strtolower($matches[2]); |
|
| 915 | 915 | } |
| 916 | 916 | |
| 917 | 917 | private function lowercaseProperties($matches) |
| 918 | 918 | { |
| 919 | - return $matches[1] . strtolower($matches[2]) . $matches[3]; |
|
| 919 | + return $matches[1].strtolower($matches[2]).$matches[3]; |
|
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | // --------------------------------------------------------------------------------------------- |
@@ -967,18 +967,18 @@ discard block |
||
| 967 | 967 | $l = floatval(str_replace('%', '', $hslValues[2])); |
| 968 | 968 | |
| 969 | 969 | // Wrap and clamp, then fraction! |
| 970 | - $h = ((($h % 360) + 360) % 360) / 360; |
|
| 971 | - $s = $this->clampNumber($s, 0, 100) / 100; |
|
| 972 | - $l = $this->clampNumber($l, 0, 100) / 100; |
|
| 970 | + $h = ((($h%360) + 360)%360)/360; |
|
| 971 | + $s = $this->clampNumber($s, 0, 100)/100; |
|
| 972 | + $l = $this->clampNumber($l, 0, 100)/100; |
|
| 973 | 973 | |
| 974 | 974 | if ($s == 0) { |
| 975 | - $r = $g = $b = $this->roundNumber(255 * $l); |
|
| 975 | + $r = $g = $b = $this->roundNumber(255*$l); |
|
| 976 | 976 | } else { |
| 977 | - $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l); |
|
| 978 | - $v1 = (2 * $l) - $v2; |
|
| 979 | - $r = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h + (1/3))); |
|
| 980 | - $g = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h)); |
|
| 981 | - $b = $this->roundNumber(255 * $this->hueToRgb($v1, $v2, $h - (1/3))); |
|
| 977 | + $v2 = $l < 0.5 ? $l*(1 + $s) : ($l + $s) - ($s*$l); |
|
| 978 | + $v1 = (2*$l) - $v2; |
|
| 979 | + $r = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h + (1/3))); |
|
| 980 | + $g = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h)); |
|
| 981 | + $b = $this->roundNumber(255*$this->hueToRgb($v1, $v2, $h - (1/3))); |
|
| 982 | 982 | } |
| 983 | 983 | |
| 984 | 984 | return array($r, $g, $b); |
@@ -995,16 +995,16 @@ discard block |
||
| 995 | 995 | { |
| 996 | 996 | $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); |
| 997 | 997 | |
| 998 | - if ($vh * 6 < 1) { |
|
| 999 | - return $v1 + ($v2 - $v1) * 6 * $vh; |
|
| 998 | + if ($vh*6 < 1) { |
|
| 999 | + return $v1 + ($v2 - $v1)*6*$vh; |
|
| 1000 | 1000 | } |
| 1001 | 1001 | |
| 1002 | - if ($vh * 2 < 1) { |
|
| 1002 | + if ($vh*2 < 1) { |
|
| 1003 | 1003 | return $v2; |
| 1004 | 1004 | } |
| 1005 | 1005 | |
| 1006 | - if ($vh * 3 < 2) { |
|
| 1007 | - return $v1 + ($v2 - $v1) * ((2 / 3) - $vh) * 6; |
|
| 1006 | + if ($vh*3 < 2) { |
|
| 1007 | + return $v1 + ($v2 - $v1)*((2/3) - $vh)*6; |
|
| 1008 | 1008 | } |
| 1009 | 1009 | |
| 1010 | 1010 | return $v1; |
@@ -1039,13 +1039,13 @@ discard block |
||
| 1039 | 1039 | switch ($letter) { |
| 1040 | 1040 | case 'M': |
| 1041 | 1041 | case 'm': |
| 1042 | - return (int) $size * 1048576; |
|
| 1042 | + return (int) $size*1048576; |
|
| 1043 | 1043 | case 'K': |
| 1044 | 1044 | case 'k': |
| 1045 | - return (int) $size * 1024; |
|
| 1045 | + return (int) $size*1024; |
|
| 1046 | 1046 | case 'G': |
| 1047 | 1047 | case 'g': |
| 1048 | - return (int) $size * 1073741824; |
|
| 1048 | + return (int) $size*1073741824; |
|
| 1049 | 1049 | } |
| 1050 | 1050 | } |
| 1051 | 1051 | return (int) $size; |
@@ -1059,7 +1059,7 @@ discard block |
||
| 1059 | 1059 | private function rgbPercentageToRgbInteger($rgbPercentage) |
| 1060 | 1060 | { |
| 1061 | 1061 | if (strpos($rgbPercentage, '%') !== false) { |
| 1062 | - $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage)) * 2.55); |
|
| 1062 | + $rgbPercentage = $this->roundNumber(floatval(str_replace('%', '', $rgbPercentage))*2.55); |
|
| 1063 | 1063 | } |
| 1064 | 1064 | |
| 1065 | 1065 | return intval($rgbPercentage, 10); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | { |
| 71 | 71 | $this->_html = str_replace("\r\n", "\n", trim($html)); |
| 72 | 72 | if (isset($options['xhtml'])) { |
| 73 | - $this->_isXhtml = (bool)$options['xhtml']; |
|
| 73 | + $this->_isXhtml = (bool) $options['xhtml']; |
|
| 74 | 74 | } |
| 75 | 75 | if (isset($options['cssMinifier'])) { |
| 76 | 76 | $this->_cssMinifier = $options['cssMinifier']; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML')); |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']); |
|
| 98 | + $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']); |
|
| 99 | 99 | $this->_placeholders = array(); |
| 100 | 100 | |
| 101 | 101 | // replace SCRIPTs (and minify) with placeholders |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | ,$this->_html); |
| 112 | 112 | |
| 113 | 113 | // remove HTML comments (not containing IE conditional comments). |
| 114 | - if ($this->_keepComments == false) { |
|
| 114 | + if ($this->_keepComments == false) { |
|
| 115 | 115 | $this->_html = preg_replace_callback( |
| 116 | 116 | '/<!--([\\s\\S]*?)-->/' |
| 117 | 117 | ,array($this, '_commentCB') |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | protected function _reservePlace($content) |
| 175 | 175 | { |
| 176 | - $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%'; |
|
| 176 | + $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%'; |
|
| 177 | 177 | $this->_placeholders[$placeholder] = $content; |
| 178 | 178 | return $placeholder; |
| 179 | 179 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | protected function _outsideTagCB($m) |
| 189 | 189 | { |
| 190 | - return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<'; |
|
| 190 | + return '>'.preg_replace('/^\\s+|\\s+$/', ' ', $m[1]).'<'; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | protected function _removePreCB($m) |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | protected function _removeCdata($str) |
| 258 | 258 | { |
| 259 | 259 | return (false !== strpos($str, '<![CDATA[')) |
| 260 | - ? str_replace(array('/* <![CDATA[ */','/* ]]> */','/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str) |
|
| 260 | + ? str_replace(array('/* <![CDATA[ */', '/* ]]> */', '/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str) |
|
| 261 | 261 | : $str; |
| 262 | 262 | } |
| 263 | 263 | |
