futtta / autoptimize

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 +11 added lines, -11 removed lines

@@ -1,21 +1,21 @@
 <?php
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 class autoptimizeCLI extends WP_CLI_Command {
 
-	/**
-	 * Clears the cache.
-	 *
-	 * @subcommand clear
-	 */
-	public function clear( $args, $args_assoc ) {
-		WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
-		autoptimizeCache::clearall();
-		WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
-	}
+    /**
+     * Clears the cache.
+     *
+     * @subcommand clear
+     */
+    public function clear( $args, $args_assoc ) {
+        WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
+        autoptimizeCache::clearall();
+        WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
+    }
 
 }
 

classlesses/autoptimizeSpeedupper.php

Indentation +4 added lines, -4 removed lines

@@ -85,13 +85,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);
 }
 
 // conditionally attach filters

classes/autoptimizeBase.php

Indentation +57 added lines, -57 removed lines

@@ -343,45 +343,45 @@ 
     }
     
     protected function minify_single($pathIn) {
-		// determine JS or CSS and set var (also mimetype), return false if neither
-		if ( $this->str_ends_in($pathIn,".js") === true ) {
-			$codeType="js";
-			$codeMime="text/javascript";
-		} else if ( $this->str_ends_in($pathIn,".css") === true ) {
-			$codeType="css";
-			$codeMime="text/css";			
-		} else {
-			return false;
-		}
+        // determine JS or CSS and set var (also mimetype), return false if neither
+        if ( $this->str_ends_in($pathIn,".js") === true ) {
+            $codeType="js";
+            $codeMime="text/javascript";
+        } else if ( $this->str_ends_in($pathIn,".css") === true ) {
+            $codeType="css";
+            $codeMime="text/css";			
+        } else {
+            return false;
+        }
 		
-		// if min.js or min.css return false
-		if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) {
-			return false;
-		}
+        // if min.js or min.css return false
+        if (( $this->str_ends_in($pathIn,"-min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,".min.".$codeType) === true ) || ( $this->str_ends_in($pathIn,"js/jquery/jquery.js") === true ) ) {
+            return false;
+        }
 		
-		// read file, return false if empty
-		$_toMinify = file_get_contents($pathIn);
-		if ( empty($_toMinify) ) return false;
+        // read file, return false if empty
+        $_toMinify = file_get_contents($pathIn);
+        if ( empty($_toMinify) ) return false;
 		
-		// check cache
-		$_md5hash = "single_".md5($_toMinify);
-		$_cache = new autoptimizeCache($_md5hash,$codeType);
-		if ($_cache->check() ) {
-			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
-		} else {
-			// if not in cache first minify
-			$_Minified = $_toMinify;
-			if ($codeType === "js") {
-				if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
-					if (@is_callable(array("JSMin","minify"))) {
-						$tmp_code = trim(JSMin::minify($_toMinify));
-					}
-				}
-			} else if ($codeType === "css") {
+        // check cache
+        $_md5hash = "single_".md5($_toMinify);
+        $_cache = new autoptimizeCache($_md5hash,$codeType);
+        if ($_cache->check() ) {
+            $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
+        } else {
+            // if not in cache first minify
+            $_Minified = $_toMinify;
+            if ($codeType === "js") {
+                if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
+                    if (@is_callable(array("JSMin","minify"))) {
+                        $tmp_code = trim(JSMin::minify($_toMinify));
+                    }
+                }
+            } else if ($codeType === "css") {
                 // make sure paths to background images/ imported css/ fonts .. are OK
                 $_toMinify = $this->fixurls($pathIn,$_toMinify);
                 if (class_exists('Minify_CSS_Compressor')) {
-					$tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
+                    $tmp_code = trim(Minify_CSS_Compressor::process($_toMinify));
                 } else if(class_exists('CSSmin')) {
                     $cssmin = new CSSmin();
                     if (method_exists($cssmin,"run")) {
@@ -390,31 +390,31 @@ 
                         $tmp_code = trim(CssMin::minify($_toMinify));
                     }
                 }
-			}
-			if (!empty($tmp_code)) {
-				$_Minified = $tmp_code;
-				unset($tmp_code);
-			}
-			// and then cache
-			$_cache->cache($_Minified,$codeMime);
-			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
-		}
-		unset($_cache);
+            }
+            if (!empty($tmp_code)) {
+                $_Minified = $tmp_code;
+                unset($tmp_code);
+            }
+            // and then cache
+            $_cache->cache($_Minified,$codeMime);
+            $_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
+        }
+        unset($_cache);
 	
-		// if CDN, then CDN
-		$_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);									
+        // if CDN, then CDN
+        $_CachedMinifiedUrl = $this->url_replace_cdn($_CachedMinifiedUrl);									
 
-		return $_CachedMinifiedUrl;
-	}
+        return $_CachedMinifiedUrl;
+    }
 	
-	protected function str_ends_in($haystack,$needle) {
-		$needleLength = strlen($needle);
-		$haystackLength = strlen($haystack);
-		$lastPos=strrpos($haystack,$needle);
-		if ($lastPos === $haystackLength - $needleLength) {
-			return true;
-		} else {
-			return false;
-		}
-	}
+    protected function str_ends_in($haystack,$needle) {
+        $needleLength = strlen($needle);
+        $haystackLength = strlen($haystack);
+        $lastPos=strrpos($haystack,$needle);
+        if ($lastPos === $haystackLength - $needleLength) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }