futtta / autoptimize

classlesses/autoptimizeSpeedupper.php

Indentation +55 added lines, -55 removed lines

@@ -4,8 +4,8 @@ 
 */
 
 function ao_js_snippetcache($jsin,$scriptname) {
-	// load speedupper conditionally (true by default?)
-	if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+    // load speedupper conditionally (true by default?)
+    if ( apply_filters('autoptimize_filter_speedupper', true) ) {
         if (strpos($scriptname,"min.js")===false) {
                 $md5hash = "snippet_".md5($jsin);
                 $ccheck = new autoptimizeCache($md5hash,'js');
@@ -30,71 +30,71 @@ 
             // do some housekeeping here to remove comments & linebreaks and stuff
             $scriptsrc=preg_replace("#^\s*\/\/.*$#Um","",$jsin);
             $scriptsrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$scriptsrc);
-			$scriptsrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
+            $scriptsrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
 
-			if ((substr($scriptsrc,-1,1)!==";")&&(substr($scriptsrc,-1,1)!=="}")) {
-				$scriptsrc.=";";
-			}
+            if ((substr($scriptsrc,-1,1)!==";")&&(substr($scriptsrc,-1,1)!=="}")) {
+                $scriptsrc.=";";
+            }
 						
-			if (get_option("autoptimize_js_trycatch")==="on") {
-				$scriptsrc="try{".$scriptsrc."}catch(e){}";
-			}
+            if (get_option("autoptimize_js_trycatch")==="on") {
+                $scriptsrc="try{".$scriptsrc."}catch(e){}";
+            }
         }
         return $scriptsrc;
-	}
+    }
 }
 
 function ao_css_snippetcache($cssin,$filename) {
-	// load speedupper conditionally (true by default?)
-	if ( apply_filters('autoptimize_filter_speedupper', true) ) {
-		$md5hash = "snippet_".md5($cssin);
-		$ccheck = new autoptimizeCache($md5hash,'css');
-		if($ccheck->check()) {
-			$stylesrc = $ccheck->retrieve();
-		} else {
-			if (strpos($filename,"min.css")===false) {
-				if (class_exists('Minify_CSS_Compressor')) {
-					$tmp_code = trim(Minify_CSS_Compressor::process($cssin));
-				} else if(class_exists('CSSmin')) {
-					$cssmin = new CSSmin();
-					if (method_exists($cssmin,"run")) {
-						$tmp_code = trim($cssmin->run($cssin));
-					} elseif (@is_callable(array($cssmin,"minify"))) {
-						$tmp_code = trim(CssMin::minify($cssin));
-					}
-				}
+    // load speedupper conditionally (true by default?)
+    if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+        $md5hash = "snippet_".md5($cssin);
+        $ccheck = new autoptimizeCache($md5hash,'css');
+        if($ccheck->check()) {
+            $stylesrc = $ccheck->retrieve();
+        } else {
+            if (strpos($filename,"min.css")===false) {
+                if (class_exists('Minify_CSS_Compressor')) {
+                    $tmp_code = trim(Minify_CSS_Compressor::process($cssin));
+                } else if(class_exists('CSSmin')) {
+                    $cssmin = new CSSmin();
+                    if (method_exists($cssmin,"run")) {
+                        $tmp_code = trim($cssmin->run($cssin));
+                    } elseif (@is_callable(array($cssmin,"minify"))) {
+                        $tmp_code = trim(CssMin::minify($cssin));
+                    }
+                }
 
-				if (!empty($tmp_code)) {
-					$stylesrc = $tmp_code;
-					unset($tmp_code);
-				} else {
-					$stylesrc = $cssin;
-				}
-			} else {
-				// .min.css -> no heavy-lifting, just some cleanup
-				$stylesrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$cssin);
-				$stylesrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
-				$stylesrc=autoptimizeStyles::fixurls($filename,$stylesrc);
-			}
-			if (!empty($filename)) {
-				// don't cache inline CSS to avoid risk of cache-explosion
-				$ccheck->cache($stylesrc,'text/css');
-			}
-			unset($ccheck);
-		}
-		return $stylesrc;
-	}
+                if (!empty($tmp_code)) {
+                    $stylesrc = $tmp_code;
+                    unset($tmp_code);
+                } else {
+                    $stylesrc = $cssin;
+                }
+            } else {
+                // .min.css -> no heavy-lifting, just some cleanup
+                $stylesrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$cssin);
+                $stylesrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
+                $stylesrc=autoptimizeStyles::fixurls($filename,$stylesrc);
+            }
+            if (!empty($filename)) {
+                // don't cache inline CSS to avoid risk of cache-explosion
+                $ccheck->cache($stylesrc,'text/css');
+            }
+            unset($ccheck);
+        }
+        return $stylesrc;
+    }
 }
 
 // try to warm (snippet) cache when AO cache is cleared
 function ao_speedup_warmcache() {
-	// load speedupper conditionally (true by default?)
-	if ( apply_filters('autoptimize_filter_speedupper', true) ) {
-		error_log("speedupper triggered");
-		$warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1,100000);
-		$warmCache = @wp_remote_get($warmCacheUrl);
-		unset($warmCache);
-	}
+    // load speedupper conditionally (true by default?)
+    if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+        error_log("speedupper triggered");
+        $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1,100000);
+        $warmCache = @wp_remote_get($warmCacheUrl);
+        unset($warmCache);
+    }
 }
 
 add_filter('autoptimize_css_individual_style','ao_css_snippetcache',10,2);

