futtta / autoptimize

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.1.99";
-$autoptimize_db_version=get_option('autoptimize_version','none');
+$autoptimize_version = "2.1.99";
+$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)) {
-        if ( ($_GET["ao_noptimize"]==="1") && (apply_filters('autoptimize_filter_honor_qs_noptimize',true)) ) {
+    if (array_key_exists("ao_noptimize", $_GET)) {
+        if (($_GET["ao_noptimize"] === "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-p10/cssmin.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_URL.microtime()));
+    define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
+    define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_URL.microtime()));
 
     // 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');
 

classes/autoptimizeStyles.php

Spacing +187 added lines, -187 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+if (!defined('ABSPATH')) exit; // Exit if accessed directly

 

 class autoptimizeStyles extends autoptimizeBase {

 

@@ -23,12 +23,12 @@ 
 

     //Reads the page and collects style tags

     public function read($options) {

-        $noptimizeCSS = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );

+        $noptimizeCSS = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);

         if ($noptimizeCSS) return false;

 

-        $whitelistCSS = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content );

+        $whitelistCSS = apply_filters('autoptimize_filter_css_whitelist', '', $this->content);

         if (!empty($whitelistCSS)) {

-            $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistCSS)));

+            $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistCSS)));

         }

         

         if ($options['nogooglefont'] == true) {

@@ -36,33 +36,33 @@ 
         } else {

             $removableCSS = "";

         }

-        $removableCSS = apply_filters( 'autoptimize_filter_css_removables', $removableCSS);

+        $removableCSS = apply_filters('autoptimize_filter_css_removables', $removableCSS);

         if (!empty($removableCSS)) {

-            $this->cssremovables = array_filter(array_map('trim',explode(",",$removableCSS)));

+            $this->cssremovables = array_filter(array_map('trim', explode(",", $removableCSS)));

         }

 

-        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize',256);

+        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);

 

         // filter to "late inject minified CSS", default to true for now (it is faster)

-        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late',true);

+        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);

 

         // Remove everything that's not the header

-        if ( apply_filters('autoptimize_filter_css_justhead',$options['justhead']) == true ) {

-            $content = explode('</head>',$this->content,2);

+        if (apply_filters('autoptimize_filter_css_justhead', $options['justhead']) == true) {

+            $content = explode('</head>', $this->content, 2);

             $this->content = $content[0].'</head>';

             $this->restofcontent = $content[1];

         }

 

         // include inline?

-        if( apply_filters('autoptimize_css_include_inline',$options['include_inline']) == true ) {

+        if (apply_filters('autoptimize_css_include_inline', $options['include_inline']) == true) {

             $this->include_inline = true;

         }

         

         // what CSS shouldn't be autoptimized

         $excludeCSS = $options['css_exclude'];

-        $excludeCSS = apply_filters( 'autoptimize_filter_css_exclude', $excludeCSS, $this->content );

-        if ($excludeCSS!=="") {

-            $this->dontmove = array_filter(array_map('trim',explode(",",$excludeCSS)));

+        $excludeCSS = apply_filters('autoptimize_filter_css_exclude', $excludeCSS, $this->content);

+        if ($excludeCSS !== "") {

+            $this->dontmove = array_filter(array_map('trim', explode(",", $excludeCSS)));

         } else {

             $this->dontmove = "";

         }

@@ -70,17 +70,17 @@ 
         // should we defer css?

         // value: true/ false

         $this->defer = $options['defer'];

-        $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content );

+        $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);

 

         // should we inline while deferring?

         // value: inlined CSS

         $this->defer_inline = $options['defer_inline'];

-        $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content );

+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->defer_inline, $this->content);

 

         // should we inline?

         // value: true/ false

         $this->inline = $options['inline'];

-        $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content );

+        $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);

         

         // get cdn url

         $this->cdn_url = $options['cdn_url'];

@@ -92,7 +92,7 @@ 
         $this->content = $this->hide_noptimize($this->content);

         

         // exclude (no)script, as those may contain CSS which should be left as is

