futtta / autoptimize

classes/autoptimizeUtils.php

Spacing +88 added lines, -88 removed lines

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

classes/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_key.php

Spacing +10 added lines, -10 removed lines

@@ -12,27 +12,27 @@ 
  * @param string $message      Message.
  * @param string $color        Color to highlight message in.
  */
-function ao_ccss_render_key( $key, $status, $status_msg, $message, $color ) {
-    if ( defined( 'AUTOPTIMIZE_CRITICALCSS_API_KEY' ) ) {
-        $key = __( 'API key provided by your host/ WordPress administrator, no need to enter anything here. In case of problems with the API key, contact your host/ WordPress administrator.', 'autoptimize' );
+function ao_ccss_render_key($key, $status, $status_msg, $message, $color) {
+    if (defined('AUTOPTIMIZE_CRITICALCSS_API_KEY')) {
+        $key = __('API key provided by your host/ WordPress administrator, no need to enter anything here. In case of problems with the API key, contact your host/ WordPress administrator.', 'autoptimize');
     }
     ?>
     <ul id="key-panel">
         <li class="itemDetail">
-            <h2 class="itemTitle fleft"><?php _e( 'API Key', 'autoptimize' ); ?>: <span style="color:<?php echo $color; ?>;"><?php echo $status_msg; ?></span></h2>
+            <h2 class="itemTitle fleft"><?php _e('API Key', 'autoptimize'); ?>: <span style="color:<?php echo $color; ?>;"><?php echo $status_msg; ?></span></h2>
             <button type="button" class="toggle-btn">
-                <?php if ( 'valid' != $status ) { ?>
+                <?php if ('valid' != $status) { ?>
                     <span class="toggle-indicator dashicons dashicons-arrow-up"></span>
                 <?php } else { ?>
                     <span class="toggle-indicator dashicons dashicons-arrow-up dashicons-arrow-down"></span>
                 <?php } ?>
             </button>
-            <?php if ( 'valid' != $status ) { ?>
+            <?php if ('valid' != $status) { ?>
                 <div class="collapsible">
             <?php } else { ?>
                 <div class="collapsible hidden">
             <?php } ?>
-            <?php if ( 'valid' != $status ) { ?>
+            <?php if ('valid' != $status) { ?>
                 <div style="clear:both;padding:2px 10px;border-left:solid;border-left-width:5px;border-left-color:<?php echo $color; ?>;background-color:white;">
                     <p><?php echo $message; ?></p>
                 </div>
@@ -40,12 +40,12 @@ 
                 <table id="key" class="form-table">
                     <tr>
                         <th scope="row">
-                            <?php _e( 'Your API Key', 'autoptimize' ); ?>
+                            <?php _e('Your API Key', 'autoptimize'); ?>
                         </th>
                         <td>
-                            <textarea id="autoptimize_ccss_key" name="autoptimize_ccss_key" rows='3' style="width:100%;" placeholder="<?php _e( 'Please enter your criticalcss.com API key here.', 'autoptimize' ); ?>"><?php echo trim( $key ); ?></textarea>
+                            <textarea id="autoptimize_ccss_key" name="autoptimize_ccss_key" rows='3' style="width:100%;" placeholder="<?php _e('Please enter your criticalcss.com API key here.', 'autoptimize'); ?>"><?php echo trim($key); ?></textarea>
                             <p class="notes">
-                                <?php _e( 'Enter your <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> API key above. The key is revalidated every time a new job is sent to it.<br />To obtain your API key, go to <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> > Account > API Keys.<br />Requests to generate a critical CSS via the API are priced at £5 per domain per month.<br /><strong>Not sure yet? With the <a href="https://criticalcss.com/faq/?aff=1#trial" target="_blank">30 day money back guarantee</a>, you have nothing to lose!</strong>', 'autoptimize' ); ?>
+                                <?php _e('Enter your <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> API key above. The key is revalidated every time a new job is sent to it.<br />To obtain your API key, go to <a href="https://criticalcss.com/account/api-keys?aff=1" target="_blank">criticalcss.com</a> > Account > API Keys.<br />Requests to generate a critical CSS via the API are priced at £5 per domain per month.<br /><strong>Not sure yet? With the <a href="https://criticalcss.com/faq/?aff=1#trial" target="_blank">30 day money back guarantee</a>, you have nothing to lose!</strong>', 'autoptimize'); ?>
                             </p>
                         </td>
                     </tr>

classes/critcss-inc/admin_settings_queue.php

Spacing +24 added lines, -24 removed lines

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

classes/critcss-inc/admin_settings_explain.php

Spacing +11 added lines, -11 removed lines

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

classes/autoptimizeStyles.php

Spacing +345 added lines, -345 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', $options['defer_inline'], $this->content );
+        $this->defer_inline = apply_filters('autoptimize_filter_css_defer_inline', $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,19 +1260,19 @@ 
         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];
     }
 }

classes/autoptimizeScripts.php

Spacing +177 added lines, -177 removed lines

@@ -3,7 +3,7 @@ 
  * Class for JS optimization.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -198,128 +198,128 @@ 
      *
      * @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;
         }
 
         // 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 {
@@ -327,11 +327,11 @@ 
                         $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);
                                 }
                             }
                         }
@@ -339,14 +339,14 @@ 
                         // 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 = '';
@@ -354,17 +354,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).
@@ -373,23 +373,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;
@@ -400,11 +400,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;
@@ -429,30 +429,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;
         }
 
@@ -464,75 +464,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;
     }
 
