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 | |
@@ -23,62 +23,62 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | //Reads the page and collects style tags |
| 25 | 25 | public function read($options) {
|
| 26 | - $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content ); |
|
| 26 | + $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
|
|
| 27 | 27 | if ($noptimizeCSS) return false; |
| 28 | 28 | |
| 29 | - $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content ); |
|
| 29 | + $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content);
|
|
| 30 | 30 | if (!empty($whitelistCSS)) {
|
| 31 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));
|
|
| 31 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));
|
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS); |
|
| 34 | + $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);
|
|
| 35 | 35 | if (!empty($removableCSS)) {
|
| 36 | - $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));
|
|
| 36 | + $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));
|
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | - $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);
|
|
| 39 | + $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
|
|
| 40 | 40 | |
| 41 | 41 | // filter to "late inject minified CSS", default to true for now (it is faster) |
| 42 | - $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);
|
|
| 42 | + $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
|
|
| 43 | 43 | |
| 44 | 44 | // Remove everything that's not the header |
| 45 | - if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {
|
|
| 46 | - $content = explode('</head>',$this->content,2);
|
|
| 45 | + if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {
|
|
| 46 | + $content = explode('</head>', $this->content, 2);
|
|
| 47 | 47 | $this->content = $content[0].'</head>'; |
| 48 | 48 | $this->restofcontent = $content[1]; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // include inline? |
| 52 | - if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {
|
|
| 52 | + if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {
|
|
| 53 | 53 | $this->include_inline = true; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // what CSS shouldn't be autoptimized |
| 57 | 57 | $excludeCSS = $options['css_exclude']; |
| 58 | - $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS, $this->content ); |
|
| 59 | - if ($excludeCSS!=="") {
|
|
| 60 | - $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));
|
|
| 58 | + $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS, $this->content);
|
|
| 59 | + if ($excludeCSS !== "") {
|
|
| 60 | + $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));
|
|
| 61 | 61 | } else {
|
| 62 | 62 | $this->dontmove = array(); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | // forcefully exclude CSS with data-noptimize attrib |
| 66 | - $this->dontmove[]="data-noptimize"; |
|
| 66 | + $this->dontmove[] = "data-noptimize"; |
|
| 67 | 67 | |
| 68 | 68 | // should we defer css? |
| 69 | 69 | // value: true/ false |
| 70 | 70 | $this->defer = $options['defer']; |
| 71 | - $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content ); |
|
| 71 | + $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);
|
|
| 72 | 72 | |
| 73 | 73 | // should we inline while deferring? |
| 74 | 74 | // value: inlined CSS |
| 75 | 75 | $this->defer_inline = $options['defer_inline']; |
| 76 | - $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content ); |
|
| 76 | + $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content);
|
|
| 77 | 77 | |
| 78 | 78 | // should we inline? |
| 79 | 79 | // value: true/ false |
| 80 | 80 | $this->inline = $options['inline']; |
| 81 | - $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content ); |
|
| 81 | + $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);
|
|
| 82 | 82 | |
| 83 | 83 | // get cdn url |
| 84 | 84 | $this->cdn_url = $options['cdn_url']; |
@@ -90,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,65 +108,65 @@ 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 | - $explUrl = explode('?',$source[2],2);
|
|
| 133 | + $explUrl = explode('?', $source[2], 2);
|
|
| 134 | 134 | $url = $explUrl[0]; |
| 135 | 135 | $path = $this->getpath($url); |
| 136 | 136 | |
| 137 | - if($path!==false && preg_match('#\.css$#',$path)) {
|
|
| 137 | + if ($path !== false && preg_match('#\.css$#', $path)) {
|
|
| 138 | 138 | // Good link |
| 139 | - $this->css[] = array($media,$path); |
|
| 140 | - }else{
|
|
| 139 | + $this->css[] = array($media, $path); |
|
| 140 | + } else {
|
|
| 141 | 141 | // Link is dynamic (.php etc) |
| 142 | 142 | $tag = ''; |
| 143 | 143 | } |
| 144 | 144 | } else {
|
| 145 | 145 | // inline css in style tags can be wrapped in comment tags, so restore comments |
| 146 | 146 | $tag = $this->restore_comments($tag); |
| 147 | - preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);
|
|
| 147 | + preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
|
|
| 148 | 148 | |
| 149 | 149 | // and re-hide them to be able to to the removal based on tag |
| 150 | 150 | $tag = $this->hide_comments($tag); |
| 151 | 151 | |
| 152 | - if ( $this->include_inline ) {
|
|
| 153 | - $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);
|
|
| 154 | - $this->css[] = array($media,'INLINE;'.$code); |
|
| 152 | + if ($this->include_inline) {
|
|
| 153 | + $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
|
|
| 154 | + $this->css[] = array($media, 'INLINE;'.$code); |
|
| 155 | 155 | } else {
|
| 156 | 156 | $tag = ''; |
| 157 | 157 | } |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | // Remove the original style tag |
| 161 | - $this->content = str_replace($tag,'',$this->content); |
|
| 161 | + $this->content = str_replace($tag, '', $this->content); |
|
| 162 | 162 | } else {
|
| 163 | 163 | // excluded CSS, minify if getpath |
| 164 | - if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 165 | - $explUrl = explode('?',$source[2],2);
|
|
| 164 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 165 | + $explUrl = explode('?', $source[2], 2);
|
|
| 166 | 166 | $url = $explUrl[0]; |
| 167 | 167 | $path = $this->getpath($url); |
| 168 | 168 | |
| 169 | - if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
|
|
| 169 | + if ($path && apply_filters('autoptimize_filter_css_minify_excluded', false)) {
|
|
| 170 | 170 | $_CachedMinifiedUrl = $this->minify_single($path); |
| 171 | 171 | |
| 172 | 172 | if (!empty($_CachedMinifiedUrl)) {
|
@@ -177,12 +177,12 @@ discard block |
||
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | // remove querystring from URL |
| 180 | - if ( !empty($explUrl[1]) ) {
|
|
| 181 | - $newTag = str_replace("?".$explUrl[1],"",$newTag);
|
|
| 180 | + if (!empty($explUrl[1])) {
|
|
| 181 | + $newTag = str_replace("?".$explUrl[1], "", $newTag);
|
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | // and replace |
| 185 | - $this->content = str_replace($tag,$newTag,$this->content); |
|
| 185 | + $this->content = str_replace($tag, $newTag, $this->content); |
|
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | } |
@@ -195,31 +195,31 @@ discard block |
||
| 195 | 195 | |
| 196 | 196 | // Joins and optimizes CSS |
| 197 | 197 | public function minify() {
|
| 198 | - foreach($this->css as $group) {
|
|
| 199 | - list($media,$css) = $group; |
|
| 200 | - if(preg_match('#^INLINE;#',$css)) {
|
|
| 198 | + foreach ($this->css as $group) {
|
|
| 199 | + list($media, $css) = $group; |
|
| 200 | + if (preg_match('#^INLINE;#', $css)) {
|
|
| 201 | 201 | // <style> |
| 202 | - $css = preg_replace('#^INLINE;#','',$css);
|
|
| 203 | - $css = $this->fixurls(ABSPATH.'/index.php',$css); |
|
| 204 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" ); |
|
| 205 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {
|
|
| 206 | - $css=$tmpstyle; |
|
| 207 | - $this->alreadyminified=true; |
|
| 202 | + $css = preg_replace('#^INLINE;#', '', $css);
|
|
| 203 | + $css = $this->fixurls(ABSPATH.'/index.php', $css); |
|
| 204 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");
|
|
| 205 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 206 | + $css = $tmpstyle; |
|
| 207 | + $this->alreadyminified = true; |
|
| 208 | 208 | } |
| 209 | 209 | } else {
|
| 210 | 210 | //<link> |
| 211 | - if($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 211 | + if ($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 212 | 212 | $cssPath = $css; |
| 213 | 213 | $cssContents = file_get_contents($cssPath); |
| 214 | 214 | $cssHash = md5($cssContents); |
| 215 | - $css = $this->fixurls($cssPath,$cssContents); |
|
| 216 | - $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);
|
|
| 217 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath ); |
|
| 215 | + $css = $this->fixurls($cssPath, $cssContents); |
|
| 216 | + $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
|
|
| 217 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);
|
|
| 218 | 218 | if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
| 219 | - $css=$tmpstyle; |
|
| 220 | - $this->alreadyminified=true; |
|
| 221 | - } else if ($this->can_inject_late($cssPath,$css)) {
|
|
| 222 | - $css="/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/"; |
|
| 219 | + $css = $tmpstyle; |
|
| 220 | + $this->alreadyminified = true; |
|
| 221 | + } else if ($this->can_inject_late($cssPath, $css)) {
|
|
| 222 | + $css = "/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/"; |
|
| 223 | 223 | } |
| 224 | 224 | } else {
|
| 225 | 225 | // Couldn't read CSS. Maybe getpath isn't working? |
@@ -227,8 +227,8 @@ discard block |
||
| 227 | 227 | } |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | - foreach($media as $elem) {
|
|
| 231 | - if(!isset($this->csscode[$elem])) |
|
| 230 | + foreach ($media as $elem) {
|
|
| 231 | + if (!isset($this->csscode[$elem])) |
|
| 232 | 232 | $this->csscode[$elem] = ''; |
| 233 | 233 | $this->csscode[$elem] .= "\n/*FILESTART*/".$css; |
| 234 | 234 | } |
@@ -237,12 +237,12 @@ discard block |
||
| 237 | 237 | // Check for duplicate code |
| 238 | 238 | $md5list = array(); |
| 239 | 239 | $tmpcss = $this->csscode; |
| 240 | - foreach($tmpcss as $media => $code) {
|
|
| 240 | + foreach ($tmpcss as $media => $code) {
|
|
| 241 | 241 | $md5sum = md5($code); |
| 242 | 242 | $medianame = $media; |
| 243 | - foreach($md5list as $med => $sum) {
|
|
| 243 | + foreach ($md5list as $med => $sum) {
|
|
| 244 | 244 | // If same code |
| 245 | - if($sum === $md5sum) {
|
|
| 245 | + if ($sum === $md5sum) {
|
|
| 246 | 246 | //Add the merged code |
| 247 | 247 | $medianame = $med.', '.$media; |
| 248 | 248 | $this->csscode[$medianame] = $code; |
@@ -262,30 +262,30 @@ discard block |
||
| 262 | 262 | $external_imports = ""; |
| 263 | 263 | |
| 264 | 264 | // remove comments to avoid importing commented-out imports |
| 265 | - $thiscss_nocomments = preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 265 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 266 | 266 | |
| 267 | - while(preg_match_all('#@import +(?:url)?(?:(?:\\(([\"\']?)(?:[^\"\')]+)\\1\\)|([\"\'])(?:[^\"\']+)\\2)(?:[^,;\"\']+(?:,[^,;\"\']+)*)?)(?:;)#m',$thiscss_nocomments,$matches)) {
|
|
| 268 | - foreach($matches[0] as $import) {
|
|
| 269 | - if ($this->isremovable($import,$this->cssremovables)) {
|
|
| 270 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 267 | + while (preg_match_all('#@import +(?:url)?(?:(?:\\(([\"\']?)(?:[^\"\')]+)\\1\\)|([\"\'])(?:[^\"\']+)\\2)(?:[^,;\"\']+(?:,[^,;\"\']+)*)?)(?:;)#m', $thiscss_nocomments, $matches)) {
|
|
| 268 | + foreach ($matches[0] as $import) {
|
|
| 269 | + if ($this->isremovable($import, $this->cssremovables)) {
|
|
| 270 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 271 | 271 | $import_ok = true; |
| 272 | 272 | } else {
|
| 273 | - $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");
|
|
| 273 | + $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
|
|
| 274 | 274 | $path = $this->getpath($url); |
| 275 | 275 | $import_ok = false; |
| 276 | 276 | if (file_exists($path) && is_readable($path)) {
|
| 277 | - $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\"); |
|
| 278 | - $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);
|
|
| 279 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" ); |
|
| 280 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 281 | - $code=$tmpstyle; |
|
| 282 | - $this->alreadyminified=true; |
|
| 283 | - } else if ($this->can_inject_late($path,$code)) {
|
|
| 284 | - $code="/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/"; |
|
| 277 | + $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\"); |
|
| 278 | + $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
|
|
| 279 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");
|
|
| 280 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 281 | + $code = $tmpstyle; |
|
| 282 | + $this->alreadyminified = true; |
|
| 283 | + } else if ($this->can_inject_late($path, $code)) {
|
|
| 284 | + $code = "/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/"; |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | - if(!empty($code)) {
|
|
| 288 | - $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);
|
|
| 287 | + if (!empty($code)) {
|
|
| 288 | + $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
|
|
| 289 | 289 | if (!empty($tmp_thiscss)) {
|
| 290 | 290 | $thiscss = $tmp_thiscss; |
| 291 | 291 | $import_ok = true; |
@@ -299,32 +299,32 @@ discard block |
||
| 299 | 299 | if (!$import_ok) {
|
| 300 | 300 | // external imports and general fall-back |
| 301 | 301 | $external_imports .= $import; |
| 302 | - $thiscss = str_replace($import,'',$thiscss); |
|
| 302 | + $thiscss = str_replace($import, '', $thiscss); |
|
| 303 | 303 | $fiximports = true; |
| 304 | 304 | } |
| 305 | 305 | } |
| 306 | - $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);
|
|
| 307 | - $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);
|
|
| 306 | + $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
|
|
| 307 | + $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
|
|
| 308 | 308 | |
| 309 | 309 | // and update $thiscss_nocomments before going into next iteration in while loop |
| 310 | - $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);
|
|
| 310 | + $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
|
|
| 311 | 311 | } |
| 312 | 312 | unset($thiscss_nocomments); |
| 313 | 313 | |
| 314 | 314 | // add external imports to top of aggregated CSS |
| 315 | - if($fiximports) {
|
|
| 316 | - $thiscss=$external_imports.$thiscss; |
|
| 315 | + if ($fiximports) {
|
|
| 316 | + $thiscss = $external_imports.$thiscss; |
|
| 317 | 317 | } |
| 318 | 318 | } |
| 319 | 319 | unset($thiscss); |
| 320 | 320 | |
| 321 | 321 | // $this->csscode has all the uncompressed code now. |
| 322 | - foreach($this->csscode as &$code) {
|
|
| 322 | + foreach ($this->csscode as &$code) {
|
|
| 323 | 323 | // Check for already-minified code |
| 324 | 324 | $hash = md5($code); |
| 325 | - do_action( 'autoptimize_action_css_hash', $hash ); |
|
| 326 | - $ccheck = new autoptimizeCache($hash,'css'); |
|
| 327 | - if($ccheck->check()) {
|
|
| 325 | + do_action('autoptimize_action_css_hash', $hash);
|
|
| 326 | + $ccheck = new autoptimizeCache($hash, 'css'); |
|
| 327 | + if ($ccheck->check()) {
|
|
| 328 | 328 | $code = $ccheck->retrieve(); |
| 329 | 329 | $this->hashmap[md5($code)] = $hash; |
| 330 | 330 | continue; |
@@ -333,44 +333,44 @@ discard block |
||
| 333 | 333 | |
| 334 | 334 | // Do the imaging! |
| 335 | 335 | $imgreplace = array(); |
| 336 | - preg_match_all( self::ASSETS_REGEX, $code, $matches ); |
|
| 336 | + preg_match_all(self::ASSETS_REGEX, $code, $matches); |
|
| 337 | 337 | |
| 338 | - if ( ($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches)) ) {
|
|
| 339 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 340 | - $iurl = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 338 | + if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
|
|
| 339 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 340 | + $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 341 | 341 | |
| 342 | 342 | // if querystring, remove it from url |
| 343 | - if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }
|
|
| 343 | + if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }
|
|
| 344 | 344 | |
| 345 | 345 | $ipath = $this->getpath($iurl); |
| 346 | 346 | |
| 347 | 347 | $datauri_max_size = 4096; |
| 348 | - $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size ); |
|
| 349 | - $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', ""); |
|
| 348 | + $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);
|
|
| 349 | + $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");
|
|
| 350 | 350 | if (!empty($datauri_exclude)) {
|
| 351 | - $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));
|
|
| 351 | + $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));
|
|
| 352 | 352 | foreach ($no_datauris as $no_datauri) {
|
| 353 | - if (strpos($iurl,$no_datauri)!==false) {
|
|
| 354 | - $ipath=false; |
|
| 353 | + if (strpos($iurl, $no_datauri) !== false) {
|
|
| 354 | + $ipath = false; |
|
| 355 | 355 | break; |
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | } |
| 359 | 359 | |
| 360 | - if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 361 | - $ihash=md5($ipath); |
|
| 362 | - $icheck = new autoptimizeCache($ihash,'img'); |
|
| 363 | - if($icheck->check()) {
|
|
| 360 | + if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 361 | + $ihash = md5($ipath); |
|
| 362 | + $icheck = new autoptimizeCache($ihash, 'img'); |
|
| 363 | + if ($icheck->check()) {
|
|
| 364 | 364 | // we have the base64 image in cache |
| 365 | - $headAndData=$icheck->retrieve(); |
|
| 366 | - $_base64data=explode(";base64,",$headAndData);
|
|
| 367 | - $base64data=$_base64data[1]; |
|
| 365 | + $headAndData = $icheck->retrieve(); |
|
| 366 | + $_base64data = explode(";base64,", $headAndData);
|
|
| 367 | + $base64data = $_base64data[1]; |
|
| 368 | 368 | } else {
|
| 369 | 369 | // It's an image and we don't have it in cache, get the type |
| 370 | - $explA=explode('.',$ipath);
|
|
| 371 | - $type=end($explA); |
|
| 370 | + $explA = explode('.', $ipath);
|
|
| 371 | + $type = end($explA); |
|
| 372 | 372 | |
| 373 | - switch($type) {
|
|
| 373 | + switch ($type) {
|
|
| 374 | 374 | case 'jpeg': |
| 375 | 375 | $dataurihead = 'data:image/jpeg;base64,'; |
| 376 | 376 | break; |
@@ -392,42 +392,42 @@ discard block |
||
| 392 | 392 | |
| 393 | 393 | // Encode the data |
| 394 | 394 | $base64data = base64_encode(file_get_contents($ipath)); |
| 395 | - $headAndData=$dataurihead.$base64data; |
|
| 395 | + $headAndData = $dataurihead.$base64data; |
|
| 396 | 396 | |
| 397 | 397 | // Save in cache |
| 398 | - $icheck->cache($headAndData,"text/plain"); |
|
| 398 | + $icheck->cache($headAndData, "text/plain"); |
|
| 399 | 399 | } |
| 400 | 400 | unset($icheck); |
| 401 | 401 | |
| 402 | 402 | // Add it to the list for replacement |
| 403 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]); |
|
| 403 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]); |
|
| 404 | 404 | } else {
|
| 405 | 405 | // just cdn the URL if applicable |
| 406 | 406 | if (!empty($this->cdn_url)) {
|
| 407 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 407 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | 410 | } |
| 411 | 411 | } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
|
| 412 | 412 | // change urls to cdn-url |
| 413 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 414 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 413 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 414 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 415 | 415 | } |
| 416 | 416 | } |
| 417 | 417 | |
| 418 | - if(!empty($imgreplace)) {
|
|
| 419 | - $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code); |
|
| 418 | + if (!empty($imgreplace)) {
|
|
| 419 | + $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code); |
|
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | // Minify |
| 423 | - if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {
|
|
| 423 | + if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {
|
|
| 424 | 424 | if (class_exists('Minify_CSS_Compressor')) {
|
| 425 | 425 | $tmp_code = trim(Minify_CSS_Compressor::process($code)); |
| 426 | - } else if(class_exists('CSSmin')) {
|
|
| 426 | + } else if (class_exists('CSSmin')) {
|
|
| 427 | 427 | $cssmin = new CSSmin(); |
| 428 | - if (method_exists($cssmin,"run")) {
|
|
| 428 | + if (method_exists($cssmin, "run")) {
|
|
| 429 | 429 | $tmp_code = trim($cssmin->run($code)); |
| 430 | - } elseif (@is_callable(array($cssmin,"minify"))) {
|
|
| 430 | + } elseif (@is_callable(array($cssmin, "minify"))) {
|
|
| 431 | 431 | $tmp_code = trim(CssMin::minify($code)); |
| 432 | 432 | } |
| 433 | 433 | } |
@@ -439,7 +439,7 @@ discard block |
||
| 439 | 439 | |
| 440 | 440 | $code = $this->inject_minified($code); |
| 441 | 441 | |
| 442 | - $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code ); |
|
| 442 | + $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
|
|
| 443 | 443 | if (!empty($tmp_code)) {
|
| 444 | 444 | $code = $tmp_code; |
| 445 | 445 | unset($tmp_code); |
@@ -454,13 +454,13 @@ discard block |
||
| 454 | 454 | //Caches the CSS in uncompressed, deflated and gzipped form. |
| 455 | 455 | public function cache() {
|
| 456 | 456 | // CSS cache |
| 457 | - foreach($this->csscode as $media => $code) {
|
|
| 457 | + foreach ($this->csscode as $media => $code) {
|
|
| 458 | 458 | $md5 = $this->hashmap[md5($code)]; |
| 459 | 459 | |
| 460 | - $cache = new autoptimizeCache($md5,'css'); |
|
| 461 | - if(!$cache->check()) {
|
|
| 460 | + $cache = new autoptimizeCache($md5, 'css'); |
|
| 461 | + if (!$cache->check()) {
|
|
| 462 | 462 | // Cache our code |
| 463 | - $cache->cache($code,'text/css'); |
|
| 463 | + $cache->cache($code, 'text/css'); |
|
| 464 | 464 | } |
| 465 | 465 | $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 466 | 466 | } |
@@ -475,7 +475,7 @@ discard block |
||
| 475 | 475 | $this->content = $this->restore_comments($this->content); |
| 476 | 476 | |
| 477 | 477 | // restore (no)script |
| 478 | - if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) {
|
|
| 478 | + if (strpos($this->content, '%%SCRIPT%%') !== false) {
|
|
| 479 | 479 | $this->content = preg_replace_callback( |
| 480 | 480 | '#%%SCRIPT'.AUTOPTIMIZE_HASH.'%%(.*?)%%SCRIPT%%#is', |
| 481 | 481 | create_function( |
@@ -490,55 +490,55 @@ discard block |
||
| 490 | 490 | $this->content = $this->restore_noptimize($this->content); |
| 491 | 491 | |
| 492 | 492 | //Restore the full content |
| 493 | - if(!empty($this->restofcontent)) {
|
|
| 493 | + if (!empty($this->restofcontent)) {
|
|
| 494 | 494 | $this->content .= $this->restofcontent; |
| 495 | 495 | $this->restofcontent = ''; |
| 496 | 496 | } |
| 497 | 497 | |
| 498 | 498 | // Inject the new stylesheets |
| 499 | - $replaceTag = array("<title","before");
|
|
| 500 | - $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content ); |
|
| 499 | + $replaceTag = array("<title", "before");
|
|
| 500 | + $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content);
|
|
| 501 | 501 | |
| 502 | 502 | if ($this->inline == true) {
|
| 503 | - foreach($this->csscode as $media => $code) {
|
|
| 504 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);
|
|
| 503 | + foreach ($this->csscode as $media => $code) {
|
|
| 504 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
|
|
| 505 | 505 | } |
| 506 | 506 | } else {
|
| 507 | 507 | if ($this->defer == true) {
|
| 508 | 508 | $preloadCssBlock = ""; |
| 509 | 509 | $noScriptCssBlock = "<noscript id=\"aonoscrcss\">"; |
| 510 | - $defer_inline_code=$this->defer_inline; |
|
| 511 | - if(!empty($defer_inline_code)){
|
|
| 512 | - if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
|
|
| 510 | + $defer_inline_code = $this->defer_inline; |
|
| 511 | + if (!empty($defer_inline_code)) {
|
|
| 512 | + if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
|
|
| 513 | 513 | $iCssHash = md5($defer_inline_code); |
| 514 | - $iCssCache = new autoptimizeCache($iCssHash,'css'); |
|
| 515 | - if($iCssCache->check()) {
|
|
| 514 | + $iCssCache = new autoptimizeCache($iCssHash, 'css'); |
|
| 515 | + if ($iCssCache->check()) {
|
|
| 516 | 516 | // we have the optimized inline CSS in cache |
| 517 | - $defer_inline_code=$iCssCache->retrieve(); |
|
| 517 | + $defer_inline_code = $iCssCache->retrieve(); |
|
| 518 | 518 | } else {
|
| 519 | 519 | if (class_exists('Minify_CSS_Compressor')) {
|
| 520 | 520 | $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code)); |
| 521 | - } else if(class_exists('CSSmin')) {
|
|
| 521 | + } else if (class_exists('CSSmin')) {
|
|
| 522 | 522 | $cssmin = new CSSmin(); |
| 523 | 523 | $tmp_code = trim($cssmin->run($defer_inline_code)); |
| 524 | 524 | } |
| 525 | 525 | if (!empty($tmp_code)) {
|
| 526 | 526 | $defer_inline_code = $tmp_code; |
| 527 | - $iCssCache->cache($defer_inline_code,"text/css"); |
|
| 527 | + $iCssCache->cache($defer_inline_code, "text/css"); |
|
| 528 | 528 | unset($tmp_code); |
| 529 | 529 | } |
| 530 | 530 | } |
| 531 | 531 | } |
| 532 | - $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 533 | - $this->inject_in_html($code_out,$replaceTag); |
|
| 532 | + $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 533 | + $this->inject_in_html($code_out, $replaceTag); |
|
| 534 | 534 | } |
| 535 | 535 | } |
| 536 | 536 | |
| 537 | - foreach($this->url as $media => $url) {
|
|
| 537 | + foreach ($this->url as $media => $url) {
|
|
| 538 | 538 | $url = $this->url_replace_cdn($url); |
| 539 | 539 | |
| 540 | 540 | //Add the stylesheet either deferred (import at bottom) or normal links in head |
| 541 | - if($this->defer == true) {
|
|
| 541 | + if ($this->defer == true) {
|
|
| 542 | 542 | |
| 543 | 543 | // Filter to modify the onload attribute - passes value and the stylesheet url |
| 544 | 544 | $preloadOnLoad = apply_filters('autoptimize_filter_css_preload_onload', "this.rel='stylesheet'", $url);
|
@@ -548,25 +548,25 @@ discard block |
||
| 548 | 548 | |
| 549 | 549 | } else {
|
| 550 | 550 | if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
|
| 551 | - $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);
|
|
| 552 | - } else if (strlen($this->csscode[$media])>0) {
|
|
| 553 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);
|
|
| 551 | + $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
|
|
| 552 | + } else if (strlen($this->csscode[$media]) > 0) {
|
|
| 553 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
|
|
| 554 | 554 | } |
| 555 | 555 | } |
| 556 | 556 | } |
| 557 | 557 | |
| 558 | - if($this->defer == true) {
|
|
| 558 | + if ($this->defer == true) {
|
|
| 559 | 559 | $preloadPolyfill = '<script data-cfasync=\'false\'>/*! loadCSS. [c]2017 Filament Group, Inc. MIT License */ |
| 560 | 560 | !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);
|
| 561 | 561 | /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */ |
| 562 | 562 | !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>';
|
| 563 | 563 | $noScriptCssBlock .= "</noscript>"; |
| 564 | - $this->inject_in_html($preloadCssBlock.$noScriptCssBlock,$replaceTag); |
|
| 564 | + $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag); |
|
| 565 | 565 | |
| 566 | 566 | // Adds preload polyfill at end of body tag |
| 567 | 567 | $this->inject_in_html( |
| 568 | 568 | apply_filters('autoptimize_css_preload_polyfill', $preloadPolyfill),
|
| 569 | - array('</body>','before')
|
|
| 569 | + array('</body>', 'before')
|
|
| 570 | 570 | ); |
| 571 | 571 | } |
| 572 | 572 | } |
@@ -577,62 +577,62 @@ discard block |
||
| 577 | 577 | |
| 578 | 578 | static function fixurls($file, $code) {
|
| 579 | 579 | // Switch all imports to the url() syntax |
| 580 | - $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code );
|
|
| 580 | + $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code);
|
|
| 581 | 581 | |
| 582 | - if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
|
|
| 583 | - $file = str_replace( WP_ROOT_DIR, '/', $file ); |
|
| 584 | - $dir = dirname( $file ); // Like /themes/expound/css |
|
| 582 | + if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
|
|
| 583 | + $file = str_replace(WP_ROOT_DIR, '/', $file); |
|
| 584 | + $dir = dirname($file); // Like /themes/expound/css |
|
| 585 | 585 | |
| 586 | 586 | // $dir should not contain backslashes, since it's used to replace |
| 587 | 587 | // urls, but it can contain them when running on Windows because |
| 588 | 588 | // fixurls() is sometimes called with `ABSPATH . 'index.php'` |
| 589 | - $dir = str_replace( '\\', '/', $dir ); |
|
| 590 | - unset( $file ); // not used below at all |
|
| 589 | + $dir = str_replace('\\', '/', $dir);
|
|
| 590 | + unset($file); // not used below at all |
|
| 591 | 591 | |
| 592 | 592 | $replace = array(); |
| 593 | - foreach ( $matches[1] as $k => $url ) {
|
|
| 593 | + foreach ($matches[1] as $k => $url) {
|
|
| 594 | 594 | // Remove quotes |
| 595 | - $url = trim( $url," \t\n\r\0\x0B\"'" ); |
|
| 596 | - $noQurl = trim( $url, "\"'" ); |
|
| 597 | - if ( $url !== $noQurl ) {
|
|
| 595 | + $url = trim($url, " \t\n\r\0\x0B\"'"); |
|
| 596 | + $noQurl = trim($url, "\"'"); |
|
| 597 | + if ($url !== $noQurl) {
|
|
| 598 | 598 | $removedQuotes = true; |
| 599 | 599 | } else {
|
| 600 | 600 | $removedQuotes = false; |
| 601 | 601 | } |
| 602 | 602 | |
| 603 | - if ( '' === $noQurl ) {
|
|
| 603 | + if ('' === $noQurl) {
|
|
| 604 | 604 | continue; |
| 605 | 605 | } |
| 606 | 606 | |
| 607 | 607 | $url = $noQurl; |
| 608 | - if ( '/' === $url{0} || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) {
|
|
| 608 | + if ('/' === $url{0} || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
|
|
| 609 | 609 | // URL is protocol-relative, host-relative or something we don't touch |
| 610 | 610 | continue; |
| 611 | 611 | } else {
|
| 612 | 612 | // Relative URL |
| 613 | - $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) ); |
|
| 613 | + $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
|
|
| 614 | 614 | |
| 615 | 615 | // Hash the url + whatever was behind potentially for replacement |
| 616 | 616 | // We must do this, or different css classes referencing the same bg image (but |
| 617 | 617 | // different parts of it, say, in sprites and such) loose their stuff... |
| 618 | - $hash = md5( $url . $matches[2][$k] ); |
|
| 619 | - $code = str_replace( $matches[0][$k], $hash, $code ); |
|
| 618 | + $hash = md5($url.$matches[2][$k]); |
|
| 619 | + $code = str_replace($matches[0][$k], $hash, $code); |
|
| 620 | 620 | |
| 621 | - if ( $removedQuotes ) {
|
|
| 622 | - $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k];
|
|
| 621 | + if ($removedQuotes) {
|
|
| 622 | + $replace[$hash] = "url('".$newurl."')".$matches[2][$k];
|
|
| 623 | 623 | } else {
|
| 624 | - $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k];
|
|
| 624 | + $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];
|
|
| 625 | 625 | } |
| 626 | 626 | } |
| 627 | 627 | } |
| 628 | 628 | |
| 629 | - if ( ! empty( $replace ) ) {
|
|
| 629 | + if (!empty($replace)) {
|
|
| 630 | 630 | // Sort the replacements array by key length in desc order (so that the longest strings are replaced first) |
| 631 | - $keys = array_map( 'strlen', array_keys( $replace ) ); |
|
| 632 | - array_multisort( $keys, SORT_DESC, $replace ); |
|
| 631 | + $keys = array_map('strlen', array_keys($replace));
|
|
| 632 | + array_multisort($keys, SORT_DESC, $replace); |
|
| 633 | 633 | |
| 634 | 634 | // Replace URLs found within $code |
| 635 | - $code = str_replace( array_keys( $replace ), array_values( $replace ), $code ); |
|
| 635 | + $code = str_replace(array_keys($replace), array_values($replace), $code); |
|
| 636 | 636 | } |
| 637 | 637 | } |
| 638 | 638 | |
@@ -640,11 +640,11 @@ discard block |
||
| 640 | 640 | } |
| 641 | 641 | |
| 642 | 642 | private function ismovable($tag) {
|
| 643 | - if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
|
|
| 643 | + if (apply_filters('autoptimize_filter_css_dontaggregate', false)) {
|
|
| 644 | 644 | return false; |
| 645 | 645 | } else if (!empty($this->whitelist)) {
|
| 646 | 646 | foreach ($this->whitelist as $match) {
|
| 647 | - if(strpos($tag,$match)!==false) {
|
|
| 647 | + if (strpos($tag, $match) !== false) {
|
|
| 648 | 648 | return true; |
| 649 | 649 | } |
| 650 | 650 | } |
@@ -652,8 +652,8 @@ discard block |
||
| 652 | 652 | return false; |
| 653 | 653 | } else {
|
| 654 | 654 | if (is_array($this->dontmove)) {
|
| 655 | - foreach($this->dontmove as $match) {
|
|
| 656 | - if(strpos($tag,$match)!==false) {
|
|
| 655 | + foreach ($this->dontmove as $match) {
|
|
| 656 | + if (strpos($tag, $match) !== false) {
|
|
| 657 | 657 | //Matched something |
| 658 | 658 | return false; |
| 659 | 659 | } |
@@ -665,21 +665,21 @@ discard block |
||
| 665 | 665 | } |
| 666 | 666 | } |
| 667 | 667 | |
| 668 | - private function can_inject_late($cssPath,$css) {
|
|
| 668 | + private function can_inject_late($cssPath, $css) {
|
|
| 669 | 669 | $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
|
| 670 | - if ( $this->inject_min_late !== true ) {
|
|
| 670 | + if ($this->inject_min_late !== true) {
|
|
| 671 | 671 | // late-inject turned off |
| 672 | 672 | return false; |
| 673 | - } else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {
|
|
| 673 | + } else if ((strpos($cssPath, "min.css") === false) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) {
|
|
| 674 | 674 | // file not minified based on filename & filter |
| 675 | 675 | return false; |
| 676 | - } else if ( strpos($css,"@import") !== false ) {
|
|
| 676 | + } else if (strpos($css, "@import") !== false) {
|
|
| 677 | 677 | // can't late-inject files with imports as those need to be aggregated |
| 678 | 678 | return false; |
| 679 | - } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {
|
|
| 679 | + } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {
|
|
| 680 | 680 | // don't late-inject CSS with font-src's if fonts are set to be CDN'ed |
| 681 | 681 | return false; |
| 682 | - } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {
|
|
| 682 | + } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {
|
|
| 683 | 683 | // don't late-inject CSS with images if CDN is set OR is image inlining is on |
| 684 | 684 | return false; |
| 685 | 685 | } else {
|
@@ -689,11 +689,11 @@ discard block |
||
| 689 | 689 | } |
| 690 | 690 | |
| 691 | 691 | private function maybe_cdn_urls($inUrl) {
|
| 692 | - $url = trim($inUrl," \t\n\r\0\x0B\"'"); |
|
| 693 | - $urlPath = parse_url($url,PHP_URL_PATH); |
|
| 692 | + $url = trim($inUrl, " \t\n\r\0\x0B\"'"); |
|
| 693 | + $urlPath = parse_url($url, PHP_URL_PATH); |
|
| 694 | 694 | |
| 695 | 695 | // exclude fonts from CDN except if filter returns true |
| 696 | - if ( !preg_match('#\.(woff2?|eot|ttf|otf)$#i',$urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn',false) ) {
|
|
| 696 | + if (!preg_match('#\.(woff2?|eot|ttf|otf)$#i', $urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn', false)) {
|
|
| 697 | 697 | $cdn_url = $this->url_replace_cdn($url); |
| 698 | 698 | } else {
|
| 699 | 699 | $cdn_url = $url; |
@@ -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 autoptimizeConfig { |
| 5 | 5 | private $config = null; |
@@ -7,25 +7,25 @@ discard block |
||
| 7 | 7 | |
| 8 | 8 | //Singleton: private construct |
| 9 | 9 | private function __construct() { |
| 10 | - if( is_admin() ) { |
|
| 10 | + if (is_admin()) { |
|
| 11 | 11 | //Add the admin page and settings |
| 12 | - add_action('admin_menu',array($this,'addmenu')); |
|
| 13 | - add_action('admin_init',array($this,'registersettings')); |
|
| 12 | + add_action('admin_menu', array($this, 'addmenu')); |
|
| 13 | + add_action('admin_init', array($this, 'registersettings')); |
|
| 14 | 14 | |
| 15 | 15 | //Set meta info |
| 16 | - if(function_exists('plugin_row_meta')) { |
|
| 16 | + if (function_exists('plugin_row_meta')) { |
|
| 17 | 17 | //2.8+ |
| 18 | - add_filter('plugin_row_meta',array($this,'setmeta'),10,2); |
|
| 19 | - } elseif(function_exists('post_class')) { |
|
| 18 | + add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2); |
|
| 19 | + } elseif (function_exists('post_class')) { |
|
| 20 | 20 | //2.7 |
| 21 | 21 | $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
| 22 | - add_filter('plugin_action_links_'.$plugin,array($this,'setmeta')); |
|
| 22 | + add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta')); |
|
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | //Clean cache? |
| 26 | - if(get_option('autoptimize_cache_clean')) { |
|
| 26 | + if (get_option('autoptimize_cache_clean')) { |
|
| 27 | 27 | autoptimizeCache::clearall(); |
| 28 | - update_option('autoptimize_cache_clean',0); |
|
| 28 | + update_option('autoptimize_cache_clean', 0); |
|
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | |
@@ -159,27 +159,27 @@ discard block |
||
| 159 | 159 | <div class="wrap"> |
| 160 | 160 | |
| 161 | 161 | <?php if (version_compare(PHP_VERSION, '5.3.0') < 0) { ?> |
| 162 | -<div class="notice-error notice"><?php echo '<p>' . sprintf( __('<strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href=%s>serious security and performance issues</a>. Support for PHP 5.5 and below will be removed in one of the next AO released, please ask your hoster to provide you with an upgrade path to 7.x.','autoptimize'), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"') . '</p>'; ?></div> |
|
| 162 | +<div class="notice-error notice"><?php echo '<p>'.sprintf(__('<strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href=%s>serious security and performance issues</a>. Support for PHP 5.5 and below will be removed in one of the next AO released, please ask your hoster to provide you with an upgrade path to 7.x.', 'autoptimize'), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"').'</p>'; ?></div> |
|
| 163 | 163 | <?php } ?> |
| 164 | 164 | |
| 165 | 165 | <div id="autoptimize_main"> |
| 166 | 166 | <div id="ao_title_and_button"> |
| 167 | - <h1 id="ao_title"><?php _e('Autoptimize Settings','autoptimize'); ?> |
|
| 167 | + <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?> |
|
| 168 | 168 | <span id="ao_adv_button"> |
| 169 | 169 | <?php |
| 170 | - if (get_option('autoptimize_show_adv','0')=='1') { |
|
| 170 | + if (get_option('autoptimize_show_adv', '0') == '1') { |
|
| 171 | 171 | ?> |
| 172 | - <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings","autoptimize") ?></span></a> |
|
| 173 | - <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a> |
|
| 172 | + <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a> |
|
| 173 | + <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a> |
|
| 174 | 174 | <style>tr.ao_adv{display:table-row;} li.ao_adv{display:list-item;}</style> |
| 175 | 175 | <?php |
| 176 | - $hiddenClass=""; |
|
| 176 | + $hiddenClass = ""; |
|
| 177 | 177 | } else { |
| 178 | 178 | ?> |
| 179 | - <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings","autoptimize") ?></span></a> |
|
| 180 | - <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a> |
|
| 179 | + <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a> |
|
| 180 | + <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a> |
|
| 181 | 181 | <?php |
| 182 | - $hiddenClass="hidden "; |
|
| 182 | + $hiddenClass = "hidden "; |
|
| 183 | 183 | } |
| 184 | 184 | ?> |
| 185 | 185 | </span> |
@@ -194,158 +194,158 @@ discard block |
||
| 194 | 194 | <ul> |
| 195 | 195 | |
| 196 | 196 | <li class="itemDetail"> |
| 197 | -<h2 class="itemTitle"><?php _e('HTML Options','autoptimize'); ?></h2> |
|
| 197 | +<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2> |
|
| 198 | 198 | <table class="form-table"> |
| 199 | 199 | <tr valign="top"> |
| 200 | -<th scope="row"><?php _e('Optimize HTML Code?','autoptimize'); ?></th> |
|
| 201 | -<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html')?'checked="checked" ':''; ?>/></td> |
|
| 200 | +<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th> |
|
| 201 | +<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 202 | 202 | </tr> |
| 203 | -<tr class="<?php echo $hiddenClass;?>html_sub ao_adv" valign="top"> |
|
| 204 | -<th scope="row"><?php _e('Keep HTML comments?','autoptimize'); ?></th> |
|
| 205 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments')?'checked="checked" ':''; ?>/> |
|
| 206 | -<?php _e('Enable this if you want HTML comments to remain in the page.','autoptimize'); ?></label></td> |
|
| 203 | +<tr class="<?php echo $hiddenClass; ?>html_sub ao_adv" valign="top"> |
|
| 204 | +<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th> |
|
| 205 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/> |
|
| 206 | +<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td> |
|
| 207 | 207 | </tr> |
| 208 | 208 | </table> |
| 209 | 209 | </li> |
| 210 | 210 | |
| 211 | 211 | <li class="itemDetail"> |
| 212 | -<h2 class="itemTitle"><?php _e('JavaScript Options','autoptimize'); ?></h2> |
|
| 212 | +<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2> |
|
| 213 | 213 | <table class="form-table"> |
| 214 | 214 | <tr valign="top"> |
| 215 | -<th scope="row"><?php _e('Optimize JavaScript Code?','autoptimize'); ?></th> |
|
| 216 | -<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js')?'checked="checked" ':''; ?>/></td> |
|
| 215 | +<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th> |
|
| 216 | +<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 217 | 217 | </tr> |
| 218 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 219 | -<th scope="row"><?php _e('Force JavaScript in <head>?','autoptimize'); ?></th> |
|
| 220 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead')?'checked="checked" ':''; ?>/> |
|
| 221 | -<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.','autoptimize'); ?></label></td> |
|
| 218 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 219 | +<th scope="row"><?php _e('Force JavaScript in <head>?', 'autoptimize'); ?></th> |
|
| 220 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/> |
|
| 221 | +<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize'); ?></label></td> |
|
| 222 | 222 | </tr> |
| 223 | 223 | <?php if (get_option('autoptimize_js_justhead')) { ?> |
| 224 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 225 | -<th scope="row"><?php _e('Look for scripts only in <head>?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th> |
|
| 226 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead')?'checked="checked" ':''; ?>/> |
|
| 227 | -<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.','autoptimize'); ?></label></td> |
|
| 224 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 225 | +<th scope="row"><?php _e('Look for scripts only in <head>?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th> |
|
| 226 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
| 227 | +<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td> |
|
| 228 | 228 | </tr> |
| 229 | 229 | <?php } ?> |
| 230 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 231 | -<th scope="row"><?php _e('Also aggregate inline JS?','autoptimize'); ?></th> |
|
| 232 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline')?'checked="checked" ':''; ?>/> |
|
| 233 | -<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.','autoptimize'); ?></label></td> |
|
| 230 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 231 | +<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th> |
|
| 232 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/> |
|
| 233 | +<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize'); ?></label></td> |
|
| 234 | 234 | </tr> |
| 235 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 236 | -<th scope="row"><?php _e('Exclude scripts from Autoptimize:','autoptimize'); ?></th> |
|
| 237 | -<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude',"seal.js, js/jquery/jquery.js"); ?>"/><br /> |
|
| 238 | -<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.','autoptimize'); ?></label></td> |
|
| 235 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 236 | +<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th> |
|
| 237 | +<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude', "seal.js, js/jquery/jquery.js"); ?>"/><br /> |
|
| 238 | +<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.', 'autoptimize'); ?></label></td> |
|
| 239 | 239 | </tr> |
| 240 | -<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv"> |
|
| 241 | -<th scope="row"><?php _e('Add try-catch wrapping?','autoptimize'); ?></th> |
|
| 242 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch')?'checked="checked" ':''; ?>/> |
|
| 243 | -<?php _e('If your scripts break because of a JS-error, you might want to try this.','autoptimize'); ?></label></td> |
|
| 240 | +<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv"> |
|
| 241 | +<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th> |
|
| 242 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/> |
|
| 243 | +<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td> |
|
| 244 | 244 | </tr> |
| 245 | 245 | </table> |
| 246 | 246 | </li> |
| 247 | 247 | |
| 248 | 248 | <li class="itemDetail"> |
| 249 | -<h2 class="itemTitle"><?php _e('CSS Options','autoptimize'); ?></h2> |
|
| 249 | +<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2> |
|
| 250 | 250 | <table class="form-table"> |
| 251 | 251 | <tr valign="top"> |
| 252 | -<th scope="row"><?php _e('Optimize CSS Code?','autoptimize'); ?></th> |
|
| 253 | -<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css')?'checked="checked" ':''; ?>/></td> |
|
| 252 | +<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th> |
|
| 253 | +<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td> |
|
| 254 | 254 | </tr> |
| 255 | -<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top"> |
|
| 256 | -<th scope="row"><?php _e('Generate data: URIs for images?','autoptimize'); ?></th> |
|
| 257 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris')?'checked="checked" ':''; ?>/> |
|
| 258 | -<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.','autoptimize'); ?></label></td> |
|
| 255 | +<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top"> |
|
| 256 | +<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th> |
|
| 257 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/> |
|
| 258 | +<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td> |
|
| 259 | 259 | </tr> |
| 260 | 260 | <?php if (get_option('autoptimize_css_justhead')) { ?> |
| 261 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
|
| 262 | -<th scope="row"><?php _e('Look for styles only in <head>?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th> |
|
| 263 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead')?'checked="checked" ':''; ?>/> |
|
| 264 | -<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.','autoptimize'); ?></label></td> |
|
| 261 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv"> |
|
| 262 | +<th scope="row"><?php _e('Look for styles only in <head>?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th> |
|
| 263 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/> |
|
| 264 | +<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td> |
|
| 265 | 265 | </tr> |
| 266 | 266 | <?php } ?> |
| 267 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
|
| 268 | -<th scope="row"><?php _e('Also aggregate inline CSS?','autoptimize'); ?></th> |
|
| 269 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline','1')?'checked="checked" ':''; ?>/> |
|
| 270 | -<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.','autoptimize'); ?></label></td> |
|
| 267 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv"> |
|
| 268 | +<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th> |
|
| 269 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 270 | +<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td> |
|
| 271 | 271 | </tr> |
| 272 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv"> |
|
| 273 | -<th scope="row"><?php _e('Inline and Defer CSS?','autoptimize'); ?></th> |
|
| 274 | -<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer')?'checked="checked" ':''; ?>/> |
|
| 275 | -<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!','autoptimize'); ?></label></td> |
|
| 272 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv"> |
|
| 273 | +<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th> |
|
| 274 | +<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/> |
|
| 275 | +<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!', 'autoptimize'); ?></label></td> |
|
| 276 | 276 | </tr> |
| 277 | -<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv" id="autoptimize_css_defer_inline"> |
|
| 277 | +<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv" id="autoptimize_css_defer_inline"> |
|
| 278 | 278 | <th scope="row"></th> |
| 279 | -<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.','autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td> |
|
| 279 | +<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td> |
|
| 280 | 280 | </tr> |
| 281 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub"> |
|
| 282 | -<th scope="row"><?php _e('Inline all CSS?','autoptimize'); ?></th> |
|
| 283 | -<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline')?'checked="checked" ':''; ?>/> |
|
| 284 | -<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.','autoptimize'); ?></label></td> |
|
| 281 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub"> |
|
| 282 | +<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th> |
|
| 283 | +<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/> |
|
| 284 | +<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.', 'autoptimize'); ?></label></td> |
|
| 285 | 285 | </tr> |
| 286 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub"> |
|
| 287 | -<th scope="row"><?php _e('Exclude CSS from Autoptimize:','autoptimize'); ?></th> |
|
| 288 | -<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude','admin-bar.min.css, dashicons.min.css'); ?>"/><br /> |
|
| 289 | -<?php _e('A comma-separated list of CSS you want to exclude from being optimized.','autoptimize'); ?></label></td> |
|
| 286 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub"> |
|
| 287 | +<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th> |
|
| 288 | +<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude', 'admin-bar.min.css, dashicons.min.css'); ?>"/><br /> |
|
| 289 | +<?php _e('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize'); ?></label></td> |
|
| 290 | 290 | </tr> |
| 291 | 291 | </table> |
| 292 | 292 | </li> |
| 293 | 293 | |
| 294 | 294 | <li class="itemDetail"> |
| 295 | -<h2 class="itemTitle"><?php _e('CDN Options','autoptimize'); ?></h2> |
|
| 295 | +<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2> |
|
| 296 | 296 | <table class="form-table"> |
| 297 | 297 | <tr valign="top"> |
| 298 | -<th scope="row"><?php _e('CDN Base URL','autoptimize'); ?></th> |
|
| 299 | -<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url',''),array("http","https")); ?>" /><br /> |
|
| 300 | -<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.','autoptimize'); ?></label></td> |
|
| 298 | +<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th> |
|
| 299 | +<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url', ''), array("http", "https")); ?>" /><br /> |
|
| 300 | +<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize'); ?></label></td> |
|
| 301 | 301 | </tr> |
| 302 | 302 | </table> |
| 303 | 303 | </li> |
| 304 | 304 | |
| 305 | -<li class="<?php echo $hiddenClass;?>itemDetail ao_adv"> |
|
| 306 | -<h2 class="itemTitle"><?php _e('Cache Info','autoptimize'); ?></h2> |
|
| 305 | +<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv"> |
|
| 306 | +<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2> |
|
| 307 | 307 | <table class="form-table" > |
| 308 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 309 | -<th scope="row"><?php _e('Cache folder','autoptimize'); ?></th> |
|
| 308 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 309 | +<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th> |
|
| 310 | 310 | <td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td> |
| 311 | 311 | </tr> |
| 312 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 313 | -<th scope="row"><?php _e('Can we write?','autoptimize'); ?></th> |
|
| 314 | -<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes','autoptimize') : __('No','autoptimize')); ?></td> |
|
| 312 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 313 | +<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th> |
|
| 314 | +<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td> |
|
| 315 | 315 | </tr> |
| 316 | -<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 317 | -<th scope="row"><?php _e('Cached styles and scripts','autoptimize'); ?></th> |
|
| 316 | +<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 317 | +<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th> |
|
| 318 | 318 | <td><?php |
| 319 | - $AOstatArr=autoptimizeCache::stats(); |
|
| 320 | - $AOcacheSize=round($AOstatArr[1]/1024); |
|
| 321 | - printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2]) ); |
|
| 319 | + $AOstatArr = autoptimizeCache::stats(); |
|
| 320 | + $AOcacheSize = round($AOstatArr[1]/1024); |
|
| 321 | + printf(__('%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2])); |
|
| 322 | 322 | ?></td> |
| 323 | 323 | </tr> |
| 324 | 324 | </table> |
| 325 | 325 | </li> |
| 326 | 326 | |
| 327 | -<li class="<?php echo $hiddenClass;?>itemDetail ao_adv"> |
|
| 328 | -<h2 class="itemTitle"><?php _e('Misc Options','autoptimize'); ?></h2> |
|
| 327 | +<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv"> |
|
| 328 | +<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2> |
|
| 329 | 329 | <table class="form-table"> |
| 330 | - <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 331 | - <th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th> |
|
| 332 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/> |
|
| 333 | - <?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.','autoptimize'); ?></label> |
|
| 330 | + <tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 331 | + <th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th> |
|
| 332 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 333 | + <?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label> |
|
| 334 | 334 | </td> |
| 335 | 335 | </tr> |
| 336 | - <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 337 | - <th scope="row"><?php _e('Also optimize for logged in users?','autoptimize'); ?></th> |
|
| 338 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged','1')?'checked="checked" ':''; ?>/> |
|
| 339 | - <?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.','autoptimize'); ?></label> |
|
| 336 | + <tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 337 | + <th scope="row"><?php _e('Also optimize for logged in users?', 'autoptimize'); ?></th> |
|
| 338 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 339 | + <?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize'); ?></label> |
|
| 340 | 340 | </td> |
| 341 | 341 | </tr> |
| 342 | 342 | <?php |
| 343 | - if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) { |
|
| 343 | + if (function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout")) { |
|
| 344 | 344 | ?> |
| 345 | - <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv"> |
|
| 346 | - <th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th> |
|
| 347 | - <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/> |
|
| 348 | - <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.','autoptimize'); ?></label> |
|
| 345 | + <tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv"> |
|
| 346 | + <th scope="row"><?php _e('Also optimize shop cart/ checkout?', 'autoptimize'); ?></th> |
|
| 347 | + <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout', '1') ? 'checked="checked" ' : ''; ?>/> |
|
| 348 | + <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize'); ?></label> |
|
| 349 | 349 | </td> |
| 350 | 350 | </tr> |
| 351 | 351 | <?php |
@@ -356,11 +356,11 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | </ul> |
| 358 | 358 | |
| 359 | -<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv','0'); ?>"> |
|
| 359 | +<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv', '0'); ?>"> |
|
| 360 | 360 | |
| 361 | 361 | <p class="submit"> |
| 362 | -<input type="submit" class="button-secondary" value="<?php _e('Save Changes','autoptimize') ?>" /> |
|
| 363 | -<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache','autoptimize') ?>" /> |
|
| 362 | +<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize') ?>" /> |
|
| 363 | +<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize') ?>" /> |
|
| 364 | 364 | </p> |
| 365 | 365 | |
| 366 | 366 | </form> |
@@ -369,31 +369,31 @@ discard block |
||
| 369 | 369 | <div class="autoptimize_banner hidden"> |
| 370 | 370 | <ul> |
| 371 | 371 | <?php |
| 372 | - if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) { |
|
| 373 | - $AO_banner=get_transient("autoptimize_banner"); |
|
| 372 | + if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) { |
|
| 373 | + $AO_banner = get_transient("autoptimize_banner"); |
|
| 374 | 374 | if (empty($AO_banner)) { |
| 375 | 375 | $banner_resp = wp_remote_get("http://misc.optimizingmatters.com/autoptimize_news.html"); |
| 376 | 376 | if (!is_wp_error($banner_resp)) { |
| 377 | - if (wp_remote_retrieve_response_code($banner_resp)=="200") { |
|
| 377 | + if (wp_remote_retrieve_response_code($banner_resp) == "200") { |
|
| 378 | 378 | $AO_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp)); |
| 379 | - set_transient("autoptimize_banner",$AO_banner,DAY_IN_SECONDS); |
|
| 379 | + set_transient("autoptimize_banner", $AO_banner, DAY_IN_SECONDS); |
|
| 380 | 380 | } |
| 381 | 381 | } |
| 382 | 382 | } |
| 383 | 383 | echo $AO_banner; |
| 384 | 384 | } |
| 385 | 385 | ?> |
| 386 | - <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.","autoptimize"); ?></li> |
|
| 387 | - <li><?php _e("Happy with Autoptimize?","autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!","autoptimize"); ?></a></li> |
|
| 386 | + <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", "autoptimize"); ?></li> |
|
| 387 | + <li><?php _e("Happy with Autoptimize?", "autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!", "autoptimize"); ?></a></li> |
|
| 388 | 388 | </ul> |
| 389 | 389 | </div> |
| 390 | 390 | <div style="margin-left:10px;margin-top:-5px;"> |
| 391 | 391 | <h2> |
| 392 | - <?php _e("futtta about","autoptimize") ?> |
|
| 392 | + <?php _e("futtta about", "autoptimize") ?> |
|
| 393 | 393 | <select id="feed_dropdown" > |
| 394 | - <option value="1"><?php _e("Autoptimize","autoptimize") ?></option> |
|
| 395 | - <option value="2"><?php _e("WordPress","autoptimize") ?></option> |
|
| 396 | - <option value="3"><?php _e("Web Technology","autoptimize") ?></option> |
|
| 394 | + <option value="1"><?php _e("Autoptimize", "autoptimize") ?></option> |
|
| 395 | + <option value="2"><?php _e("WordPress", "autoptimize") ?></option> |
|
| 396 | + <option value="3"><?php _e("Web Technology", "autoptimize") ?></option> |
|
| 397 | 397 | </select> |
| 398 | 398 | </h2> |
| 399 | 399 | <div id="futtta_feed"> |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | </div> |
| 409 | 409 | </div> |
| 410 | 410 | </div> |
| 411 | - <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!","autoptimize"); ?>"></a></div> |
|
| 411 | + <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!", "autoptimize"); ?>"></a></div> |
|
| 412 | 412 | </div> |
| 413 | 413 | |
| 414 | 414 | <script type="text/javascript"> |
@@ -547,14 +547,14 @@ discard block |
||
| 547 | 547 | } |
| 548 | 548 | |
| 549 | 549 | public function addmenu() { |
| 550 | - $hook=add_options_page(__('Autoptimize Options','autoptimize'),'Autoptimize','manage_options','autoptimize',array($this,'show')); |
|
| 551 | - add_action( 'admin_print_scripts-'.$hook,array($this,'autoptimize_admin_scripts')); |
|
| 552 | - add_action( 'admin_print_styles-'.$hook,array($this,'autoptimize_admin_styles')); |
|
| 550 | + $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show')); |
|
| 551 | + add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts')); |
|
| 552 | + add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles')); |
|
| 553 | 553 | } |
| 554 | 554 | |
| 555 | 555 | public function autoptimize_admin_scripts() { |
| 556 | - wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'),null,true); |
|
| 557 | - wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'),null,true); |
|
| 556 | + wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true); |
|
| 557 | + wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true); |
|
| 558 | 558 | } |
| 559 | 559 | |
| 560 | 560 | public function autoptimize_admin_styles() { |
@@ -563,47 +563,47 @@ discard block |
||
| 563 | 563 | } |
| 564 | 564 | |
| 565 | 565 | public function registersettings() { |
| 566 | - register_setting('autoptimize','autoptimize_html'); |
|
| 567 | - register_setting('autoptimize','autoptimize_html_keepcomments'); |
|
| 568 | - register_setting('autoptimize','autoptimize_js'); |
|
| 569 | - register_setting('autoptimize','autoptimize_js_exclude'); |
|
| 570 | - register_setting('autoptimize','autoptimize_js_trycatch'); |
|
| 571 | - register_setting('autoptimize','autoptimize_js_justhead'); |
|
| 572 | - register_setting('autoptimize','autoptimize_js_forcehead'); |
|
| 573 | - register_setting('autoptimize','autoptimize_js_include_inline'); |
|
| 574 | - register_setting('autoptimize','autoptimize_css'); |
|
| 575 | - register_setting('autoptimize','autoptimize_css_exclude'); |
|
| 576 | - register_setting('autoptimize','autoptimize_css_justhead'); |
|
| 577 | - register_setting('autoptimize','autoptimize_css_datauris'); |
|
| 578 | - register_setting('autoptimize','autoptimize_css_defer'); |
|
| 579 | - register_setting('autoptimize','autoptimize_css_defer_inline'); |
|
| 580 | - register_setting('autoptimize','autoptimize_css_inline'); |
|
| 581 | - register_setting('autoptimize','autoptimize_css_include_inline'); |
|
| 582 | - register_setting('autoptimize','autoptimize_cdn_url'); |
|
| 583 | - register_setting('autoptimize','autoptimize_cache_clean'); |
|
| 584 | - register_setting('autoptimize','autoptimize_cache_nogzip'); |
|
| 585 | - register_setting('autoptimize','autoptimize_show_adv'); |
|
| 586 | - register_setting('autoptimize','autoptimize_optimize_logged'); |
|
| 587 | - register_setting('autoptimize','autoptimize_optimize_checkout'); |
|
| 566 | + register_setting('autoptimize', 'autoptimize_html'); |
|
| 567 | + register_setting('autoptimize', 'autoptimize_html_keepcomments'); |
|
| 568 | + register_setting('autoptimize', 'autoptimize_js'); |
|
| 569 | + register_setting('autoptimize', 'autoptimize_js_exclude'); |
|
| 570 | + register_setting('autoptimize', 'autoptimize_js_trycatch'); |
|
| 571 | + register_setting('autoptimize', 'autoptimize_js_justhead'); |
|
| 572 | + register_setting('autoptimize', 'autoptimize_js_forcehead'); |
|
| 573 | + register_setting('autoptimize', 'autoptimize_js_include_inline'); |
|
| 574 | + register_setting('autoptimize', 'autoptimize_css'); |
|
| 575 | + register_setting('autoptimize', 'autoptimize_css_exclude'); |
|
| 576 | + register_setting('autoptimize', 'autoptimize_css_justhead'); |
|
| 577 | + register_setting('autoptimize', 'autoptimize_css_datauris'); |
|
| 578 | + register_setting('autoptimize', 'autoptimize_css_defer'); |
|
| 579 | + register_setting('autoptimize', 'autoptimize_css_defer_inline'); |
|
| 580 | + register_setting('autoptimize', 'autoptimize_css_inline'); |
|
| 581 | + register_setting('autoptimize', 'autoptimize_css_include_inline'); |
|
| 582 | + register_setting('autoptimize', 'autoptimize_cdn_url'); |
|
| 583 | + register_setting('autoptimize', 'autoptimize_cache_clean'); |
|
| 584 | + register_setting('autoptimize', 'autoptimize_cache_nogzip'); |
|
| 585 | + register_setting('autoptimize', 'autoptimize_show_adv'); |
|
| 586 | + register_setting('autoptimize', 'autoptimize_optimize_logged'); |
|
| 587 | + register_setting('autoptimize', 'autoptimize_optimize_checkout'); |
|
| 588 | 588 | } |
| 589 | 589 | |
| 590 | - public function setmeta($links,$file=null) { |
|
| 590 | + public function setmeta($links, $file = null) { |
|
| 591 | 591 | //Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/ |
| 592 | 592 | //Do it only once - saves time |
| 593 | 593 | static $plugin; |
| 594 | - if(empty($plugin)) |
|
| 594 | + if (empty($plugin)) |
|
| 595 | 595 | $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php'); |
| 596 | 596 | |
| 597 | - if($file===null) { |
|
| 597 | + if ($file === null) { |
|
| 598 | 598 | //2.7 |
| 599 | 599 | $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')); |
| 600 | - array_unshift($links,$settings_link); |
|
| 600 | + array_unshift($links, $settings_link); |
|
| 601 | 601 | } else { |
| 602 | 602 | //2.8 |
| 603 | 603 | //If it's us, add the link |
| 604 | - if($file === $plugin) { |
|
| 605 | - $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>',__('Settings'))); |
|
| 606 | - $links = array_merge($links,$newlink); |
|
| 604 | + if ($file === $plugin) { |
|
| 605 | + $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'))); |
|
| 606 | + $links = array_merge($links, $newlink); |
|
| 607 | 607 | } |
| 608 | 608 | } |
| 609 | 609 | |
@@ -611,7 +611,7 @@ discard block |
||
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | public function get($key) { |
| 614 | - if(!is_array($this->config)) { |
|
| 614 | + if (!is_array($this->config)) { |
|
| 615 | 615 | //Default config |
| 616 | 616 | $config = array('autoptimize_html' => 0, |
| 617 | 617 | 'autoptimize_html_keepcomments' => 0, |
@@ -637,43 +637,43 @@ discard block |
||
| 637 | 637 | ); |
| 638 | 638 | |
| 639 | 639 | //Override with user settings |
| 640 | - foreach(array_keys($config) as $name) { |
|
| 640 | + foreach (array_keys($config) as $name) { |
|
| 641 | 641 | $conf = get_option($name); |
| 642 | - if($conf!==false) { |
|
| 642 | + if ($conf !== false) { |
|
| 643 | 643 | //It was set before! |
| 644 | 644 | $config[$name] = $conf; |
| 645 | 645 | } |
| 646 | 646 | } |
| 647 | 647 | |
| 648 | 648 | //Save for next question |
| 649 | - $this->config = apply_filters( 'autoptimize_filter_get_config', $config ); |
|
| 649 | + $this->config = apply_filters('autoptimize_filter_get_config', $config); |
|
| 650 | 650 | } |
| 651 | 651 | |
| 652 | - if(isset($this->config[$key])) |
|
| 652 | + if (isset($this->config[$key])) |
|
| 653 | 653 | return $this->config[$key]; |
| 654 | 654 | |
| 655 | 655 | return false; |
| 656 | 656 | } |
| 657 | 657 | |
| 658 | 658 | private function getFutttaFeeds($url) { |
| 659 | - if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) { |
|
| 660 | - $rss = fetch_feed( $url ); |
|
| 659 | + if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) { |
|
| 660 | + $rss = fetch_feed($url); |
|
| 661 | 661 | $maxitems = 0; |
| 662 | 662 | |
| 663 | - if ( ! is_wp_error( $rss ) ) { |
|
| 664 | - $maxitems = $rss->get_item_quantity( 7 ); |
|
| 665 | - $rss_items = $rss->get_items( 0, $maxitems ); |
|
| 663 | + if (!is_wp_error($rss)) { |
|
| 664 | + $maxitems = $rss->get_item_quantity(7); |
|
| 665 | + $rss_items = $rss->get_items(0, $maxitems); |
|
| 666 | 666 | } |
| 667 | 667 | ?> |
| 668 | 668 | <ul> |
| 669 | - <?php if ( $maxitems == 0 ) : ?> |
|
| 670 | - <li><?php _e( 'No items', 'autoptimize' ); ?></li> |
|
| 669 | + <?php if ($maxitems == 0) : ?> |
|
| 670 | + <li><?php _e('No items', 'autoptimize'); ?></li> |
|
| 671 | 671 | <?php else : ?> |
| 672 | - <?php foreach ( $rss_items as $item ) : ?> |
|
| 672 | + <?php foreach ($rss_items as $item) : ?> |
|
| 673 | 673 | <li> |
| 674 | - <a href="<?php echo esc_url( $item->get_permalink() ); ?>" |
|
| 675 | - title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>"> |
|
| 676 | - <?php echo esc_html( $item->get_title() ); ?> |
|
| 674 | + <a href="<?php echo esc_url($item->get_permalink()); ?>" |
|
| 675 | + title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>"> |
|
| 676 | + <?php echo esc_html($item->get_title()); ?> |
|
| 677 | 677 | </a> |
| 678 | 678 | </li> |
| 679 | 679 | <?php endforeach; ?> |
@@ -684,20 +684,20 @@ discard block |
||
| 684 | 684 | } |
| 685 | 685 | |
| 686 | 686 | // based on http://wordpress.stackexchange.com/a/58826 |
| 687 | - static function ao_admin_tabs(){ |
|
| 688 | - $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs',array('autoptimize' => __('Main','autoptimize'))); |
|
| 689 | - $tabContent=""; |
|
| 690 | - if (count($tabs)>1) { |
|
| 691 | - if(isset($_GET['page'])){ |
|
| 687 | + static function ao_admin_tabs() { |
|
| 688 | + $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('Main', 'autoptimize'))); |
|
| 689 | + $tabContent = ""; |
|
| 690 | + if (count($tabs) > 1) { |
|
| 691 | + if (isset($_GET['page'])) { |
|
| 692 | 692 | $currentId = $_GET['page']; |
| 693 | 693 | } else { |
| 694 | 694 | $currentId = "autoptimize"; |
| 695 | 695 | } |
| 696 | 696 | $tabContent .= "<h2 class=\"nav-tab-wrapper\">"; |
| 697 | - foreach($tabs as $tabId => $tabName){ |
|
| 698 | - if($currentId == $tabId){ |
|
| 697 | + foreach ($tabs as $tabId => $tabName) { |
|
| 698 | + if ($currentId == $tabId) { |
|
| 699 | 699 | $class = " nav-tab-active"; |
| 700 | - } else{ |
|
| 700 | + } else { |
|
| 701 | 701 | $class = ""; |
| 702 | 702 | } |
| 703 | 703 | $tabContent .= '<a class="nav-tab'.$class.'" href="?page='.$tabId.'">'.$tabName.'</a>'; |
@@ -3,48 +3,48 @@ discard block |
||
| 3 | 3 | * below code handles updates and is only included by autoptimize.php if/ when needed |
| 4 | 4 | */ |
| 5 | 5 | |
| 6 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 6 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 7 | 7 | |
| 8 | 8 | $majorUp = false; |
| 9 | -$autoptimize_major_version=substr($autoptimize_db_version,0,3); |
|
| 9 | +$autoptimize_major_version = substr($autoptimize_db_version, 0, 3); |
|
| 10 | 10 | |
| 11 | -switch($autoptimize_major_version) { |
|
| 11 | +switch ($autoptimize_major_version) { |
|
| 12 | 12 | case "1.6": |
| 13 | 13 | // from back in the days when I did not yet consider multisite |
| 14 | 14 | // if user was on version 1.6.x, force advanced options to be shown by default |
| 15 | - update_option('autoptimize_show_adv','1'); |
|
| 15 | + update_option('autoptimize_show_adv', '1'); |
|
| 16 | 16 | |
| 17 | 17 | // and remove old options |
| 18 | - $to_delete_options=array("autoptimize_cdn_css","autoptimize_cdn_css_url","autoptimize_cdn_js","autoptimize_cdn_js_url","autoptimize_cdn_img","autoptimize_cdn_img_url","autoptimize_css_yui","autoptimize_js_yui"); |
|
| 18 | + $to_delete_options = array("autoptimize_cdn_css", "autoptimize_cdn_css_url", "autoptimize_cdn_js", "autoptimize_cdn_js_url", "autoptimize_cdn_img", "autoptimize_cdn_img_url", "autoptimize_css_yui", "autoptimize_js_yui"); |
|
| 19 | 19 | foreach ($to_delete_options as $del_opt) { |
| 20 | - delete_option( $del_opt ); |
|
| 20 | + delete_option($del_opt); |
|
| 21 | 21 | } |
| 22 | 22 | $majorUp = true; |
| 23 | 23 | case "1.7": |
| 24 | 24 | // force 3.8 dashicons in CSS exclude options when upgrading from 1.7 to 1.8 |
| 25 | - if ( !is_multisite() ) { |
|
| 25 | + if (!is_multisite()) { |
|
| 26 | 26 | $css_exclude = get_option('autoptimize_css_exclude'); |
| 27 | 27 | if (empty($css_exclude)) { |
| 28 | 28 | $css_exclude = "admin-bar.min.css, dashicons.min.css"; |
| 29 | - } else if (strpos($css_exclude,"dashicons.min.css")===false) { |
|
| 29 | + } else if (strpos($css_exclude, "dashicons.min.css") === false) { |
|
| 30 | 30 | $css_exclude .= ", dashicons.min.css"; |
| 31 | 31 | } |
| 32 | - update_option('autoptimize_css_exclude',$css_exclude); |
|
| 32 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 33 | 33 | } else { |
| 34 | 34 | global $wpdb; |
| 35 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 35 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 36 | 36 | $original_blog_id = get_current_blog_id(); |
| 37 | - foreach ( $blog_ids as $blog_id ) { |
|
| 38 | - switch_to_blog( $blog_id ); |
|
| 37 | + foreach ($blog_ids as $blog_id) { |
|
| 38 | + switch_to_blog($blog_id); |
|
| 39 | 39 | $css_exclude = get_option('autoptimize_css_exclude'); |
| 40 | 40 | if (empty($css_exclude)) { |
| 41 | 41 | $css_exclude = "admin-bar.min.css, dashicons.min.css"; |
| 42 | - } else if (strpos($css_exclude,"dashicons.min.css")===false) { |
|
| 42 | + } else if (strpos($css_exclude, "dashicons.min.css") === false) { |
|
| 43 | 43 | $css_exclude .= ", dashicons.min.css"; |
| 44 | 44 | } |
| 45 | - update_option('autoptimize_css_exclude',$css_exclude); |
|
| 45 | + update_option('autoptimize_css_exclude', $css_exclude); |
|
| 46 | 46 | } |
| 47 | - switch_to_blog( $original_blog_id ); |
|
| 47 | + switch_to_blog($original_blog_id); |
|
| 48 | 48 | } |
| 49 | 49 | $majorUp = true; |
| 50 | 50 | case "1.9": |
@@ -52,19 +52,19 @@ discard block |
||
| 52 | 52 | * 2.0 will not aggregate inline CSS/JS by default, but we want users |
| 53 | 53 | * upgrading from 1.9 to keep their inline code aggregated by default. |
| 54 | 54 | */ |
| 55 | - if ( !is_multisite() ) { |
|
| 56 | - update_option('autoptimize_css_include_inline','on'); |
|
| 57 | - update_option('autoptimize_js_include_inline','on'); |
|
| 55 | + if (!is_multisite()) { |
|
| 56 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 57 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 58 | 58 | } else { |
| 59 | 59 | global $wpdb; |
| 60 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 60 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 61 | 61 | $original_blog_id = get_current_blog_id(); |
| 62 | - foreach ( $blog_ids as $blog_id ) { |
|
| 63 | - switch_to_blog( $blog_id ); |
|
| 64 | - update_option('autoptimize_css_include_inline','on'); |
|
| 65 | - update_option('autoptimize_js_include_inline','on'); |
|
| 62 | + foreach ($blog_ids as $blog_id) { |
|
| 63 | + switch_to_blog($blog_id); |
|
| 64 | + update_option('autoptimize_css_include_inline', 'on'); |
|
| 65 | + update_option('autoptimize_js_include_inline', 'on'); |
|
| 66 | 66 | } |
| 67 | - switch_to_blog( $original_blog_id ); |
|
| 67 | + switch_to_blog($original_blog_id); |
|
| 68 | 68 | } |
| 69 | 69 | $majorUp = true; |
| 70 | 70 | case "2.2": |
@@ -73,22 +73,22 @@ discard block |
||
| 73 | 73 | * |
| 74 | 74 | * TODO: check autoptimize_css_nogooglefont and update $autoptimize_extra["autoptimize_extra_radio_field_4"] accordingly |
| 75 | 75 | */ |
| 76 | - if ( !is_multisite() ) { |
|
| 76 | + if (!is_multisite()) { |
|
| 77 | 77 | delete_option('autoptimize_css_nogooglefont'); |
| 78 | 78 | } else { |
| 79 | 79 | global $wpdb; |
| 80 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 80 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 81 | 81 | $original_blog_id = get_current_blog_id(); |
| 82 | - foreach ( $blog_ids as $blog_id ) { |
|
| 83 | - switch_to_blog( $blog_id ); |
|
| 82 | + foreach ($blog_ids as $blog_id) { |
|
| 83 | + switch_to_blog($blog_id); |
|
| 84 | 84 | delete_option('autoptimize_css_nogooglefont'); |
| 85 | 85 | } |
| 86 | - switch_to_blog( $original_blog_id ); |
|
| 86 | + switch_to_blog($original_blog_id); |
|
| 87 | 87 | } |
| 88 | 88 | $majorUp = true; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | -if ( $majorUp === true ) { |
|
| 91 | +if ($majorUp === true) { |
|
| 92 | 92 | // clear cache and notify user to check result if major upgrade |
| 93 | 93 | autoptimizeCache::clearall(); |
| 94 | 94 | add_action('admin_notices', 'autoptimize_update_config_notice'); |
