futtta / autoptimize

classes/autoptimizeStyles.php

Indentation +28 added lines, -28 removed lines

@@ -179,32 +179,32 @@ 
                     // Remove the original style tag

                     $this->content = str_replace($tag,'',$this->content);

                 } else {

-					// excluded CSS, minify if getpath 

-					if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {

-						$explUrl = explode('?',$source[2],2);

+                    // excluded CSS, minify if getpath 

+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi',$tag,$source)) {

+                        $explUrl = explode('?',$source[2],2);

                         $url = $explUrl[0];

                         $path = $this->getpath($url);

  					

-						if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {

-							$_CachedMinifiedUrl = $this->minify_single($path);

-

-							if (!empty($_CachedMinifiedUrl)) {

-								// replace orig URL with URL to cache

-								$newTag = str_replace($url, $_CachedMinifiedUrl, $tag);

-							} else {

-								$newTag = $tag;

-							}

+                        if ($path && apply_filters('autoptimize_filter_css_minify_excluded',false)) {

+                            $_CachedMinifiedUrl = $this->minify_single($path);

+

+                            if (!empty($_CachedMinifiedUrl)) {

+                                // replace orig URL with URL to cache

+                                $newTag = str_replace($url, $_CachedMinifiedUrl, $tag);

+                            } else {

+                                $newTag = $tag;

+                            }

 							

-							// remove querystring from URL

-							if ( !empty($explUrl[1]) ) {

-								$newTag = str_replace("?".$explUrl[1],"",$newTag);

-							}

-

-							// and replace

-							$this->content = str_replace($tag,$newTag,$this->content);

-						}

-					}					

-				}

+                            // remove querystring from URL

+                            if ( !empty($explUrl[1]) ) {

+                                $newTag = str_replace("?".$explUrl[1],"",$newTag);

+                            }

+

+                            // and replace

+                            $this->content = str_replace($tag,$newTag,$this->content);

+                        }

+                    }					

+                }

             }

             return true;

         }

@@ -426,7 +426,7 @@ 
                         // just cdn the URL if applicable

                         if (!empty($this->cdn_url)) {

                             $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$this->url_replace_cdn($quotedurl),$matches[0][$count]);

-						}

+                        }

                     }

                 }

             } else if ((is_array($matches)) && (!empty($this->cdn_url))) {

@@ -647,8 +647,8 @@ 
     }

     

     private function ismovable($tag) {

-		if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {

-			return false;

+        if ( apply_filters('autoptimize_filter_css_dontaggregate', false) ) {

+            return false;

         } else if (!empty($this->whitelist)) {

             foreach ($this->whitelist as $match) {

                 if(strpos($tag,$match)!==false) {

@@ -673,13 +673,13 @@ 
     }

     

     private function can_inject_late($cssPath,$css) {

-		$consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);

+        $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $cssPath);

         if ( $this->inject_min_late !== true ) {

             // late-inject turned off

             return false;

         } else if ( (strpos($cssPath,"min.css") === false) && ( str_replace($consider_minified_array, '', $cssPath) === $cssPath ) ) {

-			// file not minified based on filename & filter

-			return false;

+            // file not minified based on filename & filter

+            return false;

         } else if ( strpos($css,"@import") !== false ) {

             // can't late-inject files with imports as those need to be aggregated 

             return false;

classes/autoptimizeBase.php

Indentation +57 added lines, -57 removed lines

@@ -343,43 +343,43 @@ 
     }
     
     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") {
                 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")) {
@@ -388,33 +388,33 @@ 
                         $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;
+        }
+    }
 
     /**
      * Specialized method to create the INJECTLATER marker.