futtta /
autoptimize
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | { |
| 71 | 71 | $this->_html = str_replace("\r\n", "\n", trim($html)); |
| 72 | 72 | if (isset($options['xhtml'])) { |
| 73 | - $this->_isXhtml = (bool)$options['xhtml']; |
|
| 73 | + $this->_isXhtml = (bool) $options['xhtml']; |
|
| 74 | 74 | } |
| 75 | 75 | if (isset($options['cssMinifier'])) { |
| 76 | 76 | $this->_cssMinifier = $options['cssMinifier']; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML')); |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']); |
|
| 98 | + $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']); |
|
| 99 | 99 | $this->_placeholders = array(); |
| 100 | 100 | |
| 101 | 101 | // replace SCRIPTs (and minify) with placeholders |
@@ -111,7 +111,7 @@ discard block |
||
| 111 | 111 | ,$this->_html); |
| 112 | 112 | |
| 113 | 113 | // remove HTML comments (not containing IE conditional comments). |
| 114 | - if ($this->_keepComments == false) { |
|
| 114 | + if ($this->_keepComments == false) { |
|
| 115 | 115 | $this->_html = preg_replace_callback( |
| 116 | 116 | '/<!--([\\s\\S]*?)-->/' |
| 117 | 117 | ,array($this, '_commentCB') |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | |
| 174 | 174 | protected function _reservePlace($content) |
| 175 | 175 | { |
| 176 | - $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%'; |
|
| 176 | + $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%'; |
|
| 177 | 177 | $this->_placeholders[$placeholder] = $content; |
| 178 | 178 | return $placeholder; |
| 179 | 179 | } |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | protected function _outsideTagCB($m) |
| 189 | 189 | { |
| 190 | - return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<'; |
|
| 190 | + return '>'.preg_replace('/^\\s+|\\s+$/', ' ', $m[1]).'<'; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | protected function _removePreCB($m) |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | protected function _removeCdata($str) |
| 258 | 258 | { |
| 259 | 259 | return (false !== strpos($str, '<![CDATA[')) |
| 260 | - ? str_replace(array('/* <![CDATA[ */','/* ]]> */','/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str) |
|
| 260 | + ? str_replace(array('/* <![CDATA[ */', '/* ]]> */', '/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str) |
|
| 261 | 261 | : $str; |
| 262 | 262 | } |
| 263 | 263 | |
@@ -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 autoptimizeHTML extends autoptimizeBase { |
| 5 | 5 | private $keepcomments = false; |
@@ -10,13 +10,13 @@ discard block |
||
| 10 | 10 | $this->keepcomments = (bool) $options['keepcomments']; |
| 11 | 11 | |
| 12 | 12 | // filter to force xhtml |
| 13 | - $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false ); |
|
| 13 | + $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false); |
|
| 14 | 14 | |
| 15 | 15 | // filter to add strings to be excluded from HTML minification |
| 16 | - $excludeHTML = apply_filters( 'autoptimize_filter_html_exclude','' ); |
|
| 17 | - if ($excludeHTML!=="") { |
|
| 18 | - $exclHTMLArr = array_filter(array_map('trim',explode(",",$excludeHTML))); |
|
| 19 | - $this->exclude = array_merge($exclHTMLArr,$this->exclude); |
|
| 16 | + $excludeHTML = apply_filters('autoptimize_filter_html_exclude', ''); |
|
| 17 | + if ($excludeHTML !== "") { |
|
| 18 | + $exclHTMLArr = array_filter(array_map('trim', explode(",", $excludeHTML))); |
|
| 19 | + $this->exclude = array_merge($exclHTMLArr, $this->exclude); |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | // Nothing else for HTML |
@@ -25,16 +25,16 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | //Joins and optimizes CSS |
| 27 | 27 | public function minify() { |
| 28 | - $noptimizeHTML = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content ); |
|
| 28 | + $noptimizeHTML = apply_filters('autoptimize_filter_html_noptimize', false, $this->content); |
|
| 29 | 29 | if ($noptimizeHTML) |
| 30 | 30 | return false; |
| 31 | 31 | |
| 32 | - if(class_exists('Minify_HTML')) { |
|
| 32 | + if (class_exists('Minify_HTML')) { |
|
| 33 | 33 | // wrap the to-be-excluded strings in noptimize tags |
| 34 | 34 | foreach ($this->exclude as $exclString) { |
| 35 | - if (strpos($this->content,$exclString)!==false) { |
|
| 36 | - $replString="<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 37 | - $this->content=str_replace($exclString,$replString,$this->content); |
|
| 35 | + if (strpos($this->content, $exclString) !== false) { |
|
| 36 | + $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 37 | + $this->content = str_replace($exclString, $replString, $this->content); |
|
| 38 | 38 | } |
| 39 | 39 | } |
| 40 | 40 | |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | $options['xhtml'] = true; |
| 48 | 48 | } |
| 49 | 49 | |
| 50 | - if (@is_callable(array("Minify_HTML","minify"))) { |
|
| 51 | - $tmp_content = Minify_HTML::minify($this->content,$options); |
|
| 50 | + if (@is_callable(array("Minify_HTML", "minify"))) { |
|
| 51 | + $tmp_content = Minify_HTML::minify($this->content, $options); |
|
| 52 | 52 | if (!empty($tmp_content)) { |
| 53 | 53 | $this->content = $tmp_content; |
| 54 | 54 | unset($tmp_content); |
@@ -60,16 +60,16 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | // remove the noptimize-wrapper from around the excluded strings |
| 62 | 62 | foreach ($this->exclude as $exclString) { |
| 63 | - $replString="<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 64 | - if (strpos($this->content,$replString)!==false) { |
|
| 65 | - $this->content=str_replace($replString,$exclString,$this->content); |
|
| 63 | + $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->"; |
|
| 64 | + if (strpos($this->content, $replString) !== false) { |
|
| 65 | + $this->content = str_replace($replString, $exclString, $this->content); |
|
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | // revslider data attribs somehow suffer from HTML optimization, this fixes that |
| 70 | - if ( class_exists('RevSlider') || apply_filters('autoptimize_filter_html_dataattrib_cleanup', false) ) { |
|
| 71 | - $this->content = preg_replace('#\n(data-.*$)\n#Um',' $1 ', $this->content); |
|
| 72 | - $this->content = preg_replace('#(=\"[^"]*\")(\w)#','$1 $2', $this->content); |
|
| 70 | + if (class_exists('RevSlider') || apply_filters('autoptimize_filter_html_dataattrib_cleanup', false)) { |
|
| 71 | + $this->content = preg_replace('#\n(data-.*$)\n#Um', ' $1 ', $this->content); |
|
| 72 | + $this->content = preg_replace('#(=\"[^"]*\")(\w)#', '$1 $2', $this->content); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | return true; |
@@ -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,12 +23,12 @@ 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 | 34 | if ($options['nogooglefont'] == true) {
|
@@ -36,33 +36,33 @@ discard block |
||
| 36 | 36 | } else {
|
| 37 | 37 | $removableCSS = ""; |
| 38 | 38 | } |
| 39 | - $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS); |
|
| 39 | + $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);
|
|
| 40 | 40 | if (!empty($removableCSS)) {
|
| 41 | - $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));
|
|
| 41 | + $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));
|
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | - $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);
|
|
| 44 | + $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
|
|
| 45 | 45 | |
| 46 | 46 | // filter to "late inject minified CSS", default to true for now (it is faster) |
| 47 | - $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);
|
|
| 47 | + $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
|
|
| 48 | 48 | |
| 49 | 49 | // Remove everything that's not the header |
| 50 | - if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {
|
|
| 51 | - $content = explode('</head>',$this->content,2);
|
|
| 50 | + if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {
|
|
| 51 | + $content = explode('</head>', $this->content, 2);
|
|
| 52 | 52 | $this->content = $content[0].'</head>'; |
| 53 | 53 | $this->restofcontent = $content[1]; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | // include inline? |
| 57 | - if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {
|
|
| 57 | + if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {
|
|
| 58 | 58 | $this->include_inline = true; |
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | // what CSS shouldn't be autoptimized |
| 62 | 62 | $excludeCSS = $options['css_exclude']; |
| 63 | - $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS, $this->content ); |
|
| 64 | - if ($excludeCSS!=="") {
|
|
| 65 | - $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));
|
|
| 63 | + $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS, $this->content);
|
|
| 64 | + if ($excludeCSS !== "") {
|
|
| 65 | + $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));
|
|
| 66 | 66 | } else {
|
| 67 | 67 | $this->dontmove = ""; |
| 68 | 68 | } |
@@ -70,17 +70,17 @@ discard block |
||
| 70 | 70 | // should we defer css? |
| 71 | 71 | // value: true/ false |
| 72 | 72 | $this->defer = $options['defer']; |
| 73 | - $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content ); |
|
| 73 | + $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);
|
|
| 74 | 74 | |
| 75 | 75 | // should we inline while deferring? |
| 76 | 76 | // value: inlined CSS |
| 77 | 77 | $this->defer_inline = $options['defer_inline']; |
| 78 | - $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content ); |
|
| 78 | + $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content);
|
|
| 79 | 79 | |
| 80 | 80 | // should we inline? |
| 81 | 81 | // value: true/ false |
| 82 | 82 | $this->inline = $options['inline']; |
| 83 | - $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content ); |
|
| 83 | + $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);
|
|
| 84 | 84 | |
| 85 | 85 | // get cdn url |
| 86 | 86 | $this->cdn_url = $options['cdn_url']; |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $this->content = $this->hide_noptimize($this->content); |
| 93 | 93 | |
| 94 | 94 | // exclude (no)script, as those may contain CSS which should be left as is |
| 95 | - if ( strpos( $this->content, '<script' ) !== false ) {
|
|
| 95 | + if (strpos($this->content, '<script') !== false) {
|
|
| 96 | 96 | $this->content = preg_replace_callback( |
| 97 | 97 | '#<(?:no)?script.*?<\/(?:no)?script>#is', |
| 98 | 98 | create_function( |
@@ -110,65 +110,65 @@ discard block |
||
| 110 | 110 | $this->content = $this->hide_comments($this->content); |
| 111 | 111 | |
| 112 | 112 | // Get <style> and <link> |
| 113 | - if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {
|
|
| 114 | - foreach($matches[0] as $tag) {
|
|
| 115 | - if ($this->isremovable($tag,$this->cssremovables)) {
|
|
| 116 | - $this->content = str_replace($tag,'',$this->content); |
|
| 113 | + if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
|
|
| 114 | + foreach ($matches[0] as $tag) {
|
|
| 115 | + if ($this->isremovable($tag, $this->cssremovables)) {
|
|
| 116 | + $this->content = str_replace($tag, '', $this->content); |
|
| 117 | 117 | } else if ($this->ismovable($tag)) {
|
| 118 | 118 | // Get the media |
| 119 | - if(strpos($tag,'media=')!==false) {
|
|
| 120 | - preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);
|
|
| 121 | - $medias = explode(',',$medias[1]);
|
|
| 119 | + if (strpos($tag, 'media=') !== false) {
|
|
| 120 | + preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
|
|
| 121 | + $medias = explode(',', $medias[1]);
|
|
| 122 | 122 | $media = array(); |
| 123 | - foreach($medias as $elem) {
|
|
| 124 | - if (empty($elem)) { $elem="all"; }
|
|
| 123 | + foreach ($medias as $elem) {
|
|
| 124 | + if (empty($elem)) { $elem = "all"; }
|
|
| 125 | 125 | $media[] = $elem; |
| 126 | 126 | } |
| 127 | 127 | } else {
|
| 128 | 128 | // No media specified - applies to all |
| 129 | 129 | $media = array('all');
|
| 130 | 130 | } |
| 131 | - $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag ); |
|
| 131 | + $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
|
|
| 132 | 132 | |
| 133 | - if(preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 133 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 134 | 134 | // <link> |
| 135 | - $explUrl = explode('?',$source[2],2);
|
|
| 135 | + $explUrl = explode('?', $source[2], 2);
|
|
| 136 | 136 | $url = $explUrl[0]; |
| 137 | 137 | $path = $this->getpath($url); |
| 138 | 138 | |
| 139 | - if($path!==false && preg_match('#\.css$#',$path)) {
|
|
| 139 | + if ($path !== false && preg_match('#\.css$#', $path)) {
|
|
| 140 | 140 | // Good link |
| 141 | - $this->css[] = array($media,$path); |
|
| 142 | - }else{
|
|
| 141 | + $this->css[] = array($media, $path); |
|
| 142 | + } else {
|
|
| 143 | 143 | // Link is dynamic (.php etc) |
| 144 | 144 | $tag = ''; |
| 145 | 145 | } |
| 146 | 146 | } else {
|
| 147 | 147 | // inline css in style tags can be wrapped in comment tags, so restore comments |
| 148 | 148 | $tag = $this->restore_comments($tag); |
| 149 | - preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);
|
|
| 149 | + preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
|
|
| 150 | 150 | |
| 151 | 151 | // and re-hide them to be able to to the removal based on tag |
| 152 | 152 | $tag = $this->hide_comments($tag); |
| 153 | 153 | |
| 154 | - if ( $this->include_inline ) {
|
|
| 155 | - $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);
|
|
| 156 | - $this->css[] = array($media,'INLINE;'.$code); |
|
| 154 | + if ($this->include_inline) {
|
|
| 155 | + $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
|
|
| 156 | + $this->css[] = array($media, 'INLINE;'.$code); |
|
| 157 | 157 | } else {
|
| 158 | 158 | $tag = ''; |
| 159 | 159 | } |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | // Remove the original style tag |
| 163 | - $this->content = str_replace($tag,'',$this->content); |
|
| 163 | + $this->content = str_replace($tag, '', $this->content); |
|
| 164 | 164 | } else {
|
| 165 | 165 | // excluded CSS, minify if getpath |
| 166 | - if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {
|
|
| 167 | - $explUrl = explode('?',$source[2],2);
|
|
| 166 | + if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
|
|
| 167 | + $explUrl = explode('?', $source[2], 2);
|
|
| 168 | 168 | $url = $explUrl[0]; |
| 169 | 169 | $path = $this->getpath($url); |
| 170 | 170 | |
| 171 | - if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {
|
|
| 171 | + if ($path && apply_filters('autoptimize_filter_css_minify_excluded', false)) {
|
|
| 172 | 172 | $_CachedMinifiedUrl = $this->minify_single($path); |
| 173 | 173 | |
| 174 | 174 | if (!empty($_CachedMinifiedUrl)) {
|
@@ -179,12 +179,12 @@ discard block |
||
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | // remove querystring from URL |
| 182 | - if ( !empty($explUrl[1]) ) {
|
|
| 183 | - $newTag = str_replace("?".$explUrl[1],"",$newTag);
|
|
| 182 | + if (!empty($explUrl[1])) {
|
|
| 183 | + $newTag = str_replace("?".$explUrl[1], "", $newTag);
|
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | // and replace |
| 187 | - $this->content = str_replace($tag,$newTag,$this->content); |
|
| 187 | + $this->content = str_replace($tag, $newTag, $this->content); |
|
| 188 | 188 | } |
| 189 | 189 | } |
| 190 | 190 | } |
@@ -197,29 +197,29 @@ discard block |
||
| 197 | 197 | |
| 198 | 198 | // Joins and optimizes CSS |
| 199 | 199 | public function minify() {
|
| 200 | - foreach($this->css as $group) {
|
|
| 201 | - list($media,$css) = $group; |
|
| 202 | - if(preg_match('#^INLINE;#',$css)) {
|
|
| 200 | + foreach ($this->css as $group) {
|
|
| 201 | + list($media, $css) = $group; |
|
| 202 | + if (preg_match('#^INLINE;#', $css)) {
|
|
| 203 | 203 | // <style> |
| 204 | - $css = preg_replace('#^INLINE;#','',$css);
|
|
| 205 | - $css = $this->fixurls(ABSPATH.'/index.php',$css); |
|
| 206 | - $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" ); |
|
| 207 | - if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {
|
|
| 208 | - $css=$tmpstyle; |
|
| 209 | - $this->alreadyminified=true; |
|
| 204 | + $css = preg_replace('#^INLINE;#', '', $css);
|
|
| 205 | + $css = $this->fixurls(ABSPATH.'/index.php', $css); |
|
| 206 | + $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");
|
|
| 207 | + if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
|
|
| 208 | + $css = $tmpstyle; |
|
| 209 | + $this->alreadyminified = true; |
|
| 210 | 210 | } |
| 211 | 211 | } else {
|
| 212 | 212 | //<link> |
| 213 | - if($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 213 | + if ($css !== false && file_exists($css) && is_readable($css)) {
|
|
| 214 | 214 | $cssPath = $css; |
| 215 | - $css = $this->fixurls($cssPath,file_get_contents($cssPath)); |
|
| 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, file_get_contents($cssPath)); |
|
| 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)."|".md5($css)."%%INJECTLATER%%*/"; |
|
| 219 | + $css = $tmpstyle; |
|
| 220 | + $this->alreadyminified = true; |
|
| 221 | + } else if ($this->can_inject_late($cssPath, $css)) {
|
|
| 222 | + $css = "/*!%%INJECTLATER%%".base64_encode($cssPath)."|".md5($css)."%%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.*(?:;|$)#Um',$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.*(?:;|$)#Um', $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%%".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%%".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,31 +299,31 @@ 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 | - $ccheck = new autoptimizeCache($hash,'css'); |
|
| 326 | - if($ccheck->check()) {
|
|
| 325 | + $ccheck = new autoptimizeCache($hash, 'css'); |
|
| 326 | + if ($ccheck->check()) {
|
|
| 327 | 327 | $code = $ccheck->retrieve(); |
| 328 | 328 | $this->hashmap[md5($code)] = $hash; |
| 329 | 329 | continue; |
@@ -332,44 +332,44 @@ discard block |
||
| 332 | 332 | |
| 333 | 333 | // Do the imaging! |
| 334 | 334 | $imgreplace = array(); |
| 335 | - preg_match_all( self::ASSETS_REGEX, $code, $matches ); |
|
| 335 | + preg_match_all(self::ASSETS_REGEX, $code, $matches); |
|
| 336 | 336 | |
| 337 | - if ( ($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches)) ) {
|
|
| 338 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 339 | - $iurl = trim($quotedurl," \t\n\r\0\x0B\"'"); |
|
| 337 | + if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {
|
|
| 338 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 339 | + $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'"); |
|
| 340 | 340 | |
| 341 | 341 | // if querystring, remove it from url |
| 342 | - if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }
|
|
| 342 | + if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }
|
|
| 343 | 343 | |
| 344 | 344 | $ipath = $this->getpath($iurl); |
| 345 | 345 | |
| 346 | 346 | $datauri_max_size = 4096; |
| 347 | - $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size ); |
|
| 348 | - $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', ""); |
|
| 347 | + $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);
|
|
| 348 | + $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");
|
|
| 349 | 349 | if (!empty($datauri_exclude)) {
|
| 350 | - $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));
|
|
| 350 | + $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));
|
|
| 351 | 351 | foreach ($no_datauris as $no_datauri) {
|
| 352 | - if (strpos($iurl,$no_datauri)!==false) {
|
|
| 353 | - $ipath=false; |
|
| 352 | + if (strpos($iurl, $no_datauri) !== false) {
|
|
| 353 | + $ipath = false; |
|
| 354 | 354 | break; |
| 355 | 355 | } |
| 356 | 356 | } |
| 357 | 357 | } |
| 358 | 358 | |
| 359 | - if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 360 | - $ihash=md5($ipath); |
|
| 361 | - $icheck = new autoptimizeCache($ihash,'img'); |
|
| 362 | - if($icheck->check()) {
|
|
| 359 | + if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {
|
|
| 360 | + $ihash = md5($ipath); |
|
| 361 | + $icheck = new autoptimizeCache($ihash, 'img'); |
|
| 362 | + if ($icheck->check()) {
|
|
| 363 | 363 | // we have the base64 image in cache |
| 364 | - $headAndData=$icheck->retrieve(); |
|
| 365 | - $_base64data=explode(";base64,",$headAndData);
|
|
| 366 | - $base64data=$_base64data[1]; |
|
| 364 | + $headAndData = $icheck->retrieve(); |
|
| 365 | + $_base64data = explode(";base64,", $headAndData);
|
|
| 366 | + $base64data = $_base64data[1]; |
|
| 367 | 367 | } else {
|
| 368 | 368 | // It's an image and we don't have it in cache, get the type |
| 369 | - $explA=explode('.',$ipath);
|
|
| 370 | - $type=end($explA); |
|
| 369 | + $explA = explode('.', $ipath);
|
|
| 370 | + $type = end($explA); |
|
| 371 | 371 | |
| 372 | - switch($type) {
|
|
| 372 | + switch ($type) {
|
|
| 373 | 373 | case 'jpeg': |
| 374 | 374 | $dataurihead = 'data:image/jpeg;base64,'; |
| 375 | 375 | break; |
@@ -391,42 +391,42 @@ discard block |
||
| 391 | 391 | |
| 392 | 392 | // Encode the data |
| 393 | 393 | $base64data = base64_encode(file_get_contents($ipath)); |
| 394 | - $headAndData=$dataurihead.$base64data; |
|
| 394 | + $headAndData = $dataurihead.$base64data; |
|
| 395 | 395 | |
| 396 | 396 | // Save in cache |
| 397 | - $icheck->cache($headAndData,"text/plain"); |
|
| 397 | + $icheck->cache($headAndData, "text/plain"); |
|
| 398 | 398 | } |
| 399 | 399 | unset($icheck); |
| 400 | 400 | |
| 401 | 401 | // Add it to the list for replacement |
| 402 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]); |
|
| 402 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]); |
|
| 403 | 403 | } else {
|
| 404 | 404 | // just cdn the URL if applicable |
| 405 | 405 | if (!empty($this->cdn_url)) {
|
| 406 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 406 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 407 | 407 | } |
| 408 | 408 | } |
| 409 | 409 | } |
| 410 | 410 | } else if ((is_array($matches)) && (!empty($this->cdn_url))) {
|
| 411 | 411 | // change urls to cdn-url |
| 412 | - foreach($matches[1] as $count => $quotedurl) {
|
|
| 413 | - $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->maybe_cdn_urls($quotedurl),$matches[0][$count]); |
|
| 412 | + foreach ($matches[1] as $count => $quotedurl) {
|
|
| 413 | + $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $this->maybe_cdn_urls($quotedurl), $matches[0][$count]); |
|
| 414 | 414 | } |
| 415 | 415 | } |
| 416 | 416 | |
| 417 | - if(!empty($imgreplace)) {
|
|
| 418 | - $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code); |
|
| 417 | + if (!empty($imgreplace)) {
|
|
| 418 | + $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code); |
|
| 419 | 419 | } |
| 420 | 420 | |
| 421 | 421 | // Minify |
| 422 | - if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {
|
|
| 422 | + if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {
|
|
| 423 | 423 | if (class_exists('Minify_CSS_Compressor')) {
|
| 424 | 424 | $tmp_code = trim(Minify_CSS_Compressor::process($code)); |
| 425 | - } else if(class_exists('CSSmin')) {
|
|
| 425 | + } else if (class_exists('CSSmin')) {
|
|
| 426 | 426 | $cssmin = new CSSmin(); |
| 427 | - if (method_exists($cssmin,"run")) {
|
|
| 427 | + if (method_exists($cssmin, "run")) {
|
|
| 428 | 428 | $tmp_code = trim($cssmin->run($code)); |
| 429 | - } elseif (@is_callable(array($cssmin,"minify"))) {
|
|
| 429 | + } elseif (@is_callable(array($cssmin, "minify"))) {
|
|
| 430 | 430 | $tmp_code = trim(CssMin::minify($code)); |
| 431 | 431 | } |
| 432 | 432 | } |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | |
| 439 | 439 | $code = $this->inject_minified($code); |
| 440 | 440 | |
| 441 | - $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code ); |
|
| 441 | + $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
|
|
| 442 | 442 | if (!empty($tmp_code)) {
|
| 443 | 443 | $code = $tmp_code; |
| 444 | 444 | unset($tmp_code); |
@@ -453,13 +453,13 @@ discard block |
||
| 453 | 453 | //Caches the CSS in uncompressed, deflated and gzipped form. |
| 454 | 454 | public function cache() {
|
| 455 | 455 | // CSS cache |
| 456 | - foreach($this->csscode as $media => $code) {
|
|
| 456 | + foreach ($this->csscode as $media => $code) {
|
|
| 457 | 457 | $md5 = $this->hashmap[md5($code)]; |
| 458 | 458 | |
| 459 | - $cache = new autoptimizeCache($md5,'css'); |
|
| 460 | - if(!$cache->check()) {
|
|
| 459 | + $cache = new autoptimizeCache($md5, 'css'); |
|
| 460 | + if (!$cache->check()) {
|
|
| 461 | 461 | // Cache our code |
| 462 | - $cache->cache($code,'text/css'); |
|
| 462 | + $cache->cache($code, 'text/css'); |
|
| 463 | 463 | } |
| 464 | 464 | $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 465 | 465 | } |
@@ -474,7 +474,7 @@ discard block |
||
| 474 | 474 | $this->content = $this->restore_comments($this->content); |
| 475 | 475 | |
| 476 | 476 | // restore (no)script |
| 477 | - if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) {
|
|
| 477 | + if (strpos($this->content, '%%SCRIPT%%') !== false) {
|
|
| 478 | 478 | $this->content = preg_replace_callback( |
| 479 | 479 | '#%%SCRIPT%%(.*?)%%SCRIPT%%#is', |
| 480 | 480 | create_function( |
@@ -489,74 +489,74 @@ discard block |
||
| 489 | 489 | $this->content = $this->restore_noptimize($this->content); |
| 490 | 490 | |
| 491 | 491 | //Restore the full content |
| 492 | - if(!empty($this->restofcontent)) {
|
|
| 492 | + if (!empty($this->restofcontent)) {
|
|
| 493 | 493 | $this->content .= $this->restofcontent; |
| 494 | 494 | $this->restofcontent = ''; |
| 495 | 495 | } |
| 496 | 496 | |
| 497 | 497 | // Inject the new stylesheets |
| 498 | - $replaceTag = array("<title","before");
|
|
| 499 | - $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content ); |
|
| 498 | + $replaceTag = array("<title", "before");
|
|
| 499 | + $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content);
|
|
| 500 | 500 | |
| 501 | 501 | if ($this->inline == true) {
|
| 502 | - foreach($this->csscode as $media => $code) {
|
|
| 503 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);
|
|
| 502 | + foreach ($this->csscode as $media => $code) {
|
|
| 503 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);
|
|
| 504 | 504 | } |
| 505 | 505 | } else {
|
| 506 | 506 | if ($this->defer == true) {
|
| 507 | 507 | $preloadCssBlock = ""; |
| 508 | 508 | $noScriptCssBlock = "<noscript id=\"aonoscrcss\">"; |
| 509 | - $defer_inline_code=$this->defer_inline; |
|
| 510 | - if(!empty($defer_inline_code)){
|
|
| 511 | - if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
|
|
| 509 | + $defer_inline_code = $this->defer_inline; |
|
| 510 | + if (!empty($defer_inline_code)) {
|
|
| 511 | + if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
|
|
| 512 | 512 | $iCssHash = md5($defer_inline_code); |
| 513 | - $iCssCache = new autoptimizeCache($iCssHash,'css'); |
|
| 514 | - if($iCssCache->check()) {
|
|
| 513 | + $iCssCache = new autoptimizeCache($iCssHash, 'css'); |
|
| 514 | + if ($iCssCache->check()) {
|
|
| 515 | 515 | // we have the optimized inline CSS in cache |
| 516 | - $defer_inline_code=$iCssCache->retrieve(); |
|
| 516 | + $defer_inline_code = $iCssCache->retrieve(); |
|
| 517 | 517 | } else {
|
| 518 | 518 | if (class_exists('Minify_CSS_Compressor')) {
|
| 519 | 519 | $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code)); |
| 520 | - } else if(class_exists('CSSmin')) {
|
|
| 520 | + } else if (class_exists('CSSmin')) {
|
|
| 521 | 521 | $cssmin = new CSSmin(); |
| 522 | 522 | $tmp_code = trim($cssmin->run($defer_inline_code)); |
| 523 | 523 | } |
| 524 | 524 | if (!empty($tmp_code)) {
|
| 525 | 525 | $defer_inline_code = $tmp_code; |
| 526 | - $iCssCache->cache($defer_inline_code,"text/css"); |
|
| 526 | + $iCssCache->cache($defer_inline_code, "text/css"); |
|
| 527 | 527 | unset($tmp_code); |
| 528 | 528 | } |
| 529 | 529 | } |
| 530 | 530 | } |
| 531 | - $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 532 | - $this->inject_in_html($code_out,$replaceTag); |
|
| 531 | + $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>'; |
|
| 532 | + $this->inject_in_html($code_out, $replaceTag); |
|
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | |
| 536 | - foreach($this->url as $media => $url) {
|
|
| 536 | + foreach ($this->url as $media => $url) {
|
|
| 537 | 537 | $url = $this->url_replace_cdn($url); |
| 538 | 538 | |
| 539 | 539 | //Add the stylesheet either deferred (import at bottom) or normal links in head |
| 540 | - if($this->defer == true) {
|
|
| 540 | + if ($this->defer == true) {
|
|
| 541 | 541 | $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="this.rel=\'stylesheet\'" />'; |
| 542 | 542 | $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />'; |
| 543 | 543 | } else {
|
| 544 | 544 | if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
|
| 545 | - $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);
|
|
| 546 | - } else if (strlen($this->csscode[$media])>0) {
|
|
| 547 | - $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);
|
|
| 545 | + $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);
|
|
| 546 | + } else if (strlen($this->csscode[$media]) > 0) {
|
|
| 547 | + $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);
|
|
| 548 | 548 | } |
| 549 | 549 | } |
| 550 | 550 | } |
| 551 | 551 | |
| 552 | - if($this->defer == true) {
|
|
| 552 | + if ($this->defer == true) {
|
|
| 553 | 553 | $preloadPolyfill = '<script data-cfasync=\'false\'>/*! loadCSS. [c]2017 Filament Group, Inc. MIT License */ |
| 554 | 554 | !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);
|
| 555 | 555 | /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */ |
| 556 | 556 | !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>';
|
| 557 | 557 | $noScriptCssBlock .= "</noscript>"; |
| 558 | - $this->inject_in_html($preloadCssBlock.$noScriptCssBlock,$replaceTag); |
|
| 559 | - $this->inject_in_html($preloadPolyfill,array('</body>','before'));
|
|
| 558 | + $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag); |
|
| 559 | + $this->inject_in_html($preloadPolyfill, array('</body>', 'before'));
|
|
| 560 | 560 | } |
| 561 | 561 | } |
| 562 | 562 | |
@@ -564,38 +564,38 @@ discard block |
||
| 564 | 564 | return $this->content; |
| 565 | 565 | } |
| 566 | 566 | |
| 567 | - static function fixurls($file,$code) {
|
|
| 568 | - $file = str_replace(WP_ROOT_DIR,'',$file); |
|
| 569 | - $file = str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',$file); |
|
| 567 | + static function fixurls($file, $code) {
|
|
| 568 | + $file = str_replace(WP_ROOT_DIR, '', $file); |
|
| 569 | + $file = str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', $file); |
|
| 570 | 570 | $dir = dirname($file); // Like /themes/expound/css |
| 571 | 571 | |
| 572 | 572 | // switch all imports to the url() syntax |
| 573 | - $code=preg_replace('#@import ("|\')(.+?)\.css.*("|\')#','@import url("${2}.css")',$code);
|
|
| 573 | + $code = preg_replace('#@import ("|\')(.+?)\.css.*("|\')#', '@import url("${2}.css")', $code);
|
|
| 574 | 574 | |
| 575 | - if( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
|
|
| 575 | + if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
|
|
| 576 | 576 | $replace = array(); |
| 577 | - foreach($matches[1] as $k => $url) {
|
|
| 577 | + foreach ($matches[1] as $k => $url) {
|
|
| 578 | 578 | // Remove quotes |
| 579 | - $url = trim($url," \t\n\r\0\x0B\"'"); |
|
| 580 | - $noQurl = trim($url,"\"'"); |
|
| 579 | + $url = trim($url, " \t\n\r\0\x0B\"'"); |
|
| 580 | + $noQurl = trim($url, "\"'"); |
|
| 581 | 581 | |
| 582 | 582 | if ($noQurl === '') { continue; }
|
| 583 | 583 | |
| 584 | - if ($url!==$noQurl) {
|
|
| 585 | - $removedQuotes=true; |
|
| 584 | + if ($url !== $noQurl) {
|
|
| 585 | + $removedQuotes = true; |
|
| 586 | 586 | } else {
|
| 587 | - $removedQuotes=false; |
|
| 587 | + $removedQuotes = false; |
|
| 588 | 588 | } |
| 589 | - $url=$noQurl; |
|
| 590 | - if(substr($url,0,1)=='/' || preg_match('#^(https?://|ftp://|data:)#i',$url)) {
|
|
| 589 | + $url = $noQurl; |
|
| 590 | + if (substr($url, 0, 1) == '/' || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
|
|
| 591 | 591 | //URL is absolute |
| 592 | 592 | continue; |
| 593 | 593 | } else {
|
| 594 | 594 | // relative URL |
| 595 | - $newurl = preg_replace('/https?:/','',str_replace(" ","%20",AUTOPTIMIZE_WP_CONTENT_URL.str_replace('//','/',$dir.'/'.$url)));
|
|
| 595 | + $newurl = preg_replace('/https?:/', '', str_replace(" ", "%20", AUTOPTIMIZE_WP_CONTENT_URL.str_replace('//', '/', $dir.'/'.$url)));
|
|
| 596 | 596 | |
| 597 | 597 | $hash = md5($url); |
| 598 | - $code = str_replace($matches[0][$k],$hash,$code); |
|
| 598 | + $code = str_replace($matches[0][$k], $hash, $code); |
|
| 599 | 599 | |
| 600 | 600 | if (!empty($removedQuotes)) {
|
| 601 | 601 | $replace[$hash] = 'url(\''.$newurl.'\')'.$matches[2][$k]; |
@@ -605,17 +605,17 @@ discard block |
||
| 605 | 605 | } |
| 606 | 606 | } |
| 607 | 607 | //Do the replacing here to avoid breaking URLs |
| 608 | - $code = str_replace(array_keys($replace),array_values($replace),$code); |
|
| 608 | + $code = str_replace(array_keys($replace), array_values($replace), $code); |
|
| 609 | 609 | } |
| 610 | 610 | return $code; |
| 611 | 611 | } |
| 612 | 612 | |
| 613 | 613 | private function ismovable($tag) {
|
| 614 | - if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {
|
|
| 614 | + if (apply_filters('autoptimize_filter_css_dontaggregate', false)) {
|
|
| 615 | 615 | return false; |
| 616 | 616 | } else if (!empty($this->whitelist)) {
|
| 617 | 617 | foreach ($this->whitelist as $match) {
|
| 618 | - if(strpos($tag,$match)!==false) {
|
|
| 618 | + if (strpos($tag, $match) !== false) {
|
|
| 619 | 619 | return true; |
| 620 | 620 | } |
| 621 | 621 | } |
@@ -623,8 +623,8 @@ discard block |
||
| 623 | 623 | return false; |
| 624 | 624 | } else {
|
| 625 | 625 | if (is_array($this->dontmove)) {
|
| 626 | - foreach($this->dontmove as $match) {
|
|
| 627 | - if(strpos($tag,$match)!==false) {
|
|
| 626 | + foreach ($this->dontmove as $match) {
|
|
| 627 | + if (strpos($tag, $match) !== false) {
|
|
| 628 | 628 | //Matched something |
| 629 | 629 | return false; |
| 630 | 630 | } |
@@ -636,21 +636,21 @@ discard block |
||
| 636 | 636 | } |
| 637 | 637 | } |
| 638 | 638 | |
| 639 | - private function can_inject_late($cssPath,$css) {
|
|
| 639 | + private function can_inject_late($cssPath, $css) {
|
|
| 640 | 640 | $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);
|
| 641 | - if ( $this->inject_min_late !== true ) {
|
|
| 641 | + if ($this->inject_min_late !== true) {
|
|
| 642 | 642 | // late-inject turned off |
| 643 | 643 | return false; |
| 644 | - } else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {
|
|
| 644 | + } else if ((strpos($cssPath, "min.css") === false) && (str_replace($consider_minified_array, '', $cssPath) === $cssPath)) {
|
|
| 645 | 645 | // file not minified based on filename & filter |
| 646 | 646 | return false; |
| 647 | - } else if ( strpos($css,"@import") !== false ) {
|
|
| 647 | + } else if (strpos($css, "@import") !== false) {
|
|
| 648 | 648 | // can't late-inject files with imports as those need to be aggregated |
| 649 | 649 | return false; |
| 650 | - } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {
|
|
| 650 | + } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {
|
|
| 651 | 651 | // don't late-inject CSS with font-src's if fonts are set to be CDN'ed |
| 652 | 652 | return false; |
| 653 | - } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {
|
|
| 653 | + } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {
|
|
| 654 | 654 | // don't late-inject CSS with images if CDN is set OR is image inlining is on |
| 655 | 655 | return false; |
| 656 | 656 | } else {
|
@@ -660,9 +660,9 @@ discard block |
||
| 660 | 660 | } |
| 661 | 661 | |
| 662 | 662 | private function maybe_cdn_urls($inUrl) {
|
| 663 | - $url = trim($inUrl," \t\n\r\0\x0B\"'"); |
|
| 663 | + $url = trim($inUrl, " \t\n\r\0\x0B\"'"); |
|
| 664 | 664 | // exclude fonts from CDN except if filter returns true |
| 665 | - if ( !preg_match('#\.(woff2?|eot|ttf|otf)$#i',$url) || apply_filters('autoptimize_filter_css_fonts_cdn',false) ) {
|
|
| 665 | + if (!preg_match('#\.(woff2?|eot|ttf|otf)$#i', $url) || apply_filters('autoptimize_filter_css_fonts_cdn', false)) {
|
|
| 666 | 666 | $cdn_url = $this->url_replace_cdn($url); |
| 667 | 667 | } else {
|
| 668 | 668 | $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 autoptimizeCache { |
| 5 | 5 | private $filename; |
@@ -7,14 +7,14 @@ discard block |
||
| 7 | 7 | private $cachedir; |
| 8 | 8 | private $delayed; |
| 9 | 9 | |
| 10 | - public function __construct($md5,$ext='php') { |
|
| 10 | + public function __construct($md5, $ext = 'php') { |
|
| 11 | 11 | $this->cachedir = AUTOPTIMIZE_CACHE_DIR; |
| 12 | 12 | $this->delayed = AUTOPTIMIZE_CACHE_DELAY; |
| 13 | 13 | $this->nogzip = AUTOPTIMIZE_CACHE_NOGZIP; |
| 14 | - if($this->nogzip == false) { |
|
| 14 | + if ($this->nogzip == false) { |
|
| 15 | 15 | $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.php'; |
| 16 | 16 | } else { |
| 17 | - if (in_array($ext, array("js","css"))) { |
|
| 17 | + if (in_array($ext, array("js", "css"))) { |
|
| 18 | 18 | $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext; |
| 19 | 19 | } else { |
| 20 | 20 | $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext; |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | public function check() { |
| 26 | - if(!file_exists($this->cachedir.$this->filename)) { |
|
| 26 | + if (!file_exists($this->cachedir.$this->filename)) { |
|
| 27 | 27 | // No cached file, sorry |
| 28 | 28 | return false; |
| 29 | 29 | } |
@@ -32,8 +32,8 @@ discard block |
||
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | public function retrieve() { |
| 35 | - if($this->check()) { |
|
| 36 | - if($this->nogzip == false) { |
|
| 35 | + if ($this->check()) { |
|
| 36 | + if ($this->nogzip == false) { |
|
| 37 | 37 | return file_get_contents($this->cachedir.$this->filename.'.none'); |
| 38 | 38 | } else { |
| 39 | 39 | return file_get_contents($this->cachedir.$this->filename); |
@@ -42,48 +42,48 @@ discard block |
||
| 42 | 42 | return false; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - public function cache($code,$mime) { |
|
| 46 | - if($this->nogzip == false) { |
|
| 45 | + public function cache($code, $mime) { |
|
| 46 | + if ($this->nogzip == false) { |
|
| 47 | 47 | $file = ($this->delayed ? 'delayed.php' : 'default.php'); |
| 48 | 48 | $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'/config/'.$file); |
| 49 | - $phpcode = str_replace(array('%%CONTENT%%','exit;'),array($mime,''),$phpcode); |
|
| 50 | - file_put_contents($this->cachedir.$this->filename,$phpcode, LOCK_EX); |
|
| 51 | - file_put_contents($this->cachedir.$this->filename.'.none',$code, LOCK_EX); |
|
| 52 | - if(!$this->delayed) { |
|
| 49 | + $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode); |
|
| 50 | + file_put_contents($this->cachedir.$this->filename, $phpcode, LOCK_EX); |
|
| 51 | + file_put_contents($this->cachedir.$this->filename.'.none', $code, LOCK_EX); |
|
| 52 | + if (!$this->delayed) { |
|
| 53 | 53 | // Compress now! |
| 54 | - file_put_contents($this->cachedir.$this->filename.'.deflate',gzencode($code,9,FORCE_DEFLATE), LOCK_EX); |
|
| 55 | - file_put_contents($this->cachedir.$this->filename.'.gzip',gzencode($code,9,FORCE_GZIP), LOCK_EX); |
|
| 54 | + file_put_contents($this->cachedir.$this->filename.'.deflate', gzencode($code, 9, FORCE_DEFLATE), LOCK_EX); |
|
| 55 | + file_put_contents($this->cachedir.$this->filename.'.gzip', gzencode($code, 9, FORCE_GZIP), LOCK_EX); |
|
| 56 | 56 | } |
| 57 | 57 | } else { |
| 58 | 58 | // Write code to cache without doing anything else |
| 59 | - file_put_contents($this->cachedir.$this->filename,$code, LOCK_EX); |
|
| 59 | + file_put_contents($this->cachedir.$this->filename, $code, LOCK_EX); |
|
| 60 | 60 | if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) { |
| 61 | 61 | // Create an additional cached gzip file |
| 62 | - file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code,9,FORCE_GZIP), LOCK_EX); |
|
| 62 | + file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code, 9, FORCE_GZIP), LOCK_EX); |
|
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public function getname() { |
| 68 | - apply_filters('autoptimize_filter_cache_getname',AUTOPTIMIZE_CACHE_URL.$this->filename); |
|
| 68 | + apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename); |
|
| 69 | 69 | return $this->filename; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | static function clearall() { |
| 73 | - if(!autoptimizeCache::cacheavail()) { |
|
| 73 | + if (!autoptimizeCache::cacheavail()) { |
|
| 74 | 74 | return false; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | // scan the cachedirs |
| 78 | - foreach (array("","js","css") as $scandirName) { |
|
| 78 | + foreach (array("", "js", "css") as $scandirName) { |
|
| 79 | 79 | $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | // clear the cachedirs |
| 83 | 83 | foreach ($scan as $scandirName=>$scanneddir) { |
| 84 | - $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/"; |
|
| 85 | - foreach($scanneddir as $file) { |
|
| 86 | - if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) { |
|
| 84 | + $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/"; |
|
| 85 | + foreach ($scanneddir as $file) { |
|
| 86 | + if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) { |
|
| 87 | 87 | @unlink($thisAoCacheDir.$file); |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -98,15 +98,15 @@ discard block |
||
| 98 | 98 | do_action("autoptimize_action_cachepurged"); |
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | - add_action("shutdown","autoptimize_do_cachepurged_action",11); |
|
| 101 | + add_action("shutdown", "autoptimize_do_cachepurged_action", 11); |
|
| 102 | 102 | |
| 103 | 103 | // try to purge caching plugins cache-files? |
| 104 | 104 | include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizePageCacheFlush.php'); |
| 105 | - add_action("autoptimize_action_cachepurged","autoptimize_flush_pagecache",10,0); |
|
| 105 | + add_action("autoptimize_action_cachepurged", "autoptimize_flush_pagecache", 10, 0); |
|
| 106 | 106 | |
| 107 | 107 | // warm cache (part of speedupper)? |
| 108 | - if ( apply_filters('autoptimize_filter_speedupper', true) ) { |
|
| 109 | - $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1,100000); |
|
| 108 | + if (apply_filters('autoptimize_filter_speedupper', true)) { |
|
| 109 | + $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1, 100000); |
|
| 110 | 110 | $warmCache = @wp_remote_get($warmCacheUrl); |
| 111 | 111 | unset($warmCache); |
| 112 | 112 | } |
@@ -114,12 +114,12 @@ discard block |
||
| 114 | 114 | return true; |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - static function stats() { |
|
| 118 | - $AOstats=get_transient("autoptimize_stats"); |
|
| 117 | + static function stats() { |
|
| 118 | + $AOstats = get_transient("autoptimize_stats"); |
|
| 119 | 119 | |
| 120 | 120 | if (empty($AOstats)) { |
| 121 | 121 | // Cache not available :( |
| 122 | - if(!autoptimizeCache::cacheavail()) { |
|
| 122 | + if (!autoptimizeCache::cacheavail()) { |
|
| 123 | 123 | return 0; |
| 124 | 124 | } |
| 125 | 125 | |
@@ -128,28 +128,28 @@ discard block |
||
| 128 | 128 | $size = 0; |
| 129 | 129 | |
| 130 | 130 | // scan the cachedirs |
| 131 | - foreach (array("","js","css") as $scandirName) { |
|
| 131 | + foreach (array("", "js", "css") as $scandirName) { |
|
| 132 | 132 | $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName); |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | foreach ($scan as $scandirName=>$scanneddir) { |
| 136 | - $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/"; |
|
| 137 | - foreach($scanneddir as $file) { |
|
| 138 | - if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) { |
|
| 139 | - if(is_file($thisAoCacheDir.$file)) { |
|
| 140 | - if(AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file,'.js') !== false || strpos($file,'.css') !== false || strpos($file,'.img') !== false || strpos($file,'.txt') !== false )) { |
|
| 136 | + $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/"; |
|
| 137 | + foreach ($scanneddir as $file) { |
|
| 138 | + if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) { |
|
| 139 | + if (is_file($thisAoCacheDir.$file)) { |
|
| 140 | + if (AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file, '.js') !== false || strpos($file, '.css') !== false || strpos($file, '.img') !== false || strpos($file, '.txt') !== false)) { |
|
| 141 | 141 | $count++; |
| 142 | - } elseif(!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file,'.none') !== false) { |
|
| 142 | + } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file, '.none') !== false) { |
|
| 143 | 143 | $count++; |
| 144 | 144 | } |
| 145 | - $size+=filesize($thisAoCacheDir.$file); |
|
| 145 | + $size += filesize($thisAoCacheDir.$file); |
|
| 146 | 146 | } |
| 147 | 147 | } |
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | - $AOstats=array($count,$size,time()); |
|
| 151 | - if ($count>100) { |
|
| 152 | - set_transient("autoptimize_stats",$AOstats,HOUR_IN_SECONDS); |
|
| 150 | + $AOstats = array($count, $size, time()); |
|
| 151 | + if ($count > 100) { |
|
| 152 | + set_transient("autoptimize_stats", $AOstats, HOUR_IN_SECONDS); |
|
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | // print the number of instances |
@@ -157,36 +157,36 @@ discard block |
||
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | static function cacheavail() { |
| 160 | - if(!defined('AUTOPTIMIZE_CACHE_DIR')) { |
|
| 160 | + if (!defined('AUTOPTIMIZE_CACHE_DIR')) { |
|
| 161 | 161 | // We didn't set a cache |
| 162 | 162 | return false; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - foreach (array("","js","css") as $checkDir) { |
|
| 166 | - if(!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) { |
|
| 165 | + foreach (array("", "js", "css") as $checkDir) { |
|
| 166 | + if (!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) { |
|
| 167 | 167 | return false; |
| 168 | 168 | } |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | /** write index.html here to avoid prying eyes */ |
| 172 | - $indexFile=AUTOPTIMIZE_CACHE_DIR.'/index.html'; |
|
| 173 | - if(!is_file($indexFile)) { |
|
| 174 | - @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); |
|
| 172 | + $indexFile = AUTOPTIMIZE_CACHE_DIR.'/index.html'; |
|
| 173 | + if (!is_file($indexFile)) { |
|
| 174 | + @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); |
|
| 175 | 175 | } |
| 176 | 176 | |
| 177 | 177 | /** write .htaccess here to overrule wp_super_cache */ |
| 178 | - $htAccess=AUTOPTIMIZE_CACHE_DIR.'/.htaccess'; |
|
| 179 | - if(!is_file($htAccess)) { |
|
| 178 | + $htAccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess'; |
|
| 179 | + if (!is_file($htAccess)) { |
|
| 180 | 180 | /** |
| 181 | 181 | * create wp-content/AO_htaccess_tmpl with |
| 182 | 182 | * whatever htaccess rules you might need |
| 183 | 183 | * if you want to override default AO htaccess |
| 184 | 184 | */ |
| 185 | - $htaccess_tmpl=WP_CONTENT_DIR."/AO_htaccess_tmpl"; |
|
| 185 | + $htaccess_tmpl = WP_CONTENT_DIR."/AO_htaccess_tmpl"; |
|
| 186 | 186 | if (is_file($htaccess_tmpl)) { |
| 187 | - $htAccessContent=file_get_contents($htaccess_tmpl); |
|
| 187 | + $htAccessContent = file_get_contents($htaccess_tmpl); |
|
| 188 | 188 | } else if (is_multisite() || AUTOPTIMIZE_CACHE_NOGZIP == false) { |
| 189 | - $htAccessContent='<IfModule mod_expires.c> |
|
| 189 | + $htAccessContent = '<IfModule mod_expires.c> |
|
| 190 | 190 | ExpiresActive On |
| 191 | 191 | ExpiresByType text/css A30672000 |
| 192 | 192 | ExpiresByType text/javascript A30672000 |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | </Files> |
| 210 | 210 | </IfModule>'; |
| 211 | 211 | } else { |
| 212 | - $htAccessContent='<IfModule mod_expires.c> |
|
| 212 | + $htAccessContent = '<IfModule mod_expires.c> |
|
| 213 | 213 | ExpiresActive On |
| 214 | 214 | ExpiresByType text/css A30672000 |
| 215 | 215 | ExpiresByType text/javascript A30672000 |
@@ -232,7 +232,7 @@ discard block |
||
| 232 | 232 | </Files> |
| 233 | 233 | </IfModule>'; |
| 234 | 234 | } |
| 235 | - @file_put_contents($htAccess,$htAccessContent); |
|
| 235 | + @file_put_contents($htAccess, $htAccessContent); |
|
| 236 | 236 | } |
| 237 | 237 | |
| 238 | 238 | // All OK |
@@ -241,22 +241,22 @@ discard block |
||
| 241 | 241 | |
| 242 | 242 | static function checkCacheDir($dir) { |
| 243 | 243 | // Check and create if not exists |
| 244 | - if(!file_exists($dir)) { |
|
| 245 | - @mkdir($dir,0775,true); |
|
| 246 | - if(!file_exists($dir)) { |
|
| 244 | + if (!file_exists($dir)) { |
|
| 245 | + @mkdir($dir, 0775, true); |
|
| 246 | + if (!file_exists($dir)) { |
|
| 247 | 247 | return false; |
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | // check if we can now write |
| 252 | - if(!is_writable($dir)) { |
|
| 252 | + if (!is_writable($dir)) { |
|
| 253 | 253 | return false; |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | 256 | // and write index.html here to avoid prying eyes |
| 257 | - $indexFile=$dir.'/index.html'; |
|
| 258 | - if(!is_file($indexFile)) { |
|
| 259 | - @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); |
|
| 257 | + $indexFile = $dir.'/index.html'; |
|
| 258 | + if (!is_file($indexFile)) { |
|
| 259 | + @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | return true; |
@@ -1,11 +1,11 @@ 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 autoptimizeScripts extends autoptimizeBase { |
| 5 | 5 | private $scripts = array(); |
| 6 | - private $dontmove = array('document.write','html5.js','show_ads.js','google_ad','blogcatalog.com/w','tweetmeme.com/i','mybloglog.com/','histats.com/js','ads.smowtion.com/ad.js','statcounter.com/counter/counter.js','widgets.amung.us','ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar','intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject','plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize'); |
|
| 7 | - private $domove = array('gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go'); |
|
| 8 | - private $domovelast = array('addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/','jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go'); |
|
| 6 | + private $dontmove = array('document.write', 'html5.js', 'show_ads.js', 'google_ad', 'blogcatalog.com/w', 'tweetmeme.com/i', 'mybloglog.com/', 'histats.com/js', 'ads.smowtion.com/ad.js', 'statcounter.com/counter/counter.js', 'widgets.amung.us', 'ws.amazon.com/widgets', 'media.fastclick.net', '/ads/', 'comment-form-quicktags/quicktags.php', 'edToolbar', 'intensedebate.com', 'scripts.chitika.net/', '_gaq.push', 'jotform.com/', 'admin-bar.min.js', 'GoogleAnalyticsObject', 'plupload.full.min.js', 'syntaxhighlighter', 'adsbygoogle', 'gist.github.com', '_stq', 'nonce', 'post_id', 'data-noptimize'); |
|
| 7 | + private $domove = array('gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go'); |
|
| 8 | + private $domovelast = array('addthis.com', '/afsonline/show_afs_search.js', 'disqus.js', 'networkedblogs.com/getnetworkwidget', 'infolinks.com/js/', 'jd.gallery.js.php', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'linkwithin.com/widget.js', 'tiny_mce.js', 'tinyMCEPreInit.go'); |
|
| 9 | 9 | private $trycatch = false; |
| 10 | 10 | private $alreadyminified = false; |
| 11 | 11 | private $forcehead = true; |
@@ -21,70 +21,70 @@ discard block |
||
| 21 | 21 | |
| 22 | 22 | //Reads the page and collects script tags |
| 23 | 23 | public function read($options) { |
| 24 | - $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content ); |
|
| 24 | + $noptimizeJS = apply_filters('autoptimize_filter_js_noptimize', false, $this->content); |
|
| 25 | 25 | if ($noptimizeJS) return false; |
| 26 | 26 | |
| 27 | 27 | // only optimize known good JS? |
| 28 | - $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content ); |
|
| 28 | + $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', '', $this->content); |
|
| 29 | 29 | if (!empty($whitelistJS)) { |
| 30 | - $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistJS))); |
|
| 30 | + $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistJS))); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | // is there JS we should simply remove |
| 34 | - $removableJS = apply_filters( 'autoptimize_filter_js_removables', '', $this->content ); |
|
| 34 | + $removableJS = apply_filters('autoptimize_filter_js_removables', '', $this->content); |
|
| 35 | 35 | if (!empty($removableJS)) { |
| 36 | - $this->jsremovables = array_filter(array_map('trim',explode(",",$removableJS))); |
|
| 36 | + $this->jsremovables = array_filter(array_map('trim', explode(",", $removableJS))); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | // only header? |
| 40 | - if( apply_filters('autoptimize_filter_js_justhead', $options['justhead']) == true ) { |
|
| 41 | - $content = explode('</head>',$this->content,2); |
|
| 40 | + if (apply_filters('autoptimize_filter_js_justhead', $options['justhead']) == true) { |
|
| 41 | + $content = explode('</head>', $this->content, 2); |
|
| 42 | 42 | $this->content = $content[0].'</head>'; |
| 43 | 43 | $this->restofcontent = $content[1]; |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | // include inline? |
| 47 | - if( apply_filters('autoptimize_js_include_inline', $options['include_inline']) == true ) { |
|
| 47 | + if (apply_filters('autoptimize_js_include_inline', $options['include_inline']) == true) { |
|
| 48 | 48 | $this->include_inline = true; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | // filter to "late inject minified JS", default to true for now (it is faster) |
| 52 | - $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late',true); |
|
| 52 | + $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true); |
|
| 53 | 53 | |
| 54 | 54 | // filters to override hardcoded do(nt)move(last) array contents (array in, array out!) |
| 55 | - $this->dontmove = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove ); |
|
| 56 | - $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast ); |
|
| 57 | - $this->domove = apply_filters( 'autoptimize_filter_js_domove', $this->domove ); |
|
| 55 | + $this->dontmove = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove); |
|
| 56 | + $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast); |
|
| 57 | + $this->domove = apply_filters('autoptimize_filter_js_domove', $this->domove); |
|
| 58 | 58 | |
| 59 | 59 | // get extra exclusions settings or filter |
| 60 | 60 | $excludeJS = $options['js_exclude']; |
| 61 | - $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS, $this->content ); |
|
| 62 | - if ($excludeJS!=="") { |
|
| 61 | + $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS, $this->content); |
|
| 62 | + if ($excludeJS !== "") { |
|
| 63 | 63 | if (is_array($excludeJS)) { |
| 64 | - if(($removeKeys = array_keys($excludeJS,"remove")) !== false) { |
|
| 64 | + if (($removeKeys = array_keys($excludeJS, "remove")) !== false) { |
|
| 65 | 65 | foreach ($removeKeys as $removeKey) { |
| 66 | 66 | unset($excludeJS[$removeKey]); |
| 67 | - $this->jsremovables[]=$removeKey; |
|
| 67 | + $this->jsremovables[] = $removeKey; |
|
| 68 | 68 | } |
| 69 | 69 | } |
| 70 | 70 | $exclJSArr = array_keys($excludeJS); |
| 71 | 71 | } else { |
| 72 | - $exclJSArr = array_filter(array_map('trim',explode(",",$excludeJS))); |
|
| 72 | + $exclJSArr = array_filter(array_map('trim', explode(",", $excludeJS))); |
|
| 73 | 73 | } |
| 74 | - $this->dontmove = array_merge($exclJSArr,$this->dontmove); |
|
| 74 | + $this->dontmove = array_merge($exclJSArr, $this->dontmove); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | //Should we add try-catch? |
| 78 | - if($options['trycatch'] == true) |
|
| 78 | + if ($options['trycatch'] == true) |
|
| 79 | 79 | $this->trycatch = true; |
| 80 | 80 | |
| 81 | 81 | // force js in head? |
| 82 | - if($options['forcehead'] == true) { |
|
| 82 | + if ($options['forcehead'] == true) { |
|
| 83 | 83 | $this->forcehead = true; |
| 84 | 84 | } else { |
| 85 | 85 | $this->forcehead = false; |
| 86 | 86 | } |
| 87 | - $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead ); |
|
| 87 | + $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead); |
|
| 88 | 88 | |
| 89 | 89 | // get cdn url |
| 90 | 90 | $this->cdn_url = $options['cdn_url']; |
@@ -99,24 +99,24 @@ discard block |
||
| 99 | 99 | $this->content = $this->hide_comments($this->content); |
| 100 | 100 | |
| 101 | 101 | // Get script files |
| 102 | - if (preg_match_all('#<script.*</script>#Usmi',$this->content,$matches)) { |
|
| 103 | - foreach($matches[0] as $tag) { |
|
| 102 | + if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) { |
|
| 103 | + foreach ($matches[0] as $tag) { |
|
| 104 | 104 | // only consider script aggregation for types whitelisted in should_aggregate-function |
| 105 | - if( !$this->should_aggregate($tag) ) { |
|
| 106 | - $tag=''; |
|
| 105 | + if (!$this->should_aggregate($tag)) { |
|
| 106 | + $tag = ''; |
|
| 107 | 107 | continue; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi',$tag,$source)) { |
|
| 110 | + if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) { |
|
| 111 | 111 | // non-inline script |
| 112 | - if ($this->isremovable($tag,$this->jsremovables)) { |
|
| 113 | - $this->content = str_replace($tag,'',$this->content); |
|
| 112 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 113 | + $this->content = str_replace($tag, '', $this->content); |
|
| 114 | 114 | continue; |
| 115 | 115 | } |
| 116 | - $explUrl = explode('?',$source[2],2); |
|
| 116 | + $explUrl = explode('?', $source[2], 2); |
|
| 117 | 117 | $url = $explUrl[0]; |
| 118 | 118 | $path = $this->getpath($url); |
| 119 | - if($path !== false && preg_match('#\.js$#',$path) && $this->ismergeable($tag)) { |
|
| 119 | + if ($path !== false && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) { |
|
| 120 | 120 | // ok to optimize, add to array |
| 121 | 121 | $this->scripts[] = $path; |
| 122 | 122 | } else { |
@@ -127,14 +127,14 @@ discard block |
||
| 127 | 127 | if (is_array($excludeJS)) { |
| 128 | 128 | // should we add flags? |
| 129 | 129 | foreach ($excludeJS as $exclTag => $exclFlags) { |
| 130 | - if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) { |
|
| 131 | - $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag); |
|
| 130 | + if (strpos($origTag, $exclTag) !== false && in_array($exclFlags, array("async", "defer"))) { |
|
| 131 | + $newTag = str_replace('<script ', '<script '.$exclFlags.' ', $newTag); |
|
| 132 | 132 | } |
| 133 | 133 | } |
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | // should we minify the non-aggregated script? |
| 137 | - if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) { |
|
| 137 | + if ($path && apply_filters('autoptimize_filter_js_minify_excluded', false)) { |
|
| 138 | 138 | $_CachedMinifiedUrl = $this->minify_single($path); |
| 139 | 139 | |
| 140 | 140 | // replace orig URL with minified URL from cache if so |
@@ -143,23 +143,23 @@ discard block |
||
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | // remove querystring from URL in newTag |
| 146 | - if ( !empty($explUrl[1]) ) { |
|
| 147 | - $newTag = str_replace("?".$explUrl[1],"",$newTag); |
|
| 146 | + if (!empty($explUrl[1])) { |
|
| 147 | + $newTag = str_replace("?".$explUrl[1], "", $newTag); |
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // should we move the non-aggregated script? |
| 152 | - if( $this->ismovable($newTag) ) { |
|
| 152 | + if ($this->ismovable($newTag)) { |
|
| 153 | 153 | // can be moved, flags and all |
| 154 | - if( $this->movetolast($newTag) ) { |
|
| 154 | + if ($this->movetolast($newTag)) { |
|
| 155 | 155 | $this->move['last'][] = $newTag; |
| 156 | 156 | } else { |
| 157 | 157 | $this->move['first'][] = $newTag; |
| 158 | 158 | } |
| 159 | 159 | } else { |
| 160 | 160 | // cannot be moved, so if flag was added re-inject altered tag immediately |
| 161 | - if ( $origTag !== $newTag ) { |
|
| 162 | - $this->content = str_replace($origTag,$newTag,$this->content); |
|
| 161 | + if ($origTag !== $newTag) { |
|
| 162 | + $this->content = str_replace($origTag, $newTag, $this->content); |
|
| 163 | 163 | $origTag = ''; |
| 164 | 164 | } |
| 165 | 165 | // and forget about the $tag (not to be touched any more) |
@@ -168,23 +168,23 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | } else { |
| 170 | 170 | // Inline script |
| 171 | - if ($this->isremovable($tag,$this->jsremovables)) { |
|
| 172 | - $this->content = str_replace($tag,'',$this->content); |
|
| 171 | + if ($this->isremovable($tag, $this->jsremovables)) { |
|
| 172 | + $this->content = str_replace($tag, '', $this->content); |
|
| 173 | 173 | continue; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | // unhide comments, as javascript may be wrapped in comment-tags for old times' sake |
| 177 | 177 | $tag = $this->restore_comments($tag); |
| 178 | - if($this->ismergeable($tag) && ( $this->include_inline )) { |
|
| 179 | - preg_match('#<script.*>(.*)</script>#Usmi',$tag,$code); |
|
| 180 | - $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm','$1',$code[1]); |
|
| 181 | - $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/','',$code); |
|
| 178 | + if ($this->ismergeable($tag) && ($this->include_inline)) { |
|
| 179 | + preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code); |
|
| 180 | + $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]); |
|
| 181 | + $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code); |
|
| 182 | 182 | $this->scripts[] = 'INLINE;'.$code; |
| 183 | 183 | } else { |
| 184 | 184 | // Can we move this? |
| 185 | - $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag ); |
|
| 186 | - if( $this->ismovable($tag) || $autoptimize_js_moveable !== '' ) { |
|
| 187 | - if( $this->movetolast($tag) || $autoptimize_js_moveable === 'last' ) { |
|
| 185 | + $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag); |
|
| 186 | + if ($this->ismovable($tag) || $autoptimize_js_moveable !== '') { |
|
| 187 | + if ($this->movetolast($tag) || $autoptimize_js_moveable === 'last') { |
|
| 188 | 188 | $this->move['last'][] = $tag; |
| 189 | 189 | } else { |
| 190 | 190 | $this->move['first'][] = $tag; |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | //Remove the original script tag |
| 202 | - $this->content = str_replace($tag,'',$this->content); |
|
| 202 | + $this->content = str_replace($tag, '', $this->content); |
|
| 203 | 203 | } |
| 204 | 204 | |
| 205 | 205 | return true; |
@@ -211,37 +211,37 @@ discard block |
||
| 211 | 211 | |
| 212 | 212 | //Joins and optimizes JS |
| 213 | 213 | public function minify() { |
| 214 | - foreach($this->scripts as $script) { |
|
| 215 | - if(preg_match('#^INLINE;#',$script)) { |
|
| 214 | + foreach ($this->scripts as $script) { |
|
| 215 | + if (preg_match('#^INLINE;#', $script)) { |
|
| 216 | 216 | //Inline script |
| 217 | - $script = preg_replace('#^INLINE;#','',$script); |
|
| 218 | - $script = rtrim( $script, ";\n\t\r" ) . ';'; |
|
| 217 | + $script = preg_replace('#^INLINE;#', '', $script); |
|
| 218 | + $script = rtrim($script, ";\n\t\r").';'; |
|
| 219 | 219 | //Add try-catch? |
| 220 | - if($this->trycatch) { |
|
| 220 | + if ($this->trycatch) { |
|
| 221 | 221 | $script = 'try{'.$script.'}catch(e){}'; |
| 222 | 222 | } |
| 223 | - $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, '' ); |
|
| 224 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscript) ) { |
|
| 225 | - $script=$tmpscript; |
|
| 226 | - $this->alreadyminified=true; |
|
| 223 | + $tmpscript = apply_filters('autoptimize_js_individual_script', $script, ''); |
|
| 224 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) { |
|
| 225 | + $script = $tmpscript; |
|
| 226 | + $this->alreadyminified = true; |
|
| 227 | 227 | } |
| 228 | - $this->jscode .= "\n" . $script; |
|
| 228 | + $this->jscode .= "\n".$script; |
|
| 229 | 229 | } else { |
| 230 | 230 | //External script |
| 231 | - if($script !== false && file_exists($script) && is_readable($script)) { |
|
| 231 | + if ($script !== false && file_exists($script) && is_readable($script)) { |
|
| 232 | 232 | $scriptsrc = file_get_contents($script); |
| 233 | - $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$scriptsrc); |
|
| 234 | - $scriptsrc = rtrim($scriptsrc,";\n\t\r").';'; |
|
| 233 | + $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc); |
|
| 234 | + $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';'; |
|
| 235 | 235 | //Add try-catch? |
| 236 | - if($this->trycatch) { |
|
| 236 | + if ($this->trycatch) { |
|
| 237 | 237 | $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}'; |
| 238 | 238 | } |
| 239 | - $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script ); |
|
| 240 | - if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc) ) { |
|
| 241 | - $scriptsrc=$tmpscriptsrc; |
|
| 242 | - $this->alreadyminified=true; |
|
| 239 | + $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script); |
|
| 240 | + if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) { |
|
| 241 | + $scriptsrc = $tmpscriptsrc; |
|
| 242 | + $this->alreadyminified = true; |
|
| 243 | 243 | } else if ($this->can_inject_late($script)) { |
| 244 | - $scriptsrc="/*!%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%*/"; |
|
| 244 | + $scriptsrc = "/*!%%INJECTLATER%%".base64_encode($script)."|".md5($scriptsrc)."%%INJECTLATER%%*/"; |
|
| 245 | 245 | } |
| 246 | 246 | $this->jscode .= "\n".$scriptsrc; |
| 247 | 247 | }/*else{ |
@@ -252,24 +252,24 @@ discard block |
||
| 252 | 252 | |
| 253 | 253 | //Check for already-minified code |
| 254 | 254 | $this->md5hash = md5($this->jscode); |
| 255 | - $ccheck = new autoptimizeCache($this->md5hash,'js'); |
|
| 256 | - if($ccheck->check()) { |
|
| 255 | + $ccheck = new autoptimizeCache($this->md5hash, 'js'); |
|
| 256 | + if ($ccheck->check()) { |
|
| 257 | 257 | $this->jscode = $ccheck->retrieve(); |
| 258 | 258 | return true; |
| 259 | 259 | } |
| 260 | 260 | unset($ccheck); |
| 261 | 261 | |
| 262 | 262 | //$this->jscode has all the uncompressed code now. |
| 263 | - if ($this->alreadyminified!==true) { |
|
| 264 | - if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) { |
|
| 265 | - if (@is_callable(array("JSMin","minify"))) { |
|
| 263 | + if ($this->alreadyminified !== true) { |
|
| 264 | + if (class_exists('JSMin') && apply_filters('autoptimize_js_do_minify', true)) { |
|
| 265 | + if (@is_callable(array("JSMin", "minify"))) { |
|
| 266 | 266 | $tmp_jscode = trim(JSMin::minify($this->jscode)); |
| 267 | 267 | if (!empty($tmp_jscode)) { |
| 268 | 268 | $this->jscode = $tmp_jscode; |
| 269 | 269 | unset($tmp_jscode); |
| 270 | 270 | } |
| 271 | 271 | $this->jscode = $this->inject_minified($this->jscode); |
| 272 | - $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
|
| 272 | + $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode); |
|
| 273 | 273 | return true; |
| 274 | 274 | } else { |
| 275 | 275 | $this->jscode = $this->inject_minified($this->jscode); |
@@ -280,16 +280,16 @@ discard block |
||
| 280 | 280 | return false; |
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | - $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode ); |
|
| 283 | + $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode); |
|
| 284 | 284 | return true; |
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | //Caches the JS in uncompressed, deflated and gzipped form. |
| 288 | - public function cache() { |
|
| 289 | - $cache = new autoptimizeCache($this->md5hash,'js'); |
|
| 290 | - if(!$cache->check()) { |
|
| 288 | + public function cache() { |
|
| 289 | + $cache = new autoptimizeCache($this->md5hash, 'js'); |
|
| 290 | + if (!$cache->check()) { |
|
| 291 | 291 | //Cache our code |
| 292 | - $cache->cache($this->jscode,'text/javascript'); |
|
| 292 | + $cache->cache($this->jscode, 'text/javascript'); |
|
| 293 | 293 | } |
| 294 | 294 | $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
| 295 | 295 | $this->url = $this->url_replace_cdn($this->url); |
@@ -298,32 +298,32 @@ discard block |
||
| 298 | 298 | // Returns the content |
| 299 | 299 | public function getcontent() { |
| 300 | 300 | // Restore the full content |
| 301 | - if(!empty($this->restofcontent)) { |
|
| 301 | + if (!empty($this->restofcontent)) { |
|
| 302 | 302 | $this->content .= $this->restofcontent; |
| 303 | 303 | $this->restofcontent = ''; |
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | // Add the scripts taking forcehead/ deferred (default) into account |
| 307 | - if($this->forcehead == true) { |
|
| 308 | - $replaceTag=array("</head>","before"); |
|
| 309 | - $defer=""; |
|
| 307 | + if ($this->forcehead == true) { |
|
| 308 | + $replaceTag = array("</head>", "before"); |
|
| 309 | + $defer = ""; |
|
| 310 | 310 | } else { |
| 311 | - $replaceTag=array("</body>","before"); |
|
| 312 | - $defer="defer "; |
|
| 311 | + $replaceTag = array("</body>", "before"); |
|
| 312 | + $defer = "defer "; |
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | - $defer = apply_filters( 'autoptimize_filter_js_defer', $defer ); |
|
| 315 | + $defer = apply_filters('autoptimize_filter_js_defer', $defer); |
|
| 316 | 316 | $bodyreplacementpayload = '<script type="text/javascript" '.$defer.'src="'.$this->url.'"></script>'; |
| 317 | - $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload',$bodyreplacementpayload); |
|
| 317 | + $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload); |
|
| 318 | 318 | |
| 319 | - $bodyreplacement = implode('',$this->move['first']); |
|
| 319 | + $bodyreplacement = implode('', $this->move['first']); |
|
| 320 | 320 | $bodyreplacement .= $bodyreplacementpayload; |
| 321 | - $bodyreplacement .= implode('',$this->move['last']); |
|
| 321 | + $bodyreplacement .= implode('', $this->move['last']); |
|
| 322 | 322 | |
| 323 | - $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag ); |
|
| 323 | + $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag); |
|
| 324 | 324 | |
| 325 | - if (strlen($this->jscode)>0) { |
|
| 326 | - $this->inject_in_html($bodyreplacement,$replaceTag); |
|
| 325 | + if (strlen($this->jscode) > 0) { |
|
| 326 | + $this->inject_in_html($bodyreplacement, $replaceTag); |
|
| 327 | 327 | } |
| 328 | 328 | |
| 329 | 329 | // restore comments |
@@ -341,19 +341,19 @@ discard block |
||
| 341 | 341 | |
| 342 | 342 | // Checks against the white- and blacklists |
| 343 | 343 | private function ismergeable($tag) { |
| 344 | - if (apply_filters('autoptimize_filter_js_dontaggregate',false)) { |
|
| 344 | + if (apply_filters('autoptimize_filter_js_dontaggregate', false)) { |
|
| 345 | 345 | return false; |
| 346 | 346 | } else if (!empty($this->whitelist)) { |
| 347 | 347 | foreach ($this->whitelist as $match) { |
| 348 | - if(strpos($tag,$match)!==false) { |
|
| 348 | + if (strpos($tag, $match) !== false) { |
|
| 349 | 349 | return true; |
| 350 | 350 | } |
| 351 | 351 | } |
| 352 | 352 | // no match with whitelist |
| 353 | 353 | return false; |
| 354 | 354 | } else { |
| 355 | - foreach($this->domove as $match) { |
|
| 356 | - if(strpos($tag,$match)!==false) { |
|
| 355 | + foreach ($this->domove as $match) { |
|
| 356 | + if (strpos($tag, $match) !== false) { |
|
| 357 | 357 | // Matched something |
| 358 | 358 | return false; |
| 359 | 359 | } |
@@ -363,8 +363,8 @@ discard block |
||
| 363 | 363 | return false; |
| 364 | 364 | } |
| 365 | 365 | |
| 366 | - foreach($this->dontmove as $match) { |
|
| 367 | - if(strpos($tag,$match)!==false) { |
|
| 366 | + foreach ($this->dontmove as $match) { |
|
| 367 | + if (strpos($tag, $match) !== false) { |
|
| 368 | 368 | //Matched something |
| 369 | 369 | return false; |
| 370 | 370 | } |
@@ -377,12 +377,12 @@ discard block |
||
| 377 | 377 | |
| 378 | 378 | // Checks againstt the blacklist |
| 379 | 379 | private function ismovable($tag) { |
| 380 | - if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',true)) { |
|
| 380 | + if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable', true)) { |
|
| 381 | 381 | return false; |
| 382 | 382 | } |
| 383 | 383 | |
| 384 | - foreach($this->domove as $match) { |
|
| 385 | - if(strpos($tag,$match)!==false) { |
|
| 384 | + foreach ($this->domove as $match) { |
|
| 385 | + if (strpos($tag, $match) !== false) { |
|
| 386 | 386 | // Matched something |
| 387 | 387 | return true; |
| 388 | 388 | } |
@@ -392,8 +392,8 @@ discard block |
||
| 392 | 392 | return true; |
| 393 | 393 | } |
| 394 | 394 | |
| 395 | - foreach($this->dontmove as $match) { |
|
| 396 | - if(strpos($tag,$match)!==false) { |
|
| 395 | + foreach ($this->dontmove as $match) { |
|
| 396 | + if (strpos($tag, $match) !== false) { |
|
| 397 | 397 | // Matched something |
| 398 | 398 | return false; |
| 399 | 399 | } |
@@ -404,8 +404,8 @@ discard block |
||
| 404 | 404 | } |
| 405 | 405 | |
| 406 | 406 | private function movetolast($tag) { |
| 407 | - foreach($this->domovelast as $match) { |
|
| 408 | - if(strpos($tag,$match)!==false) { |
|
| 407 | + foreach ($this->domovelast as $match) { |
|
| 408 | + if (strpos($tag, $match) !== false) { |
|
| 409 | 409 | // Matched, return true |
| 410 | 410 | return true; |
| 411 | 411 | } |
@@ -431,10 +431,10 @@ discard block |
||
| 431 | 431 | * original function by https://github.com/zytzagoo/ on his AO fork, thanks Tomas! |
| 432 | 432 | */ |
| 433 | 433 | public function should_aggregate($tag) { |
| 434 | - preg_match('#<(script[^>]*)>#i',$tag,$scripttag); |
|
| 435 | - if ( strpos($scripttag[1], 'type')===false ) { |
|
| 434 | + preg_match('#<(script[^>]*)>#i', $tag, $scripttag); |
|
| 435 | + if (strpos($scripttag[1], 'type') === false) { |
|
| 436 | 436 | return true; |
| 437 | - } else if ( preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1]) ) { |
|
| 437 | + } else if (preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1])) { |
|
| 438 | 438 | return true; |
| 439 | 439 | } else { |
| 440 | 440 | return false; |
@@ -452,11 +452,11 @@ discard block |
||
| 452 | 452 | * @return bool |
| 453 | 453 | */ |
| 454 | 454 | private function can_inject_late($jsPath) { |
| 455 | - $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false); |
|
| 456 | - if ( $this->inject_min_late !== true ) { |
|
| 455 | + $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false); |
|
| 456 | + if ($this->inject_min_late !== true) { |
|
| 457 | 457 | // late-inject turned off |
| 458 | 458 | return false; |
| 459 | - } else if ( (strpos($jsPath,"min.js") === false) && ( strpos($jsPath,"wp-includes/js/jquery/jquery.js") === false ) && ( str_replace($consider_minified_array, '', $jsPath) === $jsPath ) ) { |
|
| 459 | + } else if ((strpos($jsPath, "min.js") === false) && (strpos($jsPath, "wp-includes/js/jquery/jquery.js") === false) && (str_replace($consider_minified_array, '', $jsPath) === $jsPath)) { |
|
| 460 | 460 | // file not minified based on filename & filter |
| 461 | 461 | return false; |
| 462 | 462 | } else { |
@@ -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,24 +52,24 @@ 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 | } |
| 71 | 71 | |
| 72 | -if ( $majorUp === true ) { |
|
| 72 | +if ($majorUp === true) { |
|
| 73 | 73 | // clear cache and notify user to check result if major upgrade |
| 74 | 74 | autoptimizeCache::clearall(); |
| 75 | 75 | add_action('admin_notices', 'autoptimize_update_config_notice'); |
@@ -3,24 +3,24 @@ discard block |
||
| 3 | 3 | Classlessly add a "more tools" tab to promote (future) AO addons and/ or affiliate services |
| 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 | add_action('admin_init', 'ao_partner_tabs_preinit'); |
| 9 | 9 | function ao_partner_tabs_preinit() { |
| 10 | - if (apply_filters('autoptimize_filter_show_partner_tabs',true)) { |
|
| 11 | - add_filter('autoptimize_filter_settingsscreen_tabs','ao_add_partner_tabs'); |
|
| 10 | + if (apply_filters('autoptimize_filter_show_partner_tabs', true)) { |
|
| 11 | + add_filter('autoptimize_filter_settingsscreen_tabs', 'ao_add_partner_tabs'); |
|
| 12 | 12 | } |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | function ao_add_partner_tabs($in) { |
| 16 | - $in=array_merge($in,array('ao_partners' => __('Optimize More!','autoptimize'))); |
|
| 16 | + $in = array_merge($in, array('ao_partners' => __('Optimize More!', 'autoptimize'))); |
|
| 17 | 17 | return $in; |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | -add_action('admin_menu','ao_partners_init'); |
|
| 20 | +add_action('admin_menu', 'ao_partners_init'); |
|
| 21 | 21 | function ao_partners_init() { |
| 22 | - if (apply_filters('autoptimize_filter_show_partner_tabs',true)) { |
|
| 23 | - $hook=add_submenu_page(NULL,'AO partner','AO partner','manage_options','ao_partners','ao_partners'); |
|
| 22 | + if (apply_filters('autoptimize_filter_show_partner_tabs', true)) { |
|
| 23 | + $hook = add_submenu_page(NULL, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', 'ao_partners'); |
|
| 24 | 24 | // register_settings here as well if needed |
| 25 | 25 | } |
| 26 | 26 | } |
@@ -71,10 +71,10 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | </style> |
| 73 | 73 | <div class="wrap"> |
| 74 | - <h1><?php _e('Autoptimize Settings','autoptimize'); ?></h1> |
|
| 74 | + <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1> |
|
| 75 | 75 | <?php echo autoptimizeConfig::ao_admin_tabs(); ?> |
| 76 | 76 | <?php |
| 77 | - echo '<h2>'. __("These Autoptimize power-ups and related services will improve your site's performance even more!",'autoptimize') . '</h2>'; |
|
| 77 | + echo '<h2>'.__("These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize').'</h2>'; |
|
| 78 | 78 | ?> |
| 79 | 79 | <div> |
| 80 | 80 | <?php getAOPartnerFeed(); ?> |
@@ -84,32 +84,32 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | function getAOPartnerFeed() { |
| 87 | - $noFeedText=__( 'Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize' ); |
|
| 87 | + $noFeedText = __('Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize'); |
|
| 88 | 88 | |
| 89 | - if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) { |
|
| 90 | - $rss = fetch_feed( "http://feeds.feedburner.com/OptimizingMattersDownloads" ); |
|
| 89 | + if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) { |
|
| 90 | + $rss = fetch_feed("http://feeds.feedburner.com/OptimizingMattersDownloads"); |
|
| 91 | 91 | $maxitems = 0; |
| 92 | 92 | |
| 93 | - if ( ! is_wp_error( $rss ) ) { |
|
| 94 | - $maxitems = $rss->get_item_quantity( 20 ); |
|
| 95 | - $rss_items = $rss->get_items( 0, $maxitems ); |
|
| 93 | + if (!is_wp_error($rss)) { |
|
| 94 | + $maxitems = $rss->get_item_quantity(20); |
|
| 95 | + $rss_items = $rss->get_items(0, $maxitems); |
|
| 96 | 96 | } ?> |
| 97 | 97 | <ul> |
| 98 | 98 | <?php |
| 99 | - if ( $maxitems == 0 ) { |
|
| 99 | + if ($maxitems == 0) { |
|
| 100 | 100 | echo $noFeedText; |
| 101 | 101 | } else { |
| 102 | - foreach ( $rss_items as $item ) : |
|
| 103 | - $itemURL = esc_url( $item->get_permalink() ); ?> |
|
| 102 | + foreach ($rss_items as $item) : |
|
| 103 | + $itemURL = esc_url($item->get_permalink()); ?> |
|
| 104 | 104 | <li class="itemDetail"> |
| 105 | - <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html( $item->get_title() ); ?></a></h3> |
|
| 105 | + <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html($item->get_title()); ?></a></h3> |
|
| 106 | 106 | <?php |
| 107 | - if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(),"image")!==false) ) { |
|
| 108 | - $itemImgURL=esc_url($enclosure->get_link()); |
|
| 107 | + if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(), "image") !== false)) { |
|
| 108 | + $itemImgURL = esc_url($enclosure->get_link()); |
|
| 109 | 109 | echo "<div class=\"itemImage\"><a href=\"".$itemURL."\" target=\"_blank\"><img src=\"".$itemImgURL."\"/></a></div>"; |
| 110 | 110 | } |
| 111 | 111 | ?> |
| 112 | - <div class="itemDescription"><?php echo wp_kses_post($item -> get_description() ); ?></div> |
|
| 112 | + <div class="itemDescription"><?php echo wp_kses_post($item -> get_description()); ?></div> |
|
| 113 | 113 | <div class="itemButtonRow"><div class="itemButton button-secondary"><a href="<?php echo $itemURL; ?>" target="_blank">More info</a></div></div> |
| 114 | 114 | </li> |
| 115 | 115 | <?php endforeach; ?> |
@@ -4,64 +4,64 @@ discard block |
||
| 4 | 4 | * new in Autoptimize 2.2 |
| 5 | 5 | */ |
| 6 | 6 | |
| 7 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 7 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 8 | 8 | |
| 9 | -function ao_js_snippetcache($jsin,$jsfilename) { |
|
| 9 | +function ao_js_snippetcache($jsin, $jsfilename) { |
|
| 10 | 10 | $md5hash = "snippet_".md5($jsin); |
| 11 | - $ccheck = new autoptimizeCache($md5hash,'js'); |
|
| 12 | - if($ccheck->check()) { |
|
| 11 | + $ccheck = new autoptimizeCache($md5hash, 'js'); |
|
| 12 | + if ($ccheck->check()) { |
|
| 13 | 13 | $scriptsrc = $ccheck->retrieve(); |
| 14 | 14 | } else { |
| 15 | - if ( (strpos($jsfilename,"min.js") === false) && ( strpos($jsfilename,"js/jquery/jquery.js") === false ) && ( str_replace(apply_filters('autoptimize_filter_js_consider_minified',false), '', $jsfilename) === $jsfilename ) ) { |
|
| 16 | - if(class_exists('JSMin')) { |
|
| 15 | + if ((strpos($jsfilename, "min.js") === false) && (strpos($jsfilename, "js/jquery/jquery.js") === false) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) { |
|
| 16 | + if (class_exists('JSMin')) { |
|
| 17 | 17 | $tmp_jscode = trim(JSMin::minify($jsin)); |
| 18 | 18 | if (!empty($tmp_jscode)) { |
| 19 | 19 | $scriptsrc = $tmp_jscode; |
| 20 | 20 | unset($tmp_jscode); |
| 21 | 21 | } else { |
| 22 | - $scriptsrc=$jsin; |
|
| 22 | + $scriptsrc = $jsin; |
|
| 23 | 23 | } |
| 24 | 24 | } else { |
| 25 | - $scriptsrc=$jsin; |
|
| 25 | + $scriptsrc = $jsin; |
|
| 26 | 26 | } |
| 27 | 27 | } else { |
| 28 | 28 | // do some housekeeping here to remove comments & linebreaks and stuff |
| 29 | - $scriptsrc=preg_replace("#^\s*\/\/.*$#Um","",$jsin); |
|
| 30 | - $scriptsrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$scriptsrc); |
|
| 31 | - $scriptsrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc); |
|
| 29 | + $scriptsrc = preg_replace("#^\s*\/\/.*$#Um", "", $jsin); |
|
| 30 | + $scriptsrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $scriptsrc); |
|
| 31 | + $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc); |
|
| 32 | 32 | |
| 33 | - if ((substr($scriptsrc,-1,1)!==";")&&(substr($scriptsrc,-1,1)!=="}")) { |
|
| 34 | - $scriptsrc.=";"; |
|
| 33 | + if ((substr($scriptsrc, -1, 1) !== ";") && (substr($scriptsrc, -1, 1) !== "}")) { |
|
| 34 | + $scriptsrc .= ";"; |
|
| 35 | 35 | } |
| 36 | 36 | } |
| 37 | - if ( !empty($jsfilename) && str_replace( apply_filters('autoptimize_filter_js_speedup_cache',false), '', $jsfilename ) === $jsfilename ) { |
|
| 37 | + if (!empty($jsfilename) && str_replace(apply_filters('autoptimize_filter_js_speedup_cache', false), '', $jsfilename) === $jsfilename) { |
|
| 38 | 38 | // don't cache inline CSS or if filter says no |
| 39 | - $ccheck->cache($scriptsrc,'text/javascript'); |
|
| 39 | + $ccheck->cache($scriptsrc, 'text/javascript'); |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | unset($ccheck); |
| 43 | 43 | |
| 44 | - if (get_option("autoptimize_js_trycatch")==="on") { |
|
| 45 | - $scriptsrc="try{".$scriptsrc."}catch(e){}"; |
|
| 44 | + if (get_option("autoptimize_js_trycatch") === "on") { |
|
| 45 | + $scriptsrc = "try{".$scriptsrc."}catch(e){}"; |
|
| 46 | 46 | } |
| 47 | 47 | |
| 48 | 48 | return $scriptsrc; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | -function ao_css_snippetcache($cssin,$cssfilename) { |
|
| 51 | +function ao_css_snippetcache($cssin, $cssfilename) { |
|
| 52 | 52 | $md5hash = "snippet_".md5($cssin); |
| 53 | - $ccheck = new autoptimizeCache($md5hash,'css'); |
|
| 54 | - if($ccheck->check()) { |
|
| 53 | + $ccheck = new autoptimizeCache($md5hash, 'css'); |
|
| 54 | + if ($ccheck->check()) { |
|
| 55 | 55 | $stylesrc = $ccheck->retrieve(); |
| 56 | 56 | } else { |
| 57 | - if ( ( strpos($cssfilename,"min.css") === false ) && ( str_replace( apply_filters('autoptimize_filter_css_consider_minified',false), '', $cssfilename ) === $cssfilename ) ) { |
|
| 57 | + if ((strpos($cssfilename, "min.css") === false) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) { |
|
| 58 | 58 | if (class_exists('Minify_CSS_Compressor')) { |
| 59 | 59 | $tmp_code = trim(Minify_CSS_Compressor::process($cssin)); |
| 60 | - } else if(class_exists('CSSmin')) { |
|
| 60 | + } else if (class_exists('CSSmin')) { |
|
| 61 | 61 | $cssmin = new CSSmin(); |
| 62 | - if (method_exists($cssmin,"run")) { |
|
| 62 | + if (method_exists($cssmin, "run")) { |
|
| 63 | 63 | $tmp_code = trim($cssmin->run($cssin)); |
| 64 | - } elseif (@is_callable(array($cssmin,"minify"))) { |
|
| 64 | + } elseif (@is_callable(array($cssmin, "minify"))) { |
|
| 65 | 65 | $tmp_code = trim(CssMin::minify($cssin)); |
| 66 | 66 | } |
| 67 | 67 | } |
@@ -74,13 +74,13 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | } else { |
| 76 | 76 | // .min.css -> no heavy-lifting, just some cleanup |
| 77 | - $stylesrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$cssin); |
|
| 78 | - $stylesrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc); |
|
| 79 | - $stylesrc=autoptimizeStyles::fixurls($cssfilename,$stylesrc); |
|
| 77 | + $stylesrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $cssin); |
|
| 78 | + $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc); |
|
| 79 | + $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc); |
|
| 80 | 80 | } |
| 81 | - if ( !empty($cssfilename) && ( str_replace( apply_filters('autoptimize_filter_css_speedup_cache',false), '', $cssfilename ) === $cssfilename ) ) { |
|
| 81 | + if (!empty($cssfilename) && (str_replace(apply_filters('autoptimize_filter_css_speedup_cache', false), '', $cssfilename) === $cssfilename)) { |
|
| 82 | 82 | // only cache CSS if not inline and allowed by filter |
| 83 | - $ccheck->cache($stylesrc,'text/css'); |
|
| 83 | + $ccheck->cache($stylesrc, 'text/css'); |
|
| 84 | 84 | } |
| 85 | 85 | } |
| 86 | 86 | unset($ccheck); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | |
| 90 | 90 | function ao_css_speedup_cleanup($cssin) { |
| 91 | 91 | // speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed |
| 92 | - return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin)); |
|
| 92 | + return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin)); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | function ao_js_speedup_cleanup($jsin) { |
@@ -97,7 +97,7 @@ discard block |
||
| 97 | 97 | return trim($jsin); |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | -add_filter('autoptimize_css_individual_style','ao_css_snippetcache',10,2); |
|
| 101 | -add_filter('autoptimize_js_individual_script','ao_js_snippetcache',10,2); |
|
| 102 | -add_filter('autoptimize_css_after_minify','ao_css_speedup_cleanup',10,1); |
|
| 103 | -add_filter('autoptimize_js_after_minify','ao_js_speedup_cleanup',10,1); |
|
| 100 | +add_filter('autoptimize_css_individual_style', 'ao_css_snippetcache', 10, 2); |
|
| 101 | +add_filter('autoptimize_js_individual_script', 'ao_js_snippetcache', 10, 2); |
|
| 102 | +add_filter('autoptimize_css_after_minify', 'ao_css_speedup_cleanup', 10, 1); |
|
| 103 | +add_filter('autoptimize_js_after_minify', 'ao_js_speedup_cleanup', 10, 1); |
|
@@ -2,55 +2,55 @@ |
||
| 2 | 2 | // flush as many page cache plugin's caches as possible |
| 3 | 3 | // hyper cache and gator cache hook into AO, so we don't need to :-) |
| 4 | 4 | |
| 5 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 5 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 6 | 6 | |
| 7 | 7 | function autoptimize_flush_pagecache() { |
| 8 | - if(function_exists('wp_cache_clear_cache')) { |
|
| 8 | + if (function_exists('wp_cache_clear_cache')) { |
|
| 9 | 9 | if (is_multisite()) { |
| 10 | 10 | $blog_id = get_current_blog_id(); |
| 11 | 11 | wp_cache_clear_cache($blog_id); |
| 12 | 12 | } else { |
| 13 | 13 | wp_cache_clear_cache(); |
| 14 | 14 | } |
| 15 | - } else if ( has_action('cachify_flush_cache') ) { |
|
| 15 | + } else if (has_action('cachify_flush_cache')) { |
|
| 16 | 16 | do_action('cachify_flush_cache'); |
| 17 | - } else if ( function_exists('w3tc_pgcache_flush') ) { |
|
| 17 | + } else if (function_exists('w3tc_pgcache_flush')) { |
|
| 18 | 18 | w3tc_pgcache_flush(); |
| 19 | - } else if ( function_exists('wp_fast_cache_bulk_delete_all') ) { |
|
| 19 | + } else if (function_exists('wp_fast_cache_bulk_delete_all')) { |
|
| 20 | 20 | wp_fast_cache_bulk_delete_all(); // still to retest |
| 21 | 21 | } else if (class_exists("WpFastestCache")) { |
| 22 | 22 | $wpfc = new WpFastestCache(); |
| 23 | 23 | $wpfc -> deleteCache(); |
| 24 | - } else if ( class_exists("c_ws_plugin__qcache_purging_routines") ) { |
|
| 24 | + } else if (class_exists("c_ws_plugin__qcache_purging_routines")) { |
|
| 25 | 25 | c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache, still to retest |
| 26 | - } else if ( class_exists("zencache") ) { |
|
| 26 | + } else if (class_exists("zencache")) { |
|
| 27 | 27 | zencache::clear(); |
| 28 | - } else if ( class_exists("comet_cache") ) { |
|
| 28 | + } else if (class_exists("comet_cache")) { |
|
| 29 | 29 | comet_cache::clear(); |
| 30 | - } else if ( class_exists("WpeCommon") ) { |
|
| 31 | - if ( apply_filters('autoptimize_flush_wpengine_aggressive', false) ) { |
|
| 32 | - if ( method_exists( "WpeCommon", "purge_memcached" ) ) { |
|
| 30 | + } else if (class_exists("WpeCommon")) { |
|
| 31 | + if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) { |
|
| 32 | + if (method_exists("WpeCommon", "purge_memcached")) { |
|
| 33 | 33 | WpeCommon::purge_memcached(); |
| 34 | 34 | } |
| 35 | - if ( method_exists( "WpeCommon", "clear_maxcdn_cache" ) ) { |
|
| 35 | + if (method_exists("WpeCommon", "clear_maxcdn_cache")) { |
|
| 36 | 36 | WpeCommon::clear_maxcdn_cache(); |
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | - if ( method_exists( "WpeCommon", "purge_varnish_cache" ) ) { |
|
| 39 | + if (method_exists("WpeCommon", "purge_varnish_cache")) { |
|
| 40 | 40 | WpeCommon::purge_varnish_cache(); |
| 41 | 41 | } |
| 42 | - } else if ( function_exists('sg_cachepress_purge_cache') ) { |
|
| 42 | + } else if (function_exists('sg_cachepress_purge_cache')) { |
|
| 43 | 43 | sg_cachepress_purge_cache(); |
| 44 | - } else if(file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')){ |
|
| 44 | + } else if (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) { |
|
| 45 | 45 | // fallback for WP-Super-Cache |
| 46 | 46 | global $cache_path; |
| 47 | 47 | if (is_multisite()) { |
| 48 | 48 | $blog_id = get_current_blog_id(); |
| 49 | - prune_super_cache( get_supercache_dir( $blog_id ), true ); |
|
| 50 | - prune_super_cache( $cache_path . 'blogs/', true ); |
|
| 49 | + prune_super_cache(get_supercache_dir($blog_id), true); |
|
| 50 | + prune_super_cache($cache_path.'blogs/', true); |
|
| 51 | 51 | } else { |
| 52 | - prune_super_cache($cache_path.'supercache/',true); |
|
| 53 | - prune_super_cache($cache_path,true); |
|
| 52 | + prune_super_cache($cache_path.'supercache/', true); |
|
| 53 | + prune_super_cache($cache_path, true); |
|
| 54 | 54 | } |
| 55 | 55 | } |
| 56 | 56 | } |
| 57 | 57 | \ No newline at end of file |
