futtta / autoptimize

classes/autoptimizeCache.php

Doc Comments +6 added lines

@@ -42,6 +42,9 @@ 
         return false;
     }
     
+    /**
+     * @param string $mime
+     */
     public function cache($code,$mime) {
         if($this->nogzip == false) {
             $file = ($this->delayed ? 'delayed.php' : 'default.php');
@@ -240,6 +243,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $dir
+     */
     static function checkCacheDir($dir) {
         // Check and create if not exists
         if(!file_exists($dir))    {

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 class autoptimizeCache {
     private $filename;

Spacing +61 added lines, -61 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeCache {
     private $filename;
@@ -7,14 +7,14 @@ 
     private $cachedir;
     private $delayed;
     
-    public function __construct($md5,$ext='php') {
+    public function __construct($md5, $ext = 'php') {
         $this->cachedir = AUTOPTIMIZE_CACHE_DIR;
         $this->delayed = AUTOPTIMIZE_CACHE_DELAY;
         $this->nogzip = AUTOPTIMIZE_CACHE_NOGZIP;
-        if($this->nogzip == false) {
+        if ($this->nogzip == false) {
             $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.php';
         } else {
-            if (in_array($ext, array("js","css")))     {
+            if (in_array($ext, array("js", "css"))) {
                 $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
             } else {
                 $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
@@ -23,7 +23,7 @@ 
     }
     
     public function check() {
-        if(!file_exists($this->cachedir.$this->filename)) {
+        if (!file_exists($this->cachedir.$this->filename)) {
             // No cached file, sorry
             return false;
         }
@@ -32,8 +32,8 @@ 
     }
     
     public function retrieve() {
-        if($this->check()) {
-            if($this->nogzip == false) {
+        if ($this->check()) {
+            if ($this->nogzip == false) {
                 return file_get_contents($this->cachedir.$this->filename.'.none');
             } else {
                 return file_get_contents($this->cachedir.$this->filename);
@@ -42,48 +42,48 @@ 
         return false;
     }
     
-    public function cache($code,$mime) {
-        if($this->nogzip == false) {
+    public function cache($code, $mime) {
+        if ($this->nogzip == false) {
             $file = ($this->delayed ? 'delayed.php' : 'default.php');
             $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'/config/'.$file);
-            $phpcode = str_replace(array('%%CONTENT%%','exit;'),array($mime,''),$phpcode);
-            file_put_contents($this->cachedir.$this->filename,$phpcode, LOCK_EX);
-            file_put_contents($this->cachedir.$this->filename.'.none',$code, LOCK_EX);
-            if(!$this->delayed) {
+            $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode);
+            file_put_contents($this->cachedir.$this->filename, $phpcode, LOCK_EX);
+            file_put_contents($this->cachedir.$this->filename.'.none', $code, LOCK_EX);
+            if (!$this->delayed) {
                 // Compress now!
-                file_put_contents($this->cachedir.$this->filename.'.deflate',gzencode($code,9,FORCE_DEFLATE), LOCK_EX);
-                file_put_contents($this->cachedir.$this->filename.'.gzip',gzencode($code,9,FORCE_GZIP), LOCK_EX);
+                file_put_contents($this->cachedir.$this->filename.'.deflate', gzencode($code, 9, FORCE_DEFLATE), LOCK_EX);
+                file_put_contents($this->cachedir.$this->filename.'.gzip', gzencode($code, 9, FORCE_GZIP), LOCK_EX);
             }
         } else {
             // Write code to cache without doing anything else
-            file_put_contents($this->cachedir.$this->filename,$code, LOCK_EX);
+            file_put_contents($this->cachedir.$this->filename, $code, LOCK_EX);
             if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) {
                 // Create an additional cached gzip file
-                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code,9,FORCE_GZIP), LOCK_EX);
+                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code, 9, FORCE_GZIP), LOCK_EX);
             }
         }
     }
     
     public function getname() {
-        apply_filters('autoptimize_filter_cache_getname',AUTOPTIMIZE_CACHE_URL.$this->filename);
+        apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename);
         return $this->filename;
     }
     
     static function clearall() {
-        if(!autoptimizeCache::cacheavail()) {
+        if (!autoptimizeCache::cacheavail()) {
             return false;
         }
     
         // scan the cachedirs        
-        foreach (array("","js","css") as $scandirName) {
+        foreach (array("", "js", "css") as $scandirName) {
             $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName);
         }
         
         // clear the cachedirs
         foreach ($scan as $scandirName=>$scanneddir) {
-            $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/";
-            foreach($scanneddir as $file) {
-                if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) {
+            $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/";
+            foreach ($scanneddir as $file) {
+                if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) {
                     @unlink($thisAoCacheDir.$file);
                 }
             }
@@ -98,15 +98,15 @@ 
                 do_action("autoptimize_action_cachepurged");
             }
         }
-        add_action("shutdown","autoptimize_do_cachepurged_action",11);
+        add_action("shutdown", "autoptimize_do_cachepurged_action", 11);
         
         // try to purge caching plugins cache-files?
         include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizePageCacheFlush.php');
-        add_action("autoptimize_action_cachepurged","autoptimize_flush_pagecache",10,0);
+        add_action("autoptimize_action_cachepurged", "autoptimize_flush_pagecache", 10, 0);
 
         // warm cache (part of speedupper)?
-        if ( apply_filters('autoptimize_filter_speedupper', true) ) {
-            $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1,100000);
+        if (apply_filters('autoptimize_filter_speedupper', true)) {
+            $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1, 100000);
             $warmCache = @wp_remote_get($warmCacheUrl);
             unset($warmCache);
         }
@@ -114,12 +114,12 @@ 
         return true;
     }
 
-    static function stats()    {
-        $AOstats=get_transient("autoptimize_stats");
+    static function stats() {
+        $AOstats = get_transient("autoptimize_stats");
 
         if (empty($AOstats)) {
             // Cache not available :(
-            if(!autoptimizeCache::cacheavail()) {
+            if (!autoptimizeCache::cacheavail()) {
                 return 0;
             }
             
@@ -128,28 +128,28 @@ 
             $size = 0;
             
             // scan the cachedirs        
-            foreach (array("","js","css") as $scandirName) {
+            foreach (array("", "js", "css") as $scandirName) {
                 $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName);
             }
             
             foreach ($scan as $scandirName=>$scanneddir) {
-                $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/";
-                foreach($scanneddir as $file) {
-                    if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) {
-                        if(is_file($thisAoCacheDir.$file)) {
-                            if(AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file,'.js') !== false || strpos($file,'.css') !== false || strpos($file,'.img') !== false || strpos($file,'.txt') !== false )) {
+                $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/";
+                foreach ($scanneddir as $file) {
+                    if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) {
+                        if (is_file($thisAoCacheDir.$file)) {
+                            if (AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file, '.js') !== false || strpos($file, '.css') !== false || strpos($file, '.img') !== false || strpos($file, '.txt') !== false)) {
                                 $count++;
-                            } elseif(!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file,'.none') !== false) {
+                            } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file, '.none') !== false) {
                                 $count++;
                             }
-                            $size+=filesize($thisAoCacheDir.$file);
+                            $size += filesize($thisAoCacheDir.$file);
                         }
                     }
                 }
             }
-            $AOstats=array($count,$size,time());
-            if ($count>100) {
-                set_transient("autoptimize_stats",$AOstats,HOUR_IN_SECONDS);
+            $AOstats = array($count, $size, time());
+            if ($count > 100) {
+                set_transient("autoptimize_stats", $AOstats, HOUR_IN_SECONDS);
             }
         }
         // print the number of instances
@@ -157,36 +157,36 @@ 
     }    
 
     static function cacheavail() {
-        if(!defined('AUTOPTIMIZE_CACHE_DIR')) {
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
             // We didn't set a cache
             return false;
         }
         
-        foreach (array("","js","css") as $checkDir) {
-            if(!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) {
+        foreach (array("", "js", "css") as $checkDir) {
+            if (!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) {
                 return false;
             }
         }
         
         /** write index.html here to avoid prying eyes */
-        $indexFile=AUTOPTIMIZE_CACHE_DIR.'/index.html';
-        if(!is_file($indexFile)) {
-            @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
+        $indexFile = AUTOPTIMIZE_CACHE_DIR.'/index.html';
+        if (!is_file($indexFile)) {
+            @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
         }
 
         /** write .htaccess here to overrule wp_super_cache */
-        $htAccess=AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
-        if(!is_file($htAccess)) {
+        $htAccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
+        if (!is_file($htAccess)) {
             /** 
              * create wp-content/AO_htaccess_tmpl with 
              * whatever htaccess rules you might need
              * if you want to override default AO htaccess
              */
-            $htaccess_tmpl=WP_CONTENT_DIR."/AO_htaccess_tmpl";
+            $htaccess_tmpl = WP_CONTENT_DIR."/AO_htaccess_tmpl";
             if (is_file($htaccess_tmpl)) { 
-                $htAccessContent=file_get_contents($htaccess_tmpl);
+                $htAccessContent = file_get_contents($htaccess_tmpl);
             } else if (is_multisite() || AUTOPTIMIZE_CACHE_NOGZIP == false) {
-                $htAccessContent='<IfModule mod_expires.c>
+                $htAccessContent = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
         ExpiresByType text/javascript A30672000
@@ -209,7 +209,7 @@ 
     </Files>
 </IfModule>';
             } else {
-                $htAccessContent='<IfModule mod_expires.c>
+                $htAccessContent = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
         ExpiresByType text/javascript A30672000
@@ -232,7 +232,7 @@ 
     </Files>
 </IfModule>';
             }
-            @file_put_contents($htAccess,$htAccessContent);
+            @file_put_contents($htAccess, $htAccessContent);
         }
 
         // All OK
@@ -241,22 +241,22 @@ 
 
     static function checkCacheDir($dir) {
         // Check and create if not exists
-        if(!file_exists($dir))    {
-            @mkdir($dir,0775,true);
-            if(!file_exists($dir))    {
+        if (!file_exists($dir)) {
+            @mkdir($dir, 0775, true);
+            if (!file_exists($dir)) {
                 return false;
             }
         }
 
         // check if we can now write
-        if(!is_writable($dir))    {
+        if (!is_writable($dir)) {
             return false;
         }
 
         // and write index.html here to avoid prying eyes
-        $indexFile=$dir.'/index.html';
-        if(!is_file($indexFile)) {
-            @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
+        $indexFile = $dir.'/index.html';
+        if (!is_file($indexFile)) {
+            @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
         }
         
         return true;

classes/autoptimizeConfig.php

Doc Comments +3 added lines

@@ -625,6 +625,9 @@
         return false;
     }
 
+    /**
+     * @param string $url
+     */
     private function getFutttaFeeds($url) {
         if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
             $rss = fetch_feed( $url );

Indentation +4 added lines, -4 removed lines

@@ -345,8 +345,8 @@ 
 		</td>
 	</tr>
 	<?php
-		if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
-			?>
+        if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
+            ?>
 				<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
 					<th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th>
 					<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/>
@@ -354,8 +354,8 @@ 
 					</td>
 				</tr>
 			<?php
-		}
-	?>
+        }
+    ?>
 </table>
 </li>
 

Spacing +186 added lines, -186 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeConfig {
     private $config = null;
@@ -7,25 +7,25 @@ 
 
     //Singleton: private construct
     private function __construct() {
-        if( is_admin() ) {
+        if (is_admin()) {
             //Add the admin page and settings
-            add_action('admin_menu',array($this,'addmenu'));
-            add_action('admin_init',array($this,'registersettings'));
+            add_action('admin_menu', array($this, 'addmenu'));
+            add_action('admin_init', array($this, 'registersettings'));
 
             //Set meta info
-            if(function_exists('plugin_row_meta')) {
+            if (function_exists('plugin_row_meta')) {
                 //2.8+
-                add_filter('plugin_row_meta',array($this,'setmeta'),10,2);
-            } elseif(function_exists('post_class')) {
+                add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2);
+            } elseif (function_exists('post_class')) {
                 //2.7
                 $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
-                add_filter('plugin_action_links_'.$plugin,array($this,'setmeta'));
+                add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta'));
             }
 
             //Clean cache?
-            if(get_option('autoptimize_cache_clean')) {
+            if (get_option('autoptimize_cache_clean')) {
                 autoptimizeCache::clearall();
-                update_option('autoptimize_cache_clean',0);
+                update_option('autoptimize_cache_clean', 0);
             }
         }
 
@@ -159,27 +159,27 @@ 
 <div class="wrap">
 
 <?php if (version_compare(PHP_VERSION, '5.3.0') < 0) { ?>
-<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>. Support for PHP 5.5 and below will be removed in one of the next AO released, please ask your hoster to provide you with an upgrade path to 7.x.','autoptimize'), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"') . '</p>'; ?></div>
+<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>. Support for PHP 5.5 and below will be removed in one of the next AO released, please ask your hoster to provide you with an upgrade path to 7.x.', 'autoptimize'), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"').'</p>'; ?></div>
 <?php } ?>
 
 <div id="autoptimize_main">
 <div id="ao_title_and_button">
-    <h1 id="ao_title"><?php _e('Autoptimize Settings','autoptimize'); ?>
+    <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?>
     <span id="ao_adv_button">
     <?php 
-    if (get_option('autoptimize_show_adv','0')=='1') {
+    if (get_option('autoptimize_show_adv', '0') == '1') {
         ?>
-        <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
-        <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
+        <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a>
+        <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a>
         <style>tr.ao_adv{display:table-row;} li.ao_adv{display:list-item;}</style>
         <?php
-        $hiddenClass="";
+        $hiddenClass = "";
     } else {
         ?>
-        <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
-        <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
+        <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a>
+        <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a>
         <?php
-        $hiddenClass="hidden ";
+        $hiddenClass = "hidden ";
     }
     ?>
     </span>
@@ -194,163 +194,163 @@ 
 <ul>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('HTML Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Optimize HTML Code?','autoptimize'); ?></th>
-<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html')?'checked="checked" ':''; ?>/></td>
+<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
-<tr class="<?php echo $hiddenClass;?>html_sub ao_adv" valign="top">
-<th scope="row"><?php _e('Keep HTML comments?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments')?'checked="checked" ':''; ?>/>
-<?php _e('Enable this if you want HTML comments to remain in the page.','autoptimize'); ?></label></td>
+<tr class="<?php echo $hiddenClass; ?>html_sub ao_adv" valign="top">
+<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('JavaScript Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2>
 <table class="form-table"> 
 <tr valign="top">
-<th scope="row"><?php _e('Optimize JavaScript Code?','autoptimize'); ?></th>
-<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js')?'checked="checked" ':''; ?>/></td>
+<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead')?'checked="checked" ':''; ?>/>
-<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize'); ?></label></td>
 </tr>
 <?php if (get_option('autoptimize_js_justhead')) { ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Look for scripts only in &lt;head&gt;?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead')?'checked="checked" ':''; ?>/>
-<?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>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Look for scripts only in &lt;head&gt;?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?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>
 </tr>
 <?php } ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Also aggregate inline JS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline')?'checked="checked" ':''; ?>/>
-<?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>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/>
+<?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>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Exclude scripts from Autoptimize:','autoptimize'); ?></th>
-<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 />
-<?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>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th>
+<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 />
+<?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>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e('Add try-catch wrapping?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch')?'checked="checked" ':''; ?>/>
-<?php _e('If your scripts break because of a JS-error, you might want to try this.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('CSS Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2>
 <table class="form-table"> 
 <tr valign="top">
-<th scope="row"><?php _e('Optimize CSS Code?','autoptimize'); ?></th>
-<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css')?'checked="checked" ':''; ?>/></td>
+<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
-<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top">
-<th scope="row"><?php _e('Generate data: URIs for images?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris')?'checked="checked" ':''; ?>/>
-<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.','autoptimize'); ?></label></td>
+<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top">
+<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td>
 </tr>
-<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top">
-<th scope="row"><?php _e('Remove Google Fonts?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont')?'checked="checked" ':''; ?>/>
-<?php _e('Check this if you don\'t need or want Google Fonts being loaded.','autoptimize'); ?></label></td>
+<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top">
+<th scope="row"><?php _e('Remove Google Fonts?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_nogooglefont" <?php echo get_option('autoptimize_css_nogooglefont') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Check this if you don\'t need or want Google Fonts being loaded.', 'autoptimize'); ?></label></td>
 </tr>
 <?php if (get_option('autoptimize_css_justhead')) { ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
-<th scope="row"><?php _e('Look for styles only in &lt;head&gt;?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead')?'checked="checked" ':''; ?>/>
-<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
+<th scope="row"><?php _e('Look for styles only in &lt;head&gt;?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td>
 </tr>
 <?php } ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
-<th scope="row"><?php _e('Also aggregate inline CSS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline','1')?'checked="checked" ':''; ?>/>
-<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
+<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
-<th scope="row"><?php _e('Inline and Defer CSS?','autoptimize'); ?></th>
-<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" ':''; ?>/>
-<?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>
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
+<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th>
+<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" ' : ''; ?>/>
+<?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>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv" id="autoptimize_css_defer_inline">
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv" id="autoptimize_css_defer_inline">
 <th scope="row"></th>
-<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>
+<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>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub">
-<th scope="row"><?php _e('Inline all CSS?','autoptimize'); ?></th>
-<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" ':''; ?>/>
-<?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>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub">
+<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th>
+<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" ' : ''; ?>/>
+<?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>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub">
-<th scope="row"><?php _e('Exclude CSS from Autoptimize:','autoptimize'); ?></th>
-<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 />
-<?php _e('A comma-separated list of CSS you want to exclude from being optimized.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub">
+<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th>
+<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 />
+<?php _e('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('CDN Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2>
 <table class="form-table"> 
 <tr valign="top">
-<th scope="row"><?php _e('CDN Base URL','autoptimize'); ?></th>
-<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 />
-<?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>
+<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th>
+<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 />
+<?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>
 </tr>
 </table>
 </li>
 
-<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
-<h2 class="itemTitle"><?php _e('Cache Info','autoptimize'); ?></h2>
+<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv">
+<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2>
 <table class="form-table" > 
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Cache folder','autoptimize'); ?></th>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th>
 <td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Can we write?','autoptimize'); ?></th>
-<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes','autoptimize') : __('No','autoptimize')); ?></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th>
+<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Cached styles and scripts','autoptimize'); ?></th>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th>
 <td><?php
-    $AOstatArr=autoptimizeCache::stats(); 
-    $AOcacheSize=round($AOstatArr[1]/1024);
-    printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2]) );
+    $AOstatArr = autoptimizeCache::stats(); 
+    $AOcacheSize = round($AOstatArr[1]/1024);
+    printf(__('%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date("H:i e", $AOstatArr[2]));
 ?></td>
 </tr>
 </table>
 </li>
 
-<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
-<h2 class="itemTitle"><?php _e('Misc Options','autoptimize'); ?></h2>
+<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv">
+<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2>
 <table class="form-table"> 
-	<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-		<th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th>
-		<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/>
-			<?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>
+	<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+		<th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th>
+		<td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/>
+			<?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>
 		</td>
 	</tr>
-	<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-		<th scope="row"><?php _e('Also optimize for logged in users?','autoptimize'); ?></th>
-		<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged','1')?'checked="checked" ':''; ?>/>
-			<?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>
+	<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+		<th scope="row"><?php _e('Also optimize for logged in users?', 'autoptimize'); ?></th>
+		<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/>
+			<?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>
 		</td>
 	</tr>
 	<?php
-		if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
+		if (function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout")) {
 			?>
-				<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-					<th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th>
-					<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/>
-						<?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.','autoptimize'); ?></label>
+				<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+					<th scope="row"><?php _e('Also optimize shop cart/ checkout?', 'autoptimize'); ?></th>
+					<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout', '1') ? 'checked="checked" ' : ''; ?>/>
+						<?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize'); ?></label>
 					</td>
 				</tr>
 			<?php
@@ -361,11 +361,11 @@ 
 
 </ul>
 
-<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv','0'); ?>">
+<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv', '0'); ?>">
 
 <p class="submit">
-<input type="submit" class="button-secondary" value="<?php _e('Save Changes','autoptimize') ?>" />
-<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache','autoptimize') ?>" />
+<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize') ?>" />
+<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize') ?>" />
 </p>
 
 </form>
@@ -374,31 +374,31 @@ 
     <div class="autoptimize_banner hidden">
         <ul>
         <?php
-        if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
-            $AO_banner=get_transient("autoptimize_banner");
+        if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
+            $AO_banner = get_transient("autoptimize_banner");
             if (empty($AO_banner)) {
                 $banner_resp = wp_remote_get("http://misc.optimizingmatters.com/autoptimize_news.html");
                 if (!is_wp_error($banner_resp)) {
-                    if (wp_remote_retrieve_response_code($banner_resp)=="200") {
+                    if (wp_remote_retrieve_response_code($banner_resp) == "200") {
                         $AO_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp));
-                        set_transient("autoptimize_banner",$AO_banner,DAY_IN_SECONDS);
+                        set_transient("autoptimize_banner", $AO_banner, DAY_IN_SECONDS);
                     }
                 }
             }
             echo $AO_banner;
         }
         ?>
-        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.","autoptimize"); ?></li>
-        <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>
+        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", "autoptimize"); ?></li>
+        <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>
         </ul>
     </div>
     <div style="margin-left:10px;margin-top:-5px;">
         <h2>
-            <?php _e("futtta about","autoptimize") ?>
+            <?php _e("futtta about", "autoptimize") ?>
             <select id="feed_dropdown" >
-                <option value="1"><?php _e("Autoptimize","autoptimize") ?></option>
-                <option value="2"><?php _e("WordPress","autoptimize") ?></option>
-                <option value="3"><?php _e("Web Technology","autoptimize") ?></option>
+                <option value="1"><?php _e("Autoptimize", "autoptimize") ?></option>
+                <option value="2"><?php _e("WordPress", "autoptimize") ?></option>
+                <option value="3"><?php _e("Web Technology", "autoptimize") ?></option>
             </select>
         </h2>
         <div id="futtta_feed">
@@ -413,7 +413,7 @@ 
             </div>
         </div>
     </div>
-    <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>
+    <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>
 </div>
 
 <script type="text/javascript">
@@ -552,14 +552,14 @@ 
     }
 
     public function addmenu() {
-        $hook=add_options_page(__('Autoptimize Options','autoptimize'),'Autoptimize','manage_options','autoptimize',array($this,'show'));
-        add_action( 'admin_print_scripts-'.$hook,array($this,'autoptimize_admin_scripts'));
-        add_action( 'admin_print_styles-'.$hook,array($this,'autoptimize_admin_styles'));
+        $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show'));
+        add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts'));
+        add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles'));
     }
 
     public function autoptimize_admin_scripts() {
-        wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'),null,true);
-        wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'),null,true);
+        wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true);
+        wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true);
     }
 
     public function autoptimize_admin_styles() {
@@ -568,48 +568,48 @@ 
     }
 
     public function registersettings() {
-        register_setting('autoptimize','autoptimize_html');
-        register_setting('autoptimize','autoptimize_html_keepcomments');
-        register_setting('autoptimize','autoptimize_js');
-        register_setting('autoptimize','autoptimize_js_exclude');
-        register_setting('autoptimize','autoptimize_js_trycatch');
-        register_setting('autoptimize','autoptimize_js_justhead');
-        register_setting('autoptimize','autoptimize_js_forcehead');
-        register_setting('autoptimize','autoptimize_js_include_inline');
-        register_setting('autoptimize','autoptimize_css');
-        register_setting('autoptimize','autoptimize_css_exclude');
-        register_setting('autoptimize','autoptimize_css_justhead');
-        register_setting('autoptimize','autoptimize_css_datauris');
-        register_setting('autoptimize','autoptimize_css_defer');
-        register_setting('autoptimize','autoptimize_css_defer_inline');
-        register_setting('autoptimize','autoptimize_css_inline');
-        register_setting('autoptimize','autoptimize_css_include_inline');
-        register_setting('autoptimize','autoptimize_css_nogooglefont');
-        register_setting('autoptimize','autoptimize_cdn_url');
-        register_setting('autoptimize','autoptimize_cache_clean');
-        register_setting('autoptimize','autoptimize_cache_nogzip');
-        register_setting('autoptimize','autoptimize_show_adv');
-        register_setting('autoptimize','autoptimize_optimize_logged');
-        register_setting('autoptimize','autoptimize_optimize_checkout');
+        register_setting('autoptimize', 'autoptimize_html');
+        register_setting('autoptimize', 'autoptimize_html_keepcomments');
+        register_setting('autoptimize', 'autoptimize_js');
+        register_setting('autoptimize', 'autoptimize_js_exclude');
+        register_setting('autoptimize', 'autoptimize_js_trycatch');
+        register_setting('autoptimize', 'autoptimize_js_justhead');
+        register_setting('autoptimize', 'autoptimize_js_forcehead');
+        register_setting('autoptimize', 'autoptimize_js_include_inline');
+        register_setting('autoptimize', 'autoptimize_css');
+        register_setting('autoptimize', 'autoptimize_css_exclude');
+        register_setting('autoptimize', 'autoptimize_css_justhead');
+        register_setting('autoptimize', 'autoptimize_css_datauris');
+        register_setting('autoptimize', 'autoptimize_css_defer');
+        register_setting('autoptimize', 'autoptimize_css_defer_inline');
+        register_setting('autoptimize', 'autoptimize_css_inline');
+        register_setting('autoptimize', 'autoptimize_css_include_inline');
+        register_setting('autoptimize', 'autoptimize_css_nogooglefont');
+        register_setting('autoptimize', 'autoptimize_cdn_url');
+        register_setting('autoptimize', 'autoptimize_cache_clean');
+        register_setting('autoptimize', 'autoptimize_cache_nogzip');
+        register_setting('autoptimize', 'autoptimize_show_adv');
+        register_setting('autoptimize', 'autoptimize_optimize_logged');
+        register_setting('autoptimize', 'autoptimize_optimize_checkout');
     }
 
-    public function setmeta($links,$file=null) {
+    public function setmeta($links, $file = null) {
         //Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/
         //Do it only once - saves time
         static $plugin;
-        if(empty($plugin))
+        if (empty($plugin))
             $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
         
-        if($file===null) {
+        if ($file === null) {
             //2.7
             $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'));
-            array_unshift($links,$settings_link);
+            array_unshift($links, $settings_link);
         } else {
             //2.8
             //If it's us, add the link
-            if($file === $plugin) {
-                $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>',__('Settings')));
-                $links = array_merge($links,$newlink);
+            if ($file === $plugin) {
+                $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')));
+                $links = array_merge($links, $newlink);
             }
         }
 
@@ -617,7 +617,7 @@ 
     }
 
     public function get($key) {        
-        if(!is_array($this->config)) {
+        if (!is_array($this->config)) {
             //Default config
             $config = array('autoptimize_html' => 0,
                 'autoptimize_html_keepcomments' => 0,
@@ -644,43 +644,43 @@ 
                 );
 
             //Override with user settings
-            foreach(array_keys($config) as $name) {
+            foreach (array_keys($config) as $name) {
                 $conf = get_option($name);
-                if($conf!==false) {
+                if ($conf !== false) {
                     //It was set before!
                     $config[$name] = $conf;
                 }
             }
 
             //Save for next question
-            $this->config = apply_filters( 'autoptimize_filter_get_config', $config );
+            $this->config = apply_filters('autoptimize_filter_get_config', $config);
         }
 
-        if(isset($this->config[$key]))
+        if (isset($this->config[$key]))
             return $this->config[$key];
 
         return false;
     }
 
     private function getFutttaFeeds($url) {
-        if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
-            $rss = fetch_feed( $url );
+        if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
+            $rss = fetch_feed($url);
             $maxitems = 0;
 
-            if ( ! is_wp_error( $rss ) ) {
-                $maxitems = $rss->get_item_quantity( 7 ); 
-                $rss_items = $rss->get_items( 0, $maxitems );
+            if (!is_wp_error($rss)) {
+                $maxitems = $rss->get_item_quantity(7); 
+                $rss_items = $rss->get_items(0, $maxitems);
             }
             ?>
             <ul>
-                <?php if ( $maxitems == 0 ) : ?>
-                    <li><?php _e( 'No items', 'autoptimize' ); ?></li>
+                <?php if ($maxitems == 0) : ?>
+                    <li><?php _e('No items', 'autoptimize'); ?></li>
                 <?php else : ?>
-                    <?php foreach ( $rss_items as $item ) : ?>
+                    <?php foreach ($rss_items as $item) : ?>
                         <li>
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
-                                title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>">
-                                <?php echo esc_html( $item->get_title() ); ?>
+                            <a href="<?php echo esc_url($item->get_permalink()); ?>"
+                                title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>">
+                                <?php echo esc_html($item->get_title()); ?>
                             </a>
                         </li>
                     <?php endforeach; ?>
@@ -691,20 +691,20 @@ 
     }
 
     // based on http://wordpress.stackexchange.com/a/58826
-    static function ao_admin_tabs(){
-        $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs',array('autoptimize' => __('Main','autoptimize')));
-        $tabContent="";
-        if (count($tabs)>1) {
-            if(isset($_GET['page'])){
+    static function ao_admin_tabs() {
+        $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('Main', 'autoptimize')));
+        $tabContent = "";
+        if (count($tabs) > 1) {
+            if (isset($_GET['page'])) {
                 $currentId = $_GET['page'];
             } else {
                 $currentId = "autoptimize";
             }
             $tabContent .= "<h2 class=\"nav-tab-wrapper\">";
-            foreach($tabs as $tabId => $tabName){
-                if($currentId == $tabId){
+            foreach ($tabs as $tabId => $tabName) {
+                if ($currentId == $tabId) {
                     $class = " nav-tab-active";
-                } else{
+                } else {
                     $class = "";
                 }
                 $tabContent .= '<a class="nav-tab'.$class.'" href="?page='.$tabId.'">'.$tabName.'</a>';

Braces +15 added lines, -7 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 class autoptimizeConfig {
     private $config = null;
@@ -597,8 +600,9 @@ 
         //Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/
         //Do it only once - saves time
         static $plugin;
-        if(empty($plugin))
-            $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
+        if(empty($plugin)) {
+                    $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
+        }
         
         if($file===null) {
             //2.7
@@ -656,8 +660,9 @@ 
             $this->config = apply_filters( 'autoptimize_filter_get_config', $config );
         }
 
-        if(isset($this->config[$key]))
-            return $this->config[$key];
+        if(isset($this->config[$key])) {
+                    return $this->config[$key];
+        }
 
         return false;
     }
@@ -675,10 +680,13 @@ 
             <ul>
                 <?php if ( $maxitems == 0 ) : ?>
                     <li><?php _e( 'No items', 'autoptimize' ); ?></li>
-                <?php else : ?>
+                <?php else {
+    : ?>
                     <?php foreach ( $rss_items as $item ) : ?>
                         <li>
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
+                            <a href="<?php echo esc_url( $item->get_permalink() );
+}
+?>"
                                 title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>">
                                 <?php echo esc_html( $item->get_title() ); ?>
                             </a>

classes/external/php/minify-css-compressor.php

Doc Comments +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
      * 
      * @param array $options (currently ignored)
      * 
-     * @return null
+     * @return string
      */
     private function __construct($options) {
         $this->_options = $options;

Spacing +1 added lines, -1 removed lines

@@ -245,6 +245,6 @@
                 )
                 \\s*
             /x', '$1', $m[1]);
-        return 'font-family:' . $m[1] . $m[2];
+        return 'font-family:'.$m[1].$m[2];
     }
 }

config/default.php

Braces +13 added lines, -8 removed lines

@@ -1,10 +1,12 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+}
+if(!isset($_SERVER['HTTP_USER_AGENT'])) {
 	$_SERVER['HTTP_USER_AGENT'] = '';
+}
 	
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -19,16 +21,19 @@ 
 {
 	$version = floatval($matches[1]);
 	
-	if ($version < 6)
-		$encoding = 'none';
+	if ($version < 6) {
+			$encoding = 'none';
+	}
 		
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
-		$encoding = 'none';
-}
+	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) {
+			$encoding = 'none';
+	}
+	}
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) {
 	$encoding = 'none';
+}
 
 //Get data
 $contents = file_get_contents(__FILE__.'.'.$encoding);

Indentation +26 added lines, -26 removed lines

@@ -2,9 +2,9 @@ 
 
 //Check everything exists before using it
 if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
+    $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
 if(!isset($_SERVER['HTTP_USER_AGENT']))
-	$_SERVER['HTTP_USER_AGENT'] = '';
+    $_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -15,20 +15,20 @@ 
 
 // Check for buggy versions of Internet Explorer
 if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') && 
-	preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
+    preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
 {
-	$version = floatval($matches[1]);
+    $version = floatval($matches[1]);
 	
-	if ($version < 6)
-		$encoding = 'none';
+    if ($version < 6)
+        $encoding = 'none';
 		
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
-		$encoding = 'none';
+    if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
+        $encoding = 'none';
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
 if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
-	$encoding = 'none';
+    $encoding = 'none';
 
 //Get data
 $contents = file_get_contents(__FILE__.'.'.$encoding);
@@ -41,24 +41,24 @@ 
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
 if (($modTimeMatch)||($eTagMatch)) {
-	header('HTTP/1.1 304 Not Modified');
-	header('Connection: close');
+    header('HTTP/1.1 304 Not Modified');
+    header('Connection: close');
 } else {
-	// send all sorts of headers
-	$expireTime=60*60*24*356; // 1y max according to RFC
+    // send all sorts of headers
+    $expireTime=60*60*24*356; // 1y max according to RFC
 
-	if(isset($encoding) && $encoding != 'none') 
-	{
-		header('Content-Encoding: '.$encoding);
-	}
-	header('Vary: Accept-Encoding');
-	header('Content-Length: '.strlen($contents));
-	header('Content-type: %%CONTENT%%; charset=utf-8');
-	header('Cache-Control: max-age='.$expireTime.', public, immutable');
-	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years
-	header('ETag: ' . $eTag);
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
+    if(isset($encoding) && $encoding != 'none') 
+    {
+        header('Content-Encoding: '.$encoding);
+    }
+    header('Vary: Accept-Encoding');
+    header('Content-Length: '.strlen($contents));
+    header('Content-type: %%CONTENT%%; charset=utf-8');
+    header('Cache-Control: max-age='.$expireTime.', public, immutable');
+    header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years
+    header('ETag: ' . $eTag);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 	
-	// send output
-	echo $contents;
+    // send output
+    echo $contents;
 }

Spacing +10 added lines, -10 removed lines

@@ -1,9 +1,9 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+if (!isset($_SERVER['HTTP_USER_AGENT']))
 	$_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
@@ -27,28 +27,28 @@ 
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
 	$encoding = 'none';
 
 //Get data
 $contents = file_get_contents(__FILE__.'.'.$encoding);
 
 // first check if we have to send 304
-$eTag=md5($contents);
-$modTime=filemtime(__FILE__.'.none');
+$eTag = md5($contents);
+$modTime = filemtime(__FILE__.'.none');
 
 date_default_timezone_set("UTC");
-$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag));
+$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag));
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
-if (($modTimeMatch)||($eTagMatch)) {
+if (($modTimeMatch) || ($eTagMatch)) {
 	header('HTTP/1.1 304 Not Modified');
 	header('Connection: close');
 } else {
 	// send all sorts of headers
-	$expireTime=60*60*24*356; // 1y max according to RFC
+	$expireTime = 60*60*24*356; // 1y max according to RFC
 
-	if(isset($encoding) && $encoding != 'none') 
+	if (isset($encoding) && $encoding != 'none') 
 	{
 		header('Content-Encoding: '.$encoding);
 	}
@@ -57,7 +57,7 @@ 
 	header('Content-type: %%CONTENT%%; charset=utf-8');
 	header('Cache-Control: max-age='.$expireTime.', public, immutable');
 	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years
-	header('ETag: ' . $eTag);
+	header('ETag: '.$eTag);
 	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 	
 	// send output

config/delayed.php

Braces +14 added lines, -9 removed lines

@@ -1,10 +1,12 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+}
+if(!isset($_SERVER['HTTP_USER_AGENT'])) {
 	$_SERVER['HTTP_USER_AGENT'] = '';
+}
 	
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -19,16 +21,19 @@ 
 {
 	$version = floatval($matches[1]);
 	
-	if ($version < 6)
-		$encoding = 'none';
+	if ($version < 6) {
+			$encoding = 'none';
+	}
 		
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
-		$encoding = 'none';
-}
+	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) {
+			$encoding = 'none';
+	}
+	}
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) {
 	$encoding = 'none';
+}
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
 if($encoding != 'none' && $iscompressed == false)
@@ -36,7 +41,7 @@ 
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
 	$contents = gzencode($code,9,$flag);
-}else{
+} else{
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }

Indentation +41 added lines, -41 removed lines

@@ -2,9 +2,9 @@ 
 
 //Check everything exists before using it
 if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
+    $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
 if(!isset($_SERVER['HTTP_USER_AGENT']))
-	$_SERVER['HTTP_USER_AGENT'] = '';
+    $_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -15,30 +15,30 @@ 
 
 // Check for buggy versions of Internet Explorer
 if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') && 
-	preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
+    preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
 {
-	$version = floatval($matches[1]);
+    $version = floatval($matches[1]);
 	
-	if ($version < 6)
-		$encoding = 'none';
+    if ($version < 6)
+        $encoding = 'none';
 		
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
-		$encoding = 'none';
+    if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) 
+        $encoding = 'none';
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
 if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
-	$encoding = 'none';
+    $encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
 if($encoding != 'none' && $iscompressed == false)
 {
-	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
-	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
+    $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
+    $code = file_get_contents(__FILE__.'.none');
+    $contents = gzencode($code,9,$flag);
 }else{
-	//Get data
-	$contents = file_get_contents(__FILE__.'.'.$encoding);
+    //Get data
+    $contents = file_get_contents(__FILE__.'.'.$encoding);
 }
 
 // first check if we have to send 304
@@ -51,35 +51,35 @@ 
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
 if (($modTimeMatch)||($eTagMatch)) {
-	header('HTTP/1.1 304 Not Modified');
-	header('Connection: close');
+    header('HTTP/1.1 304 Not Modified');
+    header('Connection: close');
 } else {
-	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
-	if ($encoding != 'none') {
-		header('Content-Encoding: '.$encoding);
-	}
-	header('Vary: Accept-Encoding');
-	header('Content-Length: '.strlen($contents));
-	header('Content-type: %%CONTENT%%; charset=utf-8');
-	header('Cache-Control: max-age='.$expireTime.', public, immutable');
-	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
+    // send all sorts of headers
+    $expireTime=60*60*24*355; // 1y max according to RFC
+    if ($encoding != 'none') {
+        header('Content-Encoding: '.$encoding);
+    }
+    header('Vary: Accept-Encoding');
+    header('Content-Length: '.strlen($contents));
+    header('Content-type: %%CONTENT%%; charset=utf-8');
+    header('Cache-Control: max-age='.$expireTime.', public, immutable');
+    header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
+    header('ETag: ' . $eTag);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
-	// send output
-	echo $contents;
+    // send output
+    echo $contents;
 
-	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
-	{
-		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+    //And write to filesystem cache if not done yet
+    if($encoding != 'none' && $iscompressed == false)
+    {
+        //Write the content we sent
+        file_put_contents(__FILE__.'.'.$encoding,$contents);
 		
-		//And write the new content
-		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
-		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
-	}
+        //And write the new content
+        $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
+        $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
+        $contents = gzencode($code,9,$flag);
+        file_put_contents(__FILE__.'.'.$ext,$contents);
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -1,9 +1,9 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+if (!isset($_SERVER['HTTP_USER_AGENT']))
 	$_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
@@ -27,16 +27,16 @@ 
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
 	$encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
-if($encoding != 'none' && $iscompressed == false)
+if ($encoding != 'none' && $iscompressed == false)
 {
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
-}else{
+	$contents = gzencode($code, 9, $flag);
+} else {
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }
@@ -44,19 +44,19 @@ 
 // first check if we have to send 304
 // inspired by http://www.jonasjohn.de/snippets/php/caching.htm
 
-$eTag=md5($contents);
-$modTime=filemtime(__FILE__.'.none');
+$eTag = md5($contents);
+$modTime = filemtime(__FILE__.'.none');
 
 date_default_timezone_set("UTC");
-$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag));
+$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag));
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
-if (($modTimeMatch)||($eTagMatch)) {
+if (($modTimeMatch) || ($eTagMatch)) {
 	header('HTTP/1.1 304 Not Modified');
 	header('Connection: close');
 } else {
 	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
+	$expireTime = 60*60*24*355; // 1y max according to RFC
 	if ($encoding != 'none') {
 		header('Content-Encoding: '.$encoding);
 	}
@@ -65,22 +65,22 @@ 
 	header('Content-type: %%CONTENT%%; charset=utf-8');
 	header('Cache-Control: max-age='.$expireTime.', public, immutable');
 	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
+	header('ETag: '.$eTag);
 	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
 	// send output
 	echo $contents;
 
 	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
+	if ($encoding != 'none' && $iscompressed == false)
 	{
 		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+		file_put_contents(__FILE__.'.'.$encoding, $contents);
 		
 		//And write the new content
 		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
 		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
+		$contents = gzencode($code, 9, $flag);
+		file_put_contents(__FILE__.'.'.$ext, $contents);
 	}
 }

classlesses/autoptimizeCacheChecker.php

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 /* 
  * cachechecker code
@@ -13,39 +13,39 @@ 
  */
 
 if (is_admin()) {
-    add_action('plugins_loaded','ao_cachechecker_setup');
+    add_action('plugins_loaded', 'ao_cachechecker_setup');
 }
 
 function ao_cachechecker_setup() {
-    $doCacheCheck = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true);
-    $cacheCheckSchedule = wp_get_schedule( 'ao_cachechecker' );
-    $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency','daily');
-    if (!in_array($AOCCfreq,array('hourly','daily','monthly'))) {
-        $AOCCfreq='daily';
+    $doCacheCheck = (bool) apply_filters('autoptimize_filter_cachecheck_do', true);
+    $cacheCheckSchedule = wp_get_schedule('ao_cachechecker');
+    $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency', 'daily');
+    if (!in_array($AOCCfreq, array('hourly', 'daily', 'monthly'))) {
+        $AOCCfreq = 'daily';
     }
-    if ( $doCacheCheck && ( !$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq ) ) {
+    if ($doCacheCheck && (!$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq)) {
         wp_schedule_event(time(), $AOCCfreq, 'ao_cachechecker');
-    } else if ( $cacheCheckSchedule && !$doCacheCheck ) {
-        wp_clear_scheduled_hook( 'ao_cachechecker' );
+    } else if ($cacheCheckSchedule && !$doCacheCheck) {
+        wp_clear_scheduled_hook('ao_cachechecker');
     }
 }
 
 add_action('ao_cachechecker', 'ao_cachechecker_cronjob');
 function ao_cachechecker_cronjob() {
-    $maxSize = (int) apply_filters( "autoptimize_filter_cachecheck_maxsize", 512000);
-    $doCacheCheck = (bool) apply_filters( "autoptimize_filter_cachecheck_do", true);
-    $statArr=autoptimizeCache::stats(); 
-    $cacheSize=round($statArr[1]/1024);
-    if (($cacheSize>$maxSize) && ($doCacheCheck)) {
-        update_option("autoptimize_cachesize_notice",true);
-        if (apply_filters('autoptimize_filter_cachecheck_sendmail',true)) {
-            $saniSiteUrl=esc_url(site_url());
-            $ao_mailto=apply_filters('autoptimize_filter_cachecheck_mailto',get_option('admin_email',''));
-            $ao_mailsubject=__('Autoptimize cache size warning','autoptimize')." (".$saniSiteUrl.")";
-            $ao_mailbody=__('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")";
+    $maxSize = (int) apply_filters("autoptimize_filter_cachecheck_maxsize", 512000);
+    $doCacheCheck = (bool) apply_filters("autoptimize_filter_cachecheck_do", true);
+    $statArr = autoptimizeCache::stats(); 
+    $cacheSize = round($statArr[1]/1024);
+    if (($cacheSize > $maxSize) && ($doCacheCheck)) {
+        update_option("autoptimize_cachesize_notice", true);
+        if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) {
+            $saniSiteUrl = esc_url(site_url());
+            $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', get_option('admin_email', ''));
+            $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize')." (".$saniSiteUrl.")";
+            $ao_mailbody = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")";
 
             if (!empty($ao_mailto)) {
-                $ao_mailresult=wp_mail($ao_mailto,$ao_mailsubject,$ao_mailbody);
+                $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody);
                 if (!$ao_mailresult) {
                     error_log("Autoptimize could not send cache size warning mail.");
                 }
@@ -56,10 +56,10 @@ 
 
 add_action('admin_notices', 'autoptimize_cachechecker_notice');
 function autoptimize_cachechecker_notice() {
-    if ((bool) get_option("autoptimize_cachesize_notice",false)) {
+    if ((bool) get_option("autoptimize_cachesize_notice", false)) {
         echo '<div class="notice notice-warning"><p>';
-        _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' );
+        _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize');
         echo '</p></div>';
-        update_option("autoptimize_cachesize_notice",false);
+        update_option("autoptimize_cachesize_notice", false);
     }
 }

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 /* 
  * cachechecker code

classes/autoptimizeHTML.php

Braces +7 added lines, -3 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 class autoptimizeHTML extends autoptimizeBase {
     private $keepcomments = false;
@@ -26,8 +29,9 @@ 
     //Joins and optimizes CSS
     public function minify() {
         $noptimizeHTML = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content );
-        if ($noptimizeHTML)
-            return false;
+        if ($noptimizeHTML) {
+                    return false;
+        }
         
         if(class_exists('Minify_HTML')) {
             // wrap the to-be-excluded strings in noptimize tags

Spacing +19 added lines, -19 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeHTML extends autoptimizeBase {
     private $keepcomments = false;
@@ -10,13 +10,13 @@ 
         $this->keepcomments = (bool) $options['keepcomments'];
         
         // filter to force xhtml
-        $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false );
+        $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false);
         
         // filter to add strings to be excluded from HTML minification
-        $excludeHTML = apply_filters( 'autoptimize_filter_html_exclude','' );
-        if ($excludeHTML!=="") {
-            $exclHTMLArr = array_filter(array_map('trim',explode(",",$excludeHTML)));
-            $this->exclude = array_merge($exclHTMLArr,$this->exclude);
+        $excludeHTML = apply_filters('autoptimize_filter_html_exclude', '');
+        if ($excludeHTML !== "") {
+            $exclHTMLArr = array_filter(array_map('trim', explode(",", $excludeHTML)));
+            $this->exclude = array_merge($exclHTMLArr, $this->exclude);
         }
         
         // Nothing else for HTML
@@ -25,16 +25,16 @@ 
     
     //Joins and optimizes CSS
     public function minify() {
-        $noptimizeHTML = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content );
+        $noptimizeHTML = apply_filters('autoptimize_filter_html_noptimize', false, $this->content);
         if ($noptimizeHTML)
             return false;
         
-        if(class_exists('Minify_HTML')) {
+        if (class_exists('Minify_HTML')) {
             // wrap the to-be-excluded strings in noptimize tags
             foreach ($this->exclude as $exclString) {
-                if (strpos($this->content,$exclString)!==false) {
-                    $replString="<!--noptimize-->".$exclString."<!--/noptimize-->";
-                    $this->content=str_replace($exclString,$replString,$this->content);
+                if (strpos($this->content, $exclString) !== false) {
+                    $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->";
+                    $this->content = str_replace($exclString, $replString, $this->content);
                 }
             }
 
@@ -47,8 +47,8 @@ 
                 $options['xhtml'] = true;
             }
 
-            if (@is_callable(array("Minify_HTML","minify"))) {
-                $tmp_content = Minify_HTML::minify($this->content,$options);
+            if (@is_callable(array("Minify_HTML", "minify"))) {
+                $tmp_content = Minify_HTML::minify($this->content, $options);
                 if (!empty($tmp_content)) {
                     $this->content = $tmp_content;
                     unset($tmp_content);
@@ -60,16 +60,16 @@ 
             
             // remove the noptimize-wrapper from around the excluded strings
             foreach ($this->exclude as $exclString) {
-                $replString="<!--noptimize-->".$exclString."<!--/noptimize-->";
-                if (strpos($this->content,$replString)!==false) {
-                    $this->content=str_replace($replString,$exclString,$this->content);
+                $replString = "<!--noptimize-->".$exclString."<!--/noptimize-->";
+                if (strpos($this->content, $replString) !== false) {
+                    $this->content = str_replace($replString, $exclString, $this->content);
                 }
             }
 
             // revslider data attribs somehow suffer from HTML optimization, this fixes that
-            if ( class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false) ) {
-                $this->content = preg_replace('#\n(data-.*$)\n#Um',' $1 ', $this->content);
-                $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#','$1 $2', $this->content);
+            if (class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false)) {
+                $this->content = preg_replace('#\n(data-.*$)\n#Um', ' $1 ', $this->content);
+                $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content);
             }
 
             return true;

classes/external/php/minify-2.1.7-jsmin.php

Indentation +12 added lines, -12 removed lines

@@ -273,12 +273,12 @@ 
             return true;

         }

 

-	// we have to check for a preceding keyword, and we don't need to pattern

-	// match over the whole output.

-	$recentOutput = substr($this->output, -10);

+    // we have to check for a preceding keyword, and we don't need to pattern

+    // match over the whole output.

+    $recentOutput = substr($this->output, -10);

 

-	// check if return/typeof directly precede a pattern without a space

-	foreach (array('return', 'typeof') as $keyword) {

+    // check if return/typeof directly precede a pattern without a space

+    foreach (array('return', 'typeof') as $keyword) {

             if ($this->a !== substr($keyword, -1)) {

                 // certainly wasn't keyword

                 continue;

@@ -290,13 +290,13 @@ 
             }

         }

 

-	// check all keywords

-	if ($this->a === ' ' || $this->a === "\n") {

-		if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {

-			if ($m[1] === '' || !$this->isAlphaNum($m[1])) {

-				return true;

-			}

-		}

+    // check all keywords

+    if ($this->a === ' ' || $this->a === "\n") {

+        if (preg_match('~(^|[\\s\\S])(?:case|else|in|return|typeof)$~', $recentOutput, $m)) {

+            if ($m[1] === '' || !$this->isAlphaNum($m[1])) {

+                return true;

+            }

+        }

     }

 

         return false;

Spacing +13 added lines, -13 removed lines

@@ -68,7 +68,7 @@ 
     protected $inputLength = 0;

     protected $lookAhead   = null;

     protected $output      = '';

-    protected $lastByteOut  = '';

+    protected $lastByteOut = '';

     protected $keptComment = '';

 

     /**

@@ -104,7 +104,7 @@ 
         }

 

         $mbIntEnc = null;

-        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {

+        if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {

             $mbIntEnc = mb_internal_encoding();

             mb_internal_encoding('8bit');

         }

@@ -121,7 +121,7 @@ 
                         && ($this->b === $this->lastByteOut)) {

                     // Don't delete this space. If we do, the addition/subtraction

                     // could be parsed as a post-increment

-                } elseif (! $this->isAlphaNum($this->b)) {

+                } elseif (!$this->isAlphaNum($this->b)) {

                     $command = self::ACTION_DELETE_A;

                 }

             } elseif ($this->a === "\n") {

@@ -132,10 +132,10 @@ 
                     // otherwise mb_strpos will give WARNING

                 } elseif ($this->b === null

                           || (false === strpos('{[(+-!~', $this->b)

-                              && ! $this->isAlphaNum($this->b))) {

+                              && !$this->isAlphaNum($this->b))) {

                     $command = self::ACTION_DELETE_A;

                 }

-            } elseif (! $this->isAlphaNum($this->a)) {

+            } elseif (!$this->isAlphaNum($this->a)) {

                 if ($this->b === ' '

                     || ($this->b === "\n"

                         && (false === strpos('}])+-"\'', $this->a)))) {

@@ -191,7 +191,7 @@ 
                 $this->a = $this->b;

                 if ($this->a === "'" || $this->a === '"') { // string literal

                     $str = $this->a; // in case needed for exception

-                    for(;;) {

+                    for (;;) {

                         $this->output .= $this->a;

                         $this->lastByteOut = $this->a;

 

@@ -218,13 +218,13 @@ 
             case self::ACTION_DELETE_A_B: // 3

                 $this->b = $this->next();

                 if ($this->b === '/' && $this->isRegexpLiteral()) {

-                    $this->output .= $this->a . $this->b;

+                    $this->output .= $this->a.$this->b;

                     $pattern = '/'; // keep entire pattern in case we need to report it in the exception

-                    for(;;) {

+                    for (;;) {

                         $this->a = $this->get();

                         $pattern .= $this->a;

                         if ($this->a === '[') {

-                            for(;;) {

+                            for (;;) {

                                 $this->output .= $this->a;

                                 $this->a = $this->get();

                                 $pattern .= $this->a;

@@ -239,7 +239,7 @@ 
                                 if ($this->isEOF($this->a)) {

                                     throw new JSMin_UnterminatedRegExpException(

                                         "JSMin: Unterminated set in RegExp at byte "

-                                            . $this->inputIndex .": {$pattern}");

+                                            . $this->inputIndex.": {$pattern}");

                                 }

                             }

                         }

@@ -283,7 +283,7 @@ 
                 // certainly wasn't keyword

                 continue;

             }

-            if (preg_match("~(^|[\\s\\S])" . substr($keyword, 0, -1) . "$~", $recentOutput, $m)) {

+            if (preg_match("~(^|[\\s\\S])".substr($keyword, 0, -1)."$~", $recentOutput, $m)) {

                 if ($m[1] === '' || !$this->isAlphaNum($m[1])) {

                     return true;

                 }

@@ -392,7 +392,7 @@ 
     {

         $this->get();

         $comment = '';

-        for(;;) {

+        for (;;) {

             $get = $this->get();

             if ($get === '*') {

                 if ($this->peek() === '/') { // end of comment reached

@@ -403,7 +403,7 @@ 
                             // don't prepend a newline if two comments right after one another

                             $this->keptComment = "\n";

                         }

-                        $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n";

+                        $this->keptComment .= "/*!".substr($comment, 1)."*/\n";

                     } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {

                         // IE conditional

                         $this->keptComment .= "/*{$comment}*/";

classes/external/php/minify-2.3.1-jsmin.php

Spacing +13 added lines, -13 removed lines

@@ -68,7 +68,7 @@ 
     protected $inputLength = 0;
     protected $lookAhead   = null;
     protected $output      = '';
-    protected $lastByteOut  = '';
+    protected $lastByteOut = '';
     protected $keptComment = '';
 
     /**
@@ -104,7 +104,7 @@ 
         }
 
         $mbIntEnc = null;
-        if (function_exists('mb_strlen') && ((int)ini_get('mbstring.func_overload') & 2)) {
+        if (function_exists('mb_strlen') && ((int) ini_get('mbstring.func_overload') & 2)) {
             $mbIntEnc = mb_internal_encoding();
             mb_internal_encoding('8bit');
         }
@@ -126,7 +126,7 @@ 
                         && ($this->b === $this->lastByteOut)) {
                     // Don't delete this space. If we do, the addition/subtraction
                     // could be parsed as a post-increment
-                } elseif (! $this->isAlphaNum($this->b)) {
+                } elseif (!$this->isAlphaNum($this->b)) {
                     $command = self::ACTION_DELETE_A;
                 }
             } elseif ($this->a === "\n") {
@@ -137,10 +137,10 @@ 
                     // otherwise mb_strpos will give WARNING
                 } elseif ($this->b === null
                           || (false === strpos('{[(+-!~', $this->b)
-                              && ! $this->isAlphaNum($this->b))) {
+                              && !$this->isAlphaNum($this->b))) {
                     $command = self::ACTION_DELETE_A;
                 }
-            } elseif (! $this->isAlphaNum($this->a)) {
+            } elseif (!$this->isAlphaNum($this->a)) {
                 if ($this->b === ' '
                     || ($this->b === "\n"
                         && (false === strpos('}])+-"\'', $this->a)))) {
@@ -197,7 +197,7 @@ 
                 if ($this->a === "'" || $this->a === '"' || $this->a === '`') { // string/template literal
                     $delimiter = $this->a;
                     $str = $this->a; // in case needed for exception
-                    for(;;) {
+                    for (;;) {
                         $this->output .= $this->a;
                         $this->lastByteOut = $this->a;
                         $this->a = $this->get();
@@ -225,13 +225,13 @@ 
             case self::ACTION_DELETE_A_B: // 3
                 $this->b = $this->next();
                 if ($this->b === '/' && $this->isRegexpLiteral()) {
-                    $this->output .= $this->a . $this->b;
+                    $this->output .= $this->a.$this->b;
                     $pattern = '/'; // keep entire pattern in case we need to report it in the exception
-                    for(;;) {
+                    for (;;) {
                         $this->a = $this->get();
                         $pattern .= $this->a;
                         if ($this->a === '[') {
-                            for(;;) {
+                            for (;;) {
                                 $this->output .= $this->a;
                                 $this->a = $this->get();
                                 $pattern .= $this->a;
@@ -246,7 +246,7 @@ 
                                 if ($this->isEOF($this->a)) {
                                     throw new JSMin_UnterminatedRegExpException(
                                         "JSMin: Unterminated set in RegExp at byte "
-                                            . $this->inputIndex .": {$pattern}");
+                                            . $this->inputIndex.": {$pattern}");
                                 }
                             }
                         }
@@ -291,7 +291,7 @@ 
 
         // if the "/" follows a keyword, it must be a regexp, otherwise it's best to assume division
 
-        $subject = $this->output . trim($this->a);
+        $subject = $this->output.trim($this->a);
         if (!preg_match('/(?:case|else|in|return|typeof)$/', $subject, $m)) {
             // not a keyword
             return false;
@@ -402,7 +402,7 @@ 
     {
         $this->get();
         $comment = '';
-        for(;;) {
+        for (;;) {
             $get = $this->get();
             if ($get === '*') {
                 if ($this->peek() === '/') { // end of comment reached
@@ -413,7 +413,7 @@ 
                             // don't prepend a newline if two comments right after one another
                             $this->keptComment = "\n";
                         }
-                        $this->keptComment .= "/*!" . substr($comment, 1) . "*/\n";
+                        $this->keptComment .= "/*!".substr($comment, 1)."*/\n";
                     } else if (preg_match('/^@(?:cc_on|if|elif|else|end)\\b/', $comment)) {
                         // IE conditional
                         $this->keptComment .= "/*{$comment}*/";