futtta / autoptimize

classes/autoptimizeImages.php

Doc Comments +10 added lines, -1 removed lines

@@ -382,6 +382,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     private function get_imgopt_base_url()
     {
         static $imgopt_base_url = null;
@@ -873,6 +876,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     public function get_cdn_url() {
         // getting CDN url here to avoid having to make bigger changes to autoptimizeBase.
         static $cdn_url = null;
@@ -976,6 +982,9 @@ 
         return $out;
     }
 
+    /**
+     * @return string
+     */
     public function process_bgimage( $in ) {
         if ( strpos( $in, 'background-image:' ) !== false && apply_filters( 'autoptimize_filter_imgopt_lazyload_backgroundimages', true ) ) {
             $out = preg_replace_callback(
@@ -1345,7 +1354,7 @@ 
     /**
      * Determines and returns the service launch status.
      *
-     * @return bool
+     * @return null|boolean
      */
     public function launch_ok()
     {

Spacing +369 added lines, -369 removed lines

@@ -3,7 +3,7 @@ 
  * Handles optimizing images.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -23,18 +23,18 @@ 
      */
     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);
         $this->lazyload_counter = 0;
     }
 
-    public function set_options( array $options )
+    public function set_options(array $options)
     {
         $this->options = $options;
 
@@ -43,17 +43,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;
@@ -66,9 +66,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;
@@ -88,7 +88,7 @@ 
      */
     public static function instance()
     {
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new self();
         }
 
@@ -97,34 +97,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
                 );
@@ -134,43 +134,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
             );
@@ -185,12 +185,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;
         }
@@ -199,7 +199,7 @@ 
             $this->imgopt_active()
             && $do_cdn
             && $service_not_down
-            && ( $not_launch_status || $this->launch_ok() )
+            && ($not_launch_status || $this->launch_ok())
         ) {
             return true;
         }
@@ -210,13 +210,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;
@@ -231,7 +231,7 @@ 
 
     public static function get_service_url_suffix()
     {
-        $suffix = '/af/SPZURYE109483/' . AUTOPTIMIZE_SITE_DOMAIN;
+        $suffix = '/af/SPZURYE109483/'.AUTOPTIMIZE_SITE_DOMAIN;
 
         return $suffix;
     }
@@ -240,12 +240,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]
             );
         }
 
