@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php exit; |
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 4 | +if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
| 6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 6 | +if (!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 7 | 7 | $_SERVER['HTTP_USER_AGENT'] = ''; |
| 8 | 8 | |
| 9 | 9 | // Determine supported compression method |
@@ -27,27 +27,27 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 30 | +if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 31 | 31 | $encoding = 'none'; |
| 32 | 32 | |
| 33 | 33 | //Get data |
| 34 | 34 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
| 35 | 35 | |
| 36 | 36 | // first check if we have to send 304 |
| 37 | -$eTag=md5($contents); |
|
| 38 | -$modTime=filemtime(__FILE__.'.none'); |
|
| 37 | +$eTag = md5($contents); |
|
| 38 | +$modTime = filemtime(__FILE__.'.none'); |
|
| 39 | 39 | |
| 40 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); |
|
| 40 | +$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag)); |
|
| 41 | 41 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 42 | 42 | |
| 43 | -if (($modTimeMatch)||($eTagMatch)) { |
|
| 43 | +if (($modTimeMatch) || ($eTagMatch)) { |
|
| 44 | 44 | header('HTTP/1.1 304 Not Modified'); |
| 45 | 45 | header('Connection: close'); |
| 46 | 46 | } else { |
| 47 | 47 | // send all sorts of headers |
| 48 | - $expireTime=60*60*24*356; // 1y max according to RFC |
|
| 48 | + $expireTime = 60*60*24*356; // 1y max according to RFC |
|
| 49 | 49 | |
| 50 | - if(isset($encoding) && $encoding != 'none') |
|
| 50 | + if (isset($encoding) && $encoding != 'none') |
|
| 51 | 51 | { |
| 52 | 52 | header('Content-Encoding: '.$encoding); |
| 53 | 53 | } |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | header('Content-type: %%CONTENT%%; charset=utf-8'); |
| 57 | 57 | header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
| 58 | 58 | header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years |
| 59 | - header('ETag: ' . $eTag); |
|
| 59 | + header('ETag: '.$eTag); |
|
| 60 | 60 | header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
| 61 | 61 | |
| 62 | 62 | // send output |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php exit; |
| 2 | 2 | |
| 3 | 3 | //Check everything exists before using it |
| 4 | -if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 4 | +if (!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) |
|
| 5 | 5 | $_SERVER['HTTP_ACCEPT_ENCODING'] = ''; |
| 6 | -if(!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 6 | +if (!isset($_SERVER['HTTP_USER_AGENT'])) |
|
| 7 | 7 | $_SERVER['HTTP_USER_AGENT'] = ''; |
| 8 | 8 | |
| 9 | 9 | // Determine supported compression method |
@@ -27,16 +27,16 @@ discard block |
||
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | //Some servers compress the output of PHP - Don't break in those cases |
| 30 | -if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 30 | +if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) |
|
| 31 | 31 | $encoding = 'none'; |
| 32 | 32 | |
| 33 | 33 | $iscompressed = file_exists(__FILE__.'.'.$encoding); |
| 34 | -if($encoding != 'none' && $iscompressed == false) |
|
| 34 | +if ($encoding != 'none' && $iscompressed == false) |
|
| 35 | 35 | { |
| 36 | 36 | $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE); |
| 37 | 37 | $code = file_get_contents(__FILE__.'.none'); |
| 38 | - $contents = gzencode($code,9,$flag); |
|
| 39 | -}else{ |
|
| 38 | + $contents = gzencode($code, 9, $flag); |
|
| 39 | +} else { |
|
| 40 | 40 | //Get data |
| 41 | 41 | $contents = file_get_contents(__FILE__.'.'.$encoding); |
| 42 | 42 | } |
@@ -44,18 +44,18 @@ discard block |
||
| 44 | 44 | // first check if we have to send 304 |
| 45 | 45 | // inspired by http://www.jonasjohn.de/snippets/php/caching.htm |
| 46 | 46 | |
| 47 | -$eTag=md5($contents); |
|
| 48 | -$modTime=filemtime(__FILE__.'.none'); |
|
| 47 | +$eTag = md5($contents); |
|
| 48 | +$modTime = filemtime(__FILE__.'.none'); |
|
| 49 | 49 | |
| 50 | -$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag)); |
|
| 50 | +$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag)); |
|
| 51 | 51 | $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime); |
| 52 | 52 | |
| 53 | -if (($modTimeMatch)||($eTagMatch)) { |
|
| 53 | +if (($modTimeMatch) || ($eTagMatch)) { |
|
| 54 | 54 | header('HTTP/1.1 304 Not Modified'); |
| 55 | 55 | header('Connection: close'); |
| 56 | 56 | } else { |
| 57 | 57 | // send all sorts of headers |
| 58 | - $expireTime=60*60*24*355; // 1y max according to RFC |
|
| 58 | + $expireTime = 60*60*24*355; // 1y max according to RFC |
|
| 59 | 59 | if ($encoding != 'none') { |
| 60 | 60 | header('Content-Encoding: '.$encoding); |
| 61 | 61 | } |
@@ -64,22 +64,22 @@ discard block |
||
| 64 | 64 | header('Content-type: %%CONTENT%%; charset=utf-8'); |
| 65 | 65 | header('Cache-Control: max-age='.$expireTime.', public, must-revalidate'); |
| 66 | 66 | header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); |
| 67 | - header('ETag: ' . $eTag); |
|
| 67 | + header('ETag: '.$eTag); |
|
| 68 | 68 | header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT'); |
| 69 | 69 | |
| 70 | 70 | // send output |
| 71 | 71 | echo $contents; |
| 72 | 72 | |
| 73 | 73 | //And write to filesystem cache if not done yet |
| 74 | - if($encoding != 'none' && $iscompressed == false) |
|
| 74 | + if ($encoding != 'none' && $iscompressed == false) |
|
| 75 | 75 | { |
| 76 | 76 | //Write the content we sent |
| 77 | - file_put_contents(__FILE__.'.'.$encoding,$contents); |
|
| 77 | + file_put_contents(__FILE__.'.'.$encoding, $contents); |
|
| 78 | 78 | |
| 79 | 79 | //And write the new content |
| 80 | 80 | $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP); |
| 81 | 81 | $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip'); |
| 82 | - $contents = gzencode($code,9,$flag); |
|
| 83 | - file_put_contents(__FILE__.'.'.$ext,$contents); |
|
| 82 | + $contents = gzencode($code, 9, $flag); |
|
| 83 | + file_put_contents(__FILE__.'.'.$ext, $contents); |
|
| 84 | 84 | } |
| 85 | 85 | } |
@@ -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 | /* |
| 5 | 5 | * cachechecker code |
@@ -13,39 +13,39 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | 15 | if (is_admin()) { |
| 16 | - add_action('plugins_loaded','ao_cachechecker_setup'); |
|
| 16 | + add_action('plugins_loaded', 'ao_cachechecker_setup'); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | function ao_cachechecker_setup() { |
| 20 | - $doCacheCheck = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true); |
|
| 21 | - $cacheCheckSchedule = wp_get_schedule( 'ao_cachechecker' ); |
|
| 22 | - $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency','daily'); |
|
| 23 | - if (!in_array($AOCCfreq,array('hourly','daily','monthly'))) { |
|
| 24 | - $AOCCfreq='daily'; |
|
| 20 | + $doCacheCheck = (bool) apply_filters('autoptimize_filter_cachecheck_do', true); |
|
| 21 | + $cacheCheckSchedule = wp_get_schedule('ao_cachechecker'); |
|
| 22 | + $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency', 'daily'); |
|
| 23 | + if (!in_array($AOCCfreq, array('hourly', 'daily', 'monthly'))) { |
|
| 24 | + $AOCCfreq = 'daily'; |
|
| 25 | 25 | } |
| 26 | - if ( $doCacheCheck && ( !$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq ) ) { |
|
| 26 | + if ($doCacheCheck && (!$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq)) { |
|
| 27 | 27 | wp_schedule_event(time(), $AOCCfreq, 'ao_cachechecker'); |
| 28 | - } else if ( $cacheCheckSchedule && !$doCacheCheck ) { |
|
| 29 | - wp_clear_scheduled_hook( 'ao_cachechecker' ); |
|
| 28 | + } else if ($cacheCheckSchedule && !$doCacheCheck) { |
|
| 29 | + wp_clear_scheduled_hook('ao_cachechecker'); |
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | add_action('ao_cachechecker', 'ao_cachechecker_cronjob'); |
| 34 | 34 | function ao_cachechecker_cronjob() { |
| 35 | - $maxSize = (int) apply_filters( "autoptimize_filter_cachecheck_maxsize", 512000); |
|
| 36 | - $doCacheCheck = (bool) apply_filters( "autoptimize_filter_cachecheck_do", true); |
|
| 37 | - $statArr=autoptimizeCache::stats(); |
|
| 38 | - $cacheSize=round($statArr[1]/1024); |
|
| 39 | - if (($cacheSize>$maxSize) && ($doCacheCheck)) { |
|
| 40 | - update_option("autoptimize_cachesize_notice",true); |
|
| 41 | - if (apply_filters('autoptimize_filter_cachecheck_sendmail',true)) { |
|
| 42 | - $saniSiteUrl=esc_url(site_url()); |
|
| 43 | - $ao_mailto=apply_filters('autoptimize_filter_cachecheck_mailto',get_option('admin_email','')); |
|
| 44 | - $ao_mailsubject=__('Autoptimize cache size warning','autoptimize')." (".$saniSiteUrl.")"; |
|
| 45 | - $ao_mailbody=__('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")"; |
|
| 35 | + $maxSize = (int) apply_filters("autoptimize_filter_cachecheck_maxsize", 512000); |
|
| 36 | + $doCacheCheck = (bool) apply_filters("autoptimize_filter_cachecheck_do", true); |
|
| 37 | + $statArr = autoptimizeCache::stats(); |
|
| 38 | + $cacheSize = round($statArr[1]/1024); |
|
| 39 | + if (($cacheSize > $maxSize) && ($doCacheCheck)) { |
|
| 40 | + update_option("autoptimize_cachesize_notice", true); |
|
| 41 | + if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) { |
|
| 42 | + $saniSiteUrl = esc_url(site_url()); |
|
| 43 | + $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', get_option('admin_email', '')); |
|
| 44 | + $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize')." (".$saniSiteUrl.")"; |
|
| 45 | + $ao_mailbody = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")"; |
|
| 46 | 46 | |
| 47 | 47 | if (!empty($ao_mailto)) { |
| 48 | - $ao_mailresult=wp_mail($ao_mailto,$ao_mailsubject,$ao_mailbody); |
|
| 48 | + $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody); |
|
| 49 | 49 | if (!$ao_mailresult) { |
| 50 | 50 | error_log("Autoptimize could not send cache size warning mail."); |
| 51 | 51 | } |
@@ -56,10 +56,10 @@ discard block |
||
| 56 | 56 | |
| 57 | 57 | add_action('admin_notices', 'autoptimize_cachechecker_notice'); |
| 58 | 58 | function autoptimize_cachechecker_notice() { |
| 59 | - if ((bool) get_option("autoptimize_cachesize_notice",false)) { |
|
| 59 | + if ((bool) get_option("autoptimize_cachesize_notice", false)) { |
|
| 60 | 60 | echo '<div class="notice notice-warning"><p>'; |
| 61 | - _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' ); |
|
| 61 | + _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize'); |
|
| 62 | 62 | echo '</p></div>'; |
| 63 | - update_option("autoptimize_cachesize_notice",false); |
|
| 63 | + update_option("autoptimize_cachesize_notice", false); |
|
| 64 | 64 | } |
| 65 | 65 | } |
@@ -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 | |