View GitHub Repository autoptimize

Schedule Inspection
Subscribe
Completed
Push — master ( 9c48f6...d6880f )
by frank
02:22
created
Status
Category
Toggle Patches
classlesses/autoptimizeSpeedupper.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -88,13 +88,13 @@
 
 block discarded – undo
88 88 
 }
89 89
90 90 
 function ao_css_speedup_cleanup($cssin) {
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));
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));
93 93 
 }
94 94
95 95 
 function ao_js_speedup_cleanup($jsin) {
96 
-	// cleanup
97 
-	return trim($jsin);
96 
+    // cleanup
97 
+    return trim($jsin);
98 98 
 }
99 99
100 100 
 add_filter('autoptimize_css_individual_style','ao_css_snippetcache',10,2);
Please login to merge, or discard this patch.
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch 
@@ -1,67 +1,67 @@  discard block
 
 block discarded – undo
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 
 /*
5 5 
 * Autoptimize SpeedUp; minify & cache each JS/ CSS separately
6 6 
 * new in Autoptimize 2.2
7 7 
 */
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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);
Please login to merge, or discard this patch.
classes/autoptimizeScripts.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch 
@@ -128,27 +128,27 @@  discard block
 
 block discarded – undo
128 128 
                             // should we add flags?
129 129 
                             foreach ($excludeJS as $exclTag => $exclFlags) {
130 130 
                                 if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) {
131 
-                                   $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag);
131 
+                                    $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag);
132 132 
                                 }
133 133 
                             }
134 134 
                         }
135 135
136 
-   						// should we minify the non-aggregated script?
137 
-						if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
138 
-							$_CachedMinifiedUrl = $this->minify_single($path);
136 
+                            // should we minify the non-aggregated script?
137 
+                        if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
138 
+                            $_CachedMinifiedUrl = $this->minify_single($path);
139 139
140 
-							// replace orig URL with minified URL from cache if so
141 
-							if (!empty($_CachedMinifiedUrl)) {
142 
-								$newTag = str_replace($url, $_CachedMinifiedUrl, $newTag);
143 
-							}
140 
+                            // replace orig URL with minified URL from cache if so
141 
+                            if (!empty($_CachedMinifiedUrl)) {
142 
+                                $newTag = str_replace($url, $_CachedMinifiedUrl, $newTag);
143 
+                            }
144 144
145 
-							// remove querystring from URL in newTag
146 
-							if ( !empty($explUrl[1]) ) {
147 
-								$newTag = str_replace("?".$explUrl[1],"",$newTag);
148 
-							}
149 
-						}
145 
+                            // remove querystring from URL in newTag
146 
+                            if ( !empty($explUrl[1]) ) {
147 
+                                $newTag = str_replace("?".$explUrl[1],"",$newTag);
148 
+                            }
149 
+                        }
150 150
151 
-						// should we move the non-aggregated script?
151 
+                        // should we move the non-aggregated script?
152 152 
                         if( $this->ismovable($newTag) ) {
153 153 
                             // can be moved, flags and all
154 154 
                             if( $this->movetolast($newTag) )    {
 
@@ -261,7 +261,7 @@  discard block
 
 block discarded – undo
261 261
262 262 
         //$this->jscode has all the uncompressed code now.
263 263 
         if ($this->alreadyminified!==true) {
264 
-          if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
264 
+            if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
265 265 
             if (@is_callable(array("JSMin","minify"))) {
266 266 
                 $tmp_jscode = trim(JSMin::minify($this->jscode));
267 267 
                 if (!empty($tmp_jscode)) {
 
@@ -275,10 +275,10 @@  discard block
 
 block discarded – undo
275 275 
                 $this->jscode = $this->inject_minified($this->jscode);
276 276 
                 return false;
277 277 
             }
278 
-          } else {
279 
-              $this->jscode = $this->inject_minified($this->jscode);
280 
-              return false;
281 
-          }
278 
+            } else {
279 
+                $this->jscode = $this->inject_minified($this->jscode);
280 
+                return false;
281 
+            }
282 282 
         }
283 283 
         $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
284 284 
         return true;
 
@@ -341,8 +341,8 @@  discard block
 
 block discarded – undo
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)) {
345 
-			return false;
344 
+        if (apply_filters('autoptimize_filter_js_dontaggregate',false)) {
345 
+            return false;
346 346 
         } else if (!empty($this->whitelist)) {
347 347 
             foreach ($this->whitelist as $match) {
348 348 
                 if(strpos($tag,$match)!==false) {
 
@@ -450,15 +450,15 @@  discard block
 
 block discarded – undo
450 450 
      *
451 451 
      * @param string $jsPath
452 452 
      * @return bool
453 
-	 */
454 
-	private function can_inject_late($jsPath) {
455 
-		$consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
453 
+     */
454 
+    private function can_inject_late($jsPath) {
455 
+        $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
456 456 
         if ( $this->inject_min_late !== true ) {
457 457 
             // late-inject turned off
458 458 
             return false;
459 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 
-			// file not minified based on filename & filter
461 
-			return false;
460 
+            // file not minified based on filename & filter
461 
+            return false;
462 462 
         } else {
463 463 
             // phew, all is safe, we can late-inject
464 464 
             return true;
Please login to merge, or discard this patch.
Spacing   +115 added lines, -115 removed lines patch added patch discarded remove patch 
@@ -1,11 +1,11 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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 {
Please login to merge, or discard this patch.