Spacing +33 added lines, -33 removed lines

@@ -3,63 +3,63 @@ 
 Autoptimize SpeedUp; minify & cache each JS/ CSS separately + warm the cache
 */
 
-function ao_js_snippetcache($jsin,$scriptname) {
+function ao_js_snippetcache($jsin, $scriptname) {
 	// load speedupper conditionally (true by default?)
-	if ( apply_filters('autoptimize_filter_speedupper', true) ) {
-        if (strpos($scriptname,"min.js")===false) {
+	if (apply_filters('autoptimize_filter_speedupper', true)) {
+        if (strpos($scriptname, "min.js") === false) {
                 $md5hash = "snippet_".md5($jsin);
-                $ccheck = new autoptimizeCache($md5hash,'js');
-                if($ccheck->check()) {
+                $ccheck = new autoptimizeCache($md5hash, 'js');
+                if ($ccheck->check()) {
                         $scriptsrc = $ccheck->retrieve();
                 } else {
-                        if(class_exists('JSMin')) {
+                        if (class_exists('JSMin')) {
                                 $tmp_jscode = trim(JSMin::minify($jsin));
                                 if (!empty($tmp_jscode)) {
                                         $scriptsrc = $tmp_jscode;
                                         unset($tmp_jscode);
-                                        $ccheck->cache($scriptsrc,'text/javascript');
+                                        $ccheck->cache($scriptsrc, 'text/javascript');
                                 } else {
-                                        $scriptsrc=$jsin;
+                                        $scriptsrc = $jsin;
                                 }
                         } else {
-                                $scriptsrc=$jsin;
+                                $scriptsrc = $jsin;
                         }
                 }
                 unset($ccheck);
         } else {
             // do some housekeeping here to remove comments & linebreaks and stuff
-            $scriptsrc=preg_replace("#^\s*\/\/.*$#Um","",$jsin);
-            $scriptsrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$scriptsrc);
-			$scriptsrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
+            $scriptsrc = preg_replace("#^\s*\/\/.*$#Um", "", $jsin);
+            $scriptsrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $scriptsrc);
+			$scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
 
-			if ((substr($scriptsrc,-1,1)!==";")&&(substr($scriptsrc,-1,1)!=="}")) {
-				$scriptsrc.=";";
+			if ((substr($scriptsrc, -1, 1) !== ";") && (substr($scriptsrc, -1, 1) !== "}")) {
+				$scriptsrc .= ";";
 			}
 						
-			if (get_option("autoptimize_js_trycatch")==="on") {
-				$scriptsrc="try{".$scriptsrc."}catch(e){}";
+			if (get_option("autoptimize_js_trycatch") === "on") {
+				$scriptsrc = "try{".$scriptsrc."}catch(e){}";
 			}
         }
         return $scriptsrc;
 	}
 }
 
-function ao_css_snippetcache($cssin,$filename) {
+function ao_css_snippetcache($cssin, $filename) {
 	// load speedupper conditionally (true by default?)
-	if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+	if (apply_filters('autoptimize_filter_speedupper', true)) {
 		$md5hash = "snippet_".md5($cssin);
-		$ccheck = new autoptimizeCache($md5hash,'css');
-		if($ccheck->check()) {
+		$ccheck = new autoptimizeCache($md5hash, 'css');
+		if ($ccheck->check()) {
 			$stylesrc = $ccheck->retrieve();
 		} else {
-			if (strpos($filename,"min.css")===false) {
+			if (strpos($filename, "min.css") === false) {
 				if (class_exists('Minify_CSS_Compressor')) {
 					$tmp_code = trim(Minify_CSS_Compressor::process($cssin));
-				} else if(class_exists('CSSmin')) {
+				} else if (class_exists('CSSmin')) {
 					$cssmin = new CSSmin();
-					if (method_exists($cssmin,"run")) {
+					if (method_exists($cssmin, "run")) {
 						$tmp_code = trim($cssmin->run($cssin));
-					} elseif (@is_callable(array($cssmin,"minify"))) {
+					} elseif (@is_callable(array($cssmin, "minify"))) {
 						$tmp_code = trim(CssMin::minify($cssin));
 					}
 				}
@@ -72,13 +72,13 @@ 
 				}
 			} else {
 				// .min.css -> no heavy-lifting, just some cleanup
-				$stylesrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$cssin);
-				$stylesrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
-				$stylesrc=autoptimizeStyles::fixurls($filename,$stylesrc);
+				$stylesrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $cssin);
+				$stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
+				$stylesrc = autoptimizeStyles::fixurls($filename, $stylesrc);
 			}
 			if (!empty($filename)) {
 				// don't cache inline CSS to avoid risk of cache-explosion
-				$ccheck->cache($stylesrc,'text/css');
+				$ccheck->cache($stylesrc, 'text/css');
 			}
 			unset($ccheck);
 		}
@@ -89,14 +89,14 @@ 
 // try to warm (snippet) cache when AO cache is cleared
 function ao_speedup_warmcache() {
 	// load speedupper conditionally (true by default?)
-	if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+	if (apply_filters('autoptimize_filter_speedupper', true)) {
 		error_log("speedupper triggered");
-		$warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1,100000);
+		$warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1, 100000);
 		$warmCache = @wp_remote_get($warmCacheUrl);
 		unset($warmCache);
 	}
 }
 
-add_filter('autoptimize_css_individual_style','ao_css_snippetcache',10,2);
-add_filter('autoptimize_js_individual_script','ao_js_snippetcache',10,2);
-add_action('autoptimize_action_cachepurged','ao_speedup_warmcache');
+add_filter('autoptimize_css_individual_style', 'ao_css_snippetcache', 10, 2);
+add_filter('autoptimize_js_individual_script', 'ao_js_snippetcache', 10, 2);
+add_action('autoptimize_action_cachepurged', 'ao_speedup_warmcache');

autoptimize.php

Spacing +69 added lines, -69 removed lines

@@ -12,15 +12,15 @@ 
 http://www.gnu.org/licenses/gpl.txt
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__));
+define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__));
 
 // Load config class
 include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeConfig.php');
 
 // Load toolbar class
-include( AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php' );
+include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php');
 
 // Load partners tab if admin
 if (is_admin()) {
@@ -31,25 +31,25 @@ 
 include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeSpeedupper.php');
 
 // Do we gzip when caching (needed early to load autoptimizeCache.php)
-define('AUTOPTIMIZE_CACHE_NOGZIP',(bool) get_option('autoptimize_cache_nogzip'));
+define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip'));
 
 // Load cache class
 include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCache.php');
 
 // wp-content dir name (automagically set, should not be needed), dirname of AO cache dir and AO-prefix can be overridden in wp-config.php
-if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME','/'.wp_basename( WP_CONTENT_DIR )); }
-if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR','/cache/autoptimize/'); }
+if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); }
+if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); }
 if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); }
 
 // Plugin dir constants (plugin url's defined later to accomodate domain mapped sites)
