futtta /
autoptimize
@@ -139,10 +139,18 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | // hide everything between noptimize-comment tags |
| 142 | + |
|
| 143 | + /** |
|
| 144 | + * @param string $noptimize_in |
|
| 145 | + */ |
|
| 142 | 146 | protected function hide_noptimize($noptimize_in) { |
| 143 | 147 | if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { |
| 144 | 148 | $noptimize_out = preg_replace_callback( |
| 145 | 149 | '#<!--\s?noptimize\s?-->.*?<!--\s?/\s?noptimize\s?-->#is', |
| 150 | + |
|
| 151 | + /** |
|
| 152 | + * @param string $matches |
|
| 153 | + */ |
|
| 146 | 154 | function ($matches) {return "%%NOPTIMIZE" . AUTOPTIMIZE_HASH . "%%" . base64_encode($matches[0]) . "%%NOPTIMIZE%%";}, |
| 147 | 155 | $noptimize_in |
| 148 | 156 | ); |
@@ -268,6 +276,9 @@ discard block |
||
| 268 | 276 | } |
| 269 | 277 | } |
| 270 | 278 | |
| 279 | + /** |
|
| 280 | + * @param string $tag |
|
| 281 | + */ |
|
| 271 | 282 | protected function isremovable($tag, $removables) { |
| 272 | 283 | foreach ($removables as $match) { |
| 273 | 284 | if (strpos($tag,$match)!==false) { |
@@ -278,10 +289,18 @@ discard block |
||
| 278 | 289 | } |
| 279 | 290 | |
| 280 | 291 | // inject already minified code in optimized JS/CSS |
| 292 | + |
|
| 293 | + /** |
|
| 294 | + * @return string |
|
| 295 | + */ |
|
| 281 | 296 | protected function inject_minified($in) { |
| 282 | 297 | if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) { |
| 283 | 298 | $out = preg_replace_callback( |
| 284 | 299 | '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is', |
| 300 | + |
|
| 301 | + /** |
|
| 302 | + * @return string |
|
| 303 | + */ |
|
| 285 | 304 | function ($matches) {$filepath = base64_decode(strtok($matches[1], "|")); |
| 286 | 305 | $filecontent = file_get_contents($filepath); |
| 287 | 306 | |
@@ -320,6 +339,9 @@ discard block |
||
| 320 | 339 | return $out; |
| 321 | 340 | } |
| 322 | 341 | |
| 342 | + /** |
|
| 343 | + * @param string $pathIn |
|
| 344 | + */ |
|
| 323 | 345 | protected function minify_single($pathIn) { |
| 324 | 346 | // determine JS or CSS and set var (also mimetype), return false if neither |
| 325 | 347 | if ( $this->str_ends_in($pathIn,".js") === true ) { |
@@ -385,6 +407,9 @@ discard block |
||
| 385 | 407 | return $_CachedMinifiedUrl; |
| 386 | 408 | } |
| 387 | 409 | |
| 410 | + /** |
|
| 411 | + * @param string $needle |
|
| 412 | + */ |
|
| 388 | 413 | protected function str_ends_in($haystack,$needle) { |
| 389 | 414 | $needleLength = strlen($needle); |
| 390 | 415 | $haystackLength = strlen($haystack); |
@@ -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 | abstract class autoptimizeBase { |
| 5 | 5 | protected $content = ''; |
@@ -23,37 +23,37 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | //Converts an URL to a full path |
| 25 | 25 | protected function getpath($url) { |
| 26 | - $url=apply_filters( 'autoptimize_filter_cssjs_alter_url', $url); |
|
| 26 | + $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url); |
|
| 27 | 27 | |
| 28 | - if (strpos($url,'%')!==false) { |
|
| 29 | - $url=urldecode($url); |
|
| 28 | + if (strpos($url, '%') !== false) { |
|
| 29 | + $url = urldecode($url); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - $siteHost=parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST); |
|
| 33 | - $contentHost=parse_url(AUTOPTIMIZE_WP_ROOT_URL,PHP_URL_HOST); |
|
| 32 | + $siteHost = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST); |
|
| 33 | + $contentHost = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST); |
|
| 34 | 34 | |
| 35 | 35 | // normalize |
| 36 | - if (strpos($url,'//')===0) { |
|
| 36 | + if (strpos($url, '//') === 0) { |
|
| 37 | 37 | if (is_ssl()) { |
| 38 | 38 | $url = "https:".$url; |
| 39 | 39 | } else { |
| 40 | 40 | $url = "http:".$url; |
| 41 | 41 | } |
| 42 | - } else if ((strpos($url,'//')===false) && (strpos($url,$siteHost)===false)) { |
|
| 42 | + } else if ((strpos($url, '//') === false) && (strpos($url, $siteHost) === false)) { |
|
| 43 | 43 | if (AUTOPTIMIZE_WP_SITE_URL === $siteHost) { |
| 44 | 44 | $url = AUTOPTIMIZE_WP_SITE_URL.$url; |
| 45 | 45 | } else { |
| 46 | - $subdir_levels=substr_count(preg_replace("/https?:\/\//","",AUTOPTIMIZE_WP_SITE_URL),"/"); |
|
| 47 | - $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..",$subdir_levels).$url; |
|
| 46 | + $subdir_levels = substr_count(preg_replace("/https?:\/\//", "", AUTOPTIMIZE_WP_SITE_URL), "/"); |
|
| 47 | + $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..", $subdir_levels).$url; |
|
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if ($siteHost !== $contentHost) { |
| 52 | - $url=str_replace(AUTOPTIMIZE_WP_CONTENT_URL,AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME,$url); |
|
| 52 | + $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | // first check; hostname wp site should be hostname of url |
| 56 | - $thisHost=@parse_url($url,PHP_URL_HOST); |
|
| 56 | + $thisHost = @parse_url($url, PHP_URL_HOST); |
|
| 57 | 57 | if ($thisHost !== $siteHost) { |
| 58 | 58 | /* |
| 59 | 59 | * first try to get all domains from WPML (if available) |
@@ -65,18 +65,18 @@ discard block |
||
| 65 | 65 | |
| 66 | 66 | $multidomainsWPML = apply_filters('wpml_setting', array(), 'language_domains'); |
| 67 | 67 | if (!empty($multidomainsWPML)) { |
| 68 | - $multidomains = array_map(array($this,"ao_getDomain"),$multidomainsWPML); |
|
| 68 | + $multidomains = array_map(array($this, "ao_getDomain"), $multidomainsWPML); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | if (!empty($this->cdn_url)) { |
| 72 | - $multidomains[]=parse_url($this->cdn_url,PHP_URL_HOST); |
|
| 72 | + $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains); |
| 76 | 76 | |
| 77 | 77 | if (!empty($multidomains)) { |
| 78 | - if (in_array($thisHost,$multidomains)) { |
|
| 79 | - $url=str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST), $url); |
|
| 78 | + if (in_array($thisHost, $multidomains)) { |
|
| 79 | + $url = str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST), $url); |
|
| 80 | 80 | } else { |
| 81 | 81 | return false; |
| 82 | 82 | } |
@@ -86,22 +86,22 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | // try to remove "wp root url" from url while not minding http<>https |
| 89 | - $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_ROOT_URL); |
|
| 89 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL); |
|
| 90 | 90 | if ($siteHost !== $contentHost) { |
| 91 | 91 | // as we replaced the content-domain with the site-domain, we should match against that |
| 92 | - $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_SITE_URL); |
|
| 92 | + $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL); |
|
| 93 | 93 | } |
| 94 | - $tmp_url = preg_replace('/https?:/','',$url); |
|
| 95 | - $path = str_replace($tmp_ao_root,'',$tmp_url); |
|
| 94 | + $tmp_url = preg_replace('/https?:/', '', $url); |
|
| 95 | + $path = str_replace($tmp_ao_root, '', $tmp_url); |
|
| 96 | 96 | |
| 97 | 97 | // if path starts with :// or //, this is not a URL in the WP context and we have to assume we can't aggregate |
| 98 | - if (preg_match('#^:?//#',$path)) { |
|
| 98 | + if (preg_match('#^:?//#', $path)) { |
|
| 99 | 99 | /** External script/css (adsense, etc) */ |
| 100 | 100 | return false; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | // prepend with WP_ROOT_DIR to have full path to file |
| 104 | - $path = str_replace('//','/',WP_ROOT_DIR.$path); |
|
| 104 | + $path = str_replace('//', '/', WP_ROOT_DIR.$path); |
|
| 105 | 105 | |
| 106 | 106 | // final check: does file exist and is it readable |
| 107 | 107 | if (file_exists($path) && is_file($path) && is_readable($path)) { |
@@ -114,25 +114,25 @@ discard block |
||
| 114 | 114 | // needed for WPML-filter |
| 115 | 115 | protected function ao_getDomain($in) { |
| 116 | 116 | // make sure the url starts with something vaguely resembling a protocol |
| 117 | - if ((strpos($in,"http")!==0) && (strpos($in,"//")!==0)) { |
|
| 118 | - $in="http://".$in; |
|
| 117 | + if ((strpos($in, "http") !== 0) && (strpos($in, "//") !== 0)) { |
|
| 118 | + $in = "http://".$in; |
|
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | // do the actual parse_url |
| 122 | - $out = parse_url($in,PHP_URL_HOST); |
|
| 122 | + $out = parse_url($in, PHP_URL_HOST); |
|
| 123 | 123 | |
| 124 | 124 | // fallback if parse_url does not understand the url is in fact a url |
| 125 | - if (empty($out)) $out=$in; |
|
| 125 | + if (empty($out)) $out = $in; |
|
| 126 | 126 | |
| 127 | 127 | return $out; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | |
| 131 | 131 | // logger |
| 132 | - protected function ao_logger($logmsg,$appendHTML=true) { |
|
| 132 | + protected function ao_logger($logmsg, $appendHTML = true) { |
|
| 133 | 133 | if ($appendHTML) { |
| 134 | - $logmsg="<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->"; |
|
| 135 | - $this->content.=$logmsg; |
|
| 134 | + $logmsg = "<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->"; |
|
| 135 | + $this->content .= $logmsg; |
|
| 136 | 136 | } else { |
| 137 | 137 | error_log("Autoptimize: ".$logmsg); |
| 138 | 138 | } |
@@ -140,10 +140,10 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | // hide everything between noptimize-comment tags |
| 142 | 142 | protected function hide_noptimize($noptimize_in) { |
| 143 | - if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { |
|
| 143 | + if (preg_match('/<!--\s?noptimize\s?-->/', $noptimize_in)) { |
|
| 144 | 144 | $noptimize_out = preg_replace_callback( |
| 145 | 145 | '#<!--\s?noptimize\s?-->.*?<!--\s?/\s?noptimize\s?-->#is', |
| 146 | - function ($matches) {return "%%NOPTIMIZE" . AUTOPTIMIZE_HASH . "%%" . base64_encode($matches[0]) . "%%NOPTIMIZE%%";}, |
|
| 146 | + function($matches) {return "%%NOPTIMIZE".AUTOPTIMIZE_HASH."%%".base64_encode($matches[0])."%%NOPTIMIZE%%"; }, |
|
| 147 | 147 | $noptimize_in |
| 148 | 148 | ); |
| 149 | 149 | } else { |
@@ -154,10 +154,10 @@ discard block |
||
| 154 | 154 | |
| 155 | 155 | // unhide noptimize-tags |
| 156 | 156 | protected function restore_noptimize($noptimize_in) { |
| 157 | - if ( strpos( $noptimize_in, '%%NOPTIMIZE%%' ) !== false ) { |
|
| 157 | + if (strpos($noptimize_in, '%%NOPTIMIZE%%') !== false) { |
|
| 158 | 158 | $noptimize_out = preg_replace_callback( |
| 159 | 159 | '#%%NOPTIMIZE'.AUTOPTIMIZE_HASH.'%%(.*?)%%NOPTIMIZE%%#is', |
| 160 | - function ($matches) {return base64_decode($matches[1]);}, |
|
| 160 | + function($matches) {return base64_decode($matches[1]); }, |
|
| 161 | 161 | $noptimize_in |
| 162 | 162 | ); |
| 163 | 163 | } else { |
@@ -167,10 +167,10 @@ discard block |
||
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | protected function hide_iehacks($iehacks_in) { |
| 170 | - if ( strpos( $iehacks_in, '<!--[if' ) !== false ) { |
|
| 170 | + if (strpos($iehacks_in, '<!--[if') !== false) { |
|
| 171 | 171 | $iehacks_out = preg_replace_callback( |
| 172 | 172 | '#<!--\[if.*?\[endif\]-->#is', |
| 173 | - function ($matches) {return "%%IEHACK" . AUTOPTIMIZE_HASH . "%%" . base64_encode($matches[0]) . "%%IEHACK%%";}, |
|
| 173 | + function($matches) {return "%%IEHACK".AUTOPTIMIZE_HASH."%%".base64_encode($matches[0])."%%IEHACK%%"; }, |
|
| 174 | 174 | $iehacks_in |
| 175 | 175 | ); |
| 176 | 176 | } else { |
@@ -180,23 +180,23 @@ discard block |
||
| 180 | 180 | } |
| 181 | 181 | |
| 182 | 182 | protected function restore_iehacks($iehacks_in) { |
| 183 | - if ( strpos( $iehacks_in, '%%IEHACK%%' ) !== false ) { |
|
| 183 | + if (strpos($iehacks_in, '%%IEHACK%%') !== false) { |
|
| 184 | 184 | $iehacks_out = preg_replace_callback( |
| 185 | 185 | '#%%IEHACK'.AUTOPTIMIZE_HASH.'%%(.*?)%%IEHACK%%#is', |
| 186 | - function ($matches) {return base64_decode($matches[1]);}, |
|
| 186 | + function($matches) {return base64_decode($matches[1]); }, |
|
| 187 | 187 | $iehacks_in |
| 188 | 188 | ); |
| 189 | 189 | } else { |
| 190 | - $iehacks_out=$iehacks_in; |
|
| 190 | + $iehacks_out = $iehacks_in; |
|
| 191 | 191 | } |
| 192 | 192 | return $iehacks_out; |
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | protected function hide_comments($comments_in) { |
| 196 | - if ( strpos( $comments_in, '<!--' ) !== false ) { |
|
| 196 | + if (strpos($comments_in, '<!--') !== false) { |
|
| 197 | 197 | $comments_out = preg_replace_callback( |
| 198 | 198 | '#<!--.*?-->#is', |
| 199 | - function ($matches) {return "%%COMMENTS" . AUTOPTIMIZE_HASH . "%%" . base64_encode($matches[0]) . "%%COMMENTS%%";}, |
|
| 199 | + function($matches) {return "%%COMMENTS".AUTOPTIMIZE_HASH."%%".base64_encode($matches[0])."%%COMMENTS%%"; }, |
|
| 200 | 200 | $comments_in |
| 201 | 201 | ); |
| 202 | 202 | } else { |
@@ -206,38 +206,38 @@ discard block |
||
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | protected function restore_comments($comments_in) { |
| 209 | - if ( strpos( $comments_in, '%%COMMENTS%%' ) !== false ) { |
|
| 209 | + if (strpos($comments_in, '%%COMMENTS%%') !== false) { |
|
| 210 | 210 | $comments_out = preg_replace_callback( |
| 211 | 211 | '#%%COMMENTS'.AUTOPTIMIZE_HASH.'%%(.*?)%%COMMENTS%%#is', |
| 212 | - function ($matches) {return base64_decode($matches[1]);}, |
|
| 212 | + function($matches) {return base64_decode($matches[1]); }, |
|
| 213 | 213 | $comments_in |
| 214 | 214 | ); |
| 215 | 215 | } else { |
| 216 | - $comments_out=$comments_in; |
|
| 216 | + $comments_out = $comments_in; |
|
| 217 | 217 | } |
| 218 | 218 | return $comments_out; |
| 219 | 219 | } |
| 220 | 220 | |
| 221 | - protected function url_replace_cdn( $url ) { |
|
| 221 | + protected function url_replace_cdn($url) { |
|
| 222 | 222 | // API filter to change base CDN URL |
| 223 | - $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $this->cdn_url ); |
|
| 223 | + $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $this->cdn_url); |
|
| 224 | 224 | |
| 225 | - if ( !empty($cdn_url) ) { |
|
| 225 | + if (!empty($cdn_url)) { |
|
| 226 | 226 | // prepend domain-less absolute URL's |
| 227 | - if ( ( substr( $url, 0, 1 ) === '/' ) && ( substr( $url, 1, 1 ) !== '/' ) ) { |
|
| 228 | - $url = rtrim( $cdn_url, '/' ) . $url; |
|
| 227 | + if ((substr($url, 0, 1) === '/') && (substr($url, 1, 1) !== '/')) { |
|
| 228 | + $url = rtrim($cdn_url, '/').$url; |
|
| 229 | 229 | } else { |
| 230 | 230 | // get wordpress base URL |
| 231 | - $WPSiteBreakdown = parse_url( AUTOPTIMIZE_WP_SITE_URL ); |
|
| 232 | - $WPBaseUrl = $WPSiteBreakdown['scheme'] . '://' . $WPSiteBreakdown['host']; |
|
| 233 | - if ( ! empty( $WPSiteBreakdown['port'] ) ) { |
|
| 234 | - $WPBaseUrl .= ":" . $WPSiteBreakdown['port']; |
|
| 231 | + $WPSiteBreakdown = parse_url(AUTOPTIMIZE_WP_SITE_URL); |
|
| 232 | + $WPBaseUrl = $WPSiteBreakdown['scheme'].'://'.$WPSiteBreakdown['host']; |
|
| 233 | + if (!empty($WPSiteBreakdown['port'])) { |
|
| 234 | + $WPBaseUrl .= ":".$WPSiteBreakdown['port']; |
|
| 235 | 235 | } |
| 236 | 236 | // replace full url's with scheme |
| 237 | - $tmp_url = str_replace( $WPBaseUrl, rtrim( $cdn_url, '/' ), $url ); |
|
| 238 | - if ( $tmp_url === $url ) { |
|
| 237 | + $tmp_url = str_replace($WPBaseUrl, rtrim($cdn_url, '/'), $url); |
|
| 238 | + if ($tmp_url === $url) { |
|
| 239 | 239 | // last attempt; replace scheme-less URL's |
| 240 | - $url = str_replace( preg_replace( '/https?:/', '', $WPBaseUrl ), rtrim( $cdn_url, '/' ), $url ); |
|
| 240 | + $url = str_replace(preg_replace('/https?:/', '', $WPBaseUrl), rtrim($cdn_url, '/'), $url); |
|
| 241 | 241 | } else { |
| 242 | 242 | $url = $tmp_url; |
| 243 | 243 | } |
@@ -245,32 +245,32 @@ discard block |
||
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | // allow API filter to alter URL after CDN replacement |
| 248 | - $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url ); |
|
| 248 | + $url = apply_filters('autoptimize_filter_base_replace_cdn', $url); |
|
| 249 | 249 | return $url; |
| 250 | 250 | } |
| 251 | 251 | |
| 252 | - protected function inject_in_html($payload,$replaceTag) { |
|
| 253 | - if (strpos($this->content,$replaceTag[0])!== false) { |
|
| 254 | - if ($replaceTag[1]==="after") { |
|
| 255 | - $replaceBlock=$replaceTag[0].$payload; |
|
| 256 | - } else if ($replaceTag[1]==="replace"){ |
|
| 257 | - $replaceBlock=$payload; |
|
| 252 | + protected function inject_in_html($payload, $replaceTag) { |
|
| 253 | + if (strpos($this->content, $replaceTag[0]) !== false) { |
|
| 254 | + if ($replaceTag[1] === "after") { |
|
| 255 | + $replaceBlock = $replaceTag[0].$payload; |
|
| 256 | + } else if ($replaceTag[1] === "replace") { |
|
| 257 | + $replaceBlock = $payload; |
|
| 258 | 258 | } else { |
| 259 | - $replaceBlock=$payload.$replaceTag[0]; |
|
| 259 | + $replaceBlock = $payload.$replaceTag[0]; |
|
| 260 | 260 | } |
| 261 | - $this->content = substr_replace($this->content,$replaceBlock,strpos($this->content,$replaceTag[0]),strlen($replaceTag[0])); |
|
| 261 | + $this->content = substr_replace($this->content, $replaceBlock, strpos($this->content, $replaceTag[0]), strlen($replaceTag[0])); |
|
| 262 | 262 | } else { |
| 263 | 263 | $this->content .= $payload; |
| 264 | 264 | if (!$this->tagWarning) { |
| 265 | - $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<",">"),"",$replaceTag[0])."\" missing --><!--/noptimize-->"; |
|
| 266 | - $this->tagWarning=true; |
|
| 265 | + $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<", ">"), "", $replaceTag[0])."\" missing --><!--/noptimize-->"; |
|
| 266 | + $this->tagWarning = true; |
|
| 267 | 267 | } |
| 268 | 268 | } |
| 269 | 269 | } |
| 270 | 270 | |
| 271 | 271 | protected function isremovable($tag, $removables) { |
| 272 | 272 | foreach ($removables as $match) { |
| 273 | - if (strpos($tag,$match)!==false) { |
|
| 273 | + if (strpos($tag, $match) !== false) { |
|
| 274 | 274 | return true; |
| 275 | 275 | } |
| 276 | 276 | } |
@@ -279,10 +279,10 @@ discard block |
||
| 279 | 279 | |
| 280 | 280 | // inject already minified code in optimized JS/CSS |
| 281 | 281 | protected function inject_minified($in) { |
| 282 | - if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) { |
|
| 282 | + if (strpos($in, '%%INJECTLATER%%') !== false) { |
|
| 283 | 283 | $out = preg_replace_callback( |
| 284 | 284 | '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is', |
| 285 | - function ($matches) {$filepath = base64_decode(strtok($matches[1], "|")); |
|
| 285 | + function($matches) {$filepath = base64_decode(strtok($matches[1], "|")); |
|
| 286 | 286 | $filecontent = file_get_contents($filepath); |
| 287 | 287 | |
| 288 | 288 | // remove BOM |
@@ -303,14 +303,14 @@ discard block |
||
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | if (get_option("autoptimize_js_trycatch") === "on") { |
| 306 | - $filecontent = "try{" . $filecontent . "}catch(e){}"; |
|
| 306 | + $filecontent = "try{".$filecontent."}catch(e){}"; |
|
| 307 | 307 | } |
| 308 | 308 | } else if ((substr($filepath, -4, 4) === ".css")) { |
| 309 | 309 | $filecontent = autoptimizeStyles::fixurls($filepath, $filecontent); |
| 310 | 310 | } else { |
| 311 | 311 | $filecontent = ""; |
| 312 | 312 | } |
| 313 | - return "\n" . $filecontent; |
|
| 313 | + return "\n".$filecontent; |
|
| 314 | 314 | }, |
| 315 | 315 | $in |
| 316 | 316 | ); |
@@ -322,49 +322,49 @@ discard block |
||
| 322 | 322 | |
| 323 | 323 | protected function minify_single($pathIn) { |
| 324 | 324 | // determine JS or CSS and set var (also mimetype), return false if neither |
| 325 | - if ( $this->str_ends_in($pathIn,".js") === true ) { |
|
| 326 | - $codeType="js"; |
|
| 327 | - $codeMime="text/javascript"; |
|
| 328 | - } else if ( $this->str_ends_in($pathIn,".css") === true ) { |
|
| 329 | - $codeType="css"; |
|
| 330 | - $codeMime="text/css"; |
|
| 325 | + if ($this->str_ends_in($pathIn, ".js") === true) { |
|
| 326 | + $codeType = "js"; |
|
| 327 | + $codeMime = "text/javascript"; |
|
| 328 | + } else if ($this->str_ends_in($pathIn, ".css") === true) { |
|
| 329 | + $codeType = "css"; |
|
| 330 | + $codeMime = "text/css"; |
|
| 331 | 331 | } else { |
| 332 | 332 | return false; |
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | // if min.js or min.css return false |
| 336 | - if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) { |
|
| 336 | + if (($this->str_ends_in($pathIn, "-min.".$codeType) === true) || ($this->str_ends_in($pathIn, ".min.".$codeType) === true) || ($this->str_ends_in($pathIn, "js/jquery/jquery.js") === true)) { |
|
| 337 | 337 | return false; |
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | // read file, return false if empty |
| 341 | 341 | $_toMinify = file_get_contents($pathIn); |
| 342 | - if ( empty($_toMinify) ) return false; |
|
| 342 | + if (empty($_toMinify)) return false; |
|
| 343 | 343 | |
| 344 | 344 | // check cache |
| 345 | 345 | $_md5hash = "single_".md5($_toMinify); |
| 346 | - $_cache = new autoptimizeCache($_md5hash,$codeType); |
|
| 347 | - if ($_cache->check() ) { |
|
| 346 | + $_cache = new autoptimizeCache($_md5hash, $codeType); |
|
| 347 | + if ($_cache->check()) { |
|
| 348 | 348 | $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
| 349 | 349 | } else { |
| 350 | 350 | // if not in cache first minify |
| 351 | 351 | $_Minified = $_toMinify; |
| 352 | 352 | if ($codeType === "js") { |
| 353 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 354 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 353 | + if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) { |
|
| 354 | + if (@is_callable(array("JSMin", "minify"))) { |
|
| 355 | 355 | $tmp_code = trim(JSMin::minify($_toMinify)); |
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | } else if ($codeType === "css") { |
| 359 | 359 | // make sure paths to background images/ imported css/ fonts .. are OK |
| 360 | - $_toMinify = autoptimizeStyles::fixurls($pathIn,$_toMinify); |
|
| 360 | + $_toMinify = autoptimizeStyles::fixurls($pathIn, $_toMinify); |
|
| 361 | 361 | if (class_exists('Minify_CSS_Compressor')) { |
| 362 | 362 | $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify)); |
| 363 | - } else if(class_exists('CSSmin')) { |
|
| 363 | + } else if (class_exists('CSSmin')) { |
|
| 364 | 364 | $cssmin = new CSSmin(); |
| 365 | - if (method_exists($cssmin,"run")) { |
|
| 365 | + if (method_exists($cssmin, "run")) { |
|
| 366 | 366 | $tmp_code = trim($cssmin->run($_toMinify)); |
| 367 | - } elseif (@is_callable(array($cssmin,"minify"))) { |
|
| 367 | + } elseif (@is_callable(array($cssmin, "minify"))) { |
|
| 368 | 368 | $tmp_code = trim(CssMin::minify($_toMinify)); |
| 369 | 369 | } |
| 370 | 370 | } |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | unset($tmp_code); |
| 375 | 375 | } |
| 376 | 376 | // and then cache |
| 377 | - $_cache->cache($_Minified,$codeMime); |
|
| 377 | + $_cache->cache($_Minified, $codeMime); |
|
| 378 | 378 | $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname(); |
| 379 | 379 | } |
| 380 | 380 | unset($_cache); |
@@ -385,10 +385,10 @@ discard block |
||
| 385 | 385 | return $_CachedMinifiedUrl; |
| 386 | 386 | } |
| 387 | 387 | |
| 388 | - protected function str_ends_in($haystack,$needle) { |
|
| 388 | + protected function str_ends_in($haystack, $needle) { |
|
| 389 | 389 | $needleLength = strlen($needle); |
| 390 | 390 | $haystackLength = strlen($haystack); |
| 391 | - $lastPos=strrpos($haystack,$needle); |
|
| 391 | + $lastPos = strrpos($haystack, $needle); |
|
| 392 | 392 | if ($lastPos === $haystackLength - $needleLength) { |
| 393 | 393 | return true; |
| 394 | 394 | } else { |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly
|
|
| 3 | 3 | |
| 4 | 4 | class autoptimizeStyles extends autoptimizeBase {
|
| 5 | 5 | |
@@ -23,62 +23,62 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | //Reads the page and collects style tags |
| 25 | 25 | public function read($options) {
|
| 26 | - $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content ); |
|
| 26 | + $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
|
|
| 27 | 27 | if ($noptimizeCSS) return false; |
| 28 | 28 | |
| 29 | - $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content ); |
|
| 29 | + $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content);
|
|
| 30 | 30 | if (!empty($whitelistCSS)) {
|
| 31 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));
|
|
| 31 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));
|
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - $removableCSS = apply_filters( 'autoptimize_filter_css_removables','' ); |
|
| 34 | + $removableCSS = apply_filters('autoptimize_filter_css_removables', '');
|
|
| 35 | 35 | if (!empty($removableCSS)) {
|
| 36 | - $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));
|
|
| 36 | + $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));
|
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);
|
|
| 39 | + $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
|
|
| 40 | 40 | |
| 41 | 41 | // filter to "late inject minified CSS", default to true for now (it is faster) |
| 42 | - $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);
|
|
| 42 | + $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
|
|
| 43 | 43 | |
| 44 | 44 | // Remove everything that's not the header |
| 45 | - if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {
|
|
| 46 | - $content = explode('</head>',$this->content,2);
|
|
| 45 | + if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {
|
|
| 46 | + $content = explode('</head>', $this->content, 2);
|
|
| 47 | 47 | $this->content = $content[0].'</head>'; |
| 48 | 48 | $this->restofcontent = $content[1]; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // include inline? |
| 52 | - if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {
|
|
| 52 | + if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {
|
|
| 53 | 53 | $this->include_inline = true; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // what CSS shouldn't be autoptimized |
| 57 | 57 | $excludeCSS = $options['css_exclude']; |
| 58 | - $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS, $this->content ); |
|
| 59 | - if ($excludeCSS!=="") {
|
|
| 60 | - $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));
|
|
| 58 | + $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS, $this->content);
|
|
| 59 | + if ($excludeCSS !== "") {
|
|
| 60 | + $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));
|
|
| 61 | 61 | } else {
|
| 62 | 62 | $this->dontmove = array(); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | // forcefully exclude CSS with data-noptimize attrib |
| 66 | - $this->dontmove[]="data-noptimize"; |
|
| 66 | + $this->dontmove[] = "data-noptimize"; |
|
| 67 | 67 | |
| 68 | 68 | // should we defer css? |
| 69 | 69 | // value: true/ false |
| 70 | 70 | $this->defer = $options['defer']; |
| 71 | - $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content ); |
|
| 71 | + $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);
|
|
| 72 | 72 | |
| 73 | 73 | // should we inline while deferring? |
| 74 | 74 | // value: inlined CSS |
| 75 | 75 | $this->defer_inline = $options['defer_inline']; |
| 76 | - $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content ); |
|
| 76 | + $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content);
|
|
| 77 | 77 | |
| 78 | 78 | // should we inline? |
| 79 | 79 | // value: true/ false |
| 80 | 80 | $this->inline = $options['inline']; |
| 81 | - $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content ); |
|
| 81 | + $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);
|
|
| 82 | 82 | |
| 83 | 83 | // get cdn url |
| 84 | 84 | $this->cdn_url = $options['cdn_url']; |
@@ -90,10 +90,10 @@ discard block |
||
| 90 | 90 | $this->content = $this->hide_noptimize($this->content); |
| 91 | 91 | |
| 92 | 92 | // exclude (no)script, as those may contain CSS which should be left as is |
| 93 | - if ( strpos( $this->content, '<script' ) !== false ) {
|
|
| 93 | + if (strpos($this->content, '<script') !== false) {
|
|
| 94 | 94 | $this->content = preg_replace_callback( |
| 95 | 95 | '#<(?:no)?script.*?<\/(?:no)?script>#is', |
| 96 | - function ($matches) {return "%%SCRIPT" . AUTOPTIMIZE_HASH . "%%" . base64_encode($matches[0]) . "%%SCRIPT%%";},
|
|
| 96 | + function($matches) {return "%%SCRIPT".AUTOPTIMIZE_HASH."%%".base64_encode($matches[0])."%%SCRIPT%%"; },
|
|
| 97 | 97 | $this->content |
| 98 | 98 | ); |
| 99 | 99 | } |
@@ -105,65 +105,65 @@ discard block |
||
| 105 | 105 | $this->content = $this->hide_comments($this->content); |
| 106 | 106 | |
| 107 | 107 | // Get <style> and <link> |
| 108 | - if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {
|
|
| 109 | - foreach($matches[0] as $tag) {
|
|
| 110 | - if ($this->isremovable($tag,$this->cssremovables)) {
|
|
| 111 | - $this->content = str_replace($tag,'',$this->content); |
|
| 108 | + if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
|
|
| 109 | + foreach ($matches[0] as $tag) {
|
|
| 110 | + if ($this->isremovable($tag, $this->cssremovables)) {
|
|
| 111 | + $this->content = str_replace($tag, '', $this->content); |
|
| 112 | 112 | } else if ($this->ismovable($tag)) {
|
| 113 | 113 | // Get the media |
| 114 | - if(strpos($tag,'media=')!==false) {
|
|
| 115 | - preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);
|
|
| 116 | - $medias = explode(',',$medias[1]);
|
|
| 114 | + if (strpos($tag, 'media=') !== false) {
|
|
| 115 | + preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
|
|
| 116 | + $medias = explode(',', $medias[1]);
|
|
| 117 | 117 | $media = array(); |
| 118 | - foreach($medias as $elem) {
|
|
| 119 | - if (empty($elem)) { $elem="all"; }
|
|
| 118 | + foreach ($medias as $elem) {
|
|
| 119 | + if (empty($elem)) { $elem = "all"; }
|
|
| 120 | 120 | $media[] = $elem; |
| 121 | 121 | } |
| 122 | 122 | } else {
|
| 123 | 123 | // No media specified - applies to all |
| 124 | 124 | $media = array('all');
|
| 125 | 125 | } |
| 126 | - $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag ); |
|
| 126 | + $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
|
|
| 127 | 127 | |
| 128 | - if(preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 128 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 129 | 129 | // <link> |
| 130 | - $explUrl = explode('?',$source[2],2);
|
|
| 130 | + $explUrl = explode('?', $source[2], 2);
|
|
| 131 | 131 | $url = $explUrl[0]; |
| 132 | 132 | $path = $this->getpath($url); |
| 133 | 133 | |
| 134 | - if($path!==false && preg_match('#\.css$#',$path)) {
|
|
| 134 | + if ($path !== false && preg_match('#\.css$#', $path)) {
|
|
| 135 | 135 | // Good link |
| 136 | - $this->css[] = array($media,$path); |
|
| 137 | - }else{
|
|
| 136 | + $this->css[] = array($media, $path); |
|
| 137 | + } else {
|
|
| 138 | 138 | // Link is dynamic (.php etc) |
| 139 | 139 | $tag = ''; |
| 140 | 140 | } |
| 141 | 141 | } else {
|
| 142 | 142 | // inline css in style tags can be wrapped in comment tags, so restore comments |
| 143 | 143 | $tag = $this->restore_comments($tag); |
| 144 | - preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);
|
|
| 144 | + preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
|
|
| 145 | 145 | |
| 146 | 146 | // and re-hide them to be able to to the removal based on tag |
| 147 | 147 | $tag = $this->hide_comments($tag); |
| 148 | 148 | |
| 149 | - if ( $this->include_inline ) {
|
|
| 150 | - $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);
|
|
| 151 | - $this->css[] = array($media,'INLINE;'.$code); |
|
| 149 | + if ($this->include_inline) {
|
|
| 150 | + $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
|
|
| 151 | + $this->css[] = array($media, 'INLINE;'.$code); |
|
| 152 | 152 | } else {
|
| 153 | 153 | $tag = ''; |
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | // Remove the original style tag |
| 158 | - $this->content = str_replace($tag,'',$this->content); |
|
| 158 | + $this->content = str_replace($tag, '', $this->content); |
|
| 159 | 159 | } else {
|
| 160 | 160 | // excluded CSS, minify if getpath |
| 161 | - if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 162 | - $explUrl = explode('?',$source[2],2);
|
|
| 161 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 162 | + $explUrl = explode('?', $source[2], 2);
|
|
| 163 | 163 | $url = $explUrl[0]; |
| 164 | 164 | $path = $this->getpath($url); |
| 165 | 165 | |
| 166 | - if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
|
|
| 166 | + if ($path && apply_filters('autoptimize_filter_css_minify_excluded', false)) {
|
|
| 167 | 167 | $_CachedMinifiedUrl = $this->minify_single($path); |
| 168 | 168 | |
| 169 | 169 | if (!empty($_CachedMinifiedUrl)) {
|
@@ -174,12 +174,12 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | // remove querystring from URL |
| 177 | - if ( !empty($explUrl[1]) ) {
|
|
| 178 | - $newTag = str_replace("?".$explUrl[1],"",$newTag);
|
|
| 177 | + if (!empty($explUrl[1])) {
|
|
| 178 | + $newTag = str_replace("?".$explUrl[1], "", $newTag);
|
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | // and replace |
| 182 | - $this->content = str_replace($tag,$newTag,$this->content); |
|
| 182 | + $this->content = str_replace($tag, $newTag, $this->content); |
|
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | } |
@@ -192,31 +192,31 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | // Joins and optimizes CSS |
| 194 | 194 | public function minify() {
|
| 195 | - foreach($this->css as $group) {
|
|
| 196 | - list($media,$css) = $group; |
|
| 197 | - if(preg_match('#^INLINE;#',$css)) {
|
|
| 195 | + foreach ($this->css as $group) {
|
|
| 196 | + list($media, $css) = $group; |
|
| 197 | + if (preg_match('#^INLINE;#', $css)) {
|
|
| 198 | 198 | // <style> |
| 199 | - $css = preg_replace('#^INLINE;#','',$css);
|
|
| 200 | - $css = $this->fixurls(ABSPATH.'/index.php',$css); |
|
| 201 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" ); |
|
| 202 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {
|
|
| 203 | - $css=$tmpstyle; |
|
| 204 | - $this->alreadyminified=true; |
|
| 199 | + $css = preg_replace('#^INLINE;#', '', $css);
|
|
| 200 | + $css = $this->fixurls(ABSPATH.'/index.php', $css); |
|
| 201 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");
|
|
| 202 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 203 | + $css = $tmpstyle; |
|
| 204 | + $this->alreadyminified = true; |
|
| 205 | 205 | } |
| 206 | 206 | } else {
|
| 207 | 207 | //<link> |
| 208 | - if($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 208 | + if ($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 209 | 209 | $cssPath = $css; |
| 210 | 210 | $cssContents = file_get_contents($cssPath); |
| 211 | 211 | $cssHash = md5($cssContents); |
| 212 | - $css = $this->fixurls($cssPath,$cssContents); |
|
| 213 | - $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);
|
|
| 214 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath ); |
|
| 212 | + $css = $this->fixurls($cssPath, $cssContents); |
|
| 213 | + $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
|
|
| 214 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
|
|
| 215 | 215 | if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
| 216 | - $css=$tmpstyle; |
|
| 217 | - $this->alreadyminified=true; |
|
| 218 | - } else if ($this->can_inject_late($cssPath,$css)) {
|
|
| 219 | - $css="/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/"; |
|
| 216 | + $css = $tmpstyle; |
|
| 217 | + $this->alreadyminified = true; |
|
| 218 | + } else if ($this->can_inject_late($cssPath, $css)) {
|
|
| 219 | + $css = "/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/"; |
|
| 220 | 220 | } |
| 221 | 221 | } else {
|
| 222 | 222 | // Couldn't read CSS. Maybe getpath isn't working? |
@@ -224,8 +224,8 @@ discard block |
||
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | 226 | |
| 227 | - foreach($media as $elem) {
|
|
| 228 | - if(!isset($this->csscode[$elem])) |
|
| 227 | + foreach ($media as $elem) {
|
|
| 228 | + if (!isset($this->csscode[$elem])) |
|
| 229 | 229 | $this->csscode[$elem] = ''; |
| 230 | 230 | $this->csscode[$elem] .= "\n/*FILESTART*/".$css; |
| 231 | 231 | } |
@@ -234,12 +234,12 @@ discard block |
||
| 234 | 234 | // Check for duplicate code |
| 235 | 235 | $md5list = array(); |
| 236 | 236 | $tmpcss = $this->csscode; |
| 237 | - foreach($tmpcss as $media => $code) {
|
|
| 237 | + foreach ($tmpcss as $media => $code) {
|
|
| 238 | 238 | $md5sum = md5($code); |
| 239 | 239 | $medianame = $media; |
| 240 | - foreach($md5list as $med => $sum) {
|
|
| 240 | + foreach ($md5list as $med => $sum) {
|
|
| 241 | 241 | // If same code |
| 242 | - if($sum === $md5sum) {
|
|
| 242 | + if ($sum === $md5sum) {
|
|
| 243 | 243 | //Add the merged code |
| 244 | 244 | $medianame = $med.', '.$media; |
| 245 | 245 | $this->csscode[$medianame] = $code; |
@@ -259,30 +259,30 @@ discard block |
||
| 259 | 259 | $external_imports = ""; |
| 260 | 260 | |
| 261 | 261 | // remove comments to avoid importing commented-out imports |
| 262 | - $thiscss_nocomments = preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 262 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 263 | 263 | |
| 264 | - while(preg_match_all('#@import +(?:url)?(?:(?:\\(([\"\']?)(?:[^\"\')]+)\\1\\)|([\"\'])(?:[^\"\']+)\\2)(?:[^,;\"\']+(?:,[^,;\"\']+)*)?)(?:;)#m',$thiscss_nocomments,$matches)) {
|
|
| 265 | - foreach($matches[0] as $import) {
|
|
| 266 | - if ($this->isremovable($import,$this->cssremovables)) {
|
|
| 267 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 264 | + while (preg_match_all('#@import +(?:url)?(?:(?:\\(([\"\']?)(?:[^\"\')]+)\\1\\)|([\"\'])(?:[^\"\']+)\\2)(?:[^,;\"\']+(?:,[^,;\"\']+)*)?)(?:;)#m', $thiscss_nocomments, $matches)) {
|
|
| 265 | + foreach ($matches[0] as $import) {
|
|
| 266 | + if ($this->isremovable($import, $this->cssremovables)) {
|
|
| 267 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 268 | 268 | $import_ok = true; |
| 269 | 269 | } else {
|
| 270 | - $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");
|
|
| 270 | + $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
|
|
| 271 | 271 | $path = $this->getpath($url); |
| 272 | 272 | $import_ok = false; |
| 273 | 273 | if (file_exists($path) && is_readable($path)) {
|
| 274 | - $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\"); |
|
| 275 | - $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);
|
|
| 276 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" ); |
|
| 277 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 278 | - $code=$tmpstyle; |
|
| 279 | - $this->alreadyminified=true; |
|
| 280 | - } else if ($this->can_inject_late($path,$code)) {
|
|
| 281 | - $code="/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/"; |
|
| 274 | + $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\"); |
|
| 275 | + $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
|
|
| 276 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");
|
|
| 277 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 278 | + $code = $tmpstyle; |
|
| 279 | + $this->alreadyminified = true; |
|
| 280 | + } else if ($this->can_inject_late($path, $code)) {
|
|
| 281 | + $code = "/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/"; |
|
| 282 | 282 | } |
| 283 | 283 | |
| 284 | - if(!empty($code)) {
|
|
| 285 | - $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);
|
|
| 284 | + if (!empty($code)) {
|
|
| 285 | + $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
|
|
| 286 | 286 | if (!empty($tmp_thiscss)) {
|
| 287 | 287 | $thiscss = $tmp_thiscss; |
| 288 | 288 | $import_ok = true; |
@@ -296,31 +296,31 @@ discard block |
||
| 296 | 296 | if (!$import_ok) {
|
| 297 | 297 | // external imports and general fall-back |
| 298 | 298 | $external_imports .= $import; |
| 299 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 299 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 300 | 300 | $fiximports = true; |
| 301 | 301 | } |
| 302 | 302 | } |
| 303 | - $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);
|
|
| 304 | - $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);
|
|
| 303 | + $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
|
|
| 304 | + $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
|
|
| 305 | 305 | |
| 306 | 306 | // and update $thiscss_nocomments before going into next iteration in while loop |
| 307 | - $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 307 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 308 | 308 | } |
| 309 | 309 | unset($thiscss_nocomments); |
| 310 | 310 | |
| 311 | 311 | // add external imports to top of aggregated CSS |
| 312 | - if($fiximports) {
|
|
| 313 | - $thiscss=$external_imports.$thiscss; |
|
| 312 | + if ($fiximports) {
|
|
| 313 | + $thiscss = $external_imports.$thiscss; |
|
| 314 | 314 | } |
| 315 | 315 | } |
| 316 | 316 | unset($thiscss); |
| 317 | 317 | // $this->csscode has all the uncompressed code now. |
| 318 | - foreach($this->csscode as &$code) {
|
|
| 318 | + foreach ($this->csscode as &$code) {
|
|
| 319 | 319 | // Check for already-minified code |
| 320 | 320 | $hash = md5($code); |
| 321 | - do_action( 'autoptimize_action_css_hash', $hash ); |
|
| 322 | - $ccheck = new autoptimizeCache($hash,'css'); |
|
| 323 | - if($ccheck->check()) {
|
|
| 321 | + do_action('autoptimize_action_css_hash', $hash);
|
|
| 322 | + $ccheck = new autoptimizeCache($hash, 'css'); |
|
| 323 | + if ($ccheck->check()) {
|
|
| 324 | 324 | $code = $ccheck->retrieve(); |
| 325 | 325 | $this->hashmap[md5($code)] = $hash; |
| 326 | 326 | continue; |
@@ -329,44 +329,44 @@ discard block |
||
| 329 | 329 | |
| 330 | 330 | // Do the imaging! |
| 331 | 331 | $imgreplace = array(); |
| 332 | - preg_match_all( self::ASSETS_REGEX, $code, $matches ); |
|
| 332 | + preg_match_all(self::ASSETS_REGEX, $code, $matches); |
|
| 333 | 333 | |
| 334 | - if ( ($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches)) ) {
|
|
| 335 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 336 | - $iurl = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 334 | + if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
|
|
| 335 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 336 | + $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 337 | 337 | |
| 338 | 338 | // if querystring, remove it from url |
| 339 | - if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }
|
|
| 339 | + if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }
|
|
| 340 | 340 | |
| 341 | 341 | $ipath = $this->getpath($iurl); |
| 342 | 342 | |
| 343 | 343 | $datauri_max_size = 4096; |
| 344 | - $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size ); |
|
| 345 | - $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', ""); |
|
| 344 | + $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);
|
|
| 345 | + $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");
|
|
| 346 | 346 | if (!empty($datauri_exclude)) {
|
| 347 | - $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));
|
|
| 347 | + $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));
|
|
| 348 | 348 | foreach ($no_datauris as $no_datauri) {
|
| 349 | - if (strpos($iurl,$no_datauri)!==false) {
|
|
| 350 | - $ipath=false; |
|
| 349 | + if (strpos($iurl, $no_datauri) !== false) {
|
|
| 350 | + $ipath = false; |
|
| 351 | 351 | break; |
| 352 | 352 | } |
| 353 | 353 | } |
| 354 | 354 | } |
| 355 | 355 | |
| 356 | - if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 357 | - $ihash=md5($ipath); |
|
| 358 | - $icheck = new autoptimizeCache($ihash,'img'); |
|
| 359 | - if($icheck->check()) {
|
|
| 356 | + if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 357 | + $ihash = md5($ipath); |
|
| 358 | + $icheck = new autoptimizeCache($ihash, 'img'); |
|
| 359 | + if ($icheck->check()) {
|
|
| 360 | 360 | // we have the base64 image in cache |
| 361 | - $headAndData=$icheck->retrieve(); |
|
| 362 | - $_base64data=explode(";base64,",$headAndData);
|
|
| 363 | - $base64data=$_base64data[1]; |
|
| 361 | + $headAndData = $icheck->retrieve(); |
|
| 362 | + $_base64data = explode(";base64,", $headAndData);
|
|
| 363 | + $base64data = $_base64data[1]; |
|
| 364 | 364 | } else {
|
| 365 | 365 | // It's an image and we don't have it in cache, get the type |
| 366 | - $explA=explode('.',$ipath);
|
|
| 367 | - $type=end($explA); |
|
| 366 | + $explA = explode('.', $ipath);
|
|
| 367 | + $type = end($explA); |
|
| 368 | 368 | |
| 369 | - switch($type) {
|
|
| 369 | + switch ($type) {
|
|
| 370 | 370 | case 'jpeg': |
| 371 | 371 | $dataurihead = 'data:image/jpeg;base64,'; |
| 372 | 372 | break; |
@@ -388,42 +388,42 @@ discard block |
||
| 388 | 388 | |
| 389 | 389 | // Encode the data |
| 390 | 390 | $base64data = base64_encode(file_get_contents($ipath)); |
| 391 | - $headAndData=$dataurihead.$base64data; |
|
| 391 | + $headAndData = $dataurihead.$base64data; |
|
| 392 | 392 | |
| 393 | 393 | // Save in cache |
| 394 | - $icheck->cache($headAndData,"text/plain"); |
|
| 394 | + $icheck->cache($headAndData, "text/plain"); |
|
| 395 | 395 | } |
| 396 | 396 | unset($icheck); |
| 397 | 397 | |
| 398 | 398 | // Add it to the list for replacement |
| 399 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]); |
|
| 399 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]); |
|
| 400 | 400 | } else {
|
| 401 | 401 | // just cdn the URL if applicable |
| 402 | 402 | if (!empty($this->cdn_url)) {
|
| 403 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 403 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 404 | 404 | } |
| 405 | 405 | } |
| 406 | 406 | } |
| 407 | 407 | } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
|
| 408 | 408 | // change urls to cdn-url |
| 409 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 410 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 409 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 410 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 411 | 411 | } |
| 412 | 412 | } |
| 413 | 413 | |
| 414 | - if(!empty($imgreplace)) {
|
|
| 415 | - $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code); |
|
| 414 | + if (!empty($imgreplace)) {
|
|
| 415 | + $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code); |
|
| 416 | 416 | } |
| 417 | 417 | |
| 418 | 418 | // Minify |
| 419 | - if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {
|
|
| 419 | + if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {
|
|
| 420 | 420 | if (class_exists('Minify_CSS_Compressor')) {
|
| 421 | 421 | $tmp_code = trim(Minify_CSS_Compressor::process($code)); |
| 422 | - } else if(class_exists('CSSmin')) {
|
|
| 422 | + } else if (class_exists('CSSmin')) {
|
|
| 423 | 423 | $cssmin = new CSSmin(); |
| 424 | - if (method_exists($cssmin,"run")) {
|
|
| 424 | + if (method_exists($cssmin, "run")) {
|
|
| 425 | 425 | $tmp_code = trim($cssmin->run($code)); |
| 426 | - } elseif (@is_callable(array($cssmin,"minify"))) {
|
|
| 426 | + } elseif (@is_callable(array($cssmin, "minify"))) {
|
|
| 427 | 427 | $tmp_code = trim(CssMin::minify($code)); |
| 428 | 428 | } |
| 429 | 429 | } |
@@ -435,7 +435,7 @@ discard block |
||
| 435 | 435 | |
| 436 | 436 | $code = $this->inject_minified($code); |
| 437 | 437 | |
| 438 | - $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code ); |
|
| 438 | + $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
|
|
| 439 | 439 | if (!empty($tmp_code)) {
|
| 440 | 440 | $code = $tmp_code; |
| 441 | 441 | unset($tmp_code); |
@@ -450,13 +450,13 @@ discard block |
||
| 450 | 450 | //Caches the CSS in uncompressed, deflated and gzipped form. |
| 451 | 451 | public function cache() {
|
| 452 | 452 | // CSS cache |
| 453 | - foreach($this->csscode as $media => $code) {
|
|
| 453 | + foreach ($this->csscode as $media => $code) {
|
|
| 454 | 454 | $md5 = $this->hashmap[md5($code)]; |
| 455 | 455 | |
| 456 | - $cache = new autoptimizeCache($md5,'css'); |
|
| 457 | - if(!$cache->check()) {
|
|
| 456 | + $cache = new autoptimizeCache($md5, 'css'); |
|
| 457 | + if (!$cache->check()) {
|
|
| 458 | 458 | // Cache our code |
| 459 | - $cache->cache($code,'text/css'); |
|
| 459 | + $cache->cache($code, 'text/css'); |
|
| 460 | 460 | } |
| 461 | 461 | $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 462 | 462 | } |
@@ -471,10 +471,10 @@ discard block |
||
| 471 | 471 | $this->content = $this->restore_comments($this->content); |
| 472 | 472 | |
| 473 | 473 | // restore (no)script |
| 474 | - if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) {
|
|
| 474 | + if (strpos($this->content, '%%SCRIPT%%') !== false) {
|
|
| 475 | 475 | $this->content = preg_replace_callback( |
| 476 | 476 | '#%%SCRIPT'.AUTOPTIMIZE_HASH.'%%(.*?)%%SCRIPT%%#is', |
| 477 | - function ($matches) {return base64_decode($matches[1]);},
|
|
| 477 | + function($matches) {return base64_decode($matches[1]); },
|
|
| 478 | 478 | $this->content |
| 479 | 479 | ); |
| 480 | 480 | } |
@@ -483,55 +483,55 @@ discard block |
||
| 483 | 483 | $this->content = $this->restore_noptimize($this->content); |
| 484 | 484 | |
| 485 | 485 | //Restore the full content |
| 486 | - if(!empty($this->restofcontent)) {
|
|
| 486 | + if (!empty($this->restofcontent)) {
|
|
| 487 | 487 | $this->content .= $this->restofcontent; |
| 488 | 488 | $this->restofcontent = ''; |
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | // Inject the new stylesheets |
| 492 | - $replaceTag = array("<title","before");
|
|
| 493 | - $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content ); |
|
| 492 | + $replaceTag = array("<title", "before");
|
|
| 493 | + $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content);
|
|
| 494 | 494 | |
| 495 | 495 | if ($this->inline == true) {
|
| 496 | - foreach($this->csscode as $media => $code) {
|
|
| 497 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);
|
|
| 496 | + foreach ($this->csscode as $media => $code) {
|
|
| 497 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
|
|
| 498 | 498 | } |
| 499 | 499 | } else {
|
| 500 | 500 | if ($this->defer == true) {
|
| 501 | 501 | $preloadCssBlock = ""; |
| 502 | 502 | $noScriptCssBlock = "<noscript id=\"aonoscrcss\">"; |
| 503 | - $defer_inline_code=$this->defer_inline; |
|
| 504 | - if(!empty($defer_inline_code)){
|
|
| 505 | - if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
|
|
| 503 | + $defer_inline_code = $this->defer_inline; |
|
| 504 | + if (!empty($defer_inline_code)) {
|
|
| 505 | + if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
|
|
| 506 | 506 | $iCssHash = md5($defer_inline_code); |
| 507 | - $iCssCache = new autoptimizeCache($iCssHash,'css'); |
|
| 508 | - if($iCssCache->check()) {
|
|
| 507 | + $iCssCache = new autoptimizeCache($iCssHash, 'css'); |
|
| 508 | + if ($iCssCache->check()) {
|
|
| 509 | 509 | // we have the optimized inline CSS in cache |
| 510 | - $defer_inline_code=$iCssCache->retrieve(); |
|
| 510 | + $defer_inline_code = $iCssCache->retrieve(); |
|
| 511 | 511 | } else {
|
| 512 | 512 | if (class_exists('Minify_CSS_Compressor')) {
|
| 513 | 513 | $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code)); |
| 514 | - } else if(class_exists('CSSmin')) {
|
|
| 514 | + } else if (class_exists('CSSmin')) {
|
|
| 515 | 515 | $cssmin = new CSSmin(); |
| 516 | 516 | $tmp_code = trim($cssmin->run($defer_inline_code)); |
| 517 | 517 | } |
| 518 | 518 | if (!empty($tmp_code)) {
|
| 519 | 519 | $defer_inline_code = $tmp_code; |
| 520 | - $iCssCache->cache($defer_inline_code,"text/css"); |
|
| 520 | + $iCssCache->cache($defer_inline_code, "text/css"); |
|
| 521 | 521 | unset($tmp_code); |
| 522 | 522 | } |
| 523 | 523 | } |
| 524 | 524 | } |
| 525 | - $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 526 | - $this->inject_in_html($code_out,$replaceTag); |
|
| 525 | + $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 526 | + $this->inject_in_html($code_out, $replaceTag); |
|
| 527 | 527 | } |
| 528 | 528 | } |
| 529 | 529 | |
| 530 | - foreach($this->url as $media => $url) {
|
|
| 530 | + foreach ($this->url as $media => $url) {
|
|
| 531 | 531 | $url = $this->url_replace_cdn($url); |
| 532 | 532 | |
| 533 | 533 | //Add the stylesheet either deferred (import at bottom) or normal links in head |
| 534 | - if($this->defer == true) {
|
|
| 534 | + if ($this->defer == true) {
|
|
| 535 | 535 | |
| 536 | 536 | // Filter to modify the onload attribute - passes value and the stylesheet url |
| 537 | 537 | $preloadOnLoad = apply_filters('autoptimize_filter_css_preload_onload', "this.onload=null;this.rel='stylesheet'", $url);
|
@@ -541,22 +541,22 @@ discard block |
||
| 541 | 541 | |
| 542 | 542 | } else {
|
| 543 | 543 | if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
|
| 544 | - $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);
|
|
| 545 | - } else if (strlen($this->csscode[$media])>0) {
|
|
| 546 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);
|
|
| 544 | + $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
|
|
| 545 | + } else if (strlen($this->csscode[$media]) > 0) {
|
|
| 546 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
|
|
| 547 | 547 | } |
| 548 | 548 | } |
| 549 | 549 | } |
| 550 | 550 | |
| 551 | - if($this->defer == true) {
|
|
| 551 | + if ($this->defer == true) {
|
|
| 552 | 552 | $preloadPolyfill = '<script data-cfasync=\'false\'>!function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){function e(){t.media=a}var a=t.media||"all";t.addEventListener?t.addEventListener("load",e):t.attachEvent&&t.attachEvent("onload",e),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(e,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script>';
|
| 553 | 553 | $noScriptCssBlock .= "</noscript>"; |
| 554 | - $this->inject_in_html($preloadCssBlock.$noScriptCssBlock,$replaceTag); |
|
| 554 | + $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag); |
|
| 555 | 555 | |
| 556 | 556 | // Adds preload polyfill at end of body tag |
| 557 | 557 | $this->inject_in_html( |
| 558 | 558 | apply_filters('autoptimize_css_preload_polyfill', $preloadPolyfill),
|
| 559 | - array('</body>','before')
|
|
| 559 | + array('</body>', 'before')
|
|
| 560 | 560 | ); |
| 561 | 561 | } |
| 562 | 562 | } |
@@ -567,62 +567,62 @@ discard block |
||
| 567 | 567 | |
| 568 | 568 | static function fixurls($file, $code) {
|
| 569 | 569 | // Switch all imports to the url() syntax |
| 570 | - $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code );
|
|
| 570 | + $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code);
|
|
| 571 | 571 | |
| 572 | - if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
|
|
| 573 | - $file = str_replace( WP_ROOT_DIR, '/', $file ); |
|
| 574 | - $dir = dirname( $file ); // Like /themes/expound/css |
|
| 572 | + if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
|
|
| 573 | + $file = str_replace(WP_ROOT_DIR, '/', $file); |
|
| 574 | + $dir = dirname($file); // Like /themes/expound/css |
|
| 575 | 575 | |
| 576 | 576 | // $dir should not contain backslashes, since it's used to replace |
| 577 | 577 | // urls, but it can contain them when running on Windows because |
| 578 | 578 | // fixurls() is sometimes called with `ABSPATH . 'index.php'` |
| 579 | - $dir = str_replace( '\\', '/', $dir ); |
|
| 580 | - unset( $file ); // not used below at all |
|
| 579 | + $dir = str_replace('\\', '/', $dir);
|
|
| 580 | + unset($file); // not used below at all |
|
| 581 | 581 | |
| 582 | 582 | $replace = array(); |
| 583 | - foreach ( $matches[1] as $k => $url ) {
|
|
| 583 | + foreach ($matches[1] as $k => $url) {
|
|
| 584 | 584 | // Remove quotes |
| 585 | - $url = trim( $url," \t\n\r\0\x0B\"'" ); |
|
| 586 | - $noQurl = trim( $url, "\"'" ); |
|
| 587 | - if ( $url !== $noQurl ) {
|
|
| 585 | + $url = trim($url, " \t\n\r\0\x0B\"'"); |
|
| 586 | + $noQurl = trim($url, "\"'"); |
|
| 587 | + if ($url !== $noQurl) {
|
|
| 588 | 588 | $removedQuotes = true; |
| 589 | 589 | } else {
|
| 590 | 590 | $removedQuotes = false; |
| 591 | 591 | } |
| 592 | 592 | |
| 593 | - if ( '' === $noQurl ) {
|
|
| 593 | + if ('' === $noQurl) {
|
|
| 594 | 594 | continue; |
| 595 | 595 | } |
| 596 | 596 | |
| 597 | 597 | $url = $noQurl; |
| 598 | - if ( '/' === $url{0} || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) {
|
|
| 598 | + if ('/' === $url{0} || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
|
|
| 599 | 599 | // URL is protocol-relative, host-relative or something we don't touch |
| 600 | 600 | continue; |
| 601 | 601 | } else {
|
| 602 | 602 | // Relative URL |
| 603 | - $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) ); |
|
| 603 | + $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
|
|
| 604 | 604 | |
| 605 | 605 | // Hash the url + whatever was behind potentially for replacement |
| 606 | 606 | // We must do this, or different css classes referencing the same bg image (but |
| 607 | 607 | // different parts of it, say, in sprites and such) loose their stuff... |
| 608 | - $hash = md5( $url . $matches[2][$k] ); |
|
| 609 | - $code = str_replace( $matches[0][$k], $hash, $code ); |
|
| 608 | + $hash = md5($url.$matches[2][$k]); |
|
| 609 | + $code = str_replace($matches[0][$k], $hash, $code); |
|
| 610 | 610 | |
| 611 | - if ( $removedQuotes ) {
|
|
| 612 | - $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k];
|
|
| 611 | + if ($removedQuotes) {
|
|
| 612 | + $replace[$hash] = "url('".$newurl."')".$matches[2][$k];
|
|
| 613 | 613 | } else {
|
| 614 | - $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k];
|
|
| 614 | + $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];
|
|
| 615 | 615 | } |
| 616 | 616 | } |
| 617 | 617 | } |
| 618 | 618 | |
| 619 | - if ( ! empty( $replace ) ) {
|
|
| 619 | + if (!empty($replace)) {
|
|
| 620 | 620 | // Sort the replacements array by key length in desc order (so that the longest strings are replaced first) |
| 621 | - $keys = array_map( 'strlen', array_keys( $replace ) ); |
|
| 622 | - array_multisort( $keys, SORT_DESC, $replace ); |
|
| 621 | + $keys = array_map('strlen', array_keys($replace));
|
|
| 622 | + array_multisort($keys, SORT_DESC, $replace); |
|
| 623 | 623 | |
| 624 | 624 | // Replace URLs found within $code |
| 625 | - $code = str_replace( array_keys( $replace ), array_values( $replace ), $code ); |
|
| 625 | + $code = str_replace(array_keys($replace), array_values($replace), $code); |
|
| 626 | 626 | } |
| 627 | 627 | } |
| 628 | 628 | |
@@ -630,11 +630,11 @@ discard block |
||
| 630 | 630 | } |
| 631 | 631 | |
| 632 | 632 | private function ismovable($tag) {
|
| 633 | - if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
|
|
| 633 | + if (apply_filters('autoptimize_filter_css_dontaggregate', false)) {
|
|
| 634 | 634 | return false; |
| 635 | 635 | } else if (!empty($this->whitelist)) {
|
| 636 | 636 | foreach ($this->whitelist as $match) {
|
| 637 | - if(strpos($tag,$match)!==false) {
|
|
| 637 | + if (strpos($tag, $match) !== false) {
|
|
| 638 | 638 | return true; |
| 639 | 639 | } |
| 640 | 640 | } |
@@ -642,8 +642,8 @@ discard block |
||
| 642 | 642 | return false; |
| 643 | 643 | } else {
|
| 644 | 644 | if (is_array($this->dontmove)) {
|
| 645 | - foreach($this->dontmove as $match) {
|
|
| 646 | - if(strpos($tag,$match)!==false) {
|
|
| 645 | + foreach ($this->dontmove as $match) {
|
|
| 646 | + if (strpos($tag, $match) !== false) {
|
|
| 647 | 647 | //Matched something |
| 648 | 648 | return false; |
| 649 | 649 | } |
@@ -655,21 +655,21 @@ discard block |
||
| 655 | 655 | } |
| 656 | 656 | } |
| 657 | 657 | |
| 658 | - private function can_inject_late($cssPath,$css) {
|
|
| 658 | + private function can_inject_late($cssPath, $css) {
|
|
| 659 | 659 | $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
|
| 660 | - if ( $this->inject_min_late !== true ) {
|
|
| 660 | + if ($this->inject_min_late !== true) {
|
|
| 661 | 661 | // late-inject turned off |
| 662 | 662 | return false; |
| 663 | - } else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {
|
|
| 663 | + } else if ((strpos($cssPath, "min.css") === false) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) {
|
|
| 664 | 664 | // file not minified based on filename & filter |
| 665 | 665 | return false; |
| 666 | - } else if ( strpos($css,"@import") !== false ) {
|
|
| 666 | + } else if (strpos($css, "@import") !== false) {
|
|
| 667 | 667 | // can't late-inject files with imports as those need to be aggregated |
| 668 | 668 | return false; |
| 669 | - } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {
|
|
| 669 | + } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {
|
|
| 670 | 670 | // don't late-inject CSS with font-src's if fonts are set to be CDN'ed |
| 671 | 671 | return false; |
| 672 | - } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {
|
|
| 672 | + } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {
|
|
| 673 | 673 | // don't late-inject CSS with images if CDN is set OR is image inlining is on |
| 674 | 674 | return false; |
| 675 | 675 | } else {
|
@@ -679,11 +679,11 @@ discard block |
||
| 679 | 679 | } |
| 680 | 680 | |
| 681 | 681 | private function maybe_cdn_urls($inUrl) {
|
| 682 | - $url = trim($inUrl," \t\n\r\0\x0B\"'"); |
|
| 683 | - $urlPath = parse_url($url,PHP_URL_PATH); |
|
| 682 | + $url = trim($inUrl, " \t\n\r\0\x0B\"'"); |
|
| 683 | + $urlPath = parse_url($url, PHP_URL_PATH); |
|
| 684 | 684 | |
| 685 | 685 | // exclude fonts from CDN except if filter returns true |
| 686 | - if ( !preg_match('#\.(woff2?|eot|ttf|otf)$#i',$urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn',false) ) {
|
|
| 686 | + if (!preg_match('#\.(woff2?|eot|ttf|otf)$#i', $urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn', false)) {
|
|
| 687 | 687 | $cdn_url = $this->url_replace_cdn($url); |
| 688 | 688 | } else {
|
| 689 | 689 | $cdn_url = $url; |
