futtta / autoptimize

config/default.php

Indentation +42 added lines, -42 removed lines

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

classes/autoptimizeBase.php

Indentation +1 added lines, -1 removed lines

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

classes/external/php/persist-admin-notices-dismissal/persist-admin-notices-dismissal.php

Indentation +122 added lines, -122 removed lines

@@ -29,131 +29,131 @@
  * Exit if called directly.
  */
 if ( ! defined( 'ABSPATH' ) ) {
-	die;
+    die;
 }
 
 if ( ! class_exists( 'PAnD' ) ) {
 
-	/**
-	 * Class PAnD
-	 */
-	class PAnD {
-
-		/**
-		 * Init hooks.
-		 */
-		public static function init() {
-			add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
-			add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
-		}
-
-		/**
-		 * Enqueue javascript and variables.
-		 */
-		public static function load_script() {
-
-			if ( is_customize_preview() ) {
-				return;
-			}
-
-			wp_enqueue_script(
-				'dismissible-notices',
-				plugins_url( 'dismiss-notice.js', __FILE__ ),
-				array( 'jquery', 'common' ),
-				false,
-				true
-			);
-
-			wp_localize_script(
-				'dismissible-notices',
-				'dismissible_notice',
-				array(
-					'nonce' => wp_create_nonce( 'dismissible-notice' ),
-				)
-			);
-		}
-
-		/**
-		 * Handles Ajax request to persist notices dismissal.
-		 * Uses check_ajax_referer to verify nonce.
-		 */
-		public static function dismiss_admin_notice() {
-			$option_name        = sanitize_text_field( $_POST['option_name'] );
-			$dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
-
-			if ( 'forever' != $dismissible_length ) {
-				// If $dismissible_length is not an integer default to 1
-				$dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
-				$dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
-			}
-
-			check_ajax_referer( 'dismissible-notice', 'nonce' );
-			self::set_admin_notice_cache( $option_name, $dismissible_length );
-			wp_die();
-		}
-
-		/**
-		 * Is admin notice active?
-		 *
-		 * @param string $arg data-dismissible content of notice.
-		 *
-		 * @return bool
-		 */
-		public static function is_admin_notice_active( $arg ) {
-			$array       = explode( '-', $arg );
-			$length      = array_pop( $array );
-			$option_name = implode( '-', $array );
-			$db_record   = self::get_admin_notice_cache( $option_name );
-			if ( 'forever' == $db_record ) {
-				return false;
-			} elseif ( absint( $db_record ) >= time() ) {
-				return false;
-			} else {
-				return true;
-			}
-		}
-
-		/**
-		 * Returns admin notice cached timeout.
-		 *
-		 * @access public
-		 *
-		 * @param string|bool $id admin notice name or false.
-		 *
-		 * @return array|bool The timeout. False if expired.
-		 */
-		public static function get_admin_notice_cache( $id = false ) {
-			if ( ! $id ) {
-				return false;
-			}
-			$cache_key = 'pand-' . md5( $id );
-			$timeout   = get_site_option( $cache_key );
-			$timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
-
-			if ( empty( $timeout ) || time() > $timeout ) {
-				return false;
-			}
-
-			return $timeout;
-		}
-
-		/**
-		 * Sets admin notice timeout in site option.
-		 *
-		 * @access public
-		 *
-		 * @param string      $id       Data Identifier.
-		 * @param string|bool $timeout  Timeout for admin notice.
-		 *
-		 * @return bool
-		 */
-		public static function set_admin_notice_cache( $id, $timeout ) {
-			$cache_key = 'pand-' . md5( $id );
-			update_site_option( $cache_key, $timeout );
-
-			return true;
-		}
-
-	}
+    /**
+     * Class PAnD
+     */
+    class PAnD {
+
+        /**
+         * Init hooks.
+         */
+        public static function init() {
+            add_action( 'admin_enqueue_scripts', array( __CLASS__, 'load_script' ) );
+            add_action( 'wp_ajax_dismiss_admin_notice', array( __CLASS__, 'dismiss_admin_notice' ) );
+        }
+
+        /**
+         * Enqueue javascript and variables.
+         */
+        public static function load_script() {
+
+            if ( is_customize_preview() ) {
+                return;
+            }
+
+            wp_enqueue_script(
+                'dismissible-notices',
+                plugins_url( 'dismiss-notice.js', __FILE__ ),
+                array( 'jquery', 'common' ),
+                false,
+                true
+            );
+
+            wp_localize_script(
+                'dismissible-notices',
+                'dismissible_notice',
+                array(
+                    'nonce' => wp_create_nonce( 'dismissible-notice' ),
+                )
+            );
+        }
+
+        /**
+         * Handles Ajax request to persist notices dismissal.
+         * Uses check_ajax_referer to verify nonce.
+         */
+        public static function dismiss_admin_notice() {
+            $option_name        = sanitize_text_field( $_POST['option_name'] );
+            $dismissible_length = sanitize_text_field( $_POST['dismissible_length'] );
+
+            if ( 'forever' != $dismissible_length ) {
+                // If $dismissible_length is not an integer default to 1
+                $dismissible_length = ( 0 == absint( $dismissible_length ) ) ? 1 : $dismissible_length;
+                $dismissible_length = strtotime( absint( $dismissible_length ) . ' days' );
+            }
+
+            check_ajax_referer( 'dismissible-notice', 'nonce' );
+            self::set_admin_notice_cache( $option_name, $dismissible_length );
+            wp_die();
+        }
+
+        /**
+         * Is admin notice active?
+         *
+         * @param string $arg data-dismissible content of notice.
+         *
+         * @return bool
+         */
+        public static function is_admin_notice_active( $arg ) {
+            $array       = explode( '-', $arg );
+            $length      = array_pop( $array );
+            $option_name = implode( '-', $array );
+            $db_record   = self::get_admin_notice_cache( $option_name );
+            if ( 'forever' == $db_record ) {
+                return false;
+            } elseif ( absint( $db_record ) >= time() ) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        /**
+         * Returns admin notice cached timeout.
+         *
+         * @access public
+         *
+         * @param string|bool $id admin notice name or false.
+         *
+         * @return array|bool The timeout. False if expired.
+         */
+        public static function get_admin_notice_cache( $id = false ) {
+            if ( ! $id ) {
+                return false;
+            }
+            $cache_key = 'pand-' . md5( $id );
+            $timeout   = get_site_option( $cache_key );
+            $timeout   = 'forever' === $timeout ? time() + 60 : $timeout;
+
+            if ( empty( $timeout ) || time() > $timeout ) {
+                return false;
+            }
+
+            return $timeout;
+        }
+
+        /**
+         * Sets admin notice timeout in site option.
+         *
+         * @access public
+         *
+         * @param string      $id       Data Identifier.
+         * @param string|bool $timeout  Timeout for admin notice.
+         *
+         * @return bool
+         */
+        public static function set_admin_notice_cache( $id, $timeout ) {
+            $cache_key = 'pand-' . md5( $id );
+            update_site_option( $cache_key, $timeout );
+
+            return true;
+        }
+
+    }
 
 }

classes/autoptimizeConfig.php

Indentation +10 added lines, -10 removed lines

@@ -15,11 +15,11 @@ 
     {
         if ( is_admin() ) {
             // Add the admin page and settings.
-			if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-				add_action( 'network_admin_menu', array( $this, 'addmenu' ) );
-			} else {
-				add_action( 'admin_menu', array( $this, 'addmenu' ) );
-			}
+            if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+                add_action( 'network_admin_menu', array( $this, 'addmenu' ) );
+            } else {
+                add_action( 'admin_menu', array( $this, 'addmenu' ) );
+            }
             add_action( 'admin_init', array( $this, 'registersettings' ) );
 
             // Set meta info.
@@ -630,11 +630,11 @@ 
 
     public function addmenu()
     {
-		if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-			$hook = add_submenu_page( 'settings.php',  __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_network_options', 'autoptimize', array( $this, 'show' ) );
-		} else {
-			$hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show' ) );
-		}
+        if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+            $hook = add_submenu_page( 'settings.php',  __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_network_options', 'autoptimize', array( $this, 'show' ) );
+        } else {
+            $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show' ) );
+        }
 		
         add_action( 'admin_print_scripts-' . $hook, array( $this, 'autoptimize_admin_scripts' ) );
         add_action( 'admin_print_styles-' . $hook, array( $this, 'autoptimize_admin_styles' ) );

classes/autoptimizeExtra.php

Indentation +9 added lines, -9 removed lines

@@ -33,12 +33,12 @@ 
     public function run()
     {
         if ( is_admin() ) {
-			if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-				add_action( 'network_admin_menu', array( $this, 'admin_menu' ) );
-			} else {
-				add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-			}
-			add_action( 'admin_init', array( $this, 'registersettings' ) );
+            if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+                add_action( 'network_admin_menu', array( $this, 'admin_menu' ) );
+            } else {
+                add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+            }
+            add_action( 'admin_init', array( $this, 'registersettings' ) );
             add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_extra_tab' ) );
         } else {
             $this->run_on_frontend();
@@ -342,9 +342,9 @@ 
         );
     }
 	