@@ -256,7 +256,7 @@ 
     {
         static $map = null;
 
-        if ( null === $map ) {
+        if (null === $map) {
             $map = array(
                 '1' => 'lossy',
                 '2' => 'glossy',
@@ -275,12 +275,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 {
@@ -291,10 +291,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;
     }
@@ -307,20 +307,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 = '';
             }
@@ -336,47 +336,47 @@ 
          * 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.
-            $result = $this->fix_silly_bgimg_quotes( $result );
+            $result = $this->fix_silly_bgimg_quotes($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);
             }
 
             // filter (default off) to remove QS from image URL's to avoid eating away optimization credits.
-            if ( apply_filters( 'autoptimize_filter_imgopt_no_querystring', false ) && strpos( $result, '?' ) !== false ) {
-                $result = strtok( $result, '?' );
+            if (apply_filters('autoptimize_filter_imgopt_no_querystring', false) && strpos($result, '?') !== false) {
+                $result = strtok($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;
         }
@@ -386,53 +386,53 @@ 
     {
         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, $tag = '', $testing = false )
+    private function can_optimize_image($url, $tag = '', $testing = false)
     {
         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 || $testing ) {
-            if ( is_array( $this->options ) && array_key_exists( 'autoptimize_imgopt_text_field_6', $this->options ) ) {
+        if (null === $nopti_images || $testing) {
+            if (is_array($this->options) && array_key_exists('autoptimize_imgopt_text_field_6', $this->options)) {
                 $nopti_images = $this->options['autoptimize_imgopt_text_field_6'];
             }
-            $nopti_images = apply_filters( 'autoptimize_filter_imgopt_noptimize', $nopti_images );
+            $nopti_images = apply_filters('autoptimize_filter_imgopt_noptimize', $nopti_images);
         }
 
         $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', '.avif' ), '', $url_parsed['path'] ) === $url_parsed['path'] ) {
+        } elseif (str_ireplace(array('.png', '.gif', '.jpg', '.jpeg', '.webp', '.avif'), '', $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 || ( ( '' !== $tag && strpos( $tag, $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 || (('' !== $tag && strpos($tag, $nopti_image) !== false))) {
                     return false;
                 }
             }
@@ -440,13 +440,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;
@@ -460,52 +460,52 @@ 
         );
 
         // If filter modified the url, return that.
-        if ( $filtered_url !== $orig_url ) {
+        if ($filtered_url !== $orig_url) {
             return $filtered_url;
         }
 
-        $normalized_url = $this->normalize_img_url( $orig_url );
+        $normalized_url = $this->normalize_img_url($orig_url);
 
         // if the URL is ascii we check if we have a real URL with filter_var (which only works on ascii url's) and if not a real URL we return the original one.
-        if ( apply_filters( 'autoptimize_filter_imgopt_check_normalized_url', true ) && ! preg_match( '/[^\x20-\x7e]/', $normalized_url ) && false === filter_var( $normalized_url, FILTER_VALIDATE_URL ) ) {
+        if (apply_filters('autoptimize_filter_imgopt_check_normalized_url', true) && !preg_match('/[^\x20-\x7e]/', $normalized_url) && false === filter_var($normalized_url, FILTER_VALIDATE_URL)) {
             return $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 . '/' . $normalized_url;
+        $url = $imgopt_base_url.$imgopt_size.'/'.$normalized_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], $matches[0] ) ) {
-            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], $matches[0])) {
+            return str_replace($matches[1], $this->build_imgopt_url($_normalized_img_url, $width, $height), $matches[0]);
         } else {
             return $matches[0];
         }
     }
 
-    public function replace_icon_callback( $matches )
+    public function replace_icon_callback($matches)
     {
-        if ( array_key_exists( '2', $matches ) ) {
-            $sizes  = explode( 'x', $matches[2] );
+        if (array_key_exists('2', $matches)) {
+            $sizes  = explode('x', $matches[2]);
             $width  = $sizes[0];
             $height = $sizes[1];
         } else {
@@ -514,14 +514,14 @@ 
         }
 
         // make sure we're not trying to optimize a *.ico file
-        if ( strpos( $matches[1], '.ico' ) === false ) {
-            return $this->replace_img_callback( $matches, $width, $height );
+        if (strpos($matches[1], '.ico') === false) {
+            return $this->replace_img_callback($matches, $width, $height);
         } else {
             return $matches[0];
         }
     }
 
-    public function filter_optimize_images( $in, $testing = false )
+    public function filter_optimize_images($in, $testing = false)
     {
         /*
          * potential future functional improvements:
@@ -531,7 +531,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',
@@ -541,165 +541,165 @@ 
         }
 
         // extract img tags.
-        if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $in, $matches ) ) {
-            foreach ( $matches[0] as $tag ) {
-                $tag = apply_filters( 'autoptimize_filter_imgopt_tag_preopt' , $tag );
+        if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $in, $matches)) {
+            foreach ($matches[0] as $tag) {
+                $tag = apply_filters('autoptimize_filter_imgopt_tag_preopt', $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];
                         $orig_srcset = $srcset;
-                        $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], $tag, $testing ) ) {
-                                $imgopt_url = $this->build_imgopt_url( $indiv_srcset_parts[0], $imgopt_w, '' );
-                                $srcset     = str_replace( $indiv_srcset_parts[0], $imgopt_url, $srcset );
+                            if ($this->can_optimize_image($indiv_srcset_parts[0], $tag, $testing)) {
+                                $imgopt_url = $this->build_imgopt_url($indiv_srcset_parts[0], $imgopt_w, '');
+                                $srcset     = str_replace($indiv_srcset_parts[0], $imgopt_url, $srcset);
                             }
                         }
-                        $tag = str_replace( $orig_srcset, $srcset, $tag );
+                        $tag = str_replace($orig_srcset, $srcset, $tag);
                     }
                 }
 
                 // 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, $tag, $testing ) ) {
-                            $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, $tag, $testing)) {
+                            $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, $tag ) && apply_filters( 'autoptimize_filter_imgopt_lazyload_dolqip', true, $_url ) ) {
+                    if ($this->can_optimize_image($_url, $tag) && apply_filters('autoptimize_filter_imgopt_lazyload_dolqip', true, $_url)) {
                         $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);
                 }
 
-                $tag = apply_filters( 'autoptimize_filter_imgopt_tag_postopt' , $tag );
+                $tag = apply_filters('autoptimize_filter_imgopt_tag_postopt', $tag);
 
                 // 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
             );
         }
 
         // act on icon links.
-        if ( ( strpos( $out, '<link rel="icon"' ) !== false || ( strpos( $out, "<link rel='icon'" ) !== false ) ) && apply_filters( 'autoptimize_filter_imgopt_linkicon', true ) ) {
+        if ((strpos($out, '<link rel="icon"') !== false || (strpos($out, "<link rel='icon'") !== false)) && apply_filters('autoptimize_filter_imgopt_linkicon', true)) {
             $out = preg_replace_callback(
                 '/<link\srel=(?:"|\')(?:apple-touch-)?icon(?:"|\').*\shref=(?:"|\')(.*)(?:"|\')(?:\ssizes=(?:"|\')(\d*x\d*)(?:"|\'))?\s\/>/Um',
-                array( $this, 'replace_icon_callback' ),
+                array($this, 'replace_icon_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;
         }
 
@@ -718,26 +718,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();
@@ -751,20 +751,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(
@@ -775,92 +775,92 @@ 
         return $out;
     }
 
-    public function add_lazyload( $tag, $placeholder = '' ) {
+    public function add_lazyload($tag, $placeholder = '') {
         // adds actual lazyload-attributes to an image node.
         $this->lazyload_counter++;
 
         $_lazyload_from_nth = '';
-        if ( array_key_exists( 'autoptimize_imgopt_number_field_7', $this->options ) ) {
+        if (array_key_exists('autoptimize_imgopt_number_field_7', $this->options)) {
             $_lazyload_from_nth = $this->options['autoptimize_imgopt_number_field_7'];
         }
-        $_lazyload_from_nth = apply_filters( 'autoptimize_filter_imgopt_lazyload_from_nth', $_lazyload_from_nth );
+        $_lazyload_from_nth = apply_filters('autoptimize_filter_imgopt_lazyload_from_nth', $_lazyload_from_nth);
 
-        if ( str_ireplace( $this->get_lazyload_exclusions(), '', $tag ) === $tag && $this->lazyload_counter >= $_lazyload_from_nth ) {
-            $tag = $this->maybe_fix_missing_quotes( $tag );
+        if (str_ireplace($this->get_lazyload_exclusions(), '', $tag) === $tag && $this->lazyload_counter >= $_lazyload_from_nth) {
+            $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 ) ) {
-            $cdn_url      = rtrim( $cdn_url, '/' );
-            $lazysizes_js = str_replace( AUTOPTIMIZE_WP_SITE_URL, $cdn_url, $lazysizes_js );
+        if (!empty($cdn_url)) {
+            $cdn_url      = rtrim($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', '<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', '<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_ngimg() ) {
+        if ($this->should_ngimg()) {
             // Add AVIF code, can be disabled for now to only do webp.
-            if ( apply_filters( 'autoptimize_filter_imgopt_do_avif', true ) ) {
+            if (apply_filters('autoptimize_filter_imgopt_do_avif', true)) {
                 $_ngimg_detect = 'function c_img(a,b){src="avif"==b?"data:image/avif;base64,AAAAIGZ0eXBhdmlmAAAAAGF2aWZtaWYxbWlhZk1BMUIAAADybWV0YQAAAAAAAAAoaGRscgAAAAAAAAAAcGljdAAAAAAAAAAAAAAAAGxpYmF2aWYAAAAADnBpdG0AAAAAAAEAAAAeaWxvYwAAAABEAAABAAEAAAABAAABGgAAABoAAAAoaWluZgAAAAAAAQAAABppbmZlAgAAAAABAABhdjAxQ29sb3IAAAAAamlwcnAAAABLaXBjbwAAABRpc3BlAAAAAAAAAAEAAAABAAAAEHBpeGkAAAAAAwgICAAAAAxhdjFDgQ0MAAAAABNjb2xybmNseAACAAIAAYAAAAAXaXBtYQAAAAAAAAABAAEEAQKDBAAAACJtZGF0EgAKCBgADsgQEAwgMgwf8AAAWAAAAACvJ+o=":"data:image/webp;base64,UklGRhoAAABXRUJQVlA4TA0AAAAvAAAAEAcQERGIiP4HAA==";var c=new Image;c.onload=function(){var d=0<c.width&&0<c.height;a(d,b)},c.onerror=function(){a(!1,b)},c.src=src}function s_img(a,b){w=window,"avif"==b?!1==a?c_img(s_img,"webp"):w.ngImg="avif":!1==a?w.ngImg=!1:w.ngImg="webp"}c_img(s_img,"avif");';
                 $_ngimg_load   = 'document.addEventListener("lazybeforeunveil",function({target:a}){window.ngImg&&["data-src","data-srcset"].forEach(function(b){attr=a.getAttribute(b),null!==attr&&-1==attr.indexOf("/client/to_")&&a.setAttribute(b,attr.replace(/\/client\//,"/client/to_"+window.ngImg+","))})});';
             } else {
@@ -868,8 +868,8 @@ 
                 $_ngimg_load   = "document.addEventListener('lazybeforeunveil',function({target:b}){window.supportsWebP&&['data-src','data-srcset'].forEach(function(c){attr=b.getAttribute(c),null!==attr&&-1==attr.indexOf('/client/to_webp')&&b.setAttribute(c,attr.replace(/\/client\//,'/client/to_webp,'))})});";
             }
             // Keeping autoptimize_filter_imgopt_webp_js filter for now, but it is deprecated as not only for webp any more.
-            $_ngimg_output = apply_filters( 'autoptimize_filter_imgopt_webp_js', '<script' . $type_js . $noptimize_flag . '>' . $_ngimg_detect . $_ngimg_load . '</script>' );
-            echo apply_filters( 'autoptimize_filter_imgopt_ngimg_js', $_ngimg_output );
+            $_ngimg_output = apply_filters('autoptimize_filter_imgopt_webp_js', '<script'.$type_js.$noptimize_flag.'>'.$_ngimg_detect.$_ngimg_load.'</script>');
+            echo apply_filters('autoptimize_filter_imgopt_ngimg_js', $_ngimg_output);
         }
     }
 
@@ -877,10 +877,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;
@@ -890,47 +890,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( '/(<[a-zA-Z]*)\s/', '$1 class="' . trim( $target_class ) . '" ', $tag );
+            $tag = preg_replace('/(<[a-zA-Z]*)\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_ngimg() {
         static $ngimg_return = null;
 
-        if ( is_null( $ngimg_return ) ) {
+        if (is_null($ngimg_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()) {
                 $ngimg_return = true;
             } else {
                 $ngimg_return = false;
@@ -940,9 +940,9 @@ 
         return $ngimg_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;
         }
 
@@ -950,37 +950,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[0] ) ) {
-                        $_picture_replacement = str_replace( $_source[1], $this->build_imgopt_url( $_source[1] ), $_picture_replacement );
+                    if ($imgopt && $this->can_optimize_image($_source[1], $_picture[0])) {
+                        $_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|span|table)[^>]*)\sstyle=(?:"|\')[^<>]*?background-image:\s?url\((?:"|\')?([^"\')]*)(?:"|\')?\)[^>]*/',
-                array( $this, 'lazyload_bgimg_callback' ),
+                array($this, 'lazyload_bgimg_callback'),
                 $in
             );
             return $out;
@@ -988,34 +988,34 @@ 
         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( 'url(' . $matches[2], 'url(' . $placeholder, $matches[0] );
+            $out = str_replace('url('.$matches[2], 'url('.$placeholder, $matches[0]);
             // sanitize bgimg src for quote sillyness.
-            $bgimg_src = $this->fix_silly_bgimg_quotes( $matches[2] );
+            $bgimg_src = $this->fix_silly_bgimg_quotes($matches[2]);
             // add data-bg attribute with real background-image URL for lazyload to pick up.
-            $out = str_replace( $matches[1], $matches[1] . ' data-bg="' . $bgimg_src . '"', $out );
+            $out = str_replace($matches[1], $matches[1].' data-bg="'.$bgimg_src.'"', $out);
             // and finally 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 fix_silly_bgimg_quotes( $tag_in ) {
+    public function fix_silly_bgimg_quotes($tag_in) {
         // some themes/ pagebuilders wrap backgroundimages in HTML-encoded quotes (or linebreaks) which breaks imgopt/ lazyloading, this removes them.
-        return trim( str_replace( array( "\r\n", '&quot;', '&#034;', '&apos;', '&#039;' ), '', $tag_in ) );
+        return trim(str_replace(array("\r\n", '&quot;', '&#034;', '&apos;', '&#039;'), '', $tag_in));
     }
 
-    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;
@@ -1028,23 +1028,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;
@@ -1053,8 +1053,8 @@ 
     public function imgopt_options_page()
     {
         // Check querystring for "refreshCacheChecker" and call cachechecker if so.
-        if ( array_key_exists( 'refreshImgProvStats', $_GET ) && 1 == $_GET['refreshImgProvStats'] ) {
-            $this->query_img_provider_stats( true );
+        if (array_key_exists('refreshImgProvStats', $_GET) && 1 == $_GET['refreshImgProvStats']) {
+            $this->query_img_provider_stats(true);
         }
 
         $options       = $this->fetch_options();
@@ -1065,47 +1065,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 and AVIF 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 and AVIF 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;
@@ -1120,35 +1120,35 @@ 
                             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 by speeding up your website. Start serving on-the-fly optimized images (also in the "next-gen" <strong>WebP</strong> and <strong>AVIF</strong> image formats) by %1$sShortPixel%2$s. The optimized images are cached and served from %3$sShortPixel\'s global CDN%2$s.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>', '<a href="https://help.shortpixel.com/article/62-where-does-the-cdn-has-pops" target="_blank">' );
-                        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 by speeding up your website. Start serving on-the-fly optimized images (also in the "next-gen" <strong>WebP</strong> and <strong>AVIF</strong> image formats) by %1$sShortPixel%2$s. The optimized images are cached and served from %3$sShortPixel\'s global CDN%2$s.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>', '<a href="https://help.shortpixel.com/article/62-where-does-the-cdn-has-pops" target="_blank">');
+                        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 x2 more CDN traffic or image optimization credits for free! This offer also applies to any future plan that you\'ll choose to purchase.', '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 x2 more CDN traffic or image optimization credits for free! This offer also applies to any future plan that you\'ll choose to purchase.', '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$sAutoptimize + ShortPixel FAQ%2$s!', 'autoptimize' ), '<strong><a href="https://help.shortpixel.com/category/405-autoptimize" target="_blank">', '</strong></a>' );
-                    $faqcopy = $faqcopy . ' ' . __( 'Only works for websites and images that are publicly available.', 'autoptimize' );
+                    $faqcopy = sprintf(__('<strong>Questions</strong>? Have a look at the %1$sAutoptimize + ShortPixel FAQ%2$s!', 'autoptimize'), '<strong><a href="https://help.shortpixel.com/category/405-autoptimize" target="_blank">', '</strong></a>');
+                    $faqcopy = $faqcopy.' '.__('Only works for websites and 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_optimization_exclusions' <?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( 'Optimization exclusions', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_optimization_exclusions' <?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('Optimization exclusions', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' id='autoptimize_imgopt_optimization_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_6]' value='<?php if ( ! empty( $options['autoptimize_imgopt_text_field_6'] ) ) { echo esc_attr( $options['autoptimize_imgopt_text_field_6'] ); } ?>'><br /><?php _e( 'Comma-separated list of image classes or filenames that should not be optimized.', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' id='autoptimize_imgopt_optimization_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_6]' value='<?php if (!empty($options['autoptimize_imgopt_text_field_6'])) { echo esc_attr($options['autoptimize_imgopt_text_field_6']); } ?>'><br /><?php _e('Comma-separated list of image classes or filenames that should not be optimized.', 'autoptimize'); ?></label>
                 </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]'>
@@ -1156,12 +1156,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";
                         ?>
@@ -1170,37 +1170,37 @@ 
                     <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_ngimg' <?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 or AVIF in supported browsers?', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_ngimg' <?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 or AVIF in supported browsers?', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' id='autoptimize_imgopt_ngimg_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 or AVIF image formats to any browser that supports it (requires lazy load to be active).', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' id='autoptimize_imgopt_ngimg_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 or AVIF image formats 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="autoptimize_lazyload_child hidden"'; } else { echo 'class="autoptimize_lazyload_child"'; } ?>>
-                <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="autoptimize_lazyload_child hidden"'; } else { echo 'class="autoptimize_lazyload_child"'; } ?>>
+                <th scope="row"><?php _e('Lazy-load exclusions', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' id='autoptimize_imgopt_lazyload_exclusions_text' 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_text' 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>
-            <tr id='autoptimize_imgopt_lazyload_from_nth_image' <?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="autoptimize_lazyload_child hidden"'; } else { echo 'class="autoptimize_lazyload_child"'; } ?>>
-                <th scope="row"><?php _e( 'Lazy-load from nth image', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_lazyload_from_nth_image' <?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="autoptimize_lazyload_child hidden"'; } else { echo 'class="autoptimize_lazyload_child"'; } ?>>
+                <th scope="row"><?php _e('Lazy-load from nth image', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='number' min='0' max='50' style='width:80%' id='autoptimize_imgopt_lazyload_from_nth_image_number' name='autoptimize_imgopt_settings[autoptimize_imgopt_number_field_7]' value='<?php if ( ! empty( $options['autoptimize_imgopt_number_field_7'] ) ) { echo esc_attr( $options['autoptimize_imgopt_number_field_7'] ); } else { echo '0'; } ?>'><br /><?php _e( 'Don\'t lazyload the first X images, \'0\' lazyloads all.', 'autoptimize' ); ?></label>
+                    <label><input type='number' min='0' max='50' style='width:80%' id='autoptimize_imgopt_lazyload_from_nth_image_number' name='autoptimize_imgopt_settings[autoptimize_imgopt_number_field_7]' value='<?php if (!empty($options['autoptimize_imgopt_number_field_7'])) { echo esc_attr($options['autoptimize_imgopt_number_field_7']); } else { echo '0'; } ?>'><br /><?php _e('Don\'t lazyload the first X images, \'0\' lazyloads all.', '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() {
@@ -1238,50 +1238,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/SPZURYE109483/' . $_site_host;
+            $_imgopt_upsell  = 'https://shortpixel.com/aospai/af/SPZURYE109483/'.$_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 have enough CDN quota remaining, 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 have enough CDN quota remaining, 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/SPZURYE109483';
                     // 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( __( 'you can click %1$shere to refresh your quota status%2$s', 'autoptimize' ), '<a href="' . $_imgopt_stats_refresh_url . '">', '</a>).' );
+                    $_imgopt_notice .= sprintf(__('you can click %1$shere to refresh your quota status%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'],
@@ -1301,18 +1301,18 @@ 
     /**
      * Get img provider stats (used to display notice).
      */
-    public function query_img_provider_stats( $_refresh = false ) {
-        if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_1'] ) ) {
+    public function query_img_provider_stats($_refresh = false) {
+        if (!empty($this->options['autoptimize_imgopt_checkbox_field_1'])) {
             $url      = '';
             $stat_dom = 'https://no-cdn.shortpixel.ai/';
-            $endpoint = $stat_dom . 'read-domain/';
+            $endpoint = $stat_dom.'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 ( true === $_refresh ) {
-                    $url = $url . '/refresh';
+            if ($domain && !empty($domain)) {
+                $url = $endpoint.$domain;
+                if (true === $_refresh) {
+                    $url = $url.'/refresh';
                 }
             }
 
@@ -1323,12 +1323,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);
                     }
                 }
             }
@@ -1351,15 +1351,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');
                 }
             }
         }
@@ -1376,16 +1376,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/autoptimizeCriticalCSSEnqueue.php

Spacing +74 added lines, -74 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'] || false === apply_filters( 'autoptimize_filter_ccss_enqueue_should_enqueue', true ) ) {
+        if (is_user_logged_in() || is_feed() || is_404() || (defined('DOING_AJAX') && DOING_AJAX) || $self->ao_ccss_ua() || 'nokey' == $key['status'] || 'invalid' == $key['status'] || false === apply_filters('autoptimize_filter_ccss_enqueue_should_enqueue', true)) {
             $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;
@@ -42,17 +42,17 @@ 
 
             // Get request path and page type, and initialize the queue update flag.
             $req_orig        = $_SERVER['REQUEST_URI'];
-            $req_path        = strtok( $req_orig, '?' );
+            $req_path        = strtok($req_orig, '?');
 
             // Check if we have a lang param. we need to keep as WPML can switch languages based on that
             // and that includes RTL -> LTR so diff. structure, so rules would be RTL vs LTR
             // but this needs changes in the structur of the rule object so off by default for now
             // as now this will simply result in conditional rules being overwritten.
-            if ( apply_filters( 'autoptimize_filter_ccss_coreenqueue_honor_lang', false ) && strpos( $req_orig, 'lang=' ) !== false ) {
-                $req_params = strtok( '?' );
-                parse_str( $req_params, $req_params_arr );
-                if ( array_key_exists( 'lang', $req_params_arr ) && !empty( $req_params_arr['lang'] ) ) {
-                    $req_path .= '?lang=' . $req_params_arr['lang'];
+            if (apply_filters('autoptimize_filter_ccss_coreenqueue_honor_lang', false) && strpos($req_orig, 'lang=') !== false) {
+                $req_params = strtok('?');
+                parse_str($req_params, $req_params_arr);
+                if (array_key_exists('lang', $req_params_arr) && !empty($req_params_arr['lang'])) {
+                    $req_path .= '?lang='.$req_params_arr['lang'];
                 }
             }
 
@@ -63,21 +63,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;
@@ -85,19 +85,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;
@@ -105,11 +105,11 @@ 
                 }
             }
 
-            if ( $job_qualify && ( ( false == $rule_properties['hash'] && false != $rule_properties['file'] ) || strpos( $req_type, 'template_' ) !== false ) ) {
+            if ($job_qualify && ((false == $rule_properties['hash'] && false != $rule_properties['file']) || strpos($req_type, 'template_') !== false)) {
                 // If job qualifies but rule hash is false and file isn't false (MANUAL rule) or if template, 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;
@@ -117,28 +117,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,
@@ -154,30 +154,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.
@@ -185,14 +185,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;
                 }
             }
@@ -209,33 +209,33 @@ 
         $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 ( is_front_page() ) {
+            } elseif (is_front_page()) {
                 // identify frontpage immediately to avoid it also matching a CPT or template.
                 $page_type = 'is_front_page';
                 break;
-            } elseif ( strpos( $type, 'custom_post_' ) !== false && ( ! $ao_ccss_forcepath || ! is_page() ) ) {
+            } elseif (strpos($type, 'custom_post_') !== false && (!$ao_ccss_forcepath || !is_page())) {
                 // Match custom post types and not page or page not forced to path-based.
-                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 && ( ! $ao_ccss_forcepath || ! is_page() ) ) {
+            } elseif (strpos($type, 'template_') !== false && (!$ao_ccss_forcepath || !is_page())) {
                 // Match templates if not page or if page is not forced to path-based.
-                if ( is_page_template( substr( $type, 9 ) ) ) {
+                if (is_page_template(substr($type, 9))) {
                     $page_type = $type;
                     break;
                 }
             } 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 for one page, not for the "paged pages" (/page/2 ..).
-                    if ( ! is_page() || ! is_paged() ) {
+                    if (!is_page() || !is_paged()) {
                         $page_type = $type;
                         break;
                     }
@@ -247,44 +247,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;
     }
@@ -292,17 +292,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/autoptimizeMain.php

Spacing +182 added lines, -182 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,101 +50,101 @@ 
 
     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('init', array($this, 'load_textdomain'));
 
-        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');
     }
 
     /**
@@ -154,61 +154,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();
         }
     }
@@ -216,22 +216,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.
@@ -246,9 +246,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');
             }
         }
     }
@@ -260,38 +260,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'));
         }
     }
 
@@ -302,31 +302,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;
                     }
@@ -334,15 +334,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;
                     }
@@ -350,10 +350,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;
                     }
@@ -362,16 +362,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();
             }
 
@@ -382,7 +382,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;
@@ -395,25 +395,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;
         }
 
@@ -428,7 +428,7 @@ 
      *
      * @return bool
      */
-    public static function is_amp_markup( $content )
+    public static function is_amp_markup($content)
     {
         // Short-circuit if the page is already AMP from the start.
         if (
@@ -446,9 +446,9 @@ 
         }
 
         // Or else short-circuit if the AMP plugin will be processing the output to be an AMP page.
-        if ( function_exists( 'amp_is_request' ) ) {
+        if (function_exists('amp_is_request')) {
             return amp_is_request(); // For AMP plugin v2.0+.
-        } elseif ( function_exists( 'is_amp_endpoint' ) ) {
+        } elseif (function_exists('is_amp_endpoint')) {
             return is_amp_endpoint(); // For older/other AMP plugins (still supported in 2.0 as an alias).
         }
 
@@ -463,10 +463,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;
         }
 
@@ -474,74 +474,74 @@ 
 
         // 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' ),
-                'defer_not_aggregate' => $conf->get( 'autoptimize_js_defer_not_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'),
+                'defer_not_aggregate' => $conf->get('autoptimize_js_defer_not_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;
     }
@@ -605,45 +605,45 @@ 
             'autoptimize_ccss_unloadccss',
         );
 
-        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();
         }
@@ -652,9 +652,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);
             }
         }
     }
@@ -663,36 +663,36 @@ 
     {
         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 AVIF) 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 AVIF) 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();
-        $_is_ao_settings_page        = ( str_replace( array( 'autoptimize', 'autoptimize_imgopt', 'ao_critcss', 'autoptimize_extra', 'ao_partners' ), '', $_SERVER['REQUEST_URI'] ) !== $_SERVER['REQUEST_URI'] ? true : false );
+        $_is_ao_settings_page        = (str_replace(array('autoptimize', 'autoptimize_imgopt', 'ao_critcss', 'autoptimize_extra', 'ao_partners'), '', $_SERVER['REQUEST_URI']) !== $_SERVER['REQUEST_URI'] ? true : false);
 
