futtta / autoptimize

classes/autoptimizeCacheChecker.php

Spacing +38 added lines, -38 removed lines

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

classes/autoptimizeToolbar.php

Spacing +49 added lines, -49 removed lines

@@ -3,7 +3,7 @@ 
  * Handles toolbar-related stuff.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -12,32 +12,32 @@ 
     public function __construct()
     {
         // If Cache is not available we don't add the toolbar.
-        if ( ! autoptimizeCache::cacheavail() ) {
+        if (!autoptimizeCache::cacheavail()) {
             return;
         }
 
         // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated.
-        add_action( 'wp_loaded', array( $this, 'load_toolbar' ) );
+        add_action('wp_loaded', array($this, 'load_toolbar'));
     }
 
     public function load_toolbar()
     {
         // Check permissions and that toolbar is not hidden via filter.
-        if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) {
+        if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) {
 
             // Create a handler for the AJAX toolbar requests.
-            add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) );
+            add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache'));
 
             // Load custom styles, scripts and menu only when needed.
-            if ( is_admin_bar_showing() ) {
-                if ( is_admin() ) {
-                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+            if (is_admin_bar_showing()) {
+                if (is_admin()) {
+                    add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
                 } else {
-                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+                    add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
                 }
 
                 // Add the Autoptimize Toolbar to the Admin bar.
-                add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 );
+                add_action('admin_bar_menu', array($this, 'add_toolbar'), 100);
             }
         }
     }
@@ -50,17 +50,17 @@ 
         $stats = autoptimizeCache::stats();
 
         // Set the Max Size recommended for cache files.
-        $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 );
+        $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024);
 
         // Retrieve the current Total Files in cache.
         $files = $stats[0];
         // Retrieve the current Total Size of the cache.
         $bytes = $stats[1];
-        $size  = $this->format_filesize( $bytes );
+        $size  = $this->format_filesize($bytes);
 
         // Calculate the percentage of cache used.
-        $percentage = ceil( $bytes / $max_size * 100 );
-        if ( $percentage > 100 ) {
+        $percentage = ceil($bytes/$max_size*100);
+        if ($percentage > 100) {
             $percentage = 100;
         }
 
@@ -70,82 +70,82 @@ 
          * - "orange" if over 80%.
          * - "red" if over 100%.
          */
-        $color = ( 100 == $percentage ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' );
+        $color = (100 == $percentage) ? 'red' : (($percentage > 80) ? 'orange' : 'green');
 
         // Create or add new items into the Admin Toolbar.
         // Main "Autoptimize" node.
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'    => 'autoptimize',
-            'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Autoptimize', 'autoptimize' ) . '</span>',
-            'href'  => admin_url( 'options-general.php?page=autoptimize' ),
-            'meta'  => array( 'class' => 'bullet-' . $color ),
+            'title' => '<span class="ab-icon"></span><span class="ab-label">'.__('Autoptimize', 'autoptimize').'</span>',
+            'href'  => admin_url('options-general.php?page=autoptimize'),
+            'meta'  => array('class' => 'bullet-'.$color),
         ));
 
         // "Cache Info" node.
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-cache-info',
-            'title'  => '<p>' . __( 'Cache Info', 'autoptimize' ) . '</p>' .
-                        '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
-                        '<div class="autoptimize-circle">' .
-                        '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>' .
-                        '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>' .
-                        '<div class="shadow"></div>' .
-                        '</div>' .
-                        '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>' .
-                        '</div>' .
-                        '<table>' .
-                        '<tr><td>' . __( 'Size', 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
-                        '<tr><td>' . __( 'Files', 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
+            'title'  => '<p>'.__('Cache Info', 'autoptimize').'</p>'.
+                        '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'.
+                        '<div class="autoptimize-circle">'.
+                        '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'.
+                        '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'.
+                        '<div class="shadow"></div>'.
+                        '</div>'.
+                        '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'.
+                        '</div>'.
+                        '<table>'.
+                        '<tr><td>'.__('Size', 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'.
+                        '<tr><td>'.__('Files', 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'.
                         '</table>',
             'parent' => 'autoptimize',
         ));
 
         // "Delete Cache" node.
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-delete-cache',
-            'title'  => __( 'Delete Cache', 'autoptimize' ),
+            'title'  => __('Delete Cache', 'autoptimize'),
             'parent' => 'autoptimize',
         ));
     }
 
     public function delete_cache()
     {
-        check_ajax_referer( 'ao_delcache_nonce', 'nonce' );
+        check_ajax_referer('ao_delcache_nonce', 'nonce');
 
         $result = false;
-        if ( current_user_can( 'manage_options' ) ) {
+        if (current_user_can('manage_options')) {
             // We call the function for cleaning the Autoptimize cache.
             $result = autoptimizeCache::clearall();
         }
 
-        wp_send_json( $result );
+        wp_send_json($result);
     }
 
     public function enqueue_scripts()
     {
         // Autoptimize Toolbar Styles.
-        wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all' );
+        wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all');
 
         // Autoptimize Toolbar Javascript.
-        wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), AUTOPTIMIZE_PLUGIN_VERSION, true );
+        wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), AUTOPTIMIZE_PLUGIN_VERSION, true);
 
         // Localizes a registered script with data for a JavaScript variable.
         // Needed for the AJAX to work properly on the frontend.
-        wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array(
-            'ajaxurl'     => admin_url( 'admin-ajax.php' ),
+        wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array(
+            'ajaxurl'     => admin_url('admin-ajax.php'),
             // translators: links to the Autoptimize settings page.
-            'error_msg'   => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href="%s">Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ),
-            'dismiss_msg' => __( 'Dismiss this notice.' ),
-            'nonce'       => wp_create_nonce( 'ao_delcache_nonce' ),
-        ) );
+            'error_msg'   => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href="%s">Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'),
+            'dismiss_msg' => __('Dismiss this notice.'),
+            'nonce'       => wp_create_nonce('ao_delcache_nonce'),
+        ));
     }
 
-    public function format_filesize( $bytes, $decimals = 2 )
+    public function format_filesize($bytes, $decimals = 2)
     {
-        $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' );
+        $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
 
-        for ( $i = 0; ( $bytes / 1024) > 0.9; $i++, $bytes /= 1024 ) {} // @codingStandardsIgnoreLine
+        for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} // @codingStandardsIgnoreLine
 
-        return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[ $i ] );
+        return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]);
     }
 }

classes/autoptimizeExtra.php

Spacing +159 added lines, -159 removed lines

@@ -3,7 +3,7 @@ 
  * Handles autoptimizeExtra frontend features + admin options page
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -21,9 +21,9 @@ 
      *
      * @param array $options Optional. Allows overriding options without having to specify them via admin options page.
      */
-    public function __construct( $options = array() )
+    public function __construct($options = array())
     {
-        if ( empty( $options ) ) {
+        if (empty($options)) {
             $options = self::fetch_options();
         }
 
@@ -32,9 +32,9 @@ 
 
     public function run()
     {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_extra_tab' ) );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'admin_menu'));
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_extra_tab'));
         } else {
             $this->run_on_frontend();
         }
@@ -42,8 +42,8 @@ 
 
     public static function fetch_options()
     {
-        $value = get_option( 'autoptimize_extra_settings' );
-        if ( empty( $value ) ) {
+        $value = get_option('autoptimize_extra_settings');
+        if (empty($value)) {
             // Fallback to returning defaults when no stored option exists yet.
             $value = autoptimizeConfig::get_ao_extra_default_options();
         }
@@ -54,55 +54,55 @@ 
     public function disable_emojis()
     {
         // Removing all actions related to emojis!
-        remove_action( 'admin_print_styles', 'print_emoji_styles' );
-        remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
-        remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
-        remove_action( 'wp_print_styles', 'print_emoji_styles' );
-        remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
-        remove_filter( 'the_content_feed', 'wp_staticize_emoji' );
-        remove_filter( 'comment_text_rss', 'wp_staticize_emoji' );
+        remove_action('admin_print_styles', 'print_emoji_styles');
+        remove_action('wp_head', 'print_emoji_detection_script', 7);
+        remove_action('admin_print_scripts', 'print_emoji_detection_script');
+        remove_action('wp_print_styles', 'print_emoji_styles');
+        remove_filter('wp_mail', 'wp_staticize_emoji_for_email');
+        remove_filter('the_content_feed', 'wp_staticize_emoji');
+        remove_filter('comment_text_rss', 'wp_staticize_emoji');
 
         // Removes TinyMCE emojis.
-        add_filter( 'tiny_mce_plugins', array( $this, 'filter_disable_emojis_tinymce' ) );
+        add_filter('tiny_mce_plugins', array($this, 'filter_disable_emojis_tinymce'));
 
         // Removes emoji dns-preftech.
-        add_filter( 'wp_resource_hints', array( $this, 'filter_remove_emoji_dns_prefetch' ), 10, 2 );
+        add_filter('wp_resource_hints', array($this, 'filter_remove_emoji_dns_prefetch'), 10, 2);
     }
 
-    public function filter_disable_emojis_tinymce( $plugins )
+    public function filter_disable_emojis_tinymce($plugins)
     {
-        if ( is_array( $plugins ) ) {
-            return array_diff( $plugins, array( 'wpemoji' ) );
+        if (is_array($plugins)) {
+            return array_diff($plugins, array('wpemoji'));
         } else {
             return array();
         }
     }
 
-    public function filter_remove_qs( $src )
+    public function filter_remove_qs($src)
     {
-        if ( strpos( $src, '?ver=' ) ) {
-            $src = remove_query_arg( 'ver', $src );
+        if (strpos($src, '?ver=')) {
+            $src = remove_query_arg('ver', $src);
         }
 
         return $src;
     }
 
-    public function extra_async_js( $in )
+    public function extra_async_js($in)
     {
         $exclusions = array();
-        if ( ! empty( $in ) ) {
-            $exclusions = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $in ) ) ), '' );
+        if (!empty($in)) {
+            $exclusions = array_fill_keys(array_filter(array_map('trim', explode(',', $in))), '');
         }
 
         $settings = $this->options['autoptimize_extra_text_field_3'];
-        $async    = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $settings ) ) ), '' );
-        $attr     = apply_filters( 'autoptimize_filter_extra_async', 'async' );
-        foreach ( $async as $k => $v ) {
-            $async[ $k ] = $attr;
+        $async    = array_fill_keys(array_filter(array_map('trim', explode(',', $settings))), '');
+        $attr     = apply_filters('autoptimize_filter_extra_async', 'async');
+        foreach ($async as $k => $v) {
+            $async[$k] = $attr;
         }
 
         // Merge exclusions & asyncs in one array and return to AO API.
-        $merged = array_merge( $exclusions, $async );
+        $merged = array_merge($exclusions, $async);
 
         return $merged;
     }
