futtta / autoptimize

classes/autoptimizeVersionUpdatesHandler.php

Spacing +52 added lines, -52 removed lines

@@ -3,7 +3,7 @@ 
  * Handles version updates and should only be instantiated in autoptimize.php if/when needed.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -16,9 +16,9 @@ 
      */
     protected $current_major_version = null;
 
-    public function __construct( $current_version )
+    public function __construct($current_version)
     {
-        $this->current_major_version = substr( $current_version, 0, 3 );
+        $this->current_major_version = substr($current_version, 0, 3);
     }
 
     /**
@@ -29,7 +29,7 @@ 
     {
         $major_update = false;
 
-        switch ( $this->current_major_version ) {
+        switch ($this->current_major_version) {
             case '1.6':
                 $this->upgrade_from_1_6();
                 $major_update = true;
@@ -47,14 +47,14 @@ 
                 $major_update = true;
                 // No break, intentionally, so all upgrades are ran during a single request...
             case '2.4':
-                if ( get_option( 'autoptimize_version', 'none' ) == '2.4.2' ) {
+                if (get_option('autoptimize_version', 'none') == '2.4.2') {
                     $this->upgrade_from_2_4_2();
                 }
                 $major_update = false;
                 // No break, intentionally, so all upgrades are ran during a single request...
         }
 
-        if ( true === $major_update ) {
+        if (true === $major_update) {
             $this->on_major_version_update();
         }
     }
@@ -66,19 +66,19 @@ 
      *
      * @param string $target Target version to check against (ie., the currently running one).
      */
