View GitHub Repository autoptimize

Schedule Inspection
Subscribe
Completed
Push — master ( 79b90b...aa9cf7 )
by frank
02:17
created
Status
Category
Toggle Patches
classes/autoptimizeScripts.php 1 patch
Spacing   +114 added lines, -114 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', "" );
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 );
62 
-        if ($excludeJS!=="") {
61 
+        $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS);
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);
 
@@ -284,11 +284,11 @@  discard block
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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
 
 block discarded – undo
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 {
Please login to merge, or discard this patch.
classes/autoptimizeConfig.php 1 patch
Spacing   +179 added lines, -179 removed lines patch added patch discarded remove patch 
@@ -1,5 +1,5 @@  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 autoptimizeConfig {
5 5 
     private $config = null;
 
@@ -7,25 +7,25 @@  discard block
 
 block discarded – undo
7 7
8 8 
     //Singleton: private construct
9 9 
     private function __construct() {
10 
-        if( is_admin() ) {
10 
+        if (is_admin()) {
11 11 
             //Add the admin page and settings
12 
-            add_action('admin_menu',array($this,'addmenu'));
13 
-            add_action('admin_init',array($this,'registersettings'));
12 
+            add_action('admin_menu', array($this, 'addmenu'));
13 
+            add_action('admin_init', array($this, 'registersettings'));
14 14
15 15 
             //Set meta info
16 
-            if(function_exists('plugin_row_meta')) {
16 
+            if (function_exists('plugin_row_meta')) {
17 17 
                 //2.8+
18 
-                add_filter('plugin_row_meta',array($this,'setmeta'),10,2);
19 
-            } elseif(function_exists('post_class')) {
18 
+                add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2);
19 
+            } elseif (function_exists('post_class')) {
20 20 
                 //2.7
21 21 
                 $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
22 
-                add_filter('plugin_action_links_'.$plugin,array($this,'setmeta'));
22 
+                add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta'));
23 23 
             }
24 24
25 25 
             //Clean cache?
26 
-            if(get_option('autoptimize_cache_clean')) {
26 
+            if (get_option('autoptimize_cache_clean')) {
27 27 
                 autoptimizeCache::clearall();
28 
-                update_option('autoptimize_cache_clean',0);
28 
+                update_option('autoptimize_cache_clean', 0);
29 29 
             }
30 30 
         }
31 31 
 
@@ -159,27 +159,27 @@  discard block
 
 block discarded – undo
159 159 
 <div class="wrap">
160 160
161 161 
 <?php if (version_compare(PHP_VERSION, '5.3.0') < 0) { ?>
162 
-<div class="notice-error notice"><?php echo '<p>' . sprintf( __('<strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href=%s>serious security and performance issues</a>. Please ask your hoster to provide you with an upgrade path to 5.6 or 7.0.','autoptimize'), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"') . '</p>'; ?></div>
162 
+<div class="notice-error notice"><?php echo '<p>'.sprintf(__('<strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href=%s>serious security and performance issues</a>. Please ask your hoster to provide you with an upgrade path to 5.6 or 7.0.', 'autoptimize'), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"').'</p>'; ?></div>
163 163 
 <?php } ?>
164 164
165 165 
 <div id="autoptimize_main">
166 166 
 <div id="ao_title_and_button">
167 
-    <h1 id="ao_title"><?php _e('Autoptimize Settings','autoptimize'); ?>
167 
+    <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?>
168 168 
     <span id="ao_adv_button">
169 169 
     <?php
170 
-    if (get_option('autoptimize_show_adv','0')=='1') {
170 
+    if (get_option('autoptimize_show_adv', '0') == '1') {
171 171 
         ?>
172 
-        <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
173 
-        <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
172 
+        <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a>
173 
+        <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a>
174 174 
         <style>tr.ao_adv{display:table-row;} li.ao_adv{display:list-item;}</style>
175 175 
         <?php
176 
-        $hiddenClass="";
176 
+        $hiddenClass = "";
177 177 
     } else {
178 178 
         ?>
179 
-        <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
180 
-        <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
179 
+        <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a>
180 
+        <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a>
181 181 
         <?php
182 
-        $hiddenClass="hidden ";
182 
+        $hiddenClass = "hidden ";
183 183 
     }
184 184 
     ?>
185 185 
     </span>
 
@@ -194,154 +194,154 @@  discard block
 
 block discarded – undo
194 194 
 <ul>
195 195
196 196 
 <li class="itemDetail">
197 
-<h2 class="itemTitle"><?php _e('HTML Options','autoptimize'); ?></h2>
197 
+<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2>
198 198 
 <table class="form-table">
199 199 
 <tr valign="top">
200 
-<th scope="row"><?php _e('Optimize HTML Code?','autoptimize'); ?></th>
201 
-<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html')?'checked="checked" ':''; ?>/></td>
200 
+<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th>
201 
+<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td>
202 202 
 </tr>
203 
-<tr class="<?php echo $hiddenClass;?>html_sub ao_adv" valign="top">
204 
-<th scope="row"><?php _e('Keep HTML comments?','autoptimize'); ?></th>
205 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments')?'checked="checked" ':''; ?>/>
206 
-<?php _e('Enable this if you want HTML comments to remain in the page.','autoptimize'); ?></label></td>
203 
+<tr class="<?php echo $hiddenClass; ?>html_sub ao_adv" valign="top">
204 
+<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th>
205 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/>
206 
+<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td>
207 207 
 </tr>
208 208 
 </table>
209 209 
 </li>
210 210
211 211 
 <li class="itemDetail">
212 
-<h2 class="itemTitle"><?php _e('JavaScript Options','autoptimize'); ?></h2>
212 
+<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2>
213 213 
 <table class="form-table">
214 214 
 <tr valign="top">
215 
-<th scope="row"><?php _e('Optimize JavaScript Code?','autoptimize'); ?></th>
216 
-<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js')?'checked="checked" ':''; ?>/></td>
215 
+<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th>
216 
+<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td>
217 217 
 </tr>
218 
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
219 
-<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?','autoptimize'); ?></th>
220 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead')?'checked="checked" ':''; ?>/>
221 
-<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.','autoptimize'); ?></label></td>
218 
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
219 
+<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?', 'autoptimize'); ?></th>
220 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/>
221 
+<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize'); ?></label></td>
222 222 
 </tr>
223 223 
 <?php if (get_option('autoptimize_js_justhead')) { ?>
224 
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
225 
-<th scope="row"><?php _e('Look for scripts only in &lt;head&gt;?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th>
226 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead')?'checked="checked" ':''; ?>/>
227 
-<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.','autoptimize'); ?></label></td>
224 
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
225 
+<th scope="row"><?php _e('Look for scripts only in &lt;head&gt;?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th>
226 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/>
227 
+<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td>
228 228 
 </tr>
229 229 
 <?php } ?>
230 
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
231 
-<th scope="row"><?php _e('Also aggregate inline JS?','autoptimize'); ?></th>
232 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline')?'checked="checked" ':''; ?>/>
233 
-<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.','autoptimize'); ?></label></td>
230 
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
231 
+<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th>
232 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/>
233 
+<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize'); ?></label></td>
234 234 
 </tr>
235 
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
236 
-<th scope="row"><?php _e('Exclude scripts from Autoptimize:','autoptimize'); ?></th>
237 
-<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude',"seal.js, js/jquery/jquery.js"); ?>"/><br />
238 
-<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.','autoptimize'); ?></label></td>
235 
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
236 
+<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th>
237 
+<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude', "seal.js, js/jquery/jquery.js"); ?>"/><br />
238 
+<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated and minimized by Autoptimize.', 'autoptimize'); ?></label></td>
239 239 
 </tr>
240 
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
241 
-<th scope="row"><?php _e('Add try-catch wrapping?','autoptimize'); ?></th>
242 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch')?'checked="checked" ':''; ?>/>
243 
-<?php _e('If your scripts break because of a JS-error, you might want to try this.','autoptimize'); ?></label></td>
240 
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
241 
+<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th>
242 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/>
243 
+<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td>
244 244 
 </tr>
245 245 
 </table>
246 246 
 </li>
247 247
248 248 
 <li class="itemDetail">
249 
-<h2 class="itemTitle"><?php _e('CSS Options','autoptimize'); ?></h2>
249 
+<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2>
250 250 
 <table class="form-table">
251 251 
 <tr valign="top">
252 
-<th scope="row"><?php _e('Optimize CSS Code?','autoptimize'); ?></th>
253 
-<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css')?'checked="checked" ':''; ?>/></td>
252 
+<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th>
253 
+<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td>
254 254 
 </tr>
255 
-<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top">
256 
-<th scope="row"><?php _e('Generate data: URIs for images?','autoptimize'); ?></th>
257 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris')?'checked="checked" ':''; ?>/>
258 
-<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.','autoptimize'); ?></label></td>
255 
+<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top">
256 
+<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th>
257 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/>
258 
+<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td>
259 259 
 </tr>
260 
-<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top">
261 
-<th scope="row"><?php _e('Remove Google Fonts?','autoptimize'); ?></th>
262 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont')?'checked="checked" ':''; ?>/>
263 
-<?php _e('Check this if you don\'t need or want Google Fonts being loaded.','autoptimize'); ?></label></td>
260 
+<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top">
261 
+<th scope="row"><?php _e('Remove Google Fonts?', 'autoptimize'); ?></th>
262 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont') ? 'checked="checked" ' : ''; ?>/>
263 
+<?php _e('Check this if you don\'t need or want Google Fonts being loaded.', 'autoptimize'); ?></label></td>
264 264 
 </tr>
265 265 
 <?php if (get_option('autoptimize_css_justhead')) { ?>
266 
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
267 
-<th scope="row"><?php _e('Look for styles only in &lt;head&gt;?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th>
268 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead')?'checked="checked" ':''; ?>/>
269 
-<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.','autoptimize'); ?></label></td>
266 
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
267 
+<th scope="row"><?php _e('Look for styles only in &lt;head&gt;?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th>
268 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/>
269 
+<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td>
270 270 
 </tr>
271 271 
 <?php } ?>
272 
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
273 
-<th scope="row"><?php _e('Also aggregate inline CSS?','autoptimize'); ?></th>
274 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline','1')?'checked="checked" ':''; ?>/>
275 
-<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.','autoptimize'); ?></label></td>
272 
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
273 
+<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th>
274 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/>
275 
+<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td>
276 276 
 </tr>
277 
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
278 
-<th scope="row"><?php _e('Inline and Defer CSS?','autoptimize'); ?></th>
279 
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer')?'checked="checked" ':''; ?>/>
280 
-<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!','autoptimize'); ?></label></td>
277 
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
278 
+<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th>
279 
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/>
280 
+<?php _e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> before activating this option!', 'autoptimize'); ?></label></td>
281 281 
 </tr>
282 
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv" id="autoptimize_css_defer_inline">
282 
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv" id="autoptimize_css_defer_inline">
283 283 
 <th scope="row"></th>
284 
-<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.','autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td>
284 
+<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td>
285 285 
 </tr>
286 
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub">
287 
-<th scope="row"><?php _e('Inline all CSS?','autoptimize'); ?></th>
288 
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline')?'checked="checked" ':''; ?>/>
289 
-<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.','autoptimize'); ?></label></td>
286 
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub">
287 
+<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th>
288 
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/>
289 
+<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.', 'autoptimize'); ?></label></td>
290 290 
 </tr>
291 
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub">
292 
-<th scope="row"><?php _e('Exclude CSS from Autoptimize:','autoptimize'); ?></th>
293 
-<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude','admin-bar.min.css, dashicons.min.css'); ?>"/><br />
294 
-<?php _e('A comma-separated list of CSS you want to exclude from being optimized.','autoptimize'); ?></label></td>
291 
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub">
292 
+<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th>
293 
+<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude', 'admin-bar.min.css, dashicons.min.css'); ?>"/><br />
294 
+<?php _e('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize'); ?></label></td>
295 295 
 </tr>
296 296 
 </table>
297 297 
 </li>
298 298
299 299 
 <li class="itemDetail">
300 
-<h2 class="itemTitle"><?php _e('CDN Options','autoptimize'); ?></h2>
300 
+<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2>
301 301 
 <table class="form-table">
302 302 
 <tr valign="top">
303 
-<th scope="row"><?php _e('CDN Base URL','autoptimize'); ?></th>
304 
-<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url',''),array("http","https")); ?>" /><br />
305 
-<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.','autoptimize'); ?></label></td>
303 
+<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th>
304 
+<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url', ''), array("http", "https")); ?>" /><br />
305 
+<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize'); ?></label></td>
306 306 
 </tr>
307 307 
 </table>
308 308 
 </li>
309 309
310 
-<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
311 
-<h2 class="itemTitle"><?php _e('Cache Info','autoptimize'); ?></h2>
310 
+<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv">
311 
+<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2>
312 312 
 <table class="form-table" >
313 
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
314 
-<th scope="row"><?php _e('Cache folder','autoptimize'); ?></th>
313 
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
314 
+<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th>
315 315 
 <td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td>
316 316 
 </tr>
317 
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
318 
-<th scope="row"><?php _e('Can we write?','autoptimize'); ?></th>
319 
-<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes','autoptimize') : __('No','autoptimize')); ?></td>
317 
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
318 
+<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th>
319 
+<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td>
320 320 
 </tr>
321 
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
322 
-<th scope="row"><?php _e('Cached styles and scripts','autoptimize'); ?></th>
321 
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
322 
+<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th>
323 323 
 <td><?php
324 
-    $AOstatArr=autoptimizeCache::stats();
325 
-    $AOcacheSize=round($AOstatArr[1]/1024);
326 
-    printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2]) );
324 
+    $AOstatArr = autoptimizeCache::stats();
325 
+    $AOcacheSize = round($AOstatArr[1]/1024);
326 
+    printf(__('%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2]));
327 327 
 ?></td>
328 328 
 </tr>
329 329 
 </table>
330 330 
 </li>
331 331
332 
-<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
333 
-<h2 class="itemTitle"><?php _e('Misc Options','autoptimize'); ?></h2>
332 
+<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv">
333 
+<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2>
334 334 
 <table class="form-table">
335 
-	<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
336 
-		<th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th>
337 
-		<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/>
338 
-			<?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.','autoptimize'); ?></label>
335 
+	<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
336 
+		<th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th>
337 
+		<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/>
338 
+			<?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label>
339 339 
 		</td>
340 340 
 	</tr>
341 
-	<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
342 
-		<th scope="row"><?php _e('Also optimize for logged in users?','autoptimize'); ?></th>
343 
-		<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged','1')?'checked="checked" ':''; ?>/>
344 
-			<?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.','autoptimize'); ?></label>
341 
+	<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
342 
+		<th scope="row"><?php _e('Also optimize for logged in users?', 'autoptimize'); ?></th>
343 
+		<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/>
344 
+			<?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize'); ?></label>
345 345 
 		</td>
346 346 
 	</tr>
347 347 
 </table>
 
@@ -349,11 +349,11 @@  discard block
 
 block discarded – undo
349 349
350 350 
 </ul>
351 351
352 
-<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv','0'); ?>">
352 
+<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv', '0'); ?>">
353 353
354 354 
 <p class="submit">
355 
-<input type="submit" class="button-secondary" value="<?php _e('Save Changes','autoptimize') ?>" />
356 
-<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache','autoptimize') ?>" />
355 
+<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize') ?>" />
356 
+<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize') ?>" />
357 357 
 </p>
358 358
359 359 
 </form>
 
@@ -362,31 +362,31 @@  discard block
 
 block discarded – undo
362 362 
     <div class="autoptimize_banner hidden">
363 363 
         <ul>
364 364 
         <?php
365 
-        if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
366 
-            $AO_banner=get_transient("autoptimize_banner");
365 
+        if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
366 
+            $AO_banner = get_transient("autoptimize_banner");
367 367 
             if (empty($AO_banner)) {
368 368 
                 $banner_resp = wp_remote_get("http://misc.optimizingmatters.com/autoptimize_news.html");
369 369 
                 if (!is_wp_error($banner_resp)) {
370 
-                    if (wp_remote_retrieve_response_code($banner_resp)=="200") {
370 
+                    if (wp_remote_retrieve_response_code($banner_resp) == "200") {
371 371 
                         $AO_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp));
372 
-                        set_transient("autoptimize_banner",$AO_banner,DAY_IN_SECONDS);
372 
+                        set_transient("autoptimize_banner", $AO_banner, DAY_IN_SECONDS);
373 373 
                     }
374 374 
                 }
375 375 
             }
376 376 
             echo $AO_banner;
377 377 
         }
378 378 
         ?>
379 
-        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ</a> or post your question on <a href='http://wordpress.org/support/plugin/autoptimize'>the support-forum</a>.","autoptimize"); ?></li>
380 
-        <li><?php _e("Happy with Autoptimize?","autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!","autoptimize"); ?></a></li>
379 
+        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ</a> or post your question on <a href='http://wordpress.org/support/plugin/autoptimize'>the support-forum</a>.", "autoptimize"); ?></li>
380 
+        <li><?php _e("Happy with Autoptimize?", "autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!", "autoptimize"); ?></a></li>
381 381 
         </ul>
382 382 
     </div>
383 383 
     <div style="margin-left:10px;margin-top:-5px;">
384 384 
         <h2>
385 
-            <?php _e("futtta about","autoptimize") ?>
385 
+            <?php _e("futtta about", "autoptimize") ?>
386 386 
             <select id="feed_dropdown" >
387 
-                <option value="1"><?php _e("Autoptimize","autoptimize") ?></option>
388 
-                <option value="2"><?php _e("WordPress","autoptimize") ?></option>
389 
-                <option value="3"><?php _e("Web Technology","autoptimize") ?></option>
387 
+                <option value="1"><?php _e("Autoptimize", "autoptimize") ?></option>
388 
+                <option value="2"><?php _e("WordPress", "autoptimize") ?></option>
389 
+                <option value="3"><?php _e("Web Technology", "autoptimize") ?></option>
390 390 
             </select>
391 391 
         </h2>
392 392 
         <div id="futtta_feed">
 
@@ -401,7 +401,7 @@  discard block
 
 block discarded – undo
401 401 
             </div>
402 402 
         </div>
403 403 
     </div>
404 
-    <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!","autoptimize"); ?>"></a></div>
404 
+    <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!", "autoptimize"); ?>"></a></div>
405 405 
 </div>
406 406
407 407 
 <script type="text/javascript">
 
@@ -540,14 +540,14 @@  discard block
 
 block discarded – undo
540 540 
     }
541 541
542 542 
     public function addmenu() {
543 
-        $hook=add_options_page(__('Autoptimize Options','autoptimize'),'Autoptimize','manage_options','autoptimize',array($this,'show'));
544 
-        add_action( 'admin_print_scripts-'.$hook,array($this,'autoptimize_admin_scripts'));
545 
-        add_action( 'admin_print_styles-'.$hook,array($this,'autoptimize_admin_styles'));
543 
+        $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show'));
544 
+        add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts'));
545 
+        add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles'));
546 546 
     }
547 547
548 548 
     public function autoptimize_admin_scripts() {
549 
-        wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'),null,true);
550 
-        wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'),null,true);
549 
+        wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true);
550 
+        wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true);
551 551 
     }
552 552
553 553 
     public function autoptimize_admin_styles() {
 
@@ -556,47 +556,47 @@  discard block
 
 block discarded – undo
556 556 
     }
557 557
558 558 
     public function registersettings() {
559 
-        register_setting('autoptimize','autoptimize_html');
560 
-        register_setting('autoptimize','autoptimize_html_keepcomments');
561 
-        register_setting('autoptimize','autoptimize_js');
562 
-        register_setting('autoptimize','autoptimize_js_exclude');
563 
-        register_setting('autoptimize','autoptimize_js_trycatch');
564 
-        register_setting('autoptimize','autoptimize_js_justhead');
565 
-        register_setting('autoptimize','autoptimize_js_forcehead');
566 
-        register_setting('autoptimize','autoptimize_js_include_inline');
567 
-        register_setting('autoptimize','autoptimize_css');
568 
-        register_setting('autoptimize','autoptimize_css_exclude');
569 
-        register_setting('autoptimize','autoptimize_css_justhead');
570 
-        register_setting('autoptimize','autoptimize_css_datauris');
571 
-        register_setting('autoptimize','autoptimize_css_defer');
572 
-        register_setting('autoptimize','autoptimize_css_defer_inline');
573 
-        register_setting('autoptimize','autoptimize_css_inline');
574 
-        register_setting('autoptimize','autoptimize_css_include_inline');
575 
-        register_setting('autoptimize','autoptimize_css_nogooglefont');
576 
-        register_setting('autoptimize','autoptimize_cdn_url');
577 
-        register_setting('autoptimize','autoptimize_cache_clean');
578 
-        register_setting('autoptimize','autoptimize_cache_nogzip');
579 
-        register_setting('autoptimize','autoptimize_show_adv');
580 
-        register_setting('autoptimize','autoptimize_optimize_logged');
559 
+        register_setting('autoptimize', 'autoptimize_html');
560 
+        register_setting('autoptimize', 'autoptimize_html_keepcomments');
561 
+        register_setting('autoptimize', 'autoptimize_js');
562 
+        register_setting('autoptimize', 'autoptimize_js_exclude');
563 
+        register_setting('autoptimize', 'autoptimize_js_trycatch');
564 
+        register_setting('autoptimize', 'autoptimize_js_justhead');
565 
+        register_setting('autoptimize', 'autoptimize_js_forcehead');
566 
+        register_setting('autoptimize', 'autoptimize_js_include_inline');
567 
+        register_setting('autoptimize', 'autoptimize_css');
568 
+        register_setting('autoptimize', 'autoptimize_css_exclude');
569 
+        register_setting('autoptimize', 'autoptimize_css_justhead');
570 
+        register_setting('autoptimize', 'autoptimize_css_datauris');
571 
+        register_setting('autoptimize', 'autoptimize_css_defer');
572 
+        register_setting('autoptimize', 'autoptimize_css_defer_inline');
573 
+        register_setting('autoptimize', 'autoptimize_css_inline');
574 
+        register_setting('autoptimize', 'autoptimize_css_include_inline');
575 
+        register_setting('autoptimize', 'autoptimize_css_nogooglefont');
576 
+        register_setting('autoptimize', 'autoptimize_cdn_url');
577 
+        register_setting('autoptimize', 'autoptimize_cache_clean');
578 
+        register_setting('autoptimize', 'autoptimize_cache_nogzip');
579 
+        register_setting('autoptimize', 'autoptimize_show_adv');
580 
+        register_setting('autoptimize', 'autoptimize_optimize_logged');
581 581 
     }
582 582
583 
-    public function setmeta($links,$file=null) {
583 
+    public function setmeta($links, $file = null) {
584 584 
         //Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/
585 585 
         //Do it only once - saves time
586 586 
         static $plugin;
587 
-        if(empty($plugin))
587 
+        if (empty($plugin))
588 588 
             $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
589 589
590 
-        if($file===null) {
590 
+        if ($file === null) {
591 591 
             //2.7
592 592 
             $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'));
593 
-            array_unshift($links,$settings_link);
593 
+            array_unshift($links, $settings_link);
594 594 
         } else {
595 595 
             //2.8
596 596 
             //If it's us, add the link
597 
-            if($file === $plugin) {
598 
-                $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>',__('Settings')));
599 
-                $links = array_merge($links,$newlink);
597 
+            if ($file === $plugin) {
598 
+                $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')));
599 
+                $links = array_merge($links, $newlink);
600 600 
             }
601 601 
         }
602 602 
 
@@ -604,7 +604,7 @@  discard block
 
 block discarded – undo
604 604 
     }
605 605
606 606 
     public function get($key) {
607 
-        if(!is_array($this->config)) {
607 
+        if (!is_array($this->config)) {
608 608 
             //Default config
609 609 
             $config = array('autoptimize_html' => 0,
610 610 
                 'autoptimize_html_keepcomments' => 0,
 
@@ -630,9 +630,9 @@  discard block
 
 block discarded – undo
630 630 
                 );
631 631
632 632 
             //Override with user settings
633 
-            foreach(array_keys($config) as $name) {
633 
+            foreach (array_keys($config) as $name) {
634 634 
                 $conf = get_option($name);
635 
-                if($conf!==false) {
635 
+                if ($conf !== false) {
636 636 
                     //It was set before!
637 637 
                     $config[$name] = $conf;
638 638 
                 }
 
@@ -642,31 +642,31 @@  discard block
 
 block discarded – undo
642 642 
             $this->config = $config;
643 643 
         }
644 644
645 
-        if(isset($this->config[$key]))
645 
+        if (isset($this->config[$key]))
646 646 
             return $this->config[$key];
647 647
648 648 
         return false;
649 649 
     }
650 650
651 651 
     private function getFutttaFeeds($url) {
652 
-        if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
653 
-            $rss = fetch_feed( $url );
652 
+        if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
653 
+            $rss = fetch_feed($url);
654 654 
             $maxitems = 0;
655 655
656 
-            if ( ! is_wp_error( $rss ) ) {
657 
-                $maxitems = $rss->get_item_quantity( 7 );
658 
-                $rss_items = $rss->get_items( 0, $maxitems );
656 
+            if (!is_wp_error($rss)) {
657 
+                $maxitems = $rss->get_item_quantity(7);
658 
+                $rss_items = $rss->get_items(0, $maxitems);
659 659 
             }
660 660 
             ?>
661 661 
             <ul>
662 
-                <?php if ( $maxitems == 0 ) : ?>
663 
-                    <li><?php _e( 'No items', 'autoptimize' ); ?></li>
662 
+                <?php if ($maxitems == 0) : ?>
663 
+                    <li><?php _e('No items', 'autoptimize'); ?></li>
664 664 
                 <?php else : ?>
665 
-                    <?php foreach ( $rss_items as $item ) : ?>
665 
+                    <?php foreach ($rss_items as $item) : ?>
666 666 
                         <li>
667 
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
668 
-                                title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>">
669 
-                                <?php echo esc_html( $item->get_title() ); ?>
667 
+                            <a href="<?php echo esc_url($item->get_permalink()); ?>"
668 
+                                title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>">
669 
+                                <?php echo esc_html($item->get_title()); ?>
670 670 
                             </a>
671 671 
                         </li>
672 672 
                     <?php endforeach; ?>
 
@@ -677,20 +677,20 @@  discard block
 
 block discarded – undo
677 677 
     }
678 678
679 679 
     // based on http://wordpress.stackexchange.com/a/58826
680 
-    static function ao_admin_tabs(){
681 
-        $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs',array('autoptimize' => __('Main','autoptimize')));
682 
-        $tabContent="";
683 
-        if (count($tabs)>1) {
684 
-            if(isset($_GET['page'])){
680 
+    static function ao_admin_tabs() {
681 
+        $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('Main', 'autoptimize')));
682 
+        $tabContent = "";
683 
+        if (count($tabs) > 1) {
684 
+            if (isset($_GET['page'])) {
685 685 
                 $currentId = $_GET['page'];
686 686 
             } else {
687 687 
                 $currentId = "autoptimize";
688 688 
             }
689 689 
             $tabContent .= "<h2 class=\"nav-tab-wrapper\">";
690 
-            foreach($tabs as $tabId => $tabName){
691 
-                if($currentId == $tabId){
690 
+            foreach ($tabs as $tabId => $tabName) {
691 
+                if ($currentId == $tabId) {
692 692 
                     $class = " nav-tab-active";
693 
-                } else{
693 
+                } else {
694 694 
                     $class = "";
695 695 
                 }
696 696 
                 $tabContent .= '<a class="nav-tab'.$class.'" href="?page='.$tabId.'">'.$tabName.'</a>';
Please login to merge, or discard this patch.