futtta / autoptimize

classes/autoptimizeCriticalCSSBase.php

Spacing +67 added lines, -67 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS base file (initializes all ccss files).
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -19,35 +19,35 @@ 
     public function __construct()
     {
         // define constant, but only once.
-        if ( ! defined( 'AO_CCSS_DIR' ) ) {
+        if (!defined('AO_CCSS_DIR')) {
             // Define a constant with the directory to store critical CSS in.
-            if ( is_multisite() ) {
+            if (is_multisite()) {
                 $blog_id = get_current_blog_id();
-                define( 'AO_CCSS_DIR', WP_CONTENT_DIR . '/uploads/ao_ccss/' . $blog_id . '/' );
+                define('AO_CCSS_DIR', WP_CONTENT_DIR.'/uploads/ao_ccss/'.$blog_id.'/');
             } else {
-                define( 'AO_CCSS_DIR', WP_CONTENT_DIR . '/uploads/ao_ccss/' );
+                define('AO_CCSS_DIR', WP_CONTENT_DIR.'/uploads/ao_ccss/');
             }
         }
-        if ( ! defined( 'AO_CCSS_VER' ) ) {
+        if (!defined('AO_CCSS_VER')) {
             // Define plugin version.
-            define( 'AO_CCSS_VER', 'AO_' . AUTOPTIMIZE_PLUGIN_VERSION );
+            define('AO_CCSS_VER', 'AO_'.AUTOPTIMIZE_PLUGIN_VERSION);
 
             // Define constants for criticalcss.com base path and API endpoints.
             // fixme: AO_CCSS_URL should be read from the autoptimize availability json stored as option.
-            define( 'AO_CCSS_URL', 'https://criticalcss.com' );
-            define( 'AO_CCSS_API', AO_CCSS_URL . '/api/premium/' );
-            define( 'AO_CCSS_SLEEP', 10 );
+            define('AO_CCSS_URL', 'https://criticalcss.com');
+            define('AO_CCSS_API', AO_CCSS_URL.'/api/premium/');
+            define('AO_CCSS_SLEEP', 10);
         }
 
         // Define support files locations, in case they are not already defined.
-        if ( ! defined( 'AO_CCSS_LOCK' ) ) {
-            define( 'AO_CCSS_LOCK', AO_CCSS_DIR . 'queue.lock' );
+        if (!defined('AO_CCSS_LOCK')) {
+            define('AO_CCSS_LOCK', AO_CCSS_DIR.'queue.lock');
         }
-        if ( ! defined( 'AO_CCSS_LOG' ) ) {
-            define( 'AO_CCSS_LOG', AO_CCSS_DIR . 'queuelog.html' );
+        if (!defined('AO_CCSS_LOG')) {
+            define('AO_CCSS_LOG', AO_CCSS_DIR.'queuelog.html');
         }
-        if ( ! defined( 'AO_CCSS_DEBUG' ) ) {
-            define( 'AO_CCSS_DEBUG', AO_CCSS_DIR . 'queue.json' );
+        if (!defined('AO_CCSS_DEBUG')) {
+            define('AO_CCSS_DEBUG', AO_CCSS_DIR.'queue.json');
         }
 
         $this->filepath = __FILE__;
@@ -60,19 +60,19 @@ 
     {
         // get all options.
         $all_options = $this->fetch_options();
-        foreach ( $all_options as $option => $value ) {
+        foreach ($all_options as $option => $value) {
             ${$option} = $value;
         }
 
         // make sure the 10 minutes cron schedule is added.
-        add_filter( 'cron_schedules', array( $this, 'ao_ccss_interval' ) );
+        add_filter('cron_schedules', array($this, 'ao_ccss_interval'));
 
         // check if we need to upgrade.
         $this->check_upgrade();
 
         // make sure ao_ccss_queue is scheduled OK if an API key is set.
-        if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_queue' ) ) {
-            wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' );
+        if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_queue')) {
+            wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue');
         }
     }
 
@@ -80,12 +80,12 @@ 
         // Required libs, core is always needed.
         $criticalcss_core = new autoptimizeCriticalCSSCore();
 
-        if ( defined( 'WP_CLI' ) || defined( 'DOING_CRON' ) || is_admin() ) {
+        if (defined('WP_CLI') || defined('DOING_CRON') || is_admin()) {
             // TODO: also include if overridden somehow to force queue processing to be executed?
             $criticalcss_cron = new autoptimizeCriticalCSSCron();
         }
 
-        if ( is_admin() ) {
+        if (is_admin()) {
             $criticalcss_settings = new autoptimizeCriticalCSSSettings();
         } else {
             // enqueuing only done when not wp-admin.
@@ -96,51 +96,51 @@ 
     public static function fetch_options() {
         static $autoptimize_ccss_options = null;
 
-        if ( null === $autoptimize_ccss_options ) {
+        if (null === $autoptimize_ccss_options) {
             // not cached yet, fetching from WordPress options.
-            $autoptimize_ccss_options['ao_css_defer']          = autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer' );
-            $autoptimize_ccss_options['ao_css_defer_inline']   = autoptimizeOptionWrapper::get_option( 'autoptimize_css_defer_inline' );
-            $autoptimize_ccss_options['ao_ccss_rules_raw']     = get_option( 'autoptimize_ccss_rules', false );
-            $autoptimize_ccss_options['ao_ccss_additional']    = get_option( 'autoptimize_ccss_additional' );
-            $autoptimize_ccss_options['ao_ccss_queue_raw']     = get_option( 'autoptimize_ccss_queue', false );
-            $autoptimize_ccss_options['ao_ccss_viewport']      = get_option( 'autoptimize_ccss_viewport', false );
-            $autoptimize_ccss_options['ao_ccss_finclude']      = get_option( 'autoptimize_ccss_finclude', false );
-            $autoptimize_ccss_options['ao_ccss_rtimelimit']    = get_option( 'autoptimize_ccss_rtimelimit', '30' );
-            $autoptimize_ccss_options['ao_ccss_noptimize']     = get_option( 'autoptimize_ccss_noptimize', false );
-            $autoptimize_ccss_options['ao_ccss_debug']         = get_option( 'autoptimize_ccss_debug', false );
-            $autoptimize_ccss_options['ao_ccss_key']           = get_option( 'autoptimize_ccss_key' );
-            $autoptimize_ccss_options['ao_ccss_keyst']         = get_option( 'autoptimize_ccss_keyst' );
-            $autoptimize_ccss_options['ao_ccss_loggedin']      = get_option( 'autoptimize_ccss_loggedin', '1' );
-            $autoptimize_ccss_options['ao_ccss_forcepath']     = get_option( 'autoptimize_ccss_forcepath', '1' );
-            $autoptimize_ccss_options['ao_ccss_servicestatus'] = get_option( 'autoptimize_service_availablity' );
-            $autoptimize_ccss_options['ao_ccss_deferjquery']   = get_option( 'autoptimize_ccss_deferjquery', false );
-            $autoptimize_ccss_options['ao_ccss_domain']        = get_option( 'autoptimize_ccss_domain' );
-            $autoptimize_ccss_options['ao_ccss_unloadccss']    = get_option( 'autoptimize_ccss_unloadccss', false );
-
-            if ( strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'http' ) === false && strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'uggc' ) === 0 ) {
-                $autoptimize_ccss_options['ao_ccss_domain'] = str_rot13( $autoptimize_ccss_options['ao_ccss_domain'] );
-            } elseif ( strpos( $autoptimize_ccss_options['ao_ccss_domain'], 'http' ) !== false ) {
+            $autoptimize_ccss_options['ao_css_defer']          = autoptimizeOptionWrapper::get_option('autoptimize_css_defer');
+            $autoptimize_ccss_options['ao_css_defer_inline']   = autoptimizeOptionWrapper::get_option('autoptimize_css_defer_inline');
+            $autoptimize_ccss_options['ao_ccss_rules_raw']     = get_option('autoptimize_ccss_rules', false);
+            $autoptimize_ccss_options['ao_ccss_additional']    = get_option('autoptimize_ccss_additional');
+            $autoptimize_ccss_options['ao_ccss_queue_raw']     = get_option('autoptimize_ccss_queue', false);
+            $autoptimize_ccss_options['ao_ccss_viewport']      = get_option('autoptimize_ccss_viewport', false);
+            $autoptimize_ccss_options['ao_ccss_finclude']      = get_option('autoptimize_ccss_finclude', false);
+            $autoptimize_ccss_options['ao_ccss_rtimelimit']    = get_option('autoptimize_ccss_rtimelimit', '30');
+            $autoptimize_ccss_options['ao_ccss_noptimize']     = get_option('autoptimize_ccss_noptimize', false);
+            $autoptimize_ccss_options['ao_ccss_debug']         = get_option('autoptimize_ccss_debug', false);
+            $autoptimize_ccss_options['ao_ccss_key']           = get_option('autoptimize_ccss_key');
+            $autoptimize_ccss_options['ao_ccss_keyst']         = get_option('autoptimize_ccss_keyst');
+            $autoptimize_ccss_options['ao_ccss_loggedin']      = get_option('autoptimize_ccss_loggedin', '1');
+            $autoptimize_ccss_options['ao_ccss_forcepath']     = get_option('autoptimize_ccss_forcepath', '1');
+            $autoptimize_ccss_options['ao_ccss_servicestatus'] = get_option('autoptimize_service_availablity');
+            $autoptimize_ccss_options['ao_ccss_deferjquery']   = get_option('autoptimize_ccss_deferjquery', false);
+            $autoptimize_ccss_options['ao_ccss_domain']        = get_option('autoptimize_ccss_domain');
+            $autoptimize_ccss_options['ao_ccss_unloadccss']    = get_option('autoptimize_ccss_unloadccss', false);
+
+            if (strpos($autoptimize_ccss_options['ao_ccss_domain'], 'http') === false && strpos($autoptimize_ccss_options['ao_ccss_domain'], 'uggc') === 0) {
+                $autoptimize_ccss_options['ao_ccss_domain'] = str_rot13($autoptimize_ccss_options['ao_ccss_domain']);
+            } elseif (strpos($autoptimize_ccss_options['ao_ccss_domain'], 'http') !== false) {
                 // not rot13'ed yet, do so now (goal; avoid migration plugins change the bound domain).
-                update_option( 'autoptimize_ccss_domain', str_rot13( $autoptimize_ccss_options['ao_ccss_domain'] ) );
+                update_option('autoptimize_ccss_domain', str_rot13($autoptimize_ccss_options['ao_ccss_domain']));
             }
 
             // Setup the rules array.
-            if ( empty( $autoptimize_ccss_options['ao_ccss_rules_raw'] ) ) {
+            if (empty($autoptimize_ccss_options['ao_ccss_rules_raw'])) {
                 $autoptimize_ccss_options['ao_ccss_rules']['paths'] = array();
                 $autoptimize_ccss_options['ao_ccss_rules']['types'] = array();
             } else {
-                $autoptimize_ccss_options['ao_ccss_rules'] = json_decode( $autoptimize_ccss_options['ao_ccss_rules_raw'], true );
+                $autoptimize_ccss_options['ao_ccss_rules'] = json_decode($autoptimize_ccss_options['ao_ccss_rules_raw'], true);
             }
 
             // Setup the queue array.
-            if ( empty( $autoptimize_ccss_options['ao_ccss_queue_raw'] ) ) {
+            if (empty($autoptimize_ccss_options['ao_ccss_queue_raw'])) {
                 $autoptimize_ccss_options['ao_ccss_queue'] = array();
             } else {
-                $autoptimize_ccss_options['ao_ccss_queue'] = json_decode( $autoptimize_ccss_options['ao_ccss_queue_raw'], true );
+                $autoptimize_ccss_options['ao_ccss_queue'] = json_decode($autoptimize_ccss_options['ao_ccss_queue_raw'], true);
             }
 
             // Override API key if constant is defined.
-            if ( defined( 'AUTOPTIMIZE_CRITICALCSS_API_KEY' ) ) {
+            if (defined('AUTOPTIMIZE_CRITICALCSS_API_KEY')) {
                 $autoptimize_ccss_options['ao_ccss_key'] = AUTOPTIMIZE_CRITICALCSS_API_KEY;
             }
         }
@@ -152,49 +152,49 @@ 
         global $ao_ccss_key;
 
         // Create the cache directory if it doesn't exist already.
-        if ( ! file_exists( AO_CCSS_DIR ) ) {
-            mkdir( AO_CCSS_DIR, 0755, true );
+        if (!file_exists(AO_CCSS_DIR)) {
+            mkdir(AO_CCSS_DIR, 0755, true);
         }
 
         // Create a scheduled event for the queue.
-        if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_queue' ) ) {
-            wp_schedule_event( time(), apply_filters( 'ao_ccss_queue_schedule', 'ao_ccss' ), 'ao_ccss_queue' );
+        if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_queue')) {
+            wp_schedule_event(time(), apply_filters('ao_ccss_queue_schedule', 'ao_ccss'), 'ao_ccss_queue');
         }
 
         // Create a scheduled event for log maintenance.
-        if ( isset( $ao_ccss_key ) && ! empty( $ao_ccss_key ) && ! wp_next_scheduled( 'ao_ccss_maintenance' ) ) {
-            wp_schedule_event( time(), 'twicedaily', 'ao_ccss_maintenance' );
+        if (isset($ao_ccss_key) && !empty($ao_ccss_key) && !wp_next_scheduled('ao_ccss_maintenance')) {
+            wp_schedule_event(time(), 'twicedaily', 'ao_ccss_maintenance');
         }
     }
 
     public function check_upgrade() {
-        $db_version = get_option( 'autoptimize_ccss_version', '' );
-        if ( AO_CCSS_VER !== $db_version ) {
+        $db_version = get_option('autoptimize_ccss_version', '');
+        if (AO_CCSS_VER !== $db_version) {
             // check schedules & re-schedule if needed.
             $this->on_upgrade();
             // and update db_version.
-            update_option( 'autoptimize_ccss_version', AO_CCSS_VER );
+            update_option('autoptimize_ccss_version', AO_CCSS_VER);
         }
     }
 
-    public function ao_ccss_interval( $schedules ) {
+    public function ao_ccss_interval($schedules) {
         // Let interval be configurable.
-        if ( ! defined( 'AO_CCSS_DEBUG_INTERVAL' ) ) {
+        if (!defined('AO_CCSS_DEBUG_INTERVAL')) {
             $intsec = 600;
         } else {
             $intsec = AO_CCSS_DEBUG_INTERVAL;
-            if ( $intsec >= 120 ) {
-                $inttxt = $intsec / 60 . ' minutes';
+            if ($intsec >= 120) {
+                $inttxt = $intsec/60.' minutes';
             } else {
-                $inttxt = $intsec . ' second(s)';
+                $inttxt = $intsec.' second(s)';
             }
-            autoptimizeCriticalCSSCore::ao_ccss_log( 'Using custom WP-Cron interval of ' . $inttxt, 3 );
+            autoptimizeCriticalCSSCore::ao_ccss_log('Using custom WP-Cron interval of '.$inttxt, 3);
         }
 
         // Attach interval to schedule.
         $schedules['ao_ccss'] = array(
             'interval' => $intsec,
-            'display'  => __( 'Autoptimize CriticalCSS' ),
+            'display'  => __('Autoptimize CriticalCSS'),
         );
         return $schedules;
     }

classes/autoptimizeCriticalCSSSettingsAjax.php

Spacing +109 added lines, -109 removed lines

@@ -3,7 +3,7 @@ 
  * Critical CSS settings AJAX logic.
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
@@ -12,7 +12,7 @@ 
     {
         // fetch all options at once and populate them individually explicitely as globals.
         $all_options = autoptimizeCriticalCSSBase::fetch_options();
-        foreach ( $all_options as $_option => $_value ) {
+        foreach ($all_options as $_option => $_value) {
             global ${$_option};
             ${$_option} = $_value;
         }
@@ -21,47 +21,47 @@ 
 
     public function run() {
         // add filters.
-        add_action( 'wp_ajax_fetch_critcss', array( $this, 'critcss_fetch_callback' ) );
-        add_action( 'wp_ajax_save_critcss', array( $this, 'critcss_save_callback' ) );
-        add_action( 'wp_ajax_rm_critcss', array( $this, 'critcss_rm_callback' ) );
-        add_action( 'wp_ajax_rm_critcss_all', array( $this, 'critcss_rm_all_callback' ) );
-        add_action( 'wp_ajax_ao_ccss_export', array( $this, 'ao_ccss_export_callback' ) );
-        add_action( 'wp_ajax_ao_ccss_import', array( $this, 'ao_ccss_import_callback' ) );
+        add_action('wp_ajax_fetch_critcss', array($this, 'critcss_fetch_callback'));
+        add_action('wp_ajax_save_critcss', array($this, 'critcss_save_callback'));
+        add_action('wp_ajax_rm_critcss', array($this, 'critcss_rm_callback'));
+        add_action('wp_ajax_rm_critcss_all', array($this, 'critcss_rm_all_callback'));
+        add_action('wp_ajax_ao_ccss_export', array($this, 'ao_ccss_export_callback'));
+        add_action('wp_ajax_ao_ccss_import', array($this, 'ao_ccss_import_callback'));
     }
 
     public function critcss_fetch_callback() {
         // Ajax handler to obtain a critical CSS file from the filesystem.
         // Check referer.
-        check_ajax_referer( 'fetch_critcss_nonce', 'critcss_fetch_nonce' );
+        check_ajax_referer('fetch_critcss_nonce', 'critcss_fetch_nonce');
 
         // Initialize error flag.
         $error = true;
 
         // Allow no content for MANUAL rules (as they may not exist just yet).
-        if ( current_user_can( 'manage_options' ) && empty( $_POST['critcssfile'] ) ) {
+        if (current_user_can('manage_options') && empty($_POST['critcssfile'])) {
             $content = '';
             $error   = false;
-        } elseif ( current_user_can( 'manage_options' ) && $this->critcss_check_filename( $_POST['critcssfile'] ) ) {
+        } elseif (current_user_can('manage_options') && $this->critcss_check_filename($_POST['critcssfile'])) {
             // Or check user permissios and filename.
             // Set file path and obtain its content.
-            $critcssfile = AO_CCSS_DIR . strip_tags( $_POST['critcssfile'] );
-            if ( file_exists( $critcssfile ) ) {
-                $content = file_get_contents( $critcssfile );
+            $critcssfile = AO_CCSS_DIR.strip_tags($_POST['critcssfile']);
+            if (file_exists($critcssfile)) {
+                $content = file_get_contents($critcssfile);
                 $error   = false;
             }
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code']   = '500';
-            $response['string'] = 'Error reading file ' . $critcssfile . '.';
+            $response['string'] = 'Error reading file '.$critcssfile.'.';
         } else {
             $response['code']   = '200';
             $response['string'] = $content;
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -74,22 +74,22 @@ 
 
         // Ajax handler to write a critical CSS to the filesystem
         // Check referer.
-        check_ajax_referer( 'save_critcss_nonce', 'critcss_save_nonce' );
+        check_ajax_referer('save_critcss_nonce', 'critcss_save_nonce');
 
         // Allow empty contents for MANUAL rules (as they are fetched later).
-        if ( current_user_can( 'manage_options' ) && empty( $_POST['critcssfile'] ) ) {
+        if (current_user_can('manage_options') && empty($_POST['critcssfile'])) {
             $critcssfile = false;
             $status      = true;
-        } elseif ( current_user_can( 'manage_options' ) && $this->critcss_check_filename( $_POST['critcssfile'] ) ) {
+        } elseif (current_user_can('manage_options') && $this->critcss_check_filename($_POST['critcssfile'])) {
             // Or check user permissios and filename
             // Set critical CSS content.
-            $critcsscontents = stripslashes( $_POST['critcsscontents'] );
+            $critcsscontents = stripslashes($_POST['critcsscontents']);
 
             // If there is content and it's valid, write the file.
-            if ( $critcsscontents && autoptimizeCriticalCSSCore::ao_ccss_check_contents( $critcsscontents ) ) {
+            if ($critcsscontents && autoptimizeCriticalCSSCore::ao_ccss_check_contents($critcsscontents)) {
                 // Set file path and status.
-                $critcssfile = AO_CCSS_DIR . strip_tags( $_POST['critcssfile'] );
-                $status      = file_put_contents( $critcssfile, $critcsscontents, LOCK_EX );
+                $critcssfile = AO_CCSS_DIR.strip_tags($_POST['critcssfile']);
+                $status      = file_put_contents($critcssfile, $critcsscontents, LOCK_EX);
                 // Or set as error.
             } else {
                 $error = true;
@@ -100,20 +100,20 @@ 
         }
 
         // Prepare response.
-        if ( ! $status || $error ) {
+        if (!$status || $error) {
             $response['code']   = '500';
-            $response['string'] = 'Error saving file ' . $critcssfile . '.';
+            $response['string'] = 'Error saving file '.$critcssfile.'.';
         } else {
             $response['code'] = '200';
-            if ( $critcssfile ) {
-                $response['string'] = 'File ' . $critcssfile . ' saved.';
+            if ($critcssfile) {
+                $response['string'] = 'File '.$critcssfile.' saved.';
             } else {
                 $response['string'] = 'Empty content do not need to be saved.';
             }
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -123,40 +123,40 @@ 
     public function critcss_rm_callback() {
         // Ajax handler to delete a critical CSS from the filesystem
         // Check referer.
-        check_ajax_referer( 'rm_critcss_nonce', 'critcss_rm_nonce' );
+        check_ajax_referer('rm_critcss_nonce', 'critcss_rm_nonce');
 
         // Initialize error and status flags.
         $error  = true;
         $status = false;
 
         // Allow no file for MANUAL rules (as they may not exist just yet).
-        if ( current_user_can( 'manage_options' ) && empty( $_POST['critcssfile'] ) ) {
+        if (current_user_can('manage_options') && empty($_POST['critcssfile'])) {
             $error = false;
-        } elseif ( current_user_can( 'manage_options' ) && $this->critcss_check_filename( $_POST['critcssfile'] ) ) {
+        } elseif (current_user_can('manage_options') && $this->critcss_check_filename($_POST['critcssfile'])) {
             // Or check user permissios and filename
             // Set file path and delete it.
-            $critcssfile = AO_CCSS_DIR . strip_tags( $_POST['critcssfile'] );
-            if ( file_exists( $critcssfile ) ) {
-                $status = unlink( $critcssfile );
+            $critcssfile = AO_CCSS_DIR.strip_tags($_POST['critcssfile']);
+            if (file_exists($critcssfile)) {
+                $status = unlink($critcssfile);
                 $error  = false;
             }
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code']   = '500';
-            $response['string'] = 'Error removing file ' . $critcssfile . '.';
+            $response['string'] = 'Error removing file '.$critcssfile.'.';
         } else {
             $response['code'] = '200';
-            if ( $status ) {
-                $response['string'] = 'File ' . $critcssfile . ' removed.';
+            if ($status) {
+                $response['string'] = 'File '.$critcssfile.' removed.';
             } else {
                 $response['string'] = 'No file to be removed.';
             }
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -165,28 +165,28 @@ 
     public function critcss_rm_all_callback() {
         // Ajax handler to delete a critical CSS from the filesystem
         // Check referer.
-        check_ajax_referer( 'rm_critcss_all_nonce', 'critcss_rm_all_nonce' );
+        check_ajax_referer('rm_critcss_all_nonce', 'critcss_rm_all_nonce');
 
         // Initialize error and status flags.
         $error  = true;
         $status = false;
 
         // Remove all ccss files on filesystem.
-        if ( current_user_can( 'manage_options' ) ) {
-            if ( file_exists( AO_CCSS_DIR ) && is_dir( AO_CCSS_DIR ) ) {
-                array_map( 'unlink', glob( AO_CCSS_DIR . 'ccss_*.css', GLOB_BRACE ) );
+        if (current_user_can('manage_options')) {
+            if (file_exists(AO_CCSS_DIR) && is_dir(AO_CCSS_DIR)) {
+                array_map('unlink', glob(AO_CCSS_DIR.'ccss_*.css', GLOB_BRACE));
                 $error  = false;
                 $status = true;
             }
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code']   = '500';
             $response['string'] = 'Error removing all critical CSS files.';
         } else {
             $response['code'] = '200';
-            if ( $status ) {
+            if ($status) {
                 $response['string'] = 'Critical CSS Files removed.';
             } else {
                 $response['string'] = 'No file removed.';
@@ -194,7 +194,7 @@ 
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -203,70 +203,70 @@ 
     public function ao_ccss_export_callback() {
         // Ajax handler export settings
         // Check referer.
-        check_ajax_referer( 'ao_ccss_export_nonce', 'ao_ccss_export_nonce' );
+        check_ajax_referer('ao_ccss_export_nonce', 'ao_ccss_export_nonce');
 
-        if ( ! class_exists( 'ZipArchive' ) ) {
+        if (!class_exists('ZipArchive')) {
             $response['code'] = '500';
             $response['msg']  = 'PHP ZipArchive not present, cannot create zipfile';
-            echo json_encode( $response );
+            echo json_encode($response);
             wp_die();
         }
 
         // Init array, get options and prepare the raw object.
         $settings               = array();
-        $settings['rules']      = get_option( 'autoptimize_ccss_rules' );
-        $settings['additional'] = get_option( 'autoptimize_ccss_additional' );
-        $settings['viewport']   = get_option( 'autoptimize_ccss_viewport' );
-        $settings['finclude']   = get_option( 'autoptimize_ccss_finclude' );
-        $settings['rtimelimit'] = get_option( 'autoptimize_ccss_rtimelimit' );
-        $settings['noptimize']  = get_option( 'autoptimize_ccss_noptimize' );
-        $settings['debug']      = get_option( 'autoptimize_ccss_debug' );
-        $settings['key']        = get_option( 'autoptimize_ccss_key' );
+        $settings['rules']      = get_option('autoptimize_ccss_rules');
+        $settings['additional'] = get_option('autoptimize_ccss_additional');
+        $settings['viewport']   = get_option('autoptimize_ccss_viewport');
+        $settings['finclude']   = get_option('autoptimize_ccss_finclude');
+        $settings['rtimelimit'] = get_option('autoptimize_ccss_rtimelimit');
+        $settings['noptimize']  = get_option('autoptimize_ccss_noptimize');
+        $settings['debug']      = get_option('autoptimize_ccss_debug');
+        $settings['key']        = get_option('autoptimize_ccss_key');
 
         // Initialize error flag.
         $error = true;
 
         // Check user permissions.
-        if ( current_user_can( 'manage_options' ) ) {
+        if (current_user_can('manage_options')) {
             // Prepare settings file path and content.
-            $exportfile = AO_CCSS_DIR . 'settings.json';
-            $contents   = json_encode( $settings );
-            $status     = file_put_contents( $exportfile, $contents, LOCK_EX );
+            $exportfile = AO_CCSS_DIR.'settings.json';
+            $contents   = json_encode($settings);
+            $status     = file_put_contents($exportfile, $contents, LOCK_EX);
             $error      = false;
         }
 
         // Prepare archive.
-        $zipfile = AO_CCSS_DIR . date( 'Ymd-H\hi' ) . '_ao_ccss_settings.zip';
-        $file    = pathinfo( $zipfile, PATHINFO_BASENAME );
+        $zipfile = AO_CCSS_DIR.date('Ymd-H\hi').'_ao_ccss_settings.zip';
+        $file    = pathinfo($zipfile, PATHINFO_BASENAME);
         $zip     = new ZipArchive();
-        $ret     = $zip->open( $zipfile, ZipArchive::CREATE );
-        if ( true !== $ret ) {
+        $ret     = $zip->open($zipfile, ZipArchive::CREATE);
+        if (true !== $ret) {
             $error = true;
         } else {
-            $zip->addFile( AO_CCSS_DIR . 'settings.json', 'settings.json' );
-            if ( file_exists( AO_CCSS_DIR . 'queue.json' ) ) {
-                $zip->addFile( AO_CCSS_DIR . 'queue.json', 'queue.json' );
+            $zip->addFile(AO_CCSS_DIR.'settings.json', 'settings.json');
+            if (file_exists(AO_CCSS_DIR.'queue.json')) {
+                $zip->addFile(AO_CCSS_DIR.'queue.json', 'queue.json');
             }
             $options = array(
                 'add_path'        => './',
                 'remove_all_path' => true,
             );
-            $zip->addGlob( AO_CCSS_DIR . '*.css', 0, $options );
+            $zip->addGlob(AO_CCSS_DIR.'*.css', 0, $options);
             $zip->close();
         }
 
         // Prepare response.
-        if ( ! $status || $error ) {
+        if (!$status || $error) {
             $response['code'] = '500';
-            $response['msg']  = 'Error saving file ' . $file . ', code: ' . $ret;
+            $response['msg']  = 'Error saving file '.$file.', code: '.$ret;
         } else {
             $response['code'] = '200';
-            $response['msg']  = 'File ' . $file . ' saved.';
+            $response['msg']  = 'File '.$file.' saved.';
             $response['file'] = $file;
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
@@ -275,30 +275,30 @@ 
     public function ao_ccss_import_callback() {
         // Ajax handler import settings
         // Check referer.
-        check_ajax_referer( 'ao_ccss_import_nonce', 'ao_ccss_import_nonce' );
+        check_ajax_referer('ao_ccss_import_nonce', 'ao_ccss_import_nonce');
 
         // Initialize error flag.
         $error = false;
 
         // Process an uploaded file with no errors.
-        if ( current_user_can( 'manage_options' ) && ! $_FILES['file']['error'] && $_FILES['file']['size'] < 500001 && strpos( $_FILES['file']['name'], '.zip' ) === strlen( $_FILES['file']['name'] ) - 4 ) {
+        if (current_user_can('manage_options') && !$_FILES['file']['error'] && $_FILES['file']['size'] < 500001 && strpos($_FILES['file']['name'], '.zip') === strlen($_FILES['file']['name']) - 4) {
             // create tmp dir with hard guess name in AO_CCSS_DIR.
-            $_secret_dir     = wp_hash( uniqid( md5( AUTOPTIMIZE_CACHE_URL ), true ) );
-            $_import_tmp_dir = trailingslashit( AO_CCSS_DIR . $_secret_dir );
-            mkdir( $_import_tmp_dir );
+            $_secret_dir     = wp_hash(uniqid(md5(AUTOPTIMIZE_CACHE_URL), true));
+            $_import_tmp_dir = trailingslashit(AO_CCSS_DIR.$_secret_dir);
+            mkdir($_import_tmp_dir);
 
             // Save file to that tmp directory but give it our own name to prevent directory traversal risks when using original name.
-            $zipfile = $_import_tmp_dir . uniqid( 'import_settings-', true ) . '.zip';
-            move_uploaded_file( $_FILES['file']['tmp_name'], $zipfile );
+            $zipfile = $_import_tmp_dir.uniqid('import_settings-', true).'.zip';
+            move_uploaded_file($_FILES['file']['tmp_name'], $zipfile);
 
             // Extract archive in the tmp directory.
             $zip = new ZipArchive;
-            if ( $zip->open( $zipfile ) === true ) {
+            if ($zip->open($zipfile) === true) {
                 // loop through all files in the zipfile.
                 for ($i = 0; $i < $zip->numFiles; $i++) {
                     // but only extract known good files.
-                    if ( preg_match('/^settings\.json$|^ccss_[a-z0-9]{32}\.css$/', $zip->getNameIndex( $i ) ) > 0 ) {
-                        $zip->extractTo( AO_CCSS_DIR, $zip->getNameIndex( $i ) );
+                    if (preg_match('/^settings\.json$|^ccss_[a-z0-9]{32}\.css$/', $zip->getNameIndex($i)) > 0) {
+                        $zip->extractTo(AO_CCSS_DIR, $zip->getNameIndex($i));
                     }
                 }
                 $zip->close();
@@ -307,26 +307,26 @@ 
             }
             
             // and remove temp. dir with all contents (the import-zipfile).
-            $this->rrmdir( $_import_tmp_dir );
+            $this->rrmdir($_import_tmp_dir);
 
-            if ( ! $error ) {
+            if (!$error) {
                 // Archive extraction ok, continue importing settings from AO_CCSS_DIR.
                 // Settings file.
-                $importfile = AO_CCSS_DIR . 'settings.json';
+                $importfile = AO_CCSS_DIR.'settings.json';
 
-                if ( file_exists( $importfile ) ) {
+                if (file_exists($importfile)) {
                     // Get settings and turn them into an object.
-                    $settings = json_decode( file_get_contents( $importfile ), true );
+                    $settings = json_decode(file_get_contents($importfile), true);
 
                     // Update options.
-                    update_option( 'autoptimize_ccss_rules', $settings['rules'] );
-                    update_option( 'autoptimize_ccss_additional', $settings['additional'] );
-                    update_option( 'autoptimize_ccss_viewport', $settings['viewport'] );
-                    update_option( 'autoptimize_ccss_finclude', $settings['finclude'] );
-                    update_option( 'autoptimize_ccss_rtimelimit', $settings['rtimelimit'] );
-                    update_option( 'autoptimize_ccss_noptimize', $settings['noptimize'] );
-                    update_option( 'autoptimize_ccss_debug', $settings['debug'] );
-                    update_option( 'autoptimize_ccss_key', $settings['key'] );
+                    update_option('autoptimize_ccss_rules', $settings['rules']);
+                    update_option('autoptimize_ccss_additional', $settings['additional']);
+                    update_option('autoptimize_ccss_viewport', $settings['viewport']);
+                    update_option('autoptimize_ccss_finclude', $settings['finclude']);
+                    update_option('autoptimize_ccss_rtimelimit', $settings['rtimelimit']);
+                    update_option('autoptimize_ccss_noptimize', $settings['noptimize']);
+                    update_option('autoptimize_ccss_debug', $settings['debug']);
+                    update_option('autoptimize_ccss_key', $settings['key']);
                 } else {
                     // Settings file doesn't exist, update error flag.
                     $error = 'settings file does not exist';
@@ -337,28 +337,28 @@ 
         }
 
         // Prepare response.
-        if ( $error ) {
+        if ($error) {
             $response['code'] = '500';
-            $response['msg']  = 'Error importing settings: ' . $error;
+            $response['msg']  = 'Error importing settings: '.$error;
         } else {
             $response['code'] = '200';
             $response['msg']  = 'Settings imported successfully';
         }
 
         // Dispatch respose.
-        echo json_encode( $response );
+        echo json_encode($response);
 
         // Close ajax request.
         wp_die();
     }
 
-    public function critcss_check_filename( $filename ) {
+    public function critcss_check_filename($filename) {
         // Try to avoid directory traversal when reading/writing/deleting critical CSS files.
-        if ( strpos( $filename, 'ccss_' ) !== 0 ) {
+        if (strpos($filename, 'ccss_') !== 0) {
             return false;
-        } elseif ( substr( $filename, -4, 4 ) !== '.css' ) {
+        } elseif (substr($filename, -4, 4) !== '.css') {
             return false;
-        } elseif ( sanitize_file_name( $filename ) !== $filename ) {
+        } elseif (sanitize_file_name($filename) !== $filename) {
             // Use WordPress core's sanitize_file_name to see if anything fishy is going on.
             return false;
         } else {
@@ -366,14 +366,14 @@ 
         }
     }
     
-    public function rrmdir( $path ) {
+    public function rrmdir($path) {
         // recursively remove a directory as found on
         // https://andy-carter.com/blog/recursively-remove-a-directory-in-php.
-        $files = glob($path . '/*');
-        foreach ( $files as $file ) {
-            is_dir( $file ) ? $this->rrmdir( $file ) : unlink( $file );
+        $files = glob($path.'/*');
+        foreach ($files as $file) {
+            is_dir($file) ? $this->rrmdir($file) : unlink($file);
         }
-        rmdir( $path );
+        rmdir($path);
 
         return;
     }

autoptimize.php

Spacing +33 added lines, -33 removed lines

@@ -17,66 +17,66 @@ 
  */
 
 
-if ( ! defined( 'ABSPATH' ) ) {
+if (!defined('ABSPATH')) {
     exit;
 }
 
-define( 'AUTOPTIMIZE_PLUGIN_VERSION', '2.8.0' );
+define('AUTOPTIMIZE_PLUGIN_VERSION', '2.8.0');
 
 // plugin_dir_path() returns the trailing slash!
-define( 'AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
-define( 'AUTOPTIMIZE_PLUGIN_FILE', __FILE__ );
+define('AUTOPTIMIZE_PLUGIN_DIR', plugin_dir_path(__FILE__));
+define('AUTOPTIMIZE_PLUGIN_FILE', __FILE__);
 
 // Bail early if attempting to run on non-supported php versions.
-if ( version_compare( PHP_VERSION, '5.6', '<' ) ) {
+if (version_compare(PHP_VERSION, '5.6', '<')) {
     function autoptimize_incompatible_admin_notice() {
-        echo '<div class="error"><p>' . __( 'Autoptimize requires PHP 5.6 (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.6 (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';
 }
 
 /**
@@ -87,8 +87,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;