futtta / autoptimize

classes/autoptimizeCriticalCSSEnqueue.php

Doc Comments +5 added lines

@@ -221,6 +221,11 @@
         return $page_type;
     }
 
+    /**
+     * @param string $path
+     * @param false|string $target
+     * @param boolean $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.

Spacing +74 added lines, -74 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;
@@ -42,17 +42,17 @@ 
 
             // Get request path and page type, and initialize the queue update flag.
             $req_orig        = $_SERVER['REQUEST_URI'];
-            $req_path        = strtok( $req_orig, '?' );
+            $req_path        = strtok($req_orig, '?');
 
             // Check if we have a lang param. we need to keep as WPML can switch languages based on that
             // and that includes RTL -> LTR so diff. structure, so rules would be RTL vs LTR
             // but this needs changes in the structur of the rule object so off by default for now
             // as now this will simply result in conditional rules being overwritten.
-            if ( apply_filters( 'autoptimize_filter_ccss_coreenqueue_honor_lang', false ) && strpos( $req_orig, 'lang=' ) !== false ) {
-                $req_params = strtok( '?' );
-                parse_str( $req_params, $req_params_arr );
-                if ( array_key_exists( 'lang', $req_params_arr ) && !empty( $req_params_arr['lang'] ) ) {
-                    $req_path .= '?lang=' . $req_params_arr['lang'];
+            if (apply_filters('autoptimize_filter_ccss_coreenqueue_honor_lang', false) && strpos($req_orig, 'lang=') !== false) {
+                $req_params = strtok('?');
+                parse_str($req_params, $req_params_arr);
+                if (array_key_exists('lang', $req_params_arr) && !empty($req_params_arr['lang'])) {
+                    $req_path .= '?lang='.$req_params_arr['lang'];
                 }
             }
 
@@ -63,21 +63,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;
@@ -85,19 +85,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;
@@ -105,11 +105,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;
@@ -117,28 +117,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,
@@ -154,30 +154,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.
@@ -185,14 +185,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;
                 }
             }
@@ -209,33 +209,33 @@ 
         $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 ( is_front_page() ) {
+            } elseif (is_front_page()) {
                 // identify frontpage immediately to avoid it also matching a CPT or template.
                 $page_type = 'is_front_page';
                 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;
                     }
@@ -247,44 +247,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;
     }
@@ -292,17 +292,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/autoptimizeScripts.php

Doc Comments +4 added lines, -1 removed lines

@@ -676,6 +676,9 @@ 
         return true;
     }
 
+    /**
+     * @param string $tag
+     */
     private function movetolast( $tag )
     {
         if ( empty( $tag ) ) {
@@ -733,7 +736,7 @@ 
      * @param string $filepath Filepath.
      * @param bool   $cache_miss Optional. Force a cache miss. Default false.
      *
-     * @return bool|string Url pointing to the minified js file or false.
+     * @return false|string Url pointing to the minified js file or false.
      */
     public function minify_single( $filepath, $cache_miss = false )
     {

Spacing +182 added lines, -182 removed lines

@@ -3,7 +3,7 @@ 
  * Class for JS optimization.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -206,133 +206,133 @@ 
      *
      * @param array $options all options.
      */
-    public function read( $options )
+    public function read($options)
     {
-        $noptimize_js = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content );
-        if ( $noptimize_js ) {
+        $noptimize_js = apply_filters('autoptimize_filter_js_noptimize', false, $this->content);
+        if ($noptimize_js) {
             return false;
         }
 
         // only optimize known good JS?
-        $allowlist_js = apply_filters( 'autoptimize_filter_js_allowlist', '', $this->content );
-        $allowlist_js = apply_filters( 'autoptimize_filter_js_whitelist', $allowlist_js, $this->content ); // fixme: to be removed in next version.
-        if ( ! empty( $allowlist_js ) ) {
-            $this->allowlist = array_filter( array_map( 'trim', explode( ',', $allowlist_js ) ) );
+        $allowlist_js = apply_filters('autoptimize_filter_js_allowlist', '', $this->content);
+        $allowlist_js = apply_filters('autoptimize_filter_js_whitelist', $allowlist_js, $this->content); // fixme: to be removed in next version.
+        if (!empty($allowlist_js)) {
+            $this->allowlist = array_filter(array_map('trim', explode(',', $allowlist_js)));
         }
 
         // is there JS we should simply remove?
-        $removable_js = apply_filters( 'autoptimize_filter_js_removables', '', $this->content );
-        if ( ! empty( $removable_js ) ) {
-            $this->jsremovables = array_filter( array_map( 'trim', explode( ',', $removable_js ) ) );
+        $removable_js = apply_filters('autoptimize_filter_js_removables', '', $this->content);
+        if (!empty($removable_js)) {
+            $this->jsremovables = array_filter(array_map('trim', explode(',', $removable_js)));
         }
 
         // only header?
-        if ( apply_filters( 'autoptimize_filter_js_justhead', $options['justhead'] ) ) {
-            $content             = explode( '</head>', $this->content, 2 );
-            $this->content       = $content[0] . '</head>';
+        if (apply_filters('autoptimize_filter_js_justhead', $options['justhead'])) {
+            $content             = explode('</head>', $this->content, 2);
+            $this->content       = $content[0].'</head>';
             $this->restofcontent = $content[1];
         }
 
         // Determine whether we're doing JS-files aggregation or not.
-        if ( ! $options['aggregate'] ) {
+        if (!$options['aggregate']) {
             $this->aggregate = false;
         }
         // Returning true for "dontaggregate" turns off aggregation.
-        if ( $this->aggregate && apply_filters( 'autoptimize_filter_js_dontaggregate', false ) ) {
+        if ($this->aggregate && apply_filters('autoptimize_filter_js_dontaggregate', false)) {
             $this->aggregate = false;
         }
         
         // Defer when not aggregating.
-        if ( false === $this->aggregate && apply_filters( 'autoptimize_js_filter_defer_not_aggregate', $options['defer_not_aggregate'] ) ) {
+        if (false === $this->aggregate && apply_filters('autoptimize_js_filter_defer_not_aggregate', $options['defer_not_aggregate'])) {
             $this->defer_not_aggregate = true;
         }
 
         // include inline?
-        if ( apply_filters( 'autoptimize_js_include_inline', $options['include_inline'] ) ) {
+        if (apply_filters('autoptimize_js_include_inline', $options['include_inline'])) {
             $this->include_inline = true;
         }
 
         // filter to "late inject minified JS", default to true for now (it is faster).
-        $this->inject_min_late = apply_filters( 'autoptimize_filter_js_inject_min_late', true );
+        $this->inject_min_late = apply_filters('autoptimize_filter_js_inject_min_late', true);
 
         // filters to override hardcoded do(nt)move(last) array contents (array in, array out!).
-        $this->dontmove   = apply_filters( 'autoptimize_filter_js_dontmove', $this->dontmove );
-        $this->domovelast = apply_filters( 'autoptimize_filter_js_movelast', $this->domovelast );
-        $this->domove     = apply_filters( 'autoptimize_filter_js_domove', $this->domove );
+        $this->dontmove   = apply_filters('autoptimize_filter_js_dontmove', $this->dontmove);
+        $this->domovelast = apply_filters('autoptimize_filter_js_movelast', $this->domovelast);
+        $this->domove     = apply_filters('autoptimize_filter_js_domove', $this->domove);
 
         // Determine whether excluded files should be minified if not yet so.
-        if ( ! $options['minify_excluded'] && $options['aggregate'] ) {
+        if (!$options['minify_excluded'] && $options['aggregate']) {
             $this->minify_excluded = false;
         }
-        $this->minify_excluded = apply_filters( 'autoptimize_filter_js_minify_excluded', $this->minify_excluded, '' );
+        $this->minify_excluded = apply_filters('autoptimize_filter_js_minify_excluded', $this->minify_excluded, '');
 
         // get extra exclusions settings or filter.
         $exclude_js = $options['js_exclude'];
-        $exclude_js = apply_filters( 'autoptimize_filter_js_exclude', $exclude_js, $this->content );
-
-        if ( '' !== $exclude_js ) {
-            if ( is_array( $exclude_js ) ) {
-                $remove_keys = array_keys( $exclude_js, 'remove' );
-                if ( false !== $remove_keys ) {
-                    foreach ( $remove_keys as $remove_key ) {
-                        unset( $exclude_js[ $remove_key ] );
+        $exclude_js = apply_filters('autoptimize_filter_js_exclude', $exclude_js, $this->content);
+
+        if ('' !== $exclude_js) {
+            if (is_array($exclude_js)) {
+                $remove_keys = array_keys($exclude_js, 'remove');
+                if (false !== $remove_keys) {
+                    foreach ($remove_keys as $remove_key) {
+                        unset($exclude_js[$remove_key]);
                         $this->jsremovables[] = $remove_key;
                     }
                 }
-                $excl_js_arr = array_keys( $exclude_js );
+                $excl_js_arr = array_keys($exclude_js);
             } else {
-                $excl_js_arr = array_filter( array_map( 'trim', explode( ',', $exclude_js ) ) );
+                $excl_js_arr = array_filter(array_map('trim', explode(',', $exclude_js)));
             }
-            $this->dontmove = array_merge( $excl_js_arr, $this->dontmove );
+            $this->dontmove = array_merge($excl_js_arr, $this->dontmove);
         }
 
         // Should we add try-catch?
-        if ( $options['trycatch'] ) {
+        if ($options['trycatch']) {
             $this->trycatch = true;
         }
 
         // force js in head?
-        if ( $options['forcehead'] ) {
+        if ($options['forcehead']) {
             $this->forcehead = true;
         } else {
             $this->forcehead = false;
         }
 
-        $this->forcehead = apply_filters( 'autoptimize_filter_js_forcehead', $this->forcehead );
+        $this->forcehead = apply_filters('autoptimize_filter_js_forcehead', $this->forcehead);
 
         // get cdn url.
         $this->cdn_url = $options['cdn_url'];
 
         // noptimize me.
-        $this->content = $this->hide_noptimize( $this->content );
+        $this->content = $this->hide_noptimize($this->content);
 
         // Save IE hacks.
-        $this->content = $this->hide_iehacks( $this->content );
+        $this->content = $this->hide_iehacks($this->content);
 
         // comments.
-        $this->content = $this->hide_comments( $this->content );
+        $this->content = $this->hide_comments($this->content);
 
         // Get script files.
-        if ( preg_match_all( '#<script.*</script>#Usmi', $this->content, $matches ) ) {
-            foreach ( $matches[0] as $tag ) {
+        if (preg_match_all('#<script.*</script>#Usmi', $this->content, $matches)) {
+            foreach ($matches[0] as $tag) {
                 // only consider script aggregation for types allowlisted in should_aggregate-function.
-                $should_aggregate = $this->should_aggregate( $tag );
-                if ( ! $should_aggregate ) {
+                $should_aggregate = $this->should_aggregate($tag);
+                if (!$should_aggregate) {
                     $tag = '';
                     continue;
                 }
 
-                if ( preg_match( '#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source ) ) {
+                if (preg_match('#<script[^>]*src=("|\')([^>]*)("|\')#Usmi', $tag, $source)) {
                     // non-inline script.
-                    if ( $this->isremovable( $tag, $this->jsremovables ) ) {
-                        $this->content = str_replace( $tag, '', $this->content );
+                    if ($this->isremovable($tag, $this->jsremovables)) {
+                        $this->content = str_replace($tag, '', $this->content);
                         continue;
                     }
 
                     $orig_tag = null;
-                    $url      = current( explode( '?', $source[2], 2 ) );
-                    $path     = $this->getpath( $url );
-                    if ( false !== $path && preg_match( '#\.js$#', $path ) && $this->ismergeable( $tag ) ) {
+                    $url      = current(explode('?', $source[2], 2));
+                    $path     = $this->getpath($url);
+                    if (false !== $path && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) {
                         // ok to optimize, add to array.
                         $this->scripts[] = $path;
                     } else {
@@ -340,35 +340,35 @@ 
                         $new_tag  = $tag;
 
                         // non-mergeable script (excluded or dynamic or external).
-                        if ( is_array( $exclude_js ) ) {
+                        if (is_array($exclude_js)) {
                             // should we add flags?
-                            foreach ( $exclude_js as $excl_tag => $excl_flags ) {
-                                if ( false !== strpos( $orig_tag, $excl_tag ) && in_array( $excl_flags, array( 'async', 'defer' ) ) ) {
-                                    $new_tag = str_replace( '<script ', '<script ' . $excl_flags . ' ', $new_tag );
+                            foreach ($exclude_js as $excl_tag => $excl_flags) {
+                                if (false !== strpos($orig_tag, $excl_tag) && in_array($excl_flags, array('async', 'defer'))) {
+                                    $new_tag = str_replace('<script ', '<script '.$excl_flags.' ', $new_tag);
                                 }
                             }
                         }
                         
                         // not aggregating but deferring?
-                        if ( $this->defer_not_aggregate && false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path && strpos( $new_tag, ' defer' ) === false ) {
-                            $new_tag = str_replace( '<script ', '<script defer ', $new_tag );
+                        if ($this->defer_not_aggregate && false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path && strpos($new_tag, ' defer') === false) {
+                            $new_tag = str_replace('<script ', '<script defer ', $new_tag);
                             // and remove async as async+defer=async while we explicitly want defer.
-                            if ( strpos( $new_tag, ' async' ) !== false && apply_filters( 'autoptimize_filter_js_defer_remove_async', true ) ) {
-                                $new_tag = str_replace( array( ' async', ' async="async"', " async='async'" ), '', $new_tag );
+                            if (strpos($new_tag, ' async') !== false && apply_filters('autoptimize_filter_js_defer_remove_async', true)) {
+                                $new_tag = str_replace(array(' async', ' async="async"', " async='async'"), '', $new_tag);
                             }
                         }
 
                         // Should we minify the non-aggregated script?
                         // -> if aggregate is on and exclude minify is on
                         // -> if aggregate is off and the file is not in dontmove.
-                        if ( $path && $this->minify_excluded ) {
-                            $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false );
-                            if ( ( false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path ) || ( true === $this->aggregate && ( false === $consider_minified_array || str_replace( $consider_minified_array, '', $path ) === $path ) ) ) {
-                                $minified_url = $this->minify_single( $path );
-                                if ( ! empty( $minified_url ) ) {
+                        if ($path && $this->minify_excluded) {
+                            $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
+                            if ((false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path) || (true === $this->aggregate && (false === $consider_minified_array || str_replace($consider_minified_array, '', $path) === $path))) {
+                                $minified_url = $this->minify_single($path);
+                                if (!empty($minified_url)) {
                                     // Replace original URL with minified URL from cache.
-                                    $new_tag = str_replace( $url, $minified_url, $new_tag );
-                                } elseif ( apply_filters( 'autoptimize_filter_ccsjs_remove_empty_minified_url', false ) ) {
+                                    $new_tag = str_replace($url, $minified_url, $new_tag);
+                                } elseif (apply_filters('autoptimize_filter_ccsjs_remove_empty_minified_url', false)) {
                                     // Remove the original script tag, because cache content is empty but only if filter
                                     // is trued because $minified_url is also false if original JS is minified already.
                                     $new_tag = '';
@@ -376,17 +376,17 @@ 
                             }
                         }
 
-                        if ( $this->ismovable( $new_tag ) ) {
+                        if ($this->ismovable($new_tag)) {
                             // can be moved, flags and all.
-                            if ( $this->movetolast( $new_tag ) ) {
+                            if ($this->movetolast($new_tag)) {
                                 $this->move['last'][] = $new_tag;
                             } else {
                                 $this->move['first'][] = $new_tag;
                             }
                         } else {
                             // cannot be moved, so if flag was added re-inject altered tag immediately.
-                            if ( ( '' !== $new_tag && $orig_tag !== $new_tag ) || ( '' === $new_tag && apply_filters( 'autoptimize_filter_js_remove_empty_files', false ) ) ) {
-                                $this->content = str_replace( $orig_tag, $new_tag, $this->content );
+                            if (('' !== $new_tag && $orig_tag !== $new_tag) || ('' === $new_tag && apply_filters('autoptimize_filter_js_remove_empty_files', false))) {
+                                $this->content = str_replace($orig_tag, $new_tag, $this->content);
                                 $orig_tag      = '';
                             }
                             // and forget about the $tag (not to be touched any more).
@@ -395,23 +395,23 @@ 
                     }
                 } else {
                     // Inline script.
-                    if ( $this->isremovable( $tag, $this->jsremovables ) ) {
-                        $this->content = str_replace( $tag, '', $this->content );
+                    if ($this->isremovable($tag, $this->jsremovables)) {
+                        $this->content = str_replace($tag, '', $this->content);
                         continue;
                     }
 
                     // unhide comments, as javascript may be wrapped in comment-tags for old times' sake.
-                    $tag = $this->restore_comments( $tag );
-                    if ( $this->ismergeable( $tag ) && $this->include_inline ) {
-                        preg_match( '#<script.*>(.*)</script>#Usmi', $tag, $code );
-                        $code            = preg_replace( '#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1] );
-                        $code            = preg_replace( '/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code );
-                        $this->scripts[] = 'INLINE;' . $code;
+                    $tag = $this->restore_comments($tag);
+                    if ($this->ismergeable($tag) && $this->include_inline) {
+                        preg_match('#<script.*>(.*)</script>#Usmi', $tag, $code);
+                        $code            = preg_replace('#.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*#sm', '$1', $code[1]);
+                        $code            = preg_replace('/(?:^\\s*<!--\\s*|\\s*(?:\\/\\/)?\\s*-->\\s*$)/', '', $code);
+                        $this->scripts[] = 'INLINE;'.$code;
                     } else {
                         // Can we move this?
-                        $autoptimize_js_moveable = apply_filters( 'autoptimize_js_moveable', '', $tag );
-                        if ( $this->ismovable( $tag ) || '' !== $autoptimize_js_moveable ) {
-                            if ( $this->movetolast( $tag ) || 'last' === $autoptimize_js_moveable ) {
+                        $autoptimize_js_moveable = apply_filters('autoptimize_js_moveable', '', $tag);
+                        if ($this->ismovable($tag) || '' !== $autoptimize_js_moveable) {
+                            if ($this->movetolast($tag) || 'last' === $autoptimize_js_moveable) {
                                 $this->move['last'][] = $tag;
                             } else {
                                 $this->move['first'][] = $tag;
@@ -422,11 +422,11 @@ 
                         }
                     }
                     // Re-hide comments to be able to do the removal based on tag from $this->content.
-                    $tag = $this->hide_comments( $tag );
+                    $tag = $this->hide_comments($tag);
                 }
 
                 // Remove the original script tag.
-                $this->content = str_replace( $tag, '', $this->content );
+                $this->content = str_replace($tag, '', $this->content);
             }
 
             return true;
@@ -451,30 +451,30 @@ 
      * @param string $tag Script node & child(ren).
      * @return bool
      */
-    public function should_aggregate( $tag )
+    public function should_aggregate($tag)
     {
-        if ( empty( $tag ) ) {
+        if (empty($tag)) {
             return false;
         }
 
         // We're only interested in the type attribute of the <script> tag itself, not any possible
         // inline code that might just contain the 'type=' string...
         $tag_parts = array();
-        preg_match( '#<(script[^>]*)>#i', $tag, $tag_parts );
+        preg_match('#<(script[^>]*)>#i', $tag, $tag_parts);
         $tag_without_contents = null;
-        if ( ! empty( $tag_parts[1] ) ) {
+        if (!empty($tag_parts[1])) {
             $tag_without_contents = $tag_parts[1];
         }
 
-        $has_type = ( strpos( $tag_without_contents, 'type' ) !== false );
+        $has_type = (strpos($tag_without_contents, 'type') !== false);
 
         $type_valid = false;
-        if ( $has_type ) {
-            $type_valid = (bool) preg_match( '/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents );
+        if ($has_type) {
+            $type_valid = (bool) preg_match('/type\s*=\s*[\'"]?(?:text|application)\/(?:javascript|ecmascript)[\'"]?/i', $tag_without_contents);
         }
 
         $should_aggregate = false;
-        if ( ! $has_type || $type_valid ) {
+        if (!$has_type || $type_valid) {
             $should_aggregate = true;
         }
 
@@ -486,75 +486,75 @@ 
      */
     public function minify()
     {
-        foreach ( $this->scripts as $script ) {
-            if ( empty( $script ) ) {
+        foreach ($this->scripts as $script) {
+            if (empty($script)) {
                 continue;
             }
 
             // TODO/FIXME: some duplicate code here, can be reduced/simplified.
-            if ( preg_match( '#^INLINE;#', $script ) ) {
+            if (preg_match('#^INLINE;#', $script)) {
                 // Inline script.
-                $script = preg_replace( '#^INLINE;#', '', $script );
-                $script = rtrim( $script, ";\n\t\r" ) . ';';
+                $script = preg_replace('#^INLINE;#', '', $script);
+                $script = rtrim($script, ";\n\t\r").';';
                 // Add try-catch?
-                if ( $this->trycatch ) {
-                    $script = 'try{' . $script . '}catch(e){}';
+                if ($this->trycatch) {
+                    $script = 'try{'.$script.'}catch(e){}';
                 }
-                $tmpscript = apply_filters( 'autoptimize_js_individual_script', $script, '' );
-                if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscript ) ) {
+                $tmpscript = apply_filters('autoptimize_js_individual_script', $script, '');
+                if (has_filter('autoptimize_js_individual_script') && !empty($tmpscript)) {
                     $script                = $tmpscript;
                     $this->alreadyminified = true;
                 }
-                $this->jscode .= "\n" . $script;
+                $this->jscode .= "\n".$script;
             } else {
                 // External script.
-                if ( false !== $script && file_exists( $script ) && is_readable( $script ) ) {
-                    $scriptsrc = file_get_contents( $script );
-                    $scriptsrc = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc );
-                    $scriptsrc = rtrim( $scriptsrc, ";\n\t\r" ) . ';';
+                if (false !== $script && file_exists($script) && is_readable($script)) {
+                    $scriptsrc = file_get_contents($script);
+                    $scriptsrc = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $scriptsrc);
+                    $scriptsrc = rtrim($scriptsrc, ";\n\t\r").';';
                     // Add try-catch?
-                    if ( $this->trycatch ) {
-                        $scriptsrc = 'try{' . $scriptsrc . '}catch(e){}';
+                    if ($this->trycatch) {
+                        $scriptsrc = 'try{'.$scriptsrc.'}catch(e){}';
                     }
-                    $tmpscriptsrc = apply_filters( 'autoptimize_js_individual_script', $scriptsrc, $script );
-                    if ( has_filter( 'autoptimize_js_individual_script' ) && ! empty( $tmpscriptsrc ) ) {
+                    $tmpscriptsrc = apply_filters('autoptimize_js_individual_script', $scriptsrc, $script);
+                    if (has_filter('autoptimize_js_individual_script') && !empty($tmpscriptsrc)) {
                         $scriptsrc             = $tmpscriptsrc;
                         $this->alreadyminified = true;
-                    } elseif ( $this->can_inject_late( $script ) ) {
-                        $scriptsrc = self::build_injectlater_marker( $script, md5( $scriptsrc ) );
+                    } elseif ($this->can_inject_late($script)) {
+                        $scriptsrc = self::build_injectlater_marker($script, md5($scriptsrc));
                     }
-                    $this->jscode .= "\n" . $scriptsrc;
+                    $this->jscode .= "\n".$scriptsrc;
                 }
             }
         }
 
         // Check for already-minified code.
-        $this->md5hash = md5( $this->jscode );
-        $ccheck        = new autoptimizeCache( $this->md5hash, 'js' );
-        if ( $ccheck->check() ) {
+        $this->md5hash = md5($this->jscode);
+        $ccheck        = new autoptimizeCache($this->md5hash, 'js');
+        if ($ccheck->check()) {
             $this->jscode = $ccheck->retrieve();
             return true;
         }
-        unset( $ccheck );
+        unset($ccheck);
 
         // $this->jscode has all the uncompressed code now.
-        if ( true !== $this->alreadyminified ) {
-            if ( apply_filters( 'autoptimize_js_do_minify', true ) ) {
-                $tmp_jscode = trim( JSMin::minify( $this->jscode ) );
-                if ( ! empty( $tmp_jscode ) ) {
+        if (true !== $this->alreadyminified) {
+            if (apply_filters('autoptimize_js_do_minify', true)) {
+                $tmp_jscode = trim(JSMin::minify($this->jscode));
+                if (!empty($tmp_jscode)) {
                     $this->jscode = $tmp_jscode;
-                    unset( $tmp_jscode );
+                    unset($tmp_jscode);
                 }
-                $this->jscode = $this->inject_minified( $this->jscode );
-                $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
+                $this->jscode = $this->inject_minified($this->jscode);
+                $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
                 return true;
             } else {
-                $this->jscode = $this->inject_minified( $this->jscode );
+                $this->jscode = $this->inject_minified($this->jscode);
                 return false;
             }
         }
 
-        $this->jscode = apply_filters( 'autoptimize_js_after_minify', $this->jscode );
+        $this->jscode = apply_filters('autoptimize_js_after_minify', $this->jscode);
         return true;
     }
 
@@ -563,13 +563,13 @@ 
      */
     public function cache()
     {
-        $cache = new autoptimizeCache( $this->md5hash, 'js' );
-        if ( ! $cache->check() ) {
+        $cache = new autoptimizeCache($this->md5hash, 'js');
+        if (!$cache->check()) {
             // Cache our code.
-            $cache->cache( $this->jscode, 'text/javascript' );
+            $cache->cache($this->jscode, 'text/javascript');
         }
-        $this->url = AUTOPTIMIZE_CACHE_URL . $cache->getname();
-        $this->url = $this->url_replace_cdn( $this->url );
+        $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
+        $this->url = $this->url_replace_cdn($this->url);
     }
 
     /**
@@ -578,47 +578,47 @@ 
     public function getcontent()
     {
         // Restore the full content.
-        if ( ! empty( $this->restofcontent ) ) {
+        if (!empty($this->restofcontent)) {
             $this->content      .= $this->restofcontent;
             $this->restofcontent = '';
         }
 
         // Add the scripts taking forcehead/ deferred (default) into account.
-        if ( $this->forcehead ) {
-            $replace_tag = array( '</head>', 'before' );
+        if ($this->forcehead) {
+            $replace_tag = array('</head>', 'before');
             $defer       = '';
         } else {
-            $replace_tag = array( '</body>', 'before' );
+            $replace_tag = array('</body>', 'before');
             $defer       = 'defer ';
         }
 
-        $defer   = apply_filters( 'autoptimize_filter_js_defer', $defer );
+        $defer   = apply_filters('autoptimize_filter_js_defer', $defer);
         $type_js = '';
-        if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
+        if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
             $type_js = 'type="text/javascript" ';
         }
 
-        $bodyreplacementpayload = '<script ' . $type_js . $defer . 'src="' . $this->url . '"></script>';
-        $bodyreplacementpayload = apply_filters( 'autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload );
+        $bodyreplacementpayload = '<script '.$type_js.$defer.'src="'.$this->url.'"></script>';
+        $bodyreplacementpayload = apply_filters('autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload);
 
-        $bodyreplacement  = implode( '', $this->move['first'] );
+        $bodyreplacement  = implode('', $this->move['first']);
         $bodyreplacement .= $bodyreplacementpayload;
-        $bodyreplacement .= implode( '', $this->move['last'] );
+        $bodyreplacement .= implode('', $this->move['last']);
 
-        $replace_tag = apply_filters( 'autoptimize_filter_js_replacetag', $replace_tag );
+        $replace_tag = apply_filters('autoptimize_filter_js_replacetag', $replace_tag);
 
-        if ( strlen( $this->jscode ) > 0 ) {
-            $this->inject_in_html( $bodyreplacement, $replace_tag );
+        if (strlen($this->jscode) > 0) {
+            $this->inject_in_html($bodyreplacement, $replace_tag);
         }
 
         // Restore comments.
-        $this->content = $this->restore_comments( $this->content );
+        $this->content = $this->restore_comments($this->content);
 
         // Restore IE hacks.
-        $this->content = $this->restore_iehacks( $this->content );
+        $this->content = $this->restore_iehacks($this->content);
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Return the modified HTML.
         return $this->content;
@@ -629,34 +629,34 @@ 
      *
      * @param string $tag JS tag.
      */
-    private function ismergeable( $tag )
+    private function ismergeable($tag)
     {
-        if ( empty( $tag ) || ! $this->aggregate ) {
+        if (empty($tag) || !$this->aggregate) {
             return false;
         }
 
-        if ( ! empty( $this->allowlist ) ) {
-            foreach ( $this->allowlist as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+        if (!empty($this->allowlist)) {
+            foreach ($this->allowlist as $match) {
+                if (false !== strpos($tag, $match)) {
                     return true;
                 }
             }
             // No match with allowlist.
             return false;
         } else {
-            foreach ( $this->domove as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+            foreach ($this->domove as $match) {
+                if (false !== strpos($tag, $match)) {
                     // Matched something.
                     return false;
                 }
             }
 
-            if ( $this->movetolast( $tag ) ) {
+            if ($this->movetolast($tag)) {
                 return false;
             }
 
-            foreach ( $this->dontmove as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+            foreach ($this->dontmove as $match) {
+                if (false !== strpos($tag, $match)) {
                     // Matched something.
                     return false;
                 }
@@ -672,25 +672,25 @@ 
      *
      * @param string $tag tag to check for blocklist (exclusions).
      */
-    private function ismovable( $tag )
+    private function ismovable($tag)
     {
-        if ( empty( $tag ) || true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) {
+        if (empty($tag) || true !== $this->include_inline || apply_filters('autoptimize_filter_js_unmovable', true)) {
             return false;
         }
 
-        foreach ( $this->domove as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($this->domove as $match) {
+            if (false !== strpos($tag, $match)) {
                 // Matched something.
                 return true;
             }
         }
 
-        if ( $this->movetolast( $tag ) ) {
+        if ($this->movetolast($tag)) {
             return true;
         }
 
-        foreach ( $this->dontmove as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($this->dontmove as $match) {
+            if (false !== strpos($tag, $match)) {
                 // Matched something.
                 return false;
             }
@@ -700,14 +700,14 @@ 
         return true;
     }
 
-    private function movetolast( $tag )
+    private function movetolast($tag)
     {
-        if ( empty( $tag ) ) {
+        if (empty($tag)) {
             return false;
         }
 
-        foreach ( $this->domovelast as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($this->domovelast as $match) {
+            if (false !== strpos($tag, $match)) {
                 // Matched, return true.
                 return true;
             }
@@ -727,12 +727,12 @@ 
      * @param string $js_path Path to JS file.
      * @return bool
      */
-    private function can_inject_late( $js_path ) {
-        $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false );
-        if ( true !== $this->inject_min_late ) {
+    private function can_inject_late($js_path) {
+        $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
+        if (true !== $this->inject_min_late) {
             // late-inject turned off.
             return false;
-        } elseif ( ( false === strpos( $js_path, 'min.js' ) ) && ( false === strpos( $js_path, 'wp-includes/js/jquery/jquery.js' ) ) && ( str_replace( $consider_minified_array, '', $js_path ) === $js_path ) ) {
+        } elseif ((false === strpos($js_path, 'min.js')) && (false === strpos($js_path, 'wp-includes/js/jquery/jquery.js')) && (str_replace($consider_minified_array, '', $js_path) === $js_path)) {
             // file not minified based on filename & filter.
             return false;
         } else {
@@ -759,35 +759,35 @@ 
      *
      * @return bool|string Url pointing to the minified js file or false.
      */
-    public function minify_single( $filepath, $cache_miss = false )
+    public function minify_single($filepath, $cache_miss = false)
     {
-        $contents = $this->prepare_minify_single( $filepath );
+        $contents = $this->prepare_minify_single($filepath);
 
-        if ( empty( $contents ) ) {
+        if (empty($contents)) {
             return false;
         }
 
         // Check cache.
-        $hash  = 'single_' . md5( $contents );
-        $cache = new autoptimizeCache( $hash, 'js' );
+        $hash  = 'single_'.md5($contents);
+        $cache = new autoptimizeCache($hash, 'js');
 
         // If not in cache already, minify...
-        if ( ! $cache->check() || $cache_miss ) {
-            $contents = trim( JSMin::minify( $contents ) );
+        if (!$cache->check() || $cache_miss) {
+            $contents = trim(JSMin::minify($contents));
 
             // Check if minified cache content is empty.
-            if ( empty( $contents ) ) {
+            if (empty($contents)) {
                 return false;
             }
 
             // Filter contents of excluded minified CSS.
-            $contents = apply_filters( 'autoptimize_filter_js_single_after_minify', $contents );
+            $contents = apply_filters('autoptimize_filter_js_single_after_minify', $contents);
 
             // Store in cache.
-            $cache->cache( $contents, 'text/javascript' );
+            $cache->cache($contents, 'text/javascript');
         }
 
-        $url = $this->build_minify_single_url( $cache );
+        $url = $this->build_minify_single_url($cache);
 
         return $url;
     }

classes/autoptimizeStyles.php

Doc Comments +22 added lines, -2 removed lines

@@ -439,7 +439,7 @@ 
      * be inlined into a data: URI. Defaults to 4096, passed through
      * `autoptimize_filter_css_datauri_maxsize` filter.
      *
-     * @return mixed
+     * @return integer|null
      */
     private function get_datauri_maxsize()
     {
@@ -460,6 +460,9 @@ 
         return $max_size;
     }
 
+    /**
+     * @param false|string $url
+     */
     private function check_datauri_exclude_list( $url )
     {
         static $exclude_list = null;
@@ -485,6 +488,9 @@ 
         return $matched;
     }
 
+    /**
+     * @param false|string $path
+     */
     private function build_or_get_datauri_image( $path )
     {
         /**
@@ -914,6 +920,11 @@ 
         return true;
     }
 
+    /**
+     * @param string $code
+     *
+     * @return string
+     */
     public function run_minifier_on( $code )
     {
         if ( ! $this->alreadyminified ) {
@@ -1135,6 +1146,9 @@ 
         return $code;
     }
 
+    /**
+     * @param string $tag
+     */
     private function ismovable( $tag )
     {
         if ( ! $this->aggregate ) {
@@ -1164,6 +1178,9 @@ 
         }
     }
 
+    /**
+     * @param string $css
+     */
     private function can_inject_late( $css_path, $css )
     {
         $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $css_path );
@@ -1195,7 +1212,7 @@ 
      * @param string $filepath Filepath.
      * @param bool   $cache_miss Optional. Force a cache miss. Default false.
      *
-     * @return bool|string Url pointing to the minified css file or false.
+     * @return false|string Url pointing to the minified css file or false.
      */
     public function minify_single( $filepath, $cache_miss = false )
     {
@@ -1256,6 +1273,9 @@ 
         $this->options = $options;
     }
 
+    /**
+     * @param string $name
+     */
     public function setOption( $name, $value )
     {
         $this->options[ $name ] = $value;

Spacing +349 added lines, -349 removed lines

@@ -3,7 +3,7 @@ 
  * Class for CSS optimization.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -161,54 +161,54 @@ 
      *
      * @param array $options all options.
      */
-    public function read( $options )
+    public function read($options)
     {
-        $noptimize_css = apply_filters( 'autoptimize_filter_css_noptimize', false, $this->content );
-        if ( $noptimize_css ) {
+        $noptimize_css = apply_filters('autoptimize_filter_css_noptimize', false, $this->content);
+        if ($noptimize_css) {
             return false;
         }
 
-        $allowlist_css = apply_filters( 'autoptimize_filter_css_allowlist', '', $this->content );
-        $allowlist_css = apply_filters( 'autoptimize_filter_css_whitelist', $allowlist_css, $this->content ); // fixme: to be removed in next version.
-        if ( ! empty( $allowlist_css ) ) {
-            $this->allowlist = array_filter( array_map( 'trim', explode( ',', $allowlist_css ) ) );
+        $allowlist_css = apply_filters('autoptimize_filter_css_allowlist', '', $this->content);
+        $allowlist_css = apply_filters('autoptimize_filter_css_whitelist', $allowlist_css, $this->content); // fixme: to be removed in next version.
+        if (!empty($allowlist_css)) {
+            $this->allowlist = array_filter(array_map('trim', explode(',', $allowlist_css)));
         }
 
-        $removable_css = apply_filters( 'autoptimize_filter_css_removables', '' );
-        if ( ! empty( $removable_css ) ) {
-            $this->cssremovables = array_filter( array_map( 'trim', explode( ',', $removable_css ) ) );
+        $removable_css = apply_filters('autoptimize_filter_css_removables', '');
+        if (!empty($removable_css)) {
+            $this->cssremovables = array_filter(array_map('trim', explode(',', $removable_css)));
         }
 
-        $this->cssinlinesize = apply_filters( 'autoptimize_filter_css_inlinesize', 256 );
+        $this->cssinlinesize = apply_filters('autoptimize_filter_css_inlinesize', 256);
 
         // filter to "late inject minified CSS", default to true for now (it is faster).
-        $this->inject_min_late = apply_filters( 'autoptimize_filter_css_inject_min_late', true );
+        $this->inject_min_late = apply_filters('autoptimize_filter_css_inject_min_late', true);
 
         // Remove everything that's not the header.
-        if ( apply_filters( 'autoptimize_filter_css_justhead', $options['justhead'] ) ) {
-            $content             = explode( '</head>', $this->content, 2 );
-            $this->content       = $content[0] . '</head>';
+        if (apply_filters('autoptimize_filter_css_justhead', $options['justhead'])) {
+            $content             = explode('</head>', $this->content, 2);
+            $this->content       = $content[0].'</head>';
             $this->restofcontent = $content[1];
         }
 
         // Determine whether we're doing CSS-files aggregation or not.
-        if ( isset( $options['aggregate'] ) && ! $options['aggregate'] ) {
+        if (isset($options['aggregate']) && !$options['aggregate']) {
             $this->aggregate = false;
         }
         // Returning true for "dontaggregate" turns off aggregation.
-        if ( $this->aggregate && apply_filters( 'autoptimize_filter_css_dontaggregate', false ) ) {
+        if ($this->aggregate && apply_filters('autoptimize_filter_css_dontaggregate', false)) {
             $this->aggregate = false;
         }
 
         // include inline?
-        if ( apply_filters( 'autoptimize_css_include_inline', $options['include_inline'] ) ) {
+        if (apply_filters('autoptimize_css_include_inline', $options['include_inline'])) {
             $this->include_inline = true;
         }
 
         // List of CSS strings which are excluded from autoptimization.
-        $exclude_css = apply_filters( 'autoptimize_filter_css_exclude', $options['css_exclude'], $this->content );
-        if ( '' !== $exclude_css ) {
-            $this->dontmove = array_filter( array_map( 'trim', explode( ',', $exclude_css ) ) );
+        $exclude_css = apply_filters('autoptimize_filter_css_exclude', $options['css_exclude'], $this->content);
+        if ('' !== $exclude_css) {
+            $this->dontmove = array_filter(array_map('trim', explode(',', $exclude_css)));
         } else {
             $this->dontmove = array();
         }
@@ -219,16 +219,16 @@ 
         // Should we defer css?
         // value: true / false.
         $this->defer = $options['defer'];
-        $this->defer = apply_filters( 'autoptimize_filter_css_defer', $this->defer, $this->content );
+        $this->defer = apply_filters('autoptimize_filter_css_defer', $this->defer, $this->content);
 
         // Should we inline while deferring?
         // value: inlined CSS.
-        $this->defer_inline = apply_filters( 'autoptimize_filter_css_defer_inline', $this->sanitize_css( $options['defer_inline'] ), $this->content );
+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $this->sanitize_css($options['defer_inline']), $this->content);
 
         // Should we inline?
         // value: true / false.
         $this->inline = $options['inline'];
-        $this->inline = apply_filters( 'autoptimize_filter_css_inline', $this->inline, $this->content );
+        $this->inline = apply_filters('autoptimize_filter_css_inline', $this->inline, $this->content);
 
         // Store cdn url.
         $this->cdn_url = $options['cdn_url'];
@@ -237,16 +237,16 @@ 
         $this->datauris = $options['datauris'];
 
         // Determine whether excluded files should be minified if not yet so.
-        if ( ! $options['minify_excluded'] && $options['aggregate'] ) {
+        if (!$options['minify_excluded'] && $options['aggregate']) {
             $this->minify_excluded = false;
         }
-        $this->minify_excluded = apply_filters( 'autoptimize_filter_css_minify_excluded', $this->minify_excluded, '' );
+        $this->minify_excluded = apply_filters('autoptimize_filter_css_minify_excluded', $this->minify_excluded, '');
 
         // should we force all media-attributes to all?
-        $this->media_force_all = apply_filters( 'autoptimize_filter_css_tagmedia_forceall', false );
+        $this->media_force_all = apply_filters('autoptimize_filter_css_tagmedia_forceall', false);
 
         // noptimize me.
-        $this->content = $this->hide_noptimize( $this->content );
+        $this->content = $this->hide_noptimize($this->content);
 
         // Exclude (no)script, as those may contain CSS which should be left as is.
         $this->content = $this->replace_contents_with_marker_if_exists(
@@ -257,25 +257,25 @@ 
         );
 
         // Save IE hacks.
-        $this->content = $this->hide_iehacks( $this->content );
+        $this->content = $this->hide_iehacks($this->content);
 
         // Hide HTML comments.
-        $this->content = $this->hide_comments( $this->content );
+        $this->content = $this->hide_comments($this->content);
 
         // Get <style> and <link>.
-        if ( preg_match_all( '#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches ) ) {
+        if (preg_match_all('#(<style[^>]*>.*</style>)|(<link[^>]*stylesheet[^>]*>)#Usmi', $this->content, $matches)) {
 
-            foreach ( $matches[0] as $tag ) {
-                if ( $this->isremovable( $tag, $this->cssremovables ) ) {
-                    $this->content = str_replace( $tag, '', $this->content );
-                } elseif ( $this->ismovable( $tag ) ) {
+            foreach ($matches[0] as $tag) {
+                if ($this->isremovable($tag, $this->cssremovables)) {
+                    $this->content = str_replace($tag, '', $this->content);
+                } elseif ($this->ismovable($tag)) {
                     // Get the media.
-                    if ( false !== strpos( $tag, 'media=' ) ) {
-                        preg_match( '#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias );
-                        $medias = explode( ',', $medias[1] );
+                    if (false !== strpos($tag, 'media=')) {
+                        preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $medias);
+                        $medias = explode(',', $medias[1]);
                         $media  = array();
-                        foreach ( $medias as $elem ) {
-                            if ( empty( $elem ) ) {
+                        foreach ($medias as $elem) {
+                            if (empty($elem)) {
                                 $elem = 'all';
                             }
 
@@ -283,68 +283,68 @@ 
                         }
                     } else {
                         // No media specified - applies to all.
-                        $media = array( 'all' );
+                        $media = array('all');
                     }
 
                     // forcing media attribute to all to merge all in one file.
-                    if ( $this->media_force_all ) {
-                        $media = array( 'all' );
+                    if ($this->media_force_all) {
+                        $media = array('all');
                     }
 
-                    $media = apply_filters( 'autoptimize_filter_css_tagmedia', $media, $tag );
+                    $media = apply_filters('autoptimize_filter_css_tagmedia', $media, $tag);
 
-                    if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) {
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
                         // <link>.
-                        $url  = current( explode( '?', $source[2], 2 ) );
-                        $path = $this->getpath( $url );
+                        $url  = current(explode('?', $source[2], 2));
+                        $path = $this->getpath($url);
 
-                        if ( false !== $path && preg_match( '#\.css$#', $path ) ) {
+                        if (false !== $path && preg_match('#\.css$#', $path)) {
                             // Good link.
-                            $this->css[] = array( $media, $path );
+                            $this->css[] = array($media, $path);
                         } else {
                             // Link is dynamic (.php etc).
-                            $new_tag = $this->optionally_defer_excluded( $tag, 'none' );
-                            if ( '' !== $new_tag && $new_tag !== $tag ) {
-                                $this->content = str_replace( $tag, $new_tag, $this->content );
+                            $new_tag = $this->optionally_defer_excluded($tag, 'none');
+                            if ('' !== $new_tag && $new_tag !== $tag) {
+                                $this->content = str_replace($tag, $new_tag, $this->content);
                             }
                             $tag = '';
                         }
                     } else {
                         // Inline css in style tags can be wrapped in comment tags, so restore comments.
-                        $tag = $this->restore_comments( $tag );
-                        preg_match( '#<style.*>(.*)</style>#Usmi', $tag, $code );
+                        $tag = $this->restore_comments($tag);
+                        preg_match('#<style.*>(.*)</style>#Usmi', $tag, $code);
 
                         // And re-hide them to be able to to the removal based on tag.
-                        $tag = $this->hide_comments( $tag );
+                        $tag = $this->hide_comments($tag);
 
-                        if ( $this->include_inline ) {
-                            $code        = preg_replace( '#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1] );
-                            $this->css[] = array( $media, 'INLINE;' . $code );
+                        if ($this->include_inline) {
+                            $code        = preg_replace('#^.*<!\[CDATA\[(?:\s*\*/)?(.*)(?://|/\*)\s*?\]\]>.*$#sm', '$1', $code[1]);
+                            $this->css[] = array($media, 'INLINE;'.$code);
                         } else {
                             $tag = '';
                         }
                     }
 
                     // Remove the original style tag.
-                    $this->content = str_replace( $tag, '', $this->content );
+                    $this->content = str_replace($tag, '', $this->content);
                 } else {
-                    if ( preg_match( '#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source ) ) {
-                        $exploded_url = explode( '?', $source[2], 2 );
+                    if (preg_match('#<link.*href=("|\')(.*)("|\')#Usmi', $tag, $source)) {
+                        $exploded_url = explode('?', $source[2], 2);
                         $url          = $exploded_url[0];
-                        $path         = $this->getpath( $url );
+                        $path         = $this->getpath($url);
                         $new_tag      = $tag;
 
                         // Excluded CSS, minify that file:
                         // -> if aggregate is on and exclude minify is on
                         // -> if aggregate is off and the file is not in dontmove.
-                        if ( $path && $this->minify_excluded ) {
-                            $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false );
-                            if ( ( false === $this->aggregate && str_replace( $this->dontmove, '', $path ) === $path ) || ( true === $this->aggregate && ( false === $consider_minified_array || str_replace( $consider_minified_array, '', $path ) === $path ) ) ) {
-                                $minified_url = $this->minify_single( $path );
-                                if ( ! empty( $minified_url ) ) {
+                        if ($path && $this->minify_excluded) {
+                            $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false);
+                            if ((false === $this->aggregate && str_replace($this->dontmove, '', $path) === $path) || (true === $this->aggregate && (false === $consider_minified_array || str_replace($consider_minified_array, '', $path) === $path))) {
+                                $minified_url = $this->minify_single($path);
+                                if (!empty($minified_url)) {
                                     // Replace orig URL with cached minified URL.
-                                    $new_tag = str_replace( $url, $minified_url, $tag );
-                                } elseif ( apply_filters( 'autoptimize_filter_ccsjs_remove_empty_minified_url', false ) ) {
+                                    $new_tag = str_replace($url, $minified_url, $tag);
+                                } elseif (apply_filters('autoptimize_filter_ccsjs_remove_empty_minified_url', false)) {
                                     // Remove the original style tag, because cache content is empty but only if
                                     // filter is true-ed because $minified_url is also false if file is minified already.
                                     $new_tag = '';
@@ -352,14 +352,14 @@ 
                             }
                         }
 
-                        if ( '' !== $new_tag ) {
+                        if ('' !== $new_tag) {
                             // Optionally defer (preload) non-aggregated CSS.
-                            $new_tag = $this->optionally_defer_excluded( $new_tag, $url );
+                            $new_tag = $this->optionally_defer_excluded($new_tag, $url);
                         }
 
                         // And replace!
-                        if ( ( '' !== $new_tag && $new_tag !== $tag ) || ( '' === $new_tag && apply_filters( 'autoptimize_filter_css_remove_empty_files', false ) ) ) {
-                            $this->content = str_replace( $tag, $new_tag, $this->content );
+                        if (('' !== $new_tag && $new_tag !== $tag) || ('' === $new_tag && apply_filters('autoptimize_filter_css_remove_empty_files', false))) {
+                            $this->content = str_replace($tag, $new_tag, $this->content);
                         }
                     }
                 }
@@ -380,30 +380,30 @@ 
      *
      * @return string $new_tag
      */
-    private function optionally_defer_excluded( $tag, $url = '' )
+    private function optionally_defer_excluded($tag, $url = '')
     {
         // Defer single CSS if "inline & defer" is ON and there is inline CSS.
-        if ( ! empty( $tag ) && false === strpos( $tag, ' onload=' ) && $this->defer && ! empty( $this->defer_inline ) && apply_filters( 'autoptimize_filter_css_defer_excluded', true, $tag ) ) {
+        if (!empty($tag) && false === strpos($tag, ' onload=') && $this->defer && !empty($this->defer_inline) && apply_filters('autoptimize_filter_css_defer_excluded', true, $tag)) {
             // get media attribute and based on that create onload JS attribute value.
-            if ( false === strpos( $tag, 'media=' ) ) {
-                $tag = str_replace( '<link', "<link media='all'", $tag );
+            if (false === strpos($tag, 'media=')) {
+                $tag = str_replace('<link', "<link media='all'", $tag);
             }
 
-            preg_match( '#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $_medias );
+            preg_match('#media=(?:"|\')([^>]*)(?:"|\')#Ui', $tag, $_medias);
             $_media          = $_medias[1];
-            $_preload_onload = autoptimizeConfig::get_ao_css_preload_onload( $_media );
+            $_preload_onload = autoptimizeConfig::get_ao_css_preload_onload($_media);
 
-            if ( 'print' !== $_media ) {
+            if ('print' !== $_media) {
                 // If not media=print, adapt original <link> element for CSS to be preloaded and add <noscript>-version for fallback.
-                $new_tag = '<noscript>' . autoptimizeUtils::remove_id_from_node( $tag ) . '</noscript>' . str_replace(
+                $new_tag = '<noscript>'.autoptimizeUtils::remove_id_from_node($tag).'</noscript>'.str_replace(
                     $_medias[0],
-                    "media='print' onload=\"" . $_preload_onload . '"',
+                    "media='print' onload=\"".$_preload_onload.'"',
                     $tag
                 );
 
                 // Optionally (but default false) preload the (excluded) CSS-file.
-                if ( apply_filters( 'autoptimize_fitler_css_preload_and_print', false ) && 'none' !== $url ) {
-                    $new_tag = '<link rel="preload" as="stylesheet" href="' . $url . '"/>' . $new_tag;
+                if (apply_filters('autoptimize_fitler_css_preload_and_print', false) && 'none' !== $url) {
+                    $new_tag = '<link rel="preload" as="stylesheet" href="'.$url.'"/>'.$new_tag;
                 }
             } else {
                 $new_tag = $tag;
@@ -423,22 +423,22 @@ 
      * @param string $path image path.
      * @return boolean
      */
-    private function is_datauri_candidate( $path )
+    private function is_datauri_candidate($path)
     {
         // Call only once since it's called from a loop.
         static $max_size = null;
-        if ( null === $max_size ) {
+        if (null === $max_size) {
             $max_size = $this->get_datauri_maxsize();
         }
 
-        if ( $path && preg_match( '#\.(jpe?g|png|gif|webp|bmp)$#i', $path ) &&
-            file_exists( $path ) && is_readable( $path ) && filesize( $path ) <= $max_size ) {
+        if ($path && preg_match('#\.(jpe?g|png|gif|webp|bmp)$#i', $path) &&
+            file_exists($path) && is_readable($path) && filesize($path) <= $max_size) {
 
             // Seems we have a candidate.
             $is_candidate = true;
         } else {
             // Filter allows overriding default decision (which checks for local file existence).
-            $is_candidate = apply_filters( 'autoptimize_filter_css_is_datauri_candidate', false, $path );
+            $is_candidate = apply_filters('autoptimize_filter_css_is_datauri_candidate', false, $path);
         }
 
         return $is_candidate;
@@ -463,29 +463,29 @@ 
          * of thing you're probably better of building assets completely
          * outside of WordPress anyway.
          */
-        if ( null === $max_size ) {
-            $max_size = (int) apply_filters( 'autoptimize_filter_css_datauri_maxsize', 4096 );
+        if (null === $max_size) {
+            $max_size = (int) apply_filters('autoptimize_filter_css_datauri_maxsize', 4096);
         }
 
         return $max_size;
     }
 
-    private function check_datauri_exclude_list( $url )
+    private function check_datauri_exclude_list($url)
     {
         static $exclude_list = null;
         $no_datauris         = array();
 
         // Again, skip doing certain stuff repeatedly when loop-called.
-        if ( null === $exclude_list ) {
-            $exclude_list = apply_filters( 'autoptimize_filter_css_datauri_exclude', '' );
-            $no_datauris  = array_filter( array_map( 'trim', explode( ',', $exclude_list ) ) );
+        if (null === $exclude_list) {
+            $exclude_list = apply_filters('autoptimize_filter_css_datauri_exclude', '');
+            $no_datauris  = array_filter(array_map('trim', explode(',', $exclude_list)));
         }
 
         $matched = false;
 
-        if ( ! empty( $exclude_list ) ) {
-            foreach ( $no_datauris as $no_datauri ) {
-                if ( false !== strpos( $url, $no_datauri ) ) {
+        if (!empty($exclude_list)) {
+            foreach ($no_datauris as $no_datauri) {
+                if (false !== strpos($url, $no_datauri)) {
                     $matched = true;
                     break;
                 }
@@ -495,7 +495,7 @@ 
         return $matched;
     }
 
-    private function build_or_get_datauri_image( $path )
+    private function build_or_get_datauri_image($path)
     {
         /**
          * TODO/FIXME: document the required return array format, or better yet,
@@ -504,27 +504,27 @@ 
          */
 
         // Allows short-circuiting datauri generation for an image.
-        $result = apply_filters( 'autoptimize_filter_css_datauri_image', array(), $path );
-        if ( ! empty( $result ) ) {
-            if ( is_array( $result ) && isset( $result['full'] ) && isset( $result['base64data'] ) ) {
+        $result = apply_filters('autoptimize_filter_css_datauri_image', array(), $path);
+        if (!empty($result)) {
+            if (is_array($result) && isset($result['full']) && isset($result['base64data'])) {
                 return $result;
             }
         }
 
-        $hash  = md5( $path );
-        $check = new autoptimizeCache( $hash, 'img' );
-        if ( $check->check() ) {
+        $hash  = md5($path);
+        $check = new autoptimizeCache($hash, 'img');
+        if ($check->check()) {
             // we have the base64 image in cache.
             $head_and_data = $check->retrieve();
-            $_base64data   = explode( ';base64,', $head_and_data );
+            $_base64data   = explode(';base64,', $head_and_data);
             $base64data    = $_base64data[1];
-            unset( $_base64data );
+            unset($_base64data);
         } else {
             // It's an image and we don't have it in cache, get the type by extension.
-            $exploded_path = explode( '.', $path );
-            $type          = end( $exploded_path );
+            $exploded_path = explode('.', $path);
+            $type          = end($exploded_path);
 
-            switch ( $type ) {
+            switch ($type) {
                 case 'jpg':
                 case 'jpeg':
                     $dataurihead = 'data:image/jpeg;base64,';
@@ -546,13 +546,13 @@ 
             }
 
             // Encode the data.
-            $base64data    = base64_encode( file_get_contents( $path ) );
-            $head_and_data = $dataurihead . $base64data;
+            $base64data    = base64_encode(file_get_contents($path));
+            $head_and_data = $dataurihead.$base64data;
 
             // Save in cache.
-            $check->cache( $head_and_data, 'text/plain' );
+            $check->cache($head_and_data, 'text/plain');
         }
-        unset( $check );
+        unset($check);
 
         return array(
             'full'       => $head_and_data,
@@ -569,13 +569,13 @@ 
      *
      * @return string
      */
-    protected static function replace_longest_matches_first( $string, $replacements = array() )
+    protected static function replace_longest_matches_first($string, $replacements = array())
     {
-        if ( ! empty( $replacements ) ) {
+        if (!empty($replacements)) {
             // Sort the replacements array by key length in desc order (so that the longest strings are replaced first).
-            $keys = array_map( 'strlen', array_keys( $replacements ) );
-            array_multisort( $keys, SORT_DESC, $replacements );
-            $string = str_replace( array_keys( $replacements ), array_values( $replacements ), $string );
+            $keys = array_map('strlen', array_keys($replacements));
+            array_multisort($keys, SORT_DESC, $replacements);
+            $string = str_replace(array_keys($replacements), array_values($replacements), $string);
         }
 
         return $string;
@@ -591,15 +591,15 @@ 
      *
      * @return string
      */
-    public function replace_urls( $code = '' )
+    public function replace_urls($code = '')
     {
         $replacements = array();
 
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
+            foreach ($url_src_matches[1] as $count => $original_url) {
                 // Removes quotes and other cruft.
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
 
                 /**
                  * TODO/FIXME: Add a way for other code / callable to be called here
@@ -617,17 +617,17 @@ 
                  */
 
                 // Do CDN replacement if needed.
-                if ( ! empty( $this->cdn_url ) ) {
-                    $replacement_url = $this->url_replace_cdn( $url );
+                if (!empty($this->cdn_url)) {
+                    $replacement_url = $this->url_replace_cdn($url);
                     // Prepare replacements array.
-                    $replacements[ $url_src_matches[1][ $count ] ] = str_replace(
-                        $original_url, $replacement_url, $url_src_matches[1][ $count ]
+                    $replacements[$url_src_matches[1][$count]] = str_replace(
+                        $original_url, $replacement_url, $url_src_matches[1][$count]
                     );
                 }
             }
         }
 
-        $code = self::replace_longest_matches_first( $code, $replacements );
+        $code = self::replace_longest_matches_first($code, $replacements);
 
         return $code;
     }
@@ -640,26 +640,26 @@ 
      * @param string $code HTML being processed to hide fonts.
      * @return string
      */
-    public function hide_fontface_and_maybe_cdn( $code )
+    public function hide_fontface_and_maybe_cdn($code)
     {
         // Proceed only if @font-face declarations exist within $code.
-        preg_match_all( self::FONT_FACE_REGEX, $code, $fontfaces );
-        if ( isset( $fontfaces[0] ) ) {
+        preg_match_all(self::FONT_FACE_REGEX, $code, $fontfaces);
+        if (isset($fontfaces[0])) {
             // Check if we need to cdn fonts or not.
-            $do_font_cdn = apply_filters( 'autoptimize_filter_css_fonts_cdn', false );
+            $do_font_cdn = apply_filters('autoptimize_filter_css_fonts_cdn', false);
 
-            foreach ( $fontfaces[0] as $full_match ) {
+            foreach ($fontfaces[0] as $full_match) {
                 // Keep original match so we can search/replace it.
                 $match_search = $full_match;
 
                 // Do font cdn if needed.
-                if ( $do_font_cdn ) {
-                    $full_match = $this->replace_urls( $full_match );
+                if ($do_font_cdn) {
+                    $full_match = $this->replace_urls($full_match);
                 }
 
                 // Replace declaration with its base64 encoded string.
-                $replacement = self::build_marker( 'FONTFACE', $full_match );
-                $code        = str_replace( $match_search, $replacement, $code );
+                $replacement = self::build_marker('FONTFACE', $full_match);
+                $code        = str_replace($match_search, $replacement, $code);
             }
         }
 
@@ -673,9 +673,9 @@ 
      * @param string $code HTML being processed to unhide fonts.
      * @return string
      */
-    public function restore_fontface( $code )
+    public function restore_fontface($code)
     {
-        return $this->restore_marked_content( 'FONTFACE', $code );
+        return $this->restore_marked_content('FONTFACE', $code);
     }
 
     /**
@@ -684,10 +684,10 @@ 
      * @param string $code HTML being processed rewrite assets.
      * @return string
      */
-    public function rewrite_assets( $code )
+    public function rewrite_assets($code)
     {
         // Handle @font-face rules by hiding and processing them separately.
-        $code = $this->hide_fontface_and_maybe_cdn( $code );
+        $code = $this->hide_fontface_and_maybe_cdn($code);
 
         /**
          * TODO/FIXME:
@@ -704,35 +704,35 @@ 
         $imgreplace      = array();
 
         // Matches and captures anything specified within the literal `url()` and excludes those containing data: URIs.
-        preg_match_all( self::ASSETS_REGEX, $code, $url_src_matches );
-        if ( is_array( $url_src_matches ) && ! empty( $url_src_matches ) ) {
-            foreach ( $url_src_matches[1] as $count => $original_url ) {
+        preg_match_all(self::ASSETS_REGEX, $code, $url_src_matches);
+        if (is_array($url_src_matches) && !empty($url_src_matches)) {
+            foreach ($url_src_matches[1] as $count => $original_url) {
                 // Removes quotes and other cruft.
-                $url = trim( $original_url, " \t\n\r\0\x0B\"'" );
+                $url = trim($original_url, " \t\n\r\0\x0B\"'");
 
                 // If datauri inlining is turned on, do it.
                 $inlined = false;
-                if ( $this->datauris ) {
+                if ($this->datauris) {
                     $iurl = $url;
-                    if ( false !== strpos( $iurl, '?' ) ) {
-                        $iurl = strtok( $iurl, '?' );
+                    if (false !== strpos($iurl, '?')) {
+                        $iurl = strtok($iurl, '?');
                     }
 
-                    $ipath = $this->getpath( $iurl );
+                    $ipath = $this->getpath($iurl);
 
-                    $excluded = $this->check_datauri_exclude_list( $ipath );
-                    if ( ! $excluded ) {
-                        $is_datauri_candidate = $this->is_datauri_candidate( $ipath );
-                        if ( $is_datauri_candidate ) {
-                            $datauri    = $this->build_or_get_datauri_image( $ipath );
+                    $excluded = $this->check_datauri_exclude_list($ipath);
+                    if (!$excluded) {
+                        $is_datauri_candidate = $this->is_datauri_candidate($ipath);
+                        if ($is_datauri_candidate) {
+                            $datauri    = $this->build_or_get_datauri_image($ipath);
                             $base64data = $datauri['base64data'];
                             // Add it to the list for replacement.
-                            $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
+                            $imgreplace[$url_src_matches[1][$count]] = str_replace(
                                 $original_url,
                                 $datauri['full'],
-                                $url_src_matches[1][ $count ]
+                                $url_src_matches[1][$count]
                             );
-                            $inlined                                     = true;
+                            $inlined = true;
                         }
                     }
                 }
@@ -743,20 +743,20 @@ 
                  * inlining isn't turned on, or if a resource is skipped from
                  * being inlined for whatever reason above.
                  */
-                if ( ! $inlined && ( ! empty( $this->cdn_url ) || has_filter( 'autoptimize_filter_base_replace_cdn' ) ) ) {
+                if (!$inlined && (!empty($this->cdn_url) || has_filter('autoptimize_filter_base_replace_cdn'))) {
                     // Just do the "simple" CDN replacement.
-                    $replacement_url                             = $this->url_replace_cdn( $url );
-                    $imgreplace[ $url_src_matches[1][ $count ] ] = str_replace(
-                        $original_url, $replacement_url, $url_src_matches[1][ $count ]
+                    $replacement_url                             = $this->url_replace_cdn($url);
+                    $imgreplace[$url_src_matches[1][$count]] = str_replace(
+                        $original_url, $replacement_url, $url_src_matches[1][$count]
                     );
                 }
             }
         }
 
-        $code = self::replace_longest_matches_first( $code, $imgreplace );
+        $code = self::replace_longest_matches_first($code, $imgreplace);
 
         // Replace back font-face markers with actual font-face declarations.
-        $code = $this->restore_fontface( $code );
+        $code = $this->restore_fontface($code);
 
         return $code;
     }
@@ -766,29 +766,29 @@ 
      */
     public function minify()
     {
-        foreach ( $this->css as $group ) {
-            list( $media, $css ) = $group;
-            if ( preg_match( '#^INLINE;#', $css ) ) {
+        foreach ($this->css as $group) {
+            list($media, $css) = $group;
+            if (preg_match('#^INLINE;#', $css)) {
                 // <style>.
-                $css      = preg_replace( '#^INLINE;#', '', $css );
-                $css      = self::fixurls( ABSPATH . 'index.php', $css ); // ABSPATH already contains a trailing slash.
-                $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, '' );
-                if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
+                $css      = preg_replace('#^INLINE;#', '', $css);
+                $css      = self::fixurls(ABSPATH.'index.php', $css); // ABSPATH already contains a trailing slash.
+                $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, '');
+                if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
                     $css                   = $tmpstyle;
                     $this->alreadyminified = true;
                 }
             } else {
                 // <link>
-                if ( false !== $css && file_exists( $css ) && is_readable( $css ) ) {
+                if (false !== $css && file_exists($css) && is_readable($css)) {
                     $css_path = $css;
-                    $css      = self::fixurls( $css_path, file_get_contents( $css_path ) );
-                    $css      = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $css );
-                    $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $css, $css_path );
-                    if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
+                    $css      = self::fixurls($css_path, file_get_contents($css_path));
+                    $css      = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $css);
+                    $tmpstyle = apply_filters('autoptimize_css_individual_style', $css, $css_path);
+                    if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
                         $css                   = $tmpstyle;
                         $this->alreadyminified = true;
-                    } elseif ( $this->can_inject_late( $css_path, $css ) ) {
-                        $css = self::build_injectlater_marker( $css_path, md5( $css ) );
+                    } elseif ($this->can_inject_late($css_path, $css)) {
+                        $css = self::build_injectlater_marker($css_path, md5($css));
                     }
                 } else {
                     // Couldn't read CSS. Maybe getpath isn't working?
@@ -796,12 +796,12 @@ 
                 }
             }
 
-            foreach ( $media as $elem ) {
-                if ( ! empty( $css ) ) {
-                    if ( ! isset( $this->csscode[ $elem ] ) ) {
-                        $this->csscode[ $elem ] = '';
+            foreach ($media as $elem) {
+                if (!empty($css)) {
+                    if (!isset($this->csscode[$elem])) {
+                        $this->csscode[$elem] = '';
                     }
-                    $this->csscode[ $elem ] .= "\n/*FILESTART*/" . $css;
+                    $this->csscode[$elem] .= "\n/*FILESTART*/".$css;
                 }
             }
         }
@@ -809,133 +809,133 @@ 
         // Check for duplicate code.
         $md5list = array();
         $tmpcss  = $this->csscode;
-        foreach ( $tmpcss as $media => $code ) {
-            $md5sum    = md5( $code );
+        foreach ($tmpcss as $media => $code) {
+            $md5sum    = md5($code);
             $medianame = $media;
-            foreach ( $md5list as $med => $sum ) {
+            foreach ($md5list as $med => $sum) {
                 // If same code.
-                if ( $sum === $md5sum ) {
+                if ($sum === $md5sum) {
                     // Add the merged code.
-                    $medianame                   = $med . ', ' . $media;
-                    $this->csscode[ $medianame ] = $code;
-                    $md5list[ $medianame ]       = $md5list[ $med ];
-                    unset( $this->csscode[ $med ], $this->csscode[ $media ], $md5list[ $med ] );
+                    $medianame                   = $med.', '.$media;
+                    $this->csscode[$medianame] = $code;
+                    $md5list[$medianame]       = $md5list[$med];
+                    unset($this->csscode[$med], $this->csscode[$media], $md5list[$med]);
                 }
             }
-            $md5list[ $medianame ] = $md5sum;
+            $md5list[$medianame] = $md5sum;
         }
-        unset( $tmpcss );
+        unset($tmpcss);
 
         // Manage @imports, while is for recursive import management.
-        foreach ( $this->csscode as &$thiscss ) {
+        foreach ($this->csscode as &$thiscss) {
             // Flag to trigger import reconstitution and var to hold external imports.
             $fiximports       = false;
             $external_imports = '';
 
             // remove comments to avoid importing commented-out imports.
-            $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss );
-            while ( preg_match_all( '#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches ) ) {
-                foreach ( $matches[0] as $import ) {
-                    if ( $this->isremovable( $import, $this->cssremovables ) ) {
-                        $thiscss   = str_replace( $import, '', $thiscss );
+            $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
+            while (preg_match_all('#@import +(?:url)?(?:(?:\((["\']?)(?:[^"\')]+)\1\)|(["\'])(?:[^"\']+)\2)(?:[^,;"\']+(?:,[^,;"\']+)*)?)(?:;)#mi', $thiscss_nocomments, $matches)) {
+                foreach ($matches[0] as $import) {
+                    if ($this->isremovable($import, $this->cssremovables)) {
+                        $thiscss   = str_replace($import, '', $thiscss);
                         $import_ok = true;
                     } else {
-                        $url       = trim( preg_replace( '#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim( $import ) ), " \t\n\r\0\x0B\"'" );
-                        $path      = $this->getpath( $url );
+                        $url       = trim(preg_replace('#^.*((?:https?:|ftp:)?//.*\.css).*$#', '$1', trim($import)), " \t\n\r\0\x0B\"'");
+                        $path      = $this->getpath($url);
                         $import_ok = false;
-                        if ( file_exists( $path ) && is_readable( $path ) ) {
-                            $code     = addcslashes( self::fixurls( $path, file_get_contents( $path ) ), '\\' );
-                            $code     = preg_replace( '/\x{EF}\x{BB}\x{BF}/', '', $code );
-                            $tmpstyle = apply_filters( 'autoptimize_css_individual_style', $code, '' );
-                            if ( has_filter( 'autoptimize_css_individual_style' ) && ! empty( $tmpstyle ) ) {
+                        if (file_exists($path) && is_readable($path)) {
+                            $code     = addcslashes(self::fixurls($path, file_get_contents($path)), '\\');
+                            $code     = preg_replace('/\x{EF}\x{BB}\x{BF}/', '', $code);
+                            $tmpstyle = apply_filters('autoptimize_css_individual_style', $code, '');
+                            if (has_filter('autoptimize_css_individual_style') && !empty($tmpstyle)) {
                                 $code                  = $tmpstyle;
                                 $this->alreadyminified = true;
-                            } elseif ( $this->can_inject_late( $path, $code ) ) {
-                                $code = self::build_injectlater_marker( $path, md5( $code ) );
+                            } elseif ($this->can_inject_late($path, $code)) {
+                                $code = self::build_injectlater_marker($path, md5($code));
                             }
 
-                            if ( ! empty( $code ) ) {
-                                $tmp_thiscss = preg_replace( '#(/\*FILESTART\*/.*)' . preg_quote( $import, '#' ) . '#Us', '/*FILESTART2*/' . $code . '$1', $thiscss );
-                                if ( ! empty( $tmp_thiscss ) ) {
+                            if (!empty($code)) {
+                                $tmp_thiscss = preg_replace('#(/\*FILESTART\*/.*)'.preg_quote($import, '#').'#Us', '/*FILESTART2*/'.$code.'$1', $thiscss);
+                                if (!empty($tmp_thiscss)) {
                                     $thiscss   = $tmp_thiscss;
                                     $import_ok = true;
-                                    unset( $tmp_thiscss );
+                                    unset($tmp_thiscss);
                                 }
                             }
-                            unset( $code );
+                            unset($code);
                         }
                     }
-                    if ( ! $import_ok ) {
+                    if (!$import_ok) {
                         // External imports and general fall-back.
                         $external_imports .= $import;
 
-                        $thiscss    = str_replace( $import, '', $thiscss );
+                        $thiscss    = str_replace($import, '', $thiscss);
                         $fiximports = true;
                     }
                 }
-                $thiscss = preg_replace( '#/\*FILESTART\*/#', '', $thiscss );
-                $thiscss = preg_replace( '#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss );
+                $thiscss = preg_replace('#/\*FILESTART\*/#', '', $thiscss);
+                $thiscss = preg_replace('#/\*FILESTART2\*/#', '/*FILESTART*/', $thiscss);
 
                 // and update $thiscss_nocomments before going into next iteration in while loop.
-                $thiscss_nocomments = preg_replace( '#/\*.*\*/#Us', '', $thiscss );
+                $thiscss_nocomments = preg_replace('#/\*.*\*/#Us', '', $thiscss);
             }
-            unset( $thiscss_nocomments );
+            unset($thiscss_nocomments);
 
             // Add external imports to top of aggregated CSS.
-            if ( $fiximports ) {
-                $thiscss = $external_imports . $thiscss;
+            if ($fiximports) {
+                $thiscss = $external_imports.$thiscss;
             }
         }
-        unset( $thiscss );
+        unset($thiscss);
 
         // $this->csscode has all the uncompressed code now.
-        foreach ( $this->csscode as &$code ) {
+        foreach ($this->csscode as &$code) {
             // Check for already-minified code.
-            $hash = md5( $code );
-            do_action( 'autoptimize_action_css_hash', $hash );
-            $ccheck = new autoptimizeCache( $hash, 'css' );
-            if ( $ccheck->check() ) {
+            $hash = md5($code);
+            do_action('autoptimize_action_css_hash', $hash);
+            $ccheck = new autoptimizeCache($hash, 'css');
+            if ($ccheck->check()) {
                 $code                          = $ccheck->retrieve();
-                $this->hashmap[ md5( $code ) ] = $hash;
+                $this->hashmap[md5($code)] = $hash;
                 continue;
             }
-            unset( $ccheck );
+            unset($ccheck);
 
             // Rewrite and/or inline referenced assets.
-            $code = $this->rewrite_assets( $code );
+            $code = $this->rewrite_assets($code);
 
             // Minify.
-            $code = $this->run_minifier_on( $code );
+            $code = $this->run_minifier_on($code);
 
             // Bring back INJECTLATER stuff.
-            $code = $this->inject_minified( $code );
+            $code = $this->inject_minified($code);
 
             // Filter results.
-            $tmp_code = apply_filters( 'autoptimize_css_after_minify', $code );
-            if ( ! empty( $tmp_code ) ) {
+            $tmp_code = apply_filters('autoptimize_css_after_minify', $code);
+            if (!empty($tmp_code)) {
                 $code = $tmp_code;
-                unset( $tmp_code );
+                unset($tmp_code);
             }
 
-            $this->hashmap[ md5( $code ) ] = $hash;
+            $this->hashmap[md5($code)] = $hash;
         }
 
-        unset( $code );
+        unset($code);
         return true;
     }
 
-    public function run_minifier_on( $code )
+    public function run_minifier_on($code)
     {
-        if ( ! $this->alreadyminified ) {
-            $do_minify = apply_filters( 'autoptimize_css_do_minify', true );
+        if (!$this->alreadyminified) {
+            $do_minify = apply_filters('autoptimize_css_do_minify', true);
 
-            if ( $do_minify ) {
+            if ($do_minify) {
                 $cssmin   = new autoptimizeCSSmin();
-                $tmp_code = trim( $cssmin->run( $code ) );
+                $tmp_code = trim($cssmin->run($code));
 
-                if ( ! empty( $tmp_code ) ) {
+                if (!empty($tmp_code)) {
                     $code = $tmp_code;
-                    unset( $tmp_code );
+                    unset($tmp_code);
                 }
             }
         }
@@ -949,18 +949,18 @@ 
     public function cache()
     {
         // CSS cache.
-        foreach ( $this->csscode as $media => $code ) {
-            if ( empty( $code ) ) {
+        foreach ($this->csscode as $media => $code) {
+            if (empty($code)) {
                 continue;
             }
 
-            $md5   = $this->hashmap[ md5( $code ) ];
-            $cache = new autoptimizeCache( $md5, 'css' );
-            if ( ! $cache->check() ) {
+            $md5   = $this->hashmap[md5($code)];
+            $cache = new autoptimizeCache($md5, 'css');
+            if (!$cache->check()) {
                 // Cache our code.
-                $cache->cache( $code, 'text/css' );
+                $cache->cache($code, 'text/css');
             }
-            $this->url[ $media ] = AUTOPTIMIZE_CACHE_URL . $cache->getname();
+            $this->url[$media] = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         }
     }
 
@@ -970,95 +970,95 @@ 
     public function getcontent()
     {
         // Restore the full content (only applies when "autoptimize_filter_css_justhead" filter is true).
-        if ( ! empty( $this->restofcontent ) ) {
+        if (!empty($this->restofcontent)) {
             $this->content      .= $this->restofcontent;
             $this->restofcontent = '';
         }
 
         // type is not added by default.
         $type_css = '';
-        if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
+        if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
             $type_css = 'type="text/css" ';
         }
 
         // Inject the new stylesheets.
-        $replace_tag = array( '<title', 'before' );
-        $replace_tag = apply_filters( 'autoptimize_filter_css_replacetag', $replace_tag, $this->content );
+        $replace_tag = array('<title', 'before');
+        $replace_tag = apply_filters('autoptimize_filter_css_replacetag', $replace_tag, $this->content);
 
-        if ( $this->inline ) {
-            foreach ( $this->csscode as $media => $code ) {
-                $this->inject_in_html( apply_filters( 'autoptimize_filter_css_bodyreplacementpayload', '<style ' . $type_css . 'media="' . $media . '">' . $code . '</style>' ), $replace_tag );
+        if ($this->inline) {
+            foreach ($this->csscode as $media => $code) {
+                $this->inject_in_html(apply_filters('autoptimize_filter_css_bodyreplacementpayload', '<style '.$type_css.'media="'.$media.'">'.$code.'</style>'), $replace_tag);
             }
         } else {
-            if ( $this->defer ) {
+            if ($this->defer) {
                 $preload_css_block  = '';
                 $inlined_ccss_block = '';
                 $noscript_css_block = '<noscript id="aonoscrcss">';
 
                 $defer_inline_code = $this->defer_inline;
-                if ( ! empty( $defer_inline_code ) ) {
-                    if ( apply_filters( 'autoptimize_filter_css_critcss_minify', true ) ) {
-                        $icss_hash  = md5( $defer_inline_code );
-                        $icss_cache = new autoptimizeCache( $icss_hash, 'css' );
-                        if ( $icss_cache->check() ) {
+                if (!empty($defer_inline_code)) {
+                    if (apply_filters('autoptimize_filter_css_critcss_minify', true)) {
+                        $icss_hash  = md5($defer_inline_code);
+                        $icss_cache = new autoptimizeCache($icss_hash, 'css');
+                        if ($icss_cache->check()) {
                             // we have the optimized inline CSS in cache.
                             $defer_inline_code = $icss_cache->retrieve();
                         } else {
                             $cssmin   = new autoptimizeCSSmin();
-                            $tmp_code = trim( $cssmin->run( $defer_inline_code ) );
+                            $tmp_code = trim($cssmin->run($defer_inline_code));
 
-                            if ( ! empty( $tmp_code ) ) {
+                            if (!empty($tmp_code)) {
                                 $defer_inline_code = $tmp_code;
-                                $icss_cache->cache( $defer_inline_code, 'text/css' );
-                                unset( $tmp_code );
+                                $icss_cache->cache($defer_inline_code, 'text/css');
+                                unset($tmp_code);
                             }
                         }
                     }
                     // inlined critical css set here, but injected when full CSS is injected
                     // to avoid CSS containing SVG with <title tag receiving the full CSS link.
-                    $inlined_ccss_block = '<style ' . $type_css . 'id="aoatfcss" media="all">' . $defer_inline_code . '</style>';
+                    $inlined_ccss_block = '<style '.$type_css.'id="aoatfcss" media="all">'.$defer_inline_code.'</style>';
                 }
             }
 
-            foreach ( $this->url as $media => $url ) {
-                $url = $this->url_replace_cdn( $url );
+            foreach ($this->url as $media => $url) {
+                $url = $this->url_replace_cdn($url);
 
                 // Add the stylesheet either deferred (import at bottom) or normal links in head.
-                if ( $this->defer && 'print' !== $media ) {
-                    $preload_onload = autoptimizeConfig::get_ao_css_preload_onload( $media );
+                if ($this->defer && 'print' !== $media) {
+                    $preload_onload = autoptimizeConfig::get_ao_css_preload_onload($media);
 
-                    $preload_css_block .= '<link rel="stylesheet" media="print" href="' . $url . '" onload="' . $preload_onload . '" />';
-                    if ( apply_filters( 'autoptimize_fitler_css_preload_and_print', false ) ) {
-                        $preload_css_block = '<link rel="preload" as="stylesheet" href="' . $url . '"/>' . $preload_css_block;
+                    $preload_css_block .= '<link rel="stylesheet" media="print" href="'.$url.'" onload="'.$preload_onload.'" />';
+                    if (apply_filters('autoptimize_fitler_css_preload_and_print', false)) {
+                        $preload_css_block = '<link rel="preload" as="stylesheet" href="'.$url.'"/>'.$preload_css_block;
                     }
-                    $noscript_css_block .= '<link ' . $type_css . 'media="' . $media . '" href="' . $url . '" rel="stylesheet" />';
+                    $noscript_css_block .= '<link '.$type_css.'media="'.$media.'" href="'.$url.'" rel="stylesheet" />';
                 } else {
-                    if ( strlen( $this->csscode[ $media ] ) > $this->cssinlinesize ) {
-                        $this->inject_in_html( apply_filters( 'autoptimize_filter_css_bodyreplacementpayload', '<link ' . $type_css . 'media="' . $media . '" href="' . $url . '" rel="stylesheet" />' ), $replace_tag );
-                    } elseif ( strlen( $this->csscode[ $media ] ) > 0 ) {
-                        $this->inject_in_html( apply_filters( 'autoptimize_filter_css_bodyreplacementpayload', '<style ' . $type_css . 'media="' . $media . '">' . $this->csscode[ $media ] . '</style>' ), $replace_tag );
+                    if (strlen($this->csscode[$media]) > $this->cssinlinesize) {
+                        $this->inject_in_html(apply_filters('autoptimize_filter_css_bodyreplacementpayload', '<link '.$type_css.'media="'.$media.'" href="'.$url.'" rel="stylesheet" />'), $replace_tag);
+                    } elseif (strlen($this->csscode[$media]) > 0) {
+                        $this->inject_in_html(apply_filters('autoptimize_filter_css_bodyreplacementpayload', '<style '.$type_css.'media="'.$media.'">'.$this->csscode[$media].'</style>'), $replace_tag);
                     }
                 }
             }
 
-            if ( $this->defer ) {
+            if ($this->defer) {
                 $noscript_css_block .= '</noscript>';
                 // Inject inline critical CSS, the preloaded full CSS and the noscript-CSS.
-                $this->inject_in_html( apply_filters( 'autoptimize_filter_css_bodyreplacementpayload', $inlined_ccss_block . $preload_css_block . $noscript_css_block ), $replace_tag );
+                $this->inject_in_html(apply_filters('autoptimize_filter_css_bodyreplacementpayload', $inlined_ccss_block.$preload_css_block.$noscript_css_block), $replace_tag);
             }
         }
 
         // restore comments.
-        $this->content = $this->restore_comments( $this->content );
+        $this->content = $this->restore_comments($this->content);
 
         // restore IE hacks.
-        $this->content = $this->restore_iehacks( $this->content );
+        $this->content = $this->restore_iehacks($this->content);
 
         // restore (no)script.
-        $this->content = $this->restore_marked_content( 'SCRIPT', $this->content );
+        $this->content = $this->restore_marked_content('SCRIPT', $this->content);
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Return the modified stylesheet.
         return $this->content;
@@ -1070,44 +1070,44 @@ 
      * @param string $file filename of optimized CSS-file.
      * @param string $code CSS-code in which to fix URL's.
      */
-    static function fixurls( $file, $code )
+    static function fixurls($file, $code)
     {
         // Switch all imports to the url() syntax.
-        $code = preg_replace( '#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code );
+        $code = preg_replace('#@import ("|\')(.+?)\.css.*?("|\')#', '@import url("${2}.css")', $code);
 
-        if ( preg_match_all( self::ASSETS_REGEX, $code, $matches ) ) {
-            $file = str_replace( WP_ROOT_DIR, '/', $file );
+        if (preg_match_all(self::ASSETS_REGEX, $code, $matches)) {
+            $file = str_replace(WP_ROOT_DIR, '/', $file);
             /**
              * Rollback as per https://github.com/futtta/autoptimize/issues/94
              * $file = str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', $file );
              */
-            $dir = dirname( $file ); // Like /themes/expound/css.
+            $dir = dirname($file); // Like /themes/expound/css.
 
             /**
              * $dir should not contain backslashes, since it's used to replace
              * urls, but it can contain them when running on Windows because
              * fixurls() is sometimes called with `ABSPATH . 'index.php'`
              */
-            $dir = str_replace( '\\', '/', $dir );
-            unset( $file ); // not used below at all.
+            $dir = str_replace('\\', '/', $dir);
+            unset($file); // not used below at all.
 
             $replace = array();
-            foreach ( $matches[1] as $k => $url ) {
+            foreach ($matches[1] as $k => $url) {
                 // Remove quotes.
-                $url      = trim( $url, " \t\n\r\0\x0B\"'" );
-                $no_q_url = trim( $url, "\"'" );
-                if ( $url !== $no_q_url ) {
+                $url      = trim($url, " \t\n\r\0\x0B\"'");
+                $no_q_url = trim($url, "\"'");
+                if ($url !== $no_q_url) {
                     $removed_quotes = true;
                 } else {
                     $removed_quotes = false;
                 }
 
-                if ( '' === $no_q_url ) {
+                if ('' === $no_q_url) {
                     continue;
                 }
 
                 $url = $no_q_url;
-                if ( '/' === $url[0] || preg_match( '#^(https?://|ftp://|data:)#i', $url ) ) {
+                if ('/' === $url[0] || preg_match('#^(https?://|ftp://|data:)#i', $url)) {
                     // URL is protocol-relative, host-relative or something we don't touch.
                     continue;
                 } else { // Relative URL.
@@ -1116,49 +1116,49 @@ 
                      * rollback as per https://github.com/futtta/autoptimize/issues/94
                      * $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_CONTENT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
                      */
-                    $newurl = preg_replace( '/https?:/', '', str_replace( ' ', '%20', AUTOPTIMIZE_WP_ROOT_URL . str_replace( '//', '/', $dir . '/' . $url ) ) );
-                    $newurl = apply_filters( 'autoptimize_filter_css_fixurl_newurl', $newurl );
+                    $newurl = preg_replace('/https?:/', '', str_replace(' ', '%20', AUTOPTIMIZE_WP_ROOT_URL.str_replace('//', '/', $dir.'/'.$url)));
+                    $newurl = apply_filters('autoptimize_filter_css_fixurl_newurl', $newurl);
 
                     /**
                      * Hash the url + whatever was behind potentially for replacement
                      * We must do this, or different css classes referencing the same bg image (but
                      * different parts of it, say, in sprites and such) loose their stuff...
                      */
-                    $hash = md5( $url . $matches[2][ $k ] );
-                    $code = str_replace( $matches[0][ $k ], $hash, $code );
+                    $hash = md5($url.$matches[2][$k]);
+                    $code = str_replace($matches[0][$k], $hash, $code);
 
-                    if ( $removed_quotes ) {
-                        $replace[ $hash ] = "url('" . $newurl . "')" . $matches[2][ $k ];
+                    if ($removed_quotes) {
+                        $replace[$hash] = "url('".$newurl."')".$matches[2][$k];
                     } else {
-                        $replace[ $hash ] = 'url(' . $newurl . ')' . $matches[2][ $k ];
+                        $replace[$hash] = 'url('.$newurl.')'.$matches[2][$k];
                     }
                 }
             }
 
-            $code = self::replace_longest_matches_first( $code, $replace );
+            $code = self::replace_longest_matches_first($code, $replace);
         }
 
         return $code;
     }
 
-    private function ismovable( $tag )
+    private function ismovable($tag)
     {
-        if ( ! $this->aggregate ) {
+        if (!$this->aggregate) {
             return false;
         }
 
-        if ( ! empty( $this->allowlist ) ) {
-            foreach ( $this->allowlist as $match ) {
-                if ( false !== strpos( $tag, $match ) ) {
+        if (!empty($this->allowlist)) {
+            foreach ($this->allowlist as $match) {
+                if (false !== strpos($tag, $match)) {
                     return true;
                 }
             }
             // no match with allowlist.
             return false;
         } else {
-            if ( is_array( $this->dontmove ) && ! empty( $this->dontmove ) ) {
-                foreach ( $this->dontmove as $match ) {
-                    if ( false !== strpos( $tag, $match ) ) {
+            if (is_array($this->dontmove) && !empty($this->dontmove)) {
+                foreach ($this->dontmove as $match) {
+                    if (false !== strpos($tag, $match)) {
                         // Matched something.
                         return false;
                     }
@@ -1170,22 +1170,22 @@ 
         }
     }
 
-    private function can_inject_late( $css_path, $css )
+    private function can_inject_late($css_path, $css)
     {
-        $consider_minified_array = apply_filters( 'autoptimize_filter_css_consider_minified', false, $css_path );
-        if ( true !== $this->inject_min_late ) {
+        $consider_minified_array = apply_filters('autoptimize_filter_css_consider_minified', false, $css_path);
+        if (true !== $this->inject_min_late) {
             // late-inject turned off.
             return false;
-        } elseif ( ( false === strpos( $css_path, 'min.css' ) ) && ( str_replace( $consider_minified_array, '', $css_path ) === $css_path ) ) {
+        } elseif ((false === strpos($css_path, 'min.css')) && (str_replace($consider_minified_array, '', $css_path) === $css_path)) {
             // file not minified based on filename & filter.
             return false;
-        } elseif ( false !== strpos( $css, '@import' ) ) {
+        } elseif (false !== strpos($css, '@import')) {
             // can't late-inject files with imports as those need to be aggregated.
             return false;
-        } elseif ( ( false !== strpos( $css, '@font-face' ) ) && ( apply_filters( 'autoptimize_filter_css_fonts_cdn', false ) === true ) && ( ! empty( $this->cdn_url ) ) ) {
+        } elseif ((false !== strpos($css, '@font-face')) && (apply_filters('autoptimize_filter_css_fonts_cdn', false) === true) && (!empty($this->cdn_url))) {
             // don't late-inject CSS with font-src's if fonts are set to be CDN'ed.
             return false;
-        } elseif ( ( ( true == $this->datauris ) || ( ! empty( $this->cdn_url ) ) ) && preg_match( '#background[^;}]*url\(#Ui', $css ) ) {
+        } elseif (((true == $this->datauris) || (!empty($this->cdn_url))) && preg_match('#background[^;}]*url\(#Ui', $css)) {
             // don't late-inject CSS with images if CDN is set OR if image inlining is on.
             return false;
         } else {
@@ -1203,44 +1203,44 @@ 
      *
      * @return bool|string Url pointing to the minified css file or false.
      */
-    public function minify_single( $filepath, $cache_miss = false )
+    public function minify_single($filepath, $cache_miss = false)
     {
-        $contents = $this->prepare_minify_single( $filepath );
+        $contents = $this->prepare_minify_single($filepath);
 
-        if ( empty( $contents ) ) {
+        if (empty($contents)) {
             return false;
         }
 
         // Check cache.
-        $hash  = 'single_' . md5( $contents );
-        $cache = new autoptimizeCache( $hash, 'css' );
-        do_action( 'autoptimize_action_css_hash', $hash );
+        $hash  = 'single_'.md5($contents);
+        $cache = new autoptimizeCache($hash, 'css');
+        do_action('autoptimize_action_css_hash', $hash);
 
         // If not in cache already, minify...
-        if ( ! $cache->check() || $cache_miss ) {
+        if (!$cache->check() || $cache_miss) {
             // Fixurls...
-            $contents = self::fixurls( $filepath, $contents );
+            $contents = self::fixurls($filepath, $contents);
             // CDN-replace any referenced assets if needed...
-            $contents = $this->hide_fontface_and_maybe_cdn( $contents );
-            $contents = $this->replace_urls( $contents );
-            $contents = $this->restore_fontface( $contents );
+            $contents = $this->hide_fontface_and_maybe_cdn($contents);
+            $contents = $this->replace_urls($contents);
+            $contents = $this->restore_fontface($contents);
             // Now minify...
             $cssmin   = new autoptimizeCSSmin();
-            $contents = trim( $cssmin->run( $contents ) );
+            $contents = trim($cssmin->run($contents));
 
             // Check if minified cache content is empty.
-            if ( empty( $contents ) ) {
+            if (empty($contents)) {
                 return false;
             }
 
             // Filter contents of excluded minified CSS.
-            $contents = apply_filters( 'autoptimize_filter_css_single_after_minify', $contents );
+            $contents = apply_filters('autoptimize_filter_css_single_after_minify', $contents);
 
             // Store in cache.
-            $cache->cache( $contents, 'text/css' );
+            $cache->cache($contents, 'text/css');
         }
 
-        $url = $this->build_minify_single_url( $cache );
+        $url = $this->build_minify_single_url($cache);
 
         return $url;
     }
@@ -1260,20 +1260,20 @@ 
         return $this->options;
     }
 
-    public function replaceOptions( $options )
+    public function replaceOptions($options)
     {
         $this->options = $options;
     }
 
-    public function setOption( $name, $value )
+    public function setOption($name, $value)
     {
-        $this->options[ $name ] = $value;
+        $this->options[$name] = $value;
         $this->$name            = $value;
     }
 
-    public function getOption( $name )
+    public function getOption($name)
     {
-        return $this->options[ $name ];
+        return $this->options[$name];
     }
 
     /**
@@ -1287,11 +1287,11 @@ 
      * @param string $css the to be sanitized CSS
      * @return string sanitized CSS.
      */
-    public static function sanitize_css( $css )
+    public static function sanitize_css($css)
     {
-        $css = strip_tags( $css );
-        if ( strpos( $css, '<' ) !== false ) {
-            $css = preg_replace( '#<(\/?\w+)#', '\00003C$1', $css );
+        $css = strip_tags($css);
+        if (strpos($css, '<') !== false) {
+            $css = preg_replace('#<(\/?\w+)#', '\00003C$1', $css);
         }
         return $css;
     }

classes/critcss-inc/admin_settings_impexp.js.php

Spacing +5 added lines, -5 removed lines

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

classes/critcss-inc/admin_settings_debug.php

Spacing +15 added lines, -15 removed lines

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

classes/critcss-inc/admin_settings_queue.js.php

Spacing +23 added lines, -23 removed lines

@@ -20,7 +20,7 @@ 
                                 "empty" :
                                 aoCssQueue;
         <?php
-        if ( $ao_ccss_debug ) {
+        if ($ao_ccss_debug) {
             echo "console.log( 'Queue Object:', aoCssQueueLog );\n";
         }
         ?>
@@ -62,34 +62,34 @@ 
             // Status: NEW (N, sort order 1)
             status      = '<span class="hidden">1</span>N';
             statusClass = 'new';
-            title       = '<?php _e( 'New', 'autoptimize' ); ?> (' + ljid + ')';
-            buttons     = '<?php _e( 'None', 'autoptimize' ); ?>';
+            title       = '<?php _e('New', 'autoptimize'); ?> (' + ljid + ')';
+            buttons     = '<?php _e('None', 'autoptimize'); ?>';
         } else if (keys.jqstat === 'JOB_QUEUED' || keys.jqstat === 'JOB_ONGOING') {
             // Status: PENDING (P, sort order 2)
             status      = '<span class="hidden">2</span>P';
             statusClass = 'pending';
-            title       = '<?php _e( 'PENDING', 'autoptimize' ); ?> (' + ljid + ')';
-            buttons     = '<?php _e( 'None', 'autoptimize' ); ?>';
+            title       = '<?php _e('PENDING', 'autoptimize'); ?> (' + ljid + ')';
+            buttons     = '<?php _e('None', 'autoptimize'); ?>';
         } else if (keys.jqstat === 'JOB_DONE' && keys.jrstat === 'GOOD' && (keys.jvstat === 'WARN' || keys.jvstat === 'BAD')) {
             // Status: REVIEW (R, sort order 5)
             status      = '<span class="hidden">5</span>R';
             statusClass = 'review';
-            title       = "<?php _e( 'REVIEW', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat;
-            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span>';
+            title       = "<?php _e('REVIEW', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat;
+            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span>';
             dbtn        = true;
         } else if (keys.jqstat === 'JOB_DONE') {
             // Status: DONE (D, sort order 6)
             status      = '<span class="hidden">6</span>D';
             statusClass = 'done';
-            title       = '<?php _e( 'DONE', 'autoptimize' ); ?> (' + ljid + ')';
-            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span>';
+            title       = '<?php _e('DONE', 'autoptimize'); ?> (' + ljid + ')';
+            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span>';
             dbtn        = true;
         } else if (keys.jqstat === 'JOB_FAILED' || keys.jqstat === 'STATUS_JOB_BAD' || keys.jqstat === 'INVALID_JWT_TOKEN' || keys.jqstat === 'NO_CSS' || keys.jqstat === 'NO_RESPONSE') {
         // Status: ERROR (E, sort order 4)
             status      = '<span class="hidden">4</span>E';
             statusClass = 'error';
-            title       = "<?php _e( 'ERROR', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat;
-            buttons     = '<span class="button-secondary" id="' + ljid + '_retry" title="<?php _e( 'Retry Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-update"></span></span><span class="button-secondary to-right" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e( 'Get Help', 'autoptimize' ); ?>"><span class="dashicons dashicons-sos"></span></span>';
+            title       = "<?php _e('ERROR', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat;
+            buttons     = '<span class="button-secondary" id="' + ljid + '_retry" title="<?php _e('Retry Job', 'autoptimize'); ?>"><span class="dashicons dashicons-update"></span></span><span class="button-secondary to-right" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e('Get Help', 'autoptimize'); ?>"><span class="dashicons dashicons-sos"></span></span>';
             rbtn        = true;
             dbtn        = true;
             hbtn        = true;
@@ -97,21 +97,21 @@ 
             // Status: UNKNOWN (U, sort order 5)
             status      = '<span class="hidden">5</span>U';
             statusClass = 'unknown';
-            title       = "<?php _e( 'UNKNOWN', 'autoptimize' ); ?> (" + ljid + ")\n<?php _e( 'Info from criticalcss.com:', 'autoptimize' ); ?>\n<?php _e( '- Job ID: ', 'autoptimize' ); ?>" + keys.jid + "\n<?php _e( '- Status: ', 'autoptimize' ); ?>" + keys.jqstat + "\n<?php _e( '- Result: ', 'autoptimize' ); ?>" + keys.jrstat + "\n<?php _e( '- Validation: ', 'autoptimize' ); ?>" + keys.jvstat;
-            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e( 'Delete Job', 'autoptimize' ); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e( 'Get Help', 'autoptimize' ); ?>"><span class="dashicons dashicons-sos"></span></span>';
+            title       = "<?php _e('UNKNOWN', 'autoptimize'); ?> (" + ljid + ")\n<?php _e('Info from criticalcss.com:', 'autoptimize'); ?>\n<?php _e('- Job ID: ', 'autoptimize'); ?>" + keys.jid + "\n<?php _e('- Status: ', 'autoptimize'); ?>" + keys.jqstat + "\n<?php _e('- Result: ', 'autoptimize'); ?>" + keys.jrstat + "\n<?php _e('- Validation: ', 'autoptimize'); ?>" + keys.jvstat;
+            buttons     = '<span class="button-secondary" id="' + ljid + '_remove" title="<?php _e('Delete Job', 'autoptimize'); ?>"><span class="dashicons dashicons-trash"></span></span><span class="button-secondary to-right" id="' + ljid + '_help" title="<?php _e('Get Help', 'autoptimize'); ?>"><span class="dashicons dashicons-sos"></span></span>';
             dbtn        = true;
             hbtn        = true;
         }
 
         // Prepare job finish time
         if (keys.jftime === null) {
-            ftime = '<?php _e( 'N/A', 'autoptimize' ); ?>';
+            ftime = '<?php _e('N/A', 'autoptimize'); ?>';
         } else {
             ftime = EpochToDate(keys.jftime);
         }
 
         // Append job entry
-        jQuery("#queue").append("<tr id='" + ljid + "' class='job " + statusClass + "'><td class='status'><span class='badge " + statusClass + "' title='<?php _e( 'Job status is ', 'autoptimize' ); ?>" + title + "'>" + status + "</span></td><td>" + target.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + path + "</td><td>" + type.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + ctime + "</td><td>" + ftime + "</td><td class='btn'>" + buttons + "</td></tr>");
+        jQuery("#queue").append("<tr id='" + ljid + "' class='job " + statusClass + "'><td class='status'><span class='badge " + statusClass + "' title='<?php _e('Job status is ', 'autoptimize'); ?>" + title + "'>" + status + "</span></td><td>" + target.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + path + "</td><td>" + type.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'') + "</td><td>" + ctime + "</td><td>" + ftime + "</td><td class='btn'>" + buttons + "</td></tr>");
 
         // Attach button actions
         if (rbtn) {
@@ -134,12 +134,12 @@ 
         height: 180,
         modal: true,
         buttons: {
-            "<?php _e( 'Delete', 'autoptimize' ); ?>": function() {
+            "<?php _e('Delete', 'autoptimize'); ?>": function() {
                 delete queue[jpath];
                 updateQueue(queue);
                 jQuery(this).dialog('close' );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery(this).dialog('close' );
             }
         }
@@ -152,12 +152,12 @@ 
         height:235,
         modal: true,
         buttons: {
-            "<?php _e( 'Delete all jobs?', 'autoptimize' ); ?>": function() {
+            "<?php _e('Delete all jobs?', 'autoptimize'); ?>": function() {
                 queue=[];
                 updateQueue(queue);
                 jQuery( this ).dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery( this ).dialog( "close" );
             }
         }
@@ -172,9 +172,9 @@ 
         height: 180,
         modal: true,
         buttons: {
-            "<?php _e( 'Retry', 'autoptimize' ); ?>": function() {
+            "<?php _e('Retry', 'autoptimize'); ?>": function() {
                 <?php
-                if ( $ao_ccss_debug ) {
+                if ($ao_ccss_debug) {
                     echo "console.log( 'SHOULD retry job:', jid[0], jpath );\n";
                 }
                 ?>
@@ -187,7 +187,7 @@ 
                 updateQueue(queue);
                 jQuery(this).dialog('close' );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery(this).dialog('close' );
             }
         }
@@ -201,7 +201,7 @@ 
     jQuery('#unSavedWarning').show();
     document.getElementById('ao_title_and_button').scrollIntoView();  
     <?php
-    if ( $ao_ccss_debug ) {
+    if ($ao_ccss_debug) {
         echo "console.log('Updated Queue Object:', queue);\n";
     }
     ?>

classes/critcss-inc/admin_settings_rules.js.php

Spacing +34 added lines, -34 removed lines

@@ -3,7 +3,7 @@ 
  * Outputs JS code for the rules panel.
  */
 
-if ( $ao_ccss_debug ) {
+if ($ao_ccss_debug) {
     echo "console.log('[WARN] Autoptimize CriticalCSS Power-Up is in DEBUG MODE!');\n";
     echo "console.log('[WARN] Avoid using debug mode on production/live environments unless for ad-hoc troubleshooting purposes and make sure to disable it after!');\n";
 }
@@ -23,7 +23,7 @@ 
     jQuery(document).ready(function() {
         critCssArray=JSON.parse(document.getElementById("critCssOrigin").value);
         <?php
-        if ( $ao_ccss_debug ) {
+        if ($ao_ccss_debug) {
             echo "console.log('Rules Object:', critCssArray);\n";
         }
         ?>
@@ -39,13 +39,13 @@ 
     jQuery("#rules-list").empty();
     jQuery.each(critCssArray,function(k,v) {
         if (k=="paths") {
-            kstring="<?php _e( 'Path Based Rules', 'autoptimize' ); ?>";
+            kstring="<?php _e('Path Based Rules', 'autoptimize'); ?>";
         } else {
-            kstring="<?php _e( 'Conditional Tags, Custom Post Types and Page Templates Rules', 'autoptimize' ); ?>";
+            kstring="<?php _e('Conditional Tags, Custom Post Types and Page Templates Rules', 'autoptimize'); ?>";
         }
         if (!(jQuery.isEmptyObject(v))) {
             jQuery("#rules-list").append("<tr><td colspan='5'><h4>" + kstring + "</h4></td></tr>");
-            jQuery("#rules-list").append("<tr class='header "+k+"Rule'><th><?php _e( 'Type', 'autoptimize' ); ?></th><th><?php _e( 'Target', 'autoptimize' ); ?></th><th><?php _e( 'Critical CSS File', 'autoptimize' ); ?></th><th colspan='2'><?php _e( 'Actions', 'autoptimize' ); ?></th></tr>");
+            jQuery("#rules-list").append("<tr class='header "+k+"Rule'><th><?php _e('Type', 'autoptimize'); ?></th><th><?php _e('Target', 'autoptimize'); ?></th><th><?php _e('Critical CSS File', 'autoptimize'); ?></th><th colspan='2'><?php _e('Actions', 'autoptimize'); ?></th></tr>");
         }
         nodeNumber=0;
         jQuery.each(v,function(i,nv){
@@ -55,13 +55,13 @@ 
             file=nv.file;
             filest=nv.file;
             if (file == 0) {
-                file='<?php _e( 'To be fetched from criticalcss.com in the next queue run...', 'autoptimize' ); ?>';
+                file='<?php _e('To be fetched from criticalcss.com in the next queue run...', 'autoptimize'); ?>';
             }
             if (nv.hash === 0 && filest != 0) {
-                type='<?php _e( 'MANUAL', 'autoptimize' ); ?>';
+                type='<?php _e('MANUAL', 'autoptimize'); ?>';
                 typeClass = 'manual';
             } else {
-                type='<?php _e( 'AUTO', 'autoptimize' ); ?>';
+                type='<?php _e('AUTO', 'autoptimize'); ?>';
                 typeClass = 'auto';
             }
             if (file && typeof file == 'string') {
@@ -77,7 +77,7 @@ 
             } else {
                 target = i.replace(/(woo_|template_|custom_post_|edd_|bp_|bbp_)/,'');
             }
-            jQuery("#rules-list").append("<tr class='rule "+k+"Rule'><td class='type'><span class='badge " + typeClass + "'>" + type + "</span>" + rmark + "</td><td class='target'>" + target + "</td><td class='file'>" + file + "</td><td class='btn edit'><span class=\"button-secondary\" id=\"" + nodeId + "_edit\"><?php _e( 'Edit', 'autoptimize' ); ?></span></td><td class='btn delete'><span class=\"button-secondary\" id=\"" + nodeId + "_remove\"><?php _e( 'Remove', 'autoptimize' ); ?></span></td></tr>");
+            jQuery("#rules-list").append("<tr class='rule "+k+"Rule'><td class='type'><span class='badge " + typeClass + "'>" + type + "</span>" + rmark + "</td><td class='target'>" + target + "</td><td class='file'>" + file + "</td><td class='btn edit'><span class=\"button-secondary\" id=\"" + nodeId + "_edit\"><?php _e('Edit', 'autoptimize'); ?></span></td><td class='btn delete'><span class=\"button-secondary\" id=\"" + nodeId + "_remove\"><?php _e('Remove', 'autoptimize'); ?></span></td></tr>");
             jQuery("#" + nodeId + "_edit").click(function(){addEditRow(this.id);});
             jQuery("#" + nodeId + "_remove").click(function(){confirmRemove(this.id);});
         })
@@ -90,12 +90,12 @@ 
         height:235,
         modal: true,
         buttons: {
-            "<?php _e( 'Delete', 'autoptimize' ); ?>": function() {
+            "<?php _e('Delete', 'autoptimize'); ?>": function() {
                 removeRow(idToRemove);
                 updateAfterChange();
                 jQuery( this ).dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery( this ).dialog( "close" );
             }
         }
@@ -108,14 +108,14 @@ 
         height:235,
         modal: true,
         buttons: {
-            "<?php _e( 'Delete All', 'autoptimize' ); ?>": function() {
+            "<?php _e('Delete All', 'autoptimize'); ?>": function() {
                 critCssArray={'paths':[],'types':[]};
                 drawTable(critCssArray);
                 updateAfterChange();
                 removeAllCcssFilesOnServer();
                 jQuery( this ).dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery( this ).dialog( "close" );
             }
         }
@@ -132,7 +132,7 @@ 
 
     var data = {
         'action': 'rm_critcss',
-        'critcss_rm_nonce': '<?php echo wp_create_nonce( 'rm_critcss_nonce' ); ?>',
+        'critcss_rm_nonce': '<?php echo wp_create_nonce('rm_critcss_nonce'); ?>',
         'cachebustingtimestamp': new Date().getTime(),
         'critcssfile': crit_file
     };
@@ -153,7 +153,7 @@ 
 function removeAllCcssFilesOnServer() {
     var data = {
         'action': 'rm_critcss_all',
-        'critcss_rm_all_nonce': '<?php echo wp_create_nonce( 'rm_critcss_all_nonce' ); ?>',
+        'critcss_rm_all_nonce': '<?php echo wp_create_nonce('rm_critcss_all_nonce'); ?>',
         'cachebustingtimestamp': new Date().getTime()
     };
 
@@ -173,7 +173,7 @@ 
 function addEditRow(idToEdit) {
     resetForm();
     if (idToEdit) {
-        dialogTitle="<?php _e( 'Edit Critical CSS Rule', 'autoptimize' ); ?>";
+        dialogTitle="<?php _e('Edit Critical CSS Rule', 'autoptimize'); ?>";
 
         splits=idToEdit.split(/_/);
         crit_type=splits[0];
@@ -184,7 +184,7 @@ 
         jQuery("#critcss_addedit_id").val(idToEdit);
         jQuery("#critcss_addedit_type").val(crit_type);
         jQuery("#critcss_addedit_file").val(crit_file);
-        jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'Loading critical CSS...', 'autoptimize' ); ?>");
+        jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('Loading critical CSS...', 'autoptimize'); ?>");
         jQuery("#critcss_addedit_type").attr("disabled",true);
 
         if (crit_type==="paths") {
@@ -199,7 +199,7 @@ 
 
         var data = {
             'action': 'fetch_critcss',
-            'critcss_fetch_nonce': '<?php echo wp_create_nonce( 'fetch_critcss_nonce' ); ?>',
+            'critcss_fetch_nonce': '<?php echo wp_create_nonce('fetch_critcss_nonce'); ?>',
             'cachebustingtimestamp': new Date().getTime(),
             'critcssfile': crit_file
         };
@@ -213,7 +213,7 @@ 
             }
         });
     } else {
-        dialogTitle="<?php _e( 'Add Critical CSS Rule', 'autotimize' ); ?>";
+        dialogTitle="<?php _e('Add Critical CSS Rule', 'autotimize'); ?>";
 
         // default: paths, hide content type field
         jQuery("#critcss_addedit_type").val("paths");
@@ -224,11 +224,11 @@ 
             if(this.value==="types") {
                 jQuery("#critcss_addedit_pagetype_wrapper").show();
                 jQuery("#critcss_addedit_path_wrapper").hide();
-                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For type based rules, paste your specific and minified critical CSS here and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\".', 'autoptimize' ); ?>");
+                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For type based rules, paste your specific and minified critical CSS here and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\".', 'autoptimize'); ?>");
             } else {
                 jQuery("#critcss_addedit_path_wrapper").show();
                 jQuery("#critcss_addedit_pagetype_wrapper").hide();
-                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize' ); ?>");
+                jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize'); ?>");
             }
         });
     }
@@ -240,21 +240,21 @@ 
         title: dialogTitle,
         modal: true,
         buttons: {
-            "<?php _e( 'Submit', 'autoptimize' ); ?>": function() {
+            "<?php _e('Submit', 'autoptimize'); ?>": function() {
                 rpath = jQuery("#critcss_addedit_path").val();
                 rtype = jQuery("#critcss_addedit_pagetype option:selected").val();
                 rccss = jQuery("#critcss_addedit_css").val();
                 console.log('rpath: ' + rpath, 'rtype: ' + rtype, 'rccss: ' + rccss);
                 if (rpath === '' && rtype === '') {
-                    alert('<?php _e( "RULE VALIDATION ERROR!\\n\\nBased on your rule type, you SHOULD set a path or conditional tag.", 'autoptimize' ); ?>');
+                    alert('<?php _e("RULE VALIDATION ERROR!\\n\\nBased on your rule type, you SHOULD set a path or conditional tag.", 'autoptimize'); ?>');
                 } else if (rtype !== '' && rccss == '') {
-                    alert('<?php _e( "RULE VALIDATION ERROR!\\n\\nType based rules REQUIRES a minified critical CSS.", 'autoptimize' ); ?>');
+                    alert('<?php _e("RULE VALIDATION ERROR!\\n\\nType based rules REQUIRES a minified critical CSS.", 'autoptimize'); ?>');
                 } else {
                     saveEditCritCss();
                     jQuery(this).dialog('close');
                 }
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 resetForm();
                 jQuery(this).dialog("close");
             }
@@ -268,15 +268,15 @@ 
         autoOpen: true,
         height: 505,
         width: 700,
-        title: "<?php _e( 'Default Critical CSS', 'autoptimize' ); ?>",
+        title: "<?php _e('Default Critical CSS', 'autoptimize'); ?>",
         modal: true,
         buttons: {
-            "<?php _e( 'Submit', 'autoptimize' ); ?>": function() {
+            "<?php _e('Submit', 'autoptimize'); ?>": function() {
                 document.getElementById("autoptimize_css_defer_inline").value=document.getElementById("dummyDefault").value;
                 jQuery("#unSavedWarning").show();
                 jQuery("#default_critcss_wrapper").dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery("#default_critcss_wrapper").dialog( "close" );
             }
         }
@@ -289,15 +289,15 @@ 
         autoOpen: true,
         height: 505,
         width: 700,
-        title: "<?php _e( 'Additional Critical CSS', 'autoptimize' ); ?>",
+        title: "<?php _e('Additional Critical CSS', 'autoptimize'); ?>",
         modal: true,
         buttons: {
-            "<?php _e( 'Submit', 'autoptimize' ); ?>": function() {
+            "<?php _e('Submit', 'autoptimize'); ?>": function() {
                 document.getElementById("autoptimize_ccss_additional").value=document.getElementById("dummyAdditional").value;
                 jQuery("#unSavedWarning").show();
                 jQuery("#additional_critcss_wrapper").dialog( "close" );
             },
-            "<?php _e( 'Cancel', 'autoptimize' ); ?>": function() {
+            "<?php _e('Cancel', 'autoptimize'); ?>": function() {
                 jQuery("#additional_critcss_wrapper").dialog( "close" );
             }
         }
@@ -333,7 +333,7 @@ 
     critCssArray[critcsstype][critcsstarget].file=critcssfile;
 
     <?php
-    if ( $ao_ccss_debug ) {
+    if ($ao_ccss_debug) {
         echo "console.log('[RULE PROPERTIES] Type:', critcsstype, ', Target:', critcsstarget, ', Hash:', 0, ', File:',  critcssfile);";
     }
     ?>
@@ -342,7 +342,7 @@ 
 
     var data = {
         'action': 'save_critcss',
-        'critcss_save_nonce': '<?php echo wp_create_nonce( 'save_critcss_nonce' ); ?>',
+        'critcss_save_nonce': '<?php echo wp_create_nonce('save_critcss_nonce'); ?>',
         'critcssfile': critcssfile,
         'critcsscontents': critcsscontents
     };
@@ -367,7 +367,7 @@ 
 }
 
 function resetForm() {
-    jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e( 'For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize' ); ?>");
+    jQuery("#critcss_addedit_css").attr("placeholder", "<?php _e('For path based rules, paste your specific and minified critical CSS here or leave this empty to fetch it from criticalcss.com and hit submit to save. If you want to create a rule to exclude from critical CSS injection, enter \"none\"', 'autoptimize'); ?>");
     jQuery("#critcss_addedit_type").attr("disabled",false);
     jQuery("#critcss_addedit_path_wrapper").show();
     jQuery("#critcss_addedit_id").val("");

classes/critcss-inc/admin_settings_queue.php

Spacing +24 added lines, -24 removed lines

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

classes/critcss-inc/admin_settings_explain.php

Spacing +11 added lines, -11 removed lines

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