futtta / autoptimize

classes/autoptimizeScripts.php

Indentation +20 added lines, -20 removed lines

@@ -128,27 +128,27 @@ 
                             // should we add flags?
                             foreach ($excludeJS as $exclTag => $exclFlags) {
                                 if ( strpos($origTag,$exclTag)!==false && in_array($exclFlags,array("async","defer")) ) {
-                                   $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag);
+                                    $newTag = str_replace('<script ','<script '.$exclFlags.' ',$newTag);
                                 }
                             }
                         }
                         
-   						// should we minify the non-aggregated script?
-						if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
-							$_CachedMinifiedUrl = $this->minify_single($path);
+                            // should we minify the non-aggregated script?
+                        if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
+                            $_CachedMinifiedUrl = $this->minify_single($path);
 
-							// replace orig URL with minified URL from cache if so
-							if (!empty($_CachedMinifiedUrl)) {
-								$newTag = str_replace($url, $_CachedMinifiedUrl, $newTag);
-							}
+                            // replace orig URL with minified URL from cache if so
+                            if (!empty($_CachedMinifiedUrl)) {
+                                $newTag = str_replace($url, $_CachedMinifiedUrl, $newTag);
+                            }
 							
-							// remove querystring from URL in newTag
-							if ( !empty($explUrl[1]) ) {
-								$newTag = str_replace("?".$explUrl[1],"",$newTag);
-							}
-						}
+                            // remove querystring from URL in newTag
+                            if ( !empty($explUrl[1]) ) {
+                                $newTag = str_replace("?".$explUrl[1],"",$newTag);
+                            }
+                        }
 
-						// should we move the non-aggregated script?
+                        // should we move the non-aggregated script?
                         if( $this->ismovable($newTag) ) {
                             // can be moved, flags and all
                             if( $this->movetolast($newTag) )    {
@@ -261,7 +261,7 @@ 
         
         //$this->jscode has all the uncompressed code now.
         if ($this->alreadyminified!==true) {
-          if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
+            if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
             if (@is_callable(array("JSMin","minify"))) {
                 $tmp_jscode = trim(JSMin::minify($this->jscode));
                 if (!empty($tmp_jscode)) {
@@ -275,10 +275,10 @@ 
                 $this->jscode = $this->inject_minified($this->jscode);
                 return false;
             }
-          } else {
-              $this->jscode = $this->inject_minified($this->jscode);
+            } else {
+                $this->jscode = $this->inject_minified($this->jscode);
             return false;
-          }
+            }
         }
         return true;
     }
@@ -340,8 +340,8 @@ 
     
     // Checks against the white- and blacklists
     private function ismergeable($tag) {
-		if (apply_filters('autoptimize_filter_js_dontaggregate',false)) {
-			return false;
+        if (apply_filters('autoptimize_filter_js_dontaggregate',false)) {
+            return false;
         } else if (!empty($this->whitelist)) {
             foreach ($this->whitelist as $match) {
                 if(strpos($tag,$match)!==false) {

classes/autoptimizeStyles.php

Indentation +24 added lines, -24 removed lines

@@ -163,32 +163,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;

         }

@@ -661,8 +661,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) {