futtta / autoptimize

classes/autoptimizeCriticalCSSCore.php

Spacing +151 added lines, -151 removed lines

@@ -4,7 +4,7 @@ 
  * gets called by AO core, checks the rules and if a matching rule is found returns the associated CCSS.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -13,7 +13,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;
         }
@@ -28,28 +28,28 @@ 
         global $ao_ccss_unloadccss;
 
         // add all filters to do CCSS if key present.
-        if ( $ao_css_defer && isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) ) {
+        if ($ao_css_defer && isset($ao_ccss_key) && !empty($ao_ccss_key)) {
             // Set AO behavior: disable minification to avoid double minifying and caching.
-            add_filter( 'autoptimize_filter_css_critcss_minify', '__return_false' );
-            add_filter( 'autoptimize_filter_css_defer_inline', array( $this, 'ao_ccss_frontend' ), 10, 1 );
+            add_filter('autoptimize_filter_css_critcss_minify', '__return_false');
+            add_filter('autoptimize_filter_css_defer_inline', array($this, 'ao_ccss_frontend'), 10, 1);
 
             // Add the action to enqueue jobs for CriticalCSS cron.
-            add_action( 'autoptimize_action_css_hash', array( 'autoptimizeCriticalCSSEnqueue', 'ao_ccss_enqueue' ), 10, 1 );
+            add_action('autoptimize_action_css_hash', array('autoptimizeCriticalCSSEnqueue', 'ao_ccss_enqueue'), 10, 1);
 
             // conditionally add the filter to defer jquery and others.
-            if ( $ao_ccss_deferjquery ) {
-                add_filter( 'autoptimize_html_after_minify', array( $this, 'ao_ccss_defer_jquery' ), 11, 1 );
+            if ($ao_ccss_deferjquery) {
+                add_filter('autoptimize_html_after_minify', array($this, 'ao_ccss_defer_jquery'), 11, 1);
             }
 
             // conditionally add filter to unload the CCSS.
-            if ( $ao_ccss_unloadccss ) {
-                add_filter( 'autoptimize_html_after_minify', array( $this, 'ao_ccss_unloadccss' ), 12, 1 );
+            if ($ao_ccss_unloadccss) {
+                add_filter('autoptimize_html_after_minify', array($this, 'ao_ccss_unloadccss'), 12, 1);
             }
 
             // Order paths by length, as longest ones have greater priority in the rules.
-            if ( ! empty( $ao_ccss_rules['paths'] ) ) {
-                $keys = array_map( 'strlen', array_keys( $ao_ccss_rules['paths'] ) );
-                array_multisort( $keys, SORT_DESC, $ao_ccss_rules['paths'] );
+            if (!empty($ao_ccss_rules['paths'])) {
+                $keys = array_map('strlen', array_keys($ao_ccss_rules['paths']));
+                array_multisort($keys, SORT_DESC, $ao_ccss_rules['paths']);
             }
 
             // Add an array with default WordPress's conditional tags
@@ -58,14 +58,14 @@ 
             $ao_ccss_types = $this->get_ao_ccss_core_types();
 
             // Extend conditional tags on plugin initalization.
-            add_action( apply_filters( 'autoptimize_filter_ccss_extend_types_hook', 'init' ), array( $this, 'ao_ccss_extend_types' ) );
+            add_action(apply_filters('autoptimize_filter_ccss_extend_types_hook', 'init'), array($this, 'ao_ccss_extend_types'));
 
             // When autoptimize cache is cleared, also clear transient cache for page templates.
-            add_action( 'autoptimize_action_cachepurged', array( 'autoptimizeCriticalCSSCore', 'ao_ccss_clear_page_tpl_cache' ), 10, 0 );
+            add_action('autoptimize_action_cachepurged', array('autoptimizeCriticalCSSCore', 'ao_ccss_clear_page_tpl_cache'), 10, 0);
         }
     }
 
-    public function ao_ccss_frontend( $inlined ) {
+    public function ao_ccss_frontend($inlined) {
         // Apply CriticalCSS to frontend pages
         // Attach types and settings arrays.
         global $ao_ccss_types;
@@ -77,20 +77,20 @@ 
         $no_ccss = '';
 
         // Only if keystatus is OK and option to add CCSS for logged on users is on or user is not logged in.
-        if ( ( $ao_ccss_keyst && 2 == $ao_ccss_keyst ) && ( $ao_ccss_loggedin || ! is_user_logged_in() ) ) {
+        if (($ao_ccss_keyst && 2 == $ao_ccss_keyst) && ($ao_ccss_loggedin || !is_user_logged_in())) {
             // Check for a valid CriticalCSS based on path to return its contents.
-            $req_path = strtok( $_SERVER['REQUEST_URI'], '?' );
-            if ( ! empty( $ao_ccss_rules['paths'] ) ) {
-                foreach ( $ao_ccss_rules['paths'] as $path => $rule ) {
+            $req_path = strtok($_SERVER['REQUEST_URI'], '?');
+            if (!empty($ao_ccss_rules['paths'])) {
+                foreach ($ao_ccss_rules['paths'] as $path => $rule) {
                     // explicit match OR partial match if MANUAL rule.
-                    if ( $req_path == $path || urldecode( $req_path ) == $path || ( false == $rule['hash'] && false != $rule['file'] && strpos( $req_path, str_replace( site_url(), '', $path ) ) !== false ) ) {
-                        if ( file_exists( AO_CCSS_DIR . $rule['file'] ) ) {
-                            $_ccss_contents = file_get_contents( AO_CCSS_DIR . $rule['file'] );
-                            if ( 'none' != $_ccss_contents ) {
-                                if ( $ao_ccss_debug ) {
-                                    $_ccss_contents = '/* PATH: ' . $path . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                    if ($req_path == $path || urldecode($req_path) == $path || (false == $rule['hash'] && false != $rule['file'] && strpos($req_path, str_replace(site_url(), '', $path)) !== false)) {
+                        if (file_exists(AO_CCSS_DIR.$rule['file'])) {
+                            $_ccss_contents = file_get_contents(AO_CCSS_DIR.$rule['file']);
+                            if ('none' != $_ccss_contents) {
+                                if ($ao_ccss_debug) {
+                                    $_ccss_contents = '/* PATH: '.$path.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                 }
-                                return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                             } else {
                                 $no_ccss = 'none';
                             }
@@ -100,55 +100,55 @@ 
             }
 
             // Check for a valid CriticalCSS based on conditional tags to return its contents.
-            if ( ! empty( $ao_ccss_rules['types'] ) && 'none' !== $no_ccss ) {
+            if (!empty($ao_ccss_rules['types']) && 'none' !== $no_ccss) {
                 // order types-rules by the order of the original $ao_ccss_types array so as not to depend on the order in which rules were added.
-                $ao_ccss_rules['types'] = array_replace( array_intersect_key( array_flip( $ao_ccss_types ), $ao_ccss_rules['types'] ), $ao_ccss_rules['types'] );
+                $ao_ccss_rules['types'] = array_replace(array_intersect_key(array_flip($ao_ccss_types), $ao_ccss_rules['types']), $ao_ccss_rules['types']);
                 $is_front_page          = is_front_page();
 
-                foreach ( $ao_ccss_rules['types'] as $type => $rule ) {
-                    if ( in_array( $type, $ao_ccss_types ) && file_exists( AO_CCSS_DIR . $rule['file'] ) ) {
-                        $_ccss_contents = file_get_contents( AO_CCSS_DIR . $rule['file'] );
-                        if ( $is_front_page && 'is_front_page' == $type ) {
-                            if ( 'none' != $_ccss_contents ) {
-                                if ( $ao_ccss_debug ) {
-                                    $_ccss_contents = '/* TYPES: ' . $type . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                foreach ($ao_ccss_rules['types'] as $type => $rule) {
+                    if (in_array($type, $ao_ccss_types) && file_exists(AO_CCSS_DIR.$rule['file'])) {
+                        $_ccss_contents = file_get_contents(AO_CCSS_DIR.$rule['file']);
+                        if ($is_front_page && 'is_front_page' == $type) {
+                            if ('none' != $_ccss_contents) {
+                                if ($ao_ccss_debug) {
+                                    $_ccss_contents = '/* TYPES: '.$type.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                 }
-                                return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                             } else {
                                 $no_ccss = 'none';
                             }
-                        } elseif ( strpos( $type, 'custom_post_' ) === 0 && ! $is_front_page ) {
-                            if ( get_post_type( get_the_ID() ) === substr( $type, 12 ) ) {
-                                if ( 'none' != $_ccss_contents ) {
-                                    if ( $ao_ccss_debug ) {
-                                        $_ccss_contents = '/* TYPES: ' . $type . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                        } elseif (strpos($type, 'custom_post_') === 0 && !$is_front_page) {
+                            if (get_post_type(get_the_ID()) === substr($type, 12)) {
+                                if ('none' != $_ccss_contents) {
+                                    if ($ao_ccss_debug) {
+                                        $_ccss_contents = '/* TYPES: '.$type.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                     }
-                                    return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                    return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                                 } else {
                                     $no_ccss = 'none';
                                 }
                             }
-                        } elseif ( 0 === strpos( $type, 'template_' ) && ! $is_front_page ) {
-                            if ( is_page_template( substr( $type, 9 ) ) ) {
-                                if ( 'none' != $_ccss_contents ) {
-                                    if ( $ao_ccss_debug ) {
-                                        $_ccss_contents = '/* TYPES: ' . $type . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                        } elseif (0 === strpos($type, 'template_') && !$is_front_page) {
+                            if (is_page_template(substr($type, 9))) {
+                                if ('none' != $_ccss_contents) {
+                                    if ($ao_ccss_debug) {
+                                        $_ccss_contents = '/* TYPES: '.$type.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                     }
-                                    return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                    return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                                 } else {
                                     $no_ccss = 'none';
                                 }
                             }
-                        } elseif ( ! $is_front_page ) {
+                        } elseif (!$is_front_page) {
                             // all "normal" conditional tags, core + woo + buddypress + edd + bbpress
                             // but we have to remove the prefix for the non-core ones for them to function.
-                            $type = str_replace( array( 'woo_', 'bp_', 'bbp_', 'edd_' ), '', $type );
-                            if ( function_exists( $type ) && call_user_func( $type ) ) {
-                                if ( 'none' != $_ccss_contents ) {
-                                    if ( $ao_ccss_debug ) {
-                                        $_ccss_contents = '/* TYPES: ' . $type . ' hash: ' . $rule['hash'] . ' file: ' . $rule['file'] . ' */ ' . $_ccss_contents;
+                            $type = str_replace(array('woo_', 'bp_', 'bbp_', 'edd_'), '', $type);
+                            if (function_exists($type) && call_user_func($type)) {
+                                if ('none' != $_ccss_contents) {
+                                    if ($ao_ccss_debug) {
+                                        $_ccss_contents = '/* TYPES: '.$type.' hash: '.$rule['hash'].' file: '.$rule['file'].' */ '.$_ccss_contents;
                                     }
-                                    return apply_filters( 'autoptimize_filter_ccss_core_ccss', $_ccss_contents . $ao_ccss_additional );
+                                    return apply_filters('autoptimize_filter_ccss_core_ccss', $_ccss_contents.$ao_ccss_additional);
                                 } else {
                                     $no_ccss = 'none';
                                 }
@@ -161,45 +161,45 @@ 
 
         // Finally, inline the default CriticalCSS if any or else the entire CSS for the page
         // This also applies to logged in users if the option to add CCSS for logged in users has been disabled.
-        if ( ! empty( $inlined ) && 'none' !== $no_ccss ) {
-            return apply_filters( 'autoptimize_filter_ccss_core_ccss', $inlined . $ao_ccss_additional );
+        if (!empty($inlined) && 'none' !== $no_ccss) {
+            return apply_filters('autoptimize_filter_ccss_core_ccss', $inlined.$ao_ccss_additional);
         } else {
-            add_filter( 'autoptimize_filter_css_inline', '__return_true' );
+            add_filter('autoptimize_filter_css_inline', '__return_true');
             return;
         }
     }
 
-    public function ao_ccss_defer_jquery( $in ) {
+    public function ao_ccss_defer_jquery($in) {
         global $ao_ccss_loggedin;
         // defer all linked and inline JS.
-        if ( ( ! is_user_logged_in() || $ao_ccss_loggedin ) && preg_match_all( '#<script.*>(.*)</script>#Usmi', $in, $matches, PREG_SET_ORDER ) ) {
-            foreach ( $matches as $match ) {
-                if ( str_replace( apply_filters( 'autoptimize_filter_ccss_core_defer_exclude', array( 'data-noptimize="1"', 'data-cfasync="false"', 'data-pagespeed-no-defer' ) ), '', $match[0] ) !== $match[0] ) {
+        if ((!is_user_logged_in() || $ao_ccss_loggedin) && preg_match_all('#<script.*>(.*)</script>#Usmi', $in, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                if (str_replace(apply_filters('autoptimize_filter_ccss_core_defer_exclude', array('data-noptimize="1"', 'data-cfasync="false"', 'data-pagespeed-no-defer')), '', $match[0]) !== $match[0]) {
                     // do not touch JS with noptimize/ cfasync/ pagespeed-no-defer flags.
                     continue;
-                } elseif ( '' !== $match[1] && ( ! preg_match( '/<script.* type\s?=.*>/', $match[0] ) || preg_match( '/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $match[0] ) ) ) {
+                } elseif ('' !== $match[1] && (!preg_match('/<script.* type\s?=.*>/', $match[0]) || preg_match('/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $match[0]))) {
                     // base64-encode and defer all inline JS.
-                    $base64_js = '<script defer src="data:text/javascript;base64,' . base64_encode( $match[1] ) . '"></script>';
-                    $in        = str_replace( $match[0], $base64_js, $in );
-                } elseif ( str_replace( array( ' defer', ' async' ), '', $match[0] ) === $match[0] ) {
+                    $base64_js = '<script defer src="data:text/javascript;base64,'.base64_encode($match[1]).'"></script>';
+                    $in        = str_replace($match[0], $base64_js, $in);
+                } elseif (str_replace(array(' defer', ' async'), '', $match[0]) === $match[0]) {
                     // and defer linked JS unless already deferred or asynced.
-                    $new_match = str_replace( '<script ', '<script defer ', $match[0] );
-                    $in        = str_replace( $match[0], $new_match, $in );
+                    $new_match = str_replace('<script ', '<script defer ', $match[0]);
+                    $in        = str_replace($match[0], $new_match, $in);
                 }
             }
         }
         return $in;
     }
 
-    public function ao_ccss_unloadccss( $html_in ) {
+    public function ao_ccss_unloadccss($html_in) {
         // set media attrib of inline CCSS to none at onLoad to avoid it impacting full CSS (rarely needed).
-        $_unloadccss_js = apply_filters( 'autoptimize_filter_ccss_core_unloadccss_js', '<script>window.addEventListener("load", function(event) {document.getElementById("aoatfcss").media="none";})</script>' );
+        $_unloadccss_js = apply_filters('autoptimize_filter_ccss_core_unloadccss_js', '<script>window.addEventListener("load", function(event) {document.getElementById("aoatfcss").media="none";})</script>');
 
-        if ( false !== strpos( $html_in, $_unloadccss_js . '</body>' ) ) {
+        if (false !== strpos($html_in, $_unloadccss_js.'</body>')) {
             return $html_in;
         }
 
-        return str_replace( '</body>', $_unloadccss_js . '</body>', $html_in );
+        return str_replace('</body>', $_unloadccss_js.'</body>', $html_in);
     }
 
     public function ao_ccss_extend_types() {
@@ -208,9 +208,9 @@ 
         global $ao_ccss_types;
 
         // in some cases $ao_ccss_types is empty and/or not an array, this should work around that problem.
-        if ( empty( $ao_ccss_types ) || ! is_array( $ao_ccss_types ) ) {
+        if (empty($ao_ccss_types) || !is_array($ao_ccss_types)) {
             $ao_ccss_types = get_ao_ccss_core_types();
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Empty types array in extend, refetching array with core conditionals.', 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Empty types array in extend, refetching array with core conditionals.', 3);
         }
 
         // Custom Post Types.
@@ -222,23 +222,23 @@ 
             'names',
             'and'
         );
-        foreach ( $cpts as $cpt ) {
-            array_unshift( $ao_ccss_types, 'custom_post_' . $cpt );
+        foreach ($cpts as $cpt) {
+            array_unshift($ao_ccss_types, 'custom_post_'.$cpt);
         }
 
         // Templates.
         // Transient cache to avoid frequent disk reads.
-        $templates = get_transient( 'autoptimize_ccss_page_templates' );
-        if ( ! $templates ) {
+        $templates = get_transient('autoptimize_ccss_page_templates');
+        if (!$templates) {
             $templates = wp_get_theme()->get_page_templates();
-            set_transient( 'autoptimize_ccss_page_templates', $templates, HOUR_IN_SECONDS );
+            set_transient('autoptimize_ccss_page_templates', $templates, HOUR_IN_SECONDS);
         }
-        foreach ( $templates as $tplfile => $tplname ) {
-            array_unshift( $ao_ccss_types, 'template_' . $tplfile );
+        foreach ($templates as $tplfile => $tplname) {
+            array_unshift($ao_ccss_types, 'template_'.$tplfile);
         }
 
         // bbPress tags.
-        if ( function_exists( 'is_bbpress' ) ) {
+        if (function_exists('is_bbpress')) {
             $ao_ccss_types = array_merge(
                 array(
                     'bbp_is_bbpress',
@@ -270,7 +270,7 @@ 
         }
 
         // BuddyPress tags.
-        if ( function_exists( 'is_buddypress' ) ) {
+        if (function_exists('is_buddypress')) {
             $ao_ccss_types = array_merge(
                 array(
                     'bp_is_activation_page',
@@ -312,7 +312,7 @@ 
         }
 
         // Easy Digital Downloads (EDD) tags.
-        if ( function_exists( 'edd_is_checkout' ) ) {
+        if (function_exists('edd_is_checkout')) {
             $ao_ccss_types = array_merge(
                 array(
                     'edd_is_checkout',
@@ -324,7 +324,7 @@ 
         }
 
         // WooCommerce tags.
-        if ( class_exists( 'WooCommerce' ) ) {
+        if (class_exists('WooCommerce')) {
             $ao_ccss_types = array_merge(
                 array(
                     'woo_is_account_page',
@@ -343,7 +343,7 @@ 
 
     public function get_ao_ccss_core_types() {
         global $ao_ccss_types;
-        if ( empty( $ao_ccss_types ) || ! is_array( $ao_ccss_types ) ) {
+        if (empty($ao_ccss_types) || !is_array($ao_ccss_types)) {
             return array(
                 'is_404',
                 'is_archive',
@@ -364,7 +364,7 @@ 
         }
     }
 
-    public static function ao_ccss_key_status( $render ) {
+    public static function ao_ccss_key_status($render) {
         // Provide key status
         // Get key and key status.
         global $ao_ccss_key;
@@ -377,55 +377,55 @@ 
         $key_return = array();
         $status     = false;
 
-        if ( $key && 2 == $key_status ) {
+        if ($key && 2 == $key_status) {
             // Key exists and its status is valid.
             // Set valid key status.
             $status     = 'valid';
-            $status_msg = __( 'Valid' );
+            $status_msg = __('Valid');
             $color      = '#46b450'; // Green.
             $message    = null;
-        } elseif ( $key && 1 == $key_status ) {
+        } elseif ($key && 1 == $key_status) {
             // Key exists but its validation has failed.
             // Set invalid key status.
             $status     = 'invalid';
-            $status_msg = __( 'Invalid' );
+            $status_msg = __('Invalid');
             $color      = '#dc3232'; // Red.
-            $message    = __( 'Your API key is invalid. Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> key.', 'autoptimize' );
-        } elseif ( $key && ! $key_status ) {
+            $message    = __('Your API key is invalid. Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> key.', 'autoptimize');
+        } elseif ($key && !$key_status) {
             // Key exists but it has no valid status yet
             // Perform key validation.
-            $key_check = $self->ao_ccss_key_validation( $key );
+            $key_check = $self->ao_ccss_key_validation($key);
 
             // Key is valid, set valid status.
-            if ( $key_check ) {
+            if ($key_check) {
                 $status     = 'valid';
-                $status_msg = __( 'Valid' );
+                $status_msg = __('Valid');
                 $color      = '#46b450'; // Green.
                 $message    = null;
             } else {
                 // Key is invalid, set invalid status.
                 $status     = 'invalid';
-                $status_msg = __( 'Invalid' );
+                $status_msg = __('Invalid');
                 $color      = '#dc3232'; // Red.
-                if ( get_option( 'autoptimize_ccss_keyst' ) == 1 ) {
-                    $message = __( 'Your API key is invalid. Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> key.', 'autoptimize' );
+                if (get_option('autoptimize_ccss_keyst') == 1) {
+                    $message = __('Your API key is invalid. Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> key.', 'autoptimize');
                 } else {
-                    $message = __( 'Something went wrong when checking your API key, make sure you server can communicate with https://criticalcss.com and/ or try again later.', 'autoptimize' );
+                    $message = __('Something went wrong when checking your API key, make sure you server can communicate with https://criticalcss.com and/ or try again later.', 'autoptimize');
                 }
             }
         } else {
             // No key nor status
             // Set no key status.
             $status     = 'nokey';
-            $status_msg = __( 'None' );
+            $status_msg = __('None');
             $color      = '#ffb900'; // Yellow.
-            $message    = __( 'Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key to start.', 'autoptimize' );
+            $message    = __('Please enter a valid <a href="https://criticalcss.com/?aff=1" target="_blank">criticalcss.com</a> API key to start.', 'autoptimize');
         }
 
         // Fill returned values.
         $key_return['status'] = $status;
         // Provide rendering information if required.
-        if ( $render ) {
+        if ($render) {
             $key_return['stmsg'] = $status_msg;
             $key_return['color'] = $color;
             $key_return['msg']   = $message;
@@ -435,7 +435,7 @@ 
         return $key_return;
     }
 
-    public function ao_ccss_key_validation( $key ) {
+    public function ao_ccss_key_validation($key) {
         global $ao_ccss_noptimize;
 
         // POST a dummy job to criticalcss.com to check for key validation
@@ -443,26 +443,26 @@ 
         $src_url = get_home_url();
 
         // 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);
 
         // Prepare the request.
-        $url  = esc_url_raw( AO_CCSS_API . 'generate' );
+        $url  = esc_url_raw(AO_CCSS_API.'generate');
         $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 must be JSON.
             'body'    => json_encode(
-                apply_filters( 'autoptimize_ccss_cron_api_generate_body',
+                apply_filters('autoptimize_ccss_cron_api_generate_body',
                     array(
                         'url'    => $src_url,
                         'aff'    => 1,
@@ -473,23 +473,23 @@ 
         );
 
         // 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 ( 200 == $code ) {
+        if (200 == $code) {
             // Response is OK.
             // Set key status as valid and log key check.
-            update_option( 'autoptimize_ccss_keyst', 2 );
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: API key is valid, updating key status', 3 );
+            update_option('autoptimize_ccss_keyst', 2);
+            autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: API key is valid, updating key status', 3);
 
             // extract job-id from $body and put it in the queue as a P job
             // but only if no jobs and no rules!
             global $ao_ccss_queue;
             global $ao_ccss_rules;
 
-            if ( 0 == count( $ao_ccss_queue ) && 0 == count( $ao_ccss_rules['types'] ) && 0 == count( $ao_ccss_rules['paths'] ) ) {
-                if ( 'JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status'] ) {
+            if (0 == count($ao_ccss_queue) && 0 == count($ao_ccss_rules['types']) && 0 == count($ao_ccss_rules['paths'])) {
+                if ('JOB_QUEUED' == $body['job']['status'] || 'JOB_ONGOING' == $body['job']['status']) {
                     $jprops['ljid']     = 'firstrun';
                     $jprops['rtarget']  = 'types|is_front_page';
                     $jprops['ptype']    = 'is_front_page';
@@ -500,30 +500,30 @@ 
                     $jprops['jqstat']   = $body['job']['status'];
                     $jprops['jrstat']   = null;
                     $jprops['jvstat']   = null;
-                    $jprops['jctime']   = microtime( true );
+                    $jprops['jctime']   = microtime(true);
                     $jprops['jftime']   = null;
                     $ao_ccss_queue['/'] = $jprops;
-                    $ao_ccss_queue_raw  = json_encode( $ao_ccss_queue );
-                    update_option( 'autoptimize_ccss_queue', $ao_ccss_queue_raw, false );
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Created P job for is_front_page based on API key check response.', 3 );
+                    $ao_ccss_queue_raw  = json_encode($ao_ccss_queue);
+                    update_option('autoptimize_ccss_queue', $ao_ccss_queue_raw, false);
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Created P job for is_front_page based on API key check response.', 3);
                 }
             }
             return true;
-        } elseif ( 401 == $code ) {
+        } elseif (401 == $code) {
             // Response is unauthorized
             // Set key status as invalid and log key check.
-            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 false;
         } else {
             // Response unkown
             // Log key check attempt.
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'criticalcss.com: could not check API key status, this is a service error, body follows if any...', 2 );
-            if ( ! empty( $body ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( print_r( $body, true ), 2 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('criticalcss.com: could not check API key status, this is a service error, body follows if any...', 2);
+            if (!empty($body)) {
+                autoptimizeCriticalCSSCore::ao_ccss_log(print_r($body, true), 2);
             }
-            if ( is_wp_error( $req ) ) {
-                autoptimizeCriticalCSSCore::ao_ccss_log( $req->get_error_message(), 2 );
+            if (is_wp_error($req)) {
+                autoptimizeCriticalCSSCore::ao_ccss_log($req->get_error_message(), 2);
             }
             return false;
         }
@@ -538,14 +538,14 @@ 
         $viewport = array();
 
         // Viewport Width.
-        if ( ! empty( $ao_ccss_viewport['w'] ) ) {
+        if (!empty($ao_ccss_viewport['w'])) {
             $viewport['w'] = $ao_ccss_viewport['w'];
         } else {
             $viewport['w'] = '';
         }
 
         // Viewport Height.
-        if ( ! empty( $ao_ccss_viewport['h'] ) ) {
+        if (!empty($ao_ccss_viewport['h'])) {
             $viewport['h'] = $ao_ccss_viewport['h'];
         } else {
             $viewport['h'] = '';
@@ -554,23 +554,23 @@ 
         return $viewport;
     }
 
-    public static function ao_ccss_check_contents( $ccss ) {
+    public static function ao_ccss_check_contents($ccss) {
         // Perform basic exploit avoidance and CSS validation.
-        if ( ! empty( $ccss ) ) {
+        if (!empty($ccss)) {
             // Try to avoid code injection.
-            $blocklist = array( '#!/', 'function(', '<script', '<?php' );
-            foreach ( $blocklist as $blocklisted ) {
-                if ( strpos( $ccss, $blocklisted ) !== false ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS received contained blocklisted content.', 2 );
+            $blocklist = array('#!/', 'function(', '<script', '<?php');
+            foreach ($blocklist as $blocklisted) {
+                if (strpos($ccss, $blocklisted) !== false) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS received contained blocklisted content.', 2);
                     return false;
                 }
             }
 
             // Check for most basics CSS structures.
-            $needlist = array( '{', '}', ':' );
-            foreach ( $needlist as $needed ) {
-                if ( false === strpos( $ccss, $needed ) && 'none' !== $ccss ) {
-                    autoptimizeCriticalCSSCore::ao_ccss_log( 'Critical CSS received did not seem to contain real CSS.', 2 );
+            $needlist = array('{', '}', ':');
+            foreach ($needlist as $needed) {
+                if (false === strpos($ccss, $needed) && 'none' !== $ccss) {
+                    autoptimizeCriticalCSSCore::ao_ccss_log('Critical CSS received did not seem to contain real CSS.', 2);
                     return false;
                 }
             }
@@ -580,7 +580,7 @@ 
         return true;
     }
 
-    public static function ao_ccss_log( $msg, $lvl ) {
+    public static function ao_ccss_log($msg, $lvl) {
         // Commom logging facility
         // Attach debug option.
         global $ao_ccss_debug;
@@ -591,7 +591,7 @@ 
         // 3: DD (for debug)
         // Default: UU (for unkown).
         $level = false;
-        switch ( $lvl ) {
+        switch ($lvl) {
             case 1:
                 $level = 'II';
                 break;
@@ -600,7 +600,7 @@ 
                 break;
             case 3:
                 // Output debug messages only if debug mode is enabled.
-                if ( $ao_ccss_debug ) {
+                if ($ao_ccss_debug) {
                     $level = 'DD';
                 }
                 break;
@@ -609,19 +609,19 @@ 
         }
 
         // Prepare and write a log message if there's a valid level.
-        if ( $level ) {
+        if ($level) {
 
             // Prepare message.
-            $message = date( 'c' ) . ' - [' . $level . '] ' . htmlentities( $msg ) . '<br>';
+            $message = date('c').' - ['.$level.'] '.htmlentities($msg).'<br>';
 
             // Write message to log file.
-            error_log( $message, 3, AO_CCSS_LOG );
+            error_log($message, 3, AO_CCSS_LOG);
         }
     }
 
     public static function ao_ccss_clear_page_tpl_cache() {
         // Clears transient cache for page templates.
-        delete_transient( 'autoptimize_ccss_page_templates' );
+        delete_transient('autoptimize_ccss_page_templates');
     }
 
 }

classes/autoptimizeCriticalCSSSettingsAjax.php

Spacing +106 added lines, -106 removed lines

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

config/autoptimize_404_handler.php

Spacing +10 added lines, -10 removed lines

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