futtta / autoptimize

classes/critcss-inc/admin_settings_impexp.js.php

Spacing +5 added lines, -5 removed lines

@@ -9,15 +9,15 @@ 
     console.log('Exporting...');
     var data = {
         'action': 'ao_ccss_export',
-        'ao_ccss_export_nonce': '<?php echo wp_create_nonce( 'ao_ccss_export_nonce' ); ?>',
+        'ao_ccss_export_nonce': '<?php echo wp_create_nonce('ao_ccss_export_nonce'); ?>',
     };
 
     jQuery.post(ajaxurl, data, function(response) {
         response_array=JSON.parse(response);
         if (response_array['code'] == 200) {
             <?php
-            if ( is_multisite() ) {
-                $blog_id = '/' . get_current_blog_id() . '/';
+            if (is_multisite()) {
+                $blog_id = '/'.get_current_blog_id().'/';
             } else {
                 $blog_id = '/';
             }
@@ -32,7 +32,7 @@ 
             autoOpen: true,
             height: 210,
             width: 700,
-            title: "<?php _e( 'Export settings result', 'autoptimize' ); ?>",
+            title: "<?php _e('Export settings result', 'autoptimize'); ?>",
             modal: true,
             buttons: {
                 OK: function() {
@@ -50,7 +50,7 @@ 
     var settings_file = file[0].files[0];
     fd.append('file', settings_file);
     fd.append('action', 'ao_ccss_import');
-    fd.append('ao_ccss_import_nonce', '<?php echo wp_create_nonce( 'ao_ccss_import_nonce' ); ?>');
+    fd.append('ao_ccss_import_nonce', '<?php echo wp_create_nonce('ao_ccss_import_nonce'); ?>');
 
     jQuery.ajax({
         url: ajaxurl,

classes/critcss-inc/admin_settings_rules.php

Spacing +70 added lines, -70 removed lines

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

classes/critcss-inc/admin_settings_debug.php

Spacing +15 added lines, -15 removed lines

@@ -10,7 +10,7 @@ 
 $ao_options = $wpdb->get_results('
   SELECT option_name  AS name,
          option_value AS value
-  FROM ' . $wpdb->options . '
+  FROM ' . $wpdb->options.'
   WHERE option_name LIKE "autoptimize_%%"
   ORDER BY name
 ', ARRAY_A);
@@ -19,27 +19,27 @@ 
 $ao_trans = $wpdb->get_results('
   SELECT option_name  AS name,
          option_value AS value
-  FROM ' . $wpdb->options . '
+  FROM ' . $wpdb->options.'
   WHERE option_name LIKE "_transient_autoptimize_%%"
      OR option_name LIKE "_transient_timeout_autoptimize_%%"
 ', ARRAY_A);
 
 // Render debug panel if there's something to show.
-if ( $ao_options || $ao_trans ) {
+if ($ao_options || $ao_trans) {
 ?>
 <!-- BEGIN: Settings Debug -->
 <ul>
     <li class="itemDetail">
-        <h2 class="itemTitle"><?php _e( 'Debug Information', 'autoptimize' ); ?></h2>
+        <h2 class="itemTitle"><?php _e('Debug Information', 'autoptimize'); ?></h2>
 
         <?php
         // Render options.
-        if ( $ao_options ) {
+        if ($ao_options) {
         ?>
-            <h4><?php _e( 'Options', 'autoptimize' ); ?>:</h4>
+            <h4><?php _e('Options', 'autoptimize'); ?>:</h4>
             <table class="form-table debug">
             <?php
-            foreach ( $ao_options as $option ) {
+            foreach ($ao_options as $option) {
             ?>
                 <tr>
                     <th scope="row">
@@ -47,10 +47,10 @@ 
                     </th>
                     <td>
                         <?php
-                        if ( 'autoptimize_ccss_queue' == $option['name'] || 'autoptimize_ccss_rules' == $option['name'] ) {
-                            $value = print_r( json_decode( $option['value'], true ), true );
-                            if ( $value ) {
-                                echo "Raw JSON:\n<pre>" . $option['value'] . "</pre>\n\nDecoded JSON:\n<pre>" . $value . '</pre>';
+                        if ('autoptimize_ccss_queue' == $option['name'] || 'autoptimize_ccss_rules' == $option['name']) {
+                            $value = print_r(json_decode($option['value'], true), true);
+                            if ($value) {
+                                echo "Raw JSON:\n<pre>".$option['value']."</pre>\n\nDecoded JSON:\n<pre>".$value.'</pre>';
                             } else {
                                 echo 'Empty';
                             }
@@ -69,11 +69,11 @@ 
         }
         // Render WP-Cron intervals and scheduled events.
         ?>
-        <h4><?php _e( 'WP-Cron Intervals', 'autoptimize' ); ?>:</h4>
-        <pre><?php print_r( wp_get_schedules() ); ?></pre>
+        <h4><?php _e('WP-Cron Intervals', 'autoptimize'); ?>:</h4>
+        <pre><?php print_r(wp_get_schedules()); ?></pre>
         <hr />
-        <h4><?php _e( 'WP-Cron Scheduled Events', 'autoptimize' ); ?>:</h4>
-        <pre><?php print_r( _get_cron_array() ); ?></pre>
+        <h4><?php _e('WP-Cron Scheduled Events', 'autoptimize'); ?>:</h4>
+        <pre><?php print_r(_get_cron_array()); ?></pre>
     </li>
 </ul>
 <!-- END: Settings Debug -->

classes/autoptimizeCriticalCSSSettings.php

Spacing +103 added lines, -103 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS Options page.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -17,34 +17,34 @@ 
 
     public function __construct()
     {
-        $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http );
+        $this->settings_screen_do_remote_http = apply_filters('autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http);
         $this->run();
     }
 
     protected function enabled()
     {
-        return apply_filters( 'autoptimize_filter_show_criticalcss_tabs', true );
+        return apply_filters('autoptimize_filter_show_criticalcss_tabs', true);
     }
 
     public function run()
     {
-        if ( $this->enabled() ) {
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_critcss_tabs' ), 10, 1 );
-            add_action( 'admin_enqueue_scripts', array( $this, 'admin_assets' ) );
+        if ($this->enabled()) {
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_critcss_tabs'), 10, 1);
+            add_action('admin_enqueue_scripts', array($this, 'admin_assets'));
 
-            if ( $this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
-                add_action( 'network_admin_menu', array( $this, 'add_critcss_admin_menu' ) );
+            if ($this->is_multisite_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
+                add_action('network_admin_menu', array($this, 'add_critcss_admin_menu'));
             } else {
-                add_action( 'admin_menu', array( $this, 'add_critcss_admin_menu' ) );
+                add_action('admin_menu', array($this, 'add_critcss_admin_menu'));
             }
 
             $criticalcss_ajax = new autoptimizeCriticalCSSSettingsAjax();
         }
     }
 
-    public function add_critcss_tabs( $in )
+    public function add_critcss_tabs($in)
     {
-        $in = array_merge( $in, array( 'ao_critcss' => '⚡ ' . __( 'Critical CSS', 'autoptimize' ) ) );
+        $in = array_merge($in, array('ao_critcss' => '⚡ '.__('Critical CSS', 'autoptimize')));
 
         return $in;
     }
@@ -52,56 +52,56 @@ 
     public function add_critcss_admin_menu()
     {
         // Register settings.
-        register_setting( 'ao_ccss_options_group', 'autoptimize_css_defer_inline' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rules' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_additional' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_queue' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_viewport' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_finclude' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_rlimit' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_noptimize' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_debug' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_key' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_keyst' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_loggedin' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_forcepath' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_deferjquery' );
-        register_setting( 'ao_ccss_options_group', 'autoptimize_ccss_domain' );
+        register_setting('ao_ccss_options_group', 'autoptimize_css_defer_inline');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_rules');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_additional');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_queue');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_viewport');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_finclude');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_rlimit');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_noptimize');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_debug');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_key');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_keyst');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_loggedin');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_forcepath');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_deferjquery');
+        register_setting('ao_ccss_options_group', 'autoptimize_ccss_domain');
 
         // And add submenu-page.
-        add_submenu_page( null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array( $this, 'ao_criticalcsssettings_page' ) );
+        add_submenu_page(null, 'Critical CSS', 'Critical CSS', 'manage_options', 'ao_critcss', array($this, 'ao_criticalcsssettings_page'));
     }
 
-    public function admin_assets( $hook ) {
+    public function admin_assets($hook) {
         // Return if plugin is not hooked.
-        if ( 'settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook ) {
+        if ('settings_page_ao_critcss' != $hook && 'admin_page_ao_critcss' != $hook) {
             return;
         }
 
         // Stylesheets to add.
-        wp_enqueue_style( 'wp-jquery-ui-dialog' );
-        wp_enqueue_style( 'ao-tablesorter', plugins_url( 'critcss-inc/css/ao-tablesorter/style.css', __FILE__ ) );
-        wp_enqueue_style( 'ao-ccss-admin-css', plugins_url( 'critcss-inc/css/admin_styles.css', __FILE__ ) );
+        wp_enqueue_style('wp-jquery-ui-dialog');
+        wp_enqueue_style('ao-tablesorter', plugins_url('critcss-inc/css/ao-tablesorter/style.css', __FILE__));
+        wp_enqueue_style('ao-ccss-admin-css', plugins_url('critcss-inc/css/admin_styles.css', __FILE__));
 
         // Scripts to add.
-        wp_enqueue_script( 'jquery-ui-dialog', array( 'jquery' ) );
-        wp_enqueue_script( 'md5', plugins_url( 'critcss-inc/js/md5.min.js', __FILE__ ), null, null, true );
-        wp_enqueue_script( 'tablesorter', plugins_url( 'critcss-inc/js/jquery.tablesorter.min.js', __FILE__ ), array( 'jquery' ), null, true );
-        wp_enqueue_script( 'ao-ccss-admin-license', plugins_url( 'critcss-inc/js/admin_settings.js', __FILE__ ), array( 'jquery' ), null, true );
+        wp_enqueue_script('jquery-ui-dialog', array('jquery'));
+        wp_enqueue_script('md5', plugins_url('critcss-inc/js/md5.min.js', __FILE__), null, null, true);
+        wp_enqueue_script('tablesorter', plugins_url('critcss-inc/js/jquery.tablesorter.min.js', __FILE__), array('jquery'), null, true);
+        wp_enqueue_script('ao-ccss-admin-license', plugins_url('critcss-inc/js/admin_settings.js', __FILE__), array('jquery'), null, true);
     }
 
     public function ao_criticalcsssettings_page()
     {
         // these are not OO yet, simply require for now.
-        require_once( 'critcss-inc/admin_settings_rules.php' );
-        require_once( 'critcss-inc/admin_settings_queue.php' );
-        require_once( 'critcss-inc/admin_settings_key.php' );
-        require_once( 'critcss-inc/admin_settings_adv.php' );
-        require_once( 'critcss-inc/admin_settings_explain.php' );
+        require_once('critcss-inc/admin_settings_rules.php');
+        require_once('critcss-inc/admin_settings_queue.php');
+        require_once('critcss-inc/admin_settings_key.php');
+        require_once('critcss-inc/admin_settings_adv.php');
+        require_once('critcss-inc/admin_settings_explain.php');
 
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
@@ -109,7 +109,7 @@ 
         <div class="wrap">
             <div id="autoptimize_main">
                 <div id="ao_title_and_button">
-                    <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+                    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
                 </div>
 
                 <?php
@@ -117,14 +117,14 @@ 
                 echo autoptimizeConfig::ao_admin_tabs();
 
                 // Make sure dir to write ao_ccss exists and is writable.
-                if ( ! is_dir( AO_CCSS_DIR ) ) {
-                    $mkdirresp = @mkdir( AO_CCSS_DIR, 0775, true ); // @codingStandardsIgnoreLine
-                    $fileresp  = file_put_contents( AO_CCSS_DIR . 'index.html', '<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>' );
-                    if ( ( ! $mkdirresp ) || ( ! $fileresp ) ) {
+                if (!is_dir(AO_CCSS_DIR)) {
+                    $mkdirresp = @mkdir(AO_CCSS_DIR, 0775, true); // @codingStandardsIgnoreLine
+                    $fileresp  = file_put_contents(AO_CCSS_DIR.'index.html', '<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>');
+                    if ((!$mkdirresp) || (!$fileresp)) {
                         ?>
                         <div class="notice-error notice"><p>
                         <?php
-                        _e( 'Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize' );
+                        _e('Could not create the required directory. Make sure the webserver can write to the wp-content directory.', 'autoptimize');
                         ?>
                         </p></div>
                         <?php
@@ -132,11 +132,11 @@ 
                 }
 
                 // Check for Autoptimize.
-                if ( ! empty( $ao_ccss_key ) && ! $ao_css_defer ) {
+                if (!empty($ao_ccss_key) && !$ao_css_defer) {
                     ?>
                     <div class="notice-error notice"><p>
                     <?php
-                    _e( "Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to use this power-up.", 'autoptimize' );
+                    _e("Oops! Please <strong>activate the \"Inline and Defer CSS\" option</strong> on Autoptimize's main settings page to use this power-up.", 'autoptimize');
                     ?>
                     </p></div>
                     <?php
@@ -144,11 +144,11 @@ 
                 }
 
                 // check if WordPress cron is disabled and warn if so.
-                if ( ! empty( $ao_ccss_key ) && defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON && PAnD::is_admin_notice_active( 'i-know-about-disable-cron-forever' ) ) {
+                if (!empty($ao_ccss_key) && defined('DISABLE_WP_CRON') && DISABLE_WP_CRON && PAnD::is_admin_notice_active('i-know-about-disable-cron-forever')) {
                     ?>
                     <div data-dismissible="i-know-about-disable-cron-forever" class="notice-warning notice is-dismissible"><p>
                     <?php
-                    _e( 'WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' );
+                    _e('WordPress cron (for task scheduling) seems to be disabled. Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
@@ -156,24 +156,24 @@ 
 
                 // warn if it looks as though the queue processing job looks isn't running
                 // but store result in transient as to not to have to go through 2 arrays each and every time.
-                $_warn_cron = get_transient( 'ao_ccss_cronwarning' );
-                if ( ! empty( $ao_ccss_key ) && false === $_warn_cron ) {
+                $_warn_cron = get_transient('ao_ccss_cronwarning');
+                if (!empty($ao_ccss_key) && false === $_warn_cron) {
                     $_jobs_all_new         = true;
-                    $_oldest_job_timestamp = microtime( true ); // now.
+                    $_oldest_job_timestamp = microtime(true); // now.
                     $_jobs_too_old         = true;
 
                     // go over queue array.
-                    if ( empty( $ao_ccss_queue ) ) {
+                    if (empty($ao_ccss_queue)) {
                         // no jobs, then no warning.
                         $_jobs_all_new = false;
                     } else {
-                        foreach ( $ao_ccss_queue as $job ) {
-                            if ( $job['jctime'] < $_oldest_job_timestamp ) {
+                        foreach ($ao_ccss_queue as $job) {
+                            if ($job['jctime'] < $_oldest_job_timestamp) {
                                 // we need to catch the oldest job's timestamp.
                                 $_oldest_job_timestamp = $job['jctime'];
                             }
 
-                            if ( 'NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid'] ) {
+                            if ('NEW' !== $job['jqstat'] && 'firstrun' !== $job['ljid']) {
                                 // we have a non-"NEW" job which is not our pending firstrun job either, break the loop.
                                 $_jobs_all_new = false;
                                 break;
@@ -182,11 +182,11 @@ 
                     }
 
                     // is the oldest job too old (4h)?
-                    if ( $_oldest_job_timestamp > microtime( true ) - 60 * 60 * 4 ) {
+                    if ($_oldest_job_timestamp > microtime(true) - 60*60*4) {
                         $_jobs_too_old = false;
                     }
 
-                    if ( $_jobs_all_new && ! $this->ao_ccss_has_autorules() && $_jobs_too_old ) {
+                    if ($_jobs_all_new && !$this->ao_ccss_has_autorules() && $_jobs_too_old) {
                         $_warn_cron            = 'on';
                         $_transient_multiplier = 1; // store for 1 hour.
                     } else {
@@ -194,33 +194,33 @@ 
                         $_transient_multiplier = 4; // store for 4 hours.
                     }
                     // and set transient.
-                    set_transient( 'ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier * HOUR_IN_SECONDS );
+                    set_transient('ao_ccss_cronwarning', $_warn_cron, $_transient_multiplier*HOUR_IN_SECONDS);
                 }
 
-                if ( ! empty( $ao_ccss_key ) && 'on' == $_warn_cron && PAnD::is_admin_notice_active( 'i-know-about-cron-1' ) ) {
+                if (!empty($ao_ccss_key) && 'on' == $_warn_cron && PAnD::is_admin_notice_active('i-know-about-cron-1')) {
                     ?>
                     <div data-dismissible="i-know-about-cron-1" class="notice-warning notice is-dismissible"><p>
                     <?php
-                    _e( 'It looks like there might be a problem with WordPress cron (task scheduling). Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize' );
+                    _e('It looks like there might be a problem with WordPress cron (task scheduling). Have a look at <a href="https://wordpress.org/plugins/autoptimize-criticalcss/faq/" target="_blank">the FAQ</a> or the info in the Job Queue instructions if all jobs remain in "N" status and no rules are created.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
-                } elseif ( ! empty( $ao_ccss_key ) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && ! $this->ao_ccss_has_autorules() ) {
+                } elseif (!empty($ao_ccss_key) && '2' == $ao_ccss_keyst && 'on' != $_warn_cron && !$this->ao_ccss_has_autorules()) {
                     ?>
                     <div class="notice-success notice"><p>
                     <?php
-                    _e( 'Great, Autoptimize will now automatically start creating new critical CSS rules, you should see those appearing below in the next couple of hours.', 'autoptimize' );
+                    _e('Great, Autoptimize will now automatically start creating new critical CSS rules, you should see those appearing below in the next couple of hours.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
                 }
 
                 // warn if service is down.
-                if ( ! empty( $ao_ccss_key ) && ! empty( $ao_ccss_servicestatus ) && is_array( $ao_ccss_servicestatus ) && 'down' === $ao_ccss_servicestatus['critcss']['status'] ) {
+                if (!empty($ao_ccss_key) && !empty($ao_ccss_servicestatus) && is_array($ao_ccss_servicestatus) && 'down' === $ao_ccss_servicestatus['critcss']['status']) {
                     ?>
                     <div class="notice-warning notice"><p>
                     <?php
-                    _e( 'The critical CSS service has been reported to be down. Although no new rules will be created for now, this does not prevent existing rules from being applied.', 'autoptimize' );
+                    _e('The critical CSS service has been reported to be down. Although no new rules will be created for now, this does not prevent existing rules from being applied.', 'autoptimize');
                     ?>
                     </p></div>
                     <?php
@@ -230,24 +230,24 @@ 
                 ?>
                 <form id="settings" method="post" action="options.php">
                     <?php
-                    settings_fields( 'ao_ccss_options_group' );
+                    settings_fields('ao_ccss_options_group');
 
                     // Get API key status.
-                    $key = autoptimizeCriticalCSSCore::ao_ccss_key_status( true );
+                    $key = autoptimizeCriticalCSSCore::ao_ccss_key_status(true);
 
-                    if ( $this->is_multisite_network_admin() ) {
+                    if ($this->is_multisite_network_admin()) {
                         ?>
                         <ul id="key-panel">
                             <li class="itemDetail">
                             <?php
                                 // translators: the placesholder is for a line of code in wp-config.php.
-                                echo sprintf( __( '<p>Critical CSS settings cannot be set at network level as critical CSS is specific to each sub-site.</p><p>You can however provide the critical CSS API key for use by all sites by adding this your wp-config.php as %s</p>', 'autoptimize' ), '<br/><code>define(\'AUTOPTIMIZE_CRITICALCSS_API_KEY\', \'eyJhbGmorestringsherexHa7MkOQFtDFkZgLmBLe-LpcHx4\');</code>' );
+                                echo sprintf(__('<p>Critical CSS settings cannot be set at network level as critical CSS is specific to each sub-site.</p><p>You can however provide the critical CSS API key for use by all sites by adding this your wp-config.php as %s</p>', 'autoptimize'), '<br/><code>define(\'AUTOPTIMIZE_CRITICALCSS_API_KEY\', \'eyJhbGmorestringsherexHa7MkOQFtDFkZgLmBLe-LpcHx4\');</code>');
                             ?>
                             </li>
                         </ul>
                         <?php
                     } else {
-                        if ( 'valid' == $key['status'] ) {
+                        if ('valid' == $key['status']) {
                             // If key status is valid, render other panels.
                             // Render rules section.
                             ao_ccss_render_rules();
@@ -264,23 +264,23 @@ 
                             $viewport = autoptimizeCriticalCSSCore::ao_ccss_viewport();
 
                             // Add hidden fields.
-                            echo "<input class='hidden' name='autoptimize_ccss_rules' value='" . $ao_ccss_rules_raw . "'>";
-                            echo "<input class='hidden' name='autoptimize_ccss_queue' value='" . $ao_ccss_queue_raw . "'>";
-                            echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="' . $viewport['w'] . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="' . $viewport['h'] . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_finclude" value="' . $ao_ccss_finclude . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_rlimit" value="' . $ao_ccss_rlimit . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_debug" value="' . $ao_ccss_debug . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="' . $ao_ccss_noptimize . '">';
-                            echo '<input class="hidden" name="autoptimize_css_defer_inline" value="' . esc_attr( $ao_css_defer_inline ) . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="' . $ao_ccss_loggedin . '">';
-                            echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="' . $ao_ccss_forcepath . '">';
+                            echo "<input class='hidden' name='autoptimize_ccss_rules' value='".$ao_ccss_rules_raw."'>";
+                            echo "<input class='hidden' name='autoptimize_ccss_queue' value='".$ao_ccss_queue_raw."'>";
+                            echo '<input class="hidden" name="autoptimize_ccss_viewport[w]" value="'.$viewport['w'].'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_viewport[h]" value="'.$viewport['h'].'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_finclude" value="'.$ao_ccss_finclude.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_rlimit" value="'.$ao_ccss_rlimit.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_debug" value="'.$ao_ccss_debug.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_noptimize" value="'.$ao_ccss_noptimize.'">';
+                            echo '<input class="hidden" name="autoptimize_css_defer_inline" value="'.esc_attr($ao_css_defer_inline).'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_loggedin" value="'.$ao_ccss_loggedin.'">';
+                            echo '<input class="hidden" name="autoptimize_ccss_forcepath" value="'.$ao_ccss_forcepath.'">';
                         }
                         // Render key panel unconditionally.
-                        ao_ccss_render_key( $ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color'] );
+                        ao_ccss_render_key($ao_ccss_key, $key['status'], $key['stmsg'], $key['msg'], $key['color']);
                         ?>
                         <p class="submit left">
-                            <input type="submit" class="button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" />
+                            <input type="submit" class="button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" />
                         </p>
                         <?php
                     }
@@ -298,31 +298,31 @@ 
                     });
                 }
                 </script>
-                <form id="importSettingsForm"<?php if ( $this->is_multisite_network_admin() ) { echo ' class="hidden"'; } ?>>
-                    <span id="exportSettings" class="button-secondary"><?php _e( 'Export Settings', 'autoptimize' ); ?></span>
-                    <input class="button-secondary" id="importSettings" type="button" value="<?php _e( 'Import Settings', 'autoptimize' ); ?>" onclick="upload();return false;" />
+                <form id="importSettingsForm"<?php if ($this->is_multisite_network_admin()) { echo ' class="hidden"'; } ?>>
+                    <span id="exportSettings" class="button-secondary"><?php _e('Export Settings', 'autoptimize'); ?></span>
+                    <input class="button-secondary" id="importSettings" type="button" value="<?php _e('Import Settings', 'autoptimize'); ?>" onclick="upload();return false;" />
                     <input class="button-secondary" id="settingsfile" name="settingsfile" type="file" />
                 </form>
                 <div id="importdialog"></div>
             </div><!-- /#autoptimize_main -->
         </div><!-- /#wrap -->
         <?php
-        if ( ! $this->is_multisite_network_admin() ) {
+        if (!$this->is_multisite_network_admin()) {
             // Include debug panel if debug mode is enable.
-            if ( $ao_ccss_debug ) {
+            if ($ao_ccss_debug) {
             ?>
                 <div id="debug">
                     <?php
                     // Include debug panel.
-                    include( 'critcss-inc/admin_settings_debug.php' );
+                    include('critcss-inc/admin_settings_debug.php');
                     ?>
                 </div><!-- /#debug -->
             <?php
             }
             echo '<script>';
-            include( 'critcss-inc/admin_settings_rules.js.php' );
-            include( 'critcss-inc/admin_settings_queue.js.php' );
-            include( 'critcss-inc/admin_settings_impexp.js.php' );
+            include('critcss-inc/admin_settings_rules.js.php');
+            include('critcss-inc/admin_settings_queue.js.php');
+            include('critcss-inc/admin_settings_impexp.js.php');
             echo '</script>';
         }
     }
@@ -330,19 +330,19 @@ 
     public static function ao_ccss_has_autorules() {
         static $_has_auto_rules = null;
 
-        if ( null === $_has_auto_rules ) {
+        if (null === $_has_auto_rules) {
             global $ao_ccss_rules;
             $_has_auto_rules = false;
-            if ( ! empty( $ao_ccss_rules ) ) {
-                foreach ( array( 'types', 'paths' ) as $_typat ) {
-                    foreach ( $ao_ccss_rules[ $_typat ] as $rule ) {
-                        if ( ! empty( $rule['hash'] ) ) {
+            if (!empty($ao_ccss_rules)) {
+                foreach (array('types', 'paths') as $_typat) {
+                    foreach ($ao_ccss_rules[$_typat] as $rule) {
+                        if (!empty($rule['hash'])) {
                             // we have at least one AUTO job, so all is fine.
                             $_has_auto_rules = true;
                             break;
                         }
                     }
-                    if ( $_has_auto_rules ) {
+                    if ($_has_auto_rules) {
                         break;
                     }
                 }
@@ -355,8 +355,8 @@ 
     public function is_multisite_network_admin() {
         static $_multisite_network_admin = null;
 
-        if ( null === $_multisite_network_admin ) {
-            if ( is_multisite() && is_network_admin() ) {
+        if (null === $_multisite_network_admin) {
+            if (is_multisite() && is_network_admin()) {
                 $_multisite_network_admin = true;
             } else {
                 $_multisite_network_admin = false;

classes/autoptimizeCriticalCSSSettingsAjax.php

Spacing +99 added lines, -99 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS settings AJAX logic.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -12,7 +12,7 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
@@ -21,47 +21,47 @@ 
 
     public function run() {
         // add filters.
-        add_action( 'wp_ajax_fetch_critcss', array( $this, 'critcss_fetch_callback' ) );
-        add_action( 'wp_ajax_save_critcss', array( $this, 'critcss_save_callback' ) );
-        add_action( 'wp_ajax_rm_critcss', array( $this, 'critcss_rm_callback' ) );
-        add_action( 'wp_ajax_rm_critcss_all', array( $this, 'critcss_rm_all_callback' ) );
-        add_action( 'wp_ajax_ao_ccss_export', array( $this, 'ao_ccss_export_callback' ) );
-        add_action( 'wp_ajax_ao_ccss_import', array( $this, 'ao_ccss_import_callback' ) );
+        add_action('wp_ajax_fetch_critcss', array($this, 'critcss_fetch_callback'));
+        add_action('wp_ajax_save_critcss', array($this, 'critcss_save_callback'));
+        add_action('wp_ajax_rm_critcss', array($this, 'critcss_rm_callback'));
+        add_action('wp_ajax_rm_critcss_all', array($this, 'critcss_rm_all_callback'));
+        add_action('wp_ajax_ao_ccss_export', array($this, 'ao_ccss_export_callback'));
+        add_action('wp_ajax_ao_ccss_import', array($this, 'ao_ccss_import_callback'));
     }
 
     public function critcss_fetch_callback() {
         // Ajax handler to obtain a critical CSS file from the filesystem.
         // Check referer.
-        check_ajax_referer( 'fetch_critcss_nonce', 'critcss_fetch_nonce' );
+        check_ajax_referer('fetch_critcss_nonce', 'critcss_fetch_nonce');
 
         // Initialize error flag.
         $error = true;
 
         // Allow no content for MANUAL rules (as they may not exist just yet).
-        if ( current_user_can( 'manage_options' ) && empty( $_POST['critcssfile'] ) ) {
+        if (current_user_can('manage_options') && empty($_POST['critcssfile'])) {
             $content = '';
             $error   = false;
-        } elseif ( current_user_can( 'manage_options' ) && $this->critcss_check_filename( $_POST['critcssfile'] ) ) {
+        } elseif (current_user_can('manage_options') && $this->critcss_check_filename($_POST['critcssfile'])) {
             // Or check user permissios and filename.
             // Set file path and obtain its content.
-            $critcssfile = AO_CCSS_DIR . strip_tags( $_POST['critcssfile'] );
-            if ( file_exists( $critcssfile ) ) {
-                $content = file_get_contents( $critcssfile );
+            $critcssfile = AO_CCSS_DIR.strip_tags($_POST['critcssfile']);
+            if (file_exists($critcssfile)) {
+                $content = file_get_contents($critcssfile);
                 $error   = false;
             }
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code']   = '500';
-            $response['string'] = 'Error reading file ' . $critcssfile . '.';
+            $response['string'] = 'Error reading file '.$critcssfile.'.';
         } else {
             $response['code']   = '200';
             $response['string'] = $content;
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -74,22 +74,22 @@ 
 
         // Ajax handler to write a critical CSS to the filesystem
         // Check referer.
-        check_ajax_referer( 'save_critcss_nonce', 'critcss_save_nonce' );
+        check_ajax_referer('save_critcss_nonce', 'critcss_save_nonce');
 
         // Allow empty contents for MANUAL rules (as they are fetched later).
-        if ( current_user_can( 'manage_options' ) && empty( $_POST['critcssfile'] ) ) {
+        if (current_user_can('manage_options') && empty($_POST['critcssfile'])) {
             $critcssfile = false;
             $status      = true;
-        } elseif ( current_user_can( 'manage_options' ) && $this->critcss_check_filename( $_POST['critcssfile'] ) ) {
+        } elseif (current_user_can('manage_options') && $this->critcss_check_filename($_POST['critcssfile'])) {
             // Or check user permissios and filename
             // Set critical CSS content.
-            $critcsscontents = stripslashes( $_POST['critcsscontents'] );
+            $critcsscontents = stripslashes($_POST['critcsscontents']);
 
             // If there is content and it's valid, write the file.
-            if ( $critcsscontents && autoptimizeCriticalCSSCore::ao_ccss_check_contents( $critcsscontents ) ) {
+            if ($critcsscontents && autoptimizeCriticalCSSCore::ao_ccss_check_contents($critcsscontents)) {
                 // Set file path and status.
-                $critcssfile = AO_CCSS_DIR . strip_tags( $_POST['critcssfile'] );
-                $status      = file_put_contents( $critcssfile, $critcsscontents, LOCK_EX );
+                $critcssfile = AO_CCSS_DIR.strip_tags($_POST['critcssfile']);
+                $status      = file_put_contents($critcssfile, $critcsscontents, LOCK_EX);
                 // Or set as error.
             } else {
                 $error = true;
@@ -100,20 +100,20 @@ 
         }
 
         // Prepare response.
-        if ( ! $status || $error ) {
+        if (!$status || $error) {
             $response['code']   = '500';
-            $response['string'] = 'Error saving file ' . $critcssfile . '.';
+            $response['string'] = 'Error saving file '.$critcssfile.'.';
         } else {
             $response['code'] = '200';
-            if ( $critcssfile ) {
-                $response['string'] = 'File ' . $critcssfile . ' saved.';
+            if ($critcssfile) {
+                $response['string'] = 'File '.$critcssfile.' saved.';
             } else {
                 $response['string'] = 'Empty content do not need to be saved.';
             }
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -123,40 +123,40 @@ 
     public function critcss_rm_callback() {
         // Ajax handler to delete a critical CSS from the filesystem
         // Check referer.
-        check_ajax_referer( 'rm_critcss_nonce', 'critcss_rm_nonce' );
+        check_ajax_referer('rm_critcss_nonce', 'critcss_rm_nonce');
 
         // Initialize error and status flags.
         $error  = true;
         $status = false;
 
         // Allow no file for MANUAL rules (as they may not exist just yet).
-        if ( current_user_can( 'manage_options' ) && empty( $_POST['critcssfile'] ) ) {
+        if (current_user_can('manage_options') && empty($_POST['critcssfile'])) {
             $error = false;
-        } elseif ( current_user_can( 'manage_options' ) && $this->critcss_check_filename( $_POST['critcssfile'] ) ) {
+        } elseif (current_user_can('manage_options') && $this->critcss_check_filename($_POST['critcssfile'])) {
             // Or check user permissios and filename
             // Set file path and delete it.
-            $critcssfile = AO_CCSS_DIR . strip_tags( $_POST['critcssfile'] );
-            if ( file_exists( $critcssfile ) ) {
-                $status = unlink( $critcssfile );
+            $critcssfile = AO_CCSS_DIR.strip_tags($_POST['critcssfile']);
+            if (file_exists($critcssfile)) {
+                $status = unlink($critcssfile);
                 $error  = false;
             }
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code']   = '500';
-            $response['string'] = 'Error removing file ' . $critcssfile . '.';
+            $response['string'] = 'Error removing file '.$critcssfile.'.';
         } else {
             $response['code'] = '200';
-            if ( $status ) {
-                $response['string'] = 'File ' . $critcssfile . ' removed.';
+            if ($status) {
+                $response['string'] = 'File '.$critcssfile.' removed.';
             } else {
                 $response['string'] = 'No file to be removed.';
             }
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -165,28 +165,28 @@ 
     public function critcss_rm_all_callback() {
         // Ajax handler to delete a critical CSS from the filesystem
         // Check referer.
-        check_ajax_referer( 'rm_critcss_all_nonce', 'critcss_rm_all_nonce' );
+        check_ajax_referer('rm_critcss_all_nonce', 'critcss_rm_all_nonce');
 
         // Initialize error and status flags.
         $error  = true;
         $status = false;
 
         // Remove all ccss files on filesystem.
-        if ( current_user_can( 'manage_options' ) ) {
-            if ( file_exists( AO_CCSS_DIR ) && is_dir( AO_CCSS_DIR ) ) {
-                array_map( 'unlink', glob( AO_CCSS_DIR . 'ccss_*.css', GLOB_BRACE ) );
+        if (current_user_can('manage_options')) {
+            if (file_exists(AO_CCSS_DIR) && is_dir(AO_CCSS_DIR)) {
+                array_map('unlink', glob(AO_CCSS_DIR.'ccss_*.css', GLOB_BRACE));
                 $error  = false;
                 $status = true;
             }
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code']   = '500';
             $response['string'] = 'Error removing all critical CSS files.';
         } else {
             $response['code'] = '200';
-            if ( $status ) {
+            if ($status) {
                 $response['string'] = 'Critical CSS Files removed.';
             } else {
                 $response['string'] = 'No file removed.';
@@ -194,7 +194,7 @@ 
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -203,70 +203,70 @@ 
     public function ao_ccss_export_callback() {
         // Ajax handler export settings
         // Check referer.
-        check_ajax_referer( 'ao_ccss_export_nonce', 'ao_ccss_export_nonce' );
+        check_ajax_referer('ao_ccss_export_nonce', 'ao_ccss_export_nonce');
 
-        if ( ! class_exists( 'ZipArchive' ) ) {
+        if (!class_exists('ZipArchive')) {
             $response['code'] = '500';
             $response['msg']  = 'PHP ZipArchive not present, cannot create zipfile';
-            echo json_encode( $response );
+            echo json_encode($response);
             wp_die();
         }
 
         // Init array, get options and prepare the raw object.
         $settings               = array();
-        $settings['rules']      = get_option( 'autoptimize_ccss_rules' );
-        $settings['additional'] = get_option( 'autoptimize_ccss_additional' );
-        $settings['viewport']   = get_option( 'autoptimize_ccss_viewport' );
-        $settings['finclude']   = get_option( 'autoptimize_ccss_finclude' );
-        $settings['rlimit']     = get_option( 'autoptimize_ccss_rlimit' );
-        $settings['noptimize']  = get_option( 'autoptimize_ccss_noptimize' );
-        $settings['debug']      = get_option( 'autoptimize_ccss_debug' );
-        $settings['key']        = get_option( 'autoptimize_ccss_key' );
+        $settings['rules']      = get_option('autoptimize_ccss_rules');
+        $settings['additional'] = get_option('autoptimize_ccss_additional');
+        $settings['viewport']   = get_option('autoptimize_ccss_viewport');
+        $settings['finclude']   = get_option('autoptimize_ccss_finclude');
+        $settings['rlimit']     = get_option('autoptimize_ccss_rlimit');
+        $settings['noptimize']  = get_option('autoptimize_ccss_noptimize');
+        $settings['debug']      = get_option('autoptimize_ccss_debug');
+        $settings['key']        = get_option('autoptimize_ccss_key');
 
         // Initialize error flag.
         $error = true;
 
         // Check user permissions.
-        if ( current_user_can( 'manage_options' ) ) {
+        if (current_user_can('manage_options')) {
             // Prepare settings file path and content.
-            $exportfile = AO_CCSS_DIR . 'settings.json';
-            $contents   = json_encode( $settings );
-            $status     = file_put_contents( $exportfile, $contents, LOCK_EX );
+            $exportfile = AO_CCSS_DIR.'settings.json';
+            $contents   = json_encode($settings);
+            $status     = file_put_contents($exportfile, $contents, LOCK_EX);
             $error      = false;
         }
 
         // Prepare archive.
-        $zipfile = AO_CCSS_DIR . date( 'Ymd-H\hi' ) . '_ao_ccss_settings.zip';
-        $file    = pathinfo( $zipfile, PATHINFO_BASENAME );
+        $zipfile = AO_CCSS_DIR.date('Ymd-H\hi').'_ao_ccss_settings.zip';
+        $file    = pathinfo($zipfile, PATHINFO_BASENAME);
         $zip     = new ZipArchive();
-        $ret     = $zip->open( $zipfile, ZipArchive::CREATE );
-        if ( true !== $ret ) {
+        $ret     = $zip->open($zipfile, ZipArchive::CREATE);
+        if (true !== $ret) {
             $error = true;
         } else {
-            $zip->addFile( AO_CCSS_DIR . 'settings.json', 'settings.json' );
-            if ( file_exists( AO_CCSS_DIR . 'queue.json' ) ) {
-                $zip->addFile( AO_CCSS_DIR . 'queue.json', 'queue.json' );
+            $zip->addFile(AO_CCSS_DIR.'settings.json', 'settings.json');
+            if (file_exists(AO_CCSS_DIR.'queue.json')) {
+                $zip->addFile(AO_CCSS_DIR.'queue.json', 'queue.json');
             }
             $options = array(
                 'add_path'        => './',
                 'remove_all_path' => true,
             );
-            $zip->addGlob( AO_CCSS_DIR . '*.css', 0, $options );
+            $zip->addGlob(AO_CCSS_DIR.'*.css', 0, $options);
             $zip->close();
         }
 
         // Prepare response.
-        if ( ! $status || $error ) {
+        if (!$status || $error) {
             $response['code'] = '500';
-            $response['msg']  = 'Error saving file ' . $file . ', code: ' . $ret;
+            $response['msg']  = 'Error saving file '.$file.', code: '.$ret;
         } else {
             $response['code'] = '200';
-            $response['msg']  = 'File ' . $file . ' saved.';
+            $response['msg']  = 'File '.$file.' saved.';
             $response['file'] = $file;
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -275,44 +275,44 @@ 
     public function ao_ccss_import_callback() {
         // Ajax handler import settings
         // Check referer.
-        check_ajax_referer( 'ao_ccss_import_nonce', 'ao_ccss_import_nonce' );
+        check_ajax_referer('ao_ccss_import_nonce', 'ao_ccss_import_nonce');
 
         // Initialize error flag.
         $error = false;
 
         // Process an uploaded file with no errors.
-        if ( ! $_FILES['file']['error'] ) {
+        if (!$_FILES['file']['error']) {
             // Save file to the cache directory.
-            $zipfile = AO_CCSS_DIR . $_FILES['file']['name'];
-            move_uploaded_file( $_FILES['file']['tmp_name'], $zipfile );
+            $zipfile = AO_CCSS_DIR.$_FILES['file']['name'];
+            move_uploaded_file($_FILES['file']['tmp_name'], $zipfile);
 
             // Extract archive.
             $zip = new ZipArchive;
-            if ( $zip->open( $zipfile ) === true ) {
-                $zip->extractTo( AO_CCSS_DIR );
+            if ($zip->open($zipfile) === true) {
+                $zip->extractTo(AO_CCSS_DIR);
                 $zip->close();
             } else {
                 $error = 'extracting';
             }
 
-            if ( ! $error ) {
+            if (!$error) {
                 // Archive extraction ok, continue settings importing
                 // Settings file.
-                $importfile = AO_CCSS_DIR . 'settings.json';
+                $importfile = AO_CCSS_DIR.'settings.json';
 
-                if ( file_exists( $importfile ) ) {
+                if (file_exists($importfile)) {
                     // Get settings and turn them into an object.
-                    $settings = json_decode( file_get_contents( $importfile ), true );
+                    $settings = json_decode(file_get_contents($importfile), true);
 
                     // Update options.
-                    update_option( 'autoptimize_ccss_rules', $settings['rules'] );
-                    update_option( 'autoptimize_ccss_additional', $settings['additional'] );
-                    update_option( 'autoptimize_ccss_viewport', $settings['viewport'] );
-                    update_option( 'autoptimize_ccss_finclude', $settings['finclude'] );
-                    update_option( 'autoptimize_ccss_rlimit', $settings['rlimit'] );
-                    update_option( 'autoptimize_ccss_noptimize', $settings['noptimize'] );
-                    update_option( 'autoptimize_ccss_debug', $settings['debug'] );
-                    update_option( 'autoptimize_ccss_key', $settings['key'] );
+                    update_option('autoptimize_ccss_rules', $settings['rules']);
+                    update_option('autoptimize_ccss_additional', $settings['additional']);
+                    update_option('autoptimize_ccss_viewport', $settings['viewport']);
+                    update_option('autoptimize_ccss_finclude', $settings['finclude']);
+                    update_option('autoptimize_ccss_rlimit', $settings['rlimit']);
+                    update_option('autoptimize_ccss_noptimize', $settings['noptimize']);
+                    update_option('autoptimize_ccss_debug', $settings['debug']);
+                    update_option('autoptimize_ccss_key', $settings['key']);
                 } else {
                     // Settings file doesn't exist, update error flag.
                     $error = 'settings file does not exist';
@@ -321,28 +321,28 @@ 
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code'] = '500';
-            $response['msg']  = 'Error importing settings: ' . $error;
+            $response['msg']  = 'Error importing settings: '.$error;
         } else {
             $response['code'] = '200';
             $response['msg']  = 'Settings imported successfully';
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
     }
 
-    public function critcss_check_filename( $filename ) {
+    public function critcss_check_filename($filename) {
         // Try to avoid directory traversal when reading/writing/deleting critical CSS files.
-        if ( strpos( $filename, 'ccss_' ) !== 0 ) {
+        if (strpos($filename, 'ccss_') !== 0) {
             return false;
-        } elseif ( substr( $filename, -4, 4 ) !== '.css' ) {
+        } elseif (substr($filename, -4, 4) !== '.css') {
             return false;
-        } elseif ( sanitize_file_name( $filename ) !== $filename ) {
+        } elseif (sanitize_file_name($filename) !== $filename) {
             // Use WordPress core's sanitize_file_name to see if anything fishy is going on.
             return false;
         } else {

classes/autoptimizeUtils.php

Spacing +88 added lines, -88 removed lines

@@ -3,7 +3,7 @@ 
  * General helpers.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -16,15 +16,15 @@ 
      *
      * @return bool
      */
-    public static function mbstring_available( $override = null )
+    public static function mbstring_available($override = null)
     {
         static $available = null;
 
-        if ( null === $available ) {
-            $available = \extension_loaded( 'mbstring' );
+        if (null === $available) {
+            $available = \extension_loaded('mbstring');
         }
 
-        if ( null !== $override ) {
+        if (null !== $override) {
             $available = $override;
         }
 
@@ -42,12 +42,12 @@ 
      *
      * @return int|false
      */
-    public static function strpos( $haystack, $needle, $offset = 0, $encoding = null )
+    public static function strpos($haystack, $needle, $offset = 0, $encoding = null)
     {
-        if ( self::mbstring_available() ) {
-            return ( null === $encoding ) ? \mb_strpos( $haystack, $needle, $offset ) : \mb_strpos( $haystack, $needle, $offset, $encoding );
+        if (self::mbstring_available()) {
+            return (null === $encoding) ? \mb_strpos($haystack, $needle, $offset) : \mb_strpos($haystack, $needle, $offset, $encoding);
         } else {
-            return \strpos( $haystack, $needle, $offset );
+            return \strpos($haystack, $needle, $offset);
         }
     }
 
@@ -62,12 +62,12 @@ 
      * @return int Number of characters or bytes in given $string
      *             (characters if/when supported, bytes otherwise).
      */
-    public static function strlen( $string, $encoding = null )
+    public static function strlen($string, $encoding = null)
     {
-        if ( self::mbstring_available() ) {
-            return ( null === $encoding ) ? \mb_strlen( $string ) : \mb_strlen( $string, $encoding );
+        if (self::mbstring_available()) {
+            return (null === $encoding) ? \mb_strlen($string) : \mb_strlen($string, $encoding);
         } else {
-            return \strlen( $string );
+            return \strlen($string);
         }
     }
 
@@ -85,44 +85,44 @@ 
      *
      * @return string
      */
-    public static function substr_replace( $string, $replacement, $start, $length = null, $encoding = null )
+    public static function substr_replace($string, $replacement, $start, $length = null, $encoding = null)
     {
-        if ( self::mbstring_available() ) {
-            $strlen = self::strlen( $string, $encoding );
+        if (self::mbstring_available()) {
+            $strlen = self::strlen($string, $encoding);
 
-            if ( $start < 0 ) {
+            if ($start < 0) {
                 if ( -$start < $strlen ) {
                     $start = $strlen + $start;
                 } else {
                     $start = 0;
                 }
-            } elseif ( $start > $strlen ) {
+            } elseif ($start > $strlen) {
                 $start = $strlen;
             }
 
-            if ( null === $length || '' === $length ) {
+            if (null === $length || '' === $length) {
                 $start2 = $strlen;
-            } elseif ( $length < 0 ) {
+            } elseif ($length < 0) {
                 $start2 = $strlen + $length;
-                if ( $start2 < $start ) {
+                if ($start2 < $start) {
                     $start2 = $start;
                 }
             } else {
                 $start2 = $start + $length;
             }
 
-            if ( null === $encoding ) {
-                $leader  = $start ? \mb_substr( $string, 0, $start ) : '';
-                $trailer = ( $start2 < $strlen ) ? \mb_substr( $string, $start2, null ) : '';
+            if (null === $encoding) {
+                $leader  = $start ? \mb_substr($string, 0, $start) : '';
+                $trailer = ($start2 < $strlen) ? \mb_substr($string, $start2, null) : '';
             } else {
-                $leader  = $start ? \mb_substr( $string, 0, $start, $encoding ) : '';
-                $trailer = ( $start2 < $strlen ) ? \mb_substr( $string, $start2, null, $encoding ) : '';
+                $leader  = $start ? \mb_substr($string, 0, $start, $encoding) : '';
+                $trailer = ($start2 < $strlen) ? \mb_substr($string, $start2, null, $encoding) : '';
             }
 
             return "{$leader}{$replacement}{$trailer}";
         }
 
-        return ( null === $length ) ? \substr_replace( $string, $replacement, $start ) : \substr_replace( $string, $replacement, $start, $length );
+        return (null === $length) ? \substr_replace($string, $replacement, $start) : \substr_replace($string, $replacement, $start, $length);
     }
 
     /**
@@ -132,16 +132,16 @@ 
      *
      * @return bool
      */
-    public static function siteurl_not_root( $override = null )
+    public static function siteurl_not_root($override = null)
     {
         static $subdir = null;
 
-        if ( null === $subdir ) {
+        if (null === $subdir) {
             $parts  = self::get_ao_wp_site_url_parts();
-            $subdir = ( isset( $parts['path'] ) && ( '/' !== $parts['path'] ) );
+            $subdir = (isset($parts['path']) && ('/' !== $parts['path']));
         }
 
-        if ( null !== $override ) {
+        if (null !== $override) {
             $subdir = $override;
         }
 
@@ -158,8 +158,8 @@ 
     {
         static $parts = array();
 
-        if ( empty( $parts ) ) {
-            $parts = \parse_url( AUTOPTIMIZE_WP_SITE_URL );
+        if (empty($parts)) {
+            $parts = \parse_url(AUTOPTIMIZE_WP_SITE_URL);
         }
 
         return $parts;
@@ -174,33 +174,33 @@ 
      *
      * @return string
      */
-    public static function tweak_cdn_url_if_needed( $cdn_url, $force_cache_miss = false )
+    public static function tweak_cdn_url_if_needed($cdn_url, $force_cache_miss = false)
     {
         static $results = array();
 
-        if ( ! isset( $results[ $cdn_url ] ) || $force_cache_miss ) {
+        if (!isset($results[$cdn_url]) || $force_cache_miss) {
 
             // In order to return unmodified input when there's no need to tweak.
-            $results[ $cdn_url ] = $cdn_url;
+            $results[$cdn_url] = $cdn_url;
 
             // Behind a default true filter for backcompat, and only for sites
             // in a subfolder/subdirectory, but still easily turned off if
             // not wanted/needed...
-            if ( autoptimizeUtils::siteurl_not_root() ) {
-                $check = apply_filters( 'autoptimize_filter_cdn_magic_path_check', true, $cdn_url );
-                if ( $check ) {
+            if (autoptimizeUtils::siteurl_not_root()) {
+                $check = apply_filters('autoptimize_filter_cdn_magic_path_check', true, $cdn_url);
+                if ($check) {
                     $site_url_parts = autoptimizeUtils::get_ao_wp_site_url_parts();
-                    $cdn_url_parts  = \parse_url( $cdn_url );
-                    $schemeless     = self::is_protocol_relative( $cdn_url );
-                    $cdn_url_parts  = self::maybe_replace_cdn_path( $site_url_parts, $cdn_url_parts );
-                    if ( false !== $cdn_url_parts ) {
-                        $results[ $cdn_url ] = self::assemble_parsed_url( $cdn_url_parts, $schemeless );
+                    $cdn_url_parts  = \parse_url($cdn_url);
+                    $schemeless     = self::is_protocol_relative($cdn_url);
+                    $cdn_url_parts  = self::maybe_replace_cdn_path($site_url_parts, $cdn_url_parts);
+                    if (false !== $cdn_url_parts) {
+                        $results[$cdn_url] = self::assemble_parsed_url($cdn_url_parts, $schemeless);
                     }
                 }
             }
         }
 
-        return $results[ $cdn_url ];
+        return $results[$cdn_url];
     }
 
     /**
@@ -214,10 +214,10 @@ 
      *
      * @return array|false
      */
-    public static function maybe_replace_cdn_path( array $site_url_parts, array $cdn_url_parts )
+    public static function maybe_replace_cdn_path(array $site_url_parts, array $cdn_url_parts)
     {
-        if ( isset( $site_url_parts['path'] ) && '/' !== $site_url_parts['path'] ) {
-            if ( ! isset( $cdn_url_parts['path'] ) || '/' === $cdn_url_parts['path'] ) {
+        if (isset($site_url_parts['path']) && '/' !== $site_url_parts['path']) {
+            if (!isset($cdn_url_parts['path']) || '/' === $cdn_url_parts['path']) {
                 $cdn_url_parts['path'] = $site_url_parts['path'];
                 return $cdn_url_parts;
             }
@@ -237,20 +237,20 @@ 
      *
      * @return string
      */
-    public static function assemble_parsed_url( array $parsed_url, $schemeless = false )
+    public static function assemble_parsed_url(array $parsed_url, $schemeless = false)
     {
-        $scheme = isset( $parsed_url['scheme'] ) ? $parsed_url['scheme'] . '://' : '';
-        if ( $schemeless ) {
+        $scheme = isset($parsed_url['scheme']) ? $parsed_url['scheme'].'://' : '';
+        if ($schemeless) {
             $scheme = '//';
         }
-        $host     = isset( $parsed_url['host'] ) ? $parsed_url['host'] : '';
-        $port     = isset( $parsed_url['port'] ) ? ':' . $parsed_url['port'] : '';
-        $user     = isset( $parsed_url['user'] ) ? $parsed_url['user'] : '';
-        $pass     = isset( $parsed_url['pass'] ) ? ':' . $parsed_url['pass'] : '';
-        $pass     = ( $user || $pass ) ? "$pass@" : '';
-        $path     = isset( $parsed_url['path'] ) ? $parsed_url['path'] : '';
-        $query    = isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '';
-        $fragment = isset( $parsed_url['fragment'] ) ? '#' . $parsed_url['fragment'] : '';
+        $host     = isset($parsed_url['host']) ? $parsed_url['host'] : '';
+        $port     = isset($parsed_url['port']) ? ':'.$parsed_url['port'] : '';
+        $user     = isset($parsed_url['user']) ? $parsed_url['user'] : '';
+        $pass     = isset($parsed_url['pass']) ? ':'.$parsed_url['pass'] : '';
+        $pass     = ($user || $pass) ? "$pass@" : '';
+        $path     = isset($parsed_url['path']) ? $parsed_url['path'] : '';
+        $query    = isset($parsed_url['query']) ? '?'.$parsed_url['query'] : '';
+        $fragment = isset($parsed_url['fragment']) ? '#'.$parsed_url['fragment'] : '';
 
         return "$scheme$user$pass$host$port$path$query$fragment";
     }
@@ -262,12 +262,12 @@ 
      *
      * @return bool
      */
-    public static function is_protocol_relative( $url )
+    public static function is_protocol_relative($url)
     {
         $result = false;
 
-        if ( ! empty( $url ) ) {
-            $result = ( 0 === strpos( $url, '//' ) );
+        if (!empty($url)) {
+            $result = (0 === strpos($url, '//'));
         }
 
         return $result;
@@ -280,9 +280,9 @@ 
      *
      * @return string
      */
-    public static function path_canonicalize( $path )
+    public static function path_canonicalize($path)
     {
-        $patterns     = array(
+        $patterns = array(
             '~/{2,}~',
             '~/(\./)+~',
             '~([^/\.]+/(?R)*\.{2,}/)~',
@@ -295,7 +295,7 @@ 
             '',
         );
 
-        return preg_replace( $patterns, $replacements, $path );
+        return preg_replace($patterns, $replacements, $path);
     }
 
     /**
@@ -307,15 +307,15 @@ 
      *
      * @return null|array Service status or null.
      */
-    public static function check_service_availability( $return_result = false )
+    public static function check_service_availability($return_result = false)
     {
-        $service_availability_resp = wp_remote_get( 'https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver=' . AUTOPTIMIZE_PLUGIN_VERSION );
-        if ( ! is_wp_error( $service_availability_resp ) ) {
-            if ( '200' == wp_remote_retrieve_response_code( $service_availability_resp ) ) {
-                $availabilities = json_decode( wp_remote_retrieve_body( $service_availability_resp ), true );
-                if ( is_array( $availabilities ) ) {
-                    autoptimizeOptionWrapper::update_option( 'autoptimize_service_availablity', $availabilities );
-                    if ( $return_result ) {
+        $service_availability_resp = wp_remote_get('https://misc.optimizingmatters.com/api/autoptimize_service_availablity.json?from=aomain&ver='.AUTOPTIMIZE_PLUGIN_VERSION);
+        if (!is_wp_error($service_availability_resp)) {
+            if ('200' == wp_remote_retrieve_response_code($service_availability_resp)) {
+                $availabilities = json_decode(wp_remote_retrieve_body($service_availability_resp), true);
+                if (is_array($availabilities)) {
+                    autoptimizeOptionWrapper::update_option('autoptimize_service_availablity', $availabilities);
+                    if ($return_result) {
                         return $availabilities;
                     }
                 }
@@ -331,10 +331,10 @@ 
      *
      * @return bool
      */
-    public static function str_is_valid_regex( $string )
+    public static function str_is_valid_regex($string)
     {
-        set_error_handler( function() {}, E_WARNING );
-        $is_regex = ( false !== preg_match( $string, '' ) );
+        set_error_handler(function() {}, E_WARNING);
+        $is_regex = (false !== preg_match($string, ''));
         restore_error_handler();
 
         return $is_regex;
@@ -347,17 +347,17 @@ 
      *
      * @return bool
      */
-    public static function is_plugin_active( $plugin_file )
+    public static function is_plugin_active($plugin_file)
     {
         static $ipa_exists = null;
-        if ( null === $ipa_exists ) {
-            if ( ! function_exists( '\is_plugin_active' ) ) {
-                require_once ABSPATH . 'wp-admin/includes/plugin.php';
+        if (null === $ipa_exists) {
+            if (!function_exists('\is_plugin_active')) {
+                require_once ABSPATH.'wp-admin/includes/plugin.php';
             }
-            $ipa_exists = function_exists( '\is_plugin_active' );
+            $ipa_exists = function_exists('\is_plugin_active');
         }
 
-        return $ipa_exists && \is_plugin_active( $plugin_file );
+        return $ipa_exists && \is_plugin_active($plugin_file);
     }
 
     /**
@@ -367,11 +367,11 @@ 
      *
      * @return string
      */
-    public static function remove_id_from_node( $node ) {
-        if ( strpos( $node, 'id=' ) === false || apply_filters( 'autoptimize_filter_utils_keep_ids', false ) ) {
+    public static function remove_id_from_node($node) {
+        if (strpos($node, 'id=') === false || apply_filters('autoptimize_filter_utils_keep_ids', false)) {
             return $node;
         } else {
-            return preg_replace( '#(.*) id=[\'|"].*[\'|"] (.*)#Um', '$1 $2', $node );
+            return preg_replace('#(.*) id=[\'|"].*[\'|"] (.*)#Um', '$1 $2', $node);
         }
     }
 
@@ -383,15 +383,15 @@ 
      *
      * @return bool
      */
-    public static function str_ends_in( $str, $test )
+    public static function str_ends_in($str, $test)
     {
         // @codingStandardsIgnoreStart
         // substr_compare() is bugged on 5.5.11: https://3v4l.org/qGYBH
         // return ( 0 === substr_compare( $str, $test, -strlen( $test ) ) );
         // @codingStandardsIgnoreEnd
 
-        $length = strlen( $test );
+        $length = strlen($test);
 
-        return ( substr( $str, -$length, $length ) === $test );
+        return (substr($str, -$length, $length) === $test);
     }
 }

classes/autoptimizeImages.php

Spacing +338 added lines, -338 removed lines

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

classes/autoptimizeMain.php

Spacing +181 added lines, -181 removed lines

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

classes/autoptimizeCriticalCSSEnqueue.php

Spacing +67 added lines, -67 removed lines

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