futtta / autoptimize

classes/autoptimizeCLI.php

Indentation +31 added lines, -31 removed lines

@@ -1,41 +1,41 @@
 <?php
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 class autoptimizeCLI extends WP_CLI_Command {
 
-	/**
-	 * Clears the cache.
-	 *
-	 * @subcommand clear
-	 * @synopsis [--type=<css|js>]
-	 */
-	public function clear( $args, $args_assoc ) {
-		$clear = '';
-		if ( ! empty( $args_assoc ) ) {
-			$clear = $args_assoc['type'];
-			if ( ! in_array( $clear, array( 'css', 'js' ), true ) ) {
-				WP_CLI::error( esc_html__( 'Please choose `css` or `js`.', 'autoptimize' ) );
-			}
-		}
-
-		if ( empty( $clear ) ) {
-			WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
-			autoptimizeCache::clearall();
-			WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
-			return;
-		}
-
-		WP_CLI::line( esc_html__( 'Clearing the cache...', 'autoptimize' ) );
-
-		WP_Filesystem();
-		global $wp_filesystem;
-		$wp_filesystem->rmdir( AUTOPTIMIZE_CACHE_DIR . $clear, true );
-
-		WP_CLI::success( esc_html__( sprintf( '%s cache cleared.', strtoupper( $clear ) ),'autoptimize' ) );
-	}
+    /**
+     * Clears the cache.
+     *
+     * @subcommand clear
+     * @synopsis [--type=<css|js>]
+     */
+    public function clear( $args, $args_assoc ) {
+        $clear = '';
+        if ( ! empty( $args_assoc ) ) {
+            $clear = $args_assoc['type'];
+            if ( ! in_array( $clear, array( 'css', 'js' ), true ) ) {
+                WP_CLI::error( esc_html__( 'Please choose `css` or `js`.', 'autoptimize' ) );
+            }
+        }
+
+        if ( empty( $clear ) ) {
+            WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
+            autoptimizeCache::clearall();
+            WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
+            return;
+        }
+
+        WP_CLI::line( esc_html__( 'Clearing the cache...', 'autoptimize' ) );
+
+        WP_Filesystem();
+        global $wp_filesystem;
+        $wp_filesystem->rmdir( AUTOPTIMIZE_CACHE_DIR . $clear, true );
+
+        WP_CLI::success( esc_html__( sprintf( '%s cache cleared.', strtoupper( $clear ) ),'autoptimize' ) );
+    }
 
 }
 

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -12,31 +12,31 @@ 
 	 * @subcommand clear
 	 * @synopsis [--type=<css|js>]
 	 */
-	public function clear( $args, $args_assoc ) {
+	public function clear($args, $args_assoc) {
 		$clear = '';
-		if ( ! empty( $args_assoc ) ) {
+		if (!empty($args_assoc)) {
 			$clear = $args_assoc['type'];
-			if ( ! in_array( $clear, array( 'css', 'js' ), true ) ) {
-				WP_CLI::error( esc_html__( 'Please choose `css` or `js`.', 'autoptimize' ) );
+			if (!in_array($clear, array('css', 'js'), true)) {
+				WP_CLI::error(esc_html__('Please choose `css` or `js`.', 'autoptimize'));
 			}
 		}
 
-		if ( empty( $clear ) ) {
-			WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
+		if (empty($clear)) {
+			WP_CLI::line(esc_html__('Flushing the cache...', 'autoptimize'));
 			autoptimizeCache::clearall();
-			WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
+			WP_CLI::success(esc_html__('Cache flushed.', 'autoptimize'));
 			return;
 		}
 
-		WP_CLI::line( esc_html__( 'Clearing the cache...', 'autoptimize' ) );
+		WP_CLI::line(esc_html__('Clearing the cache...', 'autoptimize'));
 
 		WP_Filesystem();
 		global $wp_filesystem;
-		$wp_filesystem->rmdir( AUTOPTIMIZE_CACHE_DIR . $clear, true );
+		$wp_filesystem->rmdir(AUTOPTIMIZE_CACHE_DIR.$clear, true);
 
-		WP_CLI::success( esc_html__( sprintf( '%s cache cleared.', strtoupper( $clear ) ),'autoptimize' ) );
+		WP_CLI::success(esc_html__(sprintf('%s cache cleared.', strtoupper($clear)), 'autoptimize'));
 	}
 
 }
 
-WP_CLI::add_command( 'autoptimize', 'autoptimizeCLI' );
+WP_CLI::add_command('autoptimize', 'autoptimizeCLI');

autoptimize.php

Indentation +16 added lines, -16 removed lines

@@ -50,7 +50,7 @@ 
 
 // WP CLI
 if ( defined( 'WP_CLI' ) && WP_CLI ) {
-	require_once AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
+    require_once AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
 }
 
 // Initialize the cache at least once
@@ -137,21 +137,21 @@ 
         $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() && current_user_can('edit_posts') ) {
-		$ao_noptimize = true;
-	}
-
-	// if setting says not to optimize cart/ checkout
-	if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) {
-		// checking for woocommerce, easy digital downloads and wp ecommerce
-		foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) {
-			if ( function_exists($shopCond) && $shopCond() ) {
-				$ao_noptimize = true;
-				break;
-			}
-		}
-	}
+    // 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() && current_user_can('edit_posts') ) {
+        $ao_noptimize = true;
+    }
+
+    // if setting says not to optimize cart/ checkout
+    if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) {
+        // checking for woocommerce, easy digital downloads and wp ecommerce
+        foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) {
+            if ( function_exists($shopCond) && $shopCond() ) {
+                $ao_noptimize = true;
+                break;
+            }
+        }
+    }
 
     // filter you can use to block autoptimization on your own terms
     $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );

Spacing +76 added lines, -76 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()) {
@@ -28,29 +28,29 @@ 
 }
 
 // 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',substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR)-strlen(AUTOPTIMIZE_WP_CONTENT_NAME)));
+define('AUTOPTIMIZE_CACHE_DELAY', true);
+define('WP_ROOT_DIR', substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR) - strlen(AUTOPTIMIZE_WP_CONTENT_NAME)));
 
 // WP CLI
-if ( defined( 'WP_CLI' ) && WP_CLI ) {
-	require_once AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
+if (defined('WP_CLI') && WP_CLI) {
+	require_once AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCLI.php';
 }
 
 // Initialize the cache at least once
@@ -59,65 +59,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.2.0";
-$autoptimize_db_version=get_option('autoptimize_version','none');
+$autoptimize_version = "2.2.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","autoptimize_optimize_checkout");
+    $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", "autoptimize_optimize_checkout");
 
-    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>';
 }
 
@@ -126,27 +126,27 @@ 
     $ao_noptimize = false;
 
     // noptimize in qs to get non-optimized page for debugging
-    if (array_key_exists("ao_noptimize",$_GET) || array_key_exists("ao_noptirocket",$_GET)) {
-        if ( ( ($_GET["ao_noptimize"]==="1") || ($_GET["ao_noptirocket"]==="1") ) && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) {
+    if (array_key_exists("ao_noptimize", $_GET) || array_key_exists("ao_noptirocket", $_GET)) {
+        if ((($_GET["ao_noptimize"] === "1") || ($_GET["ao_noptirocket"] === "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() && current_user_can('edit_posts') ) {
+	if (get_option('autoptimize_optimize_logged', 'on') !== 'on' && is_user_logged_in() && current_user_can('edit_posts')) {
 		$ao_noptimize = true;
 	}
 
 	// if setting says not to optimize cart/ checkout
-	if ( get_option('autoptimize_optimize_checkout','on') !== 'on' ) {
+	if (get_option('autoptimize_optimize_checkout', 'on') !== 'on') {
 		// checking for woocommerce, easy digital downloads and wp ecommerce
-		foreach ( array("is_checkout","is_cart","edd_is_checkout","wpsc_is_cart","wpsc_is_checkout") as $shopCond ) {
-			if ( function_exists($shopCond) && $shopCond() ) {
+		foreach (array("is_checkout", "is_cart", "edd_is_checkout", "wpsc_is_cart", "wpsc_is_checkout") as $shopCond) {
+			if (function_exists($shopCond) && $shopCond()) {
 				$ao_noptimize = true;
 				break;
 			}
@@ -154,11 +154,11 @@ 
 	}
 
     // 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())) {
         // load speedupper conditionally (true by default?)
-        if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+        if (apply_filters('autoptimize_filter_speedupper', true)) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeSpeedupper.php');
         }
 
@@ -169,7 +169,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')) {
@@ -179,7 +179,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')) {
@@ -188,15 +188,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')) {
@@ -207,13 +207,13 @@ 
                     @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-4_fgo.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();
             }
@@ -225,36 +225,36 @@ 
 
 // 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_HASH',wp_hash(AUTOPTIMIZE_CACHE_DIR));
+    define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
+    define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_DIR));
 
     // 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
@@ -283,12 +283,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();
@@ -296,19 +296,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 {
@@ -316,9 +316,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');