-	public function registersettings() {
-		register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
-	}
+    public function registersettings() {
+        register_setting( 'autoptimize_extra_settings', 'autoptimize_extra_settings' );
+    }
 
     public function add_extra_tab( $in )
     {

classes/autoptimizeOption.php

Indentation +50 added lines, -50 removed lines

@@ -12,70 +12,70 @@
  */
 class autoptimizeOption
 {
-	/**
-	 * Constructor, add filter on saving options.
-	 */
-	public function __construct()
+    /**
+     * Constructor, add filter on saving options.
+     */
+    public function __construct()
     {
-		add_action('init', [$this, 'check_multisite_on_saving_options']);
-	}
+        add_action('init', [$this, 'check_multisite_on_saving_options']);
+    }
 
-	/**
-	 * Retrieves the option in standalone and multisite instances.
-	 * 
-	 * @param string $option  Name of option to retrieve. Expected to not be SQL-escaped.
-	 * @param mixed  $default Optional. Default value to return if the option does not exist.
-	 * @return mixed Value set for the option.
-	 */
+    /**
+     * Retrieves the option in standalone and multisite instances.
+     * 
+     * @param string $option  Name of option to retrieve. Expected to not be SQL-escaped.
+     * @param mixed  $default Optional. Default value to return if the option does not exist.
+     * @return mixed Value set for the option.
+     */
     public static function get_option( $option, $default = false )
     {
-		if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-			return get_network_option( get_main_network_id(), $option );
-		} else {
-			return get_option( $option, $default );
-		}
+        if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+            return get_network_option( get_main_network_id(), $option );
+        } else {
+            return get_option( $option, $default );
+        }
     }
 