-if (is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true )) {
+if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
     $blog_id = get_current_blog_id();
-    define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
+    define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
 } else {
     define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR);
 }
-define('AUTOPTIMIZE_CACHE_DELAY',true);
-define('WP_ROOT_DIR',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',WP_CONTENT_DIR));
+define('AUTOPTIMIZE_CACHE_DELAY', true);
+define('WP_ROOT_DIR', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', WP_CONTENT_DIR));
 
 // Initialize the cache at least once
 $conf = autoptimizeConfig::instance();
@@ -57,65 +57,65 @@ 
 /* Check if we're updating, in which case we might need to do stuff and flush the cache
 to avoid old versions of aggregated files lingering around */
 
-$autoptimize_version="2.1.0";
-$autoptimize_db_version=get_option('autoptimize_version','none');
+$autoptimize_version = "2.1.0";
+$autoptimize_db_version = get_option('autoptimize_version', 'none');
 
 if ($autoptimize_db_version !== $autoptimize_version) {
-    if ($autoptimize_db_version==="none") {
+    if ($autoptimize_db_version === "none") {
         add_action('admin_notices', 'autoptimize_install_config_notice');
     } else {
         // updating, include the update-code
         include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeUpdateCode.php');
     }
 
-    update_option('autoptimize_version',$autoptimize_version);
-    $autoptimize_db_version=$autoptimize_version;
+    update_option('autoptimize_version', $autoptimize_version);
+    $autoptimize_db_version = $autoptimize_version;
 }
 
 // Load translations
 function autoptimize_load_plugin_textdomain() {
-    load_plugin_textdomain('autoptimize',false,plugin_basename(dirname( __FILE__ )).'/localization');
+    load_plugin_textdomain('autoptimize', false, plugin_basename(dirname(__FILE__)).'/localization');
 }
-add_action( 'init', 'autoptimize_load_plugin_textdomain' );
+add_action('init', 'autoptimize_load_plugin_textdomain');
 
-function autoptimize_uninstall(){
+function autoptimize_uninstall() {
     autoptimizeCache::clearall();
 
-    $delete_options=array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice","autoptimize_css_include_inline","autoptimize_js_include_inline","autoptimize_css_nogooglefont","autoptimize_optimize_logged");
+    $delete_options = array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice", "autoptimize_css_include_inline", "autoptimize_js_include_inline", "autoptimize_css_nogooglefont", "autoptimize_optimize_logged");
 
-    if ( !is_multisite() ) {
-        foreach ($delete_options as $del_opt) {    delete_option( $del_opt ); }
+    if (!is_multisite()) {
+        foreach ($delete_options as $del_opt) {    delete_option($del_opt); }
     } else {
         global $wpdb;
-        $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+        $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
         $original_blog_id = get_current_blog_id();
-        foreach ( $blog_ids as $blog_id ) {
-            switch_to_blog( $blog_id );
-            foreach ($delete_options as $del_opt) {    delete_option( $del_opt ); }
+        foreach ($blog_ids as $blog_id) {
+            switch_to_blog($blog_id);
+            foreach ($delete_options as $del_opt) {    delete_option($del_opt); }
         }
-        switch_to_blog( $original_blog_id );
+        switch_to_blog($original_blog_id);
     }
 
-    if ( wp_get_schedule( 'ao_cachechecker' ) ) {
-        wp_clear_scheduled_hook( 'ao_cachechecker' );
+    if (wp_get_schedule('ao_cachechecker')) {
+        wp_clear_scheduled_hook('ao_cachechecker');
     }
 }
 
 function autoptimize_install_config_notice() {
     echo '<div class="updated"><p>';
-    _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' );
+    _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize');
     echo '</p></div>';
 }
 
 function autoptimize_update_config_notice() {
     echo '<div class="updated"><p>';
-    _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' );
+    _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize');
     echo '</p></div>';
 }
 
 function autoptimize_cache_unavailable_notice() {
     echo '<div class="error"><p>';
-    printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR );
+    printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR);
     echo '</p></div>';
 }
 
@@ -124,26 +124,26 @@ 
     $ao_noptimize = false;
 
     // noptimize in qs to get non-optimized page for debugging
-    if (array_key_exists("ao_noptimize",$_GET)) {
-        if ( ($_GET["ao_noptimize"]==="1") && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) {
+    if (array_key_exists("ao_noptimize", $_GET)) {
+        if (($_GET["ao_noptimize"] === "1") && (apply_filters('autoptimize_filter_honor_qs_noptimize', true))) {
             $ao_noptimize = true;
         }
     }
 
     // check for DONOTMINIFY constant as used by e.g. WooCommerce POS
-    if (defined('DONOTMINIFY') && (constant('DONOTMINIFY')===true || constant('DONOTMINIFY')==="true")) {
+    if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === "true")) {
         $ao_noptimize = true;
     }
 
 	// if setting says not to optimize logged in user and user is logged in
-	if (get_option('autoptimize_optimize_logged','on') !== 'on' && is_user_logged_in()) {
+	if (get_option('autoptimize_optimize_logged', 'on') !== 'on' && is_user_logged_in()) {
 		$ao_noptimize = true;
 	}
 
     // filter you can use to block autoptimization on your own terms
-    $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );
+    $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize);
 
-    if (!is_feed() && !$ao_noptimize && !is_admin() && ( !function_exists('is_customize_preview') || !is_customize_preview() ) ) {
+    if (!is_feed() && !$ao_noptimize && !is_admin() && (!function_exists('is_customize_preview') || !is_customize_preview())) {
         // Config element
         $conf = autoptimizeConfig::instance();
 
@@ -151,7 +151,7 @@ 
         include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeBase.php');
 
         // Load extra classes and set some vars
-        if($conf->get('autoptimize_html')) {
+        if ($conf->get('autoptimize_html')) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeHTML.php');
             // BUG: new minify-html does not support keeping HTML comments, skipping for now
             // if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
@@ -161,7 +161,7 @@ 
             // }
         }
 
-        if($conf->get('autoptimize_js')) {
+        if ($conf->get('autoptimize_js')) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeScripts.php');
             if (!class_exists('JSMin')) {
                 if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
@@ -170,15 +170,15 @@ 
                     @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/minify-2.3.1-jsmin.php');
                 }
             }
-            if ( ! defined( 'CONCATENATE_SCRIPTS' )) {
-                define('CONCATENATE_SCRIPTS',false);
+            if (!defined('CONCATENATE_SCRIPTS')) {
+                define('CONCATENATE_SCRIPTS', false);
             }
-            if ( ! defined( 'COMPRESS_SCRIPTS' )) {
-                define('COMPRESS_SCRIPTS',false);
+            if (!defined('COMPRESS_SCRIPTS')) {
+                define('COMPRESS_SCRIPTS', false);
             }
         }
 
-        if($conf->get('autoptimize_css')) {
+        if ($conf->get('autoptimize_css')) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeStyles.php');
             if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
                 if (!class_exists('Minify_CSS_Compressor')) {
@@ -189,13 +189,13 @@ 
                     @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-p10/cssmin.php');
                 }
             }
-            if ( ! defined( 'COMPRESS_CSS' )) {
-                define('COMPRESS_CSS',false);
+            if (!defined('COMPRESS_CSS')) {
+                define('COMPRESS_CSS', false);
             }
         }
 
         // filter to be used with care, kills all output buffers when true. use with extreme caution. you have been warned!
-        if (apply_filters('autoptimize_filter_obkiller',false)) {
+        if (apply_filters('autoptimize_filter_obkiller', false)) {
             while (ob_get_level() > 0) {
                 ob_end_clean();
             }
@@ -207,35 +207,35 @@ 
 
 // Action on end, this is where the magic happens
 function autoptimize_end_buffering($content) {
-    if ( ((stripos($content,"<html") === false) && (stripos($content,"<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/',$content) === 1 || stripos($content,"<xsl:stylesheet") !== false ) { return $content; }
+    if (((stripos($content, "<html") === false) && (stripos($content, "<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/', $content) === 1 || stripos($content, "<xsl:stylesheet") !== false) { return $content; }
     
     // load URL constants as late as possible to allow domain mapper to kick in
     if (function_exists("domain_mapping_siteurl")) {
-        define('AUTOPTIMIZE_WP_SITE_URL',domain_mapping_siteurl(get_current_blog_id()));
-        define('AUTOPTIMIZE_WP_CONTENT_URL',str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL),AUTOPTIMIZE_WP_SITE_URL,content_url()));
+        define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id()));
+        define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url()));
     } else {
-        define('AUTOPTIMIZE_WP_SITE_URL',site_url());
-        define('AUTOPTIMIZE_WP_CONTENT_URL',content_url());
+        define('AUTOPTIMIZE_WP_SITE_URL', site_url());
+        define('AUTOPTIMIZE_WP_CONTENT_URL', content_url());
     }
 
-    if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true ) ) {
+    if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
         $blog_id = get_current_blog_id();
-        define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
+        define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
     } else {
-        define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
+        define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
     }
-    define('AUTOPTIMIZE_WP_ROOT_URL',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',AUTOPTIMIZE_WP_CONTENT_URL));
+    define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
 
     // Config element
     $conf = autoptimizeConfig::instance();
 
     // Choose the classes
     $classes = array();
-    if($conf->get('autoptimize_js'))
+    if ($conf->get('autoptimize_js'))
         $classes[] = 'autoptimizeScripts';
-    if($conf->get('autoptimize_css'))
+    if ($conf->get('autoptimize_css'))
         $classes[] = 'autoptimizeStyles';
-    if($conf->get('autoptimize_html'))
+    if ($conf->get('autoptimize_html'))
         $classes[] = 'autoptimizeHTML';
 
     // Set some options
@@ -264,12 +264,12 @@ 
         )
     );
 
-    $content = apply_filters( 'autoptimize_filter_html_before_minify', $content );
+    $content = apply_filters('autoptimize_filter_html_before_minify', $content);
 
     // Run the classes
-    foreach($classes as $name) {
+    foreach ($classes as $name) {
         $instance = new $name($content);
-        if($instance->read($classoptions[$name])) {
+        if ($instance->read($classoptions[$name])) {
             $instance->minify();
             $instance->cache();
             $content = $instance->getcontent();
@@ -277,19 +277,19 @@ 
         unset($instance);
     }
     
-    $content = apply_filters( 'autoptimize_html_after_minify', $content );
+    $content = apply_filters('autoptimize_html_after_minify', $content);
     return $content;
 }
 
-if ( autoptimizeCache::cacheavail() ) {
+if (autoptimizeCache::cacheavail()) {
     $conf = autoptimizeConfig::instance();
-    if( $conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') ) {
+    if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) {
         // Hook to wordpress
         if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
-            add_action('init','autoptimize_start_buffering',-1);
+            add_action('init', 'autoptimize_start_buffering', -1);
         } else {
             if (!defined('AUTOPTIMIZE_HOOK_INTO')) { define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); }
-            add_action(constant("AUTOPTIMIZE_HOOK_INTO"),'autoptimize_start_buffering',2);
+            add_action(constant("AUTOPTIMIZE_HOOK_INTO"), 'autoptimize_start_buffering', 2);
         }
     }
 } else {
@@ -297,9 +297,9 @@ 
 }
 
 function autoptimize_activate() {
-    register_uninstall_hook( __FILE__, 'autoptimize_uninstall' );
+    register_uninstall_hook(__FILE__, 'autoptimize_uninstall');
 }
-register_activation_hook( __FILE__, 'autoptimize_activate' );
+register_activation_hook(__FILE__, 'autoptimize_activate');
 
 include_once('classlesses/autoptimizeCacheChecker.php');