futtta / autoptimize

classes/autoptimizeScripts.php

Indentation +25 added lines, -25 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) {
@@ -449,15 +449,15 @@ 
      * 
      * @param string $jsPath
      * @return bool
-	 */
-	private function can_inject_late($jsPath) {
-		$consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
+     */
+    private function can_inject_late($jsPath) {
+        $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
         if ( $this->inject_min_late !== true ) {
             // late-inject turned off
             return false;
         } else if ( (strpos($jsPath,"min.js") === false) && ( strpos($jsPath,"wp-includes/js/jquery/jquery.js") === false ) && ( str_replace($consider_minified_array, '', $jsPath) === $jsPath ) ) {
-			// file not minified based on filename & filter
-			return false;
+            // file not minified based on filename & filter
+            return false;
         } else {
             // phew, all is safe, we can late-inject
             return true;

classes/autoptimizeHTML.php

Indentation +4 added lines, -4 removed lines

@@ -66,11 +66,11 @@
                 }
             }
 
-			// revslider data attribs somehow suffer from HTML optimization, this fixes that
+            // revslider data attribs somehow suffer from HTML optimization, this fixes that
             if ( class_exists('RevSlider') || apply_filters('autoptimize_filter_html_dataattrib_cleanup', false) ) {
-				$this->content = preg_replace('#\n(data-.*$)\n#Um',' $1 ', $this->content);
-				$this->content = preg_replace('#(=\"[^"]*\")(\w)#','$1 $2', $this->content);
-			}
+                $this->content = preg_replace('#\n(data-.*$)\n#Um',' $1 ', $this->content);
+                $this->content = preg_replace('#(=\"[^"]*\")(\w)#','$1 $2', $this->content);
+            }
 
             return true;
         }

classlesses/autoptimizeSpeedupper.php

Indentation +55 added lines, -55 removed lines

@@ -4,8 +4,8 @@ 
 */
 
 function ao_js_snippetcache($jsin,$scriptname) {
-	// load speedupper conditionally (true by default?)
-	if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+    // load speedupper conditionally (true by default?)
+    if ( apply_filters('autoptimize_filter_speedupper', true) ) {
         if (strpos($scriptname,"min.js")===false) {
                 $md5hash = "snippet_".md5($jsin);
                 $ccheck = new autoptimizeCache($md5hash,'js');
@@ -30,71 +30,71 @@ 
             // do some housekeeping here to remove comments & linebreaks and stuff
             $scriptsrc=preg_replace("#^\s*\/\/.*$#Um","",$jsin);
             $scriptsrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$scriptsrc);
-			$scriptsrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
+            $scriptsrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
 
-			if ((substr($scriptsrc,-1,1)!==";")&&(substr($scriptsrc,-1,1)!=="}")) {
-				$scriptsrc.=";";
-			}
+            if ((substr($scriptsrc,-1,1)!==";")&&(substr($scriptsrc,-1,1)!=="}")) {
+                $scriptsrc.=";";
+            }
 						
-			if (get_option("autoptimize_js_trycatch")==="on") {
-				$scriptsrc="try{".$scriptsrc."}catch(e){}";
-			}
+            if (get_option("autoptimize_js_trycatch")==="on") {
+                $scriptsrc="try{".$scriptsrc."}catch(e){}";
+            }
         }
         return $scriptsrc;
-	}
+    }
 }
 
 function ao_css_snippetcache($cssin,$filename) {
-	// load speedupper conditionally (true by default?)
-	if ( apply_filters('autoptimize_filter_speedupper', true) ) {
-		$md5hash = "snippet_".md5($cssin);
-		$ccheck = new autoptimizeCache($md5hash,'css');
-		if($ccheck->check()) {
-			$stylesrc = $ccheck->retrieve();
-		} else {
-			if (strpos($filename,"min.css")===false) {
-				if (class_exists('Minify_CSS_Compressor')) {
-					$tmp_code = trim(Minify_CSS_Compressor::process($cssin));
-				} else if(class_exists('CSSmin')) {
-					$cssmin = new CSSmin();
-					if (method_exists($cssmin,"run")) {
-						$tmp_code = trim($cssmin->run($cssin));
-					} elseif (@is_callable(array($cssmin,"minify"))) {
-						$tmp_code = trim(CssMin::minify($cssin));
-					}
-				}
+    // load speedupper conditionally (true by default?)
+    if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+        $md5hash = "snippet_".md5($cssin);
+        $ccheck = new autoptimizeCache($md5hash,'css');
+        if($ccheck->check()) {
+            $stylesrc = $ccheck->retrieve();
+        } else {
+            if (strpos($filename,"min.css")===false) {
+                if (class_exists('Minify_CSS_Compressor')) {
+                    $tmp_code = trim(Minify_CSS_Compressor::process($cssin));
+                } else if(class_exists('CSSmin')) {
+                    $cssmin = new CSSmin();
+                    if (method_exists($cssmin,"run")) {
+                        $tmp_code = trim($cssmin->run($cssin));
+                    } elseif (@is_callable(array($cssmin,"minify"))) {
+                        $tmp_code = trim(CssMin::minify($cssin));
+                    }
+                }
 
-				if (!empty($tmp_code)) {
-					$stylesrc = $tmp_code;
-					unset($tmp_code);
-				} else {
-					$stylesrc = $cssin;
-				}
-			} else {
-				// .min.css -> no heavy-lifting, just some cleanup
-				$stylesrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$cssin);
-				$stylesrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
-				$stylesrc=autoptimizeStyles::fixurls($filename,$stylesrc);
-			}
-			if (!empty($filename)) {
-				// don't cache inline CSS to avoid risk of cache-explosion
-				$ccheck->cache($stylesrc,'text/css');
-			}
-			unset($ccheck);
-		}
-		return $stylesrc;
-	}
+                if (!empty($tmp_code)) {
+                    $stylesrc = $tmp_code;
+                    unset($tmp_code);
+                } else {
+                    $stylesrc = $cssin;
+                }
+            } else {
+                // .min.css -> no heavy-lifting, just some cleanup
+                $stylesrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$cssin);
+                $stylesrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
+                $stylesrc=autoptimizeStyles::fixurls($filename,$stylesrc);
+            }
+            if (!empty($filename)) {
+                // don't cache inline CSS to avoid risk of cache-explosion
+                $ccheck->cache($stylesrc,'text/css');
+            }
+            unset($ccheck);
+        }
+        return $stylesrc;
+    }
 }
 
 // try to warm (snippet) cache when AO cache is cleared
 function ao_speedup_warmcache() {
-	// load speedupper conditionally (true by default?)
-	if ( apply_filters('autoptimize_filter_speedupper', true) ) {
-		error_log("speedupper triggered");
-		$warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1,100000);
-		$warmCache = @wp_remote_get($warmCacheUrl);
-		unset($warmCache);
-	}
+    // load speedupper conditionally (true by default?)
+    if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+        error_log("speedupper triggered");
+        $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1,100000);
+        $warmCache = @wp_remote_get($warmCacheUrl);
+        unset($warmCache);
+    }
 }
 
 add_filter('autoptimize_css_individual_style','ao_css_snippetcache',10,2);