futtta / autoptimize

classes/autoptimizeCache.php

Spacing +176 added lines, -176 removed lines

@@ -3,7 +3,7 @@ 
  * Handles disk-cache-related operations.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -38,22 +38,22 @@ 
      * @param string $md5 Hash.
      * @param string $ext Extension.
      */
-    public function __construct( $md5, $ext = 'php' )
+    public function __construct($md5, $ext = 'php')
     {
         $_min_ext = '';
-        if ( apply_filters( 'autoptimize_filter_cache_url_add_min_ext', false ) ) {
+        if (apply_filters('autoptimize_filter_cache_url_add_min_ext', false)) {
             $_min_ext = '.min';
         }
 
         $this->cachedir = AUTOPTIMIZE_CACHE_DIR;
         $this->nogzip   = AUTOPTIMIZE_CACHE_NOGZIP;
-        if ( ! $this->nogzip ) {
-            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . $_min_ext . '.php';
+        if (!$this->nogzip) {
+            $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.$_min_ext.'.php';
         } else {
-            if ( in_array( $ext, array( 'js', 'css' ) ) ) {
-                $this->filename = $ext . '/' . AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . $_min_ext . '.' . $ext;
+            if (in_array($ext, array('js', 'css'))) {
+                $this->filename = $ext.'/'.AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.$_min_ext.'.'.$ext;
             } else {
-                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX . $md5 . $_min_ext . '.' . $ext;
+                $this->filename = AUTOPTIMIZE_CACHEFILE_PREFIX.$md5.$_min_ext.'.'.$ext;
             }
         }
     }
@@ -65,7 +65,7 @@ 
      */
     public function check()
     {
-        return file_exists( $this->cachedir . $this->filename );
+        return file_exists($this->cachedir.$this->filename);
     }
 
     /**
@@ -75,11 +75,11 @@ 
      */
     public function retrieve()
     {
-        if ( $this->check() ) {
-            if ( false == $this->nogzip ) {
-                return file_get_contents( $this->cachedir . $this->filename . '.none' );
+        if ($this->check()) {
+            if (false == $this->nogzip) {
+                return file_get_contents($this->cachedir.$this->filename.'.none');
             } else {
-                return file_get_contents( $this->cachedir . $this->filename );
+                return file_get_contents($this->cachedir.$this->filename);
             }
         }
         return false;
@@ -93,50 +93,50 @@ 
      *
      * @return void
      */
-    public function cache( $data, $mime )
+    public function cache($data, $mime)
     {
         // off by default; check if cachedirs exist every time before caching
         //
         // to be activated for users that experience these ugly errors;
         // PHP Warning: file_put_contents failed to open stream: No such file or directory.
-        if ( apply_filters( 'autoptimize_filter_cache_checkdirs_on_write', false ) ) {
+        if (apply_filters('autoptimize_filter_cache_checkdirs_on_write', false)) {
             $this->check_and_create_dirs();
         }
 
-        if ( false === $this->nogzip ) {
+        if (false === $this->nogzip) {
             // We handle gzipping ourselves.
             $file    = 'default.php';
-            $phpcode = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $file );
-            $phpcode = str_replace( array( '%%CONTENT%%', 'exit;' ), array( $mime, '' ), $phpcode );
+            $phpcode = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$file);
+            $phpcode = str_replace(array('%%CONTENT%%', 'exit;'), array($mime, ''), $phpcode);
 
-            file_put_contents( $this->cachedir . $this->filename, $phpcode );
-            file_put_contents( $this->cachedir . $this->filename . '.none', $data );
+            file_put_contents($this->cachedir.$this->filename, $phpcode);
+            file_put_contents($this->cachedir.$this->filename.'.none', $data);
         } else {
             // Write code to cache without doing anything else.
-            file_put_contents( $this->cachedir . $this->filename, $data );
+            file_put_contents($this->cachedir.$this->filename, $data);
 
             // save fallback .js or .css file if filter true (to be false by default) but not if snippet or single.
-            if ( self::do_fallback() && strpos( $this->filename, '_snippet_' ) === false && strpos( $this->filename, '_single_' ) === false ) {
-                $_extension     = pathinfo( $this->filename, PATHINFO_EXTENSION );
-                $_fallback_file = AUTOPTIMIZE_CACHEFILE_PREFIX . 'fallback.' . $_extension;
-                if ( ( 'css' === $_extension || 'js' === $_extension ) && ! file_exists( $this->cachedir . $_extension . '/' . $_fallback_file ) ) {
-                    file_put_contents( $this->cachedir . $_extension . '/' . $_fallback_file, $data );
+            if (self::do_fallback() && strpos($this->filename, '_snippet_') === false && strpos($this->filename, '_single_') === false) {
+                $_extension     = pathinfo($this->filename, PATHINFO_EXTENSION);
+                $_fallback_file = AUTOPTIMIZE_CACHEFILE_PREFIX.'fallback.'.$_extension;
+                if (('css' === $_extension || 'js' === $_extension) && !file_exists($this->cachedir.$_extension.'/'.$_fallback_file)) {
+                    file_put_contents($this->cachedir.$_extension.'/'.$_fallback_file, $data);
                 }
             }
 
-            if ( apply_filters( 'autoptimize_filter_cache_create_static_gzip', false ) ) {
+            if (apply_filters('autoptimize_filter_cache_create_static_gzip', false)) {
                 // Create an additional cached gzip file.
-                file_put_contents( $this->cachedir . $this->filename . '.gz', gzencode( $data, 9, FORCE_GZIP ) );
+                file_put_contents($this->cachedir.$this->filename.'.gz', gzencode($data, 9, FORCE_GZIP));
                 // If PHP Brotli extension is installed, create an additional cached Brotli file.
-                if ( function_exists( 'brotli_compress' ) ) {
-                    file_put_contents( $this->cachedir . $this->filename . '.br', brotli_compress( $data, 11, BROTLI_GENERIC ) );
+                if (function_exists('brotli_compress')) {
+                    file_put_contents($this->cachedir.$this->filename.'.br', brotli_compress($data, 11, BROTLI_GENERIC));
                 }
             }
         }
 
         // Provide 3rd party action hook for every cache file that is created.
         // This hook can for example be used to inject a copy of the created cache file to a other domain.
-        do_action( 'autoptimize_action_cache_file_created', $this->cachedir . $this->filename );
+        do_action('autoptimize_action_cache_file_created', $this->cachedir.$this->filename);
     }
 
     /**
@@ -151,7 +151,7 @@ 
         // The original idea here was to provide 3rd party code a hook so that
         // it can "listen" to all the complete autoptimized-urls that the page
         // will emit... Or something to that effect I think?
-        apply_filters( 'autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL . $this->filename );
+        apply_filters('autoptimize_filter_cache_getname', AUTOPTIMIZE_CACHE_URL.$this->filename);
 
         return $this->filename;
     }
@@ -164,11 +164,11 @@ 
      * @param string $file Filename.
      * @return bool
      */
-    protected static function is_valid_cache_file( $dir, $file )
+    protected static function is_valid_cache_file($dir, $file)
     {
-        if ( '.' !== $file && '..' !== $file &&
-            false !== strpos( $file, AUTOPTIMIZE_CACHEFILE_PREFIX ) &&
-            is_file( $dir . $file ) ) {
+        if ('.' !== $file && '..' !== $file &&
+            false !== strpos($file, AUTOPTIMIZE_CACHEFILE_PREFIX) &&
+            is_file($dir.$file)) {
 
             // It's a valid file!
             return true;
@@ -186,16 +186,16 @@ 
     protected static function clear_cache_classic()
     {
         $contents = self::get_cache_contents();
-        foreach ( $contents as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    @unlink( $dir . $file ); // @codingStandardsIgnoreLine
+        foreach ($contents as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    @unlink($dir.$file); // @codingStandardsIgnoreLine
                 }
             }
         }
 
-        @unlink( AUTOPTIMIZE_CACHE_DIR . '/.htaccess' ); // @codingStandardsIgnoreLine
+        @unlink(AUTOPTIMIZE_CACHE_DIR.'/.htaccess'); // @codingStandardsIgnoreLine
     }
 
     /**
@@ -206,19 +206,19 @@ 
      *
      * @return bool
      */
-    protected static function rmdir( $pathname )
+    protected static function rmdir($pathname)
     {
-        $files = self::get_dir_contents( $pathname );
-        foreach ( $files as $file ) {
-            $path = $pathname . '/' . $file;
-            if ( is_dir( $path ) ) {
-                self::rmdir( $path );
+        $files = self::get_dir_contents($pathname);
+        foreach ($files as $file) {
+            $path = $pathname.'/'.$file;
+            if (is_dir($path)) {
+                self::rmdir($path);
             } else {
-                unlink( $path );
+                unlink($path);
             }
         }
 
-        return rmdir( $pathname );
+        return rmdir($pathname);
     }
 
     /**
@@ -239,12 +239,12 @@ 
         $new_name = self::get_unique_name();
 
         // Makes sure the new pathname is on the same level...
-        $new_pathname = dirname( $dir ) . '/' . $new_name;
-        $renamed      = @rename( $dir, $new_pathname ); // @codingStandardsIgnoreLine
+        $new_pathname = dirname($dir).'/'.$new_name;
+        $renamed      = @rename($dir, $new_pathname); // @codingStandardsIgnoreLine
 
         // When renamed, re-create the default cache directory back so it's
         // available again...
-        if ( $renamed ) {
+        if ($renamed) {
             $ok = self::cacheavail();
         }
 
@@ -258,7 +258,7 @@ 
      */
     public static function advanced_cache_clear_enabled()
     {
-        return apply_filters( 'autoptimize_filter_cache_clear_advanced', false );
+        return apply_filters('autoptimize_filter_cache_clear_advanced', false);
     }
 
     /**
@@ -269,7 +269,7 @@ 
     protected static function get_unique_name()
     {
         $prefix   = self::get_advanced_cache_clear_prefix();
-        $new_name = uniqid( $prefix, true );
+        $new_name = uniqid($prefix, true);
 
         return $new_name;
     }
@@ -282,8 +282,8 @@ 
     protected static function get_advanced_cache_clear_prefix()
     {
         $pathname = self::get_pathname_base();
-        $basename = basename( $pathname );
-        $prefix   = $basename . '-artifact-';
+        $basename = basename($pathname);
+        $prefix   = $basename.'-artifact-';
 
         return $prefix;
     }
@@ -296,9 +296,9 @@ 
      *
      * @return array
      */
-    protected static function get_dir_contents( $pathname )
+    protected static function get_dir_contents($pathname)
     {
-        return array_slice( scandir( $pathname ), 2 );
+        return array_slice(scandir($pathname), 2);
     }
 
     /**
@@ -311,24 +311,24 @@ 
     public static function delete_advanced_cache_clear_artifacts()
     {
         // Don't go through these motions (called from the cachechecker) if advanced cache clear isn't even active.
-        if ( ! self::advanced_cache_clear_enabled() ) {
+        if (!self::advanced_cache_clear_enabled()) {
             return false;
         }
 
         $dir    = self::get_pathname_base();
         $prefix = self::get_advanced_cache_clear_prefix();
-        $parent = dirname( $dir );
+        $parent = dirname($dir);
         $ok     = false;
 
         // Returns the list of files without '.' and '..' elements.
-        $files = self::get_dir_contents( $parent );
-        if ( is_array( $files ) && ! empty( $files ) ) {
-            foreach ( $files as $file ) {
-                $path     = $parent . '/' . $file;
-                $prefixed = ( false !== strpos( $path, $prefix ) );
+        $files = self::get_dir_contents($parent);
+        if (is_array($files) && !empty($files)) {
+            foreach ($files as $file) {
+                $path     = $parent.'/'.$file;
+                $prefixed = (false !== strpos($path, $prefix));
                 // Removing only our own (prefixed) directories...
-                if ( is_dir( $path ) && $prefixed ) {
-                    $ok = self::rmdir( $path );
+                if (is_dir($path) && $prefixed) {
+                    $ok = self::rmdir($path);
                 }
             }
         }
@@ -348,9 +348,9 @@ 
     {
         $pathname = self::get_pathname_base();
 
-        if ( is_multisite() && apply_filters( 'autoptimize_separate_blog_caches', true ) ) {
+        if (is_multisite() && apply_filters('autoptimize_separate_blog_caches', true)) {
             $blog_id   = get_current_blog_id();
-            $pathname .= $blog_id . '/';
+            $pathname .= $blog_id.'/';
         }
 
         return $pathname;
@@ -363,7 +363,7 @@ 
      */
     protected static function get_pathname_base()
     {
-        $pathname = WP_CONTENT_DIR . AUTOPTIMIZE_CACHE_CHILD_DIR;
+        $pathname = WP_CONTENT_DIR.AUTOPTIMIZE_CACHE_CHILD_DIR;
 
         return $pathname;
     }
@@ -375,46 +375,46 @@ 
      *
      * @return bool
      */
-    public static function clearall( $propagate = true )
+    public static function clearall($propagate = true)
     {
-        if ( ! self::cacheavail() ) {
+        if (!self::cacheavail()) {
             return false;
         }
 
         // TODO/FIXME: If cache is big, switch to advanced/new cache clearing automatically?
-        if ( self::advanced_cache_clear_enabled() ) {
+        if (self::advanced_cache_clear_enabled()) {
             self::clear_cache_via_rename();
         } else {
             self::clear_cache_classic();
         }
 
         // Remove 404 handler if required.
-        if ( self::do_fallback() ) {
-            $_fallback_php = trailingslashit( WP_CONTENT_DIR ) . 'autoptimize_404_handler.php';
-            @unlink( $_fallback_php ); // @codingStandardsIgnoreLine
+        if (self::do_fallback()) {
+            $_fallback_php = trailingslashit(WP_CONTENT_DIR).'autoptimize_404_handler.php';
+            @unlink($_fallback_php); // @codingStandardsIgnoreLine
         }
 
         // Remove the transient so it gets regenerated...
-        delete_transient( 'autoptimize_stats' );
+        delete_transient('autoptimize_stats');
 
         // Cache was just purged, clear page cache and allow others to hook into our purging...
-        if ( true === $propagate ) {
-            if ( ! function_exists( 'autoptimize_do_cachepurged_action' ) ) {
+        if (true === $propagate) {
+            if (!function_exists('autoptimize_do_cachepurged_action')) {
                 function autoptimize_do_cachepurged_action() {
-                    do_action( 'autoptimize_action_cachepurged' );
+                    do_action('autoptimize_action_cachepurged');
                 }
             }
-            add_action( 'shutdown', 'autoptimize_do_cachepurged_action', 11 );
-            add_action( 'autoptimize_action_cachepurged', array( 'autoptimizeCache', 'flushPageCache' ), 10, 0 );
+            add_action('shutdown', 'autoptimize_do_cachepurged_action', 11);
+            add_action('autoptimize_action_cachepurged', array('autoptimizeCache', 'flushPageCache'), 10, 0);
         }
 
         // Warm cache (part of speedupper)!
-        if ( apply_filters( 'autoptimize_filter_speedupper', true ) && false == get_transient( 'autoptimize_cache_warmer_protector' ) ) {
-            set_transient( 'autoptimize_cache_warmer_protector', 'I shall not warm cache for another 10 minutes.', 60 * 10 );
-            $url   = site_url() . '/?ao_speedup_cachebuster=' . rand( 1, 100000 );
-            $url   = apply_filters( 'autoptimize_filter_cache_warmer_url', $url );
-            $cache = @wp_remote_get( $url ); // @codingStandardsIgnoreLine
-            unset( $cache );
+        if (apply_filters('autoptimize_filter_speedupper', true) && false == get_transient('autoptimize_cache_warmer_protector')) {
+            set_transient('autoptimize_cache_warmer_protector', 'I shall not warm cache for another 10 minutes.', 60*10);
+            $url   = site_url().'/?ao_speedup_cachebuster='.rand(1, 100000);
+            $url   = apply_filters('autoptimize_filter_cache_warmer_url', $url);
+            $cache = @wp_remote_get($url); // @codingStandardsIgnoreLine
+            unset($cache);
         }
 
         return true;
@@ -429,7 +429,7 @@ 
      */
     public static function clearall_actionless()
     {
-        return self::clearall( false );
+        return self::clearall(false);
     }
 
     /**
@@ -441,8 +441,8 @@ 
     {
         $contents = array();
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            $contents[ $dir ] = scandir( AUTOPTIMIZE_CACHE_DIR . $dir );
+        foreach (array('', 'js', 'css') as $dir) {
+            $contents[$dir] = scandir(AUTOPTIMIZE_CACHE_DIR.$dir);
         }
 
         return $contents;
@@ -455,21 +455,21 @@ 
      */
     public static function stats()
     {
-        $stats = get_transient( 'autoptimize_stats' );
+        $stats = get_transient('autoptimize_stats');
 
         // If no transient, do the actual scan!
-        if ( ! is_array( $stats ) ) {
-            if ( ! self::cacheavail() ) {
+        if (!is_array($stats)) {
+            if (!self::cacheavail()) {
                 return 0;
             }
             $stats = self::stats_scan();
             $count = $stats[0];
-            if ( $count > 100 ) {
+            if ($count > 100) {
                 // Store results in transient.
                 set_transient(
                     'autoptimize_stats',
                     $stats,
-                    apply_filters( 'autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS )
+                    apply_filters('autoptimize_filter_cache_statsexpiry', HOUR_IN_SECONDS)
                 );
             }
         }
@@ -492,30 +492,30 @@ 
         $size  = 0;
 
         // Scan everything in our cache directories.
-        foreach ( self::get_cache_contents() as $name => $files ) {
-            $dir = rtrim( AUTOPTIMIZE_CACHE_DIR . $name, '/' ) . '/';
-            foreach ( $files as $file ) {
-                if ( self::is_valid_cache_file( $dir, $file ) ) {
-                    if ( AUTOPTIMIZE_CACHE_NOGZIP &&
+        foreach (self::get_cache_contents() as $name => $files) {
+            $dir = rtrim(AUTOPTIMIZE_CACHE_DIR.$name, '/').'/';
+            foreach ($files as $file) {
+                if (self::is_valid_cache_file($dir, $file)) {
+                    if (AUTOPTIMIZE_CACHE_NOGZIP &&
                         (
-                            false !== strpos( $file, '.js' ) ||
-                            false !== strpos( $file, '.css' ) ||
-                            false !== strpos( $file, '.img' ) ||
-                            false !== strpos( $file, '.txt' )
+                            false !== strpos($file, '.js') ||
+                            false !== strpos($file, '.css') ||
+                            false !== strpos($file, '.img') ||
+                            false !== strpos($file, '.txt')
                         )
                     ) {
                         // Web server is gzipping, we count .js|.css|.img|.txt files.
                         $count++;
-                    } elseif ( ! AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos( $file, '.none' ) ) {
+                    } elseif (!AUTOPTIMIZE_CACHE_NOGZIP && false !== strpos($file, '.none')) {
                         // We are gzipping ourselves via php, counting only .none files.
                         $count++;
                     }
-                    $size += filesize( $dir . $file );
+                    $size += filesize($dir.$file);
                 }
             }
         }
 
-        $stats = array( $count, $size, time() );
+        $stats = array($count, $size, time());
 
         return $stats;
     }
@@ -529,22 +529,22 @@ 
      */
     public static function cacheavail()
     {
-        if ( false === autoptimizeCache::check_and_create_dirs() ) {
+        if (false === autoptimizeCache::check_and_create_dirs()) {
             return false;
         }
 
         // Using .htaccess inside our cache folder to overrule wp-super-cache.
-        $htaccess = AUTOPTIMIZE_CACHE_DIR . '/.htaccess';
-        if ( ! is_file( $htaccess ) ) {
+        $htaccess = AUTOPTIMIZE_CACHE_DIR.'/.htaccess';
+        if (!is_file($htaccess)) {
             /**
              * Create `wp-content/AO_htaccess_tmpl` file with
              * whatever htaccess rules you might need
              * if you want to override default AO htaccess
              */
-            $htaccess_tmpl = WP_CONTENT_DIR . '/AO_htaccess_tmpl';
-            if ( is_file( $htaccess_tmpl ) ) {
-                $content = file_get_contents( $htaccess_tmpl );
-            } elseif ( is_multisite() || ! AUTOPTIMIZE_CACHE_NOGZIP ) {
+            $htaccess_tmpl = WP_CONTENT_DIR.'/AO_htaccess_tmpl';
+            if (is_file($htaccess_tmpl)) {
+                $content = file_get_contents($htaccess_tmpl);
+            } elseif (is_multisite() || !AUTOPTIMIZE_CACHE_NOGZIP) {
                 $content = '<IfModule mod_expires.c>
         ExpiresActive On
         ExpiresByType text/css A30672000
@@ -598,13 +598,13 @@ 
 </IfModule>';
             }
 
-            if ( self::do_fallback() === true ) {
-                $content .= "\nErrorDocument 404 " . trailingslashit( parse_url( content_url(), PHP_URL_PATH ) ) . 'autoptimize_404_handler.php';
+            if (self::do_fallback() === true) {
+                $content .= "\nErrorDocument 404 ".trailingslashit(parse_url(content_url(), PHP_URL_PATH)).'autoptimize_404_handler.php';
             }
-            @file_put_contents( $htaccess, $content ); // @codingStandardsIgnoreLine
+            @file_put_contents($htaccess, $content); // @codingStandardsIgnoreLine
         }
 
-        if ( self::do_fallback() ) {
+        if (self::do_fallback()) {
             self::check_fallback_php();
         }
 
@@ -619,17 +619,17 @@ 
      */
     public static function check_fallback_php() {
         $_fallback_filename = 'autoptimize_404_handler.php';
-        $_fallback_php      = trailingslashit( WP_CONTENT_DIR ) . $_fallback_filename;
+        $_fallback_php      = trailingslashit(WP_CONTENT_DIR).$_fallback_filename;
         $_fallback_status   = true;
 
-        if ( ! file_exists( $_fallback_php ) ) {
-            $_fallback_php_contents = file_get_contents( AUTOPTIMIZE_PLUGIN_DIR . 'config/' . $_fallback_filename );
-            $_fallback_php_contents = str_replace( '<?php exit;', '<?php', $_fallback_php_contents );
-            $_fallback_php_contents = str_replace( '<!--ao-cache-dir-->', AUTOPTIMIZE_CACHE_DIR, $_fallback_php_contents );
-            if ( apply_filters( 'autoptimize_filter_cache_fallback_log_errors', false ) ) {
-                $_fallback_php_contents = str_replace( '// error_log', 'error_log', $_fallback_php_contents );
+        if (!file_exists($_fallback_php)) {
+            $_fallback_php_contents = file_get_contents(AUTOPTIMIZE_PLUGIN_DIR.'config/'.$_fallback_filename);
+            $_fallback_php_contents = str_replace('<?php exit;', '<?php', $_fallback_php_contents);
+            $_fallback_php_contents = str_replace('<!--ao-cache-dir-->', AUTOPTIMIZE_CACHE_DIR, $_fallback_php_contents);
+            if (apply_filters('autoptimize_filter_cache_fallback_log_errors', false)) {
+                $_fallback_php_contents = str_replace('// error_log', 'error_log', $_fallback_php_contents);
             }
-            $_fallback_status = file_put_contents( $_fallback_php, $_fallback_php_contents );
+            $_fallback_status = file_put_contents($_fallback_php, $_fallback_php_contents);
         }
 
         return $_fallback_status;
@@ -646,8 +646,8 @@ 
     public static function do_fallback() {
         static $_do_fallback = null;
 
-        if ( null === $_do_fallback ) {
-            $_do_fallback = (bool) apply_filters( 'autoptimize_filter_cache_do_fallback', autoptimizeOptionWrapper::get_option( 'autoptimize_cache_fallback', '' ) );
+        if (null === $_do_fallback) {
+            $_do_fallback = (bool) apply_filters('autoptimize_filter_cache_do_fallback', autoptimizeOptionWrapper::get_option('autoptimize_cache_fallback', ''));
         }
 
         return $_do_fallback;
@@ -659,26 +659,26 @@ 
      * and 410'ing ("Gone") if fallback not available.
      */
     public static function wordpress_notfound_fallback() {
-        $original_request = strtok( $_SERVER['REQUEST_URI'], '?' );
-        if ( strpos( $original_request, wp_basename( WP_CONTENT_DIR ) . AUTOPTIMIZE_CACHE_CHILD_DIR ) !== false && is_404() ) {
+        $original_request = strtok($_SERVER['REQUEST_URI'], '?');
+        if (strpos($original_request, wp_basename(WP_CONTENT_DIR).AUTOPTIMIZE_CACHE_CHILD_DIR) !== false && is_404()) {
             // make sure this is not considered a 404.
             global $wp_query;
             $wp_query->is_404 = false;
 
             // set fallback path.
-            $js_or_css     = pathinfo( $original_request, PATHINFO_EXTENSION );
-            $fallback_path = AUTOPTIMIZE_CACHE_DIR . $js_or_css . '/autoptimize_fallback.' . $js_or_css;
+            $js_or_css     = pathinfo($original_request, PATHINFO_EXTENSION);
+            $fallback_path = AUTOPTIMIZE_CACHE_DIR.$js_or_css.'/autoptimize_fallback.'.$js_or_css;
 
             // set fallback URL.
-            $fallback_target = preg_replace( '/(.*)_(?:[a-z0-9]{32})\.(js|css)$/', '${1}_fallback.${2}', $original_request );
+            $fallback_target = preg_replace('/(.*)_(?:[a-z0-9]{32})\.(js|css)$/', '${1}_fallback.${2}', $original_request);
 
             // redirect to fallback if possible.
-            if ( $original_request !== $fallback_target && file_exists( $fallback_path ) ) {
+            if ($original_request !== $fallback_target && file_exists($fallback_path)) {
                 // redirect to fallback.
-                wp_redirect( $fallback_target, 302 );
+                wp_redirect($fallback_target, 302);
             } else {
                 // return HTTP 410 (gone) reponse.
-                status_header( 410 );
+                status_header(410);
             }
         }
     }
@@ -690,13 +690,13 @@ 
      * @return bool
      */
     public static function check_and_create_dirs() {
-        if ( ! defined( 'AUTOPTIMIZE_CACHE_DIR' ) ) {
+        if (!defined('AUTOPTIMIZE_CACHE_DIR')) {
             // We didn't set a cache.
             return false;
         }
 
-        foreach ( array( '', 'js', 'css' ) as $dir ) {
-            if ( ! self::check_cache_dir( AUTOPTIMIZE_CACHE_DIR . $dir ) ) {
+        foreach (array('', 'js', 'css') as $dir) {
+            if (!self::check_cache_dir(AUTOPTIMIZE_CACHE_DIR.$dir)) {
                 return false;
             }
         }
@@ -711,25 +711,25 @@ 
      *
      * @return bool
      */
-    protected static function check_cache_dir( $dir )
+    protected static function check_cache_dir($dir)
     {
         // Try creating the dir if it doesn't exist.
-        if ( ! file_exists( $dir ) ) {
-            @mkdir( $dir, 0775, true ); // @codingStandardsIgnoreLine
-            if ( ! file_exists( $dir ) ) {
+        if (!file_exists($dir)) {
+            @mkdir($dir, 0775, true); // @codingStandardsIgnoreLine
+            if (!file_exists($dir)) {
                 return false;
             }
         }
 
         // If we still cannot write, bail.
-        if ( ! is_writable( $dir ) ) {
+        if (!is_writable($dir)) {
             return false;
         }
 
         // Create an index.html in there to avoid prying eyes!
-        $idx_file = rtrim( $dir, '/\\' ) . '/index.html';
-        if ( ! is_file( $idx_file ) ) {
-            @file_put_contents( $idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>' ); // @codingStandardsIgnoreLine
+        $idx_file = rtrim($dir, '/\\').'/index.html';
+        if (!is_file($idx_file)) {
+            @file_put_contents($idx_file, '<html><head><meta name="robots" content="noindex, nofollow"></head><body>Generated by <a href="http://wordpress.org/extend/plugins/autoptimize/" rel="nofollow">Autoptimize</a></body></html>'); // @codingStandardsIgnoreLine
         }
 
         return true;
@@ -743,50 +743,50 @@ 
     // @codingStandardsIgnoreStart
     public static function flushPageCache()
     {
-        if ( function_exists( 'wp_cache_clear_cache' ) ) {
-            if ( is_multisite() ) {
+        if (function_exists('wp_cache_clear_cache')) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                wp_cache_clear_cache( $blog_id );
+                wp_cache_clear_cache($blog_id);
             } else {
                 wp_cache_clear_cache();
             }
-        } elseif ( has_action( 'cachify_flush_cache' ) ) {
-            do_action( 'cachify_flush_cache' );
-        } elseif ( function_exists( 'w3tc_pgcache_flush' ) ) {
+        } elseif (has_action('cachify_flush_cache')) {
+            do_action('cachify_flush_cache');
+        } elseif (function_exists('w3tc_pgcache_flush')) {
             w3tc_pgcache_flush();
-        } elseif ( function_exists( 'wp_fast_cache_bulk_delete_all' ) ) {
+        } elseif (function_exists('wp_fast_cache_bulk_delete_all')) {
             wp_fast_cache_bulk_delete_all();
-        } elseif ( class_exists( 'WpFastestCache' ) ) {
+        } elseif (class_exists('WpFastestCache')) {
             $wpfc = new WpFastestCache();
             $wpfc->deleteCache();
-        } elseif ( class_exists( 'c_ws_plugin__qcache_purging_routines' ) ) {
+        } elseif (class_exists('c_ws_plugin__qcache_purging_routines')) {
             c_ws_plugin__qcache_purging_routines::purge_cache_dir(); // quick cache
-        } elseif ( class_exists( 'zencache' ) ) {
+        } elseif (class_exists('zencache')) {
             zencache::clear();
-        } elseif ( class_exists( 'comet_cache' ) ) {
+        } elseif (class_exists('comet_cache')) {
             comet_cache::clear();
-        } elseif ( class_exists( 'WpeCommon' ) ) {
+        } elseif (class_exists('WpeCommon')) {
             // WPEngine cache purge/flush methods to call by default
             $wpe_methods = array(
                 'purge_varnish_cache',
             );
 
             // More agressive clear/flush/purge behind a filter
-            if ( apply_filters( 'autoptimize_flush_wpengine_aggressive', false ) ) {
-                $wpe_methods = array_merge( $wpe_methods, array( 'purge_memcached', 'clear_maxcdn_cache' ) );
+            if (apply_filters('autoptimize_flush_wpengine_aggressive', false)) {
+                $wpe_methods = array_merge($wpe_methods, array('purge_memcached', 'clear_maxcdn_cache'));
             }
 
             // Filtering the entire list of WpeCommon methods to be called (for advanced usage + easier testing)
-            $wpe_methods = apply_filters( 'autoptimize_flush_wpengine_methods', $wpe_methods );
+            $wpe_methods = apply_filters('autoptimize_flush_wpengine_methods', $wpe_methods);
 
-            foreach ( $wpe_methods as $wpe_method ) {
-                if ( method_exists( 'WpeCommon', $wpe_method ) ) {
+            foreach ($wpe_methods as $wpe_method) {
+                if (method_exists('WpeCommon', $wpe_method)) {
                     WpeCommon::$wpe_method();
                 }
             }
-        } elseif ( function_exists( 'sg_cachepress_purge_cache' ) ) {
+        } elseif (function_exists('sg_cachepress_purge_cache')) {
             sg_cachepress_purge_cache();
-        } elseif ( array_key_exists( 'KINSTA_CACHE_ZONE', $_SERVER ) ) {
+        } elseif (array_key_exists('KINSTA_CACHE_ZONE', $_SERVER)) {
             $_kinsta_clear_cache_url = 'https://localhost/kinsta-clear-cache-all';
             $_kinsta_response        = wp_remote_get(
                 $_kinsta_clear_cache_url,
@@ -795,18 +795,18 @@ 
                     'timeout' => 5,
                     )
             );
-        } elseif ( defined('NGINX_HELPER_BASENAME') ) {
-            do_action( 'rt_nginx_helper_purge_all' );
-        } elseif ( file_exists( WP_CONTENT_DIR . '/wp-cache-config.php' ) && function_exists( 'prune_super_cache' ) ) {
+        } elseif (defined('NGINX_HELPER_BASENAME')) {
+            do_action('rt_nginx_helper_purge_all');
+        } elseif (file_exists(WP_CONTENT_DIR.'/wp-cache-config.php') && function_exists('prune_super_cache')) {
             // fallback for WP-Super-Cache
             global $cache_path;
-            if ( is_multisite() ) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                prune_super_cache( get_supercache_dir( $blog_id ), true );
-                prune_super_cache( $cache_path . 'blogs/', true );
+                prune_super_cache(get_supercache_dir($blog_id), true);
+                prune_super_cache($cache_path.'blogs/', true);
             } else {
-                prune_super_cache( $cache_path . 'supercache/', true );
-                prune_super_cache( $cache_path, true );
+                prune_super_cache($cache_path.'supercache/', true);
+                prune_super_cache($cache_path, true);
             }
         }
     }

classes/autoptimizeScripts.php

Spacing +175 added lines, -175 removed lines

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

classes/critcss-inc/admin_settings_explain.php

Spacing +11 added lines, -11 removed lines

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