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