-        if ( strpos( $this->content, '<script' ) !== false ) { 

+        if (strpos($this->content, '<script') !== false) { 

             $this->content = preg_replace_callback(

                 '#<(?:no)?script.*?<\/(?:no)?script>#is',

                 create_function(

@@ -110,65 +110,65 @@ 
         $this->content = $this->hide_comments($this->content);

         

         // Get <style> and <link>

-        if(preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi',$this->content,$matches)) {

-            foreach($matches[0] as $tag) {

-                if ($this->isremovable($tag,$this->cssremovables)) {

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

+        if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {

+            foreach ($matches[0] as $tag) {

+                if ($this->isremovable($tag, $this->cssremovables)) {

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

                 } else if ($this->ismovable($tag)) {

                     // Get the media

-                    if(strpos($tag,'media=')!==false) {

-                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui',$tag,$medias);

-                        $medias = explode(',',$medias[1]);

+                    if (strpos($tag, 'media=') !== false) {

+                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);

+                        $medias = explode(',', $medias[1]);

                         $media = array();

-                        foreach($medias as $elem) {

-                            if (empty($elem)) { $elem="all"; }

+                        foreach ($medias as $elem) {

+                            if (empty($elem)) { $elem = "all"; }

                             $media[] = $elem;

                         }

                     } else {

                         // No media specified - applies to all

                         $media = array('all');

                     }

-                    $media = apply_filters( 'autoptimize_filter_css_tagmedia',$media,$tag );

+                    $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);

                 

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

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

                         // <link>

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

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

                         $url = $explUrl[0];

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

                         

-                        if($path!==false && preg_match('#\.css$#',$path)) {

+                        if ($path !== false && preg_match('#\.css$#', $path)) {

                             // Good link

-                            $this->css[] = array($media,$path);

-                        }else{

+                            $this->css[] = array($media, $path);

+                        } else {

                             // Link is dynamic (.php etc)

                             $tag = '';

                         }

                     } else {

                         // inline css in style tags can be wrapped in comment tags, so restore comments

                         $tag = $this->restore_comments($tag);

-                        preg_match('#<style.*>(.*)</style>#Usmi',$tag,$code);

+                        preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);

 

                         // and re-hide them to be able to to the removal based on tag

                         $tag = $this->hide_comments($tag);

 

-                        if ( $this->include_inline ) {

-                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm','$1',$code[1]);

-                            $this->css[] = array($media,'INLINE;'.$code);

+                        if ($this->include_inline) {

+                            $code = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);

+                            $this->css[] = array($media, 'INLINE;'.$code);

                         } else {

                             $tag = '';

                         }

                     }

                     

                     // Remove the original style tag

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

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

                 } else {

 					// excluded CSS, minify if getpath 

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

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

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

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

                         $url = $explUrl[0];

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

  					

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

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

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

 

 							if (!empty($_CachedMinifiedUrl)) {

@@ -179,12 +179,12 @@ 
 							}

 							

 							// remove querystring from URL

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

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

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

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

 							}

 

 							// and replace

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

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

 						}

 					}					

 				}

@@ -197,31 +197,31 @@ 
     

     // Joins and optimizes CSS

     public function minify() {

-        foreach($this->css as $group) {

-            list($media,$css) = $group;

-            if(preg_match('#^INLINE;#',$css)) {

+        foreach ($this->css as $group) {

+            list($media, $css) = $group;

+            if (preg_match('#^INLINE;#', $css)) {

                 // <style>

-                $css = preg_replace('#^INLINE;#','',$css);

-                $css = $this->fixurls(ABSPATH.'/index.php',$css);

-                $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, "" );

-                if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle) ) {

-                    $css=$tmpstyle;

-                    $this->alreadyminified=true;

+                $css = preg_replace('#^INLINE;#', '', $css);

+                $css = $this->fixurls(ABSPATH.'/index.php', $css);

+                $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, "");

+                if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {

+                    $css = $tmpstyle;

+                    $this->alreadyminified = true;

                 }

             } else {

                 //<link>

-                if($css !== false && file_exists($css) && is_readable($css)) {

+                if ($css !== false && file_exists($css) && is_readable($css)) {

                     $cssPath = $css;

                     $cssContents = file_get_contents($cssPath);

                     $cssHash = md5($cssContents);

-                    $css = $this->fixurls($cssPath,$cssContents);

-                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$css);

-                    $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $cssPath );

+                    $css = $this->fixurls($cssPath, $cssContents);

+                    $css = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);

+                    $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $cssPath);

                     if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {

-                        $css=$tmpstyle;

-                        $this->alreadyminified=true;

-                    } else if ($this->can_inject_late($cssPath,$css)) {

-                        $css="/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/";

+                        $css = $tmpstyle;

+                        $this->alreadyminified = true;

+                    } else if ($this->can_inject_late($cssPath, $css)) {

+                        $css = "/*!%%INJECTLATER%%".base64_encode($cssPath)."|".$cssHash."%%INJECTLATER%%*/";

                     }

                 } else {

                     // Couldn't read CSS. Maybe getpath isn't working?

@@ -229,8 +229,8 @@ 
                 }

             }

             

-            foreach($media as $elem) {

-                if(!isset($this->csscode[$elem]))

+            foreach ($media as $elem) {

+                if (!isset($this->csscode[$elem]))

                     $this->csscode[$elem] = '';

                 $this->csscode[$elem] .= "\n/*FILESTART*/".$css;

             }

@@ -239,12 +239,12 @@ 
         // Check for duplicate code

         $md5list = array();

         $tmpcss = $this->csscode;

-        foreach($tmpcss as $media => $code) {

+        foreach ($tmpcss as $media => $code) {

             $md5sum = md5($code);

             $medianame = $media;

-            foreach($md5list as $med => $sum) {

+            foreach ($md5list as $med => $sum) {

                 // If same code

-                if($sum === $md5sum) {

+                if ($sum === $md5sum) {

                     //Add the merged code

                     $medianame = $med.', '.$media;

                     $this->csscode[$medianame] = $code;

@@ -264,30 +264,30 @@ 
             $external_imports = "";

 

             // remove comments to avoid importing commented-out imports

-            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us','',$thiscss);

+            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);

 

-            while(preg_match_all('#@import.*(?:;|$)#Um',$thiscss_nocomments,$matches)) {

-                foreach($matches[0] as $import)    {

-                    if ($this->isremovable($import,$this->cssremovables)) {

-                        $thiscss = str_replace($import,'',$thiscss);

+            while (preg_match_all('#@import.*(?:;|$)#Um', $thiscss_nocomments, $matches)) {

+                foreach ($matches[0] as $import) {

+                    if ($this->isremovable($import, $this->cssremovables)) {

+                        $thiscss = str_replace($import, '', $thiscss);

                         $import_ok = true;

                     } else {

-                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#','$1',trim($import))," \t\n\r\0\x0B\"'");

+                        $url = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");

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

                         $import_ok = false;

                         if (file_exists($path) && is_readable($path)) {

-                            $code = addcslashes($this->fixurls($path,file_get_contents($path)),"\\");

-                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$code);

-                            $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, "" );

-                            if ( has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {

-                                $code=$tmpstyle;

-                                $this->alreadyminified=true;

-                            } else if ($this->can_inject_late($path,$code)) {

-                                $code="/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/";

+                            $code = addcslashes($this->fixurls($path, file_get_contents($path)), "\\");

+                            $code = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);

+                            $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, "");

+                            if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {

+                                $code = $tmpstyle;

+                                $this->alreadyminified = true;

+                            } else if ($this->can_inject_late($path, $code)) {

+                                $code = "/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($path)."|".md5($code)."%%INJECTLATER%%*/";

                             }

                             

-                            if(!empty($code)) {

-                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import,'#').'#Us','/*FILESTART2*/'.$code.'$1',$thiscss);

+                            if (!empty($code)) {

+                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);

                                 if (!empty($tmp_thiscss)) {

                                     $thiscss = $tmp_thiscss;

                                     $import_ok = true;

@@ -301,31 +301,31 @@ 
                     if (!$import_ok) {

                         // external imports and general fall-back

                         $external_imports .= $import;

-                        $thiscss = str_replace($import,'',$thiscss);

+                        $thiscss = str_replace($import, '', $thiscss);

                         $fiximports = true;

                     }

                 }

-                $thiscss = preg_replace('#/\*FILESTART\*/#','',$thiscss);

-                $thiscss = preg_replace('#/\*FILESTART2\*/#','/*FILESTART*/',$thiscss);

+                $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);

+                $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);

                 

                 // and update $thiscss_nocomments before going into next iteration in while loop

-                $thiscss_nocomments=preg_replace('#/\*.*\*/#Us','',$thiscss);

+                $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);

             }

             unset($thiscss_nocomments);

             

             // add external imports to top of aggregated CSS

-            if($fiximports) {

-                $thiscss=$external_imports.$thiscss;

+            if ($fiximports) {

+                $thiscss = $external_imports.$thiscss;

             }

         }

         unset($thiscss);

         

         // $this->csscode has all the uncompressed code now. 

-        foreach($this->csscode as &$code) {

+        foreach ($this->csscode as &$code) {

             // Check for already-minified code

             $hash = md5($code);

-            $ccheck = new autoptimizeCache($hash,'css');

-            if($ccheck->check()) {

+            $ccheck = new autoptimizeCache($hash, 'css');

+            if ($ccheck->check()) {

                 $code = $ccheck->retrieve();

                 $this->hashmap[md5($code)] = $hash;

                 continue;

@@ -334,44 +334,44 @@ 
 

             // Do the imaging!

             $imgreplace = array();

-            preg_match_all( self::ASSETS_REGEX, $code, $matches );

+            preg_match_all(self::ASSETS_REGEX, $code, $matches);

 

-            if ( ($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches)) ) {

-                foreach($matches[1] as $count => $quotedurl) {

-                    $iurl = trim($quotedurl," \t\n\r\0\x0B\"'");

+            if (($this->datauris == true) && (function_exists('base64_encode')) && (is_array($matches))) {

+                foreach ($matches[1] as $count => $quotedurl) {

+                    $iurl = trim($quotedurl, " \t\n\r\0\x0B\"'");

 

                     // if querystring, remove it from url

-                    if (strpos($iurl,'?') !== false) { $iurl = strtok($iurl,'?'); }

+                    if (strpos($iurl, '?') !== false) { $iurl = strtok($iurl, '?'); }

                     

                     $ipath = $this->getpath($iurl);

 

                     $datauri_max_size = 4096;

-                    $datauri_max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', $datauri_max_size );

-                    $datauri_exclude = apply_filters( 'autoptimize_filter_css_datauri_exclude', "");

+                    $datauri_max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', $datauri_max_size);

+                    $datauri_exclude = apply_filters('autoptimize_filter_css_datauri_exclude', "");

                     if (!empty($datauri_exclude)) {

-                        $no_datauris=array_filter(array_map('trim',explode(",",$datauri_exclude)));

+                        $no_datauris = array_filter(array_map('trim', explode(",", $datauri_exclude)));

                         foreach ($no_datauris as $no_datauri) {

-                            if (strpos($iurl,$no_datauri)!==false) {

-                                $ipath=false;

+                            if (strpos($iurl, $no_datauri) !== false) {

+                                $ipath = false;

                                 break;

                             }

                         }

                     }

 

-                    if($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i',$ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {

-                        $ihash=md5($ipath);

-                        $icheck = new autoptimizeCache($ihash,'img');

-                        if($icheck->check()) {

+                    if ($ipath != false && preg_match('#\.(jpe?g|png|gif|bmp)$#i', $ipath) && file_exists($ipath) && is_readable($ipath) && filesize($ipath) <= $datauri_max_size) {

+                        $ihash = md5($ipath);

+                        $icheck = new autoptimizeCache($ihash, 'img');

+                        if ($icheck->check()) {

                             // we have the base64 image in cache

-                            $headAndData=$icheck->retrieve();

-                            $_base64data=explode(";base64,",$headAndData);

-                            $base64data=$_base64data[1];

+                            $headAndData = $icheck->retrieve();

+                            $_base64data = explode(";base64,", $headAndData);

+                            $base64data = $_base64data[1];

                         } else {

                             // It's an image and we don't have it in cache, get the type

-                            $explA=explode('.',$ipath);

-                            $type=end($explA);

+                            $explA = explode('.', $ipath);

+                            $type = end($explA);

 

-                            switch($type) {

+                            switch ($type) {

                                 case 'jpeg':

                                     $dataurihead = 'data:image/jpeg;base64,';

                                     break;

@@ -393,42 +393,42 @@ 
                         

                             // Encode the data

                             $base64data = base64_encode(file_get_contents($ipath));

-                            $headAndData=$dataurihead.$base64data;

+                            $headAndData = $dataurihead.$base64data;

 

                             // Save in cache

-                            $icheck->cache($headAndData,"text/plain");

+                            $icheck->cache($headAndData, "text/plain");

                         }

                         unset($icheck);

 

                         // Add it to the list for replacement

-                        $imgreplace[$matches[0][$count]] = str_replace($quotedurl,$headAndData,$matches[0][$count]);

+                        $imgreplace[$matches[0][$count]] = str_replace($quotedurl, $headAndData, $matches[0][$count]);

                     } else {

                         // just cdn the URL if applicable

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

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

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

 						}

                     }

                 }

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

                 // change urls to cdn-url

-                foreach($matches[1] as $count => $quotedurl) {

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

+                foreach ($matches[1] as $count => $quotedurl) {

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

                 }

             }

             

-            if(!empty($imgreplace)) {

-                $code = str_replace(array_keys($imgreplace),array_values($imgreplace),$code);

+            if (!empty($imgreplace)) {

+                $code = str_replace(array_keys($imgreplace), array_values($imgreplace), $code);

             }

             

             // Minify

-            if (($this->alreadyminified!==true) && (apply_filters( "autoptimize_css_do_minify", true))) {

+            if (($this->alreadyminified !== true) && (apply_filters("autoptimize_css_do_minify", true))) {

                 if (class_exists('Minify_CSS_Compressor')) {

                     $tmp_code = trim(Minify_CSS_Compressor::process($code));

-                } 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($code));

-                    } elseif (@is_callable(array($cssmin,"minify"))) {

+                    } elseif (@is_callable(array($cssmin, "minify"))) {

                         $tmp_code = trim(CssMin::minify($code));

                     }

                 }

@@ -440,7 +440,7 @@ 
             

             $code = $this->inject_minified($code);

             

-            $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code );

+            $tmp_code = apply_filters('autoptimize_css_after_minify', $code);

             if (!empty($tmp_code)) {

                 $code = $tmp_code;

                 unset($tmp_code);

@@ -455,13 +455,13 @@ 
     //Caches the CSS in uncompressed, deflated and gzipped form.

     public function cache() {

         // CSS cache

-        foreach($this->csscode as $media => $code) {

+        foreach ($this->csscode as $media => $code) {

             $md5 = $this->hashmap[md5($code)];

                 

-            $cache = new autoptimizeCache($md5,'css');

-            if(!$cache->check()) {

+            $cache = new autoptimizeCache($md5, 'css');

+            if (!$cache->check()) {

                 // Cache our code

-                $cache->cache($code,'text/css');

+                $cache->cache($code, 'text/css');

             }

             $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname();

         }

@@ -476,7 +476,7 @@ 
         $this->content = $this->restore_comments($this->content);

         

         // restore (no)script

-        if ( strpos( $this->content, '%%SCRIPT%%' ) !== false ) { 

+        if (strpos($this->content, '%%SCRIPT%%') !== false) { 

             $this->content = preg_replace_callback(

                 '#%%SCRIPT'.AUTOPTIMIZE_HASH.'%%(.*?)%%SCRIPT%%#is',

                 create_function(

@@ -491,74 +491,74 @@ 
         $this->content = $this->restore_noptimize($this->content);

         

         //Restore the full content

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

+        if (!empty($this->restofcontent)) {

             $this->content .= $this->restofcontent;

             $this->restofcontent = '';

         }

         

         // Inject the new stylesheets

-        $replaceTag = array("<title","before");

-        $replaceTag = apply_filters( 'autoptimize_filter_css_replacetag', $replaceTag, $this->content );

+        $replaceTag = array("<title", "before");

+        $replaceTag = apply_filters('autoptimize_filter_css_replacetag', $replaceTag, $this->content);

 

         if ($this->inline == true) {

-            foreach($this->csscode as $media => $code) {

-                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>',$replaceTag);

+            foreach ($this->csscode as $media => $code) {

+                $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$code.'</style>', $replaceTag);

             }

         } else {

             if ($this->defer == true) {

                 $preloadCssBlock = "";

                 $noScriptCssBlock = "<noscript id=\"aonoscrcss\">";

-                $defer_inline_code=$this->defer_inline;

-                if(!empty($defer_inline_code)){

-                    if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {

+                $defer_inline_code = $this->defer_inline;

+                if (!empty($defer_inline_code)) {

+                    if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {

                         $iCssHash = md5($defer_inline_code);

-                        $iCssCache = new autoptimizeCache($iCssHash,'css');

-                        if($iCssCache->check()) { 

+                        $iCssCache = new autoptimizeCache($iCssHash, 'css');

+                        if ($iCssCache->check()) { 

                             // we have the optimized inline CSS in cache

-                            $defer_inline_code=$iCssCache->retrieve();

+                            $defer_inline_code = $iCssCache->retrieve();

                         } else {

                             if (class_exists('Minify_CSS_Compressor')) {

                                 $tmp_code = trim(Minify_CSS_Compressor::process($defer_inline_code));

-                            } else if(class_exists('CSSmin')) {

+                            } else if (class_exists('CSSmin')) {

                                 $cssmin = new CSSmin();

                                 $tmp_code = trim($cssmin->run($defer_inline_code));

                             }

                             if (!empty($tmp_code)) {

                                 $defer_inline_code = $tmp_code;

-                                $iCssCache->cache($defer_inline_code,"text/css");

+                                $iCssCache->cache($defer_inline_code, "text/css");

                                 unset($tmp_code);

                             }

                         }

                     }

-                    $code_out='<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';

-                    $this->inject_in_html($code_out,$replaceTag);

+                    $code_out = '<style type="text/css" id="aoatfcss" media="all">'.$defer_inline_code.'</style>';

+                    $this->inject_in_html($code_out, $replaceTag);

                 }

             }

 

-            foreach($this->url as $media => $url) {

+            foreach ($this->url as $media => $url) {

                 $url = $this->url_replace_cdn($url);

                 

                 //Add the stylesheet either deferred (import at bottom) or normal links in head

-                if($this->defer == true) {

+                if ($this->defer == true) {

                     $preloadCssBlock .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="this.rel=\'stylesheet\'" />';

                     $noScriptCssBlock .= '<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />';

                 } else {

                     if (strlen($this->csscode[$media]) > $this->cssinlinesize) {

-                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />',$replaceTag);

-                    } else if (strlen($this->csscode[$media])>0) {

-                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>',$replaceTag);

+                        $this->inject_in_html('<link type="text/css" media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replaceTag);

+                    } else if (strlen($this->csscode[$media]) > 0) {

+                        $this->inject_in_html('<style type="text/css" media="'.$media.'">'.$this->csscode[$media].'</style>', $replaceTag);

                     }

                 }

             }

             

-            if($this->defer == true) {

+            if ($this->defer == true) {

                 $preloadPolyfill = '<script data-cfasync=\'false\'>/*! loadCSS. [c]2017 Filament Group, Inc. MIT License */

 !function(a){"use strict";var b=function(b,c,d){function e(a){return h.body?a():void setTimeout(function(){e(a)})}function f(){i.addEventListener&&i.removeEventListener("load",f),i.media=d||"all"}var g,h=a.document,i=h.createElement("link");if(c)g=c;else{var j=(h.body||h.getElementsByTagName("head")[0]).childNodes;g=j[j.length-1]}var k=h.styleSheets;i.rel="stylesheet",i.href=b,i.media="only x",e(function(){g.parentNode.insertBefore(i,c?g:g.nextSibling)});var l=function(a){for(var b=i.href,c=k.length;c--;)if(k[c].href===b)return a();setTimeout(function(){l(a)})};return i.addEventListener&&i.addEventListener("load",f),i.onloadcssdefined=l,l(f),i};"undefined"!=typeof exports?exports.loadCSS=b:a.loadCSS=b}("undefined"!=typeof global?global:this);

 /*! loadCSS rel=preload polyfill. [c]2017 Filament Group, Inc. MIT License */

 !function(a){if(a.loadCSS){var b=loadCSS.relpreload={};if(b.support=function(){try{return a.document.createElement("link").relList.supports("preload")}catch(b){return!1}},b.poly=function(){for(var b=a.document.getElementsByTagName("link"),c=0;c<b.length;c++){var d=b[c];"preload"===d.rel&&"style"===d.getAttribute("as")&&(a.loadCSS(d.href,d,d.getAttribute("media")),d.rel=null)}},!b.support()){b.poly();var c=a.setInterval(b.poly,300);a.addEventListener&&a.addEventListener("load",function(){b.poly(),a.clearInterval(c)}),a.attachEvent&&a.attachEvent("onload",function(){a.clearInterval(c)})}}}(this);</script>';

                 $noScriptCssBlock .= "</noscript>";

-                $this->inject_in_html($preloadCssBlock.$noScriptCssBlock,$replaceTag);

-                $this->inject_in_html($preloadPolyfill,array('</body>','before'));

+                $this->inject_in_html($preloadCssBlock.$noScriptCssBlock, $replaceTag);

+                $this->inject_in_html($preloadPolyfill, array('</body>', 'before'));

             }

         }

 

@@ -568,62 +568,62 @@ 
     

     static function fixurls($file, $code) {

         // Switch all imports to the url() syntax

-        $code = preg_replace( '#@import ("|\')(.+?)\.css.*("|\')#', '@import url("${2}.css")', $code );

+        $code = preg_replace('#@import ("|\')(.+?)\.css.*("|\')#', '@import url("${2}.css")', $code);

 

-        if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {

-            $file = str_replace( WP_ROOT_DIR, '/', $file );

-            $dir = dirname( $file ); // Like /themes/expound/css

+        if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {

+            $file = str_replace(WP_ROOT_DIR, '/', $file);

+            $dir = dirname($file); // Like /themes/expound/css

 

             // $dir should not contain backslashes, since it's used to replace

             // urls, but it can contain them when running on Windows because

             // fixurls() is sometimes called with `ABSPATH . 'index.php'`

-            $dir = str_replace( '\\', '/', $dir );

-            unset( $file ); // not used below at all

+            $dir = str_replace('\\', '/', $dir);

+            unset($file); // not used below at all

 

             $replace = array();

-            foreach ( $matches[1] as $k => $url ) {

+            foreach ($matches[1] as $k => $url) {

                 // Remove quotes

-                $url    = trim( $url," \t\n\r\0\x0B\"'" );

-                $noQurl = trim( $url, "\"'" );

-                if ( $url !== $noQurl ) {

+                $url    = trim($url, " \t\n\r\0\x0B\"'");

+                $noQurl = trim($url, "\"'");

+                if ($url !== $noQurl) {

                     $removedQuotes = true;

                 } else {

                     $removedQuotes = false;

                 }

 

-                if ( '' === $noQurl ) {

+                if ('' === $noQurl) {

                     continue;

                 }

 

                 $url = $noQurl;

-                if ( '/' === $url{0} || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) {

+                if ('/' === $url{0} || preg_match('#^(https?://|ftp://|data:)#i', $url)) {

                     // URL is protocol-relative, host-relative or something we don't touch

                     continue;

                 } else {

                     // Relative URL

-                    $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );

+                    $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));

 

                     // Hash the url + whatever was behind potentially for replacement

                     // We must do this, or different css classes referencing the same bg image (but

                     // different parts of it, say, in sprites and such) loose their stuff...

-                    $hash = md5( $url . $matches[2][$k] );

-                    $code = str_replace( $matches[0][$k], $hash, $code );

+                    $hash = md5($url.$matches[2][$k]);

+                    $code = str_replace($matches[0][$k], $hash, $code);

 

-                    if ( $removedQuotes ) {

-                        $replace[$hash] = "url('" . $newurl . "')" . $matches[2][$k];

+                    if ($removedQuotes) {

+                        $replace[$hash] = "url('".$newurl."')".$matches[2][$k];

                     } else {

-                        $replace[$hash] = 'url(' . $newurl . ')' . $matches[2][$k];

+                        $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];

                     }

                 }

             }

 

-            if ( ! empty( $replace ) ) {

+            if (!empty($replace)) {

                 // Sort the replacements array by key length in desc order (so that the longest strings are replaced first)

-                $keys = array_map( 'strlen', array_keys( $replace ) );

-                array_multisort( $keys, SORT_DESC, $replace );

+                $keys = array_map('strlen', array_keys($replace));

+                array_multisort($keys, SORT_DESC, $replace);

 

                 // Replace URLs found within $code

-                $code = str_replace( array_keys( $replace ), array_values( $replace ), $code );

+                $code = str_replace(array_keys($replace), array_values($replace), $code);

             }

         }

 

@@ -631,11 +631,11 @@ 
     }

     

     private function ismovable($tag) {

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

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

 			return false;

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

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

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

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

                     return true;

                 }

             }

@@ -643,8 +643,8 @@ 
             return false;

         } else {

             if (is_array($this->dontmove)) {

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

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

+                foreach ($this->dontmove as $match) {

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

                         //Matched something

                         return false;

                     }

@@ -656,21 +656,21 @@ 
         }

     }

     

-    private function can_inject_late($cssPath,$css) {

+    private function can_inject_late($cssPath, $css) {

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

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

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

             // late-inject turned off

             return false;

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

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

 			// file not minified based on filename & filter

 			return false;

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

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

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

             return false;

-        } else if ( (strpos($css,"@font-face")!==false ) && ( apply_filters("autoptimize_filter_css_fonts_cdn",false)===true) && (!empty($this->cdn_url)) ) {

+        } else if ((strpos($css, "@font-face") !== false) && (apply_filters("autoptimize_filter_css_fonts_cdn", false) === true) && (!empty($this->cdn_url))) {

             // don't late-inject CSS with font-src's if fonts are set to be CDN'ed

             return false;

-        } else if ( (($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui",$css) ) {

+        } else if ((($this->datauris == true) || (!empty($this->cdn_url))) && preg_match("#background[^;}]*url\(#Ui", $css)) {

             // don't late-inject CSS with images if CDN is set OR is image inlining is on

             return false;

         } else {

@@ -680,11 +680,11 @@ 
     }

     

     private function maybe_cdn_urls($inUrl) {

-        $url = trim($inUrl," \t\n\r\0\x0B\"'");

-        $urlPath = parse_url($url,PHP_URL_PATH);

+        $url = trim($inUrl, " \t\n\r\0\x0B\"'");

+        $urlPath = parse_url($url, PHP_URL_PATH);

 

         // exclude fonts from CDN except if filter returns true

-        if ( !preg_match('#\.(woff2?|eot|ttf|otf)$#i',$urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn',false) ) {

+        if (!preg_match('#\.(woff2?|eot|ttf|otf)$#i', $urlPath) || apply_filters('autoptimize_filter_css_fonts_cdn', false)) {

             $cdn_url = $this->url_replace_cdn($url);

         } else {

             $cdn_url = $url;

classes/autoptimizeScripts.php

Spacing +115 added lines, -115 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 class autoptimizeScripts extends autoptimizeBase {
     private $scripts = array();
-    private $dontmove = array('document.write','html5.js','show_ads.js','google_ad','blogcatalog.com/w','tweetmeme.com/i','mybloglog.com/','histats.com/js','ads.smowtion.com/ad.js','statcounter.com/counter/counter.js','widgets.amung.us','ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar','intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject','plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize');
-    private $domove = array('gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go');
-    private $domovelast = array('addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/','jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go');
+    private $dontmove = array('document.write', 'html5.js', 'show_ads.js', 'google_ad', 'blogcatalog.com/w', 'tweetmeme.com/i', 'mybloglog.com/', 'histats.com/js', 'ads.smowtion.com/ad.js', 'statcounter.com/counter/counter.js', 'widgets.amung.us', 'ws.amazon.com/widgets', 'media.fastclick.net', '/ads/', 'comment-form-quicktags/quicktags.php', 'edToolbar', 'intensedebate.com', 'scripts.chitika.net/', '_gaq.push', 'jotform.com/', 'admin-bar.min.js', 'GoogleAnalyticsObject', 'plupload.full.min.js', 'syntaxhighlighter', 'adsbygoogle', 'gist.github.com', '_stq', 'nonce', 'post_id', 'data-noptimize');
+    private $domove = array('gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go');
+    private $domovelast = array('addthis.com', '/afsonline/show_afs_search.js', 'disqus.js', 'networkedblogs.com/getnetworkwidget', 'infolinks.com/js/', 'jd.gallery.js.php', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'linkwithin.com/widget.js', 'tiny_mce.js', 'tinyMCEPreInit.go');
     private $trycatch = false;
     private $alreadyminified = false;
     private $forcehead = true;
@@ -21,70 +21,70 @@ 
     
     //Reads the page and collects script tags
     public function read($options) {
-        $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content );
+        $noptimizeJS = apply_filters('autoptimize_filter_js_noptimize', false, $this->content);
         if ($noptimizeJS) return false;
 
         // only optimize known good JS?
-        $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content );
+        $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', '', $this->content);
         if (!empty($whitelistJS)) {
-            $this->whitelist = array_filter(array_map('trim',explode(",",$whitelistJS)));
+            $this->whitelist = array_filter(array_map('trim', explode(",", $whitelistJS)));
         }
 
         // is there JS we should simply remove
-        $removableJS = apply_filters( 'autoptimize_filter_js_removables', '', $this->content );
+        $removableJS = apply_filters('autoptimize_filter_js_removables', '', $this->content);
         if (!empty($removableJS)) {
-            $this->jsremovables = array_filter(array_map('trim',explode(",",$removableJS)));
+            $this->jsremovables = array_filter(array_map('trim', explode(",", $removableJS)));
         }
 
         // only header?
-        if( apply_filters('autoptimize_filter_js_justhead', $options['justhead']) == true ) {
-            $content = explode('</head>',$this->content,2);
+        if (apply_filters('autoptimize_filter_js_justhead', $options['justhead']) == true) {
+            $content = explode('</head>', $this->content, 2);
             $this->content = $content[0].'</head>';
             $this->restofcontent = $content[1];
         }
         
         // include inline?
-        if( apply_filters('autoptimize_js_include_inline', $options['include_inline']) == true ) {
+        if (apply_filters('autoptimize_js_include_inline', $options['include_inline']) == true) {
             $this->include_inline = true;
         }
 
         // filter to "late inject minified JS", default to true for now (it is faster)
-        $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late',true);
+        $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true);
 
         // filters to override hardcoded do(nt)move(last) array contents (array in, array out!)
-        $this->dontmove = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove );        
-        $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast );
-        $this->domove = apply_filters( 'autoptimize_filter_js_domove', $this->domove );
+        $this->dontmove = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove);        
+        $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast);
+        $this->domove = apply_filters('autoptimize_filter_js_domove', $this->domove);
 
         // get extra exclusions settings or filter
         $excludeJS = $options['js_exclude'];
-        $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS, $this->content );
-        if ($excludeJS!=="") {
+        $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS, $this->content);
+        if ($excludeJS !== "") {
             if (is_array($excludeJS)) {
-                if(($removeKeys = array_keys($excludeJS,"remove")) !== false) {
+                if (($removeKeys = array_keys($excludeJS, "remove")) !== false) {
                     foreach ($removeKeys as $removeKey) {
                         unset($excludeJS[$removeKey]);
-                        $this->jsremovables[]=$removeKey;
+                        $this->jsremovables[] = $removeKey;
                     }
                 }
                 $exclJSArr = array_keys($excludeJS);
             } else {
-                $exclJSArr = array_filter(array_map('trim',explode(",",$excludeJS)));
+                $exclJSArr = array_filter(array_map('trim', explode(",", $excludeJS)));
             }
-            $this->dontmove = array_merge($exclJSArr,$this->dontmove);
+            $this->dontmove = array_merge($exclJSArr, $this->dontmove);
         }
 
         //Should we add try-catch?
-        if($options['trycatch'] == true)
+        if ($options['trycatch'] == true)
             $this->trycatch = true;
 
         // force js in head?    
-        if($options['forcehead'] == true) {
+        if ($options['forcehead'] == true) {
             $this->forcehead = true;
         } else {
             $this->forcehead = false;
         }
-        $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead );
+        $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead);
 
         // get cdn url
         $this->cdn_url = $options['cdn_url'];
@@ -99,24 +99,24 @@ 
         $this->content = $this->hide_comments($this->content);
 
         // Get script files
-        if (preg_match_all('#<script.*</script>#Usmi',$this->content,$matches)) {
-            foreach($matches[0] as $tag) {
+        if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) {
+            foreach ($matches[0] as $tag) {
                 // only consider script aggregation for types whitelisted in should_aggregate-function
-                if( !$this->should_aggregate($tag) ) {
-                    $tag='';
+                if (!$this->should_aggregate($tag)) {
+                    $tag = '';
                     continue;
                 }
 
-                if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi',$tag,$source)) {
+                if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) {
                     // non-inline script
-                    if ($this->isremovable($tag,$this->jsremovables)) {
-                        $this->content = str_replace($tag,'',$this->content);
+                    if ($this->isremovable($tag, $this->jsremovables)) {
+                        $this->content = str_replace($tag, '', $this->content);
                         continue;
                     }
-                    $explUrl = explode('?',$source[2],2);
+                    $explUrl = explode('?', $source[2], 2);
                     $url = $explUrl[0];
                     $path = $this->getpath($url);
-                    if($path !== false && preg_match('#\.js$#',$path) && $this->ismergeable($tag)) {
+                    if ($path !== false && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) {
                         // ok to optimize, add to array
                         $this->scripts[] = $path;
                     } else {
@@ -127,14 +127,14 @@ 
                         if (is_array($excludeJS)) {
                             // 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);
+                                if (strpos($origTag, $exclTag) !== false && in_array($exclFlags, array("async", "defer"))) {
+                                   $newTag = str_replace('<script ', '<script '.$exclFlags.' ', $newTag);
                                 }
                             }
                         }
                         
    						// should we minify the non-aggregated script?
-						if ($path && apply_filters('autoptimize_filter_js_minify_excluded',false)) {
+						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
@@ -143,23 +143,23 @@ 
 							}
 							
 							// remove querystring from URL in newTag
-							if ( !empty($explUrl[1]) ) {
-								$newTag = str_replace("?".$explUrl[1],"",$newTag);
+							if (!empty($explUrl[1])) {
+								$newTag = str_replace("?".$explUrl[1], "", $newTag);
 							}
 						}
 
 						// should we move the non-aggregated script?
-                        if( $this->ismovable($newTag) ) {
+                        if ($this->ismovable($newTag)) {
                             // can be moved, flags and all
-                            if( $this->movetolast($newTag) )    {
+                            if ($this->movetolast($newTag)) {
                                 $this->move['last'][] = $newTag;
                             } else {
                                 $this->move['first'][] = $newTag;
                             }
                         } else {
                             // cannot be moved, so if flag was added re-inject altered tag immediately
-                            if ( $origTag !== $newTag ) {
-                                $this->content = str_replace($origTag,$newTag,$this->content);
+                            if ($origTag !== $newTag) {
+                                $this->content = str_replace($origTag, $newTag, $this->content);
                                 $origTag = '';
                             }
                             // and forget about the $tag (not to be touched any more)
@@ -168,23 +168,23 @@ 
                     }
                 } else {
                     // Inline script
-                    if ($this->isremovable($tag,$this->jsremovables)) {
-                        $this->content = str_replace($tag,'',$this->content);
+                    if ($this->isremovable($tag, $this->jsremovables)) {
+                        $this->content = str_replace($tag, '', $this->content);
                         continue;
                     }
                     
                     // unhide comments, as javascript may be wrapped in comment-tags for old times' sake
                     $tag = $this->restore_comments($tag);
-                    if($this->ismergeable($tag) && ( $this->include_inline )) {
-                        preg_match('#<script.*>(.*)</script>#Usmi',$tag,$code);
-                        $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm','$1',$code[1]);
-                        $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/','',$code);
+                    if ($this->ismergeable($tag) && ($this->include_inline)) {
+                        preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code);
+                        $code = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]);
+                        $code = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code);
                         $this->scripts[] = 'INLINE;'.$code;
                     } else {
                         // Can we move this?
-                        $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag );
-                        if( $this->ismovable($tag) || $autoptimize_js_moveable !== '' ) {
-                            if( $this->movetolast($tag) || $autoptimize_js_moveable === 'last' ) {
+                        $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag);
+                        if ($this->ismovable($tag) || $autoptimize_js_moveable !== '') {
+                            if ($this->movetolast($tag) || $autoptimize_js_moveable === 'last') {
                                 $this->move['last'][] = $tag;
                             } else {
                                 $this->move['first'][] = $tag;
@@ -199,7 +199,7 @@ 
                 }
                 
                 //Remove the original script tag
-                $this->content = str_replace($tag,'',$this->content);
+                $this->content = str_replace($tag, '', $this->content);
             }
             
             return true;
@@ -211,39 +211,39 @@ 
     
     //Joins and optimizes JS
     public function minify() {
-        foreach($this->scripts as $script) {
-            if(preg_match('#^INLINE;#',$script)) {
+        foreach ($this->scripts as $script) {
+            if (preg_match('#^INLINE;#', $script)) {
                 //Inline script
-                $script = preg_replace('#^INLINE;#','',$script);
-                $script = rtrim( $script, ";\n\t\r" ) . ';';
+                $script = preg_replace('#^INLINE;#', '', $script);
+                $script = rtrim($script, ";\n\t\r").';';
                 //Add try-catch?
-                if($this->trycatch) {
+                if ($this->trycatch) {
                     $script = 'try{'.$script.'}catch(e){}';
                 }
-                $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, '' );
-                if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscript) ) {
-                    $script=$tmpscript;
-                    $this->alreadyminified=true;
+                $tmpscript = apply_filters('autoptimize_js_individual_script', $script, '');
+                if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) {
+                    $script = $tmpscript;
+                    $this->alreadyminified = true;
                 }
-                $this->jscode .= "\n" . $script;
+                $this->jscode .= "\n".$script;
             } else {
                 //External script
-                if($script !== false && file_exists($script) && is_readable($script)) {
+                if ($script !== false && file_exists($script) && is_readable($script)) {
                     $scriptsrc = file_get_contents($script);
                     $scripthash = md5($scriptsrc);
-                    $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/','',$scriptsrc);
-                    $scriptsrc = rtrim($scriptsrc,";\n\t\r").';';
+                    $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc);
+                    $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';';
 
                     //Add try-catch?
-                    if($this->trycatch) {
+                    if ($this->trycatch) {
                         $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}';
                     }
-                    $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script );
-                    if ( has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc) ) {
-                        $scriptsrc=$tmpscriptsrc;
-                        $this->alreadyminified=true;
+                    $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script);
+                    if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) {
+                        $scriptsrc = $tmpscriptsrc;
+                        $this->alreadyminified = true;
                     } else if ($this->can_inject_late($script)) {
-                        $scriptsrc="/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($script)."|".$scripthash."%%INJECTLATER%%*/";
+                        $scriptsrc = "/*!%%INJECTLATER".AUTOPTIMIZE_HASH."%%".base64_encode($script)."|".$scripthash."%%INJECTLATER%%*/";
                     }
                     $this->jscode .= "\n".$scriptsrc;
                 }/*else{
@@ -254,24 +254,24 @@ 
 
         //Check for already-minified code
         $this->md5hash = md5($this->jscode);
-        $ccheck = new autoptimizeCache($this->md5hash,'js');
-        if($ccheck->check()) {
+        $ccheck = new autoptimizeCache($this->md5hash, 'js');
+        if ($ccheck->check()) {
             $this->jscode = $ccheck->retrieve();
             return true;
         }
         unset($ccheck);
         
         //$this->jscode has all the uncompressed code now.
-        if ($this->alreadyminified!==true) {
-          if (class_exists('JSMin') && apply_filters( 'autoptimize_js_do_minify' , true)) {
-            if (@is_callable(array("JSMin","minify"))) {
+        if ($this->alreadyminified !== 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)) {
                     $this->jscode = $tmp_jscode;
                     unset($tmp_jscode);
                 }
                 $this->jscode = $this->inject_minified($this->jscode);
-                $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
+                $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
                 return true;
             } else {
                 $this->jscode = $this->inject_minified($this->jscode);
@@ -282,16 +282,16 @@ 
               return false;
           }
         }
-        $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
+        $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
         return true;
     }
     
     //Caches the JS in uncompressed, deflated and gzipped form.
-    public function cache()    {
-        $cache = new autoptimizeCache($this->md5hash,'js');
-        if(!$cache->check()) {
+    public function cache() {
+        $cache = new autoptimizeCache($this->md5hash, 'js');
+        if (!$cache->check()) {
             //Cache our code
-            $cache->cache($this->jscode,'text/javascript');
+            $cache->cache($this->jscode, 'text/javascript');
         }
         $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         $this->url = $this->url_replace_cdn($this->url);
@@ -300,32 +300,32 @@ 
     // Returns the content
     public function getcontent() {
         // Restore the full content
-        if(!empty($this->restofcontent)) {
+        if (!empty($this->restofcontent)) {
             $this->content .= $this->restofcontent;
             $this->restofcontent = '';
         }
         
         // Add the scripts taking forcehead/ deferred (default) into account
-        if($this->forcehead == true) {
-            $replaceTag=array("</head>","before");
-            $defer="";
+        if ($this->forcehead == true) {
+            $replaceTag = array("</head>", "before");
+            $defer = "";
         } else {
-            $replaceTag=array("</body>","before");
-            $defer="defer ";
+            $replaceTag = array("</body>", "before");
+            $defer = "defer ";
         }
         
-        $defer = apply_filters( 'autoptimize_filter_js_defer', $defer );
+        $defer = apply_filters('autoptimize_filter_js_defer', $defer);
         $bodyreplacementpayload = '<script type="text/javascript" '.$defer.'src="'.$this->url.'"></script>';
-        $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload',$bodyreplacementpayload);
+        $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload);
 
-        $bodyreplacement = implode('',$this->move['first']);
+        $bodyreplacement = implode('', $this->move['first']);
         $bodyreplacement .= $bodyreplacementpayload;
-        $bodyreplacement .= implode('',$this->move['last']);
+        $bodyreplacement .= implode('', $this->move['last']);
 
-        $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag );
+        $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag);
 
-        if (strlen($this->jscode)>0) {
-            $this->inject_in_html($bodyreplacement,$replaceTag);
+        if (strlen($this->jscode) > 0) {
+            $this->inject_in_html($bodyreplacement, $replaceTag);
         }
         
         // restore comments
@@ -343,19 +343,19 @@ 
     
     // Checks against the white- and blacklists
     private function ismergeable($tag) {
-		if (apply_filters('autoptimize_filter_js_dontaggregate',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) {
+                if (strpos($tag, $match) !== false) {
                     return true;
                 }
             }
             // no match with whitelist
             return false;
         } else {
-            foreach($this->domove as $match) {
-                if(strpos($tag,$match)!==false)    {
+            foreach ($this->domove as $match) {
+                if (strpos($tag, $match) !== false) {
                     // Matched something
                     return false;
                 }
@@ -365,8 +365,8 @@ 
                 return false;
             }
             
-            foreach($this->dontmove as $match) {
-                if(strpos($tag,$match)!==false)    {
+            foreach ($this->dontmove as $match) {
+                if (strpos($tag, $match) !== false) {
                     //Matched something
                     return false;
                 }
@@ -379,12 +379,12 @@ 
     
     // Checks againstt the blacklist
     private function ismovable($tag) {
-        if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable',true)) {
+        if ($this->include_inline !== true || apply_filters('autoptimize_filter_js_unmovable', true)) {
             return false;
         }
         
-        foreach($this->domove as $match) {
-            if(strpos($tag,$match)!==false)    {
+        foreach ($this->domove as $match) {
+            if (strpos($tag, $match) !== false) {
                 // Matched something
                 return true;
             }
@@ -394,8 +394,8 @@ 
             return true;
         }
         
-        foreach($this->dontmove as $match) {
-            if(strpos($tag,$match)!==false) {
+        foreach ($this->dontmove as $match) {
+            if (strpos($tag, $match) !== false) {
                 // Matched something
                 return false;
             }
@@ -406,8 +406,8 @@ 
     }
     
     private function movetolast($tag) {
-        foreach($this->domovelast as $match) {
-            if(strpos($tag,$match)!==false)    {
+        foreach ($this->domovelast as $match) {
+            if (strpos($tag, $match) !== false) {
                 // Matched, return true
                 return true;
             }
@@ -433,10 +433,10 @@ 
      * original function by https://github.com/zytzagoo/ on his AO fork, thanks Tomas!
      */
     public function should_aggregate($tag) {
-        preg_match('#<(script[^>]*)>#i',$tag,$scripttag);
-        if ( strpos($scripttag[1], 'type')===false ) {
+        preg_match('#<(script[^>]*)>#i', $tag, $scripttag);
+        if (strpos($scripttag[1], 'type') === false) {
             return true;
-        } else if ( preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1]) ) {
+        } else if (preg_match('/type\s*=\s*["\']?(?:text|application)\/(?:javascript|ecmascript)["\']?/i', $scripttag[1])) {
             return true;
         } else {
             return false;
@@ -454,11 +454,11 @@ 
      * @return bool
 	 */
 	private function can_inject_late($jsPath) {
-		$consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified',false);
-        if ( $this->inject_min_late !== true ) {
+		$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 ) ) {
+        } 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;
         } else {

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 {