futtta / autoptimize

classes/autoptimizeCriticalCSSBase.php

Spacing +60 added lines, -60 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS base file (initializes all ccss files).
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -19,27 +19,27 @@ 
     public function __construct()
     {
         // define constant, but only once.
-        if ( ! defined( 'AO_CCSS_DIR' ) ) {
+        if (!defined('AO_CCSS_DIR')) {
             // Define plugin version.
-            define( 'AO_CCSS_VER', 'AO_' . AUTOPTIMIZE_PLUGIN_VERSION );
+            define('AO_CCSS_VER', 'AO_'.AUTOPTIMIZE_PLUGIN_VERSION);
 
             // Define a constant with the directory to store critical CSS in.
-            if ( is_multisite() ) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                define( 'AO_CCSS_DIR', WP_CONTENT_DIR . '/uploads/ao_ccss/' . $blog_id . '/' );
+                define('AO_CCSS_DIR', WP_CONTENT_DIR.'/uploads/ao_ccss/'.$blog_id.'/');
             } else {
-                define( 'AO_CCSS_DIR', WP_CONTENT_DIR . '/uploads/ao_ccss/' );
+                define('AO_CCSS_DIR', WP_CONTENT_DIR.'/uploads/ao_ccss/');
             }
 
             // Define support files locations.
-            define( 'AO_CCSS_LOCK', AO_CCSS_DIR . 'queue.lock' );
-            define( 'AO_CCSS_LOG', AO_CCSS_DIR . 'queuelog.html' );
-            define( 'AO_CCSS_DEBUG', AO_CCSS_DIR . 'queue.json' );
+            define('AO_CCSS_LOCK', AO_CCSS_DIR.'queue.lock');
+            define('AO_CCSS_LOG', AO_CCSS_DIR.'queuelog.html');
+            define('AO_CCSS_DEBUG', AO_CCSS_DIR.'queue.json');
 
             // Define constants for criticalcss.com base path and API endpoints.
             // fixme: AO_CCSS_URL should be read from the autoptimize availability json stored as option.
-            define( 'AO_CCSS_URL', 'https://criticalcss.com' );
-            define( 'AO_CCSS_API', AO_CCSS_URL . '/api/premium/' );
+            define('AO_CCSS_URL', 'https://criticalcss.com');
+            define('AO_CCSS_API', AO_CCSS_URL.'/api/premium/');
         }
 
         $this->filepath = __FILE__;
@@ -52,19 +52,19 @@ 
     {
         // get all options.
         $all_options = $this->fetch_options();
-        foreach ( $all_options as $option => $value ) {
+        foreach ($all_options as $option => $value) {
             ${$option} = $value;
         }
 
         // make sure the 10 minutes cron schedule is added.
-        add_filter( 'cron_schedules', array( $this, 'ao_ccss_interval' ) );
+        add_filter('cron_schedules', array($this, 'ao_ccss_interval'));
 
         // check if we need to upgrade.
         $this->check_upgrade();
 
         // make sure ao_ccss_queue is scheduled OK if an API key is set.
-        if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_queue' ) ) {
-            wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' );
+        if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_queue')) {
+            wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue');
         }
     }
 
@@ -72,12 +72,12 @@ 
         // Required libs, core is always needed.
         $criticalcss_core = new autoptimizeCriticalCSSCore();
 
-        if ( defined( 'DOING_CRON' ) || is_admin() ) {
+        if (defined('DOING_CRON') || is_admin()) {
             // TODO: also include if overridden somehow to force queue processing to be executed?
             $criticalcss_cron = new autoptimizeCriticalCSSCron();
         }
 
-        if ( is_admin() ) {
+        if (is_admin()) {
             $criticalcss_settings = new autoptimizeCriticalCSSSettings();
         } else {
             // enqueuing only done when not wp-admin.
@@ -87,48 +87,48 @@ 
 
     public static function fetch_options() {
         // Get options.
-        $autoptimize_ccss_options['ao_css_defer']          = autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer' );
-        $autoptimize_ccss_options['ao_css_defer_inline']   = autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' );
-        $autoptimize_ccss_options['ao_ccss_rules_raw']     = get_option( 'autoptimize_ccss_rules', false );
-        $autoptimize_ccss_options['ao_ccss_additional']    = get_option( 'autoptimize_ccss_additional' );
-        $autoptimize_ccss_options['ao_ccss_queue_raw']     = get_option( 'autoptimize_ccss_queue', false );
-        $autoptimize_ccss_options['ao_ccss_viewport']      = get_option( 'autoptimize_ccss_viewport', false );
-        $autoptimize_ccss_options['ao_ccss_finclude']      = get_option( 'autoptimize_ccss_finclude', false );
-        $autoptimize_ccss_options['ao_ccss_rlimit']        = get_option( 'autoptimize_ccss_rlimit', '5' );
-        $autoptimize_ccss_options['ao_ccss_noptimize']     = get_option( 'autoptimize_ccss_noptimize', false );
-        $autoptimize_ccss_options['ao_ccss_debug']         = get_option( 'autoptimize_ccss_debug', false );
-        $autoptimize_ccss_options['ao_ccss_key']           = get_option( 'autoptimize_ccss_key' );
-        $autoptimize_ccss_options['ao_ccss_keyst']         = get_option( 'autoptimize_ccss_keyst' );
-        $autoptimize_ccss_options['ao_ccss_loggedin']      = get_option( 'autoptimize_ccss_loggedin', '1' );
-        $autoptimize_ccss_options['ao_ccss_forcepath']     = get_option( 'autoptimize_ccss_forcepath', '1' );
-        $autoptimize_ccss_options['ao_ccss_servicestatus'] = get_option( 'autoptimize_service_availablity' );
-        $autoptimize_ccss_options['ao_ccss_deferjquery']   = get_option( 'autoptimize_ccss_deferjquery', false );
-        $autoptimize_ccss_options['ao_ccss_domain']        = get_option( 'autoptimize_ccss_domain' );
-
-        if ( strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'http' ) === false && strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'uggc' ) === 0 ) {
-            $autoptimize_ccss_options['ao_ccss_domain'] = str_rot13( $autoptimize_ccss_options['ao_ccss_domain'] );
-        } elseif ( strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'http' ) !== false ) {
+        $autoptimize_ccss_options['ao_css_defer']          = autoptimizeOptionWrapper::get_option('autoptimize_css_defer');
+        $autoptimize_ccss_options['ao_css_defer_inline']   = autoptimizeOptionWrapper::get_option('autoptimize_css_defer_inline');
+        $autoptimize_ccss_options['ao_ccss_rules_raw']     = get_option('autoptimize_ccss_rules', false);
+        $autoptimize_ccss_options['ao_ccss_additional']    = get_option('autoptimize_ccss_additional');
+        $autoptimize_ccss_options['ao_ccss_queue_raw']     = get_option('autoptimize_ccss_queue', false);
+        $autoptimize_ccss_options['ao_ccss_viewport']      = get_option('autoptimize_ccss_viewport', false);
+        $autoptimize_ccss_options['ao_ccss_finclude']      = get_option('autoptimize_ccss_finclude', false);
+        $autoptimize_ccss_options['ao_ccss_rlimit']        = get_option('autoptimize_ccss_rlimit', '5');
+        $autoptimize_ccss_options['ao_ccss_noptimize']     = get_option('autoptimize_ccss_noptimize', false);
+        $autoptimize_ccss_options['ao_ccss_debug']         = get_option('autoptimize_ccss_debug', false);
+        $autoptimize_ccss_options['ao_ccss_key']           = get_option('autoptimize_ccss_key');
+        $autoptimize_ccss_options['ao_ccss_keyst']         = get_option('autoptimize_ccss_keyst');
+        $autoptimize_ccss_options['ao_ccss_loggedin']      = get_option('autoptimize_ccss_loggedin', '1');
+        $autoptimize_ccss_options['ao_ccss_forcepath']     = get_option('autoptimize_ccss_forcepath', '1');
+        $autoptimize_ccss_options['ao_ccss_servicestatus'] = get_option('autoptimize_service_availablity');
+        $autoptimize_ccss_options['ao_ccss_deferjquery']   = get_option('autoptimize_ccss_deferjquery', false);
+        $autoptimize_ccss_options['ao_ccss_domain']        = get_option('autoptimize_ccss_domain');
+
+        if (strpos($autoptimize_ccss_options['ao_ccss_domain'], 'http') === false && strpos($autoptimize_ccss_options['ao_ccss_domain'], 'uggc') === 0) {
+            $autoptimize_ccss_options['ao_ccss_domain'] = str_rot13($autoptimize_ccss_options['ao_ccss_domain']);
+        } elseif (strpos($autoptimize_ccss_options['ao_ccss_domain'], 'http') !== false) {
             // not rot13'ed yet, do so now (goal; avoid migration plugins change the bound domain).
-            update_option( 'autoptimize_ccss_domain', str_rot13( $autoptimize_ccss_options['ao_ccss_domain'] ) );
+            update_option('autoptimize_ccss_domain', str_rot13($autoptimize_ccss_options['ao_ccss_domain']));
         }
 
         // Setup the rules array.
-        if ( empty( $autoptimize_ccss_options['ao_ccss_rules_raw'] ) ) {
+        if (empty($autoptimize_ccss_options['ao_ccss_rules_raw'])) {
             $autoptimize_ccss_options['ao_ccss_rules']['paths'] = array();
             $autoptimize_ccss_options['ao_ccss_rules']['types'] = array();
         } else {
-            $autoptimize_ccss_options['ao_ccss_rules'] = json_decode( $autoptimize_ccss_options['ao_ccss_rules_raw'], true );
+            $autoptimize_ccss_options['ao_ccss_rules'] = json_decode($autoptimize_ccss_options['ao_ccss_rules_raw'], true);
         }
 
         // Setup the queue array.
-        if ( empty( $autoptimize_ccss_options['ao_ccss_queue_raw'] ) ) {
+        if (empty($autoptimize_ccss_options['ao_ccss_queue_raw'])) {
             $autoptimize_ccss_options['ao_ccss_queue'] = array();
         } else {
-            $autoptimize_ccss_options['ao_ccss_queue'] = json_decode( $autoptimize_ccss_options['ao_ccss_queue_raw'], true );
+            $autoptimize_ccss_options['ao_ccss_queue'] = json_decode($autoptimize_ccss_options['ao_ccss_queue_raw'], true);
         }
 
         // Override API key if constant is defined.
-        if ( defined( 'AUTOPTIMIZE_CRITICALCSS_API_KEY' ) ) {
+        if (defined('AUTOPTIMIZE_CRITICALCSS_API_KEY')) {
             $autoptimize_ccss_options['ao_ccss_key'] = AUTOPTIMIZE_CRITICALCSS_API_KEY;
         }
 
@@ -139,49 +139,49 @@ 
         global $ao_ccss_key;
 
         // Create the cache directory if it doesn't exist already.
-        if ( ! file_exists( AO_CCSS_DIR ) ) {
-            mkdir( AO_CCSS_DIR, 0755, true );
+        if (!file_exists(AO_CCSS_DIR)) {
+            mkdir(AO_CCSS_DIR, 0755, true);
         }
 
         // Create a scheduled event for the queue.
-        if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_queue' ) ) {
-            wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' );
+        if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_queue')) {
+            wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue');
         }
 
         // Create a scheduled event for log maintenance.
-        if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_maintenance' ) ) {
-            wp_schedule_event( time(), 'twicedaily', 'ao_ccss_maintenance' );
+        if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_maintenance')) {
+            wp_schedule_event(time(), 'twicedaily', 'ao_ccss_maintenance');
         }
     }
 
     public function check_upgrade() {
-        $db_version = get_option( 'autoptimize_ccss_version', '' );
-        if ( AO_CCSS_VER !== $db_version ) {
+        $db_version = get_option('autoptimize_ccss_version', '');
+        if (AO_CCSS_VER !== $db_version) {
             // check schedules & re-schedule if needed.
             $this->on_upgrade();
             // and update db_version.
-            update_option( 'autoptimize_ccss_version', AO_CCSS_VER );
+            update_option('autoptimize_ccss_version', AO_CCSS_VER);
         }
     }
 
-    public function ao_ccss_interval( $schedules ) {
+    public function ao_ccss_interval($schedules) {
         // Let interval be configurable.
-        if ( ! defined( 'AO_CCSS_DEBUG_INTERVAL' ) ) {
+        if (!defined('AO_CCSS_DEBUG_INTERVAL')) {
             $intsec = 600;
         } else {
             $intsec = AO_CCSS_DEBUG_INTERVAL;
-            if ( $intsec >= 120 ) {
-                $inttxt = $intsec / 60 . ' minutes';
+            if ($intsec >= 120) {
+                $inttxt = $intsec/60.' minutes';
             } else {
-                $inttxt = $intsec . ' second(s)';
+                $inttxt = $intsec.' second(s)';
             }
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Using custom WP-Cron interval of ' . $inttxt, 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Using custom WP-Cron interval of '.$inttxt, 3);
         }
 
         // Attach interval to schedule.
         $schedules['ao_ccss'] = array(
             'interval' => $intsec,
-            'display'  => __( 'Autoptimize CriticalCSS' ),
+            'display'  => __('Autoptimize CriticalCSS'),
         );
         return $schedules;
     }

classes/autoptimizeImages.php

Spacing +338 added lines, -338 removed lines

@@ -3,7 +3,7 @@ 
  * Handles optimizing images.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -23,17 +23,17 @@ 
      */
     protected static $instance = null;
 
-    public function __construct( array $options = array() )
+    public function __construct(array $options = array())
     {
         // If options are not provided, fetch them.
-        if ( empty( $options ) ) {
+        if (empty($options)) {
             $options = $this->fetch_options();
         }
 
-        $this->set_options( $options );
+        $this->set_options($options);
     }
 
-    public function set_options( array $options )
+    public function set_options(array $options)
     {
         $this->options = $options;
 
@@ -42,17 +42,17 @@ 
 
     public static function fetch_options()
     {
-        $value = autoptimizeOptionWrapper::get_option( 'autoptimize_imgopt_settings' );
-        if ( empty( $value ) ) {
+        $value = autoptimizeOptionWrapper::get_option('autoptimize_imgopt_settings');
+        if (empty($value)) {
             // Fallback to returning defaults when no stored option exists yet.
             $value = autoptimizeConfig::get_ao_imgopt_default_options();
         }
 
         // get service availability and add it to the options-array.
-        $value['availabilities'] = autoptimizeOptionWrapper::get_option( 'autoptimize_service_availablity' );
+        $value['availabilities'] = autoptimizeOptionWrapper::get_option('autoptimize_service_availablity');
 
-        if ( empty( $value['availabilities'] ) ) {
-            $value['availabilities'] = autoptimizeUtils::check_service_availability( true );
+        if (empty($value['availabilities'])) {
+            $value['availabilities'] = autoptimizeUtils::check_service_availability(true);
         }
 
         return $value;
@@ -65,9 +65,9 @@ 
         // and does not use/ request the availablity data (which could slow things down).
         static $imgopt_active = null;
 
-        if ( null === $imgopt_active ) {
-            $opts = autoptimizeOptionWrapper::get_option( 'autoptimize_imgopt_settings', '' );
-            if ( ! empty( $opts ) && is_array( $opts ) && array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $opts ) && ! empty( $opts['autoptimize_imgopt_checkbox_field_1'] ) && '1' === $opts['autoptimize_imgopt_checkbox_field_1'] ) {
+        if (null === $imgopt_active) {
+            $opts = autoptimizeOptionWrapper::get_option('autoptimize_imgopt_settings', '');
+            if (!empty($opts) && is_array($opts) && array_key_exists('autoptimize_imgopt_checkbox_field_1', $opts) && !empty($opts['autoptimize_imgopt_checkbox_field_1']) && '1' === $opts['autoptimize_imgopt_checkbox_field_1']) {
                 $imgopt_active = true;
             } else {
                 $imgopt_active = false;
@@ -87,7 +87,7 @@ 
      */
     public static function instance()
     {
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new self();
         }
 
@@ -96,34 +96,34 @@ 
 
     public function run()
     {
-        if ( is_admin() ) {
-            if ( is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
-                add_action( 'network_admin_menu', array( $this, 'imgopt_admin_menu' ) );
+        if (is_admin()) {
+            if (is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
+                add_action('network_admin_menu', array($this, 'imgopt_admin_menu'));
             } else {
-                add_action( 'admin_menu', array( $this, 'imgopt_admin_menu' ) );
+                add_action('admin_menu', array($this, 'imgopt_admin_menu'));
             }
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_imgopt_tab' ), 9 );
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_imgopt_tab'), 9);
         } else {
-            add_action( 'wp', array( $this, 'run_on_frontend' ) );
+            add_action('wp', array($this, 'run_on_frontend'));
         }
     }
 
     public function run_on_frontend() {
-        if ( ! $this->should_run() ) {
-            if ( $this->should_lazyload() ) {
+        if (!$this->should_run()) {
+            if ($this->should_lazyload()) {
                 add_filter(
                     'wp_lazy_loading_enabled',
                     '__return_false'
                 );
                 add_filter(
                     'autoptimize_html_after_minify',
-                    array( $this, 'filter_lazyload_images' ),
+                    array($this, 'filter_lazyload_images'),
                     10,
                     1
                 );
                 add_action(
                     'wp_footer',
-                    array( $this, 'add_lazyload_js_footer' ),
+                    array($this, 'add_lazyload_js_footer'),
                     10,
                     0
                 );
@@ -133,43 +133,43 @@ 
 
         $active = false;
 
-        if ( apply_filters( 'autoptimize_filter_imgopt_do', true ) ) {
+        if (apply_filters('autoptimize_filter_imgopt_do', true)) {
             add_filter(
                 'autoptimize_html_after_minify',
-                array( $this, 'filter_optimize_images' ),
+                array($this, 'filter_optimize_images'),
                 10,
                 1
             );
             $active = true;
         }
 
-        if ( apply_filters( 'autoptimize_filter_imgopt_do_css', true ) ) {
+        if (apply_filters('autoptimize_filter_imgopt_do_css', true)) {
             add_filter(
                 'autoptimize_filter_base_replace_cdn',
-                array( $this, 'filter_optimize_css_images' ),
+                array($this, 'filter_optimize_css_images'),
                 10,
                 1
             );
             $active = true;
         }
 
-        if ( $active ) {
+        if ($active) {
             add_filter(
                 'autoptimize_extra_filter_tobepreconn',
-                array( $this, 'filter_preconnect_imgopt_url' ),
+                array($this, 'filter_preconnect_imgopt_url'),
                 10,
                 1
             );
         }
 
-        if ( $this->should_lazyload() ) {
+        if ($this->should_lazyload()) {
             add_filter(
                 'wp_lazy_loading_enabled',
                 '__return_false'
             );
             add_action(
                 'wp_footer',
-                array( $this, 'add_lazyload_js_footer' ),
+                array($this, 'add_lazyload_js_footer'),
                 10,
                 0
             );
@@ -184,12 +184,12 @@ 
     protected function should_run()
     {
         $opts              = $this->options;
-        $service_not_down  = ( 'down' !== $opts['availabilities']['extra_imgopt']['status'] );
-        $not_launch_status = ( 'launch' !== $opts['availabilities']['extra_imgopt']['status'] );
+        $service_not_down  = ('down' !== $opts['availabilities']['extra_imgopt']['status']);
+        $not_launch_status = ('launch' !== $opts['availabilities']['extra_imgopt']['status']);
 
         $do_cdn      = true;
         $_userstatus = $this->get_imgopt_provider_userstatus();
-        if ( isset( $_userstatus['Status'] ) && ( -2 == $_userstatus['Status'] || -3 == $_userstatus['Status'] ) ) {
+        if (isset($_userstatus['Status']) && ( -2 == $_userstatus['Status'] || -3 == $_userstatus['Status'] )) {
             // don't even attempt to put images on CDN if heavily exceeded threshold or if site not reachable.
             $do_cdn = false;
         }
@@ -198,7 +198,7 @@ 
             $this->imgopt_active()
             && $do_cdn
             && $service_not_down
-            && ( $not_launch_status || $this->launch_ok() )
+            && ($not_launch_status || $this->launch_ok())
         ) {
             return true;
         }
@@ -209,13 +209,13 @@ 
     {
         static $imgopt_host = null;
 
-        if ( null === $imgopt_host ) {
+        if (null === $imgopt_host) {
             $imgopt_host  = 'https://cdn.shortpixel.ai/';
             $avail_imgopt = $this->options['availabilities']['extra_imgopt'];
-            if ( ! empty( $avail_imgopt ) && array_key_exists( 'hosts', $avail_imgopt ) && is_array( $avail_imgopt['hosts'] ) ) {
-                $imgopt_host = array_rand( array_flip( $avail_imgopt['hosts'] ) );
+            if (!empty($avail_imgopt) && array_key_exists('hosts', $avail_imgopt) && is_array($avail_imgopt['hosts'])) {
+                $imgopt_host = array_rand(array_flip($avail_imgopt['hosts']));
             }
-            $imgopt_host = apply_filters( 'autoptimize_filter_imgopt_host', $imgopt_host );
+            $imgopt_host = apply_filters('autoptimize_filter_imgopt_host', $imgopt_host);
         }
 
         return $imgopt_host;
@@ -230,7 +230,7 @@ 
 
     public static function get_service_url_suffix()
     {
-        $suffix = '/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN;
+        $suffix = '/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN;
 
         return $suffix;
     }
@@ -239,12 +239,12 @@ 
     {
         static $quality = null;
 
-        if ( null === $quality ) {
+        if (null === $quality) {
             $q_array = $this->get_img_quality_array();
             $setting = $this->get_img_quality_setting();
             $quality = apply_filters(
                 'autoptimize_filter_imgopt_quality',
-                'q_' . $q_array[ $setting ]
+                'q_'.$q_array[$setting]
             );
         }
 
@@ -255,7 +255,7 @@ 
     {
         static $map = null;
 
-        if ( null === $map ) {
+        if (null === $map) {
             $map = array(
                 '1' => 'lossy',
                 '2' => 'glossy',
@@ -274,12 +274,12 @@ 
     {
         static $q = null;
 
-        if ( null === $q ) {
-            if ( is_array( $this->options ) && array_key_exists( 'autoptimize_imgopt_select_field_2', $this->options ) ) {
+        if (null === $q) {
+            if (is_array($this->options) && array_key_exists('autoptimize_imgopt_select_field_2', $this->options)) {
                 $setting = $this->options['autoptimize_imgopt_select_field_2'];
             }
 
-            if ( ! isset( $setting ) || empty( $setting ) || ( '1' !== $setting && '3' !== $setting ) ) {
+            if (!isset($setting) || empty($setting) || ('1' !== $setting && '3' !== $setting)) {
                 // default image opt. value is 2 ("glossy").
                 $q = '2';
             } else {
@@ -290,10 +290,10 @@ 
         return $q;
     }
 
-    public function filter_preconnect_imgopt_url( array $in )
+    public function filter_preconnect_imgopt_url(array $in)
     {
-        $url_parts = parse_url( $this->get_imgopt_base_url() );
-        $in[]      = $url_parts['scheme'] . '://' . $url_parts['host'];
+        $url_parts = parse_url($this->get_imgopt_base_url());
+        $in[]      = $url_parts['scheme'].'://'.$url_parts['host'];
 
         return $in;
     }
@@ -306,20 +306,20 @@ 
      *
      * @return string
      */
-    private function normalize_img_url( $in )
+    private function normalize_img_url($in)
     {
         // Only parse the site url once.
         static $parsed_site_url = null;
-        if ( null === $parsed_site_url ) {
-            $parsed_site_url = parse_url( site_url() );
+        if (null === $parsed_site_url) {
+            $parsed_site_url = parse_url(site_url());
         }
 
         // get CDN domain once.
         static $cdn_domain = null;
-        if ( is_null( $cdn_domain ) ) {
+        if (is_null($cdn_domain)) {
             $cdn_url = $this->get_cdn_url();
-            if ( ! empty( $cdn_url ) ) {
-                $cdn_domain = parse_url( $cdn_url, PHP_URL_HOST );
+            if (!empty($cdn_url)) {
+                $cdn_domain = parse_url($cdn_url, PHP_URL_HOST);
             } else {
                 $cdn_domain = '';
             }
@@ -335,44 +335,44 @@ 
          * identical string operations).
          */
         static $cache = null;
-        if ( null === $cache ) {
+        if (null === $cache) {
             $cache = array();
         }
 
         // Do the work on cache miss only.
-        if ( ! isset( $cache[ $in ] ) ) {
+        if (!isset($cache[$in])) {
             // Default to (the trimmed version of) what was given to us.
-            $result = trim( $in );
+            $result = trim($in);
 
             // Some silly plugins wrap background images in html-encoded quotes, so remove those from the img url.
-            if ( strpos( $result, '"' ) !== false ) {
-                $result = str_replace( '"', '', $result );
+            if (strpos($result, '"') !== false) {
+                $result = str_replace('"', '', $result);
             }
 
-            if ( autoptimizeUtils::is_protocol_relative( $result ) ) {
-                $result = $parsed_site_url['scheme'] . ':' . $result;
-            } elseif ( 0 === strpos( $result, '/' ) ) {
+            if (autoptimizeUtils::is_protocol_relative($result)) {
+                $result = $parsed_site_url['scheme'].':'.$result;
+            } elseif (0 === strpos($result, '/')) {
                 // Root-relative...
-                $result = $parsed_site_url['scheme'] . '://' . $parsed_site_url['host'] . $result;
-            } elseif ( ! empty( $cdn_domain ) && strpos( $result, $cdn_domain ) !== 0 ) {
-                $result = str_replace( $cdn_domain, $parsed_site_url['host'], $result );
+                $result = $parsed_site_url['scheme'].'://'.$parsed_site_url['host'].$result;
+            } elseif (!empty($cdn_domain) && strpos($result, $cdn_domain) !== 0) {
+                $result = str_replace($cdn_domain, $parsed_site_url['host'], $result);
             }
 
-            $result = apply_filters( 'autoptimize_filter_imgopt_normalized_url', $result );
+            $result = apply_filters('autoptimize_filter_imgopt_normalized_url', $result);
 
             // Store in cache.
-            $cache[ $in ] = $result;
+            $cache[$in] = $result;
         }
 
-        return $cache[ $in ];
+        return $cache[$in];
     }
 
-    public function filter_optimize_css_images( $in )
+    public function filter_optimize_css_images($in)
     {
-        $in = $this->normalize_img_url( $in );
+        $in = $this->normalize_img_url($in);
 
-        if ( $this->can_optimize_image( $in ) ) {
-            return $this->build_imgopt_url( $in, '', '' );
+        if ($this->can_optimize_image($in)) {
+            return $this->build_imgopt_url($in, '', '');
         } else {
             return $in;
         }
@@ -382,50 +382,50 @@ 
     {
         static $imgopt_base_url = null;
 
-        if ( null === $imgopt_base_url ) {
+        if (null === $imgopt_base_url) {
             $imgopt_host     = $this->get_imgopt_host();
             $quality         = $this->get_img_quality_string();
-            $ret_val         = apply_filters( 'autoptimize_filter_imgopt_wait', 'ret_img' ); // values: ret_wait, ret_img, ret_json, ret_blank.
-            $imgopt_base_url = $imgopt_host . 'client/' . $quality . ',' . $ret_val;
-            $imgopt_base_url = apply_filters( 'autoptimize_filter_imgopt_base_url', $imgopt_base_url );
+            $ret_val         = apply_filters('autoptimize_filter_imgopt_wait', 'ret_img'); // values: ret_wait, ret_img, ret_json, ret_blank.
+            $imgopt_base_url = $imgopt_host.'client/'.$quality.','.$ret_val;
+            $imgopt_base_url = apply_filters('autoptimize_filter_imgopt_base_url', $imgopt_base_url);
         }
 
         return $imgopt_base_url;
     }
 
-    private function can_optimize_image( $url )
+    private function can_optimize_image($url)
     {
         static $cdn_url      = null;
         static $nopti_images = null;
 
-        if ( null === $cdn_url ) {
+        if (null === $cdn_url) {
             $cdn_url = apply_filters(
                 'autoptimize_filter_base_cdnurl',
-                autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url', '' )
+                autoptimizeOptionWrapper::get_option('autoptimize_cdn_url', '')
             );
         }
 
-        if ( null === $nopti_images ) {
-            $nopti_images = apply_filters( 'autoptimize_filter_imgopt_noptimize', '' );
+        if (null === $nopti_images) {
+            $nopti_images = apply_filters('autoptimize_filter_imgopt_noptimize', '');
         }
 
         $site_host  = AUTOPTIMIZE_SITE_DOMAIN;
-        $url        = $this->normalize_img_url( $url );
-        $url_parsed = parse_url( $url );
+        $url        = $this->normalize_img_url($url);
+        $url_parsed = parse_url($url);
 
-        if ( array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host && empty( $cdn_url ) ) {
+        if (array_key_exists('host', $url_parsed) && $url_parsed['host'] !== $site_host && empty($cdn_url)) {
             return false;
-        } elseif ( ! empty( $cdn_url ) && strpos( $url, $cdn_url ) === false && array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host ) {
+        } elseif (!empty($cdn_url) && strpos($url, $cdn_url) === false && array_key_exists('host', $url_parsed) && $url_parsed['host'] !== $site_host) {
             return false;
-        } elseif ( strpos( $url, '.php' ) !== false ) {
+        } elseif (strpos($url, '.php') !== false) {
             return false;
-        } elseif ( str_ireplace( array( '.png', '.gif', '.jpg', '.jpeg', '.webp' ), '', $url_parsed['path'] ) === $url_parsed['path'] ) {
+        } elseif (str_ireplace(array('.png', '.gif', '.jpg', '.jpeg', '.webp'), '', $url_parsed['path']) === $url_parsed['path']) {
             // fixme: better check against end of string.
             return false;
-        } elseif ( ! empty( $nopti_images ) ) {
-            $nopti_images_array = array_filter( array_map( 'trim', explode( ',', $nopti_images ) ) );
-            foreach ( $nopti_images_array as $nopti_image ) {
-                if ( strpos( $url, $nopti_image ) !== false ) {
+        } elseif (!empty($nopti_images)) {
+            $nopti_images_array = array_filter(array_map('trim', explode(',', $nopti_images)));
+            foreach ($nopti_images_array as $nopti_image) {
+                if (strpos($url, $nopti_image) !== false) {
                     return false;
                 }
             }
@@ -433,13 +433,13 @@ 
         return true;
     }
 
-    private function build_imgopt_url( $orig_url, $width = 0, $height = 0 )
+    private function build_imgopt_url($orig_url, $width = 0, $height = 0)
     {
         // sanitize width and height.
-        if ( strpos( $width, '%' ) !== false ) {
+        if (strpos($width, '%') !== false) {
             $width = 0;
         }
-        if ( strpos( $height, '%' ) !== false ) {
+        if (strpos($height, '%') !== false) {
             $height = 0;
         }
         $width  = (int) $width;
@@ -453,43 +453,43 @@ 
         );
 
         // If filter modified the url, return that.
-        if ( $filtered_url !== $orig_url ) {
+        if ($filtered_url !== $orig_url) {
             return $filtered_url;
         }
 
-        $orig_url        = $this->normalize_img_url( $orig_url );
+        $orig_url        = $this->normalize_img_url($orig_url);
         $imgopt_base_url = $this->get_imgopt_base_url();
         $imgopt_size     = '';
 
-        if ( $width && 0 !== $width ) {
-            $imgopt_size = ',w_' . $width;
+        if ($width && 0 !== $width) {
+            $imgopt_size = ',w_'.$width;
         }
 
-        if ( $height && 0 !== $height ) {
-            $imgopt_size .= ',h_' . $height;
+        if ($height && 0 !== $height) {
+            $imgopt_size .= ',h_'.$height;
         }
 
-        $url = $imgopt_base_url . $imgopt_size . '/' . $orig_url;
+        $url = $imgopt_base_url.$imgopt_size.'/'.$orig_url;
 
         return $url;
     }
 
-    public function replace_data_thumbs( $matches )
+    public function replace_data_thumbs($matches)
     {
-        return $this->replace_img_callback( $matches, 150, 150 );
+        return $this->replace_img_callback($matches, 150, 150);
     }
 
-    public function replace_img_callback( $matches, $width = 0, $height = 0 )
+    public function replace_img_callback($matches, $width = 0, $height = 0)
     {
-        $_normalized_img_url = $this->normalize_img_url( $matches[1] );
-        if ( $this->can_optimize_image( $matches[1] ) ) {
-            return str_replace( $matches[1], $this->build_imgopt_url( $_normalized_img_url, $width, $height ), $matches[0] );
+        $_normalized_img_url = $this->normalize_img_url($matches[1]);
+        if ($this->can_optimize_image($matches[1])) {
+            return str_replace($matches[1], $this->build_imgopt_url($_normalized_img_url, $width, $height), $matches[0]);
         } else {
             return $matches[0];
         }
     }
 
-    public function filter_optimize_images( $in )
+    public function filter_optimize_images($in)
     {
         /*
          * potential future functional improvements:
@@ -499,7 +499,7 @@ 
         $to_replace = array();
 
         // hide noscript tags to avoid nesting noscript tags (as lazyloaded images add noscript).
-        if ( $this->should_lazyload() ) {
+        if ($this->should_lazyload()) {
             $in = autoptimizeBase::replace_contents_with_marker_if_exists(
                 'SCRIPT',
                 '<script',
@@ -509,25 +509,25 @@ 
         }
 
         // extract img tags.
-        if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $in, $matches ) ) {
-            foreach ( $matches[0] as $tag ) {
+        if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $in, $matches)) {
+            foreach ($matches[0] as $tag) {
                 $orig_tag = $tag;
                 $imgopt_w = '';
                 $imgopt_h = '';
 
                 // first do (data-)srcsets.
-                if ( preg_match_all( '#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER ) ) {
-                    foreach ( $allsrcsets as $srcset ) {
+                if (preg_match_all('#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER)) {
+                    foreach ($allsrcsets as $srcset) {
                         $srcset  = $srcset[2];
-                        $srcsets = explode( ',', $srcset );
-                        foreach ( $srcsets as $indiv_srcset ) {
-                            $indiv_srcset_parts = explode( ' ', trim( $indiv_srcset ) );
-                            if ( isset( $indiv_srcset_parts[1] ) && rtrim( $indiv_srcset_parts[1], 'w' ) !== $indiv_srcset_parts[1] ) {
-                                $imgopt_w = rtrim( $indiv_srcset_parts[1], 'w' );
+                        $srcsets = explode(',', $srcset);
+                        foreach ($srcsets as $indiv_srcset) {
+                            $indiv_srcset_parts = explode(' ', trim($indiv_srcset));
+                            if (isset($indiv_srcset_parts[1]) && rtrim($indiv_srcset_parts[1], 'w') !== $indiv_srcset_parts[1]) {
+                                $imgopt_w = rtrim($indiv_srcset_parts[1], 'w');
                             }
-                            if ( $this->can_optimize_image( $indiv_srcset_parts[0] ) ) {
-                                $imgopt_url = $this->build_imgopt_url( $indiv_srcset_parts[0], $imgopt_w, '' );
-                                $tag        = str_replace( $indiv_srcset_parts[0], $imgopt_url, $tag );
+                            if ($this->can_optimize_image($indiv_srcset_parts[0])) {
+                                $imgopt_url = $this->build_imgopt_url($indiv_srcset_parts[0], $imgopt_w, '');
+                                $tag        = str_replace($indiv_srcset_parts[0], $imgopt_url, $tag);
                             }
                         }
                     }
@@ -535,124 +535,124 @@ 
 
                 // proceed with img src.
                 // get width and height and add to $imgopt_size.
-                $_get_size = $this->get_size_from_tag( $tag );
+                $_get_size = $this->get_size_from_tag($tag);
                 $imgopt_w  = $_get_size['width'];
                 $imgopt_h  = $_get_size['height'];
 
                 // then start replacing images src.
-                if ( preg_match_all( '#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER ) ) {
-                    foreach ( $urls as $url ) {
+                if (preg_match_all('#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER)) {
+                    foreach ($urls as $url) {
                         $full_src_orig = $url[0];
                         $url           = $url[1];
-                        if ( $this->can_optimize_image( $url ) ) {
-                            $imgopt_url      = $this->build_imgopt_url( $url, $imgopt_w, $imgopt_h );
-                            $full_imgopt_src = str_replace( $url, $imgopt_url, $full_src_orig );
-                            $tag             = str_replace( $full_src_orig, $full_imgopt_src, $tag );
+                        if ($this->can_optimize_image($url)) {
+                            $imgopt_url      = $this->build_imgopt_url($url, $imgopt_w, $imgopt_h);
+                            $full_imgopt_src = str_replace($url, $imgopt_url, $full_src_orig);
+                            $tag             = str_replace($full_src_orig, $full_imgopt_src, $tag);
                         }
                     }
                 }
 
                 // do lazyload stuff.
-                if ( $this->should_lazyload( $in ) && ! empty( $url ) ) {
+                if ($this->should_lazyload($in) && !empty($url)) {
                     // first do lpiq placeholder logic.
-                    if ( strpos( $url, $this->get_imgopt_host() ) === 0 ) {
+                    if (strpos($url, $this->get_imgopt_host()) === 0) {
                         // if all img src have been replaced during srcset, we have to extract the
                         // origin url from the imgopt one to be able to set a lqip placeholder.
-                        $_url = substr( $url, strpos( $url, '/http' ) + 1 );
+                        $_url = substr($url, strpos($url, '/http') + 1);
                     } else {
                         $_url = $url;
                     }
 
-                    $_url = $this->normalize_img_url( $_url );
+                    $_url = $this->normalize_img_url($_url);
 
                     $placeholder = '';
-                    if ( $this->can_optimize_image( $_url ) && apply_filters( 'autoptimize_filter_imgopt_lazyload_dolqip', true ) ) {
+                    if ($this->can_optimize_image($_url) && apply_filters('autoptimize_filter_imgopt_lazyload_dolqip', true)) {
                         $lqip_w = '';
                         $lqip_h = '';
-                        if ( isset( $imgopt_w ) && ! empty( $imgopt_w ) ) {
-                            $lqip_w = ',w_' . $imgopt_w;
+                        if (isset($imgopt_w) && !empty($imgopt_w)) {
+                            $lqip_w = ',w_'.$imgopt_w;
                         }
-                        if ( isset( $imgopt_h ) && ! empty( $imgopt_h ) ) {
-                            $lqip_h = ',h_' . $imgopt_h;
+                        if (isset($imgopt_h) && !empty($imgopt_h)) {
+                            $lqip_h = ',h_'.$imgopt_h;
                         }
-                        $placeholder = $this->get_imgopt_host() . 'client/q_lqip,ret_wait' . $lqip_w . $lqip_h . '/' . $_url;
+                        $placeholder = $this->get_imgopt_host().'client/q_lqip,ret_wait'.$lqip_w.$lqip_h.'/'.$_url;
                     }
                     // then call add_lazyload-function with lpiq placeholder if set.
-                    $tag = $this->add_lazyload( $tag, $placeholder );
+                    $tag = $this->add_lazyload($tag, $placeholder);
                 }
 
                 // and add tag to array for later replacement.
-                if ( $tag !== $orig_tag ) {
-                    $to_replace[ $orig_tag ] = $tag;
+                if ($tag !== $orig_tag) {
+                    $to_replace[$orig_tag] = $tag;
                 }
             }
         }
 
         // and replace all.
-        $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $in );
+        $out = str_replace(array_keys($to_replace), array_values($to_replace), $in);
 
         // img thumbnails in e.g. woocommerce.
-        if ( strpos( $out, 'data-thumb' ) !== false && apply_filters( 'autoptimize_filter_imgopt_datathumbs', true ) ) {
+        if (strpos($out, 'data-thumb') !== false && apply_filters('autoptimize_filter_imgopt_datathumbs', true)) {
             $out = preg_replace_callback(
                 '/\<div(?:[^>]?)\sdata-thumb\=(?:\"|\')(.+?)(?:\"|\')(?:[^>]*)?\>/s',
-                array( $this, 'replace_data_thumbs' ),
+                array($this, 'replace_data_thumbs'),
                 $out
             );
         }
 
         // background-image in inline style.
-        if ( strpos( $out, 'background-image:' ) !== false && apply_filters( 'autoptimize_filter_imgopt_backgroundimages', true ) ) {
+        if (strpos($out, 'background-image:') !== false && apply_filters('autoptimize_filter_imgopt_backgroundimages', true)) {
             $out = preg_replace_callback(
                 '/style=(?:"|\')[^<>]*?background-image:\s?url\((?:"|\')?([^"\')]*)(?:"|\')?\)/',
-                array( $this, 'replace_img_callback' ),
+                array($this, 'replace_img_callback'),
                 $out
             );
         }
 
         // lazyload: restore noscript tags + lazyload picture source tags and bgimage.
-        if ( $this->should_lazyload() ) {
+        if ($this->should_lazyload()) {
             $out = autoptimizeBase::restore_marked_content(
                 'SCRIPT',
                 $out
             );
 
-            $out = $this->process_picture_tag( $out, true, true );
-            $out = $this->process_bgimage( $out );
+            $out = $this->process_picture_tag($out, true, true);
+            $out = $this->process_bgimage($out);
         } else {
-            $out = $this->process_picture_tag( $out, true, false );
+            $out = $this->process_picture_tag($out, true, false);
         }
 
         return $out;
     }
 
-    public function get_size_from_tag( $tag ) {
+    public function get_size_from_tag($tag) {
         // reusable function to extract widht and height from an image tag
         // enforcing a filterable maximum width and height (default 4999X4999).
         $width  = '';
         $height = '';
 
-        if ( preg_match( '#width=("|\')(.*)("|\')#Usmi', $tag, $_width ) ) {
-            if ( strpos( $_width[2], '%' ) === false ) {
+        if (preg_match('#width=("|\')(.*)("|\')#Usmi', $tag, $_width)) {
+            if (strpos($_width[2], '%') === false) {
                 $width = (int) $_width[2];
             }
         }
-        if ( preg_match( '#height=("|\')(.*)("|\')#Usmi', $tag, $_height ) ) {
-            if ( strpos( $_height[2], '%' ) === false ) {
+        if (preg_match('#height=("|\')(.*)("|\')#Usmi', $tag, $_height)) {
+            if (strpos($_height[2], '%') === false) {
                 $height = (int) $_height[2];
             }
         }
 
         // check for and enforce (filterable) max sizes.
-        $_max_width = apply_filters( 'autoptimize_filter_imgopt_max_width', 4999 );
-        if ( $width > $_max_width ) {
+        $_max_width = apply_filters('autoptimize_filter_imgopt_max_width', 4999);
+        if ($width > $_max_width) {
             $_width = $_max_width;
-            $height = $_width / $width * $height;
+            $height = $_width/$width*$height;
             $width  = $_width;
         }
-        $_max_height = apply_filters( 'autoptimize_filter_imgopt_max_height', 4999 );
-        if ( $height > $_max_height ) {
+        $_max_height = apply_filters('autoptimize_filter_imgopt_max_height', 4999);
+        if ($height > $_max_height) {
             $_height = $_max_height;
-            $width   = $_height / $height * $width;
+            $width   = $_height/$height*$width;
             $height  = $_height;
         }
 
@@ -671,26 +671,26 @@ 
         return $self->should_lazyload();
     }
 
-    public function should_lazyload( $context = '' ) {
-        if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_3'] ) && false === $this->check_nolazy() ) {
+    public function should_lazyload($context = '') {
+        if (!empty($this->options['autoptimize_imgopt_checkbox_field_3']) && false === $this->check_nolazy()) {
             $lazyload_return = true;
         } else {
             $lazyload_return = false;
         }
-        $lazyload_return = apply_filters( 'autoptimize_filter_imgopt_should_lazyload', $lazyload_return, $context );
+        $lazyload_return = apply_filters('autoptimize_filter_imgopt_should_lazyload', $lazyload_return, $context);
 
         return $lazyload_return;
     }
 
     public function check_nolazy() {
-        if ( array_key_exists( 'ao_nolazy', $_GET ) && '1' === $_GET['ao_nolazy'] ) {
+        if (array_key_exists('ao_nolazy', $_GET) && '1' === $_GET['ao_nolazy']) {
             return true;
         } else {
             return false;
         }
     }
 
-    public function filter_lazyload_images( $in )
+    public function filter_lazyload_images($in)
     {
         // only used is image optimization is NOT active but lazyload is.
         $to_replace = array();
@@ -704,20 +704,20 @@ 
         );
 
         // extract img tags and add lazyload attribs.
-        if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $out, $matches ) ) {
-            foreach ( $matches[0] as $tag ) {
-                if ( $this->should_lazyload( $out ) ) {
-                    $to_replace[ $tag ] = $this->add_lazyload( $tag );
+        if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $out, $matches)) {
+            foreach ($matches[0] as $tag) {
+                if ($this->should_lazyload($out)) {
+                    $to_replace[$tag] = $this->add_lazyload($tag);
                 }
             }
-            $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $out );
+            $out = str_replace(array_keys($to_replace), array_values($to_replace), $out);
         }
 
         // and also lazyload picture tag.
-        $out = $this->process_picture_tag( $out, false, true );
+        $out = $this->process_picture_tag($out, false, true);
 
         // and inline style blocks with background-image.
-        $out = $this->process_bgimage( $out );
+        $out = $this->process_bgimage($out);
 
         // restore noscript tags.
         $out = autoptimizeBase::restore_marked_content(
@@ -728,84 +728,84 @@ 
         return $out;
     }
 
-    public function add_lazyload( $tag, $placeholder = '' ) {
+    public function add_lazyload($tag, $placeholder = '') {
         // adds actual lazyload-attributes to an image node.
-        if ( str_ireplace( $this->get_lazyload_exclusions(), '', $tag ) === $tag ) {
-            $tag = $this->maybe_fix_missing_quotes( $tag );
+        if (str_ireplace($this->get_lazyload_exclusions(), '', $tag) === $tag) {
+            $tag = $this->maybe_fix_missing_quotes($tag);
 
             // store original tag for use in noscript version.
-            $noscript_tag = '<noscript>' . autoptimizeUtils::remove_id_from_node( $tag ) . '</noscript>';
+            $noscript_tag = '<noscript>'.autoptimizeUtils::remove_id_from_node($tag).'</noscript>';
 
-            $lazyload_class = apply_filters( 'autoptimize_filter_imgopt_lazyload_class', 'lazyload' );
+            $lazyload_class = apply_filters('autoptimize_filter_imgopt_lazyload_class', 'lazyload');
 
             // insert lazyload class.
-            $tag = $this->inject_classes_in_tag( $tag, "$lazyload_class " );
+            $tag = $this->inject_classes_in_tag($tag, "$lazyload_class ");
 
-            if ( ! $placeholder || empty( $placeholder ) ) {
+            if (!$placeholder || empty($placeholder)) {
                 // get image width & heigth for placeholder fun (and to prevent content reflow).
-                $_get_size = $this->get_size_from_tag( $tag );
+                $_get_size = $this->get_size_from_tag($tag);
                 $width     = $_get_size['width'];
                 $height    = $_get_size['height'];
-                if ( false === $width || empty( $width ) ) {
+                if (false === $width || empty($width)) {
                     $width = 210; // default width for SVG placeholder.
                 }
-                if ( false === $height || empty( $height ) ) {
-                    $height = $width / 3 * 2; // if no height, base it on width using the 3/2 aspect ratio.
+                if (false === $height || empty($height)) {
+                    $height = $width/3*2; // if no height, base it on width using the 3/2 aspect ratio.
                 }
 
                 // insert the actual lazyload stuff.
                 // see https://css-tricks.com/preventing-content-reflow-from-lazy-loaded-images/ for great read on why we're using empty svg's.
-                $placeholder = apply_filters( 'autoptimize_filter_imgopt_lazyload_placeholder', $this->get_default_lazyload_placeholder( $width, $height ) );
+                $placeholder = apply_filters('autoptimize_filter_imgopt_lazyload_placeholder', $this->get_default_lazyload_placeholder($width, $height));
             }
 
-            $tag = preg_replace( '/(\s)src=/', ' src=\'' . $placeholder . '\' data-src=', $tag );
-            $tag = preg_replace( '/(\s)srcset=/', ' data-srcset=', $tag );
+            $tag = preg_replace('/(\s)src=/', ' src=\''.$placeholder.'\' data-src=', $tag);
+            $tag = preg_replace('/(\s)srcset=/', ' data-srcset=', $tag);
 
             // move sizes to data-sizes unless filter says no.
-            if ( apply_filters( 'autoptimize_filter_imgopt_lazyload_move_sizes', true ) ) {
-                $tag = str_replace( ' sizes=', ' data-sizes=', $tag );
+            if (apply_filters('autoptimize_filter_imgopt_lazyload_move_sizes', true)) {
+                $tag = str_replace(' sizes=', ' data-sizes=', $tag);
             }
 
             // add the noscript-tag from earlier.
-            $tag = $noscript_tag . $tag;
-            $tag = apply_filters( 'autoptimize_filter_imgopt_lazyloaded_img', $tag );
+            $tag = $noscript_tag.$tag;
+            $tag = apply_filters('autoptimize_filter_imgopt_lazyloaded_img', $tag);
         }
 
         return $tag;
     }
 
     public function add_lazyload_js_footer() {
-        if ( false === autoptimizeMain::should_buffer() ) {
+        if (false === autoptimizeMain::should_buffer()) {
             return;
         }
 
         // The JS will by default be excluded form autoptimization but this can be changed with a filter.
         $noptimize_flag = '';
-        if ( apply_filters( 'autoptimize_filter_imgopt_lazyload_js_noptimize', true ) ) {
+        if (apply_filters('autoptimize_filter_imgopt_lazyload_js_noptimize', true)) {
             $noptimize_flag = ' data-noptimize="1"';
         }
 
-        $lazysizes_js = plugins_url( 'external/js/lazysizes.min.js?ao_version=' . AUTOPTIMIZE_PLUGIN_VERSION, __FILE__ );
+        $lazysizes_js = plugins_url('external/js/lazysizes.min.js?ao_version='.AUTOPTIMIZE_PLUGIN_VERSION, __FILE__);
         $cdn_url      = $this->get_cdn_url();
-        if ( ! empty( $cdn_url ) ) {
-            $lazysizes_js = str_replace( AUTOPTIMIZE_WP_SITE_URL, $cdn_url, $lazysizes_js );
+        if (!empty($cdn_url)) {
+            $lazysizes_js = str_replace(AUTOPTIMIZE_WP_SITE_URL, $cdn_url, $lazysizes_js);
         }
 
         $type_js = '';
-        if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
+        if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
             $type_js = ' type="text/javascript"';
         }
 
         // Adds lazyload CSS & JS to footer, using echo because wp_enqueue_script seems not to support pushing attributes (async).
-        echo apply_filters( 'autoptimize_filter_imgopt_lazyload_cssoutput', '<style>.lazyload,.lazyloading{opacity:0;}.lazyloaded{opacity:1;transition:opacity 300ms;}</style><noscript><style>.lazyload{display:none;}</style></noscript>' );
-        echo apply_filters( 'autoptimize_filter_imgopt_lazyload_jsconfig', '<script' . $type_js . $noptimize_flag . '>window.lazySizesConfig=window.lazySizesConfig||{};window.lazySizesConfig.loadMode=1;</script>' );
-        echo apply_filters( 'autoptimize_filter_imgopt_lazyload_js', '<script async' . $type_js . $noptimize_flag . ' src=\'' . $lazysizes_js . '\'></script>' );
+        echo apply_filters('autoptimize_filter_imgopt_lazyload_cssoutput', '<style>.lazyload,.lazyloading{opacity:0;}.lazyloaded{opacity:1;transition:opacity 300ms;}</style><noscript><style>.lazyload{display:none;}</style></noscript>');
+        echo apply_filters('autoptimize_filter_imgopt_lazyload_jsconfig', '<script'.$type_js.$noptimize_flag.'>window.lazySizesConfig=window.lazySizesConfig||{};window.lazySizesConfig.loadMode=1;</script>');
+        echo apply_filters('autoptimize_filter_imgopt_lazyload_js', '<script async'.$type_js.$noptimize_flag.' src=\''.$lazysizes_js.'\'></script>');
 
         // And add webp detection and loading JS.
-        if ( $this->should_webp() ) {
+        if ($this->should_webp()) {
             $_webp_detect = "function c_webp(A){var n=new Image;n.onload=function(){var e=0<n.width&&0<n.height;A(e)},n.onerror=function(){A(!1)},n.src='data:image/webp;base64,UklGRhoAAABXRUJQVlA4TA0AAAAvAAAAEAcQERGIiP4HAA=='}function s_webp(e){window.supportsWebP=e}c_webp(s_webp);";
             $_webp_load   = "document.addEventListener('lazybeforeunveil',function({target:c}){supportsWebP&&['data-src','data-srcset'].forEach(function(a){attr=c.getAttribute(a),null!==attr&&c.setAttribute(a,attr.replace(/\/client\//,'/client/to_webp,'))})});";
-            echo apply_filters( 'autoptimize_filter_imgopt_webp_js', '<script' . $type_js . $noptimize_flag . '>' . $_webp_detect . $_webp_load . '</script>' );
+            echo apply_filters('autoptimize_filter_imgopt_webp_js', '<script'.$type_js.$noptimize_flag.'>'.$_webp_detect.$_webp_load.'</script>');
         }
     }
 
@@ -813,10 +813,10 @@ 
         // getting CDN url here to avoid having to make bigger changes to autoptimizeBase.
         static $cdn_url = null;
 
-        if ( null === $cdn_url ) {
-            $cdn_url = autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url', '' );
-            $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed( $cdn_url );
-            $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $cdn_url );
+        if (null === $cdn_url) {
+            $cdn_url = autoptimizeOptionWrapper::get_option('autoptimize_cdn_url', '');
+            $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed($cdn_url);
+            $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $cdn_url);
         }
 
         return $cdn_url;
@@ -826,47 +826,47 @@ 
         // returns array of strings that if found in an <img tag will stop the img from being lazy-loaded.
         static $exclude_lazyload_array = null;
 
-        if ( null === $exclude_lazyload_array ) {
+        if (null === $exclude_lazyload_array) {
             $options = $this->options;
 
             // set default exclusions.
-            $exclude_lazyload_array = array( 'skip-lazy', 'data-no-lazy', 'notlazy', 'data-src', 'data-srcset', 'data:image/', 'data-lazyload', 'rev-slidebg', 'loading="eager"' );
+            $exclude_lazyload_array = array('skip-lazy', 'data-no-lazy', 'notlazy', 'data-src', 'data-srcset', 'data:image/', 'data-lazyload', 'rev-slidebg', 'loading="eager"');
 
             // add from setting.
-            if ( array_key_exists( 'autoptimize_imgopt_text_field_5', $options ) ) {
+            if (array_key_exists('autoptimize_imgopt_text_field_5', $options)) {
                 $exclude_lazyload_option = $options['autoptimize_imgopt_text_field_5'];
-                if ( ! empty( $exclude_lazyload_option ) ) {
-                    $exclude_lazyload_array = array_merge( $exclude_lazyload_array, array_filter( array_map( 'trim', explode( ',', $options['autoptimize_imgopt_text_field_5'] ) ) ) );
+                if (!empty($exclude_lazyload_option)) {
+                    $exclude_lazyload_array = array_merge($exclude_lazyload_array, array_filter(array_map('trim', explode(',', $options['autoptimize_imgopt_text_field_5']))));
                 }
             }
 
             // and filter for developer-initiated changes.
-            $exclude_lazyload_array = apply_filters( 'autoptimize_filter_imgopt_lazyload_exclude_array', $exclude_lazyload_array );
+            $exclude_lazyload_array = apply_filters('autoptimize_filter_imgopt_lazyload_exclude_array', $exclude_lazyload_array);
         }
 
         return $exclude_lazyload_array;
     }
 
-    public function inject_classes_in_tag( $tag, $target_class ) {
-        if ( strpos( $tag, 'class=' ) !== false ) {
-            $tag = preg_replace( '/(\sclass\s?=\s?("|\'))/', '$1' . $target_class, $tag );
+    public function inject_classes_in_tag($tag, $target_class) {
+        if (strpos($tag, 'class=') !== false) {
+            $tag = preg_replace('/(\sclass\s?=\s?("|\'))/', '$1'.$target_class, $tag);
         } else {
-            $tag = preg_replace( '/(<img)\s/', '$1 class="' . trim( $target_class ) . '" ', $tag );
+            $tag = preg_replace('/(<img)\s/', '$1 class="'.trim($target_class).'" ', $tag);
         }
 
         return $tag;
     }
 
-    public function get_default_lazyload_placeholder( $imgopt_w, $imgopt_h ) {
-        return 'data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%20' . $imgopt_w . '%20' . $imgopt_h . '%22%3E%3C/svg%3E';
+    public function get_default_lazyload_placeholder($imgopt_w, $imgopt_h) {
+        return 'data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%20'.$imgopt_w.'%20'.$imgopt_h.'%22%3E%3C/svg%3E';
     }
 
     public function should_webp() {
         static $webp_return = null;
 
-        if ( is_null( $webp_return ) ) {
+        if (is_null($webp_return)) {
             // webp only works if imgopt and lazyload are also active.
-            if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_4'] ) && ! empty( $this->options['autoptimize_imgopt_checkbox_field_3'] ) && $this->imgopt_active() ) {
+            if (!empty($this->options['autoptimize_imgopt_checkbox_field_4']) && !empty($this->options['autoptimize_imgopt_checkbox_field_3']) && $this->imgopt_active()) {
                 $webp_return = true;
             } else {
                 $webp_return = false;
@@ -876,9 +876,9 @@ 
         return $webp_return;
     }
 
-    public function process_picture_tag( $in, $imgopt = false, $lazy = false ) {
+    public function process_picture_tag($in, $imgopt = false, $lazy = false) {
         // check if "<picture" is present and if filter allows us to process <picture>.
-        if ( strpos( $in, '<picture' ) === false || apply_filters( 'autoptimize_filter_imgopt_dopicture', true ) === false ) {
+        if (strpos($in, '<picture') === false || apply_filters('autoptimize_filter_imgopt_dopicture', true) === false) {
             return $in;
         }
 
@@ -886,37 +886,37 @@ 
         $to_replace_pict = array();
 
         // extract and process each picture-node.
-        preg_match_all( '#<picture.*</picture>#Usmi', $in, $_pictures, PREG_SET_ORDER );
-        foreach ( $_pictures as $_picture ) {
-            $_picture = $this->maybe_fix_missing_quotes( $_picture );
-            if ( strpos( $_picture[0], '<source ' ) !== false && preg_match_all( '#<source .*srcset=(?:"|\')(?!data)(.*)(?:"|\').*>#Usmi', $_picture[0], $_sources, PREG_SET_ORDER ) !== false ) {
-                foreach ( $_sources as $_source ) {
+        preg_match_all('#<picture.*</picture>#Usmi', $in, $_pictures, PREG_SET_ORDER);
+        foreach ($_pictures as $_picture) {
+            $_picture = $this->maybe_fix_missing_quotes($_picture);
+            if (strpos($_picture[0], '<source ') !== false && preg_match_all('#<source .*srcset=(?:"|\')(?!data)(.*)(?:"|\').*>#Usmi', $_picture[0], $_sources, PREG_SET_ORDER) !== false) {
+                foreach ($_sources as $_source) {
                     $_picture_replacement = $_source[0];
 
                     // should we optimize the image?
-                    if ( $imgopt && $this->can_optimize_image( $_source[1] ) ) {
-                        $_picture_replacement = str_replace( $_source[1], $this->build_imgopt_url( $_source[1] ), $_picture_replacement );
+                    if ($imgopt && $this->can_optimize_image($_source[1])) {
+                        $_picture_replacement = str_replace($_source[1], $this->build_imgopt_url($_source[1]), $_picture_replacement);
                     }
                     // should we lazy-load?
-                    if ( $lazy && $this->should_lazyload() && str_ireplace( $_exclusions, '', $_picture_replacement ) === $_picture_replacement ) {
-                        $_picture_replacement = str_replace( ' srcset=', ' data-srcset=', $_picture_replacement );
+                    if ($lazy && $this->should_lazyload() && str_ireplace($_exclusions, '', $_picture_replacement) === $_picture_replacement) {
+                        $_picture_replacement = str_replace(' srcset=', ' data-srcset=', $_picture_replacement);
                     }
-                    $to_replace_pict[ $_source[0] ] = $_picture_replacement;
+                    $to_replace_pict[$_source[0]] = $_picture_replacement;
                 }
             }
         }
 
         // and return the fully procesed $in.
-        $out = str_replace( array_keys( $to_replace_pict ), array_values( $to_replace_pict ), $in );
+        $out = str_replace(array_keys($to_replace_pict), array_values($to_replace_pict), $in);
 
         return $out;
     }
 
-    public function process_bgimage( $in ) {
-        if ( strpos( $in, 'background-image:' ) !== false && apply_filters( 'autoptimize_filter_imgopt_lazyload_backgroundimages', true ) ) {
+    public function process_bgimage($in) {
+        if (strpos($in, 'background-image:') !== false && apply_filters('autoptimize_filter_imgopt_lazyload_backgroundimages', true)) {
             $out = preg_replace_callback(
                 '/(<(?:article|aside|body|div|footer|header|p|section|table)[^>]*)\sstyle=(?:"|\')[^<>]*?background-image:\s?url\((?:"|\')?([^"\')]*)(?:"|\')?\)[^>]*/',
-                array( $this, 'lazyload_bgimg_callback' ),
+                array($this, 'lazyload_bgimg_callback'),
                 $in
             );
             return $out;
@@ -924,27 +924,27 @@ 
         return $in;
     }
 
-    public function lazyload_bgimg_callback( $matches ) {
-        if ( str_ireplace( $this->get_lazyload_exclusions(), '', $matches[0] ) === $matches[0] ) {
+    public function lazyload_bgimg_callback($matches) {
+        if (str_ireplace($this->get_lazyload_exclusions(), '', $matches[0]) === $matches[0]) {
             // get placeholder & lazyload class strings.
-            $placeholder    = apply_filters( 'autoptimize_filter_imgopt_lazyload_placeholder', $this->get_default_lazyload_placeholder( 500, 300 ) );
-            $lazyload_class = apply_filters( 'autoptimize_filter_imgopt_lazyload_class', 'lazyload' );
+            $placeholder    = apply_filters('autoptimize_filter_imgopt_lazyload_placeholder', $this->get_default_lazyload_placeholder(500, 300));
+            $lazyload_class = apply_filters('autoptimize_filter_imgopt_lazyload_class', 'lazyload');
             // replace background-image URL with SVG placeholder.
-            $out = str_replace( $matches[2], $placeholder, $matches[0] );
+            $out = str_replace($matches[2], $placeholder, $matches[0]);
             // add data-bg attribute with real background-image URL for lazyload to pick up.
-            $out = str_replace( $matches[1], $matches[1] . ' data-bg="' . trim( str_replace( array( "\r\n", '&quot;' ), '', $matches[2] ) ) . '"', $out );
+            $out = str_replace($matches[1], $matches[1].' data-bg="'.trim(str_replace(array("\r\n", '&quot;'), '', $matches[2])).'"', $out);
             // add lazyload class to tag.
-            $out = $this->inject_classes_in_tag( $out, "$lazyload_class " );
+            $out = $this->inject_classes_in_tag($out, "$lazyload_class ");
             return $out;
         }
         return $matches[0];
     }
 
-    public function maybe_fix_missing_quotes( $tag_in ) {
+    public function maybe_fix_missing_quotes($tag_in) {
         // W3TC's Minify_HTML class removes quotes around attribute value, this re-adds them for the class and width/height attributes so we can lazyload properly.
-        if ( file_exists( WP_PLUGIN_DIR . '/w3-total-cache/w3-total-cache.php' ) && class_exists( 'Minify_HTML' ) && apply_filters( 'autoptimize_filter_imgopt_fixquotes', true ) ) {
-            $tag_out = preg_replace( '/class\s?=([^("|\')]*)(\s|>)/U', 'class=\'$1\'$2', $tag_in );
-            $tag_out = preg_replace( '/\s(width|height)=(?:"|\')?([^\s"\'>]*)(?:"|\')?/', ' $1=\'$2\'', $tag_out );
+        if (file_exists(WP_PLUGIN_DIR.'/w3-total-cache/w3-total-cache.php') && class_exists('Minify_HTML') && apply_filters('autoptimize_filter_imgopt_fixquotes', true)) {
+            $tag_out = preg_replace('/class\s?=([^("|\')]*)(\s|>)/U', 'class=\'$1\'$2', $tag_in);
+            $tag_out = preg_replace('/\s(width|height)=(?:"|\')?([^\s"\'>]*)(?:"|\')?/', ' $1=\'$2\'', $tag_out);
             return $tag_out;
         } else {
             return $tag_in;
@@ -957,23 +957,23 @@ 
     public function imgopt_admin_menu()
     {
         // no acces if multisite and not network admin and no site config allowed.
-        if ( autoptimizeConfig::should_show_menu_tabs() ) {
+        if (autoptimizeConfig::should_show_menu_tabs()) {
             add_submenu_page(
                 null,
                 'autoptimize_imgopt',
                 'autoptimize_imgopt',
                 'manage_options',
                 'autoptimize_imgopt',
-                array( $this, 'imgopt_options_page' )
+                array($this, 'imgopt_options_page')
             );
         }
-        register_setting( 'autoptimize_imgopt_settings', 'autoptimize_imgopt_settings' );
+        register_setting('autoptimize_imgopt_settings', 'autoptimize_imgopt_settings');
     }
 
-    public function add_imgopt_tab( $in )
+    public function add_imgopt_tab($in)
     {
-        if ( autoptimizeConfig::should_show_menu_tabs() ) {
-            $in = array_merge( $in, array( 'autoptimize_imgopt' => __( 'Images', 'autoptimize' ) ) );
+        if (autoptimizeConfig::should_show_menu_tabs()) {
+            $in = array_merge($in, array('autoptimize_imgopt' => __('Images', 'autoptimize')));
         }
 
         return $in;
@@ -982,7 +982,7 @@ 
     public function imgopt_options_page()
     {
         // Check querystring for "refreshCacheChecker" and call cachechecker if so.
-        if ( array_key_exists( 'refreshImgProvStats', $_GET ) && 1 == $_GET['refreshImgProvStats'] ) {
+        if (array_key_exists('refreshImgProvStats', $_GET) && 1 == $_GET['refreshImgProvStats']) {
             $this->query_img_provider_stats();
         }
 
@@ -994,47 +994,47 @@ 
         #ao_settings_form .form-table th {font-weight: normal;}
         #autoptimize_imgopt_descr{font-size: 120%;}
     </style>
-    <script>document.title = "Autoptimize: <?php _e( 'Images', 'autoptimize' ); ?> " + document.title;</script>
+    <script>document.title = "Autoptimize: <?php _e('Images', '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 if ( 'down' === $options['availabilities']['extra_imgopt']['status'] ) { ?>
+        <?php if ('down' === $options['availabilities']['extra_imgopt']['status']) { ?>
             <div class="notice-warning notice"><p>
             <?php
             // translators: "Autoptimize support forum" will appear in a "a href".
-            echo sprintf( __( 'The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize' ), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>' );
+            echo sprintf(__('The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize'), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>');
             ?>
             </p></div>
         <?php } ?>
 
-        <?php if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] && ! autoptimizeImages::instance()->launch_ok() ) { ?>
+        <?php if ('launch' === $options['availabilities']['extra_imgopt']['status'] && !autoptimizeImages::instance()->launch_ok()) { ?>
             <div class="notice-warning notice"><p>
-            <?php _e( 'The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize' ); ?>
+            <?php _e('The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize'); ?>
             </p></div>
         <?php } ?>
 
-        <?php if ( class_exists( 'Jetpack' ) && method_exists( 'Jetpack', 'get_active_modules' ) && in_array( 'photon', Jetpack::get_active_modules() ) ) { ?>
+        <?php if (class_exists('Jetpack') && method_exists('Jetpack', 'get_active_modules') && in_array('photon', Jetpack::get_active_modules())) { ?>
             <div class="notice-warning notice"><p>
             <?php
             // translators: "disable  Jetpack's site accelerator for images" will appear in a "a href" linking to the jetpack settings page.
-            echo sprintf( __( 'Please %1$sdisable Jetpack\'s site accelerator for images%2$s to be able to use Autoptomize\'s advanced image optimization features below.', 'autoptimize' ), '<a href="admin.php?page=jetpack#/settings">', '</a>' );
+            echo sprintf(__('Please %1$sdisable Jetpack\'s site accelerator for images%2$s to be able to use Autoptomize\'s advanced image optimization features below.', 'autoptimize'), '<a href="admin.php?page=jetpack#/settings">', '</a>');
             ?>
             </p></div>
         <?php } ?>
-    <form id='ao_settings_form' action='<?php echo admin_url( 'options.php' ); ?>' method='post'>
-        <?php settings_fields( 'autoptimize_imgopt_settings' ); ?>
-        <h2><?php _e( 'Image optimization', 'autoptimize' ); ?></h2>
-        <span id='autoptimize_imgopt_descr'><?php _e( 'Make your site significantly faster by just ticking a couple of checkboxes to optimize and lazy load your images, WebP support included!', 'autoptimize' ); ?></span>
+    <form id='ao_settings_form' action='<?php echo admin_url('options.php'); ?>' method='post'>
+        <?php settings_fields('autoptimize_imgopt_settings'); ?>
+        <h2><?php _e('Image optimization', 'autoptimize'); ?></h2>
+        <span id='autoptimize_imgopt_descr'><?php _e('Make your site significantly faster by just ticking a couple of checkboxes to optimize and lazy load your images, WebP support included!', 'autoptimize'); ?></span>
         <table class="form-table">
             <tr>
-                <th scope="row"><?php _e( 'Optimize Images', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Optimize Images', 'autoptimize'); ?></th>
                 <td>
-                    <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Optimize images on the fly and serve them from Shortpixel\'s global CDN.', 'autoptimize' ); ?></label>
+                    <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_1]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_1']) && '1' === $options['autoptimize_imgopt_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Optimize images on the fly and serve them from Shortpixel\'s global CDN.', 'autoptimize'); ?></label>
                     <?php
                     // show shortpixel status.
                     $_notice = autoptimizeImages::instance()->get_imgopt_status_notice();
-                    if ( $_notice ) {
-                        switch ( $_notice['status'] ) {
+                    if ($_notice) {
+                        switch ($_notice['status']) {
                             case 2:
                                 $_notice_color = 'green';
                                 break;
@@ -1049,29 +1049,29 @@ 
                             default:
                                 $_notice_color = 'green';
                         }
-                        echo apply_filters( 'autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:' . $_notice_color . ';">' . __( 'Shortpixel status: ', 'autoptimize' ) . '</span></strong>' . $_notice['notice'] . '</p>' );
+                        echo apply_filters('autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:'.$_notice_color.';">'.__('Shortpixel status: ', 'autoptimize').'</span></strong>'.$_notice['notice'].'</p>');
                     } else {
                         // translators: link points to shortpixel.
-                        $upsell_msg_1 = '<p>' . sprintf( __( 'Get more Google love and improve your website\'s loading speed by having your publicly available images optimized on the fly (also in the "next-gen" WebP image format) by %1$sShortPixel%2$s and then cached and served fast from Shortpixel\'s global CDN.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' );
-                        if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] ) {
-                            $upsell_msg_2 = __( 'For a limited time only, this service is offered free for all Autoptimize users, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize' );
+                        $upsell_msg_1 = '<p>'.sprintf(__('Get more Google love and improve your website\'s loading speed by having your publicly available images optimized on the fly (also in the "next-gen" WebP image format) by %1$sShortPixel%2$s and then cached and served fast from Shortpixel\'s global CDN.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>');
+                        if ('launch' === $options['availabilities']['extra_imgopt']['status']) {
+                            $upsell_msg_2 = __('For a limited time only, this service is offered free for all Autoptimize users, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize');
                         } else {
                             // translators: link points to shortpixel.
-                            $upsell_msg_2 = sprintf( __( '%1$sSign-up now%2$s to receive a 1 000 bonus + 50&#37; more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' );
+                            $upsell_msg_2 = sprintf(__('%1$sSign-up now%2$s to receive a 1 000 bonus + 50&#37; more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>');
                         }
-                        echo apply_filters( 'autoptimize_imgopt_imgopt_settings_copy', $upsell_msg_1 . ' ' . $upsell_msg_2 . '</p>' );
+                        echo apply_filters('autoptimize_imgopt_imgopt_settings_copy', $upsell_msg_1.' '.$upsell_msg_2.'</p>');
                     }
                     // translators: link points to shortpixel FAQ.
-                    $faqcopy = sprintf( __( '<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize' ), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>' );
-                    $faqcopy = $faqcopy . ' ' . __( 'Only works for sites/ images that are publicly available.', 'autoptimize' );
+                    $faqcopy = sprintf(__('<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize'), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>');
+                    $faqcopy = $faqcopy.' '.__('Only works for sites/ images that are publicly available.', 'autoptimize');
                     // translators: links points to shortpixel TOS & Privacy Policy.
-                    $toscopy = sprintf( __( 'Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize' ), '<a href="https://shortpixel.com/tos' . $sp_url_suffix . '" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp' . $sp_url_suffix . '" target="_blank">', '</a>' );
-                    echo apply_filters( 'autoptimize_imgopt_imgopt_settings_tos', '<p>' . $faqcopy . ' ' . $toscopy . '</p>' );
+                    $toscopy = sprintf(__('Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize'), '<a href="https://shortpixel.com/tos'.$sp_url_suffix.'" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp'.$sp_url_suffix.'" target="_blank">', '</a>');
+                    echo apply_filters('autoptimize_imgopt_imgopt_settings_tos', '<p>'.$faqcopy.' '.$toscopy.'</p>');
                     ?>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_quality' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Image Optimization quality', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_quality' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_1', $options) || (isset($options['autoptimize_imgopt_checkbox_field_1']) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Image Optimization quality', 'autoptimize'); ?></th>
                 <td>
                     <label>
                     <select name='autoptimize_imgopt_settings[autoptimize_imgopt_select_field_2]'>
@@ -1079,12 +1079,12 @@ 
                         $_imgopt_array = autoptimizeImages::instance()->get_img_quality_array();
                         $_imgopt_val   = autoptimizeImages::instance()->get_img_quality_setting();
 
-                        foreach ( $_imgopt_array as $key => $value ) {
-                            echo '<option value="' . $key . '"';
-                            if ( $_imgopt_val == $key ) {
+                        foreach ($_imgopt_array as $key => $value) {
+                            echo '<option value="'.$key.'"';
+                            if ($_imgopt_val == $key) {
                                 echo ' selected';
                             }
-                            echo '>' . ucfirst( $value ) . '</option>';
+                            echo '>'.ucfirst($value).'</option>';
                         }
                         echo "\n";
                         ?>
@@ -1093,31 +1093,31 @@ 
                     <p>
                         <?php
                             // translators: link points to shortpixel image test page.
-                            echo apply_filters( 'autoptimize_imgopt_imgopt_quality_copy', sprintf( __( 'You can %1$stest compression levels here%2$s.', 'autoptimize' ), '<a href="https://shortpixel.com/oic' . $sp_url_suffix . '" target="_blank">', '</a>' ) );
+                            echo apply_filters('autoptimize_imgopt_imgopt_quality_copy', sprintf(__('You can %1$stest compression levels here%2$s.', 'autoptimize'), '<a href="https://shortpixel.com/oic'.$sp_url_suffix.'" target="_blank">', '</a>'));
                         ?>
                     </p>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_webp' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Load WebP in supported browsers?', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_webp' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_1', $options) || (isset($options['autoptimize_imgopt_checkbox_field_1']) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Load WebP in supported browsers?', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' id='autoptimize_imgopt_webp_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_4]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_4'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_3'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Automatically serve "next-gen" WebP image format to any browser that supports it (requires lazy load to be active).', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' id='autoptimize_imgopt_webp_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_4]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_4']) && '1' === $options['autoptimize_imgopt_checkbox_field_3']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Automatically serve "next-gen" WebP image format to any browser that supports it (requires lazy load to be active).', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Lazy-load images?', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Lazy-load images?', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' id='autoptimize_imgopt_lazyload_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_3]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_3'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_3'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Image lazy-loading will delay the loading of non-visible images to allow the browser to optimally load all resources for the "above the fold"-page first.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' id='autoptimize_imgopt_lazyload_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_3]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_3']) && '1' === $options['autoptimize_imgopt_checkbox_field_3']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Image lazy-loading will delay the loading of non-visible images to allow the browser to optimally load all resources for the "above the fold"-page first.', 'autoptimize'); ?></label>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_lazyload_exclusions' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_3', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_3'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_3'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Lazy-load exclusions', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_lazyload_exclusions' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_3', $options) || (isset($options['autoptimize_imgopt_checkbox_field_3']) && '1' !== $options['autoptimize_imgopt_checkbox_field_3'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Lazy-load exclusions', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' id='autoptimize_imgopt_lazyload_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_5]' value='<?php if ( ! empty( $options['autoptimize_imgopt_text_field_5'] ) ) { echo esc_attr( $options['autoptimize_imgopt_text_field_5'] ); } ?>'><br /><?php _e( 'Comma-separated list of to be excluded image classes or filenames.', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' id='autoptimize_imgopt_lazyload_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_5]' value='<?php if (!empty($options['autoptimize_imgopt_text_field_5'])) { echo esc_attr($options['autoptimize_imgopt_text_field_5']); } ?>'><br /><?php _e('Comma-separated list of to be excluded image classes or filenames.', 'autoptimize'); ?></label>
                 </td>
             </tr>
         </table>
-        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /></p>
+        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /></p>
     </form>
     <script>
         jQuery(document).ready(function() {
@@ -1153,50 +1153,50 @@ 
      * Ïmg opt status as used on dashboard.
      */
     public function get_imgopt_status_notice() {
-        if ( $this->imgopt_active() ) {
+        if ($this->imgopt_active()) {
             $_imgopt_notice  = '';
-            $_stat           = autoptimizeOptionWrapper::get_option( 'autoptimize_imgopt_provider_stat', '' );
+            $_stat           = autoptimizeOptionWrapper::get_option('autoptimize_imgopt_provider_stat', '');
             $_site_host      = AUTOPTIMIZE_SITE_DOMAIN;
-            $_imgopt_upsell  = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . $_site_host;
+            $_imgopt_upsell  = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.$_site_host;
             $_imgopt_assoc   = 'https://shortpixel.helpscoutdocs.com/article/94-how-to-associate-a-domain-to-my-account';
             $_imgopt_unreach = 'https://shortpixel.helpscoutdocs.com/article/148-why-are-my-images-redirected-from-cdn-shortpixel-ai';
 
-            if ( is_array( $_stat ) ) {
-                if ( 1 == $_stat['Status'] ) {
+            if (is_array($_stat)) {
+                if (1 == $_stat['Status']) {
                     // translators: "add more credits" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                 } elseif ( -1 == $_stat['Status'] || -2 == $_stat['Status'] ) {
                     // translators: "add more credits" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                     // translators: "associate your domain" will appear in a "a href".
-                    $_imgopt_notice = $_imgopt_notice . ' ' . sprintf( __( 'If you already have enough credits then you may need to %1$sassociate your domain%2$s to your Shortpixel account.', 'autoptimize' ), '<a rel="noopener noreferrer" href="' . $_imgopt_assoc . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = $_imgopt_notice.' '.sprintf(__('If you already have enough credits then you may need to %1$sassociate your domain%2$s to your Shortpixel account.', 'autoptimize'), '<a rel="noopener noreferrer" href="'.$_imgopt_assoc.'" target="_blank">', '</a>');
                 } elseif ( -3 == $_stat['Status'] ) {
                     // translators: "check the documentation here" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'It seems ShortPixel image optimization is not able to fetch images from your site, %1$scheck the documentation here%2$s for more information', 'autoptimize' ), '<a href="' . $_imgopt_unreach . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('It seems ShortPixel image optimization is not able to fetch images from your site, %1$scheck the documentation here%2$s for more information', 'autoptimize'), '<a href="'.$_imgopt_unreach.'" target="_blank">', '</a>');
                 } else {
                     $_imgopt_upsell = 'https://shortpixel.com/g/af/GWRGFLW109483';
                     // translators: "log in to check your account" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                 }
 
                 // add info on freshness + refresh link if status is not 2 (good shape).
-                if ( 2 != $_stat['Status'] ) {
-                    $_imgopt_stats_refresh_url = add_query_arg( array(
+                if (2 != $_stat['Status']) {
+                    $_imgopt_stats_refresh_url = add_query_arg(array(
                         'page'                => 'autoptimize_imgopt',
                         'refreshImgProvStats' => '1',
-                    ), admin_url( 'options-general.php' ) );
-                    if ( $_stat && array_key_exists( 'timestamp', $_stat ) && ! empty( $_stat['timestamp'] ) ) {
-                        $_imgopt_stats_last_run = __( 'based on status at ', 'autoptimize' ) . date_i18n( autoptimizeOptionWrapper::get_option( 'time_format' ), $_stat['timestamp'] );
+                    ), admin_url('options-general.php'));
+                    if ($_stat && array_key_exists('timestamp', $_stat) && !empty($_stat['timestamp'])) {
+                        $_imgopt_stats_last_run = __('based on status at ', 'autoptimize').date_i18n(autoptimizeOptionWrapper::get_option('time_format'), $_stat['timestamp']);
                     } else {
-                        $_imgopt_stats_last_run = __( 'based on previously fetched data', 'autoptimize' );
+                        $_imgopt_stats_last_run = __('based on previously fetched data', 'autoptimize');
                     }
-                    $_imgopt_notice .= ' (' . $_imgopt_stats_last_run . ', ';
+                    $_imgopt_notice .= ' ('.$_imgopt_stats_last_run.', ';
                     // translators: "here to refresh" links to the Autoptimize Extra page and forces a refresh of the img opt stats.
-                    $_imgopt_notice .= sprintf( __( 'click %1$shere to refresh%2$s', 'autoptimize' ), '<a href="' . $_imgopt_stats_refresh_url . '">', '</a>).' );
+                    $_imgopt_notice .= sprintf(__('click %1$shere to refresh%2$s', 'autoptimize'), '<a href="'.$_imgopt_stats_refresh_url.'">', '</a>).');
                 }
 
                 // and make the full notice filterable.
-                $_imgopt_notice = apply_filters( 'autoptimize_filter_imgopt_notice', $_imgopt_notice );
+                $_imgopt_notice = apply_filters('autoptimize_filter_imgopt_notice', $_imgopt_notice);
 
                 return array(
                     'status' => $_stat['Status'],
@@ -1217,14 +1217,14 @@ 
      * Get img provider stats (used to display notice).
      */
     public function query_img_provider_stats() {
-        if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_1'] ) ) {
+        if (!empty($this->options['autoptimize_imgopt_checkbox_field_1'])) {
             $url      = '';
-            $endpoint = $this->get_imgopt_host() . 'read-domain/';
+            $endpoint = $this->get_imgopt_host().'read-domain/';
             $domain   = AUTOPTIMIZE_SITE_DOMAIN;
 
             // make sure parse_url result makes sense, keeping $url empty if not.
-            if ( $domain && ! empty( $domain ) ) {
-                $url = $endpoint . $domain;
+            if ($domain && !empty($domain)) {
+                $url = $endpoint.$domain;
             }
 
             $url = apply_filters(
@@ -1234,12 +1234,12 @@ 
 
             // only do the remote call if $url is not empty to make sure no parse_url
             // weirdness results in useless calls.
-            if ( ! empty( $url ) ) {
-                $response = wp_remote_get( $url );
-                if ( ! is_wp_error( $response ) ) {
-                    if ( '200' == wp_remote_retrieve_response_code( $response ) ) {
-                        $stats = json_decode( wp_remote_retrieve_body( $response ), true );
-                        autoptimizeOptionWrapper::update_option( 'autoptimize_imgopt_provider_stat', $stats );
+            if (!empty($url)) {
+                $response = wp_remote_get($url);
+                if (!is_wp_error($response)) {
+                    if ('200' == wp_remote_retrieve_response_code($response)) {
+                        $stats = json_decode(wp_remote_retrieve_body($response), true);
+                        autoptimizeOptionWrapper::update_option('autoptimize_imgopt_provider_stat', $stats);
                     }
                 }
             }
@@ -1262,15 +1262,15 @@ 
     {
         static $launch_status = null;
 
-        if ( null === $launch_status ) {
+        if (null === $launch_status) {
             $avail_imgopt  = $this->options['availabilities']['extra_imgopt'];
-            $magic_number  = intval( substr( md5( parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) ), 0, 3 ), 16 );
-            $has_launched  = autoptimizeOptionWrapper::get_option( 'autoptimize_imgopt_launched', '' );
+            $magic_number  = intval(substr(md5(parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)), 0, 3), 16);
+            $has_launched  = autoptimizeOptionWrapper::get_option('autoptimize_imgopt_launched', '');
             $launch_status = false;
-            if ( $has_launched || ( is_array( $avail_imgopt ) && array_key_exists( 'launch-threshold', $avail_imgopt ) && $magic_number < $avail_imgopt['launch-threshold'] ) ) {
+            if ($has_launched || (is_array($avail_imgopt) && array_key_exists('launch-threshold', $avail_imgopt) && $magic_number < $avail_imgopt['launch-threshold'])) {
                 $launch_status = true;
-                if ( ! $has_launched ) {
-                    autoptimizeOptionWrapper::update_option( 'autoptimize_imgopt_launched', 'on' );
+                if (!$has_launched) {
+                    autoptimizeOptionWrapper::update_option('autoptimize_imgopt_launched', 'on');
                 }
             }
         }
@@ -1287,16 +1287,16 @@ 
     public function get_imgopt_provider_userstatus() {
         static $_provider_userstatus = null;
 
-        if ( is_null( $_provider_userstatus ) ) {
-            $_stat = autoptimizeOptionWrapper::get_option( 'autoptimize_imgopt_provider_stat', '' );
-            if ( is_array( $_stat ) ) {
-                if ( array_key_exists( 'Status', $_stat ) ) {
+        if (is_null($_provider_userstatus)) {
+            $_stat = autoptimizeOptionWrapper::get_option('autoptimize_imgopt_provider_stat', '');
+            if (is_array($_stat)) {
+                if (array_key_exists('Status', $_stat)) {
                     $_provider_userstatus['Status'] = $_stat['Status'];
                 } else {
                     // if no stats then we assume all is well.
                     $_provider_userstatus['Status'] = 2;
                 }
-                if ( array_key_exists( 'timestamp', $_stat ) ) {
+                if (array_key_exists('timestamp', $_stat)) {
                     $_provider_userstatus['timestamp'] = $_stat['timestamp'];
                 } else {
                     // if no timestamp then we return "".

classes/autoptimizeMain.php

Spacing +181 added lines, -181 removed lines

@@ -3,7 +3,7 @@ 
  * Wraps base plugin logic/hooks and handles activation/deactivation/uninstall.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -33,7 +33,7 @@ 
      * @param string $version Version.
      * @param string $filepath Filepath. Needed for activation/deactivation/uninstall hooks.
      */
-    public function __construct( $version, $filepath )
+    public function __construct($version, $filepath)
     {
         $this->version  = $version;
         $this->filepath = $filepath;
@@ -50,102 +50,102 @@ 
 
     protected function add_hooks()
     {
-        if ( ! defined( 'AUTOPTIMIZE_SETUP_INITHOOK' ) ) {
-            define( 'AUTOPTIMIZE_SETUP_INITHOOK', 'plugins_loaded' );
+        if (!defined('AUTOPTIMIZE_SETUP_INITHOOK')) {
+            define('AUTOPTIMIZE_SETUP_INITHOOK', 'plugins_loaded');
         }
 
-        add_action( AUTOPTIMIZE_SETUP_INITHOOK, array( $this, 'setup' ) );
-        add_action( AUTOPTIMIZE_SETUP_INITHOOK, array( $this, 'hook_page_cache_purge' ) );
+        add_action(AUTOPTIMIZE_SETUP_INITHOOK, array($this, 'setup'));
+        add_action(AUTOPTIMIZE_SETUP_INITHOOK, array($this, 'hook_page_cache_purge'));
 
-        add_action( 'autoptimize_setup_done', array( $this, 'version_upgrades_check' ) );
-        add_action( 'autoptimize_setup_done', array( $this, 'check_cache_and_run' ) );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_ao_extra' ), 15 );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_partners_tab' ), 20 );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_criticalcss' ), 11 );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_notfound_fallback' ), 10 );
+        add_action('autoptimize_setup_done', array($this, 'version_upgrades_check'));
+        add_action('autoptimize_setup_done', array($this, 'check_cache_and_run'));
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_ao_extra'), 15);
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_partners_tab'), 20);
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_criticalcss'), 11);
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_notfound_fallback'), 10);
 
-        add_action( 'init', array( $this, 'load_textdomain' ) );
-        add_action( 'admin_init', array( 'PAnD', 'init' ) );
+        add_action('init', array($this, 'load_textdomain'));
+        add_action('admin_init', array('PAnD', 'init'));
 
-        if ( is_multisite() && is_admin() ) {
+        if (is_multisite() && is_admin()) {
             // Only if multisite and if in admin we want to check if we need to save options on network level.
-            add_action( 'init', 'autoptimizeOptionWrapper::check_multisite_on_saving_options' );
+            add_action('init', 'autoptimizeOptionWrapper::check_multisite_on_saving_options');
         }
 
         // register uninstall & deactivation hooks.
-        register_uninstall_hook( $this->filepath, 'autoptimizeMain::on_uninstall' );
-        register_deactivation_hook( $this->filepath, 'autoptimizeMain::on_deactivation' );
+        register_uninstall_hook($this->filepath, 'autoptimizeMain::on_uninstall');
+        register_deactivation_hook($this->filepath, 'autoptimizeMain::on_deactivation');
     }
 
     public function load_textdomain()
     {
-        load_plugin_textdomain( 'autoptimize' );
+        load_plugin_textdomain('autoptimize');
     }
 
     public function setup()
     {
         // Do we gzip in php when caching or is the webserver doing it?
-        define( 'AUTOPTIMIZE_CACHE_NOGZIP', (bool) autoptimizeOptionWrapper::get_option( 'autoptimize_cache_nogzip' ) );
+        define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) autoptimizeOptionWrapper::get_option('autoptimize_cache_nogzip'));
 
         // These can be overridden by specifying them in wp-config.php or such.
-        if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_NAME' ) ) {
-            define( 'AUTOPTIMIZE_WP_CONTENT_NAME', '/' . wp_basename( WP_CONTENT_DIR ) );
+        if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) {
+            define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR));
         }
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_CHILD_DIR' ) ) {
-            define( 'AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/' );
+        if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) {
+            define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/');
         }
-        if ( ! defined( 'AUTOPTIMIZE_CACHEFILE_PREFIX' ) ) {
-            define( 'AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_' );
+        if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) {
+            define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_');
         }
         // Note: trailing slash is not optional!
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) {
-            define( 'AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname() );
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
+            define('AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname());
         }
 
-        define( 'WP_ROOT_DIR', substr( WP_CONTENT_DIR, 0, strlen( WP_CONTENT_DIR ) - strlen( AUTOPTIMIZE_WP_CONTENT_NAME ) ) );
+        define('WP_ROOT_DIR', substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR) - strlen(AUTOPTIMIZE_WP_CONTENT_NAME)));
 
-        if ( ! defined( 'AUTOPTIMIZE_WP_SITE_URL' ) ) {
-            if ( function_exists( 'domain_mapping_siteurl' ) ) {
-                define( 'AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl( get_current_blog_id() ) );
+        if (!defined('AUTOPTIMIZE_WP_SITE_URL')) {
+            if (function_exists('domain_mapping_siteurl')) {
+                define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id()));
             } else {
-                define( 'AUTOPTIMIZE_WP_SITE_URL', site_url() );
+                define('AUTOPTIMIZE_WP_SITE_URL', site_url());
             }
         }
-        if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_URL' ) ) {
-            if ( function_exists( 'get_original_url' ) ) {
-                define( 'AUTOPTIMIZE_WP_CONTENT_URL', str_replace( get_original_url( AUTOPTIMIZE_WP_SITE_URL ), AUTOPTIMIZE_WP_SITE_URL, content_url() ) );
+        if (!defined('AUTOPTIMIZE_WP_CONTENT_URL')) {
+            if (function_exists('get_original_url')) {
+                define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url()));
             } else {
-                define( 'AUTOPTIMIZE_WP_CONTENT_URL', content_url() );
+                define('AUTOPTIMIZE_WP_CONTENT_URL', content_url());
             }
         }
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_URL' ) ) {
-            if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
+        if (!defined('AUTOPTIMIZE_CACHE_URL')) {
+            if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
                 $blog_id = get_current_blog_id();
-                define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR . $blog_id . '/' );
+                define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
             } else {
-                define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR );
+                define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
             }
         }
-        if ( ! defined( 'AUTOPTIMIZE_WP_ROOT_URL' ) ) {
-            define( 'AUTOPTIMIZE_WP_ROOT_URL', str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL ) );
+        if (!defined('AUTOPTIMIZE_WP_ROOT_URL')) {
+            define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
         }
-        if ( ! defined( 'AUTOPTIMIZE_HASH' ) ) {
-            define( 'AUTOPTIMIZE_HASH', wp_hash( AUTOPTIMIZE_CACHE_URL ) );
+        if (!defined('AUTOPTIMIZE_HASH')) {
+            define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_URL));
         }
-        if ( ! defined( 'AUTOPTIMIZE_SITE_DOMAIN' ) ) {
-            define( 'AUTOPTIMIZE_SITE_DOMAIN', parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) );
+        if (!defined('AUTOPTIMIZE_SITE_DOMAIN')) {
+            define('AUTOPTIMIZE_SITE_DOMAIN', parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST));
         }
 
         // Multibyte-capable string replacements are available with a filter.
         // Also requires 'mbstring' extension.
-        $with_mbstring = apply_filters( 'autoptimize_filter_main_use_mbstring', false );
-        if ( $with_mbstring ) {
-            autoptimizeUtils::mbstring_available( \extension_loaded( 'mbstring' ) );
+        $with_mbstring = apply_filters('autoptimize_filter_main_use_mbstring', false);
+        if ($with_mbstring) {
+            autoptimizeUtils::mbstring_available(\extension_loaded('mbstring'));
         } else {
-            autoptimizeUtils::mbstring_available( false );
+            autoptimizeUtils::mbstring_available(false);
         }
 
-        do_action( 'autoptimize_setup_done' );
+        do_action('autoptimize_setup_done');
     }
 
     /**
@@ -155,61 +155,61 @@ 
      */
     public function version_upgrades_check()
     {
-        autoptimizeVersionUpdatesHandler::check_installed_and_update( $this->version );
+        autoptimizeVersionUpdatesHandler::check_installed_and_update($this->version);
     }
 
     public function check_cache_and_run()
     {
-        if ( autoptimizeCache::cacheavail() ) {
+        if (autoptimizeCache::cacheavail()) {
             $conf = autoptimizeConfig::instance();
-            if ( $conf->get( 'autoptimize_html' ) || $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) || autoptimizeImages::imgopt_active() || autoptimizeImages::should_lazyload_wrapper() ) {
-                if ( ! defined( 'AUTOPTIMIZE_NOBUFFER_OPTIMIZE' ) ) {
+            if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css') || autoptimizeImages::imgopt_active() || autoptimizeImages::should_lazyload_wrapper()) {
+                if (!defined('AUTOPTIMIZE_NOBUFFER_OPTIMIZE')) {
                     // Hook into WordPress frontend.
-                    if ( defined( 'AUTOPTIMIZE_INIT_EARLIER' ) ) {
+                    if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
                         add_action(
                             'init',
-                            array( $this, 'start_buffering' ),
+                            array($this, 'start_buffering'),
                             self::INIT_EARLIER_PRIORITY
                         );
                     } else {
-                        if ( ! defined( 'AUTOPTIMIZE_HOOK_INTO' ) ) {
-                            define( 'AUTOPTIMIZE_HOOK_INTO', 'template_redirect' );
+                        if (!defined('AUTOPTIMIZE_HOOK_INTO')) {
+                            define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect');
                         }
                         add_action(
-                            constant( 'AUTOPTIMIZE_HOOK_INTO' ),
-                            array( $this, 'start_buffering' ),
+                            constant('AUTOPTIMIZE_HOOK_INTO'),
+                            array($this, 'start_buffering'),
                             self::DEFAULT_HOOK_PRIORITY
                         );
                     }
                 }
 
                 // And disable Jetpack's site accelerator if JS or CSS opt. are active.
-                if ( class_exists( 'Jetpack' ) && apply_filters( 'autoptimize_filter_main_disable_jetpack_cdn', true ) && ( $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) ) ) {
-                    add_filter( 'jetpack_force_disable_site_accelerator', '__return_true' );
+                if (class_exists('Jetpack') && apply_filters('autoptimize_filter_main_disable_jetpack_cdn', true) && ($conf->get('autoptimize_js') || $conf->get('autoptimize_css'))) {
+                    add_filter('jetpack_force_disable_site_accelerator', '__return_true');
                 }
             }
         } else {
-            add_action( 'admin_notices', 'autoptimizeMain::notice_cache_unavailable' );
+            add_action('admin_notices', 'autoptimizeMain::notice_cache_unavailable');
         }
     }
 
     public function maybe_run_ao_extra()
     {
-        if ( apply_filters( 'autoptimize_filter_extra_activate', true ) ) {
+        if (apply_filters('autoptimize_filter_extra_activate', true)) {
             $ao_imgopt = new autoptimizeImages();
             $ao_imgopt->run();
             $ao_extra = new autoptimizeExtra();
             $ao_extra->run();
 
             // And show the imgopt notice.
-            add_action( 'admin_notices', 'autoptimizeMain::notice_plug_imgopt' );
+            add_action('admin_notices', 'autoptimizeMain::notice_plug_imgopt');
         }
     }
 
     public function maybe_run_partners_tab()
     {
         // Loads partners tab code if in admin (and not in admin-ajax.php)!
-        if ( autoptimizeConfig::is_admin_and_not_ajax() ) {
+        if (autoptimizeConfig::is_admin_and_not_ajax()) {
             new autoptimizePartners();
         }
     }
@@ -217,22 +217,22 @@ 
     public function maybe_run_criticalcss()
     {
         // Loads criticalcss if the power-up is not active and if the filter returns true.
-        if ( apply_filters( 'autoptimize_filter_criticalcss_active', true ) && ! autoptimizeUtils::is_plugin_active( 'autoptimize-criticalcss/ao_criticss_aas.php' ) ) {
+        if (apply_filters('autoptimize_filter_criticalcss_active', true) && !autoptimizeUtils::is_plugin_active('autoptimize-criticalcss/ao_criticss_aas.php')) {
             new autoptimizeCriticalCSSBase();
         }
     }
 
     public function maybe_run_notfound_fallback()
     {
-        if ( autoptimizeCache::do_fallback() ) {
-            add_action( 'template_redirect', array( 'autoptimizeCache', 'wordpress_notfound_fallback' ) );
+        if (autoptimizeCache::do_fallback()) {
+            add_action('template_redirect', array('autoptimizeCache', 'wordpress_notfound_fallback'));
         }
     }
 
     public function hook_page_cache_purge()
     {
         // hook into a collection of page cache purge actions if filter allows.
-        if ( apply_filters( 'autoptimize_filter_main_hookpagecachepurge', true ) ) {
+        if (apply_filters('autoptimize_filter_main_hookpagecachepurge', true)) {
             $page_cache_purge_actions = array(
                 'after_rocket_clean_domain', // exists.
                 'hyper_cache_purged', // Stefano confirmed this will be added.
@@ -247,9 +247,9 @@ 
                 'wpo_cache_flush', // wp-optimize.
                 'rt_nginx_helper_after_fastcgi_purge_all', // nginx helper.
             );
-            $page_cache_purge_actions = apply_filters( 'autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions );
-            foreach ( $page_cache_purge_actions as $purge_action ) {
-                add_action( $purge_action, 'autoptimizeCache::clearall_actionless' );
+            $page_cache_purge_actions = apply_filters('autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions);
+            foreach ($page_cache_purge_actions as $purge_action) {
+                add_action($purge_action, 'autoptimizeCache::clearall_actionless');
             }
         }
     }
@@ -261,38 +261,38 @@ 
      */
     public function start_buffering()
     {
-        if ( $this->should_buffer() ) {
+        if ($this->should_buffer()) {
 
             // Load speedupper conditionally (true by default).
-            if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) {
+            if (apply_filters('autoptimize_filter_speedupper', true)) {
                 $ao_speedupper = new autoptimizeSpeedupper();
             }
 
             $conf = autoptimizeConfig::instance();
 
-            if ( $conf->get( 'autoptimize_js' ) ) {
-                if ( ! defined( 'CONCATENATE_SCRIPTS' ) ) {
-                    define( 'CONCATENATE_SCRIPTS', false );
+            if ($conf->get('autoptimize_js')) {
+                if (!defined('CONCATENATE_SCRIPTS')) {
+                    define('CONCATENATE_SCRIPTS', false);
                 }
-                if ( ! defined( 'COMPRESS_SCRIPTS' ) ) {
-                    define( 'COMPRESS_SCRIPTS', false );
+                if (!defined('COMPRESS_SCRIPTS')) {
+                    define('COMPRESS_SCRIPTS', false);
                 }
             }
 
-            if ( $conf->get( 'autoptimize_css' ) ) {
-                if ( ! defined( 'COMPRESS_CSS' ) ) {
-                    define( 'COMPRESS_CSS', false );
+            if ($conf->get('autoptimize_css')) {
+                if (!defined('COMPRESS_CSS')) {
+                    define('COMPRESS_CSS', false);
                 }
             }
 
-            if ( apply_filters( 'autoptimize_filter_obkiller', false ) ) {
-                while ( ob_get_level() > 0 ) {
+            if (apply_filters('autoptimize_filter_obkiller', false)) {
+                while (ob_get_level() > 0) {
                     ob_end_clean();
                 }
             }
 
             // Now, start the real thing!
-            ob_start( array( $this, 'end_buffering' ) );
+            ob_start(array($this, 'end_buffering'));
         }
     }
 
@@ -303,31 +303,31 @@ 
      *                          deciding once per request (for use in tests).
      * @return bool
      */
-    public static function should_buffer( $doing_tests = false )
+    public static function should_buffer($doing_tests = false)
     {
         static $do_buffering = null;
 
         // Only check once in case we're called multiple times by others but
         // still allows multiple calls when doing tests.
-        if ( null === $do_buffering || $doing_tests ) {
+        if (null === $do_buffering || $doing_tests) {
 
             $ao_noptimize = false;
 
             // Checking for DONOTMINIFY constant as used by e.g. WooCommerce POS.
-            if ( defined( 'DONOTMINIFY' ) && ( constant( 'DONOTMINIFY' ) === true || constant( 'DONOTMINIFY' ) === 'true' ) ) {
+            if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === 'true')) {
                 $ao_noptimize = true;
             }
 
             // Skip checking query strings if they're disabled.
-            if ( apply_filters( 'autoptimize_filter_honor_qs_noptimize', true ) ) {
+            if (apply_filters('autoptimize_filter_honor_qs_noptimize', true)) {
                 // Check for `ao_noptimize` (and other) keys in the query string
                 // to get non-optimized page for debugging.
                 $keys = array(
                     'ao_noptimize',
                     'ao_noptirocket',
                 );
-                foreach ( $keys as $key ) {
-                    if ( array_key_exists( $key, $_GET ) && '1' === $_GET[ $key ] ) {
+                foreach ($keys as $key) {
+                    if (array_key_exists($key, $_GET) && '1' === $_GET[$key]) {
                         $ao_noptimize = true;
                         break;
                     }
@@ -335,15 +335,15 @@ 
             }
 
             // If setting says not to optimize logged in user and user is logged in...
-            if ( false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_logged', 'on' ) && is_user_logged_in() && current_user_can( 'edit_posts' ) ) {
+            if (false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_optimize_logged', 'on') && is_user_logged_in() && current_user_can('edit_posts')) {
                 $ao_noptimize = true;
             }
 
             // If setting says not to optimize cart/checkout.
-            if ( false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_checkout', 'off' ) ) {
+            if (false === $ao_noptimize && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_optimize_checkout', 'off')) {
                 // Checking for woocommerce, easy digital downloads and wp ecommerce...
-                foreach ( array( 'is_checkout', 'is_cart', 'is_account_page', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout' ) as $func ) {
-                    if ( function_exists( $func ) && $func() ) {
+                foreach (array('is_checkout', 'is_cart', 'is_account_page', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout') as $func) {
+                    if (function_exists($func) && $func()) {
                         $ao_noptimize = true;
                         break;
                     }
@@ -351,10 +351,10 @@ 
             }
 
             // And make sure pagebuilder previews don't get optimized HTML/ JS/ CSS/ ...
-            if ( false === $ao_noptimize ) {
-                $_qs_pagebuilders = array( 'tve', 'elementor-preview', 'fl_builder', 'vc_action', 'et_fb', 'bt-beaverbuildertheme', 'ct_builder', 'fb-edit', 'siteorigin_panels_live_editor' );
-                foreach ( $_qs_pagebuilders as $_pagebuilder ) {
-                    if ( array_key_exists( $_pagebuilder, $_GET ) ) {
+            if (false === $ao_noptimize) {
+                $_qs_pagebuilders = array('tve', 'elementor-preview', 'fl_builder', 'vc_action', 'et_fb', 'bt-beaverbuildertheme', 'ct_builder', 'fb-edit', 'siteorigin_panels_live_editor');
+                foreach ($_qs_pagebuilders as $_pagebuilder) {
+                    if (array_key_exists($_pagebuilder, $_GET)) {
                         $ao_noptimize = true;
                         break;
                     }
@@ -363,16 +363,16 @@ 
 
             // Also honor PageSpeed=off parameter as used by mod_pagespeed, in use by some pagebuilders,
             // see https://www.modpagespeed.com/doc/experiment#ModPagespeed for info on that.
-            if ( false === $ao_noptimize && array_key_exists( 'PageSpeed', $_GET ) && 'off' === $_GET['PageSpeed'] ) {
+            if (false === $ao_noptimize && array_key_exists('PageSpeed', $_GET) && 'off' === $_GET['PageSpeed']) {
                 $ao_noptimize = true;
             }
 
             // And finally allows blocking of autoptimization on your own terms regardless of above decisions.
-            $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );
+            $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize);
 
             // Check for site being previewed in the Customizer (available since WP 4.0).
             $is_customize_preview = false;
-            if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) {
+            if (function_exists('is_customize_preview') && is_customize_preview()) {
                 $is_customize_preview = is_customize_preview();
             }
 
@@ -383,7 +383,7 @@ 
              * while the main query hasn't been ran yet. Thats why we use
              * AUTOPTIMIZE_INIT_EARLIER in tests.
              */
-            $do_buffering = ( ! is_admin() && ! is_feed() && ! is_embed() && ! $ao_noptimize && ! $is_customize_preview );
+            $do_buffering = (!is_admin() && !is_feed() && !is_embed() && !$ao_noptimize && !$is_customize_preview);
         }
 
         return $do_buffering;
@@ -396,25 +396,25 @@ 
      *
      * @return bool
      */
-    public function is_valid_buffer( $content )
+    public function is_valid_buffer($content)
     {
         // Defaults to true.
         $valid = true;
 
-        $has_no_html_tag    = ( false === stripos( $content, '<html' ) );
-        $has_xsl_stylesheet = ( false !== stripos( $content, '<xsl:stylesheet' ) || false !== stripos( $content, '<?xml-stylesheet' ) );
-        $has_html5_doctype  = ( preg_match( '/^<!DOCTYPE.+html>/i', ltrim( $content ) ) > 0 );
-        $has_noptimize_page = ( false !== stripos( $content, '<!-- noptimize-page -->' ) );
+        $has_no_html_tag    = (false === stripos($content, '<html'));
+        $has_xsl_stylesheet = (false !== stripos($content, '<xsl:stylesheet') || false !== stripos($content, '<?xml-stylesheet'));
+        $has_html5_doctype  = (preg_match('/^<!DOCTYPE.+html>/i', ltrim($content)) > 0);
+        $has_noptimize_page = (false !== stripos($content, '<!-- noptimize-page -->'));
 
-        if ( $has_no_html_tag ) {
+        if ($has_no_html_tag) {
             // Can't be valid amp markup without an html tag preceding it.
             $is_amp_markup = false;
         } else {
-            $is_amp_markup = self::is_amp_markup( $content );
+            $is_amp_markup = self::is_amp_markup($content);
         }
 
         // If it's not html, or if it's amp or contains xsl stylesheets we don't touch it.
-        if ( $has_no_html_tag && ! $has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet || $has_noptimize_page ) {
+        if ($has_no_html_tag && !$has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet || $has_noptimize_page) {
             $valid = false;
         }
 
@@ -429,14 +429,14 @@ 
      *
      * @return bool
      */
-    public static function is_amp_markup( $content )
+    public static function is_amp_markup($content)
     {
         // Short-circuit when a function is available to determine whether the response is (or will be) an AMP page.
-        if ( function_exists( 'is_amp_endpoint' ) ) {
+        if (function_exists('is_amp_endpoint')) {
             return is_amp_endpoint();
         }
 
-        $is_amp_markup = preg_match( '/<html[^>]*(?:amp|⚡)/i', $content );
+        $is_amp_markup = preg_match('/<html[^>]*(?:amp|⚡)/i', $content);
 
         return (bool) $is_amp_markup;
     }
@@ -449,10 +449,10 @@ 
      *
      * @return string
      */
-    public function end_buffering( $content )
+    public function end_buffering($content)
     {
         // Bail early without modifying anything if we can't handle the content.
-        if ( ! $this->is_valid_buffer( $content ) ) {
+        if (!$this->is_valid_buffer($content)) {
             return $content;
         }
 
@@ -460,73 +460,73 @@ 
 
         // Determine what needs to be ran.
         $classes = array();
-        if ( $conf->get( 'autoptimize_js' ) ) {
+        if ($conf->get('autoptimize_js')) {
             $classes[] = 'autoptimizeScripts';
         }
-        if ( $conf->get( 'autoptimize_css' ) ) {
+        if ($conf->get('autoptimize_css')) {
             $classes[] = 'autoptimizeStyles';
         }
-        if ( $conf->get( 'autoptimize_html' ) ) {
+        if ($conf->get('autoptimize_html')) {
             $classes[] = 'autoptimizeHTML';
         }
 
         $classoptions = array(
             'autoptimizeScripts' => array(
-                'aggregate'       => $conf->get( 'autoptimize_js_aggregate' ),
-                'justhead'        => $conf->get( 'autoptimize_js_justhead' ),
-                'forcehead'       => $conf->get( 'autoptimize_js_forcehead' ),
-                'trycatch'        => $conf->get( 'autoptimize_js_trycatch' ),
-                'js_exclude'      => $conf->get( 'autoptimize_js_exclude' ),
-                'cdn_url'         => $conf->get( 'autoptimize_cdn_url' ),
-                'include_inline'  => $conf->get( 'autoptimize_js_include_inline' ),
-                'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ),
+                'aggregate'       => $conf->get('autoptimize_js_aggregate'),
+                'justhead'        => $conf->get('autoptimize_js_justhead'),
+                'forcehead'       => $conf->get('autoptimize_js_forcehead'),
+                'trycatch'        => $conf->get('autoptimize_js_trycatch'),
+                'js_exclude'      => $conf->get('autoptimize_js_exclude'),
+                'cdn_url'         => $conf->get('autoptimize_cdn_url'),
+                'include_inline'  => $conf->get('autoptimize_js_include_inline'),
+                'minify_excluded' => $conf->get('autoptimize_minify_excluded'),
             ),
             'autoptimizeStyles'  => array(
-                'aggregate'       => $conf->get( 'autoptimize_css_aggregate' ),
-                'justhead'        => $conf->get( 'autoptimize_css_justhead' ),
-                'datauris'        => $conf->get( 'autoptimize_css_datauris' ),
-                'defer'           => $conf->get( 'autoptimize_css_defer' ),
-                'defer_inline'    => $conf->get( 'autoptimize_css_defer_inline' ),
-                'inline'          => $conf->get( 'autoptimize_css_inline' ),
-                'css_exclude'     => $conf->get( 'autoptimize_css_exclude' ),
-                'cdn_url'         => $conf->get( 'autoptimize_cdn_url' ),
-                'include_inline'  => $conf->get( 'autoptimize_css_include_inline' ),
-                'nogooglefont'    => $conf->get( 'autoptimize_css_nogooglefont' ),
-                'minify_excluded' => $conf->get( 'autoptimize_minify_excluded' ),
+                'aggregate'       => $conf->get('autoptimize_css_aggregate'),
+                'justhead'        => $conf->get('autoptimize_css_justhead'),
+                'datauris'        => $conf->get('autoptimize_css_datauris'),
+                'defer'           => $conf->get('autoptimize_css_defer'),
+                'defer_inline'    => $conf->get('autoptimize_css_defer_inline'),
+                'inline'          => $conf->get('autoptimize_css_inline'),
+                'css_exclude'     => $conf->get('autoptimize_css_exclude'),
+                'cdn_url'         => $conf->get('autoptimize_cdn_url'),
+                'include_inline'  => $conf->get('autoptimize_css_include_inline'),
+                'nogooglefont'    => $conf->get('autoptimize_css_nogooglefont'),
+                'minify_excluded' => $conf->get('autoptimize_minify_excluded'),
             ),
             'autoptimizeHTML'    => array(
-                'keepcomments' => $conf->get( 'autoptimize_html_keepcomments' ),
+                'keepcomments' => $conf->get('autoptimize_html_keepcomments'),
             ),
         );
 
-        $content = apply_filters( 'autoptimize_filter_html_before_minify', $content );
+        $content = apply_filters('autoptimize_filter_html_before_minify', $content);
 
         // Run the classes!
-        foreach ( $classes as $name ) {
-            $instance = new $name( $content );
-            if ( $instance->read( $classoptions[ $name ] ) ) {
+        foreach ($classes as $name) {
+            $instance = new $name($content);
+            if ($instance->read($classoptions[$name])) {
                 $instance->minify();
                 $instance->cache();
                 $content = $instance->getcontent();
             }
-            unset( $instance );
+            unset($instance);
         }
 
-        $content = apply_filters( 'autoptimize_html_after_minify', $content );
+        $content = apply_filters('autoptimize_html_after_minify', $content);
 
         return $content;
     }
 
-    public static function autoptimize_nobuffer_optimize( $html_in ) {
+    public static function autoptimize_nobuffer_optimize($html_in) {
         $html_out = $html_in;
 
-        if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) {
+        if (apply_filters('autoptimize_filter_speedupper', true)) {
             $ao_speedupper = new autoptimizeSpeedupper();
         }
 
-        $self = new self( AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE );
-        if ( $self->should_buffer() ) {
-            $html_out = $self->end_buffering( $html_in );
+        $self = new self(AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE);
+        if ($self->should_buffer()) {
+            $html_out = $self->end_buffering($html_in);
         }
         return $html_out;
     }
@@ -587,45 +587,45 @@ 
             'autoptimize_ccss_domain',
         );
 
-        if ( ! is_multisite() ) {
-            foreach ( $delete_options as $del_opt ) {
-                delete_option( $del_opt );
+        if (!is_multisite()) {
+            foreach ($delete_options as $del_opt) {
+                delete_option($del_opt);
             }
             autoptimizeMain::remove_cronjobs();
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                foreach ( $delete_options as $del_opt ) {
-                    delete_option( $del_opt );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                foreach ($delete_options as $del_opt) {
+                    delete_option($del_opt);
                 }
                 autoptimizeMain::remove_cronjobs();
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
 
         // Remove AO CCSS cached files and directory.
-        $ao_ccss_dir = WP_CONTENT_DIR . '/uploads/ao_ccss/';
-        if ( file_exists( $ao_ccss_dir ) && is_dir( $ao_ccss_dir ) ) {
+        $ao_ccss_dir = WP_CONTENT_DIR.'/uploads/ao_ccss/';
+        if (file_exists($ao_ccss_dir) && is_dir($ao_ccss_dir)) {
             // fixme: should check for subdirs when in multisite and remove contents of those as well.
-            array_map( 'unlink', glob( AO_CCSS_DIR . '*.{css,html,json,log,zip,lock}', GLOB_BRACE ) );
-            rmdir( AO_CCSS_DIR );
+            array_map('unlink', glob(AO_CCSS_DIR.'*.{css,html,json,log,zip,lock}', GLOB_BRACE));
+            rmdir(AO_CCSS_DIR);
         }
     }
 
     public static function on_deactivation()
     {
-        if ( is_multisite() && is_network_admin() ) {
+        if (is_multisite() && is_network_admin()) {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
                 autoptimizeMain::remove_cronjobs();
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         } else {
             autoptimizeMain::remove_cronjobs();
         }
@@ -634,9 +634,9 @@ 
 
     public static function remove_cronjobs() {
         // Remove scheduled events.
-        foreach ( array( 'ao_cachechecker', 'ao_ccss_queue', 'ao_ccss_maintenance' ) as $_event ) {
-            if ( wp_get_schedule( $_event ) ) {
-                wp_clear_scheduled_hook( $_event );
+        foreach (array('ao_cachechecker', 'ao_ccss_queue', 'ao_ccss_maintenance') as $_event) {
+            if (wp_get_schedule($_event)) {
+                wp_clear_scheduled_hook($_event);
             }
         }
     }
@@ -645,35 +645,35 @@ 
     {
         echo '<div class="error"><p>';
         // Translators: %s is the cache directory location.
-        printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR );
+        printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR);
         echo '</p></div>';
     }
 
     public static function notice_installed()
     {
         echo '<div class="updated"><p>';
-        _e( 'Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' );
+        _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize');
         echo '</p></div>';
     }
 
     public static function notice_updated()
     {
         echo '<div class="updated"><p>';
-        _e( 'Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' );
+        _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize');
         echo '</p></div>';
     }
 
     public static function notice_plug_imgopt()
     {
         // Translators: the URL added points to the Autopmize Extra settings.
-        $_ao_imgopt_plug_notice      = sprintf( __( 'Did you know Autoptimize includes on-the-fly image optimization (with support for WebP) and CDN via ShortPixel? Check out the %1$sAutoptimize Image settings%2$s to activate this option.', 'autoptimize' ), '<a href="options-general.php?page=autoptimize_imgopt">', '</a>' );
-        $_ao_imgopt_plug_notice      = apply_filters( 'autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice );
+        $_ao_imgopt_plug_notice      = sprintf(__('Did you know Autoptimize includes on-the-fly image optimization (with support for WebP) and CDN via ShortPixel? Check out the %1$sAutoptimize Image settings%2$s to activate this option.', 'autoptimize'), '<a href="options-general.php?page=autoptimize_imgopt">', '</a>');
+        $_ao_imgopt_plug_notice      = apply_filters('autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice);
         $_ao_imgopt_launch_ok        = autoptimizeImages::launch_ok_wrapper();
         $_ao_imgopt_plug_dismissible = 'ao-img-opt-plug-123';
         $_ao_imgopt_active           = autoptimizeImages::imgopt_active();
 
-        if ( current_user_can( 'manage_options' ) && '' !== $_ao_imgopt_plug_notice && ! $_ao_imgopt_active && $_ao_imgopt_launch_ok && PAnD::is_admin_notice_active( $_ao_imgopt_plug_dismissible ) ) {
-            echo '<div class="notice notice-info is-dismissible" data-dismissible="' . $_ao_imgopt_plug_dismissible . '"><p>';
+        if (current_user_can('manage_options') && '' !== $_ao_imgopt_plug_notice && !$_ao_imgopt_active && $_ao_imgopt_launch_ok && PAnD::is_admin_notice_active($_ao_imgopt_plug_dismissible)) {
+            echo '<div class="notice notice-info is-dismissible" data-dismissible="'.$_ao_imgopt_plug_dismissible.'"><p>';
             echo $_ao_imgopt_plug_notice;
             echo '</p></div>';
         }

classes/autoptimizeCriticalCSSEnqueue.php

Spacing +67 added lines, -67 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' ) ) ) || ! apply_filters( 'autoptimize_filter_ccss_coreenqueue_ignorealltypes', false ) ) ) {
-                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'))) || !apply_filters('autoptimize_filter_ccss_coreenqueue_ignorealltypes', false))) {
+                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' ) ) ) ) || apply_filters( 'autoptimize_filter_ccss_coreenqueue_ignorealltypes', false ) ) {
-                    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')))) || apply_filters('autoptimize_filter_ccss_coreenqueue_ignorealltypes', false)) {
+                    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,25 +194,25 @@ 
         $page_type = false;
 
         // Iterates over the array to match a type.
-        foreach ( $ao_ccss_types as $type ) {
-            if ( is_404() ) {
+        foreach ($ao_ccss_types as $type) {
+            if (is_404()) {
                 $page_type = 'is_404';
                 break;
-            } elseif ( strpos( $type, 'custom_post_' ) !== false ) {
+            } elseif (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;
                     }
@@ -224,44 +224,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;
     }
@@ -269,17 +269,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/autoptimizeCriticalCSSCron.php

Spacing +254 added lines, -254 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,88 +473,88 @@ 
 
         // 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;
         }
 
         // Add filter to allow the body array to be altered (e.g. to add customPageHeaders).
-        $body = apply_filters( 'autoptimize_ccss_cron_api_generate_body', $body );
+        $body = apply_filters('autoptimize_ccss_cron_api_generate_body', $body);
 
         // 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;
@@ -562,76 +562,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 = '';
@@ -641,21 +641,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;
         }
 
@@ -665,15 +665,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);
                 }
             }
         }
@@ -682,29 +682,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;
@@ -714,7 +714,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;
@@ -722,47 +722,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++;
@@ -779,54 +779,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/autoptimizeStyles.php

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 ) && false === strpos( $tag, ' onload=' ) && $this->defer && ! empty( $this->defer_inline ) && apply_filters( 'autoptimize_filter_css_defer_excluded', true, $tag ) ) {
+        if (!empty($tag) && false === strpos($tag, ' onload=') && $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];
     }
 }

classes/autoptimizeCriticalCSSCore.php

Spacing +139 added lines, -139 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( $_SERVER['REQUEST_URI'], '?' );
-            if ( ! empty( $ao_ccss_rules['paths'] ) ) {
-                foreach ( $ao_ccss_rules['paths'] as $path => $rule ) {
+            $req_path = strtok($_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 || urldecode( $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 || urldecode($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,7 +406,7 @@ 
         return $key_return;
     }
 
-    public function ao_ccss_key_validation( $key ) {
+    public function ao_ccss_key_validation($key) {
         global $ao_ccss_noptimize;
 
         // POST a dummy job to criticalcss.com to check for key validation
@@ -414,26 +414,26 @@ 
         $src_url = get_home_url();
 
         // 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);
 
         // 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 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 must be JSON.
             'body'    => json_encode(
-                apply_filters( 'autoptimize_ccss_cron_api_generate_body',
+                apply_filters('autoptimize_ccss_cron_api_generate_body',
                     array(
                         'url'    => $src_url,
                         'aff'    => 1,
@@ -444,23 +444,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';
@@ -471,30 +471,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;
         }
@@ -509,14 +509,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'] = '';
@@ -525,23 +525,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;
                 }
             }
@@ -551,7 +551,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;
@@ -562,7 +562,7 @@ 
         // 3: DD (for debug)
         // Default: UU (for unkown).
         $level = false;
-        switch ( $lvl ) {
+        switch ($lvl) {
             case 1:
                 $level = 'II';
                 break;
@@ -571,7 +571,7 @@ 
                 break;
             case 3:
                 // Output debug messages only if debug mode is enabled.
-                if ( $ao_ccss_debug ) {
+                if ($ao_ccss_debug) {
                     $level = 'DD';
                 }
                 break;
@@ -580,13 +580,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/critcss-inc/admin_settings_queue.js.php

Spacing +23 added lines, -23 removed lines

@@ -20,7 +20,7 @@ 
                                 "empty" :
                                 aoCssQueue;
         <?php
-        if ( $ao_ccss_debug ) {
+        if ($ao_ccss_debug) {
             echo "console.log( 'Queue Object:', aoCssQueueLog );\n";
         }
         ?>
@@ -62,34 +62,34 @@ 
             // Status: NEW (N, sort order 1)
             status      = '<span class="hidden">1</span>N';
             statusClass = 'new';
-            title       = '<?php _e( 'New', 'autoptimize' ); ?> (' + ljid + ')';
-            buttons     = '<?php _e( 'None', 'autoptimize' ); ?>';
+            title       = '<?php _e('New', 'autoptimize'); ?> (' + ljid + ')';
+            buttons     = '<?php _e('None', 'autoptimize'); ?>';
         } else if (keys.jqstat === 'JOB_QUEUED' || keys.jqstat === 'JOB_ONGOING') {
             // Status: PENDING (P, sort order 2)
             status      = '<span class="hidden">2</span>P';
             statusClass = 'pending';
-            title       = '<?php _e( 'PENDING', 'autoptimize' ); ?> (' + ljid + ')';
-            buttons     = '<?php _e( 'None', 'autoptimize' ); ?>';
+            title       = '<?php _e('PENDING', 'autoptimize'); ?> (' + ljid + ')';
+            buttons     = '<?php _e('None', 'autoptimize'); ?>';
         } else if (keys.jqstat === 'JOB_DONE' && keys.jrstat === 'GOOD' && (keys.jvstat === 'WARN' || keys.jvstat === 'BAD')) {
             // Status: REVIEW (R, sort order 5)
             status      = '<span class="hidden">5</span>R';
             statusClass = 'review';
-            title       = "<?php _e( 'REVIEW', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat;
-            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span>';
+            title       = "<?php _e('REVIEW', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat;
+            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span>';
             dbtn        = true;
         } else if (keys.jqstat === 'JOB_DONE') {
             // Status: DONE (D, sort order 6)
             status      = '<span class="hidden">6</span>D';
             statusClass = 'done';
-            title       = '<?php _e( 'DONE', 'autoptimize' ); ?> (' + ljid + ')';
-            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span>';
+            title       = '<?php _e('DONE', 'autoptimize'); ?> (' + ljid + ')';
+            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span>';
             dbtn        = true;
         } else if (keys.jqstat === 'JOB_FAILED' || keys.jqstat === 'STATUS_JOB_BAD' || keys.jqstat === 'INVALID_JWT_TOKEN' || keys.jqstat === 'NO_CSS' || keys.jqstat === 'NO_RESPONSE') {
         // Status: ERROR (E, sort order 4)
             status      = '<span class="hidden">4</span>E';
             statusClass = 'error';
-            title       = "<?php _e( 'ERROR', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat;
-            buttons     = '<span class="button-secondary" id="' + ljid + '_retry" title="<?php _e( 'Retry Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-update"></span></span><span class="button-secondary to-right" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e( 'Get Help', 'autoptimize' ); ?>"><span class="dashicons dashicons-sos"></span></span>';
+            title       = "<?php _e('ERROR', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat;
+            buttons     = '<span class="button-secondary" id="' + ljid + '_retry" title="<?php _e('Retry Job', 'autoptimize'); ?>"><span class="dashicons dashicons-update"></span></span><span class="button-secondary to-right" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e('Get Help', 'autoptimize'); ?>"><span class="dashicons dashicons-sos"></span></span>';
             rbtn        = true;
             dbtn        = true;
             hbtn        = true;
@@ -97,21 +97,21 @@ 
             // Status: UNKNOWN (U, sort order 5)
             status      = '<span class="hidden">5</span>U';
             statusClass = 'unknown';
-            title       = "<?php _e( 'UNKNOWN', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat;
-            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e( 'Get Help', 'autoptimize' ); ?>"><span class="dashicons dashicons-sos"></span></span>';
+            title       = "<?php _e('UNKNOWN', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat;
+            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e('Get Help', 'autoptimize'); ?>"><span class="dashicons dashicons-sos"></span></span>';
             dbtn        = true;
             hbtn        = true;
         }
 
         // Prepare job finish time
         if (keys.jftime === null) {
-            ftime = '<?php _e( 'N/A', 'autoptimize' ); ?>';
+            ftime = '<?php _e('N/A', 'autoptimize'); ?>';
         } else {
             ftime = EpochToDate(keys.jftime);
         }
 
         // Append job entry
-        jQuery("#queue").append("<tr id='" + ljid + "' class='job " + statusClass + "'><td class='status'><span class='badge " + statusClass + "' title='<?php _e( 'Job status is ', 'autoptimize' ); ?>" + title + "'>" + status + "</span></td><td>" + target.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + path + "</td><td>" + type.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + ctime + "</td><td>" + ftime + "</td><td class='btn'>" + buttons + "</td></tr>");
+        jQuery("#queue").append("<tr id='" + ljid + "' class='job " + statusClass + "'><td class='status'><span class='badge " + statusClass + "' title='<?php _e('Job status is ', 'autoptimize'); ?>" + title + "'>" + status + "</span></td><td>" + target.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + path + "</td><td>" + type.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + ctime + "</td><td>" + ftime + "</td><td class='btn'>" + buttons + "</td></tr>");
 
         // Attach button actions
         if (rbtn) {
@@ -134,12 +134,12 @@ 
         height: 180,
         modal: true,
         buttons: {
-            "<?php _e( 'Delete', 'autoptimize' ); ?>": function() {
+            "<?php _e('Delete', 'autoptimize'); ?>": function() {
                 delete queue[jpath];
                 updateQueue(queue);
                 jQuery(this).dialog('close' );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery(this).dialog('close' );
             }
         }
@@ -152,12 +152,12 @@ 
         height:235,
         modal: true,
         buttons: {
-            "<?php _e( 'Delete all jobs?', 'autoptimize' ); ?>": function() {
+            "<?php _e('Delete all jobs?', 'autoptimize'); ?>": function() {
                 queue=[];
                 updateQueue(queue);
                 jQuery( this ).dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery( this ).dialog( "close" );
             }
         }
@@ -172,9 +172,9 @@ 
         height: 180,
         modal: true,
         buttons: {
-            "<?php _e( 'Retry', 'autoptimize' ); ?>": function() {
+            "<?php _e('Retry', 'autoptimize'); ?>": function() {
                 <?php
-                if ( $ao_ccss_debug ) {
+                if ($ao_ccss_debug) {
                     echo "console.log( 'SHOULD retry job:', jid[0], jpath );\n";
                 }
                 ?>
@@ -187,7 +187,7 @@ 
                 updateQueue(queue);
                 jQuery(this).dialog('close' );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery(this).dialog('close' );
             }
         }
@@ -201,7 +201,7 @@ 
     jQuery('#unSavedWarning').show();
     document.getElementById('ao_title_and_button').scrollIntoView();  
     <?php
-    if ( $ao_ccss_debug ) {
+    if ($ao_ccss_debug) {
         echo "console.log('Updated Queue Object:', queue);\n";
     }
     ?>

classes/critcss-inc/admin_settings_rules.js.php

Spacing +34 added lines, -34 removed lines

@@ -3,7 +3,7 @@ 
  * Outputs JS code for the rules panel.
  */
 
-if ( $ao_ccss_debug ) {
+if ($ao_ccss_debug) {
     echo "console.log('[WARN] Autoptimize CriticalCSS Power-Up is in DEBUG MODE!');\n";
     echo "console.log('[WARN] Avoid using debug mode on production/live environments unless for ad-hoc troubleshooting purposes and make sure to disable it after!');\n";
 }
@@ -23,7 +23,7 @@ 
     jQuery(document).ready(function() {
         critCssArray=JSON.parse(document.getElementById("critCssOrigin").value);
         <?php
-        if ( $ao_ccss_debug ) {
+        if ($ao_ccss_debug) {
             echo "console.log('Rules Object:', critCssArray);\n";
         }
         ?>
@@ -39,13 +39,13 @@ 
     jQuery("#rules-list").empty();
     jQuery.each(critCssArray,function(k,v) {
         if (k=="paths") {
-            kstring="<?php _e( 'Path Based Rules', 'autoptimize' ); ?>";
+            kstring="<?php _e('Path Based Rules', 'autoptimize'); ?>";
         } else {
-            kstring="<?php _e( 'Conditional Tags, Custom Post Types and Page Templates Rules', 'autoptimize' ); ?>";
+            kstring="<?php _e('Conditional Tags, Custom Post Types and Page Templates Rules', 'autoptimize'); ?>";
         }
         if (!(jQuery.isEmptyObject(v))) {
             jQuery("#rules-list").append("<tr><td colspan='5'><h4>" + kstring + "</h4></td></tr>");
-            jQuery("#rules-list").append("<tr class='header "+k+"Rule'><th><?php _e( 'Type', 'autoptimize' ); ?></th><th><?php _e( 'Target', 'autoptimize' ); ?></th><th><?php _e( 'Critical CSS File', 'autoptimize' ); ?></th><th colspan='2'><?php _e( 'Actions', 'autoptimize' ); ?></th></tr>");
+            jQuery("#rules-list").append("<tr class='header "+k+"Rule'><th><?php _e('Type', 'autoptimize'); ?></th><th><?php _e('Target', 'autoptimize'); ?></th><th><?php _e('Critical CSS File', 'autoptimize'); ?></th><th colspan='2'><?php _e('Actions', 'autoptimize'); ?></th></tr>");
         }
         nodeNumber=0;
         jQuery.each(v,function(i,nv){
@@ -55,13 +55,13 @@ 
             file=nv.file;
             filest=nv.file;
             if (file == 0) {
-                file='<?php _e( 'To be fetched from criticalcss.com in the next queue run...', 'autoptimize' ); ?>';
+                file='<?php _e('To be fetched from criticalcss.com in the next queue run...', 'autoptimize'); ?>';
             }
             if (nv.hash === 0 && filest != 0) {
-                type='<?php _e( 'MANUAL', 'autoptimize' ); ?>';
+                type='<?php _e('MANUAL', 'autoptimize'); ?>';
                 typeClass = 'manual';
             } else {
-                type='<?php _e( 'AUTO', 'autoptimize' ); ?>';
+                type='<?php _e('AUTO', 'autoptimize'); ?>';
                 typeClass = 'auto';
             }
             if (file && typeof file == 'string') {
@@ -77,7 +77,7 @@ 
             } else {
                 target = i.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'');
             }
-            jQuery("#rules-list").append("<tr class='rule "+k+"Rule'><td class='type'><span class='badge " + typeClass + "'>" + type + "</span>" + rmark + "</td><td class='target'>" + target + "</td><td class='file'>" + file + "</td><td class='btn edit'><span class=\"button-secondary\" id=\"" + nodeId + "_edit\"><?php _e( 'Edit', 'autoptimize' ); ?></span></td><td class='btn delete'><span class=\"button-secondary\" id=\"" + nodeId + "_remove\"><?php _e( 'Remove', 'autoptimize' ); ?></span></td></tr>");
+            jQuery("#rules-list").append("<tr class='rule "+k+"Rule'><td class='type'><span class='badge " + typeClass + "'>" + type + "</span>" + rmark + "</td><td class='target'>" + target + "</td><td class='file'>" + file + "</td><td class='btn edit'><span class=\"button-secondary\" id=\"" + nodeId + "_edit\"><?php _e('Edit', 'autoptimize'); ?></span></td><td class='btn delete'><span class=\"button-secondary\" id=\"" + nodeId + "_remove\"><?php _e('Remove', 'autoptimize'); ?></span></td></tr>");
             jQuery("#" + nodeId + "_edit").click(function(){addEditRow(this.id);});
             jQuery("#" + nodeId + "_remove").click(function(){confirmRemove(this.id);});
         })
@@ -90,12 +90,12 @@ 
         height:235,
         modal: true,
         buttons: {
-            "<?php _e( 'Delete', 'autoptimize' ); ?>": function() {
+            "<?php _e('Delete', 'autoptimize'); ?>": function() {
                 removeRow(idToRemove);
                 updateAfterChange();
                 jQuery( this ).dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery( this ).dialog( "close" );
             }
         }
@@ -108,14 +108,14 @@ 
         height:235,
         modal: true,
         buttons: {
-            "<?php _e( 'Delete All', 'autoptimize' ); ?>": function() {
+            "<?php _e('Delete All', 'autoptimize'); ?>": function() {
                 critCssArray={'paths':[],'types':[]};
                 drawTable(critCssArray);
                 updateAfterChange();
                 removeAllCcssFilesOnServer();
                 jQuery( this ).dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery( this ).dialog( "close" );
             }
         }
@@ -132,7 +132,7 @@ 
 
     var data = {
         'action': 'rm_critcss',
-        'critcss_rm_nonce': '<?php echo wp_create_nonce( 'rm_critcss_nonce' ); ?>',
+        'critcss_rm_nonce': '<?php echo wp_create_nonce('rm_critcss_nonce'); ?>',
         'cachebustingtimestamp': new Date().getTime(),
         'critcssfile': crit_file
     };
@@ -153,7 +153,7 @@ 
 function removeAllCcssFilesOnServer() {
     var data = {
         'action': 'rm_critcss_all',
-        'critcss_rm_all_nonce': '<?php echo wp_create_nonce( 'rm_critcss_all_nonce' ); ?>',
+        'critcss_rm_all_nonce': '<?php echo wp_create_nonce('rm_critcss_all_nonce'); ?>',
         'cachebustingtimestamp': new Date().getTime()
     };
 
@@ -173,7 +173,7 @@ 
 function addEditRow(idToEdit) {
     resetForm();
     if (idToEdit) {
-        dialogTitle="<?php _e( 'Edit Critical CSS Rule', 'autoptimize' ); ?>";
+        dialogTitle="<?php _e('Edit Critical CSS Rule', 'autoptimize'); ?>";
 
         splits=idToEdit.split(/_/);
         crit_type=splits[0];
@@ -184,7 +184,7 @@ 
         jQuery("#critcss_addedit_id").val(idToEdit);
         jQuery("#critcss_addedit_type").val(crit_type);
         jQuery("#critcss_addedit_file").val(crit_file);
-        jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'Loading critical CSS...', 'autoptimize' ); ?>");
+        jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('Loading critical CSS...', 'autoptimize'); ?>");
         jQuery("#critcss_addedit_type").attr("disabled",true);
 
         if (crit_type==="paths") {
@@ -199,7 +199,7 @@ 
 
         var data = {
             'action': 'fetch_critcss',
-            'critcss_fetch_nonce': '<?php echo wp_create_nonce( 'fetch_critcss_nonce' ); ?>',
+            'critcss_fetch_nonce': '<?php echo wp_create_nonce('fetch_critcss_nonce'); ?>',
             'cachebustingtimestamp': new Date().getTime(),
             'critcssfile': crit_file
         };
@@ -213,7 +213,7 @@ 
             }
         });
     } else {
-        dialogTitle="<?php _e( 'Add Critical CSS Rule', 'autotimize' ); ?>";
+        dialogTitle="<?php _e('Add Critical CSS Rule', 'autotimize'); ?>";
 
         // default: paths, hide content type field
         jQuery("#critcss_addedit_type").val("paths");
@@ -224,11 +224,11 @@ 
             if(this.value==="types") {
                 jQuery("#critcss_addedit_pagetype_wrapper").show();
                 jQuery("#critcss_addedit_path_wrapper").hide();
-                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For type based rules, paste your specific and minified critical CSS here and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\".', 'autoptimize' ); ?>");
+                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For type based rules, paste your specific and minified critical CSS here and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\".', 'autoptimize'); ?>");
             } else {
                 jQuery("#critcss_addedit_path_wrapper").show();
                 jQuery("#critcss_addedit_pagetype_wrapper").hide();
-                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize' ); ?>");
+                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize'); ?>");
             }
         });
     }
@@ -240,21 +240,21 @@ 
         title: dialogTitle,
         modal: true,
         buttons: {
-            "<?php _e( 'Submit', 'autoptimize' ); ?>": function() {
+            "<?php _e('Submit', 'autoptimize'); ?>": function() {
                 rpath = jQuery("#critcss_addedit_path").val();
                 rtype = jQuery("#critcss_addedit_pagetype option:selected").val();
                 rccss = jQuery("#critcss_addedit_css").val();
                 console.log('rpath: ' + rpath, 'rtype: ' + rtype, 'rccss: ' + rccss);
                 if (rpath === '' && rtype === '') {
-                    alert('<?php _e( "RULE VALIDATION ERROR!\\n\\nBased on your rule type, you SHOULD set a path or conditional tag.", 'autoptimize' ); ?>');
+                    alert('<?php _e("RULE VALIDATION ERROR!\\n\\nBased on your rule type, you SHOULD set a path or conditional tag.", 'autoptimize'); ?>');
                 } else if (rtype !== '' && rccss == '') {
-                    alert('<?php _e( "RULE VALIDATION ERROR!\\n\\nType based rules REQUIRES a minified critical CSS.", 'autoptimize' ); ?>');
+                    alert('<?php _e("RULE VALIDATION ERROR!\\n\\nType based rules REQUIRES a minified critical CSS.", 'autoptimize'); ?>');
                 } else {
                     saveEditCritCss();
                     jQuery(this).dialog('close');
                 }
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 resetForm();
                 jQuery(this).dialog("close");
             }
@@ -268,15 +268,15 @@ 
         autoOpen: true,
         height: 505,
         width: 700,
-        title: "<?php _e( 'Default Critical CSS', 'autoptimize' ); ?>",
+        title: "<?php _e('Default Critical CSS', 'autoptimize'); ?>",
         modal: true,
         buttons: {
-            "<?php _e( 'Submit', 'autoptimize' ); ?>": function() {
+            "<?php _e('Submit', 'autoptimize'); ?>": function() {
                 document.getElementById("autoptimize_css_defer_inline").value=document.getElementById("dummyDefault").value;
                 jQuery("#unSavedWarning").show();
                 jQuery("#default_critcss_wrapper").dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery("#default_critcss_wrapper").dialog( "close" );
             }
         }
@@ -289,15 +289,15 @@ 
         autoOpen: true,
         height: 505,
         width: 700,
-        title: "<?php _e( 'Additional Critical CSS', 'autoptimize' ); ?>",
+        title: "<?php _e('Additional Critical CSS', 'autoptimize'); ?>",
         modal: true,
         buttons: {
-            "<?php _e( 'Submit', 'autoptimize' ); ?>": function() {
+            "<?php _e('Submit', 'autoptimize'); ?>": function() {
                 document.getElementById("autoptimize_ccss_additional").value=document.getElementById("dummyAdditional").value;
                 jQuery("#unSavedWarning").show();
                 jQuery("#additional_critcss_wrapper").dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery("#additional_critcss_wrapper").dialog( "close" );
             }
         }
@@ -333,7 +333,7 @@ 
     critCssArray[critcsstype][critcsstarget].file=critcssfile;
 
     <?php
-    if ( $ao_ccss_debug ) {
+    if ($ao_ccss_debug) {
         echo "console.log('[RULE PROPERTIES] Type:', critcsstype, ', Target:', critcsstarget, ', Hash:', 0, ', File:',  critcssfile);";
     }
     ?>
@@ -342,7 +342,7 @@ 
 
     var data = {
         'action': 'save_critcss',
-        'critcss_save_nonce': '<?php echo wp_create_nonce( 'save_critcss_nonce' ); ?>',
+        'critcss_save_nonce': '<?php echo wp_create_nonce('save_critcss_nonce'); ?>',
         'critcssfile': critcssfile,
         'critcsscontents': critcsscontents
     };
@@ -367,7 +367,7 @@ 
 }
 
 function resetForm() {
-    jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize' ); ?>");
+    jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize'); ?>");
     jQuery("#critcss_addedit_type").attr("disabled",false);
     jQuery("#critcss_addedit_path_wrapper").show();
     jQuery("#critcss_addedit_id").val("");