@@ -541,13 +541,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);
     }
 
     /**
@@ -556,47 +556,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;
@@ -607,34 +607,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;
                 }
@@ -650,25 +650,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;
             }
@@ -678,14 +678,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;
             }
@@ -705,12 +705,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 {
@@ -737,35 +737,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/autoptimizeExtra.php

Spacing +198 added lines, -198 removed lines

@@ -3,7 +3,7 @@ 
  * Handles autoptimizeExtra frontend features + admin options page
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -28,9 +28,9 @@ 
      *
      * @param array $options Optional. Allows overriding options without having to specify them via admin options page.
      */
-    public function __construct( $options = array() )
+    public function __construct($options = array())
     {
-        if ( empty( $options ) ) {
+        if (empty($options)) {
             $options = self::fetch_options();
         }
 
@@ -47,7 +47,7 @@ 
      */
     public static function instance()
     {
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new self();
         }
 
@@ -56,19 +56,19 @@ 
 
     public function run()
     {
-        if ( is_admin() ) {
-            if ( is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network() ) {
-                add_action( 'network_admin_menu', array( $this, 'admin_menu' ) );
+        if (is_admin()) {
+            if (is_multisite() && is_network_admin() && autoptimizeOptionWrapper::is_ao_active_for_network()) {
+                add_action('network_admin_menu', array($this, 'admin_menu'));
             } else {
-                add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+                add_action('admin_menu', array($this, 'admin_menu'));
             }
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_extra_tab' ) );
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_extra_tab'));
         } else {
-            add_action( 'wp', array( $this, 'run_on_frontend' ) );
+            add_action('wp', array($this, 'run_on_frontend'));
         }
     }
 
-    public function set_options( array $options )
+    public function set_options(array $options)
     {
         $this->options = $options;
 
@@ -77,8 +77,8 @@ 
 
     public static function fetch_options()
     {
-        $value = autoptimizeOptionWrapper::get_option( 'autoptimize_extra_settings' );
-        if ( empty( $value ) ) {
+        $value = autoptimizeOptionWrapper::get_option('autoptimize_extra_settings');
+        if (empty($value)) {
             // Fallback to returning defaults when no stored option exists yet.
             $value = autoptimizeConfig::get_ao_extra_default_options();
         }
@@ -89,55 +89,55 @@ 
     public function disable_emojis()
     {
         // Removing all actions related to emojis!
-        remove_action( 'admin_print_styles', 'print_emoji_styles' );
-        remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
-        remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
-        remove_action( 'wp_print_styles', 'print_emoji_styles' );
-        remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
-        remove_filter( 'the_content_feed', 'wp_staticize_emoji' );
-        remove_filter( 'comment_text_rss', 'wp_staticize_emoji' );
+        remove_action('admin_print_styles', 'print_emoji_styles');
+        remove_action('wp_head', 'print_emoji_detection_script', 7);
+        remove_action('admin_print_scripts', 'print_emoji_detection_script');
+        remove_action('wp_print_styles', 'print_emoji_styles');
+        remove_filter('wp_mail', 'wp_staticize_emoji_for_email');
+        remove_filter('the_content_feed', 'wp_staticize_emoji');
+        remove_filter('comment_text_rss', 'wp_staticize_emoji');
 
         // Removes TinyMCE emojis.
-        add_filter( 'tiny_mce_plugins', array( $this, 'filter_disable_emojis_tinymce' ) );
+        add_filter('tiny_mce_plugins', array($this, 'filter_disable_emojis_tinymce'));
 
         // Removes emoji dns-preftech.
-        add_filter( 'wp_resource_hints', array( $this, 'filter_remove_emoji_dns_prefetch' ), 10, 2 );
+        add_filter('wp_resource_hints', array($this, 'filter_remove_emoji_dns_prefetch'), 10, 2);
     }
 
-    public function filter_disable_emojis_tinymce( $plugins )
+    public function filter_disable_emojis_tinymce($plugins)
     {
-        if ( is_array( $plugins ) ) {
-            return array_diff( $plugins, array( 'wpemoji' ) );
+        if (is_array($plugins)) {
+            return array_diff($plugins, array('wpemoji'));
         } else {
             return array();
         }
     }
 
-    public function filter_remove_qs( $src )
+    public function filter_remove_qs($src)
     {
-        if ( strpos( $src, '?ver=' ) ) {
-            $src = remove_query_arg( 'ver', $src );
+        if (strpos($src, '?ver=')) {
+            $src = remove_query_arg('ver', $src);
         }
 
         return $src;
     }
 
-    public function extra_async_js( $in )
+    public function extra_async_js($in)
     {
         $exclusions = array();
-        if ( ! empty( $in ) ) {
-            $exclusions = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $in ) ) ), '' );
+        if (!empty($in)) {
+            $exclusions = array_fill_keys(array_filter(array_map('trim', explode(',', $in))), '');
         }
 
         $settings = $this->options['autoptimize_extra_text_field_3'];
-        $async    = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $settings ) ) ), '' );
-        $attr     = apply_filters( 'autoptimize_filter_extra_async', 'async' );
-        foreach ( $async as $k => $v ) {
-            $async[ $k ] = $attr;
+        $async    = array_fill_keys(array_filter(array_map('trim', explode(',', $settings))), '');
+        $attr     = apply_filters('autoptimize_filter_extra_async', 'async');
+        foreach ($async as $k => $v) {
+            $async[$k] = $attr;
         }
 
         // Merge exclusions & asyncs in one array and return to AO API.
-        $merged = array_merge( $exclusions, $async );
+        $merged = array_merge($exclusions, $async);
 
         return $merged;
     }
@@ -148,68 +148,68 @@ 
         // for optimizations are met, this to ensure e.g. removing querystrings
         // is not done when optimizing for logged in users is off, breaking
         // some pagebuilders (Divi & Elementor).
-        if ( false === autoptimizeMain::should_buffer() ) {
+        if (false === autoptimizeMain::should_buffer()) {
             return;
         }
 
         $options = $this->options;
 
         // Disable emojis if specified.
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) ) {
+        if (!empty($options['autoptimize_extra_checkbox_field_1'])) {
             $this->disable_emojis();
         }
 
         // Remove version query parameters.
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) ) {
-            add_filter( 'script_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 );
-            add_filter( 'style_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 );
+        if (!empty($options['autoptimize_extra_checkbox_field_0'])) {
+            add_filter('script_loader_src', array($this, 'filter_remove_qs'), 15, 1);
+            add_filter('style_loader_src', array($this, 'filter_remove_qs'), 15, 1);
         }
 
         // Avoiding conflicts of interest when async-javascript plugin is active!
-        $async_js_plugin_active = autoptimizeUtils::is_plugin_active( 'async-javascript/async-javascript.php' );
-        if ( ! empty( $options['autoptimize_extra_text_field_3'] ) && ! $async_js_plugin_active ) {
-            add_filter( 'autoptimize_filter_js_exclude', array( $this, 'extra_async_js' ), 10, 1 );
+        $async_js_plugin_active = autoptimizeUtils::is_plugin_active('async-javascript/async-javascript.php');
+        if (!empty($options['autoptimize_extra_text_field_3']) && !$async_js_plugin_active) {
+            add_filter('autoptimize_filter_js_exclude', array($this, 'extra_async_js'), 10, 1);
         }
 
         // Optimize google fonts!
-        if ( ! empty( $options['autoptimize_extra_radio_field_4'] ) && ( '1' !== $options['autoptimize_extra_radio_field_4'] ) ) {
-            add_filter( 'wp_resource_hints', array( $this, 'filter_remove_gfonts_dnsprefetch' ), 10, 2 );
-            add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_google_fonts' ), 10, 1 );
-            add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_google_fonts' ), 10, 1 );
+        if (!empty($options['autoptimize_extra_radio_field_4']) && ('1' !== $options['autoptimize_extra_radio_field_4'])) {
+            add_filter('wp_resource_hints', array($this, 'filter_remove_gfonts_dnsprefetch'), 10, 2);
+            add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_google_fonts'), 10, 1);
+            add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_google_fonts'), 10, 1);
         }
 
         // Preconnect!
-        if ( ! empty( $options['autoptimize_extra_text_field_2'] ) || has_filter( 'autoptimize_extra_filter_tobepreconn' ) ) {
-            add_filter( 'wp_resource_hints', array( $this, 'filter_preconnect' ), 10, 2 );
+        if (!empty($options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn')) {
+            add_filter('wp_resource_hints', array($this, 'filter_preconnect'), 10, 2);
         }
 
         // Preload!
-        if ( ! empty( $options['autoptimize_extra_text_field_7'] ) || has_filter( 'autoptimize_filter_extra_tobepreloaded' ) ) {
-            add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_preload' ), 10, 2 );
+        if (!empty($options['autoptimize_extra_text_field_7']) || has_filter('autoptimize_filter_extra_tobepreloaded')) {
+            add_filter('autoptimize_html_after_minify', array($this, 'filter_preload'), 10, 2);
         }
     }
 
-    public function filter_remove_emoji_dns_prefetch( $urls, $relation_type )
+    public function filter_remove_emoji_dns_prefetch($urls, $relation_type)
     {
-        $emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/' );
+        $emoji_svg_url = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/');
 
-        return $this->filter_remove_dns_prefetch( $urls, $relation_type, $emoji_svg_url );
+        return $this->filter_remove_dns_prefetch($urls, $relation_type, $emoji_svg_url);
     }
 
-    public function filter_remove_gfonts_dnsprefetch( $urls, $relation_type )
+    public function filter_remove_gfonts_dnsprefetch($urls, $relation_type)
     {
-        return $this->filter_remove_dns_prefetch( $urls, $relation_type, 'fonts.googleapis.com' );
+        return $this->filter_remove_dns_prefetch($urls, $relation_type, 'fonts.googleapis.com');
     }
 
-    public function filter_remove_dns_prefetch( $urls, $relation_type, $url_to_remove )
+    public function filter_remove_dns_prefetch($urls, $relation_type, $url_to_remove)
     {
         $url_to_remove = (string) $url_to_remove;
 
-        if ( ! empty( $url_to_remove ) && 'dns-prefetch' === $relation_type ) {
+        if (!empty($url_to_remove) && 'dns-prefetch' === $relation_type) {
             $cnt = 0;
-            foreach ( $urls as $url ) {
-                if ( false !== strpos( $url, $url_to_remove ) ) {
-                    unset( $urls[ $cnt ] );
+            foreach ($urls as $url) {
+                if (false !== strpos($url, $url_to_remove)) {
+                    unset($urls[$cnt]);
                 }
                 $cnt++;
             }
@@ -218,151 +218,151 @@ 
         return $urls;
     }
 
-    public function filter_optimize_google_fonts( $in )
+    public function filter_optimize_google_fonts($in)
     {
         // Extract fonts, partly based on wp rocket's extraction code.
-        $markup = preg_replace( '/<!--(.*)-->/Uis', '', $in );
-        preg_match_all( '#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches );
+        $markup = preg_replace('/<!--(.*)-->/Uis', '', $in);
+        preg_match_all('#<link(?:\s+(?:(?!href\s*=\s*)[^>])+)?(?:\s+href\s*=\s*([\'"])((?:https?:)?\/\/fonts\.googleapis\.com\/css(?:(?!\1).)+)\1)(?:\s+[^>]*)?>#iU', $markup, $matches);
 
         $fonts_collection = array();
-        if ( ! $matches[2] ) {
+        if (!$matches[2]) {
             return $in;
         }
 
         // Store them in $fonts array.
         $i = 0;
-        foreach ( $matches[2] as $font ) {
-            if ( ! preg_match( '/rel=["\']dns-prefetch["\']/', $matches[0][ $i ] ) ) {
+        foreach ($matches[2] as $font) {
+            if (!preg_match('/rel=["\']dns-prefetch["\']/', $matches[0][$i])) {
                 // Get fonts name.
-                $font = str_replace( array( '%7C', '%7c' ), '|', $font );
-                if ( strpos( $font, 'fonts.googleapis.com/css2' ) !== false ) {
+                $font = str_replace(array('%7C', '%7c'), '|', $font);
+                if (strpos($font, 'fonts.googleapis.com/css2') !== false) {
                     // (Somewhat) change Google Fonts APIv2 syntax back to v1.
-                    $font = str_replace( array( 'wght@', 'wght%40', ';', '%3B' ), array( '', '', ',', ',' ), $font );
+                    $font = str_replace(array('wght@', 'wght%40', ';', '%3B'), array('', '', ',', ','), $font);
                 }
-                $font = explode( 'family=', $font );
-                $font = ( isset( $font[1] ) ) ? explode( '&', $font[1] ) : array();
+                $font = explode('family=', $font);
+                $font = (isset($font[1])) ? explode('&', $font[1]) : array();
                 // Add font to $fonts[$i] but make sure not to pollute with an empty family!
-                $_thisfont = array_values( array_filter( explode( '|', reset( $font ) ) ) );
-                if ( ! empty( $_thisfont ) ) {
-                    $fonts_collection[ $i ]['fonts'] = $_thisfont;
+                $_thisfont = array_values(array_filter(explode('|', reset($font))));
+                if (!empty($_thisfont)) {
+                    $fonts_collection[$i]['fonts'] = $_thisfont;
                     // And add subset if any!
-                    $subset = ( is_array( $font ) ) ? end( $font ) : '';
-                    if ( false !== strpos( $subset, 'subset=' ) ) {
-                        $subset                            = str_replace( array( '%2C', '%2c' ), ',', $subset );
-                        $subset                            = explode( 'subset=', $subset );
-                        $fonts_collection[ $i ]['subsets'] = explode( ',', $subset[1] );
+                    $subset = (is_array($font)) ? end($font) : '';
+                    if (false !== strpos($subset, 'subset=')) {
+                        $subset                            = str_replace(array('%2C', '%2c'), ',', $subset);
+                        $subset                            = explode('subset=', $subset);
+                        $fonts_collection[$i]['subsets'] = explode(',', $subset[1]);
                     }
                 }
                 // And remove Google Fonts.
-                $in = str_replace( $matches[0][ $i ], '', $in );
+                $in = str_replace($matches[0][$i], '', $in);
             }
             $i++;
         }
 
         $options      = $this->options;
         $fonts_markup = '';
-        if ( '2' === $options['autoptimize_extra_radio_field_4'] ) {
+        if ('2' === $options['autoptimize_extra_radio_field_4']) {
             // Remove Google Fonts.
-            unset( $fonts_collection );
+            unset($fonts_collection);
             return $in;
-        } elseif ( '3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4'] ) {
+        } elseif ('3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4']) {
             // Aggregate & link!
             $fonts_string  = '';
             $subset_string = '';
-            foreach ( $fonts_collection as $font ) {
-                $fonts_string .= '|' . trim( implode( '|', $font['fonts'] ), '|' );
-                if ( ! empty( $font['subsets'] ) ) {
-                    $subset_string .= ',' . trim( implode( ',', $font['subsets'] ), ',' );
+            foreach ($fonts_collection as $font) {
+                $fonts_string .= '|'.trim(implode('|', $font['fonts']), '|');
+                if (!empty($font['subsets'])) {
+                    $subset_string .= ','.trim(implode(',', $font['subsets']), ',');
                 }
             }
 
-            if ( ! empty( $subset_string ) ) {
-                $subset_string = str_replace( ',', '%2C', ltrim( $subset_string, ',' ) );
-                $fonts_string  = $fonts_string . '&#038;subset=' . $subset_string;
+            if (!empty($subset_string)) {
+                $subset_string = str_replace(',', '%2C', ltrim($subset_string, ','));
+                $fonts_string  = $fonts_string.'&#038;subset='.$subset_string;
             }
 
-            $fonts_string = apply_filters( 'autoptimize_filter_extra_gfont_fontstring', str_replace( '|', '%7C', ltrim( $fonts_string, '|' ) ) );
+            $fonts_string = apply_filters('autoptimize_filter_extra_gfont_fontstring', str_replace('|', '%7C', ltrim($fonts_string, '|')));
             // only add display parameter if there is none in $fonts_string (by virtue of the filter).
-            if ( strpos( $fonts_string, 'display=' ) === false ) {
-                $fonts_string .= apply_filters( 'autoptimize_filter_extra_gfont_display', '&amp;display=swap' );
+            if (strpos($fonts_string, 'display=') === false) {
+                $fonts_string .= apply_filters('autoptimize_filter_extra_gfont_display', '&amp;display=swap');
             }
 
-            if ( ! empty( $fonts_string ) ) {
-                if ( '5' === $options['autoptimize_extra_radio_field_4'] ) {
-                    $rel_string = 'rel="stylesheet" media="print" onload="' . autoptimizeConfig::get_ao_css_preload_onload() . '"';
+            if (!empty($fonts_string)) {
+                if ('5' === $options['autoptimize_extra_radio_field_4']) {
+                    $rel_string = 'rel="stylesheet" media="print" onload="'.autoptimizeConfig::get_ao_css_preload_onload().'"';
                 } else {
                     $rel_string = 'rel="stylesheet"';
                 }
-                $fonts_markup = '<link ' . $rel_string . ' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family=' . $fonts_string . '" />';
+                $fonts_markup = '<link '.$rel_string.' id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family='.$fonts_string.'" />';
             }
-        } elseif ( '4' === $options['autoptimize_extra_radio_field_4'] ) {
+        } elseif ('4' === $options['autoptimize_extra_radio_field_4']) {
             // Aggregate & load async (webfont.js impl.)!
             $fonts_array = array();
-            foreach ( $fonts_collection as $_fonts ) {
-                if ( ! empty( $_fonts['subsets'] ) ) {
-                    $_subset = implode( ',', $_fonts['subsets'] );
-                    foreach ( $_fonts['fonts'] as $key => $_one_font ) {
-                        $_one_font               = $_one_font . ':' . $_subset;
-                        $_fonts['fonts'][ $key ] = $_one_font;
+            foreach ($fonts_collection as $_fonts) {
+                if (!empty($_fonts['subsets'])) {
+                    $_subset = implode(',', $_fonts['subsets']);
+                    foreach ($_fonts['fonts'] as $key => $_one_font) {
+                        $_one_font               = $_one_font.':'.$_subset;
+                        $_fonts['fonts'][$key] = $_one_font;
                     }
                 }
-                $fonts_array = array_merge( $fonts_array, $_fonts['fonts'] );
+                $fonts_array = array_merge($fonts_array, $_fonts['fonts']);
             }
 
-            $fonts_array = array_map( 'urldecode', $fonts_array );
+            $fonts_array = array_map('urldecode', $fonts_array);
             $fonts_array = array_map(
-                function( $_f ) {
-                    return trim( $_f, ',' );
+                function($_f) {
+                    return trim($_f, ',');
                 },
                 $fonts_array
             );
 
             // type attrib on <script not added by default.
             $type_js = '';
-            if ( apply_filters( 'autoptimize_filter_cssjs_addtype', false ) ) {
+            if (apply_filters('autoptimize_filter_cssjs_addtype', false)) {
                 $type_js = 'type="text/javascript" ';
             }
 
-            $fonts_markup         = '<script ' . $type_js . 'data-cfasync="false" id="ao_optimized_gfonts_config">WebFontConfig={google:{families:' . wp_json_encode( $fonts_array ) . ' },classes:false, events:false, timeout:1500};</script>';
-            $fonts_library_markup = '<script ' . $type_js . 'data-cfasync="false" id="ao_optimized_gfonts_webfontloader">(function() {var wf = document.createElement(\'script\');wf.src=\'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js\';wf.type=\'text/javascript\';wf.async=\'true\';var s=document.getElementsByTagName(\'script\')[0];s.parentNode.insertBefore(wf, s);})();</script>';
-            $in                   = substr_replace( $in, $fonts_library_markup . '</head>', strpos( $in, '</head>' ), strlen( '</head>' ) );
+            $fonts_markup         = '<script '.$type_js.'data-cfasync="false" id="ao_optimized_gfonts_config">WebFontConfig={google:{families:'.wp_json_encode($fonts_array).' },classes:false, events:false, timeout:1500};</script>';
+            $fonts_library_markup = '<script '.$type_js.'data-cfasync="false" id="ao_optimized_gfonts_webfontloader">(function() {var wf = document.createElement(\'script\');wf.src=\'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js\';wf.type=\'text/javascript\';wf.async=\'true\';var s=document.getElementsByTagName(\'script\')[0];s.parentNode.insertBefore(wf, s);})();</script>';
+            $in                   = substr_replace($in, $fonts_library_markup.'</head>', strpos($in, '</head>'), strlen('</head>'));
         }
 
         // Replace back in markup.
-        $inject_point = apply_filters( 'autoptimize_filter_extra_gfont_injectpoint', '<link' );
-        $out          = substr_replace( $in, $fonts_markup . $inject_point, strpos( $in, $inject_point ), strlen( $inject_point ) );
-        unset( $fonts_collection );
+        $inject_point = apply_filters('autoptimize_filter_extra_gfont_injectpoint', '<link');
+        $out          = substr_replace($in, $fonts_markup.$inject_point, strpos($in, $inject_point), strlen($inject_point));
+        unset($fonts_collection);
 
         return $out;
     }
 
-    public function filter_preconnect( $hints, $relation_type )
+    public function filter_preconnect($hints, $relation_type)
     {
         $options  = $this->options;
         $preconns = array();
 
         // Get settings and store in array.
-        if ( array_key_exists( 'autoptimize_extra_text_field_2', $options ) ) {
-            $preconns = array_filter( array_map( 'trim', explode( ',', $options['autoptimize_extra_text_field_2'] ) ) );
+        if (array_key_exists('autoptimize_extra_text_field_2', $options)) {
+            $preconns = array_filter(array_map('trim', explode(',', $options['autoptimize_extra_text_field_2'])));
         }
-        $preconns = apply_filters( 'autoptimize_extra_filter_tobepreconn', $preconns );
+        $preconns = apply_filters('autoptimize_extra_filter_tobepreconn', $preconns);
 
         // Walk array, extract domain and add to new array with crossorigin attribute.
-        foreach ( $preconns as $preconn ) {
+        foreach ($preconns as $preconn) {
             $domain = '';
-            $parsed = parse_url( $preconn );
-            if ( is_array( $parsed ) && ! empty( $parsed['host'] ) && empty( $parsed['scheme'] ) ) {
-                $domain = '//' . $parsed['host'];
-            } elseif ( is_array( $parsed ) && ! empty( $parsed['host'] ) ) {
-                $domain = $parsed['scheme'] . '://' . $parsed['host'];
+            $parsed = parse_url($preconn);
+            if (is_array($parsed) && !empty($parsed['host']) && empty($parsed['scheme'])) {
+                $domain = '//'.$parsed['host'];
+            } elseif (is_array($parsed) && !empty($parsed['host'])) {
+                $domain = $parsed['scheme'].'://'.$parsed['host'];
             }
 
-            if ( ! empty( $domain ) ) {
-                $hint = array( 'href' => $domain );
+            if (!empty($domain)) {
+                $hint = array('href' => $domain);
                 // Fonts don't get preconnected unless crossorigin flag is set, non-fonts don't get preconnected if origin flag is set
                 // so hardcode fonts.gstatic.com to come with crossorigin and have filter to add other domains if needed.
-                $crossorigins = apply_filters( 'autoptimize_extra_filter_preconn_crossorigin', array( 'https://fonts.gstatic.com' ) );
-                if ( in_array( $domain, $crossorigins ) ) {
+                $crossorigins = apply_filters('autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com'));
+                if (in_array($domain, $crossorigins)) {
                     $hint['crossorigin'] = 'anonymous';
                 }
                 $new_hints[] = $hint;
@@ -370,21 +370,21 @@ 
         }
 
         // Merge in WP's preconnect hints.
-        if ( 'preconnect' === $relation_type && ! empty( $new_hints ) ) {
-            $hints = array_merge( $hints, $new_hints );
+        if ('preconnect' === $relation_type && !empty($new_hints)) {
+            $hints = array_merge($hints, $new_hints);
         }
 
         return $hints;
     }
 
-    public function filter_preconnect_google_fonts( $in )
+    public function filter_preconnect_google_fonts($in)
     {
-        if ( '2' !== $this->options['autoptimize_extra_radio_field_4'] ) {
+        if ('2' !== $this->options['autoptimize_extra_radio_field_4']) {
             // Preconnect to fonts.gstatic.com unless we remove gfonts.
             $in[] = 'https://fonts.gstatic.com';
         }
 
-        if ( '4' === $this->options['autoptimize_extra_radio_field_4'] ) {
+        if ('4' === $this->options['autoptimize_extra_radio_field_4']) {
             // Preconnect even more hosts for webfont.js!
             $in[] = 'https://ajax.googleapis.com';
             $in[] = 'https://fonts.googleapis.com';
@@ -393,76 +393,76 @@ 
         return $in;
     }
 
-    public function filter_preload( $in ) {
+    public function filter_preload($in) {
         // make array from comma separated list.
         $options  = $this->options;
         $preloads = array();
-        if ( array_key_exists( 'autoptimize_extra_text_field_7', $options ) ) {
-            $preloads = array_filter( array_map( 'trim', explode( ',', $options['autoptimize_extra_text_field_7'] ) ) );
+        if (array_key_exists('autoptimize_extra_text_field_7', $options)) {
+            $preloads = array_filter(array_map('trim', explode(',', $options['autoptimize_extra_text_field_7'])));
         }
-        $preloads = apply_filters( 'autoptimize_filter_extra_tobepreloaded', $preloads );
+        $preloads = apply_filters('autoptimize_filter_extra_tobepreloaded', $preloads);
 
         // immediately return if nothing to be preloaded.
-        if ( empty( $preloads ) ) {
+        if (empty($preloads)) {
             return $in;
         }
 
         // iterate through array and add preload link to tmp string.
         $preload_output = '';
-        foreach ( $preloads as $preload ) {
+        foreach ($preloads as $preload) {
             $crossorigin = '';
             $preload_as  = '';
             $mime_type   = '';
-            $_preload    = strtok( $preload, '?' );
+            $_preload    = strtok($preload, '?');
 
-            if ( autoptimizeUtils::str_ends_in( $_preload, '.css' ) ) {
+            if (autoptimizeUtils::str_ends_in($_preload, '.css')) {
                 $preload_as = 'style';
-            } elseif ( autoptimizeUtils::str_ends_in( $_preload, '.js' ) ) {
+            } elseif (autoptimizeUtils::str_ends_in($_preload, '.js')) {
                 $preload_as = 'script';
-            } elseif ( autoptimizeUtils::str_ends_in( $_preload, '.woff' ) || autoptimizeUtils::str_ends_in( $_preload, '.woff2' ) || autoptimizeUtils::str_ends_in( $_preload, '.ttf' ) || autoptimizeUtils::str_ends_in( $_preload, '.eot' ) ) {
+            } elseif (autoptimizeUtils::str_ends_in($_preload, '.woff') || autoptimizeUtils::str_ends_in($_preload, '.woff2') || autoptimizeUtils::str_ends_in($_preload, '.ttf') || autoptimizeUtils::str_ends_in($_preload, '.eot')) {
                 $preload_as  = 'font';
                 $crossorigin = ' crossorigin';
-                $mime_type   = ' type="font/' . pathinfo( $_preload, PATHINFO_EXTENSION ) . '"';
-                if ( ' type="font/eot"' === $mime_type ) {
+                $mime_type   = ' type="font/'.pathinfo($_preload, PATHINFO_EXTENSION).'"';
+                if (' type="font/eot"' === $mime_type) {
                     $mime_type = 'application/vnd.ms-fontobject';
                 }
-            } elseif ( autoptimizeUtils::str_ends_in( $_preload, '.jpeg' ) || autoptimizeUtils::str_ends_in( $_preload, '.jpg' ) || autoptimizeUtils::str_ends_in( $_preload, '.webp' ) || autoptimizeUtils::str_ends_in( $_preload, '.png' ) || autoptimizeUtils::str_ends_in( $_preload, '.gif' ) ) {
+            } elseif (autoptimizeUtils::str_ends_in($_preload, '.jpeg') || autoptimizeUtils::str_ends_in($_preload, '.jpg') || autoptimizeUtils::str_ends_in($_preload, '.webp') || autoptimizeUtils::str_ends_in($_preload, '.png') || autoptimizeUtils::str_ends_in($_preload, '.gif')) {
                 $preload_as = 'image';
             } else {
                 $preload_as = 'other';
             }
 
-            $preload_output .= '<link rel="preload" href="' . $preload . '" as="' . $preload_as . '"' . $mime_type . $crossorigin . '>';
+            $preload_output .= '<link rel="preload" href="'.$preload.'" as="'.$preload_as.'"'.$mime_type.$crossorigin.'>';
         }
-        $preload_output = apply_filters( 'autoptimize_filter_extra_preload_output', $preload_output );
+        $preload_output = apply_filters('autoptimize_filter_extra_preload_output', $preload_output);
 
         // add string to head (before first link node by default).
-        $preload_inject = apply_filters( 'autoptimize_filter_extra_preload_inject', '<link' );
-        $position       = autoptimizeUtils::strpos( $in, $preload_inject );
+        $preload_inject = apply_filters('autoptimize_filter_extra_preload_inject', '<link');
+        $position       = autoptimizeUtils::strpos($in, $preload_inject);
 
-        return autoptimizeUtils::substr_replace( $in, $preload_output . $preload_inject, $position, strlen( $preload_inject ) );
+        return autoptimizeUtils::substr_replace($in, $preload_output.$preload_inject, $position, strlen($preload_inject));
     }
 
     public function admin_menu()
     {
         // no acces if multisite and not network admin and no site config allowed.
-        if ( autoptimizeConfig::should_show_menu_tabs() ) {
+        if (autoptimizeConfig::should_show_menu_tabs()) {
             add_submenu_page(
                 null,
                 'autoptimize_extra',
                 'autoptimize_extra',
                 'manage_options',
                 'autoptimize_extra',
-                array( $this, 'options_page' )
+                array($this, 'options_page')
             );
         }
-        register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
+        register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings');
     }
 
-    public function add_extra_tab( $in )
+    public function add_extra_tab($in)
     {
-        if ( autoptimizeConfig::should_show_menu_tabs() ) {
-            $in = array_merge( $in, array( 'autoptimize_extra' => __( 'Extra', 'autoptimize' ) ) );
+        if (autoptimizeConfig::should_show_menu_tabs()) {
+            $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize')));
         }
 
         return $in;
@@ -482,97 +482,97 @@ 
         #ao_settings_form .form-table th {font-weight: normal;}
         #autoptimize_extra_descr{font-size: 120%;}
     </style>
-    <script>document.title = "Autoptimize: <?php _e( 'Extra', 'autoptimize' ); ?> " + document.title;</script>
+    <script>document.title = "Autoptimize: <?php _e('Extra', 'autoptimize'); ?> " + document.title;</script>
     <div class="wrap">
-    <h1><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?></h1>
+    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
         <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
-        <?php if ( 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_js' ) && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_css' ) && 'on' !== autoptimizeOptionWrapper::get_option( 'autoptimize_html' ) && ! autoptimizeImages::imgopt_active() ) { ?>
+        <?php if ('on' !== autoptimizeOptionWrapper::get_option('autoptimize_js') && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_css') && 'on' !== autoptimizeOptionWrapper::get_option('autoptimize_html') && !autoptimizeImages::imgopt_active()) { ?>
             <div class="notice-warning notice"><p>
-            <?php _e( 'Most of below Extra optimizations require at least one of HTML, JS, CSS or Image autoptimizations being active.', 'autoptimize' ); ?>
+            <?php _e('Most of below Extra optimizations require at least one of HTML, JS, CSS or Image autoptimizations being active.', 'autoptimize'); ?>
             </p></div>
         <?php } ?>
 
-    <form id='ao_settings_form' action='<?php echo admin_url( 'options.php' ); ?>' method='post'>
-        <?php settings_fields( 'autoptimize_extra_settings' ); ?>
-        <h2><?php _e( 'Extra Auto-Optimizations', 'autoptimize' ); ?></h2>
-        <span id='autoptimize_extra_descr'><?php _e( 'The following settings can improve your site\'s performance even more.', 'autoptimize' ); ?></span>
+    <form id='ao_settings_form' action='<?php echo admin_url('options.php'); ?>' method='post'>
+        <?php settings_fields('autoptimize_extra_settings'); ?>
+        <h2><?php _e('Extra Auto-Optimizations', 'autoptimize'); ?></h2>
+        <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.', 'autoptimize'); ?></span>
         <table class="form-table">
             <tr>
-                <th scope="row"><?php _e( 'Google Fonts', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Google Fonts', 'autoptimize'); ?></th>
                 <td>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if ( ! in_array( $gfonts, array( 2, 3, 4, 5 ) ) ) { echo 'checked'; } ?> ><?php _e( 'Leave as is', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked( 2, $gfonts, true ); ?> ><?php _e( 'Remove Google Fonts', 'autoptimize' ); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($gfonts, array(2, 3, 4, 5))) { echo 'checked'; } ?> ><?php _e('Leave as is', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked(2, $gfonts, true); ?> ><?php _e('Remove Google Fonts', 'autoptimize'); ?><br/>
                     <?php // translators: "display:swap" should remain untranslated, will be shown in code tags. ?>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked( 3, $gfonts, true ); ?> ><?php echo __( 'Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize' ) . ', ' . sprintf( __( 'includes %1$sdisplay:swap%2$s.', 'autoptimize' ), '<code>', '</code>' ); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $gfonts, true); ?> ><?php echo __('Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize').', '.sprintf(__('includes %1$sdisplay:swap%2$s.', 'autoptimize'), '<code>', '</code>'); ?><br/>
                     <?php // translators: "display:swap" should remain untranslated, will be shown in code tags. ?>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked( 5, $gfonts, true ); ?> ><?php echo __( 'Combine and link deferred in head (fonts load late, but are not render-blocking)', 'autoptimize' ) . ', ' . sprintf( __( 'includes %1$sdisplay:swap%2$s.', 'autoptimize' ), '<code>', '</code>' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked( 4, $gfonts, true ); ?> ><?php echo __( 'Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize' ) . ' ' . __( '(deprecated)', 'autoptimize' ); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked(5, $gfonts, true); ?> ><?php echo __('Combine and link deferred in head (fonts load late, but are not render-blocking)', 'autoptimize').', '.sprintf(__('includes %1$sdisplay:swap%2$s.', 'autoptimize'), '<code>', '</code>'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $gfonts, true); ?> ><?php echo __('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize').' '.__('(deprecated)', 'autoptimize'); ?><br/>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Remove emojis', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Remove emojis', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) && '1' === $options['autoptimize_extra_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($options['autoptimize_extra_checkbox_field_1']) && '1' === $options['autoptimize_extra_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Remove query strings from static resources', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Remove query strings from static resources', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) && '1' === $options['autoptimize_extra_checkbox_field_0'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty($options['autoptimize_extra_checkbox_field_0']) && '1' === $options['autoptimize_extra_checkbox_field_0']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_2', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_2'] ); } ?>'><br /><?php _e( 'Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php if (array_key_exists('autoptimize_extra_text_field_2', $options)) { echo esc_attr($options['autoptimize_extra_text_field_2']); } ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Preload specific requests <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Preload specific requests <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_7]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_7', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_7'] ); } ?>'><br /><?php _e( 'Comma-separated list with full URL\'s of to to-be-preloaded resources. To be used sparingly!', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_7]' value='<?php if (array_key_exists('autoptimize_extra_text_field_7', $options)) { echo esc_attr($options['autoptimize_extra_text_field_7']); } ?>'><br /><?php _e('Comma-separated list with full URL\'s of to to-be-preloaded resources. To be used sparingly!', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Async Javascript-files <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
                     <?php
-                    if ( autoptimizeUtils::is_plugin_active( 'async-javascript/async-javascript.php' ) ) {
+                    if (autoptimizeUtils::is_plugin_active('async-javascript/async-javascript.php')) {
                         // translators: link points Async Javascript settings page.
-                        printf( __( 'You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize' ), '<a href="' . 'options-general.php?page=async-javascript' . '">', '</a>' );
+                        printf(__('You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize'), '<a href="'.'options-general.php?page=async-javascript'.'">', '</a>');
                     } else {
                         ?>
-                        <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_3', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_3'] ); } ?>'>
+                        <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php if (array_key_exists('autoptimize_extra_text_field_3', $options)) { echo esc_attr($options['autoptimize_extra_text_field_3']); } ?>'>
                         <br />
                         <?php
-                            _e( 'Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize' );
+                            _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize');
                             // translators: %s will be replaced by a link to the "async javascript" plugin.
-                            echo sprintf( __( 'Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize' ), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"' );
-                            $asj_install_url = network_admin_url() . 'plugin-install.php?s=async+javascript&tab=search&type=term';
-                            echo sprintf( ' <a href="' . $asj_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) );
+                            echo sprintf(__('Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize'), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"');
+                            $asj_install_url = network_admin_url().'plugin-install.php?s=async+javascript&tab=search&type=term';
+                            echo sprintf(' <a href="'.$asj_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize'));
                     }
                     ?>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Optimize YouTube videos', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Optimize YouTube videos', 'autoptimize'); ?></th>
                 <td>
                     <?php
-                    if ( autoptimizeUtils::is_plugin_active( 'wp-youtube-lyte/wp-youtube-lyte.php' ) ) {
-                        _e( 'Great, you have WP YouTube Lyte installed.', 'autoptimize' );
+                    if (autoptimizeUtils::is_plugin_active('wp-youtube-lyte/wp-youtube-lyte.php')) {
+                        _e('Great, you have WP YouTube Lyte installed.', 'autoptimize');
                         $lyte_config_url = 'options-general.php?page=lyte_settings_page';
-                        echo sprintf( ' <a href="' . $lyte_config_url . '">%s</a>', __( 'Click here to configure it.', 'autoptimize' ) );
+                        echo sprintf(' <a href="'.$lyte_config_url.'">%s</a>', __('Click here to configure it.', 'autoptimize'));
                     } else {
                         // translators: %s will be replaced by a link to "wp youtube lyte" plugin.
-                        echo sprintf( __( '%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize' ), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>' );
-                        $lyte_install_url = network_admin_url() . 'plugin-install.php?s=lyte&tab=search&type=term';
-                        echo sprintf( ' <a href="' . $lyte_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) );
+                        echo sprintf(__('%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize'), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>');
+                        $lyte_install_url = network_admin_url().'plugin-install.php?s=lyte&tab=search&type=term';
+                        echo sprintf(' <a href="'.$lyte_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize'));
                     }
                     ?>
                 </td>
             </tr>
         </table>
-        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /></p>
+        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /></p>
     </form>
         <?php
     }