-	/**
-	 * Saves the option in standalone and multisite instances.
-	 * 
-	 * @param string      $option   Option name. Expected to not be SQL-escaped.
-	 * @param mixed       $value    Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
-	 * @param string|bool $autoload Optional. Whether to load the option when WordPress starts up. For existing options,
-	 *                              `$autoload` can only be updated using `update_option()` if `$value` is also changed.
+    /**
+     * Saves the option in standalone and multisite instances.
+     * 
+     * @param string      $option   Option name. Expected to not be SQL-escaped.
+     * @param mixed       $value    Option value. Must be serializable if non-scalar. Expected to not be SQL-escaped.
+     * @param string|bool $autoload Optional. Whether to load the option when WordPress starts up. For existing options,
+     *                              `$autoload` can only be updated using `update_option()` if `$value` is also changed.
      *			                    Accepts 'yes'|true to enable or 'no'|false to disable. For non-existent options,
      *				                the default value is 'yes'. Default null.
      * @return bool False if value was not updated and true if value was updated.
-	 */
+     */
     public static function update_option( $option, $value, $autoload = null )
     {
-		if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-			return update_network_option( get_main_network_id(), $option, $value );
-		} else {
-			return update_option( $option, $value, $autoload );
-		}
+        if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+            return update_network_option( get_main_network_id(), $option, $value );
+        } else {
+            return update_option( $option, $value, $autoload );
+        }
     }
 
