futtta / autoptimize

classes/autoptimizeCache.php

Spacing +61 added lines, -61 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeCache {
     private $filename;
@@ -7,14 +7,14 @@ 
     private $cachedir;
     private $delayed;
     
-    public function __construct($md5,$ext='php') {
+    public function __construct($md5, $ext = 'php') {
         $this->cachedir = AUTOPTIMIZE_CACHE_DIR;
         $this->delayed = AUTOPTIMIZE_CACHE_DELAY;
         $this->nogzip = AUTOPTIMIZE_CACHE_NOGZIP;
-        if($this->nogzip == false) {
+        if ($this->nogzip == false) {
             $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.php';
         } else {
-            if (in_array($ext, array("js","css")))     {
+            if (in_array($ext, array("js", "css"))) {
                 $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
             } else {
                 $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
@@ -23,7 +23,7 @@ 
     }
     
     public function check() {
-        if(!file_exists($this->cachedir.$this->filename)) {
+        if (!file_exists($this->cachedir.$this->filename)) {
             // No cached file, sorry
             return false;
         }
@@ -32,8 +32,8 @@ 
     }
     
     public function retrieve() {
-        if($this->check()) {
-            if($this->nogzip == false) {
+        if ($this->check()) {
+            if ($this->nogzip == false) {
                 return file_get_contents($this->cachedir.$this->filename.'.none');
             } else {
                 return file_get_contents($this->cachedir.$this->filename);
@@ -42,48 +42,48 @@ 
         return false;
     }
     
-    public function cache($code,$mime) {
-        if($this->nogzip == false) {
+    public function cache($code, $mime) {
+        if ($this->nogzip == false) {
             $file = ($this->delayed ? 'delayed.php' : 'default.php');
             $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'/config/'.$file);
-            $phpcode = str_replace(array('%%CONTENT%%','exit;'),array($mime,''),$phpcode);
-            file_put_contents($this->cachedir.$this->filename,$phpcode, LOCK_EX);
-            file_put_contents($this->cachedir.$this->filename.'.none',$code, LOCK_EX);
-            if(!$this->delayed) {
+            $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode);
+            file_put_contents($this->cachedir.$this->filename, $phpcode, LOCK_EX);
+            file_put_contents($this->cachedir.$this->filename.'.none', $code, LOCK_EX);
+            if (!$this->delayed) {
                 // Compress now!
-                file_put_contents($this->cachedir.$this->filename.'.deflate',gzencode($code,9,FORCE_DEFLATE), LOCK_EX);
-                file_put_contents($this->cachedir.$this->filename.'.gzip',gzencode($code,9,FORCE_GZIP), LOCK_EX);
+                file_put_contents($this->cachedir.$this->filename.'.deflate', gzencode($code, 9, FORCE_DEFLATE), LOCK_EX);
+                file_put_contents($this->cachedir.$this->filename.'.gzip', gzencode($code, 9, FORCE_GZIP), LOCK_EX);
             }
         } else {
             // Write code to cache without doing anything else
-            file_put_contents($this->cachedir.$this->filename,$code, LOCK_EX);
+            file_put_contents($this->cachedir.$this->filename, $code, LOCK_EX);
             if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) {
                 // Create an additional cached gzip file
-                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code,9,FORCE_GZIP), LOCK_EX);
+                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($code, 9, FORCE_GZIP), LOCK_EX);
             }
         }
     }
     
     public function getname() {
-        apply_filters('autoptimize_filter_cache_getname',AUTOPTIMIZE_CACHE_URL.$this->filename);
+        apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename);
         return $this->filename;
     }
     
     static function clearall() {
-        if(!autoptimizeCache::cacheavail()) {
+        if (!autoptimizeCache::cacheavail()) {
             return false;
         }
     
         // scan the cachedirs        
-        foreach (array("","js","css") as $scandirName) {
+        foreach (array("", "js", "css") as $scandirName) {
             $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName);
         }
         
         // clear the cachedirs
         foreach ($scan as $scandirName=>$scanneddir) {
-            $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/";
-            foreach($scanneddir as $file) {
-                if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) {
+            $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/";
+            foreach ($scanneddir as $file) {
+                if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false && is_file($thisAoCacheDir.$file)) {
                     @unlink($thisAoCacheDir.$file);
                 }
             }
@@ -98,15 +98,15 @@ 
                 do_action("autoptimize_action_cachepurged");
             }
         }
-        add_action("shutdown","autoptimize_do_cachepurged_action",11);
+        add_action("shutdown", "autoptimize_do_cachepurged_action", 11);
         
         // try to purge caching plugins cache-files?
         include_once(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizePageCacheFlush.php');
-        add_action("autoptimize_action_cachepurged","autoptimize_flush_pagecache",10,0);
+        add_action("autoptimize_action_cachepurged", "autoptimize_flush_pagecache", 10, 0);
 
         // warm cache (part of speedupper)?
-        if ( apply_filters('autoptimize_filter_speedupper', true) ) {
-            $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1,100000);
+        if (apply_filters('autoptimize_filter_speedupper', true)) {
+            $warmCacheUrl = site_url()."/?ao_speedup_cachebuster=".rand(1, 100000);
             $warmCache = @wp_remote_get($warmCacheUrl);
             unset($warmCache);
         }
@@ -114,12 +114,12 @@ 
         return true;
     }
 
-    static function stats()    {
-        $AOstats=get_transient("autoptimize_stats");
+    static function stats() {
+        $AOstats = get_transient("autoptimize_stats");
 
         if (empty($AOstats)) {
             // Cache not available :(
-            if(!autoptimizeCache::cacheavail()) {
+            if (!autoptimizeCache::cacheavail()) {
                 return 0;
             }
             
@@ -128,28 +128,28 @@ 
             $size = 0;
             
             // scan the cachedirs        
-            foreach (array("","js","css") as $scandirName) {
+            foreach (array("", "js", "css") as $scandirName) {
                 $scan[$scandirName] = scandir(AUTOPTIMIZE_CACHE_DIR.$scandirName);
             }
             
             foreach ($scan as $scandirName=>$scanneddir) {
-                $thisAoCacheDir=rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName,"/")."/";
-                foreach($scanneddir as $file) {
-                    if(!in_array($file,array('.','..')) && strpos($file,AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) {
-                        if(is_file($thisAoCacheDir.$file)) {
-                            if(AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file,'.js') !== false || strpos($file,'.css') !== false || strpos($file,'.img') !== false || strpos($file,'.txt') !== false )) {
+                $thisAoCacheDir = rtrim(AUTOPTIMIZE_CACHE_DIR.$scandirName, "/")."/";
+                foreach ($scanneddir as $file) {
+                    if (!in_array($file, array('.', '..')) && strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) !== false) {
+                        if (is_file($thisAoCacheDir.$file)) {
+                            if (AUTOPTIMIZE_CACHE_NOGZIP && (strpos($file, '.js') !== false || strpos($file, '.css') !== false || strpos($file, '.img') !== false || strpos($file, '.txt') !== false)) {
                                 $count++;
-                            } elseif(!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file,'.none') !== false) {
+                            } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && strpos($file, '.none') !== false) {
                                 $count++;
                             }
-                            $size+=filesize($thisAoCacheDir.$file);
+                            $size += filesize($thisAoCacheDir.$file);
                         }
                     }
                 }
             }
-            $AOstats=array($count,$size,time());
-            if ($count>100) {
-                set_transient("autoptimize_stats",$AOstats,HOUR_IN_SECONDS);
+            $AOstats = array($count, $size, time());
+            if ($count > 100) {
+                set_transient("autoptimize_stats", $AOstats, HOUR_IN_SECONDS);
             }
         }
         // print the number of instances
@@ -157,36 +157,36 @@ 
     }    
 
     static function cacheavail() {
-        if(!defined('AUTOPTIMIZE_CACHE_DIR')) {
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
             // We didn't set a cache
             return false;
         }
         
-        foreach (array("","js","css") as $checkDir) {
-            if(!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) {
+        foreach (array("", "js", "css") as $checkDir) {
+            if (!autoptimizeCache::checkCacheDir(AUTOPTIMIZE_CACHE_DIR.$checkDir)) {
                 return false;
             }
         }
         
         /** write index.html here to avoid prying eyes */
-        $indexFile=AUTOPTIMIZE_CACHE_DIR.'/index.html';
-        if(!is_file($indexFile)) {
-            @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
+        $indexFile = AUTOPTIMIZE_CACHE_DIR.'/index.html';
+        if (!is_file($indexFile)) {
+            @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
         }
 
         /** write .htaccess here to overrule wp_super_cache */
-        $htAccess=AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
-        if(!is_file($htAccess)) {
+        $htAccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
+        if (!is_file($htAccess)) {
             /** 
              * create wp-content/AO_htaccess_tmpl with 
              * whatever htaccess rules you might need
              * if you want to override default AO htaccess
              */
-            $htaccess_tmpl=WP_CONTENT_DIR."/AO_htaccess_tmpl";
+            $htaccess_tmpl = WP_CONTENT_DIR."/AO_htaccess_tmpl";
             if (is_file($htaccess_tmpl)) { 
-                $htAccessContent=file_get_contents($htaccess_tmpl);
+                $htAccessContent = file_get_contents($htaccess_tmpl);
             } else if (is_multisite() || AUTOPTIMIZE_CACHE_NOGZIP == false) {
-                $htAccessContent='<IfModule mod_expires.c>
+                $htAccessContent = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
         ExpiresByType text/javascript A30672000
@@ -209,7 +209,7 @@ 
     </Files>
 </IfModule>';
             } else {
-                $htAccessContent='<IfModule mod_expires.c>
+                $htAccessContent = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
         ExpiresByType text/javascript A30672000
@@ -232,7 +232,7 @@ 
     </Files>
 </IfModule>';
             }
-            @file_put_contents($htAccess,$htAccessContent);
+            @file_put_contents($htAccess, $htAccessContent);
         }
 
         // All OK
@@ -241,22 +241,22 @@ 
 
     static function checkCacheDir($dir) {
         // Check and create if not exists
-        if(!file_exists($dir))    {
-            @mkdir($dir,0775,true);
-            if(!file_exists($dir))    {
+        if (!file_exists($dir)) {
+            @mkdir($dir, 0775, true);
+            if (!file_exists($dir)) {
                 return false;
             }
         }
 
         // check if we can now write
-        if(!is_writable($dir))    {
+        if (!is_writable($dir)) {
             return false;
         }
 
         // and write index.html here to avoid prying eyes
-        $indexFile=$dir.'/index.html';
-        if(!is_file($indexFile)) {
-            @file_put_contents($indexFile,'<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
+        $indexFile = $dir.'/index.html';
+        if (!is_file($indexFile)) {
+            @file_put_contents($indexFile, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>');
         }
         
         return true;

classlesses/autoptimizeUpdateCode.php

Spacing +25 added lines, -25 removed lines

@@ -3,48 +3,48 @@ 
 * below code handles updates and is only included by autoptimize.php if/ when needed
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 $majorUp = false;        
-$autoptimize_major_version=substr($autoptimize_db_version,0,3);
+$autoptimize_major_version = substr($autoptimize_db_version, 0, 3);
 
-switch($autoptimize_major_version) {
+switch ($autoptimize_major_version) {
     case "1.6":
         // from back in the days when I did not yet consider multisite
         // if user was on version 1.6.x, force advanced options to be shown by default
-        update_option('autoptimize_show_adv','1');
+        update_option('autoptimize_show_adv', '1');
 
         // and remove old options
-        $to_delete_options=array("autoptimize_cdn_css","autoptimize_cdn_css_url","autoptimize_cdn_js","autoptimize_cdn_js_url","autoptimize_cdn_img","autoptimize_cdn_img_url","autoptimize_css_yui","autoptimize_js_yui");
+        $to_delete_options = array("autoptimize_cdn_css", "autoptimize_cdn_css_url", "autoptimize_cdn_js", "autoptimize_cdn_js_url", "autoptimize_cdn_img", "autoptimize_cdn_img_url", "autoptimize_css_yui", "autoptimize_js_yui");
         foreach ($to_delete_options as $del_opt) {
-            delete_option( $del_opt );
+            delete_option($del_opt);
         }
         $majorUp = true;
     case "1.7":
         // force 3.8 dashicons in CSS exclude options when upgrading from 1.7 to 1.8
-        if ( !is_multisite() ) {
+        if (!is_multisite()) {
             $css_exclude = get_option('autoptimize_css_exclude');
             if (empty($css_exclude)) {
                 $css_exclude = "admin-bar.min.css, dashicons.min.css";
-            } else if (strpos($css_exclude,"dashicons.min.css")===false) {
+            } else if (strpos($css_exclude, "dashicons.min.css") === false) {
                 $css_exclude .= ", dashicons.min.css";
             }
-            update_option('autoptimize_css_exclude',$css_exclude);
+            update_option('autoptimize_css_exclude', $css_exclude);
         } else {
             global $wpdb;
-            $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
                 $css_exclude = get_option('autoptimize_css_exclude');
                 if (empty($css_exclude)) {
                     $css_exclude = "admin-bar.min.css, dashicons.min.css";
-                } else if (strpos($css_exclude,"dashicons.min.css")===false) {
+                } else if (strpos($css_exclude, "dashicons.min.css") === false) {
                     $css_exclude .= ", dashicons.min.css";
                 }
-                update_option('autoptimize_css_exclude',$css_exclude);
+                update_option('autoptimize_css_exclude', $css_exclude);
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
         $majorUp = true;
     case "1.9":
@@ -52,24 +52,24 @@ 
         * 2.0 will not aggregate inline CSS/JS by default, but we want users
         * upgrading from 1.9 to keep their inline code aggregated by default. 
         */
-        if ( !is_multisite() ) {
-            update_option('autoptimize_css_include_inline','on');
-            update_option('autoptimize_js_include_inline','on');
+        if (!is_multisite()) {
+            update_option('autoptimize_css_include_inline', 'on');
+            update_option('autoptimize_js_include_inline', 'on');
         } else {
             global $wpdb;
-            $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                update_option('autoptimize_css_include_inline','on');
-                update_option('autoptimize_js_include_inline','on');
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                update_option('autoptimize_css_include_inline', 'on');
+                update_option('autoptimize_js_include_inline', 'on');
             }
-            switch_to_blog( $original_blog_id );    
+            switch_to_blog($original_blog_id);    
         }
         $majorUp = true;
     }
 
-if ( $majorUp === true ) {
+if ($majorUp === true) {
     // clear cache and notify user to check result if major upgrade
     autoptimizeCache::clearall();
     add_action('admin_notices', 'autoptimize_update_config_notice');

classlesses/autoptimizePartners.php

Spacing +22 added lines, -22 removed lines

@@ -3,24 +3,24 @@ 
 Classlessly add a "more tools" tab to promote (future) AO addons and/ or affiliate services
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 add_action('admin_init', 'ao_partner_tabs_preinit');
 function ao_partner_tabs_preinit() {
-    if (apply_filters('autoptimize_filter_show_partner_tabs',true)) {
-        add_filter('autoptimize_filter_settingsscreen_tabs','ao_add_partner_tabs');
+    if (apply_filters('autoptimize_filter_show_partner_tabs', true)) {
+        add_filter('autoptimize_filter_settingsscreen_tabs', 'ao_add_partner_tabs');
     }
 }
 
 function ao_add_partner_tabs($in) {
-    $in=array_merge($in,array('ao_partners' => __('Optimize More!','autoptimize')));
+    $in = array_merge($in, array('ao_partners' => __('Optimize More!', 'autoptimize')));
     return $in;
 }
 
-add_action('admin_menu','ao_partners_init');
+add_action('admin_menu', 'ao_partners_init');
 function ao_partners_init() {
-    if (apply_filters('autoptimize_filter_show_partner_tabs',true)) {
-        $hook=add_submenu_page(NULL,'AO partner','AO partner','manage_options','ao_partners','ao_partners');
+    if (apply_filters('autoptimize_filter_show_partner_tabs', true)) {
+        $hook = add_submenu_page(NULL, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', 'ao_partners');
         // register_settings here as well if needed
     }
 }
@@ -71,10 +71,10 @@ 
     }    
     </style>
     <div class="wrap">
-        <h1><?php _e('Autoptimize Settings','autoptimize'); ?></h1>
+        <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
         <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
         <?php
-            echo '<h2>'. __("These Autoptimize power-ups and related services will improve your site's performance even more!",'autoptimize') . '</h2>';
+            echo '<h2>'.__("These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize').'</h2>';
         ?>
         <div>
             <?php getAOPartnerFeed(); ?>
@@ -84,32 +84,32 @@ 
 }
 
 function getAOPartnerFeed() {
-    $noFeedText=__( 'Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize' );
+    $noFeedText = __('Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize');
 
-    if (apply_filters('autoptimize_settingsscreen_remotehttp',true)) {
-        $rss = fetch_feed( "http://feeds.feedburner.com/OptimizingMattersDownloads" );
+    if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
+        $rss = fetch_feed("http://feeds.feedburner.com/OptimizingMattersDownloads");
         $maxitems = 0;
 
-        if ( ! is_wp_error( $rss ) ) {
-            $maxitems = $rss->get_item_quantity( 20 ); 
-            $rss_items = $rss->get_items( 0, $maxitems );
+        if (!is_wp_error($rss)) {
+            $maxitems = $rss->get_item_quantity(20); 
+            $rss_items = $rss->get_items(0, $maxitems);
         } ?>
         <ul>
             <?php
-            if ( $maxitems == 0 ) {
+            if ($maxitems == 0) {
                 echo $noFeedText;
             } else {
-                foreach ( $rss_items as $item ) : 
-                    $itemURL = esc_url( $item->get_permalink() ); ?>
+                foreach ($rss_items as $item) : 
+                    $itemURL = esc_url($item->get_permalink()); ?>
                     <li class="itemDetail">
-                        <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html( $item->get_title() ); ?></a></h3>
+                        <h3 class="itemTitle"><a href="<?php echo $itemURL; ?>" target="_blank"><?php echo esc_html($item->get_title()); ?></a></h3>
                         <?php
-                        if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(),"image")!==false) ) {
-                            $itemImgURL=esc_url($enclosure->get_link());
+                        if (($enclosure = $item->get_enclosure()) && (strpos($enclosure->get_type(), "image") !== false)) {
+                            $itemImgURL = esc_url($enclosure->get_link());
                             echo "<div class=\"itemImage\"><a href=\"".$itemURL."\" target=\"_blank\"><img src=\"".$itemImgURL."\"/></a></div>";
                         }
                         ?>
-                        <div class="itemDescription"><?php echo wp_kses_post($item -> get_description() ); ?></div>
+                        <div class="itemDescription"><?php echo wp_kses_post($item -> get_description()); ?></div>
                         <div class="itemButtonRow"><div class="itemButton button-secondary"><a href="<?php echo $itemURL; ?>" target="_blank">More info</a></div></div>
                     </li>
                 <?php endforeach; ?>

classlesses/autoptimizePageCacheFlush.php

Spacing +19 added lines, -19 removed lines

@@ -2,55 +2,55 @@
 // flush as many page cache plugin's caches as possible
 // hyper cache and gator cache hook into AO, so we don't need to :-)
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 function autoptimize_flush_pagecache() {
-    if(function_exists('wp_cache_clear_cache')) {
+    if (function_exists('wp_cache_clear_cache')) {
         if (is_multisite()) {
             $blog_id = get_current_blog_id();
             wp_cache_clear_cache($blog_id);
         } else {
             wp_cache_clear_cache();
         }
-    } else if ( has_action('cachify_flush_cache') ) {
+    } else if (has_action('cachify_flush_cache')) {
         do_action('cachify_flush_cache');
-    } else if ( function_exists('w3tc_pgcache_flush') ) {
+    } else if (function_exists('w3tc_pgcache_flush')) {
         w3tc_pgcache_flush();
-    } else if ( function_exists('wp_fast_cache_bulk_delete_all') ) {
+    } else if (function_exists('wp_fast_cache_bulk_delete_all')) {
         wp_fast_cache_bulk_delete_all(); // still to retest
     } else if (class_exists("WpFastestCache")) {
         $wpfc = new WpFastestCache();
         $wpfc -> deleteCache();
-    } else if ( class_exists("c_ws_plugin__qcache_purging_routines") ) {
+    } else if (class_exists("c_ws_plugin__qcache_purging_routines")) {
         c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache, still to retest
-    } else if ( class_exists("zencache") ) {
+    } else if (class_exists("zencache")) {
         zencache::clear();
-    } else if ( class_exists("comet_cache") ) {
+    } else if (class_exists("comet_cache")) {
         comet_cache::clear();
-    } else if ( class_exists("WpeCommon") ) {
-        if ( apply_filters('autoptimize_flush_wpengine_aggressive', false) ) {
-            if ( method_exists( "WpeCommon", "purge_memcached" ) ) {
+    } else if (class_exists("WpeCommon")) {
+        if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) {
+            if (method_exists("WpeCommon", "purge_memcached")) {
                 WpeCommon::purge_memcached();
             }
-            if ( method_exists( "WpeCommon", "clear_maxcdn_cache" ) ) {  
+            if (method_exists("WpeCommon", "clear_maxcdn_cache")) {  
                 WpeCommon::clear_maxcdn_cache();
             }
         }
-        if ( method_exists( "WpeCommon", "purge_varnish_cache" ) ) {
+        if (method_exists("WpeCommon", "purge_varnish_cache")) {
             WpeCommon::purge_varnish_cache();   
         }
-    } else if ( function_exists('sg_cachepress_purge_cache') ) {
+    } else if (function_exists('sg_cachepress_purge_cache')) {
         sg_cachepress_purge_cache();
-    } else if(file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')){
+    } else if (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) {
         // fallback for WP-Super-Cache
         global $cache_path;
         if (is_multisite()) {
             $blog_id = get_current_blog_id();
-            prune_super_cache( get_supercache_dir( $blog_id ), true );
-            prune_super_cache( $cache_path . 'blogs/', true );
+            prune_super_cache(get_supercache_dir($blog_id), true);
+            prune_super_cache($cache_path.'blogs/', true);
         } else {
-            prune_super_cache($cache_path.'supercache/',true);
-            prune_super_cache($cache_path,true);
+            prune_super_cache($cache_path.'supercache/', true);
+            prune_super_cache($cache_path, true);
         }
     }
 }
\ No newline at end of file

config/default.php

Spacing +10 added lines, -10 removed lines

@@ -1,9 +1,9 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+if (!isset($_SERVER['HTTP_USER_AGENT']))
 	$_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
@@ -27,27 +27,27 @@ 
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
 	$encoding = 'none';
 
 //Get data
 $contents = file_get_contents(__FILE__.'.'.$encoding);
 
 // first check if we have to send 304
-$eTag=md5($contents);
-$modTime=filemtime(__FILE__.'.none');
+$eTag = md5($contents);
+$modTime = filemtime(__FILE__.'.none');
 
-$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag));
+$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag));
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
-if (($modTimeMatch)||($eTagMatch)) {
+if (($modTimeMatch) || ($eTagMatch)) {
 	header('HTTP/1.1 304 Not Modified');
 	header('Connection: close');
 } else {
 	// send all sorts of headers
-	$expireTime=60*60*24*356; // 1y max according to RFC
+	$expireTime = 60*60*24*356; // 1y max according to RFC
 
-	if(isset($encoding) && $encoding != 'none') 
+	if (isset($encoding) && $encoding != 'none') 
 	{
 		header('Content-Encoding: '.$encoding);
 	}
@@ -56,7 +56,7 @@ 
 	header('Content-type: %%CONTENT%%; charset=utf-8');
 	header('Cache-Control: max-age='.$expireTime.', public, immutable');
 	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT'); //10 years
-	header('ETag: ' . $eTag);
+	header('ETag: '.$eTag);
 	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 	
 	// send output

config/delayed.php

Spacing +16 added lines, -16 removed lines

@@ -1,9 +1,9 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+if (!isset($_SERVER['HTTP_USER_AGENT']))
 	$_SERVER['HTTP_USER_AGENT'] = '';
 	
 // Determine supported compression method
@@ -27,16 +27,16 @@ 
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
 	$encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
-if($encoding != 'none' && $iscompressed == false)
+if ($encoding != 'none' && $iscompressed == false)
 {
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
-}else{
+	$contents = gzencode($code, 9, $flag);
+} else {
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }
@@ -44,18 +44,18 @@ 
 // first check if we have to send 304
 // inspired by http://www.jonasjohn.de/snippets/php/caching.htm
 
-$eTag=md5($contents);
-$modTime=filemtime(__FILE__.'.none');
+$eTag = md5($contents);
+$modTime = filemtime(__FILE__.'.none');
 
-$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag));
+$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag));
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
-if (($modTimeMatch)||($eTagMatch)) {
+if (($modTimeMatch) || ($eTagMatch)) {
 	header('HTTP/1.1 304 Not Modified');
 	header('Connection: close');
 } else {
 	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
+	$expireTime = 60*60*24*355; // 1y max according to RFC
 	if ($encoding != 'none') {
 		header('Content-Encoding: '.$encoding);
 	}
@@ -64,22 +64,22 @@ 
 	header('Content-type: %%CONTENT%%; charset=utf-8');
 	header('Cache-Control: max-age='.$expireTime.', public, immutable');
 	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
+	header('ETag: '.$eTag);
 	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
 	// send output
 	echo $contents;
 
 	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
+	if ($encoding != 'none' && $iscompressed == false)
 	{
 		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+		file_put_contents(__FILE__.'.'.$encoding, $contents);
 		
 		//And write the new content
 		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
 		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
+		$contents = gzencode($code, 9, $flag);
+		file_put_contents(__FILE__.'.'.$ext, $contents);
 	}
 }

classes/autoptimizeBase.php

Spacing +80 added lines, -80 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 abstract class autoptimizeBase {
     protected $content = '';
@@ -23,37 +23,37 @@ 
     
     //Converts an URL to a full path
     protected function getpath($url) {
-        $url=apply_filters( 'autoptimize_filter_cssjs_alter_url', $url);
+        $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url);
         
-        if (strpos($url,'%')!==false) {
-            $url=urldecode($url);
+        if (strpos($url, '%') !== false) {
+            $url = urldecode($url);
         }
 
-        $siteHost=parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST);
-        $contentHost=parse_url(AUTOPTIMIZE_WP_ROOT_URL,PHP_URL_HOST);
+        $siteHost = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST);
+        $contentHost = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST);
         
         // normalize
-        if (strpos($url,'//')===0) {
+        if (strpos($url, '//') === 0) {
             if (is_ssl()) {
                 $url = "https:".$url;
             } else {
                 $url = "http:".$url;
             }
-        } else if ((strpos($url,'//')===false) && (strpos($url,$siteHost)===false)) {
+        } else if ((strpos($url, '//') === false) && (strpos($url, $siteHost) === false)) {
             if (AUTOPTIMIZE_WP_SITE_URL === $siteHost) {
                 $url = AUTOPTIMIZE_WP_SITE_URL.$url;
             } else {
-                $subdir_levels=substr_count(preg_replace("/https?:\/\//","",AUTOPTIMIZE_WP_SITE_URL),"/");
-                $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..",$subdir_levels).$url;
+                $subdir_levels = substr_count(preg_replace("/https?:\/\//", "", AUTOPTIMIZE_WP_SITE_URL), "/");
+                $url = AUTOPTIMIZE_WP_SITE_URL.str_repeat("/..", $subdir_levels).$url;
             }
         }
         
         if ($siteHost !== $contentHost) {
-            $url=str_replace(AUTOPTIMIZE_WP_CONTENT_URL,AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME,$url);
+            $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url);
         }
 
         // first check; hostname wp site should be hostname of url
-        $thisHost=@parse_url($url,PHP_URL_HOST);
+        $thisHost = @parse_url($url, PHP_URL_HOST);
         if ($thisHost !== $siteHost) {
             /* 
             * first try to get all domains from WPML (if available)
@@ -65,18 +65,18 @@ 
             
             $multidomainsWPML = apply_filters('wpml_setting', array(), 'language_domains');
             if (!empty($multidomainsWPML)) {
-                $multidomains = array_map(array($this,"ao_getDomain"),$multidomainsWPML);
+                $multidomains = array_map(array($this, "ao_getDomain"), $multidomainsWPML);
             }
             
             if (!empty($this->cdn_url)) {
-                $multidomains[]=parse_url($this->cdn_url,PHP_URL_HOST);
+                $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST);
             }
             
             $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains);
             
             if (!empty($multidomains)) {
-                if (in_array($thisHost,$multidomains)) {
-                    $url=str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL,PHP_URL_HOST), $url);
+                if (in_array($thisHost, $multidomains)) {
+                    $url = str_replace($thisHost, parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST), $url);
                 } else {
                     return false;
                 }
@@ -86,22 +86,22 @@ 
         }
         
         // try to remove "wp root url" from url while not minding http<>https
-        $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_ROOT_URL);
+        $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL);
         if ($siteHost !== $contentHost) {
             // as we replaced the content-domain with the site-domain, we should match against that 
-            $tmp_ao_root = preg_replace('/https?:/','',AUTOPTIMIZE_WP_SITE_URL);
+            $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL);
         }
-        $tmp_url = preg_replace('/https?:/','',$url);
-        $path = str_replace($tmp_ao_root,'',$tmp_url);
+        $tmp_url = preg_replace('/https?:/', '', $url);
+        $path = str_replace($tmp_ao_root, '', $tmp_url);
         
         // if path starts with :// or //, this is not a URL in the WP context and we have to assume we can't aggregate
-        if (preg_match('#^:?//#',$path)) {
+        if (preg_match('#^:?//#', $path)) {
             /** External script/css (adsense, etc) */
             return false;
         }
 
         // prepend with WP_ROOT_DIR to have full path to file
-        $path = str_replace('//','/',WP_ROOT_DIR.$path);
+        $path = str_replace('//', '/', WP_ROOT_DIR.$path);
         
         // final check: does file exist and is it readable
         if (file_exists($path) && is_file($path) && is_readable($path)) {
@@ -114,25 +114,25 @@ 
     // needed for WPML-filter
     protected function ao_getDomain($in) {
         // make sure the url starts with something vaguely resembling a protocol
-        if ((strpos($in,"http")!==0) && (strpos($in,"//")!==0)) {
-            $in="http://".$in;
+        if ((strpos($in, "http") !== 0) && (strpos($in, "//") !== 0)) {
+            $in = "http://".$in;
         }
         
         // do the actual parse_url
-        $out = parse_url($in,PHP_URL_HOST);
+        $out = parse_url($in, PHP_URL_HOST);
         
         // fallback if parse_url does not understand the url is in fact a url
-        if (empty($out)) $out=$in;
+        if (empty($out)) $out = $in;
         
         return $out;
     }
 
 
     // logger
-    protected function ao_logger($logmsg,$appendHTML=true) {
+    protected function ao_logger($logmsg, $appendHTML = true) {
         if ($appendHTML) {
-            $logmsg="<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
-            $this->content.=$logmsg;
+            $logmsg = "<!--noptimize--><!-- ".$logmsg." --><!--/noptimize-->";
+            $this->content .= $logmsg;
         } else {
             error_log("Autoptimize: ".$logmsg);
         }
@@ -140,7 +140,7 @@ 
 
     // hide everything between noptimize-comment tags
     protected function hide_noptimize($noptimize_in) {
-        if ( preg_match( '/<!--\s?noptimize\s?-->/', $noptimize_in ) ) { 
+        if (preg_match('/<!--\s?noptimize\s?-->/', $noptimize_in)) { 
             $noptimize_out = preg_replace_callback(
                 '#<!--\s?noptimize\s?-->.*?<!--\s?/\s?noptimize\s?-->#is',
                 create_function(
@@ -157,7 +157,7 @@ 
     
     // unhide noptimize-tags
     protected function restore_noptimize($noptimize_in) {
-        if ( strpos( $noptimize_in, '%%NOPTIMIZE%%' ) !== false ) { 
+        if (strpos($noptimize_in, '%%NOPTIMIZE%%') !== false) { 
             $noptimize_out = preg_replace_callback(
                 '#%%NOPTIMIZE'.AUTOPTIMIZE_HASH.'%%(.*?)%%NOPTIMIZE%%#is',
                 create_function(
@@ -173,7 +173,7 @@ 
     }
 
     protected function hide_iehacks($iehacks_in) {
-        if ( strpos( $iehacks_in, '<!--[if' ) !== false ) { 
+        if (strpos($iehacks_in, '<!--[if') !== false) { 
             $iehacks_out = preg_replace_callback(
                 '#<!--\[if.*?\[endif\]-->#is',
                 create_function(
@@ -189,7 +189,7 @@ 
     }
 
     protected function restore_iehacks($iehacks_in) {
-        if ( strpos( $iehacks_in, '%%IEHACK%%' ) !== false ) { 
+        if (strpos($iehacks_in, '%%IEHACK%%') !== false) { 
             $iehacks_out = preg_replace_callback(
                 '#%%IEHACK'.AUTOPTIMIZE_HASH.'%%(.*?)%%IEHACK%%#is',
                 create_function(
@@ -199,13 +199,13 @@ 
                 $iehacks_in
             );
         } else {
-            $iehacks_out=$iehacks_in;
+            $iehacks_out = $iehacks_in;
         }
         return $iehacks_out;
     }
 
     protected function hide_comments($comments_in) {
-        if ( strpos( $comments_in, '<!--' ) !== false ) {
+        if (strpos($comments_in, '<!--') !== false) {
             $comments_out = preg_replace_callback(
                 '#<!--.*?-->#is',
                 create_function(
@@ -221,7 +221,7 @@ 
     }
 
     protected function restore_comments($comments_in) {
-        if ( strpos( $comments_in, '%%COMMENTS%%' ) !== false ) {
+        if (strpos($comments_in, '%%COMMENTS%%') !== false) {
             $comments_out = preg_replace_callback(
                 '#%%COMMENTS'.AUTOPTIMIZE_HASH.'%%(.*?)%%COMMENTS%%#is',
                 create_function(
@@ -231,31 +231,31 @@ 
                 $comments_in
             );
         } else {
-            $comments_out=$comments_in;
+            $comments_out = $comments_in;
         }
         return $comments_out;
     }
 
-    protected function url_replace_cdn( $url ) {
+    protected function url_replace_cdn($url) {
         // API filter to change base CDN URL
-        $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $this->cdn_url );
+        $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $this->cdn_url);
 
-        if ( !empty($cdn_url) )  {
+        if (!empty($cdn_url)) {
             // prepend domain-less absolute URL's
-            if ( ( substr( $url, 0, 1 ) === '/' ) && ( substr( $url, 1, 1 ) !== '/' ) ) {
-                $url = rtrim( $cdn_url, '/' ) . $url;
+            if ((substr($url, 0, 1) === '/') && (substr($url, 1, 1) !== '/')) {
+                $url = rtrim($cdn_url, '/').$url;
             } else {
                 // get wordpress base URL
-                $WPSiteBreakdown = parse_url( AUTOPTIMIZE_WP_SITE_URL );
-                $WPBaseUrl       = $WPSiteBreakdown['scheme'] . '://' . $WPSiteBreakdown['host'];
-                if ( ! empty( $WPSiteBreakdown['port'] ) ) {
-                    $WPBaseUrl .= ":" . $WPSiteBreakdown['port'];
+                $WPSiteBreakdown = parse_url(AUTOPTIMIZE_WP_SITE_URL);
+                $WPBaseUrl       = $WPSiteBreakdown['scheme'].'://'.$WPSiteBreakdown['host'];
+                if (!empty($WPSiteBreakdown['port'])) {
+                    $WPBaseUrl .= ":".$WPSiteBreakdown['port'];
                 }
                 // replace full url's with scheme
-                $tmp_url = str_replace( $WPBaseUrl, rtrim( $cdn_url, '/' ), $url );
-                if ( $tmp_url === $url ) {
+                $tmp_url = str_replace($WPBaseUrl, rtrim($cdn_url, '/'), $url);
+                if ($tmp_url === $url) {
                     // last attempt; replace scheme-less URL's
-                    $url = str_replace( preg_replace( '/https?:/', '', $WPBaseUrl ), rtrim( $cdn_url, '/' ), $url );
+                    $url = str_replace(preg_replace('/https?:/', '', $WPBaseUrl), rtrim($cdn_url, '/'), $url);
                 } else {
                     $url = $tmp_url;
                 }
@@ -263,32 +263,32 @@ 
         }
 
         // allow API filter to alter URL after CDN replacement
-        $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url );
+        $url = apply_filters('autoptimize_filter_base_replace_cdn', $url);
         return $url;
     }
 
-    protected function inject_in_html($payload,$replaceTag) {
-        if (strpos($this->content,$replaceTag[0])!== false) {
-            if ($replaceTag[1]==="after") {
-                $replaceBlock=$replaceTag[0].$payload;
-            } else if ($replaceTag[1]==="replace"){
-                $replaceBlock=$payload;
+    protected function inject_in_html($payload, $replaceTag) {
+        if (strpos($this->content, $replaceTag[0]) !== false) {
+            if ($replaceTag[1] === "after") {
+                $replaceBlock = $replaceTag[0].$payload;
+            } else if ($replaceTag[1] === "replace") {
+                $replaceBlock = $payload;
             } else {
-                $replaceBlock=$payload.$replaceTag[0];
+                $replaceBlock = $payload.$replaceTag[0];
             }
-            $this->content = substr_replace($this->content,$replaceBlock,strpos($this->content,$replaceTag[0]),strlen($replaceTag[0]));
+            $this->content = substr_replace($this->content, $replaceBlock, strpos($this->content, $replaceTag[0]), strlen($replaceTag[0]));
         } else {
             $this->content .= $payload;
             if (!$this->tagWarning) {
-                $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<",">"),"",$replaceTag[0])."\" missing --><!--/noptimize-->";
-                $this->tagWarning=true;
+                $this->content .= "<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag \"".str_replace(array("<", ">"), "", $replaceTag[0])."\" missing --><!--/noptimize-->";
+                $this->tagWarning = true;
             }
         }
     }
     
     protected function isremovable($tag, $removables) {
         foreach ($removables as $match) {
-            if (strpos($tag,$match)!==false) {
+            if (strpos($tag, $match) !== false) {
                 return true;
             }
         }
@@ -297,7 +297,7 @@ 
     
     // inject already minified code in optimized JS/CSS
     protected function inject_minified($in) {
-        if ( strpos( $in, '%%INJECTLATER%%' ) !== false ) {
+        if (strpos($in, '%%INJECTLATER%%') !== false) {
             $out = preg_replace_callback(
                 '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is',
                 create_function(
@@ -349,47 +349,47 @@ 
     
     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";			
+		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 ) ) {
+		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;
+		if (empty($_toMinify)) return false;
 		
 		// check cache
 		$_md5hash = "single_".md5($_toMinify);
-		$_cache = new autoptimizeCache($_md5hash,$codeType);
-		if ($_cache->check() ) {
+		$_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"))) {
+				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));
-                } else if(class_exists('CSSmin')) {
+                } else if (class_exists('CSSmin')) {
                     $cssmin = new CSSmin();
-                    if (method_exists($cssmin,"run")) {
+                    if (method_exists($cssmin, "run")) {
                         $tmp_code = trim($cssmin->run($_toMinify));
-                    } elseif (@is_callable(array($cssmin,"minify"))) {
+                    } elseif (@is_callable(array($cssmin, "minify"))) {
                         $tmp_code = trim(CssMin::minify($_toMinify));
                     }
                 }
@@ -399,7 +399,7 @@ 
 				unset($tmp_code);
 			}
 			// and then cache
-			$_cache->cache($_Minified,$codeMime);
+			$_cache->cache($_Minified, $codeMime);
 			$_CachedMinifiedUrl = AUTOPTIMIZE_CACHE_URL.$_cache->getname();
 		}
 		unset($_cache);
@@ -410,10 +410,10 @@ 
 		return $_CachedMinifiedUrl;
 	}
 	
-	protected function str_ends_in($haystack,$needle) {
+	protected function str_ends_in($haystack, $needle) {
 		$needleLength = strlen($needle);
 		$haystackLength = strlen($haystack);
-		$lastPos=strrpos($haystack,$needle);
+		$lastPos = strrpos($haystack, $needle);
 		if ($lastPos === $haystackLength - $needleLength) {
 			return true;
 		} else {

classlesses/autoptimizeSpeedupper.php

Spacing +34 added lines, -34 removed lines

@@ -4,64 +4,64 @@ 
 * new in Autoptimize 2.2
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-function ao_js_snippetcacher($jsin,$jsfilename) {
+function ao_js_snippetcacher($jsin, $jsfilename) {
     $md5hash = "snippet_".md5($jsin);
-    $ccheck = new autoptimizeCache($md5hash,'js');
-    if($ccheck->check()) {
+    $ccheck = new autoptimizeCache($md5hash, 'js');
+    if ($ccheck->check()) {
         $scriptsrc = $ccheck->retrieve();
     } else {
-        if ( (strpos($jsfilename,"min.js") === false) && ( strpos($jsfilename,"js/jquery/jquery.js") === false ) && ( str_replace(apply_filters('autoptimize_filter_js_consider_minified',false), '', $jsfilename) === $jsfilename ) ) {
-            if(class_exists('JSMin')) {
+        if ((strpos($jsfilename, "min.js") === false) && (strpos($jsfilename, "js/jquery/jquery.js") === false) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) {
+            if (class_exists('JSMin')) {
                 $tmp_jscode = trim(JSMin::minify($jsin));
                 if (!empty($tmp_jscode)) {
                         $scriptsrc = $tmp_jscode;
                         unset($tmp_jscode);
                 } else {
-                        $scriptsrc=$jsin;
+                        $scriptsrc = $jsin;
                 }
             } else {
-                $scriptsrc=$jsin;
+                $scriptsrc = $jsin;
             }
         } else {
             // 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("#^\s*\/\/.*$#Um", "", $jsin);
+            $scriptsrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $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 ( !empty($jsfilename) && str_replace( apply_filters('autoptimize_filter_js_speedup_cache',false), '', $jsfilename ) === $jsfilename ) {
+        if (!empty($jsfilename) && str_replace(apply_filters('autoptimize_filter_js_speedup_cache', false), '', $jsfilename) === $jsfilename) {
             // don't cache inline CSS or if filter says no
-            $ccheck->cache($scriptsrc,'text/javascript');
+            $ccheck->cache($scriptsrc, 'text/javascript');
         }
     }
     unset($ccheck);
 
-    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_snippetcacher($cssin,$cssfilename) {
+function ao_css_snippetcacher($cssin, $cssfilename) {
     $md5hash = "snippet_".md5($cssin);
-    $ccheck = new autoptimizeCache($md5hash,'css');
-    if($ccheck->check()) {
+    $ccheck = new autoptimizeCache($md5hash, 'css');
+    if ($ccheck->check()) {
         $stylesrc = $ccheck->retrieve();
     } else {
-        if ( ( strpos($cssfilename,"min.css") === false ) && ( str_replace( apply_filters('autoptimize_filter_css_consider_minified',false), '', $cssfilename ) === $cssfilename ) ) {
+        if ((strpos($cssfilename, "min.css") === false) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) {
             if (class_exists('Minify_CSS_Compressor')) {
                 $tmp_code = trim(Minify_CSS_Compressor::process($cssin));
-            } else if(class_exists('CSSmin')) {
+            } else if (class_exists('CSSmin')) {
                 $cssmin = new CSSmin();
-                if (method_exists($cssmin,"run")) {
+                if (method_exists($cssmin, "run")) {
                     $tmp_code = trim($cssmin->run($cssin));
-                } elseif (@is_callable(array($cssmin,"minify"))) {
+                } elseif (@is_callable(array($cssmin, "minify"))) {
                     $tmp_code = trim(CssMin::minify($cssin));
                 }
             }
@@ -74,13 +74,13 @@ 
             }
         } 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($cssfilename,$stylesrc);
+            $stylesrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $cssin);
+            $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
+            $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc);
         }
-        if ( !empty($cssfilename) && ( str_replace( apply_filters('autoptimize_filter_css_speedup_cache',false), '', $cssfilename ) === $cssfilename ) ) {
+        if (!empty($cssfilename) && (str_replace(apply_filters('autoptimize_filter_css_speedup_cache', false), '', $cssfilename) === $cssfilename)) {
             // only cache CSS if not inline and allowed by filter
-            $ccheck->cache($stylesrc,'text/css');
+            $ccheck->cache($stylesrc, 'text/css');
         }
     }
     unset($ccheck);
@@ -89,7 +89,7 @@ 
 
 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));
+	return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin));
 }
 
 function ao_js_speedup_cleanup($jsin) {
@@ -97,7 +97,7 @@ 
 	return trim($jsin);
 }
 
-add_filter('autoptimize_css_individual_style','ao_css_snippetcacher',10,2);
-add_filter('autoptimize_js_individual_script','ao_js_snippetcacher',10,2);
-add_filter('autoptimize_css_after_minify','ao_css_speedup_cleanup',10,1);
-add_filter('autoptimize_js_after_minify','ao_js_speedup_cleanup',10,1);
+add_filter('autoptimize_css_individual_style', 'ao_css_snippetcacher', 10, 2);
+add_filter('autoptimize_js_individual_script', 'ao_js_snippetcacher', 10, 2);
+add_filter('autoptimize_css_after_minify', 'ao_css_speedup_cleanup', 10, 1);
+add_filter('autoptimize_js_after_minify', 'ao_js_speedup_cleanup', 10, 1);

autoptimize.php

Spacing +74 added lines, -74 removed lines

@@ -12,15 +12,15 @@ 
 http://www.gnu.org/licenses/gpl.txt
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-define('AUTOPTIMIZE_PLUGIN_DIR',plugin_dir_path(__FILE__));
+define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__));
 
 // Load config class
 include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeConfig.php');
 
 // Load toolbar class
-include( AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php' );
+include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeToolbar.php');
 
 // Load partners tab if admin
 if (is_admin()) {
@@ -28,25 +28,25 @@ 
 }
 
 // Do we gzip when caching (needed early to load autoptimizeCache.php)
-define('AUTOPTIMIZE_CACHE_NOGZIP',(bool) get_option('autoptimize_cache_nogzip'));
+define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip'));
 
 // Load cache class
 include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCache.php');
 
 // wp-content dir name (automagically set, should not be needed), dirname of AO cache dir and AO-prefix can be overridden in wp-config.php
-if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME','/'.wp_basename( WP_CONTENT_DIR )); }
-if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR','/cache/autoptimize/'); }
+if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) { define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR)); }
+if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) { define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/'); }
 if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) { define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_'); }
 
 // Plugin dir constants (plugin url's defined later to accomodate domain mapped sites)
-if (is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true )) {
+if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
     $blog_id = get_current_blog_id();
-    define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
+    define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
 } else {
     define('AUTOPTIMIZE_CACHE_DIR', WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR);
 }
-define('AUTOPTIMIZE_CACHE_DELAY',true);
-define('WP_ROOT_DIR',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',WP_CONTENT_DIR));
+define('AUTOPTIMIZE_CACHE_DELAY', true);
+define('WP_ROOT_DIR', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', WP_CONTENT_DIR));
 
 // Initialize the cache at least once
 $conf = autoptimizeConfig::instance();
@@ -54,65 +54,65 @@ 
 /* Check if we're updating, in which case we might need to do stuff and flush the cache
 to avoid old versions of aggregated files lingering around */
 
-$autoptimize_version="2.2.0";
-$autoptimize_db_version=get_option('autoptimize_version','none');
+$autoptimize_version = "2.2.0";
+$autoptimize_db_version = get_option('autoptimize_version', 'none');
 
 if ($autoptimize_db_version !== $autoptimize_version) {
-    if ($autoptimize_db_version==="none") {
+    if ($autoptimize_db_version === "none") {
         add_action('admin_notices', 'autoptimize_install_config_notice');
     } else {
         // updating, include the update-code
         include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeUpdateCode.php');
     }
 
-    update_option('autoptimize_version',$autoptimize_version);
-    $autoptimize_db_version=$autoptimize_version;
+    update_option('autoptimize_version', $autoptimize_version);
+    $autoptimize_db_version = $autoptimize_version;
 }
 
 // Load translations
 function autoptimize_load_plugin_textdomain() {
-    load_plugin_textdomain('autoptimize',false,plugin_basename(dirname( __FILE__ )).'/localization');
+    load_plugin_textdomain('autoptimize', false, plugin_basename(dirname(__FILE__)).'/localization');
 }
-add_action( 'init', 'autoptimize_load_plugin_textdomain' );
+add_action('init', 'autoptimize_load_plugin_textdomain');
 
-function autoptimize_uninstall(){
+function autoptimize_uninstall() {
     autoptimizeCache::clearall();
 
-    $delete_options=array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice","autoptimize_css_include_inline","autoptimize_js_include_inline","autoptimize_css_nogooglefont","autoptimize_optimize_logged","autoptimize_optimize_checkout");
+    $delete_options = array("autoptimize_cache_clean", "autoptimize_cache_nogzip", "autoptimize_css", "autoptimize_css_datauris", "autoptimize_css_justhead", "autoptimize_css_defer", "autoptimize_css_defer_inline", "autoptimize_css_inline", "autoptimize_css_exclude", "autoptimize_html", "autoptimize_html_keepcomments", "autoptimize_js", "autoptimize_js_exclude", "autoptimize_js_forcehead", "autoptimize_js_justhead", "autoptimize_js_trycatch", "autoptimize_version", "autoptimize_show_adv", "autoptimize_cdn_url", "autoptimize_cachesize_notice", "autoptimize_css_include_inline", "autoptimize_js_include_inline", "autoptimize_css_nogooglefont", "autoptimize_optimize_logged", "autoptimize_optimize_checkout");
 
-    if ( !is_multisite() ) {
-        foreach ($delete_options as $del_opt) { delete_option( $del_opt ); }
+    if (!is_multisite()) {
+        foreach ($delete_options as $del_opt) { delete_option($del_opt); }
     } else {
         global $wpdb;
-        $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+        $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
         $original_blog_id = get_current_blog_id();
-        foreach ( $blog_ids as $blog_id ) {
-            switch_to_blog( $blog_id );
-            foreach ($delete_options as $del_opt) { delete_option( $del_opt ); }
+        foreach ($blog_ids as $blog_id) {
+            switch_to_blog($blog_id);
+            foreach ($delete_options as $del_opt) { delete_option($del_opt); }
         }
-        switch_to_blog( $original_blog_id );
+        switch_to_blog($original_blog_id);
     }
 
-    if ( wp_get_schedule( 'ao_cachechecker' ) ) {
-        wp_clear_scheduled_hook( 'ao_cachechecker' );
+    if (wp_get_schedule('ao_cachechecker')) {
+        wp_clear_scheduled_hook('ao_cachechecker');
     }
 }
 
 function autoptimize_install_config_notice() {
     echo '<div class="updated"><p>';
-    _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' );
+    _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize');
     echo '</p></div>';
 }
 
 function autoptimize_update_config_notice() {
     echo '<div class="updated"><p>';
-    _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' );
+    _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize');
     echo '</p></div>';
 }
 
 function autoptimize_cache_unavailable_notice() {
     echo '<div class="error"><p>';
-    printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR );
+    printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR);
     echo '</p></div>';
 }
 
@@ -121,27 +121,27 @@ 
     $ao_noptimize = false;
 
     // noptimize in qs to get non-optimized page for debugging
-    if (array_key_exists("ao_noptimize",$_GET) || array_key_exists("ao_noptirocket",$_GET)) {
-        if ( ( ($_GET["ao_noptimize"]==="1") || ($_GET["ao_noptirocket"]==="1") ) && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) {
+    if (array_key_exists("ao_noptimize", $_GET) || array_key_exists("ao_noptirocket", $_GET)) {
+        if ((($_GET["ao_noptimize"] === "1") || ($_GET["ao_noptirocket"] === "1")) && (apply_filters('autoptimize_filter_honor_qs_noptimize', true))) {
             $ao_noptimize = true;
         }
     }
 
     // check for DONOTMINIFY constant as used by e.g. WooCommerce POS
-    if (defined('DONOTMINIFY') && (constant('DONOTMINIFY')===true || constant('DONOTMINIFY')==="true")) {
+    if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === "true")) {
         $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') ) {
+	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' ) {
+	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() ) {
+		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;
 			}
@@ -149,11 +149,11 @@ 
 	}
 
     // filter you can use to block autoptimization on your own terms
-    $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );
+    $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize);
 
-    if (!is_feed() && !$ao_noptimize && !is_admin() && ( !function_exists('is_customize_preview') || !is_customize_preview() ) ) {
+    if (!is_feed() && !$ao_noptimize && !is_admin() && (!function_exists('is_customize_preview') || !is_customize_preview())) {
         // load speedupper conditionally (true by default?)
-        if ( apply_filters('autoptimize_filter_speedupper', true) ) {
+        if (apply_filters('autoptimize_filter_speedupper', true)) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classlesses/autoptimizeSpeedupper.php');
         }
 
@@ -164,7 +164,7 @@ 
         include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeBase.php');
 
         // Load extra classes and set some vars
-        if($conf->get('autoptimize_html')) {
+        if ($conf->get('autoptimize_html')) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeHTML.php');
             // BUG: new minify-html does not support keeping HTML comments, skipping for now
             // if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
@@ -174,7 +174,7 @@ 
             // }
         }
 
-        if($conf->get('autoptimize_js')) {
+        if ($conf->get('autoptimize_js')) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeScripts.php');
             if (!class_exists('JSMin')) {
                 if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
@@ -183,15 +183,15 @@ 
                     @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/minify-2.3.1-jsmin.php');
                 }
             }
-            if ( ! defined( 'CONCATENATE_SCRIPTS' )) {
-                define('CONCATENATE_SCRIPTS',false);
+            if (!defined('CONCATENATE_SCRIPTS')) {
+                define('CONCATENATE_SCRIPTS', false);
             }
-            if ( ! defined( 'COMPRESS_SCRIPTS' )) {
-                define('COMPRESS_SCRIPTS',false);
+            if (!defined('COMPRESS_SCRIPTS')) {
+                define('COMPRESS_SCRIPTS', false);
             }
         }
 
-        if($conf->get('autoptimize_css')) {
+        if ($conf->get('autoptimize_css')) {
             include(AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeStyles.php');
             if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) {
                 if (!class_exists('Minify_CSS_Compressor')) {
@@ -202,13 +202,13 @@ 
                     @include(AUTOPTIMIZE_PLUGIN_DIR.'classes/external/php/yui-php-cssmin-2.4.8-4_fgo.php');
                 }
             }
-            if ( ! defined( 'COMPRESS_CSS' )) {
-                define('COMPRESS_CSS',false);
+            if (!defined('COMPRESS_CSS')) {
+                define('COMPRESS_CSS', false);
             }
         }
 
         // filter to be used with care, kills all output buffers when true. use with extreme caution. you have been warned!
-        if (apply_filters('autoptimize_filter_obkiller',false)) {
+        if (apply_filters('autoptimize_filter_obkiller', false)) {
             while (ob_get_level() > 0) {
                 ob_end_clean();
             }
@@ -220,36 +220,36 @@ 
 
 // Action on end, this is where the magic happens
 function autoptimize_end_buffering($content) {
-    if ( ((stripos($content,"<html") === false) && (stripos($content,"<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/',$content) === 1 || stripos($content,"<xsl:stylesheet") !== false ) { return $content; }
+    if (((stripos($content, "<html") === false) && (stripos($content, "<!DOCTYPE html") === false)) || preg_match('/<html[^>]*(?:amp|⚡)/', $content) === 1 || stripos($content, "<xsl:stylesheet") !== false) { return $content; }
 
     // load URL constants as late as possible to allow domain mapper to kick in
     if (function_exists("domain_mapping_siteurl")) {
-        define('AUTOPTIMIZE_WP_SITE_URL',domain_mapping_siteurl(get_current_blog_id()));
-        define('AUTOPTIMIZE_WP_CONTENT_URL',str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL),AUTOPTIMIZE_WP_SITE_URL,content_url()));
+        define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id()));
+        define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url()));
     } else {
-        define('AUTOPTIMIZE_WP_SITE_URL',site_url());
-        define('AUTOPTIMIZE_WP_CONTENT_URL',content_url());
+        define('AUTOPTIMIZE_WP_SITE_URL', site_url());
+        define('AUTOPTIMIZE_WP_CONTENT_URL', content_url());
     }
 
-    if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches' , true ) ) {
+    if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
         $blog_id = get_current_blog_id();
-        define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/' );
+        define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
     } else {
-        define('AUTOPTIMIZE_CACHE_URL',AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
+        define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
     }
-    define('AUTOPTIMIZE_WP_ROOT_URL',str_replace(AUTOPTIMIZE_WP_CONTENT_NAME,'',AUTOPTIMIZE_WP_CONTENT_URL));
-    define('AUTOPTIMIZE_HASH',wp_hash(AUTOPTIMIZE_CACHE_DIR));
+    define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
+    define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_DIR));
 
     // Config element
     $conf = autoptimizeConfig::instance();
 
     // Choose the classes
     $classes = array();
-    if($conf->get('autoptimize_js'))
+    if ($conf->get('autoptimize_js'))
         $classes[] = 'autoptimizeScripts';
-    if($conf->get('autoptimize_css'))
+    if ($conf->get('autoptimize_css'))
         $classes[] = 'autoptimizeStyles';
-    if($conf->get('autoptimize_html'))
+    if ($conf->get('autoptimize_html'))
         $classes[] = 'autoptimizeHTML';
 
     // Set some options
@@ -278,12 +278,12 @@ 
         )
     );
 
-    $content = apply_filters( 'autoptimize_filter_html_before_minify', $content );
+    $content = apply_filters('autoptimize_filter_html_before_minify', $content);
 
     // Run the classes
-    foreach($classes as $name) {
+    foreach ($classes as $name) {
         $instance = new $name($content);
-        if($instance->read($classoptions[$name])) {
+        if ($instance->read($classoptions[$name])) {
             $instance->minify();
             $instance->cache();
             $content = $instance->getcontent();
@@ -291,19 +291,19 @@ 
         unset($instance);
     }
     
-    $content = apply_filters( 'autoptimize_html_after_minify', $content );
+    $content = apply_filters('autoptimize_html_after_minify', $content);
     return $content;
 }
 
-if ( autoptimizeCache::cacheavail() ) {
+if (autoptimizeCache::cacheavail()) {
     $conf = autoptimizeConfig::instance();
-    if( $conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') ) {
+    if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) {
         // Hook to wordpress
         if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
-            add_action('init','autoptimize_start_buffering',-1);
+            add_action('init', 'autoptimize_start_buffering', -1);
         } else {
             if (!defined('AUTOPTIMIZE_HOOK_INTO')) { define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect'); }
-            add_action(constant("AUTOPTIMIZE_HOOK_INTO"),'autoptimize_start_buffering',2);
+            add_action(constant("AUTOPTIMIZE_HOOK_INTO"), 'autoptimize_start_buffering', 2);
         }
     }
 } else {
@@ -311,9 +311,9 @@ 
 }
 
 function autoptimize_activate() {
-    register_uninstall_hook( __FILE__, 'autoptimize_uninstall' );
+    register_uninstall_hook(__FILE__, 'autoptimize_uninstall');
 }
-register_activation_hook( __FILE__, 'autoptimize_activate' );
+register_activation_hook(__FILE__, 'autoptimize_activate');
 
 include_once('classlesses/autoptimizeCacheChecker.php');