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 | class autoptimizeStyles extends autoptimizeBase {
|
| 5 | 5 | |
@@ -24,12 +24,12 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | //Reads the page and collects style tags |
| 26 | 26 | public function read($options) {
|
| 27 | - $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content ); |
|
| 27 | + $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
|
|
| 28 | 28 | if ($noptimizeCSS) return false; |
| 29 | 29 | |
| 30 | - $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '' ); |
|
| 30 | + $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '');
|
|
| 31 | 31 | if (!empty($whitelistCSS)) {
|
| 32 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));
|
|
| 32 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));
|
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | if ($options['nogooglefont'] == true) {
|
@@ -37,33 +37,33 @@ discard block |
||
| 37 | 37 | } else {
|
| 38 | 38 | $removableCSS = ""; |
| 39 | 39 | } |
| 40 | - $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS); |
|
| 40 | + $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);
|
|
| 41 | 41 | if (!empty($removableCSS)) {
|
| 42 | - $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));
|
|
| 42 | + $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));
|
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);
|
|
| 45 | + $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
|
|
| 46 | 46 | |
| 47 | 47 | // filter to "late inject minified CSS", default to true for now (it is faster) |
| 48 | - $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);
|
|
| 48 | + $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
|
|
| 49 | 49 | |
| 50 | 50 | // Remove everything that's not the header |
| 51 | - if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {
|
|
| 52 | - $content = explode('</head>',$this->content,2);
|
|
| 51 | + if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {
|
|
| 52 | + $content = explode('</head>', $this->content, 2);
|
|
| 53 | 53 | $this->content = $content[0].'</head>'; |
| 54 | 54 | $this->restofcontent = $content[1]; |
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | // include inline? |
| 58 | - if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {
|
|
| 58 | + if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {
|
|
| 59 | 59 | $this->include_inline = true; |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | // what CSS shouldn't be autoptimized |
| 63 | 63 | $excludeCSS = $options['css_exclude']; |
| 64 | - $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS ); |
|
| 65 | - if ($excludeCSS!=="") {
|
|
| 66 | - $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));
|
|
| 64 | + $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS);
|
|
| 65 | + if ($excludeCSS !== "") {
|
|
| 66 | + $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));
|
|
| 67 | 67 | } else {
|
| 68 | 68 | $this->dontmove = ""; |
| 69 | 69 | } |
@@ -71,17 +71,17 @@ discard block |
||
| 71 | 71 | // should we defer css? |
| 72 | 72 | // value: true/ false |
| 73 | 73 | $this->defer = $options['defer']; |
| 74 | - $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer ); |
|
| 74 | + $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer);
|
|
| 75 | 75 | |
| 76 | 76 | // should we inline while deferring? |
| 77 | 77 | // value: inlined CSS |
| 78 | 78 | $this->defer_inline = $options['defer_inline']; |
| 79 | - $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline ); |
|
| 79 | + $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline);
|
|
| 80 | 80 | |
| 81 | 81 | // should we inline? |
| 82 | 82 | // value: true/ false |
| 83 | 83 | $this->inline = $options['inline']; |
| 84 | - $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline ); |
|
| 84 | + $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline);
|
|
| 85 | 85 | |
| 86 | 86 | // get cdn url |
| 87 | 87 | $this->cdn_url = $options['cdn_url']; |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | $this->content = $this->hide_noptimize($this->content); |
| 94 | 94 | |
| 95 | 95 | // exclude (no)script, as those may contain CSS which should be left as is |
| 96 | - if ( strpos( $this->content, '<script' ) !== false ) {
|
|
| 96 | + if (strpos($this->content, '<script') !== false) {
|
|
| 97 | 97 | $this->content = preg_replace_callback( |
| 98 | 98 | '#<(?:no)?script.*?<\/(?:no)?script>#is', |
| 99 | 99 | create_function( |
@@ -111,56 +111,56 @@ discard block |
||
| 111 | 111 | $this->content = $this->hide_comments($this->content); |
| 112 | 112 | |
| 113 | 113 | // Get <style> and <link> |
| 114 | - if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {
|
|
| 115 | - foreach($matches[0] as $tag) {
|
|
| 116 | - if ($this->isremovable($tag,$this->cssremovables)) {
|
|
| 117 | - $this->content = str_replace($tag,'',$this->content); |
|
| 114 | + if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
|
|
| 115 | + foreach ($matches[0] as $tag) {
|
|
| 116 | + if ($this->isremovable($tag, $this->cssremovables)) {
|
|
| 117 | + $this->content = str_replace($tag, '', $this->content); |
|
| 118 | 118 | } else if ($this->ismovable($tag)) {
|
| 119 | 119 | // Get the media |
| 120 | - if(strpos($tag,'media=')!==false) {
|
|
| 121 | - preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);
|
|
| 122 | - $medias = explode(',',$medias[1]);
|
|
| 120 | + if (strpos($tag, 'media=') !== false) {
|
|
| 121 | + preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
|
|
| 122 | + $medias = explode(',', $medias[1]);
|
|
| 123 | 123 | $media = array(); |
| 124 | - foreach($medias as $elem) {
|
|
| 125 | - if (empty($elem)) { $elem="all"; }
|
|
| 124 | + foreach ($medias as $elem) {
|
|
| 125 | + if (empty($elem)) { $elem = "all"; }
|
|
| 126 | 126 | $media[] = $elem; |
| 127 | 127 | } |
| 128 | 128 | } else {
|
| 129 | 129 | // No media specified - applies to all |
| 130 | 130 | $media = array('all');
|
| 131 | 131 | } |
| 132 | - $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag ); |
|
| 132 | + $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
|
|
| 133 | 133 | |
| 134 | - if(preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 134 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 135 | 135 | // <link> |
| 136 | - $url = current(explode('?',$source[2],2));
|
|
| 136 | + $url = current(explode('?', $source[2], 2));
|
|
| 137 | 137 | $path = $this->getpath($url); |
| 138 | 138 | |
| 139 | - if($path!==false && preg_match('#\.css$#',$path)) {
|
|
| 139 | + if ($path !== false && preg_match('#\.css$#', $path)) {
|
|
| 140 | 140 | // Good link |
| 141 | - $this->css[] = array($media,$path); |
|
| 142 | - }else{
|
|
| 141 | + $this->css[] = array($media, $path); |
|
| 142 | + } else {
|
|
| 143 | 143 | // Link is dynamic (.php etc) |
| 144 | 144 | $tag = ''; |
| 145 | 145 | } |
| 146 | 146 | } else {
|
| 147 | 147 | // inline css in style tags can be wrapped in comment tags, so restore comments |
| 148 | 148 | $tag = $this->restore_comments($tag); |
| 149 | - preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);
|
|
| 149 | + preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
|
|
| 150 | 150 | |
| 151 | 151 | // and re-hide them to be able to to the removal based on tag |
| 152 | 152 | $tag = $this->hide_comments($tag); |
| 153 | 153 | |
| 154 | - if ( $this->include_inline ) {
|
|
| 155 | - $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);
|
|
| 156 | - $this->css[] = array($media,'INLINE;'.$code); |
|
| 154 | + if ($this->include_inline) {
|
|
| 155 | + $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
|
|
| 156 | + $this->css[] = array($media, 'INLINE;'.$code); |
|
| 157 | 157 | } else {
|
| 158 | 158 | $tag = ''; |
| 159 | 159 | } |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | // Remove the original style tag |
| 163 | - $this->content = str_replace($tag,'',$this->content); |
|
| 163 | + $this->content = str_replace($tag, '', $this->content); |
|
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | 166 | return true; |
@@ -171,29 +171,29 @@ discard block |
||
| 171 | 171 | |
| 172 | 172 | // Joins and optimizes CSS |
| 173 | 173 | public function minify() {
|
| 174 | - foreach($this->css as $group) {
|
|
| 175 | - list($media,$css) = $group; |
|
| 176 | - if(preg_match('#^INLINE;#',$css)) {
|
|
| 174 | + foreach ($this->css as $group) {
|
|
| 175 | + list($media, $css) = $group; |
|
| 176 | + if (preg_match('#^INLINE;#', $css)) {
|
|
| 177 | 177 | // <style> |
| 178 | - $css = preg_replace('#^INLINE;#','',$css);
|
|
| 179 | - $css = $this->fixurls(ABSPATH.'/index.php',$css); |
|
| 180 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" ); |
|
| 181 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {
|
|
| 182 | - $css=$tmpstyle; |
|
| 183 | - $this->alreadyminified=true; |
|
| 178 | + $css = preg_replace('#^INLINE;#', '', $css);
|
|
| 179 | + $css = $this->fixurls(ABSPATH.'/index.php', $css); |
|
| 180 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");
|
|
| 181 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 182 | + $css = $tmpstyle; |
|
| 183 | + $this->alreadyminified = true; |
|
| 184 | 184 | } |
| 185 | 185 | } else {
|
| 186 | 186 | //<link> |
| 187 | - if($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 187 | + if ($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 188 | 188 | $cssPath = $css; |
| 189 | - $css = $this->fixurls($cssPath,file_get_contents($cssPath)); |
|
| 190 | - $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);
|
|
| 191 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath ); |
|
| 189 | + $css = $this->fixurls($cssPath, file_get_contents($cssPath)); |
|
| 190 | + $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
|
|
| 191 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
|
|
| 192 | 192 | if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
| 193 | - $css=$tmpstyle; |
|
| 194 | - $this->alreadyminified=true; |
|
| 195 | - } else if ($this->can_inject_late($cssPath,$css)) {
|
|
| 196 | - $css="%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%"; |
|
| 193 | + $css = $tmpstyle; |
|
| 194 | + $this->alreadyminified = true; |
|
| 195 | + } else if ($this->can_inject_late($cssPath, $css)) {
|
|
| 196 | + $css = "%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%INJECTLATER%%"; |
|
| 197 | 197 | } |
| 198 | 198 | } else {
|
| 199 | 199 | // Couldn't read CSS. Maybe getpath isn't working? |
@@ -201,8 +201,8 @@ discard block |
||
| 201 | 201 | } |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | - foreach($media as $elem) {
|
|
| 205 | - if(!isset($this->csscode[$elem])) |
|
| 204 | + foreach ($media as $elem) {
|
|
| 205 | + if (!isset($this->csscode[$elem])) |
|
| 206 | 206 | $this->csscode[$elem] = ''; |
| 207 | 207 | $this->csscode[$elem] .= "\n/*FILESTART*/".$css; |
| 208 | 208 | } |
@@ -211,12 +211,12 @@ discard block |
||
| 211 | 211 | // Check for duplicate code |
| 212 | 212 | $md5list = array(); |
| 213 | 213 | $tmpcss = $this->csscode; |
| 214 | - foreach($tmpcss as $media => $code) {
|
|
| 214 | + foreach ($tmpcss as $media => $code) {
|
|
| 215 | 215 | $md5sum = md5($code); |
| 216 | 216 | $medianame = $media; |
| 217 | - foreach($md5list as $med => $sum) {
|
|
| 217 | + foreach ($md5list as $med => $sum) {
|
|
| 218 | 218 | // If same code |
| 219 | - if($sum === $md5sum) {
|
|
| 219 | + if ($sum === $md5sum) {
|
|
| 220 | 220 | //Add the merged code |
| 221 | 221 | $medianame = $med.', '.$media; |
| 222 | 222 | $this->csscode[$medianame] = $code; |
@@ -236,30 +236,30 @@ discard block |
||
| 236 | 236 | $external_imports = ""; |
| 237 | 237 | |
| 238 | 238 | // remove comments to avoid importing commented-out imports |
| 239 | - $thiscss_nocomments = preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 239 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 240 | 240 | |
| 241 | - while(preg_match_all('#@import.*(?:;|$)#Um',$thiscss_nocomments,$matches)) {
|
|
| 242 | - foreach($matches[0] as $import) {
|
|
| 243 | - if ($this->isremovable($import,$this->cssremovables)) {
|
|
| 244 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 241 | + while (preg_match_all('#@import.*(?:;|$)#Um', $thiscss_nocomments, $matches)) {
|
|
| 242 | + foreach ($matches[0] as $import) {
|
|
| 243 | + if ($this->isremovable($import, $this->cssremovables)) {
|
|
| 244 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 245 | 245 | $import_ok = true; |
| 246 | 246 | } else {
|
| 247 | - $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");
|
|
| 247 | + $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
|
|
| 248 | 248 | $path = $this->getpath($url); |
| 249 | 249 | $import_ok = false; |
| 250 | 250 | if (file_exists($path) && is_readable($path)) {
|
| 251 | - $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\"); |
|
| 252 | - $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);
|
|
| 253 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" ); |
|
| 254 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 255 | - $code=$tmpstyle; |
|
| 256 | - $this->alreadyminified=true; |
|
| 257 | - } else if ($this->can_inject_late($path,$code)) {
|
|
| 258 | - $code="%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%"; |
|
| 251 | + $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\"); |
|
| 252 | + $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
|
|
| 253 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");
|
|
| 254 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 255 | + $code = $tmpstyle; |
|
| 256 | + $this->alreadyminified = true; |
|
| 257 | + } else if ($this->can_inject_late($path, $code)) {
|
|
| 258 | + $code = "%%INJECTLATER%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%"; |
|
| 259 | 259 | } |
| 260 | 260 | |
| 261 | - if(!empty($code)) {
|
|
| 262 | - $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);
|
|
| 261 | + if (!empty($code)) {
|
|
| 262 | + $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
|
|
| 263 | 263 | if (!empty($tmp_thiscss)) {
|
| 264 | 264 | $thiscss = $tmp_thiscss; |
| 265 | 265 | $import_ok = true; |
@@ -273,32 +273,32 @@ discard block |
||
| 273 | 273 | if (!$import_ok) {
|
| 274 | 274 | // external imports and general fall-back |
| 275 | 275 | $external_imports .= $import; |
| 276 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 276 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 277 | 277 | $fiximports = true; |
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | - $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);
|
|
| 281 | - $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);
|
|
| 280 | + $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
|
|
| 281 | + $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
|
|
| 282 | 282 | |
| 283 | 283 | // and update $thiscss_nocomments before going into next iteration in while loop |
| 284 | - $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 284 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 285 | 285 | } |
| 286 | 286 | unset($thiscss_nocomments); |
| 287 | 287 | |
| 288 | 288 | // add external imports to top of aggregated CSS |
| 289 | - if($fiximports) {
|
|
| 290 | - $thiscss=$external_imports.$thiscss; |
|
| 289 | + if ($fiximports) {
|
|
| 290 | + $thiscss = $external_imports.$thiscss; |
|
| 291 | 291 | } |
| 292 | 292 | } |
| 293 | 293 | unset($thiscss); |
| 294 | 294 | |
| 295 | 295 | // $this->csscode has all the uncompressed code now. |
| 296 | 296 | $mhtmlcount = 0; |
| 297 | - foreach($this->csscode as &$code) {
|
|
| 297 | + foreach ($this->csscode as &$code) {
|
|
| 298 | 298 | // Check for already-minified code |
| 299 | 299 | $hash = md5($code); |
| 300 | - $ccheck = new autoptimizeCache($hash,'css'); |
|
| 301 | - if($ccheck->check()) {
|
|
| 300 | + $ccheck = new autoptimizeCache($hash, 'css'); |
|
| 301 | + if ($ccheck->check()) {
|
|
| 302 | 302 | $code = $ccheck->retrieve(); |
| 303 | 303 | $this->hashmap[md5($code)] = $hash; |
| 304 | 304 | continue; |
@@ -312,44 +312,44 @@ discard block |
||
| 312 | 312 | // this is the old regex that searched for the entire background css rule, but it wouldn't match multiple background image url css rules. |
| 313 | 313 | // preg_match_all('#(background[^;{}]*url\((?!\s?"?\'?\s?data)(.*)\)[^;}]*)(?:;|$|})#Usm',$code,$matches);
|
| 314 | 314 | // this new regex will be slightly faster too: |
| 315 | - preg_match_all( self::ASSETS_REGEX, $code, $matches ); |
|
| 315 | + preg_match_all(self::ASSETS_REGEX, $code, $matches); |
|
| 316 | 316 | |
| 317 | - if(($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
|
|
| 318 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 319 | - $iurl = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 317 | + if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
|
|
| 318 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 319 | + $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 320 | 320 | |
| 321 | 321 | // if querystring, remove it from url |
| 322 | - if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }
|
|
| 322 | + if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }
|
|
| 323 | 323 | |
| 324 | 324 | $ipath = $this->getpath($iurl); |
| 325 | 325 | |
| 326 | 326 | $datauri_max_size = 4096; |
| 327 | - $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size ); |
|
| 328 | - $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', ""); |
|
| 327 | + $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);
|
|
| 328 | + $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");
|
|
| 329 | 329 | if (!empty($datauri_exclude)) {
|
| 330 | - $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));
|
|
| 330 | + $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));
|
|
| 331 | 331 | foreach ($no_datauris as $no_datauri) {
|
| 332 | - if (strpos($iurl,$no_datauri)!==false) {
|
|
| 333 | - $ipath=false; |
|
| 332 | + if (strpos($iurl, $no_datauri) !== false) {
|
|
| 333 | + $ipath = false; |
|
| 334 | 334 | break; |
| 335 | 335 | } |
| 336 | 336 | } |
| 337 | 337 | } |
| 338 | 338 | |
| 339 | - if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 340 | - $ihash=md5($ipath); |
|
| 341 | - $icheck = new autoptimizeCache($ihash,'img'); |
|
| 342 | - if($icheck->check()) {
|
|
| 339 | + if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 340 | + $ihash = md5($ipath); |
|
| 341 | + $icheck = new autoptimizeCache($ihash, 'img'); |
|
| 342 | + if ($icheck->check()) {
|
|
| 343 | 343 | // we have the base64 image in cache |
| 344 | - $headAndData=$icheck->retrieve(); |
|
| 345 | - $_base64data=explode(";base64,",$headAndData);
|
|
| 346 | - $base64data=$_base64data[1]; |
|
| 344 | + $headAndData = $icheck->retrieve(); |
|
| 345 | + $_base64data = explode(";base64,", $headAndData);
|
|
| 346 | + $base64data = $_base64data[1]; |
|
| 347 | 347 | } else {
|
| 348 | 348 | // It's an image and we don't have it in cache, get the type |
| 349 | - $explA=explode('.',$ipath);
|
|
| 350 | - $type=end($explA); |
|
| 349 | + $explA = explode('.', $ipath);
|
|
| 350 | + $type = end($explA); |
|
| 351 | 351 | |
| 352 | - switch($type) {
|
|
| 352 | + switch ($type) {
|
|
| 353 | 353 | case 'jpeg': |
| 354 | 354 | $dataurihead = 'data:image/jpeg;base64,'; |
| 355 | 355 | break; |
@@ -371,15 +371,15 @@ discard block |
||
| 371 | 371 | |
| 372 | 372 | // Encode the data |
| 373 | 373 | $base64data = base64_encode(file_get_contents($ipath)); |
| 374 | - $headAndData=$dataurihead.$base64data; |
|
| 374 | + $headAndData = $dataurihead.$base64data; |
|
| 375 | 375 | |
| 376 | 376 | // Save in cache |
| 377 | - $icheck->cache($headAndData,"text/plain"); |
|
| 377 | + $icheck->cache($headAndData, "text/plain"); |
|
| 378 | 378 | } |
| 379 | 379 | unset($icheck); |
| 380 | 380 | |
| 381 | 381 | // Add it to the list for replacement |
| 382 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]).";\n*".str_replace($quotedurl,'mhtml:%%MHTML%%!'.$mhtmlcount,$matches[0][$count]).";\n_".$matches[0][$count].';'; |
|
| 382 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]).";\n*".str_replace($quotedurl, 'mhtml:%%MHTML%%!'.$mhtmlcount, $matches[0][$count]).";\n_".$matches[0][$count].';'; |
|
| 383 | 383 | |
| 384 | 384 | // Store image on the mhtml document |
| 385 | 385 | $this->mhtml .= "--_\r\nContent-Location:{$mhtmlcount}\r\nContent-Transfer-Encoding:base64\r\n\r\n{$base64data}\r\n";
|
@@ -387,52 +387,52 @@ discard block |
||
| 387 | 387 | } else {
|
| 388 | 388 | // just cdn the URL if applicable |
| 389 | 389 | if (!empty($this->cdn_url)) {
|
| 390 | - $url = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 391 | - $cdn_url=$this->url_replace_cdn($url); |
|
| 392 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$cdn_url,$matches[0][$count]); |
|
| 390 | + $url = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 391 | + $cdn_url = $this->url_replace_cdn($url); |
|
| 392 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $cdn_url, $matches[0][$count]); |
|
| 393 | 393 | } |
| 394 | 394 | } |
| 395 | 395 | } |
| 396 | 396 | } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
|
| 397 | 397 | // change background image urls to cdn-url |
| 398 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 399 | - $url = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 400 | - $cdn_url=$this->url_replace_cdn($url); |
|
| 401 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$cdn_url,$matches[0][$count]); |
|
| 398 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 399 | + $url = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 400 | + $cdn_url = $this->url_replace_cdn($url); |
|
| 401 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $cdn_url, $matches[0][$count]); |
|
| 402 | 402 | } |
| 403 | 403 | } |
| 404 | 404 | |
| 405 | - if(!empty($imgreplace)) {
|
|
| 406 | - $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code); |
|
| 405 | + if (!empty($imgreplace)) {
|
|
| 406 | + $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code); |
|
| 407 | 407 | } |
| 408 | 408 | |
| 409 | 409 | // CDN the fonts! |
| 410 | - if ( (!empty($this->cdn_url)) && (apply_filters('autoptimize_filter_css_fonts_cdn',false)) && (version_compare(PHP_VERSION, '5.3.0') >= 0) ) {
|
|
| 410 | + if ((!empty($this->cdn_url)) && (apply_filters('autoptimize_filter_css_fonts_cdn', false)) && (version_compare(PHP_VERSION, '5.3.0') >= 0)) {
|
|
| 411 | 411 | $fontreplace = array(); |
| 412 | 412 | include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeFontRegex.php'); |
| 413 | 413 | |
| 414 | - preg_match_all($fonturl_regex,$code,$matches); |
|
| 414 | + preg_match_all($fonturl_regex, $code, $matches); |
|
| 415 | 415 | if (is_array($matches)) {
|
| 416 | - foreach($matches[8] as $count => $quotedurl) {
|
|
| 417 | - $url = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 418 | - $cdn_url=$this->url_replace_cdn($url); |
|
| 419 | - $fontreplace[$matches[8][$count]] = str_replace($quotedurl,$cdn_url,$matches[8][$count]); |
|
| 416 | + foreach ($matches[8] as $count => $quotedurl) {
|
|
| 417 | + $url = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 418 | + $cdn_url = $this->url_replace_cdn($url); |
|
| 419 | + $fontreplace[$matches[8][$count]] = str_replace($quotedurl, $cdn_url, $matches[8][$count]); |
|
| 420 | 420 | } |
| 421 | - if(!empty($fontreplace)) {
|
|
| 422 | - $code = str_replace(array_keys($fontreplace),array_values($fontreplace),$code); |
|
| 421 | + if (!empty($fontreplace)) {
|
|
| 422 | + $code = str_replace(array_keys($fontreplace), array_values($fontreplace), $code); |
|
| 423 | 423 | } |
| 424 | 424 | } |
| 425 | 425 | } |
| 426 | 426 | |
| 427 | 427 | // Minify |
| 428 | - if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {
|
|
| 428 | + if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {
|
|
| 429 | 429 | if (class_exists('Minify_CSS_Compressor')) {
|
| 430 | 430 | $tmp_code = trim(Minify_CSS_Compressor::process($code)); |
| 431 | - } else if(class_exists('CSSmin')) {
|
|
| 431 | + } else if (class_exists('CSSmin')) {
|
|
| 432 | 432 | $cssmin = new CSSmin(); |
| 433 | - if (method_exists($cssmin,"run")) {
|
|
| 433 | + if (method_exists($cssmin, "run")) {
|
|
| 434 | 434 | $tmp_code = trim($cssmin->run($code)); |
| 435 | - } elseif (@is_callable(array($cssmin,"minify"))) {
|
|
| 435 | + } elseif (@is_callable(array($cssmin, "minify"))) {
|
|
| 436 | 436 | $tmp_code = trim(CssMin::minify($code)); |
| 437 | 437 | } |
| 438 | 438 | } |
@@ -444,7 +444,7 @@ discard block |
||
| 444 | 444 | |
| 445 | 445 | $code = $this->inject_minified($code); |
| 446 | 446 | |
| 447 | - $tmp_code = apply_filters( 'autoptimize_css_after_minify',$code ); |
|
| 447 | + $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
|
|
| 448 | 448 | if (!empty($tmp_code)) {
|
| 449 | 449 | $code = $tmp_code; |
| 450 | 450 | unset($tmp_code); |
@@ -458,31 +458,31 @@ discard block |
||
| 458 | 458 | |
| 459 | 459 | //Caches the CSS in uncompressed, deflated and gzipped form. |
| 460 | 460 | public function cache() {
|
| 461 | - if($this->datauris) {
|
|
| 461 | + if ($this->datauris) {
|
|
| 462 | 462 | // MHTML Preparation |
| 463 | 463 | $this->mhtml = "/*\r\nContent-Type: multipart/related; boundary=\"_\"\r\n\r\n".$this->mhtml."*/\r\n"; |
| 464 | 464 | $md5 = md5($this->mhtml); |
| 465 | - $cache = new autoptimizeCache($md5,'txt'); |
|
| 466 | - if(!$cache->check()) {
|
|
| 465 | + $cache = new autoptimizeCache($md5, 'txt'); |
|
| 466 | + if (!$cache->check()) {
|
|
| 467 | 467 | // Cache our images for IE |
| 468 | - $cache->cache($this->mhtml,'text/plain'); |
|
| 468 | + $cache->cache($this->mhtml, 'text/plain'); |
|
| 469 | 469 | } |
| 470 | 470 | $mhtml = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 471 | 471 | } |
| 472 | 472 | |
| 473 | 473 | // CSS cache |
| 474 | - foreach($this->csscode as $media => $code) {
|
|
| 474 | + foreach ($this->csscode as $media => $code) {
|
|
| 475 | 475 | $md5 = $this->hashmap[md5($code)]; |
| 476 | 476 | |
| 477 | - if($this->datauris) {
|
|
| 477 | + if ($this->datauris) {
|
|
| 478 | 478 | // Images for ie! Get the right url |
| 479 | - $code = str_replace('%%MHTML%%',$mhtml,$code);
|
|
| 479 | + $code = str_replace('%%MHTML%%', $mhtml, $code);
|
|
| 480 | 480 | } |
| 481 | 481 | |
| 482 | - $cache = new autoptimizeCache($md5,'css'); |
|
| 483 | - if(!$cache->check()) {
|
|
| 482 | + $cache = new autoptimizeCache($md5, 'css'); |
|
| 483 | + if (!$cache->check()) {
|
|
| 484 | 484 | // Cache our code |
| 485 | - $cache->cache($code,'text/css'); |
|
| 485 | + $cache->cache($code, 'text/css'); |
|
| 486 | 486 | } |
| 487 | 487 | $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 488 | 488 | } |
@@ -497,7 +497,7 @@ discard block |
||
| 497 | 497 | $this->content = $this->restore_comments($this->content); |
| 498 | 498 | |
| 499 | 499 | // restore (no)script |
| 500 | - if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) {
|
|
| 500 | + if (strpos($this->content, '%%SCRIPT%%') !== false) {
|
|
| 501 | 501 | $this->content = preg_replace_callback( |
| 502 | 502 | '#%%SCRIPT%%(.*?)%%SCRIPT%%#is', |
| 503 | 503 | create_function( |
@@ -512,74 +512,74 @@ discard block |
||
| 512 | 512 | $this->content = $this->restore_noptimize($this->content); |
| 513 | 513 | |
| 514 | 514 | //Restore the full content |
| 515 | - if(!empty($this->restofcontent)) {
|
|
| 515 | + if (!empty($this->restofcontent)) {
|
|
| 516 | 516 | $this->content .= $this->restofcontent; |
| 517 | 517 | $this->restofcontent = ''; |
| 518 | 518 | } |
| 519 | 519 | |
| 520 | 520 | // Inject the new stylesheets |
| 521 | - $replaceTag = array("<title","before");
|
|
| 522 | - $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag ); |
|
| 521 | + $replaceTag = array("<title", "before");
|
|
| 522 | + $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag);
|
|
| 523 | 523 | |
| 524 | 524 | if ($this->inline == true) {
|
| 525 | - foreach($this->csscode as $media => $code) {
|
|
| 526 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);
|
|
| 525 | + foreach ($this->csscode as $media => $code) {
|
|
| 526 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
|
|
| 527 | 527 | } |
| 528 | 528 | } else {
|
| 529 | 529 | if ($this->defer == true) {
|
| 530 | 530 | $preloadCssBlock = ""; |
| 531 | 531 | $noScriptCssBlock = "<noscript id=\"aonoscrcss\">"; |
| 532 | - $defer_inline_code=$this->defer_inline; |
|
| 533 | - if(!empty($defer_inline_code)){
|
|
| 534 | - if ( apply_filters( 'autoptimize_filter_css_critcss_minify',true ) ) {
|
|
| 535 | - $iCssHash=md5($defer_inline_code); |
|
| 536 | - $iCssCache = new autoptimizeCache($iCssHash,'css'); |
|
| 537 | - if($iCssCache->check()) {
|
|
| 532 | + $defer_inline_code = $this->defer_inline; |
|
| 533 | + if (!empty($defer_inline_code)) {
|
|
| 534 | + if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
|
|
| 535 | + $iCssHash = md5($defer_inline_code); |
|
| 536 | + $iCssCache = new autoptimizeCache($iCssHash, 'css'); |
|
| 537 | + if ($iCssCache->check()) {
|
|
| 538 | 538 | // we have the optimized inline CSS in cache |
| 539 | - $defer_inline_code=$iCssCache->retrieve(); |
|
| 539 | + $defer_inline_code = $iCssCache->retrieve(); |
|
| 540 | 540 | } else {
|
| 541 | 541 | if (class_exists('Minify_CSS_Compressor')) {
|
| 542 | 542 | $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code)); |
| 543 | - } else if(class_exists('CSSmin')) {
|
|
| 543 | + } else if (class_exists('CSSmin')) {
|
|
| 544 | 544 | $cssmin = new CSSmin(); |
| 545 | 545 | $tmp_code = trim($cssmin->run($defer_inline_code)); |
| 546 | 546 | } |
| 547 | 547 | if (!empty($tmp_code)) {
|
| 548 | 548 | $defer_inline_code = $tmp_code; |
| 549 | - $iCssCache->cache($defer_inline_code,"text/css"); |
|
| 549 | + $iCssCache->cache($defer_inline_code, "text/css"); |
|
| 550 | 550 | unset($tmp_code); |
| 551 | 551 | } |
| 552 | 552 | } |
| 553 | 553 | } |
| 554 | - $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 555 | - $this->inject_in_html($code_out,$replaceTag); |
|
| 554 | + $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 555 | + $this->inject_in_html($code_out, $replaceTag); |
|
| 556 | 556 | } |
| 557 | 557 | } |
| 558 | 558 | |
| 559 | - foreach($this->url as $media => $url) {
|
|
| 559 | + foreach ($this->url as $media => $url) {
|
|
| 560 | 560 | $url = $this->url_replace_cdn($url); |
| 561 | 561 | |
| 562 | 562 | //Add the stylesheet either deferred (import at bottom) or normal links in head |
| 563 | - if($this->defer == true) {
|
|
| 563 | + if ($this->defer == true) {
|
|
| 564 | 564 | $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="this.rel=\'stylesheet\'" />'; |
| 565 | 565 | $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />'; |
| 566 | 566 | } else {
|
| 567 | 567 | if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
|
| 568 | - $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);
|
|
| 569 | - } else if (strlen($this->csscode[$media])>0) {
|
|
| 570 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);
|
|
| 568 | + $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
|
|
| 569 | + } else if (strlen($this->csscode[$media]) > 0) {
|
|
| 570 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
|
|
| 571 | 571 | } |
| 572 | 572 | } |
| 573 | 573 | } |
| 574 | 574 | |
| 575 | - if($this->defer == true) {
|
|
| 575 | + if ($this->defer == true) {
|
|
| 576 | 576 | $preloadPolyfill = '<script data-cfasync=\'false\'>/*! loadCSS. [c]2017 Filament Group, Inc. MIT License */ |
| 577 | 577 | !function(a){"use strict";var b=function(b,c,d){function e(a){return h.body?a():void setTimeout(function(){e(a)})}function f(){i.addEventListener&&i.removeEventListener("load",f),i.media=d||"all"}var g,h=a.document,i=h.createElement("link");if(c)g=c;else{var j=(h.body||h.getElementsByTagName("head")[0]).childNodes;g=j[j.length-1]}var k=h.styleSheets;i.rel="stylesheet",i.href=b,i.media="only x",e(function(){g.parentNode.insertBefore(i,c?g:g.nextSibling)});var l=function(a){for(var b=i.href,c=k.length;c--;)if(k[c].href===b)return a();setTimeout(function(){l(a)})};return i.addEventListener&&i.addEventListener("load",f),i.onloadcssdefined=l,l(f),i};"undefined"!=typeof exports?exports.loadCSS=b:a.loadCSS=b}("undefined"!=typeof global?global:this);
|
| 578 | 578 | /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */ |
| 579 | 579 | !function(a){if(a.loadCSS){var b=loadCSS.relpreload={};if(b.support=function(){try{return a.document.createElement("link").relList.supports("preload")}catch(b){return!1}},b.poly=function(){for(var b=a.document.getElementsByTagName("link"),c=0;c<b.length;c++){var d=b[c];"preload"===d.rel&&"style"===d.getAttribute("as")&&(a.loadCSS(d.href,d,d.getAttribute("media")),d.rel=null)}},!b.support()){b.poly();var c=a.setInterval(b.poly,300);a.addEventListener&&a.addEventListener("load",function(){b.poly(),a.clearInterval(c)}),a.attachEvent&&a.attachEvent("onload",function(){a.clearInterval(c)})}}}(this);</script>';
|
| 580 | 580 | $noScriptCssBlock .= "</noscript>"; |
| 581 | - $this->inject_in_html($preloadCssBlock.$noScriptCssBlock,$replaceTag); |
|
| 582 | - $this->inject_in_html($preloadPolyfill,array('</body>','before'));
|
|
| 581 | + $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag); |
|
| 582 | + $this->inject_in_html($preloadPolyfill, array('</body>', 'before'));
|
|
| 583 | 583 | } |
| 584 | 584 | } |
| 585 | 585 | |
@@ -587,38 +587,38 @@ discard block |
||
| 587 | 587 | return $this->content; |
| 588 | 588 | } |
| 589 | 589 | |
| 590 | - static function fixurls($file,$code) {
|
|
| 591 | - $file = str_replace(WP_ROOT_DIR,'',$file); |
|
| 592 | - $file = str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',$file); |
|
| 590 | + static function fixurls($file, $code) {
|
|
| 591 | + $file = str_replace(WP_ROOT_DIR, '', $file); |
|
| 592 | + $file = str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', $file); |
|
| 593 | 593 | $dir = dirname($file); // Like /themes/expound/css |
| 594 | 594 | |
| 595 | 595 | // switch all imports to the url() syntax |
| 596 | - $code=preg_replace('#@import ("|\')(.+?)\.css.*("|\')#','@import url("${2}.css")',$code);
|
|
| 596 | + $code = preg_replace('#@import ("|\')(.+?)\.css.*("|\')#', '@import url("${2}.css")', $code);
|
|
| 597 | 597 | |
| 598 | - if( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
|
|
| 598 | + if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
|
|
| 599 | 599 | $replace = array(); |
| 600 | - foreach($matches[1] as $k => $url) {
|
|
| 600 | + foreach ($matches[1] as $k => $url) {
|
|
| 601 | 601 | // Remove quotes |
| 602 | - $url = trim($url," \t\n\r\0\x0B\"'"); |
|
| 603 | - $noQurl = trim($url,"\"'"); |
|
| 602 | + $url = trim($url, " \t\n\r\0\x0B\"'"); |
|
| 603 | + $noQurl = trim($url, "\"'"); |
|
| 604 | 604 | |
| 605 | 605 | if ($noQurl === '') { continue; }
|
| 606 | 606 | |
| 607 | - if ($url!==$noQurl) {
|
|
| 608 | - $removedQuotes=true; |
|
| 607 | + if ($url !== $noQurl) {
|
|
| 608 | + $removedQuotes = true; |
|
| 609 | 609 | } else {
|
| 610 | - $removedQuotes=false; |
|
| 610 | + $removedQuotes = false; |
|
| 611 | 611 | } |
| 612 | - $url=$noQurl; |
|
| 613 | - if(substr($url,0,1)=='/' || preg_match('#^(https?://|ftp://|data:)#i',$url)) {
|
|
| 612 | + $url = $noQurl; |
|
| 613 | + if (substr($url, 0, 1) == '/' || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
|
|
| 614 | 614 | //URL is absolute |
| 615 | 615 | continue; |
| 616 | 616 | } else {
|
| 617 | 617 | // relative URL |
| 618 | - $newurl = preg_replace('/https?:/','',str_replace(" ","%20",AUTOPTIMIZE_WP_CONTENT_URL.str_replace('//','/',$dir.'/'.$url)));
|
|
| 618 | + $newurl = preg_replace('/https?:/', '', str_replace(" ", "%20", AUTOPTIMIZE_WP_CONTENT_URL.str_replace('//', '/', $dir.'/'.$url)));
|
|
| 619 | 619 | |
| 620 | 620 | $hash = md5($url); |
| 621 | - $code = str_replace($matches[0][$k],$hash,$code); |
|
| 621 | + $code = str_replace($matches[0][$k], $hash, $code); |
|
| 622 | 622 | |
| 623 | 623 | if (!empty($removedQuotes)) {
|
| 624 | 624 | $replace[$hash] = 'url(\''.$newurl.'\')'; |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | } |
| 629 | 629 | } |
| 630 | 630 | //Do the replacing here to avoid breaking URLs |
| 631 | - $code = str_replace(array_keys($replace),array_values($replace),$code); |
|
| 631 | + $code = str_replace(array_keys($replace), array_values($replace), $code); |
|
| 632 | 632 | } |
| 633 | 633 | return $code; |
| 634 | 634 | } |
@@ -636,7 +636,7 @@ discard block |
||
| 636 | 636 | private function ismovable($tag) {
|
| 637 | 637 | if (!empty($this->whitelist)) {
|
| 638 | 638 | foreach ($this->whitelist as $match) {
|
| 639 | - if(strpos($tag,$match)!==false) {
|
|
| 639 | + if (strpos($tag, $match) !== false) {
|
|
| 640 | 640 | return true; |
| 641 | 641 | } |
| 642 | 642 | } |
@@ -644,8 +644,8 @@ discard block |
||
| 644 | 644 | return false; |
| 645 | 645 | } else {
|
| 646 | 646 | if (is_array($this->dontmove)) {
|
| 647 | - foreach($this->dontmove as $match) {
|
|
| 648 | - if(strpos($tag,$match)!==false) {
|
|
| 647 | + foreach ($this->dontmove as $match) {
|
|
| 648 | + if (strpos($tag, $match) !== false) {
|
|
| 649 | 649 | //Matched something |
| 650 | 650 | return false; |
| 651 | 651 | } |
@@ -657,17 +657,17 @@ discard block |
||
| 657 | 657 | } |
| 658 | 658 | } |
| 659 | 659 | |
| 660 | - private function can_inject_late($cssPath,$css) {
|
|
| 661 | - if ((strpos($cssPath,"min.css")===false) || ($this->inject_min_late!==true)) {
|
|
| 660 | + private function can_inject_late($cssPath, $css) {
|
|
| 661 | + if ((strpos($cssPath, "min.css") === false) || ($this->inject_min_late !== true)) {
|
|
| 662 | 662 | // late-inject turned off or file not minified based on filename |
| 663 | 663 | return false; |
| 664 | - } else if (strpos($css,"@import")!==false) {
|
|
| 664 | + } else if (strpos($css, "@import") !== false) {
|
|
| 665 | 665 | // can't late-inject files with imports as those need to be aggregated |
| 666 | 666 | return false; |
| 667 | - } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {
|
|
| 667 | + } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {
|
|
| 668 | 668 | // don't late-inject CSS with font-src's if fonts are set to be CDN'ed |
| 669 | 669 | return false; |
| 670 | - } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {
|
|
| 670 | + } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {
|
|
| 671 | 671 | // don't late-inject CSS with images if CDN is set OR is image inlining is on |
| 672 | 672 | return false; |
| 673 | 673 | } else {
|
@@ -1,35 +1,35 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 2 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 3 | 3 | class autoptimizeToolbar |
| 4 | 4 | { |
| 5 | 5 | public function __construct() |
| 6 | 6 | { |
| 7 | 7 | // If Cache is not available we don't add the Autoptimize Toolbar |
| 8 | - if( ! autoptimizeCache::cacheavail() ) { |
|
| 8 | + if (!autoptimizeCache::cacheavail()) { |
|
| 9 | 9 | return; |
| 10 | 10 | } |
| 11 | 11 | // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated. |
| 12 | - add_action( 'wp_loaded', array( $this, 'load_toolbar' ) ); |
|
| 12 | + add_action('wp_loaded', array($this, 'load_toolbar')); |
|
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | public function load_toolbar() |
| 16 | 16 | { |
| 17 | 17 | // Check permissions and that toolbar is not hidden via filter |
| 18 | - if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) { |
|
| 18 | + if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) { |
|
| 19 | 19 | // Create a handler for the AJAX toolbar requests |
| 20 | - add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) ); |
|
| 20 | + add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache')); |
|
| 21 | 21 | |
| 22 | 22 | // Load custom styles, scripts and menu only when needed |
| 23 | - if ( is_admin_bar_showing() ) { |
|
| 24 | - if ( is_admin() ) { |
|
| 23 | + if (is_admin_bar_showing()) { |
|
| 24 | + if (is_admin()) { |
|
| 25 | 25 | // in the case of back-end |
| 26 | - add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 26 | + add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 27 | 27 | } else { |
| 28 | 28 | // in the case of front-end |
| 29 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 29 | + add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts')); |
|
| 30 | 30 | } |
| 31 | 31 | // Add the Autoptimize Toolbar to the Admin bar |
| 32 | - add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 ); |
|
| 32 | + add_action('admin_bar_menu', array($this, 'add_toolbar'), 100); |
|
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $stats = autoptimizeCache::stats(); |
| 43 | 43 | |
| 44 | 44 | // Set the Max Size recommended for cache files |
| 45 | - $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 ); |
|
| 45 | + $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024); |
|
| 46 | 46 | |
| 47 | 47 | // Retrieve the current Total Files in cache |
| 48 | 48 | $files = $stats[0]; |
@@ -52,83 +52,83 @@ discard block |
||
| 52 | 52 | $size = $this->format_filesize($bytes); |
| 53 | 53 | |
| 54 | 54 | // We calculated the percentage of cache used |
| 55 | - $percentage = ceil( $bytes / $max_size * 100 ); |
|
| 56 | - if ( $percentage > 100 ) { |
|
| 55 | + $percentage = ceil($bytes/$max_size*100); |
|
| 56 | + if ($percentage > 100) { |
|
| 57 | 57 | $percentage = 100; |
| 58 | 58 | } |
| 59 | 59 | // We define the type of color indicator for the current state of cache size. |
| 60 | 60 | // "green" if the size is less than 80% of the total recommended |
| 61 | 61 | // "orange" if over 80% |
| 62 | 62 | // "red" if over 100% |
| 63 | - $color = ( $percentage == 100 ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' ); |
|
| 63 | + $color = ($percentage == 100) ? 'red' : (($percentage > 80) ? 'orange' : 'green'); |
|
| 64 | 64 | |
| 65 | 65 | // Create or add new items into the Admin Toolbar. |
| 66 | 66 | // Main Autoptimize node |
| 67 | - $wp_admin_bar->add_node( array( |
|
| 67 | + $wp_admin_bar->add_node(array( |
|
| 68 | 68 | 'id' => 'autoptimize', |
| 69 | - 'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( "Autoptimize", 'autoptimize' ) . '</span>', |
|
| 70 | - 'href' => admin_url( 'options-general.php?page=autoptimize' ), |
|
| 71 | - 'meta' => array( 'class' => 'bullet-' . $color ) |
|
| 69 | + 'title' => '<span class="ab-icon"></span><span class="ab-label">'.__("Autoptimize", 'autoptimize').'</span>', |
|
| 70 | + 'href' => admin_url('options-general.php?page=autoptimize'), |
|
| 71 | + 'meta' => array('class' => 'bullet-'.$color) |
|
| 72 | 72 | )); |
| 73 | 73 | |
| 74 | 74 | // Cache Info node |
| 75 | - $wp_admin_bar->add_node( array( |
|
| 75 | + $wp_admin_bar->add_node(array( |
|
| 76 | 76 | 'id' => 'autoptimize-cache-info', |
| 77 | - 'title' => '<p>' . __( "Cache Info", 'autoptimize' ) . '</p>' . |
|
| 78 | - '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' . |
|
| 77 | + 'title' => '<p>'.__("Cache Info", 'autoptimize').'</p>'. |
|
| 78 | + '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'. |
|
| 79 | 79 | '<div class="circle">'. |
| 80 | - '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 81 | - '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>'. |
|
| 80 | + '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 81 | + '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'. |
|
| 82 | 82 | '<div class="shadow"></div>'. |
| 83 | 83 | '</div>'. |
| 84 | - '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>'. |
|
| 85 | - '</div>' . |
|
| 86 | - '<table>' . |
|
| 87 | - '<tr><td>' . __( "Size", 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' . |
|
| 88 | - '<tr><td>' . __( "Files", 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' . |
|
| 84 | + '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'. |
|
| 85 | + '</div>'. |
|
| 86 | + '<table>'. |
|
| 87 | + '<tr><td>'.__("Size", 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'. |
|
| 88 | + '<tr><td>'.__("Files", 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'. |
|
| 89 | 89 | '</table>', |
| 90 | 90 | 'parent' => 'autoptimize' |
| 91 | 91 | )); |
| 92 | 92 | |
| 93 | 93 | // Delete Cache node |
| 94 | - $wp_admin_bar->add_node( array( |
|
| 94 | + $wp_admin_bar->add_node(array( |
|
| 95 | 95 | 'id' => 'autoptimize-delete-cache', |
| 96 | - 'title' => __( "Delete Cache", 'autoptimize' ), |
|
| 96 | + 'title' => __("Delete Cache", 'autoptimize'), |
|
| 97 | 97 | 'parent' => 'autoptimize' |
| 98 | 98 | )); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | public function delete_cache() |
| 102 | 102 | { |
| 103 | - check_ajax_referer( 'ao_delcache_nonce', 'nonce' ); |
|
| 103 | + check_ajax_referer('ao_delcache_nonce', 'nonce'); |
|
| 104 | 104 | $result = false; |
| 105 | - if ( current_user_can( 'manage_options' ) ) |
|
| 105 | + if (current_user_can('manage_options')) |
|
| 106 | 106 | { |
| 107 | 107 | // We call the function for cleaning the Autoptimize cache |
| 108 | 108 | $result = autoptimizeCache::clearall(); |
| 109 | 109 | } |
| 110 | - wp_send_json( $result ); |
|
| 110 | + wp_send_json($result); |
|
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | public function enqueue_scripts() |
| 114 | 114 | { |
| 115 | 115 | // Autoptimize Toolbar Styles |
| 116 | - wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), time(), 'all' ); |
|
| 116 | + wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), time(), 'all'); |
|
| 117 | 117 | // Autoptimize Toolbar Javascript |
| 118 | - wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), time(), true ); |
|
| 118 | + wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), time(), true); |
|
| 119 | 119 | // Localizes a registered script with data for a JavaScript variable. (We need this for the AJAX work properly in the front-end mode) |
| 120 | - wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 121 | - 'ajaxurl' => admin_url( 'admin-ajax.php' ), |
|
| 122 | - 'error_msg' => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ), |
|
| 123 | - 'dismiss_msg' => __( 'Dismiss this notice.' ), |
|
| 124 | - 'nonce' => wp_create_nonce( 'ao_delcache_nonce' ) |
|
| 125 | - ) ); |
|
| 120 | + wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array( |
|
| 121 | + 'ajaxurl' => admin_url('admin-ajax.php'), |
|
| 122 | + 'error_msg' => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'), |
|
| 123 | + 'dismiss_msg' => __('Dismiss this notice.'), |
|
| 124 | + 'nonce' => wp_create_nonce('ao_delcache_nonce') |
|
| 125 | + )); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | public function format_filesize($bytes, $decimals = 2) |
| 129 | 129 | { |
| 130 | - $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' ); |
|
| 131 | - for ($i = 0; ($bytes / 1024) > 0.9; $i++, $bytes /= 1024) {} |
|
| 132 | - return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[$i] ); |
|
| 130 | + $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'); |
|
| 131 | + for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} |
|
| 132 | + return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]); |
|
| 133 | 133 | } |
| 134 | 134 | } |
