futtta / autoptimize

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()

classes/autoptimizeOption.php

Indentation +74 added lines, -74 removed lines

@@ -12,103 +12,103 @@
  */
 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']);
+    }
 	
-	/**
-	 * Ensure that is_plugin_active_for_network function is declared.
-	 */
-	public static function maybe_include_plugin_functions() {
-		if( ! function_exists( 'is_plugin_active_for_network' ) ) {
-			include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-		}
-	}
+    /**
+     * Ensure that is_plugin_active_for_network function is declared.
+     */
+    public static function maybe_include_plugin_functions() {
+        if( ! function_exists( 'is_plugin_active_for_network' ) ) {
+            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+        }
+    }
 
-	/**
-	 * 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 )
     {
-		// Ensure that is_plugin_active_for_network function is declared.
-		self::maybe_include_plugin_functions();
+        // Ensure that is_plugin_active_for_network function is declared.
+        self::maybe_include_plugin_functions();
 		
-		// This is always a network setting.
-		if( 'autoptimize_enable_site_config' === $option ) {
-			return get_network_option( get_main_network_id(), $option );
-		}
+        // This is always a network setting.
+        if( 'autoptimize_enable_site_config' === $option ) {
+            return get_network_option( get_main_network_id(), $option );
+        }
 
-		// If the plugin is network activated and our per site setting is not on, use the network configuration.
-		$configuration_per_site = get_network_option( get_main_network_id(), 'autoptimize_enable_site_config' );
-		if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 'on' !== $configuration_per_site ) {
-			return get_network_option( get_main_network_id(), $option );
-		}
+        // If the plugin is network activated and our per site setting is not on, use the network configuration.
+        $configuration_per_site = get_network_option( get_main_network_id(), 'autoptimize_enable_site_config' );
+        if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 'on' !== $configuration_per_site ) {
+            return get_network_option( get_main_network_id(), $option );
+        }
 			
-		return get_option( $option, $default );
+        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 )
     {
 		
-		// Ensure that is_plugin_active_for_network function is declared.
-		self::maybe_include_plugin_functions();
-		$blog_id = get_current_blog_id();
+        // Ensure that is_plugin_active_for_network function is declared.
+        self::maybe_include_plugin_functions();
+        $blog_id = get_current_blog_id();
 		
-		if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) {
-			return update_network_option( get_main_network_id(), $option, $value );
-		} else {
-			return update_option( $option, $value, $autoload );
-		}
+        if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) {
+            return update_network_option( get_main_network_id(), $option, $value );
+        } else {
+            return update_option( $option, $value, $autoload );
+        }
     }
 
-	/**
-	 * 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()
     {
-		// Ensure that is_plugin_active_for_network function is declared.
-		self::maybe_include_plugin_functions();
-		$blog_id = get_current_blog_id();
+        // Ensure that is_plugin_active_for_network function is declared.
+        self::maybe_include_plugin_functions();
+        $blog_id = get_current_blog_id();
 		
-		if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) {
-			add_filter( 'pre_update_option', [$this, 'update_autoptimize_option_on_network'], 10, 3 );
-		}
-	}
+        if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) {
+            add_filter( 'pre_update_option', [$this, 'update_autoptimize_option_on_network'], 10, 3 );
+        }
+    }
 
-	public static function update_autoptimize_option_on_network( $value, $option, $old_value ) {
-		if( strpos( $option, 'autoptimize_' ) === 0 ) {
+    public static function update_autoptimize_option_on_network( $value, $option, $old_value ) {
+        if( strpos( $option, 'autoptimize_' ) === 0 ) {
 			
-			// Ensure that is_plugin_active_for_network function is declared.
-			self::maybe_include_plugin_functions();
-			$blog_id = get_current_blog_id();
+            // Ensure that is_plugin_active_for_network function is declared.
+            self::maybe_include_plugin_functions();
+            $blog_id = get_current_blog_id();
 		
-			if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) {
-				 update_network_option( get_main_network_id(), $option, $value );
-				 // Return old value, to stop update_option logic.
-				 return $old_value;
-			}
-		}
-		return $value;
-	}
+            if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) && 1 === $blog_id ) {
+                    update_network_option( get_main_network_id(), $option, $value );
+                    // Return old value, to stop update_option logic.
+                    return $old_value;
+            }
+        }
+        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_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_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();
@@ -877,9 +877,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/autoptimizeMain.php

Indentation +1 added lines, -1 removed lines

@@ -492,7 +492,7 @@
             'autoptimize_css_exclude',
             'autoptimize_html',
             'autoptimize_html_keepcomments',
-			'autoptimize_enable_site_config',
+            'autoptimize_enable_site_config',
             'autoptimize_js',
             'autoptimize_js_aggregate',
             'autoptimize_js_exclude',

classes/autoptimizeConfig.php

Indentation +17 added lines, -17 removed lines

@@ -15,11 +15,11 @@ 
     {
         if ( is_admin() ) {
             // Add the admin page and settings.
-			if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-				add_action( 'network_admin_menu', array( $this, 'addmenu' ) );
-			}
+            if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+                add_action( 'network_admin_menu', array( $this, 'addmenu' ) );
+            }
 
-			add_action( 'admin_menu', array( $this, 'addmenu' ) );
+            add_action( 'admin_menu', array( $this, 'addmenu' ) );
             add_action( 'admin_init', array( $this, 'registersettings' ) );
 
             // Set meta info.
@@ -59,12 +59,12 @@ 
         return self::$instance;
     }
 
-	public function show_message() {
-		?>
+    public function show_message() {
+        ?>
 			<h1>Autoptimize enabled in network</h1>
 			<p>If you want to enable per site configutation for Autoptimize, please contact your network administrator.</p>
 		<?php
-	}
+    }
 
     public function show()
     {
@@ -654,14 +654,14 @@ 
 
     public function addmenu()
     {
-		if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-			$hook = add_submenu_page( 'settings.php',  __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_network_options', 'autoptimize', array( $this, 'show' ) );
-		}
-		if ( ! is_multisite() || 'on' === autoptimizeOption::get_option('autoptimize_enable_site_config') ) {
-			$hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show' ) );
-		} else {
-			$hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_message' ) );
-		}
+        if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+            $hook = add_submenu_page( 'settings.php',  __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_network_options', 'autoptimize', array( $this, 'show' ) );
+        }
+        if ( ! is_multisite() || 'on' === autoptimizeOption::get_option('autoptimize_enable_site_config') ) {
+            $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show' ) );
+        } else {
+            $hook = add_options_page( __( 'Autoptimize Options', 'autoptimize' ), 'Autoptimize', 'manage_options', 'autoptimize', array( $this, 'show_message' ) );
+        }
 
         add_action( 'admin_print_scripts-' . $hook, array( $this, 'autoptimize_admin_scripts' ) );
         add_action( 'admin_print_styles-' . $hook, array( $this, 'autoptimize_admin_styles' ) );
@@ -682,7 +682,7 @@ 
     public function registersettings() {
         register_setting( 'autoptimize', 'autoptimize_html' );
         register_setting( 'autoptimize', 'autoptimize_html_keepcomments' );
-		register_setting( 'autoptimize', 'autoptimize_enable_site_config' );
+        register_setting( 'autoptimize', 'autoptimize_enable_site_config' );
         register_setting( 'autoptimize', 'autoptimize_js' );
         register_setting( 'autoptimize', 'autoptimize_js_aggregate' );
         register_setting( 'autoptimize', 'autoptimize_js_exclude' );
@@ -741,7 +741,7 @@ 
         static $config = array(
             'autoptimize_html' => 0,
             'autoptimize_html_keepcomments' => 0,
-			'autoptimize_enable_site_config' => 0,
+            'autoptimize_enable_site_config' => 0,
             'autoptimize_js' => 0,
             'autoptimize_js_aggregate' => 1,
             'autoptimize_js_exclude' => 'wp-includes/js/dist/, wp-includes/js/tinymce/, js/jquery/jquery.js',

classes/autoptimizeExtra.php

Indentation +9 added lines, -9 removed lines

@@ -33,12 +33,12 @@ 
     public function run()
     {
         if ( is_admin() ) {
-			if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
-				add_action( 'network_admin_menu', array( $this, 'admin_menu' ) );
-			} else {
-				add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-			}
-			add_action( 'admin_init', array( $this, 'registersettings' ) );
+            if ( is_plugin_active_for_network( 'autoptimize/autoptimize.php' ) ) {
+                add_action( 'network_admin_menu', array( $this, 'admin_menu' ) );
+            } else {
+                add_action( 'admin_menu', array( $this, 'admin_menu' ) );
+            }
+            add_action( 'admin_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 )
     {