futtta / autoptimize

classes/autoptimizeBase.php

Doc Comments +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
      *
      * @param string $url URL to transform.
      *
-     * @return bool|string
+     * @return false|string
      */
     public function getpath( $url )
     {
@@ -610,7 +610,7 @@ 
     /**
      * Logs given `$data` for debugging purposes (when debug logging is on).
      *
-     * @param mixed $data Data to log.
+     * @param string $data Data to log.
      *
      * @return void
      */
@@ -632,7 +632,7 @@ 
      *
      * @param string $filepath Filepath.
      *
-     * @return bool|string to be minified code or false.
+     * @return false|string to be minified code or false.
      */
     protected function prepare_minify_single( $filepath )
     {

Indentation +1 added lines, -1 removed lines

@@ -412,7 +412,7 @@
          * First element is the filepath, second is the md5 hash of contents
          * the filepath had when it was being processed.
          * If we don't have those, we'll bail out early.
-        */
+         */
         $filepath = null;
         $filehash = null;
 

Spacing +151 added lines, -151 removed lines

@@ -3,7 +3,7 @@ 
  * Base class other (more-specific) classes inherit from.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -23,7 +23,7 @@ 
      */
     public $debug_log = false;
 
-    public function __construct( $content )
+    public function __construct($content)
     {
         $this->content = $content;
     }
@@ -35,7 +35,7 @@ 
      *
      * @return bool
      */
-    abstract public function read( $options );
+    abstract public function read($options);
 
     /**
      * Joins and optimizes collected things.
@@ -66,40 +66,40 @@ 
      *
      * @return bool|string
      */
-    public function getpath( $url )
+    public function getpath($url)
     {
-        $url = apply_filters( 'autoptimize_filter_cssjs_alter_url', $url );
+        $url = apply_filters('autoptimize_filter_cssjs_alter_url', $url);
 
-        if ( false !== strpos( $url, '%' ) ) {
-            $url = urldecode( $url );
+        if (false !== strpos($url, '%')) {
+            $url = urldecode($url);
         }
 
-        $site_host    = parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST );
-        $content_host = parse_url( AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST );
+        $site_host    = parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST);
+        $content_host = parse_url(AUTOPTIMIZE_WP_ROOT_URL, PHP_URL_HOST);
 
         // Normalizing attempts...
-        $double_slash_position = strpos( $url, '//' );
-        if ( 0 === $double_slash_position ) {
-            if ( is_ssl() ) {
-                $url = 'https:' . $url;
+        $double_slash_position = strpos($url, '//');
+        if (0 === $double_slash_position) {
+            if (is_ssl()) {
+                $url = 'https:'.$url;
             } else {
-                $url = 'http:' . $url;
+                $url = 'http:'.$url;
             }
-        } elseif ( ( false === $double_slash_position ) && ( false === strpos( $url, $site_host ) ) ) {
-            if ( AUTOPTIMIZE_WP_SITE_URL === $site_host ) {
-                $url = AUTOPTIMIZE_WP_SITE_URL . $url;
+        } elseif ((false === $double_slash_position) && (false === strpos($url, $site_host))) {
+            if (AUTOPTIMIZE_WP_SITE_URL === $site_host) {
+                $url = AUTOPTIMIZE_WP_SITE_URL.$url;
             } else {
-                $url = AUTOPTIMIZE_WP_SITE_URL . autoptimizeUtils::path_canonicalize( $url );
+                $url = AUTOPTIMIZE_WP_SITE_URL.autoptimizeUtils::path_canonicalize($url);
             }
         }
 
-        if ( $site_host !== $content_host ) {
-            $url = str_replace( AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL . AUTOPTIMIZE_WP_CONTENT_NAME, $url );
+        if ($site_host !== $content_host) {
+            $url = str_replace(AUTOPTIMIZE_WP_CONTENT_URL, AUTOPTIMIZE_WP_SITE_URL.AUTOPTIMIZE_WP_CONTENT_NAME, $url);
         }
 
         // First check; hostname wp site should be hostname of url!
-        $url_host = @parse_url( $url, PHP_URL_HOST ); // @codingStandardsIgnoreLine
-        if ( $url_host !== $site_host ) {
+        $url_host = @parse_url($url, PHP_URL_HOST); // @codingStandardsIgnoreLine
+        if ($url_host !== $site_host) {
             /**
              * First try to get all domains from WPML (if available)
              * then explicitely declare $this->cdn_url as OK as well
@@ -108,20 +108,20 @@ 
              */
             $multidomains = array();
 
-            $multidomains_wpml = apply_filters( 'wpml_setting', array(), 'language_domains' );
-            if ( ! empty( $multidomains_wpml ) ) {
-                $multidomains = array_map( array( $this, 'get_url_hostname' ), $multidomains_wpml );
+            $multidomains_wpml = apply_filters('wpml_setting', array(), 'language_domains');
+            if (!empty($multidomains_wpml)) {
+                $multidomains = array_map(array($this, 'get_url_hostname'), $multidomains_wpml);
             }
 
-            if ( ! empty( $this->cdn_url ) ) {
-                $multidomains[] = parse_url( $this->cdn_url, PHP_URL_HOST );
+            if (!empty($this->cdn_url)) {
+                $multidomains[] = parse_url($this->cdn_url, PHP_URL_HOST);
             }
 
-            $multidomains = apply_filters( 'autoptimize_filter_cssjs_multidomain', $multidomains );
+            $multidomains = apply_filters('autoptimize_filter_cssjs_multidomain', $multidomains);
 
-            if ( ! empty( $multidomains ) ) {
-                if ( in_array( $url_host, $multidomains ) ) {
-                    $url = str_replace( $url_host, $site_host, $url );
+            if (!empty($multidomains)) {
+                if (in_array($url_host, $multidomains)) {
+                    $url = str_replace($url_host, $site_host, $url);
                 } else {
                     return false;
                 }
@@ -131,28 +131,28 @@ 
         }
 
         // Try to remove "wp root url" from url while not minding http<>https.
-        $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL );
+        $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_ROOT_URL);
 
-        if ( $site_host !== $content_host ) {
+        if ($site_host !== $content_host) {
             // As we replaced the content-domain with the site-domain, we should match against that.
-            $tmp_ao_root = preg_replace( '/https?:/', '', AUTOPTIMIZE_WP_SITE_URL );
+            $tmp_ao_root = preg_replace('/https?:/', '', AUTOPTIMIZE_WP_SITE_URL);
         }
 
-        $tmp_url = preg_replace( '/https?:/', '', $url );
-        $path    = str_replace( $tmp_ao_root, '', $tmp_url );
+        $tmp_url = preg_replace('/https?:/', '', $url);
+        $path    = str_replace($tmp_ao_root, '', $tmp_url);
 
         // If path starts with :// or //, this is not a URL in the WP context and
         // we have to assume we can't aggregate.
-        if ( preg_match( '#^:?//#', $path ) ) {
+        if (preg_match('#^:?//#', $path)) {
             // External script/css (adsense, etc).
             return false;
         }
 
         // Prepend with WP_ROOT_DIR to have full path to file.
-        $path = str_replace( '//', '/', WP_ROOT_DIR . $path );
+        $path = str_replace('//', '/', WP_ROOT_DIR.$path);
 
         // Final check: does file exist and is it readable?
-        if ( file_exists( $path ) && is_file( $path ) && is_readable( $path ) ) {
+        if (file_exists($path) && is_file($path) && is_readable($path)) {
             return $path;
         } else {
             return false;
@@ -169,18 +169,18 @@ 
      *
      * @return string
      */
-    protected function get_url_hostname( $url )
+    protected function get_url_hostname($url)
     {
         // Checking that the url starts with something vaguely resembling a protocol.
-        if ( ( 0 !== strpos( $url, 'http' ) ) && ( 0 !== strpos( $url, '//' ) ) ) {
-            $url = 'http://' . $url;
+        if ((0 !== strpos($url, 'http')) && (0 !== strpos($url, '//'))) {
+            $url = 'http://'.$url;
         }
 
         // Grab the hostname.
-        $hostname = parse_url( $url, PHP_URL_HOST );
+        $hostname = parse_url($url, PHP_URL_HOST);
 
         // Fallback when parse_url() fails.
-        if ( empty( $hostname ) ) {
+        if (empty($hostname)) {
             $hostname = $url;
         }
 
@@ -194,7 +194,7 @@ 
      *
      * @return string
      */
-    protected function hide_noptimize( $markup )
+    protected function hide_noptimize($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'NOPTIMIZE',
@@ -211,9 +211,9 @@ 
      *
      * @return string
      */
-    protected function restore_noptimize( $markup )
+    protected function restore_noptimize($markup)
     {
-        return $this->restore_marked_content( 'NOPTIMIZE', $markup );
+        return $this->restore_marked_content('NOPTIMIZE', $markup);
     }
 
     /**
@@ -223,7 +223,7 @@ 
      *
      * @return string
      */
-    protected function hide_iehacks( $markup )
+    protected function hide_iehacks($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'IEHACK', // Marker name...
@@ -240,9 +240,9 @@ 
      *
      * @return string
      */
-    protected function restore_iehacks( $markup )
+    protected function restore_iehacks($markup)
     {
-        return $this->restore_marked_content( 'IEHACK', $markup );
+        return $this->restore_marked_content('IEHACK', $markup);
     }
 
     /**
@@ -254,7 +254,7 @@ 
      *
      * @return string
      */
-    protected function hide_comments( $markup )
+    protected function hide_comments($markup)
     {
         return $this->replace_contents_with_marker_if_exists(
             'COMMENTS',
@@ -272,9 +272,9 @@ 
      *
      * @return string
      */
-    protected function restore_comments( $markup )
+    protected function restore_comments($markup)
     {
-        return $this->restore_marked_content( 'COMMENTS', $markup );
+        return $this->restore_marked_content('COMMENTS', $markup);
     }
 
     /**
@@ -285,44 +285,44 @@ 
      *
      * @return string
      */
-    public function url_replace_cdn( $url )
+    public function url_replace_cdn($url)
     {
         // For 2.3 back-compat in which cdn-ing appeared to be automatically
         // including WP subfolder/subdirectory into account as part of cdn-ing,
         // even though it might've caused serious troubles in certain edge-cases.
-        $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed( $this->cdn_url );
+        $cdn_url = autoptimizeUtils::tweak_cdn_url_if_needed($this->cdn_url);
 
         // Allows API/filter to further tweak the cdn url...
-        $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', $cdn_url );
-        if ( ! empty( $cdn_url ) ) {
-            $this->debug_log( 'before=' . $url );
+        $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', $cdn_url);
+        if (!empty($cdn_url)) {
+            $this->debug_log('before='.$url);
 
             // Simple str_replace-based approach fails when $url is protocol-or-host-relative.
-            $is_protocol_relative = autoptimizeUtils::is_protocol_relative( $url );
-            $is_host_relative     = ( ! $is_protocol_relative && ( '/' === $url{0} ) );
-            $cdn_url              = rtrim( $cdn_url, '/' );
+            $is_protocol_relative = autoptimizeUtils::is_protocol_relative($url);
+            $is_host_relative     = (!$is_protocol_relative && ('/' === $url{0} ));
+            $cdn_url              = rtrim($cdn_url, '/');
 
-            if ( $is_host_relative ) {
+            if ($is_host_relative) {
                 // Prepending host-relative urls with the cdn url.
-                $url = $cdn_url . $url;
+                $url = $cdn_url.$url;
             } else {
                 // Either a protocol-relative or "regular" url, replacing it either way.
-                if ( $is_protocol_relative ) {
+                if ($is_protocol_relative) {
                     // Massage $site_url so that simple str_replace() still "works" by
                     // searching for the protocol-relative version of AUTOPTIMIZE_WP_SITE_URL.
-                    $site_url = str_replace( array( 'http:', 'https:' ), '', AUTOPTIMIZE_WP_SITE_URL );
+                    $site_url = str_replace(array('http:', 'https:'), '', AUTOPTIMIZE_WP_SITE_URL);
                 } else {
                     $site_url = AUTOPTIMIZE_WP_SITE_URL;
                 }
-                $this->debug_log( '`' . $site_url . '` -> `' . $cdn_url . '` in `' . $url . '`' );
-                $url = str_replace( $site_url, $cdn_url, $url );
+                $this->debug_log('`'.$site_url.'` -> `'.$cdn_url.'` in `'.$url.'`');
+                $url = str_replace($site_url, $cdn_url, $url);
             }
 
-            $this->debug_log( 'after=' . $url );
+            $this->debug_log('after='.$url);
         }
 
         // Allow API filter to take further care of CDN replacement.
-        $url = apply_filters( 'autoptimize_filter_base_replace_cdn', $url );
+        $url = apply_filters('autoptimize_filter_base_replace_cdn', $url);
 
         return $url;
     }
@@ -340,18 +340,18 @@ 
      *
      * @return void
      */
-    protected function inject_in_html( $payload, $where )
+    protected function inject_in_html($payload, $where)
     {
         $warned   = false;
-        $position = autoptimizeUtils::strpos( $this->content, $where[0] );
-        if ( false !== $position ) {
+        $position = autoptimizeUtils::strpos($this->content, $where[0]);
+        if (false !== $position) {
             // Found the tag, setup content/injection as specified.
-            if ( 'after' === $where[1] ) {
-                $content = $where[0] . $payload;
-            } elseif ( 'replace' === $where[1] ) {
+            if ('after' === $where[1]) {
+                $content = $where[0].$payload;
+            } elseif ('replace' === $where[1]) {
                 $content = $payload;
             } else {
-                $content = $payload . $where[0];
+                $content = $payload.$where[0];
             }
             // Place where specified.
             $this->content = autoptimizeUtils::substr_replace(
@@ -360,14 +360,14 @@ 
                 $position,
                 // Using plain strlen() should be safe here for now, since
                 // we're not searching for multibyte chars here still...
-                strlen( $where[0] )
+                strlen($where[0])
             );
         } else {
             // Couldn't find what was specified, just append and add a warning.
             $this->content .= $payload;
-            if ( ! $warned ) {
-                $tag_display    = str_replace( array( '<', '>' ), '', $where[0] );
-                $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `' . $tag_display . '` missing --><!--/noptimize-->';
+            if (!$warned) {
+                $tag_display    = str_replace(array('<', '>'), '', $where[0]);
+                $this->content .= '<!--noptimize--><!-- Autoptimize found a problem with the HTML in your Theme, tag `'.$tag_display.'` missing --><!--/noptimize-->';
                 $warned         = true;
             }
         }
@@ -381,10 +381,10 @@ 
      *
      * @return bool
      */
-    protected function isremovable( $tag, $removables )
+    protected function isremovable($tag, $removables)
     {
-        foreach ( $removables as $match ) {
-            if ( false !== strpos( $tag, $match ) ) {
+        foreach ($removables as $match) {
+            if (false !== strpos($tag, $match)) {
                 return true;
             }
         }
@@ -399,10 +399,10 @@ 
      *
      * @return string
      */
-    public function inject_minified_callback( $matches )
+    public function inject_minified_callback($matches)
     {
         static $conf = null;
-        if ( null === $conf ) {
+        if (null === $conf) {
             $conf = autoptimizeConfig::instance();
         }
 
@@ -417,62 +417,62 @@ 
         $filehash = null;
 
         // Grab the parts we need.
-        $parts = explode( '|', $matches[1] );
-        if ( ! empty( $parts ) ) {
-            $filepath = isset( $parts[0] ) ? base64_decode($parts[0]) : null;
-            $filehash = isset( $parts[1] ) ? $parts[1] : null;
+        $parts = explode('|', $matches[1]);
+        if (!empty($parts)) {
+            $filepath = isset($parts[0]) ? base64_decode($parts[0]) : null;
+            $filehash = isset($parts[1]) ? $parts[1] : null;
         }
 
         // Bail early if something's not right...
-        if ( ! $filepath || ! $filehash ) {
+        if (!$filepath || !$filehash) {
             return "\n";
         }
 
-        $filecontent = file_get_contents( $filepath );
+        $filecontent = file_get_contents($filepath);
 
         // Some things are differently handled for css/js...
-        $is_js_file = ( '.js' === substr( $filepath, -3, 3 ) );
+        $is_js_file = ('.js' === substr($filepath, -3, 3));
 
         $is_css_file = false;
-        if ( ! $is_js_file ) {
-            $is_css_file = ( '.css' === substr( $filepath, -4, 4 ) );
+        if (!$is_js_file) {
+            $is_css_file = ('.css' === substr($filepath, -4, 4));
         }
 
         // BOMs being nuked here unconditionally (regardless of where they are)!
-        $filecontent = preg_replace( "#\x{EF}\x{BB}\x{BF}#", '', $filecontent );
+        $filecontent = preg_replace("#\x{EF}\x{BB}\x{BF}#", '', $filecontent);
 
         // Remove comments and blank lines.
-        if ( $is_js_file ) {
-            $filecontent = preg_replace( '#^\s*\/\/.*$#Um', '', $filecontent );
+        if ($is_js_file) {
+            $filecontent = preg_replace('#^\s*\/\/.*$#Um', '', $filecontent);
         }
 
         // Nuke un-important comments.
-        $filecontent = preg_replace( '#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent );
+        $filecontent = preg_replace('#^\s*\/\*[^!].*\*\/\s?#Um', '', $filecontent);
 
         // Normalize newlines.
-        $filecontent = preg_replace( '#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent );
+        $filecontent = preg_replace('#(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+#', "\n", $filecontent);
 
         // JS specifics.
-        if ( $is_js_file ) {
+        if ($is_js_file) {
             // Append a semicolon at the end of js files if it's missing.
-            $last_char = substr( $filecontent, -1, 1 );
-            if ( ';' !== $last_char && '}' !== $last_char ) {
+            $last_char = substr($filecontent, -1, 1);
+            if (';' !== $last_char && '}' !== $last_char) {
                 $filecontent .= ';';
             }
             // Check if try/catch should be used.
-            $opt_js_try_catch = $conf->get( 'autoptimize_js_trycatch' );
-            if ( 'on' === $opt_js_try_catch ) {
+            $opt_js_try_catch = $conf->get('autoptimize_js_trycatch');
+            if ('on' === $opt_js_try_catch) {
                 // It should, wrap in try/catch.
-                $filecontent = 'try{' . $filecontent . '}catch(e){}';
+                $filecontent = 'try{'.$filecontent.'}catch(e){}';
             }
-        } elseif ( $is_css_file ) {
-            $filecontent = autoptimizeStyles::fixurls( $filepath, $filecontent );
+        } elseif ($is_css_file) {
+            $filecontent = autoptimizeStyles::fixurls($filepath, $filecontent);
         } else {
             $filecontent = '';
         }
 
         // Return modified (or empty!) code/content.
-        return "\n" . $filecontent;
+        return "\n".$filecontent;
     }
 
     /**
@@ -482,13 +482,13 @@ 
      *
      * @return string
      */
-    protected function inject_minified( $in )
+    protected function inject_minified($in)
     {
         $out = $in;
-        if ( false !== strpos( $in, '%%INJECTLATER%%' ) ) {
+        if (false !== strpos($in, '%%INJECTLATER%%')) {
             $out = preg_replace_callback(
-                '#\/\*\!%%INJECTLATER' . AUTOPTIMIZE_HASH . '%%(.*?)%%INJECTLATER%%\*\/#is',
-                array( $this, 'inject_minified_callback' ),
+                '#\/\*\!%%INJECTLATER'.AUTOPTIMIZE_HASH.'%%(.*?)%%INJECTLATER%%\*\/#is',
+                array($this, 'inject_minified_callback'),
                 $in
             );
         }
@@ -508,9 +508,9 @@ 
      *
      * @return string
      */
-    public static function build_injectlater_marker( $filepath, $hash )
+    public static function build_injectlater_marker($filepath, $hash)
     {
-        $contents = '/*!' . self::build_marker( 'INJECTLATER', $filepath, $hash ) . '*/';
+        $contents = '/*!'.self::build_marker('INJECTLATER', $filepath, $hash).'*/';
 
         return $contents;
     }
@@ -528,18 +528,18 @@ 
      *
      * @return string
      */
-    public static function build_marker( $name, $data, $hash = null )
+    public static function build_marker($name, $data, $hash = null)
     {
         // Start the marker, add the data.
-        $marker = '%%' . $name . AUTOPTIMIZE_HASH . '%%' . base64_encode( $data );
+        $marker = '%%'.$name.AUTOPTIMIZE_HASH.'%%'.base64_encode($data);
 
         // Add the hash if provided.
-        if ( null !== $hash ) {
-            $marker .= '|' . $hash;
+        if (null !== $hash) {
+            $marker .= '|'.$hash;
         }
 
         // Close the marker.
-        $marker .= '%%' . $name . '%%';
+        $marker .= '%%'.$name.'%%';
 
         return $marker;
     }
@@ -559,22 +559,22 @@ 
      *
      * @return string
      */
-    protected function replace_contents_with_marker_if_exists( $marker, $search, $re_replace_pattern, $content )
+    protected function replace_contents_with_marker_if_exists($marker, $search, $re_replace_pattern, $content)
     {
         $found = false;
 
-        $is_regex = autoptimizeUtils::str_is_valid_regex( $search );
-        if ( $is_regex ) {
-            $found = preg_match( $search, $content );
+        $is_regex = autoptimizeUtils::str_is_valid_regex($search);
+        if ($is_regex) {
+            $found = preg_match($search, $content);
         } else {
-            $found = ( false !== strpos( $content, $search ) );
+            $found = (false !== strpos($content, $search));
         }
 
-        if ( $found ) {
+        if ($found) {
             $content = preg_replace_callback(
                 $re_replace_pattern,
-                function( $matches ) use ( $marker ) {
-                    return autoptimizeBase::build_marker( $marker, $matches[0] );
+                function($matches) use ($marker) {
+                    return autoptimizeBase::build_marker($marker, $matches[0]);
                 },
                 $content
             );
@@ -591,13 +591,13 @@ 
      *
      * @return string
      */
-    protected function restore_marked_content( $marker, $content )
+    protected function restore_marked_content($marker, $content)
     {
-        if ( false !== strpos( $content, $marker ) ) {
+        if (false !== strpos($content, $marker)) {
             $content = preg_replace_callback(
-                '#%%' . $marker . AUTOPTIMIZE_HASH . '%%(.*?)%%' . $marker . '%%#is',
-                function ( $matches ) {
-                    return base64_decode( $matches[1] );
+                '#%%'.$marker.AUTOPTIMIZE_HASH.'%%(.*?)%%'.$marker.'%%#is',
+                function($matches) {
+                    return base64_decode($matches[1]);
                 },
                 $content
             );
@@ -613,17 +613,17 @@ 
      *
      * @return void
      */
-    protected function debug_log( $data )
+    protected function debug_log($data)
     {
-        if ( ! isset( $this->debug_log ) || ! $this->debug_log ) {
+        if (!isset($this->debug_log) || !$this->debug_log) {
             return;
         }
 
-        if ( ! is_string( $data ) && ! is_resource( $data ) ) {
-            $data = var_export( $data, true );
+        if (!is_string($data) && !is_resource($data)) {
+            $data = var_export($data, true);
         }
 
-        error_log( $data );
+        error_log($data);
     }
 
     /**
@@ -633,12 +633,12 @@ 
      *
      * @return bool|string to be minified code or false.
      */
-    protected function prepare_minify_single( $filepath )
+    protected function prepare_minify_single($filepath)
     {
         // Decide what we're dealing with, return false if we don't know.
-        if ( $this->str_ends_in( $filepath, '.js' ) ) {
+        if ($this->str_ends_in($filepath, '.js')) {
             $type = 'js';
-        } elseif ( $this->str_ends_in( $filepath, '.css' ) ) {
+        } elseif ($this->str_ends_in($filepath, '.css')) {
             $type = 'css';
         } else {
             return false;
@@ -647,18 +647,18 @@ 
         // Bail if it looks like its already minifed (by having -min or .min
         // in filename) or if it looks like WP jquery.js (which is minified).
         $minified_variants = array(
-            '-min.' . $type,
-            '.min.' . $type,
+            '-min.'.$type,
+            '.min.'.$type,
             'js/jquery/jquery.js',
         );
-        foreach ( $minified_variants as $ending ) {
-            if ( $this->str_ends_in( $filepath, $ending ) ) {
+        foreach ($minified_variants as $ending) {
+            if ($this->str_ends_in($filepath, $ending)) {
                 return false;
             }
         }
 
         // Get file contents, bail if empty.
-        $contents = file_get_contents( $filepath );
+        $contents = file_get_contents($filepath);
 
         return $contents;
     }
@@ -671,12 +671,12 @@ 
      *
      * @return string
      */
-    protected function build_minify_single_url( autoptimizeCache $cache )
+    protected function build_minify_single_url(autoptimizeCache $cache)
     {
-        $url = AUTOPTIMIZE_CACHE_URL . $cache->getname();
+        $url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
 
         // CDN-replace the resulting URL if needed...
-        $url = $this->url_replace_cdn( $url );
+        $url = $this->url_replace_cdn($url);
 
         return $url;
     }
@@ -689,15 +689,15 @@ 
      *
      * @return bool
      */
-    protected function str_ends_in( $str, $test )
+    protected 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/autoptimizeCache.php

Doc Comments +1 added lines, -1 removed lines

@@ -434,7 +434,7 @@
      * size = total filesize (in bytes) of found files
      * timestamp = unix timestamp when the scan was last performed/finished.
      *
-     * @return array
+     * @return integer[]
      */
     protected static function stats_scan()
     {

Spacing +134 added lines, -134 removed lines

@@ -3,7 +3,7 @@ 
  * Handles disk-cache-related operations.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -38,17 +38,17 @@ 
      * @param string $md5 Hash.
      * @param string $ext Extension.
      */
-    public function __construct( $md5, $ext = 'php' )
+    public function __construct($md5, $ext = 'php')
     {
         $this->cachedir = AUTOPTIMIZE_CACHE_DIR;
         $this->nogzip   = AUTOPTIMIZE_CACHE_NOGZIP;
-        if ( ! $this->nogzip ) {
-            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . '.php';
+        if (!$this->nogzip) {
+            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.php';
         } else {
-            if ( in_array( $ext, array( 'js', 'css' ) ) ) {
-                $this->filename = $ext . '/' . AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . '.' . $ext;
+            if (in_array($ext, array('js', 'css'))) {
+                $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
             } else {
-                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . '.' . $ext;
+                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.'.'.$ext;
             }
         }
     }
@@ -60,7 +60,7 @@ 
      */
     public function check()
     {
-        return file_exists( $this->cachedir . $this->filename );
+        return file_exists($this->cachedir.$this->filename);
     }
 
     /**
@@ -70,11 +70,11 @@ 
      */
     public function retrieve()
     {
-        if ( $this->check() ) {
-            if ( false == $this->nogzip ) {
-                return file_get_contents( $this->cachedir . $this->filename . '.none' );
+        if ($this->check()) {
+            if (false == $this->nogzip) {
+                return file_get_contents($this->cachedir.$this->filename.'.none');
             } else {
-                return file_get_contents( $this->cachedir . $this->filename );
+                return file_get_contents($this->cachedir.$this->filename);
             }
         }
         return false;
@@ -88,22 +88,22 @@ 
      *
      * @return void
      */
-    public function cache( $data, $mime )
+    public function cache($data, $mime)
     {
-        if ( false === $this->nogzip ) {
+        if (false === $this->nogzip) {
             // We handle gzipping ourselves.
             $file    = 'default.php';
-            $phpcode = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $file );
-            $phpcode = str_replace( array( '%%CONTENT%%', 'exit;' ), array( $mime, '' ), $phpcode );
+            $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$file);
+            $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode);
 
-            file_put_contents( $this->cachedir . $this->filename, $phpcode );
-            file_put_contents( $this->cachedir . $this->filename . '.none', $data );
+            file_put_contents($this->cachedir.$this->filename, $phpcode);
+            file_put_contents($this->cachedir.$this->filename.'.none', $data);
         } else {
             // Write code to cache without doing anything else.
-            file_put_contents( $this->cachedir . $this->filename, $data );
-            if ( apply_filters( 'autoptimize_filter_cache_create_static_gzip', false ) ) {
+            file_put_contents($this->cachedir.$this->filename, $data);
+            if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) {
                 // Create an additional cached gzip file.
-                file_put_contents( $this->cachedir . $this->filename . '.gz', gzencode( $data, 9, FORCE_GZIP ) );
+                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($data, 9, FORCE_GZIP));
             }
         }
     }
@@ -120,7 +120,7 @@ 
         // The original idea here was to provide 3rd party code a hook so that
         // it can "listen" to all the complete autoptimized-urls that the page
         // will emit... Or something to that effect I think?
-        apply_filters( 'autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL . $this->filename );
+        apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename);
 
         return $this->filename;
     }
@@ -133,11 +133,11 @@ 
      * @param string $file Filename.
      * @return bool
      */
-    protected static function is_valid_cache_file( $dir, $file )
+    protected static function is_valid_cache_file($dir, $file)
     {
-        if ( '.' !== $file && '..' !== $file &&
-            false !== strpos( $file, AUTOPTIMIZE_CACHEFILE_PREFIX ) &&
-            is_file( $dir . $file ) ) {
+        if ('.' !== $file && '..' !== $file &&
+            false !== strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) &&
+            is_file($dir.$file)) {
 
             // It's a valid file!
             return true;
@@ -155,16 +155,16 @@ 
     protected static function clear_cache_classic()
     {
         $contents = self::get_cache_contents();
-        foreach ( $contents as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    @unlink( $dir . $file ); // @codingStandardsIgnoreLine
+        foreach ($contents as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    @unlink($dir.$file); // @codingStandardsIgnoreLine
                 }
             }
         }
 
-        @unlink( AUTOPTIMIZE_CACHE_DIR . '/.htaccess' ); // @codingStandardsIgnoreLine
+        @unlink(AUTOPTIMIZE_CACHE_DIR.'/.htaccess'); // @codingStandardsIgnoreLine
     }
 
     /**
@@ -175,19 +175,19 @@ 
      *
      * @return bool
      */
-    protected static function rmdir( $pathname )
+    protected static function rmdir($pathname)
     {
-        $files = self::get_dir_contents( $pathname );
-        foreach ( $files as $file ) {
-            $path = $pathname . '/' . $file;
-            if ( is_dir( $path ) ) {
-                self::rmdir( $path );
+        $files = self::get_dir_contents($pathname);
+        foreach ($files as $file) {
+            $path = $pathname.'/'.$file;
+            if (is_dir($path)) {
+                self::rmdir($path);
             } else {
-                unlink( $path );
+                unlink($path);
             }
         }
 
-        return rmdir( $pathname );
+        return rmdir($pathname);
     }
 
     /**
@@ -204,12 +204,12 @@ 
         $new_name = self::get_unique_name();
 
         // Makes sure the new pathname is on the same level...
-        $new_pathname = dirname( $dir ) . '/' . $new_name;
-        $renamed      = @rename( $dir, $new_pathname ); // @codingStandardsIgnoreLine
+        $new_pathname = dirname($dir).'/'.$new_name;
+        $renamed      = @rename($dir, $new_pathname); // @codingStandardsIgnoreLine
 
         // When renamed, re-create the default cache directory back so it's
         // available again...
-        if ( $renamed ) {
+        if ($renamed) {
             $ok = self::cacheavail();
         }
 
@@ -223,7 +223,7 @@ 
      */
     public static function advanced_cache_clear_enabled()
     {
-        return apply_filters( 'autoptimize_filter_cache_clear_advanced', false );
+        return apply_filters('autoptimize_filter_cache_clear_advanced', false);
     }
 
     /**
@@ -234,7 +234,7 @@ 
     protected static function get_unique_name()
     {
         $prefix   = self::get_advanced_cache_clear_prefix();
-        $new_name = uniqid( $prefix, true );
+        $new_name = uniqid($prefix, true);
 
         return $new_name;
     }
@@ -247,8 +247,8 @@ 
     protected static function get_advanced_cache_clear_prefix()
     {
         $pathname = self::get_pathname_base();
-        $basename = basename( $pathname );
-        $prefix   = $basename . '-';
+        $basename = basename($pathname);
+        $prefix   = $basename.'-';
 
         return $prefix;
     }
@@ -261,9 +261,9 @@ 
      *
      * @return array
      */
-    protected static function get_dir_contents( $pathname )
+    protected static function get_dir_contents($pathname)
     {
-        return array_slice( scandir( $pathname ), 2 );
+        return array_slice(scandir($pathname), 2);
     }
 
     /**
@@ -277,17 +277,17 @@ 
     {
         $dir    = self::get_pathname_base();
         $prefix = self::get_advanced_cache_clear_prefix();
-        $parent = dirname( $dir );
+        $parent = dirname($dir);
         $ok     = false;
 
         // Returns the list of files without '.' and '..' elements.
-        $files = self::get_dir_contents( $parent );
-        foreach ( $files as $file ) {
-            $path     = $parent . '/' . $file;
-            $prefixed = ( false !== strpos( $path, $prefix ) );
+        $files = self::get_dir_contents($parent);
+        foreach ($files as $file) {
+            $path     = $parent.'/'.$file;
+            $prefixed = (false !== strpos($path, $prefix));
             // Removing only our own (prefixed) directories...
-            if ( is_dir( $path ) && $prefixed ) {
-                $ok = self::rmdir( $path );
+            if (is_dir($path) && $prefixed) {
+                $ok = self::rmdir($path);
             }
         }
 
@@ -306,9 +306,9 @@ 
     {
         $pathname = self::get_pathname_base();
 
-        if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
+        if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
             $blog_id   = get_current_blog_id();
-            $pathname .= $blog_id . '/';
+            $pathname .= $blog_id.'/';
         }
 
         return $pathname;
@@ -321,7 +321,7 @@ 
      */
     protected static function get_pathname_base()
     {
-        $pathname = WP_CONTENT_DIR . AUTOPTIMIZE_CACHE_CHILD_DIR;
+        $pathname = WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR;
 
         return $pathname;
     }
@@ -333,38 +333,38 @@ 
      *
      * @return bool
      */
-    public static function clearall( $propagate = true )
+    public static function clearall($propagate = true)
     {
-        if ( ! self::cacheavail() ) {
+        if (!self::cacheavail()) {
             return false;
         }
 
         // TODO/FIXME: If cache is big, switch to advanced/new cache clearing automatically?
-        if ( self::advanced_cache_clear_enabled() ) {
+        if (self::advanced_cache_clear_enabled()) {
             self::clear_cache_via_rename();
         } else {
             self::clear_cache_classic();
         }
 
         // Remove the transient so it gets regenerated...
-        delete_transient( 'autoptimize_stats' );
+        delete_transient('autoptimize_stats');
 
         // Cache was just purged, clear page cache and allow others to hook into our purging...
-        if ( true === $propagate ) {
-            if ( ! function_exists( 'autoptimize_do_cachepurged_action' ) ) {
+        if (true === $propagate) {
+            if (!function_exists('autoptimize_do_cachepurged_action')) {
                 function autoptimize_do_cachepurged_action() {
-                    do_action( 'autoptimize_action_cachepurged' );
+                    do_action('autoptimize_action_cachepurged');
                 }
             }
-            add_action( 'shutdown', 'autoptimize_do_cachepurged_action', 11 );
-            add_action( 'autoptimize_action_cachepurged', array( 'autoptimizeCache', 'flushPageCache' ), 10, 0 );
+            add_action('shutdown', 'autoptimize_do_cachepurged_action', 11);
+            add_action('autoptimize_action_cachepurged', array('autoptimizeCache', 'flushPageCache'), 10, 0);
         }
 
         // Warm cache (part of speedupper)!
-        if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) {
-            $url   = site_url() . '/?ao_speedup_cachebuster=' . rand( 1, 100000 );
-            $cache = @wp_remote_get( $url ); // @codingStandardsIgnoreLine
-            unset( $cache );
+        if (apply_filters('autoptimize_filter_speedupper', true)) {
+            $url   = site_url().'/?ao_speedup_cachebuster='.rand(1, 100000);
+            $cache = @wp_remote_get($url); // @codingStandardsIgnoreLine
+            unset($cache);
         }
 
         return true;
@@ -379,7 +379,7 @@ 
      */
     public static function clearall_actionless()
     {
-        return self::clearall( false );
+        return self::clearall(false);
     }
 
     /**
@@ -391,8 +391,8 @@ 
     {
         $contents = array();
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            $contents[ $dir ] = scandir( AUTOPTIMIZE_CACHE_DIR . $dir );
+        foreach (array('', 'js', 'css') as $dir) {
+            $contents[$dir] = scandir(AUTOPTIMIZE_CACHE_DIR.$dir);
         }
 
         return $contents;
@@ -405,21 +405,21 @@ 
      */
     public static function stats()
     {
-        $stats = get_transient( 'autoptimize_stats' );
+        $stats = get_transient('autoptimize_stats');
 
         // If no transient, do the actual scan!
-        if ( ! is_array( $stats ) ) {
-            if ( ! self::cacheavail() ) {
+        if (!is_array($stats)) {
+            if (!self::cacheavail()) {
                 return 0;
             }
             $stats = self::stats_scan();
             $count = $stats[0];
-            if ( $count > 100 ) {
+            if ($count > 100) {
                 // Store results in transient.
                 set_transient(
                     'autoptimize_stats',
                     $stats,
-                    apply_filters( 'autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS )
+                    apply_filters('autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS)
                 );
             }
         }
@@ -442,30 +442,30 @@ 
         $size  = 0;
 
         // Scan everything in our cache directories.
-        foreach ( self::get_cache_contents() as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    if ( AUTOPTIMIZE_CACHE_NOGZIP &&
+        foreach (self::get_cache_contents() as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    if (AUTOPTIMIZE_CACHE_NOGZIP &&
                         (
-                            false !== strpos( $file, '.js' ) ||
-                            false !== strpos( $file, '.css' ) ||
-                            false !== strpos( $file, '.img' ) ||
-                            false !== strpos( $file, '.txt' )
+                            false !== strpos($file, '.js') ||
+                            false !== strpos($file, '.css') ||
+                            false !== strpos($file, '.img') ||
+                            false !== strpos($file, '.txt')
                         )
                     ) {
                         // Web server is gzipping, we count .js|.css|.img|.txt files.
                         $count++;
-                    } elseif ( ! AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos( $file, '.none' ) ) {
+                    } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos($file, '.none')) {
                         // We are gzipping ourselves via php, counting only .none files.
                         $count++;
                     }
-                    $size += filesize( $dir . $file );
+                    $size += filesize($dir.$file);
                 }
             }
         }
 
-        $stats = array( $count, $size, time() );
+        $stats = array($count, $size, time());
 
         return $stats;
     }
@@ -479,29 +479,29 @@ 
      */
     public static function cacheavail()
     {
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) {
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
             // We didn't set a cache.
             return false;
         }
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            if ( ! self::check_cache_dir( AUTOPTIMIZE_CACHE_DIR . $dir ) ) {
+        foreach (array('', 'js', 'css') as $dir) {
+            if (!self::check_cache_dir(AUTOPTIMIZE_CACHE_DIR.$dir)) {
                 return false;
             }
         }
 
         // Using .htaccess inside our cache folder to overrule wp-super-cache.
-        $htaccess = AUTOPTIMIZE_CACHE_DIR . '/.htaccess';
-        if ( ! is_file( $htaccess ) ) {
+        $htaccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
+        if (!is_file($htaccess)) {
             /**
              * Create `wp-content/AO_htaccess_tmpl` file with
              * whatever htaccess rules you might need
              * if you want to override default AO htaccess
              */
-            $htaccess_tmpl = WP_CONTENT_DIR . '/AO_htaccess_tmpl';
-            if ( is_file( $htaccess_tmpl ) ) {
-                $content = file_get_contents( $htaccess_tmpl );
-            } elseif ( is_multisite() || ! AUTOPTIMIZE_CACHE_NOGZIP ) {
+            $htaccess_tmpl = WP_CONTENT_DIR.'/AO_htaccess_tmpl';
+            if (is_file($htaccess_tmpl)) {
+                $content = file_get_contents($htaccess_tmpl);
+            } elseif (is_multisite() || !AUTOPTIMIZE_CACHE_NOGZIP) {
                 $content = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
@@ -554,7 +554,7 @@ 
     </Files>
 </IfModule>';
             }
-            @file_put_contents( $htaccess, $content ); // @codingStandardsIgnoreLine
+            @file_put_contents($htaccess, $content); // @codingStandardsIgnoreLine
         }
 
         // All OK!
@@ -569,25 +569,25 @@ 
      *
      * @return bool
      */
-    protected static function check_cache_dir( $dir )
+    protected static function check_cache_dir($dir)
     {
         // Try creating the dir if it doesn't exist.
-        if ( ! file_exists( $dir ) ) {
-            @mkdir( $dir, 0775, true ); // @codingStandardsIgnoreLine
-            if ( ! file_exists( $dir ) ) {
+        if (!file_exists($dir)) {
+            @mkdir($dir, 0775, true); // @codingStandardsIgnoreLine
+            if (!file_exists($dir)) {
                 return false;
             }
         }
 
         // If we still cannot write, bail.
-        if ( ! is_writable( $dir ) ) {
+        if (!is_writable($dir)) {
             return false;
         }
 
         // Create an index.html in there to avoid prying eyes!
-        $idx_file = rtrim( $dir, '/\\' ) . '/index.html';
-        if ( ! is_file( $idx_file ) ) {
-            @file_put_contents( $idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>' ); // @codingStandardsIgnoreLine
+        $idx_file = rtrim($dir, '/\\').'/index.html';
+        if (!is_file($idx_file)) {
+            @file_put_contents($idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); // @codingStandardsIgnoreLine
         }
 
         return true;
@@ -601,59 +601,59 @@ 
     // @codingStandardsIgnoreStart
     public static function flushPageCache()
     {
-        if ( function_exists( 'wp_cache_clear_cache' ) ) {
-            if ( is_multisite() ) {
+        if (function_exists('wp_cache_clear_cache')) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                wp_cache_clear_cache( $blog_id );
+                wp_cache_clear_cache($blog_id);
             } else {
                 wp_cache_clear_cache();
             }
-        } elseif ( has_action( 'cachify_flush_cache' ) ) {
-            do_action( 'cachify_flush_cache' );
-        } elseif ( function_exists( 'w3tc_pgcache_flush' ) ) {
+        } elseif (has_action('cachify_flush_cache')) {
+            do_action('cachify_flush_cache');
+        } elseif (function_exists('w3tc_pgcache_flush')) {
             w3tc_pgcache_flush();
-        } elseif ( function_exists( 'wp_fast_cache_bulk_delete_all' ) ) {
+        } elseif (function_exists('wp_fast_cache_bulk_delete_all')) {
             wp_fast_cache_bulk_delete_all();
-        } elseif ( class_exists( 'WpFastestCache' ) ) {
+        } elseif (class_exists('WpFastestCache')) {
             $wpfc = new WpFastestCache();
             $wpfc->deleteCache();
-        } elseif ( class_exists( 'c_ws_plugin__qcache_purging_routines' ) ) {
+        } elseif (class_exists('c_ws_plugin__qcache_purging_routines')) {
             c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache
-        } elseif ( class_exists( 'zencache' ) ) {
+        } elseif (class_exists('zencache')) {
             zencache::clear();
-        } elseif ( class_exists( 'comet_cache' ) ) {
+        } elseif (class_exists('comet_cache')) {
             comet_cache::clear();
-        } elseif ( class_exists( 'WpeCommon' ) ) {
+        } elseif (class_exists('WpeCommon')) {
             // WPEngine cache purge/flush methods to call by default
             $wpe_methods = array(
                 'purge_varnish_cache',
             );
 
             // More agressive clear/flush/purge behind a filter
-            if ( apply_filters( 'autoptimize_flush_wpengine_aggressive', false ) ) {
-                $wpe_methods = array_merge( $wpe_methods, array( 'purge_memcached', 'clear_maxcdn_cache' ) );
+            if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) {
+                $wpe_methods = array_merge($wpe_methods, array('purge_memcached', 'clear_maxcdn_cache'));
             }
 
             // Filtering the entire list of WpeCommon methods to be called (for advanced usage + easier testing)
-            $wpe_methods = apply_filters( 'autoptimize_flush_wpengine_methods', $wpe_methods );
+            $wpe_methods = apply_filters('autoptimize_flush_wpengine_methods', $wpe_methods);
 
-            foreach ( $wpe_methods as $wpe_method ) {
-                if ( method_exists( 'WpeCommon', $wpe_method ) ) {
+            foreach ($wpe_methods as $wpe_method) {
+                if (method_exists('WpeCommon', $wpe_method)) {
                     WpeCommon::$wpe_method();
                 }
             }
-        } elseif ( function_exists( 'sg_cachepress_purge_cache' ) ) {
+        } elseif (function_exists('sg_cachepress_purge_cache')) {
             sg_cachepress_purge_cache();
-        } elseif ( file_exists( WP_CONTENT_DIR . '/wp-cache-config.php' ) && function_exists( 'prune_super_cache' ) ) {
+        } elseif (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) {
             // fallback for WP-Super-Cache
             global $cache_path;
-            if ( is_multisite() ) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                prune_super_cache( get_supercache_dir( $blog_id ), true );
-                prune_super_cache( $cache_path . 'blogs/', true );
+                prune_super_cache(get_supercache_dir($blog_id), true);
+                prune_super_cache($cache_path.'blogs/', true);
             } else {
-                prune_super_cache( $cache_path . 'supercache/', true );
-                prune_super_cache( $cache_path, true );
+                prune_super_cache($cache_path.'supercache/', true);
+                prune_super_cache($cache_path, true);
             }
         }
     }

classes/autoptimizeConfig.php

Doc Comments +6 added lines

@@ -752,6 +752,9 @@ 
         return $preload_onload;
     }
 
+    /**
+     * @param string $key
+     */
     public function get($key)
     {
         if ( ! is_array( $this->config ) ) {
@@ -778,6 +781,9 @@ 
         return false;
     }
 
+    /**
+     * @param string $url
+     */
     private function getFutttaFeeds($url) {
         if ( $this->settings_screen_do_remote_http ) {
             $rss = fetch_feed( $url );

Spacing +213 added lines, -213 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly.
+if (!defined('ABSPATH')) exit; // Exit if accessed directly.
 
 class autoptimizeConfig
 {
@@ -13,28 +13,28 @@ 
      */
     private function __construct()
     {
-        if ( is_admin() ) {
+        if (is_admin()) {
             // Add the admin page and settings.
-            add_action( 'admin_menu', array( $this, 'addmenu' ) );
-            add_action( 'admin_init', array( $this, 'registersettings' ) );
+            add_action('admin_menu', array($this, 'addmenu'));
+            add_action('admin_init', array($this, 'registersettings'));
 
             // Set meta info.
-            if ( function_exists( 'plugin_row_meta' ) ) {
+            if (function_exists('plugin_row_meta')) {
                 // 2.8 and higher.
-                add_filter( 'plugin_row_meta', array( $this, 'setmeta' ), 10, 2 );
-            } elseif ( function_exists( 'post_class' ) ) {
+                add_filter('plugin_row_meta', array($this, 'setmeta'), 10, 2);
+            } elseif (function_exists('post_class')) {
                 // 2.7 and lower.
-                $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' );
-                add_filter( 'plugin_action_links_' . $plugin, array( $this, 'setmeta' ) );
+                $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
+                add_filter('plugin_action_links_'.$plugin, array($this, 'setmeta'));
             }
 
             // Clean cache?
-            if ( get_option( 'autoptimize_cache_clean' ) ) {
+            if (get_option('autoptimize_cache_clean')) {
                 autoptimizeCache::clearall();
-                update_option( 'autoptimize_cache_clean', 0 );
+                update_option('autoptimize_cache_clean', 0);
             }
 
-            $this->settings_screen_do_remote_http = apply_filters( 'autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http );
+            $this->settings_screen_do_remote_http = apply_filters('autoptimize_settingsscreen_remotehttp', $this->settings_screen_do_remote_http);
         }
 
         // Adds the Autoptimize Toolbar to the Admin bar.
@@ -48,7 +48,7 @@ 
     static public function instance()
     {
         // Only one instance.
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new autoptimizeConfig();
         }
 
@@ -174,28 +174,28 @@ 
 
 <div class="wrap">
 
-<?php if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) { ?>
-<div class="notice-error notice"><?php echo '<p>' . sprintf( __( '<strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href=%s>serious security and performance issues</a>. Support for PHP 5.5 and below will be removed in one of the next AO released, please ask your hoster to provide you with an upgrade path to 7.x.', 'autoptimize' ), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"' ) . '</p>'; ?></div>
+<?php if (version_compare(PHP_VERSION, '5.3.0') < 0) { ?>
+<div class="notice-error notice"><?php echo '<p>'.sprintf(__('<strong>You are using a very old version of PHP</strong> (5.2.x or older) which has <a href=%s>serious security and performance issues</a>. Support for PHP 5.5 and below will be removed in one of the next AO released, please ask your hoster to provide you with an upgrade path to 7.x.', 'autoptimize'), '"http://blog.futtta.be/2016/03/15/why-would-you-still-be-on-php-5-2/" target="_blank"').'</p>'; ?></div>
 <?php } ?>
 
-<?php if ( defined( 'AUTOPTIMIZE_LEGACY_MINIFIERS' ) ) { ?>
+<?php if (defined('AUTOPTIMIZE_LEGACY_MINIFIERS')) { ?>
     <div class="notice-error notice"><p>
-        <?php _e( "You are using the (no longer supported) AUTOPTIMIZE_LEGACY_MINIFIERS constant. Ensure your site is working properly and remove the constant, it doesn't do anything any more.", 'autoptimize' ); ?>
+        <?php _e("You are using the (no longer supported) AUTOPTIMIZE_LEGACY_MINIFIERS constant. Ensure your site is working properly and remove the constant, it doesn't do anything any more.", 'autoptimize'); ?>
     </p></div>
 <?php } ?>
 
 <div id="autoptimize_main">
     <div id="ao_title_and_button">
-        <h1 id="ao_title"><?php _e( 'Autoptimize Settings', 'autoptimize' ); ?>
+        <h1 id="ao_title"><?php _e('Autoptimize Settings', 'autoptimize'); ?>
         <span id="ao_adv_button">
-        <?php if ( get_option( 'autoptimize_show_adv', '0' ) == '1' ) { ?>
-            <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
-            <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
+        <?php if (get_option('autoptimize_show_adv', '0') == '1') { ?>
+            <a href="javascript:void(0);" id="ao_show_adv" class="button" style="display:none;"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a>
+            <a href="javascript:void(0);" id="ao_hide_adv" class="button"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a>
             <style>tr.ao_adv{display:table-row;} li.ao_adv{display:list-item;}</style>
             <?php $hiddenClass = ''; ?>
         <?php } else { ?>
-            <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings","autoptimize") ?></span></a>
-            <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings","autoptimize") ?></span></a>
+            <a href="javascript:void(0);" id="ao_show_adv" class="button"><span><?php _e("Show advanced settings", "autoptimize") ?></span></a>
+            <a href="javascript:void(0);" id="ao_hide_adv" class="button" style="display:none;"><span><?php _e("Hide advanced settings", "autoptimize") ?></span></a>
             <?php $hiddenClass = 'hidden '; ?>
         <?php } ?>
         </span>
@@ -205,185 +205,185 @@ 
     <?php echo $this->ao_admin_tabs(); ?>
 
 <form method="post" action="options.php">
-<?php settings_fields( 'autoptimize' ); ?>
+<?php settings_fields('autoptimize'); ?>
 
 <ul>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('HTML Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('HTML Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Optimize HTML Code?','autoptimize'); ?></th>
-<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html')?'checked="checked" ':''; ?>/></td>
+<th scope="row"><?php _e('Optimize HTML Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_html" name="autoptimize_html" <?php echo get_option('autoptimize_html') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
-<tr class="<?php echo $hiddenClass;?>html_sub ao_adv" valign="top">
-<th scope="row"><?php _e('Keep HTML comments?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments')?'checked="checked" ':''; ?>/>
-<?php _e('Enable this if you want HTML comments to remain in the page.','autoptimize'); ?></label></td>
+<tr class="<?php echo $hiddenClass; ?>html_sub ao_adv" valign="top">
+<th scope="row"><?php _e('Keep HTML comments?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_html_keepcomments" <?php echo get_option('autoptimize_html_keepcomments') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this if you want HTML comments to remain in the page.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('JavaScript Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('JavaScript Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Optimize JavaScript Code?','autoptimize'); ?></th>
-<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js')?'checked="checked" ':''; ?>/></td>
+<th scope="row"><?php _e('Optimize JavaScript Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_js" name="autoptimize_js" <?php echo get_option('autoptimize_js') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv">
-<th scope="row"><?php _e( 'Aggregate JS-files?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get( 'autoptimize_js_aggregate' ) ? 'checked="checked" ':''; ?>/>
-<?php _e( 'Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv">
+<th scope="row"><?php _e('Aggregate JS-files?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_js_aggregate" name="autoptimize_js_aggregate" <?php echo $conf->get('autoptimize_js_aggregate') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Aggregate all linked JS-files to have them loaded non-render blocking? If this option is off, the individual JS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
-<th scope="row"><?php _e('Also aggregate inline JS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline')?'checked="checked" ':''; ?>/>
-<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv js_aggregate">
+<th scope="row"><?php _e('Also aggregate inline JS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_include_inline" <?php echo get_option('autoptimize_js_include_inline') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Let Autoptimize also extract JS from the HTML. <strong>Warning</strong>: this can make Autoptimize\'s cache size grow quickly, so only enable this if you know what you\'re doing.', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
-<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead')?'checked="checked" ':''; ?>/>
-<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv js_aggregate">
+<th scope="row"><?php _e('Force JavaScript in &lt;head&gt;?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_forcehead" <?php echo get_option('autoptimize_js_forcehead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Load JavaScript early, this can potentially fix some JS-errors, but makes the JS render blocking.', 'autoptimize'); ?></label></td>
 </tr>
 <?php if (get_option('autoptimize_js_justhead')) { ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
-<th scope="row"><?php _e('Look for scripts only in &lt;head&gt;?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead')?'checked="checked" ':''; ?>/>
-<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv js_aggregate">
+<th scope="row"><?php _e('Look for scripts only in &lt;head&gt;?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_justhead" <?php echo get_option('autoptimize_js_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Mostly useful in combination with previous option when using jQuery-based templates, but might help keeping cache size under control.', 'autoptimize'); ?></label></td>
 </tr>
 <?php } ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
-<th scope="row"><?php _e('Exclude scripts from Autoptimize:','autoptimize'); ?></th>
-<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude',"seal.js, js/jquery/jquery.js"); ?>"/><br />
-<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv js_aggregate">
+<th scope="row"><?php _e('Exclude scripts from Autoptimize:', 'autoptimize'); ?></th>
+<td><label><input type="text" style="width:100%;" name="autoptimize_js_exclude" value="<?php echo get_option('autoptimize_js_exclude', "seal.js, js/jquery/jquery.js"); ?>"/><br />
+<?php _e('A comma-separated list of scripts you want to exclude from being optimized, for example \'whatever.js, another.js\' (without the quotes) to exclude those scripts from being aggregated by Autoptimize.', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>js_sub ao_adv js_aggregate">
-<th scope="row"><?php _e('Add try-catch wrapping?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch')?'checked="checked" ':''; ?>/>
-<?php _e('If your scripts break because of a JS-error, you might want to try this.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>js_sub ao_adv js_aggregate">
+<th scope="row"><?php _e('Add try-catch wrapping?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_js_trycatch" <?php echo get_option('autoptimize_js_trycatch') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('If your scripts break because of a JS-error, you might want to try this.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('CSS Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('CSS Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('Optimize CSS Code?','autoptimize'); ?></th>
-<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css')?'checked="checked" ':''; ?>/></td>
+<th scope="row"><?php _e('Optimize CSS Code?', 'autoptimize'); ?></th>
+<td><input type="checkbox" id="autoptimize_css" name="autoptimize_css" <?php echo get_option('autoptimize_css') ? 'checked="checked" ' : ''; ?>/></td>
 </tr>
-<tr class="<?php echo $hiddenClass;?>css_sub ao_adv" valign="top">
-<th scope="row"><?php _e( 'Aggregate CSS-files?', 'autoptimize' ); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get( 'autoptimize_css_aggregate' ) ? 'checked="checked" ' : ''; ?>/>
-<?php _e('Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize' ); ?></label></td>
+<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv" valign="top">
+<th scope="row"><?php _e('Aggregate CSS-files?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_aggregate" name="autoptimize_css_aggregate" <?php echo $conf->get('autoptimize_css_aggregate') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Aggregate all linked CSS-files? If this option is off, the individual CSS-files will remain in place but will be minified.', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv css_aggregate">
-<th scope="row"><?php _e('Also aggregate inline CSS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline','1')?'checked="checked" ':''; ?>/>
-<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv css_aggregate">
+<th scope="row"><?php _e('Also aggregate inline CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_include_inline" <?php echo get_option('autoptimize_css_include_inline', '1') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Check this option for Autoptimize to also aggregate CSS in the HTML.', 'autoptimize'); ?></label></td>
 </tr>
-<tr class="<?php echo $hiddenClass;?>css_sub ao_adv css_aggregate" valign="top">
-<th scope="row"><?php _e('Generate data: URIs for images?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris')?'checked="checked" ':''; ?>/>
-<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.','autoptimize'); ?></label></td>
+<tr class="<?php echo $hiddenClass; ?>css_sub ao_adv css_aggregate" valign="top">
+<th scope="row"><?php _e('Generate data: URIs for images?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_datauris" <?php echo get_option('autoptimize_css_datauris') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Enable this to include small background-images in the CSS itself instead of as separate downloads.', 'autoptimize'); ?></label></td>
 </tr>
 <?php if (get_option('autoptimize_css_justhead')) { ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv css_aggregate">
-<th scope="row"><?php _e('Look for styles only in &lt;head&gt;?','autoptimize'); echo ' <i>'. __('(deprecated)','autoptimize') . '</i>'; ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead')?'checked="checked" ':''; ?>/>
-<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv css_aggregate">
+<th scope="row"><?php _e('Look for styles only in &lt;head&gt;?', 'autoptimize'); echo ' <i>'.__('(deprecated)', 'autoptimize').'</i>'; ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_justhead" <?php echo get_option('autoptimize_css_justhead') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Don\'t autoptimize CSS outside the head-section. If the cache gets big, you might want to enable this.', 'autoptimize'); ?></label></td>
 </tr>
 <?php } ?>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv">
-<th scope="row"><?php _e('Inline and Defer CSS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer')?'checked="checked" ':''; ?>/>
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv">
+<th scope="row"><?php _e('Inline and Defer CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" name="autoptimize_css_defer" id="autoptimize_css_defer" <?php echo get_option('autoptimize_css_defer') ? 'checked="checked" ' : ''; ?>/>
 <?php
-_e( 'Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize' );
-if ( function_exists( 'is_plugin_active' ) && ! is_plugin_active( 'autoptimize-criticalcss/ao_criticss_aas.php' ) ) {
+_e('Inline "above the fold CSS" while loading the main autoptimized CSS only after page load. <a href="http://wordpress.org/plugins/autoptimize/faq/" target="_blank">Check the FAQ</a> for more info.', 'autoptimize');
+if (function_exists('is_plugin_active') && !is_plugin_active('autoptimize-criticalcss/ao_criticss_aas.php')) {
     echo ' ';
-    $critcss_install_url = network_admin_url() . 'plugin-install.php?s=autoptimize+criticalcss&tab=search&type=term';
-    echo sprintf( __( 'This can be fully automated for different types of pages with the %s.', 'autoptimize' ), '<a href="'.$critcss_install_url.'">Autoptimize CriticalCSS Power-Up</a>' );
+    $critcss_install_url = network_admin_url().'plugin-install.php?s=autoptimize+criticalcss&tab=search&type=term';
+    echo sprintf(__('This can be fully automated for different types of pages with the %s.', 'autoptimize'), '<a href="'.$critcss_install_url.'">Autoptimize CriticalCSS Power-Up</a>');
 }
 ?>
 </label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>css_sub ao_adv" id="autoptimize_css_defer_inline">
+<tr valign="top" class="<?php echo $hiddenClass; ?>css_sub ao_adv" id="autoptimize_css_defer_inline">
 <th scope="row"></th>
-<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.','autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td>
+<td><label><textarea rows="10" cols="10" style="width:100%;" placeholder="<?php _e('Paste the above the fold CSS here.', 'autoptimize'); ?>" name="autoptimize_css_defer_inline"><?php echo get_option('autoptimize_css_defer_inline'); ?></textarea></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub css_aggregate">
-<th scope="row"><?php _e('Inline all CSS?','autoptimize'); ?></th>
-<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline')?'checked="checked" ':''; ?>/>
-<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub css_aggregate">
+<th scope="row"><?php _e('Inline all CSS?', 'autoptimize'); ?></th>
+<td><label class="cb_label"><input type="checkbox" id="autoptimize_css_inline" name="autoptimize_css_inline" <?php echo get_option('autoptimize_css_inline') ? 'checked="checked" ' : ''; ?>/>
+<?php _e('Inlining all CSS can improve performance for sites with a low pageviews/ visitor-rate, but may slow down performance otherwise.', 'autoptimize'); ?></label></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv css_sub css_aggregate">
-<th scope="row"><?php _e('Exclude CSS from Autoptimize:','autoptimize'); ?></th>
-<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude','wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css'); ?>"/><br />
-<?php _e('A comma-separated list of CSS you want to exclude from being optimized.','autoptimize'); ?></label></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv css_sub css_aggregate">
+<th scope="row"><?php _e('Exclude CSS from Autoptimize:', 'autoptimize'); ?></th>
+<td><label><input type="text" style="width:100%;" name="autoptimize_css_exclude" value="<?php echo get_option('autoptimize_css_exclude', 'wp-content/cache/, wp-content/uploads/, admin-bar.min.css, dashicons.min.css'); ?>"/><br />
+<?php _e('A comma-separated list of CSS you want to exclude from being optimized.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
 <li class="itemDetail">
-<h2 class="itemTitle"><?php _e('CDN Options','autoptimize'); ?></h2>
+<h2 class="itemTitle"><?php _e('CDN Options', 'autoptimize'); ?></h2>
 <table class="form-table">
 <tr valign="top">
-<th scope="row"><?php _e('CDN Base URL','autoptimize'); ?></th>
-<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url',''),array("http","https")); ?>" /><br />
-<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.','autoptimize'); ?></label></td>
+<th scope="row"><?php _e('CDN Base URL', 'autoptimize'); ?></th>
+<td><label><input id="cdn_url" type="text" name="autoptimize_cdn_url" pattern="^(https?:)?\/\/([\da-z\.-]+)\.([\da-z\.]{2,6})([\/\w \.-]*)*(:\d{2,5})?\/?$" style="width:100%" value="<?php echo esc_url(get_option('autoptimize_cdn_url', ''), array("http", "https")); ?>" /><br />
+<?php _e('Enter your CDN root URL to enable CDN for Autoptimized files. The URL can be http, https or protocol-relative (e.g. <code>//cdn.example.com/</code>). This is not needed for Cloudflare.', 'autoptimize'); ?></label></td>
 </tr>
 </table>
 </li>
 
-<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
-<h2 class="itemTitle"><?php _e('Cache Info','autoptimize'); ?></h2>
+<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv">
+<h2 class="itemTitle"><?php _e('Cache Info', 'autoptimize'); ?></h2>
 <table class="form-table" >
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Cache folder','autoptimize'); ?></th>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Cache folder', 'autoptimize'); ?></th>
 <td><?php echo htmlentities(AUTOPTIMIZE_CACHE_DIR); ?></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Can we write?','autoptimize'); ?></th>
-<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes','autoptimize') : __('No','autoptimize')); ?></td>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Can we write?', 'autoptimize'); ?></th>
+<td><?php echo (autoptimizeCache::cacheavail() ? __('Yes', 'autoptimize') : __('No', 'autoptimize')); ?></td>
 </tr>
-<tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-<th scope="row"><?php _e('Cached styles and scripts','autoptimize'); ?></th>
+<tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+<th scope="row"><?php _e('Cached styles and scripts', 'autoptimize'); ?></th>
 <td><?php
     $AOstatArr = autoptimizeCache::stats();
-    if ( ! empty( $AOstatArr ) && is_array( $AOstatArr ) ) {
-        $AOcacheSize = size_format( $AOstatArr[1], 2 );
+    if (!empty($AOstatArr) && is_array($AOstatArr)) {
+        $AOcacheSize = size_format($AOstatArr[1], 2);
         $details = '';
-        if ( $AOcacheSize > 0 ) {
-            $details = ', ~' . $AOcacheSize . ' total';
+        if ($AOcacheSize > 0) {
+            $details = ', ~'.$AOcacheSize.' total';
         }
-        printf( __( '%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize' ), $AOstatArr[0], $AOcacheSize, date( 'H:i e', $AOstatArr[2] ) );
+        printf(__('%1$s files, totalling %2$s Kbytes (calculated at %3$s)', 'autoptimize'), $AOstatArr[0], $AOcacheSize, date('H:i e', $AOstatArr[2]));
     }
 ?></td>
 </tr>
 </table>
 </li>
 
-<li class="<?php echo $hiddenClass;?>itemDetail ao_adv">
-<h2 class="itemTitle"><?php _e('Misc Options','autoptimize'); ?></h2>
+<li class="<?php echo $hiddenClass; ?>itemDetail ao_adv">
+<h2 class="itemTitle"><?php _e('Misc Options', 'autoptimize'); ?></h2>
 <table class="form-table">
-    <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-    <th scope="row"><?php _e('Save aggregated script/css as static files?','autoptimize'); ?></th>
-    <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip','1')?'checked="checked" ':''; ?>/>
-    <?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.','autoptimize'); ?></label></td>
+    <tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+    <th scope="row"><?php _e('Save aggregated script/css as static files?', 'autoptimize'); ?></th>
+    <td><label class="cb_label"><input type="checkbox" name="autoptimize_cache_nogzip" <?php echo get_option('autoptimize_cache_nogzip', '1') ? 'checked="checked" ' : ''; ?>/>
+    <?php _e('By default files saved are static css/js, uncheck this option if your webserver doesn\'t properly handle the compression and expiry.', 'autoptimize'); ?></label></td>
     </tr>
-    <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-    <th scope="row"><?php _e('Also optimize for logged in users?','autoptimize'); ?></th>
-    <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged','1')?'checked="checked" ':''; ?>/>
-    <?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.','autoptimize'); ?></label></td>
+    <tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+    <th scope="row"><?php _e('Also optimize for logged in users?', 'autoptimize'); ?></th>
+    <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_logged" <?php echo get_option('autoptimize_optimize_logged', '1') ? 'checked="checked" ' : ''; ?>/>
+    <?php _e('By default Autoptimize is also active for logged on users, uncheck not to optimize when logged in e.g. to use a pagebuilder.', 'autoptimize'); ?></label></td>
     </tr>
     <?php
-    if ( function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout") ) {
+    if (function_exists("is_checkout") || function_exists("is_cart") || function_exists("edd_is_checkout") || function_exists("wpsc_is_cart") || function_exists("wpsc_is_checkout")) {
     ?>
-    <tr valign="top" class="<?php echo $hiddenClass;?>ao_adv">
-        <th scope="row"><?php _e('Also optimize shop cart/ checkout?','autoptimize'); ?></th>
-        <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout','1')?'checked="checked" ':''; ?>/>
-            <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.','autoptimize'); ?></label>
+    <tr valign="top" class="<?php echo $hiddenClass; ?>ao_adv">
+        <th scope="row"><?php _e('Also optimize shop cart/ checkout?', 'autoptimize'); ?></th>
+        <td><label class="cb_label"><input type="checkbox" name="autoptimize_optimize_checkout" <?php echo get_option('autoptimize_optimize_checkout', '1') ? 'checked="checked" ' : ''; ?>/>
+            <?php _e('By default Autoptimize is also active on your shop\'s cart/ checkout, uncheck not to optimize those.', 'autoptimize'); ?></label>
         </td>
     </tr>
     <?php } ?>
@@ -392,11 +392,11 @@ 
 
 </ul>
 
-<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv','0'); ?>">
+<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo get_option('autoptimize_show_adv', '0'); ?>">
 
 <p class="submit">
-<input type="submit" class="button-secondary" value="<?php _e('Save Changes','autoptimize') ?>" />
-<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache','autoptimize') ?>" />
+<input type="submit" class="button-secondary" value="<?php _e('Save Changes', 'autoptimize') ?>" />
+<input type="submit" class="button-primary" name="autoptimize_cache_clean" value="<?php _e('Save Changes and Empty Cache', 'autoptimize') ?>" />
 </p>
 
 </form>
@@ -405,13 +405,13 @@ 
     <div class="autoptimize_banner hidden">
       <ul>
     <?php
-    if ( $this->settings_screen_do_remote_http ) {
-        $AO_banner = get_transient( 'autoptimize_banner' );
-        if ( empty( $AO_banner ) ) {
-            $banner_resp = wp_remote_get( 'https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION );
-            if ( ! is_wp_error( $banner_resp ) ) {
-                if ( '200' == wp_remote_retrieve_response_code( $banner_resp ) ) {
-                    $AO_banner = wp_kses_post( wp_remote_retrieve_body( $banner_resp ) );
+    if ($this->settings_screen_do_remote_http) {
+        $AO_banner = get_transient('autoptimize_banner');
+        if (empty($AO_banner)) {
+            $banner_resp = wp_remote_get('https://misc.optimizingmatters.com/autoptimize_news.html?ao_ver='.AUTOPTIMIZE_PLUGIN_VERSION);
+            if (!is_wp_error($banner_resp)) {
+                if ('200' == wp_remote_retrieve_response_code($banner_resp)) {
+                    $AO_banner = wp_kses_post(wp_remote_retrieve_body($banner_resp));
                     set_transient('autoptimize_banner', $AO_banner, DAY_IN_SECONDS);
                 }
             }
@@ -419,17 +419,17 @@ 
         echo $AO_banner;
     }
     ?>
-        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.","autoptimize"); ?></li>
-        <li><?php _e("Happy with Autoptimize?","autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!","autoptimize"); ?></a></li>
+        <li><?php _e("Need help? <a href='https://wordpress.org/plugins/autoptimize/faq/'>Check out the FAQ here</a>.", "autoptimize"); ?></li>
+        <li><?php _e("Happy with Autoptimize?", "autoptimize"); ?><br /><a href="<?php echo network_admin_url(); ?>plugin-install.php?tab=search&type=author&s=optimizingmatters"><?php _e("Try my other plugins!", "autoptimize"); ?></a></li>
     </ul>
     </div>
     <div style="margin-left:10px;margin-top:-5px;">
         <h2>
-            <?php _e("futtta about","autoptimize") ?>
+            <?php _e("futtta about", "autoptimize") ?>
             <select id="feed_dropdown" >
-                <option value="1"><?php _e("Autoptimize","autoptimize") ?></option>
-                <option value="2"><?php _e("WordPress","autoptimize") ?></option>
-                <option value="3"><?php _e("Web Technology","autoptimize") ?></option>
+                <option value="1"><?php _e("Autoptimize", "autoptimize") ?></option>
+                <option value="2"><?php _e("WordPress", "autoptimize") ?></option>
+                <option value="3"><?php _e("Web Technology", "autoptimize") ?></option>
             </select>
         </h2>
         <div id="futtta_feed">
@@ -444,7 +444,7 @@ 
             </div>
         </div>
     </div>
-    <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!","autoptimize"); ?>"></a></div>
+    <div style="float:right;margin:50px 15px;"><a href="http://blog.futtta.be/2013/10/21/do-not-donate-to-me/" target="_blank"><img width="100px" height="85px" src="<?php echo plugins_url().'/'.plugin_basename(dirname(__FILE__)).'/external/do_not_donate_smallest.png'; ?>" title="<?php _e("Do not donate for this plugin!", "autoptimize"); ?>"></a></div>
 </div>
 
 <script type="text/javascript">
@@ -607,48 +607,48 @@ 
 
     public function addmenu()
     {
-        $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show' ) );
-        add_action( 'admin_print_scripts-' . $hook, array( $this, 'autoptimize_admin_scripts' ) );
-        add_action( 'admin_print_styles-' . $hook, array( $this, 'autoptimize_admin_styles' ) );
+        $hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show'));
+        add_action('admin_print_scripts-'.$hook, array($this, 'autoptimize_admin_scripts'));
+        add_action('admin_print_styles-'.$hook, array($this, 'autoptimize_admin_styles'));
     }
 
     public function autoptimize_admin_scripts()
     {
-        wp_enqueue_script( 'jqcookie', plugins_url( '/external/js/jquery.cookie.min.js', __FILE__ ), array( 'jquery' ), null, true );
-        wp_enqueue_script( 'unslider', plugins_url( '/external/js/unslider-min.js', __FILE__ ), array( 'jquery' ), null, true );
+        wp_enqueue_script('jqcookie', plugins_url('/external/js/jquery.cookie.min.js', __FILE__), array('jquery'), null, true);
+        wp_enqueue_script('unslider', plugins_url('/external/js/unslider-min.js', __FILE__), array('jquery'), null, true);
     }
 
     public function autoptimize_admin_styles()
     {
-        wp_enqueue_style( 'unslider', plugins_url( '/external/js/unslider.css', __FILE__ ) );
-        wp_enqueue_style( 'unslider-dots', plugins_url( '/external/js/unslider-dots.css', __FILE__ ) );
+        wp_enqueue_style('unslider', plugins_url('/external/js/unslider.css', __FILE__));
+        wp_enqueue_style('unslider-dots', plugins_url('/external/js/unslider-dots.css', __FILE__));
     }
 
     public function registersettings() {
-        register_setting( 'autoptimize', 'autoptimize_html' );
-        register_setting( 'autoptimize', 'autoptimize_html_keepcomments' );
-        register_setting( 'autoptimize', 'autoptimize_js' );
-        register_setting( 'autoptimize', 'autoptimize_js_aggregate' );
-        register_setting( 'autoptimize', 'autoptimize_js_exclude' );
-        register_setting( 'autoptimize', 'autoptimize_js_trycatch' );
-        register_setting( 'autoptimize', 'autoptimize_js_justhead' );
-        register_setting( 'autoptimize', 'autoptimize_js_forcehead' );
-        register_setting( 'autoptimize', 'autoptimize_js_include_inline' );
-        register_setting( 'autoptimize', 'autoptimize_css' );
-        register_setting( 'autoptimize', 'autoptimize_css_aggregate' );
-        register_setting( 'autoptimize', 'autoptimize_css_exclude' );
-        register_setting( 'autoptimize', 'autoptimize_css_justhead' );
-        register_setting( 'autoptimize', 'autoptimize_css_datauris' );
-        register_setting( 'autoptimize', 'autoptimize_css_defer' );
-        register_setting( 'autoptimize', 'autoptimize_css_defer_inline' );
-        register_setting( 'autoptimize', 'autoptimize_css_inline' );
-        register_setting( 'autoptimize', 'autoptimize_css_include_inline' );
-        register_setting( 'autoptimize', 'autoptimize_cdn_url' );
-        register_setting( 'autoptimize', 'autoptimize_cache_clean' );
-        register_setting( 'autoptimize', 'autoptimize_cache_nogzip' );
-        register_setting( 'autoptimize', 'autoptimize_show_adv' );
-        register_setting( 'autoptimize', 'autoptimize_optimize_logged' );
-        register_setting( 'autoptimize', 'autoptimize_optimize_checkout' );
+        register_setting('autoptimize', 'autoptimize_html');
+        register_setting('autoptimize', 'autoptimize_html_keepcomments');
+        register_setting('autoptimize', 'autoptimize_js');
+        register_setting('autoptimize', 'autoptimize_js_aggregate');
+        register_setting('autoptimize', 'autoptimize_js_exclude');
+        register_setting('autoptimize', 'autoptimize_js_trycatch');
+        register_setting('autoptimize', 'autoptimize_js_justhead');
+        register_setting('autoptimize', 'autoptimize_js_forcehead');
+        register_setting('autoptimize', 'autoptimize_js_include_inline');
+        register_setting('autoptimize', 'autoptimize_css');
+        register_setting('autoptimize', 'autoptimize_css_aggregate');
+        register_setting('autoptimize', 'autoptimize_css_exclude');
+        register_setting('autoptimize', 'autoptimize_css_justhead');
+        register_setting('autoptimize', 'autoptimize_css_datauris');
+        register_setting('autoptimize', 'autoptimize_css_defer');
+        register_setting('autoptimize', 'autoptimize_css_defer_inline');
+        register_setting('autoptimize', 'autoptimize_css_inline');
+        register_setting('autoptimize', 'autoptimize_css_include_inline');
+        register_setting('autoptimize', 'autoptimize_cdn_url');
+        register_setting('autoptimize', 'autoptimize_cache_clean');
+        register_setting('autoptimize', 'autoptimize_cache_nogzip');
+        register_setting('autoptimize', 'autoptimize_show_adv');
+        register_setting('autoptimize', 'autoptimize_optimize_logged');
+        register_setting('autoptimize', 'autoptimize_optimize_checkout');
     }
 
     public function setmeta($links, $file = null)
@@ -656,20 +656,20 @@ 
         // Inspired on http://wpengineer.com/meta-links-for-wordpress-plugins/.
         // Do it only once - saves time.
         static $plugin;
-        if ( empty( $plugin ) ) {
-            $plugin = plugin_basename( AUTOPTIMIZE_PLUGIN_DIR . 'autoptimize.php' );
+        if (empty($plugin)) {
+            $plugin = plugin_basename(AUTOPTIMIZE_PLUGIN_DIR.'autoptimize.php');
         }
 
-        if ( null === $file ) {
+        if (null === $file) {
             // 2.7 and lower.
-            $settings_link = sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) );
-            array_unshift( $links, $settings_link );
+            $settings_link = sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings'));
+            array_unshift($links, $settings_link);
         } else {
             // 2.8 and higher.
             // If it's us, add the link.
-            if ( $file === $plugin ) {
-                $newlink = array( sprintf( '<a href="options-general.php?page=autoptimize">%s</a>', __( 'Settings' ) ) );
-                $links = array_merge( $links, $newlink );
+            if ($file === $plugin) {
+                $newlink = array(sprintf('<a href="options-general.php?page=autoptimize">%s</a>', __('Settings')));
+                $links = array_merge($links, $newlink);
             }
         }
 
@@ -737,7 +737,7 @@ 
      */
     public static function get_ao_css_preload_polyfill()
     {
-        $preload_poly = apply_filters('autoptimize_css_preload_polyfill','<script data-cfasync=\'false\'>!function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){function e(){t.media=a}var a=t.media||"all";t.addEventListener?t.addEventListener("load",e):t.attachEvent&&t.attachEvent("onload",e),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(e,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script>');
+        $preload_poly = apply_filters('autoptimize_css_preload_polyfill', '<script data-cfasync=\'false\'>!function(t){"use strict";t.loadCSS||(t.loadCSS=function(){});var e=loadCSS.relpreload={};if(e.support=function(){var e;try{e=t.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),e.bindMediaToggle=function(t){function e(){t.media=a}var a=t.media||"all";t.addEventListener?t.addEventListener("load",e):t.attachEvent&&t.attachEvent("onload",e),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(e,3e3)},e.poly=function(){if(!e.support())for(var a=t.document.getElementsByTagName("link"),n=0;n<a.length;n++){var o=a[n];"preload"!==o.rel||"style"!==o.getAttribute("as")||o.getAttribute("data-loadcss")||(o.setAttribute("data-loadcss",!0),e.bindMediaToggle(o))}},!e.support()){e.poly();var a=t.setInterval(e.poly,500);t.addEventListener?t.addEventListener("load",function(){e.poly(),t.clearInterval(a)}):t.attachEvent&&t.attachEvent("onload",function(){e.poly(),t.clearInterval(a)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:t.loadCSS=loadCSS}("undefined"!=typeof global?global:this);</script>');
         return $preload_poly;
     }
 
@@ -748,55 +748,55 @@ 
      */
     public static function get_ao_css_preload_onload()
     {
-        $preload_onload = apply_filters('autoptimize_filter_css_preload_onload',"this.onload=null;this.rel='stylesheet'");
+        $preload_onload = apply_filters('autoptimize_filter_css_preload_onload', "this.onload=null;this.rel='stylesheet'");
         return $preload_onload;
     }
 
     public function get($key)
     {
-        if ( ! is_array( $this->config ) ) {
+        if (!is_array($this->config)) {
             // Default config.
             $config = self::get_defaults();
 
             // Override with user settings.
-            foreach ( array_keys( $config ) as $name ) {
-                $conf = get_option( $name );
-                if ( false !== $conf ) {
+            foreach (array_keys($config) as $name) {
+                $conf = get_option($name);
+                if (false !== $conf) {
                     // It was set before!
-                    $config[ $name ] = $conf;
+                    $config[$name] = $conf;
                 }
             }
 
             // Save for next call.
-            $this->config = apply_filters( 'autoptimize_filter_get_config', $config );
+            $this->config = apply_filters('autoptimize_filter_get_config', $config);
         }
 
-        if ( isset( $this->config[ $key ] ) ) {
-            return $this->config[ $key ];
+        if (isset($this->config[$key])) {
+            return $this->config[$key];
         }
 
         return false;
     }
 
     private function getFutttaFeeds($url) {
-        if ( $this->settings_screen_do_remote_http ) {
-            $rss = fetch_feed( $url );
+        if ($this->settings_screen_do_remote_http) {
+            $rss = fetch_feed($url);
             $maxitems = 0;
 
-            if ( ! is_wp_error( $rss ) ) {
-                $maxitems = $rss->get_item_quantity( 7 );
-                $rss_items = $rss->get_items( 0, $maxitems );
+            if (!is_wp_error($rss)) {
+                $maxitems = $rss->get_item_quantity(7);
+                $rss_items = $rss->get_items(0, $maxitems);
             }
             ?>
             <ul>
-                <?php if ( $maxitems == 0 ) : ?>
-                    <li><?php _e( 'No items', 'autoptimize' ); ?></li>
+                <?php if ($maxitems == 0) : ?>
+                    <li><?php _e('No items', 'autoptimize'); ?></li>
                 <?php else : ?>
-                    <?php foreach ( $rss_items as $item ) : ?>
+                    <?php foreach ($rss_items as $item) : ?>
                         <li>
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
-                                title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>">
-                                <?php echo esc_html( $item->get_title() ); ?>
+                            <a href="<?php echo esc_url($item->get_permalink()); ?>"
+                                title="<?php printf(__('Posted %s', 'autoptimize'), $item->get_date('j F Y | g:i a')); ?>">
+                                <?php echo esc_html($item->get_title()); ?>
                             </a>
                         </li>
                     <?php endforeach; ?>
@@ -809,23 +809,23 @@ 
     // based on http://wordpress.stackexchange.com/a/58826
     static function ao_admin_tabs()
     {
-        $tabs = apply_filters( 'autoptimize_filter_settingsscreen_tabs' ,array( 'autoptimize' => __( 'Main', 'autoptimize' ) ) );
+        $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('Main', 'autoptimize')));
         $tabContent = '';
         $tabs_count = count($tabs);
-        if ( $tabs_count > 1 ) {
-            if ( isset( $_GET['page'] ) ) {
+        if ($tabs_count > 1) {
+            if (isset($_GET['page'])) {
                 $currentId = $_GET['page'];
             } else {
                 $currentId = "autoptimize";
             }
             $tabContent .= '<h2 class="nav-tab-wrapper">';
             foreach ($tabs as $tabId => $tabName) {
-                if ( $currentId == $tabId ) {
+                if ($currentId == $tabId) {
                     $class = ' nav-tab-active';
-                } else{
+                } else {
                     $class = '';
                 }
-                $tabContent .= '<a class="nav-tab' . $class . '" href="?page=' . $tabId . '">' . $tabName . '</a>';
+                $tabContent .= '<a class="nav-tab'.$class.'" href="?page='.$tabId.'">'.$tabName.'</a>';
             }
             $tabContent .= '</h2>';
         } else {
@@ -842,7 +842,7 @@ 
      */
     public static function is_admin_and_not_ajax()
     {
-        return ( is_admin() && ! self::doing_ajax() );
+        return (is_admin() && !self::doing_ajax());
     }
 
     /**
@@ -852,10 +852,10 @@ 
      */
     protected static function doing_ajax()
     {
-        if ( function_exists( 'wp_doing_ajax' ) ) {
+        if (function_exists('wp_doing_ajax')) {
             return wp_doing_ajax();
         } else {
-            return ( defined( 'DOING_AJAX' ) && DOING_AJAX );
+            return (defined('DOING_AJAX') && DOING_AJAX);
         }
     }
 }

Braces +9 added lines, -3 removed lines

@@ -1,5 +1,8 @@ 
 <?php
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly.
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
+// Exit if accessed directly.
 
 class autoptimizeConfig
 {
@@ -791,10 +794,13 @@ 
             <ul>
                 <?php if ( $maxitems == 0 ) : ?>
                     <li><?php _e( 'No items', 'autoptimize' ); ?></li>
-                <?php else : ?>
+                <?php else {
+    : ?>
                     <?php foreach ( $rss_items as $item ) : ?>
                         <li>
-                            <a href="<?php echo esc_url( $item->get_permalink() ); ?>"
+                            <a href="<?php echo esc_url( $item->get_permalink() );
+}
+?>"
                                 title="<?php printf( __( 'Posted %s', 'autoptimize' ), $item->get_date('j F Y | g:i a') ); ?>">
                                 <?php echo esc_html( $item->get_title() ); ?>
                             </a>

classes/autoptimizeExtra.php

Doc Comments +3 added lines

@@ -437,6 +437,9 @@
         }
     }
 
+    /**
+     * @return string
+     */
     private function get_imgopt_base_url()
     {
         static $imgopt_base_url = null;

Spacing +299 added lines, -299 removed lines

@@ -3,7 +3,7 @@ 
  * Handles autoptimizeExtra frontend features + admin options page
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -21,9 +21,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 = $this->fetch_options();
         }
 
@@ -32,9 +32,9 @@ 
 
     public function run()
     {
-        if ( is_admin() ) {
-            add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_extra_tab' ) );
+        if (is_admin()) {
+            add_action('admin_menu', array($this, 'admin_menu'));
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_extra_tab'));
         } else {
             $this->run_on_frontend();
         }
@@ -42,17 +42,17 @@ 
 
     protected function fetch_options()
     {
-        $value = get_option( 'autoptimize_extra_settings' );
-        if ( empty( $value ) ) {
+        $value = 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();
         }
 
         // get service availability.
-        $value['availabilities'] = get_option( 'autoptimize_service_availablity' );
+        $value['availabilities'] = get_option('autoptimize_service_availablity');
 
-        if ( empty( $value['availabilities'] ) ) {
-            $value['availabilities'] = autoptimizeUtils::check_service_availability( true );
+        if (empty($value['availabilities'])) {
+            $value['availabilities'] = autoptimizeUtils::check_service_availability(true);
         }
 
         return $value;
@@ -61,54 +61,54 @@ 
     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 ) {
-        if ( strpos( $src, '?ver=' ) ) {
-            $src = remove_query_arg( 'ver', $src );
+    public function filter_remove_qs($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;
     }
@@ -118,76 +118,76 @@ 
         $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);
         }
 
         // Making sure is_plugin_active() exists when we need it.
-        if ( ! function_exists( 'is_plugin_active' ) ) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
+        if (!function_exists('is_plugin_active')) {
+            require_once ABSPATH.'wp-admin/includes/plugin.php';
         }
         // Avoiding conflicts of interest when async-javascript plugin is active!
         $async_js_plugin_active = false;
-        if ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'async-javascript/async-javascript.php' ) ) {
+        if (function_exists('is_plugin_active') && is_plugin_active('async-javascript/async-javascript.php')) {
             $async_js_plugin_active = true;
         }
-        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 );
+        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);
         }
 
         // Optimize Images!
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && 'down' !== $options['availabilities']['extra_imgopt']['status'] && ( 'launch' !== $options['availabilities']['extra_imgopt']['status'] || $this->imgopt_launch_ok() ) ) {
-            if ( apply_filters( 'autoptimize_filter_extra_imgopt_do', true ) ) {
-                add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_images' ), 10, 1 );
+        if (!empty($options['autoptimize_extra_checkbox_field_5']) && 'down' !== $options['availabilities']['extra_imgopt']['status'] && ('launch' !== $options['availabilities']['extra_imgopt']['status'] || $this->imgopt_launch_ok())) {
+            if (apply_filters('autoptimize_filter_extra_imgopt_do', true)) {
+                add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_images'), 10, 1);
                 $_imgopt_active = true;
             }
-            if ( apply_filters( 'autoptimize_filter_extra_imgopt_do_css', true ) ) {
-                add_filter( 'autoptimize_filter_base_replace_cdn', array( $this, 'filter_optimize_css_images' ), 10, 1 );
+            if (apply_filters('autoptimize_filter_extra_imgopt_do_css', true)) {
+                add_filter('autoptimize_filter_base_replace_cdn', array($this, 'filter_optimize_css_images'), 10, 1);
                 $_imgopt_active = true;
             }
-            if ( $_imgopt_active ) {
-                add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_imgopt_url' ), 10, 1 );
+            if ($_imgopt_active) {
+                add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_imgopt_url'), 10, 1);
             }
         }
     }
 
-    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)
     {
-        if ( 'dns-prefetch' === $relation_type ) {
+        if ('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++;
             }
@@ -196,131 +196,131 @@ 
         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 );
-                $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 ) ) {
-                    $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                            = explode( 'subset=', $subset );
-                        $fonts_collection[ $i ]['subsets'] = explode( ',', $subset[1] );
+                    $subset = (is_array($font)) ? end($font) : '';
+                    if (false !== strpos($subset, '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 .= implode( ',', $font['subsets'] );
+            foreach ($fonts_collection as $font) {
+                $fonts_string .= '|'.trim(implode('|', $font['fonts']), '|');
+                if (!empty($font['subsets'])) {
+                    $subset_string .= implode(',', $font['subsets']);
                 }
             }
 
-            if ( ! empty( $subset_string ) ) {
-                $fonts_string = $fonts_string . '&#038;subset=' . $subset_string;
+            if (!empty($subset_string)) {
+                $fonts_string = $fonts_string.'&#038;subset='.$subset_string;
             }
 
-            $fonts_string = str_replace( '|', '%7C', ltrim( $fonts_string, '|' ) );
+            $fonts_string = str_replace('|', '%7C', ltrim($fonts_string, '|'));
 
-            if ( ! empty( $fonts_string ) ) {
-                if ( '5' === $options['autoptimize_extra_radio_field_4'] ) {
-                    $rel_string = 'rel="preload" as="style" onload="' . autoptimizeConfig::get_ao_css_preload_onload() . '"';
+            if (!empty($fonts_string)) {
+                if ('5' === $options['autoptimize_extra_radio_field_4']) {
+                    $rel_string = 'rel="preload" as="style" 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_markup = '<script data-cfasync="false" id="ao_optimized_gfonts" type="text/javascript">WebFontConfig={google:{families:[\'';
-            foreach ( $fonts_array as $fnt ) {
-                $fonts_markup .= $fnt . "','";
+            foreach ($fonts_array as $fnt) {
+                $fonts_markup .= $fnt."','";
             }
-            $fonts_markup  = trim( trim( $fonts_markup, "'" ), ',' );
+            $fonts_markup  = trim(trim($fonts_markup, "'"), ',');
             $fonts_markup .= '] },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>';
         }
 
         // Replace back in markup.
-        $out = substr_replace( $in, $fonts_markup . '<link', strpos( $in, '<link' ), strlen( '<link' ) );
-        unset( $fonts_collection );
+        $out = substr_replace($in, $fonts_markup.'<link', strpos($in, '<link'), strlen('<link'));
+        unset($fonts_collection);
 
         // and insert preload polyfill if "link preload" and if the polyfill isn't there yet (courtesy of inline&defer).
         $preload_polyfill = autoptimizeConfig::get_ao_css_preload_polyfill();
-        if ( '5' === $options['autoptimize_extra_radio_field_4'] && strpos( $out, $preload_polyfill ) === false ) {
-            $out = str_replace( '</body>', $preload_polyfill . '</body>', $out );
+        if ('5' === $options['autoptimize_extra_radio_field_4'] && strpos($out, $preload_polyfill) === false) {
+            $out = str_replace('</body>', $preload_polyfill.'</body>', $out);
         }
         return $out;
     }
 
-    public function filter_preconnect( $hints, $relation_type )
+    public function filter_preconnect($hints, $relation_type)
     {
         $options = $this->options;
 
         // Get settings and store in array.
-        $preconns = array_filter( array_map( 'trim', explode( ',', $options['autoptimize_extra_text_field_2'] ) ) );
-        $preconns = apply_filters( 'autoptimize_extra_filter_tobepreconn', $preconns );
+        $preconns = array_filter(array_map('trim', explode(',', $options['autoptimize_extra_text_field_2'])));
+        $preconns = apply_filters('autoptimize_extra_filter_tobepreconn', $preconns);
 
         // Walk array, extract domain and add to new array with crossorigin attribute.
-        foreach ( $preconns as $preconn ) {
-            $parsed = parse_url( $preconn );
+        foreach ($preconns as $preconn) {
+            $parsed = parse_url($preconn);
 
-            if ( is_array( $parsed ) && empty( $parsed['scheme'] ) ) {
-                $domain = '//' . $parsed['host'];
-            } elseif ( is_array( $parsed ) ) {
-                $domain = $parsed['scheme'] . '://' . $parsed['host'];
+            if (is_array($parsed) && empty($parsed['scheme'])) {
+                $domain = '//'.$parsed['host'];
+            } elseif (is_array($parsed)) {
+                $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;
@@ -328,21 +328,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';
@@ -351,7 +351,7 @@ 
         return $in;
     }
 
-    public function filter_optimize_images( $in )
+    public function filter_optimize_images($in)
     {
         /*
          * potential future functional improvements:
@@ -364,26 +364,26 @@ 
         $to_replace      = array();
 
         // extract img tags.
-        if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $in, $matches ) ) {
-            foreach ( $matches[0] as $tag ) {
+        if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $in, $matches)) {
+            foreach ($matches[0] as $tag) {
                 $orig_tag = $tag;
                 $imgopt_w = '';
                 $imgopt_h = '';
 
                 // first do (data-)srcsets.
-                if ( preg_match_all( '#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER ) ) {
-                    foreach ( $allsrcsets as $srcset ) {
+                if (preg_match_all('#srcset=("|\')(.*)("|\')#Usmi', $tag, $allsrcsets, PREG_SET_ORDER)) {
+                    foreach ($allsrcsets as $srcset) {
                         $srcset  = $srcset[2];
-                        $srcsets = explode( ',', $srcset );
-                        foreach ( $srcsets as $indiv_srcset ) {
-                            $indiv_srcset_parts = explode( ' ', trim( $indiv_srcset ) );
-                            if ( $indiv_srcset_parts[1] && rtrim( $indiv_srcset_parts[1], 'w' ) !== $indiv_srcset_parts[1] ) {
-                                $imgopt_w = rtrim( $indiv_srcset_parts[1], 'w' );
+                        $srcsets = explode(',', $srcset);
+                        foreach ($srcsets as $indiv_srcset) {
+                            $indiv_srcset_parts = explode(' ', trim($indiv_srcset));
+                            if ($indiv_srcset_parts[1] && rtrim($indiv_srcset_parts[1], 'w') !== $indiv_srcset_parts[1]) {
+                                $imgopt_w = rtrim($indiv_srcset_parts[1], 'w');
                             }
-                            if ( $this->can_optimize_image( $indiv_srcset_parts[0] ) ) {
-                                $imgopt_url              = $this->build_imgopt_url( $indiv_srcset_parts[0], $imgopt_w, '' );
-                                $tag                     = str_replace( $indiv_srcset_parts[0], $imgopt_url, $tag );
-                                $to_replace[ $orig_tag ] = $tag;
+                            if ($this->can_optimize_image($indiv_srcset_parts[0])) {
+                                $imgopt_url              = $this->build_imgopt_url($indiv_srcset_parts[0], $imgopt_w, '');
+                                $tag                     = str_replace($indiv_srcset_parts[0], $imgopt_url, $tag);
+                                $to_replace[$orig_tag] = $tag;
                             }
                         }
                     }
@@ -393,35 +393,35 @@ 
                 // first reset and then get width and height and add to $imgopt_size.
                 $imgopt_w = '';
                 $imgopt_h = '';
-                if ( preg_match( '#width=("|\')(.*)("|\')#Usmi', $tag, $width ) ) {
+                if (preg_match('#width=("|\')(.*)("|\')#Usmi', $tag, $width)) {
                     $imgopt_w = $width[2];
                 }
-                if ( preg_match( '#height=("|\')(.*)("|\')#Usmi', $tag, $height ) ) {
+                if (preg_match('#height=("|\')(.*)("|\')#Usmi', $tag, $height)) {
                     $imgopt_h = $height[2];
                 }
 
                 // then start replacing images src.
-                if ( preg_match_all( '#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER ) ) {
-                    foreach ( $urls as $url ) {
+                if (preg_match_all('#src=(?:"|\')(?!data)(.*)(?:"|\')#Usmi', $tag, $urls, PREG_SET_ORDER)) {
+                    foreach ($urls as $url) {
                         $full_src_orig = $url[0];
                         $url           = $url[1];
-                        if ( $this->can_optimize_image( $url ) ) {
-                            $imgopt_url              = $this->build_imgopt_url( $url, $imgopt_w, $imgopt_h );
-                            $full_imgopt_src         = str_replace( $url, $imgopt_url, $full_src_orig );
-                            $tag                     = str_replace( $full_src_orig, $full_imgopt_src, $tag );
-                            $to_replace[ $orig_tag ] = $tag;
+                        if ($this->can_optimize_image($url)) {
+                            $imgopt_url              = $this->build_imgopt_url($url, $imgopt_w, $imgopt_h);
+                            $full_imgopt_src         = str_replace($url, $imgopt_url, $full_src_orig);
+                            $tag                     = str_replace($full_src_orig, $full_imgopt_src, $tag);
+                            $to_replace[$orig_tag] = $tag;
                         }
                     }
                 }
             }
         }
-        $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $in );
+        $out = str_replace(array_keys($to_replace), array_values($to_replace), $in);
 
         // img thumbnails in e.g. woocommerce.
-        if ( strpos( $out, 'data-thumb' ) !== false && apply_filters( 'autoptimize_filter_extra_imgopt_datathumbs', true ) ) {
+        if (strpos($out, 'data-thumb') !== false && apply_filters('autoptimize_filter_extra_imgopt_datathumbs', true)) {
             $out = preg_replace_callback(
                 '/\<div(?:[^>]?)\sdata-thumb\=(?:\"|\')(.+?)(?:\"|\')(?:[^>]*)?\>/s',
-                array( $this, 'replace_data_thumbs' ),
+                array($this, 'replace_data_thumbs'),
                 $out
             );
         }
@@ -429,13 +429,13 @@ 
         return $out;
     }
 
-    public function filter_optimize_css_images( $in )
+    public function filter_optimize_css_images($in)
     {
         $imgopt_base_url = $this->get_imgopt_base_url();
-        $in              = $this->normalize_img_urls( $in );
+        $in              = $this->normalize_img_urls($in);
 
-        if ( $this->can_optimize_image( $in ) ) {
-            return $this->build_imgopt_url( $in, '', '' );
+        if ($this->can_optimize_image($in)) {
+            return $this->build_imgopt_url($in, '', '');
         } else {
             return $in;
         }
@@ -445,47 +445,47 @@ 
     {
         static $imgopt_base_url = null;
 
-        if ( is_null( $imgopt_base_url ) ) {
+        if (is_null($imgopt_base_url)) {
             $imgopt_host     = $this->get_imgopt_host();
             $quality         = $this->get_img_quality_string();
-            $ret_val         = apply_filters( 'autoptimize_filter_extra_imgopt_wait', 'ret_img' ); // values: ret_wait, ret_img, ret_json, ret_blank.
-            $imgopt_base_url = $imgopt_host . 'client/' . $quality . ',' . $ret_val;
-            $imgopt_base_url = apply_filters( 'autoptimize_filter_extra_imgopt_base_url', $imgopt_base_url );
+            $ret_val         = apply_filters('autoptimize_filter_extra_imgopt_wait', 'ret_img'); // values: ret_wait, ret_img, ret_json, ret_blank.
+            $imgopt_base_url = $imgopt_host.'client/'.$quality.','.$ret_val;
+            $imgopt_base_url = apply_filters('autoptimize_filter_extra_imgopt_base_url', $imgopt_base_url);
         }
 
         return $imgopt_base_url;
     }
 
-    private function can_optimize_image( $url )
+    private function can_optimize_image($url)
     {
         static $cdn_url      = null;
         static $nopti_images = null;
 
-        if ( is_null( $cdn_url ) ) {
-            $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', get_option( 'autoptimize_cdn_url', '' ) );
+        if (is_null($cdn_url)) {
+            $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', get_option('autoptimize_cdn_url', ''));
         }
 
-        if ( is_null( $nopti_images ) ) {
-            $nopti_images = apply_filters( 'autoptimize_filter_extra_imgopt_noptimize', '' );
+        if (is_null($nopti_images)) {
+            $nopti_images = apply_filters('autoptimize_filter_extra_imgopt_noptimize', '');
         }
 
         $imgopt_base_url = $this->get_imgopt_base_url();
         $site_host       = AUTOPTIMIZE_SITE_DOMAIN;
-        $url_parsed      = parse_url( $url );
+        $url_parsed      = parse_url($url);
 
-        if ( $url_parsed['host'] !== $site_host && empty( $cdn_url ) ) {
+        if ($url_parsed['host'] !== $site_host && empty($cdn_url)) {
             return false;
-        } elseif ( ! empty( $cdn_url ) && strpos( $url, $cdn_url ) === false && $url_parsed['host'] !== $site_host ) {
+        } elseif (!empty($cdn_url) && strpos($url, $cdn_url) === false && $url_parsed['host'] !== $site_host) {
             return false;
-        } elseif ( strpos( $url, '.php' ) !== false ) {
+        } elseif (strpos($url, '.php') !== false) {
             return false;
-        } elseif ( str_ireplace( array( '.png', '.gif', '.jpg', '.jpeg' ), '', $url_parsed['path'] ) === $url_parsed['path'] ) {
+        } elseif (str_ireplace(array('.png', '.gif', '.jpg', '.jpeg'), '', $url_parsed['path']) === $url_parsed['path']) {
             // fixme: better check against end of string.
             return false;
-        } elseif ( ! empty( $nopti_images ) ) {
-            $nopti_images_array = array_filter( array_map( 'trim', explode( ',', $nopti_images ) ) );
-            foreach ( $nopti_images_array as $nopti_image ) {
-                if ( strpos( $url, $nopti_image ) !== false ) {
+        } elseif (!empty($nopti_images)) {
+            $nopti_images_array = array_filter(array_map('trim', explode(',', $nopti_images)));
+            foreach ($nopti_images_array as $nopti_image) {
+                if (strpos($url, $nopti_image) !== false) {
                     return false;
                 }
             }
@@ -493,72 +493,72 @@ 
         return true;
     }
 
-    private function build_imgopt_url( $orig_url, $width = 0, $height = 0 )
+    private function build_imgopt_url($orig_url, $width = 0, $height = 0)
     {
-        $filtered_url = apply_filters( 'autoptimize_filter_extra_imgopt_build_url', $orig_url, $width, $height );
+        $filtered_url = apply_filters('autoptimize_filter_extra_imgopt_build_url', $orig_url, $width, $height);
 
-        if ( $filtered_url !== $orig_url ) {
+        if ($filtered_url !== $orig_url) {
             return $filtered_url;
         }
 
-        $orig_url        = $this->normalize_img_urls( $orig_url );
+        $orig_url        = $this->normalize_img_urls($orig_url);
         $imgopt_base_url = $this->get_imgopt_base_url();
         $imgopt_size     = '';
 
-        if ( $width && 0 !== $width ) {
-            $imgopt_size = ',w_' . $width;
+        if ($width && 0 !== $width) {
+            $imgopt_size = ',w_'.$width;
         }
 
-        if ( $height && 0 !== $height ) {
-            $imgopt_size .= ',h_' . $height;
+        if ($height && 0 !== $height) {
+            $imgopt_size .= ',h_'.$height;
         }
 
-        $url = $imgopt_base_url . $imgopt_size . '/' . $orig_url;
+        $url = $imgopt_base_url.$imgopt_size.'/'.$orig_url;
 
         return $url;
     }
 
-    public function replace_data_thumbs( $matches )
+    public function replace_data_thumbs($matches)
     {
-        if ( $this->can_optimize_image( $matches[1] ) ) {
-            return str_replace( $matches[1], $this->build_imgopt_url( $matches[1], 150, 150 ), $matches[0] );
+        if ($this->can_optimize_image($matches[1])) {
+            return str_replace($matches[1], $this->build_imgopt_url($matches[1], 150, 150), $matches[0]);
         } else {
             return $matches[0];
         }
     }
 
-    public function filter_preconnect_imgopt_url( $in )
+    public function filter_preconnect_imgopt_url($in)
     {
-        $imgopt_url_array = parse_url( $this->get_imgopt_base_url() );
-        $in[]             = $imgopt_url_array['scheme'] . '://' . $imgopt_url_array['host'];
+        $imgopt_url_array = parse_url($this->get_imgopt_base_url());
+        $in[]             = $imgopt_url_array['scheme'].'://'.$imgopt_url_array['host'];
 
         return $in;
     }
 
-    private function normalize_img_urls( $in )
+    private function normalize_img_urls($in)
     {
-        $parsed_site_url = parse_url( site_url() );
+        $parsed_site_url = parse_url(site_url());
 
-        if ( strpos( $in, 'http' ) !== 0 && strpos( $in, '//' ) === 0 ) {
-            $in = $parsed_site_url['scheme'] . ':' . $in;
-        } elseif ( strpos( $in, '/' ) === 0 ) {
-            $in = $parsed_site_url['scheme'] . '://' . $parsed_site_url['host'] . $in;
+        if (strpos($in, 'http') !== 0 && strpos($in, '//') === 0) {
+            $in = $parsed_site_url['scheme'].':'.$in;
+        } elseif (strpos($in, '/') === 0) {
+            $in = $parsed_site_url['scheme'].'://'.$parsed_site_url['host'].$in;
         }
 
-        return apply_filters( 'autoptimize_filter_extra_imgopt_normalized_url', $in );
+        return apply_filters('autoptimize_filter_extra_imgopt_normalized_url', $in);
     }
 
     private function get_img_quality_array()
     {
         static $img_quality_array = null;
 
-        if ( is_null( $img_quality_array ) ) {
+        if (is_null($img_quality_array)) {
             $img_quality_array = array(
                 '1' => 'lossy',
                 '2' => 'glossy',
                 '3' => 'lossless',
             );
-            $img_quality_array = apply_filters( 'autoptimize_filter_extra_imgopt_quality_array', $img_quality_array );
+            $img_quality_array = apply_filters('autoptimize_filter_extra_imgopt_quality_array', $img_quality_array);
         }
 
         return $img_quality_array;
@@ -568,10 +568,10 @@ 
     {
         static $_img_q = null;
 
-        if ( is_null( $_img_q ) ) {
+        if (is_null($_img_q)) {
             $_setting = $this->options['autoptimize_extra_select_field_6'];
 
-            if ( ! $_setting || empty( $_setting ) || ( '1' !== $_setting && '3' !== $_setting ) ) {
+            if (!$_setting || empty($_setting) || ('1' !== $_setting && '3' !== $_setting)) {
                 // default image opt. value is 2 ("glossy").
                 $_img_q = '2';
             } else {
@@ -586,10 +586,10 @@ 
     {
         static $_img_q_string = null;
 
-        if ( is_null( $_img_q_string ) ) {
+        if (is_null($_img_q_string)) {
             $_quality_array = $this->get_img_quality_array();
             $_setting       = $this->get_img_quality_setting();
-            $_img_q_string  = apply_filters( 'autoptimize_filter_extra_imgopt_quality', 'q_' . $_quality_array[ $_setting ] );
+            $_img_q_string  = apply_filters('autoptimize_filter_extra_imgopt_quality', 'q_'.$_quality_array[$_setting]);
         }
 
         return $_img_q_string;
@@ -604,25 +604,25 @@ 
 
     public function query_img_provider_stats()
     {
-        if ( ! empty( $this->options['autoptimize_extra_checkbox_field_5'] ) ) {
+        if (!empty($this->options['autoptimize_extra_checkbox_field_5'])) {
             $_img_provider_stat_url = '';
-            $_img_provider_endpoint = $this->get_imgopt_host() . 'read-domain/';
+            $_img_provider_endpoint = $this->get_imgopt_host().'read-domain/';
             $_site_host             = AUTOPTIMIZE_SITE_DOMAIN;
 
             // make sure parse_url result makes sense, keeping $_img_provider_stat_url empty if not.
-            if ( $_site_host && ! empty( $_site_host ) ) {
-                $_img_provider_stat_url = $_img_provider_endpoint . $_site_host;
+            if ($_site_host && !empty($_site_host)) {
+                $_img_provider_stat_url = $_img_provider_endpoint.$_site_host;
             }
 
-            $_img_provider_stat_url = apply_filters( 'autoptimize_filter_extra_imgopt_stat_url', $_img_provider_stat_url );
+            $_img_provider_stat_url = apply_filters('autoptimize_filter_extra_imgopt_stat_url', $_img_provider_stat_url);
 
             // only do the remote call if $_img_provider_stat_url is not empty to make sure no parse_url weirdness results in useless calls.
-            if ( ! empty( $_img_provider_stat_url ) ) {
-                $_img_stat_resp = wp_remote_get( $_img_provider_stat_url );
-                if ( ! is_wp_error( $_img_stat_resp ) ) {
-                    if ( '200' == wp_remote_retrieve_response_code( $_img_stat_resp ) ) {
-                        $_img_provider_stat = json_decode( wp_remote_retrieve_body( $_img_stat_resp ), true );
-                        update_option( 'autoptimize_imgopt_provider_stat', $_img_provider_stat );
+            if (!empty($_img_provider_stat_url)) {
+                $_img_stat_resp = wp_remote_get($_img_provider_stat_url);
+                if (!is_wp_error($_img_stat_resp)) {
+                    if ('200' == wp_remote_retrieve_response_code($_img_stat_resp)) {
+                        $_img_provider_stat = json_decode(wp_remote_retrieve_body($_img_stat_resp), true);
+                        update_option('autoptimize_imgopt_provider_stat', $_img_provider_stat);
                     }
                 }
             }
@@ -633,14 +633,14 @@ 
     {
         static $launch_status = null;
 
-        if ( is_null( $launch_status ) ) {
+        if (is_null($launch_status)) {
             $avail_imgopt = $this->options['availabilities']['extra_imgopt'];
-            $magic_number = intval( substr( md5( parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) ), 0, 3 ), 16 );
-            $has_launched = get_option( 'autoptimize_imgopt_launched', '' );
-            if ( $has_launched || ( array_key_exists( 'launch-threshold', $avail_imgopt ) && $magic_number < $avail_imgopt['launch-threshold'] ) ) {
+            $magic_number = intval(substr(md5(parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)), 0, 3), 16);
+            $has_launched = get_option('autoptimize_imgopt_launched', '');
+            if ($has_launched || (array_key_exists('launch-threshold', $avail_imgopt) && $magic_number < $avail_imgopt['launch-threshold'])) {
                 $launch_status = true;
-                if ( ! $has_launched ) {
-                    update_option( 'autoptimize_imgopt_launched', 'on' );
+                if (!$has_launched) {
+                    update_option('autoptimize_imgopt_launched', 'on');
                 }
             } else {
                 $launch_status = false;
@@ -654,10 +654,10 @@ 
     {
         static $imgopt_host = null;
 
-        if ( is_null( $imgopt_host ) ) {
+        if (is_null($imgopt_host)) {
             $avail_imgopt = $this->options['availabilities']['extra_imgopt'];
-            if ( ! empty( $avail_imgopt ) && array_key_exists( 'hosts', $avail_imgopt ) && is_array( $avail_imgopt['hosts'] ) ) {
-                $imgopt_host = array_rand( array_flip( $avail_imgopt['hosts'] ) );
+            if (!empty($avail_imgopt) && array_key_exists('hosts', $avail_imgopt) && is_array($avail_imgopt['hosts'])) {
+                $imgopt_host = array_rand(array_flip($avail_imgopt['hosts']));
             } else {
                 $imgopt_host = 'https://cdn.shortpixel.ai/';
             }
@@ -675,28 +675,28 @@ 
 
     public function get_imgopt_status_notice() {
         $_extra_options = $this->options;
-        if ( ! empty( $_extra_options ) && is_array( $_extra_options ) && array_key_exists( 'autoptimize_extra_checkbox_field_5', $_extra_options ) && ! empty( $_extra_options['autoptimize_extra_checkbox_field_5'] ) ) {
+        if (!empty($_extra_options) && is_array($_extra_options) && array_key_exists('autoptimize_extra_checkbox_field_5', $_extra_options) && !empty($_extra_options['autoptimize_extra_checkbox_field_5'])) {
             $_imgopt_notice = '';
-            $_stat          = get_option( 'autoptimize_imgopt_provider_stat', '' );
+            $_stat          = get_option('autoptimize_imgopt_provider_stat', '');
             $_site_host     = AUTOPTIMIZE_SITE_DOMAIN;
-            $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . $_site_host;
+            $_imgopt_upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.$_site_host;
 
-            if ( is_array( $_stat ) ) {
-                if ( 1 == $_stat['Status'] ) {
+            if (is_array($_stat)) {
+                if (1 == $_stat['Status']) {
                     // translators: "add more credits" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota is almost used, make sure you %1$sadd more credits%2$s to avoid slowing down your website.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                 } elseif ( -1 == $_stat['Status'] ) {
                     // translators: "add more credits" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota was used, %1$sadd more credits%2$s to keep fast serving optimized images on your site.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                 } else {
                     $_imgopt_upsell = 'https://shortpixel.com/g/af/GWRGFLW109483';
                     // translators: "log in to check your account" will appear in a "a href".
-                    $_imgopt_notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize' ), '<a href="' . $_imgopt_upsell . '" target="_blank">', '</a>' );
+                    $_imgopt_notice = sprintf(__('Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize'), '<a href="'.$_imgopt_upsell.'" target="_blank">', '</a>');
                 }
-                $_imgopt_notice = apply_filters( 'autoptimize_filter_imgopt_notice', $_imgopt_notice );
+                $_imgopt_notice = apply_filters('autoptimize_filter_imgopt_notice', $_imgopt_notice);
 
                 return array(
-                    'status' => $_stat[ 'Status' ],
+                    'status' => $_stat['Status'],
                     'notice' => $_imgopt_notice,
                 );
             }
@@ -712,13 +712,13 @@ 
 
     public function admin_menu()
     {
-        add_submenu_page( null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', array( $this, 'options_page' ) );
-        register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
+        add_submenu_page(null, 'autoptimize_extra', 'autoptimize_extra', 'manage_options', 'autoptimize_extra', array($this, 'options_page'));
+        register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings');
     }
 
-    public function add_extra_tab( $in )
+    public function add_extra_tab($in)
     {
-        $in = array_merge( $in, array( 'autoptimize_extra' => __( 'Extra', 'autoptimize' ) ) );
+        $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize')));
 
         return $in;
     }
@@ -731,7 +731,7 @@ 
         // behavior being persisted in the DB even if save is done here.
         $options       = $this->fetch_options();
         $gfonts        = $options['autoptimize_extra_radio_field_4'];
-        $sp_url_suffix = '/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN;
+        $sp_url_suffix = '/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN;
     ?>
     <style>
         #ao_settings_form {background: white;border: 1px solid #ccc;padding: 1px 15px;margin: 15px 10px 10px 0;}
@@ -739,35 +739,35 @@ 
         #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(); ?>
     <?php
-    if ( 'on' !== get_option( 'autoptimize_js' ) && 'on' !== get_option( 'autoptimize_css' ) && 'on' !== get_option( 'autoptimize_html' ) ) {
+    if ('on' !== get_option('autoptimize_js') && 'on' !== get_option('autoptimize_css') && 'on' !== get_option('autoptimize_html')) {
         ?>
         <div class="notice-warning notice"><p>
         <?php
-        _e( 'Most of below Extra optimizations require at least one of HTML, JS or CSS autoptimizations being active.', 'autoptimize' );
+        _e('Most of below Extra optimizations require at least one of HTML, JS or CSS autoptimizations being active.', 'autoptimize');
         ?>
         </p></div>
         <?php
     }
 
-    if ( 'down' === $options['availabilities']['extra_imgopt']['status'] ) {
+    if ('down' === $options['availabilities']['extra_imgopt']['status']) {
         ?>
         <div class="notice-warning notice"><p>
         <?php
         // translators: "Autoptimize support forum" will appear in a "a href".
-        echo sprintf( __( 'The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize' ), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>' );
+        echo sprintf(__('The image optimization service is currently down, image optimization will be skipped until further notice. Check the %1$sAutoptimize support forum%2$s for more info.', 'autoptimize'), '<a href="https://wordpress.org/support/plugin/autoptimize/" target="_blank">', '</a>');
         ?>
         </p></div>
         <?php
     }
 
-    if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] && ! $this->imgopt_launch_ok() ) {
+    if ('launch' === $options['availabilities']['extra_imgopt']['status'] && !$this->imgopt_launch_ok()) {
         ?>
         <div class="notice-warning notice"><p>
         <?php
-        _e( 'The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize' );
+        _e('The image optimization service is launching, but not yet available for this domain, it should become available in the next couple of days.', 'autoptimize');
         ?>
         </p></div>
         <?php
@@ -775,29 +775,29 @@ 
 
     ?>
     <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>
+        <?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="3" <?php checked( 3, $gfonts, true ); ?> ><?php _e( 'Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked( 5, $gfonts, true ); ?> ><?php _e( 'Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked( 4, $gfonts, 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($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="3" <?php checked(3, $gfonts, true); ?> ><?php _e('Combine and link in head (fonts load fast but are render-blocking)', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="5" <?php checked(5, $gfonts, true); ?> ><?php _e('Combine and preload in head (fonts load late, but are not render-blocking)', 'autoptimize'); ?><br/>
+                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="4" <?php checked(4, $gfonts, 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( 'Optimize Images', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Optimize Images', 'autoptimize'); ?></th>
                 <td>
-                    <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_5]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && '1' === $options['autoptimize_extra_checkbox_field_5'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Optimize images on the fly and serve them from a CDN.', 'autoptimize' ); ?></label>
+                    <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_5]' <?php if (!empty($options['autoptimize_extra_checkbox_field_5']) && '1' === $options['autoptimize_extra_checkbox_field_5']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Optimize images on the fly and serve them from a CDN.', 'autoptimize'); ?></label>
                     <?php
                     // show shortpixel status.
                     $_notice = $this->get_imgopt_status_notice();
-                    if ( $_notice ) {
-                        switch ( $_notice['status'] ) {
+                    if ($_notice) {
+                        switch ($_notice['status']) {
                             case 2:
                                 $_notice_color = 'green';
                                 break;
@@ -810,24 +810,24 @@ 
                             default:
                                 $_notice_color = 'green';
                         }
-                        echo apply_filters( 'autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:' . $_notice_color . ';">' . __( 'Shortpixel status: ', 'autoptimize' ) . '</span></strong>' . $_notice['notice'] . '</p>' );
+                        echo apply_filters('autoptimize_filter_imgopt_settings_status', '<p><strong><span style="color:'.$_notice_color.';">'.__('Shortpixel status: ', 'autoptimize').'</span></strong>'.$_notice['notice'].'</p>');
                     } else {
-                        $upsell_msg_1 = '<p>' . sprintf( __( 'Get more Google love and improve your website\'s loading speed by having the images optimized on the fly by %1$sShortPixel%2$s and then cached and served fast from a CDN.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' );
-                        if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] ) {
-                            $upsell_msg_2 = __( 'For a limited time only, this service is offered free-for-all, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize' );
+                        $upsell_msg_1 = '<p>'.sprintf(__('Get more Google love and improve your website\'s loading speed by having the images optimized on the fly by %1$sShortPixel%2$s and then cached and served fast from a CDN.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>');
+                        if ('launch' === $options['availabilities']['extra_imgopt']['status']) {
+                            $upsell_msg_2 = __('For a limited time only, this service is offered free-for-all, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize');
                         } else {
-                            $upsell_msg_2 = __( 'The service is offered for free for 100 images/month regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize' );
+                            $upsell_msg_2 = __('The service is offered for free for 100 images/month regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize');
                         }
-                        echo apply_filters( 'autoptimize_extra_imgopt_settings_copy', $upsell_msg_1 . ' ' . $upsell_msg_2 . '</p>' );
+                        echo apply_filters('autoptimize_extra_imgopt_settings_copy', $upsell_msg_1.' '.$upsell_msg_2.'</p>');
                     }
-                    $faqcopy = sprintf( __( '<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize' ), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>' );
-                    $toscopy = sprintf( __( 'Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize' ), '<a href="https://shortpixel.com/tos' . $sp_url_suffix . '" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp' . $sp_url_suffix . '" target="_blank">', '</a>' );
-                    echo apply_filters( 'autoptimize_extra_imgopt_settings_tos', '<p>' . $faqcopy . ' ' . $toscopy . '</p>' );
+                    $faqcopy = sprintf(__('<strong>Questions</strong>? Have a look at the %1$sShortPixel FAQ%2$s!', 'autoptimize'), '<strong><a href="https://shortpixel.helpscoutdocs.com/category/60-shortpixel-ai-cdn" target="_blank">', '</strong></a>');
+                    $toscopy = sprintf(__('Usage of this feature is subject to Shortpixel\'s %1$sTerms of Use%2$s and %3$sPrivacy policy%4$s.', 'autoptimize'), '<a href="https://shortpixel.com/tos'.$sp_url_suffix.'" target="_blank">', '</a>', '<a href="https://shortpixel.com/pp'.$sp_url_suffix.'" target="_blank">', '</a>');
+                    echo apply_filters('autoptimize_extra_imgopt_settings_tos', '<p>'.$faqcopy.' '.$toscopy.'</p>');
                     ?>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_quality' <?php if ( ! array_key_exists( 'autoptimize_extra_checkbox_field_5', $options ) || ( ! empty( $options['autoptimize_extra_checkbox_field_5'] ) && '1' !== $options['autoptimize_extra_checkbox_field_5'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Image Optimization quality', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_quality' <?php if (!array_key_exists('autoptimize_extra_checkbox_field_5', $options) || (!empty($options['autoptimize_extra_checkbox_field_5']) && '1' !== $options['autoptimize_extra_checkbox_field_5'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Image Optimization quality', 'autoptimize'); ?></th>
                 <td>
                     <label>
                     <select name='autoptimize_extra_settings[autoptimize_extra_select_field_6]'>
@@ -835,77 +835,77 @@ 
                         $_imgopt_array = $this->get_img_quality_array();
                         $_imgopt_val   = $this->get_img_quality_setting();
 
-                        foreach ( $_imgopt_array as $key => $value ) {
-                            echo '<option value="' . $key . '"';
-                            if ( $_imgopt_val == $key ) {
+                        foreach ($_imgopt_array as $key => $value) {
+                            echo '<option value="'.$key.'"';
+                            if ($_imgopt_val == $key) {
                                 echo ' selected';
                             }
-                            echo '>' . ucfirst( $value ) . '</option>';
+                            echo '>'.ucfirst($value).'</option>';
                         }
                         echo "\n";
                         ?>
                     </select>
                     </label>
-                    <p><?php echo apply_filters( 'autoptimize_extra_imgopt_quality_copy', sprintf( __( 'You can %1$stest compression levels here%2$s.', 'autoptimize' ), '<a href="https://shortpixel.com/oic' . $sp_url_suffix . '" target="_blank">', '</a>' ) ); ?></p>
+                    <p><?php echo apply_filters('autoptimize_extra_imgopt_quality_copy', sprintf(__('You can %1$stest compression levels here%2$s.', 'autoptimize'), '<a href="https://shortpixel.com/oic'.$sp_url_suffix.'" target="_blank">', '</a>')); ?></p>
                 </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 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 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( '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 ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'async-javascript/async-javascript.php' ) ) {
-                        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>' );
+                    if (function_exists('is_plugin_active') && is_plugin_active('async-javascript/async-javascript.php')) {
+                        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 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 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 ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'wp-youtube-lyte/wp-youtube-lyte.php' ) ) {
-                        _e( 'Great, you have WP YouTube Lyte installed.', 'autoptimize' );
+                    if (function_exists('is_plugin_active') && 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>
     <script>
         jQuery(document).ready(function() {

classes/autoptimizeHTML.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
     /**
      * Doesn't do much in case of HTML (no cache in css/js sense there)
      *
-     * @return true
+     * @return boolean
      */
     public function cache()
     {

Spacing +27 added lines, -27 removed lines

@@ -3,7 +3,7 @@ 
  * Handles minifying HTML markup.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -27,19 +27,19 @@ 
         '<!--/noindex-->',
     );
 
-    public function read( $options )
+    public function read($options)
     {
         // Remove the HTML comments?
         $this->keepcomments = (bool) $options['keepcomments'];
 
         // Filter to force xhtml.
-        $this->forcexhtml = (bool) apply_filters( 'autoptimize_filter_html_forcexhtml', false );
+        $this->forcexhtml = (bool) apply_filters('autoptimize_filter_html_forcexhtml', false);
 
         // Filterable strings to be excluded from HTML minification.
-        $exclude = apply_filters( 'autoptimize_filter_html_exclude', '' );
-        if ( '' !== $exclude ) {
-            $exclude_arr   = array_filter( array_map( 'trim', explode( ',', $exclude ) ) );
-            $this->exclude = array_merge( $exclude_arr, $this->exclude );
+        $exclude = apply_filters('autoptimize_filter_html_exclude', '');
+        if ('' !== $exclude) {
+            $exclude_arr   = array_filter(array_map('trim', explode(',', $exclude)));
+            $this->exclude = array_merge($exclude_arr, $this->exclude);
         }
 
         // Nothing else for HTML!
@@ -53,49 +53,49 @@ 
      */
     public function minify()
     {
-        $noptimize = apply_filters( 'autoptimize_filter_html_noptimize', false, $this->content );
-        if ( $noptimize ) {
+        $noptimize = apply_filters('autoptimize_filter_html_noptimize', false, $this->content);
+        if ($noptimize) {
             return false;
         }
 
         // Wrap the to-be-excluded strings in noptimize tags.
-        foreach ( $this->exclude as $str ) {
-            if ( false !== strpos( $this->content, $str ) ) {
-                $replacement   = '<!--noptimize-->' . $str . '<!--/noptimize-->';
-                $this->content = str_replace( $str, $replacement, $this->content );
+        foreach ($this->exclude as $str) {
+            if (false !== strpos($this->content, $str)) {
+                $replacement   = '<!--noptimize-->'.$str.'<!--/noptimize-->';
+                $this->content = str_replace($str, $replacement, $this->content);
             }
         }
 
         // Noptimize.
-        $this->content = $this->hide_noptimize( $this->content );
+        $this->content = $this->hide_noptimize($this->content);
 
         // Preparing options for Minify_HTML.
-        $options = array( 'keepComments' => $this->keepcomments );
-        if ( $this->forcexhtml ) {
+        $options = array('keepComments' => $this->keepcomments);
+        if ($this->forcexhtml) {
             $options['xhtml'] = true;
         }
 
-        $tmp_content = Minify_HTML::minify( $this->content, $options );
-        if ( ! empty( $tmp_content ) ) {
+        $tmp_content = Minify_HTML::minify($this->content, $options);
+        if (!empty($tmp_content)) {
             $this->content = $tmp_content;
-            unset( $tmp_content );
+            unset($tmp_content);
         }
 
         // Restore noptimize.
-        $this->content = $this->restore_noptimize( $this->content );
+        $this->content = $this->restore_noptimize($this->content);
 
         // Remove the noptimize-wrapper from around the excluded strings.
-        foreach ( $this->exclude as $str ) {
-            $replacement = '<!--noptimize-->' . $str . '<!--/noptimize-->';
-            if ( false !== strpos( $this->content, $replacement ) ) {
-                $this->content = str_replace( $replacement, $str, $this->content );
+        foreach ($this->exclude as $str) {
+            $replacement = '<!--noptimize-->'.$str.'<!--/noptimize-->';
+            if (false !== strpos($this->content, $replacement)) {
+                $this->content = str_replace($replacement, $str, $this->content);
             }
         }
 
         // Revslider data attribs somehow suffer from HTML optimization, this fixes that!
-        if ( class_exists( 'RevSlider' ) && apply_filters( 'autoptimize_filter_html_dataattrib_cleanup', false ) ) {
-            $this->content = preg_replace( '#\n(data-.*$)\n#Um', ' $1 ', $this->content );
-            $this->content = preg_replace( '#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content );
+        if (class_exists('RevSlider') && apply_filters('autoptimize_filter_html_dataattrib_cleanup', false)) {
+            $this->content = preg_replace('#\n(data-.*$)\n#Um', ' $1 ', $this->content);
+            $this->content = preg_replace('#<[^>]*(=\"[^"\'<>\s]*\")(\w)#', '$1 $2', $this->content);
         }
 
         return true;

classes/autoptimizeMain.php

Doc Comments +1 added lines, -1 removed lines

@@ -253,7 +253,7 @@
      *
      * @param bool $doing_tests Allows overriding the optimization of only
      *                          deciding once per request (for use in tests).
-     * @return bool
+     * @return boolean|null
      */
     public function should_buffer( $doing_tests = false )
     {

Spacing +147 added lines, -147 removed lines

@@ -3,7 +3,7 @@ 
  * Wraps base plugin logic/hooks and handles activation/deactivation/uninstall.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -33,7 +33,7 @@ 
      * @param string $version Version.
      * @param string $filepath Filepath. Needed for activation/deactivation/uninstall hooks.
      */
-    public function __construct( $version, $filepath )
+    public function __construct($version, $filepath)
     {
         $this->version  = $version;
         $this->filepath = $filepath;
@@ -50,94 +50,94 @@ 
 
     protected function add_hooks()
     {
-        add_action( 'plugins_loaded', array( $this, 'setup' ) );
+        add_action('plugins_loaded', array($this, 'setup'));
 
-        add_action( 'autoptimize_setup_done', array( $this, 'version_upgrades_check' ) );
-        add_action( 'autoptimize_setup_done', array( $this, 'check_cache_and_run' ) );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_ao_extra' ) );
-        add_action( 'autoptimize_setup_done', array( $this, 'maybe_run_partners_tab' ) );
+        add_action('autoptimize_setup_done', array($this, 'version_upgrades_check'));
+        add_action('autoptimize_setup_done', array($this, 'check_cache_and_run'));
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_ao_extra'));
+        add_action('autoptimize_setup_done', array($this, 'maybe_run_partners_tab'));
 
-        add_action( 'init', array( $this, 'load_textdomain' ) );
-        add_action( 'plugins_loaded', array( $this, 'hook_page_cache_purge' ) );
-        add_action( 'admin_init', array( 'PAnD', 'init' ) );
+        add_action('init', array($this, 'load_textdomain'));
+        add_action('plugins_loaded', array($this, 'hook_page_cache_purge'));
+        add_action('admin_init', array('PAnD', 'init'));
 
-        register_activation_hook( $this->filepath, array( $this, 'on_activate' ) );
+        register_activation_hook($this->filepath, array($this, 'on_activate'));
     }
 
     public function on_activate()
     {
-        register_uninstall_hook( $this->filepath, 'autoptimizeMain::on_uninstall' );
+        register_uninstall_hook($this->filepath, 'autoptimizeMain::on_uninstall');
     }
 
     public function load_textdomain()
     {
-        load_plugin_textdomain( 'autoptimize' );
+        load_plugin_textdomain('autoptimize');
     }
 
     public function setup()
     {
         // Do we gzip in php when caching or is the webserver doing it?
-        define( 'AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option( 'autoptimize_cache_nogzip' ) );
+        define('AUTOPTIMIZE_CACHE_NOGZIP', (bool) get_option('autoptimize_cache_nogzip'));
 
         // These can be overridden by specifying them in wp-config.php or such.
-        if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_NAME' ) ) {
-            define( 'AUTOPTIMIZE_WP_CONTENT_NAME', '/' . wp_basename( WP_CONTENT_DIR ) );
+        if (!defined('AUTOPTIMIZE_WP_CONTENT_NAME')) {
+            define('AUTOPTIMIZE_WP_CONTENT_NAME', '/'.wp_basename(WP_CONTENT_DIR));
         }
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_CHILD_DIR' ) ) {
-            define( 'AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/' );
+        if (!defined('AUTOPTIMIZE_CACHE_CHILD_DIR')) {
+            define('AUTOPTIMIZE_CACHE_CHILD_DIR', '/cache/autoptimize/');
         }
-        if ( ! defined( 'AUTOPTIMIZE_CACHEFILE_PREFIX' ) ) {
-            define( 'AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_' );
+        if (!defined('AUTOPTIMIZE_CACHEFILE_PREFIX')) {
+            define('AUTOPTIMIZE_CACHEFILE_PREFIX', 'autoptimize_');
         }
         // Note: trailing slash is not optional!
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) {
-            define( 'AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname() );
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
+            define('AUTOPTIMIZE_CACHE_DIR', autoptimizeCache::get_pathname());
         }
 
-        define( 'WP_ROOT_DIR', substr( WP_CONTENT_DIR, 0, strlen( WP_CONTENT_DIR ) - strlen( AUTOPTIMIZE_WP_CONTENT_NAME ) ) );
+        define('WP_ROOT_DIR', substr(WP_CONTENT_DIR, 0, strlen(WP_CONTENT_DIR) - strlen(AUTOPTIMIZE_WP_CONTENT_NAME)));
 
-        if ( ! defined( 'AUTOPTIMIZE_WP_SITE_URL' ) ) {
-            if ( function_exists( 'domain_mapping_siteurl' ) ) {
-                define( 'AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl( get_current_blog_id() ) );
+        if (!defined('AUTOPTIMIZE_WP_SITE_URL')) {
+            if (function_exists('domain_mapping_siteurl')) {
+                define('AUTOPTIMIZE_WP_SITE_URL', domain_mapping_siteurl(get_current_blog_id()));
             } else {
-                define( 'AUTOPTIMIZE_WP_SITE_URL', site_url() );
+                define('AUTOPTIMIZE_WP_SITE_URL', site_url());
             }
         }
-        if ( ! defined( 'AUTOPTIMIZE_WP_CONTENT_URL' ) ) {
-            if ( function_exists( 'domain_mapping_siteurl' ) ) {
-                define( 'AUTOPTIMIZE_WP_CONTENT_URL', str_replace( get_original_url( AUTOPTIMIZE_WP_SITE_URL ), AUTOPTIMIZE_WP_SITE_URL, content_url() ) );
+        if (!defined('AUTOPTIMIZE_WP_CONTENT_URL')) {
+            if (function_exists('domain_mapping_siteurl')) {
+                define('AUTOPTIMIZE_WP_CONTENT_URL', str_replace(get_original_url(AUTOPTIMIZE_WP_SITE_URL), AUTOPTIMIZE_WP_SITE_URL, content_url()));
             } else {
-                define( 'AUTOPTIMIZE_WP_CONTENT_URL', content_url() );
+                define('AUTOPTIMIZE_WP_CONTENT_URL', content_url());
             }
         }
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_URL' ) ) {
-            if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
+        if (!defined('AUTOPTIMIZE_CACHE_URL')) {
+            if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
                 $blog_id = get_current_blog_id();
-                define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR . $blog_id . '/' );
+                define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR.$blog_id.'/');
             } else {
-                define( 'AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL . AUTOPTIMIZE_CACHE_CHILD_DIR );
+                define('AUTOPTIMIZE_CACHE_URL', AUTOPTIMIZE_WP_CONTENT_URL.AUTOPTIMIZE_CACHE_CHILD_DIR);
             }
         }
-        if ( ! defined( 'AUTOPTIMIZE_WP_ROOT_URL' ) ) {
-            define( 'AUTOPTIMIZE_WP_ROOT_URL', str_replace( AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL ) );
+        if (!defined('AUTOPTIMIZE_WP_ROOT_URL')) {
+            define('AUTOPTIMIZE_WP_ROOT_URL', str_replace(AUTOPTIMIZE_WP_CONTENT_NAME, '', AUTOPTIMIZE_WP_CONTENT_URL));
         }
-        if ( ! defined( 'AUTOPTIMIZE_HASH' ) ) {
-            define( 'AUTOPTIMIZE_HASH', wp_hash( AUTOPTIMIZE_CACHE_URL ) );
+        if (!defined('AUTOPTIMIZE_HASH')) {
+            define('AUTOPTIMIZE_HASH', wp_hash(AUTOPTIMIZE_CACHE_URL));
         }
-        if ( ! defined( 'AUTOPTIMIZE_SITE_DOMAIN' ) ) {
-            define( 'AUTOPTIMIZE_SITE_DOMAIN', parse_url( AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST ) );
+        if (!defined('AUTOPTIMIZE_SITE_DOMAIN')) {
+            define('AUTOPTIMIZE_SITE_DOMAIN', parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST));
         }
 
         // Multibyte-capable string replacements are available with a filter.
         // Also requires 'mbstring' extension.
-        $with_mbstring = apply_filters( 'autoptimize_filter_with_mbstring', false );
-        if ( $with_mbstring ) {
-            autoptimizeUtils::mbstring_available( \extensions_loaded( 'mbstring' ) );
+        $with_mbstring = apply_filters('autoptimize_filter_with_mbstring', false);
+        if ($with_mbstring) {
+            autoptimizeUtils::mbstring_available(\extensions_loaded('mbstring'));
         } else {
-            autoptimizeUtils::mbstring_available( false );
+            autoptimizeUtils::mbstring_available(false);
         }
 
-        do_action( 'autoptimize_setup_done' );
+        do_action('autoptimize_setup_done');
     }
 
     /**
@@ -147,52 +147,52 @@ 
      */
     public function version_upgrades_check()
     {
-        autoptimizeVersionUpdatesHandler::check_installed_and_update( $this->version );
+        autoptimizeVersionUpdatesHandler::check_installed_and_update($this->version);
     }
 
     public function check_cache_and_run()
     {
-        if ( autoptimizeCache::cacheavail() ) {
+        if (autoptimizeCache::cacheavail()) {
             $conf = autoptimizeConfig::instance();
-            if ( $conf->get( 'autoptimize_html' ) || $conf->get( 'autoptimize_js' ) || $conf->get( 'autoptimize_css' ) ) {
+            if ($conf->get('autoptimize_html') || $conf->get('autoptimize_js') || $conf->get('autoptimize_css')) {
                 // Hook into WordPress frontend.
-                if ( defined( 'AUTOPTIMIZE_INIT_EARLIER' ) ) {
+                if (defined('AUTOPTIMIZE_INIT_EARLIER')) {
                     add_action(
                         'init',
-                        array( $this, 'start_buffering' ),
+                        array($this, 'start_buffering'),
                         self::INIT_EARLIER_PRIORITY
                     );
                 } else {
-                    if ( ! defined( 'AUTOPTIMIZE_HOOK_INTO' ) ) {
-                        define( 'AUTOPTIMIZE_HOOK_INTO', 'template_redirect' );
+                    if (!defined('AUTOPTIMIZE_HOOK_INTO')) {
+                        define('AUTOPTIMIZE_HOOK_INTO', 'template_redirect');
                     }
                     add_action(
-                        constant( 'AUTOPTIMIZE_HOOK_INTO' ),
-                        array( $this, 'start_buffering' ),
+                        constant('AUTOPTIMIZE_HOOK_INTO'),
+                        array($this, 'start_buffering'),
                         self::DEFAULT_HOOK_PRIORITY
                     );
                 }
             }
         } else {
-            add_action( 'admin_notices', 'autoptimizeMain::notice_cache_unavailable' );
+            add_action('admin_notices', 'autoptimizeMain::notice_cache_unavailable');
         }
     }
 
     public function maybe_run_ao_extra()
     {
-        if ( apply_filters( 'autoptimize_filter_extra_activate', true ) ) {
+        if (apply_filters('autoptimize_filter_extra_activate', true)) {
             $ao_extra = new autoptimizeExtra();
             $ao_extra->run();
 
             // And show the imgopt notice.
-            add_action( 'admin_notices', 'autoptimizeMain::notice_plug_imgopt' );
+            add_action('admin_notices', 'autoptimizeMain::notice_plug_imgopt');
         }
     }
 
     public function maybe_run_partners_tab()
     {
         // Loads partners tab code if in admin (and not in admin-ajax.php)!
-        if ( autoptimizeConfig::is_admin_and_not_ajax() ) {
+        if (autoptimizeConfig::is_admin_and_not_ajax()) {
             new autoptimizePartners();
         }
     }
@@ -200,7 +200,7 @@ 
     public function hook_page_cache_purge()
     {
         // hook into a collection of page cache purge actions if filter allows.
-        if ( apply_filters( 'autoptimize_filter_main_hookpagecachepurge', true ) ) {
+        if (apply_filters('autoptimize_filter_main_hookpagecachepurge', true)) {
             $page_cache_purge_actions = array(
                 'after_rocket_clean_domain', // exists.
                 'hyper_cache_purged', // Stefano confirmed this will be added.
@@ -212,9 +212,9 @@ 
                 'wpfc_delete_cache', // Emre confirmed this will be added this.
                 'swift_performance_after_clear_all_cache', // swift perf. yeah!
             );
-            $page_cache_purge_actions = apply_filters( 'autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions );
-            foreach ( $page_cache_purge_actions as $purge_action ) {
-                add_action( $purge_action, 'autoptimizeCache::clearall_actionless' );
+            $page_cache_purge_actions = apply_filters('autoptimize_filter_main_pagecachepurgeactions', $page_cache_purge_actions);
+            foreach ($page_cache_purge_actions as $purge_action) {
+                add_action($purge_action, 'autoptimizeCache::clearall_actionless');
             }
         }
     }
@@ -226,38 +226,38 @@ 
      */
     public function start_buffering()
     {
-        if ( $this->should_buffer() ) {
+        if ($this->should_buffer()) {
 
             // Load speedupper conditionally (true by default).
-            if ( apply_filters( 'autoptimize_filter_speedupper', true ) ) {
+            if (apply_filters('autoptimize_filter_speedupper', true)) {
                 $ao_speedupper = new autoptimizeSpeedupper();
             }
 
             $conf = autoptimizeConfig::instance();
 
-            if ( $conf->get( 'autoptimize_js' ) ) {
-                if ( ! defined( 'CONCATENATE_SCRIPTS' ) ) {
-                    define( 'CONCATENATE_SCRIPTS', false );
+            if ($conf->get('autoptimize_js')) {
+                if (!defined('CONCATENATE_SCRIPTS')) {
+                    define('CONCATENATE_SCRIPTS', false);
                 }
-                if ( ! defined( 'COMPRESS_SCRIPTS' ) ) {
-                    define( 'COMPRESS_SCRIPTS', false );
+                if (!defined('COMPRESS_SCRIPTS')) {
+                    define('COMPRESS_SCRIPTS', false);
                 }
             }
 
-            if ( $conf->get( 'autoptimize_css' ) ) {
-                if ( ! defined( 'COMPRESS_CSS' ) ) {
-                    define( 'COMPRESS_CSS', false );
+            if ($conf->get('autoptimize_css')) {
+                if (!defined('COMPRESS_CSS')) {
+                    define('COMPRESS_CSS', false);
                 }
             }
 
-            if ( apply_filters( 'autoptimize_filter_obkiller', false ) ) {
-                while ( ob_get_level() > 0 ) {
+            if (apply_filters('autoptimize_filter_obkiller', false)) {
+                while (ob_get_level() > 0) {
                     ob_end_clean();
                 }
             }
 
             // Now, start the real thing!
-            ob_start( array( $this, 'end_buffering' ) );
+            ob_start(array($this, 'end_buffering'));
         }
     }
 
@@ -268,31 +268,31 @@ 
      *                          deciding once per request (for use in tests).
      * @return bool
      */
-    public function should_buffer( $doing_tests = false )
+    public function should_buffer($doing_tests = false)
     {
         static $do_buffering = null;
 
         // Only check once in case we're called multiple times by others but
         // still allows multiple calls when doing tests.
-        if ( null === $do_buffering || $doing_tests ) {
+        if (null === $do_buffering || $doing_tests) {
 
             $ao_noptimize = false;
 
             // Checking for DONOTMINIFY constant as used by e.g. WooCommerce POS.
-            if ( defined( 'DONOTMINIFY' ) && ( constant( 'DONOTMINIFY' ) === true || constant( 'DONOTMINIFY' ) === 'true' ) ) {
+            if (defined('DONOTMINIFY') && (constant('DONOTMINIFY') === true || constant('DONOTMINIFY') === 'true')) {
                 $ao_noptimize = true;
             }
 
             // Skip checking query strings if they're disabled.
-            if ( apply_filters( 'autoptimize_filter_honor_qs_noptimize', true ) ) {
+            if (apply_filters('autoptimize_filter_honor_qs_noptimize', true)) {
                 // Check for `ao_noptimize` (and other) keys in the query string
                 // to get non-optimized page for debugging.
                 $keys = array(
                     'ao_noptimize',
                     'ao_noptirocket',
                 );
-                foreach ( $keys as $key ) {
-                    if ( array_key_exists( $key, $_GET ) && '1' === $_GET[ $key ] ) {
+                foreach ($keys as $key) {
+                    if (array_key_exists($key, $_GET) && '1' === $_GET[$key]) {
                         $ao_noptimize = true;
                         break;
                     }
@@ -300,15 +300,15 @@ 
             }
 
             // If setting says not to optimize logged in user and user is logged in...
-            if ( 'on' !== get_option( 'autoptimize_optimize_logged', 'on' ) && is_user_logged_in() && current_user_can( 'edit_posts' ) ) {
+            if ('on' !== get_option('autoptimize_optimize_logged', 'on') && is_user_logged_in() && current_user_can('edit_posts')) {
                 $ao_noptimize = true;
             }
 
             // If setting says not to optimize cart/checkout.
-            if ( 'on' !== get_option( 'autoptimize_optimize_checkout', 'on' ) ) {
+            if ('on' !== get_option('autoptimize_optimize_checkout', 'on')) {
                 // Checking for woocommerce, easy digital downloads and wp ecommerce...
-                foreach ( array( 'is_checkout', 'is_cart', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout' ) as $func ) {
-                    if ( function_exists( $func ) && $func() ) {
+                foreach (array('is_checkout', 'is_cart', 'edd_is_checkout', 'wpsc_is_cart', 'wpsc_is_checkout') as $func) {
+                    if (function_exists($func) && $func()) {
                         $ao_noptimize = true;
                         break;
                     }
@@ -316,11 +316,11 @@ 
             }
 
             // Allows blocking of autoptimization on your own terms regardless of above decisions.
-            $ao_noptimize = (bool) apply_filters( 'autoptimize_filter_noptimize', $ao_noptimize );
+            $ao_noptimize = (bool) apply_filters('autoptimize_filter_noptimize', $ao_noptimize);
 
             // Check for site being previewed in the Customizer (available since WP 4.0).
             $is_customize_preview = false;
-            if ( function_exists( 'is_customize_preview' ) && is_customize_preview() ) {
+            if (function_exists('is_customize_preview') && is_customize_preview()) {
                 $is_customize_preview = is_customize_preview();
             }
 
@@ -331,7 +331,7 @@ 
              * while the main query hasn't been ran yet. Thats why we use
              * AUTOPTIMIZE_INIT_EARLIER in tests.
              */
-            $do_buffering = ( ! is_admin() && ! is_feed() && ! $ao_noptimize && ! $is_customize_preview );
+            $do_buffering = (!is_admin() && !is_feed() && !$ao_noptimize && !$is_customize_preview);
         }
 
         return $do_buffering;
@@ -344,24 +344,24 @@ 
      *
      * @return bool
      */
-    public function is_valid_buffer( $content )
+    public function is_valid_buffer($content)
     {
         // Defaults to true.
         $valid = true;
 
-        $has_no_html_tag    = ( false === stripos( $content, '<html' ) );
-        $has_xsl_stylesheet = ( false !== stripos( $content, '<xsl:stylesheet' ) );
-        $has_html5_doctype  = ( preg_match( '/^<!DOCTYPE.+html>/i', $content ) > 0 );
+        $has_no_html_tag    = (false === stripos($content, '<html'));
+        $has_xsl_stylesheet = (false !== stripos($content, '<xsl:stylesheet'));
+        $has_html5_doctype  = (preg_match('/^<!DOCTYPE.+html>/i', $content) > 0);
 
-        if ( $has_no_html_tag ) {
+        if ($has_no_html_tag) {
             // Can't be valid amp markup without an html tag preceding it.
             $is_amp_markup = false;
         } else {
-            $is_amp_markup = self::is_amp_markup( $content );
+            $is_amp_markup = self::is_amp_markup($content);
         }
 
         // If it's not html, or if it's amp or contains xsl stylesheets we don't touch it.
-        if ( $has_no_html_tag && ! $has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet ) {
+        if ($has_no_html_tag && !$has_html5_doctype || $is_amp_markup || $has_xsl_stylesheet) {
             $valid = false;
         }
 
@@ -376,9 +376,9 @@ 
      *
      * @return bool
      */
-    public static function is_amp_markup( $content )
+    public static function is_amp_markup($content)
     {
-        $is_amp_markup = preg_match( '/<html[^>]*(?:amp|⚡)/i', $content );
+        $is_amp_markup = preg_match('/<html[^>]*(?:amp|⚡)/i', $content);
 
         return (bool) $is_amp_markup;
     }
@@ -391,10 +391,10 @@ 
      *
      * @return string
      */
-    public function end_buffering( $content )
+    public function end_buffering($content)
     {
         // Bail early without modifying anything if we can't handle the content.
-        if ( ! $this->is_valid_buffer( $content ) ) {
+        if (!$this->is_valid_buffer($content)) {
             return $content;
         }
 
@@ -402,57 +402,57 @@ 
 
         // Determine what needs to be ran.
         $classes = array();
-        if ( $conf->get( 'autoptimize_js' ) ) {
+        if ($conf->get('autoptimize_js')) {
             $classes[] = 'autoptimizeScripts';
         }
-        if ( $conf->get( 'autoptimize_css' ) ) {
+        if ($conf->get('autoptimize_css')) {
             $classes[] = 'autoptimizeStyles';
         }
-        if ( $conf->get( 'autoptimize_html' ) ) {
+        if ($conf->get('autoptimize_html')) {
             $classes[] = 'autoptimizeHTML';
         }
 
         $classoptions = array(
             'autoptimizeScripts' => array(
-                'aggregate'      => $conf->get( 'autoptimize_js_aggregate' ),
-                'justhead'       => $conf->get( 'autoptimize_js_justhead' ),
-                'forcehead'      => $conf->get( 'autoptimize_js_forcehead' ),
-                'trycatch'       => $conf->get( 'autoptimize_js_trycatch' ),
-                'js_exclude'     => $conf->get( 'autoptimize_js_exclude' ),
-                'cdn_url'        => $conf->get( 'autoptimize_cdn_url' ),
-                'include_inline' => $conf->get( 'autoptimize_js_include_inline' ),
+                'aggregate'      => $conf->get('autoptimize_js_aggregate'),
+                'justhead'       => $conf->get('autoptimize_js_justhead'),
+                'forcehead'      => $conf->get('autoptimize_js_forcehead'),
+                'trycatch'       => $conf->get('autoptimize_js_trycatch'),
+                'js_exclude'     => $conf->get('autoptimize_js_exclude'),
+                'cdn_url'        => $conf->get('autoptimize_cdn_url'),
+                'include_inline' => $conf->get('autoptimize_js_include_inline'),
             ),
             'autoptimizeStyles'  => array(
-                'aggregate'      => $conf->get( 'autoptimize_css_aggregate' ),
-                'justhead'       => $conf->get( 'autoptimize_css_justhead' ),
-                'datauris'       => $conf->get( 'autoptimize_css_datauris' ),
-                'defer'          => $conf->get( 'autoptimize_css_defer' ),
-                'defer_inline'   => $conf->get( 'autoptimize_css_defer_inline' ),
-                'inline'         => $conf->get( 'autoptimize_css_inline' ),
-                'css_exclude'    => $conf->get( 'autoptimize_css_exclude' ),
-                'cdn_url'        => $conf->get( 'autoptimize_cdn_url' ),
-                'include_inline' => $conf->get( 'autoptimize_css_include_inline' ),
-                'nogooglefont'   => $conf->get( 'autoptimize_css_nogooglefont' ),
+                'aggregate'      => $conf->get('autoptimize_css_aggregate'),
+                'justhead'       => $conf->get('autoptimize_css_justhead'),
+                'datauris'       => $conf->get('autoptimize_css_datauris'),
+                'defer'          => $conf->get('autoptimize_css_defer'),
+                'defer_inline'   => $conf->get('autoptimize_css_defer_inline'),
+                'inline'         => $conf->get('autoptimize_css_inline'),
+                'css_exclude'    => $conf->get('autoptimize_css_exclude'),
+                'cdn_url'        => $conf->get('autoptimize_cdn_url'),
+                'include_inline' => $conf->get('autoptimize_css_include_inline'),
+                'nogooglefont'   => $conf->get('autoptimize_css_nogooglefont'),
             ),
             'autoptimizeHTML'    => array(
-                'keepcomments' => $conf->get( 'autoptimize_html_keepcomments' ),
+                'keepcomments' => $conf->get('autoptimize_html_keepcomments'),
             ),
         );
 
-        $content = apply_filters( 'autoptimize_filter_html_before_minify', $content );
+        $content = apply_filters('autoptimize_filter_html_before_minify', $content);
 
         // Run the classes!
-        foreach ( $classes as $name ) {
-            $instance = new $name( $content );
-            if ( $instance->read( $classoptions[ $name ] ) ) {
+        foreach ($classes as $name) {
+            $instance = new $name($content);
+            if ($instance->read($classoptions[$name])) {
                 $instance->minify();
                 $instance->cache();
                 $content = $instance->getcontent();
             }
-            unset( $instance );
+            unset($instance);
         }
 
-        $content = apply_filters( 'autoptimize_html_after_minify', $content );
+        $content = apply_filters('autoptimize_html_after_minify', $content);
 
         return $content;
     }
@@ -494,25 +494,25 @@ 
             'autoptimize_imgopt_launched',
         );
 
-        if ( ! is_multisite() ) {
-            foreach ( $delete_options as $del_opt ) {
-                delete_option( $del_opt );
+        if (!is_multisite()) {
+            foreach ($delete_options as $del_opt) {
+                delete_option($del_opt);
             }
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                foreach ( $delete_options as $del_opt ) {
-                    delete_option( $del_opt );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                foreach ($delete_options as $del_opt) {
+                    delete_option($del_opt);
                 }
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
 
-        if ( wp_get_schedule( 'ao_cachechecker' ) ) {
-            wp_clear_scheduled_hook( 'ao_cachechecker' );
+        if (wp_get_schedule('ao_cachechecker')) {
+            wp_clear_scheduled_hook('ao_cachechecker');
         }
     }
 
@@ -520,41 +520,41 @@ 
     {
         echo '<div class="error"><p>';
         // Translators: %s is the cache directory location.
-        printf( __( 'Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize' ), AUTOPTIMIZE_CACHE_DIR );
+        printf(__('Autoptimize cannot write to the cache directory (%s), please fix to enable CSS/ JS optimization!', 'autoptimize'), AUTOPTIMIZE_CACHE_DIR);
         echo '</p></div>';
     }
 
     public static function notice_installed()
     {
         echo '<div class="updated"><p>';
-        _e( 'Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize' );
+        _e('Thank you for installing and activating Autoptimize. Please configure it under "Settings" -> "Autoptimize" to start improving your site\'s performance.', 'autoptimize');
         echo '</p></div>';
     }
 
     public static function notice_updated()
     {
         echo '<div class="updated"><p>';
-        _e( 'Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize' );
+        _e('Autoptimize has just been updated. Please <strong>test your site now</strong> and adapt Autoptimize config if needed.', 'autoptimize');
         echo '</p></div>';
     }
 
     public static function notice_plug_imgopt()
     {
         // Translators: the URL added points to the Autopmize Extra settings.
-        $_ao_imgopt_plug_notice      = sprintf( __( 'Did you know Autoptimize includes on-the-fly image optimization and CDN via ShortPixel? Check out the %1$sAutoptimize Extra settings%2$s to activate this option.', 'autoptimize' ), '<a href="options-general.php?page=autoptimize_extra">', '</a>' );
-        $_ao_imgopt_plug_notice      = apply_filters( 'autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice );
+        $_ao_imgopt_plug_notice      = sprintf(__('Did you know Autoptimize includes on-the-fly image optimization and CDN via ShortPixel? Check out the %1$sAutoptimize Extra settings%2$s to activate this option.', 'autoptimize'), '<a href="options-general.php?page=autoptimize_extra">', '</a>');
+        $_ao_imgopt_plug_notice      = apply_filters('autoptimize_filter_main_imgopt_plug_notice', $_ao_imgopt_plug_notice);
         $_ao_imgopt_launch_ok        = autoptimizeExtra::imgopt_launch_ok_wrapper();
         $_ao_imgopt_plug_dismissible = 'ao-img-opt-plug-123';
 
         // check if AO is optimizing images already.
         $_ao_imgopt_active = false;
-        $_ao_extra_options = get_option( 'autoptimize_extra_settings', '' );
-        if ( is_array( $_ao_extra_options ) && array_key_exists( 'autoptimize_extra_checkbox_field_5', $_ao_extra_options ) && ! empty( $_ao_extra_options['autoptimize_extra_checkbox_field_5'] ) ) {
+        $_ao_extra_options = get_option('autoptimize_extra_settings', '');
+        if (is_array($_ao_extra_options) && array_key_exists('autoptimize_extra_checkbox_field_5', $_ao_extra_options) && !empty($_ao_extra_options['autoptimize_extra_checkbox_field_5'])) {
             $_ao_imgopt_active = true;
         }
 
-        if ( '' !== $_ao_imgopt_plug_notice && ! $_ao_imgopt_active && $_ao_imgopt_launch_ok && PAnD::is_admin_notice_active( $_ao_imgopt_plug_dismissible ) ) {
-            echo '<div class="notice notice-info is-dismissible" data-dismissible="' . $_ao_imgopt_plug_dismissible . '"><p>';
+        if ('' !== $_ao_imgopt_plug_notice && !$_ao_imgopt_active && $_ao_imgopt_launch_ok && PAnD::is_admin_notice_active($_ao_imgopt_plug_dismissible)) {
+            echo '<div class="notice notice-info is-dismissible" data-dismissible="'.$_ao_imgopt_plug_dismissible.'"><p>';
             echo $_ao_imgopt_plug_notice;
             echo '</p></div>';
         }

classes/autoptimizeScripts.php

Doc Comments +9 added lines, -1 removed lines

@@ -418,6 +418,10 @@ 
     }
 
     // Checks against the white- and blacklists
+
+    /**
+     * @param string $tag
+     */
     private function ismergeable($tag)
     {
         if ( ! $this->aggregate ) {
@@ -457,6 +461,10 @@ 
     }
 
     // Checks agains the blacklist
+
+    /**
+     * @param string $tag
+     */
     private function ismovable($tag)
     {
         if ( true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) {
@@ -538,7 +546,7 @@ 
      * @param string $filepath Filepath.
      * @param bool $cache_miss Optional. Force a cache miss. Default false.
      *
-     * @return bool|string Url pointing to the minified js file or false.
+     * @return false|string Url pointing to the minified js file or false.
      */
     public function minify_single( $filepath, $cache_miss = false )
     {

Spacing +153 added lines, -153 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -13,18 +13,18 @@ 
     );
 
     private $dontmove = array(
-        'document.write','html5.js','show_ads.js','google_ad','histats.com/js','statcounter.com/counter/counter.js',
-        'ws.amazon.com/widgets','media.fastclick.net','/ads/','comment-form-quicktags/quicktags.php','edToolbar',
-        'intensedebate.com','scripts.chitika.net/','_gaq.push','jotform.com/','admin-bar.min.js','GoogleAnalyticsObject',
-        'plupload.full.min.js','syntaxhighlighter','adsbygoogle','gist.github.com','_stq','nonce','post_id','data-noptimize'
+        'document.write', 'html5.js', 'show_ads.js', 'google_ad', 'histats.com/js', 'statcounter.com/counter/counter.js',
+        'ws.amazon.com/widgets', 'media.fastclick.net', '/ads/', 'comment-form-quicktags/quicktags.php', 'edToolbar',
+        'intensedebate.com', 'scripts.chitika.net/', '_gaq.push', 'jotform.com/', 'admin-bar.min.js', 'GoogleAnalyticsObject',
+        'plupload.full.min.js', 'syntaxhighlighter', 'adsbygoogle', 'gist.github.com', '_stq', 'nonce', 'post_id', 'data-noptimize'
         ,'logHuman'
     );
     private $domove     = array(
-        'gaJsHost','load_cmc','jd.gallery.transitions.js','swfobject.embedSWF(','tiny_mce.js','tinyMCEPreInit.go'
+        'gaJsHost', 'load_cmc', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'tiny_mce.js', 'tinyMCEPreInit.go'
     );
     private $domovelast = array(
-        'addthis.com','/afsonline/show_afs_search.js','disqus.js','networkedblogs.com/getnetworkwidget','infolinks.com/js/',
-        'jd.gallery.js.php','jd.gallery.transitions.js','swfobject.embedSWF(','linkwithin.com/widget.js','tiny_mce.js','tinyMCEPreInit.go'
+        'addthis.com', '/afsonline/show_afs_search.js', 'disqus.js', 'networkedblogs.com/getnetworkwidget', 'infolinks.com/js/',
+        'jd.gallery.js.php', 'jd.gallery.transitions.js', 'swfobject.embedSWF(', 'linkwithin.com/widget.js', 'tiny_mce.js', 'tinyMCEPreInit.go'
     );
 
     private $aggregate       = true;
@@ -43,84 +43,84 @@ 
     // Reads the page and collects script tags
     public function read($options)
     {
-        $noptimizeJS = apply_filters( 'autoptimize_filter_js_noptimize', false, $this->content );
-        if ( $noptimizeJS ) {
+        $noptimizeJS = apply_filters('autoptimize_filter_js_noptimize', false, $this->content);
+        if ($noptimizeJS) {
             return false;
         }
 
         // only optimize known good JS?
-        $whitelistJS = apply_filters( 'autoptimize_filter_js_whitelist', '', $this->content );
-        if ( ! empty( $whitelistJS ) ) {
-            $this->whitelist = array_filter( array_map( 'trim', explode( ',', $whitelistJS ) ) );
+        $whitelistJS = apply_filters('autoptimize_filter_js_whitelist', '', $this->content);
+        if (!empty($whitelistJS)) {
+            $this->whitelist = array_filter(array_map('trim', explode(',', $whitelistJS)));
         }
 
         // is there JS we should simply remove
-        $removableJS = apply_filters( 'autoptimize_filter_js_removables', '', $this->content );
+        $removableJS = apply_filters('autoptimize_filter_js_removables', '', $this->content);
         if (!empty($removableJS)) {
-            $this->jsremovables = array_filter( array_map( 'trim', explode( ',', $removableJS ) ) );
+            $this->jsremovables = array_filter(array_map('trim', explode(',', $removableJS)));
         }
 
         // 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);
 
         // get extra exclusions settings or filter
         $excludeJS = $options['js_exclude'];
-        $excludeJS = apply_filters( 'autoptimize_filter_js_exclude', $excludeJS, $this->content );
+        $excludeJS = apply_filters('autoptimize_filter_js_exclude', $excludeJS, $this->content);
 
-        if ( '' !== $excludeJS ) {
-            if ( is_array( $excludeJS ) ) {
-                if ( ( $removeKeys = array_keys( $excludeJS, 'remove' ) ) !== false ) {
-                    foreach ( $removeKeys as $removeKey ) {
-                        unset( $excludeJS[$removeKey] );
+        if ('' !== $excludeJS) {
+            if (is_array($excludeJS)) {
+                if (($removeKeys = array_keys($excludeJS, 'remove')) !== false) {
+                    foreach ($removeKeys as $removeKey) {
+                        unset($excludeJS[$removeKey]);
                         $this->jsremovables[] = $removeKey;
                     }
                 }
-                $exclJSArr = array_keys( $excludeJS );
+                $exclJSArr = array_keys($excludeJS);
             } else {
-                $exclJSArr = array_filter( array_map( 'trim', explode( ',', $excludeJS ) ) );
+                $exclJSArr = array_filter(array_map('trim', explode(',', $excludeJS)));
             }
-            $this->dontmove = array_merge( $exclJSArr, $this->dontmove );
+            $this->dontmove = array_merge($exclJSArr, $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'];
@@ -135,26 +135,26 @@ 
         $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 whitelisted in should_aggregate-function
                 $should_aggregate = $this->should_aggregate($tag);
-                if ( ! $should_aggregate ) {
+                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;
                     }
 
                     $origTag = null;
-                    $url = current( explode( '?', $source[2], 2 ) );
+                    $url = current(explode('?', $source[2], 2));
                     $path = $this->getpath($url);
-                    if ( false !== $path && preg_match( '#\.js$#', $path ) && $this->ismergeable($tag) ) {
+                    if (false !== $path && preg_match('#\.js$#', $path) && $this->ismergeable($tag)) {
                         // ok to optimize, add to array
                         $this->scripts[] = $path;
                     } else {
@@ -162,40 +162,40 @@ 
                         $newTag  = $tag;
 
                         // non-mergeable script (excluded or dynamic or external)
-                        if ( is_array( $excludeJS ) ) {
+                        if (is_array($excludeJS)) {
                             // should we add flags?
-                            foreach ( $excludeJS as $exclTag => $exclFlags) {
-                                if ( false !== strpos( $origTag, $exclTag ) && in_array( $exclFlags, array( 'async', 'defer' ) ) ) {
-                                    $newTag = str_replace( '<script ', '<script ' . $exclFlags . ' ', $newTag );
+                            foreach ($excludeJS as $exclTag => $exclFlags) {
+                                if (false !== strpos($origTag, $exclTag) && in_array($exclFlags, array('async', 'defer'))) {
+                                    $newTag = str_replace('<script ', '<script '.$exclFlags.' ', $newTag);
                                 }
                             }
                         }
 
                         // Should we minify the non-aggregated script?
-                        if ( $path && apply_filters( 'autoptimize_filter_js_minify_excluded', true, $url ) ) {
-                            $minified_url = $this->minify_single( $path );
+                        if ($path && apply_filters('autoptimize_filter_js_minify_excluded', true, $url)) {
+                            $minified_url = $this->minify_single($path);
                             // replace orig URL with minified URL from cache if so
-                            if ( ! empty( $minified_url ) ) {
-                                $newTag = str_replace( $url, $minified_url, $newTag );
+                            if (!empty($minified_url)) {
+                                $newTag = str_replace($url, $minified_url, $newTag);
                             }
 
                             // remove querystring from URL in newTag
-                            if ( ! empty( $explUrl[1] ) ) {
-                                $newTag = str_replace( '?' . $explUrl[1], '', $newTag );
+                            if (!empty($explUrl[1])) {
+                                $newTag = str_replace('?'.$explUrl[1], '', $newTag);
                             }
                         }
 
-                        if ( $this->ismovable($newTag) ) {
+                        if ($this->ismovable($newTag)) {
                             // can be moved, flags and all
-                            if ( $this->movetolast($newTag) )  {
+                            if ($this->movetolast($newTag)) {
                                 $this->move['last'][] = $newTag;
                             } else {
                                 $this->move['first'][] = $newTag;
                             }
                         } else {
                             // cannot be moved, so if flag was added re-inject altered tag immediately
-                            if ( $origTag !== $newTag ) {
-                                $this->content = str_replace( $origTag, $newTag, $this->content );
+                            if ($origTag !== $newTag) {
+                                $this->content = str_replace($origTag, $newTag, $this->content);
                                 $origTag = '';
                             }
                             // and forget about the $tag (not to be touched any more)
@@ -204,23 +204,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;
+                    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;
@@ -235,7 +235,7 @@ 
                 }
 
                 //Remove the original script tag
-                $this->content = str_replace( $tag, '', $this->content );
+                $this->content = str_replace($tag, '', $this->content);
             }
 
             return true;
@@ -265,21 +265,21 @@ 
         // 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;
         }
 
@@ -289,40 +289,40 @@ 
     //Joins and optimizes JS
     public function minify()
     {
-        foreach ( $this->scripts as $script ) {
+        foreach ($this->scripts as $script) {
             // 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;
-                    } else if ( $this->can_inject_late($script) ) {
+                    } else if ($this->can_inject_late($script)) {
                         $scriptsrc = self::build_injectlater_marker($script, md5($scriptsrc));
                     }
-                    $this->jscode .= "\n" . $scriptsrc;
+                    $this->jscode .= "\n".$scriptsrc;
                 }/*else{
                     //Couldn't read JS. Maybe getpath isn't working?
                 }*/
@@ -330,32 +330,32 @@ 
         }
 
         // Check for already-minified code
-        $this->md5hash = md5( $this->jscode );
+        $this->md5hash = md5($this->jscode);
         $ccheck = new autoptimizeCache($this->md5hash, 'js');
-        if ( $ccheck->check() ) {
+        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;
     }
 
@@ -363,11 +363,11 @@ 
     public function cache()
     {
         $cache = new autoptimizeCache($this->md5hash, 'js');
-        if ( ! $cache->check() ) {
+        if (!$cache->check()) {
             // Cache our code
             $cache->cache($this->jscode, 'text/javascript');
         }
-        $this->url = AUTOPTIMIZE_CACHE_URL . $cache->getname();
+        $this->url = AUTOPTIMIZE_CACHE_URL.$cache->getname();
         $this->url = $this->url_replace_cdn($this->url);
     }
 
@@ -375,43 +375,43 @@ 
     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 ) {
-            $replaceTag = array( '</head>', 'before' );
+        if ($this->forcehead) {
+            $replaceTag = array('</head>', 'before');
             $defer = '';
         } else {
-            $replaceTag = array( '</body>', 'before' );
+            $replaceTag = array('</body>', 'before');
             $defer = 'defer ';
         }
 
-        $defer = apply_filters( 'autoptimize_filter_js_defer', $defer );
+        $defer = apply_filters('autoptimize_filter_js_defer', $defer);
 
-        $bodyreplacementpayload = '<script type="text/javascript" ' . $defer . 'src="' . $this->url . '"></script>';
-        $bodyreplacementpayload = apply_filters( 'autoptimize_filter_js_bodyreplacementpayload', $bodyreplacementpayload );
+        $bodyreplacementpayload = '<script type="text/javascript" '.$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']);
 
-        $replaceTag = apply_filters( 'autoptimize_filter_js_replacetag', $replaceTag );
+        $replaceTag = apply_filters('autoptimize_filter_js_replacetag', $replaceTag);
 
-        if ( strlen( $this->jscode ) > 0 ) {
-            $this->inject_in_html( $bodyreplacement, $replaceTag );
+        if (strlen($this->jscode) > 0) {
+            $this->inject_in_html($bodyreplacement, $replaceTag);
         }
 
         // 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;
@@ -420,32 +420,32 @@ 
     // Checks against the white- and blacklists
     private function ismergeable($tag)
     {
-        if ( ! $this->aggregate ) {
+        if (!$this->aggregate) {
             return false;
         }
 
-        if ( ! empty( $this->whitelist ) ) {
-            foreach ( $this->whitelist as $match ) {
-                if (false !== strpos( $tag, $match ) ) {
+        if (!empty($this->whitelist)) {
+            foreach ($this->whitelist as $match) {
+                if (false !== strpos($tag, $match)) {
                     return true;
                 }
             }
             // no match with whitelist
             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;
                 }
@@ -459,23 +459,23 @@ 
     // Checks agains the blacklist
     private function ismovable($tag)
     {
-        if ( true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) {
+        if (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;
             }
@@ -487,8 +487,8 @@ 
 
     private function movetolast($tag)
     {
-        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;
             }
@@ -509,11 +509,11 @@ 
      * @return bool
      */
     private function can_inject_late($jsPath) {
-        $consider_minified_array = apply_filters( 'autoptimize_filter_js_consider_minified', false );
-        if ( true !== $this->inject_min_late ) {
+        $consider_minified_array = apply_filters('autoptimize_filter_js_consider_minified', false);
+        if (true !== $this->inject_min_late) {
             // late-inject turned off
             return false;
-        } else if ( ( false === strpos( $jsPath, 'min.js' ) ) && ( false === strpos( $jsPath, 'wp-includes/js/jquery/jquery.js' ) ) && ( str_replace( $consider_minified_array, '', $jsPath ) === $jsPath ) ) {
+        } else if ((false === strpos($jsPath, 'min.js')) && (false === strpos($jsPath, 'wp-includes/js/jquery/jquery.js')) && (str_replace($consider_minified_array, '', $jsPath) === $jsPath)) {
             // file not minified based on filename & filter
             return false;
         } else {
@@ -540,26 +540,26 @@ 
      *
      * @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));
             // 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;
     }

autoptimize.php

Spacing +33 added lines, -33 removed lines

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

config/default.php

Indentation +42 added lines, -42 removed lines

@@ -2,9 +2,9 @@ 
 
 //Check everything exists before using it
 if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
-	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
+    $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
 if(!isset($_SERVER['HTTP_USER_AGENT']))
-	$_SERVER['HTTP_USER_AGENT'] = '';
+    $_SERVER['HTTP_USER_AGENT'] = '';
 
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -15,30 +15,30 @@ 
 
 // Check for buggy versions of Internet Explorer
 if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') &&
-	preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
+    preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
 {
-	$version = floatval($matches[1]);
+    $version = floatval($matches[1]);
 
-	if ($version < 6)
-		$encoding = 'none';
+    if ($version < 6)
+        $encoding = 'none';
 
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
-		$encoding = 'none';
+    if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
+        $encoding = 'none';
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
 if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
-	$encoding = 'none';
+    $encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
 if($encoding != 'none' && $iscompressed == false)
 {
-	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
-	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
+    $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
+    $code = file_get_contents(__FILE__.'.none');
+    $contents = gzencode($code,9,$flag);
 }else{
-	//Get data
-	$contents = file_get_contents(__FILE__.'.'.$encoding);
+    //Get data
+    $contents = file_get_contents(__FILE__.'.'.$encoding);
 }
 
 // first check if we have to send 304
@@ -52,36 +52,36 @@ 
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
 if (($modTimeMatch)||($eTagMatch)) {
-	header('HTTP/1.1 304 Not Modified');
-	header('Connection: close');
+    header('HTTP/1.1 304 Not Modified');
+    header('Connection: close');
 } else {
-	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
-	if ($encoding != 'none') {
-		header('Content-Encoding: '.$encoding);
-	}
-	header('Vary: Accept-Encoding');
-	header('Content-Length: '.strlen($contents));
-	header('Content-type: %%CONTENT%%; charset=utf-8');
-	header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
-	header('Cache-Control: max-age='.$expireTime.', public, immutable');
-	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
+    // send all sorts of headers
+    $expireTime=60*60*24*355; // 1y max according to RFC
+    if ($encoding != 'none') {
+        header('Content-Encoding: '.$encoding);
+    }
+    header('Vary: Accept-Encoding');
+    header('Content-Length: '.strlen($contents));
+    header('Content-type: %%CONTENT%%; charset=utf-8');
+    header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
+    header('Cache-Control: max-age='.$expireTime.', public, immutable');
+    header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
+    header('ETag: ' . $eTag);
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
-	// send output
-	echo $contents;
+    // send output
+    echo $contents;
 
-	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
-	{
-		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+    //And write to filesystem cache if not done yet
+    if($encoding != 'none' && $iscompressed == false)
+    {
+        //Write the content we sent
+        file_put_contents(__FILE__.'.'.$encoding,$contents);
 
-		//And write the new content
-		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
-		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
-	}
+        //And write the new content
+        $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
+        $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
+        $contents = gzencode($code,9,$flag);
+        file_put_contents(__FILE__.'.'.$ext,$contents);
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -1,9 +1,9 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if (!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+if (!isset($_SERVER['HTTP_USER_AGENT']))
 	$_SERVER['HTTP_USER_AGENT'] = '';
 
 // Determine supported compression method
@@ -27,16 +27,16 @@ 
 }
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if (ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
 	$encoding = 'none';
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
-if($encoding != 'none' && $iscompressed == false)
+if ($encoding != 'none' && $iscompressed == false)
 {
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
-	$contents = gzencode($code,9,$flag);
-}else{
+	$contents = gzencode($code, 9, $flag);
+} else {
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }
@@ -44,19 +44,19 @@ 
 // first check if we have to send 304
 // inspired by http://www.jonasjohn.de/snippets/php/caching.htm
 
-$eTag=md5($contents);
-$modTime=filemtime(__FILE__.'.none');
+$eTag = md5($contents);
+$modTime = filemtime(__FILE__.'.none');
 
 date_default_timezone_set("UTC");
-$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'],$eTag));
+$eTagMatch = (isset($_SERVER['HTTP_IF_NONE_MATCH']) && strpos($_SERVER['HTTP_IF_NONE_MATCH'], $eTag));
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
 
-if (($modTimeMatch)||($eTagMatch)) {
+if (($modTimeMatch) || ($eTagMatch)) {
 	header('HTTP/1.1 304 Not Modified');
 	header('Connection: close');
 } else {
 	// send all sorts of headers
-	$expireTime=60*60*24*355; // 1y max according to RFC
+	$expireTime = 60*60*24*355; // 1y max according to RFC
 	if ($encoding != 'none') {
 		header('Content-Encoding: '.$encoding);
 	}
@@ -66,22 +66,22 @@ 
 	header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
 	header('Cache-Control: max-age='.$expireTime.', public, immutable');
 	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
-	header('ETag: ' . $eTag);
+	header('ETag: '.$eTag);
 	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
 
 	// send output
 	echo $contents;
 
 	//And write to filesystem cache if not done yet
-	if($encoding != 'none' && $iscompressed == false)
+	if ($encoding != 'none' && $iscompressed == false)
 	{
 		//Write the content we sent
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
+		file_put_contents(__FILE__.'.'.$encoding, $contents);
 
 		//And write the new content
 		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
 		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
-		$contents = gzencode($code,9,$flag);
-		file_put_contents(__FILE__.'.'.$ext,$contents);
+		$contents = gzencode($code, 9, $flag);
+		file_put_contents(__FILE__.'.'.$ext, $contents);
 	}
 }

Braces +14 added lines, -9 removed lines

@@ -1,10 +1,12 @@ 
 <?php exit;
 
 //Check everything exists before using it
-if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
+if(!isset($_SERVER['HTTP_ACCEPT_ENCODING'])) {
 	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
-if(!isset($_SERVER['HTTP_USER_AGENT']))
+}
+if(!isset($_SERVER['HTTP_USER_AGENT'])) {
 	$_SERVER['HTTP_USER_AGENT'] = '';
+}
 
 // Determine supported compression method
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -19,16 +21,19 @@ 
 {
 	$version = floatval($matches[1]);
 
-	if ($version < 6)
-		$encoding = 'none';
+	if ($version < 6) {
+			$encoding = 'none';
+	}
 
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
-		$encoding = 'none';
-}
+	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1')) {
+			$encoding = 'none';
+	}
+	}
 
 //Some servers compress the output of PHP - Don't break in those cases
-if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
+if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1) {
 	$encoding = 'none';
+}
 
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
 if($encoding != 'none' && $iscompressed == false)
@@ -36,7 +41,7 @@ 
 	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
 	$code = file_get_contents(__FILE__.'.none');
 	$contents = gzencode($code,9,$flag);
-}else{
+} else{
 	//Get data
 	$contents = file_get_contents(__FILE__.'.'.$encoding);
 }