-    public static function check_installed_and_update( $target )
+    public static function check_installed_and_update($target)
     {
-        $db_version = get_option( 'autoptimize_version', 'none' );
-        if ( $db_version !== $target ) {
-            if ( 'none' === $db_version ) {
-                add_action( 'admin_notices', 'autoptimizeMain::notice_installed' );
+        $db_version = get_option('autoptimize_version', 'none');
+        if ($db_version !== $target) {
+            if ('none' === $db_version) {
+                add_action('admin_notices', 'autoptimizeMain::notice_installed');
             } else {
-                $updater = new self( $db_version );
+                $updater = new self($db_version);
                 $updater->run_needed_major_upgrades();
             }
 
             // Versions differed, upgrades happened if needed, store the new version.
-            update_option( 'autoptimize_version', $target );
+            update_option('autoptimize_version', $target);
         }
     }
 
@@ -89,10 +89,10 @@ 
     protected function on_major_version_update()
     {
         // The transients guard here prevents stale object caches from busting the cache on every request.
-        if ( false == get_transient( 'autoptimize_stale_option_buster' ) ) {
-            set_transient( 'autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS );
+        if (false == get_transient('autoptimize_stale_option_buster')) {
+            set_transient('autoptimize_stale_option_buster', 'Mamsie & Liessie zehhe: ZWIJH!', HOUR_IN_SECONDS);
             autoptimizeCache::clearall();
-            add_action( 'admin_notices', 'autoptimizeMain::notice_updated' );
+            add_action('admin_notices', 'autoptimizeMain::notice_updated');
         }
     }
 
@@ -102,7 +102,7 @@ 
     private function upgrade_from_1_6()
     {
         // If user was on version 1.6.x, force advanced options to be shown by default.
-        update_option( 'autoptimize_show_adv', '1' );
+        update_option('autoptimize_show_adv', '1');
 
         // And remove old options.
         $to_delete_options = array(
@@ -114,8 +114,8 @@ 
             'autoptimize_cdn_img_url',
             'autoptimize_css_yui',
         );
-        foreach ( $to_delete_options as $del_opt ) {
-            delete_option( $del_opt );
+        foreach ($to_delete_options as $del_opt) {
+            delete_option($del_opt);
         }
     }
 
@@ -126,29 +126,29 @@ 
      */
     private function upgrade_from_1_7()
     {
-        if ( ! is_multisite() ) {
-            $css_exclude = get_option( 'autoptimize_css_exclude' );
-            if ( empty( $css_exclude ) ) {
+        if (!is_multisite()) {
+            $css_exclude = get_option('autoptimize_css_exclude');
+            if (empty($css_exclude)) {
                 $css_exclude = 'admin-bar.min.css, dashicons.min.css';
-            } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
+            } elseif (false === strpos($css_exclude, 'dashicons.min.css')) {
                 $css_exclude .= ', dashicons.min.css';
             }
-            update_option( 'autoptimize_css_exclude', $css_exclude );
+            update_option('autoptimize_css_exclude', $css_exclude);
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                $css_exclude = get_option( 'autoptimize_css_exclude' );
-                if ( empty( $css_exclude ) ) {
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                $css_exclude = get_option('autoptimize_css_exclude');
+                if (empty($css_exclude)) {
                     $css_exclude = 'admin-bar.min.css, dashicons.min.css';
-                } elseif ( false === strpos( $css_exclude, 'dashicons.min.css' ) ) {
+                } elseif (false === strpos($css_exclude, 'dashicons.min.css')) {
                     $css_exclude .= ', dashicons.min.css';
                 }
-                update_option( 'autoptimize_css_exclude', $css_exclude );
+                update_option('autoptimize_css_exclude', $css_exclude);
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -160,19 +160,19 @@ 
      */
     private function upgrade_from_1_9()
     {
-        if ( ! is_multisite() ) {
-            update_option( 'autoptimize_css_include_inline', 'on' );
-            update_option( 'autoptimize_js_include_inline', 'on' );
+        if (!is_multisite()) {
+            update_option('autoptimize_css_include_inline', 'on');
+            update_option('autoptimize_js_include_inline', 'on');
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
-                update_option( 'autoptimize_css_include_inline', 'on' );
-                update_option( 'autoptimize_js_include_inline', 'on' );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
+                update_option('autoptimize_css_include_inline', 'on');
+                update_option('autoptimize_js_include_inline', 'on');
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -183,17 +183,17 @@ 
      */
     private function upgrade_from_2_2()
     {
-        if ( ! is_multisite() ) {
+        if (!is_multisite()) {
             $this->do_2_2_settings_update();
         } else {
             global $wpdb;
-            $blog_ids         = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+            $blog_ids         = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
             $original_blog_id = get_current_blog_id();
-            foreach ( $blog_ids as $blog_id ) {
-                switch_to_blog( $blog_id );
+            foreach ($blog_ids as $blog_id) {
+                switch_to_blog($blog_id);
                 $this->do_2_2_settings_update();
             }
-            switch_to_blog( $original_blog_id );
+            switch_to_blog($original_blog_id);
         }
     }
 
@@ -202,18 +202,18 @@ 
      */
     private function do_2_2_settings_update()
     {
-        $nogooglefont    = get_option( 'autoptimize_css_nogooglefont', '' );
-        $ao_extrasetting = get_option( 'autoptimize_extra_settings', '' );
-        if ( ( $nogooglefont ) && ( empty( $ao_extrasetting ) ) ) {
-            update_option( 'autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options() );
+        $nogooglefont    = get_option('autoptimize_css_nogooglefont', '');
+        $ao_extrasetting = get_option('autoptimize_extra_settings', '');
+        if (($nogooglefont) && (empty($ao_extrasetting))) {
+            update_option('autoptimize_extra_settings', autoptimizeConfig::get_ao_extra_default_options());
         }
-        delete_option( 'autoptimize_css_nogooglefont' );
+        delete_option('autoptimize_css_nogooglefont');
     }
 
     /**
      * 2.4.2 introduced too many cronned ao_cachecheckers, make this right
      */
     private function upgrade_from_2_4_2() {
-        wp_clear_scheduled_hook( 'ao_cachechecker' );
+        wp_clear_scheduled_hook('ao_cachechecker');
     }
 }

classes/autoptimizeCacheChecker.php

Spacing +38 added lines, -38 removed lines

@@ -6,7 +6,7 @@ 
  * Checks if cachesize is > 0.5GB (size is filterable), if so, an option is set which controls showing an admin notice.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -25,51 +25,51 @@ 
 
     public function add_hooks()
     {
-        if ( is_admin() ) {
-            add_action( 'plugins_loaded', array( $this, 'setup' ) );
+        if (is_admin()) {
+            add_action('plugins_loaded', array($this, 'setup'));
         }
-        add_action( self::SCHEDULE_HOOK, array( $this, 'cronjob' ) );
-        add_action( 'admin_notices', array( $this, 'show_admin_notice' ) );
+        add_action(self::SCHEDULE_HOOK, array($this, 'cronjob'));
+        add_action('admin_notices', array($this, 'show_admin_notice'));
     }
 
     public function setup()
     {
-        $do_cache_check = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true );
-        $schedule       = wp_get_schedule( self::SCHEDULE_HOOK );
-        $frequency      = apply_filters( 'autoptimize_filter_cachecheck_frequency', 'twicedaily' );
-        if ( ! in_array( $frequency, array( 'hourly', 'twicedaily', 'daily', 'weekly', 'monthly' ) ) ) {
+        $do_cache_check = (bool) apply_filters('autoptimize_filter_cachecheck_do', true);
+        $schedule       = wp_get_schedule(self::SCHEDULE_HOOK);
+        $frequency      = apply_filters('autoptimize_filter_cachecheck_frequency', 'twicedaily');
+        if (!in_array($frequency, array('hourly', 'twicedaily', 'daily', 'weekly', 'monthly'))) {
             $frequency = 'twicedaily';
         }
-        if ( $do_cache_check && ( ! $schedule || $schedule !== $frequency ) ) {
-            if ( $schedule ) {
-                wp_clear_scheduled_hook( self::SCHEDULE_HOOK );
+        if ($do_cache_check && (!$schedule || $schedule !== $frequency)) {
+            if ($schedule) {
+                wp_clear_scheduled_hook(self::SCHEDULE_HOOK);
             }
-            wp_schedule_event( time(), $frequency, self::SCHEDULE_HOOK );
-        } elseif ( $schedule && ! $do_cache_check ) {
-            wp_clear_scheduled_hook( self::SCHEDULE_HOOK );
+            wp_schedule_event(time(), $frequency, self::SCHEDULE_HOOK);
+        } elseif ($schedule && !$do_cache_check) {
+            wp_clear_scheduled_hook(self::SCHEDULE_HOOK);
         }
     }
 
     public function cronjob()
     {
         // Check cachesize and act accordingly.
-        $max_size       = (int) apply_filters( 'autoptimize_filter_cachecheck_maxsize', 536870912 );
-        $do_cache_check = (bool) apply_filters( 'autoptimize_filter_cachecheck_do', true );
+        $max_size       = (int) apply_filters('autoptimize_filter_cachecheck_maxsize', 536870912);
+        $do_cache_check = (bool) apply_filters('autoptimize_filter_cachecheck_do', true);
         $stat_array     = autoptimizeCache::stats();
-        $cache_size     = round( $stat_array[1] );
-        if ( ( $cache_size > $max_size ) && ( $do_cache_check ) ) {
-            update_option( 'autoptimize_cachesize_notice', true );
-            if ( apply_filters( 'autoptimize_filter_cachecheck_sendmail', true ) ) {
-                $site_url  = esc_url( site_url() );
-                $ao_mailto = apply_filters( 'autoptimize_filter_cachecheck_mailto', get_option( 'admin_email', '' ) );
-
-                $ao_mailsubject = __( 'Autoptimize cache size warning', 'autoptimize' ) . ' (' . $site_url . ')';
-                $ao_mailbody    = __( 'Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize' ) . ' (site: ' . $site_url . ')';
-
-                if ( ! empty( $ao_mailto ) ) {
-                    $ao_mailresult = wp_mail( $ao_mailto, $ao_mailsubject, $ao_mailbody );
-                    if ( ! $ao_mailresult ) {
-                        error_log( 'Autoptimize could not send cache size warning mail.' );
+        $cache_size     = round($stat_array[1]);
+        if (($cache_size > $max_size) && ($do_cache_check)) {
+            update_option('autoptimize_cachesize_notice', true);
+            if (apply_filters('autoptimize_filter_cachecheck_sendmail', true)) {
+                $site_url  = esc_url(site_url());
+                $ao_mailto = apply_filters('autoptimize_filter_cachecheck_mailto', get_option('admin_email', ''));
+
+                $ao_mailsubject = __('Autoptimize cache size warning', 'autoptimize').' ('.$site_url.')';
+                $ao_mailbody    = __('Autoptimize\'s cache size is getting big, consider purging the cache. Have a look at https://wordpress.org/plugins/autoptimize/faq/ to see how you can keep the cache size under control.', 'autoptimize').' (site: '.$site_url.')';
+
+                if (!empty($ao_mailto)) {
+                    $ao_mailresult = wp_mail($ao_mailto, $ao_mailsubject, $ao_mailbody);
+                    if (!$ao_mailresult) {
+                        error_log('Autoptimize could not send cache size warning mail.');
                     }
                 }
             }
@@ -87,16 +87,16 @@ 
 
     public function show_admin_notice()
     {
-        if ( (bool) get_option( 'autoptimize_cachesize_notice', false ) && current_user_can( 'manage_options' ) ) {
+        if ((bool) get_option('autoptimize_cachesize_notice', false) && current_user_can('manage_options')) {
             echo '<div class="notice notice-warning"><p>';
-            _e( '<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank" rel="noopener noreferrer">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize' );
+            _e('<strong>Autoptimize\'s cache size is getting big</strong>, consider purging the cache. Have a look at <a href="https://wordpress.org/plugins/autoptimize/faq/" target="_blank" rel="noopener noreferrer">the Autoptimize FAQ</a> to see how you can keep the cache size under control.', 'autoptimize');
             echo '</p></div>';
-            update_option( 'autoptimize_cachesize_notice', false );
+            update_option('autoptimize_cachesize_notice', false);
         }
 
         // Notice for image proxy usage.
         $_imgopt_notice = autoptimizeExtra::get_imgopt_status_notice_wrapper();
-        if ( current_user_can( 'manage_options' ) && is_array( $_imgopt_notice ) && array_key_exists( 'status', $_imgopt_notice ) && in_array( $_imgopt_notice['status'], array( 1, -1, -2 ) ) ) {
+        if (current_user_can('manage_options') && is_array($_imgopt_notice) && array_key_exists('status', $_imgopt_notice) && in_array($_imgopt_notice['status'], array(1, -1, -2))) {
             $_dismissible = 'ao-img-opt-notice-';
             $_hide_notice = '7';
 
@@ -104,10 +104,10 @@ 
                 $_hide_notice = '1';
             }
 
-            $_imgopt_notice_dismissible = apply_filters( 'autoptimize_filter_imgopt_notice_dismissable', $_dismissible . $_hide_notice );
+            $_imgopt_notice_dismissible = apply_filters('autoptimize_filter_imgopt_notice_dismissable', $_dismissible.$_hide_notice);
 
-            if ( $_imgopt_notice && PAnD::is_admin_notice_active( $_imgopt_notice_dismissible ) ) {
-                echo '<div class="notice notice-warning is-dismissible" data-dismissible="' . $_imgopt_notice_dismissible . '"><p>' . $_imgopt_notice['notice'] . '</p></div>';
+            if ($_imgopt_notice && PAnD::is_admin_notice_active($_imgopt_notice_dismissible)) {
+                echo '<div class="notice notice-warning is-dismissible" data-dismissible="'.$_imgopt_notice_dismissible.'"><p>'.$_imgopt_notice['notice'].'</p></div>';
             }
         }
     }

autoptimize.php

Spacing +33 added lines, -33 removed lines

@@ -16,66 +16,66 @@ 
  */
 
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
-define( 'AUTOPTIMIZE_PLUGIN_VERSION', '2.4.3' );
+define('AUTOPTIMIZE_PLUGIN_VERSION', '2.4.3');
 
 // 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;