@@ -112,54 +112,54 @@ 
         $options = $this->options;
 
         // Disable emojis if specified.
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) ) {
+        if (!empty($options['autoptimize_extra_checkbox_field_1'])) {
             $this->disable_emojis();
         }
 
         // Remove version query parameters.
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) ) {
-            add_filter( 'script_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 );
-            add_filter( 'style_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 );
+        if (!empty($options['autoptimize_extra_checkbox_field_0'])) {
+            add_filter('script_loader_src', array($this, 'filter_remove_qs'), 15, 1);
+            add_filter('style_loader_src', array($this, 'filter_remove_qs'), 15, 1);
         }
 
         // Avoiding conflicts of interest when async-javascript plugin is active!
-        $async_js_plugin_active = autoptimizeUtils::is_plugin_active( 'async-javascript/async-javascript.php' );
-        if ( ! empty( $options['autoptimize_extra_text_field_3'] ) && ! $async_js_plugin_active ) {
-            add_filter( 'autoptimize_filter_js_exclude', array( $this, 'extra_async_js' ), 10, 1 );
+        $async_js_plugin_active = autoptimizeUtils::is_plugin_active('async-javascript/async-javascript.php');
+        if (!empty($options['autoptimize_extra_text_field_3']) && !$async_js_plugin_active) {
+            add_filter('autoptimize_filter_js_exclude', array($this, 'extra_async_js'), 10, 1);
         }
 
         // Optimize google fonts!
-        if ( ! empty( $options['autoptimize_extra_radio_field_4'] ) && ( '1' !== $options['autoptimize_extra_radio_field_4'] ) ) {
-            add_filter( 'wp_resource_hints', array( $this, 'filter_remove_gfonts_dnsprefetch' ), 10, 2 );
-            add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_google_fonts' ), 10, 1 );
-            add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_google_fonts' ), 10, 1 );
+        if (!empty($options['autoptimize_extra_radio_field_4']) && ('1' !== $options['autoptimize_extra_radio_field_4'])) {
+            add_filter('wp_resource_hints', array($this, 'filter_remove_gfonts_dnsprefetch'), 10, 2);
+            add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_google_fonts'), 10, 1);
+            add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_google_fonts'), 10, 1);
         }
 
         // Preconnect!
-        if ( ! empty( $options['autoptimize_extra_text_field_2'] ) || has_filter( 'autoptimize_extra_filter_tobepreconn' ) ) {
-            add_filter( 'wp_resource_hints', array( $this, 'filter_preconnect' ), 10, 2 );
+        if (!empty($options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn')) {
+            add_filter('wp_resource_hints', array($this, 'filter_preconnect'), 10, 2);
         }
     }
 
-    public function filter_remove_emoji_dns_prefetch( $urls, $relation_type )
+    public function filter_remove_emoji_dns_prefetch($urls, $relation_type)
     {
-        $emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/' );
+        $emoji_svg_url = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/');
 
-        return $this->filter_remove_dns_prefetch( $urls, $relation_type, $emoji_svg_url );
+        return $this->filter_remove_dns_prefetch($urls, $relation_type, $emoji_svg_url);
     }
 
-    public function filter_remove_gfonts_dnsprefetch( $urls, $relation_type )
+    public function filter_remove_gfonts_dnsprefetch($urls, $relation_type)
     {
-        return $this->filter_remove_dns_prefetch( $urls, $relation_type, 'fonts.googleapis.com' );
+        return $this->filter_remove_dns_prefetch($urls, $relation_type, 'fonts.googleapis.com');
     }
 
-    public function filter_remove_dns_prefetch( $urls, $relation_type, $url_to_remove )
+    public function filter_remove_dns_prefetch($urls, $relation_type, $url_to_remove)
     {
-        if ( 'dns-prefetch' === $relation_type ) {
+        if ('dns-prefetch' === $relation_type) {
             $cnt = 0;
-            foreach ( $urls as $url ) {
-                if ( false !== strpos( $url, $url_to_remove ) ) {
-                    unset( $urls[ $cnt ] );
+            foreach ($urls as $url) {
+                if (false !== strpos($url, $url_to_remove)) {
+                    unset($urls[$cnt]);
                 }
                 $cnt++;
             }
@@ -168,131 +168,131 @@ 
         return $urls;
     }
 
-    public function filter_optimize_google_fonts( $in )
+    public function filter_optimize_google_fonts($in)
     {
         // Extract fonts, partly based on wp rocket's extraction code.
-        $markup = preg_replace( '/<!--(.*)-->/Uis', '', $in );
-        preg_match_all( '#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches );
+        $markup = preg_replace('/<!--(.*)-->/Uis', '', $in);
+        preg_match_all('#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches);
 
         $fonts_collection = array();
-        if ( ! $matches[2] ) {
+        if (!$matches[2]) {
             return $in;
         }
 
         // Store them in $fonts array.
         $i = 0;
-        foreach ( $matches[2] as $font ) {
-            if ( ! preg_match( '/rel=["\']dns-prefetch["\']/', $matches[0][ $i ] ) ) {
+        foreach ($matches[2] as $font) {
+            if (!preg_match('/rel=["\']dns-prefetch["\']/', $matches[0][$i])) {
                 // Get fonts name.
-                $font = str_replace( array( '%7C', '%7c' ), '|', $font );
-                $font = explode( 'family=', $font );
-                $font = ( isset( $font[1] ) ) ? explode( '&', $font[1] ) : array();
+                $font = str_replace(array('%7C', '%7c'), '|', $font);
+                $font = explode('family=', $font);
+                $font = (isset($font[1])) ? explode('&', $font[1]) : array();
                 // Add font to $fonts[$i] but make sure not to pollute with an empty family!
-                $_thisfont = array_values( array_filter( explode( '|', reset( $font ) ) ) );
-                if ( ! empty( $_thisfont ) ) {
-                    $fonts_collection[ $i ]['fonts'] = $_thisfont;
+                $_thisfont = array_values(array_filter(explode('|', reset($font))));
+                if (!empty($_thisfont)) {
+                    $fonts_collection[$i]['fonts'] = $_thisfont;
                     // And add subset if any!
-                    $subset = ( is_array( $font ) ) ? end( $font ) : '';
-                    if ( false !== strpos( $subset, 'subset=' ) ) {
-                        $subset                            = str_replace( array( '%2C', '%2c' ), ',', $subset );
-                        $subset                            = explode( 'subset=', $subset );
-                        $fonts_collection[ $i ]['subsets'] = explode( ',', $subset[1] );
+                    $subset = (is_array($font)) ? end($font) : '';
+                    if (false !== strpos($subset, 'subset=')) {
+                        $subset                            = str_replace(array('%2C', '%2c'), ',', $subset);
+                        $subset                            = explode('subset=', $subset);
+                        $fonts_collection[$i]['subsets'] = explode(',', $subset[1]);
                     }
                 }
                 // And remove Google Fonts.
-                $in = str_replace( $matches[0][ $i ], '', $in );
+                $in = str_replace($matches[0][$i], '', $in);
             }
             $i++;
         }
 
         $options      = $this->options;
         $fonts_markup = '';
-        if ( '2' === $options['autoptimize_extra_radio_field_4'] ) {
+        if ('2' === $options['autoptimize_extra_radio_field_4']) {
             // Remove Google Fonts.
-            unset( $fonts_collection );
+            unset($fonts_collection);
             return $in;
-        } elseif ( '3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4'] ) {
+        } elseif ('3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4']) {
             // Aggregate & link!
             $fonts_string  = '';
             $subset_string = '';
-            foreach ( $fonts_collection as $font ) {
-                $fonts_string .= '|' . trim( implode( '|', $font['fonts'] ), '|' );
-                if ( ! empty( $font['subsets'] ) ) {
-                    $subset_string .= ',' . trim( implode( ',', $font['subsets'] ), ',' );
+            foreach ($fonts_collection as $font) {
+                $fonts_string .= '|'.trim(implode('|', $font['fonts']), '|');
+                if (!empty($font['subsets'])) {
+                    $subset_string .= ','.trim(implode(',', $font['subsets']), ',');
                 }
             }
 
-            if ( ! empty( $subset_string ) ) {
-                $subset_string = str_replace( ',', '%2C', ltrim( $subset_string, ',' ) );
-                $fonts_string  = $fonts_string . '&#038;subset=' . $subset_string;
+            if (!empty($subset_string)) {
+                $subset_string = str_replace(',', '%2C', ltrim($subset_string, ','));
+                $fonts_string  = $fonts_string.'&#038;subset='.$subset_string;
             }
 
-            $fonts_string = str_replace( '|', '%7C', ltrim( $fonts_string, '|' ) );
+            $fonts_string = str_replace('|', '%7C', ltrim($fonts_string, '|'));
 
-            if ( ! empty( $fonts_string ) ) {
-                if ( '5' === $options['autoptimize_extra_radio_field_4'] ) {
-                    $rel_string = 'rel="preload" as="style" onload="' . autoptimizeConfig::get_ao_css_preload_onload() . '"';
+            if (!empty($fonts_string)) {
+                if ('5' === $options['autoptimize_extra_radio_field_4']) {
+                    $rel_string = 'rel="preload" as="style" onload="'.autoptimizeConfig::get_ao_css_preload_onload().'"';
                 } else {
                     $rel_string = 'rel="stylesheet"';
                 }
-                $fonts_markup = '<link ' . $rel_string . ' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family=' . $fonts_string . '" />';
+                $fonts_markup = '<link '.$rel_string.' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family='.$fonts_string.'" />';
             }
-        } elseif ( '4' === $options['autoptimize_extra_radio_field_4'] ) {
+        } elseif ('4' === $options['autoptimize_extra_radio_field_4']) {
             // Aggregate & load async (webfont.js impl.)!
             $fonts_array = array();
-            foreach ( $fonts_collection as $_fonts ) {
-                if ( ! empty( $_fonts['subsets'] ) ) {
-                    $_subset = implode( ',', $_fonts['subsets'] );
-                    foreach ( $_fonts['fonts'] as $key => $_one_font ) {
-                        $_one_font               = $_one_font . ':' . $_subset;
-                        $_fonts['fonts'][ $key ] = $_one_font;
+            foreach ($fonts_collection as $_fonts) {
+                if (!empty($_fonts['subsets'])) {
+                    $_subset = implode(',', $_fonts['subsets']);
+                    foreach ($_fonts['fonts'] as $key => $_one_font) {
+                        $_one_font               = $_one_font.':'.$_subset;
+                        $_fonts['fonts'][$key] = $_one_font;
                     }
                 }
-                $fonts_array = array_merge( $fonts_array, $_fonts['fonts'] );
+                $fonts_array = array_merge($fonts_array, $_fonts['fonts']);
             }
 
-            $fonts_array          = array_map( 'urldecode', $fonts_array );
-            $fonts_markup         = '<script data-cfasync="false" id="ao_optimized_gfonts_config" type="text/javascript">WebFontConfig={google:{families:' . wp_json_encode( $fonts_array ) . ' },classes:false, events:false, timeout:1500};</script>';
+            $fonts_array          = array_map('urldecode', $fonts_array);
+            $fonts_markup         = '<script data-cfasync="false" id="ao_optimized_gfonts_config" type="text/javascript">WebFontConfig={google:{families:'.wp_json_encode($fonts_array).' },classes:false, events:false, timeout:1500};</script>';
             $fonts_library_markup = '<script data-cfasync="false" id="ao_optimized_gfonts_webfontloader" type="text/javascript">(function() {var wf = document.createElement(\'script\');wf.src=\'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js\';wf.type=\'text/javascript\';wf.async=\'true\';var s=document.getElementsByTagName(\'script\')[0];s.parentNode.insertBefore(wf, s);})();</script>';
-            $in                   = substr_replace( $in, $fonts_library_markup . '</head>', strpos( $in, '</head>' ), strlen( '</head>' ) );
+            $in                   = substr_replace($in, $fonts_library_markup.'</head>', strpos($in, '</head>'), strlen('</head>'));
         }
 
         // Replace back in markup.
-        $inject_point = apply_filters( 'autoptimize_filter_extra_gfont_injectpoint', '<link' );
-        $out          = substr_replace( $in, $fonts_markup . $inject_point, strpos( $in, $inject_point ), strlen( $inject_point ) );
-        unset( $fonts_collection );
+        $inject_point = apply_filters('autoptimize_filter_extra_gfont_injectpoint', '<link');
+        $out          = substr_replace($in, $fonts_markup.$inject_point, strpos($in, $inject_point), strlen($inject_point));
+        unset($fonts_collection);
 
         // and insert preload polyfill if "link preload" and if the polyfill isn't there yet (courtesy of inline&defer).
         $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill();
-        if ( '5' === $options['autoptimize_extra_radio_field_4'] && strpos( $out, $preload_polyfill ) === false ) {
-            $out = str_replace( '</body>', $preload_polyfill . '</body>', $out );
+        if ('5' === $options['autoptimize_extra_radio_field_4'] && strpos($out, $preload_polyfill) === false) {
+            $out = str_replace('</body>', $preload_polyfill.'</body>', $out);
         }
         return $out;
     }
 
-    public function filter_preconnect( $hints, $relation_type )
+    public function filter_preconnect($hints, $relation_type)
     {
         $options = $this->options;
 
         // Get settings and store in array.
-        $preconns = array_filter( array_map( 'trim', explode( ',', $options['autoptimize_extra_text_field_2'] ) ) );
-        $preconns = apply_filters( 'autoptimize_extra_filter_tobepreconn', $preconns );
+        $preconns = array_filter(array_map('trim', explode(',', $options['autoptimize_extra_text_field_2'])));
+        $preconns = apply_filters('autoptimize_extra_filter_tobepreconn', $preconns);
 
         // Walk array, extract domain and add to new array with crossorigin attribute.
-        foreach ( $preconns as $preconn ) {
-            $parsed = parse_url( $preconn );
-            if ( is_array( $parsed ) && empty( $parsed['scheme'] ) ) {
-                $domain = '//' . $parsed['host'];
-            } elseif ( is_array( $parsed ) ) {
-                $domain = $parsed['scheme'] . '://' . $parsed['host'];
+        foreach ($preconns as $preconn) {
+            $parsed = parse_url($preconn);
+            if (is_array($parsed) && empty($parsed['scheme'])) {
+                $domain = '//'.$parsed['host'];
+            } elseif (is_array($parsed)) {
+                $domain = $parsed['scheme'].'://'.$parsed['host'];
             }
 
-            if ( ! empty( $domain ) ) {
-                $hint = array( 'href' => $domain );
+            if (!empty($domain)) {
+                $hint = array('href' => $domain);
                 // Fonts don't get preconnected unless crossorigin flag is set, non-fonts don't get preconnected if origin flag is set
                 // so hardcode fonts.gstatic.com to come with crossorigin and have filter to add other domains if needed.
-                $crossorigins = apply_filters( 'autoptimize_extra_filter_preconn_crossorigin', array( 'https://fonts.gstatic.com' ) );
-                if ( in_array( $domain, $crossorigins ) ) {
+                $crossorigins = apply_filters('autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com'));
+                if (in_array($domain, $crossorigins)) {
                     $hint['crossorigin'] = 'anonymous';
                 }
                 $new_hints[] = $hint;
@@ -300,21 +300,21 @@ 
         }
 
         // Merge in WP's preconnect hints.
-        if ( 'preconnect' === $relation_type && ! empty( $new_hints ) ) {
-            $hints = array_merge( $hints, $new_hints );
+        if ('preconnect' === $relation_type && !empty($new_hints)) {
+            $hints = array_merge($hints, $new_hints);
         }
 
         return $hints;
     }
 
-    public function filter_preconnect_google_fonts( $in )
+    public function filter_preconnect_google_fonts($in)
     {
-        if ( '2' !== $this->options['autoptimize_extra_radio_field_4'] ) {
+        if ('2' !== $this->options['autoptimize_extra_radio_field_4']) {
             // Preconnect to fonts.gstatic.com unless we remove gfonts.
             $in[] = 'https://fonts.gstatic.com';
         }
 
-        if ( '4' === $this->options['autoptimize_extra_radio_field_4'] ) {
+        if ('4' === $this->options['autoptimize_extra_radio_field_4']) {
             // Preconnect even more hosts for webfont.js!
             $in[] = 'https://ajax.googleapis.com';
             $in[] = 'https://fonts.googleapis.com';
@@ -331,14 +331,14 @@ 
             'autoptimize_extra',
             'manage_options',
             'autoptimize_extra',
-            array( $this, 'options_page' )
+            array($this, 'options_page')
         );
-        register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
+        register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings');
     }
 
-    public function add_extra_tab( $in )
+    public function add_extra_tab($in)
     {
-        $in = array_merge( $in, array( 'autoptimize_extra' => __( 'Extra', 'autoptimize' ) ) );
+        $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize')));
 
         return $in;
     }
@@ -358,87 +358,87 @@ 
         #autoptimize_extra_descr{font-size: 120%;}
     </style>
     <div class="wrap">
-    <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
         <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
-        <?php if ( 'on' !== get_option( 'autoptimize_js' ) && 'on' !== get_option( 'autoptimize_css' ) && 'on' !== get_option( 'autoptimize_html' ) && ! autoptimizeImages::imgopt_active() ) { ?>
+        <?php if ('on' !== get_option('autoptimize_js') && 'on' !== get_option('autoptimize_css') && 'on' !== get_option('autoptimize_html') && !autoptimizeImages::imgopt_active()) { ?>
             <div class="notice-warning notice"><p>
-            <?php _e( 'Most of below Extra optimizations require at least one of HTML, JS, CSS or Image autoptimizations being active.', 'autoptimize' ); ?>
+            <?php _e('Most of below Extra optimizations require at least one of HTML, JS, CSS or Image autoptimizations being active.', 'autoptimize'); ?>
             </p></div>
         <?php } ?>
 
     <form id='ao_settings_form' action='options.php' method='post'>
-        <?php settings_fields( 'autoptimize_extra_settings' ); ?>
-        <h2><?php _e( 'Extra Auto-Optimizations', 'autoptimize' ); ?></h2>
-        <span id='autoptimize_extra_descr'><?php _e( 'The following settings can improve your site\'s performance even more.', 'autoptimize' ); ?></span>
+        <?php settings_fields('autoptimize_extra_settings'); ?>
+        <h2><?php _e('Extra Auto-Optimizations', 'autoptimize'); ?></h2>
+        <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.', 'autoptimize'); ?></span>
         <table class="form-table">
             <tr>
-                <th scope="row"><?php _e( 'Google Fonts', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Google Fonts', 'autoptimize'); ?></th>
                 <td>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if ( ! in_array( $gfonts, array( 2, 3, 4, 5 ) ) ) { echo 'checked'; } ?> ><?php _e( 'Leave as is', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked( 2, $gfonts, true ); ?> ><?php _e( 'Remove Google Fonts', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked( 3, $gfonts, true ); ?> ><?php _e( 'Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked( 5, $gfonts, true ); ?> ><?php _e( 'Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked( 4, $gfonts, true ); ?> ><?php _e( 'Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize' ); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($gfonts, array(2, 3, 4, 5))) { echo 'checked'; } ?> ><?php _e('Leave as is', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked(2, $gfonts, true); ?> ><?php _e('Remove Google Fonts', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $gfonts, true); ?> ><?php _e('Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked(5, $gfonts, true); ?> ><?php _e('Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $gfonts, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize'); ?><br/>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Remove emojis', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Remove emojis', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) && '1' === $options['autoptimize_extra_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($options['autoptimize_extra_checkbox_field_1']) && '1' === $options['autoptimize_extra_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Remove query strings from static resources', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Remove query strings from static resources', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) && '1' === $options['autoptimize_extra_checkbox_field_0'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty($options['autoptimize_extra_checkbox_field_0']) && '1' === $options['autoptimize_extra_checkbox_field_0']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_2', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_2'] ); } ?>'><br /><?php _e( 'Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php if (array_key_exists('autoptimize_extra_text_field_2', $options)) { echo esc_attr($options['autoptimize_extra_text_field_2']); } ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Async Javascript-files <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
                     <?php
-                    if ( autoptimizeUtils::is_plugin_active( 'async-javascript/async-javascript.php' ) ) {
+                    if (autoptimizeUtils::is_plugin_active('async-javascript/async-javascript.php')) {
                         // translators: link points Async Javascript settings page.
-                        printf( __( 'You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize' ), '<a href="' . 'options-general.php?page=async-javascript' . '">', '</a>' );
+                        printf(__('You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize'), '<a href="'.'options-general.php?page=async-javascript'.'">', '</a>');
                     } else {
                     ?>
-                        <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_3', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_3'] ); } ?>'>
+                        <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php if (array_key_exists('autoptimize_extra_text_field_3', $options)) { echo esc_attr($options['autoptimize_extra_text_field_3']); } ?>'>
                         <br />
                         <?php
-                            _e( 'Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize' );
+                            _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize');
                             // translators: %s will be replaced by a link to the "async javascript" plugin.
-                            echo sprintf( __( 'Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize' ), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"' );
-                            $asj_install_url = network_admin_url() . 'plugin-install.php?s=async+javascript&tab=search&type=term';
-                            echo sprintf( ' <a href="' . $asj_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) );
+                            echo sprintf(__('Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize'), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"');
+                            $asj_install_url = network_admin_url().'plugin-install.php?s=async+javascript&tab=search&type=term';
+                            echo sprintf(' <a href="'.$asj_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize'));
                     }
                     ?>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Optimize YouTube videos', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Optimize YouTube videos', 'autoptimize'); ?></th>
                 <td>
                     <?php
-                    if ( autoptimizeUtils::is_plugin_active( 'wp-youtube-lyte/wp-youtube-lyte.php' ) ) {
-                        _e( 'Great, you have WP YouTube Lyte installed.', 'autoptimize' );
+                    if (autoptimizeUtils::is_plugin_active('wp-youtube-lyte/wp-youtube-lyte.php')) {
+                        _e('Great, you have WP YouTube Lyte installed.', 'autoptimize');
                         $lyte_config_url = 'options-general.php?page=lyte_settings_page';
-                        echo sprintf( ' <a href="' . $lyte_config_url . '">%s</a>', __( 'Click here to configure it.', 'autoptimize' ) );
+                        echo sprintf(' <a href="'.$lyte_config_url.'">%s</a>', __('Click here to configure it.', 'autoptimize'));
                     } else {
                         // translators: %s will be replaced by a link to "wp youtube lyte" plugin.
-                        echo sprintf( __( '%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize' ), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>' );
-                        $lyte_install_url = network_admin_url() . 'plugin-install.php?s=lyte&tab=search&type=term';
-                        echo sprintf( ' <a href="' . $lyte_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) );
+                        echo sprintf(__('%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize'), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>');
+                        $lyte_install_url = network_admin_url().'plugin-install.php?s=lyte&tab=search&type=term';
+                        echo sprintf(' <a href="'.$lyte_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize'));
                     }
                     ?>
                 </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>
         <?php
     }

autoptimize.php

Spacing +33 added lines, -33 removed lines

@@ -16,66 +16,66 @@ 
  */
 
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
-define( 'AUTOPTIMIZE_PLUGIN_VERSION', '2.5.0' );
+define('AUTOPTIMIZE_PLUGIN_VERSION', '2.5.0');
 
 // plugin_dir_path() returns the trailing slash!
-define( 'AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
-define( 'AUTOPTIMIZE_PLUGIN_FILE', __FILE__ );
+define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__));
+define('AUTOPTIMIZE_PLUGIN_FILE', __FILE__);
 
 // Bail early if attempting to run on non-supported php versions.
-if ( version_compare( PHP_VERSION, '5.3', '<' ) ) {
+if (version_compare(PHP_VERSION, '5.3', '<')) {
     function autoptimize_incompatible_admin_notice() {
-        echo '<div class="error"><p>' . __( 'Autoptimize requires PHP 5.3 (or higher) to function properly. Please upgrade PHP. The Plugin has been auto-deactivated.', 'autoptimize' ) . '</p></div>';
-        if ( isset( $_GET['activate'] ) ) {
-            unset( $_GET['activate'] );
+        echo '<div class="error"><p>'.__('Autoptimize requires PHP 5.3 (or higher) to function properly. Please upgrade PHP. The Plugin has been auto-deactivated.', 'autoptimize').'</p></div>';
+        if (isset($_GET['activate'])) {
+            unset($_GET['activate']);
         }
     }
     function autoptimize_deactivate_self() {
-        deactivate_plugins( plugin_basename( AUTOPTIMIZE_PLUGIN_FILE ) );
+        deactivate_plugins(plugin_basename(AUTOPTIMIZE_PLUGIN_FILE));
     }
-    add_action( 'admin_notices', 'autoptimize_incompatible_admin_notice' );
-    add_action( 'admin_init', 'autoptimize_deactivate_self' );
+    add_action('admin_notices', 'autoptimize_incompatible_admin_notice');
+    add_action('admin_init', 'autoptimize_deactivate_self');
     return;
 }
 
-function autoptimize_autoload( $class_name ) {
-    if ( in_array( $class_name, array( 'Minify_HTML', 'JSMin' ) ) ) {
-        $file     = strtolower( $class_name );
-        $file     = str_replace( '_', '-', $file );
-        $path     = dirname( __FILE__ ) . '/classes/external/php/';
-        $filepath = $path . $file . '.php';
-    } elseif ( false !== strpos( $class_name, 'Autoptimize\\tubalmartin\\CssMin' ) ) {
-        $file     = str_replace( 'Autoptimize\\tubalmartin\\CssMin\\', '', $class_name );
-        $path     = dirname( __FILE__ ) . '/classes/external/php/yui-php-cssmin-bundled/';
-        $filepath = $path . $file . '.php';
-    } elseif ( 'autoptimize' === substr( $class_name, 0, 11 ) ) {
+function autoptimize_autoload($class_name) {
+    if (in_array($class_name, array('Minify_HTML', 'JSMin'))) {
+        $file     = strtolower($class_name);
+        $file     = str_replace('_', '-', $file);
+        $path     = dirname(__FILE__).'/classes/external/php/';
+        $filepath = $path.$file.'.php';
+    } elseif (false !== strpos($class_name, 'Autoptimize\\tubalmartin\\CssMin')) {
+        $file     = str_replace('Autoptimize\\tubalmartin\\CssMin\\', '', $class_name);
+        $path     = dirname(__FILE__).'/classes/external/php/yui-php-cssmin-bundled/';
+        $filepath = $path.$file.'.php';
+    } elseif ('autoptimize' === substr($class_name, 0, 11)) {
         // One of our "old" classes.
         $file     = $class_name;
-        $path     = dirname( __FILE__ ) . '/classes/';
-        $filepath = $path . $file . '.php';
-    } elseif ( 'PAnD' === $class_name ) {
+        $path     = dirname(__FILE__).'/classes/';
+        $filepath = $path.$file.'.php';
+    } elseif ('PAnD' === $class_name) {
         $file     = 'persist-admin-notices-dismissal';
-        $path     = dirname( __FILE__ ) . '/classes/external/php/persist-admin-notices-dismissal/';
-        $filepath = $path . $file . '.php';
+        $path     = dirname(__FILE__).'/classes/external/php/persist-admin-notices-dismissal/';
+        $filepath = $path.$file.'.php';
     }
 
     // If we didn't match one of our rules, bail!
-    if ( ! isset( $filepath ) ) {
+    if (!isset($filepath)) {
         return;
     }
 
     require $filepath;
 }
 
-spl_autoload_register( 'autoptimize_autoload' );
+spl_autoload_register('autoptimize_autoload');
 
 // Load WP CLI command(s) on demand.
-if ( defined( 'WP_CLI' ) && WP_CLI ) {
-    require AUTOPTIMIZE_PLUGIN_DIR . 'classes/autoptimizeCLI.php';
+if (defined('WP_CLI') && WP_CLI) {
+    require AUTOPTIMIZE_PLUGIN_DIR.'classes/autoptimizeCLI.php';
 }
 
 /**
@@ -86,8 +86,8 @@ 
 function autoptimize() {
     static $plugin = null;
 
-    if ( null === $plugin ) {
-        $plugin = new autoptimizeMain( AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE );
+    if (null === $plugin) {
+        $plugin = new autoptimizeMain(AUTOPTIMIZE_PLUGIN_VERSION, AUTOPTIMIZE_PLUGIN_FILE);
     }
 
     return $plugin;

classes/autoptimizeVersionUpdatesHandler.php

Spacing +62 added lines, -62 removed lines

@@ -3,7 +3,7 @@ 
  * Handles version updates and should only be instantiated in autoptimize.php if/when needed.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -16,9 +16,9 @@ 
      */
     protected $current_major_version = null;
 
-    public function __construct( $current_version )
+    public function __construct($current_version)
     {
-        $this->current_major_version = substr( $current_version, 0, 3 );
+        $this->current_major_version = substr($current_version, 0, 3);
     }
 
     /**
@@ -29,7 +29,7 @@ 
     {
         $major_update = false;
 
-        switch ( $this->current_major_version ) {
+        switch ($this->current_major_version) {
             case '1.6':
                 $this->upgrade_from_1_6();
                 $major_update = true;
@@ -47,7 +47,7 @@ 
                 $major_update = true;
                 // No break, intentionally, so all upgrades are ran during a single request...
             case '2.4':
-                if ( get_option( 'autoptimize_version', 'none' ) == '2.4.2' ) {
+                if (get_option('autoptimize_version', 'none') == '2.4.2') {
                     $this->upgrade_from_2_4_2();
                 }
                 $this->upgrade_from_2_4();
@@ -55,7 +55,7 @@ 
                 // No break, intentionally, so all upgrades are ran during a single request...
         }
 
-        if ( true === $major_update ) {
+        if (true === $major_update) {
             $this->on_major_version_update();
         }
     }
@@ -67,19 +67,19 @@ 
      *
      * @param string $target Target version to check against (ie., the currently running one).
      */
-    public static function check_installed_and_update( $target )
+    public static function check_installed_and_update($target)
     {
-        $db_version = get_option( 'autoptimize_version', 'none' );
-        if ( $db_version !== $target ) {
-            if ( 'none' === $db_version ) {
-                add_action( 'admin_notices', 'autoptimizeMain::notice_installed' );
+        $db_version = get_option('autoptimize_version', 'none');
+        if ($db_version !== $target) {
+            if ('none' === $db_version) {
+                add_action('admin_notices', 'autoptimizeMain::notice_installed');
             } else {
-                $updater = new self( $db_version );
+                $updater = new self($db_version);
                 $updater->run_needed_major_upgrades();
             }
 
             // Versions differed, upgrades happened if needed, store the new version.
-            update_option( 'autoptimize_version', $target );
+            update_option('autoptimize_version', $target);
         }
     }
 
@@ -90,10 +90,10 @@ 
     protected function on_major_version_update()
     {
         // The transients guard here prevents stale object caches from busting the cache on every request.
-        if ( false == get_transient( 'autoptimize_stale_option_buster' ) ) {
-            set_transient( 'autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS );
+        if (false == get_transient('autoptimize_stale_option_buster')) {
+            set_transient('autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS);
             autoptimizeCache::clearall();
-            add_action( 'admin_notices', 'autoptimizeMain::notice_updated' );
+            add_action('admin_notices', 'autoptimizeMain::notice_updated');
         }
     }
 
@@ -103,7 +103,7 @@ 
     private function upgrade_from_1_6()
     {
         // If user was on version 1.6.x, force advanced options to be shown by default.
-        update_option( 'autoptimize_show_adv', '1' );
+        update_option('autoptimize_show_adv', '1');
 
         // And remove old options.
         $to_delete_options = array(
@@ -115,8 +115,8 @@ 
             'autoptimize_cdn_img_url',
             'autoptimize_css_yui',
         );
-        foreach ( $to_delete_options as $del_opt ) {
-            delete_option( $del_opt );
+        foreach ($to_delete_options as $del_opt) {
+            delete_option($del_opt);
         }
     }
 
@@ -127,29 +127,29 @@ 
      */
     private function upgrade_from_1_7()
     {
-        if ( ! is_multisite() ) {
-            $css_exclude = get_option( 'autoptimize_css_exclude' );
-            if ( empty( $css_exclude ) ) {
+        if (!is_multisite()) {
+            $css_exclude = get_option('autoptimize_css_exclude');
+            if (empty($css_exclude)) {
                 $css_exclude = 'admin-bar.min.css, dashicons.min.css';
-            } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
+            } elseif (false === strpos($css_exclude, 'dashicons.min.css')) {
                 $css_exclude .= ', dashicons.min.css';
             }
-            update_option( 'autoptimize_css_exclude', $css_exclude );
+            update_option('autoptimize_css_exclude', $css_exclude);
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                $css_exclude = get_option( 'autoptimize_css_exclude' );
-                if ( empty( $css_exclude ) ) {
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                $css_exclude = get_option('autoptimize_css_exclude');
+                if (empty($css_exclude)) {
                     $css_exclude = 'admin-bar.min.css, dashicons.min.css';
-                } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
+                } elseif (false === strpos($css_exclude, 'dashicons.min.css')) {
                     $css_exclude .= ', dashicons.min.css';
                 }
-                update_option( 'autoptimize_css_exclude', $css_exclude );
+                update_option('autoptimize_css_exclude', $css_exclude);
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -161,19 +161,19 @@ 
      */
     private function upgrade_from_1_9()
     {
-        if ( ! is_multisite() ) {
-            update_option( 'autoptimize_css_include_inline', 'on' );
-            update_option( 'autoptimize_js_include_inline', 'on' );
+        if (!is_multisite()) {
+            update_option('autoptimize_css_include_inline', 'on');
+            update_option('autoptimize_js_include_inline', 'on');
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                update_option( 'autoptimize_css_include_inline', 'on' );
-                update_option( 'autoptimize_js_include_inline', 'on' );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                update_option('autoptimize_css_include_inline', 'on');
+                update_option('autoptimize_js_include_inline', 'on');
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -184,17 +184,17 @@ 
      */
     private function upgrade_from_2_2()
     {
-        if ( ! is_multisite() ) {
+        if (!is_multisite()) {
             $this->do_2_2_settings_update();
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
                 $this->do_2_2_settings_update();
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -203,12 +203,12 @@ 
      */
     private function do_2_2_settings_update()
     {
-        $nogooglefont    = get_option( 'autoptimize_css_nogooglefont', '' );
-        $ao_extrasetting = get_option( 'autoptimize_extra_settings', '' );
-        if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) {
-            update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
+        $nogooglefont    = get_option('autoptimize_css_nogooglefont', '');
+        $ao_extrasetting = get_option('autoptimize_extra_settings', '');
+        if (($nogooglefont) && (empty($ao_extrasetting))) {
+            update_option('autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options());
         }
-        delete_option( 'autoptimize_css_nogooglefont' );
+        delete_option('autoptimize_css_nogooglefont');
     }
 
     /**
@@ -220,33 +220,33 @@ 
         $jobs = _get_cron_array();
 
         // Remove all ao_cachechecker cron jobs (for now).
-        foreach ( $jobs as $when => $job ) {
-            $name = key( $job );
+        foreach ($jobs as $when => $job) {
+            $name = key($job);
 
-            if ( false !== strpos( $name, 'ao_cachechecker' ) ) {
-                unset( $jobs[ $when ] );
+            if (false !== strpos($name, 'ao_cachechecker')) {
+                unset($jobs[$when]);
             }
         }
 
         // Save the data.
-        _set_cron_array( $jobs );
+        _set_cron_array($jobs);
     }
 
     /**
      * Migrate imgopt options from autoptimize_extra_settings to autoptimize_imgopt_settings
      */
     private function upgrade_from_2_4() {
-        $extra_settings  = get_option( 'autoptimize_extra_settings', '' );
-        $imgopt_settings = get_option( 'autoptimize_imgopt_settings', '' );
-        if ( empty( $imgopt_settings ) && ! empty( $extra_settings ) ) {
+        $extra_settings  = get_option('autoptimize_extra_settings', '');
+        $imgopt_settings = get_option('autoptimize_imgopt_settings', '');
+        if (empty($imgopt_settings) && !empty($extra_settings)) {
             $imgopt_settings = autoptimizeConfig::get_ao_imgopt_default_options();
-            if ( array_key_exists( 'autoptimize_extra_checkbox_field_5', $extra_settings ) ) {
+            if (array_key_exists('autoptimize_extra_checkbox_field_5', $extra_settings)) {
                 $imgopt_settings['autoptimize_imgopt_checkbox_field_1'] = $extra_settings['autoptimize_extra_checkbox_field_5'];
             }
-            if ( array_key_exists( 'autoptimize_extra_select_field_6', $extra_settings ) ) {
+            if (array_key_exists('autoptimize_extra_select_field_6', $extra_settings)) {
                 $imgopt_settings['autoptimize_imgopt_select_field_2'] = $extra_settings['autoptimize_extra_select_field_6'];
             }
-            update_option( 'autoptimize_imgopt_settings', $imgopt_settings );
+            update_option('autoptimize_imgopt_settings', $imgopt_settings);
         }
     }
 }

classes/autoptimizeImages.php

Doc Comments +13 added lines, -1 removed lines

@@ -362,6 +362,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     private function get_imgopt_base_url()
     {
         static $imgopt_base_url = null;
@@ -711,6 +714,9 @@ 
         return $out;
     }
 
+    /**
+     * @param string $tag
+     */
     public function add_lazyload( $tag ) {
         // adds actual lazyload-attributes to an image node.
         if ( str_ireplace( $this->get_lazyload_exclusions(), '', $tag ) === $tag ) {
@@ -790,6 +796,9 @@ 
         return $exclude_lazyload_array;
     }
 
+    /**
+     * @param string $target_class
+     */
     public function inject_classes_in_tag( $tag, $target_class ) {
         if ( strpos( $tag, 'class=' ) !== false ) {
             $tag = preg_replace( '/(\sclass\s?=\s?("|\'))/', '$1' . $target_class, $tag );
@@ -819,6 +828,9 @@ 
         return $webp_return;
     }
 
+    /**
+     * @return string
+     */
     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 ) {
@@ -1140,7 +1152,7 @@ 
     /**
      * Determines and returns the service launch status.
      *
-     * @return bool
+     * @return null|boolean
      */
     public function launch_ok()
     {

Spacing +306 added lines, -306 removed lines

@@ -3,7 +3,7 @@ 
  * Handles optimizing images.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -23,17 +23,17 @@ 
      */
     protected static $instance = null;
 
-    public function __construct( array $options = array() )
+    public function __construct(array $options = array())
     {
         // If options are not provided, fetch them.
-        if ( empty( $options ) ) {
+        if (empty($options)) {
             $options = $this->fetch_options();
         }
 
-        $this->set_options( $options );
+        $this->set_options($options);
     }
 
-    public function set_options( array $options )
+    public function set_options(array $options)
     {
         $this->options = $options;
 
@@ -42,17 +42,17 @@ 
 
     public static function fetch_options()
     {
-        $value = get_option( 'autoptimize_imgopt_settings' );
-        if ( empty( $value ) ) {
+        $value = 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'] = get_option( 'autoptimize_service_availablity' );
+        $value['availabilities'] = get_option('autoptimize_service_availablity');
 
-        if ( empty( $value['availabilities'] ) ) {
-            $value['availabilities'] = autoptimizeUtils::check_service_availability( true );
+        if (empty($value['availabilities'])) {
+            $value['availabilities'] = autoptimizeUtils::check_service_availability(true);
         }
 
         return $value;
@@ -65,9 +65,9 @@ 
         // and does not use/ request the availablity data (which could slow things down).
         static $imgopt_active = null;
 
-        if ( null === $imgopt_active ) {
-            $opts = 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 = get_option('autoptimize_imgopt_settings', '');
+            if (!empty($opts) && is_array($opts) && array_key_exists('autoptimize_imgopt_checkbox_field_1', $opts) && !empty($opts['autoptimize_imgopt_checkbox_field_1']) && '1' === $opts['autoptimize_imgopt_checkbox_field_1']) {
                 $imgopt_active = true;
             } else {
                 $imgopt_active = false;
@@ -87,7 +87,7 @@ 
      */
     public static function instance()
     {
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new self();
         }
 
@@ -96,26 +96,26 @@ 
 
     public function run()
     {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'imgopt_admin_menu' ) );
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_imgopt_tab' ), 9 );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'imgopt_admin_menu'));
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_imgopt_tab'), 9);
         } else {
             $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(
                     '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
                 );
@@ -125,39 +125,39 @@ 
 
         $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_action(
                 'wp_footer',
-                array( $this, 'add_lazyload_js_footer' )
+                array($this, 'add_lazyload_js_footer')
             );
         }
     }
@@ -170,8 +170,8 @@ 
     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();
@@ -183,7 +183,7 @@ 
             $this->imgopt_active()
             && $do_cdn
             && $service_not_down
-            && ( $not_launch_status || $this->launch_ok() )
+            && ($not_launch_status || $this->launch_ok())
         ) {
             return true;
         }
@@ -194,13 +194,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;
@@ -215,7 +215,7 @@ 
 
     public static function get_service_url_suffix()
     {
-        $suffix = '/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN;
+        $suffix = '/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN;
 
         return $suffix;
     }
@@ -224,12 +224,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]
             );
         }
 
@@ -240,7 +240,7 @@ 
     {
         static $map = null;
 
-        if ( null === $map ) {
+        if (null === $map) {
             $map = array(
                 '1' => 'lossy',
                 '2' => 'glossy',
@@ -259,12 +259,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 {
@@ -275,10 +275,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;
     }
@@ -291,20 +291,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 ) ) {
-            $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', get_option( 'autoptimize_cdn_url', '' ) );
-            if ( ! empty( $cdn_url ) ) {
-                $cdn_domain = parse_url( $cdn_url, PHP_URL_HOST );
+        if (is_null($cdn_domain)) {
+            $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', get_option('autoptimize_cdn_url', ''));
+            if (!empty($cdn_url)) {
+                $cdn_domain = parse_url($cdn_url, PHP_URL_HOST);
             } else {
                 $cdn_domain = '';
             }
@@ -320,43 +320,43 @@ 
          * 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 what was given to us.
             $result = $in;
-            if ( autoptimizeUtils::is_protocol_relative( $in ) ) {
-                $result = $parsed_site_url['scheme'] . ':' . $in;
-            } elseif ( 0 === strpos( $in, '/' ) ) {
+            if (autoptimizeUtils::is_protocol_relative($in)) {
+                $result = $parsed_site_url['scheme'].':'.$in;
+            } elseif (0 === strpos($in, '/')) {
                 // Root-relative...
-                $result = $parsed_site_url['scheme'] . '://' . $parsed_site_url['host'];
+                $result = $parsed_site_url['scheme'].'://'.$parsed_site_url['host'];
                 // Add the path for subfolder installs.
-                if ( isset( $parsed_site_url['path'] ) ) {
+                if (isset($parsed_site_url['path'])) {
                     $result .= $parsed_site_url['path'];
                 }
                 $result .= $in;
-            } elseif ( ! empty( $cdn_domain ) && strpos( $in, $cdn_domain ) !== 0 ) {
-                $result = str_replace( $cdn_domain, $parsed_site_url['host'], $in );
+            } elseif (!empty($cdn_domain) && strpos($in, $cdn_domain) !== 0) {
+                $result = str_replace($cdn_domain, $parsed_site_url['host'], $in);
             }
 
-            $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;
         }
@@ -366,50 +366,50 @@ 
     {
         static $imgopt_base_url = null;
 
-        if ( null === $imgopt_base_url ) {
+        if (null === $imgopt_base_url) {
             $imgopt_host     = $this->get_imgopt_host();
             $quality         = $this->get_img_quality_string();
-            $ret_val         = apply_filters( 'autoptimize_filter_imgopt_wait', 'ret_img' ); // values: ret_wait, ret_img, ret_json, ret_blank.
-            $imgopt_base_url = $imgopt_host . 'client/' . $quality . ',' . $ret_val;
-            $imgopt_base_url = apply_filters( 'autoptimize_filter_imgopt_base_url', $imgopt_base_url );
+            $ret_val         = apply_filters('autoptimize_filter_imgopt_wait', 'ret_img'); // values: ret_wait, ret_img, ret_json, ret_blank.
+            $imgopt_base_url = $imgopt_host.'client/'.$quality.','.$ret_val;
+            $imgopt_base_url = apply_filters('autoptimize_filter_imgopt_base_url', $imgopt_base_url);
         }
 
         return $imgopt_base_url;
     }
 
-    private function can_optimize_image( $url )
+    private function can_optimize_image($url)
     {
         static $cdn_url      = null;
         static $nopti_images = null;
 
-        if ( null === $cdn_url ) {
+        if (null === $cdn_url) {
             $cdn_url = apply_filters(
                 'autoptimize_filter_base_cdnurl',
-                get_option( 'autoptimize_cdn_url', '' )
+                get_option('autoptimize_cdn_url', '')
             );
         }
 
-        if ( null === $nopti_images ) {
-            $nopti_images = apply_filters( 'autoptimize_filter_imgopt_noptimize', '' );
+        if (null === $nopti_images) {
+            $nopti_images = apply_filters('autoptimize_filter_imgopt_noptimize', '');
         }
 
         $site_host  = AUTOPTIMIZE_SITE_DOMAIN;
-        $url        = $this->normalize_img_url( $url );
-        $url_parsed = parse_url( $url );
+        $url        = $this->normalize_img_url($url);
+        $url_parsed = parse_url($url);
 
-        if ( array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host && empty( $cdn_url ) ) {
+        if (array_key_exists('host', $url_parsed) && $url_parsed['host'] !== $site_host && empty($cdn_url)) {
             return false;
-        } elseif ( ! empty( $cdn_url ) && strpos( $url, $cdn_url ) === false && array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host ) {
+        } elseif (!empty($cdn_url) && strpos($url, $cdn_url) === false && array_key_exists('host', $url_parsed) && $url_parsed['host'] !== $site_host) {
             return false;
-        } elseif ( strpos( $url, '.php' ) !== false ) {
+        } elseif (strpos($url, '.php') !== false) {
             return false;
-        } elseif ( str_ireplace( array( '.png', '.gif', '.jpg', '.jpeg', '.webp' ), '', $url_parsed['path'] ) === $url_parsed['path'] ) {
+        } elseif (str_ireplace(array('.png', '.gif', '.jpg', '.jpeg', '.webp'), '', $url_parsed['path']) === $url_parsed['path']) {
             // fixme: better check against end of string.
             return false;
-        } elseif ( ! empty( $nopti_images ) ) {
-            $nopti_images_array = array_filter( array_map( 'trim', explode( ',', $nopti_images ) ) );
-            foreach ( $nopti_images_array as $nopti_image ) {
-                if ( strpos( $url, $nopti_image ) !== false ) {
+        } elseif (!empty($nopti_images)) {
+            $nopti_images_array = array_filter(array_map('trim', explode(',', $nopti_images)));
+            foreach ($nopti_images_array as $nopti_image) {
+                if (strpos($url, $nopti_image) !== false) {
                     return false;
                 }
             }
@@ -417,13 +417,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;
@@ -437,42 +437,42 @@ 
         );
 
         // If filter modified the url, return that.
-        if ( $filtered_url !== $orig_url ) {
+        if ($filtered_url !== $orig_url) {
             return $filtered_url;
         }
 
-        $orig_url        = $this->normalize_img_url( $orig_url );
+        $orig_url        = $this->normalize_img_url($orig_url);
         $imgopt_base_url = $this->get_imgopt_base_url();
         $imgopt_size     = '';
 
-        if ( $width && 0 !== $width ) {
-            $imgopt_size = ',w_' . $width;
+        if ($width && 0 !== $width) {
+            $imgopt_size = ',w_'.$width;
         }
 
-        if ( $height && 0 !== $height ) {
-            $imgopt_size .= ',h_' . $height;
+        if ($height && 0 !== $height) {
+            $imgopt_size .= ',h_'.$height;
         }
 
-        $url = $imgopt_base_url . $imgopt_size . '/' . $orig_url;
+        $url = $imgopt_base_url.$imgopt_size.'/'.$orig_url;
 
         return $url;
     }
 
-    public function replace_data_thumbs( $matches )
+    public function replace_data_thumbs($matches)
     {
-        return $this->replace_img_callback( $matches, 150, 150 );
+        return $this->replace_img_callback($matches, 150, 150);
     }
 
-    public function replace_img_callback( $matches, $width = 0, $height = 0 )
+    public function replace_img_callback($matches, $width = 0, $height = 0)
     {
-        if ( $this->can_optimize_image( $matches[1] ) ) {
-            return str_replace( $matches[1], $this->build_imgopt_url( $matches[1], $width, $height ), $matches[0] );
+        if ($this->can_optimize_image($matches[1])) {
+            return str_replace($matches[1], $this->build_imgopt_url($matches[1], $width, $height), $matches[0]);
         } else {
             return $matches[0];
         }
     }
 
-    public function filter_optimize_images( $in )
+    public function filter_optimize_images($in)
     {
         /*
          * potential future functional improvements:
@@ -483,7 +483,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(
                 'NOSCRIPT',
                 '<noscript',
@@ -493,25 +493,25 @@ 
         }
 
         // extract img tags.
-        if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $in, $matches ) ) {
-            foreach ( $matches[0] as $tag ) {
+        if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $in, $matches)) {
+            foreach ($matches[0] as $tag) {
                 $orig_tag = $tag;
                 $imgopt_w = '';
                 $imgopt_h = '';
 
                 // first do (data-)srcsets.
-                if ( preg_match_all( '#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER ) ) {
-                    foreach ( $allsrcsets as $srcset ) {
+                if (preg_match_all('#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER)) {
+                    foreach ($allsrcsets as $srcset) {
                         $srcset  = $srcset[2];
-                        $srcsets = explode( ',', $srcset );
-                        foreach ( $srcsets as $indiv_srcset ) {
-                            $indiv_srcset_parts = explode( ' ', trim( $indiv_srcset ) );
-                            if ( isset( $indiv_srcset_parts[1] ) && rtrim( $indiv_srcset_parts[1], 'w' ) !== $indiv_srcset_parts[1] ) {
-                                $imgopt_w = rtrim( $indiv_srcset_parts[1], 'w' );
+                        $srcsets = explode(',', $srcset);
+                        foreach ($srcsets as $indiv_srcset) {
+                            $indiv_srcset_parts = explode(' ', trim($indiv_srcset));
+                            if (isset($indiv_srcset_parts[1]) && rtrim($indiv_srcset_parts[1], 'w') !== $indiv_srcset_parts[1]) {
+                                $imgopt_w = rtrim($indiv_srcset_parts[1], 'w');
                             }
-                            if ( $this->can_optimize_image( $indiv_srcset_parts[0] ) ) {
-                                $imgopt_url = $this->build_imgopt_url( $indiv_srcset_parts[0], $imgopt_w, '' );
-                                $tag        = str_replace( $indiv_srcset_parts[0], $imgopt_url, $tag );
+                            if ($this->can_optimize_image($indiv_srcset_parts[0])) {
+                                $imgopt_url = $this->build_imgopt_url($indiv_srcset_parts[0], $imgopt_w, '');
+                                $tag        = str_replace($indiv_srcset_parts[0], $imgopt_url, $tag);
                             }
                         }
                     }
@@ -519,136 +519,136 @@ 
 
                 // proceed with img src.
                 // get width and height and add to $imgopt_size.
-                $_get_size = $this->get_size_from_tag( $tag );
+                $_get_size = $this->get_size_from_tag($tag);
                 $imgopt_w  = $_get_size['width'];
                 $imgopt_h  = $_get_size['height'];
 
                 // then start replacing images src.
-                if ( preg_match_all( '#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER ) ) {
-                    foreach ( $urls as $url ) {
+                if (preg_match_all('#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER)) {
+                    foreach ($urls as $url) {
                         $full_src_orig = $url[0];
                         $url           = $url[1];
-                        if ( $this->can_optimize_image( $url ) ) {
-                            $imgopt_url      = $this->build_imgopt_url( $url, $imgopt_w, $imgopt_h );
-                            $full_imgopt_src = str_replace( $url, $imgopt_url, $full_src_orig );
-                            $tag             = str_replace( $full_src_orig, $full_imgopt_src, $tag );
+                        if ($this->can_optimize_image($url)) {
+                            $imgopt_url      = $this->build_imgopt_url($url, $imgopt_w, $imgopt_h);
+                            $full_imgopt_src = str_replace($url, $imgopt_url, $full_src_orig);
+                            $tag             = str_replace($full_src_orig, $full_imgopt_src, $tag);
                         }
                     }
                 }
 
                 // do lazyload stuff.
-                if ( $this->should_lazyload() && str_ireplace( $this->get_lazyload_exclusions(), '', $tag ) === $tag ) {
-                    $noscript_tag = '<noscript>' . $tag . '</noscript>';
-                    $tag          = str_replace( 'srcset=', 'data-srcset=', $tag );
+                if ($this->should_lazyload() && str_ireplace($this->get_lazyload_exclusions(), '', $tag) === $tag) {
+                    $noscript_tag = '<noscript>'.$tag.'</noscript>';
+                    $tag          = str_replace('srcset=', 'data-srcset=', $tag);
 
                     // add lazyload class.
-                    $tag = $this->inject_classes_in_tag( $tag, 'lazyload ' );
+                    $tag = $this->inject_classes_in_tag($tag, 'lazyload ');
 
                     // set placeholder.
-                    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;
                     }
-                    if ( $this->can_optimize_image( $_url ) && apply_filters( 'autoptimize_filter_imgopt_lazyload_dolqip', true ) ) {
+                    if ($this->can_optimize_image($_url) && apply_filters('autoptimize_filter_imgopt_lazyload_dolqip', true)) {
                         $lqip_w = '';
                         $lqip_h = '';
-                        if ( isset( $imgopt_w ) ) {
-                            $lqip_w = ',w_' . $imgopt_w;
+                        if (isset($imgopt_w)) {
+                            $lqip_w = ',w_'.$imgopt_w;
                         }
-                        if ( isset( $imgopt_h ) ) {
-                            $lqip_h = ',h_' . $imgopt_h;
+                        if (isset($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;
                     } else {
-                        $placeholder = $this->get_default_lazyload_placeholder( $imgopt_w, $imgopt_h );
+                        $placeholder = $this->get_default_lazyload_placeholder($imgopt_w, $imgopt_h);
                     }
-                    $placeholder = ' src=\'' . apply_filters( 'autoptimize_filter_imgopt_lazyload_placeholder', $placeholder );
+                    $placeholder = ' src=\''.apply_filters('autoptimize_filter_imgopt_lazyload_placeholder', $placeholder);
 
                     // add min-heigth off by default as it can deform images, can be enabled with filter.
                     $min_height = '';
-                    if ( apply_filters( 'autoptimize_filter_imgopt_lazyload_addminheight', false ) ) {
-                        $min_height = ' style="min-height:' . $imgopt_h . 'px;"';
+                    if (apply_filters('autoptimize_filter_imgopt_lazyload_addminheight', false)) {
+                        $min_height = ' style="min-height:'.$imgopt_h.'px;"';
                     }
 
                     // add noscript & placeholder.
-                    $tag = $noscript_tag . str_replace( ' src=', $min_height . $placeholder . '\' data-src=', $tag );
-                    $tag = apply_filters( 'autoptimize_filter_imgopt_lazyloaded_img', $tag );
+                    $tag = $noscript_tag.str_replace(' src=', $min_height.$placeholder.'\' data-src=', $tag);
+                    $tag = apply_filters('autoptimize_filter_imgopt_lazyloaded_img', $tag);
                 }
 
                 // add tag to array for later replacement.
-                if ( $tag !== $orig_tag ) {
-                    $to_replace[ $orig_tag ] = $tag;
+                if ($tag !== $orig_tag) {
+                    $to_replace[$orig_tag] = $tag;
                 }
             }
         }
 
         // and replace all.
-        $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $in );
+        $out = str_replace(array_keys($to_replace), array_values($to_replace), $in);
 
         // img thumbnails in e.g. woocommerce.
-        if ( strpos( $out, 'data-thumb' ) !== false && apply_filters( 'autoptimize_filter_imgopt_datathumbs', true ) ) {
+        if (strpos($out, 'data-thumb') !== false && apply_filters('autoptimize_filter_imgopt_datathumbs', true)) {
             $out = preg_replace_callback(
                 '/\<div(?:[^>]?)\sdata-thumb\=(?:\"|\')(.+?)(?:\"|\')(?:[^>]*)?\>/s',
-                array( $this, 'replace_data_thumbs' ),
+                array($this, 'replace_data_thumbs'),
                 $out
             );
         }
 
         // background-image in inline style.
-        if ( strpos( $out, 'background-image:' ) !== false && apply_filters( 'autoptimize_filter_imgopt_backgroundimages', true ) ) {
+        if (strpos($out, 'background-image:') !== false && apply_filters('autoptimize_filter_imgopt_backgroundimages', true)) {
             $out = preg_replace_callback(
                 '/style=(?:"|\').*?background-image:\s?url\((?:"|\')?([^"\')]*)(?:"|\')?\)/',
-                array( $this, 'replace_img_callback' ),
+                array($this, 'replace_img_callback'),
                 $out
             );
         }
 
         // lazyload: restore noscript tags + lazyload picture source tags.
-        if ( $this->should_lazyload() ) {
+        if ($this->should_lazyload()) {
             $out = autoptimizeBase::restore_marked_content(
                 'NOSCRIPT',
                 $out
             );
 
-            $out = $this->process_picture_tag( $out, true, true );
+            $out = $this->process_picture_tag($out, true, true);
         } 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;
         }
 
@@ -662,12 +662,12 @@ 
      * Lazyload functions
      */
     public function should_lazyload() {
-        if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_3'] ) ) {
+        if (!empty($this->options['autoptimize_imgopt_checkbox_field_3'])) {
             $lazyload_return = true;
         } else {
             $lazyload_return = false;
         }
-        $lazyload_return = apply_filters( 'autoptimize_filter_imgopt_should_lazyload', $lazyload_return );
+        $lazyload_return = apply_filters('autoptimize_filter_imgopt_should_lazyload', $lazyload_return);
 
         return $lazyload_return;
     }
@@ -678,7 +678,7 @@ 
         return $self->should_lazyload();
     }
 
-    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();
@@ -692,15 +692,15 @@ 
         );
 
         // extract img tags and add lazyload attribs.
-        if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $out, $matches ) ) {
-            foreach ( $matches[0] as $tag ) {
-                $to_replace[ $tag ] = $this->add_lazyload( $tag );
+        if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $out, $matches)) {
+            foreach ($matches[0] as $tag) {
+                $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);
 
         // restore noscript tags.
         $out = autoptimizeBase::restore_marked_content(
@@ -711,35 +711,35 @@ 
         return $out;
     }
 
-    public function add_lazyload( $tag ) {
+    public function add_lazyload($tag) {
         // adds actual lazyload-attributes to an image node.
-        if ( str_ireplace( $this->get_lazyload_exclusions(), '', $tag ) === $tag ) {
+        if (str_ireplace($this->get_lazyload_exclusions(), '', $tag) === $tag) {
             // store original tag for use in noscript version.
-            $noscript_tag = '<noscript>' . $tag . '</noscript>';
+            $noscript_tag = '<noscript>'.$tag.'</noscript>';
 
             // insert lazyload class.
-            $tag = $this->inject_classes_in_tag( $tag, 'lazyload ' );
+            $tag = $this->inject_classes_in_tag($tag, 'lazyload ');
 
             // 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 ) {
+            if (false === $width) {
                 $widht = 210; // default width for SVG placeholder.
             }
-            if ( false === $height ) {
-                $heigth = $width / 3 * 2; // if no height, base it on width using the 3/2 aspect ratio.
+            if (false === $height) {
+                $heigth = $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 ) );
-            $tag         = str_replace( ' src=', ' src=\'' . $placeholder . '\' data-src=', $tag );
-            $tag         = str_replace( ' srcset=', ' data-srcset=', $tag );
+            $placeholder = apply_filters('autoptimize_filter_imgopt_lazyload_placeholder', $this->get_default_lazyload_placeholder($width, $height));
+            $tag         = str_replace(' src=', ' src=\''.$placeholder.'\' data-src=', $tag);
+            $tag         = str_replace(' srcset=', ' data-srcset=', $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;
@@ -748,20 +748,20 @@ 
     public function add_lazyload_js_footer() {
         // 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"';
         }
 
         // Adds lazyload CSS & JS to footer, using echo because wp_enqueue_script seems not to support pushing attributes (async).
-        echo apply_filters( 'autoptimize_filter_imgopt_lazyload_cssoutput', '<style>.lazyload,.lazyloading{opacity:0;}.lazyloaded{opacity:1;transition:opacity 300ms;}</style><noscript><style>.lazyload{display:none;}</style></noscript>' );
-        echo apply_filters( 'autoptimize_filter_imgopt_lazyload_jsconfig', '<script' . $noptimize_flag . '>window.lazySizesConfig=window.lazySizesConfig||{};window.lazySizesConfig.loadMode=1;</script>' );
-        echo '<script async' . $noptimize_flag . ' src=\'' . plugins_url( 'external/js/lazysizes.min.js', __FILE__ ) . '\'></script>';
+        echo apply_filters('autoptimize_filter_imgopt_lazyload_cssoutput', '<style>.lazyload,.lazyloading{opacity:0;}.lazyloaded{opacity:1;transition:opacity 300ms;}</style><noscript><style>.lazyload{display:none;}</style></noscript>');
+        echo apply_filters('autoptimize_filter_imgopt_lazyload_jsconfig', '<script'.$noptimize_flag.'>window.lazySizesConfig=window.lazySizesConfig||{};window.lazySizesConfig.loadMode=1;</script>');
+        echo '<script async'.$noptimize_flag.' src=\''.plugins_url('external/js/lazysizes.min.js', __FILE__).'\'></script>';
 
         // And add webp detection and loading JS.
-        if ( $this->should_webp() ) {
+        if ($this->should_webp()) {
             $_webp_detect = "function c_webp(A){var n=new Image;n.onload=function(){var e=0<n.width&&0<n.height;A(e)},n.onerror=function(){A(!1)},n.src='data:image/webp;base64,UklGRhoAAABXRUJQVlA4TA0AAAAvAAAAEAcQERGIiP4HAA=='}function s_webp(e){window.supportsWebP=e}c_webp(s_webp);";
             $_webp_load   = "document.addEventListener('lazybeforeunveil',function({target:c}){supportsWebP&&['data-src','data-srcset'].forEach(function(a){attr=c.getAttribute(a),null!==attr&&c.setAttribute(a,attr.replace(/\/client\//,'/client/to_webp,'))})});";
-            echo apply_filters( 'autoptimize_filter_imgopt_webp_js', '<script' . $noptimize_flag . '>' . $_webp_detect . $_webp_load . '</script>' );
+            echo apply_filters('autoptimize_filter_imgopt_webp_js', '<script'.$noptimize_flag.'>'.$_webp_detect.$_webp_load.'</script>');
         }
     }
 
@@ -769,47 +769,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' );
+            $exclude_lazyload_array = array('skip-lazy', 'data-no-lazy', 'notlazy', 'data-src', 'data-srcset', 'data:image/', 'data-lazyload');
 
             // 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 = str_replace( '<img ', '<img class="' . trim( $target_class ) . '" ', $tag );
+            $tag = str_replace('<img ', '<img class="'.trim($target_class).'" ', $tag);
         }
 
         return $tag;
     }
 
-    public function get_default_lazyload_placeholder( $imgopt_w, $imgopt_h ) {
-        return 'data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%20' . $imgopt_w . '%20' . $imgopt_h . '%22%3E%3C/svg%3E';
+    public function get_default_lazyload_placeholder($imgopt_w, $imgopt_h) {
+        return 'data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%20'.$imgopt_w.'%20'.$imgopt_h.'%22%3E%3C/svg%3E';
     }
 
     public function should_webp() {
         static $webp_return = null;
 
-        if ( is_null( $webp_return ) ) {
+        if (is_null($webp_return)) {
             // webp only works if imgopt and lazyload are also active.
-            if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_4'] ) && ! empty( $this->options['autoptimize_imgopt_checkbox_field_3'] ) && $this->imgopt_active() ) {
+            if (!empty($this->options['autoptimize_imgopt_checkbox_field_4']) && !empty($this->options['autoptimize_imgopt_checkbox_field_3']) && $this->imgopt_active()) {
                 $webp_return = true;
             } else {
                 $webp_return = false;
@@ -819,9 +819,9 @@ 
         return $webp_return;
     }
 
-    public function process_picture_tag( $in, $imgopt = false, $lazy = false ) {
+    public function process_picture_tag($in, $imgopt = false, $lazy = false) {
         // check if "<picture" is present and if filter allows us to process <picture>.
-        if ( strpos( $in, '<picture' ) === false || apply_filters( 'autoptimize_filter_imgopt_dopicture', true ) === false ) {
+        if (strpos($in, '<picture') === false || apply_filters('autoptimize_filter_imgopt_dopicture', true) === false) {
             return $in;
         }
 
@@ -829,27 +829,27 @@ 
         $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 ) {
-            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) {
+            if (strpos($_picture[0], '<source ') !== false && preg_match_all('#<source .*srcset=(?:"|\')(?!data)(.*)(?:"|\').*>#Usmi', $_picture[0], $_sources, PREG_SET_ORDER) !== false) {
+                foreach ($_sources as $_source) {
                     $_picture_replacement = $_source[0];
 
                     // should we optimize the image?
-                    if ( $imgopt && $this->can_optimize_image( $_source[1] ) ) {
-                        $_picture_replacement = str_replace( $_source[1], $this->build_imgopt_url( $_source[1] ), $_picture_replacement );
+                    if ($imgopt && $this->can_optimize_image($_source[1])) {
+                        $_picture_replacement = str_replace($_source[1], $this->build_imgopt_url($_source[1]), $_picture_replacement);
                     }
                     // should we lazy-load?
-                    if ( $lazy && str_ireplace( $_exclusions, '', $_picture_replacement ) === $_picture_replacement ) {
-                        $_picture_replacement = str_replace( ' srcset=', ' data-srcset=', $_picture_replacement );
+                    if ($lazy && 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;
     }
@@ -865,14 +865,14 @@ 
             '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)
     {
-        $in = array_merge( $in, array( 'autoptimize_imgopt' => __( 'Images', 'autoptimize' ) ) );
+        $in = array_merge($in, array('autoptimize_imgopt' => __('Images', 'autoptimize')));
 
         return $in;
     }
@@ -880,7 +880,7 @@ 
     public function imgopt_options_page()
     {
         // Check querystring for "refreshCacheChecker" and call cachechecker if so.
-        if ( array_key_exists( 'refreshImgProvStats', $_GET ) && 1 == $_GET['refreshImgProvStats'] ) {
+        if (array_key_exists('refreshImgProvStats', $_GET) && 1 == $_GET['refreshImgProvStats']) {
             $this->query_img_provider_stats();
         }
 
@@ -893,45 +893,45 @@ 
         #autoptimize_imgopt_descr{font-size: 120%;}
     </style>
     <div class="wrap">
-    <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
         <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
-        <?php 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='options.php' method='post'>
-        <?php settings_fields( 'autoptimize_imgopt_settings' ); ?>
-        <h2><?php _e( 'Image optimization', 'autoptimize' ); ?></h2>
-        <span id='autoptimize_imgopt_descr'><?php _e( 'Make your site significantly faster by just ticking a couple of checkboxes to optimize and lazy load your images, WebP support included!', 'autoptimize' ); ?></span>
+        <?php settings_fields('autoptimize_imgopt_settings'); ?>
+        <h2><?php _e('Image optimization', 'autoptimize'); ?></h2>
+        <span id='autoptimize_imgopt_descr'><?php _e('Make your site significantly faster by just ticking a couple of checkboxes to optimize and lazy load your images, WebP support included!', 'autoptimize'); ?></span>
         <table class="form-table">
             <tr>
-                <th scope="row"><?php _e( 'Optimize Images', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Optimize Images', 'autoptimize'); ?></th>
                 <td>
-                    <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Optimize images on the fly and serve them from Shortpixel\'s global CDN.', 'autoptimize' ); ?></label>
+                    <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_1]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_1']) && '1' === $options['autoptimize_imgopt_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Optimize images on the fly and serve them from Shortpixel\'s global CDN.', 'autoptimize'); ?></label>
                     <?php
                     // show shortpixel status.
                     $_notice = autoptimizeImages::instance()->get_status_notice();
-                    if ( $_notice ) {
-                        switch ( $_notice['status'] ) {
+                    if ($_notice) {
+                        switch ($_notice['status']) {
                             case 2:
                                 $_notice_color = 'green';
                                 break;
@@ -947,28 +947,28 @@ 
                             default:
                                 $_notice_color = 'green';
                         }
-                        echo apply_filters( 'autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:' . $_notice_color . ';">' . __( 'Shortpixel status: ', 'autoptimize' ) . '</span></strong>' . $_notice['notice'] . '</p>' );
+                        echo apply_filters('autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:'.$_notice_color.';">'.__('Shortpixel status: ', 'autoptimize').'</span></strong>'.$_notice['notice'].'</p>');
                     } else {
                         // translators: link points to shortpixel.
-                        $upsell_msg_1 = '<p>' . sprintf( __( 'Get more Google love and improve your website\'s loading speed by having the images optimized on the fly (also in the "next-gen" WebP image format) by %1$sShortPixel%2$s and then cached and served fast from Shortpixel\'s global CDN.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' );
-                        if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] ) {
-                            $upsell_msg_2 = __( 'For a limited time only, this service is offered free for all Autoptimize users, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize' );
+                        $upsell_msg_1 = '<p>'.sprintf(__('Get more Google love and improve your website\'s loading speed by having the images optimized on the fly (also in the "next-gen" WebP image format) by %1$sShortPixel%2$s and then cached and served fast from Shortpixel\'s global CDN.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>');
+                        if ('launch' === $options['availabilities']['extra_imgopt']['status']) {
+                            $upsell_msg_2 = __('For a limited time only, this service is offered free for all Autoptimize users, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize');
                         } else {
                             // translators: link points to shortpixel.
-                            $upsell_msg_2 = sprintf( __( '%1$sSign-up now%2$s to receive a 1 000 bonus + 50&#37; more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' );
+                            $upsell_msg_2 = sprintf(__('%1$sSign-up now%2$s to receive a 1 000 bonus + 50&#37; more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>');
                         }
-                        echo apply_filters( 'autoptimize_imgopt_imgopt_settings_copy', $upsell_msg_1 . ' ' . $upsell_msg_2 . '</p>' );
+                        echo apply_filters('autoptimize_imgopt_imgopt_settings_copy', $upsell_msg_1.' '.$upsell_msg_2.'</p>');
                     }
                     // translators: link points to shortpixel FAQ.
-                    $faqcopy = sprintf( __( '<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize' ), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>' );
+                    $faqcopy = sprintf(__('<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize'), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>');
                     // translators: links points to shortpixel TOS & Privacy Policy.
-                    $toscopy = sprintf( __( 'Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize' ), '<a href="https://shortpixel.com/tos' . $sp_url_suffix . '" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp' . $sp_url_suffix . '" target="_blank">', '</a>' );
-                    echo apply_filters( 'autoptimize_imgopt_imgopt_settings_tos', '<p>' . $faqcopy . ' ' . $toscopy . '</p>' );
+                    $toscopy = sprintf(__('Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize'), '<a href="https://shortpixel.com/tos'.$sp_url_suffix.'" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp'.$sp_url_suffix.'" target="_blank">', '</a>');
+                    echo apply_filters('autoptimize_imgopt_imgopt_settings_tos', '<p>'.$faqcopy.' '.$toscopy.'</p>');
                     ?>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_quality' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Image Optimization quality', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_quality' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_1', $options) || (isset($options['autoptimize_imgopt_checkbox_field_1']) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Image Optimization quality', 'autoptimize'); ?></th>
                 <td>
                     <label>
                     <select name='autoptimize_imgopt_settings[autoptimize_imgopt_select_field_2]'>
@@ -976,12 +976,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";
                         ?>
@@ -990,31 +990,31 @@ 
                     <p>
                         <?php
                             // translators: link points to shortpixel image test page.
-                            echo apply_filters( 'autoptimize_imgopt_imgopt_quality_copy', sprintf( __( 'You can %1$stest compression levels here%2$s.', 'autoptimize' ), '<a href="https://shortpixel.com/oic' . $sp_url_suffix . '" target="_blank">', '</a>' ) );
+                            echo apply_filters('autoptimize_imgopt_imgopt_quality_copy', sprintf(__('You can %1$stest compression levels here%2$s.', 'autoptimize'), '<a href="https://shortpixel.com/oic'.$sp_url_suffix.'" target="_blank">', '</a>'));
                         ?>
                     </p>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_webp' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Load WebP in supported browsers?', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_webp' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_1', $options) || (isset($options['autoptimize_imgopt_checkbox_field_1']) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Load WebP in supported browsers?', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' id='autoptimize_imgopt_webp_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_4]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_4'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_3'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Automatically serve "next-gen" WebP image format to any browser that supports it (requires lazy load to be active).', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' id='autoptimize_imgopt_webp_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_4]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_4']) && '1' === $options['autoptimize_imgopt_checkbox_field_3']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Automatically serve "next-gen" WebP image format to any browser that supports it (requires lazy load to be active).', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Lazy-load images?', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Lazy-load images?', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' id='autoptimize_imgopt_lazyload_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_3]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_3'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_3'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Image lazy-loading will delay the loading of non-visible images to allow the browser to optimally load all resources for the "above the fold"-page first.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' id='autoptimize_imgopt_lazyload_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_3]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_3']) && '1' === $options['autoptimize_imgopt_checkbox_field_3']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Image lazy-loading will delay the loading of non-visible images to allow the browser to optimally load all resources for the "above the fold"-page first.', 'autoptimize'); ?></label>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_lazyload_exclusions' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_3', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_3'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_3'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Lazy-load exclusions', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_lazyload_exclusions' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_3', $options) || (isset($options['autoptimize_imgopt_checkbox_field_3']) && '1' !== $options['autoptimize_imgopt_checkbox_field_3'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Lazy-load exclusions', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' id='autoptimize_imgopt_lazyload_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_5]' value='<?php if ( ! empty( $options['autoptimize_imgopt_text_field_5'] ) ) { echo esc_attr( $options['autoptimize_imgopt_text_field_5'] ); } ?>'><br /><?php _e( 'Comma-separated list of to be excluded image classes or filenames.', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' id='autoptimize_imgopt_lazyload_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_5]' value='<?php if (!empty($options['autoptimize_imgopt_text_field_5'])) { echo esc_attr($options['autoptimize_imgopt_text_field_5']); } ?>'><br /><?php _e('Comma-separated list of to be excluded image classes or filenames.', 'autoptimize'); ?></label>
                 </td>
             </tr>
         </table>
-        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /></p>
+        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /></p>
     </form>
     <script>
         jQuery(document).ready(function() {
@@ -1050,37 +1050,37 @@ 
      * Ïmg opt status as used on dashboard.
      */
     public function get_imgopt_status_notice() {
-        if ( $this->imgopt_active() ) {
+        if ($this->imgopt_active()) {
             $_imgopt_notice = '';
-            $_stat          = get_option( 'autoptimize_imgopt_provider_stat', '' );
+            $_stat          = get_option('autoptimize_imgopt_provider_stat', '');
             $_site_host     = AUTOPTIMIZE_SITE_DOMAIN;
-            $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . $_site_host;
+            $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.$_site_host;
 
-            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_stats_refresh_url = add_query_arg( array(
+                    $_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_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( 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(get_option('time_format'), $_stat['timestamp']);
                     } else {
-                        $_imgopt_stats_last_run = __( 'based on previously fetched data', 'autoptimize' );
+                        $_imgopt_stats_last_run = __('based on previously fetched data', 'autoptimize');
                     }
-                    $_imgopt_notice .= ' (' . $_imgopt_stats_last_run . ', ';
+                    $_imgopt_notice .= ' ('.$_imgopt_stats_last_run.', ';
                     // translators: "here to refresh" links to the Autoptimize Extra page and forces a refresh of the img opt stats.
-                    $_imgopt_notice .= sprintf( __( 'click %1$shere to refresh%2$s', 'autoptimize' ), '<a href="' . $_imgopt_stats_refresh_url . '">', '</a>).' );
+                    $_imgopt_notice .= sprintf(__('click %1$shere to refresh%2$s', 'autoptimize'), '<a href="'.$_imgopt_stats_refresh_url.'">', '</a>).');
                 } else {
                     $_imgopt_upsell = 'https://shortpixel.com/g/af/GWRGFLW109483';
                     // translators: "log in to check your account" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                 }
-                $_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'],
@@ -1101,14 +1101,14 @@ 
      * Get img provider stats (used to display notice).
      */
     public function query_img_provider_stats() {
-        if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_1'] ) ) {
+        if (!empty($this->options['autoptimize_imgopt_checkbox_field_1'])) {
             $url      = '';
-            $endpoint = $this->get_imgopt_host() . 'read-domain/';
+            $endpoint = $this->get_imgopt_host().'read-domain/';
             $domain   = AUTOPTIMIZE_SITE_DOMAIN;
 
             // make sure parse_url result makes sense, keeping $url empty if not.
-            if ( $domain && ! empty( $domain ) ) {
-                $url = $endpoint . $domain;
+            if ($domain && !empty($domain)) {
+                $url = $endpoint.$domain;
             }
 
             $url = apply_filters(
@@ -1118,12 +1118,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 );
-                        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);
+                        update_option('autoptimize_imgopt_provider_stat', $stats);
                     }
                 }
             }
@@ -1146,15 +1146,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  = get_option( 'autoptimize_imgopt_launched', '' );
+            $magic_number  = intval(substr(md5(parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)), 0, 3), 16);
+            $has_launched  = 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 ) {
-                    update_option( 'autoptimize_imgopt_launched', 'on' );
+                if (!$has_launched) {
+                    update_option('autoptimize_imgopt_launched', 'on');
                 }
             }
         }
@@ -1171,16 +1171,16 @@ 
     public function get_imgopt_provider_userstatus() {
         static $_provider_userstatus = null;
 
-        if ( is_null( $_provider_userstatus ) ) {
-            $_stat = get_option( 'autoptimize_imgopt_provider_stat', '' );
-            if ( is_array( $_stat ) ) {
-                if ( array_key_exists( 'Status', $_stat ) ) {
+        if (is_null($_provider_userstatus)) {
+            $_stat = 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 "".
@@ -1193,27 +1193,27 @@ 
     }
 
     public function get_status_notice() {
-        if ( $this->imgopt_active() ) {
+        if ($this->imgopt_active()) {
             $notice = '';
             $stat   = $this->get_imgopt_provider_userstatus();
-            $upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN;
+            $upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN;
             $assoc  = 'https://shortpixel.helpscoutdocs.com/article/94-how-to-associate-a-domain-to-my-account';
 
-            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".
-                    $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 rel="noopener noreferrer" href="' . $upsell . '" target="_blank">', '</a>' );
+                    $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 rel="noopener noreferrer" href="'.$upsell.'" target="_blank">', '</a>');
                 } elseif ( -1 == $stat['Status'] || -2 == $stat['Status'] ) {
                     // translators: "add more credits" will appear in a "a href".
-                    $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 rel="noopener noreferrer" href="' . $upsell . '" target="_blank">', '</a>' );
+                    $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 rel="noopener noreferrer" href="'.$upsell.'" target="_blank">', '</a>');
                     // translators: "associate your domain" will appear in a "a href".
-                    $notice = $notice . ' ' . sprintf( __( 'If you already have enough credits then you may need to %1$sassociate your domain%2$s to your Shortpixel account.', 'autoptimize' ), '<a rel="noopener noreferrer" href="' . $assoc . '" target="_blank">', '</a>' );
+                    $notice = $notice.' '.sprintf(__('If you already have enough credits then you may need to %1$sassociate your domain%2$s to your Shortpixel account.', 'autoptimize'), '<a rel="noopener noreferrer" href="'.$assoc.'" target="_blank">', '</a>');
                 } else {
                     $upsell = 'https://shortpixel.com/g/af/GWRGFLW109483';
                     // translators: "log in to check your account" will appear in a "a href".
-                    $notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize' ), '<a rel="noopener noreferrer" href="' . $upsell . '" target="_blank">', '</a>' );
+                    $notice = sprintf(__('Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize'), '<a rel="noopener noreferrer" href="'.$upsell.'" target="_blank">', '</a>');
                 }
-                $notice = apply_filters( 'autoptimize_filter_imgopt_notice', $notice );
+                $notice = apply_filters('autoptimize_filter_imgopt_notice', $notice);
 
                 return array(
                     'status' => $stat['Status'],