futtta / autoptimize

classes/autoptimizeStyles.php

Spacing +314 added lines, -314 removed lines

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

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.5.1' );
+define('AUTOPTIMIZE_PLUGIN_VERSION', '2.5.1');
 
 // 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;

classes/autoptimizeToolbar.php

Spacing +49 added lines, -49 removed lines

@@ -3,7 +3,7 @@ 
  * Handles toolbar-related stuff.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -12,32 +12,32 @@ 
     public function __construct()
     {
         // If Cache is not available we don't add the toolbar.
-        if ( ! autoptimizeCache::cacheavail() ) {
+        if (!autoptimizeCache::cacheavail()) {
             return;
         }
 
         // Load admin toolbar feature once WordPress, all plugins, and the theme are fully loaded and instantiated.
-        add_action( 'wp_loaded', array( $this, 'load_toolbar' ) );
+        add_action('wp_loaded', array($this, 'load_toolbar'));
     }
 
     public function load_toolbar()
     {
         // Check permissions and that toolbar is not hidden via filter.
-        if ( current_user_can( 'manage_options' ) && apply_filters( 'autoptimize_filter_toolbar_show', true ) ) {
+        if (current_user_can('manage_options') && apply_filters('autoptimize_filter_toolbar_show', true)) {
 
             // Create a handler for the AJAX toolbar requests.
-            add_action( 'wp_ajax_autoptimize_delete_cache', array( $this, 'delete_cache' ) );
+            add_action('wp_ajax_autoptimize_delete_cache', array($this, 'delete_cache'));
 
             // Load custom styles, scripts and menu only when needed.
-            if ( is_admin_bar_showing() ) {
-                if ( is_admin() ) {
-                    add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+            if (is_admin_bar_showing()) {
+                if (is_admin()) {
+                    add_action('admin_enqueue_scripts', array($this, 'enqueue_scripts'));
                 } else {
-                    add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
+                    add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts'));
                 }
 
                 // Add the Autoptimize Toolbar to the Admin bar.
-                add_action( 'admin_bar_menu', array( $this, 'add_toolbar' ), 100 );
+                add_action('admin_bar_menu', array($this, 'add_toolbar'), 100);
             }
         }
     }
@@ -50,17 +50,17 @@ 
         $stats = autoptimizeCache::stats();
 
         // Set the Max Size recommended for cache files.
-        $max_size = apply_filters( 'autoptimize_filter_cachecheck_maxsize', 512 * 1024 * 1024 );
+        $max_size = apply_filters('autoptimize_filter_cachecheck_maxsize', 512*1024*1024);
 
         // Retrieve the current Total Files in cache.
         $files = $stats[0];
         // Retrieve the current Total Size of the cache.
         $bytes = $stats[1];
-        $size  = $this->format_filesize( $bytes );
+        $size  = $this->format_filesize($bytes);
 
         // Calculate the percentage of cache used.
-        $percentage = ceil( $bytes / $max_size * 100 );
-        if ( $percentage > 100 ) {
+        $percentage = ceil($bytes/$max_size*100);
+        if ($percentage > 100) {
             $percentage = 100;
         }
 
@@ -70,82 +70,82 @@ 
          * - "orange" if over 80%.
          * - "red" if over 100%.
          */
-        $color = ( 100 == $percentage ) ? 'red' : ( ( $percentage > 80 ) ? 'orange' : 'green' );
+        $color = (100 == $percentage) ? 'red' : (($percentage > 80) ? 'orange' : 'green');
 
         // Create or add new items into the Admin Toolbar.
         // Main "Autoptimize" node.
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'    => 'autoptimize',
-            'title' => '<span class="ab-icon"></span><span class="ab-label">' . __( 'Autoptimize', 'autoptimize' ) . '</span>',
-            'href'  => admin_url( 'options-general.php?page=autoptimize' ),
-            'meta'  => array( 'class' => 'bullet-' . $color ),
+            'title' => '<span class="ab-icon"></span><span class="ab-label">'.__('Autoptimize', 'autoptimize').'</span>',
+            'href'  => admin_url('options-general.php?page=autoptimize'),
+            'meta'  => array('class' => 'bullet-'.$color),
         ));
 
         // "Cache Info" node.
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-cache-info',
-            'title'  => '<p>' . __( 'Cache Info', 'autoptimize' ) . '</p>' .
-                        '<div class="autoptimize-radial-bar" percentage="' . $percentage . '">' .
-                        '<div class="autoptimize-circle">' .
-                        '<div class="mask full"><div class="fill bg-' . $color . '"></div></div>' .
-                        '<div class="mask half"><div class="fill bg-' . $color . '"></div></div>' .
-                        '<div class="shadow"></div>' .
-                        '</div>' .
-                        '<div class="inset"><div class="percentage"><div class="numbers ' . $color . '">' . $percentage . '%</div></div></div>' .
-                        '</div>' .
-                        '<table>' .
-                        '<tr><td>' . __( 'Size', 'autoptimize' ) . ':</td><td class="size ' . $color . '">' . $size . '</td></tr>' .
-                        '<tr><td>' . __( 'Files', 'autoptimize' ) . ':</td><td class="files white">' . $files . '</td></tr>' .
+            'title'  => '<p>'.__('Cache Info', 'autoptimize').'</p>'.
+                        '<div class="autoptimize-radial-bar" percentage="'.$percentage.'">'.
+                        '<div class="autoptimize-circle">'.
+                        '<div class="mask full"><div class="fill bg-'.$color.'"></div></div>'.
+                        '<div class="mask half"><div class="fill bg-'.$color.'"></div></div>'.
+                        '<div class="shadow"></div>'.
+                        '</div>'.
+                        '<div class="inset"><div class="percentage"><div class="numbers '.$color.'">'.$percentage.'%</div></div></div>'.
+                        '</div>'.
+                        '<table>'.
+                        '<tr><td>'.__('Size', 'autoptimize').':</td><td class="size '.$color.'">'.$size.'</td></tr>'.
+                        '<tr><td>'.__('Files', 'autoptimize').':</td><td class="files white">'.$files.'</td></tr>'.
                         '</table>',
             'parent' => 'autoptimize',
         ));
 
         // "Delete Cache" node.
-        $wp_admin_bar->add_node( array(
+        $wp_admin_bar->add_node(array(
             'id'     => 'autoptimize-delete-cache',
-            'title'  => __( 'Delete Cache', 'autoptimize' ),
+            'title'  => __('Delete Cache', 'autoptimize'),
             'parent' => 'autoptimize',
         ));
     }
 
     public function delete_cache()
     {
-        check_ajax_referer( 'ao_delcache_nonce', 'nonce' );
+        check_ajax_referer('ao_delcache_nonce', 'nonce');
 
         $result = false;
-        if ( current_user_can( 'manage_options' ) ) {
+        if (current_user_can('manage_options')) {
             // We call the function for cleaning the Autoptimize cache.
             $result = autoptimizeCache::clearall();
         }
 
-        wp_send_json( $result );
+        wp_send_json($result);
     }
 
     public function enqueue_scripts()
     {
         // Autoptimize Toolbar Styles.
-        wp_enqueue_style( 'autoptimize-toolbar', plugins_url( '/static/toolbar.css', __FILE__ ), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all' );
+        wp_enqueue_style('autoptimize-toolbar', plugins_url('/static/toolbar.css', __FILE__), array(), AUTOPTIMIZE_PLUGIN_VERSION, 'all');
 
         // Autoptimize Toolbar Javascript.
-        wp_enqueue_script( 'autoptimize-toolbar', plugins_url( '/static/toolbar.js', __FILE__ ), array( 'jquery' ), AUTOPTIMIZE_PLUGIN_VERSION, true );
+        wp_enqueue_script('autoptimize-toolbar', plugins_url('/static/toolbar.js', __FILE__), array('jquery'), AUTOPTIMIZE_PLUGIN_VERSION, true);
 
         // Localizes a registered script with data for a JavaScript variable.
         // Needed for the AJAX to work properly on the frontend.
-        wp_localize_script( 'autoptimize-toolbar', 'autoptimize_ajax_object', array(
-            'ajaxurl'     => admin_url( 'admin-ajax.php' ),
+        wp_localize_script('autoptimize-toolbar', 'autoptimize_ajax_object', array(
+            'ajaxurl'     => admin_url('admin-ajax.php'),
             // translators: links to the Autoptimize settings page.
-            'error_msg'   => sprintf( __( 'Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize' ), admin_url( 'options-general.php?page=autoptimize' ) . ' style="white-space:nowrap;"' ),
-            'dismiss_msg' => __( 'Dismiss this notice.' ),
-            'nonce'       => wp_create_nonce( 'ao_delcache_nonce' ),
-        ) );
+            'error_msg'   => sprintf(__('Your Autoptimize cache might not have been purged successfully, please check on the <a href=%s>Autoptimize settings page</a>.', 'autoptimize'), admin_url('options-general.php?page=autoptimize').' style="white-space:nowrap;"'),
+            'dismiss_msg' => __('Dismiss this notice.'),
+            'nonce'       => wp_create_nonce('ao_delcache_nonce'),
+        ));
     }
 
-    public function format_filesize( $bytes, $decimals = 2 )
+    public function format_filesize($bytes, $decimals = 2)
     {
-        $units = array( 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB' );
+        $units = array('B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
 
-        for ( $i = 0; ( $bytes / 1024) > 0.9; $i++, $bytes /= 1024 ) {} // @codingStandardsIgnoreLine
+        for ($i = 0; ($bytes/1024) > 0.9; $i++, $bytes /= 1024) {} // @codingStandardsIgnoreLine
 
-        return sprintf( "%1.{$decimals}f %s", round( $bytes, $decimals ), $units[ $i ] );
+        return sprintf("%1.{$decimals}f %s", round($bytes, $decimals), $units[$i]);
     }
 }

classes/autoptimizeOption.php

Spacing +20 added lines, -20 removed lines

@@ -3,7 +3,7 @@ 
  * Autoptimize options handler.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -24,8 +24,8 @@ 
 	 * Ensure that is_plugin_active_for_network function is declared.
 	 */
 	public static function maybe_include_plugin_functions() {
-		if( ! function_exists( 'is_plugin_active_for_network' ) ) {
-			include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		if (!function_exists('is_plugin_active_for_network')) {
+			include_once(ABSPATH.'wp-admin/includes/plugin.php');
 		}
 	}
 
@@ -36,23 +36,23 @@ 
 	 * @param mixed  $default Optional. Default value to return if the option does not exist.
 	 * @return mixed Value set for the option.
 	 */
-    public static function get_option( $option, $default = false )
+    public static function get_option($option, $default = false)
     {
 		// Ensure that is_plugin_active_for_network function is declared.
 		self::maybe_include_plugin_functions();
 		
 		// This is always a network setting.
-		if( 'autoptimize_enable_site_config' === $option ) {
-			return get_network_option( get_main_network_id(), $option );
+		if ('autoptimize_enable_site_config' === $option) {
+			return get_network_option(get_main_network_id(), $option);
 		}
 
 		// If the plugin is network activated and our per site setting is not on, use the network configuration.
-		$configuration_per_site = get_network_option( get_main_network_id(), 'autoptimize_enable_site_config' );
-		if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 'on' !== $configuration_per_site ) {
-			return get_network_option( get_main_network_id(), $option );
+		$configuration_per_site = get_network_option(get_main_network_id(), 'autoptimize_enable_site_config');
+		if (is_plugin_active_for_network('autoptimize/autoptimize.php') && 'on' !== $configuration_per_site) {
+			return get_network_option(get_main_network_id(), $option);
 		}
 			
-		return get_option( $option, $default );
+		return get_option($option, $default);
     }
 
 	/**
@@ -66,17 +66,17 @@ 
      *				                the default value is 'yes'. Default null.
      * @return bool False if value was not updated and true if value was updated.
 	 */
-    public static function update_option( $option, $value, $autoload = null )
+    public static function update_option($option, $value, $autoload = null)
     {
 		
 		// Ensure that is_plugin_active_for_network function is declared.
 		self::maybe_include_plugin_functions();
 		$blog_id = get_current_blog_id();
 		
-		if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) {
-			return update_network_option( get_main_network_id(), $option, $value );
+		if (is_plugin_active_for_network('autoptimize/autoptimize.php') && 1 === $blog_id) {
+			return update_network_option(get_main_network_id(), $option, $value);
 		} else {
-			return update_option( $option, $value, $autoload );
+			return update_option($option, $value, $autoload);
 		}
     }
 
@@ -90,20 +90,20 @@ 
 		self::maybe_include_plugin_functions();
 		$blog_id = get_current_blog_id();
 		
-		if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) {
-			add_filter( 'pre_update_option', [$this, 'update_autoptimize_option_on_network'], 10, 3 );
+		if (is_plugin_active_for_network('autoptimize/autoptimize.php') && 1 === $blog_id) {
+			add_filter('pre_update_option', [$this, 'update_autoptimize_option_on_network'], 10, 3);
 		}
 	}
 
-	public static function update_autoptimize_option_on_network( $value, $option, $old_value ) {
-		if( strpos( $option, 'autoptimize_' ) === 0 ) {
+	public static function update_autoptimize_option_on_network($value, $option, $old_value) {
+		if (strpos($option, 'autoptimize_') === 0) {
 			
 			// Ensure that is_plugin_active_for_network function is declared.
 			self::maybe_include_plugin_functions();
 			$blog_id = get_current_blog_id();
 		
-			if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) {
-				 update_network_option( get_main_network_id(), $option, $value );
+			if (is_plugin_active_for_network('autoptimize/autoptimize.php') && 1 === $blog_id) {
+				 update_network_option(get_main_network_id(), $option, $value);
 				 // Return old value, to stop update_option logic.
 				 return $old_value;
 			}

classes/autoptimizeImages.php

Spacing +314 added lines, -314 removed lines

@@ -3,7 +3,7 @@ 
  * Handles optimizing images.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -23,17 +23,17 @@ 
      */
     protected static $instance = null;
 
-    public function __construct( array $options = array() )
+    public function __construct(array $options = array())
     {
         // If options are not provided, fetch them.
-        if ( empty( $options ) ) {
+        if (empty($options)) {
             $options = $this->fetch_options();
         }
 
-        $this->set_options( $options );
+        $this->set_options($options);
     }
 
-    public function set_options( array $options )
+    public function set_options(array $options)
     {
         $this->options = $options;
 
@@ -42,17 +42,17 @@ 
 
     public static function fetch_options()
     {
-        $value = autoptimizeOption::get_option( 'autoptimize_imgopt_settings' );
-        if ( empty( $value ) ) {
+        $value = autoptimizeOption::get_option('autoptimize_imgopt_settings');
+        if (empty($value)) {
             // Fallback to returning defaults when no stored option exists yet.
             $value = autoptimizeConfig::get_ao_imgopt_default_options();
         }
 
         // get service availability and add it to the options-array.
-        $value['availabilities'] = autoptimizeOption::get_option( 'autoptimize_service_availablity' );
+        $value['availabilities'] = autoptimizeOption::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;
@@ -65,9 +65,9 @@ 
         // and does not use/ request the availablity data (which could slow things down).
         static $imgopt_active = null;
 
-        if ( null === $imgopt_active ) {
-            $opts = autoptimizeOption::get_option( 'autoptimize_imgopt_settings', '' );
-            if ( ! empty( $opts ) && is_array( $opts ) && array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $opts ) && ! empty( $opts['autoptimize_imgopt_checkbox_field_1'] ) && '1' === $opts['autoptimize_imgopt_checkbox_field_1'] ) {
+        if (null === $imgopt_active) {
+            $opts = autoptimizeOption::get_option('autoptimize_imgopt_settings', '');
+            if (!empty($opts) && is_array($opts) && array_key_exists('autoptimize_imgopt_checkbox_field_1', $opts) && !empty($opts['autoptimize_imgopt_checkbox_field_1']) && '1' === $opts['autoptimize_imgopt_checkbox_field_1']) {
                 $imgopt_active = true;
             } else {
                 $imgopt_active = false;
@@ -87,7 +87,7 @@ 
      */
     public static function instance()
     {
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new self();
         }
 
@@ -96,31 +96,31 @@ 
 
     public function run()
     {
-        if ( is_admin() ) {
-			if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-				add_action( 'network_admin_menu', array( $this, 'imgopt_admin_menu' ) );
+        if (is_admin()) {
+			if (is_plugin_active_for_network('autoptimize/autoptimize.php')) {
+				add_action('network_admin_menu', array($this, 'imgopt_admin_menu'));
 			} else {
-				add_action( 'admin_menu', array( $this, 'imgopt_admin_menu' ) );
+				add_action('admin_menu', array($this, 'imgopt_admin_menu'));
 			}
-			add_action( 'admin_init', array( $this, 'registersettings' ) );
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_imgopt_tab' ), 9 );
+			add_action('admin_init', array($this, 'registersettings'));
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_imgopt_tab'), 9);
         } else {
             $this->run_on_frontend();
         }
     }
 
     public function run_on_frontend() {
-        if ( ! $this->should_run() ) {
-            if ( $this->should_lazyload() ) {
+        if (!$this->should_run()) {
+            if ($this->should_lazyload()) {
                 add_filter(
                     'autoptimize_html_after_minify',
-                    array( $this, 'filter_lazyload_images' ),
+                    array($this, 'filter_lazyload_images'),
                     10,
                     1
                 );
                 add_action(
                     'wp_footer',
-                    array( $this, 'add_lazyload_js_footer' ),
+                    array($this, 'add_lazyload_js_footer'),
                     10,
                     0
                 );
@@ -130,39 +130,39 @@ 
 
         $active = false;
 
-        if ( apply_filters( 'autoptimize_filter_imgopt_do', true ) ) {
+        if (apply_filters('autoptimize_filter_imgopt_do', true)) {
             add_filter(
                 'autoptimize_html_after_minify',
-                array( $this, 'filter_optimize_images' ),
+                array($this, 'filter_optimize_images'),
                 10,
                 1
             );
             $active = true;
         }
 
-        if ( apply_filters( 'autoptimize_filter_imgopt_do_css', true ) ) {
+        if (apply_filters('autoptimize_filter_imgopt_do_css', true)) {
             add_filter(
                 'autoptimize_filter_base_replace_cdn',
-                array( $this, 'filter_optimize_css_images' ),
+                array($this, 'filter_optimize_css_images'),
                 10,
                 1
             );
             $active = true;
         }
 
-        if ( $active ) {
+        if ($active) {
             add_filter(
                 'autoptimize_extra_filter_tobepreconn',
-                array( $this, 'filter_preconnect_imgopt_url' ),
+                array($this, 'filter_preconnect_imgopt_url'),
                 10,
                 1
             );
         }
 
-        if ( $this->should_lazyload() ) {
+        if ($this->should_lazyload()) {
             add_action(
                 'wp_footer',
-                array( $this, 'add_lazyload_js_footer' )
+                array($this, 'add_lazyload_js_footer')
             );
         }
     }
@@ -175,8 +175,8 @@ 
     protected function should_run()
     {
         $opts              = $this->options;
-        $service_not_down  = ( 'down' !== $opts['availabilities']['extra_imgopt']['status'] );
-        $not_launch_status = ( 'launch' !== $opts['availabilities']['extra_imgopt']['status'] );
+        $service_not_down  = ('down' !== $opts['availabilities']['extra_imgopt']['status']);
+        $not_launch_status = ('launch' !== $opts['availabilities']['extra_imgopt']['status']);
 
         $do_cdn      = true;
         $_userstatus = $this->get_imgopt_provider_userstatus();
@@ -188,7 +188,7 @@ 
             $this->imgopt_active()
             && $do_cdn
             && $service_not_down
-            && ( $not_launch_status || $this->launch_ok() )
+            && ($not_launch_status || $this->launch_ok())
         ) {
             return true;
         }
@@ -199,13 +199,13 @@ 
     {
         static $imgopt_host = null;
 
-        if ( null === $imgopt_host ) {
+        if (null === $imgopt_host) {
             $imgopt_host  = 'https://cdn.shortpixel.ai/';
             $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']));
             }
-            $imgopt_host = apply_filters( 'autoptimize_filter_imgopt_host', $imgopt_host );
+            $imgopt_host = apply_filters('autoptimize_filter_imgopt_host', $imgopt_host);
         }
 
         return $imgopt_host;
@@ -220,7 +220,7 @@ 
 
     public static function get_service_url_suffix()
     {
-        $suffix = '/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN;
+        $suffix = '/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN;
 
         return $suffix;
     }
@@ -229,12 +229,12 @@ 
     {
         static $quality = null;
 
-        if ( null === $quality ) {
+        if (null === $quality) {
             $q_array = $this->get_img_quality_array();
             $setting = $this->get_img_quality_setting();
             $quality = apply_filters(
                 'autoptimize_filter_imgopt_quality',
-                'q_' . $q_array[ $setting ]
+                'q_'.$q_array[$setting]
             );
         }
 
@@ -245,7 +245,7 @@ 
     {
         static $map = null;
 
-        if ( null === $map ) {
+        if (null === $map) {
             $map = array(
                 '1' => 'lossy',
                 '2' => 'glossy',
@@ -264,12 +264,12 @@ 
     {
         static $q = null;
 
-        if ( null === $q ) {
-            if ( is_array( $this->options ) && array_key_exists( 'autoptimize_imgopt_select_field_2', $this->options ) ) {
+        if (null === $q) {
+            if (is_array($this->options) && array_key_exists('autoptimize_imgopt_select_field_2', $this->options)) {
                 $setting = $this->options['autoptimize_imgopt_select_field_2'];
             }
 
-            if ( ! isset( $setting ) || empty( $setting ) || ( '1' !== $setting && '3' !== $setting ) ) {
+            if (!isset($setting) || empty($setting) || ('1' !== $setting && '3' !== $setting)) {
                 // default image opt. value is 2 ("glossy").
                 $q = '2';
             } else {
@@ -280,10 +280,10 @@ 
         return $q;
     }
 
-    public function filter_preconnect_imgopt_url( array $in )
+    public function filter_preconnect_imgopt_url(array $in)
     {
-        $url_parts = parse_url( $this->get_imgopt_base_url() );
-        $in[]      = $url_parts['scheme'] . '://' . $url_parts['host'];
+        $url_parts = parse_url($this->get_imgopt_base_url());
+        $in[]      = $url_parts['scheme'].'://'.$url_parts['host'];
 
         return $in;
     }
@@ -296,20 +296,20 @@ 
      *
      * @return string
      */
-    private function normalize_img_url( $in )
+    private function normalize_img_url($in)
     {
         // Only parse the site url once.
         static $parsed_site_url = null;
-        if ( null === $parsed_site_url ) {
-            $parsed_site_url = parse_url( site_url() );
+        if (null === $parsed_site_url) {
+            $parsed_site_url = parse_url(site_url());
         }
 
         // get CDN domain once.
         static $cdn_domain = null;
-        if ( is_null( $cdn_domain ) ) {
-            $cdn_url = apply_filters( 'autoptimize_filter_base_cdnurl', autoptimizeOption::get_option( 'autoptimize_cdn_url', '' ) );
-            if ( ! empty( $cdn_url ) ) {
-                $cdn_domain = parse_url( $cdn_url, PHP_URL_HOST );
+        if (is_null($cdn_domain)) {
+            $cdn_url = apply_filters('autoptimize_filter_base_cdnurl', autoptimizeOption::get_option('autoptimize_cdn_url', ''));
+            if (!empty($cdn_url)) {
+                $cdn_domain = parse_url($cdn_url, PHP_URL_HOST);
             } else {
                 $cdn_domain = '';
             }
@@ -325,39 +325,39 @@ 
          * identical string operations).
          */
         static $cache = null;
-        if ( null === $cache ) {
+        if (null === $cache) {
             $cache = array();
         }
 
         // Do the work on cache miss only.
-        if ( ! isset( $cache[ $in ] ) ) {
+        if (!isset($cache[$in])) {
             // Default to what was given to us.
-            $result = trim( $in );
-            if ( autoptimizeUtils::is_protocol_relative( $in ) ) {
-                $result = $parsed_site_url['scheme'] . ':' . $in;
-            } elseif ( 0 === strpos( $in, '/' ) ) {
+            $result = trim($in);
+            if (autoptimizeUtils::is_protocol_relative($in)) {
+                $result = $parsed_site_url['scheme'].':'.$in;
+            } elseif (0 === strpos($in, '/')) {
                 // Root-relative...
-                $result  = $parsed_site_url['scheme'] . '://' . $parsed_site_url['host'];
+                $result  = $parsed_site_url['scheme'].'://'.$parsed_site_url['host'];
                 $result .= $in;
-            } elseif ( ! empty( $cdn_domain ) && strpos( $in, $cdn_domain ) !== 0 ) {
-                $result = str_replace( $cdn_domain, $parsed_site_url['host'], $in );
+            } elseif (!empty($cdn_domain) && strpos($in, $cdn_domain) !== 0) {
+                $result = str_replace($cdn_domain, $parsed_site_url['host'], $in);
             }
 
-            $result = apply_filters( 'autoptimize_filter_imgopt_normalized_url', $result );
+            $result = apply_filters('autoptimize_filter_imgopt_normalized_url', $result);
 
             // Store in cache.
-            $cache[ $in ] = $result;
+            $cache[$in] = $result;
         }
 
-        return $cache[ $in ];
+        return $cache[$in];
     }
 
-    public function filter_optimize_css_images( $in )
+    public function filter_optimize_css_images($in)
     {
-        $in = $this->normalize_img_url( $in );
+        $in = $this->normalize_img_url($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;
         }
@@ -367,50 +367,50 @@ 
     {
         static $imgopt_base_url = null;
 
-        if ( null === $imgopt_base_url ) {
+        if (null === $imgopt_base_url) {
             $imgopt_host     = $this->get_imgopt_host();
             $quality         = $this->get_img_quality_string();
-            $ret_val         = apply_filters( 'autoptimize_filter_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_imgopt_base_url', $imgopt_base_url );
+            $ret_val         = apply_filters('autoptimize_filter_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_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 ( null === $cdn_url ) {
+        if (null === $cdn_url) {
             $cdn_url = apply_filters(
                 'autoptimize_filter_base_cdnurl',
-                autoptimizeOption::get_option( 'autoptimize_cdn_url', '' )
+                autoptimizeOption::get_option('autoptimize_cdn_url', '')
             );
         }
 
-        if ( null === $nopti_images ) {
-            $nopti_images = apply_filters( 'autoptimize_filter_imgopt_noptimize', '' );
+        if (null === $nopti_images) {
+            $nopti_images = apply_filters('autoptimize_filter_imgopt_noptimize', '');
         }
 
         $site_host  = AUTOPTIMIZE_SITE_DOMAIN;
-        $url        = $this->normalize_img_url( $url );
-        $url_parsed = parse_url( $url );
+        $url        = $this->normalize_img_url($url);
+        $url_parsed = parse_url($url);
 
-        if ( array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host && empty( $cdn_url ) ) {
+        if (array_key_exists('host', $url_parsed) && $url_parsed['host'] !== $site_host && empty($cdn_url)) {
             return false;
-        } elseif ( ! empty( $cdn_url ) && strpos( $url, $cdn_url ) === false && array_key_exists( 'host', $url_parsed ) && $url_parsed['host'] !== $site_host ) {
+        } elseif (!empty($cdn_url) && strpos($url, $cdn_url) === false && array_key_exists('host', $url_parsed) && $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', '.webp' ), '', $url_parsed['path'] ) === $url_parsed['path'] ) {
+        } elseif (str_ireplace(array('.png', '.gif', '.jpg', '.jpeg', '.webp'), '', $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;
                 }
             }
@@ -418,13 +418,13 @@ 
         return true;
     }
 
-    private function build_imgopt_url( $orig_url, $width = 0, $height = 0 )
+    private function build_imgopt_url($orig_url, $width = 0, $height = 0)
     {
         // sanitize width and height.
-        if ( strpos( $width, '%' ) !== false ) {
+        if (strpos($width, '%') !== false) {
             $width = 0;
         }
-        if ( strpos( $height, '%' ) !== false ) {
+        if (strpos($height, '%') !== false) {
             $height = 0;
         }
         $width  = (int) $width;
@@ -438,43 +438,43 @@ 
         );
 
         // If filter modified the url, return that.
-        if ( $filtered_url !== $orig_url ) {
+        if ($filtered_url !== $orig_url) {
             return $filtered_url;
         }
 
-        $orig_url        = $this->normalize_img_url( $orig_url );
+        $orig_url        = $this->normalize_img_url($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)
     {
-        return $this->replace_img_callback( $matches, 150, 150 );
+        return $this->replace_img_callback($matches, 150, 150);
     }
 
-    public function replace_img_callback( $matches, $width = 0, $height = 0 )
+    public function replace_img_callback($matches, $width = 0, $height = 0)
     {
-        $_normalized_img_url = $this->normalize_img_url( $matches[1] );
-        if ( $this->can_optimize_image( $matches[1] ) ) {
-            return str_replace( $matches[1], $this->build_imgopt_url( $_normalized_img_url, $width, $height ), $matches[0] );
+        $_normalized_img_url = $this->normalize_img_url($matches[1]);
+        if ($this->can_optimize_image($matches[1])) {
+            return str_replace($matches[1], $this->build_imgopt_url($_normalized_img_url, $width, $height), $matches[0]);
         } else {
             return $matches[0];
         }
     }
 
-    public function filter_optimize_images( $in )
+    public function filter_optimize_images($in)
     {
         /*
          * potential future functional improvements:
@@ -484,7 +484,7 @@ 
         $to_replace = array();
 
         // hide noscript tags to avoid nesting noscript tags (as lazyloaded images add noscript).
-        if ( $this->should_lazyload() ) {
+        if ($this->should_lazyload()) {
             $in = autoptimizeBase::replace_contents_with_marker_if_exists(
                 'SCRIPT',
                 '<script',
@@ -494,25 +494,25 @@ 
         }
 
         // 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 ( isset( $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 (isset($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 );
+                            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);
                             }
                         }
                     }
@@ -520,120 +520,120 @@ 
 
                 // proceed with img src.
                 // get width and height and add to $imgopt_size.
-                $_get_size = $this->get_size_from_tag( $tag );
+                $_get_size = $this->get_size_from_tag($tag);
                 $imgopt_w  = $_get_size['width'];
                 $imgopt_h  = $_get_size['height'];
 
                 // 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 );
+                        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);
                         }
                     }
                 }
 
                 // do lazyload stuff.
-                if ( $this->should_lazyload( $in ) ) {
+                if ($this->should_lazyload($in)) {
                     // first do lpiq placeholder logic.
-                    if ( strpos( $url, $this->get_imgopt_host() ) === 0 ) {
+                    if (strpos($url, $this->get_imgopt_host()) === 0) {
                         // if all img src have been replaced during srcset, we have to extract the
                         // origin url from the imgopt one to be able to set a lqip placeholder.
-                        $_url = substr( $url, strpos( $url, '/http' ) + 1 );
+                        $_url = substr($url, strpos($url, '/http') + 1);
                     } else {
                         $_url = $url;
                     }
 
-                    if ( $this->can_optimize_image( $_url ) && apply_filters( 'autoptimize_filter_imgopt_lazyload_dolqip', true ) ) {
+                    if ($this->can_optimize_image($_url) && apply_filters('autoptimize_filter_imgopt_lazyload_dolqip', true)) {
                         $lqip_w = '';
                         $lqip_h = '';
-                        if ( isset( $imgopt_w ) && ! empty( $imgopt_w ) ) {
-                            $lqip_w = ',w_' . $imgopt_w;
+                        if (isset($imgopt_w) && !empty($imgopt_w)) {
+                            $lqip_w = ',w_'.$imgopt_w;
                         }
-                        if ( isset( $imgopt_h ) && ! empty( $imgopt_h ) ) {
-                            $lqip_h = ',h_' . $imgopt_h;
+                        if (isset($imgopt_h) && !empty($imgopt_h)) {
+                            $lqip_h = ',h_'.$imgopt_h;
                         }
-                        $placeholder = $this->get_imgopt_host() . 'client/q_lqip,ret_wait' . $lqip_w . $lqip_h . '/' . $_url;
+                        $placeholder = $this->get_imgopt_host().'client/q_lqip,ret_wait'.$lqip_w.$lqip_h.'/'.$_url;
                     }
                     // then call add_lazyload-function with lpiq placeholder if set.
-                    $tag = $this->add_lazyload( $tag, $placeholder );
+                    $tag = $this->add_lazyload($tag, $placeholder);
                 }
 
                 // and add tag to array for later replacement.
-                if ( $tag !== $orig_tag ) {
-                    $to_replace[ $orig_tag ] = $tag;
+                if ($tag !== $orig_tag) {
+                    $to_replace[$orig_tag] = $tag;
                 }
             }
         }
 
         // and replace all.
-        $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_imgopt_datathumbs', true ) ) {
+        if (strpos($out, 'data-thumb') !== false && apply_filters('autoptimize_filter_imgopt_datathumbs', true)) {
             $out = preg_replace_callback(
                 '/\<div(?:[^>]?)\sdata-thumb\=(?:\"|\')(.+?)(?:\"|\')(?:[^>]*)?\>/s',
-                array( $this, 'replace_data_thumbs' ),
+                array($this, 'replace_data_thumbs'),
                 $out
             );
         }
 
         // background-image in inline style.
-        if ( strpos( $out, 'background-image:' ) !== false && apply_filters( 'autoptimize_filter_imgopt_backgroundimages', true ) ) {
+        if (strpos($out, 'background-image:') !== false && apply_filters('autoptimize_filter_imgopt_backgroundimages', true)) {
             $out = preg_replace_callback(
                 '/style=(?:"|\').*?background-image:\s?url\((?:"|\')?([^"\')]*)(?:"|\')?\)/',
-                array( $this, 'replace_img_callback' ),
+                array($this, 'replace_img_callback'),
                 $out
             );
         }
 
         // lazyload: restore noscript tags + lazyload picture source tags.
-        if ( $this->should_lazyload() ) {
+        if ($this->should_lazyload()) {
             $out = autoptimizeBase::restore_marked_content(
                 'SCRIPT',
                 $out
             );
 
-            $out = $this->process_picture_tag( $out, true, true );
+            $out = $this->process_picture_tag($out, true, true);
         } else {
-            $out = $this->process_picture_tag( $out, true, false );
+            $out = $this->process_picture_tag($out, true, false);
         }
 
         return $out;
     }
 
-    public function get_size_from_tag( $tag ) {
+    public function get_size_from_tag($tag) {
         // reusable function to extract widht and height from an image tag
         // enforcing a filterable maximum width and height (default 4999X4999).
         $width  = '';
         $height = '';
 
-        if ( preg_match( '#width=("|\')(.*)("|\')#Usmi', $tag, $_width ) ) {
-            if ( strpos( $_width[2], '%' ) === false ) {
+        if (preg_match('#width=("|\')(.*)("|\')#Usmi', $tag, $_width)) {
+            if (strpos($_width[2], '%') === false) {
                 $width = (int) $_width[2];
             }
         }
-        if ( preg_match( '#height=("|\')(.*)("|\')#Usmi', $tag, $_height ) ) {
-            if ( strpos( $_height[2], '%' ) === false ) {
+        if (preg_match('#height=("|\')(.*)("|\')#Usmi', $tag, $_height)) {
+            if (strpos($_height[2], '%') === false) {
                 $height = (int) $_height[2];
             }
         }
 
         // check for and enforce (filterable) max sizes.
-        $_max_width = apply_filters( 'autoptimize_filter_imgopt_max_width', 4999 );
-        if ( $width > $_max_width ) {
+        $_max_width = apply_filters('autoptimize_filter_imgopt_max_width', 4999);
+        if ($width > $_max_width) {
             $_width = $_max_width;
-            $height = $_width / $width * $height;
+            $height = $_width/$width*$height;
             $width  = $_width;
         }
-        $_max_height = apply_filters( 'autoptimize_filter_imgopt_max_height', 4999 );
-        if ( $height > $_max_height ) {
+        $_max_height = apply_filters('autoptimize_filter_imgopt_max_height', 4999);
+        if ($height > $_max_height) {
             $_height = $_max_height;
-            $width   = $_height / $height * $width;
+            $width   = $_height/$height*$width;
             $height  = $_height;
         }
 
@@ -652,18 +652,18 @@ 
         return $self->should_lazyload();
     }
 
-    public function should_lazyload( $context = '' ) {
-        if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_3'] ) ) {
+    public function should_lazyload($context = '') {
+        if (!empty($this->options['autoptimize_imgopt_checkbox_field_3'])) {
             $lazyload_return = true;
         } else {
             $lazyload_return = false;
         }
-        $lazyload_return = apply_filters( 'autoptimize_filter_imgopt_should_lazyload', $lazyload_return, $context );
+        $lazyload_return = apply_filters('autoptimize_filter_imgopt_should_lazyload', $lazyload_return, $context);
 
         return $lazyload_return;
     }
 
-    public function filter_lazyload_images( $in )
+    public function filter_lazyload_images($in)
     {
         // only used is image optimization is NOT active but lazyload is.
         $to_replace = array();
@@ -677,17 +677,17 @@ 
         );
 
         // extract img tags and add lazyload attribs.
-        if ( preg_match_all( '#<img[^>]*src[^>]*>#Usmi', $out, $matches ) ) {
-            foreach ( $matches[0] as $tag ) {
-                if ( $this->should_lazyload( $out ) ) {
-                    $to_replace[ $tag ] = $this->add_lazyload( $tag );
+        if (preg_match_all('#<img[^>]*src[^>]*>#Usmi', $out, $matches)) {
+            foreach ($matches[0] as $tag) {
+                if ($this->should_lazyload($out)) {
+                    $to_replace[$tag] = $this->add_lazyload($tag);
                 }
             }
-            $out = str_replace( array_keys( $to_replace ), array_values( $to_replace ), $out );
+            $out = str_replace(array_keys($to_replace), array_values($to_replace), $out);
         }
 
         // and also lazyload picture tag.
-        $out = $this->process_picture_tag( $out, false, true );
+        $out = $this->process_picture_tag($out, false, true);
 
         // restore noscript tags.
         $out = autoptimizeBase::restore_marked_content(
@@ -698,46 +698,46 @@ 
         return $out;
     }
 
-    public function add_lazyload( $tag, $placeholder = '' ) {
+    public function add_lazyload($tag, $placeholder = '') {
         // adds actual lazyload-attributes to an image node.
-        if ( str_ireplace( $this->get_lazyload_exclusions(), '', $tag ) === $tag ) {
-            $tag = $this->maybe_fix_missing_quotes( $tag );
+        if (str_ireplace($this->get_lazyload_exclusions(), '', $tag) === $tag) {
+            $tag = $this->maybe_fix_missing_quotes($tag);
 
             // store original tag for use in noscript version.
-            $noscript_tag = '<noscript>' . $tag . '</noscript>';
+            $noscript_tag = '<noscript>'.$tag.'</noscript>';
 
-            $lazyload_class = apply_filters( 'autoptimize_filter_imgopt_lazyload_class', 'lazyload' );
+            $lazyload_class = apply_filters('autoptimize_filter_imgopt_lazyload_class', 'lazyload');
 
             // insert lazyload class.
-            $tag = $this->inject_classes_in_tag( $tag, "$lazyload_class " );
+            $tag = $this->inject_classes_in_tag($tag, "$lazyload_class ");
 
-            if ( ! $placeholder || empty( $placeholder ) ) {
+            if (!$placeholder || empty($placeholder)) {
                 // get image width & heigth for placeholder fun (and to prevent content reflow).
-                $_get_size = $this->get_size_from_tag( $tag );
+                $_get_size = $this->get_size_from_tag($tag);
                 $width     = $_get_size['width'];
                 $height    = $_get_size['height'];
-                if ( false === $width ) {
+                if (false === $width) {
                     $widht = 210; // default width for SVG placeholder.
                 }
-                if ( false === $height ) {
-                    $heigth = $width / 3 * 2; // if no height, base it on width using the 3/2 aspect ratio.
+                if (false === $height) {
+                    $heigth = $width/3*2; // if no height, base it on width using the 3/2 aspect ratio.
                 }
 
                 // insert the actual lazyload stuff.
                 // see https://css-tricks.com/preventing-content-reflow-from-lazy-loaded-images/ for great read on why we're using empty svg's.
-                $placeholder = apply_filters( 'autoptimize_filter_imgopt_lazyload_placeholder', $this->get_default_lazyload_placeholder( $width, $height ) );
+                $placeholder = apply_filters('autoptimize_filter_imgopt_lazyload_placeholder', $this->get_default_lazyload_placeholder($width, $height));
             }
-            $tag = str_replace( ' src=', ' src=\'' . $placeholder . '\' data-src=', $tag );
-            $tag = str_replace( ' srcset=', ' data-srcset=', $tag );
+            $tag = str_replace(' src=', ' src=\''.$placeholder.'\' data-src=', $tag);
+            $tag = str_replace(' srcset=', ' data-srcset=', $tag);
 
             // move sizes to data-sizes unless filter says no.
-            if ( apply_filters( 'autoptimize_filter_imgopt_lazyload_move_sizes', true ) ) {
-                $tag = str_replace( 'sizes=', 'data-sizes=', $tag );
+            if (apply_filters('autoptimize_filter_imgopt_lazyload_move_sizes', true)) {
+                $tag = str_replace('sizes=', 'data-sizes=', $tag);
             }
 
             // add the noscript-tag from earlier.
-            $tag = $noscript_tag . $tag;
-            $tag = apply_filters( 'autoptimize_filter_imgopt_lazyloaded_img', $tag );
+            $tag = $noscript_tag.$tag;
+            $tag = apply_filters('autoptimize_filter_imgopt_lazyloaded_img', $tag);
         }
 
         return $tag;
@@ -746,20 +746,20 @@ 
     public function add_lazyload_js_footer() {
         // The JS will by default be excluded form autoptimization but this can be changed with a filter.
         $noptimize_flag = '';
-        if ( apply_filters( 'autoptimize_filter_imgopt_lazyload_js_noptimize', true ) ) {
+        if (apply_filters('autoptimize_filter_imgopt_lazyload_js_noptimize', true)) {
             $noptimize_flag = ' data-noptimize="1"';
         }
 
         // Adds lazyload CSS & JS to footer, using echo because wp_enqueue_script seems not to support pushing attributes (async).
-        echo apply_filters( 'autoptimize_filter_imgopt_lazyload_cssoutput', '<style>.lazyload,.lazyloading{opacity:0;}.lazyloaded{opacity:1;transition:opacity 300ms;}</style><noscript><style>.lazyload{display:none;}</style></noscript>' );
-        echo apply_filters( 'autoptimize_filter_imgopt_lazyload_jsconfig', '<script' . $noptimize_flag . '>window.lazySizesConfig=window.lazySizesConfig||{};window.lazySizesConfig.loadMode=1;</script>' );
-        echo apply_filters( 'autoptimize_filter_imgopt_lazyload_js', '<script async' . $noptimize_flag . ' src=\'' . plugins_url( 'external/js/lazysizes.min.js', __FILE__ ) . '\'></script>' );
+        echo apply_filters('autoptimize_filter_imgopt_lazyload_cssoutput', '<style>.lazyload,.lazyloading{opacity:0;}.lazyloaded{opacity:1;transition:opacity 300ms;}</style><noscript><style>.lazyload{display:none;}</style></noscript>');
+        echo apply_filters('autoptimize_filter_imgopt_lazyload_jsconfig', '<script'.$noptimize_flag.'>window.lazySizesConfig=window.lazySizesConfig||{};window.lazySizesConfig.loadMode=1;</script>');
+        echo apply_filters('autoptimize_filter_imgopt_lazyload_js', '<script async'.$noptimize_flag.' src=\''.plugins_url('external/js/lazysizes.min.js', __FILE__).'\'></script>');
 
         // And add webp detection and loading JS.
-        if ( $this->should_webp() ) {
+        if ($this->should_webp()) {
             $_webp_detect = "function c_webp(A){var n=new Image;n.onload=function(){var e=0<n.width&&0<n.height;A(e)},n.onerror=function(){A(!1)},n.src='data:image/webp;base64,UklGRhoAAABXRUJQVlA4TA0AAAAvAAAAEAcQERGIiP4HAA=='}function s_webp(e){window.supportsWebP=e}c_webp(s_webp);";
             $_webp_load   = "document.addEventListener('lazybeforeunveil',function({target:c}){supportsWebP&&['data-src','data-srcset'].forEach(function(a){attr=c.getAttribute(a),null!==attr&&c.setAttribute(a,attr.replace(/\/client\//,'/client/to_webp,'))})});";
-            echo apply_filters( 'autoptimize_filter_imgopt_webp_js', '<script' . $noptimize_flag . '>' . $_webp_detect . $_webp_load . '</script>' );
+            echo apply_filters('autoptimize_filter_imgopt_webp_js', '<script'.$noptimize_flag.'>'.$_webp_detect.$_webp_load.'</script>');
         }
     }
 
@@ -767,47 +767,47 @@ 
         // returns array of strings that if found in an <img tag will stop the img from being lazy-loaded.
         static $exclude_lazyload_array = null;
 
-        if ( null === $exclude_lazyload_array ) {
+        if (null === $exclude_lazyload_array) {
             $options = $this->options;
 
             // set default exclusions.
-            $exclude_lazyload_array = array( 'skip-lazy', 'data-no-lazy', 'notlazy', 'data-src', 'data-srcset', 'data:image/', 'data-lazyload', 'rev-slidebg' );
+            $exclude_lazyload_array = array('skip-lazy', 'data-no-lazy', 'notlazy', 'data-src', 'data-srcset', 'data:image/', 'data-lazyload', 'rev-slidebg');
 
             // add from setting.
-            if ( array_key_exists( 'autoptimize_imgopt_text_field_5', $options ) ) {
+            if (array_key_exists('autoptimize_imgopt_text_field_5', $options)) {
                 $exclude_lazyload_option = $options['autoptimize_imgopt_text_field_5'];
-                if ( ! empty( $exclude_lazyload_option ) ) {
-                    $exclude_lazyload_array = array_merge( $exclude_lazyload_array, array_filter( array_map( 'trim', explode( ',', $options['autoptimize_imgopt_text_field_5'] ) ) ) );
+                if (!empty($exclude_lazyload_option)) {
+                    $exclude_lazyload_array = array_merge($exclude_lazyload_array, array_filter(array_map('trim', explode(',', $options['autoptimize_imgopt_text_field_5']))));
                 }
             }
 
             // and filter for developer-initiated changes.
-            $exclude_lazyload_array = apply_filters( 'autoptimize_filter_imgopt_lazyload_exclude_array', $exclude_lazyload_array );
+            $exclude_lazyload_array = apply_filters('autoptimize_filter_imgopt_lazyload_exclude_array', $exclude_lazyload_array);
         }
 
         return $exclude_lazyload_array;
     }
 
-    public function inject_classes_in_tag( $tag, $target_class ) {
-        if ( strpos( $tag, 'class=' ) !== false ) {
-            $tag = preg_replace( '/(\sclass\s?=\s?("|\'))/', '$1' . $target_class, $tag );
+    public function inject_classes_in_tag($tag, $target_class) {
+        if (strpos($tag, 'class=') !== false) {
+            $tag = preg_replace('/(\sclass\s?=\s?("|\'))/', '$1'.$target_class, $tag);
         } else {
-            $tag = str_replace( '<img ', '<img class="' . trim( $target_class ) . '" ', $tag );
+            $tag = str_replace('<img ', '<img class="'.trim($target_class).'" ', $tag);
         }
 
         return $tag;
     }
 
-    public function get_default_lazyload_placeholder( $imgopt_w, $imgopt_h ) {
-        return 'data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%20' . $imgopt_w . '%20' . $imgopt_h . '%22%3E%3C/svg%3E';
+    public function get_default_lazyload_placeholder($imgopt_w, $imgopt_h) {
+        return 'data:image/svg+xml,%3Csvg%20xmlns=%22http://www.w3.org/2000/svg%22%20viewBox=%220%200%20'.$imgopt_w.'%20'.$imgopt_h.'%22%3E%3C/svg%3E';
     }
 
     public function should_webp() {
         static $webp_return = null;
 
-        if ( is_null( $webp_return ) ) {
+        if (is_null($webp_return)) {
             // webp only works if imgopt and lazyload are also active.
-            if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_4'] ) && ! empty( $this->options['autoptimize_imgopt_checkbox_field_3'] ) && $this->imgopt_active() ) {
+            if (!empty($this->options['autoptimize_imgopt_checkbox_field_4']) && !empty($this->options['autoptimize_imgopt_checkbox_field_3']) && $this->imgopt_active()) {
                 $webp_return = true;
             } else {
                 $webp_return = false;
@@ -817,9 +817,9 @@ 
         return $webp_return;
     }
 
-    public function process_picture_tag( $in, $imgopt = false, $lazy = false ) {
+    public function process_picture_tag($in, $imgopt = false, $lazy = false) {
         // check if "<picture" is present and if filter allows us to process <picture>.
-        if ( strpos( $in, '<picture' ) === false || apply_filters( 'autoptimize_filter_imgopt_dopicture', true ) === false ) {
+        if (strpos($in, '<picture') === false || apply_filters('autoptimize_filter_imgopt_dopicture', true) === false) {
             return $in;
         }
 
@@ -827,36 +827,36 @@ 
         $to_replace_pict = array();
 
         // extract and process each picture-node.
-        preg_match_all( '#<picture.*</picture>#Usmi', $in, $_pictures, PREG_SET_ORDER );
-        foreach ( $_pictures as $_picture ) {
-            $_picture = $this->maybe_fix_missing_quotes( $_picture );
-            if ( strpos( $_picture[0], '<source ' ) !== false && preg_match_all( '#<source .*srcset=(?:"|\')(?!data)(.*)(?:"|\').*>#Usmi', $_picture[0], $_sources, PREG_SET_ORDER ) !== false ) {
-                foreach ( $_sources as $_source ) {
+        preg_match_all('#<picture.*</picture>#Usmi', $in, $_pictures, PREG_SET_ORDER);
+        foreach ($_pictures as $_picture) {
+            $_picture = $this->maybe_fix_missing_quotes($_picture);
+            if (strpos($_picture[0], '<source ') !== false && preg_match_all('#<source .*srcset=(?:"|\')(?!data)(.*)(?:"|\').*>#Usmi', $_picture[0], $_sources, PREG_SET_ORDER) !== false) {
+                foreach ($_sources as $_source) {
                     $_picture_replacement = $_source[0];
 
                     // should we optimize the image?
-                    if ( $imgopt && $this->can_optimize_image( $_source[1] ) ) {
-                        $_picture_replacement = str_replace( $_source[1], $this->build_imgopt_url( $_source[1] ), $_picture_replacement );
+                    if ($imgopt && $this->can_optimize_image($_source[1])) {
+                        $_picture_replacement = str_replace($_source[1], $this->build_imgopt_url($_source[1]), $_picture_replacement);
                     }
                     // should we lazy-load?
-                    if ( $lazy && $this->should_lazyload() && str_ireplace( $_exclusions, '', $_picture_replacement ) === $_picture_replacement ) {
-                        $_picture_replacement = str_replace( ' srcset=', ' data-srcset=', $_picture_replacement );
+                    if ($lazy && $this->should_lazyload() && str_ireplace($_exclusions, '', $_picture_replacement) === $_picture_replacement) {
+                        $_picture_replacement = str_replace(' srcset=', ' data-srcset=', $_picture_replacement);
                     }
-                    $to_replace_pict[ $_source[0] ] = $_picture_replacement;
+                    $to_replace_pict[$_source[0]] = $_picture_replacement;
                 }
             }
         }
 
         // and return the fully procesed $in.
-        $out = str_replace( array_keys( $to_replace_pict ), array_values( $to_replace_pict ), $in );
+        $out = str_replace(array_keys($to_replace_pict), array_values($to_replace_pict), $in);
 
         return $out;
     }
 
-    public function maybe_fix_missing_quotes( $tag_in ) {
+    public function maybe_fix_missing_quotes($tag_in) {
         // W3TC's Minify_HTML class removes quotes around attribute value, this re-adds them.
-        if ( file_exists( WP_PLUGIN_DIR . '/w3-total-cache/w3-total-cache.php' ) && class_exists( 'Minify_HTML' ) && apply_filters( 'autoptimize_filter_imgopt_fixquotes', true ) ) {
-            return preg_replace( '/=([^("|\')]*)(\s|>)/U', '=\'$1\'$2', $tag_in );
+        if (file_exists(WP_PLUGIN_DIR.'/w3-total-cache/w3-total-cache.php') && class_exists('Minify_HTML') && apply_filters('autoptimize_filter_imgopt_fixquotes', true)) {
+            return preg_replace('/=([^("|\')]*)(\s|>)/U', '=\'$1\'$2', $tag_in);
         } else {
             return $tag_in;
         }
@@ -873,17 +873,17 @@ 
             'autoptimize_imgopt',
             'manage_options',
             'autoptimize_imgopt',
-            array( $this, 'imgopt_options_page' )
+            array($this, 'imgopt_options_page')
         );
     }
 	
 	public function registersettings() {
-		register_setting( 'autoptimize_imgopt_settings', 'autoptimize_imgopt_settings' );
+		register_setting('autoptimize_imgopt_settings', 'autoptimize_imgopt_settings');
 	}
 
-    public function add_imgopt_tab( $in )
+    public function add_imgopt_tab($in)
     {
-        $in = array_merge( $in, array( 'autoptimize_imgopt' => __( 'Images', 'autoptimize' ) ) );
+        $in = array_merge($in, array('autoptimize_imgopt' => __('Images', 'autoptimize')));
 
         return $in;
     }
@@ -891,7 +891,7 @@ 
     public function imgopt_options_page()
     {
         // Check querystring for "refreshCacheChecker" and call cachechecker if so.
-        if ( array_key_exists( 'refreshImgProvStats', $_GET ) && 1 == $_GET['refreshImgProvStats'] ) {
+        if (array_key_exists('refreshImgProvStats', $_GET) && 1 == $_GET['refreshImgProvStats']) {
             $this->query_img_provider_stats();
         }
 
@@ -904,45 +904,45 @@ 
         #autoptimize_imgopt_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 ( 'down' === $options['availabilities']['extra_imgopt']['status'] ) { ?>
+        <?php 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 } ?>
 
-        <?php if ( 'launch' === $options['availabilities']['extra_imgopt']['status'] && ! autoptimizeImages::instance()->launch_ok() ) { ?>
+        <?php if ('launch' === $options['availabilities']['extra_imgopt']['status'] && !autoptimizeImages::instance()->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' ); ?>
+            <?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'); ?>
             </p></div>
         <?php } ?>
 
-        <?php if ( class_exists( 'Jetpack' ) && method_exists( 'Jetpack', 'get_active_modules' ) && in_array( 'photon', Jetpack::get_active_modules() ) ) { ?>
+        <?php if (class_exists('Jetpack') && method_exists('Jetpack', 'get_active_modules') && in_array('photon', Jetpack::get_active_modules())) { ?>
             <div class="notice-warning notice"><p>
             <?php
             // translators: "disable  Jetpack's site accelerator for images" will appear in a "a href" linking to the jetpack settings page.
-            echo sprintf( __( 'Please %1$sdisable Jetpack\'s site accelerator for images%2$s to be able to use Autoptomize\'s advanced image optimization features below.', 'autoptimize' ), '<a href="admin.php?page=jetpack#/settings">', '</a>' );
+            echo sprintf(__('Please %1$sdisable Jetpack\'s site accelerator for images%2$s to be able to use Autoptomize\'s advanced image optimization features below.', 'autoptimize'), '<a href="admin.php?page=jetpack#/settings">', '</a>');
             ?>
             </p></div>
         <?php } ?>
-    <form id='ao_settings_form' action='<?php echo admin_url( 'options.php' ); ?>' method='post'>
-        <?php settings_fields( 'autoptimize_imgopt_settings' ); ?>
-        <h2><?php _e( 'Image optimization', 'autoptimize' ); ?></h2>
-        <span id='autoptimize_imgopt_descr'><?php _e( 'Make your site significantly faster by just ticking a couple of checkboxes to optimize and lazy load your images, WebP support included!', 'autoptimize' ); ?></span>
+    <form id='ao_settings_form' action='<?php echo admin_url('options.php'); ?>' method='post'>
+        <?php settings_fields('autoptimize_imgopt_settings'); ?>
+        <h2><?php _e('Image optimization', 'autoptimize'); ?></h2>
+        <span id='autoptimize_imgopt_descr'><?php _e('Make your site significantly faster by just ticking a couple of checkboxes to optimize and lazy load your images, WebP support included!', 'autoptimize'); ?></span>
         <table class="form-table">
             <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_imgopt_settings[autoptimize_imgopt_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Optimize images on the fly and serve them from Shortpixel\'s global CDN.', 'autoptimize' ); ?></label>
+                    <label><input id='autoptimize_imgopt_checkbox' type='checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_1]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_1']) && '1' === $options['autoptimize_imgopt_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Optimize images on the fly and serve them from Shortpixel\'s global CDN.', 'autoptimize'); ?></label>
                     <?php
                     // show shortpixel status.
                     $_notice = autoptimizeImages::instance()->get_status_notice();
-                    if ( $_notice ) {
-                        switch ( $_notice['status'] ) {
+                    if ($_notice) {
+                        switch ($_notice['status']) {
                             case 2:
                                 $_notice_color = 'green';
                                 break;
@@ -958,28 +958,28 @@ 
                             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 {
                         // translators: link points to shortpixel.
-                        $upsell_msg_1 = '<p>' . sprintf( __( 'Get more Google love and improve your website\'s loading speed by having the images optimized on the fly (also in the "next-gen" WebP image format) by %1$sShortPixel%2$s and then cached and served fast from Shortpixel\'s global 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 Autoptimize users, <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 (also in the "next-gen" WebP image format) by %1$sShortPixel%2$s and then cached and served fast from Shortpixel\'s global 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 Autoptimize users, <b>don\'t miss the chance to test it</b> and see how much it could improve your site\'s speed.', 'autoptimize');
                         } else {
                             // translators: link points to shortpixel.
-                            $upsell_msg_2 = sprintf( __( '%1$sSign-up now%2$s to receive a 1 000 bonus + 50&#37; more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize' ), '<a href="https://shortpixel.com/aospai' . $sp_url_suffix . '" target="_blank">', '</a>' );
+                            $upsell_msg_2 = sprintf(__('%1$sSign-up now%2$s to receive a 1 000 bonus + 50&#37; more image optimization credits regardless of the traffic used. More image optimizations can be purchased starting with $4.99.', 'autoptimize'), '<a href="https://shortpixel.com/aospai'.$sp_url_suffix.'" target="_blank">', '</a>');
                         }
-                        echo apply_filters( 'autoptimize_imgopt_imgopt_settings_copy', $upsell_msg_1 . ' ' . $upsell_msg_2 . '</p>' );
+                        echo apply_filters('autoptimize_imgopt_imgopt_settings_copy', $upsell_msg_1.' '.$upsell_msg_2.'</p>');
                     }
                     // translators: link points to shortpixel FAQ.
-                    $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>' );
+                    $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>');
                     // translators: links points to shortpixel TOS & Privacy Policy.
-                    $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_imgopt_imgopt_settings_tos', '<p>' . $faqcopy . ' ' . $toscopy . '</p>' );
+                    $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_imgopt_imgopt_settings_tos', '<p>'.$faqcopy.' '.$toscopy.'</p>');
                     ?>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_quality' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Image Optimization quality', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_quality' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_1', $options) || (isset($options['autoptimize_imgopt_checkbox_field_1']) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Image Optimization quality', 'autoptimize'); ?></th>
                 <td>
                     <label>
                     <select name='autoptimize_imgopt_settings[autoptimize_imgopt_select_field_2]'>
@@ -987,12 +987,12 @@ 
                         $_imgopt_array = autoptimizeImages::instance()->get_img_quality_array();
                         $_imgopt_val   = autoptimizeImages::instance()->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";
                         ?>
@@ -1001,31 +1001,31 @@ 
                     <p>
                         <?php
                             // translators: link points to shortpixel image test page.
-                            echo apply_filters( 'autoptimize_imgopt_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>' ) );
+                            echo apply_filters('autoptimize_imgopt_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 id='autoptimize_imgopt_webp' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_1', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_1'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Load WebP in supported browsers?', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_webp' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_1', $options) || (isset($options['autoptimize_imgopt_checkbox_field_1']) && '1' !== $options['autoptimize_imgopt_checkbox_field_1'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Load WebP in supported browsers?', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' id='autoptimize_imgopt_webp_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_4]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_4'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_3'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Automatically serve "next-gen" WebP image format to any browser that supports it (requires lazy load to be active).', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' id='autoptimize_imgopt_webp_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_4]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_4']) && '1' === $options['autoptimize_imgopt_checkbox_field_3']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Automatically serve "next-gen" WebP image format to any browser that supports it (requires lazy load to be active).', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Lazy-load images?', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Lazy-load images?', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' id='autoptimize_imgopt_lazyload_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_3]' <?php if ( ! empty( $options['autoptimize_imgopt_checkbox_field_3'] ) && '1' === $options['autoptimize_imgopt_checkbox_field_3'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Image lazy-loading will delay the loading of non-visible images to allow the browser to optimally load all resources for the "above the fold"-page first.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' id='autoptimize_imgopt_lazyload_checkbox' name='autoptimize_imgopt_settings[autoptimize_imgopt_checkbox_field_3]' <?php if (!empty($options['autoptimize_imgopt_checkbox_field_3']) && '1' === $options['autoptimize_imgopt_checkbox_field_3']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Image lazy-loading will delay the loading of non-visible images to allow the browser to optimally load all resources for the "above the fold"-page first.', 'autoptimize'); ?></label>
                 </td>
             </tr>
-            <tr id='autoptimize_imgopt_lazyload_exclusions' <?php if ( ! array_key_exists( 'autoptimize_imgopt_checkbox_field_3', $options ) || ( isset( $options['autoptimize_imgopt_checkbox_field_3'] ) && '1' !== $options['autoptimize_imgopt_checkbox_field_3'] ) ) { echo 'class="hidden"'; } ?>>
-                <th scope="row"><?php _e( 'Lazy-load exclusions', 'autoptimize' ); ?></th>
+            <tr id='autoptimize_imgopt_lazyload_exclusions' <?php if (!array_key_exists('autoptimize_imgopt_checkbox_field_3', $options) || (isset($options['autoptimize_imgopt_checkbox_field_3']) && '1' !== $options['autoptimize_imgopt_checkbox_field_3'])) { echo 'class="hidden"'; } ?>>
+                <th scope="row"><?php _e('Lazy-load exclusions', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' id='autoptimize_imgopt_lazyload_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_5]' value='<?php if ( ! empty( $options['autoptimize_imgopt_text_field_5'] ) ) { echo esc_attr( $options['autoptimize_imgopt_text_field_5'] ); } ?>'><br /><?php _e( 'Comma-separated list of to be excluded image classes or filenames.', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' id='autoptimize_imgopt_lazyload_exclusions' name='autoptimize_imgopt_settings[autoptimize_imgopt_text_field_5]' value='<?php if (!empty($options['autoptimize_imgopt_text_field_5'])) { echo esc_attr($options['autoptimize_imgopt_text_field_5']); } ?>'><br /><?php _e('Comma-separated list of to be excluded image classes or filenames.', 'autoptimize'); ?></label>
                 </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() {
@@ -1061,37 +1061,37 @@ 
      * Ïmg opt status as used on dashboard.
      */
     public function get_imgopt_status_notice() {
-        if ( $this->imgopt_active() ) {
+        if ($this->imgopt_active()) {
             $_imgopt_notice = '';
-            $_stat          = autoptimizeOption::get_option( 'autoptimize_imgopt_provider_stat', '' );
+            $_stat          = autoptimizeOption::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'] || -2 == $_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_stats_refresh_url = add_query_arg( array(
+                    $_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_stats_refresh_url = add_query_arg(array(
                         'page'                => 'autoptimize_imgopt',
                         'refreshImgProvStats' => '1',
-                    ), admin_url( 'options-general.php' ) );
-                    if ( $_stat && array_key_exists( 'timestamp', $_stat ) && ! empty( $_stat['timestamp'] ) ) {
-                        $_imgopt_stats_last_run = __( 'based on status at ', 'autoptimize' ) . date_i18n( autoptimizeOption::get_option( 'time_format' ), $_stat['timestamp'] );
+                    ), admin_url('options-general.php'));
+                    if ($_stat && array_key_exists('timestamp', $_stat) && !empty($_stat['timestamp'])) {
+                        $_imgopt_stats_last_run = __('based on status at ', 'autoptimize').date_i18n(autoptimizeOption::get_option('time_format'), $_stat['timestamp']);
                     } else {
-                        $_imgopt_stats_last_run = __( 'based on previously fetched data', 'autoptimize' );
+                        $_imgopt_stats_last_run = __('based on previously fetched data', 'autoptimize');
                     }
-                    $_imgopt_notice .= ' (' . $_imgopt_stats_last_run . ', ';
+                    $_imgopt_notice .= ' ('.$_imgopt_stats_last_run.', ';
                     // translators: "here to refresh" links to the Autoptimize Extra page and forces a refresh of the img opt stats.
-                    $_imgopt_notice .= sprintf( __( 'click %1$shere to refresh%2$s', 'autoptimize' ), '<a href="' . $_imgopt_stats_refresh_url . '">', '</a>).' );
+                    $_imgopt_notice .= sprintf(__('click %1$shere to refresh%2$s', 'autoptimize'), '<a href="'.$_imgopt_stats_refresh_url.'">', '</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'],
@@ -1112,14 +1112,14 @@ 
      * Get img provider stats (used to display notice).
      */
     public function query_img_provider_stats() {
-        if ( ! empty( $this->options['autoptimize_imgopt_checkbox_field_1'] ) ) {
+        if (!empty($this->options['autoptimize_imgopt_checkbox_field_1'])) {
             $url      = '';
-            $endpoint = $this->get_imgopt_host() . 'read-domain/';
+            $endpoint = $this->get_imgopt_host().'read-domain/';
             $domain   = AUTOPTIMIZE_SITE_DOMAIN;
 
             // make sure parse_url result makes sense, keeping $url empty if not.
-            if ( $domain && ! empty( $domain ) ) {
-                $url = $endpoint . $domain;
+            if ($domain && !empty($domain)) {
+                $url = $endpoint.$domain;
             }
 
             $url = apply_filters(
@@ -1129,12 +1129,12 @@ 
 
             // only do the remote call if $url is not empty to make sure no parse_url
             // weirdness results in useless calls.
-            if ( ! empty( $url ) ) {
-                $response = wp_remote_get( $url );
-                if ( ! is_wp_error( $response ) ) {
-                    if ( '200' == wp_remote_retrieve_response_code( $response ) ) {
-                        $stats = json_decode( wp_remote_retrieve_body( $response ), true );
-                        autoptimizeOption::update_option( 'autoptimize_imgopt_provider_stat', $stats );
+            if (!empty($url)) {
+                $response = wp_remote_get($url);
+                if (!is_wp_error($response)) {
+                    if ('200' == wp_remote_retrieve_response_code($response)) {
+                        $stats = json_decode(wp_remote_retrieve_body($response), true);
+                        autoptimizeOption::update_option('autoptimize_imgopt_provider_stat', $stats);
                     }
                 }
             }
@@ -1157,15 +1157,15 @@ 
     {
         static $launch_status = null;
 
-        if ( null === $launch_status ) {
+        if (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  = autoptimizeOption::get_option( 'autoptimize_imgopt_launched', '' );
+            $magic_number  = intval(substr(md5(parse_url(AUTOPTIMIZE_WP_SITE_URL, PHP_URL_HOST)), 0, 3), 16);
+            $has_launched  = autoptimizeOption::get_option('autoptimize_imgopt_launched', '');
             $launch_status = false;
-            if ( $has_launched || ( is_array( $avail_imgopt ) && array_key_exists( 'launch-threshold', $avail_imgopt ) && $magic_number < $avail_imgopt['launch-threshold'] ) ) {
+            if ($has_launched || (is_array($avail_imgopt) && array_key_exists('launch-threshold', $avail_imgopt) && $magic_number < $avail_imgopt['launch-threshold'])) {
                 $launch_status = true;
-                if ( ! $has_launched ) {
-                    autoptimizeOption::update_option( 'autoptimize_imgopt_launched', 'on' );
+                if (!$has_launched) {
+                    autoptimizeOption::update_option('autoptimize_imgopt_launched', 'on');
                 }
             }
         }
@@ -1182,16 +1182,16 @@ 
     public function get_imgopt_provider_userstatus() {
         static $_provider_userstatus = null;
 
-        if ( is_null( $_provider_userstatus ) ) {
-            $_stat = autoptimizeOption::get_option( 'autoptimize_imgopt_provider_stat', '' );
-            if ( is_array( $_stat ) ) {
-                if ( array_key_exists( 'Status', $_stat ) ) {
+        if (is_null($_provider_userstatus)) {
+            $_stat = autoptimizeOption::get_option('autoptimize_imgopt_provider_stat', '');
+            if (is_array($_stat)) {
+                if (array_key_exists('Status', $_stat)) {
                     $_provider_userstatus['Status'] = $_stat['Status'];
                 } else {
                     // if no stats then we assume all is well.
                     $_provider_userstatus['Status'] = 2;
                 }
-                if ( array_key_exists( 'timestamp', $_stat ) ) {
+                if (array_key_exists('timestamp', $_stat)) {
                     $_provider_userstatus['timestamp'] = $_stat['timestamp'];
                 } else {
                     // if no timestamp then we return "".
@@ -1204,27 +1204,27 @@ 
     }
 
     public function get_status_notice() {
-        if ( $this->imgopt_active() ) {
+        if ($this->imgopt_active()) {
             $notice = '';
             $stat   = $this->get_imgopt_provider_userstatus();
-            $upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/' . AUTOPTIMIZE_SITE_DOMAIN;
+            $upsell = 'https://shortpixel.com/aospai/af/GWRGFLW109483/'.AUTOPTIMIZE_SITE_DOMAIN;
             $assoc  = 'https://shortpixel.helpscoutdocs.com/article/94-how-to-associate-a-domain-to-my-account';
 
-            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".
-                    $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 rel="noopener noreferrer" href="' . $upsell . '" target="_blank">', '</a>' );
+                    $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 rel="noopener noreferrer" href="'.$upsell.'" target="_blank">', '</a>');
                 } elseif ( -1 == $stat['Status'] || -2 == $stat['Status'] ) {
                     // translators: "add more credits" will appear in a "a href".
-                    $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 rel="noopener noreferrer" href="' . $upsell . '" target="_blank">', '</a>' );
+                    $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 rel="noopener noreferrer" href="'.$upsell.'" target="_blank">', '</a>');
                     // translators: "associate your domain" will appear in a "a href".
-                    $notice = $notice . ' ' . sprintf( __( 'If you already have enough credits then you may need to %1$sassociate your domain%2$s to your Shortpixel account.', 'autoptimize' ), '<a rel="noopener noreferrer" href="' . $assoc . '" target="_blank">', '</a>' );
+                    $notice = $notice.' '.sprintf(__('If you already have enough credits then you may need to %1$sassociate your domain%2$s to your Shortpixel account.', 'autoptimize'), '<a rel="noopener noreferrer" href="'.$assoc.'" target="_blank">', '</a>');
                 } else {
                     $upsell = 'https://shortpixel.com/g/af/GWRGFLW109483';
                     // translators: "log in to check your account" will appear in a "a href".
-                    $notice = sprintf( __( 'Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize' ), '<a rel="noopener noreferrer" href="' . $upsell . '" target="_blank">', '</a>' );
+                    $notice = sprintf(__('Your ShortPixel image optimization and CDN quota are in good shape, %1$slog in to check your account%2$s.', 'autoptimize'), '<a rel="noopener noreferrer" href="'.$upsell.'" target="_blank">', '</a>');
                 }
-                $notice = apply_filters( 'autoptimize_filter_imgopt_notice', $notice );
+                $notice = apply_filters('autoptimize_filter_imgopt_notice', $notice);
 
                 return array(
                     'status' => $stat['Status'],

classes/autoptimizeConfig.php

Spacing +232 added lines, -232 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,32 +13,32 @@ 
      */
     private function __construct()
     {
-        if ( is_admin() ) {
+        if (is_admin()) {
             // Add the admin page and settings.
-			if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-				add_action( 'network_admin_menu', array( $this, 'addmenu' ) );
+			if (is_plugin_active_for_network('autoptimize/autoptimize.php')) {
+				add_action('network_admin_menu', array($this, 'addmenu'));
 			}
 
-			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 ( autoptimizeOption::get_option( 'autoptimize_cache_clean' ) ) {
+            if (autoptimizeOption::get_option('autoptimize_cache_clean')) {
                 autoptimizeCache::clearall();
-                autoptimizeOption::update_option( 'autoptimize_cache_clean', 0 );
+                autoptimizeOption::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.
@@ -52,7 +52,7 @@ 
     static public function instance()
     {
         // Only one instance.
-        if ( null === self::$instance ) {
+        if (null === self::$instance) {
             self::$instance = new autoptimizeConfig();
         }
 
@@ -185,28 +185,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 ( autoptimizeOption::get_option( 'autoptimize_show_adv', '1' ) == '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 (autoptimizeOption::get_option('autoptimize_show_adv', '1') == '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>
@@ -215,214 +215,214 @@ 
 
     <?php echo $this->ao_admin_tabs(); ?>
 
-<form method="post" action="<?php echo admin_url( 'options.php' ); ?>">
-<?php settings_fields( 'autoptimize' ); ?>
+<form method="post" action="<?php echo admin_url('options.php'); ?>">
+<?php settings_fields('autoptimize'); ?>
 
 <ul>
 
 <?php
 // Only show enable site configuration in network site option.
 $blog_id = get_current_blog_id();
-if( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) { 
+if (is_plugin_active_for_network('autoptimize/autoptimize.php') && 1 === $blog_id) { 
 ?>
 	<li class="itemDetail">
-	<h2 class="itemTitle"><?php _e('Multisite Options','autoptimize'); ?></h2>
+	<h2 class="itemTitle"><?php _e('Multisite Options', 'autoptimize'); ?></h2>
 	<table class="form-table">
 	<tr valign="top">
-	<th scope="row"><?php _e('Enable site configuration?','autoptimize'); ?></th>
-	<td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOption::get_option('autoptimize_enable_site_config')?'checked="checked" ':''; ?>/>
-	<?php _e('Enable Autoptimize configuration per site.','autoptimize'); ?></label></td>
+	<th scope="row"><?php _e('Enable site configuration?', 'autoptimize'); ?></th>
+	<td><label class="cb_label"><input type="checkbox" id="autoptimize_enable_site_config" name="autoptimize_enable_site_config" <?php echo autoptimizeOption::get_option('autoptimize_enable_site_config') ? 'checked="checked" ' : ''; ?>/>
+	<?php _e('Enable Autoptimize configuration per site.', 'autoptimize'); ?></label></td>
 	</tr>
 	</table>
 	</li>
 <?php } ?>
 
 <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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 (autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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">
-<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 autoptimizeOption::get_option('autoptimize_js_exclude',"wp-includes/js/dist/, wp-includes/js/tinymce/, 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">
+<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 autoptimizeOption::get_option('autoptimize_js_exclude', "wp-includes/js/dist/, wp-includes/js/tinymce/, 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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 (autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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">
-<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 autoptimizeOption::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">
+<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 autoptimizeOption::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('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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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('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(autoptimizeOption::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(autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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>
     <?php
     $_min_excl_class = 'ao_adv';
-    if ( !$conf->get( 'autoptimize_css_aggregate' ) && !$conf->get( 'autoptimize_js_aggregate' ) ) {
+    if (!$conf->get('autoptimize_css_aggregate') && !$conf->get('autoptimize_js_aggregate')) {
         $_min_excl_class = ' hidden';
     }
     ?>
     <tr valign="top" id="min_excl_row" class="<?php echo $hiddenClass.$_min_excl_class; ?>">
-        <th scope="row"><?php _e('Minify excluded CSS and JS files?','autoptimize'); ?></th>
-        <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOption::get_option('autoptimize_minify_excluded','1')?'checked="checked" ':''; ?>/>
-        <?php _e('When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.','autoptimize'); ?></label></td>
+        <th scope="row"><?php _e('Minify excluded CSS and JS files?', 'autoptimize'); ?></th>
+        <td><label class="cb_label"><input type="checkbox" name="autoptimize_minify_excluded" <?php echo autoptimizeOption::get_option('autoptimize_minify_excluded', '1') ? 'checked="checked" ' : ''; ?>/>
+        <?php _e('When aggregating JS or CSS, excluded files that are not minified (based on filename) are by default minified by Autoptimize despite being excluded. Uncheck this option if anything breaks despite excluding.', '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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 autoptimizeOption::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 } ?>
@@ -431,11 +431,11 @@ 
 
 </ul>
 
-<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo autoptimizeOption::get_option('autoptimize_show_adv','1'); ?>">
+<input type="hidden" id="autoptimize_show_adv" name="autoptimize_show_adv" value="<?php echo autoptimizeOption::get_option('autoptimize_show_adv', '1'); ?>">
 
 <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>
@@ -444,13 +444,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);
                 }
             }
@@ -458,17 +458,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">
@@ -483,7 +483,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">
@@ -654,58 +654,58 @@ 
 
     public function addmenu()
     {
-		if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-			$hook = add_submenu_page( 'settings.php',  __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_network_options', 'autoptimize', array( $this, 'show' ) );
+		if (is_plugin_active_for_network('autoptimize/autoptimize.php')) {
+			$hook = add_submenu_page('settings.php', __('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_network_options', 'autoptimize', array($this, 'show'));
 		}
-		if ( ! is_multisite() || 'on' === autoptimizeOption::get_option('autoptimize_enable_site_config') ) {
-			$hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show' ) );
+		if (!is_multisite() || 'on' === autoptimizeOption::get_option('autoptimize_enable_site_config')) {
+			$hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show'));
 		} else {
-			$hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_message' ) );
+			$hook = add_options_page(__('Autoptimize Options', 'autoptimize'), 'Autoptimize', 'manage_options', 'autoptimize', array($this, 'show_message'));
 		}
 
-        add_action( 'admin_print_scripts-' . $hook, array( $this, 'autoptimize_admin_scripts' ) );
-        add_action( 'admin_print_styles-' . $hook, array( $this, 'autoptimize_admin_styles' ) );
+        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_enable_site_config' );
-        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_minify_excluded' );
+        register_setting('autoptimize', 'autoptimize_html');
+        register_setting('autoptimize', 'autoptimize_html_keepcomments');
+		register_setting('autoptimize', 'autoptimize_enable_site_config');
+        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_minify_excluded');
     }
 
     public function setmeta($links, $file = null)
@@ -713,20 +713,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);
             }
         }
 
@@ -799,7 +799,7 @@ 
             'autoptimize_imgopt_select_field_2'   => '2', // quality glossy.
             'autoptimize_imgopt_checkbox_field_3' => '0', // lazy load off.
             'autoptimize_imgopt_checkbox_field_4' => '0', // webp off (might be removed).
-            'autoptimize_imgopt_text_field_5'     => '',  // lazy load exclusions empty.
+            'autoptimize_imgopt_text_field_5'     => '', // lazy load exclusions empty.
         );
         return $defaults;
     }
@@ -811,7 +811,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;
     }
 
@@ -822,55 +822,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 = autoptimizeOption::get_option( $name );
-                if ( false !== $conf ) {
+            foreach (array_keys($config) as $name) {
+                $conf = autoptimizeOption::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; ?>
@@ -883,23 +883,23 @@ 
     // based on http://wordpress.stackexchange.com/a/58826
     static function ao_admin_tabs()
     {
-        $tabs = apply_filters( 'autoptimize_filter_settingsscreen_tabs' ,array( 'autoptimize' => __( 'JS, CSS  &amp; HTML', 'autoptimize' ) ) );
+        $tabs = apply_filters('autoptimize_filter_settingsscreen_tabs', array('autoptimize' => __('JS, CSS  &amp; HTML', '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 {
@@ -916,7 +916,7 @@ 
      */
     public static function is_admin_and_not_ajax()
     {
-        return ( is_admin() && ! self::doing_ajax() );
+        return (is_admin() && !self::doing_ajax());
     }
 
     /**
@@ -926,9 +926,9 @@ 
      */
     protected static function doing_ajax()
     {
-        if ( function_exists( 'wp_doing_ajax' ) ) {
+        if (function_exists('wp_doing_ajax')) {
             return wp_doing_ajax();
         }
-        return ( defined( 'DOING_AJAX' ) && DOING_AJAX );
+        return (defined('DOING_AJAX') && DOING_AJAX);
     }
 }

classes/autoptimizeExtra.php

Spacing +163 added lines, -163 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 = self::fetch_options();
         }
 
@@ -32,14 +32,14 @@ 
 
     public function run()
     {
-        if ( is_admin() ) {
-			if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-				add_action( 'network_admin_menu', array( $this, 'admin_menu' ) );
+        if (is_admin()) {
+			if (is_plugin_active_for_network('autoptimize/autoptimize.php')) {
+				add_action('network_admin_menu', array($this, 'admin_menu'));
 			} else {
-				add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+				add_action('admin_menu', array($this, 'admin_menu'));
 			}
-			add_action( 'admin_init', array( $this, 'registersettings' ) );
-            add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_extra_tab' ) );
+			add_action('admin_init', array($this, 'registersettings'));
+            add_filter('autoptimize_filter_settingsscreen_tabs', array($this, 'add_extra_tab'));
         } else {
             $this->run_on_frontend();
         }
@@ -47,8 +47,8 @@ 
 
     public static function fetch_options()
     {
-        $value = autoptimizeOption::get_option( 'autoptimize_extra_settings' );
-        if ( empty( $value ) ) {
+        $value = autoptimizeOption::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();
         }
@@ -59,55 +59,55 @@ 
     public function disable_emojis()
     {
         // Removing all actions related to emojis!
-        remove_action( 'admin_print_styles', 'print_emoji_styles' );
-        remove_action( 'wp_head', 'print_emoji_detection_script', 7 );
-        remove_action( 'admin_print_scripts', 'print_emoji_detection_script' );
-        remove_action( 'wp_print_styles', 'print_emoji_styles' );
-        remove_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
-        remove_filter( 'the_content_feed', 'wp_staticize_emoji' );
-        remove_filter( 'comment_text_rss', 'wp_staticize_emoji' );
+        remove_action('admin_print_styles', 'print_emoji_styles');
+        remove_action('wp_head', 'print_emoji_detection_script', 7);
+        remove_action('admin_print_scripts', 'print_emoji_detection_script');
+        remove_action('wp_print_styles', 'print_emoji_styles');
+        remove_filter('wp_mail', 'wp_staticize_emoji_for_email');
+        remove_filter('the_content_feed', 'wp_staticize_emoji');
+        remove_filter('comment_text_rss', 'wp_staticize_emoji');
 
         // Removes TinyMCE emojis.
-        add_filter( 'tiny_mce_plugins', array( $this, 'filter_disable_emojis_tinymce' ) );
+        add_filter('tiny_mce_plugins', array($this, 'filter_disable_emojis_tinymce'));
 
         // Removes emoji dns-preftech.
-        add_filter( 'wp_resource_hints', array( $this, 'filter_remove_emoji_dns_prefetch' ), 10, 2 );
+        add_filter('wp_resource_hints', array($this, 'filter_remove_emoji_dns_prefetch'), 10, 2);
     }
 
-    public function filter_disable_emojis_tinymce( $plugins )
+    public function filter_disable_emojis_tinymce($plugins)
     {
-        if ( is_array( $plugins ) ) {
-            return array_diff( $plugins, array( 'wpemoji' ) );
+        if (is_array($plugins)) {
+            return array_diff($plugins, array('wpemoji'));
         } else {
             return array();
         }
     }
 
-    public function filter_remove_qs( $src )
+    public function filter_remove_qs($src)
     {
-        if ( strpos( $src, '?ver=' ) ) {
-            $src = remove_query_arg( 'ver', $src );
+        if (strpos($src, '?ver=')) {
+            $src = remove_query_arg('ver', $src);
         }
 
         return $src;
     }
 
-    public function extra_async_js( $in )
+    public function extra_async_js($in)
     {
         $exclusions = array();
-        if ( ! empty( $in ) ) {
-            $exclusions = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $in ) ) ), '' );
+        if (!empty($in)) {
+            $exclusions = array_fill_keys(array_filter(array_map('trim', explode(',', $in))), '');
         }
 
         $settings = $this->options['autoptimize_extra_text_field_3'];
-        $async    = array_fill_keys( array_filter( array_map( 'trim', explode( ',', $settings ) ) ), '' );
-        $attr     = apply_filters( 'autoptimize_filter_extra_async', 'async' );
-        foreach ( $async as $k => $v ) {
-            $async[ $k ] = $attr;
+        $async    = array_fill_keys(array_filter(array_map('trim', explode(',', $settings))), '');
+        $attr     = apply_filters('autoptimize_filter_extra_async', 'async');
+        foreach ($async as $k => $v) {
+            $async[$k] = $attr;
         }
 
         // Merge exclusions & asyncs in one array and return to AO API.
-        $merged = array_merge( $exclusions, $async );
+        $merged = array_merge($exclusions, $async);
 
         return $merged;
     }
@@ -117,56 +117,56 @@ 
         $options = $this->options;
 
         // Disable emojis if specified.
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) ) {
+        if (!empty($options['autoptimize_extra_checkbox_field_1'])) {
             $this->disable_emojis();
         }
 
         // Remove version query parameters.
-        if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) ) {
-            add_filter( 'script_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 );
-            add_filter( 'style_loader_src', array( $this, 'filter_remove_qs' ), 15, 1 );
+        if (!empty($options['autoptimize_extra_checkbox_field_0'])) {
+            add_filter('script_loader_src', array($this, 'filter_remove_qs'), 15, 1);
+            add_filter('style_loader_src', array($this, 'filter_remove_qs'), 15, 1);
         }
 
         // Avoiding conflicts of interest when async-javascript plugin is active!
-        $async_js_plugin_active = autoptimizeUtils::is_plugin_active( 'async-javascript/async-javascript.php' );
-        if ( ! empty( $options['autoptimize_extra_text_field_3'] ) && ! $async_js_plugin_active ) {
-            add_filter( 'autoptimize_filter_js_exclude', array( $this, 'extra_async_js' ), 10, 1 );
+        $async_js_plugin_active = autoptimizeUtils::is_plugin_active('async-javascript/async-javascript.php');
+        if (!empty($options['autoptimize_extra_text_field_3']) && !$async_js_plugin_active) {
+            add_filter('autoptimize_filter_js_exclude', array($this, 'extra_async_js'), 10, 1);
         }
 
         // Optimize google fonts!
-        if ( ! empty( $options['autoptimize_extra_radio_field_4'] ) && ( '1' !== $options['autoptimize_extra_radio_field_4'] ) ) {
-            add_filter( 'wp_resource_hints', array( $this, 'filter_remove_gfonts_dnsprefetch' ), 10, 2 );
-            add_filter( 'autoptimize_html_after_minify', array( $this, 'filter_optimize_google_fonts' ), 10, 1 );
-            add_filter( 'autoptimize_extra_filter_tobepreconn', array( $this, 'filter_preconnect_google_fonts' ), 10, 1 );
+        if (!empty($options['autoptimize_extra_radio_field_4']) && ('1' !== $options['autoptimize_extra_radio_field_4'])) {
+            add_filter('wp_resource_hints', array($this, 'filter_remove_gfonts_dnsprefetch'), 10, 2);
+            add_filter('autoptimize_html_after_minify', array($this, 'filter_optimize_google_fonts'), 10, 1);
+            add_filter('autoptimize_extra_filter_tobepreconn', array($this, 'filter_preconnect_google_fonts'), 10, 1);
         }
 
         // Preconnect!
-        if ( ! empty( $options['autoptimize_extra_text_field_2'] ) || has_filter( 'autoptimize_extra_filter_tobepreconn' ) ) {
-            add_filter( 'wp_resource_hints', array( $this, 'filter_preconnect' ), 10, 2 );
+        if (!empty($options['autoptimize_extra_text_field_2']) || has_filter('autoptimize_extra_filter_tobepreconn')) {
+            add_filter('wp_resource_hints', array($this, 'filter_preconnect'), 10, 2);
         }
     }
 
-    public function filter_remove_emoji_dns_prefetch( $urls, $relation_type )
+    public function filter_remove_emoji_dns_prefetch($urls, $relation_type)
     {
-        $emoji_svg_url = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/' );
+        $emoji_svg_url = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/');
 
-        return $this->filter_remove_dns_prefetch( $urls, $relation_type, $emoji_svg_url );
+        return $this->filter_remove_dns_prefetch($urls, $relation_type, $emoji_svg_url);
     }
 
-    public function filter_remove_gfonts_dnsprefetch( $urls, $relation_type )
+    public function filter_remove_gfonts_dnsprefetch($urls, $relation_type)
     {
-        return $this->filter_remove_dns_prefetch( $urls, $relation_type, 'fonts.googleapis.com' );
+        return $this->filter_remove_dns_prefetch($urls, $relation_type, 'fonts.googleapis.com');
     }
 
-    public function filter_remove_dns_prefetch( $urls, $relation_type, $url_to_remove )
+    public function filter_remove_dns_prefetch($urls, $relation_type, $url_to_remove)
     {
         $url_to_remove = (string) $url_to_remove;
 
-        if ( ! empty( $url_to_remove ) && 'dns-prefetch' === $relation_type ) {
+        if (!empty($url_to_remove) && 'dns-prefetch' === $relation_type) {
             $cnt = 0;
-            foreach ( $urls as $url ) {
-                if ( false !== strpos( $url, $url_to_remove ) ) {
-                    unset( $urls[ $cnt ] );
+            foreach ($urls as $url) {
+                if (false !== strpos($url, $url_to_remove)) {
+                    unset($urls[$cnt]);
                 }
                 $cnt++;
             }
@@ -175,131 +175,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                            = str_replace( array( '%2C', '%2c' ), ',', $subset );
-                        $subset                            = explode( 'subset=', $subset );
-                        $fonts_collection[ $i ]['subsets'] = explode( ',', $subset[1] );
+                    $subset = (is_array($font)) ? end($font) : '';
+                    if (false !== strpos($subset, 'subset=')) {
+                        $subset                            = str_replace(array('%2C', '%2c'), ',', $subset);
+                        $subset                            = explode('subset=', $subset);
+                        $fonts_collection[$i]['subsets'] = explode(',', $subset[1]);
                     }
                 }
                 // And remove Google Fonts.
-                $in = str_replace( $matches[0][ $i ], '', $in );
+                $in = str_replace($matches[0][$i], '', $in);
             }
             $i++;
         }
 
         $options      = $this->options;
         $fonts_markup = '';
-        if ( '2' === $options['autoptimize_extra_radio_field_4'] ) {
+        if ('2' === $options['autoptimize_extra_radio_field_4']) {
             // Remove Google Fonts.
-            unset( $fonts_collection );
+            unset($fonts_collection);
             return $in;
-        } elseif ( '3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4'] ) {
+        } elseif ('3' === $options['autoptimize_extra_radio_field_4'] || '5' === $options['autoptimize_extra_radio_field_4']) {
             // Aggregate & link!
             $fonts_string  = '';
             $subset_string = '';
-            foreach ( $fonts_collection as $font ) {
-                $fonts_string .= '|' . trim( implode( '|', $font['fonts'] ), '|' );
-                if ( ! empty( $font['subsets'] ) ) {
-                    $subset_string .= ',' . trim( implode( ',', $font['subsets'] ), ',' );
+            foreach ($fonts_collection as $font) {
+                $fonts_string .= '|'.trim(implode('|', $font['fonts']), '|');
+                if (!empty($font['subsets'])) {
+                    $subset_string .= ','.trim(implode(',', $font['subsets']), ',');
                 }
             }
 
-            if ( ! empty( $subset_string ) ) {
-                $subset_string = str_replace( ',', '%2C', ltrim( $subset_string, ',' ) );
-                $fonts_string  = $fonts_string . '&#038;subset=' . $subset_string;
+            if (!empty($subset_string)) {
+                $subset_string = str_replace(',', '%2C', ltrim($subset_string, ','));
+                $fonts_string  = $fonts_string.'&#038;subset='.$subset_string;
             }
 
-            $fonts_string = apply_filters( 'autoptimize_filter_extra_gfont_fontstring', str_replace( '|', '%7C', ltrim( $fonts_string, '|' ) ) );
+            $fonts_string = apply_filters('autoptimize_filter_extra_gfont_fontstring', str_replace('|', '%7C', ltrim($fonts_string, '|')));
 
-            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_array          = array_map( 'urldecode', $fonts_array );
-            $fonts_markup         = '<script data-cfasync="false" id="ao_optimized_gfonts_config" type="text/javascript">WebFontConfig={google:{families:' . wp_json_encode( $fonts_array ) . ' },classes:false, events:false, timeout:1500};</script>';
+            $fonts_array          = array_map('urldecode', $fonts_array);
+            $fonts_markup         = '<script data-cfasync="false" id="ao_optimized_gfonts_config" type="text/javascript">WebFontConfig={google:{families:'.wp_json_encode($fonts_array).' },classes:false, events:false, timeout:1500};</script>';
             $fonts_library_markup = '<script data-cfasync="false" id="ao_optimized_gfonts_webfontloader" type="text/javascript">(function() {var wf = document.createElement(\'script\');wf.src=\'https://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js\';wf.type=\'text/javascript\';wf.async=\'true\';var s=document.getElementsByTagName(\'script\')[0];s.parentNode.insertBefore(wf, s);})();</script>';
-            $in                   = substr_replace( $in, $fonts_library_markup . '</head>', strpos( $in, '</head>' ), strlen( '</head>' ) );
+            $in                   = substr_replace($in, $fonts_library_markup.'</head>', strpos($in, '</head>'), strlen('</head>'));
         }
 
         // Replace back in markup.
-        $inject_point = apply_filters( 'autoptimize_filter_extra_gfont_injectpoint', '<link' );
-        $out          = substr_replace( $in, $fonts_markup . $inject_point, strpos( $in, $inject_point ), strlen( $inject_point ) );
-        unset( $fonts_collection );
+        $inject_point = apply_filters('autoptimize_filter_extra_gfont_injectpoint', '<link');
+        $out          = substr_replace($in, $fonts_markup.$inject_point, strpos($in, $inject_point), strlen($inject_point));
+        unset($fonts_collection);
 
         // 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 );
-            if ( is_array( $parsed ) && empty( $parsed['scheme'] ) ) {
-                $domain = '//' . $parsed['host'];
-            } elseif ( is_array( $parsed ) ) {
-                $domain = $parsed['scheme'] . '://' . $parsed['host'];
+        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 ( ! 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;
@@ -307,21 +307,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';
@@ -338,17 +338,17 @@ 
             'autoptimize_extra',
             'manage_options',
             'autoptimize_extra',
-            array( $this, 'options_page' )
+            array($this, 'options_page')
         );
     }
 	
 	public function registersettings() {
-		register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
+		register_setting('autoptimize_extra_settings', 'autoptimize_extra_settings');
 	}
 
-    public function add_extra_tab( $in )
+    public function add_extra_tab($in)
     {
-        $in = array_merge( $in, array( 'autoptimize_extra' => __( 'Extra', 'autoptimize' ) ) );
+        $in = array_merge($in, array('autoptimize_extra' => __('Extra', 'autoptimize')));
 
         return $in;
     }
@@ -368,87 +368,87 @@ 
         #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' !== autoptimizeOption::get_option( 'autoptimize_js' ) && 'on' !== autoptimizeOption::get_option( 'autoptimize_css' ) && 'on' !== autoptimizeOption::get_option( 'autoptimize_html' ) && ! autoptimizeImages::imgopt_active() ) { ?>
+        <?php if ('on' !== autoptimizeOption::get_option('autoptimize_js') && 'on' !== autoptimizeOption::get_option('autoptimize_css') && 'on' !== autoptimizeOption::get_option('autoptimize_html') && !autoptimizeImages::imgopt_active()) { ?>
             <div class="notice-warning notice"><p>
-            <?php _e( 'Most of below Extra optimizations require at least one of HTML, JS, CSS or Image autoptimizations being active.', 'autoptimize' ); ?>
+            <?php _e('Most of below Extra optimizations require at least one of HTML, JS, CSS or Image autoptimizations being active.', 'autoptimize'); ?>
             </p></div>
         <?php } ?>
 
-    <form id='ao_settings_form' action='<?php echo admin_url( 'options.php' ); ?>' method='post'>
-        <?php settings_fields( 'autoptimize_extra_settings' ); ?>
-        <h2><?php _e( 'Extra Auto-Optimizations', 'autoptimize' ); ?></h2>
-        <span id='autoptimize_extra_descr'><?php _e( 'The following settings can improve your site\'s performance even more.', 'autoptimize' ); ?></span>
+    <form id='ao_settings_form' action='<?php echo admin_url('options.php'); ?>' method='post'>
+        <?php settings_fields('autoptimize_extra_settings'); ?>
+        <h2><?php _e('Extra Auto-Optimizations', 'autoptimize'); ?></h2>
+        <span id='autoptimize_extra_descr'><?php _e('The following settings can improve your site\'s performance even more.', 'autoptimize'); ?></span>
         <table class="form-table">
             <tr>
-                <th scope="row"><?php _e( 'Google Fonts', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Google Fonts', 'autoptimize'); ?></th>
                 <td>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="1" <?php if ( ! in_array( $gfonts, array( 2, 3, 4, 5 ) ) ) { echo 'checked'; } ?> ><?php _e( 'Leave as is', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="2" <?php checked( 2, $gfonts, true ); ?> ><?php _e( 'Remove Google Fonts', 'autoptimize' ); ?><br/>
-                    <input type="radio" name="autoptimize_extra_settings[autoptimize_extra_radio_field_4]" value="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( 'Remove emojis', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Remove emojis', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_1'] ) && '1' === $options['autoptimize_extra_checkbox_field_1'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_1]' <?php if (!empty($options['autoptimize_extra_checkbox_field_1']) && '1' === $options['autoptimize_extra_checkbox_field_1']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removes WordPress\' core emojis\' inline CSS, inline JavaScript, and an otherwise un-autoptimized JavaScript file.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Remove query strings from static resources', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Remove query strings from static resources', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if ( ! empty( $options['autoptimize_extra_checkbox_field_0'] ) && '1' === $options['autoptimize_extra_checkbox_field_0'] ) { echo 'checked="checked"'; } ?> value='1'><?php _e( 'Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize' ); ?></label>
+                    <label><input type='checkbox' name='autoptimize_extra_settings[autoptimize_extra_checkbox_field_0]' <?php if (!empty($options['autoptimize_extra_checkbox_field_0']) && '1' === $options['autoptimize_extra_checkbox_field_0']) { echo 'checked="checked"'; } ?> value='1'><?php _e('Removing query strings (or more specifically the <code>ver</code> parameter) will not improve load time, but might improve performance scores.', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Preconnect to 3rd party domains <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
-                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_2', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_2'] ); } ?>'><br /><?php _e( 'Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize' ); ?></label>
+                    <label><input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_2]' value='<?php if (array_key_exists('autoptimize_extra_text_field_2', $options)) { echo esc_attr($options['autoptimize_extra_text_field_2']); } ?>'><br /><?php _e('Add 3rd party domains you want the browser to <a href="https://www.keycdn.com/support/preconnect/#primary" target="_blank">preconnect</a> to, separated by comma\'s. Make sure to include the correct protocol (HTTP or HTTPS).', 'autoptimize'); ?></label>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Async Javascript-files <em>(advanced users)</em>', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Async Javascript-files <em>(advanced users)</em>', 'autoptimize'); ?></th>
                 <td>
                     <?php
-                    if ( autoptimizeUtils::is_plugin_active( 'async-javascript/async-javascript.php' ) ) {
+                    if (autoptimizeUtils::is_plugin_active('async-javascript/async-javascript.php')) {
                         // translators: link points Async Javascript settings page.
-                        printf( __( 'You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize' ), '<a href="' . 'options-general.php?page=async-javascript' . '">', '</a>' );
+                        printf(__('You have "Async JavaScript" installed, %1$sconfiguration of async javascript is best done there%2$s.', 'autoptimize'), '<a href="'.'options-general.php?page=async-javascript'.'">', '</a>');
                     } else {
                     ?>
-                        <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php if ( array_key_exists( 'autoptimize_extra_text_field_3', $options ) ) { echo esc_attr( $options['autoptimize_extra_text_field_3'] ); } ?>'>
+                        <input type='text' style='width:80%' name='autoptimize_extra_settings[autoptimize_extra_text_field_3]' value='<?php if (array_key_exists('autoptimize_extra_text_field_3', $options)) { echo esc_attr($options['autoptimize_extra_text_field_3']); } ?>'>
                         <br />
                         <?php
-                            _e( 'Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize' );
+                            _e('Comma-separated list of local or 3rd party JS-files that should loaded with the <code>async</code> flag. JS-files from your own site will be automatically excluded if added here. ', 'autoptimize');
                             // translators: %s will be replaced by a link to the "async javascript" plugin.
-                            echo sprintf( __( 'Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize' ), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"' );
-                            $asj_install_url = network_admin_url() . 'plugin-install.php?s=async+javascript&tab=search&type=term';
-                            echo sprintf( ' <a href="' . $asj_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) );
+                            echo sprintf(__('Configuration of async javascript is easier and more flexible using the %s plugin.', 'autoptimize'), '"<a href="https://wordpress.org/plugins/async-javascript" target="_blank">Async Javascript</a>"');
+                            $asj_install_url = network_admin_url().'plugin-install.php?s=async+javascript&tab=search&type=term';
+                            echo sprintf(' <a href="'.$asj_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize'));
                     }
                     ?>
                 </td>
             </tr>
             <tr>
-                <th scope="row"><?php _e( 'Optimize YouTube videos', 'autoptimize' ); ?></th>
+                <th scope="row"><?php _e('Optimize YouTube videos', 'autoptimize'); ?></th>
                 <td>
                     <?php
-                    if ( autoptimizeUtils::is_plugin_active( 'wp-youtube-lyte/wp-youtube-lyte.php' ) ) {
-                        _e( 'Great, you have WP YouTube Lyte installed.', 'autoptimize' );
+                    if (autoptimizeUtils::is_plugin_active('wp-youtube-lyte/wp-youtube-lyte.php')) {
+                        _e('Great, you have WP YouTube Lyte installed.', 'autoptimize');
                         $lyte_config_url = 'options-general.php?page=lyte_settings_page';
-                        echo sprintf( ' <a href="' . $lyte_config_url . '">%s</a>', __( 'Click here to configure it.', 'autoptimize' ) );
+                        echo sprintf(' <a href="'.$lyte_config_url.'">%s</a>', __('Click here to configure it.', 'autoptimize'));
                     } else {
                         // translators: %s will be replaced by a link to "wp youtube lyte" plugin.
-                        echo sprintf( __( '%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize' ), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>' );
-                        $lyte_install_url = network_admin_url() . 'plugin-install.php?s=lyte&tab=search&type=term';
-                        echo sprintf( ' <a href="' . $lyte_install_url . '">%s</a>', __( 'Click here to install and activate it.', 'autoptimize' ) );
+                        echo sprintf(__('%s allows you to “lazy load” your videos, by inserting responsive “Lite YouTube Embeds". ', 'autoptimize'), '<a href="https://wordpress.org/plugins/wp-youtube-lyte" target="_blank">WP YouTube Lyte</a>');
+                        $lyte_install_url = network_admin_url().'plugin-install.php?s=lyte&tab=search&type=term';
+                        echo sprintf(' <a href="'.$lyte_install_url.'">%s</a>', __('Click here to install and activate it.', 'autoptimize'));
                     }
                     ?>
                 </td>
             </tr>
         </table>
-        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e( 'Save Changes', 'autoptimize' ); ?>" /></p>
+        <p class="submit"><input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes', 'autoptimize'); ?>" /></p>
     </form>
         <?php
     }