@@ -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', "" ); |
|
28 | + $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', ""); |
|
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', ''); |
|
34 | + $removableJS = apply_filters('autoptimize_filter_js_removables', ''); |
|
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); |
@@ -284,11 +284,11 @@ discard block |
||
284 | 284 | } |
285 | 285 | |
286 | 286 | //Caches the JS in uncompressed, deflated and gzipped form. |
287 | - public function cache() { |
|
288 | - $cache = new autoptimizeCache($this->md5hash,'js'); |
|
289 | - if(!$cache->check()) { |
|
287 | + public function cache() { |
|
288 | + $cache = new autoptimizeCache($this->md5hash, 'js'); |
|
289 | + if (!$cache->check()) { |
|
290 | 290 | //Cache our code |
291 | - $cache->cache($this->jscode,'text/javascript'); |
|
291 | + $cache->cache($this->jscode, 'text/javascript'); |
|
292 | 292 | } |
293 | 293 | $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname(); |
294 | 294 | $this->url = $this->url_replace_cdn($this->url); |
@@ -297,32 +297,32 @@ discard block |
||
297 | 297 | // Returns the content |
298 | 298 | public function getcontent() { |
299 | 299 | // Restore the full content |
300 | - if(!empty($this->restofcontent)) { |
|
300 | + if (!empty($this->restofcontent)) { |
|
301 | 301 | $this->content .= $this->restofcontent; |
302 | 302 | $this->restofcontent = ''; |
303 | 303 | } |
304 | 304 | |
305 | 305 | // Add the scripts taking forcehead/ deferred (default) into account |
306 | - if($this->forcehead == true) { |
|
307 | - $replaceTag=array("</head>","before"); |
|
308 | - $defer=""; |
|
306 | + if ($this->forcehead == true) { |
|
307 | + $replaceTag = array("</head>", "before"); |
|
308 | + $defer = ""; |
|
309 | 309 | } else { |
310 | - $replaceTag=array("</body>","before"); |
|
311 | - $defer="defer "; |
|
310 | + $replaceTag = array("</body>", "before"); |
|
311 | + $defer = "defer "; |
|
312 | 312 | } |
313 | 313 | |
314 | - $defer = apply_filters( 'autoptimize_filter_js_defer', $defer ); |
|
314 | + $defer = apply_filters('autoptimize_filter_js_defer', $defer); |
|
315 | 315 | $bodyreplacementpayload = '<script type="text/javascript" '.$defer.'src="'.$this->url.'"></script>'; |
316 | - $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload',$bodyreplacementpayload); |
|
316 | + $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload); |
|
317 | 317 | |
318 | - $bodyreplacement = implode('',$this->move['first']); |
|
318 | + $bodyreplacement = implode('', $this->move['first']); |
|
319 | 319 | $bodyreplacement .= $bodyreplacementpayload; |
320 | - $bodyreplacement .= implode('',$this->move['last']); |
|
320 | + $bodyreplacement .= implode('', $this->move['last']); |
|
321 | 321 | |
322 | - $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag ); |
|
322 | + $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag); |
|
323 | 323 | |
324 | - if (strlen($this->jscode)>0) { |
|
325 | - $this->inject_in_html($bodyreplacement,$replaceTag); |
|
324 | + if (strlen($this->jscode) > 0) { |
|
325 | + $this->inject_in_html($bodyreplacement, $replaceTag); |
|
326 | 326 | } |
327 | 327 | |
328 | 328 | // restore comments |
@@ -340,19 +340,19 @@ discard block |
||
340 | 340 | |
341 | 341 | // Checks against the white- and blacklists |
342 | 342 | private function ismergeable($tag) { |
343 | - if (apply_filters('autoptimize_filter_js_dontaggregate',false)) { |
|
343 | + if (apply_filters('autoptimize_filter_js_dontaggregate', false)) { |
|
344 | 344 | return false; |
345 | 345 | } else if (!empty($this->whitelist)) { |
346 | 346 | foreach ($this->whitelist as $match) { |
347 | - if(strpos($tag,$match)!==false) { |
|
347 | + if (strpos($tag, $match) !== false) { |
|
348 | 348 | return true; |
349 | 349 | } |
350 | 350 | } |
351 | 351 | // no match with whitelist |
352 | 352 | return false; |
353 | 353 | } else { |
354 | - foreach($this->domove as $match) { |
|
355 | - if(strpos($tag,$match)!==false) { |
|
354 | + foreach ($this->domove as $match) { |
|
355 | + if (strpos($tag, $match) !== false) { |
|
356 | 356 | // Matched something |
357 | 357 | return false; |
358 | 358 | } |
@@ -362,8 +362,8 @@ discard block |
||
362 | 362 | return false; |
363 | 363 | } |
364 | 364 | |
365 | - foreach($this->dontmove as $match) { |
|
366 | - if(strpos($tag,$match)!==false) { |
|
365 | + foreach ($this->dontmove as $match) { |
|
366 | + if (strpos($tag, $match) !== false) { |
|
367 | 367 | //Matched something |
368 | 368 | return false; |
369 | 369 | } |
@@ -376,12 +376,12 @@ discard block |
||
376 | 376 | |
377 | 377 | // Checks againstt the blacklist |
378 | 378 | private function ismovable($tag) { |
379 | - if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',true)) { |
|
379 | + if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable', true)) { |
|
380 | 380 | return false; |
381 | 381 | } |
382 | 382 | |
383 | - foreach($this->domove as $match) { |
|
384 | - if(strpos($tag,$match)!==false) { |
|
383 | + foreach ($this->domove as $match) { |
|
384 | + if (strpos($tag, $match) !== false) { |
|
385 | 385 | // Matched something |
386 | 386 | return true; |
387 | 387 | } |
@@ -391,8 +391,8 @@ discard block |
||
391 | 391 | return true; |
392 | 392 | } |
393 | 393 | |
394 | - foreach($this->dontmove as $match) { |
|
395 | - if(strpos($tag,$match)!==false) { |
|
394 | + foreach ($this->dontmove as $match) { |
|
395 | + if (strpos($tag, $match) !== false) { |
|
396 | 396 | // Matched something |
397 | 397 | return false; |
398 | 398 | } |
@@ -403,8 +403,8 @@ discard block |
||
403 | 403 | } |
404 | 404 | |
405 | 405 | private function movetolast($tag) { |
406 | - foreach($this->domovelast as $match) { |
|
407 | - if(strpos($tag,$match)!==false) { |
|
406 | + foreach ($this->domovelast as $match) { |
|
407 | + if (strpos($tag, $match) !== false) { |
|
408 | 408 | // Matched, return true |
409 | 409 | return true; |
410 | 410 | } |
@@ -430,10 +430,10 @@ discard block |
||
430 | 430 | * original function by https://github.com/zytzagoo/ on his AO fork, thanks Tomas! |
431 | 431 | */ |
432 | 432 | public function should_aggregate($tag) { |
433 | - preg_match('#<(script[^>]*)>#i',$tag,$scripttag); |
|
434 | - if ( strpos($scripttag[1], 'type')===false ) { |
|
433 | + preg_match('#<(script[^>]*)>#i', $tag, $scripttag); |
|
434 | + if (strpos($scripttag[1], 'type') === false) { |
|
435 | 435 | return true; |
436 | - } else if ( preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1]) ) { |
|
436 | + } else if (preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1])) { |
|
437 | 437 | return true; |
438 | 438 | } else { |
439 | 439 | return false; |
@@ -451,11 +451,11 @@ discard block |
||
451 | 451 | * @return bool |
452 | 452 | */ |
453 | 453 | private function can_inject_late($jsPath) { |
454 | - $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false); |
|
455 | - if ( $this->inject_min_late !== true ) { |
|
454 | + $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false); |
|
455 | + if ($this->inject_min_late !== true) { |
|
456 | 456 | // late-inject turned off |
457 | 457 | return false; |
458 | - } else if ( (strpos($jsPath,"min.js") === false) && ( strpos($jsPath,"wp-includes/js/jquery/jquery.js") === false ) && ( str_replace($consider_minified_array, '', $jsPath) === $jsPath ) ) { |
|
458 | + } else if ((strpos($jsPath, "min.js") === false) && (strpos($jsPath, "wp-includes/js/jquery/jquery.js") === false) && (str_replace($consider_minified_array, '', $jsPath) === $jsPath)) { |
|
459 | 459 | // file not minified based on filename & filter |
460 | 460 | return false; |
461 | 461 | } else { |