futtta / autoptimize

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_snippetcache',10,2);

classes/autoptimizeScripts.php

Indentation +26 added lines, -26 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);
-              return false;
-          }
+            } else {
+                $this->jscode = $this->inject_minified($this->jscode);
+                return false;
+            }
         }
         $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
         return true;
@@ -341,8 +341,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) {
@@ -450,15 +450,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;

autoptimize.php

Indentation +15 added lines, -15 removed lines

@@ -132,21 +132,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/autoptimizeConfig.php

Indentation +4 added lines, -4 removed lines

@@ -345,8 +345,8 @@ 
 		</td>
 	</tr>
 	<?php
-		if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
-			?>
+        if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
+            ?>
 				<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
 					<th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th>
 					<td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/>
@@ -354,8 +354,8 @@ 
 					</td>
 				</tr>
 			<?php
-		}
-	?>
+        }
+    ?>
 </table>
 </li>