-        if ( current_user_can( 'manage_options' ) && $_is_ao_settings_page && '' !== $_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') && $_is_ao_settings_page && '' !== $_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/critcss-inc/admin_settings_rules.php

Spacing +70 added lines, -70 removed lines

@@ -13,12 +13,12 @@ 
 ?>
     <ul id="rules-panel">
         <li class="itemDetail">
-            <h2 class="itemTitle"><?php _e( 'Rules', 'autoptimize' ); ?></h2>
+            <h2 class="itemTitle"><?php _e('Rules', 'autoptimize'); ?></h2>
 
             <!-- BEGIN Rule dialogs -->
             <!-- Unsaved dialog -->
             <div id="unSavedWarning" class="hidden updated settings-error notice notice-warning is-dismissible">
-                <p><?php _e( "<strong>Rules or Queue changed!</strong> Don't forget to save your changes!", 'autoptimize' ); ?></p>
+                <p><?php _e("<strong>Rules or Queue changed!</strong> Don't forget to save your changes!", 'autoptimize'); ?></p>
             </div>
 
             <!-- Create/edit rule dialog -->
@@ -26,97 +26,97 @@ 
                 <table class="form-table rules">
                     <tr id="critcss_addedit_type_wrapper">
                         <th scope="row">
-                            <?php _e( 'Rule Type', 'autoptimize' ); ?>
+                            <?php _e('Rule Type', 'autoptimize'); ?>
                         </th>
                         <td>
                             <select id="critcss_addedit_type" style="width:100%;">
-                                <option value="paths"><?php _e( 'Path', 'autoptimize' ); ?></option>
-                                <option value="types"><?php _e( 'Conditional Tag', 'autoptimize' ); ?></option>
+                                <option value="paths"><?php _e('Path', 'autoptimize'); ?></option>
+                                <option value="types"><?php _e('Conditional Tag', 'autoptimize'); ?></option>
                             </select>
                         </td>
                     </tr>
                     <tr id="critcss_addedit_path_wrapper">
                         <th scope="row">
-                            <?php _e( 'String in Path', 'autoptimize' ); ?>
+                            <?php _e('String in Path', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="text" id="critcss_addedit_path" placeholder="<?php _e( "Enter a part of the URL that identifies the page(s) you're targetting.", 'autoptimize' ); ?>" style="width:100%;" value="">
+                            <input type="text" id="critcss_addedit_path" placeholder="<?php _e("Enter a part of the URL that identifies the page(s) you're targetting.", 'autoptimize'); ?>" style="width:100%;" value="">
                         </td>
                     </tr>
                     <tr id="critcss_addedit_pagetype_wrapper">
                         <th scope="row">
-                            <?php _e( 'Conditional Tag, Custom Post Type or Page Template', 'autoptimize' ); ?>
+                            <?php _e('Conditional Tag, Custom Post Type or Page Template', 'autoptimize'); ?>
                         </th>
                         <td>
                             <select id="critcss_addedit_pagetype" style="width:100%;">
-                                <option value="" disabled selected><?php _e( 'Select from the list below...', 'autoptimize' ); ?></option>
-                                <optgroup label="<?php _e( 'Standard Conditional Tags', 'autoptimize' ); ?>">
+                                <option value="" disabled selected><?php _e('Select from the list below...', 'autoptimize'); ?></option>
+                                <optgroup label="<?php _e('Standard Conditional Tags', 'autoptimize'); ?>">
                                     <?php
                                     // Render grouped simple conditional tags.
-                                    foreach ( $ao_ccss_types as $ctag ) {
-                                        $optgrp = substr( $ctag, 0, 3 );
-                                        if ( substr( $ctag, 0, 3 ) === 'is_' ) {
-                                            echo '<option value="' . $ctag . '">' . $ctag . '</option>';
+                                    foreach ($ao_ccss_types as $ctag) {
+                                        $optgrp = substr($ctag, 0, 3);
+                                        if (substr($ctag, 0, 3) === 'is_') {
+                                            echo '<option value="'.$ctag.'">'.$ctag.'</option>';
                                         }
-                                        $prevgrp = substr( $ctag, 0, 3 );
+                                        $prevgrp = substr($ctag, 0, 3);
                                     }
 
                                     // Render grouped custom post types, templates and specific conditional tags.
-                                    foreach ( $ao_ccss_types as $type ) {
-                                        $optgrp = substr( $type, 0, 3 );
+                                    foreach ($ao_ccss_types as $type) {
+                                        $optgrp = substr($type, 0, 3);
 
                                         // Option groups labels.
-                                        if ( $optgrp !== $prevgrp && 'is_' !== $optgrp ) {
+                                        if ($optgrp !== $prevgrp && 'is_' !== $optgrp) {
                                             ?>
                                             </optgroup>
                                             <?php
-                                            if ( substr( $type, 0, 12 ) === 'custom_post_' ) {
+                                            if (substr($type, 0, 12) === 'custom_post_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'Custom Post Types', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('Custom Post Types', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 9 ) === 'template_' ) {
+                                            } elseif (substr($type, 0, 9) === 'template_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'Page Templates', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('Page Templates', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 4 ) === 'bbp_' ) {
+                                            } elseif (substr($type, 0, 4) === 'bbp_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'BBPress Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('BBPress Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 3 ) === 'bp_' ) {
+                                            } elseif (substr($type, 0, 3) === 'bp_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'BuddyPress Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('BuddyPress Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 4 ) === 'edd_' ) {
+                                            } elseif (substr($type, 0, 4) === 'edd_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'Easy Digital Downloads Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('Easy Digital Downloads Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
-                                            } elseif ( substr( $type, 0, 4 ) === 'woo_' ) {
+                                            } elseif (substr($type, 0, 4) === 'woo_') {
                                                 ?>
-                                                <optgroup label="<?php _e( 'WooCommerce Conditional Tags', 'autoptimize' ); ?>">
+                                                <optgroup label="<?php _e('WooCommerce Conditional Tags', 'autoptimize'); ?>">
                                                 <?php
                                             }
                                         }
 
                                         // Options.
-                                        if ( 'is_' !== $optgrp ) {
+                                        if ('is_' !== $optgrp) {
                                             // Remove prefix from custom post types, templates and some specific conditional tags.
-                                            if ( substr( $type, 0, 12 ) === 'custom_post_' ) {
-                                                $_type = str_replace( 'custom_post_', '', $type );
-                                            } elseif ( substr( $type, 0, 9 ) === 'template_' ) {
-                                                $_type = str_replace( 'template_', '', $type );
-                                            } elseif ( 'bbp_is_bbpress' == $type ) {
-                                                $_type = str_replace( 'bbp_', '', $type );
-                                            } elseif ( 'bp_is_buddypress' == $type ) {
-                                                $_type = str_replace( 'bp_', '', $type );
-                                            } elseif ( substr( $type, 0, 4 ) === 'woo_' ) {
-                                                $_type = str_replace( 'woo_', '', $type );
-                                            } elseif ( substr( $type, 0, 4 ) === 'edd_' ) {
-                                                $_type = str_replace( 'edd_', '', $type );
+                                            if (substr($type, 0, 12) === 'custom_post_') {
+                                                $_type = str_replace('custom_post_', '', $type);
+                                            } elseif (substr($type, 0, 9) === 'template_') {
+                                                $_type = str_replace('template_', '', $type);
+                                            } elseif ('bbp_is_bbpress' == $type) {
+                                                $_type = str_replace('bbp_', '', $type);
+                                            } elseif ('bp_is_buddypress' == $type) {
+                                                $_type = str_replace('bp_', '', $type);
+                                            } elseif (substr($type, 0, 4) === 'woo_') {
+                                                $_type = str_replace('woo_', '', $type);
+                                            } elseif (substr($type, 0, 4) === 'edd_') {
+                                                $_type = str_replace('edd_', '', $type);
                                             } else {
                                                 $_type = $type;
                                             }
 
-                                            echo '<option value="' . $type . '">' . $_type . '</option>';
+                                            echo '<option value="'.$type.'">'.$_type.'</option>';
                                             $prevgrp = $optgrp;
                                         }
                                     }
@@ -127,10 +127,10 @@ 
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Custom Critical CSS', 'autoptimize' ); ?>
+                            <?php _e('Custom Critical CSS', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <textarea id="critcss_addedit_css" rows="13" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste your specific critical CSS here and hit submit to save.', 'autoptimize' ); ?>"></textarea>
+                            <textarea id="critcss_addedit_css" rows="13" cols="10" style="width:100%;" placeholder="<?php _e('Paste your specific critical CSS here and hit submit to save.', 'autoptimize'); ?>"></textarea>
                             <input type="hidden" id="critcss_addedit_file">
                             <input type="hidden" id="critcss_addedit_id">
                         </td>
@@ -139,23 +139,23 @@ 
             </div>
 
             <!-- Remove dialog -->
-            <div id="confirm-rm" title="<?php _e( 'Delete Rule', 'autoptimize' ); ?>" class="hidden">
-                <p><?php _e( 'This Critical CSS rule will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize' ); ?></p>
+            <div id="confirm-rm" title="<?php _e('Delete Rule', 'autoptimize'); ?>" class="hidden">
+                <p><?php _e('This Critical CSS rule will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize'); ?></p>
             </div>
 
             <!-- Remove All dialog -->
-            <div id="confirm-rm-all" title="<?php _e( 'Delete all Rules and Jobs', 'autoptimize' ); ?>" class="hidden">
-                <p><?php _e( 'All Critical CSS rules will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize' ); ?></p>
+            <div id="confirm-rm-all" title="<?php _e('Delete all Rules and Jobs', 'autoptimize'); ?>" class="hidden">
+                <p><?php _e('All Critical CSS rules will be deleted immediately and cannot be recovered.<br /><br /><strong>Are you sure?</strong>', 'autoptimize'); ?></p>
             </div>
 
             <!-- Add/edit default critical CSS dialog -->
             <div id="default_critcss_wrapper" class="hidden">
-                <textarea id="dummyDefault" rows="19" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste your MINIFIED default critical CSS here and hit submit to save. This is the critical CSS to be used for every page NOT MATCHING any rule.', 'autoptimize' ); ?>"></textarea>
+                <textarea id="dummyDefault" rows="19" cols="10" style="width:100%;" placeholder="<?php _e('Paste your MINIFIED default critical CSS here and hit submit to save. This is the critical CSS to be used for every page NOT MATCHING any rule.', 'autoptimize'); ?>"></textarea>
             </div>
 
             <!-- Add/edit additional critical CSS dialog -->
             <div id="additional_critcss_wrapper" class="hidden">
-                <textarea id="dummyAdditional" rows="19" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste your MINIFIED additional critical CSS here and hit submit to save. This is the CSS to be added AT THE END of every critical CSS provided by a matching rule, or the default one.', 'autoptimize' ); ?>"></textarea>
+                <textarea id="dummyAdditional" rows="19" cols="10" style="width:100%;" placeholder="<?php _e('Paste your MINIFIED additional critical CSS here and hit submit to save. This is the CSS to be added AT THE END of every critical CSS provided by a matching rule, or the default one.', 'autoptimize'); ?>"></textarea>
             </div>
 
             <!-- Wrapper for in screen notices -->
@@ -165,38 +165,38 @@ 
             <!-- BEGIN Rules UI -->
             <div class="howto">
                 <div class="title-wrap">
-                    <h4 class="title"><?php _e( 'How To Use Autoptimize CriticalCSS Power-Up Rules', 'autoptimize' ); ?></h4>
-                    <p class="subtitle"><?php _e( 'Click the side arrow to toggle instructions', 'autoptimize' ); ?></p>
+                    <h4 class="title"><?php _e('How To Use Autoptimize CriticalCSS Power-Up Rules', 'autoptimize'); ?></h4>
+                    <p class="subtitle"><?php _e('Click the side arrow to toggle instructions', 'autoptimize'); ?></p>
                 </div>
                 <button type="button" class="toggle-btn">
                     <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
                 </button>
                 <div class="howto-wrap hidden">
-                <p><?php _e( "TL;DR:<br />Critical CSS files from <span class='badge auto'>AUTO</span> <strong>rules are updated automatically</strong> while from <span class='badge manual'>MANUAL</span> <strong>rules are not.</strong>", 'autoptimize' ); ?></p>
+                <p><?php _e("TL;DR:<br />Critical CSS files from <span class='badge auto'>AUTO</span> <strong>rules are updated automatically</strong> while from <span class='badge manual'>MANUAL</span> <strong>rules are not.</strong>", 'autoptimize'); ?></p>
                     <ol>
-                        <li><?php _e( 'When a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key is in place, Autoptimize CriticalCSS Power-Up starts to operate <strong>automatically</strong>.', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'Upon a request to any of the frontend pages made by a <strong>not logged in user</strong>, it will <strong>asynchronously</strong> fetch and update the critical CSS from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for conditional tags you have on your site (e.g. is_page, is_single, is_archive etc.)', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'These requests also creates an <span class="badge auto">AUTO</span> rule for you. The critical CSS files from <span class="badge auto">AUTO</span> <strong>rules are updated automatically</strong> when a CSS file in your theme or frontend plugins changes.', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'If you want to make any fine tunning in the critical CSS file of an <span class="badge auto">AUTO</span> rule, click on "Edit" button of that rule, change what you need, submit and save it. The rule you\'ve just edited becomes a <span class="badge manual">MANUAL</span> rule then.', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'You can create <span class="badge manual">MANUAL</span> rules for specific page paths (URL). Longer, more specific paths have higher priority over shorter ones, which in turn have higher priority over <span class="badge auto">AUTO</span> rules. Also, critical CSS files from <span class="badge manual">MANUAL</span> <strong>rules are NEVER updated automatically.</strong>', 'autoptimize' ); ?></li>
-                        <li><?php _e( 'You can also create an <span class="badge auto">AUTO</span> rule for a path by leaving its critical CSS content empty. The critical CSS for that path will be automatically fetched from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for you and updated whenever it changes.', 'autoptimize' ); ?></li>
-                        <li><?php _e( "If you see an <span class='badge auto'>AUTO</span> rule with a <span class='badge review'>R</span> besides it (R is after REVIEW), it means that the fetched critical CSS for that rule is not 100% guaranteed to work according to <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> analysis. It's advised that you edit and review that rule to make any required adjustments.", 'autoptimize' ); ?></li>
-                        <li><?php _e( 'At any time you can delete an <span class="badge auto">AUTO</span> or <span class="badge manual">MANUAL</span> rule by cliking on "Remove" button of the desired rule and saving your changes.', 'autoptimize' ); ?></li>
+                        <li><?php _e('When a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key is in place, Autoptimize CriticalCSS Power-Up starts to operate <strong>automatically</strong>.', 'autoptimize'); ?></li>
+                        <li><?php _e('Upon a request to any of the frontend pages made by a <strong>not logged in user</strong>, it will <strong>asynchronously</strong> fetch and update the critical CSS from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for conditional tags you have on your site (e.g. is_page, is_single, is_archive etc.)', 'autoptimize'); ?></li>
+                        <li><?php _e('These requests also creates an <span class="badge auto">AUTO</span> rule for you. The critical CSS files from <span class="badge auto">AUTO</span> <strong>rules are updated automatically</strong> when a CSS file in your theme or frontend plugins changes.', 'autoptimize'); ?></li>
+                        <li><?php _e('If you want to make any fine tunning in the critical CSS file of an <span class="badge auto">AUTO</span> rule, click on "Edit" button of that rule, change what you need, submit and save it. The rule you\'ve just edited becomes a <span class="badge manual">MANUAL</span> rule then.', 'autoptimize'); ?></li>
+                        <li><?php _e('You can create <span class="badge manual">MANUAL</span> rules for specific page paths (URL). Longer, more specific paths have higher priority over shorter ones, which in turn have higher priority over <span class="badge auto">AUTO</span> rules. Also, critical CSS files from <span class="badge manual">MANUAL</span> <strong>rules are NEVER updated automatically.</strong>', 'autoptimize'); ?></li>
+                        <li><?php _e('You can also create an <span class="badge auto">AUTO</span> rule for a path by leaving its critical CSS content empty. The critical CSS for that path will be automatically fetched from <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for you and updated whenever it changes.', 'autoptimize'); ?></li>
+                        <li><?php _e("If you see an <span class='badge auto'>AUTO</span> rule with a <span class='badge review'>R</span> besides it (R is after REVIEW), it means that the fetched critical CSS for that rule is not 100% guaranteed to work according to <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> analysis. It's advised that you edit and review that rule to make any required adjustments.", 'autoptimize'); ?></li>
+                        <li><?php _e('At any time you can delete an <span class="badge auto">AUTO</span> or <span class="badge manual">MANUAL</span> rule by cliking on "Remove" button of the desired rule and saving your changes.', 'autoptimize'); ?></li>
                     </ol>
                 </div>
             </div>
-            <textarea id="autoptimize_css_defer_inline" name="autoptimize_css_defer_inline" rows="19" cols="10" style="width:100%;"><?php echo get_option( 'autoptimize_css_defer_inline', '' ); ?></textarea>
-            <textarea id="autoptimize_ccss_additional" name="autoptimize_ccss_additional" rows="19" cols="10" style="width:100%;"><?php echo get_option( 'autoptimize_ccss_additional', '' ); ?></textarea>
+            <textarea id="autoptimize_css_defer_inline" name="autoptimize_css_defer_inline" rows="19" cols="10" style="width:100%;"><?php echo get_option('autoptimize_css_defer_inline', ''); ?></textarea>
+            <textarea id="autoptimize_ccss_additional" name="autoptimize_ccss_additional" rows="19" cols="10" style="width:100%;"><?php echo get_option('autoptimize_ccss_additional', ''); ?></textarea>
             <table class="rules-list" cellspacing="0"><tbody id="rules-list"></tbody></table>
-            <input class="hidden" type="text" id="critCssOrigin" name="autoptimize_ccss_rules" value='<?php echo ( json_encode( $ao_ccss_rules, JSON_FORCE_OBJECT ) ); ?>'>
+            <input class="hidden" type="text" id="critCssOrigin" name="autoptimize_ccss_rules" value='<?php echo (json_encode($ao_ccss_rules, JSON_FORCE_OBJECT)); ?>'>
             <div class="submit rules-btn">
                 <div class="alignleft">
-                    <span id="addCritCssButton" class="button-secondary"><?php _e( 'Add New Rule', 'autoptimize' ); ?></span>
-                    <span id="editDefaultButton" class="button-secondary"><?php _e( 'Edit Default Rule CSS', 'autoptimize' ); ?></span>
-                    <span id="editAdditionalButton" class="button-secondary"><?php _e( 'Add CSS To All Rules', 'autoptimize' ); ?></span>
+                    <span id="addCritCssButton" class="button-secondary"><?php _e('Add New Rule', 'autoptimize'); ?></span>
+                    <span id="editDefaultButton" class="button-secondary"><?php _e('Edit Default Rule CSS', 'autoptimize'); ?></span>
+                    <span id="editAdditionalButton" class="button-secondary"><?php _e('Add CSS To All Rules', 'autoptimize'); ?></span>
                 </div>
                 <div class="alignright">
-                    <span id="removeAllRules" class="button-secondary" style="color:red;"><?php _e( 'Remove all rules', 'autoptimize' ); ?></span>
+                    <span id="removeAllRules" class="button-secondary" style="color:red;"><?php _e('Remove all rules', 'autoptimize'); ?></span>
                 </div>
             </div>
             <!-- END Rules UI -->

classes/critcss-inc/admin_settings_adv.php

Spacing +33 added lines, -33 removed lines

@@ -19,7 +19,7 @@ 
     global $ao_ccss_unloadccss;
 
     // In case domain is not set yet (done in cron.php).
-    if ( empty( $ao_ccss_domain ) ) {
+    if (empty($ao_ccss_domain)) {
         $ao_ccss_domain = get_site_url();
     }
 
@@ -28,7 +28,7 @@ 
 ?>
     <ul id="adv-panel">
         <li class="itemDetail">
-            <h2 class="itemTitle fleft"><?php _e( 'Advanced Settings', 'autoptimize' ); ?></h2>
+            <h2 class="itemTitle fleft"><?php _e('Advanced Settings', 'autoptimize'); ?></h2>
             <button type="button" class="toggle-btn">
                 <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
             </button>
@@ -36,114 +36,114 @@ 
                 <table id="key" class="form-table">
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Viewport Size', 'autoptimize' ); ?>
+                            <?php _e('Viewport Size', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <label for="autoptimize_ccss_vw"><?php _e( 'Width', 'autoptimize' ); ?>:</label> <input type="number" id="autoptimize_ccss_vw" name="autoptimize_ccss_viewport[w]" min="800" max="4096" placeholder="1400" value="<?php echo $viewport['w']; ?>" />&nbsp;&nbsp;
-                            <label for="autoptimize_ccss_vh"><?php _e( 'Height', 'autoptimize' ); ?>:</label> <input type="number" id="autoptimize_ccss_vh" name="autoptimize_ccss_viewport[h]" min="600" max="2160" placeholder="1080" value="<?php echo $viewport['h']; ?>" />
+                            <label for="autoptimize_ccss_vw"><?php _e('Width', 'autoptimize'); ?>:</label> <input type="number" id="autoptimize_ccss_vw" name="autoptimize_ccss_viewport[w]" min="800" max="4096" placeholder="1400" value="<?php echo $viewport['w']; ?>" />&nbsp;&nbsp;
+                            <label for="autoptimize_ccss_vh"><?php _e('Height', 'autoptimize'); ?>:</label> <input type="number" id="autoptimize_ccss_vh" name="autoptimize_ccss_viewport[h]" min="600" max="2160" placeholder="1080" value="<?php echo $viewport['h']; ?>" />
                             <p class="notes">
-                                <?php _e( '<a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> default viewport size is 1400x1080 pixels (width x height). You can change this size by typing a desired width and height values above. Allowed value ranges are from 800 to 4096 for width and from 600 to 2160 for height.', 'autoptimize' ); ?>
+                                <?php _e('<a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> default viewport size is 1400x1080 pixels (width x height). You can change this size by typing a desired width and height values above. Allowed value ranges are from 800 to 4096 for width and from 600 to 2160 for height.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Force Include CSS selectors', 'autoptimize' ); ?>
+                            <?php _e('Force Include CSS selectors', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <textarea id="autoptimize_ccss_finclude" name="autoptimize_ccss_finclude" rows='3' maxlenght='500' style="width:100%;" placeholder="<?php _e( '.button-special,//#footer', 'autoptimize' ); ?>"><?php echo trim( $ao_ccss_finclude ); ?></textarea>
+                            <textarea id="autoptimize_ccss_finclude" name="autoptimize_ccss_finclude" rows='3' maxlenght='500' style="width:100%;" placeholder="<?php _e('.button-special,//#footer', 'autoptimize'); ?>"><?php echo trim($ao_ccss_finclude); ?></textarea>
                             <p class="notes">
-                                <?php _e( 'Force include CSS selectors can be used to style dynamic content that is not part of the HTML that is seen during the Critical CSS generation. To use this feature, add comma separated values with both simple strings and/or regular expressions to match the desired selectors. Regular expressions must be preceeded by two forward slashes. For instance: <code>.button-special,//#footer</code>. In this example <code>.button-special</code> will match <code>.button-special</code> selector only, while <code>//#footer</code> will match <code>#footer</code>, <code>#footer-address</code> and <code>#footer-phone</code> selectors in case they exist.<br />Do take into account that changing this setting will only affect new/ updated rules, so you might want to remove old rules and clear your page cache to expedite the forceIncludes becoming used.', 'autoptimize' ); ?>
+                                <?php _e('Force include CSS selectors can be used to style dynamic content that is not part of the HTML that is seen during the Critical CSS generation. To use this feature, add comma separated values with both simple strings and/or regular expressions to match the desired selectors. Regular expressions must be preceeded by two forward slashes. For instance: <code>.button-special,//#footer</code>. In this example <code>.button-special</code> will match <code>.button-special</code> selector only, while <code>//#footer</code> will match <code>#footer</code>, <code>#footer-address</code> and <code>#footer-phone</code> selectors in case they exist.<br />Do take into account that changing this setting will only affect new/ updated rules, so you might want to remove old rules and clear your page cache to expedite the forceIncludes becoming used.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Queue processing time limit', 'autoptimize' ); ?>
+                            <?php _e('Queue processing time limit', 'autoptimize'); ?>
                         </th>
                         <td>
                             <input type="number" id="autoptimize_ccss_rtimelimit" name="autoptimize_ccss_rtimelimit" min="0" max="240" placeholder="0" value="<?php echo $ao_ccss_rtimelimit; ?>" />
                             <p class="notes">
-                                <?php _e( 'The cronned queue processing is an asynchronous process triggerd by (WordPress) cron. To avoid this process from running too long and potentially getting killed, you can set the number of seconds here, 0 means no limit.', 'autoptimize' ); ?>
+                                <?php _e('The cronned queue processing is an asynchronous process triggerd by (WordPress) cron. To avoid this process from running too long and potentially getting killed, you can set the number of seconds here, 0 means no limit.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Fetch Original CSS', 'autoptimize' ); ?>
+                            <?php _e('Fetch Original CSS', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_noptimize" name="autoptimize_ccss_noptimize" value="1" <?php checked( 1 == $ao_ccss_noptimize ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_noptimize" name="autoptimize_ccss_noptimize" value="1" <?php checked(1 == $ao_ccss_noptimize); ?>>
                             <p class="notes">
-                                <?php _e( 'In some (rare) cases the generation of critical CSS works better with the original CSS instead of the Autoptimized one, this option enables that behavior.', 'autoptimize' ); ?>
+                                <?php _e('In some (rare) cases the generation of critical CSS works better with the original CSS instead of the Autoptimized one, this option enables that behavior.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Add CCSS for logged in users?', 'autoptimize' ); ?>
+                            <?php _e('Add CCSS for logged in users?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_loggedin" name="autoptimize_ccss_loggedin" value="1" <?php checked( 1 == $ao_ccss_loggedin ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_loggedin" name="autoptimize_ccss_loggedin" value="1" <?php checked(1 == $ao_ccss_loggedin); ?>>
                             <p class="notes">
-                                <?php _e( 'Critical CSS is generated by criticalcss.com from your pages as seen by an "anonymous visitor". Disable this option if you don\'t want the "visitor" critical CSS to be used for logged in users.', 'autoptimize' ); ?>
+                                <?php _e('Critical CSS is generated by criticalcss.com from your pages as seen by an "anonymous visitor". Disable this option if you don\'t want the "visitor" critical CSS to be used for logged in users.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Force path-based rules to be generated for pages?', 'autoptimize' ); ?>
+                            <?php _e('Force path-based rules to be generated for pages?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_forcepath" name="autoptimize_ccss_forcepath" value="1" <?php checked( 1 == $ao_ccss_forcepath ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_forcepath" name="autoptimize_ccss_forcepath" value="1" <?php checked(1 == $ao_ccss_forcepath); ?>>
                             <p class="notes">
-                                <?php _e( 'By default for each page a separate rule is generated. If your pages have (semi-)identical above the fold look and feel and you want to keep the rules lean, you can disable that so one rule is created to all pages.', 'autoptimize' ); ?>
+                                <?php _e('By default for each page a separate rule is generated. If your pages have (semi-)identical above the fold look and feel and you want to keep the rules lean, you can disable that so one rule is created to all pages.', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Defer jQuery and other non-aggregated JS-files?', 'autoptimize' ); ?>
+                            <?php _e('Defer jQuery and other non-aggregated JS-files?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_deferjquery" name="autoptimize_ccss_deferjquery" value="1" <?php checked( 1 == $ao_ccss_deferjquery ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_deferjquery" name="autoptimize_ccss_deferjquery" value="1" <?php checked(1 == $ao_ccss_deferjquery); ?>>
                             <p class="notes">
-                                <?php _e( 'Defer all non-aggregated JS, including jQuery and inline JS to fix remaining render-blocking issues. Make sure to test your site thoroughly when activating this option!', 'autoptimize' ); ?>
+                                <?php _e('Defer all non-aggregated JS, including jQuery and inline JS to fix remaining render-blocking issues. Make sure to test your site thoroughly when activating this option!', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Unload critical CSS after page load?', 'autoptimize' ); ?>
+                            <?php _e('Unload critical CSS after page load?', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_unloadccss" name="autoptimize_ccss_unloadccss" value="1" <?php checked( 1 == $ao_ccss_unloadccss ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_unloadccss" name="autoptimize_ccss_unloadccss" value="1" <?php checked(1 == $ao_ccss_unloadccss); ?>>
                             <p class="notes">
-                                <?php _e( 'In rare cases the critical CSS needs to be removed once the full CSS loads, this option makes it so!', 'autoptimize' ); ?>
+                                <?php _e('In rare cases the critical CSS needs to be removed once the full CSS loads, this option makes it so!', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Bound domain', 'autoptimize' ); ?>
+                            <?php _e('Bound domain', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="text" id="autoptimize_ccss_domain" name="autoptimize_ccss_domain" style="width:100%;" placeholder="<?php _e( 'Don\'t leave this empty, put e.g. https://example.net/ or simply \'none\' to disable domain binding.', 'autoptimize' ); ?>" value="<?php echo trim( $ao_ccss_domain ); ?>">
+                            <input type="text" id="autoptimize_ccss_domain" name="autoptimize_ccss_domain" style="width:100%;" placeholder="<?php _e('Don\'t leave this empty, put e.g. https://example.net/ or simply \'none\' to disable domain binding.', 'autoptimize'); ?>" value="<?php echo trim($ao_ccss_domain); ?>">
                             <p class="notes">
-                                <?php _e( 'Only requests from this domain will be sent for Critical CSS generation (pricing is per domain/ month).', 'autoptimize' ); ?>
+                                <?php _e('Only requests from this domain will be sent for Critical CSS generation (pricing is per domain/ month).', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Debug Mode', 'autoptimize' ); ?>
+                            <?php _e('Debug Mode', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <input type="checkbox" id="autoptimize_ccss_debug" name="autoptimize_ccss_debug" value="1" <?php checked( 1 == $ao_ccss_debug ); ?>>
+                            <input type="checkbox" id="autoptimize_ccss_debug" name="autoptimize_ccss_debug" value="1" <?php checked(1 == $ao_ccss_debug); ?>>
                             <p class="notes">
                                 <?php
-                                _e( '<strong>CAUTION! Only use debug mode on production/live environments for ad-hoc troubleshooting and remember to turn it back off after</strong>, as this generates a lot of log-data.<br />Check the box above to enable Autoptimize CriticalCSS Power-Up debug mode. It provides debug facilities in this screen, to the browser console and to this file: ', 'autoptimize' );
-                                echo '<code>' . AO_CCSS_LOG . '</code>';
+                                _e('<strong>CAUTION! Only use debug mode on production/live environments for ad-hoc troubleshooting and remember to turn it back off after</strong>, as this generates a lot of log-data.<br />Check the box above to enable Autoptimize CriticalCSS Power-Up debug mode. It provides debug facilities in this screen, to the browser console and to this file: ', 'autoptimize');
+                                echo '<code>'.AO_CCSS_LOG.'</code>';
                                 ?>
                             </p>
                         </td>

classes/autoptimizeHTML.php

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
  * Handles minifying HTML markup.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -34,19 +34,19 @@ 
         '<!--/noindex-->',
     );
 
-    public function read( $options )
+    public function read($options)
     {
         // Remove the HTML comments?
         $this->keepcomments = (bool) $options['keepcomments'];
 
         // Filter to force xhtml.
-        $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false );
+        $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false);
 
         // Filterable strings to be excluded from HTML minification.
-        $exclude = apply_filters( 'autoptimize_filter_html_exclude', '' );
-        if ( '' !== $exclude ) {
-            $exclude_arr   = array_filter( array_map( 'trim', explode( ',', $exclude ) ) );
-            $this->exclude = array_merge( $exclude_arr, $this->exclude );
+        $exclude = apply_filters('autoptimize_filter_html_exclude', '');
+        if ('' !== $exclude) {
+            $exclude_arr   = array_filter(array_map('trim', explode(',', $exclude)));
+            $this->exclude = array_merge($exclude_arr, $this->exclude);
         }
 
         // Nothing else for HTML!
@@ -60,49 +60,49 @@ 
      */
     public function minify()
     {
-        $noptimize = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content );
-        if ( $noptimize ) {
+        $noptimize = apply_filters('autoptimize_filter_html_noptimize', false, $this->content);
+        if ($noptimize) {
             return false;
         }
 
         // Wrap the to-be-excluded strings in noptimize tags.
-        foreach ( $this->exclude as $str ) {
-            if ( false !== strpos( $this->content, $str ) ) {
-                $replacement   = '<!--noptimize-->' . $str . '<!--/noptimize-->';
-                $this->content = str_replace( $str, $replacement, $this->content );
+        foreach ($this->exclude as $str) {
+            if (false !== strpos($this->content, $str)) {
+                $replacement   = '<!--noptimize-->'.$str.'<!--/noptimize-->';
+                $this->content = str_replace($str, $replacement, $this->content);
             }
         }
 
         // Noptimize.
-        $this->content = $this->hide_noptimize( $this->content );
+        $this->content = $this->hide_noptimize($this->content);
 
         // Preparing options for Minify_HTML.
-        $options = array( 'keepComments' => $this->keepcomments );
-        if ( $this->forcexhtml ) {
+        $options = array('keepComments' => $this->keepcomments);
+        if ($this->forcexhtml) {
             $options['xhtml'] = true;
         }
 
-        $tmp_content = AO_Minify_HTML::minify( $this->content, $options );
-        if ( ! empty( $tmp_content ) ) {
+        $tmp_content = AO_Minify_HTML::minify($this->content, $options);
+        if (!empty($tmp_content)) {
             $this->content = $tmp_content;
-            unset( $tmp_content );
+            unset($tmp_content);
         }
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Remove the noptimize-wrapper from around the excluded strings.
-        foreach ( $this->exclude as $str ) {
-            $replacement = '<!--noptimize-->' . $str . '<!--/noptimize-->';
-            if ( false !== strpos( $this->content, $replacement ) ) {
-                $this->content = str_replace( $replacement, $str, $this->content );
+        foreach ($this->exclude as $str) {
+            $replacement = '<!--noptimize-->'.$str.'<!--/noptimize-->';
+            if (false !== strpos($this->content, $replacement)) {
+                $this->content = str_replace($replacement, $str, $this->content);
             }
         }
 
         // Revslider data attribs somehow suffer from HTML optimization, this fixes that!
-        if ( class_exists( 'RevSlider' ) && apply_filters( 'autoptimize_filter_html_dataattrib_cleanup', false ) ) {
-            $this->content = preg_replace( '#\n(data-.*$)\n#Um', ' $1 ', $this->content );
-            $this->content = preg_replace( '#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content );
+        if (class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false)) {
+            $this->content = preg_replace('#\n(data-.*$)\n#Um', ' $1 ', $this->content);
+            $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content);
         }
 
         return true;

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.
@@ -86,45 +86,45 @@ 
             global $ao_ccss_rtimelimit;
 
             // Initialize counters.
-            if ( $ao_ccss_rtimelimit == 0 ) {
+            if ($ao_ccss_rtimelimit == 0) {
                 // no time limit set, let's go with 1000 seconds.
                 $ao_ccss_rtimelimit = 1000;
             }
             $mt = time() + $ao_ccss_rtimelimit; // maxtime queue processing can run.
             $jc = 1; // job count number.
             $jr = 1; // jobs requests number.
-            $jt = count( $ao_ccss_queue ); // number of jobs in queue.
+            $jt = count($ao_ccss_queue); // number of jobs in 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 ( $jr > 2 ) {
+                    if ($hash) {
+                        if ($jr > 2) {
                             // we already posted 2 jobs to criticalcss.com, don't post more this run
                             // but we can keep on processing the queue to keep it tidy.
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Holding off on generating request for job with local ID <' . $jprops['ljid'] . '>, maximum number of POSTS reached.', 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Holding off on generating request for job with local ID <'.$jprops['ljid'].'>, maximum number of POSTS reached.', 3);
                             continue;
                         }
 
@@ -132,182 +132,182 @@ 
                         $jprops['hash'] = $hash;
 
                         // 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'];
-                            if ( $apireq['job']['error'] ) {
+                            if ($apireq['job']['error']) {
                                 $jprops['jrstat'] = $apireq['job']['error'];
                             } else {
                                 $jprops['jrstat'] = 'Baby did a bad bad thing';
                             }
                             $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);
 
                     // 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']);
 
                     // 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'] || 'WARN' == $apireq['validationStatus'] ) ) {
+                        if ('GOOD' == $apireq['resultStatus'] && ('GOOD' == $apireq['validationStatus'] || 'WARN' == $apireq['validationStatus'])) {
                             // SUCCESS: GOOD job with GOOD or WARN 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'] && ( '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'] && ('BAD' == $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' == $apireq['validationStatus'])) {
                             // SUCCESS: GOOD job with BAD or SCREENSHOT_WARN_BLANK validation
                             // Update job properties.
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
-                            if ( apply_filters( 'autoptimize_filter_ccss_save_review_rules', true ) ) {
-                                $jprops['file']   = $this->ao_ccss_save_file( $apireq['css'], $trule, true );
+                            $jprops['jftime'] = microtime(true);
+                            if (apply_filters('autoptimize_filter_ccss_save_review_rules', true)) {
+                                $jprops['file']   = $this->ao_ccss_save_file($apireq['css'], $trule, 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 );
+                                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);
                             } else {
-                                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . ', file not saved because it required REVIEW.', 3 );
+                                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].', file not saved because it required REVIEW.', 3);
                             }
-                        } elseif ( 'GOOD' != $apireq['resultStatus'] && ( 'GOOD' != $apireq['validationStatus'] || 'WARN' != $apireq['validationStatus'] || 'BAD' != $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' != $apireq['validationStatus'] ) ) {
+                        } 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['job']['error'] ) {
+                        if ($apireq['job']['error']) {
                             $jprops['jrstat'] = $apireq['job']['error'];
                         } else {
                             $jprops['jrstat'] = 'Baby did a bad bad thing';
                         }
                         $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.
@@ -315,40 +315,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 time limit is (almost exceeded).
-                if ( time() > $mt ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'The time limit of ' . $ao_ccss_rtimelimit . ' seconds was exceeded, queue control must finish now', 3 );
+                if (time() > $mt) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('The time limit of '.$ao_ccss_rtimelimit.' seconds was exceeded, queue control must finish now', 3);
                     break;
                 }
 
@@ -357,46 +357,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;
             }
         }
@@ -406,32 +406,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;
@@ -443,35 +443,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();
@@ -481,88 +481,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;
@@ -570,76 +570,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 = '';
@@ -649,21 +649,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;
         }
 
@@ -673,15 +673,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);
                 }
             }
         }
@@ -690,29 +690,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;
@@ -722,7 +722,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] ) && ! empty( $trule[1] ) ) {
+            if (('types' == $trule[0] || 'paths' == $trule[0]) && !empty($trule[1])) {
                 // Set rule hash and file and action flag.
                 $rule['hash'] = $hash;
                 $rule['file'] = $file;
@@ -730,47 +730,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++;
@@ -787,54 +787,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/autoptimizeCache.php

Spacing +183 added lines, -183 removed lines

@@ -3,7 +3,7 @@ 
  * Handles disk-cache-related operations.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -38,22 +38,22 @@ 
      * @param string $md5 Hash.
      * @param string $ext Extension.
      */
-    public function __construct( $md5, $ext = 'php' )
+    public function __construct($md5, $ext = 'php')
     {
         $_min_ext = '';
-        if ( apply_filters( 'autoptimize_filter_cache_url_add_min_ext', false ) ) {
+        if (apply_filters('autoptimize_filter_cache_url_add_min_ext', false)) {
             $_min_ext = '.min';
         }
 
         $this->cachedir = AUTOPTIMIZE_CACHE_DIR;
         $this->nogzip   = AUTOPTIMIZE_CACHE_NOGZIP;
-        if ( ! $this->nogzip ) {
-            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . $_min_ext . '.php';
+        if (!$this->nogzip) {
+            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.$_min_ext.'.php';
         } else {
-            if ( in_array( $ext, array( 'js', 'css' ) ) ) {
-                $this->filename = $ext . '/' . AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . $_min_ext . '.' . $ext;
+            if (in_array($ext, array('js', 'css'))) {
+                $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.$_min_ext.'.'.$ext;
             } else {
-                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . $_min_ext . '.' . $ext;
+                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.$_min_ext.'.'.$ext;
             }
         }
     }
@@ -65,7 +65,7 @@ 
      */
     public function check()
     {
-        return file_exists( $this->cachedir . $this->filename );
+        return file_exists($this->cachedir.$this->filename);
     }
 
     /**
@@ -75,11 +75,11 @@ 
      */
     public function retrieve()
     {
-        if ( $this->check() ) {
-            if ( false == $this->nogzip ) {
-                return file_get_contents( $this->cachedir . $this->filename . '.none' );
+        if ($this->check()) {
+            if (false == $this->nogzip) {
+                return file_get_contents($this->cachedir.$this->filename.'.none');
             } else {
-                return file_get_contents( $this->cachedir . $this->filename );
+                return file_get_contents($this->cachedir.$this->filename);
             }
         }
         return false;
@@ -93,10 +93,10 @@ 
      *
      * @return void
      */
-    public function cache( $data, $mime )
+    public function cache($data, $mime)
     {
         // readonly FS explicitly OK'ed by developer, so just pretend all is OK.
-        if ( defined( 'AUTOPTIMIZE_CACHE_READONLY' ) ) {
+        if (defined('AUTOPTIMIZE_CACHE_READONLY')) {
             return true;
         }
 
@@ -104,44 +104,44 @@ 
         //
         // to be activated for users that experience these ugly errors;
         // PHP Warning: file_put_contents failed to open stream: No such file or directory.
-        if ( apply_filters( 'autoptimize_filter_cache_checkdirs_on_write', false ) ) {
+        if (apply_filters('autoptimize_filter_cache_checkdirs_on_write', false)) {
             $this->check_and_create_dirs();
         }
 
-        if ( false === $this->nogzip ) {
+        if (false === $this->nogzip) {
             // We handle gzipping ourselves.
             $file    = 'default.php';
-            $phpcode = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $file );
-            $phpcode = str_replace( array( '%%CONTENT%%', 'exit;' ), array( $mime, '' ), $phpcode );
+            $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$file);
+            $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode);
 
-            file_put_contents( $this->cachedir . $this->filename, $phpcode );
-            file_put_contents( $this->cachedir . $this->filename . '.none', $data );
+            file_put_contents($this->cachedir.$this->filename, $phpcode);
+            file_put_contents($this->cachedir.$this->filename.'.none', $data);
         } else {
             // Write code to cache without doing anything else.
-            file_put_contents( $this->cachedir . $this->filename, $data );
+            file_put_contents($this->cachedir.$this->filename, $data);
 
             // save fallback .js or .css file if filter true (to be false by default) but not if snippet or single.
-            if ( self::do_fallback() && strpos( $this->filename, '_snippet_' ) === false && strpos( $this->filename, '_single_' ) === false ) {
-                $_extension     = pathinfo( $this->filename, PATHINFO_EXTENSION );
-                $_fallback_file = AUTOPTIMIZE_CACHEFILE_PREFIX . 'fallback.' . $_extension;
-                if ( ( 'css' === $_extension || 'js' === $_extension ) && ! file_exists( $this->cachedir . $_extension . '/' . $_fallback_file ) ) {
-                    file_put_contents( $this->cachedir . $_extension . '/' . $_fallback_file, $data );
+            if (self::do_fallback() && strpos($this->filename, '_snippet_') === false && strpos($this->filename, '_single_') === false) {
+                $_extension     = pathinfo($this->filename, PATHINFO_EXTENSION);
+                $_fallback_file = AUTOPTIMIZE_CACHEFILE_PREFIX.'fallback.'.$_extension;
+                if (('css' === $_extension || 'js' === $_extension) && !file_exists($this->cachedir.$_extension.'/'.$_fallback_file)) {
+                    file_put_contents($this->cachedir.$_extension.'/'.$_fallback_file, $data);
                 }
             }
 
-            if ( apply_filters( 'autoptimize_filter_cache_create_static_gzip', false ) ) {
+            if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) {
                 // Create an additional cached gzip file.
-                file_put_contents( $this->cachedir . $this->filename . '.gz', gzencode( $data, 9, FORCE_GZIP ) );
+                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($data, 9, FORCE_GZIP));
                 // If PHP Brotli extension is installed, create an additional cached Brotli file.
-                if ( function_exists( 'brotli_compress' ) ) {
-                    file_put_contents( $this->cachedir . $this->filename . '.br', brotli_compress( $data, 11, BROTLI_GENERIC ) );
+                if (function_exists('brotli_compress')) {
+                    file_put_contents($this->cachedir.$this->filename.'.br', brotli_compress($data, 11, BROTLI_GENERIC));
                 }
             }
         }
 
         // Provide 3rd party action hook for every cache file that is created.
         // This hook can for example be used to inject a copy of the created cache file to a other domain.
-        do_action( 'autoptimize_action_cache_file_created', $this->cachedir . $this->filename );
+        do_action('autoptimize_action_cache_file_created', $this->cachedir.$this->filename);
     }
 
     /**
@@ -156,7 +156,7 @@ 
         // The original idea here was to provide 3rd party code a hook so that
         // it can "listen" to all the complete autoptimized-urls that the page
         // will emit... Or something to that effect I think?
-        apply_filters( 'autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL . $this->filename );
+        apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename);
 
         return $this->filename;
     }
@@ -169,11 +169,11 @@ 
      * @param string $file Filename.
      * @return bool
      */
-    protected static function is_valid_cache_file( $dir, $file )
+    protected static function is_valid_cache_file($dir, $file)
     {
-        if ( '.' !== $file && '..' !== $file &&
-            false !== strpos( $file, AUTOPTIMIZE_CACHEFILE_PREFIX ) &&
-            is_file( $dir . $file ) ) {
+        if ('.' !== $file && '..' !== $file &&
+            false !== strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) &&
+            is_file($dir.$file)) {
 
             // It's a valid file!
             return true;
@@ -191,16 +191,16 @@ 
     protected static function clear_cache_classic()
     {
         $contents = self::get_cache_contents();
-        foreach ( $contents as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    @unlink( $dir . $file ); // @codingStandardsIgnoreLine
+        foreach ($contents as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    @unlink($dir.$file); // @codingStandardsIgnoreLine
                 }
             }
         }
 
-        @unlink( AUTOPTIMIZE_CACHE_DIR . '/.htaccess' ); // @codingStandardsIgnoreLine
+        @unlink(AUTOPTIMIZE_CACHE_DIR.'/.htaccess'); // @codingStandardsIgnoreLine
     }
 
     /**
@@ -211,19 +211,19 @@ 
      *
      * @return bool
      */
-    protected static function rmdir( $pathname )
+    protected static function rmdir($pathname)
     {
-        $files = self::get_dir_contents( $pathname );
-        foreach ( $files as $file ) {
-            $path = $pathname . '/' . $file;
-            if ( is_dir( $path ) ) {
-                self::rmdir( $path );
+        $files = self::get_dir_contents($pathname);
+        foreach ($files as $file) {
+            $path = $pathname.'/'.$file;
+            if (is_dir($path)) {
+                self::rmdir($path);
             } else {
-                unlink( $path );
+                unlink($path);
             }
         }
 
-        return rmdir( $pathname );
+        return rmdir($pathname);
     }
 
     /**
@@ -244,12 +244,12 @@ 
         $new_name = self::get_unique_name();
 
         // Makes sure the new pathname is on the same level...
-        $new_pathname = dirname( $dir ) . '/' . $new_name;
-        $renamed      = @rename( $dir, $new_pathname ); // @codingStandardsIgnoreLine
+        $new_pathname = dirname($dir).'/'.$new_name;
+        $renamed      = @rename($dir, $new_pathname); // @codingStandardsIgnoreLine
 
         // When renamed, re-create the default cache directory back so it's
         // available again...
-        if ( $renamed ) {
+        if ($renamed) {
             $ok = self::cacheavail();
         }
 
@@ -263,7 +263,7 @@ 
      */
     public static function advanced_cache_clear_enabled()
     {
-        return apply_filters( 'autoptimize_filter_cache_clear_advanced', false );
+        return apply_filters('autoptimize_filter_cache_clear_advanced', false);
     }
 
     /**
@@ -274,7 +274,7 @@ 
     protected static function get_unique_name()
     {
         $prefix   = self::get_advanced_cache_clear_prefix();
-        $new_name = uniqid( $prefix, true );
+        $new_name = uniqid($prefix, true);
 
         return $new_name;
     }
@@ -287,8 +287,8 @@ 
     protected static function get_advanced_cache_clear_prefix()
     {
         $pathname = self::get_pathname_base();
-        $basename = basename( $pathname );
-        $prefix   = $basename . '-artifact-';
+        $basename = basename($pathname);
+        $prefix   = $basename.'-artifact-';
 
         return $prefix;
     }
@@ -301,9 +301,9 @@ 
      *
      * @return array
      */
-    protected static function get_dir_contents( $pathname )
+    protected static function get_dir_contents($pathname)
     {
-        return array_slice( scandir( $pathname ), 2 );
+        return array_slice(scandir($pathname), 2);
     }
 
     /**
@@ -316,24 +316,24 @@ 
     public static function delete_advanced_cache_clear_artifacts()
     {
         // Don't go through these motions (called from the cachechecker) if advanced cache clear isn't even active.
-        if ( ! self::advanced_cache_clear_enabled() ) {
+        if (!self::advanced_cache_clear_enabled()) {
             return false;
         }
 
         $dir    = self::get_pathname_base();
         $prefix = self::get_advanced_cache_clear_prefix();
-        $parent = dirname( $dir );
+        $parent = dirname($dir);
         $ok     = false;
 
         // Returns the list of files without '.' and '..' elements.
-        $files = self::get_dir_contents( $parent );
-        if ( is_array( $files ) && ! empty( $files ) ) {
-            foreach ( $files as $file ) {
-                $path     = $parent . '/' . $file;
-                $prefixed = ( false !== strpos( $path, $prefix ) );
+        $files = self::get_dir_contents($parent);
+        if (is_array($files) && !empty($files)) {
+            foreach ($files as $file) {
+                $path     = $parent.'/'.$file;
+                $prefixed = (false !== strpos($path, $prefix));
                 // Removing only our own (prefixed) directories...
-                if ( is_dir( $path ) && $prefixed ) {
-                    $ok = self::rmdir( $path );
+                if (is_dir($path) && $prefixed) {
+                    $ok = self::rmdir($path);
                 }
             }
         }
@@ -353,9 +353,9 @@ 
     {
         $pathname = self::get_pathname_base();
 
-        if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
+        if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
             $blog_id   = get_current_blog_id();
-            $pathname .= $blog_id . '/';
+            $pathname .= $blog_id.'/';
         }
 
         return $pathname;
@@ -368,7 +368,7 @@ 
      */
     protected static function get_pathname_base()
     {
-        $pathname = WP_CONTENT_DIR . AUTOPTIMIZE_CACHE_CHILD_DIR;
+        $pathname = WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR;
 
         return $pathname;
     }
@@ -380,46 +380,46 @@ 
      *
      * @return bool
      */
-    public static function clearall( $propagate = true )
+    public static function clearall($propagate = true)
     {
-        if ( ! self::cacheavail() ) {
+        if (!self::cacheavail()) {
             return false;
         }
 
         // TODO/FIXME: If cache is big, switch to advanced/new cache clearing automatically?
-        if ( self::advanced_cache_clear_enabled() ) {
+        if (self::advanced_cache_clear_enabled()) {
             self::clear_cache_via_rename();
         } else {
             self::clear_cache_classic();
         }
 
         // Remove 404 handler if required.
-        if ( self::do_fallback() ) {
-            $_fallback_php = trailingslashit( WP_CONTENT_DIR ) . 'autoptimize_404_handler.php';
-            @unlink( $_fallback_php ); // @codingStandardsIgnoreLine
+        if (self::do_fallback()) {
+            $_fallback_php = trailingslashit(WP_CONTENT_DIR).'autoptimize_404_handler.php';
+            @unlink($_fallback_php); // @codingStandardsIgnoreLine
         }
 
         // Remove the transient so it gets regenerated...
-        delete_transient( 'autoptimize_stats' );
+        delete_transient('autoptimize_stats');
 
         // Cache was just purged, clear page cache and allow others to hook into our purging...
-        if ( true === $propagate ) {
-            if ( ! function_exists( 'autoptimize_do_cachepurged_action' ) ) {
+        if (true === $propagate) {
+            if (!function_exists('autoptimize_do_cachepurged_action')) {
                 function autoptimize_do_cachepurged_action() {
-                    do_action( 'autoptimize_action_cachepurged' );
+                    do_action('autoptimize_action_cachepurged');
                 }
             }
-            add_action( 'shutdown', 'autoptimize_do_cachepurged_action', 11 );
-            add_action( 'autoptimize_action_cachepurged', array( 'autoptimizeCache', 'flushPageCache' ), 10, 0 );
+            add_action('shutdown', 'autoptimize_do_cachepurged_action', 11);
+            add_action('autoptimize_action_cachepurged', array('autoptimizeCache', 'flushPageCache'), 10, 0);
         }
 
         // Warm cache (part of speedupper)!
-        if ( apply_filters( 'autoptimize_filter_speedupper', true ) && false == get_transient( 'autoptimize_cache_warmer_protector' ) ) {
-            set_transient( 'autoptimize_cache_warmer_protector', 'I shall not warm cache for another 10 minutes.', 60 * 10 );
-            $url   = site_url() . '/?ao_speedup_cachebuster=' . rand( 1, 100000 );
-            $url   = apply_filters( 'autoptimize_filter_cache_warmer_url', $url );
-            $cache = @wp_remote_get( $url ); // @codingStandardsIgnoreLine
-            unset( $cache );
+        if (apply_filters('autoptimize_filter_speedupper', true) && false == get_transient('autoptimize_cache_warmer_protector')) {
+            set_transient('autoptimize_cache_warmer_protector', 'I shall not warm cache for another 10 minutes.', 60*10);
+            $url   = site_url().'/?ao_speedup_cachebuster='.rand(1, 100000);
+            $url   = apply_filters('autoptimize_filter_cache_warmer_url', $url);
+            $cache = @wp_remote_get($url); // @codingStandardsIgnoreLine
+            unset($cache);
         }
 
         return true;
@@ -434,7 +434,7 @@ 
      */
     public static function clearall_actionless()
     {
-        return self::clearall( false );
+        return self::clearall(false);
     }
 
     /**
@@ -446,8 +446,8 @@ 
     {
         $contents = array();
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            $contents[ $dir ] = scandir( AUTOPTIMIZE_CACHE_DIR . $dir );
+        foreach (array('', 'js', 'css') as $dir) {
+            $contents[$dir] = scandir(AUTOPTIMIZE_CACHE_DIR.$dir);
         }
 
         return $contents;
@@ -460,21 +460,21 @@ 
      */
     public static function stats()
     {
-        $stats = get_transient( 'autoptimize_stats' );
+        $stats = get_transient('autoptimize_stats');
 
         // If no transient, do the actual scan!
-        if ( ! is_array( $stats ) ) {
-            if ( ! self::cacheavail() ) {
+        if (!is_array($stats)) {
+            if (!self::cacheavail()) {
                 return 0;
             }
             $stats = self::stats_scan();
             $count = $stats[0];
-            if ( $count > 100 ) {
+            if ($count > 100) {
                 // Store results in transient.
                 set_transient(
                     'autoptimize_stats',
                     $stats,
-                    apply_filters( 'autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS )
+                    apply_filters('autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS)
                 );
             }
         }
@@ -497,30 +497,30 @@ 
         $size  = 0;
 
         // Scan everything in our cache directories.
-        foreach ( self::get_cache_contents() as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    if ( AUTOPTIMIZE_CACHE_NOGZIP &&
+        foreach (self::get_cache_contents() as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    if (AUTOPTIMIZE_CACHE_NOGZIP &&
                         (
-                            false !== strpos( $file, '.js' ) ||
-                            false !== strpos( $file, '.css' ) ||
-                            false !== strpos( $file, '.img' ) ||
-                            false !== strpos( $file, '.txt' )
+                            false !== strpos($file, '.js') ||
+                            false !== strpos($file, '.css') ||
+                            false !== strpos($file, '.img') ||
+                            false !== strpos($file, '.txt')
                         )
                     ) {
                         // Web server is gzipping, we count .js|.css|.img|.txt files.
                         $count++;
-                    } elseif ( ! AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos( $file, '.none' ) ) {
+                    } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos($file, '.none')) {
                         // We are gzipping ourselves via php, counting only .none files.
                         $count++;
                     }
-                    $size += filesize( $dir . $file );
+                    $size += filesize($dir.$file);
                 }
             }
         }
 
-        $stats = array( $count, $size, time() );
+        $stats = array($count, $size, time());
 
         return $stats;
     }
@@ -535,26 +535,26 @@ 
     public static function cacheavail()
     {
         // readonly FS explicitly OK'ed by dev, let's assume the cache dirs are there!
-        if ( defined( 'AUTOPTIMIZE_CACHE_READONLY' ) ) {
+        if (defined('AUTOPTIMIZE_CACHE_READONLY')) {
             return true;
         }
 
-        if ( false === autoptimizeCache::check_and_create_dirs() ) {
+        if (false === autoptimizeCache::check_and_create_dirs()) {
             return false;
         }
 
         // Using .htaccess inside our cache folder to overrule wp-super-cache.
-        $htaccess = AUTOPTIMIZE_CACHE_DIR . '/.htaccess';
-        if ( ! is_file( $htaccess ) ) {
+        $htaccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
+        if (!is_file($htaccess)) {
             /**
              * Create `wp-content/AO_htaccess_tmpl` file with
              * whatever htaccess rules you might need
              * if you want to override default AO htaccess
              */
-            $htaccess_tmpl = WP_CONTENT_DIR . '/AO_htaccess_tmpl';
-            if ( is_file( $htaccess_tmpl ) ) {
-                $content = file_get_contents( $htaccess_tmpl );
-            } elseif ( is_multisite() || ! AUTOPTIMIZE_CACHE_NOGZIP ) {
+            $htaccess_tmpl = WP_CONTENT_DIR.'/AO_htaccess_tmpl';
+            if (is_file($htaccess_tmpl)) {
+                $content = file_get_contents($htaccess_tmpl);
+            } elseif (is_multisite() || !AUTOPTIMIZE_CACHE_NOGZIP) {
                 $content = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
@@ -608,13 +608,13 @@ 
 </IfModule>';
             }
 
-            if ( self::do_fallback() === true ) {
-                $content .= "\nErrorDocument 404 " . trailingslashit( parse_url( content_url(), PHP_URL_PATH ) ) . 'autoptimize_404_handler.php';
+            if (self::do_fallback() === true) {
+                $content .= "\nErrorDocument 404 ".trailingslashit(parse_url(content_url(), PHP_URL_PATH)).'autoptimize_404_handler.php';
             }
-            @file_put_contents( $htaccess, $content ); // @codingStandardsIgnoreLine
+            @file_put_contents($htaccess, $content); // @codingStandardsIgnoreLine
         }
 
-        if ( self::do_fallback() ) {
+        if (self::do_fallback()) {
             self::check_fallback_php();
         }
 
@@ -629,17 +629,17 @@ 
      */
     public static function check_fallback_php() {
         $_fallback_filename = 'autoptimize_404_handler.php';
-        $_fallback_php      = trailingslashit( WP_CONTENT_DIR ) . $_fallback_filename;
+        $_fallback_php      = trailingslashit(WP_CONTENT_DIR).$_fallback_filename;
         $_fallback_status   = true;
 
-        if ( ! file_exists( $_fallback_php ) && is_writable( WP_CONTENT_DIR ) ) {
-            $_fallback_php_contents = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $_fallback_filename );
-            $_fallback_php_contents = str_replace( '<?php exit;', '<?php', $_fallback_php_contents );
-            $_fallback_php_contents = str_replace( '<!--ao-cache-dir-->', AUTOPTIMIZE_CACHE_DIR, $_fallback_php_contents );
-            if ( apply_filters( 'autoptimize_filter_cache_fallback_log_errors', false ) ) {
-                $_fallback_php_contents = str_replace( '// error_log', 'error_log', $_fallback_php_contents );
+        if (!file_exists($_fallback_php) && is_writable(WP_CONTENT_DIR)) {
+            $_fallback_php_contents = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$_fallback_filename);
+            $_fallback_php_contents = str_replace('<?php exit;', '<?php', $_fallback_php_contents);
+            $_fallback_php_contents = str_replace('<!--ao-cache-dir-->', AUTOPTIMIZE_CACHE_DIR, $_fallback_php_contents);
+            if (apply_filters('autoptimize_filter_cache_fallback_log_errors', false)) {
+                $_fallback_php_contents = str_replace('// error_log', 'error_log', $_fallback_php_contents);
             }
-            $_fallback_status = file_put_contents( $_fallback_php, $_fallback_php_contents );
+            $_fallback_status = file_put_contents($_fallback_php, $_fallback_php_contents);
         }
 
         return $_fallback_status;
@@ -656,8 +656,8 @@ 
     public static function do_fallback() {
         static $_do_fallback = null;
 
-        if ( null === $_do_fallback ) {
-            $_do_fallback = (bool) apply_filters( 'autoptimize_filter_cache_do_fallback', autoptimizeOptionWrapper::get_option( 'autoptimize_cache_fallback', '1' ) );
+        if (null === $_do_fallback) {
+            $_do_fallback = (bool) apply_filters('autoptimize_filter_cache_do_fallback', autoptimizeOptionWrapper::get_option('autoptimize_cache_fallback', '1'));
         }
 
         return $_do_fallback;
@@ -669,31 +669,31 @@ 
      * and 410'ing ("Gone") if fallback not available.
      */
     public static function wordpress_notfound_fallback() {
-        $original_request = strtok( $_SERVER['REQUEST_URI'], '?' );
-        if ( strpos( $original_request, wp_basename( WP_CONTENT_DIR ) . AUTOPTIMIZE_CACHE_CHILD_DIR ) !== false && is_404() ) {
+        $original_request = strtok($_SERVER['REQUEST_URI'], '?');
+        if (strpos($original_request, wp_basename(WP_CONTENT_DIR).AUTOPTIMIZE_CACHE_CHILD_DIR) !== false && is_404()) {
             // make sure this is not considered a 404.
             global $wp_query;
             $wp_query->is_404 = false;
 
             // set fallback path.
-            $js_or_css     = pathinfo( $original_request, PATHINFO_EXTENSION );
-            $fallback_path = AUTOPTIMIZE_CACHE_DIR . $js_or_css . '/autoptimize_fallback.' . $js_or_css;
+            $js_or_css     = pathinfo($original_request, PATHINFO_EXTENSION);
+            $fallback_path = AUTOPTIMIZE_CACHE_DIR.$js_or_css.'/autoptimize_fallback.'.$js_or_css;
 
             // prepare for Shakeeb's Unused CSS files to be 404-handled as well.
-            if ( strpos( $original_request, 'uucss/uucss-' ) !== false ) {
-                $original_request = preg_replace( '/uucss\/uucss-[a-z0-9]{32}-/', 'css/', $original_request  );
+            if (strpos($original_request, 'uucss/uucss-') !== false) {
+                $original_request = preg_replace('/uucss\/uucss-[a-z0-9]{32}-/', 'css/', $original_request);
             }
 
             // set fallback URL.
-            $fallback_target = preg_replace( '/(.*)_(?:[a-z0-9]{32})\.(js|css)$/', '${1}_fallback.${2}', $original_request );
+            $fallback_target = preg_replace('/(.*)_(?:[a-z0-9]{32})\.(js|css)$/', '${1}_fallback.${2}', $original_request);
 
             // redirect to fallback if possible.
-            if ( $original_request !== $fallback_target && file_exists( $fallback_path ) ) {
+            if ($original_request !== $fallback_target && file_exists($fallback_path)) {
                 // redirect to fallback.
-                wp_redirect( $fallback_target, 302 );
+                wp_redirect($fallback_target, 302);
             } else {
                 // return HTTP 410 (gone) reponse.
-                status_header( 410 );
+                status_header(410);
             }
         }
     }
@@ -705,13 +705,13 @@ 
      * @return bool
      */
     public static function check_and_create_dirs() {
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) {
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
             // We didn't set a cache.
             return false;
         }
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            if ( ! self::check_cache_dir( AUTOPTIMIZE_CACHE_DIR . $dir ) ) {
+        foreach (array('', 'js', 'css') as $dir) {
+            if (!self::check_cache_dir(AUTOPTIMIZE_CACHE_DIR.$dir)) {
                 return false;
             }
         }
@@ -726,25 +726,25 @@ 
      *
      * @return bool
      */
-    protected static function check_cache_dir( $dir )
+    protected static function check_cache_dir($dir)
     {
         // Try creating the dir if it doesn't exist.
-        if ( ! file_exists( $dir ) ) {
-            @mkdir( $dir, 0775, true ); // @codingStandardsIgnoreLine
-            if ( ! file_exists( $dir ) ) {
+        if (!file_exists($dir)) {
+            @mkdir($dir, 0775, true); // @codingStandardsIgnoreLine
+            if (!file_exists($dir)) {
                 return false;
             }
         }
 
         // If we still cannot write, bail.
-        if ( ! is_writable( $dir ) ) {
+        if (!is_writable($dir)) {
             return false;
         }
 
         // Create an index.html in there to avoid prying eyes!
-        $idx_file = rtrim( $dir, '/\\' ) . '/index.html';
-        if ( ! is_file( $idx_file ) ) {
-            @file_put_contents( $idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>' ); // @codingStandardsIgnoreLine
+        $idx_file = rtrim($dir, '/\\').'/index.html';
+        if (!is_file($idx_file)) {
+            @file_put_contents($idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); // @codingStandardsIgnoreLine
         }
 
         return true;
@@ -758,54 +758,54 @@ 
     // @codingStandardsIgnoreStart
     public static function flushPageCache()
     {
-        if ( function_exists( 'wp_cache_clear_cache' ) ) {
-            if ( is_multisite() ) {
+        if (function_exists('wp_cache_clear_cache')) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                wp_cache_clear_cache( $blog_id );
+                wp_cache_clear_cache($blog_id);
             } else {
                 wp_cache_clear_cache();
             }
-        } elseif ( has_action( 'cachify_flush_cache' ) ) {
-            do_action( 'cachify_flush_cache' );
-        } elseif ( function_exists( 'w3tc_pgcache_flush' ) ) {
+        } elseif (has_action('cachify_flush_cache')) {
+            do_action('cachify_flush_cache');
+        } elseif (function_exists('w3tc_pgcache_flush')) {
             w3tc_pgcache_flush();
-        } elseif ( function_exists( 'wp_fast_cache_bulk_delete_all' ) ) {
+        } elseif (function_exists('wp_fast_cache_bulk_delete_all')) {
             wp_fast_cache_bulk_delete_all();
-        } elseif ( function_exists( 'rapidcache_clear_cache' ) ) {
+        } elseif (function_exists('rapidcache_clear_cache')) {
             rapidcache_clear_cache();
-        } elseif ( class_exists( 'Swift_Performance_Cache' ) ) {
+        } elseif (class_exists('Swift_Performance_Cache')) {
             Swift_Performance_Cache::clear_all_cache();
-        } elseif ( class_exists( 'WpFastestCache' ) ) {
+        } elseif (class_exists('WpFastestCache')) {
             $wpfc = new WpFastestCache();
             $wpfc->deleteCache();
-        } elseif ( class_exists( 'c_ws_plugin__qcache_purging_routines' ) ) {
+        } elseif (class_exists('c_ws_plugin__qcache_purging_routines')) {
             c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache
-        } elseif ( class_exists( 'zencache' ) ) {
+        } elseif (class_exists('zencache')) {
             zencache::clear();
-        } elseif ( class_exists( 'comet_cache' ) ) {
+        } elseif (class_exists('comet_cache')) {
             comet_cache::clear();
-        } elseif ( class_exists( 'WpeCommon' ) ) {
+        } elseif (class_exists('WpeCommon')) {
             // WPEngine cache purge/flush methods to call by default
             $wpe_methods = array(
                 'purge_varnish_cache',
             );
 
             // More agressive clear/flush/purge behind a filter
-            if ( apply_filters( 'autoptimize_flush_wpengine_aggressive', false ) ) {
-                $wpe_methods = array_merge( $wpe_methods, array( 'purge_memcached', 'clear_maxcdn_cache' ) );
+            if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) {
+                $wpe_methods = array_merge($wpe_methods, array('purge_memcached', 'clear_maxcdn_cache'));
             }
 
             // Filtering the entire list of WpeCommon methods to be called (for advanced usage + easier testing)
-            $wpe_methods = apply_filters( 'autoptimize_flush_wpengine_methods', $wpe_methods );
+            $wpe_methods = apply_filters('autoptimize_flush_wpengine_methods', $wpe_methods);
 
-            foreach ( $wpe_methods as $wpe_method ) {
-                if ( method_exists( 'WpeCommon', $wpe_method ) ) {
+            foreach ($wpe_methods as $wpe_method) {
+                if (method_exists('WpeCommon', $wpe_method)) {
                     WpeCommon::$wpe_method();
                 }
             }
-        } elseif ( function_exists( 'sg_cachepress_purge_cache' ) ) {
+        } elseif (function_exists('sg_cachepress_purge_cache')) {
             sg_cachepress_purge_cache();
-        } elseif ( array_key_exists( 'KINSTA_CACHE_ZONE', $_SERVER ) ) {
+        } elseif (array_key_exists('KINSTA_CACHE_ZONE', $_SERVER)) {
             $_kinsta_clear_cache_url = 'https://localhost/kinsta-clear-cache-all';
             $_kinsta_response        = wp_remote_get(
                 $_kinsta_clear_cache_url,
@@ -814,20 +814,20 @@ 
                     'timeout' => 5,
                     )
             );
-        } elseif ( defined('NGINX_HELPER_BASENAME') ) {
-            do_action( 'rt_nginx_helper_purge_all' );
-        } elseif ( file_exists( WP_CONTENT_DIR . '/wp-cache-config.php' ) && function_exists( 'prune_super_cache' ) ) {
+        } elseif (defined('NGINX_HELPER_BASENAME')) {
+            do_action('rt_nginx_helper_purge_all');
+        } elseif (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) {
             // fallback for WP-Super-Cache
             global $cache_path;
-            if ( is_multisite() ) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                prune_super_cache( get_supercache_dir( $blog_id ), true );
-                prune_super_cache( $cache_path . 'blogs/', true );
+                prune_super_cache(get_supercache_dir($blog_id), true);
+                prune_super_cache($cache_path.'blogs/', true);
             } else {
-                prune_super_cache( $cache_path . 'supercache/', true );
-                prune_super_cache( $cache_path, true );
+                prune_super_cache($cache_path.'supercache/', true);
+                prune_super_cache($cache_path, true);
             }
-        } elseif ( class_exists( 'NginxCache' ) ) {
+        } elseif (class_exists('NginxCache')) {
             $nginx_cache = new NginxCache();
             $nginx_cache->purge_zone_once();
         }

classes/autoptimizeBase.php

Spacing +151 added lines, -151 removed lines

@@ -3,7 +3,7 @@ 
  * Base class other (more-specific) classes inherit from.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -30,7 +30,7 @@ 
      */
     public $cdn_url = '';
 
-    public function __construct( $content )
+    public function __construct($content)
     {
         $this->content = $content;
     }
@@ -42,7 +42,7 @@ 
      *
      * @return bool
      */
-    abstract public function read( $options );
+    abstract public function read($options);
 
     /**
      * Joins and optimizes collected things.
@@ -73,40 +73,40 @@ 
      *
      * @return bool|string
      */
-    public function getpath( $url )
+    public function getpath($url)
     {
-        $url = apply_filters( 'autoptimize_filter_cssjs_alter_url', $url );
+        $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url);
 
-        if ( false !== strpos( $url, '%' ) ) {
-            $url = urldecode( $url );
+        if (false !== strpos($url, '%')) {
+            $url = urldecode($url);
         }
 
-        $site_host    = parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST );
-        $content_host = parse_url( AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST );
+        $site_host    = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST);
+        $content_host = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST);
 
         // Normalizing attempts...
-        $double_slash_position = strpos( $url, '//' );
-        if ( 0 === $double_slash_position ) {
-            if ( is_ssl() ) {
-                $url = 'https:' . $url;
+        $double_slash_position = strpos($url, '//');
+        if (0 === $double_slash_position) {
+            if (is_ssl()) {
+                $url = 'https:'.$url;
             } else {
-                $url = 'http:' . $url;
+                $url = 'http:'.$url;
             }
-        } elseif ( ( false === $double_slash_position ) && ( false === strpos( $url, $site_host ) ) ) {
-            if ( AUTOPTIMIZE_WP_SITE_URL === $site_host ) {
-                $url = AUTOPTIMIZE_WP_SITE_URL . $url;
+        } elseif ((false === $double_slash_position) && (false === strpos($url, $site_host))) {
+            if (AUTOPTIMIZE_WP_SITE_URL === $site_host) {
+                $url = AUTOPTIMIZE_WP_SITE_URL.$url;
             } else {
-                $url = AUTOPTIMIZE_WP_SITE_URL . autoptimizeUtils::path_canonicalize( $url );
+                $url = AUTOPTIMIZE_WP_SITE_URL.autoptimizeUtils::path_canonicalize($url);
             }
         }
 
-        if ( $site_host !== $content_host ) {
-            $url = str_replace( AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL . AUTOPTIMIZE_WP_CONTENT_NAME, $url );
+        if ($site_host !== $content_host) {
+            $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url);
         }
 
         // First check; hostname wp site should be hostname of url!
-        $url_host = @parse_url( $url, PHP_URL_HOST ); // @codingStandardsIgnoreLine
-        if ( $url_host !== $site_host ) {
+        $url_host = @parse_url($url, PHP_URL_HOST); // @codingStandardsIgnoreLine
+        if ($url_host !== $site_host) {
             /**
              * First try to get all domains from WPML (if available)
              * then explicitely declare $this->cdn_url as OK as well
@@ -115,20 +115,20 @@ 
              */
             $multidomains = array();
 
-            $multidomains_wpml = apply_filters( 'wpml_setting', array(), 'language_domains' );
-            if ( ! empty( $multidomains_wpml ) ) {
-                $multidomains = array_map( array( $this, 'get_url_hostname' ), $multidomains_wpml );
+            $multidomains_wpml = apply_filters('wpml_setting', array(), 'language_domains');
+            if (!empty($multidomains_wpml)) {
+                $multidomains = array_map(array($this, 'get_url_hostname'), $multidomains_wpml);
             }
 
-            if ( ! empty( $this->cdn_url ) ) {
-                $multidomains[] = parse_url( $this->cdn_url, PHP_URL_HOST );
+            if (!empty($this->cdn_url)) {
+                $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST);
             }
 
-            $multidomains = apply_filters( 'autoptimize_filter_cssjs_multidomain', $multidomains );
+            $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains);
 
-            if ( ! empty( $multidomains ) ) {
-                if ( in_array( $url_host, $multidomains ) ) {
-                    $url = str_replace( $url_host, $site_host, $url );
+            if (!empty($multidomains)) {
+                if (in_array($url_host, $multidomains)) {
+                    $url = str_replace($url_host, $site_host, $url);
                 } else {
                     return false;
                 }
@@ -138,36 +138,36 @@ 
         }
 
         // Try to remove "wp root url" from url while not minding http<>https.
-        $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL );
+        $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL);
 
-        if ( $site_host !== $content_host ) {
+        if ($site_host !== $content_host) {
             // As we replaced the content-domain with the site-domain, we should match against that.
-            $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_SITE_URL );
+            $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL);
         }
         
-        if ( is_multisite() && ! is_main_site() && ! empty( $this->cdn_url ) ) {
+        if (is_multisite() && !is_main_site() && !empty($this->cdn_url)) {
             // multisite child sites with CDN need the network_site_url as tmp_ao_root but only if directory-based multisite.
             $_network_site_url = network_site_url();
-            if ( strpos( AUTOPTIMIZE_WP_SITE_URL, $_network_site_url ) !== false ) {
-                $tmp_ao_root = preg_replace( '/https?:/', '', $_network_site_url );
+            if (strpos(AUTOPTIMIZE_WP_SITE_URL, $_network_site_url) !== false) {
+                $tmp_ao_root = preg_replace('/https?:/', '', $_network_site_url);
             }
         }
 
-        $tmp_url = preg_replace( '/https?:/', '', $url );
-        $path    = str_replace( $tmp_ao_root, '', $tmp_url );
+        $tmp_url = preg_replace('/https?:/', '', $url);
+        $path    = str_replace($tmp_ao_root, '', $tmp_url);
 
         // If path starts with :// or //, this is not a URL in the WP context and
         // we have to assume we can't aggregate.
-        if ( preg_match( '#^:?//#', $path ) ) {
+        if (preg_match('#^:?//#', $path)) {
             // External script/css (adsense, etc).
             return false;
         }
 
         // Prepend with WP_ROOT_DIR to have full path to file.
-        $path = str_replace( '//', '/', trailingslashit( WP_ROOT_DIR ) . $path );
+        $path = str_replace('//', '/', trailingslashit(WP_ROOT_DIR).$path);
 
         // Final check: does file exist and is it readable?
-        if ( file_exists( $path ) && is_file( $path ) && is_readable( $path ) ) {
+        if (file_exists($path) && is_file($path) && is_readable($path)) {
             return $path;
         } else {
             return false;
@@ -184,18 +184,18 @@ 
      *
      * @return string
      */
-    protected function get_url_hostname( $url )
+    protected function get_url_hostname($url)
     {
         // Checking that the url starts with something vaguely resembling a protocol.
-        if ( ( 0 !== strpos( $url, 'http' ) ) && ( 0 !== strpos( $url, '//' ) ) ) {
-            $url = 'http://' . $url;
+        if ((0 !== strpos($url, 'http')) && (0 !== strpos($url, '//'))) {
+            $url = 'http://'.$url;
         }
 
         // Grab the hostname.
-        $hostname = parse_url( $url, PHP_URL_HOST );
+        $hostname = parse_url($url, PHP_URL_HOST);
 
         // Fallback when parse_url() fails.
-        if ( empty( $hostname ) ) {
+        if (empty($hostname)) {
             $hostname = $url;
         }
 
@@ -209,7 +209,7 @@ 
      *
      * @return string
      */
-    protected function hide_noptimize( $markup )
+    protected function hide_noptimize($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'NOPTIMIZE',
@@ -226,9 +226,9 @@ 
      *
      * @return string
      */
-    protected function restore_noptimize( $markup )
+    protected function restore_noptimize($markup)
     {
-        return $this->restore_marked_content( 'NOPTIMIZE', $markup );
+        return $this->restore_marked_content('NOPTIMIZE', $markup);
     }
 
     /**
@@ -238,7 +238,7 @@ 
      *
      * @return string
      */
-    protected function hide_iehacks( $markup )
+    protected function hide_iehacks($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'IEHACK', // Marker name...
@@ -255,9 +255,9 @@ 
      *
      * @return string
      */
-    protected function restore_iehacks( $markup )
+    protected function restore_iehacks($markup)
     {
-        return $this->restore_marked_content( 'IEHACK', $markup );
+        return $this->restore_marked_content('IEHACK', $markup);
     }
 
     /**
@@ -269,7 +269,7 @@ 
      *
      * @return string
      */
-    protected function hide_comments( $markup )
+    protected function hide_comments($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'COMMENTS',
@@ -287,9 +287,9 @@ 
      *
      * @return string
      */
-    protected function restore_comments( $markup )
+    protected function restore_comments($markup)
     {
-        return $this->restore_marked_content( 'COMMENTS', $markup );
+        return $this->restore_marked_content('COMMENTS', $markup);
     }
 
     /**
@@ -300,44 +300,44 @@ 
      *
      * @return string
      */
-    public function url_replace_cdn( $url )
+    public function url_replace_cdn($url)
     {
         // For 2.3 back-compat in which cdn-ing appeared to be automatically
         // including WP subfolder/subdirectory into account as part of cdn-ing,
         // even though it might've caused serious troubles in certain edge-cases.
-        $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed( $this->cdn_url );
+        $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed($this->cdn_url);
 
         // Allows API/filter to further tweak the cdn url...
-        $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $cdn_url );
-        if ( ! empty( $cdn_url ) ) {
-            $this->debug_log( 'before=' . $url );
+        $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $cdn_url);
+        if (!empty($cdn_url)) {
+            $this->debug_log('before='.$url);
 
             // Simple str_replace-based approach fails when $url is protocol-or-host-relative.
-            $is_protocol_relative = autoptimizeUtils::is_protocol_relative( $url );
-            $is_host_relative     = ( ! $is_protocol_relative && ( '/' === $url[0] ) );
-            $cdn_url              = rtrim( $cdn_url, '/' );
+            $is_protocol_relative = autoptimizeUtils::is_protocol_relative($url);
+            $is_host_relative     = (!$is_protocol_relative && ('/' === $url[0]));
+            $cdn_url              = rtrim($cdn_url, '/');
 
-            if ( $is_host_relative ) {
+            if ($is_host_relative) {
                 // Prepending host-relative urls with the cdn url.
-                $url = $cdn_url . $url;
+                $url = $cdn_url.$url;
             } else {
                 // Either a protocol-relative or "regular" url, replacing it either way.
-                if ( $is_protocol_relative ) {
+                if ($is_protocol_relative) {
                     // Massage $site_url so that simple str_replace() still "works" by
                     // searching for the protocol-relative version of AUTOPTIMIZE_WP_SITE_URL.
-                    $site_url = str_replace( array( 'http:', 'https:' ), '', AUTOPTIMIZE_WP_SITE_URL );
+                    $site_url = str_replace(array('http:', 'https:'), '', AUTOPTIMIZE_WP_SITE_URL);
                 } else {
                     $site_url = AUTOPTIMIZE_WP_SITE_URL;
                 }
-                $this->debug_log( '`' . $site_url . '` -> `' . $cdn_url . '` in `' . $url . '`' );
-                $url = str_replace( $site_url, $cdn_url, $url );
+                $this->debug_log('`'.$site_url.'` -> `'.$cdn_url.'` in `'.$url.'`');
+                $url = str_replace($site_url, $cdn_url, $url);
             }
 
-            $this->debug_log( 'after=' . $url );
+            $this->debug_log('after='.$url);
         }
 
         // Allow API filter to take further care of CDN replacement.
-        $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url );
+        $url = apply_filters('autoptimize_filter_base_replace_cdn', $url);
 
         return $url;
     }
@@ -355,18 +355,18 @@ 
      *
      * @return void
      */
-    protected function inject_in_html( $payload, $where )
+    protected function inject_in_html($payload, $where)
     {
         $warned   = false;
-        $position = autoptimizeUtils::strpos( $this->content, $where[0] );
-        if ( false !== $position ) {
+        $position = autoptimizeUtils::strpos($this->content, $where[0]);
+        if (false !== $position) {
             // Found the tag, setup content/injection as specified.
-            if ( 'after' === $where[1] ) {
-                $content = $where[0] . $payload;
-            } elseif ( 'replace' === $where[1] ) {
+            if ('after' === $where[1]) {
+                $content = $where[0].$payload;
+            } elseif ('replace' === $where[1]) {
                 $content = $payload;
             } else {
-                $content = $payload . $where[0];
+                $content = $payload.$where[0];
             }
             // Place where specified.
             $this->content = autoptimizeUtils::substr_replace(
@@ -375,14 +375,14 @@ 
                 $position,
                 // Using plain strlen() should be safe here for now, since
                 // we're not searching for multibyte chars here still...
-                strlen( $where[0] )
+                strlen($where[0])
             );
         } else {
             // Couldn't find what was specified, just append and add a warning.
             $this->content .= $payload;
-            if ( ! $warned ) {
-                $tag_display    = str_replace( array( '<', '>' ), '', $where[0] );
-                $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `' . $tag_display . '` missing --><!--/noptimize-->';
+            if (!$warned) {
+                $tag_display    = str_replace(array('<', '>'), '', $where[0]);
+                $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `'.$tag_display.'` missing --><!--/noptimize-->';
                 $warned         = true;
             }
         }
@@ -396,10 +396,10 @@ 
      *
      * @return bool
      */
-    protected function isremovable( $tag, $removables )
+    protected function isremovable($tag, $removables)
     {
-        foreach ( $removables as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($removables as $match) {
+            if (false !== strpos($tag, $match)) {
                 return true;
             }
         }
@@ -414,10 +414,10 @@ 
      *
      * @return string
      */
-    public function inject_minified_callback( $matches )
+    public function inject_minified_callback($matches)
     {
         static $conf = null;
-        if ( null === $conf ) {
+        if (null === $conf) {
             $conf = autoptimizeConfig::instance();
         }
 
@@ -432,62 +432,62 @@ 
         $filehash = null;
 
         // Grab the parts we need.
-        $parts = explode( '|', $matches[1] );
-        if ( ! empty( $parts ) ) {
-            $filepath = isset( $parts[0] ) ? base64_decode( $parts[0] ) : null;
-            $filehash = isset( $parts[1] ) ? $parts[1] : null;
+        $parts = explode('|', $matches[1]);
+        if (!empty($parts)) {
+            $filepath = isset($parts[0]) ? base64_decode($parts[0]) : null;
+            $filehash = isset($parts[1]) ? $parts[1] : null;
         }
 
         // Bail early if something's not right...
-        if ( ! $filepath || ! $filehash ) {
+        if (!$filepath || !$filehash) {
             return "\n";
         }
 
-        $filecontent = file_get_contents( $filepath );
+        $filecontent = file_get_contents($filepath);
 
         // Some things are differently handled for css/js...
-        $is_js_file = ( '.js' === substr( $filepath, -3, 3 ) );
+        $is_js_file = ('.js' === substr($filepath, -3, 3));
 
         $is_css_file = false;
-        if ( ! $is_js_file ) {
-            $is_css_file = ( '.css' === substr( $filepath, -4, 4 ) );
+        if (!$is_js_file) {
+            $is_css_file = ('.css' === substr($filepath, -4, 4));
         }
 
         // BOMs being nuked here unconditionally (regardless of where they are)!
-        $filecontent = preg_replace( "#\x{EF}\x{BB}\x{BF}#", '', $filecontent );
+        $filecontent = preg_replace("#\x{EF}\x{BB}\x{BF}#", '', $filecontent);
 
         // Remove comments and blank lines.
-        if ( $is_js_file ) {
-            $filecontent = preg_replace( '#^\s*\/\/.*$#Um', '', $filecontent );
+        if ($is_js_file) {
+            $filecontent = preg_replace('#^\s*\/\/.*$#Um', '', $filecontent);
         }
 
         // Nuke un-important comments.
-        $filecontent = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent );
+        $filecontent = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent);
 
         // Normalize newlines.
-        $filecontent = preg_replace( '#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent );
+        $filecontent = preg_replace('#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent);
 
         // JS specifics.
-        if ( $is_js_file ) {
+        if ($is_js_file) {
             // Append a semicolon at the end of js files if it's missing.
-            $last_char = substr( $filecontent, -1, 1 );
-            if ( ';' !== $last_char && '}' !== $last_char ) {
+            $last_char = substr($filecontent, -1, 1);
+            if (';' !== $last_char && '}' !== $last_char) {
                 $filecontent .= ';';
             }
             // Check if try/catch should be used.
-            $opt_js_try_catch = $conf->get( 'autoptimize_js_trycatch' );
-            if ( 'on' === $opt_js_try_catch ) {
+            $opt_js_try_catch = $conf->get('autoptimize_js_trycatch');
+            if ('on' === $opt_js_try_catch) {
                 // It should, wrap in try/catch.
-                $filecontent = 'try{' . $filecontent . '}catch(e){}';
+                $filecontent = 'try{'.$filecontent.'}catch(e){}';
             }
-        } elseif ( $is_css_file ) {
-            $filecontent = autoptimizeStyles::fixurls( $filepath, $filecontent );
+        } elseif ($is_css_file) {
+            $filecontent = autoptimizeStyles::fixurls($filepath, $filecontent);
         } else {
             $filecontent = '';
         }
 
         // Return modified (or empty!) code/content.
-        return "\n" . $filecontent;
+        return "\n".$filecontent;
     }
 
     /**
@@ -497,13 +497,13 @@ 
      *
      * @return string
      */
-    protected function inject_minified( $in )
+    protected function inject_minified($in)
     {
         $out = $in;
-        if ( false !== strpos( $in, '%%INJECTLATER%%' ) ) {
+        if (false !== strpos($in, '%%INJECTLATER%%')) {
             $out = preg_replace_callback(
-                '#\/\*\!%%INJECTLATER' . AUTOPTIMIZE_HASH . '%%(.*?)%%INJECTLATER%%\*\/#is',
-                array( $this, 'inject_minified_callback' ),
+                '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is',
+                array($this, 'inject_minified_callback'),
                 $in
             );
         }
@@ -523,9 +523,9 @@ 
      *
      * @return string
      */
-    public static function build_injectlater_marker( $filepath, $hash )
+    public static function build_injectlater_marker($filepath, $hash)
     {
-        $contents = '/*!' . self::build_marker( 'INJECTLATER', $filepath, $hash ) . '*/';
+        $contents = '/*!'.self::build_marker('INJECTLATER', $filepath, $hash).'*/';
 
         return $contents;
     }
@@ -543,18 +543,18 @@ 
      *
      * @return string
      */
-    public static function build_marker( $name, $data, $hash = null )
+    public static function build_marker($name, $data, $hash = null)
     {
         // Start the marker, add the data.
-        $marker = '%%' . $name . AUTOPTIMIZE_HASH . '%%' . base64_encode( $data );
+        $marker = '%%'.$name.AUTOPTIMIZE_HASH.'%%'.base64_encode($data);
 
         // Add the hash if provided.
-        if ( null !== $hash ) {
-            $marker .= '|' . $hash;
+        if (null !== $hash) {
+            $marker .= '|'.$hash;
         }
 
         // Close the marker.
-        $marker .= '%%' . $name . '%%';
+        $marker .= '%%'.$name.'%%';
 
         return $marker;
     }
@@ -574,22 +574,22 @@ 
      *
      * @return string
      */
-    public static function replace_contents_with_marker_if_exists( $marker, $search, $re_replace_pattern, $content )
+    public static function replace_contents_with_marker_if_exists($marker, $search, $re_replace_pattern, $content)
     {
         $found = false;
 
-        $is_regex = autoptimizeUtils::str_is_valid_regex( $search );
-        if ( $is_regex ) {
-            $found = preg_match( $search, $content );
+        $is_regex = autoptimizeUtils::str_is_valid_regex($search);
+        if ($is_regex) {
+            $found = preg_match($search, $content);
         } else {
-            $found = ( false !== strpos( $content, $search ) );
+            $found = (false !== strpos($content, $search));
         }
 
-        if ( $found ) {
+        if ($found) {
             $content = preg_replace_callback(
                 $re_replace_pattern,
-                function( $matches ) use ( $marker ) {
-                    return autoptimizeBase::build_marker( $marker, $matches[0] );
+                function($matches) use ($marker) {
+                    return autoptimizeBase::build_marker($marker, $matches[0]);
                 },
                 $content
             );
@@ -606,13 +606,13 @@ 
      *
      * @return string
      */
-    public static function restore_marked_content( $marker, $content )
+    public static function restore_marked_content($marker, $content)
     {
-        if ( false !== strpos( $content, $marker ) ) {
+        if (false !== strpos($content, $marker)) {
             $content = preg_replace_callback(
-                '#%%' . $marker . AUTOPTIMIZE_HASH . '%%(.*?)%%' . $marker . '%%#is',
-                function ( $matches ) {
-                    return base64_decode( $matches[1] );
+                '#%%'.$marker.AUTOPTIMIZE_HASH.'%%(.*?)%%'.$marker.'%%#is',
+                function($matches) {
+                    return base64_decode($matches[1]);
                 },
                 $content
             );
@@ -628,17 +628,17 @@ 
      *
      * @return void
      */
-    protected function debug_log( $data )
+    protected function debug_log($data)
     {
-        if ( ! isset( $this->debug_log ) || ! $this->debug_log ) {
+        if (!isset($this->debug_log) || !$this->debug_log) {
             return;
         }
 
-        if ( ! is_string( $data ) && ! is_resource( $data ) ) {
-            $data = var_export( $data, true );
+        if (!is_string($data) && !is_resource($data)) {
+            $data = var_export($data, true);
         }
 
-        error_log( $data );
+        error_log($data);
     }
 
     /**
@@ -648,12 +648,12 @@ 
      *
      * @return bool|string to be minified code or false.
      */
-    protected function prepare_minify_single( $filepath )
+    protected function prepare_minify_single($filepath)
     {
         // Decide what we're dealing with, return false if we don't know.
-        if ( autoptimizeUtils::str_ends_in( $filepath, '.js' ) ) {
+        if (autoptimizeUtils::str_ends_in($filepath, '.js')) {
             $type = 'js';
-        } elseif ( autoptimizeUtils::str_ends_in( $filepath, '.css' ) ) {
+        } elseif (autoptimizeUtils::str_ends_in($filepath, '.css')) {
             $type = 'css';
         } else {
             return false;
@@ -662,18 +662,18 @@ 
         // Bail if it looks like its already minifed (by having -min or .min
         // in filename) or if it looks like WP jquery.js (which is minified).
         $minified_variants = array(
-            '-min.' . $type,
-            '.min.' . $type,
+            '-min.'.$type,
+            '.min.'.$type,
             'js/jquery/jquery.js',
         );
-        foreach ( $minified_variants as $ending ) {
-            if ( autoptimizeUtils::str_ends_in( $filepath, $ending ) ) {
+        foreach ($minified_variants as $ending) {
+            if (autoptimizeUtils::str_ends_in($filepath, $ending)) {
                 return false;
             }
         }
 
         // Get file contents, bail if empty.
-        $contents = file_get_contents( $filepath );
+        $contents = file_get_contents($filepath);
 
         return $contents;
     }
@@ -686,12 +686,12 @@ 
      *
      * @return string
      */
-    protected function build_minify_single_url( autoptimizeCache $cache )
+    protected function build_minify_single_url(autoptimizeCache $cache)
     {
-        $url = AUTOPTIMIZE_CACHE_URL . $cache->getname();
+        $url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
 
         // CDN-replace the resulting URL if needed...
-        $url = $this->url_replace_cdn( $url );
+        $url = $this->url_replace_cdn($url);
 
         return $url;
     }