futtta / autoptimize

config/delayed.php

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);
+    }
 }

classlesses/autoptimizeSpeedupper.php

Indentation +4 added lines, -4 removed lines

@@ -88,13 +88,13 @@
 }
 
 function ao_css_speedup_cleanup($cssin) {
-	// speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
-	return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
+    // speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
+    return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
 }
 
 function ao_js_speedup_cleanup($jsin) {
-	// cleanup
-	return trim($jsin);
+    // cleanup
+    return trim($jsin);
 }
 
 add_filter('autoptimize_css_individual_style','ao_css_snippetcacher',10,2);

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 );

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' ) );
+    }
 
 }