futtta / autoptimize

classes/autoptimizeCriticalCSSEnqueue.php

Spacing +68 added lines, -68 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS job enqueue logic.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -12,27 +12,27 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
     }
 
-    public static function ao_ccss_enqueue( $hash ) {
+    public static function ao_ccss_enqueue($hash) {
         $self = new self();
         // Get key status.
-        $key = autoptimizeCriticalCSSCore::ao_ccss_key_status( false );
+        $key = autoptimizeCriticalCSSCore::ao_ccss_key_status(false);
 
         // Queue is available to anyone...
         $enqueue = true;
 
         // ... which are not the ones below.
-        if ( is_user_logged_in() || is_feed() || is_404() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) || $self->ao_ccss_ua() || 'nokey' == $key['status'] || 'invalid' == $key['status'] || false === apply_filters( 'autoptimize_filter_ccss_enqueue_should_enqueue', true ) ) {
+        if (is_user_logged_in() || is_feed() || is_404() || (defined('DOING_AJAX') && DOING_AJAX) || $self->ao_ccss_ua() || 'nokey' == $key['status'] || 'invalid' == $key['status'] || false === apply_filters('autoptimize_filter_ccss_enqueue_should_enqueue', true)) {
             $enqueue = false;
-            autoptimizeCriticalCSSCore::ao_ccss_log( "Job queuing is not available for WordPress's logged in users, feeds, error pages, ajax calls, to criticalcss.com itself or when a valid API key is not found", 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log("Job queuing is not available for WordPress's logged in users, feeds, error pages, ajax calls, to criticalcss.com itself or when a valid API key is not found", 3);
         }
 
-        if ( $enqueue ) {
+        if ($enqueue) {
             // Continue if queue is available
             // Attach required arrays/ vars.
             global $ao_ccss_rules;
@@ -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'] ) || strpos( $req_type, 'template_' ) !== false ) ) {
+            if ($job_qualify && ((false == $rule_properties['hash'] && false != $rule_properties['file']) || strpos($req_type, 'template_') !== false)) {
                 // If job qualifies but rule hash is false and file isn't false (MANUAL rule) or if template, job does not qualify despite what previous evaluations says.
                 $job_qualify = false;
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job submission DISQUALIFIED by MANUAL rule <' . $target_rule . '> with hash <' . $rule_properties['hash'] . '> and file <' . $rule_properties['file'] . '>', 3 );
-            } elseif ( ! $job_qualify && empty( $rule_properties ) ) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job submission DISQUALIFIED by MANUAL rule <'.$target_rule.'> with hash <'.$rule_properties['hash'].'> and file <'.$rule_properties['file'].'>', 3);
+            } elseif (!$job_qualify && empty($rule_properties)) {
                 // But if job does not qualify and rule properties are set, job qualifies as there is no matching rule for it yet
                 // Fill-in the new target rule.
                 $job_qualify = true;
@@ -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;
                 }
             }
@@ -195,29 +195,29 @@ 
         $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 && ( ! $ao_ccss_forcepath || ! is_page() ) ) {
+            } elseif (strpos($type, 'custom_post_') !== false && (!$ao_ccss_forcepath || !is_page())) {
                 // Match custom post types and not page or page not forced to path-based.
-                if ( get_post_type( get_the_ID() ) === substr( $type, 12 ) ) {
+                if (get_post_type(get_the_ID()) === substr($type, 12)) {
                     $page_type = $type;
                     break;
                 }
-            } elseif ( strpos( $type, 'template_' ) !== false && ( ! $ao_ccss_forcepath || ! is_page() ) ) {
+            } elseif (strpos($type, 'template_') !== false && (!$ao_ccss_forcepath || !is_page())) {
                 // Match templates if not page or if page is not forced to path-based.
-                if ( is_page_template( substr( $type, 9 ) ) ) {
+                if (is_page_template(substr($type, 9))) {
                     $page_type = $type;
                     break;
                 }
             } else {
                 // Match all other existing types
                 // but remove prefix to be able to check if the function exists & returns true.
-                $_type = str_replace( array( 'woo_', 'bp_', 'bbp_', 'edd_' ), '', $type );
-                if ( function_exists( $_type ) && call_user_func( $_type ) ) {
+                $_type = str_replace(array('woo_', 'bp_', 'bbp_', 'edd_'), '', $type);
+                if (function_exists($_type) && call_user_func($_type)) {
                     // Make sure we only return for one page, not for the "paged pages" (/page/2 ..).
-                    if ( ! is_page() || ! is_paged() ) {
+                    if (!is_page() || !is_paged()) {
                         $page_type = $type;
                         break;
                     }
@@ -229,44 +229,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;
     }
@@ -274,17 +274,17 @@ 
     public function ao_ccss_ua() {
         // Check for criticalcss.com user agent.
         $agent = '';
-        if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
+        if (isset($_SERVER['HTTP_USER_AGENT'])) {
             $agent = $_SERVER['HTTP_USER_AGENT'];
         }
 
         // Check for UA and return TRUE when criticalcss.com is the detected UA, false when not.
-        $rtn = strpos( $agent, AO_CCSS_URL );
-        if ( 0 === $rtn ) {
+        $rtn = strpos($agent, AO_CCSS_URL);
+        if (0 === $rtn) {
             $rtn = true;
         } else {
             $rtn = false;
         }
-        return ( $rtn );
+        return ($rtn);
     }
 }

classes/critcss-inc/admin_settings_adv.php

Spacing +33 added lines, -33 removed lines

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

classes/autoptimizeVersionUpdatesHandler.php

Spacing +66 added lines, -66 removed lines

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

classes/autoptimizeCriticalCSSBase.php

Spacing +67 added lines, -67 removed lines

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

classes/autoptimizeCriticalCSSSettingsAjax.php

Spacing +109 added lines, -109 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['rtimelimit'] = get_option( 'autoptimize_ccss_rtimelimit' );
-        $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['rtimelimit'] = get_option('autoptimize_ccss_rtimelimit');
+        $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,30 +275,30 @@ 
     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 ( current_user_can( 'manage_options' ) && ! $_FILES['file']['error'] && $_FILES['file']['size'] < 500001 && strpos( $_FILES['file']['name'], '.zip' ) === strlen( $_FILES['file']['name'] ) - 4 ) {
+        if (current_user_can('manage_options') && !$_FILES['file']['error'] && $_FILES['file']['size'] < 500001 && strpos($_FILES['file']['name'], '.zip') === strlen($_FILES['file']['name']) - 4) {
             // create tmp dir with hard guess name in AO_CCSS_DIR.
-            $_secret_dir     = wp_hash( uniqid( md5( AUTOPTIMIZE_CACHE_URL ), true ) );
-            $_import_tmp_dir = trailingslashit( AO_CCSS_DIR . $_secret_dir );
-            mkdir( $_import_tmp_dir );
+            $_secret_dir     = wp_hash(uniqid(md5(AUTOPTIMIZE_CACHE_URL), true));
+            $_import_tmp_dir = trailingslashit(AO_CCSS_DIR.$_secret_dir);
+            mkdir($_import_tmp_dir);
 
             // Save file to that tmp directory but give it our own name to prevent directory traversal risks when using original name.
-            $zipfile = $_import_tmp_dir . uniqid( 'import_settings-', true ) . '.zip';
-            move_uploaded_file( $_FILES['file']['tmp_name'], $zipfile );
+            $zipfile = $_import_tmp_dir.uniqid('import_settings-', true).'.zip';
+            move_uploaded_file($_FILES['file']['tmp_name'], $zipfile);
 
             // Extract archive in the tmp directory.
             $zip = new ZipArchive;
-            if ( $zip->open( $zipfile ) === true ) {
+            if ($zip->open($zipfile) === true) {
                 // loop through all files in the zipfile.
                 for ($i = 0; $i < $zip->numFiles; $i++) {
                     // but only extract known good files.
-                    if ( preg_match('/^settings\.json$|^ccss_[a-z0-9]{32}\.css$/', $zip->getNameIndex( $i ) ) > 0 ) {
-                        $zip->extractTo( AO_CCSS_DIR, $zip->getNameIndex( $i ) );
+                    if (preg_match('/^settings\.json$|^ccss_[a-z0-9]{32}\.css$/', $zip->getNameIndex($i)) > 0) {
+                        $zip->extractTo(AO_CCSS_DIR, $zip->getNameIndex($i));
                     }
                 }
                 $zip->close();
@@ -307,26 +307,26 @@ 
             }
             
             // and remove temp. dir with all contents (the import-zipfile).
-            $this->rrmdir( $_import_tmp_dir );
+            $this->rrmdir($_import_tmp_dir);
 
-            if ( ! $error ) {
+            if (!$error) {
                 // Archive extraction ok, continue importing settings from AO_CCSS_DIR.
                 // 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_rtimelimit', $settings['rtimelimit'] );
-                    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_rtimelimit', $settings['rtimelimit']);
+                    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';
@@ -337,28 +337,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 {
@@ -366,14 +366,14 @@ 
         }
     }
     
-    public function rrmdir( $path ) {
+    public function rrmdir($path) {
         // recursively remove a directory as found on
         // https://andy-carter.com/blog/recursively-remove-a-directory-in-php.
-        $files = glob($path . '/*');
-        foreach ( $files as $file ) {
-            is_dir( $file ) ? $this->rrmdir( $file ) : unlink( $file );
+        $files = glob($path.'/*');
+        foreach ($files as $file) {
+            is_dir($file) ? $this->rrmdir($file) : unlink($file);
         }
-        rmdir( $path );
+        rmdir($path);
 
         return;
     }

classes/autoptimizeCache.php

Spacing +182 added lines, -182 removed lines

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

classes/autoptimizeCriticalCSSCron.php

Spacing +254 added lines, -254 removed lines

@@ -4,7 +4,7 @@ 
  * processes the queue, submitting jobs to criticalcss.com and retrieving generated CSS from criticalcss.com and saving rules.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -13,23 +13,23 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
 
         // Add queue control to a registered event.
-        add_action( 'ao_ccss_queue', array( $this, 'ao_ccss_queue_control' ) );
+        add_action('ao_ccss_queue', array($this, 'ao_ccss_queue_control'));
         // Add cleaning job to a registered event.
-        add_action( 'ao_ccss_maintenance', array( $this, 'ao_ccss_cleaning' ) );
+        add_action('ao_ccss_maintenance', array($this, 'ao_ccss_cleaning'));
     }
 
     public function ao_ccss_queue_control() {
         // The queue execution backend.
         global $ao_ccss_key;
-        if ( ! isset( $ao_ccss_key ) || empty( $ao_ccss_key ) ) {
+        if (!isset($ao_ccss_key) || empty($ao_ccss_key)) {
             // no key set, not processing the queue!
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'No key set, so not processing queue.', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('No key set, so not processing queue.', 3);
             return;
         }
 
@@ -50,35 +50,35 @@ 
          *    When properly set, queue will always finish a job with the declared settings above regardless of the real API responses.
          */
         $queue_debug = false;
-        if ( file_exists( AO_CCSS_DEBUG ) ) {
-            $qdobj_raw = file_get_contents( AO_CCSS_DEBUG );
-            $qdobj     = json_decode( $qdobj_raw, true );
-            if ( $qdobj ) {
-                if ( 1 === $qdobj['enable'] ) {
+        if (file_exists(AO_CCSS_DEBUG)) {
+            $qdobj_raw = file_get_contents(AO_CCSS_DEBUG);
+            $qdobj     = json_decode($qdobj_raw, true);
+            if ($qdobj) {
+                if (1 === $qdobj['enable']) {
                     $queue_debug = true;
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue operating in debug mode with the following settings: <' . $qdobj_raw . '>', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Queue operating in debug mode with the following settings: <'.$qdobj_raw.'>', 3);
                 }
             }
         }
 
         // Set some default values for $qdobj to avoid function call warnings.
-        if ( ! $queue_debug ) {
+        if (!$queue_debug) {
             $qdobj['htcode'] = false;
         }
 
         // Check if queue is already running.
         $queue_lock = false;
-        if ( file_exists( AO_CCSS_LOCK ) ) {
+        if (file_exists(AO_CCSS_LOCK)) {
             $queue_lock = true;
         }
 
         // Proceed with the queue if it's not already running.
-        if ( ! $queue_lock ) {
+        if (!$queue_lock) {
 
             // Log queue start and create the lock file.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control started', 3 );
-            if ( touch( AO_CCSS_LOCK ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control locked', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue control started', 3);
+            if (touch(AO_CCSS_LOCK)) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('Queue control locked', 3);
             }
 
             // Attach required variables.
@@ -86,45 +86,45 @@ 
             global $ao_ccss_rtimelimit;
 
             // Initialize counters.
-            if ( $ao_ccss_rtimelimit == 0 ) {
+            if ($ao_ccss_rtimelimit == 0) {
                 // no time limit set, let's go with 1000 seconds.
                 $ao_ccss_rtimelimit = 1000;
             }
             $mt = time() + $ao_ccss_rtimelimit; // maxtime queue processing can run.
             $jc = 1; // job count number.
             $jr = 1; // jobs requests number.
-            $jt = count( $ao_ccss_queue ); // number of jobs in queue.
+            $jt = count($ao_ccss_queue); // number of jobs in queue.
 
             // Sort queue by ascending job status (e.g. ERROR, JOB_ONGOING, JOB_QUEUED, NEW...).
-            array_multisort( array_column( $ao_ccss_queue, 'jqstat' ), $ao_ccss_queue ); // @codingStandardsIgnoreLine
+            array_multisort(array_column($ao_ccss_queue, 'jqstat'), $ao_ccss_queue); // @codingStandardsIgnoreLine
 
             // Iterates over the entire queue.
-            foreach ( $ao_ccss_queue as $path => $jprops ) {
+            foreach ($ao_ccss_queue as $path => $jprops) {
                 // Prepare flags and target rule.
                 $update      = false;
                 $deljob      = false;
                 $rule_update = false;
                 $oldccssfile = false;
-                $trule       = explode( '|', $jprops['rtarget'] );
+                $trule       = explode('|', $jprops['rtarget']);
 
                 // Log job count.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Processing job ' . $jc . ' of ' . $jt . ' with id <' . $jprops['ljid'] . '> and status <' . $jprops['jqstat'] . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Processing job '.$jc.' of '.$jt.' with id <'.$jprops['ljid'].'> and status <'.$jprops['jqstat'].'>', 3);
 
                 // Process NEW jobs.
-                if ( 'NEW' == $jprops['jqstat'] ) {
+                if ('NEW' == $jprops['jqstat']) {
 
                     // Log the new job.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Found NEW job with local ID <' . $jprops['ljid'] . '>, starting its queue processing', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Found NEW job with local ID <'.$jprops['ljid'].'>, starting its queue processing', 3);
 
                     // Compare job and rule hashes (if any).
-                    $hash = $this->ao_ccss_diff_hashes( $jprops['ljid'], $jprops['hash'], $jprops['hashes'], $jprops['rtarget'] );
+                    $hash = $this->ao_ccss_diff_hashes($jprops['ljid'], $jprops['hash'], $jprops['hashes'], $jprops['rtarget']);
 
                     // If job hash is new or different of a previous one.
-                    if ( $hash ) {
-                        if ( $jr > 2 ) {
+                    if ($hash) {
+                        if ($jr > 2) {
                             // we already posted 2 jobs to criticalcss.com, don't post more this run
                             // but we can keep on processing the queue to keep it tidy.
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Holding off on generating request for job with local ID <' . $jprops['ljid'] . '>, maximum number of POSTS reached.', 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Holding off on generating request for job with local ID <'.$jprops['ljid'].'>, maximum number of POSTS reached.', 3);
                             continue;
                         }
 
@@ -132,182 +132,182 @@ 
                         $jprops['hash'] = $hash;
 
                         // Dispatch the job generate request and increment request count.
-                        $apireq = $this->ao_ccss_api_generate( $path, $queue_debug, $qdobj['htcode'] );
+                        $apireq = $this->ao_ccss_api_generate($path, $queue_debug, $qdobj['htcode']);
                         $jr++;
 
                         // NOTE: All the following conditions maps to the ones in admin_settings_queue.js.php.
-                        if ( 'JOB_QUEUED' == $apireq['job']['status'] || 'JOB_ONGOING' == $apireq['job']['status'] ) {
+                        if ('JOB_QUEUED' == $apireq['job']['status'] || 'JOB_ONGOING' == $apireq['job']['status']) {
                             // SUCCESS: request has a valid result.
                             // Update job properties.
                             $jprops['jid']    = $apireq['job']['id'];
                             $jprops['jqstat'] = $apireq['job']['status'];
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> generate request successful, remote id <' . $jprops['jid'] . '>, status now is <' . $jprops['jqstat'] . '>', 3 );
-                        } elseif ( 'STATUS_JOB_BAD' == $apireq['job']['status'] ) {
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> generate request successful, remote id <'.$jprops['jid'].'>, status now is <'.$jprops['jqstat'].'>', 3);
+                        } elseif ('STATUS_JOB_BAD' == $apireq['job']['status']) {
                             // ERROR: concurrent requests
                             // Update job properties.
                             $jprops['jid']    = $apireq['job']['id'];
                             $jprops['jqstat'] = $apireq['job']['status'];
-                            if ( $apireq['job']['error'] ) {
+                            if ($apireq['job']['error']) {
                                 $jprops['jrstat'] = $apireq['job']['error'];
                             } else {
                                 $jprops['jrstat'] = 'Baby did a bad bad thing';
                             }
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Concurrent requests when processing job id <' . $jprops['ljid'] . '>, job status is now <' . $jprops['jqstat'] . '>', 3 );
-                        } elseif ( 'INVALID_JWT_TOKEN' == $apireq['errorCode'] ) {
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Concurrent requests when processing job id <'.$jprops['ljid'].'>, job status is now <'.$jprops['jqstat'].'>', 3);
+                        } elseif ('INVALID_JWT_TOKEN' == $apireq['errorCode']) {
                             // ERROR: key validation
                             // Update job properties.
                             $jprops['jqstat'] = $apireq['errorCode'];
                             $jprops['jrstat'] = $apireq['error'];
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'API key validation error when processing job id <' . $jprops['ljid'] . '>, job status is now <' . $jprops['jqstat'] . '>', 3 );
-                        } elseif ( empty( $apireq ) ) {
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('API key validation error when processing job id <'.$jprops['ljid'].'>, job status is now <'.$jprops['jqstat'].'>', 3);
+                        } elseif (empty($apireq)) {
                             // ERROR: no response
                             // Update job properties.
                             $jprops['jqstat'] = 'NO_RESPONSE';
                             $jprops['jrstat'] = 'NONE';
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> request has no response, status now is <' . $jprops['jqstat'] . '>', 3 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> request has no response, status now is <'.$jprops['jqstat'].'>', 3);
                         } else {
                             // UNKNOWN: unhandled generate exception
                             // Update job properties.
                             $jprops['jqstat'] = 'JOB_UNKNOWN';
                             $jprops['jrstat'] = 'NONE';
                             $jprops['jvstat'] = 'NONE';
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> generate request has an UNKNOWN condition, status now is <' . $jprops['jqstat'] . '>, check log messages above for more information', 2 );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job response was: ' . json_encode( $apireq ), 3 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> generate request has an UNKNOWN condition, status now is <'.$jprops['jqstat'].'>, check log messages above for more information', 2);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job response was: '.json_encode($apireq), 3);
                         }
                     } else {
                         // SUCCESS: Job hash is equal to a previous one, so it's done
                         // Update job status and finish time.
                         $jprops['jqstat'] = 'JOB_DONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> requires no further processing, status now is <' . $jprops['jqstat'] . '>', 3 );
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> requires no further processing, status now is <'.$jprops['jqstat'].'>', 3);
                     }
 
                     // Set queue update flag.
                     $update = true;
 
-                } elseif ( 'JOB_QUEUED' == $jprops['jqstat'] || 'JOB_ONGOING' == $jprops['jqstat'] ) {
+                } elseif ('JOB_QUEUED' == $jprops['jqstat'] || 'JOB_ONGOING' == $jprops['jqstat']) {
                     // Process QUEUED and ONGOING jobs
                     // Log the pending job.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Found PENDING job with local ID <' . $jprops['ljid'] . '>, continuing its queue processing', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Found PENDING job with local ID <'.$jprops['ljid'].'>, continuing its queue processing', 3);
 
                     // Dispatch the job result request and increment request count.
-                    $apireq = $this->ao_ccss_api_results( $jprops['jid'], $queue_debug, $qdobj['htcode'] );
+                    $apireq = $this->ao_ccss_api_results($jprops['jid'], $queue_debug, $qdobj['htcode']);
 
                     // NOTE: All the following condigitons maps to the ones in admin_settings_queue.js.php
                     // Replace API response values if queue debugging is enabled and some value is set.
-                    if ( $queue_debug ) {
-                        if ( $qdobj['status'] ) {
+                    if ($queue_debug) {
+                        if ($qdobj['status']) {
                             $apireq['status'] = $qdobj['status'];
                         }
-                        if ( $qdobj['resultStatus'] ) {
+                        if ($qdobj['resultStatus']) {
                             $apireq['resultStatus'] = $qdobj['resultStatus'];
                         }
-                        if ( $qdobj['validationStatus'] ) {
+                        if ($qdobj['validationStatus']) {
                             $apireq['validationStatus'] = $qdobj['validationStatus'];
                         }
                     }
 
-                    if ( 'JOB_QUEUED' == $apireq['status'] || 'JOB_ONGOING' == $apireq['status'] ) {
+                    if ('JOB_QUEUED' == $apireq['status'] || 'JOB_ONGOING' == $apireq['status']) {
                         // SUCCESS: request has a valid result
                         // Process a PENDING job
                         // Update job properties.
                         $jprops['jqstat'] = $apireq['status'];
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . '> unchanged', 3 );
-                    } elseif ( 'JOB_DONE' == $apireq['status'] ) {
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].'> unchanged', 3);
+                    } elseif ('JOB_DONE' == $apireq['status']) {
                         // Process a DONE job
                         // New resultStatus from ccss.com "HTML_404", consider as "GOOD" for now.
-                        if ( 'HTML_404' == $apireq['resultStatus'] ) {
+                        if ('HTML_404' == $apireq['resultStatus']) {
                             $apireq['resultStatus'] = 'GOOD';
                         }
 
-                        if ( 'GOOD' == $apireq['resultStatus'] && 'GOOD' == $apireq['validationStatus'] ) {
+                        if ('GOOD' == $apireq['resultStatus'] && 'GOOD' == $apireq['validationStatus']) {
                             // SUCCESS: GOOD job with GOOD validation
                             // Update job properties.
-                            $jprops['file']   = $this->ao_ccss_save_file( $apireq['css'], $trule, false );
+                            $jprops['file']   = $this->ao_ccss_save_file($apireq['css'], $trule, false);
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
+                            $jprops['jftime'] = microtime(true);
                             $rule_update      = true;
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . '>, file saved <' . $jprops['file'] . '>', 3 );
-                        } elseif ( 'GOOD' == $apireq['resultStatus'] && ( 'WARN' == $apireq['validationStatus'] || 'BAD' == $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' == $apireq['validationStatus'] ) ) {
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].'>, file saved <'.$jprops['file'].'>', 3);
+                        } elseif ('GOOD' == $apireq['resultStatus'] && ('WARN' == $apireq['validationStatus'] || 'BAD' == $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' == $apireq['validationStatus'])) {
                             // SUCCESS: GOOD job with WARN or BAD validation
                             // Update job properties.
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
-                            if ( apply_filters( 'autoptimize_filter_ccss_save_review_rules', true ) ) {
-                                $jprops['file']   = $this->ao_ccss_save_file( $apireq['css'], $trule, true );
+                            $jprops['jftime'] = microtime(true);
+                            if (apply_filters('autoptimize_filter_ccss_save_review_rules', true)) {
+                                $jprops['file']   = $this->ao_ccss_save_file($apireq['css'], $trule, true);
                                 $rule_update      = true;
-                                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . ', file saved <' . $jprops['file'] . '> but requires REVIEW', 3 );
+                                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].', file saved <'.$jprops['file'].'> but requires REVIEW', 3);
                             } else {
-                                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful, remote id <' . $jprops['jid'] . '>, status <' . $jprops['jqstat'] . ', file saved <' . $jprops['file'] . '> but required REVIEW so not saved.', 3 );
+                                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful, remote id <'.$jprops['jid'].'>, status <'.$jprops['jqstat'].', file saved <'.$jprops['file'].'> but required REVIEW so not saved.', 3);
                             }
-                        } elseif ( 'GOOD' != $apireq['resultStatus'] && ( 'GOOD' != $apireq['validationStatus'] || 'WARN' != $apireq['validationStatus'] || 'BAD' != $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' != $apireq['validationStatus'] ) ) {
+                        } elseif ('GOOD' != $apireq['resultStatus'] && ('GOOD' != $apireq['validationStatus'] || 'WARN' != $apireq['validationStatus'] || 'BAD' != $apireq['validationStatus'] || 'SCREENSHOT_WARN_BLANK' != $apireq['validationStatus'])) {
                             // ERROR: no GOOD, WARN or BAD results
                             // Update job properties.
                             $jprops['jqstat'] = $apireq['status'];
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job FAILED, status now is <' . $jprops['jqstat'] . '>', 3 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job FAILED, status now is <'.$jprops['jqstat'].'>', 3);
                             $apireq['css'] = '/* critical css removed for DEBUG logging purposes */';
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job response was: ' . json_encode( $apireq ), 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job response was: '.json_encode($apireq), 3);
                         } else {
                             // UNKNOWN: unhandled JOB_DONE exception
                             // Update job properties.
                             $jprops['jqstat'] = 'JOB_UNKNOWN';
                             $jprops['jrstat'] = $apireq['resultStatus'];
                             $jprops['jvstat'] = $apireq['validationStatus'];
-                            $jprops['jftime'] = microtime( true );
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job is UNKNOWN, status now is <' . $jprops['jqstat'] . '>', 2 );
+                            $jprops['jftime'] = microtime(true);
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job is UNKNOWN, status now is <'.$jprops['jqstat'].'>', 2);
                             $apireq['css'] = '/* critical css removed for DEBUG logging purposes */';
-                            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job response was: ' . json_encode( $apireq ), 3 );
+                            autoptimizeCriticalCSSCore::ao_ccss_log('Job response was: '.json_encode($apireq), 3);
                         }
-                    } elseif ( 'JOB_FAILED' == $apireq['job']['status'] || 'STATUS_JOB_BAD' == $apireq['job']['status'] ) {
+                    } elseif ('JOB_FAILED' == $apireq['job']['status'] || 'STATUS_JOB_BAD' == $apireq['job']['status']) {
                         // ERROR: failed job
                         // Update job properties.
                         $jprops['jqstat'] = $apireq['job']['status'];
-                        if ( $apireq['job']['error'] ) {
+                        if ($apireq['job']['error']) {
                             $jprops['jrstat'] = $apireq['job']['error'];
                         } else {
                             $jprops['jrstat'] = 'Baby did a bad bad thing';
                         }
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job FAILED, status now is <' . $jprops['jqstat'] . '>', 3 );
-                    } elseif ( 'This css no longer exists. Please re-generate it.' == $apireq['error'] ) {
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job FAILED, status now is <'.$jprops['jqstat'].'>', 3);
+                    } elseif ('This css no longer exists. Please re-generate it.' == $apireq['error']) {
                         // ERROR: CSS doesn't exist
                         // Update job properties.
                         $jprops['jqstat'] = 'NO_CSS';
                         $jprops['jrstat'] = $apireq['error'];
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request successful but job FAILED, status now is <' . $jprops['jqstat'] . '>', 3 );
-                    } elseif ( empty( $apireq ) ) {
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request successful but job FAILED, status now is <'.$jprops['jqstat'].'>', 3);
+                    } elseif (empty($apireq)) {
                         // ERROR: no response
                         // Update job properties.
                         $jprops['jqstat'] = 'NO_RESPONSE';
                         $jprops['jrstat'] = 'NONE';
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> request has no response, status now is <' . $jprops['jqstat'] . '>', 3 );
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> request has no response, status now is <'.$jprops['jqstat'].'>', 3);
                     } else {
                         // UNKNOWN: unhandled results exception
                         // Update job properties.
                         $jprops['jqstat'] = 'JOB_UNKNOWN';
                         $jprops['jrstat'] = 'NONE';
                         $jprops['jvstat'] = 'NONE';
-                        $jprops['jftime'] = microtime( true );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> result request has an UNKNOWN condition, status now is <' . $jprops['jqstat'] . '>, check log messages above for more information', 2 );
+                        $jprops['jftime'] = microtime(true);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> result request has an UNKNOWN condition, status now is <'.$jprops['jqstat'].'>, check log messages above for more information', 2);
                     }
 
                     // Set queue update flag.
@@ -315,40 +315,40 @@ 
                 }
 
                 // Mark DONE jobs for removal.
-                if ( 'JOB_DONE' == $jprops['jqstat'] ) {
+                if ('JOB_DONE' == $jprops['jqstat']) {
                     $update = true;
                     $deljob = true;
                 }
 
                 // Persist updated queue object.
-                if ( $update ) {
-                    if ( ! $deljob ) {
+                if ($update) {
+                    if (!$deljob) {
                         // Update properties of a NEW or PENDING job...
-                        $ao_ccss_queue[ $path ] = $jprops;
+                        $ao_ccss_queue[$path] = $jprops;
                     } else {
                         // ...or remove the DONE job.
-                        unset( $ao_ccss_queue[ $path ] );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> is DONE and was removed from the queue', 3 );
+                        unset($ao_ccss_queue[$path]);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> is DONE and was removed from the queue', 3);
                     }
 
                     // Update queue object.
-                    $ao_ccss_queue_raw = json_encode( $ao_ccss_queue );
-                    update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue updated by job id <' . $jprops['ljid'] . '>', 3 );
+                    $ao_ccss_queue_raw = json_encode($ao_ccss_queue);
+                    update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Queue updated by job id <'.$jprops['ljid'].'>', 3);
 
                     // Update target rule.
-                    if ( $rule_update ) {
-                        $this->ao_ccss_rule_update( $jprops['ljid'], $jprops['rtarget'], $jprops['file'], $jprops['hash'] );
-                        autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $jprops['ljid'] . '> updated the target rule <' . $jprops['rtarget'] . '>', 3 );
+                    if ($rule_update) {
+                        $this->ao_ccss_rule_update($jprops['ljid'], $jprops['rtarget'], $jprops['file'], $jprops['hash']);
+                        autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$jprops['ljid'].'> updated the target rule <'.$jprops['rtarget'].'>', 3);
                     }
                 } else {
                     // Or log no queue action.
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Nothing to do on this job', 3 );
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Nothing to do on this job', 3);
                 }
 
                 // Break the loop if request time limit is (almost exceeded).
-                if ( time() > $mt ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'The time limit of ' . $ao_ccss_rtimelimit . ' seconds was exceeded, queue control must finish now', 3 );
+                if (time() > $mt) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('The time limit of '.$ao_ccss_rtimelimit.' seconds was exceeded, queue control must finish now', 3);
                     break;
                 }
 
@@ -357,46 +357,46 @@ 
             }
 
             // Remove the lock file and log the queue end.
-            if ( file_exists( AO_CCSS_LOCK ) ) {
-                unlink( AO_CCSS_LOCK );
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control unlocked', 3 );
+            if (file_exists(AO_CCSS_LOCK)) {
+                unlink(AO_CCSS_LOCK);
+                autoptimizeCriticalCSSCore::ao_ccss_log('Queue control unlocked', 3);
             }
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue control finished', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue control finished', 3);
 
             // Log that queue is locked.
         } else {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue is already running, skipping the attempt to run it again', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue is already running, skipping the attempt to run it again', 3);
         }
     }
 
-    public function ao_ccss_diff_hashes( $ljid, $hash, $hashes, $rule ) {
+    public function ao_ccss_diff_hashes($ljid, $hash, $hashes, $rule) {
         // Compare job hashes
         // STEP 1: update job hashes.
-        if ( 1 == count( $hashes ) ) {
+        if (1 == count($hashes)) {
             // Job with a single hash
             // Set job hash.
             $hash = $hashes[0];
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> updated with SINGLE hash <' . $hash . '>', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> updated with SINGLE hash <'.$hash.'>', 3);
         } else {
             // Job with multiple hashes
             // Loop through hashes to concatenate them.
             $nhash = '';
-            foreach ( $hashes as $shash ) {
+            foreach ($hashes as $shash) {
                 $nhash .= $shash;
             }
 
             // Set job hash.
-            $hash = md5( $nhash );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> updated with a COMPOSITE hash <' . $hash . '>', 3 );
+            $hash = md5($nhash);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> updated with a COMPOSITE hash <'.$hash.'>', 3);
         }
 
         // STEP 2: compare job to existing jobs to prevent double submission for same type+hash.
         global $ao_ccss_queue;
 
-        foreach ( $ao_ccss_queue as $queue_item ) {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Comparing <' . $rule . $hash . '> with <' . $queue_item['rtarget'] . $queue_item['hash'] . '>', 3 );
-            if ( $queue_item['hash'] == $hash && $queue_item['rtarget'] == $rule && in_array( $queue_item['jqstat'], array( 'JOB_QUEUED', 'JOB_ONGOING', 'JOB_DONE' ) ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> matches the already pending job <' . $queue_item['ljid'] . '>', 3 );
+        foreach ($ao_ccss_queue as $queue_item) {
+            autoptimizeCriticalCSSCore::ao_ccss_log('Comparing <'.$rule.$hash.'> with <'.$queue_item['rtarget'].$queue_item['hash'].'>', 3);
+            if ($queue_item['hash'] == $hash && $queue_item['rtarget'] == $rule && in_array($queue_item['jqstat'], array('JOB_QUEUED', 'JOB_ONGOING', 'JOB_DONE'))) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> matches the already pending job <'.$queue_item['ljid'].'>', 3);
                 return false;
             }
         }
@@ -406,32 +406,32 @@ 
         global $ao_ccss_rules;
 
         // Prepare rule variables.
-        $trule = explode( '|', $rule );
-        $srule = $ao_ccss_rules[ $trule[0] ][ $trule[1] ];
+        $trule = explode('|', $rule);
+        $srule = $ao_ccss_rules[$trule[0]][$trule[1]];
 
         // Check if a MANUAL rule exist and return false.
-        if ( ! empty( $srule ) && ( 0 == $srule['hash'] && 0 != $srule['file'] ) ) {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> matches the MANUAL rule <' . $trule[0] . '|' . $trule[1] . '>', 3 );
+        if (!empty($srule) && (0 == $srule['hash'] && 0 != $srule['file'])) {
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> matches the MANUAL rule <'.$trule[0].'|'.$trule[1].'>', 3);
             return false;
-        } elseif ( ! empty( $srule ) ) {
+        } elseif (!empty($srule)) {
             // Check if an AUTO rule exist.
-            if ( $hash === $srule['hash'] && is_file( AO_CCSS_DIR . $srule['file'] ) && 0 != filesize( AO_CCSS_DIR . $srule['file'] ) ) {
+            if ($hash === $srule['hash'] && is_file(AO_CCSS_DIR.$srule['file']) && 0 != filesize(AO_CCSS_DIR.$srule['file'])) {
                 // Check if job hash matches rule, if the CCSS file exists said file is not empty and return FALSE is so.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> with hash <' . $hash . '> MATCH the one in rule <' . $trule[0] . '|' . $trule[1] . '>', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> with hash <'.$hash.'> MATCH the one in rule <'.$trule[0].'|'.$trule[1].'>', 3);
                 return false;
             } else {
                 // Or return the new hash if they differ.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> with hash <' . $hash . '> DOES NOT MATCH the one in rule <' . $trule[0] . '|' . $trule[1] . '> or rule\'s CCSS file was invalid.', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> with hash <'.$hash.'> DOES NOT MATCH the one in rule <'.$trule[0].'|'.$trule[1].'> or rule\'s CCSS file was invalid.', 3);
                 return $hash;
             }
         } else {
             // Or just return the hash if no rule exist yet.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Job id <' . $ljid . '> with hash <' . $hash . '> has no rule yet', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Job id <'.$ljid.'> with hash <'.$hash.'> has no rule yet', 3);
             return $hash;
         }
     }
 
-    public function ao_ccss_api_generate( $path, $debug, $dcode ) {
+    public function ao_ccss_api_generate($path, $debug, $dcode) {
         // POST jobs to criticalcss.com and return responses
         // Get key and key status.
         global $ao_ccss_key;
@@ -443,35 +443,35 @@ 
         global $ao_ccss_noptimize;
 
         $site_host = get_site_url();
-        $site_path = parse_url( $site_host, PHP_URL_PATH );
+        $site_path = parse_url($site_host, PHP_URL_PATH);
 
-        if ( ! empty( $site_path ) ) {
-            $site_host = str_replace( $site_path, '', $site_host );
+        if (!empty($site_path)) {
+            $site_host = str_replace($site_path, '', $site_host);
         }
 
         // Logic to bind to one domain to avoid site clones of sites would
         // automatically begin spawning requests to criticalcss.com which has
         // a per domain cost.
         global $ao_ccss_domain;
-        if ( empty( $ao_ccss_domain ) ) {
+        if (empty($ao_ccss_domain)) {
             // first request being done, update option to allow future requests are only allowed if from same domain.
-            update_option( 'autoptimize_ccss_domain', str_rot13( $site_host ) );
-        } elseif ( trim( $ao_ccss_domain, '\'"' ) !== 'none' && parse_url( $site_host, PHP_URL_HOST ) !== parse_url( $ao_ccss_domain, PHP_URL_HOST ) && apply_filters( 'autoptimize_filter_ccss_bind_domain', true ) ) {
+            update_option('autoptimize_ccss_domain', str_rot13($site_host));
+        } elseif (trim($ao_ccss_domain, '\'"') !== 'none' && parse_url($site_host, PHP_URL_HOST) !== parse_url($ao_ccss_domain, PHP_URL_HOST) && apply_filters('autoptimize_filter_ccss_bind_domain', true)) {
             // not the same domain, log as error and return without posting to criticalcss.com.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Request for domain ' . $site_host . ' does not match bound domain ' . $ao_ccss_domain . ' so not proceeding.', 2 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Request for domain '.$site_host.' does not match bound domain '.$ao_ccss_domain.' so not proceeding.', 2);
             return false;
         }
 
-        $src_url = $site_host . $path;
+        $src_url = $site_host.$path;
 
         // Avoid AO optimizations if required by config or avoid lazyload if lazyload is active in AO.
-        if ( ! empty( $ao_ccss_noptimize ) ) {
+        if (!empty($ao_ccss_noptimize)) {
             $src_url .= '?ao_noptirocket=1';
-        } elseif ( class_exists( 'autoptimizeImages', false ) && autoptimizeImages::should_lazyload_wrapper() ) {
+        } elseif (class_exists('autoptimizeImages', false) && autoptimizeImages::should_lazyload_wrapper()) {
             $src_url .= '?ao_nolazy=1';
         }
 
-        $src_url = apply_filters( 'autoptimize_filter_ccss_cron_srcurl', $src_url );
+        $src_url = apply_filters('autoptimize_filter_ccss_cron_srcurl', $src_url);
 
         // Initialize request body.
         $body           = array();
@@ -481,88 +481,88 @@ 
 
         // Prepare and add viewport size to the body if available.
         $viewport = autoptimizeCriticalCSSCore::ao_ccss_viewport();
-        if ( ! empty( $viewport['w'] ) && ! empty( $viewport['h'] ) ) {
+        if (!empty($viewport['w']) && !empty($viewport['h'])) {
             $body['width']  = $viewport['w'];
             $body['height'] = $viewport['h'];
         }
 
         // Prepare and add forceInclude to the body if available.
         global $ao_ccss_finclude;
-        $finclude = $this->ao_ccss_finclude( $ao_ccss_finclude );
-        if ( ! empty( $finclude ) ) {
+        $finclude = $this->ao_ccss_finclude($ao_ccss_finclude);
+        if (!empty($finclude)) {
             $body['forceInclude'] = $finclude;
         }
 
         // Add filter to allow the body array to be altered (e.g. to add customPageHeaders).
-        $body = apply_filters( 'autoptimize_ccss_cron_api_generate_body', $body );
+        $body = apply_filters('autoptimize_ccss_cron_api_generate_body', $body);
 
         // Body must be json and log it.
-        $body = json_encode( $body );
-        autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request body is ' . $body, 3 );
+        $body = json_encode($body);
+        autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request body is '.$body, 3);
 
         // Prepare the request.
-        $url  = esc_url_raw( AO_CCSS_API . 'generate?aover=' . AO_CCSS_VER );
+        $url  = esc_url_raw(AO_CCSS_API.'generate?aover='.AO_CCSS_VER);
         $args = array(
             'headers' => array(
-                'User-Agent'    => 'Autoptimize v' . AO_CCSS_VER,
+                'User-Agent'    => 'Autoptimize v'.AO_CCSS_VER,
                 'Content-type'  => 'application/json; charset=utf-8',
-                'Authorization' => 'JWT ' . $key,
+                'Authorization' => 'JWT '.$key,
                 'Connection'    => 'close',
             ),
             'body'    => $body,
         );
 
         // Dispatch the request and store its response code.
-        $req  = wp_safe_remote_post( $url, $args );
-        $code = wp_remote_retrieve_response_code( $req );
-        $body = json_decode( wp_remote_retrieve_body( $req ), true );
+        $req  = wp_safe_remote_post($url, $args);
+        $code = wp_remote_retrieve_response_code($req);
+        $body = json_decode(wp_remote_retrieve_body($req), true);
 
-        if ( $debug && $dcode ) {
+        if ($debug && $dcode) {
             // If queue debug is active, change response code.
             $code = $dcode;
         }
 
-        if ( 200 == $code ) {
+        if (200 == $code) {
             // Response code is OK.
             // Workaround criticalcss.com non-RESTful reponses.
-            if ( 'JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status'] || 'STATUS_JOB_BAD' == $body['job']['status'] ) {
+            if ('JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status'] || 'STATUS_JOB_BAD' == $body['job']['status']) {
                 // Log successful and return encoded request body.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> replied successfully', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> replied successfully', 3);
 
                 // This code also means the key is valid, so cache key status for 24h if not already cached.
-                if ( ( ! $key_status || 2 != $key_status ) && $key ) {
-                    update_option( 'autoptimize_ccss_keyst', 2 );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is valid, updating key status', 3 );
+                if ((!$key_status || 2 != $key_status) && $key) {
+                    update_option('autoptimize_ccss_keyst', 2);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is valid, updating key status', 3);
                 }
 
                 // Return the request body.
                 return $body;
             } else {
                 // Log successful requests with invalid reponses.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> replied with code <' . $code . '> and an UNKNOWN error condition, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> replied with code <'.$code.'> and an UNKNOWN error condition, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
                 return $body;
             }
         } else {
             // Response code is anything else.
             // Log failed request with a valid response code and return body.
-            if ( $code ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> replied with error code <' . $code . '>, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+            if ($code) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> replied with error code <'.$code.'>, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
 
-                if ( 401 == $code ) {
+                if (401 == $code) {
                     // If request is unauthorized, also clear key status.
-                    update_option( 'autoptimize_ccss_keyst', 1 );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is invalid, updating key status', 3 );
+                    update_option('autoptimize_ccss_keyst', 1);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is invalid, updating key status', 3);
                 }
 
                 // Return the request body.
                 return $body;
             } else {
                 // Log failed request with no response and return false.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: POST generate request for path <' . $src_url . '> has no response, this could be a service timeout', 2 );
-                if ( is_wp_error( $req ) ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( $req->get_error_message(), 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: POST generate request for path <'.$src_url.'> has no response, this could be a service timeout', 2);
+                if (is_wp_error($req)) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log($req->get_error_message(), 2);
                 }
 
                 return false;
@@ -570,76 +570,76 @@ 
         }
     }
 
-    public function ao_ccss_api_results( $jobid, $debug, $dcode ) {
+    public function ao_ccss_api_results($jobid, $debug, $dcode) {
         // GET jobs from criticalcss.com and return responses
         // Get key.
         global $ao_ccss_key;
         $key = $ao_ccss_key;
 
         // Prepare the request.
-        $url  = AO_CCSS_API . 'results?resultId=' . $jobid;
+        $url  = AO_CCSS_API.'results?resultId='.$jobid;
         $args = array(
             'headers' => array(
-                'User-Agent'    => 'Autoptimize CriticalCSS Power-Up v' . AO_CCSS_VER,
-                'Authorization' => 'JWT ' . $key,
+                'User-Agent'    => 'Autoptimize CriticalCSS Power-Up v'.AO_CCSS_VER,
+                'Authorization' => 'JWT '.$key,
                 'Connection'    => 'close',
             ),
         );
 
         // Dispatch the request and store its response code.
-        $req  = wp_safe_remote_get( $url, $args );
-        $code = wp_remote_retrieve_response_code( $req );
-        $body = json_decode( wp_remote_retrieve_body( $req ), true );
+        $req  = wp_safe_remote_get($url, $args);
+        $code = wp_remote_retrieve_response_code($req);
+        $body = json_decode(wp_remote_retrieve_body($req), true);
 
-        if ( $debug && $dcode ) {
+        if ($debug && $dcode) {
             // If queue debug is active, change response code.
             $code = $dcode;
         }
 
-        if ( 200 == $code ) {
+        if (200 == $code) {
             // Response code is OK.
-            if ( is_array( $body ) && ( array_key_exists( 'status', $body ) || array_key_exists( 'job', $body ) ) && ( 'JOB_QUEUED' == $body['status'] || 'JOB_ONGOING' == $body['status'] || 'JOB_DONE' == $body['status'] || 'JOB_FAILED' == $body['status'] || 'JOB_UNKNOWN' == $body['status'] || 'STATUS_JOB_BAD' == $body['job']['status'] ) ) {
+            if (is_array($body) && (array_key_exists('status', $body) || array_key_exists('job', $body)) && ('JOB_QUEUED' == $body['status'] || 'JOB_ONGOING' == $body['status'] || 'JOB_DONE' == $body['status'] || 'JOB_FAILED' == $body['status'] || 'JOB_UNKNOWN' == $body['status'] || 'STATUS_JOB_BAD' == $body['job']['status'])) {
                 // Workaround criticalcss.com non-RESTful reponses
                 // Log successful and return encoded request body.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied successfully', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied successfully', 3);
                 return $body;
-            } elseif ( is_array( $body ) && ( array_key_exists( 'error', $body ) && 'This css no longer exists. Please re-generate it.' == $body['error'] ) ) {
+            } elseif (is_array($body) && (array_key_exists('error', $body) && 'This css no longer exists. Please re-generate it.' == $body['error'])) {
                 // Handle no CSS reply
                 // Log no CSS error and return encoded request body.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied successfully but the CSS for it does not exist anymore', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied successfully but the CSS for it does not exist anymore', 3);
                 return $body;
             } else {
                 // Log failed request and return false.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied with code <' . $code . '> and an UNKNOWN error condition, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied with code <'.$code.'> and an UNKNOWN error condition, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
                 return false;
             }
         } else {
             // Response code is anything else
             // Log failed request with a valid response code and return body.
-            if ( $code ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> replied with error code <' . $code . '>, body follows...', 2 );
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
-                if ( 401 == $code ) {
+            if ($code) {
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> replied with error code <'.$code.'>, body follows...', 2);
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
+                if (401 == $code) {
                     // If request is unauthorized, also clear key status.
-                    update_option( 'autoptimize_ccss_keyst', 1 );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is invalid, updating key status', 3 );
+                    update_option('autoptimize_ccss_keyst', 1);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is invalid, updating key status', 3);
                 }
 
                 // Return the request body.
                 return $body;
             } else {
                 // Log failed request with no response and return false.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: GET results request for remote job id <' . $jobid . '> has no response, this could be a service timeout', 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: GET results request for remote job id <'.$jobid.'> has no response, this could be a service timeout', 2);
                 return false;
             }
         }
     }
 
-    public function ao_ccss_save_file( $ccss, $target, $review ) {
+    public function ao_ccss_save_file($ccss, $target, $review) {
         // Save critical CSS into the filesystem and return its filename
         // Prepare review mark.
-        if ( $review ) {
+        if ($review) {
             $rmark = '_R';
         } else {
             $rmark = '';
@@ -649,21 +649,21 @@ 
         $filename = false;
         $content  = $ccss;
 
-        if ( autoptimizeCriticalCSSCore::ao_ccss_check_contents( $content ) ) {
+        if (autoptimizeCriticalCSSCore::ao_ccss_check_contents($content)) {
             // Sanitize content, set filename and try to save file.
-            $file     = AO_CCSS_DIR . 'ccss_' . md5( $ccss . $target[1] ) . $rmark . '.css';
-            $status   = file_put_contents( $file, $content, LOCK_EX );
-            $filename = pathinfo( $file, PATHINFO_BASENAME );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS file for the rule <' . $target[0] . '|' . $target[1] . '> was saved as <' . $filename . '>, size in bytes is <' . $status . '>', 3 );
+            $file     = AO_CCSS_DIR.'ccss_'.md5($ccss.$target[1]).$rmark.'.css';
+            $status   = file_put_contents($file, $content, LOCK_EX);
+            $filename = pathinfo($file, PATHINFO_BASENAME);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS file for the rule <'.$target[0].'|'.$target[1].'> was saved as <'.$filename.'>, size in bytes is <'.$status.'>', 3);
 
-            if ( ! $status ) {
+            if (!$status) {
                 // If file has not been saved, reset filename.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS file <' . $filename . '> could not be not saved', 2 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS file <'.$filename.'> could not be not saved', 2);
                 $filename = false;
                 return $filename;
             }
         } else {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS received did not pass content check', 2 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS received did not pass content check', 2);
             return $filename;
         }
 
@@ -673,15 +673,15 @@ 
         global $ao_ccss_rules;
 
         // Prepare rule variables.
-        $srule   = $ao_ccss_rules[ $target[0] ][ $target[1] ];
+        $srule   = $ao_ccss_rules[$target[0]][$target[1]];
         $oldfile = $srule['file'];
 
-        if ( $oldfile && $oldfile !== $filename ) {
-            $delfile = AO_CCSS_DIR . $oldfile;
-            if ( file_exists( $delfile ) ) {
-                $unlinkst = unlink( $delfile );
-                if ( $unlinkst ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'A previous critical CSS file <' . $oldfile . '> was removed for the rule <' . $target[0] . '|' . $target[1] . '>', 3 );
+        if ($oldfile && $oldfile !== $filename) {
+            $delfile = AO_CCSS_DIR.$oldfile;
+            if (file_exists($delfile)) {
+                $unlinkst = unlink($delfile);
+                if ($unlinkst) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('A previous critical CSS file <'.$oldfile.'> was removed for the rule <'.$target[0].'|'.$target[1].'>', 3);
                 }
             }
         }
@@ -690,29 +690,29 @@ 
         return $filename;
     }
 
-    public function ao_ccss_rule_update( $ljid, $srule, $file, $hash ) {
+    public function ao_ccss_rule_update($ljid, $srule, $file, $hash) {
         // Update or create a rule
         // Attach required arrays.
         global $ao_ccss_rules;
 
         // Prepare rule variables.
-        $trule  = explode( '|', $srule );
-        $rule   = $ao_ccss_rules[ $trule[0] ][ $trule[1] ];
+        $trule  = explode('|', $srule);
+        $rule   = $ao_ccss_rules[$trule[0]][$trule[1]];
         $action = false;
         $rtype  = '';
 
-        if ( 0 === $rule['hash'] && 0 !== $rule['file'] ) {
+        if (0 === $rule['hash'] && 0 !== $rule['file']) {
             // manual rule, don't ever overwrite.
             $action = 'NOT UPDATED';
             $rtype  = 'MANUAL';
-        } elseif ( 0 === $rule['hash'] && 0 === $rule['file'] ) {
+        } elseif (0 === $rule['hash'] && 0 === $rule['file']) {
             // If this is an user created AUTO rule with no hash and file yet, update its hash and filename
             // Set rule hash, file and action flag.
             $rule['hash'] = $hash;
             $rule['file'] = $file;
             $action       = 'UPDATED';
             $rtype        = 'AUTO';
-        } elseif ( 0 !== $rule['hash'] && ctype_alnum( $rule['hash'] ) ) {
+        } elseif (0 !== $rule['hash'] && ctype_alnum($rule['hash'])) {
             // If this is an genuine AUTO rule, update its hash and filename
             // Set rule hash, file and action flag.
             $rule['hash'] = $hash;
@@ -722,7 +722,7 @@ 
         } else {
             // If rule doesn't exist, create an AUTO rule
             // AUTO rules were only for types, but will now also work for paths.
-            if ( 'types' == $trule[0] || 'paths' == $trule[0] ) {
+            if ('types' == $trule[0] || 'paths' == $trule[0]) {
                 // Set rule hash and file and action flag.
                 $rule['hash'] = $hash;
                 $rule['file'] = $file;
@@ -730,47 +730,47 @@ 
                 $rtype        = 'AUTO';
             } else {
                 // Log that no rule was created.
-                autoptimizeCriticalCSSCore::ao_ccss_log( 'Exception, no AUTO rule created', 3 );
+                autoptimizeCriticalCSSCore::ao_ccss_log('Exception, no AUTO rule created', 3);
             }
         }
 
-        if ( $action ) {
+        if ($action) {
             // If a rule creation/update is required, persist updated rules object.
-            $ao_ccss_rules[ $trule[0] ][ $trule[1] ] = $rule;
-            $ao_ccss_rules_raw                       = json_encode( $ao_ccss_rules );
-            update_option( 'autoptimize_ccss_rules', $ao_ccss_rules_raw );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Target rule <' . $srule . '> of type <' . $rtype . '> was ' . $action . ' for job id <' . $ljid . '>', 3 );
+            $ao_ccss_rules[$trule[0]][$trule[1]] = $rule;
+            $ao_ccss_rules_raw                       = json_encode($ao_ccss_rules);
+            update_option('autoptimize_ccss_rules', $ao_ccss_rules_raw);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Target rule <'.$srule.'> of type <'.$rtype.'> was '.$action.' for job id <'.$ljid.'>', 3);
         } else {
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'No rule action required', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('No rule action required', 3);
         }
     }
 
-    function ao_ccss_finclude( $finclude_raw ) {
+    function ao_ccss_finclude($finclude_raw) {
         // Prepare forceInclude object.
-        if ( ! empty( $finclude_raw ) ) {
+        if (!empty($finclude_raw)) {
             // If there are any content
             // Convert raw string into arra and initialize the returning object.
-            $fincludes = explode( ',', $finclude_raw );
+            $fincludes = explode(',', $finclude_raw);
             $finclude  = array();
 
             // Interacts over every rule.
             $i = 0;
-            foreach ( $fincludes as $include ) {
+            foreach ($fincludes as $include) {
                 // Trim leading and trailing whitespaces.
-                $include = trim( $include );
+                $include = trim($include);
 
-                if ( substr( $include, 0, 2 ) === '//' ) {
+                if (substr($include, 0, 2) === '//') {
                     // Regex rule
                     // Format value as required.
-                    $include = str_replace( '//', '/', $include );
-                    $include = $include . '/i';
+                    $include = str_replace('//', '/', $include);
+                    $include = $include.'/i';
 
                     // Store regex object.
-                    $finclude[ $i ]['type']  = 'RegExp';
-                    $finclude[ $i ]['value'] = $include;
+                    $finclude[$i]['type']  = 'RegExp';
+                    $finclude[$i]['value'] = $include;
                 } else {
                     // Simple value rule.
-                    $finclude[ $i ]['value'] = $include;
+                    $finclude[$i]['value'] = $include;
                 }
 
                 $i++;
@@ -787,54 +787,54 @@ 
     public function ao_ccss_cleaning() {
         // Perform plugin maintenance
         // Truncate log file >= 1MB .
-        if ( file_exists( AO_CCSS_LOG ) ) {
-            if ( filesize( AO_CCSS_LOG ) >= 1048576 ) {
-                $logfile = fopen( AO_CCSS_LOG, 'w' );
-                fclose( $logfile );
+        if (file_exists(AO_CCSS_LOG)) {
+            if (filesize(AO_CCSS_LOG) >= 1048576) {
+                $logfile = fopen(AO_CCSS_LOG, 'w');
+                fclose($logfile);
             }
         }
 
         // Remove lock file.
-        if ( file_exists( AO_CCSS_LOCK ) ) {
-            unlink( AO_CCSS_LOCK );
+        if (file_exists(AO_CCSS_LOCK)) {
+            unlink(AO_CCSS_LOCK);
         }
 
         // Make sure queue processing is scheduled, recreate if not.
-        if ( ! wp_next_scheduled( 'ao_ccss_queue' ) ) {
-            wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' );
+        if (!wp_next_scheduled('ao_ccss_queue')) {
+            wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue');
         }
 
         // Queue cleaning.
         global $ao_ccss_queue;
         $queue_purge_threshold = 100;
-        $queue_purge_age       = 24 * 60 * 60;
-        $queue_length          = count( $ao_ccss_queue );
-        $timestamp_yesterday   = microtime( true ) - $queue_purge_age;
+        $queue_purge_age       = 24*60*60;
+        $queue_length          = count($ao_ccss_queue);
+        $timestamp_yesterday   = microtime(true) - $queue_purge_age;
         $remove_old_new        = false;
         $queue_altered         = false;
 
-        if ( $queue_length > $queue_purge_threshold ) {
+        if ($queue_length > $queue_purge_threshold) {
             $remove_old_new = true;
         }
 
-        foreach ( $ao_ccss_queue as $path => $job ) {
-            if ( ( $remove_old_new && 'NEW' == $job['jqstat'] && $job['jctime'] < $timestamp_yesterday ) || in_array( $job['jqstat'], array( 'JOB_FAILED', 'STATUS_JOB_BAD', 'NO_CSS', 'NO_RESPONSE' ) ) ) {
-                unset( $ao_ccss_queue[ $path ] );
+        foreach ($ao_ccss_queue as $path => $job) {
+            if (($remove_old_new && 'NEW' == $job['jqstat'] && $job['jctime'] < $timestamp_yesterday) || in_array($job['jqstat'], array('JOB_FAILED', 'STATUS_JOB_BAD', 'NO_CSS', 'NO_RESPONSE'))) {
+                unset($ao_ccss_queue[$path]);
                 $queue_altered = true;
             }
         }
 
         // save queue to options!
-        if ( $queue_altered ) {
-            $ao_ccss_queue_raw = json_encode( $ao_ccss_queue );
-            update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Queue cleaning done.', 3 );
+        if ($queue_altered) {
+            $ao_ccss_queue_raw = json_encode($ao_ccss_queue);
+            update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
+            autoptimizeCriticalCSSCore::ao_ccss_log('Queue cleaning done.', 3);
         }
 
         // re-check key if invalid.
         global $ao_ccss_keyst;
-        if ( 1 == $ao_ccss_keyst ) {
-            $this->ao_ccss_api_generate( '', '', '' );
+        if (1 == $ao_ccss_keyst) {
+            $this->ao_ccss_api_generate('', '', '');
         }
     }
 }

autoptimize.php

Spacing +33 added lines, -33 removed lines

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

classes/autoptimizeConfig.php

Spacing +225 added lines, -225 removed lines

@@ -3,7 +3,7 @@ 
  * Main configuration logic.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -35,33 +35,33 @@ 
      */
     private function __construct()
     {
-        if ( is_admin() ) {
+        if (is_admin()) {
             // Add the admin page and settings.
-            if ( autoptimizeOptionWrapper::is_ao_active_for_network() ) {
-                add_action( 'network_admin_menu', array( $this, 'addmenu' ) );
+            if (autoptimizeOptionWrapper::is_ao_active_for_network()) {
+                add_action('network_admin_menu', array($this, 'addmenu'));
             }
 
-            add_action( 'admin_menu', array( $this, 'addmenu' ) );
-            add_action( 'admin_init', array( $this, 'registersettings' ) );
-            add_action( 'admin_init', array( 'PAnD', 'init' ) );
+            add_action('admin_menu', array($this, 'addmenu'));
+            add_action('admin_init', array($this, 'registersettings'));
+            add_action('admin_init', array('PAnD', 'init'));
 
             // Set meta info.
-            if ( function_exists( 'plugin_row_meta' ) ) {
+            if (function_exists('plugin_row_meta')) {
                 // 2.8 and higher.
-                add_filter( 'plugin_row_meta', array( $this, 'setmeta' ), 10, 2 );
-            } elseif ( function_exists( 'post_class' ) ) {
+                add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2);
+            } elseif (function_exists('post_class')) {
                 // 2.7 and lower.
-                $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' );
-                add_filter( 'plugin_action_links_' . $plugin, array( $this, 'setmeta' ) );
+                $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
+                add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta'));
             }
 
             // Clean cache?
-            if ( autoptimizeOptionWrapper::get_option( 'autoptimize_cache_clean' ) ) {
+            if (autoptimizeOptionWrapper::get_option('autoptimize_cache_clean')) {
                 autoptimizeCache::clearall();
-                autoptimizeOptionWrapper::update_option( 'autoptimize_cache_clean', 0 );
+                autoptimizeOptionWrapper::update_option('autoptimize_cache_clean', 0);
             }
 
-            $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);
         }
 
         // Adds the Autoptimize Toolbar to the Admin bar.
@@ -77,7 +77,7 @@ 
     static public function instance()
     {
         // Only one instance.
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new autoptimizeConfig();
         }
 
@@ -87,9 +87,9 @@ 
     public function show_network_message() {
         ?>
         <div class="wrap">
-            <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+            <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
             <?php echo $this->ao_admin_tabs(); ?>
-            <p style="font-size:120%;"><?php echo apply_filters( 'autoptimize_filter_settingsscreen_multisite_network_message', __( 'Autoptimize is enabled and configured on a WordPress network level. Please contact your network administrator if you need Autoptimize settings changed.', 'autoptimize' ) ); ?></p>
+            <p style="font-size:120%;"><?php echo apply_filters('autoptimize_filter_settingsscreen_multisite_network_message', __('Autoptimize is enabled and configured on a WordPress network level. Please contact your network administrator if you need Autoptimize settings changed.', 'autoptimize')); ?></p>
         </div>
         <?php
     }
@@ -184,32 +184,32 @@ 
 <div class="wrap">
 
 <!-- Temporary nudge to disable aoccss power-up. -->
-<?php if ( autoptimizeUtils::is_plugin_active( 'autoptimize-criticalcss/ao_criticss_aas.php' ) ) { ?>
+<?php if (autoptimizeUtils::is_plugin_active('autoptimize-criticalcss/ao_criticss_aas.php')) { ?>
     <div class="notice-info notice"><p>
-        <?php _e( 'Autoptimize now includes the criticalcss.com integration that was previously part of the separate power-up. If you want you can simply disable the power-up and Autoptimize will take over immediately.', 'autoptimize' ); ?>
+        <?php _e('Autoptimize now includes the criticalcss.com integration that was previously part of the separate power-up. If you want you can simply disable the power-up and Autoptimize will take over immediately.', 'autoptimize'); ?>
     </p></div>
 <?php } ?>
 
 <div id="autoptimize_main">
-    <h1 id="ao_title"><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+    <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
     <?php echo $this->ao_admin_tabs(); ?>
 
-<form method="post" action="<?php echo admin_url( 'options.php' ); ?>">
-<?php settings_fields( 'autoptimize' ); ?>
+<form method="post" action="<?php echo admin_url('options.php'); ?>">
+<?php settings_fields('autoptimize'); ?>
 
 <ul>
 
 <?php
 // Only show enable site configuration in network site option.
-if ( is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
+if (is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
 ?>
     <li class="itemDetail multiSite">
-        <h2 class="itemTitle"><?php _e( 'Multisite Options', 'autoptimize' ); ?></h2>
+        <h2 class="itemTitle"><?php _e('Multisite Options', 'autoptimize'); ?></h2>
         <table class="form-table">
             <tr valign="top">
-                <th scope="row"><?php _e( 'Enable site configuration?', 'autoptimize' ); ?></th>
-                <td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ? 'checked="checked" ' : ''; ?>/>
-                <?php _e( 'Enable Autoptimize configuration per site.', 'autoptimize' ); ?></label></td>
+                <th scope="row"><?php _e('Enable site configuration?', 'autoptimize'); ?></th>
+                <td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config') ? 'checked="checked" ' : ''; ?>/>
+                <?php _e('Enable Autoptimize configuration per site.', 'autoptimize'); ?></label></td>
             </tr>
         </table>
     </li>
@@ -218,120 +218,120 @@ 
 <?php } ?>    
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'JavaScript Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e( 'Optimize JavaScript Code?', 'autoptimize' ); ?></th>
-<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js' ) ? 'checked="checked" ' : ''; ?>/></td>
+<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
 <tr valign="top" class="js_sub js_aggregate_master">
-<th scope="row"><?php _e( 'Aggregate JS-files?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get( 'autoptimize_js_aggregate' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Aggregate JS-files?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get('autoptimize_js_aggregate') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td>
 </tr>
 <tr valign="top" class="js_sub js_not_aggregate">
-<th scope="row"><?php _e( 'Do not aggregate but defer?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_defer_not_aggregate" name="autoptimize_js_defer_not_aggregate" <?php echo $conf->get( 'autoptimize_js_defer_not_aggregate' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'When JS is not aggregated, all linked JS-files can be deferred instead, making them non-render-blocking.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Do not aggregate but defer?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_defer_not_aggregate" name="autoptimize_js_defer_not_aggregate" <?php echo $conf->get('autoptimize_js_defer_not_aggregate') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('When JS is not aggregated, all linked JS-files can be deferred instead, making them non-render-blocking.', 'autoptimize'); ?></label></td>
 </tr>
 <tr valign="top" class="js_sub js_aggregate">
-<th scope="row"><?php _e( 'Also aggregate inline JS?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_include_inline' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize'); ?></label></td>
 </tr>
 <tr valign="top" class="js_sub js_aggregate">
-<th scope="row"><?php _e( 'Force JavaScript in &lt;head&gt;?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_forcehead' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize'); ?></label></td>
 </tr>
-<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_js_justhead' ) ) { ?>
+<?php if (autoptimizeOptionWrapper::get_option('autoptimize_js_justhead')) { ?>
 <tr valign="top" class="js_sub js_aggregate">
 <th scope="row">
 <?php
-    _e( 'Look for scripts only in &lt;head&gt;?', 'autoptimize' );
-    echo ' <i>' . __( '(deprecated)', 'autoptimize' ) . '</i>';
+    _e('Look for scripts only in &lt;head&gt;?', 'autoptimize');
+    echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>';
 ?>
 </th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_justhead' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize' ); ?></label></td>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td>
 </tr>
 <?php } ?>
 <tr valign="top" class="js_sub">
-<th scope="row"><?php _e( 'Exclude scripts from Autoptimize:', 'autoptimize' ); ?></th>
-<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo esc_attr( autoptimizeOptionWrapper::get_option( 'autoptimize_js_exclude', 'wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.js, js/jquery/jquery.min.js' ) ); ?>"/><br />
+<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th>
+<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo esc_attr(autoptimizeOptionWrapper::get_option('autoptimize_js_exclude', 'wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.js, js/jquery/jquery.min.js')); ?>"/><br />
 <?php
-echo __( 'A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.', 'autoptimize' ) . ' ' . __( 'Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' );
+echo __('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.', 'autoptimize').' '.__('Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize');
 ?>
 </label></td>
 </tr>
 <tr valign="top" class="js_sub js_aggregate">
-<th scope="row"><?php _e( 'Add try-catch wrapping?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_js_trycatch' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'If your scripts break because of a JS-error, you might want to try this.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'CSS Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e( 'Optimize CSS Code?', 'autoptimize' ); ?></th>
-<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css' ) ? 'checked="checked" ' : ''; ?>/></td>
+<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
 <tr class="css_sub" valign="top">
-<th scope="row"><?php _e( 'Aggregate CSS-files?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get( 'autoptimize_css_aggregate' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Aggregate CSS-files?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get('autoptimize_css_aggregate') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td>
 </tr>
 <tr valign="top" class="css_sub css_aggregate">
-<th scope="row"><?php _e( 'Also aggregate inline CSS?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_include_inline', '1' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td>
 </tr>
 <tr class="css_sub css_aggregate" valign="top">
-<th scope="row"><?php _e( 'Generate data: URIs for images?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_datauris' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td>
 </tr>
-<?php if ( autoptimizeOptionWrapper::get_option( 'autoptimize_css_justhead' ) ) { ?>
+<?php if (autoptimizeOptionWrapper::get_option('autoptimize_css_justhead')) { ?>
 <tr valign="top" class="css_sub css_aggregate">
 <th scope="row">
 <?php
-_e( 'Look for styles only in &lt;head&gt;?', 'autoptimize' );
-echo ' <i>' . __( '(deprecated)', 'autoptimize' ) . '</i>';
+_e('Look for styles only in &lt;head&gt;?', 'autoptimize');
+echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>';
 ?>
 </th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_justhead' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize' ); ?></label></td>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td>
 </tr>
 <?php } ?>
 <tr valign="top" class="css_sub">
-<th scope="row"><?php _e( 'Inline and Defer CSS?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer' ) ? 'checked="checked" ' : ''; ?>/>
+<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/>
 <?php
-_e( 'Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize' );
+_e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize');
 echo ' ';
-$critcss_settings_url = get_admin_url( null, 'options-general.php?page=ao_critcss' );
+$critcss_settings_url = get_admin_url(null, 'options-general.php?page=ao_critcss');
 // translators: links "autoptimize critical CSS" tab.
-echo sprintf( __( 'This can be fully automated for different types of pages on the %s tab.', 'autoptimize' ), '<a href="' . $critcss_settings_url . '">CriticalCSS</a>' );
+echo sprintf(__('This can be fully automated for different types of pages on the %s tab.', 'autoptimize'), '<a href="'.$critcss_settings_url.'">CriticalCSS</a>');
 ?>
 </label></td>
 </tr>
 <tr valign="top" class="css_sub" id="autoptimize_css_defer_inline">
 <th scope="row"></th>
-<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e( 'Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize' ); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' ); ?></textarea></label></td>
+<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here. You can leave this empty when using the automated Critical CSS integration.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_defer_inline'); ?></textarea></label></td>
 </tr>
 <tr valign="top" class="css_sub css_aggregate">
-<th scope="row"><?php _e( 'Inline all CSS?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_css_inline' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Inlining all CSS is an easy way to stop the CSS from being render-blocking, but is generally not recommended because the size of the HTML increases significantly. Additionally it might push meta-tags down to a position where e.g. Facebook and Whatsapp will not find them any more, breaking thumbnails when sharing.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Inlining all CSS is an easy way to stop the CSS from being render-blocking, but is generally not recommended because the size of the HTML increases significantly. Additionally it might push meta-tags down to a position where e.g. Facebook and Whatsapp will not find them any more, breaking thumbnails when sharing.', 'autoptimize'); ?></label></td>
 </tr>
 <tr valign="top" class="css_sub">
-<th scope="row"><?php _e( 'Exclude CSS from Autoptimize:', 'autoptimize' ); ?></th>
-<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo esc_attr( autoptimizeOptionWrapper::get_option( 'autoptimize_css_exclude', 'wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css' ) ); ?>"/><br />
+<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th>
+<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo esc_attr(autoptimizeOptionWrapper::get_option('autoptimize_css_exclude', 'wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css')); ?>"/><br />
 <?php
-echo __( 'A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize' ) . ' ' . __( 'Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize' );
+echo __('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize').' '.__('Important: excluded non-minified files are still minified by Autoptimize unless that option under "misc" is disabled.', 'autoptimize');
 ?>
 </label></td>
 </tr>
@@ -339,55 +339,55 @@ 
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'HTML Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e( 'Optimize HTML Code?', 'autoptimize' ); ?></th>
-<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_html' ) ? 'checked="checked" ' : ''; ?>/></td>
+<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
 <tr class="html_sub" valign="top">
-<th scope="row"><?php _e( 'Keep HTML comments?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_html_keepcomments' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e( 'Enable this if you want HTML comments to remain in the page.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'CDN Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e( 'CDN Base URL', 'autoptimize' ); ?></th>
-<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url( autoptimizeOptionWrapper::get_option( 'autoptimize_cdn_url', '' ), array( 'http', 'https' ) ); ?>" /><br />
-<?php _e( 'Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize' ); ?></label></td>
+<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th>
+<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(autoptimizeOptionWrapper::get_option('autoptimize_cdn_url', ''), array('http', 'https')); ?>" /><br />
+<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'Cache Info', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2>
 <table class="form-table" >
 <tr valign="top" >
-<th scope="row"><?php _e( 'Cache folder', 'autoptimize' ); ?></th>
-<td><?php echo htmlentities( AUTOPTIMIZE_CACHE_DIR ); ?></td>
+<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th>
+<td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td>
 </tr>
 <tr valign="top" >
-<th scope="row"><?php _e( 'Can we write?', 'autoptimize' ); ?></th>
-<td><?php echo ( autoptimizeCache::cacheavail() ? __( 'Yes', 'autoptimize' ) : __( 'No', 'autoptimize' ) ); ?></td>
+<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th>
+<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td>
 </tr>
 <tr valign="top" >
-<th scope="row"><?php _e( 'Cached styles and scripts', 'autoptimize' ); ?></th>
+<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th>
 <td>
     <?php
     $ao_stat_arr = autoptimizeCache::stats();
-    if ( ! empty( $ao_stat_arr ) && is_array( $ao_stat_arr ) ) {
-        $ao_cache_size = size_format( $ao_stat_arr[1], 2 );
+    if (!empty($ao_stat_arr) && is_array($ao_stat_arr)) {
+        $ao_cache_size = size_format($ao_stat_arr[1], 2);
         $details       = '';
-        if ( $ao_cache_size > 0 ) {
-            $details = ', ~' . $ao_cache_size . ' total';
+        if ($ao_cache_size > 0) {
+            $details = ', ~'.$ao_cache_size.' total';
         }
         // translators: Kilobytes + timestamp shown.
-        printf( __( '%1$s files, totalling %2$s (calculated at %3$s)', 'autoptimize' ), $ao_stat_arr[0], $ao_cache_size, date( 'H:i e', $ao_stat_arr[2] ) );
+        printf(__('%1$s files, totalling %2$s (calculated at %3$s)', 'autoptimize'), $ao_stat_arr[0], $ao_cache_size, date('H:i e', $ao_stat_arr[2]));
     }
     ?>
 </td>
@@ -396,41 +396,41 @@ 
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e( 'Misc Options', 'autoptimize' ); ?></h2>
+<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2>
 <table class="form-table">
     <tr valign="top" >
-    <th scope="row"><?php _e( 'Save aggregated script/css as static files?', 'autoptimize' ); ?></th>
-    <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_cache_nogzip', '1' ) ? 'checked="checked" ' : ''; ?>/>
-    <?php _e( 'By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize' ); ?></label></td>
+    <th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th>
+    <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/>
+    <?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label></td>
     </tr>
     <?php
     $_min_excl_class = '';
-    if ( ! $conf->get( 'autoptimize_css_aggregate' ) && ! $conf->get( 'autoptimize_js_aggregate' ) ) {
+    if (!$conf->get('autoptimize_css_aggregate') && !$conf->get('autoptimize_js_aggregate')) {
         $_min_excl_class = 'hidden';
     }
     ?>
     <tr valign="top" id="min_excl_row" class="<?php echo $_min_excl_class; ?>">
-        <th scope="row"><?php _e( 'Minify excluded CSS and JS files?', 'autoptimize' ); ?></th>
-        <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_minify_excluded', '1' ) ? 'checked="checked" ' : ''; ?>/>
-        <?php _e( 'When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', 'autoptimize' ); ?></label></td>
+        <th scope="row"><?php _e('Minify excluded CSS and JS files?', 'autoptimize'); ?></th>
+        <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_minify_excluded', '1') ? 'checked="checked" ' : ''; ?>/>
+        <?php _e('When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', 'autoptimize'); ?></label></td>
     </tr>
     <tr valign="top">
-        <th scope="row"><?php _e( 'Enable 404 fallbacks?', 'autoptimize' ); ?></th>
-        <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_fallback" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_cache_fallback', '1' ) ? 'checked="checked" ' : ''; ?>/>
-        <?php _e( 'Sometimes Autoptimized JS/ CSS is referenced in cached HTML but is already removed, resulting in broken sites. With this option on, Autoptimize will try to redirect those not-found files to "fallback"-versions, keeping the page/ site somewhat intact. In some cases this will require extra web-server level configuration to ensure <code>wp-content/autoptimize_404_handler.php</code> is set to handle 404\'s in <code>wp-content/cache/autoptimize</code>.', 'autoptimize' ); ?></label></td>
+        <th scope="row"><?php _e('Enable 404 fallbacks?', 'autoptimize'); ?></th>
+        <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_fallback" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_cache_fallback', '1') ? 'checked="checked" ' : ''; ?>/>
+        <?php _e('Sometimes Autoptimized JS/ CSS is referenced in cached HTML but is already removed, resulting in broken sites. With this option on, Autoptimize will try to redirect those not-found files to "fallback"-versions, keeping the page/ site somewhat intact. In some cases this will require extra web-server level configuration to ensure <code>wp-content/autoptimize_404_handler.php</code> is set to handle 404\'s in <code>wp-content/cache/autoptimize</code>.', 'autoptimize'); ?></label></td>
     </tr>
     <tr valign="top">
-    <th scope="row"><?php _e( 'Also optimize for logged in editors/ administrators?', 'autoptimize' ); ?></th>
-    <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_logged', '1' ) ? 'checked="checked" ' : ''; ?>/>
-    <?php _e( 'By default Autoptimize is also active for logged on editors/ administrators, uncheck this option if you don\'t want Autoptimize to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize' ); ?></label></td>
+    <th scope="row"><?php _e('Also optimize for logged in editors/ administrators?', 'autoptimize'); ?></th>
+    <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/>
+    <?php _e('By default Autoptimize is also active for logged on editors/ administrators, uncheck this option if you don\'t want Autoptimize to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize'); ?></label></td>
     </tr>
     <?php
-    if ( function_exists( 'is_checkout' ) || function_exists( 'is_cart' ) || function_exists( 'edd_is_checkout' ) || function_exists( 'wpsc_is_cart' ) || function_exists( 'wpsc_is_checkout' ) ) {
+    if (function_exists('is_checkout') || function_exists('is_cart') || function_exists('edd_is_checkout') || function_exists('wpsc_is_cart') || function_exists('wpsc_is_checkout')) {
     ?>
     <tr valign="top" >
-        <th scope="row"><?php _e( 'Also optimize shop cart/ checkout?', 'autoptimize' ); ?></th>
-        <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo autoptimizeOptionWrapper::get_option( 'autoptimize_optimize_checkout', '0' ) ? 'checked="checked" ' : ''; ?>/>
-            <?php _e( 'By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize' ); ?></label>
+        <th scope="row"><?php _e('Also optimize shop cart/ checkout?', 'autoptimize'); ?></th>
+        <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo autoptimizeOptionWrapper::get_option('autoptimize_optimize_checkout', '0') ? 'checked="checked" ' : ''; ?>/>
+            <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize'); ?></label>
         </td>
     </tr>
     <?php } ?>
@@ -440,8 +440,8 @@ 
 </ul>
 
 <p class="submit">
-<input type="submit" class="button-secondary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" />
-<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e( 'Save Changes and Empty Cache', 'autoptimize' ); ?>" />
+<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize'); ?>" />
+<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize'); ?>" />
 </p>
 
 </form>
@@ -450,46 +450,46 @@ 
     <div class="autoptimize_banner hidden">
     <ul>
     <?php
-    if ( $this->settings_screen_do_remote_http ) {
-        $ao_banner = get_transient( 'autoptimize_banner' );
-        if ( empty( $ao_banner ) ) {
-            $banner_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver=' . AUTOPTIMIZE_PLUGIN_VERSION );
-            if ( ! is_wp_error( $banner_resp ) ) {
-                if ( '200' == wp_remote_retrieve_response_code( $banner_resp ) ) {
-                    $ao_banner = wp_kses_post( wp_remote_retrieve_body( $banner_resp ) );
-                    set_transient( 'autoptimize_banner', $ao_banner, WEEK_IN_SECONDS );
+    if ($this->settings_screen_do_remote_http) {
+        $ao_banner = get_transient('autoptimize_banner');
+        if (empty($ao_banner)) {
+            $banner_resp = wp_remote_get('https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION);
+            if (!is_wp_error($banner_resp)) {
+                if ('200' == wp_remote_retrieve_response_code($banner_resp)) {
+                    $ao_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp));
+                    set_transient('autoptimize_banner', $ao_banner, WEEK_IN_SECONDS);
                 }
             }
         }
         echo $ao_banner;
     }
     ?>
-        <li><?php _e( "Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", 'autoptimize' ); ?></li>
-        <li><?php _e( 'Happy with Autoptimize?', 'autoptimize' ); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e( 'Try my other plugins!', 'autoptimize' ); ?></a></li>
+        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", 'autoptimize'); ?></li>
+        <li><?php _e('Happy with Autoptimize?', 'autoptimize'); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e('Try my other plugins!', 'autoptimize'); ?></a></li>
     </ul>
     </div>
     <div style="margin-left:10px;margin-top:-5px;">
         <h2>
-            <?php _e( 'futtta about', 'autoptimize' ); ?>
+            <?php _e('futtta about', 'autoptimize'); ?>
             <select id="feed_dropdown" >
-                <option value="1"><?php _e( 'Autoptimize', 'autoptimize' ); ?></option>
-                <option value="2"><?php _e( 'WordPress', 'autoptimize' ); ?></option>
-                <option value="3"><?php _e( 'Web Technology', 'autoptimize' ); ?></option>
+                <option value="1"><?php _e('Autoptimize', 'autoptimize'); ?></option>
+                <option value="2"><?php _e('WordPress', 'autoptimize'); ?></option>
+                <option value="3"><?php _e('Web Technology', 'autoptimize'); ?></option>
             </select>
         </h2>
         <div id="futtta_feed">
             <div id="autoptimizefeed">
-                <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_autoptimize' ); ?>
+                <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_autoptimize'); ?>
             </div>
             <div id="wordpressfeed">
-                <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_wordpress' ); ?>
+                <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_wordpress'); ?>
             </div>
             <div id="webtechfeed">
-                <?php $this->get_futtta_feeds( 'http://feeds.feedburner.com/futtta_webtech' ); ?>
+                <?php $this->get_futtta_feeds('http://feeds.feedburner.com/futtta_webtech'); ?>
             </div>
         </div>
     </div>
-    <div style="float:right;margin:50px 15px;"><a href="https://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url() . '/' . plugin_basename( dirname( __FILE__ ) ) . '/external/do_not_donate_smallest.png'; ?>" title="<?php _e( 'Do not donate for this plugin!', 'autoptimize' ); ?>"></a></div>
+    <div style="float:right;margin:50px 15px;"><a href="https://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e('Do not donate for this plugin!', 'autoptimize'); ?>"></a></div>
 </div>
 
 <script type="text/javascript">
@@ -655,82 +655,82 @@ 
 
     public function addmenu()
     {
-        if ( is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
+        if (is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
             // multisite, network admin, ao network activated: add normal settings page at network level.
-            $hook = add_submenu_page( 'settings.php', __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_network_options', 'autoptimize', array( $this, 'show_config' ) );
-        } elseif ( is_multisite() && ! is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ) {
+            $hook = add_submenu_page('settings.php', __('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_network_options', 'autoptimize', array($this, 'show_config'));
+        } elseif (is_multisite() && !is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config')) {
             // multisite, ao network activated, not network admin so site specific settings, but "autoptimize_enable_site_config" is off: show "sorry, ask network admin" message iso options.
-            $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_network_message' ) );
+            $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show_network_message'));
         } else {
             // default: show normal options page if not multisite, if multisite but not network activated, if multisite and network activated and "autoptimize_enable_site_config" is on.
-            $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_config' ) );
+            $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show_config'));
         }
 
-        add_action( 'admin_print_scripts-' . $hook, array( $this, 'autoptimize_admin_scripts' ) );
-        add_action( 'admin_print_styles-' . $hook, array( $this, 'autoptimize_admin_styles' ) );
+        add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts'));
+        add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles'));
     }
 
     public function autoptimize_admin_scripts()
     {
-        wp_enqueue_script( 'jqcookie', plugins_url( '/external/js/jquery.cookie.min.js', __FILE__ ), array( 'jquery' ), null, true );
-        wp_enqueue_script( 'unslider', plugins_url( '/external/js/unslider-min.js', __FILE__ ), array( 'jquery' ), null, true );
+        wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true);
+        wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true);
     }
 
     public function autoptimize_admin_styles()
     {
-        wp_enqueue_style( 'unslider', plugins_url( '/external/js/unslider.css', __FILE__ ) );
-        wp_enqueue_style( 'unslider-dots', plugins_url( '/external/js/unslider-dots.css', __FILE__ ) );
+        wp_enqueue_style('unslider', plugins_url('/external/js/unslider.css', __FILE__));
+        wp_enqueue_style('unslider-dots', plugins_url('/external/js/unslider-dots.css', __FILE__));
     }
 
     public function registersettings() {
-        register_setting( 'autoptimize', 'autoptimize_html' );
-        register_setting( 'autoptimize', 'autoptimize_html_keepcomments' );
-        register_setting( 'autoptimize', 'autoptimize_enable_site_config' );
-        register_setting( 'autoptimize', 'autoptimize_js' );
-        register_setting( 'autoptimize', 'autoptimize_js_aggregate' );
-        register_setting( 'autoptimize', 'autoptimize_js_defer_not_aggregate' );
-        register_setting( 'autoptimize', 'autoptimize_js_exclude' );
-        register_setting( 'autoptimize', 'autoptimize_js_trycatch' );
-        register_setting( 'autoptimize', 'autoptimize_js_justhead' );
-        register_setting( 'autoptimize', 'autoptimize_js_forcehead' );
-        register_setting( 'autoptimize', 'autoptimize_js_include_inline' );
-        register_setting( 'autoptimize', 'autoptimize_css' );
-        register_setting( 'autoptimize', 'autoptimize_css_aggregate' );
-        register_setting( 'autoptimize', 'autoptimize_css_exclude' );
-        register_setting( 'autoptimize', 'autoptimize_css_justhead' );
-        register_setting( 'autoptimize', 'autoptimize_css_datauris' );
-        register_setting( 'autoptimize', 'autoptimize_css_defer' );
-        register_setting( 'autoptimize', 'autoptimize_css_defer_inline' );
-        register_setting( 'autoptimize', 'autoptimize_css_inline' );
-        register_setting( 'autoptimize', 'autoptimize_css_include_inline' );
-        register_setting( 'autoptimize', 'autoptimize_cdn_url' );
-        register_setting( 'autoptimize', 'autoptimize_cache_clean' );
-        register_setting( 'autoptimize', 'autoptimize_cache_nogzip' );
-        register_setting( 'autoptimize', 'autoptimize_optimize_logged' );
-        register_setting( 'autoptimize', 'autoptimize_optimize_checkout' );
-        register_setting( 'autoptimize', 'autoptimize_minify_excluded' );
-        register_setting( 'autoptimize', 'autoptimize_cache_fallback' );
+        register_setting('autoptimize', 'autoptimize_html');
+        register_setting('autoptimize', 'autoptimize_html_keepcomments');
+        register_setting('autoptimize', 'autoptimize_enable_site_config');
+        register_setting('autoptimize', 'autoptimize_js');
+        register_setting('autoptimize', 'autoptimize_js_aggregate');
+        register_setting('autoptimize', 'autoptimize_js_defer_not_aggregate');
+        register_setting('autoptimize', 'autoptimize_js_exclude');
+        register_setting('autoptimize', 'autoptimize_js_trycatch');
+        register_setting('autoptimize', 'autoptimize_js_justhead');
+        register_setting('autoptimize', 'autoptimize_js_forcehead');
+        register_setting('autoptimize', 'autoptimize_js_include_inline');
+        register_setting('autoptimize', 'autoptimize_css');
+        register_setting('autoptimize', 'autoptimize_css_aggregate');
+        register_setting('autoptimize', 'autoptimize_css_exclude');
+        register_setting('autoptimize', 'autoptimize_css_justhead');
+        register_setting('autoptimize', 'autoptimize_css_datauris');
+        register_setting('autoptimize', 'autoptimize_css_defer');
+        register_setting('autoptimize', 'autoptimize_css_defer_inline');
+        register_setting('autoptimize', 'autoptimize_css_inline');
+        register_setting('autoptimize', 'autoptimize_css_include_inline');
+        register_setting('autoptimize', 'autoptimize_cdn_url');
+        register_setting('autoptimize', 'autoptimize_cache_clean');
+        register_setting('autoptimize', 'autoptimize_cache_nogzip');
+        register_setting('autoptimize', 'autoptimize_optimize_logged');
+        register_setting('autoptimize', 'autoptimize_optimize_checkout');
+        register_setting('autoptimize', 'autoptimize_minify_excluded');
+        register_setting('autoptimize', 'autoptimize_cache_fallback');
     }
 
-    public function setmeta( $links, $file = null )
+    public function setmeta($links, $file = null)
     {
         // Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/.
         // Do it only once - saves time.
         static $plugin;
-        if ( empty( $plugin ) ) {
-            $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' );
+        if (empty($plugin)) {
+            $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
         }
 
-        if ( null === $file ) {
+        if (null === $file) {
             // 2.7 and lower.
-            $settings_link = sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) );
-            array_unshift( $links, $settings_link );
+            $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'));
+            array_unshift($links, $settings_link);
         } else {
             // 2.8 and higher.
             // If it's us, add the link.
-            if ( $file === $plugin ) {
-                $newlink = array( sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) ) );
-                $links   = array_merge( $links, $newlink );
+            if ($file === $plugin) {
+                $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')));
+                $links   = array_merge($links, $newlink);
             }
         }
 
@@ -807,8 +807,8 @@ 
             'autoptimize_imgopt_select_field_2'   => '2', // quality glossy.
             'autoptimize_imgopt_checkbox_field_3' => '0', // lazy load off.
             'autoptimize_imgopt_checkbox_field_4' => '0', // webp off (might be removed).
-            'autoptimize_imgopt_text_field_5'     => '',  // lazy load exclusions empty.
-            'autoptimize_imgopt_text_field_6'     => '',  // optimization exclusions empty.
+            'autoptimize_imgopt_text_field_5'     => '', // lazy load exclusions empty.
+            'autoptimize_imgopt_text_field_6'     => '', // optimization exclusions empty.
             'autoptimize_imgopt_number_field_7'   => '0', // lazy load from nth image (0 = lazyload all).
         );
         return $defaults;
@@ -821,58 +821,58 @@ 
      *
      * @return string
      */
-    public static function get_ao_css_preload_onload( $media = 'all' )
+    public static function get_ao_css_preload_onload($media = 'all')
     {
-        $preload_onload = apply_filters( 'autoptimize_filter_css_preload_onload', "this.onload=null;this.media='" . $media . "';" );
+        $preload_onload = apply_filters('autoptimize_filter_css_preload_onload', "this.onload=null;this.media='".$media."';");
         return $preload_onload;
     }
 
-    public function get( $key )
+    public function get($key)
     {
-        if ( ! is_array( $this->config ) ) {
+        if (!is_array($this->config)) {
             // Default config.
             $config = self::get_defaults();
 
             // Override with user settings.
-            foreach ( array_keys( $config ) as $name ) {
-                $conf = autoptimizeOptionWrapper::get_option( $name );
-                if ( false !== $conf ) {
+            foreach (array_keys($config) as $name) {
+                $conf = autoptimizeOptionWrapper::get_option($name);
+                if (false !== $conf) {
                     // It was set before!
-                    $config[ $name ] = $conf;
+                    $config[$name] = $conf;
                 }
             }
 
             // Save for next call.
-            $this->config = apply_filters( 'autoptimize_filter_get_config', $config );
+            $this->config = apply_filters('autoptimize_filter_get_config', $config);
         }
 
-        if ( isset( $this->config[ $key ] ) ) {
-            return $this->config[ $key ];
+        if (isset($this->config[$key])) {
+            return $this->config[$key];
         }
 
         return false;
     }
 
-    private function get_futtta_feeds( $url ) {
-        if ( $this->settings_screen_do_remote_http ) {
-            $rss      = fetch_feed( $url );
+    private function get_futtta_feeds($url) {
+        if ($this->settings_screen_do_remote_http) {
+            $rss      = fetch_feed($url);
             $maxitems = 0;
 
-            if ( ! is_wp_error( $rss ) ) {
-                $maxitems  = $rss->get_item_quantity( 7 );
-                $rss_items = $rss->get_items( 0, $maxitems );
+            if (!is_wp_error($rss)) {
+                $maxitems  = $rss->get_item_quantity(7);
+                $rss_items = $rss->get_items(0, $maxitems);
             }
             ?>
             <ul>
-                <?php if ( 0 == $maxitems ) : ?>
-                    <li><?php _e( 'No items', 'autoptimize' ); ?></li>
+                <?php if (0 == $maxitems) : ?>
+                    <li><?php _e('No items', 'autoptimize'); ?></li>
                 <?php else : ?>
-                    <?php foreach ( $rss_items as $item ) : ?>
+                    <?php foreach ($rss_items as $item) : ?>
                         <li>
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
+                            <a href="<?php echo esc_url($item->get_permalink()); ?>"
                                 <?php // translators: the variable contains a date. ?>
-                                title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date( 'j F Y | g:i a' ) ); ?>">
-                                <?php echo esc_html( $item->get_title() ); ?>
+                                title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>">
+                                <?php echo esc_html($item->get_title()); ?>
                             </a>
                         </li>
                     <?php endforeach; ?>
@@ -885,23 +885,23 @@ 
     static function ao_admin_tabs()
     {
         // based on http://wordpress.stackexchange.com/a/58826 .
-        $tabs        = apply_filters( 'autoptimize_filter_settingsscreen_tabs', array( 'autoptimize' => __( 'JS, CSS  &amp; HTML', 'autoptimize' ) ) );
+        $tabs        = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('JS, CSS  &amp; HTML', 'autoptimize')));
         $tab_content = '';
-        $tabs_count  = count( $tabs );
-        if ( $tabs_count > 1 ) {
-            if ( isset( $_GET['page'] ) ) {
+        $tabs_count  = count($tabs);
+        if ($tabs_count > 1) {
+            if (isset($_GET['page'])) {
                 $current_id = $_GET['page'];
             } else {
                 $current_id = 'autoptimize';
             }
             $tab_content .= '<h2 class="nav-tab-wrapper">';
-            foreach ( $tabs as $tab_id => $tab_name ) {
-                if ( $current_id == $tab_id ) {
+            foreach ($tabs as $tab_id => $tab_name) {
+                if ($current_id == $tab_id) {
                     $class = ' nav-tab-active';
                 } else {
                     $class = '';
                 }
-                $tab_content .= '<a class="nav-tab' . $class . '" href="?page=' . $tab_id . '">' . $tab_name . '</a>';
+                $tab_content .= '<a class="nav-tab'.$class.'" href="?page='.$tab_id.'">'.$tab_name.'</a>';
             }
             $tab_content .= '</h2>';
         } else {
@@ -918,7 +918,7 @@ 
      */
     public static function is_admin_and_not_ajax()
     {
-        return ( is_admin() && ! self::doing_ajax() );
+        return (is_admin() && !self::doing_ajax());
     }
 
     /**
@@ -928,10 +928,10 @@ 
      */
     protected static function doing_ajax()
     {
-        if ( function_exists( 'wp_doing_ajax' ) ) {
+        if (function_exists('wp_doing_ajax')) {
             return wp_doing_ajax();
         }
-        return ( defined( 'DOING_AJAX' ) && DOING_AJAX );
+        return (defined('DOING_AJAX') && DOING_AJAX);
     }
 
     /**
@@ -940,7 +940,7 @@ 
      * @return bool
      */
     public static function should_show_menu_tabs() {
-        if ( ! is_multisite() || is_network_admin() || 'on' === autoptimizeOptionWrapper::get_option( 'autoptimize_enable_site_config' ) ) {
+        if (!is_multisite() || is_network_admin() || 'on' === autoptimizeOptionWrapper::get_option('autoptimize_enable_site_config')) {
             return true;
         } else {
             return false;