-	/**
-	 * Use the pre_update_option filter to check if the option to be saved if from autoptimize and
-	 * in that case, take care of multisite case.
-	 */
-	public static function check_multisite_on_saving_options()
+    /**
+     * Use the pre_update_option filter to check if the option to be saved if from autoptimize and
+     * in that case, take care of multisite case.
+     */
+    public static function check_multisite_on_saving_options()
     {
-		if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-			add_filter( 'pre_update_option', [$this, 'update_autoptimize_option_on_network'], 10, 3 );
-		}
-	}
+        if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+            add_filter( 'pre_update_option', [$this, 'update_autoptimize_option_on_network'], 10, 3 );
+        }
+    }
 
-	public static function update_autoptimize_option_on_network( $value, $option, $old_value ) {
-		if( strpos( $option, 'autoptimize_' ) === 0 ) {
-			if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-				 update_network_option( get_main_network_id(), $option, $value );
-				 // Return old value, to stop update_option logic.
-				 return $old_value;
-			}
-		}
-		return $value;
-	}
+    public static function update_autoptimize_option_on_network( $value, $option, $old_value ) {
+        if( strpos( $option, 'autoptimize_' ) === 0 ) {
+            if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+                    update_network_option( get_main_network_id(), $option, $value );
+                    // Return old value, to stop update_option logic.
+                    return $old_value;
+            }
+        }
+        return $value;
+    }
 }
 new autoptimizeOption();

classes/autoptimizeImages.php

Indentation +9 added lines, -9 removed lines

@@ -97,12 +97,12 @@ 
     public function run()
     {
         if ( is_admin() ) {
-			if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-				add_action( 'network_admin_menu', array( $this, 'imgopt_admin_menu' ) );
-			} else {
-				add_action( 'admin_menu', array( $this, 'imgopt_admin_menu' ) );
-			}
-			add_action( 'admin_init', array( $this, 'registersettings' ) );
+            if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+                add_action( 'network_admin_menu', array( $this, 'imgopt_admin_menu' ) );
+            } else {
+                add_action( 'admin_menu', array( $this, 'imgopt_admin_menu' ) );
+            }
+            add_action( 'admin_init', array( $this, 'registersettings' ) );
             add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_imgopt_tab' ), 9 );
         } else {
             $this->run_on_frontend();
@@ -875,9 +875,9 @@ 
         );
     }
 	
-	public function registersettings() {
-		register_setting( 'autoptimize_imgopt_settings', 'autoptimize_imgopt_settings' );
-	}
+    public function registersettings() {
+        register_setting( 'autoptimize_imgopt_settings', 'autoptimize_imgopt_settings' );
+    }
 
     public function add_imgopt_tab( $in )
     {

classes/autoptimizePartners.php

Indentation +5 added lines, -5 removed lines

@@ -20,11 +20,11 @@
         if ( $this->enabled() ) {
             add_filter( 'autoptimize_filter_settingsscreen_tabs', array( $this, 'add_partner_tabs' ), 10, 1 );
         }
-		if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-			add_action( 'network_admin_menu', array( $this, 'add_admin_menu' ) );
-		} else {
-			add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
-		}
+        if ( is_multisite() && is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+            add_action( 'network_admin_menu', array( $this, 'add_admin_menu' ) );
+        } else {
+            add_action( 'admin_menu', array( $this, 'add_admin_menu' ) );
+        }
     }
 
     protected function enabled()