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 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 |
@@ -12,15 +12,15 @@ discard block |
||
| 12 | 12 | http://www.gnu.org/licenses/gpl.txt |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | -if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly |
|
| 15 | +if (!defined('ABSPATH')) exit; // Exit if accessed directly |
|
| 16 | 16 | |
| 17 | -define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__)); |
|
| 17 | +define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__)); |
|
| 18 | 18 | |
| 19 | 19 | // Load config class |
| 20 | 20 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeConfig.php'); |
| 21 | 21 | |
| 22 | 22 | // Load toolbar class |
| 23 | -include( AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php' ); |
|
| 23 | +include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php'); |
|
| 24 | 24 | |
| 25 | 25 | // Load partners tab if admin |
| 26 | 26 | if (is_admin()) { |
@@ -28,25 +28,25 @@ discard block |
||
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | // Do we gzip when caching (needed early to load autoptimizeCache.php) |
| 31 | -define('AUTOPTIMIZE_CACHE_NOGZIP',(bool) get_option('autoptimize_cache_nogzip')); |
|
| 31 | +define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip')); |
|
| 32 | 32 | |
| 33 | 33 | // Load cache class |
| 34 | 34 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCache.php'); |
| 35 | 35 | |
| 36 | 36 | // wp-content dir name (automagically set, should not be needed), dirname of AO cache dir and AO-prefix can be overridden in wp-config.php |
| 37 | -if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME','/'.wp_basename( WP_CONTENT_DIR )); } |
|
| 38 | -if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR','/cache/autoptimize/'); } |
|
| 37 | +if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); } |
|
| 38 | +if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); } |
|
| 39 | 39 | if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); } |
| 40 | 40 | |
| 41 | 41 | // Plugin dir constants (plugin url's defined later to accomodate domain mapped sites) |
| 42 | -if (is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true )) { |
|
| 42 | +if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
| 43 | 43 | $blog_id = get_current_blog_id(); |
| 44 | - define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' ); |
|
| 44 | + define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/'); |
|
| 45 | 45 | } else { |
| 46 | 46 | define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR); |
| 47 | 47 | } |
| 48 | -define('AUTOPTIMIZE_CACHE_DELAY',true); |
|
| 49 | -define('WP_ROOT_DIR',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',WP_CONTENT_DIR)); |
|
| 48 | +define('AUTOPTIMIZE_CACHE_DELAY', true); |
|
| 49 | +define('WP_ROOT_DIR', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', WP_CONTENT_DIR)); |
|
| 50 | 50 | |
| 51 | 51 | // Initialize the cache at least once |
| 52 | 52 | $conf = autoptimizeConfig::instance(); |
@@ -54,65 +54,65 @@ discard block |
||
| 54 | 54 | /* Check if we're updating, in which case we might need to do stuff and flush the cache |
| 55 | 55 | to avoid old versions of aggregated files lingering around */ |
| 56 | 56 | |
| 57 | -$autoptimize_version="2.1.99"; |
|
| 58 | -$autoptimize_db_version=get_option('autoptimize_version','none'); |
|
| 57 | +$autoptimize_version = "2.1.99"; |
|
| 58 | +$autoptimize_db_version = get_option('autoptimize_version', 'none'); |
|
| 59 | 59 | |
| 60 | 60 | if ($autoptimize_db_version !== $autoptimize_version) { |
| 61 | - if ($autoptimize_db_version==="none") { |
|
| 61 | + if ($autoptimize_db_version === "none") { |
|
| 62 | 62 | add_action('admin_notices', 'autoptimize_install_config_notice'); |
| 63 | 63 | } else { |
| 64 | 64 | // updating, include the update-code |
| 65 | 65 | include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeUpdateCode.php'); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - update_option('autoptimize_version',$autoptimize_version); |
|
| 69 | - $autoptimize_db_version=$autoptimize_version; |
|
| 68 | + update_option('autoptimize_version', $autoptimize_version); |
|
| 69 | + $autoptimize_db_version = $autoptimize_version; |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | // Load translations |
| 73 | 73 | function autoptimize_load_plugin_textdomain() { |
| 74 | - load_plugin_textdomain('autoptimize',false,plugin_basename(dirname( __FILE__ )).'/localization'); |
|
| 74 | + load_plugin_textdomain('autoptimize', false, plugin_basename(dirname(__FILE__)).'/localization'); |
|
| 75 | 75 | } |
| 76 | -add_action( 'init', 'autoptimize_load_plugin_textdomain' ); |
|
| 76 | +add_action('init', 'autoptimize_load_plugin_textdomain'); |
|
| 77 | 77 | |
| 78 | -function autoptimize_uninstall(){ |
|
| 78 | +function autoptimize_uninstall() { |
|
| 79 | 79 | autoptimizeCache::clearall(); |
| 80 | 80 | |
| 81 | - $delete_options=array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice","autoptimize_css_include_inline","autoptimize_js_include_inline","autoptimize_css_nogooglefont","autoptimize_optimize_logged","autoptimize_optimize_checkout"); |
|
| 81 | + $delete_options = array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice", "autoptimize_css_include_inline", "autoptimize_js_include_inline", "autoptimize_css_nogooglefont", "autoptimize_optimize_logged", "autoptimize_optimize_checkout"); |
|
| 82 | 82 | |
| 83 | - if ( !is_multisite() ) { |
|
| 84 | - foreach ($delete_options as $del_opt) { delete_option( $del_opt ); } |
|
| 83 | + if (!is_multisite()) { |
|
| 84 | + foreach ($delete_options as $del_opt) { delete_option($del_opt); } |
|
| 85 | 85 | } else { |
| 86 | 86 | global $wpdb; |
| 87 | - $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" ); |
|
| 87 | + $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs"); |
|
| 88 | 88 | $original_blog_id = get_current_blog_id(); |
| 89 | - foreach ( $blog_ids as $blog_id ) { |
|
| 90 | - switch_to_blog( $blog_id ); |
|
| 91 | - foreach ($delete_options as $del_opt) { delete_option( $del_opt ); } |
|
| 89 | + foreach ($blog_ids as $blog_id) { |
|
| 90 | + switch_to_blog($blog_id); |
|
| 91 | + foreach ($delete_options as $del_opt) { delete_option($del_opt); } |
|
| 92 | 92 | } |
| 93 | - switch_to_blog( $original_blog_id ); |
|
| 93 | + switch_to_blog($original_blog_id); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - if ( wp_get_schedule( 'ao_cachechecker' ) ) { |
|
| 97 | - wp_clear_scheduled_hook( 'ao_cachechecker' ); |
|
| 96 | + if (wp_get_schedule('ao_cachechecker')) { |
|
| 97 | + wp_clear_scheduled_hook('ao_cachechecker'); |
|
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | function autoptimize_install_config_notice() { |
| 102 | 102 | echo '<div class="updated"><p>'; |
| 103 | - _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' ); |
|
| 103 | + _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize'); |
|
| 104 | 104 | echo '</p></div>'; |
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | function autoptimize_update_config_notice() { |
| 108 | 108 | echo '<div class="updated"><p>'; |
| 109 | - _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' ); |
|
| 109 | + _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize'); |
|
| 110 | 110 | echo '</p></div>'; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | 113 | function autoptimize_cache_unavailable_notice() { |
| 114 | 114 | echo '<div class="error"><p>'; |
| 115 | - printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR ); |
|
| 115 | + printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR); |
|
| 116 | 116 | echo '</p></div>'; |
| 117 | 117 | } |
| 118 | 118 | |
@@ -121,27 +121,27 @@ discard block |
||
| 121 | 121 | $ao_noptimize = false; |
| 122 | 122 | |
| 123 | 123 | // noptimize in qs to get non-optimized page for debugging |
| 124 | - if (array_key_exists("ao_noptimize",$_GET)) { |
|
| 125 | - if ( ($_GET["ao_noptimize"]==="1") && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) { |
|
| 124 | + if (array_key_exists("ao_noptimize", $_GET)) { |
|
| 125 | + if (($_GET["ao_noptimize"] === "1") && (apply_filters('autoptimize_filter_honor_qs_noptimize', true))) { |
|
| 126 | 126 | $ao_noptimize = true; |
| 127 | 127 | } |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | // check for DONOTMINIFY constant as used by e.g. WooCommerce POS |
| 131 | - if (defined('DONOTMINIFY') && (constant('DONOTMINIFY')===true || constant('DONOTMINIFY')==="true")) { |
|
| 131 | + if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === "true")) { |
|
| 132 | 132 | $ao_noptimize = true; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | // if setting says not to optimize logged in user and user is logged in |
| 136 | - if ( get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts') ) { |
|
| 136 | + if (get_option('autoptimize_optimize_logged', 'on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts')) { |
|
| 137 | 137 | $ao_noptimize = true; |
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | // if setting says not to optimize cart/ checkout |
| 141 | - if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) { |
|
| 141 | + if (get_option('autoptimize_optimize_checkout', 'on') !== 'on') { |
|
| 142 | 142 | // checking for woocommerce, easy digital downloads and wp ecommerce |
| 143 | - foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) { |
|
| 144 | - if ( function_exists($shopCond) && $shopCond() ) { |
|
| 143 | + foreach (array("is_checkout", "is_cart", "edd_is_checkout", "wpsc_is_cart", "wpsc_is_checkout") as $shopCond) { |
|
| 144 | + if (function_exists($shopCond) && $shopCond()) { |
|
| 145 | 145 | $ao_noptimize = true; |
| 146 | 146 | break; |
| 147 | 147 | } |
@@ -149,11 +149,11 @@ discard block |
||
| 149 | 149 | } |
| 150 | 150 | |
| 151 | 151 | // filter you can use to block autoptimization on your own terms |
| 152 | - $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize ); |
|
| 152 | + $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize); |
|
| 153 | 153 | |
| 154 | - if (!is_feed() && !$ao_noptimize && !is_admin() && ( !function_exists('is_customize_preview') || !is_customize_preview() ) ) { |
|
| 154 | + if (!is_feed() && !$ao_noptimize && !is_admin() && (!function_exists('is_customize_preview') || !is_customize_preview())) { |
|
| 155 | 155 | // load speedupper conditionally (true by default?) |
| 156 | - if ( apply_filters('autoptimize_filter_speedupper', true) ) { |
|
| 156 | + if (apply_filters('autoptimize_filter_speedupper', true)) { |
|
| 157 | 157 | include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeSpeedupper.php'); |
| 158 | 158 | } |
| 159 | 159 | |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeBase.php'); |
| 165 | 165 | |
| 166 | 166 | // Load extra classes and set some vars |
| 167 | - if($conf->get('autoptimize_html')) { |
|
| 167 | + if ($conf->get('autoptimize_html')) { |
|
| 168 | 168 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeHTML.php'); |
| 169 | 169 | // BUG: new minify-html does not support keeping HTML comments, skipping for now |
| 170 | 170 | // if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | // } |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - if($conf->get('autoptimize_js')) { |
|
| 177 | + if ($conf->get('autoptimize_js')) { |
|
| 178 | 178 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeScripts.php'); |
| 179 | 179 | if (!class_exists('JSMin')) { |
| 180 | 180 | if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
@@ -183,15 +183,15 @@ discard block |
||
| 183 | 183 | @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/minify-2.3.1-jsmin.php'); |
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | - if ( ! defined( 'CONCATENATE_SCRIPTS' )) { |
|
| 187 | - define('CONCATENATE_SCRIPTS',false); |
|
| 186 | + if (!defined('CONCATENATE_SCRIPTS')) { |
|
| 187 | + define('CONCATENATE_SCRIPTS', false); |
|
| 188 | 188 | } |
| 189 | - if ( ! defined( 'COMPRESS_SCRIPTS' )) { |
|
| 190 | - define('COMPRESS_SCRIPTS',false); |
|
| 189 | + if (!defined('COMPRESS_SCRIPTS')) { |
|
| 190 | + define('COMPRESS_SCRIPTS', false); |
|
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | 193 | |
| 194 | - if($conf->get('autoptimize_css')) { |
|
| 194 | + if ($conf->get('autoptimize_css')) { |
|
| 195 | 195 | include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeStyles.php'); |
| 196 | 196 | if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { |
| 197 | 197 | if (!class_exists('Minify_CSS_Compressor')) { |
@@ -202,13 +202,13 @@ discard block |
||
| 202 | 202 | @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-p10/cssmin.php'); |
| 203 | 203 | } |
| 204 | 204 | } |
| 205 | - if ( ! defined( 'COMPRESS_CSS' )) { |
|
| 206 | - define('COMPRESS_CSS',false); |
|
| 205 | + if (!defined('COMPRESS_CSS')) { |
|
| 206 | + define('COMPRESS_CSS', false); |
|
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | // filter to be used with care, kills all output buffers when true. use with extreme caution. you have been warned! |
| 211 | - if (apply_filters('autoptimize_filter_obkiller',false)) { |
|
| 211 | + if (apply_filters('autoptimize_filter_obkiller', false)) { |
|
| 212 | 212 | while (ob_get_level() > 0) { |
| 213 | 213 | ob_end_clean(); |
| 214 | 214 | } |
@@ -220,35 +220,35 @@ discard block |
||
| 220 | 220 | |
| 221 | 221 | // Action on end, this is where the magic happens |
| 222 | 222 | function autoptimize_end_buffering($content) { |
| 223 | - if ( ((stripos($content,"<html") === false) && (stripos($content,"<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/',$content) === 1 || stripos($content,"<xsl:stylesheet") !== false ) { return $content; } |
|
| 223 | + if (((stripos($content, "<html") === false) && (stripos($content, "<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/', $content) === 1 || stripos($content, "<xsl:stylesheet") !== false) { return $content; } |
|
| 224 | 224 | |
| 225 | 225 | // load URL constants as late as possible to allow domain mapper to kick in |
| 226 | 226 | if (function_exists("domain_mapping_siteurl")) { |
| 227 | - define('AUTOPTIMIZE_WP_SITE_URL',domain_mapping_siteurl(get_current_blog_id())); |
|
| 228 | - define('AUTOPTIMIZE_WP_CONTENT_URL',str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL),AUTOPTIMIZE_WP_SITE_URL,content_url())); |
|
| 227 | + define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id())); |
|
| 228 | + define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url())); |
|
| 229 | 229 | } else { |
| 230 | - define('AUTOPTIMIZE_WP_SITE_URL',site_url()); |
|
| 231 | - define('AUTOPTIMIZE_WP_CONTENT_URL',content_url()); |
|
| 230 | + define('AUTOPTIMIZE_WP_SITE_URL', site_url()); |
|
| 231 | + define('AUTOPTIMIZE_WP_CONTENT_URL', content_url()); |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | - if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true ) ) { |
|
| 234 | + if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) { |
|
| 235 | 235 | $blog_id = get_current_blog_id(); |
| 236 | - define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' ); |
|
| 236 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/'); |
|
| 237 | 237 | } else { |
| 238 | - define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
| 238 | + define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR); |
|
| 239 | 239 | } |
| 240 | - define('AUTOPTIMIZE_WP_ROOT_URL',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',AUTOPTIMIZE_WP_CONTENT_URL)); |
|
| 240 | + define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL)); |
|
| 241 | 241 | |
| 242 | 242 | // Config element |
| 243 | 243 | $conf = autoptimizeConfig::instance(); |
| 244 | 244 | |
| 245 | 245 | // Choose the classes |
| 246 | 246 | $classes = array(); |
| 247 | - if($conf->get('autoptimize_js')) |
|
| 247 | + if ($conf->get('autoptimize_js')) |
|
| 248 | 248 | $classes[] = 'autoptimizeScripts'; |
| 249 | - if($conf->get('autoptimize_css')) |
|
| 249 | + if ($conf->get('autoptimize_css')) |
|
| 250 | 250 | $classes[] = 'autoptimizeStyles'; |
| 251 | - if($conf->get('autoptimize_html')) |
|
| 251 | + if ($conf->get('autoptimize_html')) |
|
| 252 | 252 | $classes[] = 'autoptimizeHTML'; |
| 253 | 253 | |
| 254 | 254 | // Set some options |
@@ -277,12 +277,12 @@ discard block |
||
| 277 | 277 | ) |
| 278 | 278 | ); |
| 279 | 279 | |
| 280 | - $content = apply_filters( 'autoptimize_filter_html_before_minify', $content ); |
|
| 280 | + $content = apply_filters('autoptimize_filter_html_before_minify', $content); |
|
| 281 | 281 | |
| 282 | 282 | // Run the classes |
| 283 | - foreach($classes as $name) { |
|
| 283 | + foreach ($classes as $name) { |
|
| 284 | 284 | $instance = new $name($content); |
| 285 | - if($instance->read($classoptions[$name])) { |
|
| 285 | + if ($instance->read($classoptions[$name])) { |
|
| 286 | 286 | $instance->minify(); |
| 287 | 287 | $instance->cache(); |
| 288 | 288 | $content = $instance->getcontent(); |
@@ -290,19 +290,19 @@ discard block |
||
| 290 | 290 | unset($instance); |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | - $content = apply_filters( 'autoptimize_html_after_minify', $content ); |
|
| 293 | + $content = apply_filters('autoptimize_html_after_minify', $content); |
|
| 294 | 294 | return $content; |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | -if ( autoptimizeCache::cacheavail() ) { |
|
| 297 | +if (autoptimizeCache::cacheavail()) { |
|
| 298 | 298 | $conf = autoptimizeConfig::instance(); |
| 299 | - if( $conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') ) { |
|
| 299 | + if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) { |
|
| 300 | 300 | // Hook to wordpress |
| 301 | 301 | if (defined('AUTOPTIMIZE_INIT_EARLIER')) { |
| 302 | - add_action('init','autoptimize_start_buffering',-1); |
|
| 302 | + add_action('init', 'autoptimize_start_buffering', -1); |
|
| 303 | 303 | } else { |
| 304 | 304 | if (!defined('AUTOPTIMIZE_HOOK_INTO')) { define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); } |
| 305 | - add_action(constant("AUTOPTIMIZE_HOOK_INTO"),'autoptimize_start_buffering',2); |
|
| 305 | + add_action(constant("AUTOPTIMIZE_HOOK_INTO"), 'autoptimize_start_buffering', 2); |
|
| 306 | 306 | } |
| 307 | 307 | } |
| 308 | 308 | } else { |
@@ -310,9 +310,9 @@ discard block |
||
| 310 | 310 | } |
| 311 | 311 | |
| 312 | 312 | function autoptimize_activate() { |
| 313 | - register_uninstall_hook( __FILE__, 'autoptimize_uninstall' ); |
|
| 313 | + register_uninstall_hook(__FILE__, 'autoptimize_uninstall'); |
|
| 314 | 314 | } |
| 315 | -register_activation_hook( __FILE__, 'autoptimize_activate' ); |
|
| 315 | +register_activation_hook(__FILE__, 'autoptimize_activate'); |
|
| 316 | 316 | |
| 317 | 317 | include_once('classlesses/autoptimizeCacheChecker.php'); |
| 318 | 318 | |
