futtta / autoptimize

classes/autoptimizeCacheChecker.php

Spacing +38 added lines, -38 removed lines

@@ -6,7 +6,7 @@ 
  * Checks if cachesize is > 0.5GB (size is filterable), if so, an option is set which controls showing an admin notice.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -25,51 +25,51 @@ 
 
     public function add_hooks()
     {
-        if ( is_admin() ) {
-            add_action( 'plugins_loaded', array( $this, 'setup' ) );
+        if (is_admin()) {
+            add_action('plugins_loaded', array($this, 'setup'));
         }
-        add_action( self::SCHEDULE_HOOK, array( $this, 'cronjob' ) );
-        add_action( 'admin_notices', array( $this, 'show_admin_notice' ) );
+        add_action(self::SCHEDULE_HOOK, array($this, 'cronjob'));
+        add_action('admin_notices', array($this, 'show_admin_notice'));
     }
 
     public function setup()
     {
-        $do_cache_check = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true );
-        $schedule       = wp_get_schedule( self::SCHEDULE_HOOK );
-        $frequency      = apply_filters( 'autoptimize_filter_cachecheck_frequency', 'twicedaily' );
-        if ( ! in_array( $frequency, array( 'hourly', 'twicedaily', 'daily', 'weekly', 'monthly' ) ) ) {
+        $do_cache_check = (bool) apply_filters('autoptimize_filter_cachecheck_do', true);
+        $schedule       = wp_get_schedule(self::SCHEDULE_HOOK);
+        $frequency      = apply_filters('autoptimize_filter_cachecheck_frequency', 'twicedaily');
+        if (!in_array($frequency, array('hourly', 'twicedaily', 'daily', 'weekly', 'monthly'))) {
             $frequency = 'twicedaily';
         }
-        if ( $do_cache_check && ( ! $schedule || $schedule !== $frequency ) ) {
-            if ( $schedule ) {
-                wp_clear_scheduled_hook( self::SCHEDULE_HOOK );
+        if ($do_cache_check && (!$schedule || $schedule !== $frequency)) {
+            if ($schedule) {
+                wp_clear_scheduled_hook(self::SCHEDULE_HOOK);
             }
-            wp_schedule_event( time(), $frequency, self::SCHEDULE_HOOK );
-        } elseif ( $schedule && ! $do_cache_check ) {
-            wp_clear_scheduled_hook( self::SCHEDULE_HOOK );
+            wp_schedule_event(time(), $frequency, self::SCHEDULE_HOOK);
+        } elseif ($schedule && !$do_cache_check) {
+            wp_clear_scheduled_hook(self::SCHEDULE_HOOK);
         }
     }
 
     public function cronjob()
     {
         // Check cachesize and act accordingly.
-        $max_size       = (int) apply_filters( 'autoptimize_filter_cachecheck_maxsize', 536870912 );
-        $do_cache_check = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true );
+        $max_size       = (int) apply_filters('autoptimize_filter_cachecheck_maxsize', 536870912);
+        $do_cache_check = (bool) apply_filters('autoptimize_filter_cachecheck_do', true);
         $stat_array     = autoptimizeCache::stats();
-        $cache_size     = round( $stat_array[1] );
-        if ( ( $cache_size > $max_size ) && ( $do_cache_check ) ) {
-            autoptimizeOptionWrapper::update_option( 'autoptimize_cachesize_notice', true );
-            if ( apply_filters( 'autoptimize_filter_cachecheck_sendmail', true ) ) {
-                $home_url  = esc_url( home_url() );
-                $ao_mailto = apply_filters( 'autoptimize_filter_cachecheck_mailto', autoptimizeOptionWrapper::get_option( 'admin_email', '' ) );
-
-                $ao_mailsubject = __( 'Autoptimize cache size warning', 'autoptimize' ) . ' (' . $home_url . ')';
-                $ao_mailbody    = __( 'Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize' ) . ' (site: ' . $home_url . ')';
-
-                if ( ! empty( $ao_mailto ) ) {
-                    $ao_mailresult = wp_mail( $ao_mailto, $ao_mailsubject, $ao_mailbody );
-                    if ( ! $ao_mailresult ) {
-                        error_log( 'Autoptimize could not send cache size warning mail.' );
+        $cache_size     = round($stat_array[1]);
+        if (($cache_size > $max_size) && ($do_cache_check)) {
+            autoptimizeOptionWrapper::update_option('autoptimize_cachesize_notice', true);
+            if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) {
+                $home_url  = esc_url(home_url());
+                $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', autoptimizeOptionWrapper::get_option('admin_email', ''));
+
+                $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize').' ('.$home_url.')';
+                $ao_mailbody    = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize').' (site: '.$home_url.')';
+
+                if (!empty($ao_mailto)) {
+                    $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody);
+                    if (!$ao_mailresult) {
+                        error_log('Autoptimize could not send cache size warning mail.');
                     }
                 }
             }
@@ -87,16 +87,16 @@ 
 
     public function show_admin_notice()
     {
-        if ( (bool) autoptimizeOptionWrapper::get_option( 'autoptimize_cachesize_notice', false ) && current_user_can( 'manage_options' ) ) {
+        if ((bool) autoptimizeOptionWrapper::get_option('autoptimize_cachesize_notice', false) && current_user_can('manage_options')) {
             echo '<div class="notice notice-warning"><p>';
-            _e( '<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank" rel="noopener noreferrer">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' );
+            _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank" rel="noopener noreferrer">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize');
             echo '</p></div>';
-            autoptimizeOptionWrapper::update_option( 'autoptimize_cachesize_notice', false );
+            autoptimizeOptionWrapper::update_option('autoptimize_cachesize_notice', false);
         }
 
         // Notice for image proxy usage.
         $_imgopt_notice = autoptimizeImages::instance()->get_imgopt_status_notice_wrapper();
-        if ( current_user_can( 'manage_options' ) && is_array( $_imgopt_notice ) && array_key_exists( 'status', $_imgopt_notice ) && in_array( $_imgopt_notice['status'], array( 1, -1, -2, -3 ) ) ) {
+        if (current_user_can('manage_options') && is_array($_imgopt_notice) && array_key_exists('status', $_imgopt_notice) && in_array($_imgopt_notice['status'], array(1, -1, -2, -3))) {
             $_dismissible = 'ao-img-opt-notice-';
             $_hide_notice = '7';
 
@@ -104,10 +104,10 @@ 
                 $_hide_notice = '1';
             }
 
-            $_imgopt_notice_dismissible = apply_filters( 'autoptimize_filter_imgopt_notice_dismissable', $_dismissible . $_hide_notice );
+            $_imgopt_notice_dismissible = apply_filters('autoptimize_filter_imgopt_notice_dismissable', $_dismissible.$_hide_notice);
 
-            if ( $_imgopt_notice && PAnD::is_admin_notice_active( $_imgopt_notice_dismissible ) ) {
-                echo '<div class="notice notice-warning is-dismissible" data-dismissible="' . $_imgopt_notice_dismissible . '"><p><strong>' . __( 'Autoptimize', 'autoptimize' ) . '</strong>: ' . $_imgopt_notice['notice'] . '</p></div>';
+            if ($_imgopt_notice && PAnD::is_admin_notice_active($_imgopt_notice_dismissible)) {
+                echo '<div class="notice notice-warning is-dismissible" data-dismissible="'.$_imgopt_notice_dismissible.'"><p><strong>'.__('Autoptimize', 'autoptimize').'</strong>: '.$_imgopt_notice['notice'].'</p></div>';
             }
         }
     }

classes/autoptimizePartners.php

Spacing +31 added lines, -31 removed lines

@@ -4,7 +4,7 @@ 
  * addons and/or affiliate services.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -17,68 +17,68 @@ 
 
     public function run()
     {
-        if ( $this->enabled() ) {
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_partner_tabs' ), 10, 1 );
+        if ($this->enabled()) {
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_partner_tabs'), 10, 1);
         }
-        if ( is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
-            add_action( 'network_admin_menu', array( $this, 'add_admin_menu' ) );
+        if (is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
+            add_action('network_admin_menu', array($this, 'add_admin_menu'));
         } else {
-            add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
+            add_action('admin_menu', array($this, 'add_admin_menu'));
         }
     }
 
     protected function enabled()
     {
-        return apply_filters( 'autoptimize_filter_show_partner_tabs', true );
+        return apply_filters('autoptimize_filter_show_partner_tabs', true);
     }
 
-    public function add_partner_tabs( $in )
+    public function add_partner_tabs($in)
     {
-        $in = array_merge( $in, array(
-            'ao_partners' => __( 'Optimize More!', 'autoptimize' ),
-        ) );
+        $in = array_merge($in, array(
+            'ao_partners' => __('Optimize More!', 'autoptimize'),
+        ));
 
         return $in;
     }
 
     public function add_admin_menu()
     {
-        if ( $this->enabled() ) {
-            add_submenu_page( null, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', array( $this, 'ao_partners_page' ) );
+        if ($this->enabled()) {
+            add_submenu_page(null, 'AO partner', 'AO partner', 'manage_options', 'ao_partners', array($this, 'ao_partners_page'));
         }
     }
 
     protected function get_ao_partner_feed_markup()
     {
-        $no_feed_text = __( 'Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize' );
+        $no_feed_text = __('Have a look at <a href="http://optimizingmatters.com/">optimizingmatters.com</a> for Autoptimize power-ups!', 'autoptimize');
         $output       = '';
-        if ( apply_filters( 'autoptimize_settingsscreen_remotehttp', true ) ) {
-            $rss      = fetch_feed( 'http://feeds.feedburner.com/OptimizingMattersDownloads' );
+        if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
+            $rss      = fetch_feed('http://feeds.feedburner.com/OptimizingMattersDownloads');
             $maxitems = 0;
 
-            if ( ! is_wp_error( $rss ) ) {
-                $maxitems  = $rss->get_item_quantity( 20 );
-                $rss_items = $rss->get_items( 0, $maxitems );
+            if (!is_wp_error($rss)) {
+                $maxitems  = $rss->get_item_quantity(20);
+                $rss_items = $rss->get_items(0, $maxitems);
             }
 
-            if ( 0 == $maxitems ) {
+            if (0 == $maxitems) {
                 $output .= $no_feed_text;
             } else {
                 $output .= '<ul>';
-                foreach ( $rss_items as $item ) {
-                    $item_url  = esc_url( $item->get_permalink() );
+                foreach ($rss_items as $item) {
+                    $item_url  = esc_url($item->get_permalink());
                     $enclosure = $item->get_enclosure();
 
                     $output .= '<li class="itemDetail">';
-                    $output .= '<h3 class="itemTitle"><a href="' . $item_url . '" target="_blank">' . esc_html( $item->get_title() ) . '</a></h3>';
+                    $output .= '<h3 class="itemTitle"><a href="'.$item_url.'" target="_blank">'.esc_html($item->get_title()).'</a></h3>';
 
-                    if ( $enclosure && ( false !== strpos( $enclosure->get_type(), 'image' ) ) ) {
-                        $img_url = esc_url( $enclosure->get_link() );
-                        $output .= '<div class="itemImage"><a href="' . $item_url . '" target="_blank"><img src="' . $img_url . '"></a></div>';
+                    if ($enclosure && (false !== strpos($enclosure->get_type(), 'image'))) {
+                        $img_url = esc_url($enclosure->get_link());
+                        $output .= '<div class="itemImage"><a href="'.$item_url.'" target="_blank"><img src="'.$img_url.'"></a></div>';
                     }
 
-                    $output .= '<div class="itemDescription">' . wp_kses_post( $item->get_description() ) . '</div>';
-                    $output .= '<div class="itemButtonRow"><div class="itemButton button-secondary"><a href="' . $item_url . '" target="_blank">' . __( 'More info', 'autoptimize' ) . '</a></div></div>';
+                    $output .= '<div class="itemDescription">'.wp_kses_post($item->get_description()).'</div>';
+                    $output .= '<div class="itemButtonRow"><div class="itemButton button-secondary"><a href="'.$item_url.'" target="_blank">'.__('More info', 'autoptimize').'</a></div></div>';
                     $output .= '</li>';
                 }
                 $output .= '</ul>';
@@ -136,11 +136,11 @@ 
         color: #23282d;
     }
     </style>
-    <script>document.title = "Autoptimize: <?php _e( 'Optimize More!', 'autoptimize' ); ?> " + document.title;</script>
+    <script>document.title = "Autoptimize: <?php _e('Optimize More!', 'autoptimize'); ?> " + document.title;</script>
     <div class="wrap">
-        <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+        <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
         <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
-        <?php echo '<h2>' . __( "These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize' ) . '</h2>'; ?>
+        <?php echo '<h2>'.__("These Autoptimize power-ups and related services will improve your site's performance even more!", 'autoptimize').'</h2>'; ?>
         <div>
             <?php echo $this->get_ao_partner_feed_markup(); ?>
         </div>

config/autoptimize_404_handler.php

Spacing +8 added lines, -8 removed lines

@@ -20,19 +20,19 @@
  * to files that don't exist in AO's cache.
  */
 
-$original_request = strtok( $_SERVER['REQUEST_URI'], '?' );
-$fallback_target  = preg_replace( '/(.*)_(?:[a-z0-9]{32})\.(js|css)$/', '${1}_fallback.${2}', $original_request );
+$original_request = strtok($_SERVER['REQUEST_URI'], '?');
+$fallback_target  = preg_replace('/(.*)_(?:[a-z0-9]{32})\.(js|css)$/', '${1}_fallback.${2}', $original_request);
 $ao_cache_dir     = '<!--ao-cache-dir-->';
-$js_or_css        = pathinfo( $original_request, PATHINFO_EXTENSION );
-$fallback_path    = $ao_cache_dir . $js_or_css . '/autoptimize_fallback.' . $js_or_css;
+$js_or_css        = pathinfo($original_request, PATHINFO_EXTENSION);
+$fallback_path    = $ao_cache_dir.$js_or_css.'/autoptimize_fallback.'.$js_or_css;
 
-if ( $original_request !== $fallback_target && file_exists( $fallback_path ) ) {
+if ($original_request !== $fallback_target && file_exists($fallback_path)) {
     // error_log( 'Autoptimize file ' . $original_request . ' not found, using fallback instead.' );
-    header( 'HTTP/1.1 301 Moved Permanently' );
-    header( 'Location: ' . $fallback_target );
+    header('HTTP/1.1 301 Moved Permanently');
+    header('Location: '.$fallback_target);
 } else {
     // error_log( 'Autoptimize file ' . $original_request . ' not found, sending 410 gone response.' );
-    header( 'HTTP/1.1 410 Gone' );
+    header('HTTP/1.1 410 Gone');
 }
 
 exit();

classes/autoptimizeOptionWrapper.php

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
  * Autoptimize options handler.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -21,8 +21,8 @@ 
      * Ensure that is_plugin_active_for_network function is declared.
      */
     public static function maybe_include_plugin_functions() {
-        if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
-            include_once ABSPATH . 'wp-admin/includes/plugin.php';
+        if (!function_exists('is_plugin_active_for_network')) {
+            include_once ABSPATH.'wp-admin/includes/plugin.php';
         }
     }
 
@@ -33,19 +33,19 @@ 
      * @param mixed  $default Optional. Default value to return if the option does not exist.
      * @return mixed Value set for the option.
      */
-    public static function get_option( $option, $default = false ) {
+    public static function get_option($option, $default = false) {
         // This is always a network setting, it is on by default to ensure settings are available at site level unless explicitly turned off.
-        if ( 'autoptimize_enable_site_config' === $option ) {
-            return get_network_option( get_main_network_id(), $option, 'on' );
+        if ('autoptimize_enable_site_config' === $option) {
+            return get_network_option(get_main_network_id(), $option, 'on');
         }
 
         // If the plugin is network activated and our per site setting is not on, use the network configuration.
-        $configuration_per_site = get_network_option( get_main_network_id(), 'autoptimize_enable_site_config', 'on' );
-        if ( self::is_ao_active_for_network() && ( 'on' !== $configuration_per_site || is_network_admin() ) ) {
-            return get_network_option( get_main_network_id(), $option, $default );
+        $configuration_per_site = get_network_option(get_main_network_id(), 'autoptimize_enable_site_config', 'on');
+        if (self::is_ao_active_for_network() && ('on' !== $configuration_per_site || is_network_admin())) {
+            return get_network_option(get_main_network_id(), $option, $default);
         }
 
-        return get_option( $option, $default );
+        return get_option($option, $default);
     }
 
     /**
@@ -59,11 +59,11 @@ 
      *                              the default value is 'yes'. Default null.
      * @return bool False if value was not updated and true if value was updated.
      */
-    public static function update_option( $option, $value, $autoload = null ) {
-        if ( self::is_ao_active_for_network() && is_network_admin() ) {
-            return update_network_option( get_main_network_id(), $option, $value );
-        } elseif ( 'autoptimize_enable_site_config' !== $option ) {
-            return update_option( $option, $value, $autoload );
+    public static function update_option($option, $value, $autoload = null) {
+        if (self::is_ao_active_for_network() && is_network_admin()) {
+            return update_network_option(get_main_network_id(), $option, $value);
+        } elseif ('autoptimize_enable_site_config' !== $option) {
+            return update_option($option, $value, $autoload);
         }
     }
 
@@ -72,8 +72,8 @@ 
      * in that case, take care of multisite case.
      */
     public static function check_multisite_on_saving_options() {
-        if ( self::is_ao_active_for_network() ) {
-            add_filter( 'pre_update_option', 'autoptimizeOptionWrapper::update_autoptimize_option_on_network', 10, 3 );
+        if (self::is_ao_active_for_network()) {
+            add_filter('pre_update_option', 'autoptimizeOptionWrapper::update_autoptimize_option_on_network', 10, 3);
         }
     }
 
@@ -84,16 +84,16 @@ 
      * @param string $option    Option name.
      * @param string $old_value Old value.
      */
-    public static function update_autoptimize_option_on_network( $value, $option, $old_value ) {
-        if ( strpos( $option, 'autoptimize_' ) === 0 && self::is_options_from_network_admin() ) {
-            if ( self::is_ao_active_for_network() ) {
-                update_network_option( get_main_network_id(), $option, $value );
+    public static function update_autoptimize_option_on_network($value, $option, $old_value) {
+        if (strpos($option, 'autoptimize_') === 0 && self::is_options_from_network_admin()) {
+            if (self::is_ao_active_for_network()) {
+                update_network_option(get_main_network_id(), $option, $value);
                 // Return old value, to stop update_option logic.
                 return $old_value;
             }
-            if ( apply_filters( 'autoptimize_filter_optionwrapper_wp_cache_delete', false ) ) {
+            if (apply_filters('autoptimize_filter_optionwrapper_wp_cache_delete', false)) {
                 // in some (rare) cases options seem to get stuck in WP's Object cache, this should clear it there.
-                wp_cache_delete( $option );
+                wp_cache_delete($option);
             }
         }
         return $value;
@@ -107,8 +107,8 @@ 
     public static function is_options_from_network_admin() {
         static $_really_is_network_admin = null;
 
-        if ( null === $_really_is_network_admin ) {
-            if ( array_key_exists( '_wp_http_referer', $_POST ) && strpos( network_admin_url( 'settings.php' ), strtok( $_POST['_wp_http_referer'], '?' ) ) !== false ) {
+        if (null === $_really_is_network_admin) {
+            if (array_key_exists('_wp_http_referer', $_POST) && strpos(network_admin_url('settings.php'), strtok($_POST['_wp_http_referer'], '?')) !== false) {
                 $_really_is_network_admin = true;
             } else {
                 $_really_is_network_admin = false;
@@ -123,9 +123,9 @@ 
      */
     public static function is_ao_active_for_network() {
         static $_is_ao_active_for_network = null;
-        if ( null === $_is_ao_active_for_network || defined( 'TEST_MULTISITE_FORCE_AO_ON_NETWORK' ) ) {
+        if (null === $_is_ao_active_for_network || defined('TEST_MULTISITE_FORCE_AO_ON_NETWORK')) {
             self::maybe_include_plugin_functions();
-            if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) || is_plugin_active_for_network( 'autoptimize-beta/autoptimize.php' ) || defined( 'TEST_MULTISITE_FORCE_AO_ON_NETWORK' ) ) {
+            if (is_plugin_active_for_network('autoptimize/autoptimize.php') || is_plugin_active_for_network('autoptimize-beta/autoptimize.php') || defined('TEST_MULTISITE_FORCE_AO_ON_NETWORK')) {
                 $_is_ao_active_for_network = true;
             } else {
                 $_is_ao_active_for_network = false;

classes/autoptimizeCriticalCSSCore.php

Doc Comments +6 added lines

@@ -335,6 +335,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $render
+     */
     public static function ao_ccss_key_status( $render ) {
         // Provide key status
         // Get key and key status.
@@ -539,6 +542,9 @@ 
         return true;
     }
 
+    /**
+     * @param integer $lvl
+     */
     public static function ao_ccss_log( $msg, $lvl ) {
         // Commom logging facility
         // Attach debug option.

Spacing +136 added lines, -136 removed lines

@@ -4,7 +4,7 @@ 
  * gets called by AO core, checks the rules and if a matching rule is found returns the associated CCSS.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -13,7 +13,7 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
@@ -27,23 +27,23 @@ 
         global $ao_ccss_key;
 
         // add all filters to do CCSS if key present.
-        if ( $ao_css_defer && isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) ) {
+        if ($ao_css_defer && isset($ao_ccss_key) && !empty($ao_ccss_key)) {
             // Set AO behavior: disable minification to avoid double minifying and caching.
-            add_filter( 'autoptimize_filter_css_critcss_minify', '__return_false' );
-            add_filter( 'autoptimize_filter_css_defer_inline', array( $this, 'ao_ccss_frontend' ), 10, 1 );
+            add_filter('autoptimize_filter_css_critcss_minify', '__return_false');
+            add_filter('autoptimize_filter_css_defer_inline', array($this, 'ao_ccss_frontend'), 10, 1);
 
             // Add the action to enqueue jobs for CriticalCSS cron.
-            add_action( 'autoptimize_action_css_hash', array( 'autoptimizeCriticalCSSEnqueue', 'ao_ccss_enqueue' ), 10, 1 );
+            add_action('autoptimize_action_css_hash', array('autoptimizeCriticalCSSEnqueue', 'ao_ccss_enqueue'), 10, 1);
 
             // conditionally add the filter to defer jquery and others.
-            if ( $ao_ccss_deferjquery ) {
-                add_filter( 'autoptimize_html_after_minify', array( $this, 'ao_ccss_defer_jquery' ), 11, 1 );
+            if ($ao_ccss_deferjquery) {
+                add_filter('autoptimize_html_after_minify', array($this, 'ao_ccss_defer_jquery'), 11, 1);
             }
 
             // Order paths by length, as longest ones have greater priority in the rules.
-            if ( ! empty( $ao_ccss_rules['paths'] ) ) {
-                $keys = array_map( 'strlen', array_keys( $ao_ccss_rules['paths'] ) );
-                array_multisort( $keys, SORT_DESC, $ao_ccss_rules['paths'] );
+            if (!empty($ao_ccss_rules['paths'])) {
+                $keys = array_map('strlen', array_keys($ao_ccss_rules['paths']));
+                array_multisort($keys, SORT_DESC, $ao_ccss_rules['paths']);
             }
 
             // Add an array with default WordPress's conditional tags
@@ -52,11 +52,11 @@ 
             $ao_ccss_types = $this->get_ao_ccss_core_types();
 
             // Extend conditional tags on plugin initalization.
-            add_action( apply_filters( 'autoptimize_filter_ccss_extend_types_hook', 'init' ), array( $this, 'ao_ccss_extend_types' ) );
+            add_action(apply_filters('autoptimize_filter_ccss_extend_types_hook', 'init'), array($this, 'ao_ccss_extend_types'));
         }
     }
 
-    public function ao_ccss_frontend( $inlined ) {
+    public function ao_ccss_frontend($inlined) {
         // Apply CriticalCSS to frontend pages
         // Attach types and settings arrays.
         global $ao_ccss_types;
@@ -68,20 +68,20 @@ 
         $no_ccss = '';
 
         // Only if keystatus is OK and option to add CCSS for logged on users is on or user is not logged in.
-        if ( ( $ao_ccss_keyst && 2 == $ao_ccss_keyst ) && ( $ao_ccss_loggedin || ! is_user_logged_in() ) ) {
+        if (($ao_ccss_keyst && 2 == $ao_ccss_keyst) && ($ao_ccss_loggedin || !is_user_logged_in())) {
             // Check for a valid CriticalCSS based on path to return its contents.
-            $req_path = strtok( urldecode( $_SERVER['REQUEST_URI'] ), '?' );
-            if ( ! empty( $ao_ccss_rules['paths'] ) ) {
-                foreach ( $ao_ccss_rules['paths'] as $path => $rule ) {
+            $req_path = strtok(urldecode($_SERVER['REQUEST_URI']), '?');
+            if (!empty($ao_ccss_rules['paths'])) {
+                foreach ($ao_ccss_rules['paths'] as $path => $rule) {
                     // explicit match OR partial match if MANUAL rule.
-                    if ( $req_path == $path || ( false == $rule['hash'] && false != $rule['file'] && strpos( $req_path, str_replace( site_url(), '', $path ) ) !== false ) ) {
-                        if ( file_exists( AO_CCSS_DIR . $rule['file'] ) ) {
-                            $_ccss_contents = file_get_contents( AO_CCSS_DIR . $rule['file'] );
-                            if ( 'none' != $_ccss_contents ) {
-                                if ( $ao_ccss_debug ) {
-                                    $_ccss_contents = '/* PATH: ' . $path . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                    if ($req_path == $path || (false == $rule['hash'] && false != $rule['file'] && strpos($req_path, str_replace(site_url(), '', $path)) !== false)) {
+                        if (file_exists(AO_CCSS_DIR.$rule['file'])) {
+                            $_ccss_contents = file_get_contents(AO_CCSS_DIR.$rule['file']);
+                            if ('none' != $_ccss_contents) {
+                                if ($ao_ccss_debug) {
+                                    $_ccss_contents = '/* PATH: '.$path.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                 }
-                                return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                             } else {
                                 $no_ccss = 'none';
                             }
@@ -91,55 +91,55 @@ 
             }
 
             // Check for a valid CriticalCSS based on conditional tags to return its contents.
-            if ( ! empty( $ao_ccss_rules['types'] ) && 'none' !== $no_ccss ) {
+            if (!empty($ao_ccss_rules['types']) && 'none' !== $no_ccss) {
                 // order types-rules by the order of the original $ao_ccss_types array so as not to depend on the order in which rules were added.
-                $ao_ccss_rules['types'] = array_replace( array_intersect_key( array_flip( $ao_ccss_types ), $ao_ccss_rules['types'] ), $ao_ccss_rules['types'] );
+                $ao_ccss_rules['types'] = array_replace(array_intersect_key(array_flip($ao_ccss_types), $ao_ccss_rules['types']), $ao_ccss_rules['types']);
                 $is_front_page          = is_front_page();
 
-                foreach ( $ao_ccss_rules['types'] as $type => $rule ) {
-                    if ( in_array( $type, $ao_ccss_types ) && file_exists( AO_CCSS_DIR . $rule['file'] ) ) {
-                        $_ccss_contents = file_get_contents( AO_CCSS_DIR . $rule['file'] );
-                        if ( $is_front_page && 'is_front_page' == $type ) {
-                            if ( 'none' != $_ccss_contents ) {
-                                if ( $ao_ccss_debug ) {
-                                    $_ccss_contents = '/* TYPES: ' . $type . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                foreach ($ao_ccss_rules['types'] as $type => $rule) {
+                    if (in_array($type, $ao_ccss_types) && file_exists(AO_CCSS_DIR.$rule['file'])) {
+                        $_ccss_contents = file_get_contents(AO_CCSS_DIR.$rule['file']);
+                        if ($is_front_page && 'is_front_page' == $type) {
+                            if ('none' != $_ccss_contents) {
+                                if ($ao_ccss_debug) {
+                                    $_ccss_contents = '/* TYPES: '.$type.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                 }
-                                return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                             } else {
                                 $no_ccss = 'none';
                             }
-                        } elseif ( strpos( $type, 'custom_post_' ) === 0 && ! $is_front_page ) {
-                            if ( get_post_type( get_the_ID() ) === substr( $type, 12 ) ) {
-                                if ( 'none' != $_ccss_contents ) {
-                                    if ( $ao_ccss_debug ) {
-                                        $_ccss_contents = '/* TYPES: ' . $type . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                        } elseif (strpos($type, 'custom_post_') === 0 && !$is_front_page) {
+                            if (get_post_type(get_the_ID()) === substr($type, 12)) {
+                                if ('none' != $_ccss_contents) {
+                                    if ($ao_ccss_debug) {
+                                        $_ccss_contents = '/* TYPES: '.$type.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                     }
-                                    return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                    return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                                 } else {
                                     $no_ccss = 'none';
                                 }
                             }
-                        } elseif ( 0 === strpos( $type, 'template_' ) && ! $is_front_page ) {
-                            if ( is_page_template( substr( $type, 9 ) ) ) {
-                                if ( 'none' != $_ccss_contents ) {
-                                    if ( $ao_ccss_debug ) {
-                                        $_ccss_contents = '/* TYPES: ' . $type . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                        } elseif (0 === strpos($type, 'template_') && !$is_front_page) {
+                            if (is_page_template(substr($type, 9))) {
+                                if ('none' != $_ccss_contents) {
+                                    if ($ao_ccss_debug) {
+                                        $_ccss_contents = '/* TYPES: '.$type.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                     }
-                                    return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                    return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                                 } else {
                                     $no_ccss = 'none';
                                 }
                             }
-                        } elseif ( ! $is_front_page ) {
+                        } elseif (!$is_front_page) {
                             // all "normal" conditional tags, core + woo + buddypress + edd + bbpress
                             // but we have to remove the prefix for the non-core ones for them to function.
-                            $type = str_replace( array( 'woo_', 'bp_', 'bbp_', 'edd_' ), '', $type );
-                            if ( function_exists( $type ) && call_user_func( $type ) ) {
-                                if ( 'none' != $_ccss_contents ) {
-                                    if ( $ao_ccss_debug ) {
-                                        $_ccss_contents = '/* TYPES: ' . $type . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                            $type = str_replace(array('woo_', 'bp_', 'bbp_', 'edd_'), '', $type);
+                            if (function_exists($type) && call_user_func($type)) {
+                                if ('none' != $_ccss_contents) {
+                                    if ($ao_ccss_debug) {
+                                        $_ccss_contents = '/* TYPES: '.$type.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                     }
-                                    return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                    return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                                 } else {
                                     $no_ccss = 'none';
                                 }
@@ -152,26 +152,26 @@ 
 
         // Finally, inline the default CriticalCSS if any or else the entire CSS for the page
         // This also applies to logged in users if the option to add CCSS for logged in users has been disabled.
-        if ( ! empty( $inlined ) && 'none' !== $no_ccss ) {
-            return apply_filters( 'autoptimize_filter_ccss_core_ccss', $inlined . $ao_ccss_additional );
+        if (!empty($inlined) && 'none' !== $no_ccss) {
+            return apply_filters('autoptimize_filter_ccss_core_ccss', $inlined.$ao_ccss_additional);
         } else {
-            add_filter( 'autoptimize_filter_css_inline', '__return_true' );
+            add_filter('autoptimize_filter_css_inline', '__return_true');
             return;
         }
     }
 
-    public function ao_ccss_defer_jquery( $in ) {
+    public function ao_ccss_defer_jquery($in) {
         // try to defer all JS (main goal being jquery.js as AO by default does not aggregate that).
-        if ( ( ! is_user_logged_in() || $ao_ccss_loggedin ) && preg_match_all( '#<script.*>(.*)</script>#Usmi', $in, $matches, PREG_SET_ORDER ) ) {
-            foreach ( $matches as $match ) {
-                if ( ( ! preg_match( '/<script.* type\s?=.*>/', $match[0] ) || preg_match( '/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $match[0] ) ) && '' !== $match[1] && ( false !== strpos( $match[1], 'jQuery' ) || false !== strpos( $match[1], '$' ) ) ) {
+        if ((!is_user_logged_in() || $ao_ccss_loggedin) && preg_match_all('#<script.*>(.*)</script>#Usmi', $in, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                if ((!preg_match('/<script.* type\s?=.*>/', $match[0]) || preg_match('/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $match[0])) && '' !== $match[1] && (false !== strpos($match[1], 'jQuery') || false !== strpos($match[1], '$'))) {
                     // inline js that requires jquery, wrap deferring JS around it to defer it.
-                    $new_match = 'var aoDeferInlineJQuery=function(){' . $match[1] . '}; if (document.readyState === "loading") {document.addEventListener("DOMContentLoaded", aoDeferInlineJQuery);} else {aoDeferInlineJQuery();}';
-                    $in        = str_replace( $match[1], $new_match, $in );
-                } elseif ( '' === $match[1] && false !== strpos( $match[0], 'src=' ) && false === strpos( $match[0], 'defer' ) ) {
+                    $new_match = 'var aoDeferInlineJQuery=function(){'.$match[1].'}; if (document.readyState === "loading") {document.addEventListener("DOMContentLoaded", aoDeferInlineJQuery);} else {aoDeferInlineJQuery();}';
+                    $in        = str_replace($match[1], $new_match, $in);
+                } elseif ('' === $match[1] && false !== strpos($match[0], 'src=') && false === strpos($match[0], 'defer')) {
                     // linked non-aggregated JS, defer it.
-                    $new_match = str_replace( '<script ', '<script defer ', $match[0] );
-                    $in        = str_replace( $match[0], $new_match, $in );
+                    $new_match = str_replace('<script ', '<script defer ', $match[0]);
+                    $in        = str_replace($match[0], $new_match, $in);
                 }
             }
         }
@@ -184,9 +184,9 @@ 
         global $ao_ccss_types;
 
         // in some cases $ao_ccss_types is empty and/or not an array, this should work around that problem.
-        if ( empty( $ao_ccss_types ) || ! is_array( $ao_ccss_types ) ) {
+        if (empty($ao_ccss_types) || !is_array($ao_ccss_types)) {
             $ao_ccss_types = get_ao_ccss_core_types();
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Empty types array in extend, refetching array with core conditionals.', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Empty types array in extend, refetching array with core conditionals.', 3);
         }
 
         // Custom Post Types.
@@ -198,18 +198,18 @@ 
             'names',
             'and'
         );
-        foreach ( $cpts as $cpt ) {
-            array_unshift( $ao_ccss_types, 'custom_post_' . $cpt );
+        foreach ($cpts as $cpt) {
+            array_unshift($ao_ccss_types, 'custom_post_'.$cpt);
         }
 
         // Templates.
         $templates = wp_get_theme()->get_page_templates();
-        foreach ( $templates as $tplfile => $tplname ) {
-            array_unshift( $ao_ccss_types, 'template_' . $tplfile );
+        foreach ($templates as $tplfile => $tplname) {
+            array_unshift($ao_ccss_types, 'template_'.$tplfile);
         }
 
         // bbPress tags.
-        if ( function_exists( 'is_bbpress' ) ) {
+        if (function_exists('is_bbpress')) {
             $ao_ccss_types = array_merge(
                 array(
                     'bbp_is_bbpress',
@@ -241,7 +241,7 @@ 
         }
 
         // BuddyPress tags.
-        if ( function_exists( 'is_buddypress' ) ) {
+        if (function_exists('is_buddypress')) {
             $ao_ccss_types = array_merge(
                 array(
                     'bp_is_activation_page',
@@ -283,7 +283,7 @@ 
         }
 
         // Easy Digital Downloads (EDD) tags.
-        if ( function_exists( 'edd_is_checkout' ) ) {
+        if (function_exists('edd_is_checkout')) {
             $ao_ccss_types = array_merge(
                 array(
                     'edd_is_checkout',
@@ -295,7 +295,7 @@ 
         }
 
         // WooCommerce tags.
-        if ( class_exists( 'WooCommerce' ) ) {
+        if (class_exists('WooCommerce')) {
             $ao_ccss_types = array_merge(
                 array(
                     'woo_is_account_page',
@@ -314,7 +314,7 @@ 
 
     public function get_ao_ccss_core_types() {
         global $ao_ccss_types;
-        if ( empty( $ao_ccss_types ) || ! is_array( $ao_ccss_types ) ) {
+        if (empty($ao_ccss_types) || !is_array($ao_ccss_types)) {
             return array(
                 'is_404',
                 'is_archive',
@@ -335,7 +335,7 @@ 
         }
     }
 
-    public static function ao_ccss_key_status( $render ) {
+    public static function ao_ccss_key_status($render) {
         // Provide key status
         // Get key and key status.
         global $ao_ccss_key;
@@ -348,55 +348,55 @@ 
         $key_return = array();
         $status     = false;
 
-        if ( $key && 2 == $key_status ) {
+        if ($key && 2 == $key_status) {
             // Key exists and its status is valid.
             // Set valid key status.
             $status     = 'valid';
-            $status_msg = __( 'Valid' );
+            $status_msg = __('Valid');
             $color      = '#46b450'; // Green.
             $message    = null;
-        } elseif ( $key && 1 == $key_status ) {
+        } elseif ($key && 1 == $key_status) {
             // Key exists but its validation has failed.
             // Set invalid key status.
             $status     = 'invalid';
-            $status_msg = __( 'Invalid' );
+            $status_msg = __('Invalid');
             $color      = '#dc3232'; // Red.
-            $message    = __( 'Your API key is invalid. Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> key.', 'autoptimize' );
-        } elseif ( $key && ! $key_status ) {
+            $message    = __('Your API key is invalid. Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> key.', 'autoptimize');
+        } elseif ($key && !$key_status) {
             // Key exists but it has no valid status yet
             // Perform key validation.
-            $key_check = $self->ao_ccss_key_validation( $key );
+            $key_check = $self->ao_ccss_key_validation($key);
 
             // Key is valid, set valid status.
-            if ( $key_check ) {
+            if ($key_check) {
                 $status     = 'valid';
-                $status_msg = __( 'Valid' );
+                $status_msg = __('Valid');
                 $color      = '#46b450'; // Green.
                 $message    = null;
             } else {
                 // Key is invalid, set invalid status.
                 $status     = 'invalid';
-                $status_msg = __( 'Invalid' );
+                $status_msg = __('Invalid');
                 $color      = '#dc3232'; // Red.
-                if ( get_option( 'autoptimize_ccss_keyst' ) == 1 ) {
-                    $message = __( 'Your API key is invalid. Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> key.', 'autoptimize' );
+                if (get_option('autoptimize_ccss_keyst') == 1) {
+                    $message = __('Your API key is invalid. Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> key.', 'autoptimize');
                 } else {
-                    $message = __( 'Something went wrong when checking your API key, make sure you server can communicate with https://criticalcss.com and/ or try again later.', 'autoptimize' );
+                    $message = __('Something went wrong when checking your API key, make sure you server can communicate with https://criticalcss.com and/ or try again later.', 'autoptimize');
                 }
             }
         } else {
             // No key nor status
             // Set no key status.
             $status     = 'nokey';
-            $status_msg = __( 'None' );
+            $status_msg = __('None');
             $color      = '#ffb900'; // Yellow.
-            $message    = __( 'Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key to start.', 'autoptimize' );
+            $message    = __('Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key to start.', 'autoptimize');
         }
 
         // Fill returned values.
         $key_return['status'] = $status;
         // Provide rendering information if required.
-        if ( $render ) {
+        if ($render) {
             $key_return['stmsg'] = $status_msg;
             $key_return['color'] = $color;
             $key_return['msg']   = $message;
@@ -406,19 +406,19 @@ 
         return $key_return;
     }
 
-    public function ao_ccss_key_validation( $key ) {
+    public function ao_ccss_key_validation($key) {
         // POST a dummy job to criticalcss.com to check for key validation
         // Prepare home URL for the request.
         $src_url = get_home_url();
-        $src_url = apply_filters( 'autoptimize_filter_ccss_cron_srcurl', $src_url );
+        $src_url = apply_filters('autoptimize_filter_ccss_cron_srcurl', $src_url);
 
         // Prepare the request.
-        $url  = esc_url_raw( AO_CCSS_API . 'generate' );
+        $url  = esc_url_raw(AO_CCSS_API.'generate');
         $args = array(
             'headers' => array(
-                'User-Agent'    => 'Autoptimize CriticalCSS Power-Up v' . AO_CCSS_VER,
+                'User-Agent'    => 'Autoptimize CriticalCSS Power-Up v'.AO_CCSS_VER,
                 'Content-type'  => 'application/json; charset=utf-8',
-                'Authorization' => 'JWT ' . $key,
+                'Authorization' => 'JWT '.$key,
                 'Connection'    => 'close',
             ),
             // Body must be JSON.
@@ -432,23 +432,23 @@ 
         );
 
         // Dispatch the request and store its response code.
-        $req  = wp_safe_remote_post( $url, $args );
-        $code = wp_remote_retrieve_response_code( $req );
-        $body = json_decode( wp_remote_retrieve_body( $req ), true );
+        $req  = wp_safe_remote_post($url, $args);
+        $code = wp_remote_retrieve_response_code($req);
+        $body = json_decode(wp_remote_retrieve_body($req), true);
 
-        if ( 200 == $code ) {
+        if (200 == $code) {
             // Response is OK.
             // Set key status as valid and log key check.
-            update_option( 'autoptimize_ccss_keyst', 2 );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is valid, updating key status', 3 );
+            update_option('autoptimize_ccss_keyst', 2);
+            autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is valid, updating key status', 3);
 
             // extract job-id from $body and put it in the queue as a P job
             // but only if no jobs and no rules!
             global $ao_ccss_queue;
             global $ao_ccss_rules;
 
-            if ( 0 == count( $ao_ccss_queue ) && 0 == count( $ao_ccss_rules['types'] ) && 0 == count( $ao_ccss_rules['paths'] ) ) {
-                if ( 'JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status'] ) {
+            if (0 == count($ao_ccss_queue) && 0 == count($ao_ccss_rules['types']) && 0 == count($ao_ccss_rules['paths'])) {
+                if ('JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status']) {
                     $jprops['ljid']     = 'firstrun';
                     $jprops['rtarget']  = 'types|is_front_page';
                     $jprops['ptype']    = 'is_front_page';
@@ -459,30 +459,30 @@ 
                     $jprops['jqstat']   = $body['job']['status'];
                     $jprops['jrstat']   = null;
                     $jprops['jvstat']   = null;
-                    $jprops['jctime']   = microtime( true );
+                    $jprops['jctime']   = microtime(true);
                     $jprops['jftime']   = null;
                     $ao_ccss_queue['/'] = $jprops;
-                    $ao_ccss_queue_raw  = json_encode( $ao_ccss_queue );
-                    update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Created P job for is_front_page based on API key check response.', 3 );
+                    $ao_ccss_queue_raw  = json_encode($ao_ccss_queue);
+                    update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Created P job for is_front_page based on API key check response.', 3);
                 }
             }
             return true;
-        } elseif ( 401 == $code ) {
+        } elseif (401 == $code) {
             // Response is unauthorized
             // Set key status as invalid and log key check.
-            update_option( 'autoptimize_ccss_keyst', 1 );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is invalid, updating key status', 3 );
+            update_option('autoptimize_ccss_keyst', 1);
+            autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is invalid, updating key status', 3);
             return false;
         } else {
             // Response unkown
             // Log key check attempt.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: could not check API key status, this is a service error, body follows if any...', 2 );
-            if ( ! empty( $body ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: could not check API key status, this is a service error, body follows if any...', 2);
+            if (!empty($body)) {
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
             }
-            if ( is_wp_error( $req ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( $req->get_error_message(), 2 );
+            if (is_wp_error($req)) {
+                autoptimizeCriticalCSSCore::ao_ccss_log($req->get_error_message(), 2);
             }
             return false;
         }
@@ -497,14 +497,14 @@ 
         $viewport = array();
 
         // Viewport Width.
-        if ( ! empty( $ao_ccss_viewport['w'] ) ) {
+        if (!empty($ao_ccss_viewport['w'])) {
             $viewport['w'] = $ao_ccss_viewport['w'];
         } else {
             $viewport['w'] = '';
         }
 
         // Viewport Height.
-        if ( ! empty( $ao_ccss_viewport['h'] ) ) {
+        if (!empty($ao_ccss_viewport['h'])) {
             $viewport['h'] = $ao_ccss_viewport['h'];
         } else {
             $viewport['h'] = '';
@@ -513,23 +513,23 @@ 
         return $viewport;
     }
 
-    public static function ao_ccss_check_contents( $ccss ) {
+    public static function ao_ccss_check_contents($ccss) {
         // Perform basic exploit avoidance and CSS validation.
-        if ( ! empty( $ccss ) ) {
+        if (!empty($ccss)) {
             // Try to avoid code injection.
-            $blacklist = array( '#!/', 'function(', '<script', '<?php' );
-            foreach ( $blacklist as $blacklisted ) {
-                if ( strpos( $ccss, $blacklisted ) !== false ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS received contained blacklisted content.', 2 );
+            $blacklist = array('#!/', 'function(', '<script', '<?php');
+            foreach ($blacklist as $blacklisted) {
+                if (strpos($ccss, $blacklisted) !== false) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS received contained blacklisted content.', 2);
                     return false;
                 }
             }
 
             // Check for most basics CSS structures.
-            $pinklist = array( '{', '}', ':' );
-            foreach ( $pinklist as $needed ) {
-                if ( false === strpos( $ccss, $needed ) && 'none' !== $ccss ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS received did not seem to contain real CSS.', 2 );
+            $pinklist = array('{', '}', ':');
+            foreach ($pinklist as $needed) {
+                if (false === strpos($ccss, $needed) && 'none' !== $ccss) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS received did not seem to contain real CSS.', 2);
                     return false;
                 }
             }
@@ -539,7 +539,7 @@ 
         return true;
     }
 
-    public static function ao_ccss_log( $msg, $lvl ) {
+    public static function ao_ccss_log($msg, $lvl) {
         // Commom logging facility
         // Attach debug option.
         global $ao_ccss_debug;
@@ -550,7 +550,7 @@ 
         // 3: DD (for debug)
         // Default: UU (for unkown).
         $level = false;
-        switch ( $lvl ) {
+        switch ($lvl) {
             case 1:
                 $level = 'II';
                 break;
@@ -559,7 +559,7 @@ 
                 break;
             case 3:
                 // Output debug messages only if debug mode is enabled.
-                if ( $ao_ccss_debug ) {
+                if ($ao_ccss_debug) {
                     $level = 'DD';
                 }
                 break;
@@ -568,13 +568,13 @@ 
         }
 
         // Prepare and write a log message if there's a valid level.
-        if ( $level ) {
+        if ($level) {
 
             // Prepare message.
-            $message = date( 'c' ) . ' - [' . $level . '] ' . htmlentities( $msg ) . '<br>';
+            $message = date('c').' - ['.$level.'] '.htmlentities($msg).'<br>';
 
             // Write message to log file.
-            error_log( $message, 3, AO_CCSS_LOG );
+            error_log($message, 3, AO_CCSS_LOG);
         }
     }
 }

classes/autoptimizeCriticalCSSCron.php

Doc Comments +9 added lines

@@ -423,6 +423,9 @@ 
         }
     }
 
+    /**
+     * @param boolean|string $debug
+     */
     public function ao_ccss_api_generate( $path, $debug, $dcode ) {
         // POST jobs to criticalcss.com and return responses
         // Get key and key status.
@@ -559,6 +562,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $debug
+     */
     public function ao_ccss_api_results( $jobid, $debug, $dcode ) {
         // GET jobs from criticalcss.com and return responses
         // Get key.
@@ -625,6 +631,9 @@ 
         }
     }
 
+    /**
+     * @param boolean $review
+     */
     public function ao_ccss_save_file( $ccss, $target, $review ) {
         // Save critical CSS into the filesystem and return its filename
         // Prepare review mark.

Spacing +253 added lines, -253 removed lines

@@ -4,7 +4,7 @@ 
  * processes the queue, submitting jobs to criticalcss.com and retrieving generated CSS from criticalcss.com and saving rules.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -13,23 +13,23 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
 
         // Add queue control to a registered event.
-        add_action( 'ao_ccss_queue', array( $this, 'ao_ccss_queue_control' ) );
+        add_action('ao_ccss_queue', array($this, 'ao_ccss_queue_control'));
         // Add cleaning job to a registered event.
-        add_action( 'ao_ccss_maintenance', array( $this, 'ao_ccss_cleaning' ) );
+        add_action('ao_ccss_maintenance', array($this, 'ao_ccss_cleaning'));
     }
 
     public function ao_ccss_queue_control() {
         // The queue execution backend.
         global $ao_ccss_key;
-        if ( ! isset( $ao_ccss_key ) || empty( $ao_ccss_key ) ) {
+        if (!isset($ao_ccss_key) || empty($ao_ccss_key)) {
             // no key set, not processing the queue!
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'No key set, so not processing queue.', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('No key set, so not processing queue.', 3);
             return;
         }
 
@@ -50,35 +50,35 @@ 
          *    When properly set, queue will always finish a job with the declared settings above regardless of the real API responses.
          */
         $queue_debug = false;
-        if ( file_exists( AO_CCSS_DEBUG ) ) {
-            $qdobj_raw = file_get_contents( AO_CCSS_DEBUG );
-            $qdobj     = json_decode( $qdobj_raw, true );
-            if ( $qdobj ) {
-                if ( 1 === $qdobj['enable'] ) {
+        if (file_exists(AO_CCSS_DEBUG)) {
+            $qdobj_raw = file_get_contents(AO_CCSS_DEBUG);
+            $qdobj     = json_decode($qdobj_raw, true);
+            if ($qdobj) {
+                if (1 === $qdobj['enable']) {
                     $queue_debug = true;
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue operating in debug mode with the following settings: <' . $qdobj_raw . '>', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Queue operating in debug mode with the following settings: <'.$qdobj_raw.'>', 3);
                 }
             }
         }
 
         // Set some default values for $qdobj to avoid function call warnings.
-        if ( ! $queue_debug ) {
+        if (!$queue_debug) {
             $qdobj['htcode'] = false;
         }
 
         // Check if queue is already running.
         $queue_lock = false;
-        if ( file_exists( AO_CCSS_LOCK ) ) {
+        if (file_exists(AO_CCSS_LOCK)) {
             $queue_lock = true;
         }
 
         // Proceed with the queue if it's not already running.
-        if ( ! $queue_lock ) {
+        if (!$queue_lock) {
 
             // Log queue start and create the lock file.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control started', 3 );
-            if ( touch( AO_CCSS_LOCK ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control locked', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue control started', 3);
+            if (touch(AO_CCSS_LOCK)) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('Queue control locked', 3);
             }
 
             // Attach required variables.
@@ -88,218 +88,218 @@ 
             // Initialize job counters.
             $jc = 1;
             $jr = 1;
-            $jt = count( $ao_ccss_queue );
+            $jt = count($ao_ccss_queue);
 
             // Sort queue by ascending job status (e.g. ERROR, JOB_ONGOING, JOB_QUEUED, NEW...).
-            array_multisort( array_column( $ao_ccss_queue, 'jqstat' ), $ao_ccss_queue ); // @codingStandardsIgnoreLine
+            array_multisort(array_column($ao_ccss_queue, 'jqstat'), $ao_ccss_queue); // @codingStandardsIgnoreLine
 
             // Iterates over the entire queue.
-            foreach ( $ao_ccss_queue as $path => $jprops ) {
+            foreach ($ao_ccss_queue as $path => $jprops) {
                 // Prepare flags and target rule.
                 $update      = false;
                 $deljob      = false;
                 $rule_update = false;
                 $oldccssfile = false;
-                $trule       = explode( '|', $jprops['rtarget'] );
+                $trule       = explode('|', $jprops['rtarget']);
 
                 // Log job count.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Processing job ' . $jc . ' of ' . $jt . ' with id <' . $jprops['ljid'] . '> and status <' . $jprops['jqstat'] . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Processing job '.$jc.' of '.$jt.' with id <'.$jprops['ljid'].'> and status <'.$jprops['jqstat'].'>', 3);
 
                 // Process NEW jobs.
-                if ( 'NEW' == $jprops['jqstat'] ) {
+                if ('NEW' == $jprops['jqstat']) {
 
                     // Log the new job.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Found NEW job with local ID <' . $jprops['ljid'] . '>, starting its queue processing', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Found NEW job with local ID <'.$jprops['ljid'].'>, starting its queue processing', 3);
 
                     // Compare job and rule hashes (if any).
-                    $hash = $this->ao_ccss_diff_hashes( $jprops['ljid'], $jprops['hash'], $jprops['hashes'], $jprops['rtarget'] );
+                    $hash = $this->ao_ccss_diff_hashes($jprops['ljid'], $jprops['hash'], $jprops['hashes'], $jprops['rtarget']);
 
                     // If job hash is new or different of a previous one.
-                    if ( $hash ) {
+                    if ($hash) {
                         // Set job hash.
                         $jprops['hash'] = $hash;
 
                         // If this is not the first job, wait 15 seconds before process next job due criticalcss.com API limits.
-                        if ( $jr > 1 ) {
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Waiting 15 seconds due to criticalcss.com API limits', 3 );
-                            sleep( 15 );
+                        if ($jr > 1) {
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Waiting 15 seconds due to criticalcss.com API limits', 3);
+                            sleep(15);
                         }
 
                         // Dispatch the job generate request and increment request count.
-                        $apireq = $this->ao_ccss_api_generate( $path, $queue_debug, $qdobj['htcode'] );
+                        $apireq = $this->ao_ccss_api_generate($path, $queue_debug, $qdobj['htcode']);
                         $jr++;
 
                         // NOTE: All the following conditions maps to the ones in admin_settings_queue.js.php.
-                        if ( 'JOB_QUEUED' == $apireq['job']['status'] || 'JOB_ONGOING' == $apireq['job']['status'] ) {
+                        if ('JOB_QUEUED' == $apireq['job']['status'] || 'JOB_ONGOING' == $apireq['job']['status']) {
                             // SUCCESS: request has a valid result.
                             // Update job properties.
                             $jprops['jid']    = $apireq['job']['id'];
                             $jprops['jqstat'] = $apireq['job']['status'];
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> generate request successful, remote id <' . $jprops['jid'] . '>, status now is <' . $jprops['jqstat'] . '>', 3 );
-                        } elseif ( 'STATUS_JOB_BAD' == $apireq['job']['status'] ) {
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> generate request successful, remote id <'.$jprops['jid'].'>, status now is <'.$jprops['jqstat'].'>', 3);
+                        } elseif ('STATUS_JOB_BAD' == $apireq['job']['status']) {
                             // ERROR: concurrent requests
                             // Update job properties.
                             $jprops['jid']    = $apireq['job']['id'];
                             $jprops['jqstat'] = $apireq['job']['status'];
                             $jprops['jrstat'] = $apireq['error'];
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Concurrent requests when processing job id <' . $jprops['ljid'] . '>, job status is now <' . $jprops['jqstat'] . '>', 3 );
-                        } elseif ( 'INVALID_JWT_TOKEN' == $apireq['errorCode'] ) {
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Concurrent requests when processing job id <'.$jprops['ljid'].'>, job status is now <'.$jprops['jqstat'].'>', 3);
+                        } elseif ('INVALID_JWT_TOKEN' == $apireq['errorCode']) {
                             // ERROR: key validation
                             // Update job properties.
                             $jprops['jqstat'] = $apireq['errorCode'];
                             $jprops['jrstat'] = $apireq['error'];
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'API key validation error when processing job id <' . $jprops['ljid'] . '>, job status is now <' . $jprops['jqstat'] . '>', 3 );
-                        } elseif ( empty( $apireq ) ) {
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('API key validation error when processing job id <'.$jprops['ljid'].'>, job status is now <'.$jprops['jqstat'].'>', 3);
+                        } elseif (empty($apireq)) {
                             // ERROR: no response
                             // Update job properties.
                             $jprops['jqstat'] = 'NO_RESPONSE';
                             $jprops['jrstat'] = 'NONE';
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> request has no response, status now is <' . $jprops['jqstat'] . '>', 3 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> request has no response, status now is <'.$jprops['jqstat'].'>', 3);
                         } else {
                             // UNKNOWN: unhandled generate exception
                             // Update job properties.
                             $jprops['jqstat'] = 'JOB_UNKNOWN';
                             $jprops['jrstat'] = 'NONE';
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> generate request has an UNKNOWN condition, status now is <' . $jprops['jqstat'] . '>, check log messages above for more information', 2 );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job response was: ' . json_encode( $apireq ), 3 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> generate request has an UNKNOWN condition, status now is <'.$jprops['jqstat'].'>, check log messages above for more information', 2);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job response was: '.json_encode($apireq), 3);
                         }
                     } else {
                         // SUCCESS: Job hash is equal to a previous one, so it's done
                         // Update job status and finish time.
                         $jprops['jqstat'] = 'JOB_DONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> requires no further processing, status now is <' . $jprops['jqstat'] . '>', 3 );
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> requires no further processing, status now is <'.$jprops['jqstat'].'>', 3);
                     }
 
                     // Set queue update flag.
                     $update = true;
 
-                } elseif ( 'JOB_QUEUED' == $jprops['jqstat'] || 'JOB_ONGOING' == $jprops['jqstat'] ) {
+                } elseif ('JOB_QUEUED' == $jprops['jqstat'] || 'JOB_ONGOING' == $jprops['jqstat']) {
                     // Process QUEUED and ONGOING jobs
                     // Log the pending job.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Found PENDING job with local ID <' . $jprops['ljid'] . '>, continuing its queue processing', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Found PENDING job with local ID <'.$jprops['ljid'].'>, continuing its queue processing', 3);
 
                     // If this is not the first job, wait 15 seconds before process next job due criticalcss.com API limits.
-                    if ( $jr > 1 ) {
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Waiting 15 seconds due to criticalcss.com API limits', 3 );
-                        sleep( 15 );
+                    if ($jr > 1) {
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Waiting 15 seconds due to criticalcss.com API limits', 3);
+                        sleep(15);
                     }
 
                     // Dispatch the job result request and increment request count.
-                    $apireq = $this->ao_ccss_api_results( $jprops['jid'], $queue_debug, $qdobj['htcode'] );
+                    $apireq = $this->ao_ccss_api_results($jprops['jid'], $queue_debug, $qdobj['htcode']);
                     $jr++;
 
                     // NOTE: All the following condigitons maps to the ones in admin_settings_queue.js.php
                     // Replace API response values if queue debugging is enabled and some value is set.
-                    if ( $queue_debug ) {
-                        if ( $qdobj['status'] ) {
+                    if ($queue_debug) {
+                        if ($qdobj['status']) {
                             $apireq['status'] = $qdobj['status'];
                         }
-                        if ( $qdobj['resultStatus'] ) {
+                        if ($qdobj['resultStatus']) {
                             $apireq['resultStatus'] = $qdobj['resultStatus'];
                         }
-                        if ( $qdobj['validationStatus'] ) {
+                        if ($qdobj['validationStatus']) {
                             $apireq['validationStatus'] = $qdobj['validationStatus'];
                         }
                     }
 
-                    if ( 'JOB_QUEUED' == $apireq['status'] || 'JOB_ONGOING' == $apireq['status'] ) {
+                    if ('JOB_QUEUED' == $apireq['status'] || 'JOB_ONGOING' == $apireq['status']) {
                         // SUCCESS: request has a valid result
                         // Process a PENDING job
                         // Update job properties.
                         $jprops['jqstat'] = $apireq['status'];
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . '> unchanged', 3 );
-                    } elseif ( 'JOB_DONE' == $apireq['status'] ) {
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].'> unchanged', 3);
+                    } elseif ('JOB_DONE' == $apireq['status']) {
                         // Process a DONE job
                         // New resultStatus from ccss.com "HTML_404", consider as "GOOD" for now.
-                        if ( 'HTML_404' == $apireq['resultStatus'] ) {
+                        if ('HTML_404' == $apireq['resultStatus']) {
                             $apireq['resultStatus'] = 'GOOD';
                         }
 
-                        if ( 'GOOD' == $apireq['resultStatus'] && 'GOOD' == $apireq['validationStatus'] ) {
+                        if ('GOOD' == $apireq['resultStatus'] && 'GOOD' == $apireq['validationStatus']) {
                             // SUCCESS: GOOD job with GOOD validation
                             // Update job properties.
-                            $jprops['file']   = $this->ao_ccss_save_file( $apireq['css'], $trule, false );
+                            $jprops['file']   = $this->ao_ccss_save_file($apireq['css'], $trule, false);
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
+                            $jprops['jftime'] = microtime(true);
                             $rule_update      = true;
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . '>, file saved <' . $jprops['file'] . '>', 3 );
-                        } elseif ( 'GOOD' == $apireq['resultStatus'] && ( 'WARN' == $apireq['validationStatus'] || 'BAD' == $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' == $apireq['validationStatus'] ) ) {
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].'>, file saved <'.$jprops['file'].'>', 3);
+                        } elseif ('GOOD' == $apireq['resultStatus'] && ('WARN' == $apireq['validationStatus'] || 'BAD' == $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' == $apireq['validationStatus'])) {
                             // SUCCESS: GOOD job with WARN or BAD validation
                             // Update job properties.
-                            $jprops['file']   = $this->ao_ccss_save_file( $apireq['css'], $trule, true );
+                            $jprops['file']   = $this->ao_ccss_save_file($apireq['css'], $trule, true);
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
+                            $jprops['jftime'] = microtime(true);
                             $rule_update      = true;
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . ', file saved <' . $jprops['file'] . '> but requires REVIEW', 3 );
-                        } elseif ( 'GOOD' != $apireq['resultStatus'] && ( 'GOOD' != $apireq['validationStatus'] || 'WARN' != $apireq['validationStatus'] || 'BAD' != $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' != $apireq['validationStatus'] ) ) {
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].', file saved <'.$jprops['file'].'> but requires REVIEW', 3);
+                        } elseif ('GOOD' != $apireq['resultStatus'] && ('GOOD' != $apireq['validationStatus'] || 'WARN' != $apireq['validationStatus'] || 'BAD' != $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' != $apireq['validationStatus'])) {
                             // ERROR: no GOOD, WARN or BAD results
                             // Update job properties.
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job FAILED, status now is <' . $jprops['jqstat'] . '>', 3 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job FAILED, status now is <'.$jprops['jqstat'].'>', 3);
                             $apireq['css'] = '/* critical css removed for DEBUG logging purposes */';
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job response was: ' . json_encode( $apireq ), 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job response was: '.json_encode($apireq), 3);
                         } else {
                             // UNKNOWN: unhandled JOB_DONE exception
                             // Update job properties.
                             $jprops['jqstat'] = 'JOB_UNKNOWN';
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job is UNKNOWN, status now is <' . $jprops['jqstat'] . '>', 2 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job is UNKNOWN, status now is <'.$jprops['jqstat'].'>', 2);
                             $apireq['css'] = '/* critical css removed for DEBUG logging purposes */';
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job response was: ' . json_encode( $apireq ), 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job response was: '.json_encode($apireq), 3);
                         }
-                    } elseif ( 'JOB_FAILED' == $apireq['job']['status'] || 'STATUS_JOB_BAD' == $apireq['job']['status'] ) {
+                    } elseif ('JOB_FAILED' == $apireq['job']['status'] || 'STATUS_JOB_BAD' == $apireq['job']['status']) {
                         // ERROR: failed job
                         // Update job properties.
                         $jprops['jqstat'] = $apireq['job']['status'];
-                        if ( $apireq['error'] ) {
+                        if ($apireq['error']) {
                             $jprops['jrstat'] = $apireq['job']['error'];
                         } else {
                         }
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job FAILED, status now is <' . $jprops['jqstat'] . '>', 3 );
-                    } elseif ( 'This css no longer exists. Please re-generate it.' == $apireq['error'] ) {
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job FAILED, status now is <'.$jprops['jqstat'].'>', 3);
+                    } elseif ('This css no longer exists. Please re-generate it.' == $apireq['error']) {
                         // ERROR: CSS doesn't exist
                         // Update job properties.
                         $jprops['jqstat'] = 'NO_CSS';
                         $jprops['jrstat'] = $apireq['error'];
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job FAILED, status now is <' . $jprops['jqstat'] . '>', 3 );
-                    } elseif ( empty( $apireq ) ) {
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job FAILED, status now is <'.$jprops['jqstat'].'>', 3);
+                    } elseif (empty($apireq)) {
                         // ERROR: no response
                         // Update job properties.
                         $jprops['jqstat'] = 'NO_RESPONSE';
                         $jprops['jrstat'] = 'NONE';
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> request has no response, status now is <' . $jprops['jqstat'] . '>', 3 );
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> request has no response, status now is <'.$jprops['jqstat'].'>', 3);
                     } else {
                         // UNKNOWN: unhandled results exception
                         // Update job properties.
                         $jprops['jqstat'] = 'JOB_UNKNOWN';
                         $jprops['jrstat'] = 'NONE';
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request has an UNKNOWN condition, status now is <' . $jprops['jqstat'] . '>, check log messages above for more information', 2 );
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request has an UNKNOWN condition, status now is <'.$jprops['jqstat'].'>, check log messages above for more information', 2);
                     }
 
                     // Set queue update flag.
@@ -307,40 +307,40 @@ 
                 }
 
                 // Mark DONE jobs for removal.
-                if ( 'JOB_DONE' == $jprops['jqstat'] ) {
+                if ('JOB_DONE' == $jprops['jqstat']) {
                     $update = true;
                     $deljob = true;
                 }
 
                 // Persist updated queue object.
-                if ( $update ) {
-                    if ( ! $deljob ) {
+                if ($update) {
+                    if (!$deljob) {
                         // Update properties of a NEW or PENDING job...
-                        $ao_ccss_queue[ $path ] = $jprops;
+                        $ao_ccss_queue[$path] = $jprops;
                     } else {
                         // ...or remove the DONE job.
-                        unset( $ao_ccss_queue[ $path ] );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> is DONE and was removed from the queue', 3 );
+                        unset($ao_ccss_queue[$path]);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> is DONE and was removed from the queue', 3);
                     }
 
                     // Update queue object.
-                    $ao_ccss_queue_raw = json_encode( $ao_ccss_queue );
-                    update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue updated by job id <' . $jprops['ljid'] . '>', 3 );
+                    $ao_ccss_queue_raw = json_encode($ao_ccss_queue);
+                    update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Queue updated by job id <'.$jprops['ljid'].'>', 3);
 
                     // Update target rule.
-                    if ( $rule_update ) {
-                        $this->ao_ccss_rule_update( $jprops['ljid'], $jprops['rtarget'], $jprops['file'], $jprops['hash'] );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> updated the target rule <' . $jprops['rtarget'] . '>', 3 );
+                    if ($rule_update) {
+                        $this->ao_ccss_rule_update($jprops['ljid'], $jprops['rtarget'], $jprops['file'], $jprops['hash']);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> updated the target rule <'.$jprops['rtarget'].'>', 3);
                     }
                 } else {
                     // Or log no queue action.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Nothing to do on this job', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Nothing to do on this job', 3);
                 }
 
                 // Break the loop if request limit is set and was reached.
-                if ( $ao_ccss_rlimit && $ao_ccss_rlimit == $jr ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'The limit of ' . $ao_ccss_rlimit . ' request(s) to criticalcss.com was reached, queue control must finish now', 3 );
+                if ($ao_ccss_rlimit && $ao_ccss_rlimit == $jr) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('The limit of '.$ao_ccss_rlimit.' request(s) to criticalcss.com was reached, queue control must finish now', 3);
                     break;
                 }
 
@@ -349,46 +349,46 @@ 
             }
 
             // Remove the lock file and log the queue end.
-            if ( file_exists( AO_CCSS_LOCK ) ) {
-                unlink( AO_CCSS_LOCK );
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control unlocked', 3 );
+            if (file_exists(AO_CCSS_LOCK)) {
+                unlink(AO_CCSS_LOCK);
+                autoptimizeCriticalCSSCore::ao_ccss_log('Queue control unlocked', 3);
             }
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control finished', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue control finished', 3);
 
             // Log that queue is locked.
         } else {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue is already running, skipping the attempt to run it again', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue is already running, skipping the attempt to run it again', 3);
         }
     }
 
-    public function ao_ccss_diff_hashes( $ljid, $hash, $hashes, $rule ) {
+    public function ao_ccss_diff_hashes($ljid, $hash, $hashes, $rule) {
         // Compare job hashes
         // STEP 1: update job hashes.
-        if ( 1 == count( $hashes ) ) {
+        if (1 == count($hashes)) {
             // Job with a single hash
             // Set job hash.
             $hash = $hashes[0];
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> updated with SINGLE hash <' . $hash . '>', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> updated with SINGLE hash <'.$hash.'>', 3);
         } else {
             // Job with multiple hashes
             // Loop through hashes to concatenate them.
             $nhash = '';
-            foreach ( $hashes as $shash ) {
+            foreach ($hashes as $shash) {
                 $nhash .= $shash;
             }
 
             // Set job hash.
-            $hash = md5( $nhash );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> updated with a COMPOSITE hash <' . $hash . '>', 3 );
+            $hash = md5($nhash);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> updated with a COMPOSITE hash <'.$hash.'>', 3);
         }
 
         // STEP 2: compare job to existing jobs to prevent double submission for same type+hash.
         global $ao_ccss_queue;
 
-        foreach ( $ao_ccss_queue as $queue_item ) {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Comparing <' . $rule . $hash . '> with <' . $queue_item['rtarget'] . $queue_item['hash'] . '>', 3 );
-            if ( $queue_item['hash'] == $hash && $queue_item['rtarget'] == $rule && in_array( $queue_item['jqstat'], array( 'JOB_QUEUED', 'JOB_ONGOING', 'JOB_DONE' ) ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> matches the already pending job <' . $queue_item['ljid'] . '>', 3 );
+        foreach ($ao_ccss_queue as $queue_item) {
+            autoptimizeCriticalCSSCore::ao_ccss_log('Comparing <'.$rule.$hash.'> with <'.$queue_item['rtarget'].$queue_item['hash'].'>', 3);
+            if ($queue_item['hash'] == $hash && $queue_item['rtarget'] == $rule && in_array($queue_item['jqstat'], array('JOB_QUEUED', 'JOB_ONGOING', 'JOB_DONE'))) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> matches the already pending job <'.$queue_item['ljid'].'>', 3);
                 return false;
             }
         }
@@ -398,32 +398,32 @@ 
         global $ao_ccss_rules;
 
         // Prepare rule variables.
-        $trule = explode( '|', $rule );
-        $srule = $ao_ccss_rules[ $trule[0] ][ $trule[1] ];
+        $trule = explode('|', $rule);
+        $srule = $ao_ccss_rules[$trule[0]][$trule[1]];
 
         // Check if a MANUAL rule exist and return false.
-        if ( ! empty( $srule ) && ( 0 == $srule['hash'] && 0 != $srule['file'] ) ) {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> matches the MANUAL rule <' . $trule[0] . '|' . $trule[1] . '>', 3 );
+        if (!empty($srule) && (0 == $srule['hash'] && 0 != $srule['file'])) {
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> matches the MANUAL rule <'.$trule[0].'|'.$trule[1].'>', 3);
             return false;
-        } elseif ( ! empty( $srule ) ) {
+        } elseif (!empty($srule)) {
             // Check if an AUTO rule exist.
-            if ( $hash === $srule['hash'] && is_file( AO_CCSS_DIR . $srule['file'] ) && 0 != filesize( AO_CCSS_DIR . $srule['file'] ) ) {
+            if ($hash === $srule['hash'] && is_file(AO_CCSS_DIR.$srule['file']) && 0 != filesize(AO_CCSS_DIR.$srule['file'])) {
                 // Check if job hash matches rule, if the CCSS file exists said file is not empty and return FALSE is so.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> with hash <' . $hash . '> MATCH the one in rule <' . $trule[0] . '|' . $trule[1] . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> with hash <'.$hash.'> MATCH the one in rule <'.$trule[0].'|'.$trule[1].'>', 3);
                 return false;
             } else {
                 // Or return the new hash if they differ.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> with hash <' . $hash . '> DOES NOT MATCH the one in rule <' . $trule[0] . '|' . $trule[1] . '> or rule\'s CCSS file was invalid.', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> with hash <'.$hash.'> DOES NOT MATCH the one in rule <'.$trule[0].'|'.$trule[1].'> or rule\'s CCSS file was invalid.', 3);
                 return $hash;
             }
         } else {
             // Or just return the hash if no rule exist yet.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> with hash <' . $hash . '> has no rule yet', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> with hash <'.$hash.'> has no rule yet', 3);
             return $hash;
         }
     }
 
-    public function ao_ccss_api_generate( $path, $debug, $dcode ) {
+    public function ao_ccss_api_generate($path, $debug, $dcode) {
         // POST jobs to criticalcss.com and return responses
         // Get key and key status.
         global $ao_ccss_key;
@@ -435,35 +435,35 @@ 
         global $ao_ccss_noptimize;
 
         $site_host = get_site_url();
-        $site_path = parse_url( $site_host, PHP_URL_PATH );
+        $site_path = parse_url($site_host, PHP_URL_PATH);
 
-        if ( ! empty( $site_path ) ) {
-            $site_host = str_replace( $site_path, '', $site_host );
+        if (!empty($site_path)) {
+            $site_host = str_replace($site_path, '', $site_host);
         }
 
         // Logic to bind to one domain to avoid site clones of sites would
         // automatically begin spawning requests to criticalcss.com which has
         // a per domain cost.
         global $ao_ccss_domain;
-        if ( empty( $ao_ccss_domain ) ) {
+        if (empty($ao_ccss_domain)) {
             // first request being done, update option to allow future requests are only allowed if from same domain.
-            update_option( 'autoptimize_ccss_domain', str_rot13( $site_host ) );
-        } elseif ( trim( $ao_ccss_domain, '\'"' ) !== 'none' && parse_url( $site_host, PHP_URL_HOST ) !== parse_url( $ao_ccss_domain, PHP_URL_HOST ) && apply_filters( 'autoptimize_filter_ccss_bind_domain', true ) ) {
+            update_option('autoptimize_ccss_domain', str_rot13($site_host));
+        } elseif (trim($ao_ccss_domain, '\'"') !== 'none' && parse_url($site_host, PHP_URL_HOST) !== parse_url($ao_ccss_domain, PHP_URL_HOST) && apply_filters('autoptimize_filter_ccss_bind_domain', true)) {
             // not the same domain, log as error and return without posting to criticalcss.com.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Request for domain ' . $site_host . ' does not match bound domain ' . $ao_ccss_domain . ' so not proceeding.', 2 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Request for domain '.$site_host.' does not match bound domain '.$ao_ccss_domain.' so not proceeding.', 2);
             return false;
         }
 
-        $src_url = $site_host . $path;
+        $src_url = $site_host.$path;
 
         // Avoid AO optimizations if required by config or avoid lazyload if lazyload is active in AO.
-        if ( ! empty( $ao_ccss_noptimize ) ) {
+        if (!empty($ao_ccss_noptimize)) {
             $src_url .= '?ao_noptirocket=1';
-        } elseif ( class_exists( 'autoptimizeImages', false ) && autoptimizeImages::should_lazyload_wrapper() ) {
+        } elseif (class_exists('autoptimizeImages', false) && autoptimizeImages::should_lazyload_wrapper()) {
             $src_url .= '?ao_nolazy=1';
         }
 
-        $src_url = apply_filters( 'autoptimize_filter_ccss_cron_srcurl', $src_url );
+        $src_url = apply_filters('autoptimize_filter_ccss_cron_srcurl', $src_url);
 
         // Initialize request body.
         $body           = array();
@@ -473,85 +473,85 @@ 
 
         // Prepare and add viewport size to the body if available.
         $viewport = autoptimizeCriticalCSSCore::ao_ccss_viewport();
-        if ( ! empty( $viewport['w'] ) && ! empty( $viewport['h'] ) ) {
+        if (!empty($viewport['w']) && !empty($viewport['h'])) {
             $body['width']  = $viewport['w'];
             $body['height'] = $viewport['h'];
         }
 
         // Prepare and add forceInclude to the body if available.
         global $ao_ccss_finclude;
-        $finclude = $this->ao_ccss_finclude( $ao_ccss_finclude );
-        if ( ! empty( $finclude ) ) {
+        $finclude = $this->ao_ccss_finclude($ao_ccss_finclude);
+        if (!empty($finclude)) {
             $body['forceInclude'] = $finclude;
         }
 
         // Body must be json and log it.
-        $body = json_encode( $body );
-        autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request body is ' . $body, 3 );
+        $body = json_encode($body);
+        autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request body is '.$body, 3);
 
         // Prepare the request.
-        $url  = esc_url_raw( AO_CCSS_API . 'generate?aover=' . AO_CCSS_VER );
+        $url  = esc_url_raw(AO_CCSS_API.'generate?aover='.AO_CCSS_VER);
         $args = array(
             'headers' => array(
-                'User-Agent'    => 'Autoptimize v' . AO_CCSS_VER,
+                'User-Agent'    => 'Autoptimize v'.AO_CCSS_VER,
                 'Content-type'  => 'application/json; charset=utf-8',
-                'Authorization' => 'JWT ' . $key,
+                'Authorization' => 'JWT '.$key,
                 'Connection'    => 'close',
             ),
             'body'    => $body,
         );
 
         // Dispatch the request and store its response code.
-        $req  = wp_safe_remote_post( $url, $args );
-        $code = wp_remote_retrieve_response_code( $req );
-        $body = json_decode( wp_remote_retrieve_body( $req ), true );
+        $req  = wp_safe_remote_post($url, $args);
+        $code = wp_remote_retrieve_response_code($req);
+        $body = json_decode(wp_remote_retrieve_body($req), true);
 
-        if ( $debug && $dcode ) {
+        if ($debug && $dcode) {
             // If queue debug is active, change response code.
             $code = $dcode;
         }
 
-        if ( 200 == $code ) {
+        if (200 == $code) {
             // Response code is OK.
             // Workaround criticalcss.com non-RESTful reponses.
-            if ( 'JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status'] || 'STATUS_JOB_BAD' == $body['job']['status'] ) {
+            if ('JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status'] || 'STATUS_JOB_BAD' == $body['job']['status']) {
                 // Log successful and return encoded request body.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> replied successfully', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> replied successfully', 3);
 
                 // This code also means the key is valid, so cache key status for 24h if not already cached.
-                if ( ( ! $key_status || 2 != $key_status ) && $key ) {
-                    update_option( 'autoptimize_ccss_keyst', 2 );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is valid, updating key status', 3 );
+                if ((!$key_status || 2 != $key_status) && $key) {
+                    update_option('autoptimize_ccss_keyst', 2);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is valid, updating key status', 3);
                 }
 
                 // Return the request body.
                 return $body;
             } else {
                 // Log successful requests with invalid reponses.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> replied with code <' . $code . '> and an UNKNOWN error condition, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> replied with code <'.$code.'> and an UNKNOWN error condition, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
                 return $body;
             }
         } else {
             // Response code is anything else.
             // Log failed request with a valid response code and return body.
-            if ( $code ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> replied with error code <' . $code . '>, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+            if ($code) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> replied with error code <'.$code.'>, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
 
-                if ( 401 == $code ) {
+                if (401 == $code) {
                     // If request is unauthorized, also clear key status.
-                    update_option( 'autoptimize_ccss_keyst', 1 );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is invalid, updating key status', 3 );
+                    update_option('autoptimize_ccss_keyst', 1);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is invalid, updating key status', 3);
                 }
 
                 // Return the request body.
                 return $body;
             } else {
                 // Log failed request with no response and return false.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> has no response, this could be a service timeout', 2 );
-                if ( is_wp_error( $req ) ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( $req->get_error_message(), 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> has no response, this could be a service timeout', 2);
+                if (is_wp_error($req)) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log($req->get_error_message(), 2);
                 }
 
                 return false;
@@ -559,76 +559,76 @@ 
         }
     }
 
-    public function ao_ccss_api_results( $jobid, $debug, $dcode ) {
+    public function ao_ccss_api_results($jobid, $debug, $dcode) {
         // GET jobs from criticalcss.com and return responses
         // Get key.
         global $ao_ccss_key;
         $key = $ao_ccss_key;
 
         // Prepare the request.
-        $url  = AO_CCSS_API . 'results?resultId=' . $jobid;
+        $url  = AO_CCSS_API.'results?resultId='.$jobid;
         $args = array(
             'headers' => array(
-                'User-Agent'    => 'Autoptimize CriticalCSS Power-Up v' . AO_CCSS_VER,
-                'Authorization' => 'JWT ' . $key,
+                'User-Agent'    => 'Autoptimize CriticalCSS Power-Up v'.AO_CCSS_VER,
+                'Authorization' => 'JWT '.$key,
                 'Connection'    => 'close',
             ),
         );
 
         // Dispatch the request and store its response code.
-        $req  = wp_safe_remote_get( $url, $args );
-        $code = wp_remote_retrieve_response_code( $req );
-        $body = json_decode( wp_remote_retrieve_body( $req ), true );
+        $req  = wp_safe_remote_get($url, $args);
+        $code = wp_remote_retrieve_response_code($req);
+        $body = json_decode(wp_remote_retrieve_body($req), true);
 
-        if ( $debug && $dcode ) {
+        if ($debug && $dcode) {
             // If queue debug is active, change response code.
             $code = $dcode;
         }
 
-        if ( 200 == $code ) {
+        if (200 == $code) {
             // Response code is OK.
-            if ( is_array( $body ) && ( array_key_exists( 'status', $body ) || array_key_exists( 'job', $body ) ) && ( 'JOB_QUEUED' == $body['status'] || 'JOB_ONGOING' == $body['status'] || 'JOB_DONE' == $body['status'] || 'JOB_FAILED' == $body['status'] || 'JOB_UNKNOWN' == $body['status'] || 'STATUS_JOB_BAD' == $body['job']['status'] ) ) {
+            if (is_array($body) && (array_key_exists('status', $body) || array_key_exists('job', $body)) && ('JOB_QUEUED' == $body['status'] || 'JOB_ONGOING' == $body['status'] || 'JOB_DONE' == $body['status'] || 'JOB_FAILED' == $body['status'] || 'JOB_UNKNOWN' == $body['status'] || 'STATUS_JOB_BAD' == $body['job']['status'])) {
                 // Workaround criticalcss.com non-RESTful reponses
                 // Log successful and return encoded request body.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied successfully', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied successfully', 3);
                 return $body;
-            } elseif ( is_array( $body ) && ( array_key_exists( 'error', $body ) && 'This css no longer exists. Please re-generate it.' == $body['error'] ) ) {
+            } elseif (is_array($body) && (array_key_exists('error', $body) && 'This css no longer exists. Please re-generate it.' == $body['error'])) {
                 // Handle no CSS reply
                 // Log no CSS error and return encoded request body.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied successfully but the CSS for it does not exist anymore', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied successfully but the CSS for it does not exist anymore', 3);
                 return $body;
             } else {
                 // Log failed request and return false.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied with code <' . $code . '> and an UNKNOWN error condition, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied with code <'.$code.'> and an UNKNOWN error condition, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
                 return false;
             }
         } else {
             // Response code is anything else
             // Log failed request with a valid response code and return body.
-            if ( $code ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied with error code <' . $code . '>, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
-                if ( 401 == $code ) {
+            if ($code) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied with error code <'.$code.'>, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
+                if (401 == $code) {
                     // If request is unauthorized, also clear key status.
-                    update_option( 'autoptimize_ccss_keyst', 1 );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is invalid, updating key status', 3 );
+                    update_option('autoptimize_ccss_keyst', 1);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is invalid, updating key status', 3);
                 }
 
                 // Return the request body.
                 return $body;
             } else {
                 // Log failed request with no response and return false.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> has no response, this could be a service timeout', 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> has no response, this could be a service timeout', 2);
                 return false;
             }
         }
     }
 
-    public function ao_ccss_save_file( $ccss, $target, $review ) {
+    public function ao_ccss_save_file($ccss, $target, $review) {
         // Save critical CSS into the filesystem and return its filename
         // Prepare review mark.
-        if ( $review ) {
+        if ($review) {
             $rmark = '_R';
         } else {
             $rmark = '';
@@ -638,21 +638,21 @@ 
         $filename = false;
         $content  = $ccss;
 
-        if ( autoptimizeCriticalCSSCore::ao_ccss_check_contents( $content ) ) {
+        if (autoptimizeCriticalCSSCore::ao_ccss_check_contents($content)) {
             // Sanitize content, set filename and try to save file.
-            $file     = AO_CCSS_DIR . 'ccss_' . md5( $ccss . $target[1] ) . $rmark . '.css';
-            $status   = file_put_contents( $file, $content, LOCK_EX );
-            $filename = pathinfo( $file, PATHINFO_BASENAME );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS file for the rule <' . $target[0] . '|' . $target[1] . '> was saved as <' . $filename . '>, size in bytes is <' . $status . '>', 3 );
+            $file     = AO_CCSS_DIR.'ccss_'.md5($ccss.$target[1]).$rmark.'.css';
+            $status   = file_put_contents($file, $content, LOCK_EX);
+            $filename = pathinfo($file, PATHINFO_BASENAME);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS file for the rule <'.$target[0].'|'.$target[1].'> was saved as <'.$filename.'>, size in bytes is <'.$status.'>', 3);
 
-            if ( ! $status ) {
+            if (!$status) {
                 // If file has not been saved, reset filename.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS file <' . $filename . '> could not be not saved', 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS file <'.$filename.'> could not be not saved', 2);
                 $filename = false;
                 return $filename;
             }
         } else {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS received did not pass content check', 2 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS received did not pass content check', 2);
             return $filename;
         }
 
@@ -662,15 +662,15 @@ 
         global $ao_ccss_rules;
 
         // Prepare rule variables.
-        $srule   = $ao_ccss_rules[ $target[0] ][ $target[1] ];
+        $srule   = $ao_ccss_rules[$target[0]][$target[1]];
         $oldfile = $srule['file'];
 
-        if ( $oldfile && $oldfile !== $filename ) {
-            $delfile = AO_CCSS_DIR . $oldfile;
-            if ( file_exists( $delfile ) ) {
-                $unlinkst = unlink( $delfile );
-                if ( $unlinkst ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'A previous critical CSS file <' . $oldfile . '> was removed for the rule <' . $target[0] . '|' . $target[1] . '>', 3 );
+        if ($oldfile && $oldfile !== $filename) {
+            $delfile = AO_CCSS_DIR.$oldfile;
+            if (file_exists($delfile)) {
+                $unlinkst = unlink($delfile);
+                if ($unlinkst) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('A previous critical CSS file <'.$oldfile.'> was removed for the rule <'.$target[0].'|'.$target[1].'>', 3);
                 }
             }
         }
@@ -679,29 +679,29 @@ 
         return $filename;
     }
 
-    public function ao_ccss_rule_update( $ljid, $srule, $file, $hash ) {
+    public function ao_ccss_rule_update($ljid, $srule, $file, $hash) {
         // Update or create a rule
         // Attach required arrays.
         global $ao_ccss_rules;
 
         // Prepare rule variables.
-        $trule  = explode( '|', $srule );
-        $rule   = $ao_ccss_rules[ $trule[0] ][ $trule[1] ];
+        $trule  = explode('|', $srule);
+        $rule   = $ao_ccss_rules[$trule[0]][$trule[1]];
         $action = false;
         $rtype  = '';
 
-        if ( 0 === $rule['hash'] && 0 !== $rule['file'] ) {
+        if (0 === $rule['hash'] && 0 !== $rule['file']) {
             // manual rule, don't ever overwrite.
             $action = 'NOT UPDATED';
             $rtype  = 'MANUAL';
-        } elseif ( 0 === $rule['hash'] && 0 === $rule['file'] ) {
+        } elseif (0 === $rule['hash'] && 0 === $rule['file']) {
             // If this is an user created AUTO rule with no hash and file yet, update its hash and filename
             // Set rule hash, file and action flag.
             $rule['hash'] = $hash;
             $rule['file'] = $file;
             $action       = 'UPDATED';
             $rtype        = 'AUTO';
-        } elseif ( 0 !== $rule['hash'] && ctype_alnum( $rule['hash'] ) ) {
+        } elseif (0 !== $rule['hash'] && ctype_alnum($rule['hash'])) {
             // If this is an genuine AUTO rule, update its hash and filename
             // Set rule hash, file and action flag.
             $rule['hash'] = $hash;
@@ -711,7 +711,7 @@ 
         } else {
             // If rule doesn't exist, create an AUTO rule
             // AUTO rules were only for types, but will now also work for paths.
-            if ( 'types' == $trule[0] || 'paths' == $trule[0] ) {
+            if ('types' == $trule[0] || 'paths' == $trule[0]) {
                 // Set rule hash and file and action flag.
                 $rule['hash'] = $hash;
                 $rule['file'] = $file;
@@ -719,47 +719,47 @@ 
                 $rtype        = 'AUTO';
             } else {
                 // Log that no rule was created.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Exception, no AUTO rule created', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Exception, no AUTO rule created', 3);
             }
         }
 
-        if ( $action ) {
+        if ($action) {
             // If a rule creation/update is required, persist updated rules object.
-            $ao_ccss_rules[ $trule[0] ][ $trule[1] ] = $rule;
-            $ao_ccss_rules_raw                       = json_encode( $ao_ccss_rules );
-            update_option( 'autoptimize_ccss_rules', $ao_ccss_rules_raw );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Target rule <' . $srule . '> of type <' . $rtype . '> was ' . $action . ' for job id <' . $ljid . '>', 3 );
+            $ao_ccss_rules[$trule[0]][$trule[1]] = $rule;
+            $ao_ccss_rules_raw                       = json_encode($ao_ccss_rules);
+            update_option('autoptimize_ccss_rules', $ao_ccss_rules_raw);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Target rule <'.$srule.'> of type <'.$rtype.'> was '.$action.' for job id <'.$ljid.'>', 3);
         } else {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'No rule action required', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('No rule action required', 3);
         }
     }
 
-    function ao_ccss_finclude( $finclude_raw ) {
+    function ao_ccss_finclude($finclude_raw) {
         // Prepare forceInclude object.
-        if ( ! empty( $finclude_raw ) ) {
+        if (!empty($finclude_raw)) {
             // If there are any content
             // Convert raw string into arra and initialize the returning object.
-            $fincludes = explode( ',', $finclude_raw );
+            $fincludes = explode(',', $finclude_raw);
             $finclude  = array();
 
             // Interacts over every rule.
             $i = 0;
-            foreach ( $fincludes as $include ) {
+            foreach ($fincludes as $include) {
                 // Trim leading and trailing whitespaces.
-                $include = trim( $include );
+                $include = trim($include);
 
-                if ( substr( $include, 0, 2 ) === '//' ) {
+                if (substr($include, 0, 2) === '//') {
                     // Regex rule
                     // Format value as required.
-                    $include = str_replace( '//', '/', $include );
-                    $include = $include . '/i';
+                    $include = str_replace('//', '/', $include);
+                    $include = $include.'/i';
 
                     // Store regex object.
-                    $finclude[ $i ]['type']  = 'RegExp';
-                    $finclude[ $i ]['value'] = $include;
+                    $finclude[$i]['type']  = 'RegExp';
+                    $finclude[$i]['value'] = $include;
                 } else {
                     // Simple value rule.
-                    $finclude[ $i ]['value'] = $include;
+                    $finclude[$i]['value'] = $include;
                 }
 
                 $i++;
@@ -776,54 +776,54 @@ 
     public function ao_ccss_cleaning() {
         // Perform plugin maintenance
         // Truncate log file >= 1MB .
-        if ( file_exists( AO_CCSS_LOG ) ) {
-            if ( filesize( AO_CCSS_LOG ) >= 1048576 ) {
-                $logfile = fopen( AO_CCSS_LOG, 'w' );
-                fclose( $logfile );
+        if (file_exists(AO_CCSS_LOG)) {
+            if (filesize(AO_CCSS_LOG) >= 1048576) {
+                $logfile = fopen(AO_CCSS_LOG, 'w');
+                fclose($logfile);
             }
         }
 
         // Remove lock file.
-        if ( file_exists( AO_CCSS_LOCK ) ) {
-            unlink( AO_CCSS_LOCK );
+        if (file_exists(AO_CCSS_LOCK)) {
+            unlink(AO_CCSS_LOCK);
         }
 
         // Make sure queue processing is scheduled, recreate if not.
-        if ( ! wp_next_scheduled( 'ao_ccss_queue' ) ) {
-            wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' );
+        if (!wp_next_scheduled('ao_ccss_queue')) {
+            wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue');
         }
 
         // Queue cleaning.
         global $ao_ccss_queue;
         $queue_purge_threshold = 100;
-        $queue_purge_age       = 24 * 60 * 60;
-        $queue_length          = count( $ao_ccss_queue );
-        $timestamp_yesterday   = microtime( true ) - $queue_purge_age;
+        $queue_purge_age       = 24*60*60;
+        $queue_length          = count($ao_ccss_queue);
+        $timestamp_yesterday   = microtime(true) - $queue_purge_age;
         $remove_old_new        = false;
         $queue_altered         = false;
 
-        if ( $queue_length > $queue_purge_threshold ) {
+        if ($queue_length > $queue_purge_threshold) {
             $remove_old_new = true;
         }
 
-        foreach ( $ao_ccss_queue as $path => $job ) {
-            if ( ( $remove_old_new && 'NEW' == $job['jqstat'] && $job['jctime'] < $timestamp_yesterday ) || in_array( $job['jqstat'], array( 'JOB_FAILED', 'STATUS_JOB_BAD', 'NO_CSS', 'NO_RESPONSE' ) ) ) {
-                unset( $ao_ccss_queue[ $path ] );
+        foreach ($ao_ccss_queue as $path => $job) {
+            if (($remove_old_new && 'NEW' == $job['jqstat'] && $job['jctime'] < $timestamp_yesterday) || in_array($job['jqstat'], array('JOB_FAILED', 'STATUS_JOB_BAD', 'NO_CSS', 'NO_RESPONSE'))) {
+                unset($ao_ccss_queue[$path]);
                 $queue_altered = true;
             }
         }
 
         // save queue to options!
-        if ( $queue_altered ) {
-            $ao_ccss_queue_raw = json_encode( $ao_ccss_queue );
-            update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue cleaning done.', 3 );
+        if ($queue_altered) {
+            $ao_ccss_queue_raw = json_encode($ao_ccss_queue);
+            update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue cleaning done.', 3);
         }
 
         // re-check key if invalid.
         global $ao_ccss_keyst;
-        if ( 1 == $ao_ccss_keyst ) {
-            $this->ao_ccss_api_generate( '', '', '' );
+        if (1 == $ao_ccss_keyst) {
+            $this->ao_ccss_api_generate('', '', '');
         }
     }
 }

classes/autoptimizeCriticalCSSEnqueue.php

Doc Comments +5 added lines

@@ -221,6 +221,11 @@
         return $page_type;
     }
 
+    /**
+     * @param string $path
+     * @param false|string $target
+     * @param boolean $create
+     */
     public function ao_ccss_define_job( $path, $target, $type, $hash, $file, $jid, $jrstat, $jvstat, $create ) {
         // Define a job entry to be created or updated
         // Define commom job properties.

Spacing +66 added lines, -66 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS job enqueue logic.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -12,27 +12,27 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
     }
 
-    public static function ao_ccss_enqueue( $hash ) {
+    public static function ao_ccss_enqueue($hash) {
         $self = new self();
         // Get key status.
-        $key = autoptimizeCriticalCSSCore::ao_ccss_key_status( false );
+        $key = autoptimizeCriticalCSSCore::ao_ccss_key_status(false);
 
         // Queue is available to anyone...
         $enqueue = true;
 
         // ... which are not the ones below.
-        if ( is_user_logged_in() || is_feed() || is_404() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || $self->ao_ccss_ua() || 'nokey' == $key['status'] || 'invalid' == $key['status'] ) {
+        if (is_user_logged_in() || is_feed() || is_404() || (defined('DOING_AJAX') && DOING_AJAX) || $self->ao_ccss_ua() || 'nokey' == $key['status'] || 'invalid' == $key['status']) {
             $enqueue = false;
-            autoptimizeCriticalCSSCore::ao_ccss_log( "Job queuing is not available for WordPress's logged in users, feeds, error pages, ajax calls, to criticalcss.com itself or when a valid API key is not found", 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log("Job queuing is not available for WordPress's logged in users, feeds, error pages, ajax calls, to criticalcss.com itself or when a valid API key is not found", 3);
         }
 
-        if ( $enqueue ) {
+        if ($enqueue) {
             // Continue if queue is available
             // Attach required arrays/ vars.
             global $ao_ccss_rules;
@@ -41,7 +41,7 @@ 
             global $ao_ccss_forcepath;
 
             // Get request path and page type, and initialize the queue update flag.
-            $req_path        = strtok( $_SERVER['REQUEST_URI'], '?' );
+            $req_path        = strtok($_SERVER['REQUEST_URI'], '?');
             $req_type        = $self->ao_ccss_get_type();
             $job_qualify     = false;
             $target_rule     = false;
@@ -49,21 +49,21 @@ 
             $queue_update    = false;
 
             // Match for paths in rules.
-            foreach ( $ao_ccss_rules['paths'] as $path => $props ) {
+            foreach ($ao_ccss_rules['paths'] as $path => $props) {
 
                 // Prepare rule target and log.
-                $target_rule = 'paths|' . $path;
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Qualifying path <' . $req_path . '> for job submission by rule <' . $target_rule . '>', 3 );
+                $target_rule = 'paths|'.$path;
+                autoptimizeCriticalCSSCore::ao_ccss_log('Qualifying path <'.$req_path.'> for job submission by rule <'.$target_rule.'>', 3);
 
                 // Path match
                 // -> exact match needed for AUTO rules
                 // -> partial match OK for MANUAL rules (which have empty hash and a file with CCSS).
-                if ( $path === $req_path || ( false == $props['hash'] && false != $props['file'] && preg_match( '|' . $path . '|', $req_path ) ) ) {
+                if ($path === $req_path || (false == $props['hash'] && false != $props['file'] && preg_match('|'.$path.'|', $req_path))) {
 
                     // There's a path match in the rule, so job QUALIFIES with a path rule match.
                     $job_qualify     = true;
                     $rule_properties = $props;
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Path <' . $req_path . '> QUALIFIED for job submission by rule <' . $target_rule . '>', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Path <'.$req_path.'> QUALIFIED for job submission by rule <'.$target_rule.'>', 3);
 
                     // Stop processing other path rules.
                     break;
@@ -71,19 +71,19 @@ 
             }
 
             // Match for types in rules if no path rule matches and if we're not enforcing paths.
-            if ( ! $job_qualify && ( ! $ao_ccss_forcepath || ! in_array( $req_type, apply_filters( 'autoptimize_filter_ccss_coreenqueue_forcepathfortype', array( 'is_page' ) ) ) ) ) {
-                foreach ( $ao_ccss_rules['types'] as $type => $props ) {
+            if (!$job_qualify && (!$ao_ccss_forcepath || !in_array($req_type, apply_filters('autoptimize_filter_ccss_coreenqueue_forcepathfortype', array('is_page'))))) {
+                foreach ($ao_ccss_rules['types'] as $type => $props) {
 
                     // Prepare rule target and log.
-                    $target_rule = 'types|' . $type;
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Qualifying page type <' . $req_type . '> on path <' . $req_path . '> for job submission by rule <' . $target_rule . '>', 3 );
+                    $target_rule = 'types|'.$type;
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Qualifying page type <'.$req_type.'> on path <'.$req_path.'> for job submission by rule <'.$target_rule.'>', 3);
 
-                    if ( $req_type == $type ) {
+                    if ($req_type == $type) {
                         // Type match.
                         // There's a type match in the rule, so job QUALIFIES with a type rule match.
                         $job_qualify     = true;
                         $rule_properties = $props;
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Page type <' . $req_type . '> on path <' . $req_path . '> QUALIFIED for job submission by rule <' . $target_rule . '>', 3 );
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Page type <'.$req_type.'> on path <'.$req_path.'> QUALIFIED for job submission by rule <'.$target_rule.'>', 3);
 
                         // Stop processing other type rules.
                         break;
@@ -91,11 +91,11 @@ 
                 }
             }
 
-            if ( $job_qualify && false == $rule_properties['hash'] && false != $rule_properties['file'] ) {
+            if ($job_qualify && false == $rule_properties['hash'] && false != $rule_properties['file']) {
                 // If job qualifies but rule hash is false and file isn't false  (MANUAL rule), job does not qualify despite what previous evaluations says.
                 $job_qualify = false;
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission DISQUALIFIED by MANUAL rule <' . $target_rule . '> with hash <' . $rule_properties['hash'] . '> and file <' . $rule_properties['file'] . '>', 3 );
-            } elseif ( ! $job_qualify && empty( $rule_properties ) ) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission DISQUALIFIED by MANUAL rule <'.$target_rule.'> with hash <'.$rule_properties['hash'].'> and file <'.$rule_properties['file'].'>', 3);
+            } elseif (!$job_qualify && empty($rule_properties)) {
                 // But if job does not qualify and rule properties are set, job qualifies as there is no matching rule for it yet
                 // Fill-in the new target rule.
                 $job_qualify = true;
@@ -103,28 +103,28 @@ 
                 // Should we switch to path-base AUTO-rules? Conditions:
                 // 1. forcepath option has to be enabled (off by default)
                 // 2. request type should be (by default, but filterable) one of is_page (removed for now: woo_is_product or woo_is_product_category).
-                if ( $ao_ccss_forcepath && in_array( $req_type, apply_filters( 'autoptimize_filter_ccss_coreenqueue_forcepathfortype', array( 'is_page' ) ) ) ) {
-                    if ( '/' !== $req_path ) {
-                        $target_rule = 'paths|' . $req_path;
+                if ($ao_ccss_forcepath && in_array($req_type, apply_filters('autoptimize_filter_ccss_coreenqueue_forcepathfortype', array('is_page')))) {
+                    if ('/' !== $req_path) {
+                        $target_rule = 'paths|'.$req_path;
                     } else {
                         // Exception; we don't want a path-based rule for "/" as that messes things up, hard-switch this to a type-based is_front_page rule.
-                        $target_rule = 'types|' . 'is_front_page';
+                        $target_rule = 'types|'.'is_front_page';
                     }
                 } else {
-                    $target_rule = 'types|' . $req_type;
+                    $target_rule = 'types|'.$req_type;
                 }
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission QUALIFIED by MISSING rule for page type <' . $req_type . '> on path <' . $req_path . '>, new rule target is <' . $target_rule . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission QUALIFIED by MISSING rule for page type <'.$req_type.'> on path <'.$req_path.'>, new rule target is <'.$target_rule.'>', 3);
             } else {
                 // Or just log a job qualified by a matching rule.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission QUALIFIED by AUTO rule <' . $target_rule . '> with hash <' . $rule_properties['hash'] . '> and file <' . $rule_properties['file'] . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission QUALIFIED by AUTO rule <'.$target_rule.'> with hash <'.$rule_properties['hash'].'> and file <'.$rule_properties['file'].'>', 3);
             }
 
             // Submit job.
-            if ( $job_qualify ) {
-                if ( ! array_key_exists( $req_path, $ao_ccss_queue ) ) {
+            if ($job_qualify) {
+                if (!array_key_exists($req_path, $ao_ccss_queue)) {
                     // This is a NEW job
                     // Merge job into the queue.
-                    $ao_ccss_queue[ $req_path ] = $self->ao_ccss_define_job(
+                    $ao_ccss_queue[$req_path] = $self->ao_ccss_define_job(
                         $req_path,
                         $target_rule,
                         $req_type,
@@ -140,30 +140,30 @@ 
                 } else {
                     // This is an existing job
                     // The job is still NEW, most likely this is extra CSS file for the same page that needs a hash.
-                    if ( 'NEW' == $ao_ccss_queue[ $req_path ]['jqstat'] ) {
+                    if ('NEW' == $ao_ccss_queue[$req_path]['jqstat']) {
                         // Add hash if it's not already in the job.
-                        if ( ! in_array( $hash, $ao_ccss_queue[ $req_path ]['hashes'] ) ) {
+                        if (!in_array($hash, $ao_ccss_queue[$req_path]['hashes'])) {
                             // Push new hash to its array and update flag.
-                            $queue_update = array_push( $ao_ccss_queue[ $req_path ]['hashes'], $hash );
+                            $queue_update = array_push($ao_ccss_queue[$req_path]['hashes'], $hash);
 
                             // Log job update.
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Hashes UPDATED on local job id <' . $ao_ccss_queue[ $req_path ]['ljid'] . '>, job status NEW, target rule <' . $ao_ccss_queue[ $req_path ]['rtarget'] . '>, hash added: ' . $hash, 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Hashes UPDATED on local job id <'.$ao_ccss_queue[$req_path]['ljid'].'>, job status NEW, target rule <'.$ao_ccss_queue[$req_path]['rtarget'].'>, hash added: '.$hash, 3);
 
                             // Return from here as the hash array is already updated.
                             return true;
                         }
-                    } elseif ( 'NEW' != $ao_ccss_queue[ $req_path ]['jqstat'] && 'JOB_QUEUED' != $ao_ccss_queue[ $req_path ]['jqstat'] && 'JOB_ONGOING' != $ao_ccss_queue[ $req_path ]['jqstat'] ) {
+                    } elseif ('NEW' != $ao_ccss_queue[$req_path]['jqstat'] && 'JOB_QUEUED' != $ao_ccss_queue[$req_path]['jqstat'] && 'JOB_ONGOING' != $ao_ccss_queue[$req_path]['jqstat']) {
                         // Allow requeuing jobs that are not NEW, JOB_QUEUED or JOB_ONGOING
                         // Merge new job keeping some previous job values.
-                        $ao_ccss_queue[ $req_path ] = $self->ao_ccss_define_job(
+                        $ao_ccss_queue[$req_path] = $self->ao_ccss_define_job(
                             $req_path,
                             $target_rule,
                             $req_type,
                             $hash,
-                            $ao_ccss_queue[ $req_path ]['file'],
-                            $ao_ccss_queue[ $req_path ]['jid'],
-                            $ao_ccss_queue[ $req_path ]['jrstat'],
-                            $ao_ccss_queue[ $req_path ]['jvstat'],
+                            $ao_ccss_queue[$req_path]['file'],
+                            $ao_ccss_queue[$req_path]['jid'],
+                            $ao_ccss_queue[$req_path]['jrstat'],
+                            $ao_ccss_queue[$req_path]['jvstat'],
                             false
                         );
                         // Set update flag.
@@ -171,14 +171,14 @@ 
                     }
                 }
 
-                if ( $queue_update ) {
+                if ($queue_update) {
                     // Persist the job to the queue and return.
-                    $ao_ccss_queue_raw = json_encode( $ao_ccss_queue );
-                    update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
+                    $ao_ccss_queue_raw = json_encode($ao_ccss_queue);
+                    update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
                     return true;
                 } else {
                     // Or just return false if no job was added.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'A job for path <' . $req_path . '> already exist with NEW or PENDING status, skipping job creation', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('A job for path <'.$req_path.'> already exist with NEW or PENDING status, skipping job creation', 3);
                     return false;
                 }
             }
@@ -194,22 +194,22 @@ 
         $page_type = false;
 
         // Iterates over the array to match a type.
-        foreach ( $ao_ccss_types as $type ) {
-            if ( strpos( $type, 'custom_post_' ) !== false ) {
+        foreach ($ao_ccss_types as $type) {
+            if (strpos($type, 'custom_post_') !== false) {
                 // Match custom post types.
-                if ( get_post_type( get_the_ID() ) === substr( $type, 12 ) ) {
+                if (get_post_type(get_the_ID()) === substr($type, 12)) {
                     $page_type = $type;
                     break;
                 }
-            } elseif ( strpos( $type, 'template_' ) !== false ) {
+            } elseif (strpos($type, 'template_') !== false) {
                 // If templates; don't break, templates become manual-only rules.
             } else {
                 // Match all other existing types
                 // but remove prefix to be able to check if the function exists & returns true.
-                $_type = str_replace( array( 'woo_', 'bp_', 'bbp_', 'edd_' ), '', $type );
-                if ( function_exists( $_type ) && call_user_func( $_type ) ) {
+                $_type = str_replace(array('woo_', 'bp_', 'bbp_', 'edd_'), '', $type);
+                if (function_exists($_type) && call_user_func($_type)) {
                     // Make sure we only return is_front_page (and is_home) for one page, not for the "paged frontpage" (/page/2 ..).
-                    if ( ( 'is_front_page' !== $_type && 'is_home' !== $_type ) || ! is_paged() ) {
+                    if (('is_front_page' !== $_type && 'is_home' !== $_type) || !is_paged()) {
                         $page_type = $type;
                         break;
                     }
@@ -221,44 +221,44 @@ 
         return $page_type;
     }
 
-    public function ao_ccss_define_job( $path, $target, $type, $hash, $file, $jid, $jrstat, $jvstat, $create ) {
+    public function ao_ccss_define_job($path, $target, $type, $hash, $file, $jid, $jrstat, $jvstat, $create) {
         // Define a job entry to be created or updated
         // Define commom job properties.
         $path            = array();
         $path['ljid']    = $this->ao_ccss_job_id();
         $path['rtarget'] = $target;
         $path['ptype']   = $type;
-        $path['hashes']  = array( $hash );
+        $path['hashes']  = array($hash);
         $path['hash']    = $hash;
         $path['file']    = $file;
         $path['jid']     = $jid;
         $path['jqstat']  = 'NEW';
         $path['jrstat']  = $jrstat;
         $path['jvstat']  = $jvstat;
-        $path['jctime']  = microtime( true );
+        $path['jctime']  = microtime(true);
         $path['jftime']  = null;
 
         // Set operation requested.
-        if ( $create ) {
+        if ($create) {
             $operation = 'CREATED';
         } else {
             $operation = 'UPDATED';
         }
 
         // Log job creation.
-        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job ' . $operation . ' with local job id <' . $path['ljid'] . '> for target rule <' . $target . '>', 3 );
+        autoptimizeCriticalCSSCore::ao_ccss_log('Job '.$operation.' with local job id <'.$path['ljid'].'> for target rule <'.$target.'>', 3);
 
         return $path;
     }
 
-    public function ao_ccss_job_id( $length = 6 ) {
+    public function ao_ccss_job_id($length = 6) {
         // Generate random strings for the local job ID
         // Based on https://stackoverflow.com/a/4356295 .
         $characters        = '0123456789abcdefghijklmnopqrstuvwxyz';
-        $characters_length = strlen( $characters );
+        $characters_length = strlen($characters);
         $random_string     = 'j-';
-        for ( $i = 0; $i < $length; $i++ ) {
-            $random_string .= $characters[ rand( 0, $characters_length - 1 ) ];
+        for ($i = 0; $i < $length; $i++) {
+            $random_string .= $characters[rand(0, $characters_length - 1)];
         }
         return $random_string;
     }
@@ -266,17 +266,17 @@ 
     public function ao_ccss_ua() {
         // Check for criticalcss.com user agent.
         $agent = '';
-        if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
+        if (isset($_SERVER['HTTP_USER_AGENT'])) {
             $agent = $_SERVER['HTTP_USER_AGENT'];
         }
 
         // Check for UA and return TRUE when criticalcss.com is the detected UA, false when not.
-        $rtn = strpos( $agent, AO_CCSS_URL );
-        if ( 0 === $rtn ) {
+        $rtn = strpos($agent, AO_CCSS_URL);
+        if (0 === $rtn) {
             $rtn = true;
         } else {
             $rtn = false;
         }
-        return ( $rtn );
+        return ($rtn);
     }
 }

classes/autoptimizeScripts.php

Doc Comments +4 added lines, -1 removed lines

@@ -676,6 +676,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $tag
+     */
     private function movetolast( $tag )
     {
         if ( empty( $tag ) ) {
@@ -733,7 +736,7 @@ 
      * @param string $filepath Filepath.
      * @param bool   $cache_miss Optional. Force a cache miss. Default false.
      *
-     * @return bool|string Url pointing to the minified js file or false.
+     * @return false|string Url pointing to the minified js file or false.
      */
     public function minify_single( $filepath, $cache_miss = false )
     {

Spacing +174 added lines, -174 removed lines

@@ -3,7 +3,7 @@ 
  * Class for JS optimization.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -198,127 +198,127 @@ 
      *
      * @param array $options all options.
      */
-    public function read( $options )
+    public function read($options)
     {
-        $noptimize_js = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content );
-        if ( $noptimize_js ) {
+        $noptimize_js = apply_filters('autoptimize_filter_js_noptimize', false, $this->content);
+        if ($noptimize_js) {
             return false;
         }
 
         // only optimize known good JS?
-        $whitelist_js = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content );
-        if ( ! empty( $whitelist_js ) ) {
-            $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelist_js ) ) );
+        $whitelist_js = apply_filters('autoptimize_filter_js_whitelist', '', $this->content);
+        if (!empty($whitelist_js)) {
+            $this->whitelist = array_filter(array_map('trim', explode(',', $whitelist_js)));
         }
 
         // is there JS we should simply remove?
-        $removable_js = apply_filters( 'autoptimize_filter_js_removables', '', $this->content );
-        if ( ! empty( $removable_js ) ) {
-            $this->jsremovables = array_filter( array_map( 'trim', explode( ',', $removable_js ) ) );
+        $removable_js = apply_filters('autoptimize_filter_js_removables', '', $this->content);
+        if (!empty($removable_js)) {
+            $this->jsremovables = array_filter(array_map('trim', explode(',', $removable_js)));
         }
 
         // only header?
-        if ( apply_filters( 'autoptimize_filter_js_justhead', $options['justhead'] ) ) {
-            $content             = explode( '</head>', $this->content, 2 );
-            $this->content       = $content[0] . '</head>';
+        if (apply_filters('autoptimize_filter_js_justhead', $options['justhead'])) {
+            $content             = explode('</head>', $this->content, 2);
+            $this->content       = $content[0].'</head>';
             $this->restofcontent = $content[1];
         }
 
         // Determine whether we're doing JS-files aggregation or not.
-        if ( ! $options['aggregate'] ) {
+        if (!$options['aggregate']) {
             $this->aggregate = false;
         }
         // Returning true for "dontaggregate" turns off aggregation.
-        if ( $this->aggregate && apply_filters( 'autoptimize_filter_js_dontaggregate', false ) ) {
+        if ($this->aggregate && apply_filters('autoptimize_filter_js_dontaggregate', false)) {
             $this->aggregate = false;
         }
 
         // include inline?
-        if ( apply_filters( 'autoptimize_js_include_inline', $options['include_inline'] ) ) {
+        if (apply_filters('autoptimize_js_include_inline', $options['include_inline'])) {
             $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);
 
         // Determine whether excluded files should be minified if not yet so.
-        if ( ! $options['minify_excluded'] && $options['aggregate'] ) {
+        if (!$options['minify_excluded'] && $options['aggregate']) {
             $this->minify_excluded = false;
         }
-        $this->minify_excluded = apply_filters( 'autoptimize_filter_js_minify_excluded', $this->minify_excluded, '' );
+        $this->minify_excluded = apply_filters('autoptimize_filter_js_minify_excluded', $this->minify_excluded, '');
 
         // get extra exclusions settings or filter.
         $exclude_js = $options['js_exclude'];
-        $exclude_js = apply_filters( 'autoptimize_filter_js_exclude', $exclude_js, $this->content );
-
-        if ( '' !== $exclude_js ) {
-            if ( is_array( $exclude_js ) ) {
-                $remove_keys = array_keys( $exclude_js, 'remove' );
-                if ( false !== $remove_keys ) {
-                    foreach ( $remove_keys as $remove_key ) {
-                        unset( $exclude_js[ $remove_key ] );
+        $exclude_js = apply_filters('autoptimize_filter_js_exclude', $exclude_js, $this->content);
+
+        if ('' !== $exclude_js) {
+            if (is_array($exclude_js)) {
+                $remove_keys = array_keys($exclude_js, 'remove');
+                if (false !== $remove_keys) {
+                    foreach ($remove_keys as $remove_key) {
+                        unset($exclude_js[$remove_key]);
                         $this->jsremovables[] = $remove_key;
                     }
                 }
-                $excl_js_arr = array_keys( $exclude_js );
+                $excl_js_arr = array_keys($exclude_js);
             } else {
-                $excl_js_arr = array_filter( array_map( 'trim', explode( ',', $exclude_js ) ) );
+                $excl_js_arr = array_filter(array_map('trim', explode(',', $exclude_js)));
             }
-            $this->dontmove = array_merge( $excl_js_arr, $this->dontmove );
+            $this->dontmove = array_merge($excl_js_arr, $this->dontmove);
         }
 
         // Should we add try-catch?
-        if ( $options['trycatch'] ) {
+        if ($options['trycatch']) {
             $this->trycatch = true;
         }
 
         // force js in head?
-        if ( $options['forcehead'] ) {
+        if ($options['forcehead']) {
             $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'];
 
         // noptimize me.
-        $this->content = $this->hide_noptimize( $this->content );
+        $this->content = $this->hide_noptimize($this->content);
 
         // Save IE hacks.
-        $this->content = $this->hide_iehacks( $this->content );
+        $this->content = $this->hide_iehacks($this->content);
 
         // comments.
-        $this->content = $this->hide_comments( $this->content );
+        $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.
-                $should_aggregate = $this->should_aggregate( $tag );
-                if ( ! $should_aggregate ) {
+                $should_aggregate = $this->should_aggregate($tag);
+                if (!$should_aggregate) {
                     $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;
                     }
 
                     $orig_tag = null;
-                    $url      = current( explode( '?', $source[2], 2 ) );
-                    $path     = $this->getpath( $url );
-                    if ( false !== $path && preg_match( '#\.js$#', $path ) && $this->ismergeable( $tag ) ) {
+                    $url      = current(explode('?', $source[2], 2));
+                    $path     = $this->getpath($url);
+                    if (false !== $path && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) {
                         // ok to optimize, add to array.
                         $this->scripts[] = $path;
                     } else {
@@ -326,11 +326,11 @@ 
                         $new_tag  = $tag;
 
                         // non-mergeable script (excluded or dynamic or external).
-                        if ( is_array( $exclude_js ) ) {
+                        if (is_array($exclude_js)) {
                             // should we add flags?
-                            foreach ( $exclude_js as $excl_tag => $excl_flags ) {
-                                if ( false !== strpos( $orig_tag, $excl_tag ) && in_array( $excl_flags, array( 'async', 'defer' ) ) ) {
-                                    $new_tag = str_replace( '<script ', '<script ' . $excl_flags . ' ', $new_tag );
+                            foreach ($exclude_js as $excl_tag => $excl_flags) {
+                                if (false !== strpos($orig_tag, $excl_tag) && in_array($excl_flags, array('async', 'defer'))) {
+                                    $new_tag = str_replace('<script ', '<script '.$excl_flags.' ', $new_tag);
                                 }
                             }
                         }
@@ -338,13 +338,13 @@ 
                         // Should we minify the non-aggregated script?
                         // -> if aggregate is on and exclude minify is on
                         // -> if aggregate is off and the file is not in dontmove.
-                        if ( $path && $this->minify_excluded ) {
-                            $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false );
-                            if ( ( false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path ) || ( true === $this->aggregate && ( false === $consider_minified_array || str_replace( $consider_minified_array, '', $path ) === $path ) ) ) {
-                                $minified_url = $this->minify_single( $path );
-                                if ( ! empty( $minified_url ) ) {
+                        if ($path && $this->minify_excluded) {
+                            $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
+                            if ((false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path) || (true === $this->aggregate && (false === $consider_minified_array || str_replace($consider_minified_array, '', $path) === $path))) {
+                                $minified_url = $this->minify_single($path);
+                                if (!empty($minified_url)) {
                                     // Replace original URL with minified URL from cache.
-                                    $new_tag = str_replace( $url, $minified_url, $new_tag );
+                                    $new_tag = str_replace($url, $minified_url, $new_tag);
                                 } else {
                                     // Remove the original script tag, because cache content is empty.
                                     $new_tag = '';
@@ -352,17 +352,17 @@ 
                             }
                         }
 
-                        if ( $this->ismovable( $new_tag ) ) {
+                        if ($this->ismovable($new_tag)) {
                             // can be moved, flags and all.
-                            if ( $this->movetolast( $new_tag ) ) {
+                            if ($this->movetolast($new_tag)) {
                                 $this->move['last'][] = $new_tag;
                             } else {
                                 $this->move['first'][] = $new_tag;
                             }
                         } else {
                             // cannot be moved, so if flag was added re-inject altered tag immediately.
-                            if ( ( '' !== $new_tag && $orig_tag !== $new_tag ) || ( '' === $new_tag && apply_filters( 'autoptimize_filter_js_remove_empty_files', false ) ) ) {
-                                $this->content = str_replace( $orig_tag, $new_tag, $this->content );
+                            if (('' !== $new_tag && $orig_tag !== $new_tag) || ('' === $new_tag && apply_filters('autoptimize_filter_js_remove_empty_files', false))) {
+                                $this->content = str_replace($orig_tag, $new_tag, $this->content);
                                 $orig_tag      = '';
                             }
                             // and forget about the $tag (not to be touched any more).
@@ -371,23 +371,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 );
-                        $this->scripts[] = 'INLINE;' . $code;
+                    $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);
+                        $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 ) || 'last' === $autoptimize_js_moveable ) {
+                        $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag);
+                        if ($this->ismovable($tag) || '' !== $autoptimize_js_moveable) {
+                            if ($this->movetolast($tag) || 'last' === $autoptimize_js_moveable) {
                                 $this->move['last'][] = $tag;
                             } else {
                                 $this->move['first'][] = $tag;
@@ -398,11 +398,11 @@ 
                         }
                     }
                     // Re-hide comments to be able to do the removal based on tag from $this->content.
-                    $tag = $this->hide_comments( $tag );
+                    $tag = $this->hide_comments($tag);
                 }
 
                 // Remove the original script tag.
-                $this->content = str_replace( $tag, '', $this->content );
+                $this->content = str_replace($tag, '', $this->content);
             }
 
             return true;
@@ -427,30 +427,30 @@ 
      * @param string $tag Script node & child(ren).
      * @return bool
      */
-    public function should_aggregate( $tag )
+    public function should_aggregate($tag)
     {
-        if ( empty( $tag ) ) {
+        if (empty($tag)) {
             return false;
         }
 
         // We're only interested in the type attribute of the <script> tag itself, not any possible
         // inline code that might just contain the 'type=' string...
         $tag_parts = array();
-        preg_match( '#<(script[^>]*)>#i', $tag, $tag_parts );
+        preg_match('#<(script[^>]*)>#i', $tag, $tag_parts);
         $tag_without_contents = null;
-        if ( ! empty( $tag_parts[1] ) ) {
+        if (!empty($tag_parts[1])) {
             $tag_without_contents = $tag_parts[1];
         }
 
-        $has_type = ( strpos( $tag_without_contents, 'type' ) !== false );
+        $has_type = (strpos($tag_without_contents, 'type') !== false);
 
         $type_valid = false;
-        if ( $has_type ) {
-            $type_valid = (bool) preg_match( '/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents );
+        if ($has_type) {
+            $type_valid = (bool) preg_match('/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents);
         }
 
         $should_aggregate = false;
-        if ( ! $has_type || $type_valid ) {
+        if (!$has_type || $type_valid) {
             $should_aggregate = true;
         }
 
@@ -462,75 +462,75 @@ 
      */
     public function minify()
     {
-        foreach ( $this->scripts as $script ) {
-            if ( empty( $script ) ) {
+        foreach ($this->scripts as $script) {
+            if (empty($script)) {
                 continue;
             }
 
             // TODO/FIXME: some duplicate code here, can be reduced/simplified.
-            if ( preg_match( '#^INLINE;#', $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 ) {
-                    $script = 'try{' . $script . '}catch(e){}';
+                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 ) ) {
+                $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 ( false !== $script && file_exists( $script ) && is_readable( $script ) ) {
-                    $scriptsrc = file_get_contents( $script );
-                    $scriptsrc = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc );
-                    $scriptsrc = rtrim( $scriptsrc, ";\n\t\r" ) . ';';
+                if (false !== $script && file_exists($script) && is_readable($script)) {
+                    $scriptsrc = file_get_contents($script);
+                    $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc);
+                    $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';';
                     // Add try-catch?
-                    if ( $this->trycatch ) {
-                        $scriptsrc = 'try{' . $scriptsrc . '}catch(e){}';
+                    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 ) ) {
+                    $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script);
+                    if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) {
                         $scriptsrc             = $tmpscriptsrc;
                         $this->alreadyminified = true;
-                    } elseif ( $this->can_inject_late( $script ) ) {
-                        $scriptsrc = self::build_injectlater_marker( $script, md5( $scriptsrc ) );
+                    } elseif ($this->can_inject_late($script)) {
+                        $scriptsrc = self::build_injectlater_marker($script, md5($scriptsrc));
                     }
-                    $this->jscode .= "\n" . $scriptsrc;
+                    $this->jscode .= "\n".$scriptsrc;
                 }
             }
         }
 
         // Check for already-minified code.
-        $this->md5hash = md5( $this->jscode );
-        $ccheck        = new autoptimizeCache( $this->md5hash, 'js' );
-        if ( $ccheck->check() ) {
+        $this->md5hash = md5($this->jscode);
+        $ccheck        = new autoptimizeCache($this->md5hash, 'js');
+        if ($ccheck->check()) {
             $this->jscode = $ccheck->retrieve();
             return true;
         }
-        unset( $ccheck );
+        unset($ccheck);
 
         // $this->jscode has all the uncompressed code now.
-        if ( true !== $this->alreadyminified ) {
-            if ( apply_filters( 'autoptimize_js_do_minify', true ) ) {
-                $tmp_jscode = trim( JSMin::minify( $this->jscode ) );
-                if ( ! empty( $tmp_jscode ) ) {
+        if (true !== $this->alreadyminified) {
+            if (apply_filters('autoptimize_js_do_minify', true)) {
+                $tmp_jscode = trim(JSMin::minify($this->jscode));
+                if (!empty($tmp_jscode)) {
                     $this->jscode = $tmp_jscode;
-                    unset( $tmp_jscode );
+                    unset($tmp_jscode);
                 }
-                $this->jscode = $this->inject_minified( $this->jscode );
-                $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
+                $this->jscode = $this->inject_minified($this->jscode);
+                $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
                 return true;
             } else {
-                $this->jscode = $this->inject_minified( $this->jscode );
+                $this->jscode = $this->inject_minified($this->jscode);
                 return false;
             }
         }
 
-        $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
+        $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
         return true;
     }
 
@@ -539,13 +539,13 @@ 
      */
     public function cache()
     {
-        $cache = new autoptimizeCache( $this->md5hash, 'js' );
-        if ( ! $cache->check() ) {
+        $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 );
+        $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
+        $this->url = $this->url_replace_cdn($this->url);
     }
 
     /**
@@ -554,47 +554,47 @@ 
     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 ) {
-            $replace_tag = array( '</head>', 'before' );
+        if ($this->forcehead) {
+            $replace_tag = array('</head>', 'before');
             $defer       = '';
         } else {
-            $replace_tag = array( '</body>', 'before' );
+            $replace_tag = array('</body>', 'before');
             $defer       = 'defer ';
         }
 
-        $defer   = apply_filters( 'autoptimize_filter_js_defer', $defer );
+        $defer   = apply_filters('autoptimize_filter_js_defer', $defer);
         $type_js = '';
-        if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
+        if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
             $type_js = 'type="text/javascript" ';
         }
 
-        $bodyreplacementpayload = '<script ' . $type_js . $defer . 'src="' . $this->url . '"></script>';
-        $bodyreplacementpayload = apply_filters( 'autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload );
+        $bodyreplacementpayload = '<script '.$type_js.$defer.'src="'.$this->url.'"></script>';
+        $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']);
 
-        $replace_tag = apply_filters( 'autoptimize_filter_js_replacetag', $replace_tag );
+        $replace_tag = apply_filters('autoptimize_filter_js_replacetag', $replace_tag);
 
-        if ( strlen( $this->jscode ) > 0 ) {
-            $this->inject_in_html( $bodyreplacement, $replace_tag );
+        if (strlen($this->jscode) > 0) {
+            $this->inject_in_html($bodyreplacement, $replace_tag);
         }
 
         // Restore comments.
-        $this->content = $this->restore_comments( $this->content );
+        $this->content = $this->restore_comments($this->content);
 
         // Restore IE hacks.
-        $this->content = $this->restore_iehacks( $this->content );
+        $this->content = $this->restore_iehacks($this->content);
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Return the modified HTML.
         return $this->content;
@@ -605,34 +605,34 @@ 
      *
      * @param string $tag JS tag.
      */
-    private function ismergeable( $tag )
+    private function ismergeable($tag)
     {
-        if ( empty( $tag ) || ! $this->aggregate ) {
+        if (empty($tag) || !$this->aggregate) {
             return false;
         }
 
-        if ( ! empty( $this->whitelist ) ) {
-            foreach ( $this->whitelist as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+        if (!empty($this->whitelist)) {
+            foreach ($this->whitelist as $match) {
+                if (false !== strpos($tag, $match)) {
                     return true;
                 }
             }
             // No match with whitelist.
             return false;
         } else {
-            foreach ( $this->domove as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+            foreach ($this->domove as $match) {
+                if (false !== strpos($tag, $match)) {
                     // Matched something.
                     return false;
                 }
             }
 
-            if ( $this->movetolast( $tag ) ) {
+            if ($this->movetolast($tag)) {
                 return false;
             }
 
-            foreach ( $this->dontmove as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+            foreach ($this->dontmove as $match) {
+                if (false !== strpos($tag, $match)) {
                     // Matched something.
                     return false;
                 }
@@ -648,25 +648,25 @@ 
      *
      * @param string $tag tag to check for blacklist (exclusions).
      */
-    private function ismovable( $tag )
+    private function ismovable($tag)
     {
-        if ( empty( $tag ) || true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) {
+        if (empty($tag) || true !== $this->include_inline || apply_filters('autoptimize_filter_js_unmovable', true)) {
             return false;
         }
 
-        foreach ( $this->domove as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($this->domove as $match) {
+            if (false !== strpos($tag, $match)) {
                 // Matched something.
                 return true;
             }
         }
 
-        if ( $this->movetolast( $tag ) ) {
+        if ($this->movetolast($tag)) {
             return true;
         }
 
-        foreach ( $this->dontmove as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($this->dontmove as $match) {
+            if (false !== strpos($tag, $match)) {
                 // Matched something.
                 return false;
             }
@@ -676,14 +676,14 @@ 
         return true;
     }
 
-    private function movetolast( $tag )
+    private function movetolast($tag)
     {
-        if ( empty( $tag ) ) {
+        if (empty($tag)) {
             return false;
         }
 
-        foreach ( $this->domovelast as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($this->domovelast as $match) {
+            if (false !== strpos($tag, $match)) {
                 // Matched, return true.
                 return true;
             }
@@ -703,12 +703,12 @@ 
      * @param string $js_path Path to JS file.
      * @return bool
      */
-    private function can_inject_late( $js_path ) {
-        $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false );
-        if ( true !== $this->inject_min_late ) {
+    private function can_inject_late($js_path) {
+        $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
+        if (true !== $this->inject_min_late) {
             // late-inject turned off.
             return false;
-        } elseif ( ( false === strpos( $js_path, 'min.js' ) ) && ( false === strpos( $js_path, 'wp-includes/js/jquery/jquery.js' ) ) && ( str_replace( $consider_minified_array, '', $js_path ) === $js_path ) ) {
+        } elseif ((false === strpos($js_path, 'min.js')) && (false === strpos($js_path, 'wp-includes/js/jquery/jquery.js')) && (str_replace($consider_minified_array, '', $js_path) === $js_path)) {
             // file not minified based on filename & filter.
             return false;
         } else {
@@ -735,32 +735,32 @@ 
      *
      * @return bool|string Url pointing to the minified js file or false.
      */
-    public function minify_single( $filepath, $cache_miss = false )
+    public function minify_single($filepath, $cache_miss = false)
     {
-        $contents = $this->prepare_minify_single( $filepath );
+        $contents = $this->prepare_minify_single($filepath);
 
-        if ( empty( $contents ) ) {
+        if (empty($contents)) {
             return false;
         }
 
         // Check cache.
-        $hash  = 'single_' . md5( $contents );
-        $cache = new autoptimizeCache( $hash, 'js' );
+        $hash  = 'single_'.md5($contents);
+        $cache = new autoptimizeCache($hash, 'js');
 
         // If not in cache already, minify...
-        if ( ! $cache->check() || $cache_miss ) {
-            $contents = trim( JSMin::minify( $contents ) );
+        if (!$cache->check() || $cache_miss) {
+            $contents = trim(JSMin::minify($contents));
 
             // Check if minified cache content is empty.
-            if ( empty( $contents ) ) {
+            if (empty($contents)) {
                 return false;
             }
 
             // Store in cache.
-            $cache->cache( $contents, 'text/javascript' );
+            $cache->cache($contents, 'text/javascript');
         }
 
-        $url = $this->build_minify_single_url( $cache );
+        $url = $this->build_minify_single_url($cache);
 
         return $url;
     }

classes/autoptimizeStyles.php

Doc Comments +22 added lines, -2 removed lines

@@ -439,7 +439,7 @@ 
      * be inlined into a data: URI. Defaults to 4096, passed through
      * `autoptimize_filter_css_datauri_maxsize` filter.
      *
-     * @return mixed
+     * @return integer|null
      */
     private function get_datauri_maxsize()
     {
@@ -460,6 +460,9 @@ 
         return $max_size;
     }
 
+    /**
+     * @param false|string $url
+     */
     private function check_datauri_exclude_list( $url )
     {
         static $exclude_list = null;
@@ -485,6 +488,9 @@ 
         return $matched;
     }
 
+    /**
+     * @param false|string $path
+     */
     private function build_or_get_datauri_image( $path )
     {
         /**
@@ -914,6 +920,11 @@ 
         return true;
     }
 
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
     public function run_minifier_on( $code )
     {
         if ( ! $this->alreadyminified ) {
@@ -1135,6 +1146,9 @@ 
         return $code;
     }
 
+    /**
+     * @param string $tag
+     */
     private function ismovable( $tag )
     {
         if ( ! $this->aggregate ) {
@@ -1164,6 +1178,9 @@ 
         }
     }
 
+    /**
+     * @param string $css
+     */
     private function can_inject_late( $css_path, $css )
     {
         $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $css_path );
@@ -1195,7 +1212,7 @@ 
      * @param string $filepath Filepath.
      * @param bool   $cache_miss Optional. Force a cache miss. Default false.
      *
-     * @return bool|string Url pointing to the minified css file or false.
+     * @return false|string Url pointing to the minified css file or false.
      */
     public function minify_single( $filepath, $cache_miss = false )
     {
@@ -1256,6 +1273,9 @@ 
         $this->options = $options;
     }
 
+    /**
+     * @param string $name
+     */
     public function setOption( $name, $value )
     {
         $this->options[ $name ] = $value;

Spacing +334 added lines, -334 removed lines

@@ -3,7 +3,7 @@ 
  * Class for CSS optimization.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -161,53 +161,53 @@ 
      *
      * @param array $options all options.
      */
-    public function read( $options )
+    public function read($options)
     {
-        $noptimize_css = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );
-        if ( $noptimize_css ) {
+        $noptimize_css = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
+        if ($noptimize_css) {
             return false;
         }
 
-        $whitelist_css = apply_filters( 'autoptimize_filter_css_whitelist', '', $this->content );
-        if ( ! empty( $whitelist_css ) ) {
-            $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelist_css ) ) );
+        $whitelist_css = apply_filters('autoptimize_filter_css_whitelist', '', $this->content);
+        if (!empty($whitelist_css)) {
+            $this->whitelist = array_filter(array_map('trim', explode(',', $whitelist_css)));
         }
 
-        $removable_css = apply_filters( 'autoptimize_filter_css_removables', '' );
-        if ( ! empty( $removable_css ) ) {
-            $this->cssremovables = array_filter( array_map( 'trim', explode( ',', $removable_css ) ) );
+        $removable_css = apply_filters('autoptimize_filter_css_removables', '');
+        if (!empty($removable_css)) {
+            $this->cssremovables = array_filter(array_map('trim', explode(',', $removable_css)));
         }
 
-        $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'] ) ) {
-            $content             = explode( '</head>', $this->content, 2 );
-            $this->content       = $content[0] . '</head>';
+        if (apply_filters('autoptimize_filter_css_justhead', $options['justhead'])) {
+            $content             = explode('</head>', $this->content, 2);
+            $this->content       = $content[0].'</head>';
             $this->restofcontent = $content[1];
         }
 
         // Determine whether we're doing CSS-files aggregation or not.
-        if ( isset( $options['aggregate'] ) && ! $options['aggregate'] ) {
+        if (isset($options['aggregate']) && !$options['aggregate']) {
             $this->aggregate = false;
         }
         // Returning true for "dontaggregate" turns off aggregation.
-        if ( $this->aggregate && apply_filters( 'autoptimize_filter_css_dontaggregate', false ) ) {
+        if ($this->aggregate && apply_filters('autoptimize_filter_css_dontaggregate', false)) {
             $this->aggregate = false;
         }
 
         // include inline?
-        if ( apply_filters( 'autoptimize_css_include_inline', $options['include_inline'] ) ) {
+        if (apply_filters('autoptimize_css_include_inline', $options['include_inline'])) {
             $this->include_inline = true;
         }
 
         // List of CSS strings which are excluded from autoptimization.
-        $exclude_css = apply_filters( 'autoptimize_filter_css_exclude', $options['css_exclude'], $this->content );
-        if ( '' !== $exclude_css ) {
-            $this->dontmove = array_filter( array_map( 'trim', explode( ',', $exclude_css ) ) );
+        $exclude_css = apply_filters('autoptimize_filter_css_exclude', $options['css_exclude'], $this->content);
+        if ('' !== $exclude_css) {
+            $this->dontmove = array_filter(array_map('trim', explode(',', $exclude_css)));
         } else {
             $this->dontmove = array();
         }
@@ -218,16 +218,16 @@ 
         // 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 = apply_filters( 'autoptimize_filter_css_defer_inline', $options['defer_inline'], $this->content );
+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $options['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);
 
         // Store cdn url.
         $this->cdn_url = $options['cdn_url'];
@@ -236,16 +236,16 @@ 
         $this->datauris = $options['datauris'];
 
         // Determine whether excluded files should be minified if not yet so.
-        if ( ! $options['minify_excluded'] && $options['aggregate'] ) {
+        if (!$options['minify_excluded'] && $options['aggregate']) {
             $this->minify_excluded = false;
         }
-        $this->minify_excluded = apply_filters( 'autoptimize_filter_css_minify_excluded', $this->minify_excluded, '' );
+        $this->minify_excluded = apply_filters('autoptimize_filter_css_minify_excluded', $this->minify_excluded, '');
 
         // should we force all media-attributes to all?
-        $this->media_force_all = apply_filters( 'autoptimize_filter_css_tagmedia_forceall', false );
+        $this->media_force_all = apply_filters('autoptimize_filter_css_tagmedia_forceall', false);
 
         // noptimize me.
-        $this->content = $this->hide_noptimize( $this->content );
+        $this->content = $this->hide_noptimize($this->content);
 
         // Exclude (no)script, as those may contain CSS which should be left as is.
         $this->content = $this->replace_contents_with_marker_if_exists(
@@ -256,25 +256,25 @@ 
         );
 
         // Save IE hacks.
-        $this->content = $this->hide_iehacks( $this->content );
+        $this->content = $this->hide_iehacks($this->content);
 
         // Hide HTML comments.
-        $this->content = $this->hide_comments( $this->content );
+        $this->content = $this->hide_comments($this->content);
 
         // Get <style> and <link>.
-        if ( preg_match_all( '#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches ) ) {
+        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 );
-                } elseif ( $this->ismovable( $tag ) ) {
+            foreach ($matches[0] as $tag) {
+                if ($this->isremovable($tag, $this->cssremovables)) {
+                    $this->content = str_replace($tag, '', $this->content);
+                } elseif ($this->ismovable($tag)) {
                     // Get the media.
-                    if ( false !== strpos( $tag, 'media=' ) ) {
-                        preg_match( '#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias );
-                        $medias = explode( ',', $medias[1] );
+                    if (false !== strpos($tag, 'media=')) {
+                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
+                        $medias = explode(',', $medias[1]);
                         $media  = array();
-                        foreach ( $medias as $elem ) {
-                            if ( empty( $elem ) ) {
+                        foreach ($medias as $elem) {
+                            if (empty($elem)) {
                                 $elem = 'all';
                             }
 
@@ -282,67 +282,67 @@ 
                         }
                     } else {
                         // No media specified - applies to all.
-                        $media = array( 'all' );
+                        $media = array('all');
                     }
 
                     // forcing media attribute to all to merge all in one file.
-                    if ( $this->media_force_all ) {
-                        $media = array( 'all' );
+                    if ($this->media_force_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>.
-                        $url  = current( explode( '?', $source[2], 2 ) );
-                        $path = $this->getpath( $url );
+                        $url  = current(explode('?', $source[2], 2));
+                        $path = $this->getpath($url);
 
-                        if ( false !== $path && preg_match( '#\.css$#', $path ) ) {
+                        if (false !== $path && preg_match('#\.css$#', $path)) {
                             // Good link.
-                            $this->css[] = array( $media, $path );
+                            $this->css[] = array($media, $path);
                         } else {
                             // Link is dynamic (.php etc).
-                            $new_tag = $this->optionally_defer_excluded( $tag, 'none' );
-                            if ( '' !== $new_tag && $new_tag !== $tag ) {
-                                $this->content = str_replace( $tag, $new_tag, $this->content );
+                            $new_tag = $this->optionally_defer_excluded($tag, 'none');
+                            if ('' !== $new_tag && $new_tag !== $tag) {
+                                $this->content = str_replace($tag, $new_tag, $this->content);
                             }
                             $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 );
+                        $tag = $this->restore_comments($tag);
+                        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 );
+                        $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 {
-                    if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) {
-                        $exploded_url = explode( '?', $source[2], 2 );
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
+                        $exploded_url = explode('?', $source[2], 2);
                         $url          = $exploded_url[0];
-                        $path         = $this->getpath( $url );
+                        $path         = $this->getpath($url);
                         $new_tag      = $tag;
 
                         // Excluded CSS, minify that file:
                         // -> if aggregate is on and exclude minify is on
                         // -> if aggregate is off and the file is not in dontmove.
-                        if ( $path && $this->minify_excluded ) {
-                            $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false );
-                            if ( ( false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path ) || ( true === $this->aggregate && ( false === $consider_minified_array || str_replace( $consider_minified_array, '', $path ) === $path ) ) ) {
-                                $minified_url = $this->minify_single( $path );
-                                if ( ! empty( $minified_url ) ) {
+                        if ($path && $this->minify_excluded) {
+                            $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false);
+                            if ((false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path) || (true === $this->aggregate && (false === $consider_minified_array || str_replace($consider_minified_array, '', $path) === $path))) {
+                                $minified_url = $this->minify_single($path);
+                                if (!empty($minified_url)) {
                                     // Replace orig URL with cached minified URL.
-                                    $new_tag = str_replace( $url, $minified_url, $tag );
+                                    $new_tag = str_replace($url, $minified_url, $tag);
                                 } else {
                                     // Remove the original style tag, because cache content is empty.
                                     $new_tag = '';
@@ -350,14 +350,14 @@ 
                             }
                         }
 
-                        if ( '' !== $new_tag ) {
+                        if ('' !== $new_tag) {
                             // Optionally defer (preload) non-aggregated CSS.
-                            $new_tag = $this->optionally_defer_excluded( $new_tag, $url );
+                            $new_tag = $this->optionally_defer_excluded($new_tag, $url);
                         }
 
                         // And replace!
-                        if ( ( '' !== $new_tag && $new_tag !== $tag ) || ( '' === $new_tag && apply_filters( 'autoptimize_filter_css_remove_empty_files', false ) ) ) {
-                            $this->content = str_replace( $tag, $new_tag, $this->content );
+                        if (('' !== $new_tag && $new_tag !== $tag) || ('' === $new_tag && apply_filters('autoptimize_filter_css_remove_empty_files', false))) {
+                            $this->content = str_replace($tag, $new_tag, $this->content);
                         }
                     }
                 }
@@ -378,10 +378,10 @@ 
      *
      * @return string $new_tag
      */
-    private function optionally_defer_excluded( $tag, $url = '' )
+    private function optionally_defer_excluded($tag, $url = '')
     {
         // Defer single CSS if "inline & defer" is ON and there is inline CSS.
-        if ( ! empty( $tag ) && $this->defer && ! empty( $this->defer_inline ) && apply_filters( 'autoptimize_filter_css_defer_excluded', true, $tag ) ) {
+        if (!empty($tag) && $this->defer && !empty($this->defer_inline) && apply_filters('autoptimize_filter_css_defer_excluded', true, $tag)) {
             // Get/ set (via filter) the JS to be triggers onload of the preloaded CSS.
             $_preload_onload = apply_filters(
                 'autoptimize_filter_css_preload_onload',
@@ -390,12 +390,12 @@ 
             );
 
             // Adapt original <link> element for CSS to be preloaded and add <noscript>-version for fallback.
-            $new_tag = '<noscript>' . autoptimizeUtils::remove_id_from_node( $tag ) . '</noscript>' . str_replace(
+            $new_tag = '<noscript>'.autoptimizeUtils::remove_id_from_node($tag).'</noscript>'.str_replace(
                 array(
                     "rel='stylesheet'",
                     'rel="stylesheet"',
                 ),
-                "rel='preload' as='style' onload=\"" . $_preload_onload . '"',
+                "rel='preload' as='style' onload=\"".$_preload_onload.'"',
                 $tag
             );
 
@@ -413,22 +413,22 @@ 
      * @param string $path image path.
      * @return boolean
      */
-    private function is_datauri_candidate( $path )
+    private function is_datauri_candidate($path)
     {
         // Call only once since it's called from a loop.
         static $max_size = null;
-        if ( null === $max_size ) {
+        if (null === $max_size) {
             $max_size = $this->get_datauri_maxsize();
         }
 
-        if ( $path && preg_match( '#\.(jpe?g|png|gif|webp|bmp)$#i', $path ) &&
-            file_exists( $path ) && is_readable( $path ) && filesize( $path ) <= $max_size ) {
+        if ($path && preg_match('#\.(jpe?g|png|gif|webp|bmp)$#i', $path) &&
+            file_exists($path) && is_readable($path) && filesize($path) <= $max_size) {
 
             // Seems we have a candidate.
             $is_candidate = true;
         } else {
             // Filter allows overriding default decision (which checks for local file existence).
-            $is_candidate = apply_filters( 'autoptimize_filter_css_is_datauri_candidate', false, $path );
+            $is_candidate = apply_filters('autoptimize_filter_css_is_datauri_candidate', false, $path);
         }
 
         return $is_candidate;
@@ -453,29 +453,29 @@ 
          * of thing you're probably better of building assets completely
          * outside of WordPress anyway.
          */
-        if ( null === $max_size ) {
-            $max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', 4096 );
+        if (null === $max_size) {
+            $max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', 4096);
         }
 
         return $max_size;
     }
 
-    private function check_datauri_exclude_list( $url )
+    private function check_datauri_exclude_list($url)
     {
         static $exclude_list = null;
         $no_datauris         = array();
 
         // Again, skip doing certain stuff repeatedly when loop-called.
-        if ( null === $exclude_list ) {
-            $exclude_list = apply_filters( 'autoptimize_filter_css_datauri_exclude', '' );
-            $no_datauris  = array_filter( array_map( 'trim', explode( ',', $exclude_list ) ) );
+        if (null === $exclude_list) {
+            $exclude_list = apply_filters('autoptimize_filter_css_datauri_exclude', '');
+            $no_datauris  = array_filter(array_map('trim', explode(',', $exclude_list)));
         }
 
         $matched = false;
 
-        if ( ! empty( $exclude_list ) ) {
-            foreach ( $no_datauris as $no_datauri ) {
-                if ( false !== strpos( $url, $no_datauri ) ) {
+        if (!empty($exclude_list)) {
+            foreach ($no_datauris as $no_datauri) {
+                if (false !== strpos($url, $no_datauri)) {
                     $matched = true;
                     break;
                 }
@@ -485,7 +485,7 @@ 
         return $matched;
     }
 
-    private function build_or_get_datauri_image( $path )
+    private function build_or_get_datauri_image($path)
     {
         /**
          * TODO/FIXME: document the required return array format, or better yet,
@@ -494,27 +494,27 @@ 
          */
 
         // Allows short-circuiting datauri generation for an image.
-        $result = apply_filters( 'autoptimize_filter_css_datauri_image', array(), $path );
-        if ( ! empty( $result ) ) {
-            if ( is_array( $result ) && isset( $result['full'] ) && isset( $result['base64data'] ) ) {
+        $result = apply_filters('autoptimize_filter_css_datauri_image', array(), $path);
+        if (!empty($result)) {
+            if (is_array($result) && isset($result['full']) && isset($result['base64data'])) {
                 return $result;
             }
         }
 
-        $hash  = md5( $path );
-        $check = new autoptimizeCache( $hash, 'img' );
-        if ( $check->check() ) {
+        $hash  = md5($path);
+        $check = new autoptimizeCache($hash, 'img');
+        if ($check->check()) {
             // we have the base64 image in cache.
             $head_and_data = $check->retrieve();
-            $_base64data   = explode( ';base64,', $head_and_data );
+            $_base64data   = explode(';base64,', $head_and_data);
             $base64data    = $_base64data[1];
-            unset( $_base64data );
+            unset($_base64data);
         } else {
             // It's an image and we don't have it in cache, get the type by extension.
-            $exploded_path = explode( '.', $path );
-            $type          = end( $exploded_path );
+            $exploded_path = explode('.', $path);
+            $type          = end($exploded_path);
 
-            switch ( $type ) {
+            switch ($type) {
                 case 'jpg':
                 case 'jpeg':
                     $dataurihead = 'data:image/jpeg;base64,';
@@ -536,13 +536,13 @@ 
             }
 
             // Encode the data.
-            $base64data    = base64_encode( file_get_contents( $path ) );
-            $head_and_data = $dataurihead . $base64data;
+            $base64data    = base64_encode(file_get_contents($path));
+            $head_and_data = $dataurihead.$base64data;
 
             // Save in cache.
-            $check->cache( $head_and_data, 'text/plain' );
+            $check->cache($head_and_data, 'text/plain');
         }
-        unset( $check );
+        unset($check);
 
         return array(
             'full'       => $head_and_data,
@@ -559,13 +559,13 @@ 
      *
      * @return string
      */
-    protected static function replace_longest_matches_first( $string, $replacements = array() )
+    protected static function replace_longest_matches_first($string, $replacements = array())
     {
-        if ( ! empty( $replacements ) ) {
+        if (!empty($replacements)) {
             // Sort the replacements array by key length in desc order (so that the longest strings are replaced first).
-            $keys = array_map( 'strlen', array_keys( $replacements ) );
-            array_multisort( $keys, SORT_DESC, $replacements );
-            $string = str_replace( array_keys( $replacements ), array_values( $replacements ), $string );
+            $keys = array_map('strlen', array_keys($replacements));
+            array_multisort($keys, SORT_DESC, $replacements);
+            $string = str_replace(array_keys($replacements), array_values($replacements), $string);
         }
 
         return $string;
@@ -581,15 +581,15 @@ 
      *
      * @return string
      */
-    public function replace_urls( $code = '' )
+    public function replace_urls($code = '')
     {
         $replacements = array();
 
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
+            foreach ($url_src_matches[1] as $count => $original_url) {
                 // Removes quotes and other cruft.
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
 
                 /**
                  * TODO/FIXME: Add a way for other code / callable to be called here
@@ -607,17 +607,17 @@ 
                  */
 
                 // Do CDN replacement if needed.
-                if ( ! empty( $this->cdn_url ) ) {
-                    $replacement_url = $this->url_replace_cdn( $url );
+                if (!empty($this->cdn_url)) {
+                    $replacement_url = $this->url_replace_cdn($url);
                     // Prepare replacements array.
-                    $replacements[ $url_src_matches[1][ $count ] ] = str_replace(
-                        $original_url, $replacement_url, $url_src_matches[1][ $count ]
+                    $replacements[$url_src_matches[1][$count]] = str_replace(
+                        $original_url, $replacement_url, $url_src_matches[1][$count]
                     );
                 }
             }
         }
 
-        $code = self::replace_longest_matches_first( $code, $replacements );
+        $code = self::replace_longest_matches_first($code, $replacements);
 
         return $code;
     }
@@ -630,26 +630,26 @@ 
      * @param string $code HTML being processed to hide fonts.
      * @return string
      */
-    public function hide_fontface_and_maybe_cdn( $code )
+    public function hide_fontface_and_maybe_cdn($code)
     {
         // Proceed only if @font-face declarations exist within $code.
-        preg_match_all( self::FONT_FACE_REGEX, $code, $fontfaces );
-        if ( isset( $fontfaces[0] ) ) {
+        preg_match_all(self::FONT_FACE_REGEX, $code, $fontfaces);
+        if (isset($fontfaces[0])) {
             // Check if we need to cdn fonts or not.
-            $do_font_cdn = apply_filters( 'autoptimize_filter_css_fonts_cdn', false );
+            $do_font_cdn = apply_filters('autoptimize_filter_css_fonts_cdn', false);
 
-            foreach ( $fontfaces[0] as $full_match ) {
+            foreach ($fontfaces[0] as $full_match) {
                 // Keep original match so we can search/replace it.
                 $match_search = $full_match;
 
                 // Do font cdn if needed.
-                if ( $do_font_cdn ) {
-                    $full_match = $this->replace_urls( $full_match );
+                if ($do_font_cdn) {
+                    $full_match = $this->replace_urls($full_match);
                 }
 
                 // Replace declaration with its base64 encoded string.
-                $replacement = self::build_marker( 'FONTFACE', $full_match );
-                $code        = str_replace( $match_search, $replacement, $code );
+                $replacement = self::build_marker('FONTFACE', $full_match);
+                $code        = str_replace($match_search, $replacement, $code);
             }
         }
 
@@ -663,9 +663,9 @@ 
      * @param string $code HTML being processed to unhide fonts.
      * @return string
      */
-    public function restore_fontface( $code )
+    public function restore_fontface($code)
     {
-        return $this->restore_marked_content( 'FONTFACE', $code );
+        return $this->restore_marked_content('FONTFACE', $code);
     }
 
     /**
@@ -674,10 +674,10 @@ 
      * @param string $code HTML being processed rewrite assets.
      * @return string
      */
-    public function rewrite_assets( $code )
+    public function rewrite_assets($code)
     {
         // Handle @font-face rules by hiding and processing them separately.
-        $code = $this->hide_fontface_and_maybe_cdn( $code );
+        $code = $this->hide_fontface_and_maybe_cdn($code);
 
         /**
          * TODO/FIXME:
@@ -694,35 +694,35 @@ 
         $imgreplace      = array();
 
         // Matches and captures anything specified within the literal `url()` and excludes those containing data: URIs.
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
+            foreach ($url_src_matches[1] as $count => $original_url) {
                 // Removes quotes and other cruft.
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
 
                 // If datauri inlining is turned on, do it.
                 $inlined = false;
-                if ( $this->datauris ) {
+                if ($this->datauris) {
                     $iurl = $url;
-                    if ( false !== strpos( $iurl, '?' ) ) {
-                        $iurl = strtok( $iurl, '?' );
+                    if (false !== strpos($iurl, '?')) {
+                        $iurl = strtok($iurl, '?');
                     }
 
-                    $ipath = $this->getpath( $iurl );
+                    $ipath = $this->getpath($iurl);
 
-                    $excluded = $this->check_datauri_exclude_list( $ipath );
-                    if ( ! $excluded ) {
-                        $is_datauri_candidate = $this->is_datauri_candidate( $ipath );
-                        if ( $is_datauri_candidate ) {
-                            $datauri    = $this->build_or_get_datauri_image( $ipath );
+                    $excluded = $this->check_datauri_exclude_list($ipath);
+                    if (!$excluded) {
+                        $is_datauri_candidate = $this->is_datauri_candidate($ipath);
+                        if ($is_datauri_candidate) {
+                            $datauri    = $this->build_or_get_datauri_image($ipath);
                             $base64data = $datauri['base64data'];
                             // Add it to the list for replacement.
-                            $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
+                            $imgreplace[$url_src_matches[1][$count]] = str_replace(
                                 $original_url,
                                 $datauri['full'],
-                                $url_src_matches[1][ $count ]
+                                $url_src_matches[1][$count]
                             );
-                            $inlined                                     = true;
+                            $inlined = true;
                         }
                     }
                 }
@@ -733,20 +733,20 @@ 
                  * inlining isn't turned on, or if a resource is skipped from
                  * being inlined for whatever reason above.
                  */
-                if ( ! $inlined && ( ! empty( $this->cdn_url ) || has_filter( 'autoptimize_filter_base_replace_cdn' ) ) ) {
+                if (!$inlined && (!empty($this->cdn_url) || has_filter('autoptimize_filter_base_replace_cdn'))) {
                     // Just do the "simple" CDN replacement.
-                    $replacement_url                             = $this->url_replace_cdn( $url );
-                    $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
-                        $original_url, $replacement_url, $url_src_matches[1][ $count ]
+                    $replacement_url                             = $this->url_replace_cdn($url);
+                    $imgreplace[$url_src_matches[1][$count]] = str_replace(
+                        $original_url, $replacement_url, $url_src_matches[1][$count]
                     );
                 }
             }
         }
 
-        $code = self::replace_longest_matches_first( $code, $imgreplace );
+        $code = self::replace_longest_matches_first($code, $imgreplace);
 
         // Replace back font-face markers with actual font-face declarations.
-        $code = $this->restore_fontface( $code );
+        $code = $this->restore_fontface($code);
 
         return $code;
     }
@@ -756,29 +756,29 @@ 
      */
     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      = self::fixurls( ABSPATH . 'index.php', $css ); // ABSPATH already contains a trailing slash.
-                $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, '' );
-                if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
+                $css      = preg_replace('#^INLINE;#', '', $css);
+                $css      = self::fixurls(ABSPATH.'index.php', $css); // ABSPATH already contains a trailing slash.
+                $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 ( false !== $css && file_exists( $css ) && is_readable( $css ) ) {
+                if (false !== $css && file_exists($css) && is_readable($css)) {
                     $css_path = $css;
-                    $css      = self::fixurls( $css_path, file_get_contents( $css_path ) );
-                    $css      = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $css );
-                    $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $css_path );
-                    if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
+                    $css      = self::fixurls($css_path, file_get_contents($css_path));
+                    $css      = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
+                    $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $css_path);
+                    if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
                         $css                   = $tmpstyle;
                         $this->alreadyminified = true;
-                    } elseif ( $this->can_inject_late( $css_path, $css ) ) {
-                        $css = self::build_injectlater_marker( $css_path, md5( $css ) );
+                    } elseif ($this->can_inject_late($css_path, $css)) {
+                        $css = self::build_injectlater_marker($css_path, md5($css));
                     }
                 } else {
                     // Couldn't read CSS. Maybe getpath isn't working?
@@ -786,12 +786,12 @@ 
                 }
             }
 
-            foreach ( $media as $elem ) {
-                if ( ! empty( $css ) ) {
-                    if ( ! isset( $this->csscode[ $elem ] ) ) {
-                        $this->csscode[ $elem ] = '';
+            foreach ($media as $elem) {
+                if (!empty($css)) {
+                    if (!isset($this->csscode[$elem])) {
+                        $this->csscode[$elem] = '';
                     }
-                    $this->csscode[ $elem ] .= "\n/*FILESTART*/" . $css;
+                    $this->csscode[$elem] .= "\n/*FILESTART*/".$css;
                 }
             }
         }
@@ -799,133 +799,133 @@ 
         // Check for duplicate code.
         $md5list = array();
         $tmpcss  = $this->csscode;
-        foreach ( $tmpcss as $media => $code ) {
-            $md5sum    = md5( $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;
-                    $md5list[ $medianame ]       = $md5list[ $med ];
-                    unset( $this->csscode[ $med ], $this->csscode[ $media ], $md5list[ $med ] );
+                    $medianame                   = $med.', '.$media;
+                    $this->csscode[$medianame] = $code;
+                    $md5list[$medianame]       = $md5list[$med];
+                    unset($this->csscode[$med], $this->csscode[$media], $md5list[$med]);
                 }
             }
-            $md5list[ $medianame ] = $md5sum;
+            $md5list[$medianame] = $md5sum;
         }
-        unset( $tmpcss );
+        unset($tmpcss);
 
         // Manage @imports, while is for recursive import management.
-        foreach ( $this->csscode as &$thiscss ) {
+        foreach ($this->csscode as &$thiscss) {
             // Flag to trigger import reconstitution and var to hold external imports.
             $fiximports       = false;
             $external_imports = '';
 
             // remove comments to avoid importing commented-out imports.
-            $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss );
-            while ( preg_match_all( '#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches ) ) {
-                foreach ( $matches[0] as $import ) {
-                    if ( $this->isremovable( $import, $this->cssremovables ) ) {
-                        $thiscss   = str_replace( $import, '', $thiscss );
+            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
+            while (preg_match_all('#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $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\"'" );
-                        $path      = $this->getpath( $url );
+                        $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( self::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 ) ) {
+                        if (file_exists($path) && is_readable($path)) {
+                            $code     = addcslashes(self::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;
-                            } elseif ( $this->can_inject_late( $path, $code ) ) {
-                                $code = self::build_injectlater_marker( $path, md5( $code ) );
+                            } elseif ($this->can_inject_late($path, $code)) {
+                                $code = self::build_injectlater_marker($path, md5($code));
                             }
 
-                            if ( ! empty( $code ) ) {
-                                $tmp_thiscss = preg_replace( '#(/\*FILESTART\*/.*)' . preg_quote( $import, '#' ) . '#Us', '/*FILESTART2*/' . $code . '$1', $thiscss );
-                                if ( ! empty( $tmp_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;
-                                    unset( $tmp_thiscss );
+                                    unset($tmp_thiscss);
                                 }
                             }
-                            unset( $code );
+                            unset($code);
                         }
                     }
-                    if ( ! $import_ok ) {
+                    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 );
+            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 );
+        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 );
-            do_action( 'autoptimize_action_css_hash', $hash );
-            $ccheck = new autoptimizeCache( $hash, 'css' );
-            if ( $ccheck->check() ) {
+            $hash = md5($code);
+            do_action('autoptimize_action_css_hash', $hash);
+            $ccheck = new autoptimizeCache($hash, 'css');
+            if ($ccheck->check()) {
                 $code                          = $ccheck->retrieve();
-                $this->hashmap[ md5( $code ) ] = $hash;
+                $this->hashmap[md5($code)] = $hash;
                 continue;
             }
-            unset( $ccheck );
+            unset($ccheck);
 
             // Rewrite and/or inline referenced assets.
-            $code = $this->rewrite_assets( $code );
+            $code = $this->rewrite_assets($code);
 
             // Minify.
-            $code = $this->run_minifier_on( $code );
+            $code = $this->run_minifier_on($code);
 
             // Bring back INJECTLATER stuff.
-            $code = $this->inject_minified( $code );
+            $code = $this->inject_minified($code);
 
             // Filter results.
-            $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code );
-            if ( ! empty( $tmp_code ) ) {
+            $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
+            if (!empty($tmp_code)) {
                 $code = $tmp_code;
-                unset( $tmp_code );
+                unset($tmp_code);
             }
 
-            $this->hashmap[ md5( $code ) ] = $hash;
+            $this->hashmap[md5($code)] = $hash;
         }
 
-        unset( $code );
+        unset($code);
         return true;
     }
 
-    public function run_minifier_on( $code )
+    public function run_minifier_on($code)
     {
-        if ( ! $this->alreadyminified ) {
-            $do_minify = apply_filters( 'autoptimize_css_do_minify', true );
+        if (!$this->alreadyminified) {
+            $do_minify = apply_filters('autoptimize_css_do_minify', true);
 
-            if ( $do_minify ) {
+            if ($do_minify) {
                 $cssmin   = new autoptimizeCSSmin();
-                $tmp_code = trim( $cssmin->run( $code ) );
+                $tmp_code = trim($cssmin->run($code));
 
-                if ( ! empty( $tmp_code ) ) {
+                if (!empty($tmp_code)) {
                     $code = $tmp_code;
-                    unset( $tmp_code );
+                    unset($tmp_code);
                 }
             }
         }
@@ -939,18 +939,18 @@ 
     public function cache()
     {
         // CSS cache.
-        foreach ( $this->csscode as $media => $code ) {
-            if ( empty( $code ) ) {
+        foreach ($this->csscode as $media => $code) {
+            if (empty($code)) {
                 continue;
             }
 
-            $md5   = $this->hashmap[ md5( $code ) ];
-            $cache = new autoptimizeCache( $md5, 'css' );
-            if ( ! $cache->check() ) {
+            $md5   = $this->hashmap[md5($code)];
+            $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();
+            $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         }
     }
 
@@ -960,99 +960,99 @@ 
     public function getcontent()
     {
         // Restore the full content (only applies when "autoptimize_filter_css_justhead" filter is true).
-        if ( ! empty( $this->restofcontent ) ) {
+        if (!empty($this->restofcontent)) {
             $this->content      .= $this->restofcontent;
             $this->restofcontent = '';
         }
 
         // type is not added by default.
         $type_css = '';
-        if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
+        if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
             $type_css = 'type="text/css" ';
         }
 
         // Inject the new stylesheets.
-        $replace_tag = array( '<title', 'before' );
-        $replace_tag = apply_filters( 'autoptimize_filter_css_replacetag', $replace_tag, $this->content );
+        $replace_tag = array('<title', 'before');
+        $replace_tag = apply_filters('autoptimize_filter_css_replacetag', $replace_tag, $this->content);
 
-        if ( $this->inline ) {
-            foreach ( $this->csscode as $media => $code ) {
-                $this->inject_in_html( '<style ' . $type_css . 'media="' . $media . '">' . $code . '</style>', $replace_tag );
+        if ($this->inline) {
+            foreach ($this->csscode as $media => $code) {
+                $this->inject_in_html('<style '.$type_css.'media="'.$media.'">'.$code.'</style>', $replace_tag);
             }
         } else {
-            if ( $this->defer ) {
+            if ($this->defer) {
                 $preload_css_block  = '';
                 $inlined_ccss_block = '';
                 $noscript_css_block = '<noscript id="aonoscrcss">';
 
                 $defer_inline_code = $this->defer_inline;
-                if ( ! empty( $defer_inline_code ) ) {
-                    if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
-                        $icss_hash  = md5( $defer_inline_code );
-                        $icss_cache = new autoptimizeCache( $icss_hash, 'css' );
-                        if ( $icss_cache->check() ) {
+                if (!empty($defer_inline_code)) {
+                    if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
+                        $icss_hash  = md5($defer_inline_code);
+                        $icss_cache = new autoptimizeCache($icss_hash, 'css');
+                        if ($icss_cache->check()) {
                             // we have the optimized inline CSS in cache.
                             $defer_inline_code = $icss_cache->retrieve();
                         } else {
                             $cssmin   = new autoptimizeCSSmin();
-                            $tmp_code = trim( $cssmin->run( $defer_inline_code ) );
+                            $tmp_code = trim($cssmin->run($defer_inline_code));
 
-                            if ( ! empty( $tmp_code ) ) {
+                            if (!empty($tmp_code)) {
                                 $defer_inline_code = $tmp_code;
-                                $icss_cache->cache( $defer_inline_code, 'text/css' );
-                                unset( $tmp_code );
+                                $icss_cache->cache($defer_inline_code, 'text/css');
+                                unset($tmp_code);
                             }
                         }
                     }
                     // inlined critical css set here, but injected when full CSS is injected
                     // to avoid CSS containing SVG with <title tag receiving the full CSS link.
-                    $inlined_ccss_block = '<style ' . $type_css . 'id="aoatfcss" media="all">' . $defer_inline_code . '</style>';
+                    $inlined_ccss_block = '<style '.$type_css.'id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
                 }
             }
 
-            foreach ( $this->url as $media => $url ) {
-                $url = $this->url_replace_cdn( $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 ) {
+                if ($this->defer) {
                     $preload_onload = autoptimizeConfig::get_ao_css_preload_onload();
 
-                    $preload_css_block  .= '<link rel="preload" as="style" media="' . $media . '" href="' . $url . '" onload="' . $preload_onload . '" />';
-                    $noscript_css_block .= '<link ' . $type_css . 'media="' . $media . '" href="' . $url . '" rel="stylesheet" />';
+                    $preload_css_block  .= '<link rel="preload" as="style" media="'.$media.'" href="'.$url.'" onload="'.$preload_onload.'" />';
+                    $noscript_css_block .= '<link '.$type_css.'media="'.$media.'" href="'.$url.'" rel="stylesheet" />';
                 } else {
-                    if ( strlen( $this->csscode[ $media ] ) > $this->cssinlinesize ) {
-                        $this->inject_in_html( '<link ' . $type_css . 'media="' . $media . '" href="' . $url . '" rel="stylesheet" />', $replace_tag );
-                    } elseif ( strlen( $this->csscode[ $media ] ) > 0 ) {
-                        $this->inject_in_html( '<style ' . $type_css . 'media="' . $media . '">' . $this->csscode[ $media ] . '</style>', $replace_tag );
+                    if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
+                        $this->inject_in_html('<link '.$type_css.'media="'.$media.'" href="'.$url.'" rel="stylesheet" />', $replace_tag);
+                    } elseif (strlen($this->csscode[$media]) > 0) {
+                        $this->inject_in_html('<style '.$type_css.'media="'.$media.'">'.$this->csscode[$media].'</style>', $replace_tag);
                     }
                 }
             }
 
-            if ( $this->defer ) {
+            if ($this->defer) {
                 $preload_polyfill    = autoptimizeConfig::get_ao_css_preload_polyfill();
                 $noscript_css_block .= '</noscript>';
                 // Inject inline critical CSS, the preloaded full CSS and the noscript-CSS.
-                $this->inject_in_html( $inlined_ccss_block . $preload_css_block . $noscript_css_block, $replace_tag );
+                $this->inject_in_html($inlined_ccss_block.$preload_css_block.$noscript_css_block, $replace_tag);
 
                 // Adds preload polyfill at end of body tag.
                 $this->inject_in_html(
-                    apply_filters( 'autoptimize_css_preload_polyfill', $preload_polyfill ),
-                    apply_filters( 'autoptimize_css_preload_polyfill_injectat', array( '</body>', 'before' ) )
+                    apply_filters('autoptimize_css_preload_polyfill', $preload_polyfill),
+                    apply_filters('autoptimize_css_preload_polyfill_injectat', array('</body>', 'before'))
                 );
             }
         }
 
         // restore comments.
-        $this->content = $this->restore_comments( $this->content );
+        $this->content = $this->restore_comments($this->content);
 
         // restore IE hacks.
-        $this->content = $this->restore_iehacks( $this->content );
+        $this->content = $this->restore_iehacks($this->content);
 
         // restore (no)script.
-        $this->content = $this->restore_marked_content( 'SCRIPT', $this->content );
+        $this->content = $this->restore_marked_content('SCRIPT', $this->content);
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Return the modified stylesheet.
         return $this->content;
@@ -1064,44 +1064,44 @@ 
      * @param string $file filename of optimized CSS-file.
      * @param string $code CSS-code in which to fix URL's.
      */
-    static function fixurls( $file, $code )
+    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 );
+        if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
+            $file = str_replace(WP_ROOT_DIR, '/', $file);
             /**
              * Rollback as per https://github.com/futtta/autoptimize/issues/94
              * $file = str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', $file );
              */
-            $dir = dirname( $file ); // Like /themes/expound/css.
+            $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\"'" );
-                $no_q_url = trim( $url, "\"'" );
-                if ( $url !== $no_q_url ) {
+                $url      = trim($url, " \t\n\r\0\x0B\"'");
+                $no_q_url = trim($url, "\"'");
+                if ($url !== $no_q_url) {
                     $removed_quotes = true;
                 } else {
                     $removed_quotes = false;
                 }
 
-                if ( '' === $no_q_url ) {
+                if ('' === $no_q_url) {
                     continue;
                 }
 
                 $url = $no_q_url;
-                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.
@@ -1110,49 +1110,49 @@ 
                      * rollback as per https://github.com/futtta/autoptimize/issues/94
                      * $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_CONTENT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
                      */
-                    $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
-                    $newurl = apply_filters( 'autoptimize_filter_css_fixurl_newurl', $newurl );
+                    $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
+                    $newurl = apply_filters('autoptimize_filter_css_fixurl_newurl', $newurl);
 
                     /**
                      * 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 ( $removed_quotes ) {
-                        $replace[ $hash ] = "url('" . $newurl . "')" . $matches[2][ $k ];
+                    if ($removed_quotes) {
+                        $replace[$hash] = "url('".$newurl."')".$matches[2][$k];
                     } else {
-                        $replace[ $hash ] = 'url(' . $newurl . ')' . $matches[2][ $k ];
+                        $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];
                     }
                 }
             }
 
-            $code = self::replace_longest_matches_first( $code, $replace );
+            $code = self::replace_longest_matches_first($code, $replace);
         }
 
         return $code;
     }
 
-    private function ismovable( $tag )
+    private function ismovable($tag)
     {
-        if ( ! $this->aggregate ) {
+        if (!$this->aggregate) {
             return false;
         }
 
-        if ( ! empty( $this->whitelist ) ) {
-            foreach ( $this->whitelist as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+        if (!empty($this->whitelist)) {
+            foreach ($this->whitelist as $match) {
+                if (false !== strpos($tag, $match)) {
                     return true;
                 }
             }
             // no match with whitelist.
             return false;
         } else {
-            if ( is_array( $this->dontmove ) && ! empty( $this->dontmove ) ) {
-                foreach ( $this->dontmove as $match ) {
-                    if ( false !== strpos( $tag, $match ) ) {
+            if (is_array($this->dontmove) && !empty($this->dontmove)) {
+                foreach ($this->dontmove as $match) {
+                    if (false !== strpos($tag, $match)) {
                         // Matched something.
                         return false;
                     }
@@ -1164,22 +1164,22 @@ 
         }
     }
 
-    private function can_inject_late( $css_path, $css )
+    private function can_inject_late($css_path, $css)
     {
-        $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $css_path );
-        if ( true !== $this->inject_min_late ) {
+        $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $css_path);
+        if (true !== $this->inject_min_late) {
             // late-inject turned off.
             return false;
-        } elseif ( ( false === strpos( $css_path, 'min.css' ) ) && ( str_replace( $consider_minified_array, '', $css_path ) === $css_path ) ) {
+        } elseif ((false === strpos($css_path, 'min.css')) && (str_replace($consider_minified_array, '', $css_path) === $css_path)) {
             // file not minified based on filename & filter.
             return false;
-        } elseif ( false !== strpos( $css, '@import' ) ) {
+        } elseif (false !== strpos($css, '@import')) {
             // can't late-inject files with imports as those need to be aggregated.
             return false;
-        } elseif ( ( false !== strpos( $css, '@font-face' ) ) && ( apply_filters( 'autoptimize_filter_css_fonts_cdn', false ) === true ) && ( ! empty( $this->cdn_url ) ) ) {
+        } elseif ((false !== strpos($css, '@font-face')) && (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;
-        } elseif ( ( ( true == $this->datauris ) || ( ! empty( $this->cdn_url ) ) ) && preg_match( '#background[^;}]*url\(#Ui', $css ) ) {
+        } elseif (((true == $this->datauris) || (!empty($this->cdn_url))) && preg_match('#background[^;}]*url\(#Ui', $css)) {
             // don't late-inject CSS with images if CDN is set OR if image inlining is on.
             return false;
         } else {
@@ -1197,41 +1197,41 @@ 
      *
      * @return bool|string Url pointing to the minified css file or false.
      */
-    public function minify_single( $filepath, $cache_miss = false )
+    public function minify_single($filepath, $cache_miss = false)
     {
-        $contents = $this->prepare_minify_single( $filepath );
+        $contents = $this->prepare_minify_single($filepath);
 
-        if ( empty( $contents ) ) {
+        if (empty($contents)) {
             return false;
         }
 
         // Check cache.
-        $hash  = 'single_' . md5( $contents );
-        $cache = new autoptimizeCache( $hash, 'css' );
-        do_action( 'autoptimize_action_css_hash', $hash );
+        $hash  = 'single_'.md5($contents);
+        $cache = new autoptimizeCache($hash, 'css');
+        do_action('autoptimize_action_css_hash', $hash);
 
         // If not in cache already, minify...
-        if ( ! $cache->check() || $cache_miss ) {
+        if (!$cache->check() || $cache_miss) {
             // Fixurls...
-            $contents = self::fixurls( $filepath, $contents );
+            $contents = self::fixurls($filepath, $contents);
             // CDN-replace any referenced assets if needed...
-            $contents = $this->hide_fontface_and_maybe_cdn( $contents );
-            $contents = $this->replace_urls( $contents );
-            $contents = $this->restore_fontface( $contents );
+            $contents = $this->hide_fontface_and_maybe_cdn($contents);
+            $contents = $this->replace_urls($contents);
+            $contents = $this->restore_fontface($contents);
             // Now minify...
             $cssmin   = new autoptimizeCSSmin();
-            $contents = trim( $cssmin->run( $contents ) );
+            $contents = trim($cssmin->run($contents));
 
             // Check if minified cache content is empty.
-            if ( empty( $contents ) ) {
+            if (empty($contents)) {
                 return false;
             }
 
             // Store in cache.
-            $cache->cache( $contents, 'text/css' );
+            $cache->cache($contents, 'text/css');
         }
 
-        $url = $this->build_minify_single_url( $cache );
+        $url = $this->build_minify_single_url($cache);
 
         return $url;
     }
@@ -1251,19 +1251,19 @@ 
         return $this->options;
     }
 
-    public function replaceOptions( $options )
+    public function replaceOptions($options)
     {
         $this->options = $options;
     }
 
-    public function setOption( $name, $value )
+    public function setOption($name, $value)
     {
-        $this->options[ $name ] = $value;
+        $this->options[$name] = $value;
         $this->$name            = $value;
     }
 
-    public function getOption( $name )
+    public function getOption($name)
     {
-        return $this->options[ $name ];
+        return $this->options[$name];
     }
 }