futtta / autoptimize

classlesses/autoptimizePageCacheFlush.php

Spacing +19 added lines, -19 removed lines

@@ -2,55 +2,55 @@
 // flush as many page cache plugin's caches as possible
 // hyper cache and gator cache hook into AO, so we don't need to :-)
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 function autoptimize_flush_pagecache() {
-    if(function_exists('wp_cache_clear_cache')) {
+    if (function_exists('wp_cache_clear_cache')) {
         if (is_multisite()) {
             $blog_id = get_current_blog_id();
             wp_cache_clear_cache($blog_id);
         } else {
             wp_cache_clear_cache();
         }
-    } else if ( has_action('cachify_flush_cache') ) {
+    } else if (has_action('cachify_flush_cache')) {
         do_action('cachify_flush_cache');
-    } else if ( function_exists('w3tc_pgcache_flush') ) {
+    } else if (function_exists('w3tc_pgcache_flush')) {
         w3tc_pgcache_flush();
-    } else if ( function_exists('wp_fast_cache_bulk_delete_all') ) {
+    } else if (function_exists('wp_fast_cache_bulk_delete_all')) {
         wp_fast_cache_bulk_delete_all(); // still to retest
     } else if (class_exists("WpFastestCache")) {
         $wpfc = new WpFastestCache();
         $wpfc -> deleteCache();
-    } else if ( class_exists("c_ws_plugin__qcache_purging_routines") ) {
+    } else if (class_exists("c_ws_plugin__qcache_purging_routines")) {
         c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache, still to retest
-    } else if ( class_exists("zencache") ) {
+    } else if (class_exists("zencache")) {
         zencache::clear();
-    } else if ( class_exists("comet_cache") ) {
+    } else if (class_exists("comet_cache")) {
         comet_cache::clear();
-    } else if ( class_exists("WpeCommon") ) {
-        if ( apply_filters('autoptimize_flush_wpengine_aggressive', false) ) {
-            if ( method_exists( "WpeCommon", "purge_memcached" ) ) {
+    } else if (class_exists("WpeCommon")) {
+        if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) {
+            if (method_exists("WpeCommon", "purge_memcached")) {
                 WpeCommon::purge_memcached();
             }
-            if ( method_exists( "WpeCommon", "clear_maxcdn_cache" ) ) {  
+            if (method_exists("WpeCommon", "clear_maxcdn_cache")) {  
                 WpeCommon::clear_maxcdn_cache();
             }
         }
-        if ( method_exists( "WpeCommon", "purge_varnish_cache" ) ) {
+        if (method_exists("WpeCommon", "purge_varnish_cache")) {
             WpeCommon::purge_varnish_cache();   
         }
-    } else if ( function_exists('sg_cachepress_purge_cache') ) {
+    } else if (function_exists('sg_cachepress_purge_cache')) {
         sg_cachepress_purge_cache();
-    } else if(file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')){
+    } else if (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) {
         // fallback for WP-Super-Cache
         global $cache_path;
         if (is_multisite()) {
             $blog_id = get_current_blog_id();
-            prune_super_cache( get_supercache_dir( $blog_id ), true );
-            prune_super_cache( $cache_path . 'blogs/', true );
+            prune_super_cache(get_supercache_dir($blog_id), true);
+            prune_super_cache($cache_path.'blogs/', true);
         } else {
-            prune_super_cache($cache_path.'supercache/',true);
-            prune_super_cache($cache_path,true);
+            prune_super_cache($cache_path.'supercache/', true);
+            prune_super_cache($cache_path, true);
         }
     }
 }
\ No newline at end of file

Braces +4 added lines, -1 removed lines

@@ -2,7 +2,10 @@
 // flush as many page cache plugin's caches as possible
 // hyper cache and gator cache hook into AO, so we don't need to :-)
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 function autoptimize_flush_pagecache() {
     if(function_exists('wp_cache_clear_cache')) {

classlesses/autoptimizeSpeedupper.php

Indentation +4 added lines, -4 removed lines

@@ -88,13 +88,13 @@
 }
 
 function ao_css_speedup_cleanup($cssin) {
-	// speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
-	return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
+    // speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
+    return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
 }
 
 function ao_js_speedup_cleanup($jsin) {
-	// cleanup
-	return trim($jsin);
+    // cleanup
+    return trim($jsin);
 }
 
 add_filter('autoptimize_css_individual_style','ao_css_snippetcacher',10,2);

Spacing +34 added lines, -34 removed lines

@@ -4,64 +4,64 @@ 
 * new in Autoptimize 2.2
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
-function ao_js_snippetcacher($jsin,$jsfilename) {
+function ao_js_snippetcacher($jsin, $jsfilename) {
     $md5hash = "snippet_".md5($jsin);
-    $ccheck = new autoptimizeCache($md5hash,'js');
-    if($ccheck->check()) {
+    $ccheck = new autoptimizeCache($md5hash, 'js');
+    if ($ccheck->check()) {
         $scriptsrc = $ccheck->retrieve();
     } else {
-        if ( (strpos($jsfilename,"min.js") === false) && ( strpos($jsfilename,"js/jquery/jquery.js") === false ) && ( str_replace(apply_filters('autoptimize_filter_js_consider_minified',false), '', $jsfilename) === $jsfilename ) ) {
-            if(class_exists('JSMin')) {
+        if ((strpos($jsfilename, "min.js") === false) && (strpos($jsfilename, "js/jquery/jquery.js") === false) && (str_replace(apply_filters('autoptimize_filter_js_consider_minified', false), '', $jsfilename) === $jsfilename)) {
+            if (class_exists('JSMin')) {
                 $tmp_jscode = trim(JSMin::minify($jsin));
                 if (!empty($tmp_jscode)) {
                         $scriptsrc = $tmp_jscode;
                         unset($tmp_jscode);
                 } else {
-                        $scriptsrc=$jsin;
+                        $scriptsrc = $jsin;
                 }
             } else {
-                $scriptsrc=$jsin;
+                $scriptsrc = $jsin;
             }
         } else {
             // do some housekeeping here to remove comments & linebreaks and stuff
-            $scriptsrc=preg_replace("#^\s*\/\/.*$#Um","",$jsin);
-            $scriptsrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$scriptsrc);
-            $scriptsrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
+            $scriptsrc = preg_replace("#^\s*\/\/.*$#Um", "", $jsin);
+            $scriptsrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $scriptsrc);
+            $scriptsrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $scriptsrc);
 
-            if ((substr($scriptsrc,-1,1)!==";")&&(substr($scriptsrc,-1,1)!=="}")) {
-                $scriptsrc.=";";
+            if ((substr($scriptsrc, -1, 1) !== ";") && (substr($scriptsrc, -1, 1) !== "}")) {
+                $scriptsrc .= ";";
             }
         }
-        if ( !empty($jsfilename) && str_replace( apply_filters('autoptimize_filter_js_speedup_cache',false), '', $jsfilename ) === $jsfilename ) {
+        if (!empty($jsfilename) && str_replace(apply_filters('autoptimize_filter_js_speedup_cache', false), '', $jsfilename) === $jsfilename) {
             // don't cache inline CSS or if filter says no
-            $ccheck->cache($scriptsrc,'text/javascript');
+            $ccheck->cache($scriptsrc, 'text/javascript');
         }
     }
     unset($ccheck);
 
-    if (get_option("autoptimize_js_trycatch")==="on") {
-        $scriptsrc="try{".$scriptsrc."}catch(e){}";
+    if (get_option("autoptimize_js_trycatch") === "on") {
+        $scriptsrc = "try{".$scriptsrc."}catch(e){}";
     }
 
     return $scriptsrc;
 }
 
-function ao_css_snippetcacher($cssin,$cssfilename) {
+function ao_css_snippetcacher($cssin, $cssfilename) {
     $md5hash = "snippet_".md5($cssin);
-    $ccheck = new autoptimizeCache($md5hash,'css');
-    if($ccheck->check()) {
+    $ccheck = new autoptimizeCache($md5hash, 'css');
+    if ($ccheck->check()) {
         $stylesrc = $ccheck->retrieve();
     } else {
-        if ( ( strpos($cssfilename,"min.css") === false ) && ( str_replace( apply_filters('autoptimize_filter_css_consider_minified',false), '', $cssfilename ) === $cssfilename ) ) {
+        if ((strpos($cssfilename, "min.css") === false) && (str_replace(apply_filters('autoptimize_filter_css_consider_minified', false), '', $cssfilename) === $cssfilename)) {
             if (class_exists('Minify_CSS_Compressor')) {
                 $tmp_code = trim(Minify_CSS_Compressor::process($cssin));
-            } else if(class_exists('CSSmin')) {
+            } else if (class_exists('CSSmin')) {
                 $cssmin = new CSSmin();
-                if (method_exists($cssmin,"run")) {
+                if (method_exists($cssmin, "run")) {
                     $tmp_code = trim($cssmin->run($cssin));
-                } elseif (@is_callable(array($cssmin,"minify"))) {
+                } elseif (@is_callable(array($cssmin, "minify"))) {
                     $tmp_code = trim(CssMin::minify($cssin));
                 }
             }
@@ -74,13 +74,13 @@ 
             }
         } else {
             // .min.css -> no heavy-lifting, just some cleanup
-            $stylesrc=preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us","",$cssin);
-            $stylesrc=preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
-            $stylesrc=autoptimizeStyles::fixurls($cssfilename,$stylesrc);
+            $stylesrc = preg_replace("#^\s*\/\*[^!].*\*\/\s?#Us", "", $cssin);
+            $stylesrc = preg_replace("#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#", "\n", $stylesrc);
+            $stylesrc = autoptimizeStyles::fixurls($cssfilename, $stylesrc);
         }
-        if ( !empty($cssfilename) && ( str_replace( apply_filters('autoptimize_filter_css_speedup_cache',false), '', $cssfilename ) === $cssfilename ) ) {
+        if (!empty($cssfilename) && (str_replace(apply_filters('autoptimize_filter_css_speedup_cache', false), '', $cssfilename) === $cssfilename)) {
             // only cache CSS if not inline and allowed by filter
-            $ccheck->cache($stylesrc,'text/css');
+            $ccheck->cache($stylesrc, 'text/css');
         }
     }
     unset($ccheck);
@@ -89,7 +89,7 @@ 
 
 function ao_css_speedup_cleanup($cssin) {
 	// speedupper results in aggregated CSS not being minified, so the filestart-marker AO adds when aggregating need to be removed
-	return trim(str_replace(array('/*FILESTART*/','/*FILESTART2*/'),'',$cssin));
+	return trim(str_replace(array('/*FILESTART*/', '/*FILESTART2*/'), '', $cssin));
 }
 
 function ao_js_speedup_cleanup($jsin) {
@@ -97,7 +97,7 @@ 
 	return trim($jsin);
 }
 
-add_filter('autoptimize_css_individual_style','ao_css_snippetcacher',10,2);
-add_filter('autoptimize_js_individual_script','ao_js_snippetcacher',10,2);
-add_filter('autoptimize_css_after_minify','ao_css_speedup_cleanup',10,1);
-add_filter('autoptimize_js_after_minify','ao_js_speedup_cleanup',10,1);
+add_filter('autoptimize_css_individual_style', 'ao_css_snippetcacher', 10, 2);
+add_filter('autoptimize_js_individual_script', 'ao_js_snippetcacher', 10, 2);
+add_filter('autoptimize_css_after_minify', 'ao_css_speedup_cleanup', 10, 1);
+add_filter('autoptimize_js_after_minify', 'ao_js_speedup_cleanup', 10, 1);

Braces +4 added lines, -1 removed lines

@@ -4,7 +4,10 @@
 * new in Autoptimize 2.2
 */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 function ao_js_snippetcacher($jsin,$jsfilename) {
     $md5hash = "snippet_".md5($jsin);

classes/autoptimizeCLI.php

Indentation +11 added lines, -11 removed lines

@@ -1,21 +1,21 @@
 <?php
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 class autoptimizeCLI extends WP_CLI_Command {
 
-	/**
-	 * Clears the cache.
-	 *
-	 * @subcommand clear
-	 */
-	public function clear( $args, $args_assoc ) {
-		WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
-		autoptimizeCache::clearall();
-		WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
-	}
+    /**
+     * Clears the cache.
+     *
+     * @subcommand clear
+     */
+    public function clear( $args, $args_assoc ) {
+        WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
+        autoptimizeCache::clearall();
+        WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
+    }
 
 }
 

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
 	exit;
 }
 
@@ -11,12 +11,12 @@ 
 	 *
 	 * @subcommand clear
 	 */
-	public function clear( $args, $args_assoc ) {
-		WP_CLI::line( esc_html__( 'Flushing the cache...', 'autoptimize' ) );
+	public function clear($args, $args_assoc) {
+		WP_CLI::line(esc_html__('Flushing the cache...', 'autoptimize'));
 		autoptimizeCache::clearall();
-		WP_CLI::success( esc_html__( 'Cache flushed.', 'autoptimize' ) );
+		WP_CLI::success(esc_html__('Cache flushed.', 'autoptimize'));
 	}
 
 }
 
-WP_CLI::add_command( 'autoptimize', 'autoptimizeCLI' );
+WP_CLI::add_command('autoptimize', 'autoptimizeCLI');

classlesses/autoptimizeCacheChecker.php

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly

 

 /* 

  * cachechecker code

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly

+if (!defined('ABSPATH')) exit; // Exit if accessed directly

 

 /* 

  * cachechecker code

@@ -13,39 +13,39 @@ 
  */

 

 if (is_admin()) {

-    add_action('plugins_loaded','ao_cachechecker_setup');

+    add_action('plugins_loaded', 'ao_cachechecker_setup');

 }

 

 function ao_cachechecker_setup() {

-    $doCacheCheck = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true);

-    $cacheCheckSchedule = wp_get_schedule( 'ao_cachechecker' );

-    $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency','daily');

-    if (!in_array($AOCCfreq,array('hourly','daily','monthly'))) {

-        $AOCCfreq='daily';

+    $doCacheCheck = (bool) apply_filters('autoptimize_filter_cachecheck_do', true);

+    $cacheCheckSchedule = wp_get_schedule('ao_cachechecker');

+    $AOCCfreq = apply_filters('autoptimize_filter_cachecheck_frequency', 'daily');

+    if (!in_array($AOCCfreq, array('hourly', 'daily', 'monthly'))) {

+        $AOCCfreq = 'daily';

     }

-    if ( $doCacheCheck && ( !$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq ) ) {

+    if ($doCacheCheck && (!$cacheCheckSchedule || $cacheCheckSchedule !== $AOCCfreq)) {

         wp_schedule_event(time(), $AOCCfreq, 'ao_cachechecker');

-    } else if ( $cacheCheckSchedule && !$doCacheCheck ) {

-        wp_clear_scheduled_hook( 'ao_cachechecker' );

+    } else if ($cacheCheckSchedule && !$doCacheCheck) {

+        wp_clear_scheduled_hook('ao_cachechecker');

     }

 }

 

 add_action('ao_cachechecker', 'ao_cachechecker_cronjob');

 function ao_cachechecker_cronjob() {

-    $maxSize = (int) apply_filters( "autoptimize_filter_cachecheck_maxsize", 536870912);

-    $doCacheCheck = (bool) apply_filters( "autoptimize_filter_cachecheck_do", true);

-    $statArr=autoptimizeCache::stats(); 

-    $cacheSize=round($statArr[1]);

-    if (($cacheSize>$maxSize) && ($doCacheCheck)) {

-        update_option("autoptimize_cachesize_notice",true);

-        if (apply_filters('autoptimize_filter_cachecheck_sendmail',true)) {

-            $saniSiteUrl=esc_url(site_url());

-            $ao_mailto=apply_filters('autoptimize_filter_cachecheck_mailto',get_option('admin_email',''));

-            $ao_mailsubject=__('Autoptimize cache size warning','autoptimize')." (".$saniSiteUrl.")";

-            $ao_mailbody=__('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")";

+    $maxSize = (int) apply_filters("autoptimize_filter_cachecheck_maxsize", 536870912);

+    $doCacheCheck = (bool) apply_filters("autoptimize_filter_cachecheck_do", true);

+    $statArr = autoptimizeCache::stats(); 

+    $cacheSize = round($statArr[1]);

+    if (($cacheSize > $maxSize) && ($doCacheCheck)) {

+        update_option("autoptimize_cachesize_notice", true);

+        if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) {

+            $saniSiteUrl = esc_url(site_url());

+            $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', get_option('admin_email', ''));

+            $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize')." (".$saniSiteUrl.")";

+            $ao_mailbody = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize')." (site: ".$saniSiteUrl.")";

 

             if (!empty($ao_mailto)) {

-                $ao_mailresult=wp_mail($ao_mailto,$ao_mailsubject,$ao_mailbody);

+                $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody);

                 if (!$ao_mailresult) {

                     error_log("Autoptimize could not send cache size warning mail.");

                 }

@@ -56,10 +56,10 @@ 
 

 add_action('admin_notices', 'autoptimize_cachechecker_notice');

 function autoptimize_cachechecker_notice() {

-    if ((bool) get_option("autoptimize_cachesize_notice",false)) {

+    if ((bool) get_option("autoptimize_cachesize_notice", false)) {

         echo '<div class="notice notice-warning"><p>';

-        _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' );

+        _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize');

         echo '</p></div>';

-        update_option("autoptimize_cachesize_notice",false);

+        update_option("autoptimize_cachesize_notice", false);

     }

 }

classlesses/autoptimizeExtra.php

Braces +4 added lines, -1 removed lines

@@ -1,5 +1,8 @@
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly
 
 // initialize
 if ( is_admin() ) {

Spacing +90 added lines, -90 removed lines

@@ -1,18 +1,18 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if (!defined('ABSPATH')) exit; // Exit if accessed directly
 
 // initialize
-if ( is_admin() ) {
-    add_action( 'admin_menu', 'autoptimize_extra_admin' );
-    add_filter( 'autoptimize_filter_settingsscreen_tabs','add_autoptimize_extra_tab' );
+if (is_admin()) {
+    add_action('admin_menu', 'autoptimize_extra_admin');
+    add_filter('autoptimize_filter_settingsscreen_tabs', 'add_autoptimize_extra_tab');
 } else {
     autoptimize_extra_init();
 }
 
 // get option
 function autoptimize_extra_get_options() {
-    $_default_val = array("autoptimize_extra_checkbox_field_1"=>"0","autoptimize_extra_checkbox_field_0"=>"0","autoptimize_extra_radio_field_4"=>"1","autoptimize_extra_text_field_2"=>"","autoptimize_extra_text_field_3"=>"");
-    $_option_val = get_option( 'autoptimize_extra_settings' );
+    $_default_val = array("autoptimize_extra_checkbox_field_1"=>"0", "autoptimize_extra_checkbox_field_0"=>"0", "autoptimize_extra_radio_field_4"=>"1", "autoptimize_extra_text_field_2"=>"", "autoptimize_extra_text_field_3"=>"");
+    $_option_val = get_option('autoptimize_extra_settings');
     if (empty($_option_val)) {
         $_option_val = $_default_val;
     }
@@ -30,58 +30,58 @@ 
     
     /* remove version from query string */
     if ($autoptimize_extra_options['autoptimize_extra_checkbox_field_0']) {
-        add_filter( 'script_loader_src', 'autoptimize_extra_remove_qs', 15, 1 );
-        add_filter( 'style_loader_src', 'autoptimize_extra_remove_qs', 15, 1 );
+        add_filter('script_loader_src', 'autoptimize_extra_remove_qs', 15, 1);
+        add_filter('style_loader_src', 'autoptimize_extra_remove_qs', 15, 1);
     }
 
     /* async JS */
     if (!empty($autoptimize_extra_options['autoptimize_extra_text_field_3'])) {
-        add_filter('autoptimize_filter_js_exclude','autoptimize_extra_async_js',10,1);
+        add_filter('autoptimize_filter_js_exclude', 'autoptimize_extra_async_js', 10, 1);
     }
 
     /* optimize google fonts */
-    if ( !empty( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] ) && ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] != "1" ) ) {
-        if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "2" ) {
-            add_filter('autoptimize_filter_css_removables','autoptimize_extra_remove_gfonts',10,1);
+    if (!empty($autoptimize_extra_options['autoptimize_extra_radio_field_4']) && ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] != "1")) {
+        if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "2") {
+            add_filter('autoptimize_filter_css_removables', 'autoptimize_extra_remove_gfonts', 10, 1);
         } else {
-            add_filter('autoptimize_html_after_minify','autoptimize_extra_gfonts',10,1);
-            add_filter('autoptimize_extra_filter_tobepreconn','autoptimize_extra_preconnectgooglefonts',10,1);
+            add_filter('autoptimize_html_after_minify', 'autoptimize_extra_gfonts', 10, 1);
+            add_filter('autoptimize_extra_filter_tobepreconn', 'autoptimize_extra_preconnectgooglefonts', 10, 1);
         }
     }
     
     /* preconnect */
-    if ( !empty($autoptimize_extra_options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn') ) {
-        add_filter( 'wp_resource_hints', 'autoptimize_extra_preconnect', 10, 2 );
+    if (!empty($autoptimize_extra_options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn')) {
+        add_filter('wp_resource_hints', 'autoptimize_extra_preconnect', 10, 2);
     }
 }
 
 // disable emoji's functions
 function autoptimize_extra_disable_emojis() {
     // 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');
 
     // filter to remove TinyMCE emojis
-    add_filter( 'tiny_mce_plugins', 'autoptimize_extra_disable_emojis_tinymce' );
+    add_filter('tiny_mce_plugins', 'autoptimize_extra_disable_emojis_tinymce');
 }
 
-function autoptimize_extra_disable_emojis_tinymce( $plugins ) {
-    if ( is_array( $plugins ) ) {
-        return array_diff( $plugins, array( 'wpemoji' ) );
+function autoptimize_extra_disable_emojis_tinymce($plugins) {
+    if (is_array($plugins)) {
+        return array_diff($plugins, array('wpemoji'));
     } else {
         return array();
     }
 }
 
 // remove query string function
-function autoptimize_extra_remove_qs( $src ) {
-    if ( strpos($src, '?ver=') ) {
-            $src = remove_query_arg( 'ver', $src );
+function autoptimize_extra_remove_qs($src) {
+    if (strpos($src, '?ver=')) {
+            $src = remove_query_arg('ver', $src);
     }
     return $src;
 }
@@ -93,18 +93,18 @@ 
     // get exclusions
     $AO_JSexclArrayIn = array();
     if (!empty($in)) {
-        $AO_JSexclArrayIn = array_fill_keys(array_filter(array_map('trim',explode(",",$in))),"");
+        $AO_JSexclArrayIn = array_fill_keys(array_filter(array_map('trim', explode(",", $in))), "");
     }
     
     // get asyncs
     $_fromSetting = $autoptimize_extra_options['autoptimize_extra_text_field_3'];
-    $AO_asynced_JS = array_fill_keys(array_filter(array_map('trim',explode(",",$_fromSetting))),"");
+    $AO_asynced_JS = array_fill_keys(array_filter(array_map('trim', explode(",", $_fromSetting))), "");
     foreach ($AO_asynced_JS as $JSkey => $JSvalue) {
         $AO_asynced_JS[$JSkey] = "async";
     }
     
     // merge exclusions & asyncs in one array and return to AO API
-    $AO_excl_w_async = array_merge( $AO_JSexclArrayIn, $AO_asynced_JS );
+    $AO_excl_w_async = array_merge($AO_JSexclArrayIn, $AO_asynced_JS);
     return $AO_excl_w_async;
 }
 
@@ -113,25 +113,25 @@ 
     $autoptimize_extra_options = autoptimize_extra_get_options();
     
     // get setting and store in array
-    $_to_be_preconnected = array_filter(array_map('trim',explode(",",$autoptimize_extra_options['autoptimize_extra_text_field_2'])));
-    $_to_be_preconnected = apply_filters( 'autoptimize_extra_filter_tobepreconn', $_to_be_preconnected );
+    $_to_be_preconnected = array_filter(array_map('trim', explode(",", $autoptimize_extra_options['autoptimize_extra_text_field_2'])));
+    $_to_be_preconnected = apply_filters('autoptimize_extra_filter_tobepreconn', $_to_be_preconnected);
 
     // walk array, extract domain and add to new array with crossorigin attribute
     foreach ($_to_be_preconnected as $_preconn_single) {
         $_preconn_parsed = parse_url($_preconn_single);
         
-        if ( is_array($_preconn_parsed) && empty($_preconn_parsed['scheme']) ) {
+        if (is_array($_preconn_parsed) && empty($_preconn_parsed['scheme'])) {
             $_preconn_domain = "//".$_preconn_parsed['host'];
-        } else if ( is_array($_preconn_parsed) ) {
+        } else if (is_array($_preconn_parsed)) {
             $_preconn_domain = $_preconn_parsed['scheme']."://".$_preconn_parsed['host'];
         }
         
-        if ( !empty($_preconn_domain) ) {
+        if (!empty($_preconn_domain)) {
             $_preconn_hint = array('href' => $_preconn_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
-            $_preconn_crossorigin = apply_filters( 'autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com') );
-            if ( in_array( $_preconn_domain, $_preconn_crossorigin ) ) {
+            $_preconn_crossorigin = apply_filters('autoptimize_extra_filter_preconn_crossorigin', array('https://fonts.gstatic.com'));
+            if (in_array($_preconn_domain, $_preconn_crossorigin)) {
                 $_preconn_hint['crossorigin'] = 'anonymous';
             }
             $_new_hints[] = $_preconn_hint;
@@ -139,7 +139,7 @@ 
     }
 
     // merge in wordpress' preconnect hints
-    if ( 'preconnect' === $relation_type && !empty($_new_hints) ) {
+    if ('preconnect' === $relation_type && !empty($_new_hints)) {
         $hints = array_merge($hints, $_new_hints);      
     }
     
@@ -156,48 +156,48 @@ 
     $autoptimize_extra_options = autoptimize_extra_get_options();
     
     // extract fonts, partly based on wp rocket's extraction code
-    $_without_comments = 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', $_without_comments, $matches );
+    $_without_comments = 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', $_without_comments, $matches);
 
     $i = 0;
     $fontsCollection = array();
-    if ( ! $matches[2] ) {
+    if (!$matches[2]) {
         return $in;
     }
     
     // store them in $fonts array
-    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 );
-            $font = explode( 'family=', $font );
-            $font = ( isset( $font[1] ) ) ? explode( '&', $font[1] ) : array();
+            $font = str_replace(array('%7C', '%7c'), '|', $font);
+            $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) ) {
+            $_thisfont = array_values(array_filter(explode('|', reset($font))));
+            if (!empty($_thisfont)) {
                 $fontsCollection[$i]["fonts"] = $_thisfont;
                 // And add subset if any
-                $subset = ( is_array( $font ) ) ? end( $font ) : '';
-                if ( false !== strpos( $subset, 'subset=' ) ) {
-                    $subset = explode( 'subset=', $subset );
-                    $fontsCollection[$i]["subsets"] = explode( ',', $subset[1] );
+                $subset = (is_array($font)) ? end($font) : '';
+                if (false !== strpos($subset, 'subset=')) {
+                    $subset = explode('subset=', $subset);
+                    $fontsCollection[$i]["subsets"] = explode(',', $subset[1]);
                 }
             }
             // And remove Google Fonts.
-            $in = str_replace( $matches[0][ $i ], '', $in );
+            $in = str_replace($matches[0][$i], '', $in);
         }
         $i++;
     }
 
-    $_fontsOut="";
-    if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "3" ) {
+    $_fontsOut = "";
+    if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "3") {
         // aggregate & link
-        $_fontsString="";
-        $_subsetString="";
+        $_fontsString = "";
+        $_subsetString = "";
         foreach ($fontsCollection as $font) {
-            $_fontsString .= '|'.trim( implode( '|' , $font["fonts"] ), '|' );
-            if ( !empty( $font["subsets"] ) ) {
-                $_subsetString .= implode( ',', $font["subsets"] ); 
+            $_fontsString .= '|'.trim(implode('|', $font["fonts"]), '|');
+            if (!empty($font["subsets"])) {
+                $_subsetString .= implode(',', $font["subsets"]); 
             }
         }
                     
@@ -205,17 +205,17 @@ 
             $_fontsString = $_fontsString."#038;subset=".$_subsetString;
         }
 
-        $_fontsString = str_replace( '|', '%7C', ltrim($_fontsString,'|') );
+        $_fontsString = str_replace('|', '%7C', ltrim($_fontsString, '|'));
         
-        if ( ! empty( $_fontsString ) ) {
-            $_fontsOut = '<link rel="stylesheet" id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family=' . $_fontsString . '" />';
+        if (!empty($_fontsString)) {
+            $_fontsOut = '<link rel="stylesheet" id="ao_optimized_gfonts" href="https://fonts.googleapis.com/css?family='.$_fontsString.'" />';
         }
-    } else if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4" ) {
+    } else if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4") {
         // aggregate & load async (webfont.js impl.)
         $_fontsArray = array();
         foreach ($fontsCollection as $_fonts) {
-            if ( !empty( $_fonts["subsets"] ) ) {
-                $_subset = implode(",",$_fonts["subsets"]);
+            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;
@@ -228,7 +228,7 @@ 
         foreach ($_fontsArray as $_font) {
             $_fontsOut .= $_font."','";
         }
-        $_fontsOut = trim(trim($_fontsOut,"'"),",");
+        $_fontsOut = trim(trim($_fontsOut, "'"), ",");
         $_fontsOut .= '] },classes:false, events:false, timeout:1500};(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>';
     }
  
@@ -242,7 +242,7 @@ 
 
     // preconnect to fonts.gstatic.com speed up download of static font-files
     $in[] = "https://fonts.gstatic.com";
-    if ( $autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4" ) {
+    if ($autoptimize_extra_options['autoptimize_extra_radio_field_4'] == "4") {
         // and more preconnects for webfont.js
         $in[] = "https://ajax.googleapis.com/";
         $in[] = "https://fonts.googleapis.com";
@@ -252,12 +252,12 @@ 
 
 /* admin page functions */
 function autoptimize_extra_admin() { 
-    add_submenu_page( null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', 'autoptimize_extra_options_page' );
-    register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
+    add_submenu_page(null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', 'autoptimize_extra_options_page');
+    register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings');
 }
 
 function add_autoptimize_extra_tab($in) {
-    $in=array_merge($in,array('autoptimize_extra' => __('Extra','autoptimize')));
+    $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize')));
     return $in;
 }
 
@@ -271,46 +271,46 @@ 
         #autoptimize_extra_descr{font-size: 120%;}
     </style>
     <div class="wrap">
-    <h1><?php _e('Autoptimize Settings','autoptimize'); ?></h1>
+    <h1><?php _e('Autoptimize Settings', 'autoptimize'); ?></h1>
     <?php echo autoptimizeConfig::ao_admin_tabs(); ?>
     <form id='ao_settings_form' action='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>
+        <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('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 checked( $autoptimize_extra_options['autoptimize_extra_checkbox_field_1'], 1 ); ?> 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 checked($autoptimize_extra_options['autoptimize_extra_checkbox_field_1'], 1); ?> 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 checked( $autoptimize_extra_options['autoptimize_extra_checkbox_field_0'], 1 ); ?> value='1'><?php _e('Removing query strings (or more specificaly 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 checked($autoptimize_extra_options['autoptimize_extra_checkbox_field_0'], 1); ?> value='1'><?php _e('Removing query strings (or more specificaly 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('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($_googlef,array(2,3,4))) {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, $_googlef, true); ?> ><?php _e('Remove Google Fonts','autoptimize'); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $_googlef, true); ?> ><?php _e('Combine and link in head','autoptimize'); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $_googlef, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>','autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if (!in_array($_googlef, array(2, 3, 4))) {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, $_googlef, true); ?> ><?php _e('Remove Google Fonts', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="3" <?php checked(3, $_googlef, true); ?> ><?php _e('Combine and link in head', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $_googlef, true); ?> ><?php _e('Combine and load fonts asynchronously with <a href="https://github.com/typekit/webfontloader#readme" target="_blank">webfont.js</a>', 'autoptimize'); ?><br/>
                 </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 echo $autoptimize_extra_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 echo $autoptimize_extra_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('Async Javascript-files <em>(advanced users)</em>','autoptimize'); ?></th>
+                <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
                     <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php echo $autoptimize_extra_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'); ?>
+                    <?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'); ?>
                 </td>
             </tr>
         </table>