futtta / autoptimize

classes/critcss-inc/admin_settings_queue.php

Spacing +24 added lines, -24 removed lines

@@ -11,21 +11,21 @@ 
     global $ao_ccss_queue;
 
     // Prepare the queue object.
-    if ( empty( $ao_ccss_queue ) ) {
+    if (empty($ao_ccss_queue)) {
         $ao_ccss_queue = '';
     } else {
-        $ao_ccss_queue = json_encode( $ao_ccss_queue );
+        $ao_ccss_queue = json_encode($ao_ccss_queue);
     }
 ?>
 
     <ul id="queue-panel">
         <li class="itemDetail">
-            <h2 class="itemTitle fleft"><?php _e( 'Job Queue', 'autoptimize' ); ?></h2>
+            <h2 class="itemTitle fleft"><?php _e('Job Queue', 'autoptimize'); ?></h2>
             <button type="button" class="toggle-btn">
                 <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
             </button>
             <?php
-            if ( autoptimizeCriticalCSSSettings::ao_ccss_has_autorules() ) {
+            if (autoptimizeCriticalCSSSettings::ao_ccss_has_autorules()) {
                 $_queue_visibility = 'hidden';
             } else {
                 $_queue_visibility = 'visible';
@@ -34,54 +34,54 @@ 
             <div class="collapsible <?php echo $_queue_visibility; ?>">
                 <!-- BEGIN Queue dialogs -->
                 <!-- Retry dialog -->
-                <div id="queue-confirm-retry" title="<?php _e( 'Retry Job', 'autoptimize' ); ?>" class="hidden">
-                    <p><?php _e( 'Are you sure you want to retry this job?', 'autoptimize' ); ?></p>
+                <div id="queue-confirm-retry" title="<?php _e('Retry Job', 'autoptimize'); ?>" class="hidden">
+                    <p><?php _e('Are you sure you want to retry this job?', 'autoptimize'); ?></p>
                 </div>
 
                 <!-- Remove dialog -->
-                <div id="queue-confirm-rm" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>" class="hidden">
-                    <p><?php _e( 'Are you sure you want to delete this job?', 'autoptimize' ); ?></p>
+                <div id="queue-confirm-rm" title="<?php _e('Delete Job', 'autoptimize'); ?>" class="hidden">
+                    <p><?php _e('Are you sure you want to delete this job?', 'autoptimize'); ?></p>
                 </div>
 
                 <!-- Remove all dialog -->
-                <div id="queue-confirm-rm-all" title="<?php _e( 'Delete all jobs', 'autoptimize' ); ?>" class="hidden">
-                    <p><?php _e( 'This will delete all jobs, are you sure?', 'autoptimize' ); ?></p>
+                <div id="queue-confirm-rm-all" title="<?php _e('Delete all jobs', 'autoptimize'); ?>" class="hidden">
+                    <p><?php _e('This will delete all jobs, are you sure?', 'autoptimize'); ?></p>
                 </div>
                 <!-- END Queue dialogs -->
 
                 <!-- BEGIN Queue UI -->
                 <div class="howto">
                     <div class="title-wrap">
-                        <h4 class="title"><?php _e( 'How To Use Autoptimize CriticalCSS Power-Up Queue', 'autoptimize' ); ?></h4>
-                        <p class="subtitle"><?php _e( 'Click the side arrow to toggle instructions', 'autoptimize' ); ?></p>
+                        <h4 class="title"><?php _e('How To Use Autoptimize CriticalCSS Power-Up Queue', 'autoptimize'); ?></h4>
+                        <p class="subtitle"><?php _e('Click the side arrow to toggle instructions', 'autoptimize'); ?></p>
                     </div>
                     <button type="button" class="toggle-btn">
                         <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
                     </button>
                     <div class="howto-wrap hidden">
-                        <p><?php _e( 'TL;DR:<br /><strong>Queue runs every 10 minutes.</strong> Job statuses are <span class="badge new">N</span> for NEW, <span class="badge pending">P</span> for PENDING, <span class="badge error">E</span> for ERROR and <span class="badge unknown">U</span> for UNKOWN.', 'autoptimize' ); ?></p>
+                        <p><?php _e('TL;DR:<br /><strong>Queue runs every 10 minutes.</strong> Job statuses are <span class="badge new">N</span> for NEW, <span class="badge pending">P</span> for PENDING, <span class="badge error">E</span> for ERROR and <span class="badge unknown">U</span> for UNKOWN.', 'autoptimize'); ?></p>
                         <ol>
-                            <li><?php _e( 'The queue operates <strong>automatically, asynchronously and on regular intervals of 10 minutes.</strong> To view updated queue status, refresh this page.', 'autoptimize' ); ?></li>
-                            <li><?php _e( 'When the conditions to create a job are met (i.e. user not logged in, no matching <span class="badge manual">MANUAL</span> rule or CSS files has changed for an <span class="badge auto">AUTO</span> rule), a <span class="badge new">N</span> job is created in the queue.', 'autoptimize' ); ?></li>
-                            <li><?php _e( "Autoptimize CriticalCSS Power-Up constantly query the queue for <span class='badge new'>N</span> jobs. When it finds one, gears spins and jobs becomes <span class='badge pending'>P</span> while they are running and <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> doesn't return a result.", 'autoptimize' ); ?></li>
-                            <li><?php _e( 'As soon as <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> returns a valid critical CSS file, the job is then finished and removed from the queue.', 'autoptimize' ); ?></li>
-                            <li><?php _e( 'When things go wrong, a job is marked as <span class="badge error">E</span>. You can retry faulty jobs, delete them or get in touch with <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize' ); ?></li>
-                            <li><?php _e( 'Sometimes an unknown condition can happen. In this case, the job status becomes <span class="badge unknown">U</span> and you may want to ask <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for help or just delete it.', 'autoptimize' ); ?></li>
-                            <li><?php _e( 'To get more information about jobs statuses, specially the ones with <span class="badge error">E</span> and <span class="badge unknown">U</span> status, hover your mouse in the status badge of that job. This information might be crucial when contacting <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize' ); ?></li>
-                            <li><?php _e( '<strong>A word about WordPress cron:</strong> Autoptimize CriticalCSS Power-Up watch the queue by using WordPress Cron (or WP-Cron for short.) It <a href="https://www.smashingmagazine.com/2013/10/schedule-events-using-wordpress-cron/#limitations-of-wordpress-cron-and-solutions-to-fix-em" target="_blank">could be faulty</a> on very light or very heavy loads. If your site receives just a few or thousands visits a day, it might be a good idea to <a href="https://developer.wordpress.org/plugins/cron/hooking-wp-cron-into-the-system-task-scheduler/" target="_blank">turn WP-Cron off and use your system task scheduler</a> to fire it instead.', 'autoptimize' ); ?></li>
+                            <li><?php _e('The queue operates <strong>automatically, asynchronously and on regular intervals of 10 minutes.</strong> To view updated queue status, refresh this page.', 'autoptimize'); ?></li>
+                            <li><?php _e('When the conditions to create a job are met (i.e. user not logged in, no matching <span class="badge manual">MANUAL</span> rule or CSS files has changed for an <span class="badge auto">AUTO</span> rule), a <span class="badge new">N</span> job is created in the queue.', 'autoptimize'); ?></li>
+                            <li><?php _e("Autoptimize CriticalCSS Power-Up constantly query the queue for <span class='badge new'>N</span> jobs. When it finds one, gears spins and jobs becomes <span class='badge pending'>P</span> while they are running and <a href='https://criticalcss.com/?aff=1' target='_blank'>criticalcss.com</a> doesn't return a result.", 'autoptimize'); ?></li>
+                            <li><?php _e('As soon as <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> returns a valid critical CSS file, the job is then finished and removed from the queue.', 'autoptimize'); ?></li>
+                            <li><?php _e('When things go wrong, a job is marked as <span class="badge error">E</span>. You can retry faulty jobs, delete them or get in touch with <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize'); ?></li>
+                            <li><?php _e('Sometimes an unknown condition can happen. In this case, the job status becomes <span class="badge unknown">U</span> and you may want to ask <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for help or just delete it.', 'autoptimize'); ?></li>
+                            <li><?php _e('To get more information about jobs statuses, specially the ones with <span class="badge error">E</span> and <span class="badge unknown">U</span> status, hover your mouse in the status badge of that job. This information might be crucial when contacting <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> for assistance.', 'autoptimize'); ?></li>
+                            <li><?php _e('<strong>A word about WordPress cron:</strong> Autoptimize CriticalCSS Power-Up watch the queue by using WordPress Cron (or WP-Cron for short.) It <a href="https://www.smashingmagazine.com/2013/10/schedule-events-using-wordpress-cron/#limitations-of-wordpress-cron-and-solutions-to-fix-em" target="_blank">could be faulty</a> on very light or very heavy loads. If your site receives just a few or thousands visits a day, it might be a good idea to <a href="https://developer.wordpress.org/plugins/cron/hooking-wp-cron-into-the-system-task-scheduler/" target="_blank">turn WP-Cron off and use your system task scheduler</a> to fire it instead.', 'autoptimize'); ?></li>
                         </ol>
                     </div>
                 </div>
                 <table id="queue-tbl" class="queue tablesorter" cellspacing="0">
                     <thead>
-                        <tr><th class="status"><?php _e( 'Status', 'autoptimize' ); ?></th><th><?php _e( 'Target Rule', 'autoptimize' ); ?></th><th><?php _e( 'Page Path', 'autoptimize' ); ?></th><th><?php _e( 'Page Type', 'autoptimize' ); ?></th><th><?php _e( 'Creation Date', 'autoptimize' ); ?></th><th><?php _e( 'Finish Date', 'autoptimize' ); ?></th><th class="btn"><?php _e( 'Actions', 'autoptimize' ); ?></th></tr>
+                        <tr><th class="status"><?php _e('Status', 'autoptimize'); ?></th><th><?php _e('Target Rule', 'autoptimize'); ?></th><th><?php _e('Page Path', 'autoptimize'); ?></th><th><?php _e('Page Type', 'autoptimize'); ?></th><th><?php _e('Creation Date', 'autoptimize'); ?></th><th><?php _e('Finish Date', 'autoptimize'); ?></th><th class="btn"><?php _e('Actions', 'autoptimize'); ?></th></tr>
                     </thead>
                     <tbody id="queue"></tbody>
                 </table>
-                <input class="hidden" type="text" id="ao-ccss-queue" name="autoptimize_ccss_queue" value='<?php echo( $ao_ccss_queue ); ?>'>
+                <input class="hidden" type="text" id="ao-ccss-queue" name="autoptimize_ccss_queue" value='<?php echo($ao_ccss_queue); ?>'>
                 <div class="submit jobs-btn">
                     <div class="alignright">
-                        <span id="removeAllJobs" class="button-secondary" style="color:red;"><?php _e( 'Remove all jobs', 'autoptimize' ); ?></span>
+                        <span id="removeAllJobs" class="button-secondary" style="color:red;"><?php _e('Remove all jobs', 'autoptimize'); ?></span>
                     </div>
                 </div>
             </div>

classes/critcss-inc/admin_settings_explain.php

Spacing +11 added lines, -11 removed lines

@@ -12,29 +12,29 @@
         .ao_settings_div {background: white;border: 1px solid #ccc;padding: 1px 15px;margin: 15px 10px 10px 0;}
         .ao_settings_div .form-table th {font-weight: normal;}
     </style>
-    <script>document.title = "Autoptimize: <?php _e( 'Critical CSS', 'autoptimize' ); ?> " + document.title;</script>
+    <script>document.title = "Autoptimize: <?php _e('Critical CSS', 'autoptimize'); ?> " + document.title;</script>
     <ul id="explain-panel">
         <div class="ao_settings_div">
             <?php
             $ccss_explanation = '';
 
             // get the HTML with the explanation of what critical CSS is.
-            if ( apply_filters( 'autoptimize_settingsscreen_remotehttp', true ) ) {
-                $ccss_explanation = get_transient( 'ao_ccss_explain' );
-                if ( empty( $ccss_explanation ) ) {
-                    $ccss_expl_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_ccss_explain_i18n.html?ao_ver=' . AUTOPTIMIZE_PLUGIN_VERSION );
-                    if ( ! is_wp_error( $ccss_expl_resp ) ) {
-                        if ( '200' == wp_remote_retrieve_response_code( $ccss_expl_resp ) ) {
-                            $ccss_explanation = wp_kses_post( wp_remote_retrieve_body( $ccss_expl_resp ) );
-                            set_transient( 'ao_ccss_explain', $ccss_explanation, WEEK_IN_SECONDS );
+            if (apply_filters('autoptimize_settingsscreen_remotehttp', true)) {
+                $ccss_explanation = get_transient('ao_ccss_explain');
+                if (empty($ccss_explanation)) {
+                    $ccss_expl_resp = wp_remote_get('https://misc.optimizingmatters.com/autoptimize_ccss_explain_i18n.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION);
+                    if (!is_wp_error($ccss_expl_resp)) {
+                        if ('200' == wp_remote_retrieve_response_code($ccss_expl_resp)) {
+                            $ccss_explanation = wp_kses_post(wp_remote_retrieve_body($ccss_expl_resp));
+                            set_transient('ao_ccss_explain', $ccss_explanation, WEEK_IN_SECONDS);
                         }
                     }
                 }
             }
 
             // placeholder text in case HTML is empty.
-            if ( empty( $ccss_explanation ) ) {
-                $ccss_explanation = __( '<h2>Fix render-blocking CSS!</h2><p>Significantly improve your first-paint times by making CSS non-render-blocking.</p><p>The next step is to sign up at <a href="https://criticalcss.com/?aff=1" target="_blank">https://criticalcss.com</a> (this is a premium service, priced 2 GBP/month for membership and 5 GBP/month per domain) <strong>and get the API key, which you can copy from <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">the API-keys page</a></strong> and paste below.</p><p>If you have any questions or need support, head on over to <a href="https://wordpress.org/support/plugin/autoptimize" target="_blank">our support forum</a> and we\'ll help you get up and running in no time!</p>', 'autoptimize' );
+            if (empty($ccss_explanation)) {
+                $ccss_explanation = __('<h2>Fix render-blocking CSS!</h2><p>Significantly improve your first-paint times by making CSS non-render-blocking.</p><p>The next step is to sign up at <a href="https://criticalcss.com/?aff=1" target="_blank">https://criticalcss.com</a> (this is a premium service, priced 2 GBP/month for membership and 5 GBP/month per domain) <strong>and get the API key, which you can copy from <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">the API-keys page</a></strong> and paste below.</p><p>If you have any questions or need support, head on over to <a href="https://wordpress.org/support/plugin/autoptimize" target="_blank">our support forum</a> and we\'ll help you get up and running in no time!</p>', 'autoptimize');
             } else {
                 // we were able to fetch the explenation, so add the JS to show correct language.
                 $ccss_explanation .= "<script>jQuery('.ao_i18n').hide();d=document;lang=d.getElementsByTagName('html')[0].getAttribute('lang').substring(0,2);if(d.getElementById(lang)!= null){jQuery('#'+lang).show();}else{jQuery('#default').show();}</script>";

classes/external/php/minify-html.php

Spacing +7 added lines, -7 removed lines

@@ -73,7 +73,7 @@ 
     {
         $this->_html = str_replace("\r\n", "\n", trim($html));
         if (isset($options['xhtml'])) {
-            $this->_isXhtml = (bool)$options['xhtml'];
+            $this->_isXhtml = (bool) $options['xhtml'];
         }
         if (isset($options['cssMinifier'])) {
             $this->_cssMinifier = $options['cssMinifier'];
@@ -98,7 +98,7 @@ 
             $this->_isXhtml = (false !== strpos($this->_html, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML'));
         }
 
-        $this->_replacementHash = 'MINIFYHTML' . md5($_SERVER['REQUEST_TIME']);
+        $this->_replacementHash = 'MINIFYHTML'.md5($_SERVER['REQUEST_TIME']);
         $this->_placeholders = array();
 
         // replace SCRIPTs (and minify) with placeholders
@@ -114,7 +114,7 @@ 
             ,$this->_html);
 
         // remove HTML comments (not containing IE conditional comments).
-        if  ($this->_keepComments == false) {
+        if ($this->_keepComments == false) {
             $this->_html = preg_replace_callback(
                 '/<!--([\\s\\S]*?)-->/'
                 ,array($this, '_commentCB')
@@ -159,7 +159,7 @@ 
         //$this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/i', "$1\n$2", $this->_html);
 
         // reverse order while preserving keys to ensure the last replacement is done first, etc ...
-        $this->_placeholders = array_reverse( $this->_placeholders, true );
+        $this->_placeholders = array_reverse($this->_placeholders, true);
 
         // fill placeholders
         $this->_html = str_replace(
@@ -179,7 +179,7 @@ 
 
     protected function _reservePlace($content)
     {
-        $placeholder = '%' . $this->_replacementHash . count($this->_placeholders) . '%';
+        $placeholder = '%'.$this->_replacementHash.count($this->_placeholders).'%';
         $this->_placeholders[$placeholder] = $content;
         return $placeholder;
     }
@@ -193,7 +193,7 @@ 
 
     protected function _outsideTagCB($m)
     {
-        return '>' . preg_replace('/^\\s+|\\s+$/', ' ', $m[1]) . '<';
+        return '>'.preg_replace('/^\\s+|\\s+$/', ' ', $m[1]).'<';
     }
 
     protected function _removePreCB($m)
@@ -265,7 +265,7 @@ 
     protected function _removeCdata($str)
     {
         return (false !== strpos($str, '<![CDATA['))
-            ? str_replace(array('/* <![CDATA[ */','/* ]]> */','/*<![CDATA[*/','/*]]>*/','<![CDATA[', ']]>'), '', $str)
+            ? str_replace(array('/* <![CDATA[ */', '/* ]]> */', '/*<![CDATA[*/', '/*]]>*/', '<![CDATA[', ']]>'), '', $str)
             : $str;
     }
 

config/autoptimize_404_handler.php

Spacing +10 added lines, -10 removed lines

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

classes/autoptimizeCache.php

Doc Comments +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
      * @param string $data Data to cache.
      * @param string $mime Mimetype.
      *
-     * @return void
+     * @return boolean|null
      */
     public function cache( $data, $mime )
     {
@@ -489,7 +489,7 @@ 
      * size = total filesize (in bytes) of found files
      * timestamp = unix timestamp when the scan was last performed/finished.
      *
-     * @return array
+     * @return integer[]
      */
     protected static function stats_scan()
     {

Spacing +182 added lines, -182 removed lines

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

classes/autoptimizeImages.php

Doc Comments +13 added lines, -1 removed lines

@@ -384,6 +384,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     private function get_imgopt_base_url()
     {
         static $imgopt_base_url = null;
@@ -767,6 +770,9 @@ 
         return $out;
     }
 
+    /**
+     * @param string $tag
+     */
     public function add_lazyload( $tag, $placeholder = '' ) {
         // adds actual lazyload-attributes to an image node.
         $this->lazyload_counter++;
@@ -858,6 +864,9 @@ 
         }
     }
 
+    /**
+     * @return string
+     */
     public function get_cdn_url() {
         // getting CDN url here to avoid having to make bigger changes to autoptimizeBase.
         static $cdn_url = null;
@@ -961,6 +970,9 @@ 
         return $out;
     }
 
+    /**
+     * @return string
+     */
     public function process_bgimage( $in ) {
         if ( strpos( $in, 'background-image:' ) !== false && apply_filters( 'autoptimize_filter_imgopt_lazyload_backgroundimages', true ) ) {
             $out = preg_replace_callback(
@@ -1313,7 +1325,7 @@ 
     /**
      * Determines and returns the service launch status.
      *
-     * @return bool
+     * @return null|boolean
      */
     public function launch_ok()
     {

Spacing +355 added lines, -355 removed lines

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

classes/autoptimizeExtra.php

Spacing +199 added lines, -199 removed lines

@@ -3,7 +3,7 @@ 
  * Handles autoptimizeExtra frontend features + admin options page
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -28,9 +28,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();
         }
 
@@ -47,7 +47,7 @@ 
      */
     public static function instance()
     {
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new self();
         }
 
@@ -56,19 +56,19 @@ 
 
     public function run()
     {
-        if ( is_admin() ) {
-            if ( is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
-                add_action( 'network_admin_menu', array( $this, 'admin_menu' ) );
+        if (is_admin()) {
+            if (is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
+                add_action('network_admin_menu', array($this, 'admin_menu'));
             } else {
-                add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+                add_action('admin_menu', array($this, 'admin_menu'));
             }
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_extra_tab' ) );
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_extra_tab'));
         } else {
-            add_action( 'wp', array( $this, 'run_on_frontend' ) );
+            add_action('wp', array($this, 'run_on_frontend'));
         }
     }
 
-    public function set_options( array $options )
+    public function set_options(array $options)
     {
         $this->options = $options;
 
@@ -77,8 +77,8 @@ 
 
     public static function fetch_options()
     {
-        $value = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings' );
-        if ( empty( $value ) ) {
+        $value = autoptimizeOptionWrapper::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();
         }
@@ -89,55 +89,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;
     }
@@ -148,68 +148,68 @@ 
         // for optimizations are met, this to ensure e.g. removing querystrings
         // is not done when optimizing for logged in users is off, breaking
         // some pagebuilders (Divi & Elementor).
-        if ( false === autoptimizeMain::should_buffer() ) {
+        if (false === autoptimizeMain::should_buffer()) {
             return;
         }
 
         $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);
         }
 
         // Preload!
-        if ( ! empty( $options['autoptimize_extra_text_field_7'] ) || has_filter( 'autoptimize_filter_extra_tobepreloaded' ) ) {
-            add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_preload' ), 10, 2 );
+        if (!empty($options['autoptimize_extra_text_field_7']) || has_filter('autoptimize_filter_extra_tobepreloaded')) {
+            add_filter('autoptimize_html_after_minify', array($this, 'filter_preload'), 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)
     {
         $url_to_remove = (string) $url_to_remove;
 
-        if ( ! empty( $url_to_remove ) && 'dns-prefetch' === $relation_type ) {
+        if (!empty($url_to_remove) && '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++;
             }
@@ -218,153 +218,153 @@ 
         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 );
-                if ( strpos( $font, 'fonts.googleapis.com/css2' ) !== false ) {
+                $font = str_replace(array('%7C', '%7c'), '|', $font);
+                if (strpos($font, 'fonts.googleapis.com/css2') !== false) {
                     // (Somewhat) change Google Fonts APIv2 syntax back to v1.
                     // todo: support for 100..900
-                    $font = rawurldecode( $font );
-                    $font = str_replace( array( 'css2?', 'ital,wght@', 'wght@', 'ital@', '0,', '1,', ':1', ';', '&family=' ), array( 'css?', '', '', '', '', 'italic', ':italic', ',', '%7C' ), $font );
+                    $font = rawurldecode($font);
+                    $font = str_replace(array('css2?', 'ital,wght@', 'wght@', 'ital@', '0,', '1,', ':1', ';', '&family='), array('css?', '', '', '', '', 'italic', ':italic', ',', '%7C'), $font);
                 }
-                $font = explode( 'family=', $font );
-                $font = ( isset( $font[1] ) ) ? explode( '&', $font[1] ) : array();
+                $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 = apply_filters( 'autoptimize_filter_extra_gfont_fontstring', str_replace( '|', '%7C', ltrim( $fonts_string, '|' ) ) );
+            $fonts_string = apply_filters('autoptimize_filter_extra_gfont_fontstring', str_replace('|', '%7C', ltrim($fonts_string, '|')));
             // only add display parameter if there is none in $fonts_string (by virtue of the filter).
-            if ( strpos( $fonts_string, 'display=' ) === false ) {
-                $fonts_string .= apply_filters( 'autoptimize_filter_extra_gfont_display', '&amp;display=swap' );
+            if (strpos($fonts_string, 'display=') === false) {
+                $fonts_string .= apply_filters('autoptimize_filter_extra_gfont_display', '&amp;display=swap');
             }
 
-            if ( ! empty( $fonts_string ) ) {
-                if ( '5' === $options['autoptimize_extra_radio_field_4'] ) {
-                    $rel_string = 'rel="stylesheet" media="print" onload="' . autoptimizeConfig::get_ao_css_preload_onload() . '"';
+            if (!empty($fonts_string)) {
+                if ('5' === $options['autoptimize_extra_radio_field_4']) {
+                    $rel_string = 'rel="stylesheet" media="print" 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_array = array_map('urldecode', $fonts_array);
             $fonts_array = array_map(
-                function( $_f ) {
-                    return trim( $_f, ',' );
+                function($_f) {
+                    return trim($_f, ',');
                 },
                 $fonts_array
             );
 
             // type attrib on <script not added by default.
             $type_js = '';
-            if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
+            if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
                 $type_js = 'type="text/javascript" ';
             }
 
-            $fonts_markup         = '<script ' . $type_js . 'data-cfasync="false" id="ao_optimized_gfonts_config">WebFontConfig={google:{families:' . wp_json_encode( $fonts_array ) . ' },classes:false, events:false, timeout:1500};</script>';
-            $fonts_library_markup = '<script ' . $type_js . 'data-cfasync="false" id="ao_optimized_gfonts_webfontloader">(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>' ) );
+            $fonts_markup         = '<script '.$type_js.'data-cfasync="false" id="ao_optimized_gfonts_config">WebFontConfig={google:{families:'.wp_json_encode($fonts_array).' },classes:false, events:false, timeout:1500};</script>';
+            $fonts_library_markup = '<script '.$type_js.'data-cfasync="false" id="ao_optimized_gfonts_webfontloader">(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>'));
         }
 
         // 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);
 
         return $out;
     }
 
-    public function filter_preconnect( $hints, $relation_type )
+    public function filter_preconnect($hints, $relation_type)
     {
         $options  = $this->options;
         $preconns = array();
 
         // Get settings and store in array.
-        if ( array_key_exists( 'autoptimize_extra_text_field_2', $options ) ) {
-            $preconns = array_filter( array_map( 'trim', explode( ',', $options['autoptimize_extra_text_field_2'] ) ) );
+        if (array_key_exists('autoptimize_extra_text_field_2', $options)) {
+            $preconns = array_filter(array_map('trim', explode(',', $options['autoptimize_extra_text_field_2'])));
         }
-        $preconns = apply_filters( 'autoptimize_extra_filter_tobepreconn', $preconns );
+        $preconns = apply_filters('autoptimize_extra_filter_tobepreconn', $preconns);
 
         // Walk array, extract domain and add to new array with crossorigin attribute.
-        foreach ( $preconns as $preconn ) {
+        foreach ($preconns as $preconn) {
             $domain = '';
-            $parsed = parse_url( $preconn );
-            if ( is_array( $parsed ) && ! empty( $parsed['host'] ) && empty( $parsed['scheme'] ) ) {
-                $domain = '//' . $parsed['host'];
-            } elseif ( is_array( $parsed ) && ! empty( $parsed['host'] ) ) {
-                $domain = $parsed['scheme'] . '://' . $parsed['host'];
+            $parsed = parse_url($preconn);
+            if (is_array($parsed) && !empty($parsed['host']) && empty($parsed['scheme'])) {
+                $domain = '//'.$parsed['host'];
+            } elseif (is_array($parsed) && !empty($parsed['host'])) {
+                $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;
@@ -372,21 +372,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';
@@ -395,76 +395,76 @@ 
         return $in;
     }
 
-    public function filter_preload( $in ) {
+    public function filter_preload($in) {
         // make array from comma separated list.
         $options  = $this->options;
         $preloads = array();
-        if ( array_key_exists( 'autoptimize_extra_text_field_7', $options ) ) {
-            $preloads = array_filter( array_map( 'trim', explode( ',', $options['autoptimize_extra_text_field_7'] ) ) );
+        if (array_key_exists('autoptimize_extra_text_field_7', $options)) {
+            $preloads = array_filter(array_map('trim', explode(',', $options['autoptimize_extra_text_field_7'])));
         }
-        $preloads = apply_filters( 'autoptimize_filter_extra_tobepreloaded', $preloads );
+        $preloads = apply_filters('autoptimize_filter_extra_tobepreloaded', $preloads);
 
         // immediately return if nothing to be preloaded.
-        if ( empty( $preloads ) ) {
+        if (empty($preloads)) {
             return $in;
         }
 
         // iterate through array and add preload link to tmp string.
         $preload_output = '';
-        foreach ( $preloads as $preload ) {
+        foreach ($preloads as $preload) {
             $crossorigin = '';
             $preload_as  = '';
             $mime_type   = '';
-            $_preload    = strtok( $preload, '?' );
+            $_preload    = strtok($preload, '?');
 
-            if ( autoptimizeUtils::str_ends_in( $_preload, '.css' ) ) {
+            if (autoptimizeUtils::str_ends_in($_preload, '.css')) {
                 $preload_as = 'style';
-            } elseif ( autoptimizeUtils::str_ends_in( $_preload, '.js' ) ) {
+            } elseif (autoptimizeUtils::str_ends_in($_preload, '.js')) {
                 $preload_as = 'script';
-            } elseif ( autoptimizeUtils::str_ends_in( $_preload, '.woff' ) || autoptimizeUtils::str_ends_in( $_preload, '.woff2' ) || autoptimizeUtils::str_ends_in( $_preload, '.ttf' ) || autoptimizeUtils::str_ends_in( $_preload, '.eot' ) || autoptimizeUtils::str_ends_in( $_preload, '.otf' ) ) {
+            } elseif (autoptimizeUtils::str_ends_in($_preload, '.woff') || autoptimizeUtils::str_ends_in($_preload, '.woff2') || autoptimizeUtils::str_ends_in($_preload, '.ttf') || autoptimizeUtils::str_ends_in($_preload, '.eot') || autoptimizeUtils::str_ends_in($_preload, '.otf')) {
                 $preload_as  = 'font';
                 $crossorigin = ' crossorigin';
-                $mime_type   = ' type="font/' . pathinfo( $_preload, PATHINFO_EXTENSION ) . '"';
-                if ( ' type="font/eot"' === $mime_type ) {
+                $mime_type   = ' type="font/'.pathinfo($_preload, PATHINFO_EXTENSION).'"';
+                if (' type="font/eot"' === $mime_type) {
                     $mime_type = 'application/vnd.ms-fontobject';
                 }
-            } elseif ( autoptimizeUtils::str_ends_in( $_preload, '.jpeg' ) || autoptimizeUtils::str_ends_in( $_preload, '.jpg' ) || autoptimizeUtils::str_ends_in( $_preload, '.webp' ) || autoptimizeUtils::str_ends_in( $_preload, '.png' ) || autoptimizeUtils::str_ends_in( $_preload, '.gif' ) ) {
+            } elseif (autoptimizeUtils::str_ends_in($_preload, '.jpeg') || autoptimizeUtils::str_ends_in($_preload, '.jpg') || autoptimizeUtils::str_ends_in($_preload, '.webp') || autoptimizeUtils::str_ends_in($_preload, '.png') || autoptimizeUtils::str_ends_in($_preload, '.gif')) {
                 $preload_as = 'image';
             } else {
                 $preload_as = 'other';
             }
 
-            $preload_output .= '<link rel="preload" href="' . $preload . '" as="' . $preload_as . '"' . $mime_type . $crossorigin . '>';
+            $preload_output .= '<link rel="preload" href="'.$preload.'" as="'.$preload_as.'"'.$mime_type.$crossorigin.'>';
         }
-        $preload_output = apply_filters( 'autoptimize_filter_extra_preload_output', $preload_output );
+        $preload_output = apply_filters('autoptimize_filter_extra_preload_output', $preload_output);
 
         // add string to head (before first link node by default).
-        $preload_inject = apply_filters( 'autoptimize_filter_extra_preload_inject', '<link' );
-        $position       = autoptimizeUtils::strpos( $in, $preload_inject );
+        $preload_inject = apply_filters('autoptimize_filter_extra_preload_inject', '<link');
+        $position       = autoptimizeUtils::strpos($in, $preload_inject);
 
-        return autoptimizeUtils::substr_replace( $in, $preload_output . $preload_inject, $position, strlen( $preload_inject ) );
+        return autoptimizeUtils::substr_replace($in, $preload_output.$preload_inject, $position, strlen($preload_inject));
     }
 
     public function admin_menu()
     {
         // no acces if multisite and not network admin and no site config allowed.
-        if ( autoptimizeConfig::should_show_menu_tabs() ) {
+        if (autoptimizeConfig::should_show_menu_tabs()) {
             add_submenu_page(
                 null,
                 'autoptimize_extra',
                 '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)
     {
-        if ( autoptimizeConfig::should_show_menu_tabs() ) {
-            $in = array_merge( $in, array( 'autoptimize_extra' => __( 'Extra', 'autoptimize' ) ) );
+        if (autoptimizeConfig::should_show_menu_tabs()) {
+            $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize')));
         }
 
         return $in;
@@ -484,97 +484,97 @@ 
         #ao_settings_form .form-table th {font-weight: normal;}
         #autoptimize_extra_descr{font-size: 120%;}
     </style>
-    <script>document.title = "Autoptimize: <?php _e( 'Extra', 'autoptimize' ); ?> " + document.title;</script>
+    <script>document.title = "Autoptimize: <?php _e('Extra', 'autoptimize'); ?> " + document.title;</script>
     <div class="wrap">
-    <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
         <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
-        <?php if ( 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_js' ) && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_css' ) && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_html' ) && ! autoptimizeImages::imgopt_active() ) { ?>
+        <?php if ('on' !== autoptimizeOptionWrapper::get_option('autoptimize_js') && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_css') && 'on' !== autoptimizeOptionWrapper::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='<?php echo admin_url( '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>
+    <form id='ao_settings_form' action='<?php echo admin_url('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>
         <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="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/>
                     <?php // translators: "display:swap" should remain untranslated, will be shown in code tags. ?>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked( 3, $gfonts, true ); ?> ><?php echo __( 'Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize' ) . ', ' . sprintf( __( 'includes %1$sdisplay:swap%2$s.', 'autoptimize' ), '<code>', '</code>' ); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $gfonts, true); ?> ><?php echo __('Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize').', '.sprintf(__('includes %1$sdisplay:swap%2$s.', 'autoptimize'), '<code>', '</code>'); ?><br/>
                     <?php // translators: "display:swap" should remain untranslated, will be shown in code tags. ?>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked( 5, $gfonts, true ); ?> ><?php echo __( 'Combine and link deferred in head (fonts load late, but are not render-blocking)', 'autoptimize' ) . ', ' . sprintf( __( 'includes %1$sdisplay:swap%2$s.', 'autoptimize' ), '<code>', '</code>' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked( 4, $gfonts, true ); ?> ><?php echo __( 'Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize' ) . ' ' . __( '(deprecated)', 'autoptimize' ); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked(5, $gfonts, true); ?> ><?php echo __('Combine and link deferred in head (fonts load late, but are not render-blocking)', 'autoptimize').', '.sprintf(__('includes %1$sdisplay:swap%2$s.', 'autoptimize'), '<code>', '</code>'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $gfonts, true); ?> ><?php echo __('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize').' '.__('(deprecated)', '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( 'Preload specific requests <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Preload specific requests <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_7]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_7', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_7'] ); } ?>'><br /><?php _e( 'Comma-separated list with full URL\'s of to to-be-preloaded resources. To be used sparingly!', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_7]' value='<?php if (array_key_exists('autoptimize_extra_text_field_7', $options)) { echo esc_attr($options['autoptimize_extra_text_field_7']); } ?>'><br /><?php _e('Comma-separated list with full URL\'s of to to-be-preloaded resources. To be used sparingly!', '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
     }

classes/critcss-inc/admin_settings_adv.php

Spacing +33 added lines, -33 removed lines

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

classes/autoptimizeVersionUpdatesHandler.php

Spacing +66 added lines, -66 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 ( autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' ) == '2.4.2' ) {
+                if (autoptimizeOptionWrapper::get_option('autoptimize_version', 'none') == '2.4.2') {
                     $this->upgrade_from_2_4_2();
                 }
                 $this->upgrade_from_2_4();
@@ -59,7 +59,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();
         }
     }
@@ -71,19 +71,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 = autoptimizeOptionWrapper::get_option( 'autoptimize_version', 'none' );
-        if ( $db_version !== $target ) {
-            if ( 'none' === $db_version ) {
-                add_action( 'admin_notices', 'autoptimizeMain::notice_installed' );
+        $db_version = autoptimizeOptionWrapper::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.
-            autoptimizeOptionWrapper::update_option( 'autoptimize_version', $target );
+            autoptimizeOptionWrapper::update_option('autoptimize_version', $target);
         }
     }
 
@@ -94,10 +94,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');
         }
     }
 
@@ -107,7 +107,7 @@ 
     private function upgrade_from_1_6()
     {
         // If user was on version 1.6.x, force advanced options to be shown by default.
-        autoptimizeOptionWrapper::update_option( 'autoptimize_show_adv', '1' );
+        autoptimizeOptionWrapper::update_option('autoptimize_show_adv', '1');
 
         // And remove old options.
         $to_delete_options = array(
@@ -119,8 +119,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);
         }
     }
 
@@ -131,29 +131,29 @@ 
      */
     private function upgrade_from_1_7()
     {
-        if ( ! is_multisite() ) {
-            $css_exclude = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' );
-            if ( empty( $css_exclude ) ) {
+        if (!is_multisite()) {
+            $css_exclude = autoptimizeOptionWrapper::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';
             }
-            autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude );
+            autoptimizeOptionWrapper::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 = autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude' );
-                if ( empty( $css_exclude ) ) {
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                $css_exclude = autoptimizeOptionWrapper::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';
                 }
-                autoptimizeOptionWrapper::update_option( 'autoptimize_css_exclude', $css_exclude );
+                autoptimizeOptionWrapper::update_option('autoptimize_css_exclude', $css_exclude);
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -165,19 +165,19 @@ 
      */
     private function upgrade_from_1_9()
     {
-        if ( ! is_multisite() ) {
-            autoptimizeOptionWrapper::update_option( 'autoptimize_css_include_inline', 'on' );
-            autoptimizeOptionWrapper::update_option( 'autoptimize_js_include_inline', 'on' );
+        if (!is_multisite()) {
+            autoptimizeOptionWrapper::update_option('autoptimize_css_include_inline', 'on');
+            autoptimizeOptionWrapper::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 );
-                autoptimizeOptionWrapper::update_option( 'autoptimize_css_include_inline', 'on' );
-                autoptimizeOptionWrapper::update_option( 'autoptimize_js_include_inline', 'on' );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                autoptimizeOptionWrapper::update_option('autoptimize_css_include_inline', 'on');
+                autoptimizeOptionWrapper::update_option('autoptimize_js_include_inline', 'on');
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -188,17 +188,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);
         }
     }
 
@@ -207,12 +207,12 @@ 
      */
     private function do_2_2_settings_update()
     {
-        $nogooglefont    = autoptimizeOptionWrapper::get_option( 'autoptimize_css_nogooglefont', '' );
-        $ao_extrasetting = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings', '' );
-        if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) {
-            autoptimizeOptionWrapper::update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
+        $nogooglefont    = autoptimizeOptionWrapper::get_option('autoptimize_css_nogooglefont', '');
+        $ao_extrasetting = autoptimizeOptionWrapper::get_option('autoptimize_extra_settings', '');
+        if (($nogooglefont) && (empty($ao_extrasetting))) {
+            autoptimizeOptionWrapper::update_option('autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options());
         }
-        delete_option( 'autoptimize_css_nogooglefont' );
+        delete_option('autoptimize_css_nogooglefont');
     }
 
     /**
@@ -224,33 +224,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  = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings', '' );
-        $imgopt_settings = autoptimizeOptionWrapper::get_option( 'autoptimize_imgopt_settings', '' );
-        if ( empty( $imgopt_settings ) && ! empty( $extra_settings ) ) {
+        $extra_settings  = autoptimizeOptionWrapper::get_option('autoptimize_extra_settings', '');
+        $imgopt_settings = autoptimizeOptionWrapper::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'];
             }
-            autoptimizeOptionWrapper::update_option( 'autoptimize_imgopt_settings', $imgopt_settings );
+            autoptimizeOptionWrapper::update_option('autoptimize_imgopt_settings', $imgopt_settings);
         }
     }
 
@@ -258,11 +258,11 @@ 
      * remove CCSS request limit option + update jquery exclusion to include WordPress 5.6 jquery.min.js.
      */    
     private function upgrade_from_2_7() {
-        delete_option( 'autoptimize_ccss_rlimit' );
-        $js_exclusions = get_option( 'autoptimize_js_exclude', '' );
-        if ( strpos( $js_exclusions, 'js/jquery/jquery.js' ) !== false && strpos( $js_exclusions, 'js/jquery/jquery.min.js' ) === false ) {
+        delete_option('autoptimize_ccss_rlimit');
+        $js_exclusions = get_option('autoptimize_js_exclude', '');
+        if (strpos($js_exclusions, 'js/jquery/jquery.js') !== false && strpos($js_exclusions, 'js/jquery/jquery.min.js') === false) {
             $js_exclusions .= ', js/jquery/jquery.min.js';
-            update_option( 'autoptimize_js_exclude', $js_exclusions );
+            update_option('autoptimize_js_exclude', $js_exclusions);
         }
     }
 }