awesomemotive / google-analytics-for-wordpress

languages/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
 <?php
 //Nothing to see here
 
-header( 'HTTP/1.0 403 Forbidden' );
\ No newline at end of file
+header('HTTP/1.0 403 Forbidden');
\ No newline at end of file

googleanalytics.php

Spacing +116 added lines, -116 removed lines

@@ -38,7 +38,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -145,25 +145,25 @@ 
 	 */
 	public static function get_instance() {
 
-		if ( ! isset( self::$instance ) && ! ( self::$instance instanceof MonsterInsights_Lite ) ) {
+		if ( ! isset(self::$instance) && ! (self::$instance instanceof MonsterInsights_Lite)) {
 			self::$instance = new MonsterInsights_Lite();
 
 			global $wp_version;
 
 			// Detect non-supported WordPress version and return early
-			if ( version_compare( $wp_version, '3.8', '<' ) && ( ! defined( 'MONSTERINSIGHTS_FORCE_ACTIVATION' ) || ! MONSTERINSIGHTS_FORCE_ACTIVATION ) ) {
-				add_action( 'admin_notices', array( self::$instance, 'monsterinsights_wp_notice' ) );
+			if (version_compare($wp_version, '3.8', '<') && ( ! defined('MONSTERINSIGHTS_FORCE_ACTIVATION') || ! MONSTERINSIGHTS_FORCE_ACTIVATION)) {
+				add_action('admin_notices', array(self::$instance, 'monsterinsights_wp_notice'));
 				return;
 			}
 	
 			// Detect Pro version and return early
-			if ( class_exists( 'MonsterInsights' ) && defined( 'GAWP_VERSION' ) ) {
-				add_action( 'admin_notices', array( self::$instance, 'monsterinsights_pro_notice' ) );
+			if (class_exists('MonsterInsights') && defined('GAWP_VERSION')) {
+				add_action('admin_notices', array(self::$instance, 'monsterinsights_pro_notice'));
 				return;
 			}
 
-			if ( defined( 'GAWP_ECOMMERCE_PATH' ) ) {
-				add_action( 'admin_notices', array( self::$instance, 'monsterinsights_old_ecommerce' ) );
+			if (defined('GAWP_ECOMMERCE_PATH')) {
+				add_action('admin_notices', array(self::$instance, 'monsterinsights_old_ecommerce'));
 			}
 			
 			// Define constants
@@ -176,38 +176,38 @@ 
 			self::$instance->require_files();
 
 			// This does the version to version background upgrade routines and initial install
-			$mi_version = get_option( 'monsterinsights_current_version', '5.5.3' );
-			if ( version_compare( $mi_version, '6.0.11', '<' ) ) {
+			$mi_version = get_option('monsterinsights_current_version', '5.5.3');
+			if (version_compare($mi_version, '6.0.11', '<')) {
 				monsterinsights_lite_call_install_and_upgrade();
 			}
 
-			if ( is_admin() ) {
-				new AM_Notification( 'mi-lite', self::$instance->version );
-				new AM_Deactivation_Survey( 'MonsterInsights', basename( __DIR__ ) );
+			if (is_admin()) {
+				new AM_Notification('mi-lite', self::$instance->version);
+				new AM_Deactivation_Survey('MonsterInsights', basename(__DIR__));
 			}
 
 			// Load the plugin textdomain.
-			add_action( 'plugins_loaded', array( self::$instance, 'load_plugin_textdomain' ) );
+			add_action('plugins_loaded', array(self::$instance, 'load_plugin_textdomain'));
 
 			// Load GA for admin, lazyload for frontend
-			if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
-				self::$instance->ga    		= new MonsterInsights_GA();
+			if (is_admin() || (defined('DOING_CRON') && DOING_CRON)) {
+				self::$instance->ga = new MonsterInsights_GA();
 			}
 
 			// Load admin only components.
-			if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+			if (is_admin() || (defined('DOING_CRON') && DOING_CRON)) {
 				self::$instance->notices    = new MonsterInsights_Notice_Admin();
 				self::$instance->license    = new MonsterInsights_License();
-				self::$instance->reports 	= new MonsterInsights_Reporting();
-				if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+				self::$instance->reports = new MonsterInsights_Reporting();
+				if (defined('DOING_CRON') && DOING_CRON) {
 					self::$instance->require_updater();
 				} else {
-					add_action( 'admin_init', array( self::$instance, 'require_updater' ) );
+					add_action('admin_init', array(self::$instance, 'require_updater'));
 				}
 			}
 
 			// Run hook to load MonsterInsights addons.
-			do_action( 'monsterinsights_load_plugins' ); // the updater class for each addon needs to be instantiated via `monsterinsights_updater`
+			do_action('monsterinsights_load_plugins'); // the updater class for each addon needs to be instantiated via `monsterinsights_updater`
 		}
 
 		return self::$instance;
@@ -226,7 +226,7 @@ 
 	 * @return void
 	 */
 	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'google-analytics-for-wordpress' ), '6.0.0' );
+		_doing_it_wrong(__FUNCTION__, esc_html__('Cheatin&#8217; huh?', 'google-analytics-for-wordpress'), '6.0.0');
 	}
 
 	/**
@@ -240,7 +240,7 @@ 
 	 * @return void
 	 */
 	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'google-analytics-for-wordpress' ), '6.0.0' );
+		_doing_it_wrong(__FUNCTION__, esc_html__('Cheatin&#8217; huh?', 'google-analytics-for-wordpress'), '6.0.0');
 	}
 
 	/**
@@ -255,9 +255,9 @@ 
 	 *
 	 * @return void
 	 */
-	public function __get( $key ) {
-		if ( $key === 'ga' ) {
-			if ( empty( self::$instance->ga ) ) {
+	public function __get($key) {
+		if ($key === 'ga') {
+			if (empty(self::$instance->ga)) {
 				// LazyLoad GA for Frontend
 				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/google.php';
 				self::$instance->ga = new MonsterInsights_GA();
@@ -280,48 +280,48 @@ 
 	 */
 	public function define_globals() {
 
-		if ( ! defined( 'MONSTERINSIGHTS_VERSION' ) ) {
-			define( 'MONSTERINSIGHTS_VERSION', $this->version );
+		if ( ! defined('MONSTERINSIGHTS_VERSION')) {
+			define('MONSTERINSIGHTS_VERSION', $this->version);
 		}
 
-		if ( ! defined( 'MONSTERINSIGHTS_LITE_VERSION' ) ) {
-			define( 'MONSTERINSIGHTS_LITE_VERSION', MONSTERINSIGHTS_VERSION );
+		if ( ! defined('MONSTERINSIGHTS_LITE_VERSION')) {
+			define('MONSTERINSIGHTS_LITE_VERSION', MONSTERINSIGHTS_VERSION);
 		}
 
-		if ( ! defined( 'GAWP_VERSION' ) ) {
-			define( 'GAWP_VERSION', MONSTERINSIGHTS_VERSION );
+		if ( ! defined('GAWP_VERSION')) {
+			define('GAWP_VERSION', MONSTERINSIGHTS_VERSION);
 		}
 
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_NAME' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_NAME', $this->plugin_name );
+		if ( ! defined('MONSTERINSIGHTS_PLUGIN_NAME')) {
+			define('MONSTERINSIGHTS_PLUGIN_NAME', $this->plugin_name);
 		}
 
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_SLUG' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_SLUG', $this->plugin_slug );
+		if ( ! defined('MONSTERINSIGHTS_PLUGIN_SLUG')) {
+			define('MONSTERINSIGHTS_PLUGIN_SLUG', $this->plugin_slug);
 		}
 
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_FILE' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_FILE', $this->file );
+		if ( ! defined('MONSTERINSIGHTS_PLUGIN_FILE')) {
+			define('MONSTERINSIGHTS_PLUGIN_FILE', $this->file);
 		}
 
-		if ( ! defined( 'GAWP_FILE' ) ) {
-			define( 'GAWP_FILE', MONSTERINSIGHTS_PLUGIN_FILE );
+		if ( ! defined('GAWP_FILE')) {
+			define('GAWP_FILE', MONSTERINSIGHTS_PLUGIN_FILE);
 		}
 
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_DIR' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file )  );
+		if ( ! defined('MONSTERINSIGHTS_PLUGIN_DIR')) {
+			define('MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path($this->file));
 		}
 
-		if ( ! defined( 'GAWP_PATH' ) ) {
-			define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_FILE  );
+		if ( ! defined('GAWP_PATH')) {
+			define('GAWP_PATH', MONSTERINSIGHTS_PLUGIN_FILE);
 		}
 
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_URL' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file )  );
+		if ( ! defined('MONSTERINSIGHTS_PLUGIN_URL')) {
+			define('MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url($this->file));
 		}
 
-		if ( ! defined( 'GAWP_URL' ) ) {
-			define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL  );
+		if ( ! defined('GAWP_URL')) {
+			define('GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL);
 		}
 	}	
 
@@ -336,13 +336,13 @@ 
 	public function load_plugin_textdomain() {
 
 		$mi_locale = get_locale();
-		if ( function_exists( 'get_user_locale' ) ) {
+		if (function_exists('get_user_locale')) {
 			$mi_locale = get_user_locale();
 		}
 
 		// Traditional WordPress plugin locale filter.
-		$mi_locale  = apply_filters( 'plugin_locale',  $mi_locale, 'google-analytics-for-wordpress' );
-		$mi_mofile  = sprintf( '%1$s-%2$s.mo', 'google-analytics-for-wordpress', $mi_locale ); 
+		$mi_locale  = apply_filters('plugin_locale', $mi_locale, 'google-analytics-for-wordpress');
+		$mi_mofile  = sprintf('%1$s-%2$s.mo', 'google-analytics-for-wordpress', $mi_locale); 
 	
 		// Look for wp-content/languages/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo
 		$mi_mofile1 = WP_LANG_DIR . '/google-analytics-for-wordpress/' . $mi_mofile;
@@ -354,17 +354,17 @@ 
 		$mi_mofile3 = WP_LANG_DIR . '/plugins/' . $mi_mofile;
 
 		// Look in wp-content/plugins/google-analytics-for-wordpress/languages/google-analytics-for-wordpress-{lang}_{country}.mo
-		$mi_mofile4 = dirname( plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ) ) . '/languages/';
-		$mi_mofile4 = apply_filters( 'monsterinsights_lite_languages_directory', $mi_mofile4 );
-
-		if ( file_exists( $mi_mofile1 ) ) {
-			load_textdomain( 'google-analytics-for-wordpress', $mi_mofile1 );
-		} elseif ( file_exists( $mi_mofile2 ) ) {
-			load_textdomain( 'google-analytics-for-wordpress', $mi_mofile2 );
-		} elseif ( file_exists( $mi_mofile3 ) ) {
-			load_textdomain( 'google-analytics-for-wordpress', $mi_mofile3 );
+		$mi_mofile4 = dirname(plugin_basename(MONSTERINSIGHTS_PLUGIN_FILE)) . '/languages/';
+		$mi_mofile4 = apply_filters('monsterinsights_lite_languages_directory', $mi_mofile4);
+
+		if (file_exists($mi_mofile1)) {
+			load_textdomain('google-analytics-for-wordpress', $mi_mofile1);
+		} elseif (file_exists($mi_mofile2)) {
+			load_textdomain('google-analytics-for-wordpress', $mi_mofile2);
+		} elseif (file_exists($mi_mofile3)) {
+			load_textdomain('google-analytics-for-wordpress', $mi_mofile3);
 		} else {
-			load_plugin_textdomain( 'google-analytics-for-wordpress', false, $mi_mofile4 );
+			load_plugin_textdomain('google-analytics-for-wordpress', false, $mi_mofile4);
 		}
 
 	}
@@ -381,7 +381,7 @@ 
 	public function monsterinsights_old_ecommerce() {
 		?>
 		<div class="error">
-			<p><?php echo __( 'The version of MonsterInsights eCommerce addon you have is not compatible with the version of MonsterInsights installed. Please update the eCommerce addon as soon as possible', 'ga-premium' ); ?></p>
+			<p><?php echo __('The version of MonsterInsights eCommerce addon you have is not compatible with the version of MonsterInsights installed. Please update the eCommerce addon as soon as possible', 'ga-premium'); ?></p>
 		</div>
 		<?php
 
@@ -396,14 +396,14 @@ 
 	 * @return 	void
 	 */
 	public function monsterinsights_wp_notice() {
-		$url = admin_url( 'plugins.php' );
+		$url = admin_url('plugins.php');
 		// Check for MS dashboard
-		if( is_network_admin() ) {
-			$url = network_admin_url( 'plugins.php' );
+		if (is_network_admin()) {
+			$url = network_admin_url('plugins.php');
 		}
 		?>
 		<div class="error">
-			<p><?php echo sprintf( esc_html__( 'Sorry, but your version of WordPress does not meet MonsterInsights\'s required version of %1$s3.8%2$s to run properly. The plugin not been activated. %3$sClick here to return to the Dashboard%4$s.', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a href="' . $url . '">', '</a>' ); ?></p>
+			<p><?php echo sprintf(esc_html__('Sorry, but your version of WordPress does not meet MonsterInsights\'s required version of %1$s3.8%2$s to run properly. The plugin not been activated. %3$sClick here to return to the Dashboard%4$s.', 'google-analytics-for-wordpress'), '<strong>', '</strong>', '<a href="' . $url . '">', '</a>'); ?></p>
 		</div>
 		<?php
 	}
@@ -417,14 +417,14 @@ 
 	 * @return 	void
 	 */
 	public function monsterinsights_pro_notice() {
-		$url = admin_url( 'plugins.php' );
+		$url = admin_url('plugins.php');
 		// Check for MS dashboard
-		if( is_network_admin() ) {
-			$url = network_admin_url( 'plugins.php' );
+		if (is_network_admin()) {
+			$url = network_admin_url('plugins.php');
 		}
 		?>
 		<div class="error">
-			<p><?php echo sprintf( esc_html__( 'Please %1$uninstall%2$s the MonsterInsights Lite Plugin. Your Pro version of MonsterInsights may not work as expected until the Lite version is uninstalled.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); ?></p>
+			<p><?php echo sprintf(esc_html__('Please %1$uninstall%2$s the MonsterInsights Lite Plugin. Your Pro version of MonsterInsights may not work as expected until the Lite version is uninstalled.', 'google-analytics-for-wordpress'), '<a href="' . $url . '">', '</a>'); ?></p>
 		</div>
 		<?php
 
@@ -445,7 +445,7 @@ 
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/options.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/helpers.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/deprecated.php';
-		$monsterinsights_settings  = monsterinsights_get_options();
+		$monsterinsights_settings = monsterinsights_get_options();
 	}
 
 	/**
@@ -458,7 +458,7 @@ 
 	 */
 	public function require_files() {
 
-		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+		if (is_admin() || (defined('DOING_CRON') && DOING_CRON)) {
 
 			// Lite and Pro files
 				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/pandora/class-am-notification.php';
@@ -502,11 +502,11 @@ 
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/google.php';
 
 		// Lazy Load for Frontend. Load for Admin.
-		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+		if (is_admin() || (defined('DOING_CRON') && DOING_CRON)) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/google.php';
 		}
 
-		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+		if (is_admin() || (defined('DOING_CRON') && DOING_CRON)) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/googleauth.php';
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/addons.php';
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/tools.php';
@@ -533,12 +533,12 @@ 
 
 		// Retrieve the license key. If it is not set, return early.
 		$key = monsterinsights_get_license_key();
-		if ( ! $key ) {
+		if ( ! $key) {
 			return;
 		}
 
 		// If there are any errors with the key itself, return early.
-		if ( monsterinsights_get_license_key_errors() ) {
+		if (monsterinsights_get_license_key_errors()) {
 			return;
 		}
 
@@ -546,7 +546,7 @@ 
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/licensing/updater.php';
 
 		// Fire a hook for Addons to register their updater since we know the key is present.
-		do_action( 'monsterinsights_updater', $key );
+		do_action('monsterinsights_updater', $key);
 	}
 }
 
@@ -562,27 +562,27 @@ 
  *
  * @return void
  */
-function monsterinsights_lite_activation_hook( $network_wide ) {
+function monsterinsights_lite_activation_hook($network_wide) {
 
 	global $wp_version;
 	
-	$url = admin_url( 'plugins.php' );
+	$url = admin_url('plugins.php');
 	// Check for MS dashboard
-	if ( is_network_admin() ) {
-		$url = network_admin_url( 'plugins.php' );
+	if (is_network_admin()) {
+		$url = network_admin_url('plugins.php');
 	}
 	
-	if ( version_compare( $wp_version, '3.8', '<' ) && ( ! defined( 'MONSTERINSIGHTS_FORCE_ACTIVATION' ) || ! MONSTERINSIGHTS_FORCE_ACTIVATION ) ) {
-		deactivate_plugins( plugin_basename( __FILE__ ) );
-		wp_die( sprintf( esc_html__( 'Sorry, but your version of WordPress does not meet MonsterInsight\'s required version of %1$s3.8%2$s to run properly. The plugin not been activated. %3$sClick here to return to the Dashboard%4$s.', 'google-analytics-by-wordpress' ), '<strong>', '</strong>', '<a href="' . $url . '">', '</a>' ) );
+	if (version_compare($wp_version, '3.8', '<') && ( ! defined('MONSTERINSIGHTS_FORCE_ACTIVATION') || ! MONSTERINSIGHTS_FORCE_ACTIVATION)) {
+		deactivate_plugins(plugin_basename(__FILE__));
+		wp_die(sprintf(esc_html__('Sorry, but your version of WordPress does not meet MonsterInsight\'s required version of %1$s3.8%2$s to run properly. The plugin not been activated. %3$sClick here to return to the Dashboard%4$s.', 'google-analytics-by-wordpress'), '<strong>', '</strong>', '<a href="' . $url . '">', '</a>'));
 	}
 	
-	if ( class_exists( 'MonsterInsights' ) ) {
-		deactivate_plugins( plugin_basename( __FILE__ ) );
-		wp_die( sprintf( esc_html__( 'Please uninstall and remove MonsterInsights Pro before activating MonsterInsights Lite. The Lite version has not been activated. %1$sClick here to return to the Dashboard%2$s.', 'google-analytics-by-wordpress' ), '<a href="' . $url . '">', '</a>' ) );
+	if (class_exists('MonsterInsights')) {
+		deactivate_plugins(plugin_basename(__FILE__));
+		wp_die(sprintf(esc_html__('Please uninstall and remove MonsterInsights Pro before activating MonsterInsights Lite. The Lite version has not been activated. %1$sClick here to return to the Dashboard%2$s.', 'google-analytics-by-wordpress'), '<a href="' . $url . '">', '</a>'));
 	}
 }
-register_activation_hook( __FILE__, 'monsterinsights_lite_activation_hook' );
+register_activation_hook(__FILE__, 'monsterinsights_lite_activation_hook');
 
 /**
  * Fired when the plugin is deactivation.
@@ -592,23 +592,23 @@ 
  * 
  * @return 	void
  */
-function monsterinsights_lite_deactivation_hook( $network_wide ) {
+function monsterinsights_lite_deactivation_hook($network_wide) {
 	// Note, if both MI Pro and Lite are active, this is an MI Pro instance
 	// Therefore MI Lite can only use functions of the instance common to
 	// both plugins. If it needs to be pro specific, then include a file that
 	// has that method.
 	$instance = MonsterInsights();
 	
-	if ( is_multisite() && $network_wide ) {
+	if (is_multisite() && $network_wide) {
 		$site_list = get_sites();
 		$options = array(
 			'cron_failed',
 			'cron_last_run',
 		);
 
-		foreach ( (array) $site_list as $site ) {
-			switch_to_blog( $site->blog_id );
-				monsterinsights_delete_options( $options );
+		foreach ((array) $site_list as $site) {
+			switch_to_blog($site->blog_id);
+				monsterinsights_delete_options($options);
 			restore_current_blog();
 		}
 	} else {
@@ -616,10 +616,10 @@ 
 			'cron_failed',
 			'cron_last_run',
 		);
-		monsterinsights_delete_options( $options );
+		monsterinsights_delete_options($options);
 	}
 }
-register_deactivation_hook( __FILE__, 'monsterinsights_lite_deactivation_hook' );
+register_deactivation_hook(__FILE__, 'monsterinsights_lite_deactivation_hook');
 
 /**
  * Fired when the plugin is uninstalled.
@@ -629,7 +629,7 @@ 
  * 
  * @return 	void
  */
-function monsterinsights_lite_uninstall_hook( $network_wide ) {
+function monsterinsights_lite_uninstall_hook($network_wide) {
 	wp_cache_flush();
 	$instance = MonsterInsights();
 
@@ -637,7 +637,7 @@ 
 	// Therefore MI Lite can only use functions of the instance common to
 	// both plugins. If it needs to be pro specific, then include a file that
 	// has that method.
-	if ( is_multisite() && $network_wide ) {
+	if (is_multisite() && $network_wide) {
 		$site_list = get_sites();
 
 		$options = array(
@@ -650,11 +650,11 @@ 
 			'cron_last_run',
 		);
 
-		foreach ( (array) $site_list as $site ) {
-			switch_to_blog( $site->blog_id );
-			monsterinsights_delete_options( $options );
-			delete_option( 'monsterinsights_lite_access_token' );
-			delete_option( 'monsterinsights_lite_refresh_token' );
+		foreach ((array) $site_list as $site) {
+			switch_to_blog($site->blog_id);
+			monsterinsights_delete_options($options);
+			delete_option('monsterinsights_lite_access_token');
+			delete_option('monsterinsights_lite_refresh_token');
 
 			// Destroy the data
 			$instance->reports->delete_aggregate_data();			
@@ -670,18 +670,18 @@ 
 			'cron_failed',
 			'cron_last_run',
 		);
-		monsterinsights_delete_options( $options );
-		delete_option( 'monsterinsights_lite_access_token' );
-		delete_option( 'monsterinsights_lite_refresh_token' );
+		monsterinsights_delete_options($options);
+		delete_option('monsterinsights_lite_access_token');
+		delete_option('monsterinsights_lite_refresh_token');
 
 		// Destroy the data
-		if ( isset( $instance->reports ) && method_exists( $instance->reports,'delete_aggregate_data' ) ) {
+		if (isset($instance->reports) && method_exists($instance->reports, 'delete_aggregate_data')) {
 			$instance->reports->delete_aggregate_data();
 		}
 	}
 
 }
-register_uninstall_hook( __FILE__, 'monsterinsights_lite_uninstall_hook' );
+register_uninstall_hook(__FILE__, 'monsterinsights_lite_uninstall_hook');
 
 /**
  * The main function responsible for returning the one true MonsterInsights_Lite
@@ -722,15 +722,15 @@ 
 	global $wp_version;
 
 	// If the WordPress site doesn't meet the correct WP version requirements, don't activate MonsterInsights
-	if ( version_compare( $wp_version, '3.8', '<' ) ) {
-		if ( is_plugin_active( plugin_basename( __FILE__ ) ) ) {
+	if (version_compare($wp_version, '3.8', '<')) {
+		if (is_plugin_active(plugin_basename(__FILE__))) {
 			return;
 		}
 	}
 
 	// Don't run if MI Pro is installed
-	if ( class_exists( 'MonsterInsights' ) ) {
-		if ( is_plugin_active( plugin_basename( __FILE__ ) ) ) {
+	if (class_exists('MonsterInsights')) {
+		if (is_plugin_active(plugin_basename(__FILE__))) {
 			return;
 		}
 	}
@@ -763,8 +763,8 @@ 
  * 
  * @return void
  */
-function monsterinsights_lite_call_install_and_upgrade(){
-	add_action( 'wp_loaded', 'monsterinsights_lite_install_and_upgrade' );
+function monsterinsights_lite_call_install_and_upgrade() {
+	add_action('wp_loaded', 'monsterinsights_lite_install_and_upgrade');
 }
 
 /**
@@ -790,9 +790,9 @@ 
  * 
  * @return MonsterInsights The singleton MonsterInsights instance.
  */
-if ( ! function_exists( 'MonsterInsights' ) ) {
+if ( ! function_exists('MonsterInsights')) {
 	function MonsterInsights() {
-		return ( class_exists( 'MonsterInsights' ) ? MonsterInsights_Pro() : MonsterInsights_Lite() );
+		return (class_exists('MonsterInsights') ? MonsterInsights_Pro() : MonsterInsights_Lite());
 	}
-	add_action( 'plugins_loaded', 'MonsterInsights' );
+	add_action('plugins_loaded', 'MonsterInsights');
 }
\ No newline at end of file

Indentation +596 added lines, -596 removed lines

@@ -39,7 +39,7 @@ 
 
 // Exit if accessed directly.
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -53,501 +53,501 @@ 
  */
 final class MonsterInsights_Lite {
 
-	/**
-	 * Holds the class object.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * @var object Instance of instantiated MonsterInsights class.
-	 */
-	public static $instance;
-
-	/**
-	 * Plugin version, used for cache-busting of style and script file references.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * @var string $version Plugin version.
-	 */
-	public $version = '6.2.3';
-
-	/**
-	 * Plugin file.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * @var string $file PHP File constant for main file.
-	 */
-	public $file = __FILE__;
-
-	/**
-	 * The name of the plugin.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * @var string $plugin_name Plugin name.
-	 */
-	public $plugin_name = 'MonsterInsights Lite';
-
-	/**
-	 * Unique plugin slug identifier.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * @var string $plugin_slug Plugin slug.
-	 */
-	public $plugin_slug = 'monsterinsights-lite';
-
-	/**
-	 * Holds instance of MonsterInsights Admin Notice class.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * @var MonsterInsights_Admin_Notice $notices Instance of Admin Notice class.
-	 */
-	public $notices;
-
-	/**
-	 * Holds instance of MonsterInsights License class.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * @var MonsterInsights_License $license Instance of License class.
-	 */
-	public $license;
-
-	/**
-	 * Holds instance of MonsterInsights GA class.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * @var MonsterInsights_GA $ga Instance of GA class.
-	 */
-	protected $ga;
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 */
-	public function __construct() {
-		// We don't use this
-	}
-
-	/**
-	 * Returns the singleton instance of the class.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 *
-	 * @return object The MonsterInsights_Lite object.
-	 */
-	public static function get_instance() {
-
-		if ( ! isset( self::$instance ) && ! ( self::$instance instanceof MonsterInsights_Lite ) ) {
-			self::$instance = new MonsterInsights_Lite();
-
-			global $wp_version;
-
-			// Detect non-supported WordPress version and return early
-			if ( version_compare( $wp_version, '3.8', '<' ) && ( ! defined( 'MONSTERINSIGHTS_FORCE_ACTIVATION' ) || ! MONSTERINSIGHTS_FORCE_ACTIVATION ) ) {
-				add_action( 'admin_notices', array( self::$instance, 'monsterinsights_wp_notice' ) );
-				return;
-			}
+    /**
+     * Holds the class object.
+     *
+     * @since 6.0.0
+     * @access public
+     * @var object Instance of instantiated MonsterInsights class.
+     */
+    public static $instance;
+
+    /**
+     * Plugin version, used for cache-busting of style and script file references.
+     *
+     * @since 6.0.0
+     * @access public
+     * @var string $version Plugin version.
+     */
+    public $version = '6.2.3';
+
+    /**
+     * Plugin file.
+     *
+     * @since 6.0.0
+     * @access public
+     * @var string $file PHP File constant for main file.
+     */
+    public $file = __FILE__;
+
+    /**
+     * The name of the plugin.
+     *
+     * @since 6.0.0
+     * @access public
+     * @var string $plugin_name Plugin name.
+     */
+    public $plugin_name = 'MonsterInsights Lite';
+
+    /**
+     * Unique plugin slug identifier.
+     *
+     * @since 6.0.0
+     * @access public
+     * @var string $plugin_slug Plugin slug.
+     */
+    public $plugin_slug = 'monsterinsights-lite';
+
+    /**
+     * Holds instance of MonsterInsights Admin Notice class.
+     *
+     * @since 6.0.0
+     * @access public
+     * @var MonsterInsights_Admin_Notice $notices Instance of Admin Notice class.
+     */
+    public $notices;
+
+    /**
+     * Holds instance of MonsterInsights License class.
+     *
+     * @since 6.0.0
+     * @access public
+     * @var MonsterInsights_License $license Instance of License class.
+     */
+    public $license;
+
+    /**
+     * Holds instance of MonsterInsights GA class.
+     *
+     * @since 6.0.0
+     * @access public
+     * @var MonsterInsights_GA $ga Instance of GA class.
+     */
+    protected $ga;
+
+    /**
+     * Primary class constructor.
+     *
+     * @since 6.0.0
+     * @access public
+     */
+    public function __construct() {
+        // We don't use this
+    }
+
+    /**
+     * Returns the singleton instance of the class.
+     *
+     * @access public
+     * @since 6.0.0
+     *
+     * @return object The MonsterInsights_Lite object.
+     */
+    public static function get_instance() {
+
+        if ( ! isset( self::$instance ) && ! ( self::$instance instanceof MonsterInsights_Lite ) ) {
+            self::$instance = new MonsterInsights_Lite();
+
+            global $wp_version;
+
+            // Detect non-supported WordPress version and return early
+            if ( version_compare( $wp_version, '3.8', '<' ) && ( ! defined( 'MONSTERINSIGHTS_FORCE_ACTIVATION' ) || ! MONSTERINSIGHTS_FORCE_ACTIVATION ) ) {
+                add_action( 'admin_notices', array( self::$instance, 'monsterinsights_wp_notice' ) );
+                return;
+            }
 	
-			// Detect Pro version and return early
-			if ( class_exists( 'MonsterInsights' ) && defined( 'GAWP_VERSION' ) ) {
-				add_action( 'admin_notices', array( self::$instance, 'monsterinsights_pro_notice' ) );
-				return;
-			}
-
-			if ( defined( 'GAWP_ECOMMERCE_PATH' ) ) {
-				add_action( 'admin_notices', array( self::$instance, 'monsterinsights_old_ecommerce' ) );
-			}
+            // Detect Pro version and return early
+            if ( class_exists( 'MonsterInsights' ) && defined( 'GAWP_VERSION' ) ) {
+                add_action( 'admin_notices', array( self::$instance, 'monsterinsights_pro_notice' ) );
+                return;
+            }
+
+            if ( defined( 'GAWP_ECOMMERCE_PATH' ) ) {
+                add_action( 'admin_notices', array( self::$instance, 'monsterinsights_old_ecommerce' ) );
+            }
 			
-			// Define constants
-			self::$instance->define_globals();
-
-			// Load in settings
-			self::$instance->load_settings();
-
-			// Load files
-			self::$instance->require_files();
-
-			// This does the version to version background upgrade routines and initial install
-			$mi_version = get_option( 'monsterinsights_current_version', '5.5.3' );
-			if ( version_compare( $mi_version, '6.0.11', '<' ) ) {
-				monsterinsights_lite_call_install_and_upgrade();
-			}
-
-			if ( is_admin() ) {
-				new AM_Notification( 'mi-lite', self::$instance->version );
-				new AM_Deactivation_Survey( 'MonsterInsights', basename( __DIR__ ) );
-			}
-
-			// Load the plugin textdomain.
-			add_action( 'plugins_loaded', array( self::$instance, 'load_plugin_textdomain' ) );
-
-			// Load GA for admin, lazyload for frontend
-			if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
-				self::$instance->ga    		= new MonsterInsights_GA();
-			}
-
-			// Load admin only components.
-			if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
-				self::$instance->notices    = new MonsterInsights_Notice_Admin();
-				self::$instance->license    = new MonsterInsights_License();
-				self::$instance->reports 	= new MonsterInsights_Reporting();
-				if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
-					self::$instance->require_updater();
-				} else {
-					add_action( 'admin_init', array( self::$instance, 'require_updater' ) );
-				}
-			}
-
-			// Run hook to load MonsterInsights addons.
-			do_action( 'monsterinsights_load_plugins' ); // the updater class for each addon needs to be instantiated via `monsterinsights_updater`
-		}
-
-		return self::$instance;
-
-	}
-
-	/**
-	 * Throw error on object clone
-	 *
-	 * The whole idea of the singleton design pattern is that there is a single
-	 * object therefore, we don't want the object to be cloned.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @return void
-	 */
-	public function __clone() {
-		_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'google-analytics-for-wordpress' ), '6.0.0' );
-	}
-
-	/**
-	 * Disable unserializing of the class
-	 *
-	 * Attempting to wakeup an MonsterInsights instance will throw a doing it wrong notice.
-	 * 
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @return void
-	 */
-	public function __wakeup() {
-		_doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'google-analytics-for-wordpress' ), '6.0.0' );
-	}
-
-	/**
-	 * Magic get function.
-	 *
-	 * We use this to lazy load certain functionality. Right now used to lazyload
-	 * the Google Object for frontend, so it's only loaded if user is using a plugin
-	 * that requires it.
-	 *
-	 * @since 6.0.10
-	 * @access public
-	 *
-	 * @return void
-	 */
-	public function __get( $key ) {
-		if ( $key === 'ga' ) {
-			if ( empty( self::$instance->ga ) ) {
-				// LazyLoad GA for Frontend
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/google.php';
-				self::$instance->ga = new MonsterInsights_GA();
-			}
-			return self::$instance->$key;
-		} else {
-			return self::$instance->$key;
-		}
-	}
-
-	/**
-	 * Define MonsterInsights constants.
-	 *
-	 * This function defines all of the MonsterInsights PHP constants.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 *
-	 * @return void
-	 */
-	public function define_globals() {
-
-		if ( ! defined( 'MONSTERINSIGHTS_VERSION' ) ) {
-			define( 'MONSTERINSIGHTS_VERSION', $this->version );
-		}
-
-		if ( ! defined( 'MONSTERINSIGHTS_LITE_VERSION' ) ) {
-			define( 'MONSTERINSIGHTS_LITE_VERSION', MONSTERINSIGHTS_VERSION );
-		}
-
-		if ( ! defined( 'GAWP_VERSION' ) ) {
-			define( 'GAWP_VERSION', MONSTERINSIGHTS_VERSION );
-		}
-
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_NAME' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_NAME', $this->plugin_name );
-		}
-
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_SLUG' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_SLUG', $this->plugin_slug );
-		}
-
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_FILE' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_FILE', $this->file );
-		}
-
-		if ( ! defined( 'GAWP_FILE' ) ) {
-			define( 'GAWP_FILE', MONSTERINSIGHTS_PLUGIN_FILE );
-		}
-
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_DIR' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file )  );
-		}
-
-		if ( ! defined( 'GAWP_PATH' ) ) {
-			define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_FILE  );
-		}
-
-		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_URL' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file )  );
-		}
-
-		if ( ! defined( 'GAWP_URL' ) ) {
-			define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL  );
-		}
-	}	
-
-	/**
-	 * Loads the plugin textdomain for translation.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 *
-	 * @return void
-	 */
-	public function load_plugin_textdomain() {
-
-		$mi_locale = get_locale();
-		if ( function_exists( 'get_user_locale' ) ) {
-			$mi_locale = get_user_locale();
-		}
-
-		// Traditional WordPress plugin locale filter.
-		$mi_locale  = apply_filters( 'plugin_locale',  $mi_locale, 'google-analytics-for-wordpress' );
-		$mi_mofile  = sprintf( '%1$s-%2$s.mo', 'google-analytics-for-wordpress', $mi_locale ); 
+            // Define constants
+            self::$instance->define_globals();
+
+            // Load in settings
+            self::$instance->load_settings();
+
+            // Load files
+            self::$instance->require_files();
+
+            // This does the version to version background upgrade routines and initial install
+            $mi_version = get_option( 'monsterinsights_current_version', '5.5.3' );
+            if ( version_compare( $mi_version, '6.0.11', '<' ) ) {
+                monsterinsights_lite_call_install_and_upgrade();
+            }
+
+            if ( is_admin() ) {
+                new AM_Notification( 'mi-lite', self::$instance->version );
+                new AM_Deactivation_Survey( 'MonsterInsights', basename( __DIR__ ) );
+            }
+
+            // Load the plugin textdomain.
+            add_action( 'plugins_loaded', array( self::$instance, 'load_plugin_textdomain' ) );
+
+            // Load GA for admin, lazyload for frontend
+            if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+                self::$instance->ga    		= new MonsterInsights_GA();
+            }
+
+            // Load admin only components.
+            if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+                self::$instance->notices    = new MonsterInsights_Notice_Admin();
+                self::$instance->license    = new MonsterInsights_License();
+                self::$instance->reports 	= new MonsterInsights_Reporting();
+                if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
+                    self::$instance->require_updater();
+                } else {
+                    add_action( 'admin_init', array( self::$instance, 'require_updater' ) );
+                }
+            }
+
+            // Run hook to load MonsterInsights addons.
+            do_action( 'monsterinsights_load_plugins' ); // the updater class for each addon needs to be instantiated via `monsterinsights_updater`
+        }
+
+        return self::$instance;
+
+    }
+
+    /**
+     * Throw error on object clone
+     *
+     * The whole idea of the singleton design pattern is that there is a single
+     * object therefore, we don't want the object to be cloned.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @return void
+     */
+    public function __clone() {
+        _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'google-analytics-for-wordpress' ), '6.0.0' );
+    }
+
+    /**
+     * Disable unserializing of the class
+     *
+     * Attempting to wakeup an MonsterInsights instance will throw a doing it wrong notice.
+     * 
+     * @since 6.0.0
+     * @access public
+     *
+     * @return void
+     */
+    public function __wakeup() {
+        _doing_it_wrong( __FUNCTION__, esc_html__( 'Cheatin&#8217; huh?', 'google-analytics-for-wordpress' ), '6.0.0' );
+    }
+
+    /**
+     * Magic get function.
+     *
+     * We use this to lazy load certain functionality. Right now used to lazyload
+     * the Google Object for frontend, so it's only loaded if user is using a plugin
+     * that requires it.
+     *
+     * @since 6.0.10
+     * @access public
+     *
+     * @return void
+     */
+    public function __get( $key ) {
+        if ( $key === 'ga' ) {
+            if ( empty( self::$instance->ga ) ) {
+                // LazyLoad GA for Frontend
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/google.php';
+                self::$instance->ga = new MonsterInsights_GA();
+            }
+            return self::$instance->$key;
+        } else {
+            return self::$instance->$key;
+        }
+    }
+
+    /**
+     * Define MonsterInsights constants.
+     *
+     * This function defines all of the MonsterInsights PHP constants.
+     *
+     * @since 6.0.0
+     * @access public
+     *
+     * @return void
+     */
+    public function define_globals() {
+
+        if ( ! defined( 'MONSTERINSIGHTS_VERSION' ) ) {
+            define( 'MONSTERINSIGHTS_VERSION', $this->version );
+        }
+
+        if ( ! defined( 'MONSTERINSIGHTS_LITE_VERSION' ) ) {
+            define( 'MONSTERINSIGHTS_LITE_VERSION', MONSTERINSIGHTS_VERSION );
+        }
+
+        if ( ! defined( 'GAWP_VERSION' ) ) {
+            define( 'GAWP_VERSION', MONSTERINSIGHTS_VERSION );
+        }
+
+        if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_NAME' ) ) {
+            define( 'MONSTERINSIGHTS_PLUGIN_NAME', $this->plugin_name );
+        }
+
+        if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_SLUG' ) ) {
+            define( 'MONSTERINSIGHTS_PLUGIN_SLUG', $this->plugin_slug );
+        }
+
+        if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_FILE' ) ) {
+            define( 'MONSTERINSIGHTS_PLUGIN_FILE', $this->file );
+        }
+
+        if ( ! defined( 'GAWP_FILE' ) ) {
+            define( 'GAWP_FILE', MONSTERINSIGHTS_PLUGIN_FILE );
+        }
+
+        if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_DIR' ) ) {
+            define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file )  );
+        }
+
+        if ( ! defined( 'GAWP_PATH' ) ) {
+            define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_FILE  );
+        }
+
+        if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_URL' ) ) {
+            define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file )  );
+        }
+
+        if ( ! defined( 'GAWP_URL' ) ) {
+            define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL  );
+        }
+    }	
+
+    /**
+     * Loads the plugin textdomain for translation.
+     *
+     * @access public
+     * @since 6.0.0
+     *
+     * @return void
+     */
+    public function load_plugin_textdomain() {
+
+        $mi_locale = get_locale();
+        if ( function_exists( 'get_user_locale' ) ) {
+            $mi_locale = get_user_locale();
+        }
+
+        // Traditional WordPress plugin locale filter.
+        $mi_locale  = apply_filters( 'plugin_locale',  $mi_locale, 'google-analytics-for-wordpress' );
+        $mi_mofile  = sprintf( '%1$s-%2$s.mo', 'google-analytics-for-wordpress', $mi_locale ); 
 	
-		// Look for wp-content/languages/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo
-		$mi_mofile1 = WP_LANG_DIR . '/google-analytics-for-wordpress/' . $mi_mofile;
-
-		// Look in wp-content/languages/plugins/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo
-		$mi_mofile2 = WP_LANG_DIR . '/plugins/google-analytics-for-wordpress/' . $mi_mofile;
-
-		// Look in wp-content/languages/plugins/google-analytics-for-wordpress-{lang}_{country}.mo
-		$mi_mofile3 = WP_LANG_DIR . '/plugins/' . $mi_mofile;
-
-		// Look in wp-content/plugins/google-analytics-for-wordpress/languages/google-analytics-for-wordpress-{lang}_{country}.mo
-		$mi_mofile4 = dirname( plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ) ) . '/languages/';
-		$mi_mofile4 = apply_filters( 'monsterinsights_lite_languages_directory', $mi_mofile4 );
-
-		if ( file_exists( $mi_mofile1 ) ) {
-			load_textdomain( 'google-analytics-for-wordpress', $mi_mofile1 );
-		} elseif ( file_exists( $mi_mofile2 ) ) {
-			load_textdomain( 'google-analytics-for-wordpress', $mi_mofile2 );
-		} elseif ( file_exists( $mi_mofile3 ) ) {
-			load_textdomain( 'google-analytics-for-wordpress', $mi_mofile3 );
-		} else {
-			load_plugin_textdomain( 'google-analytics-for-wordpress', false, $mi_mofile4 );
-		}
-
-	}
-
-
-	/**
-	 * Output notice to update eCommerce
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 *
-	 * @return 	void
-	 */
-	public function monsterinsights_old_ecommerce() {
-		?>
+        // Look for wp-content/languages/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo
+        $mi_mofile1 = WP_LANG_DIR . '/google-analytics-for-wordpress/' . $mi_mofile;
+
+        // Look in wp-content/languages/plugins/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo
+        $mi_mofile2 = WP_LANG_DIR . '/plugins/google-analytics-for-wordpress/' . $mi_mofile;
+
+        // Look in wp-content/languages/plugins/google-analytics-for-wordpress-{lang}_{country}.mo
+        $mi_mofile3 = WP_LANG_DIR . '/plugins/' . $mi_mofile;
+
+        // Look in wp-content/plugins/google-analytics-for-wordpress/languages/google-analytics-for-wordpress-{lang}_{country}.mo
+        $mi_mofile4 = dirname( plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ) ) . '/languages/';
+        $mi_mofile4 = apply_filters( 'monsterinsights_lite_languages_directory', $mi_mofile4 );
+
+        if ( file_exists( $mi_mofile1 ) ) {
+            load_textdomain( 'google-analytics-for-wordpress', $mi_mofile1 );
+        } elseif ( file_exists( $mi_mofile2 ) ) {
+            load_textdomain( 'google-analytics-for-wordpress', $mi_mofile2 );
+        } elseif ( file_exists( $mi_mofile3 ) ) {
+            load_textdomain( 'google-analytics-for-wordpress', $mi_mofile3 );
+        } else {
+            load_plugin_textdomain( 'google-analytics-for-wordpress', false, $mi_mofile4 );
+        }
+
+    }
+
+
+    /**
+     * Output notice to update eCommerce
+     *
+     * @access public
+     * @since 6.0.0
+     *
+     * @return 	void
+     */
+    public function monsterinsights_old_ecommerce() {
+        ?>
 		<div class="error">
 			<p><?php echo __( 'The version of MonsterInsights eCommerce addon you have is not compatible with the version of MonsterInsights installed. Please update the eCommerce addon as soon as possible', 'ga-premium' ); ?></p>
 		</div>
 		<?php
 
-	}
-
-	/**
-	 * Output a nag notice if the user has an out of date WP version installed
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 *
-	 * @return 	void
-	 */
-	public function monsterinsights_wp_notice() {
-		$url = admin_url( 'plugins.php' );
-		// Check for MS dashboard
-		if( is_network_admin() ) {
-			$url = network_admin_url( 'plugins.php' );
-		}
-		?>
+    }
+
+    /**
+     * Output a nag notice if the user has an out of date WP version installed
+     *
+     * @access public
+     * @since 6.0.0
+     *
+     * @return 	void
+     */
+    public function monsterinsights_wp_notice() {
+        $url = admin_url( 'plugins.php' );
+        // Check for MS dashboard
+        if( is_network_admin() ) {
+            $url = network_admin_url( 'plugins.php' );
+        }
+        ?>
 		<div class="error">
 			<p><?php echo sprintf( esc_html__( 'Sorry, but your version of WordPress does not meet MonsterInsights\'s required version of %1$s3.8%2$s to run properly. The plugin not been activated. %3$sClick here to return to the Dashboard%4$s.', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a href="' . $url . '">', '</a>' ); ?></p>
 		</div>
 		<?php
-	}
+    }
 	
-	/**
-	 * Output a nag notice if the user has both Lite and Pro activated
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 *
-	 * @return 	void
-	 */
-	public function monsterinsights_pro_notice() {
-		$url = admin_url( 'plugins.php' );
-		// Check for MS dashboard
-		if( is_network_admin() ) {
-			$url = network_admin_url( 'plugins.php' );
-		}
-		?>
+    /**
+     * Output a nag notice if the user has both Lite and Pro activated
+     *
+     * @access public
+     * @since 6.0.0
+     *
+     * @return 	void
+     */
+    public function monsterinsights_pro_notice() {
+        $url = admin_url( 'plugins.php' );
+        // Check for MS dashboard
+        if( is_network_admin() ) {
+            $url = network_admin_url( 'plugins.php' );
+        }
+        ?>
 		<div class="error">
 			<p><?php echo sprintf( esc_html__( 'Please %1$uninstall%2$s the MonsterInsights Lite Plugin. Your Pro version of MonsterInsights may not work as expected until the Lite version is uninstalled.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); ?></p>
 		</div>
 		<?php
 
-	}
-
-	/**
-	 * Loads MonsterInsights settings
-	 *
-	 * Adds the items to the base object, and adds the helper functions.
-	 *
-	 * @since 6.0.0
-	 * @access public
-	 * 
-	 * @return void
-	 */
-	public function load_settings() {
-		global $monsterinsights_settings;
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/options.php';
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/helpers.php';
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/deprecated.php';
-		$monsterinsights_settings  = monsterinsights_get_options();
-	}
-
-	/**
-	 * Loads all files into scope.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 *
-	 * @return 	void
-	 */
-	public function require_files() {
-
-		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
-
-			// Lite and Pro files
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/pandora/class-am-notification.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/pandora/class-am-deactivation-survey.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/ajax.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/admin.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/common.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/notice.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/capabilities.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/licensing/license.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/licensing/autoupdate.php';
-
-			// Pages
-				// Multisite
-					require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/network-settings.php';
-
-				// Single Site
-					require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/dashboard.php';
-					require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/settings.php';
-					require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/tools.php';
-					require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/reports.php';
+    }
+
+    /**
+     * Loads MonsterInsights settings
+     *
+     * Adds the items to the base object, and adds the helper functions.
+     *
+     * @since 6.0.0
+     * @access public
+     * 
+     * @return void
+     */
+    public function load_settings() {
+        global $monsterinsights_settings;
+        require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/options.php';
+        require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/helpers.php';
+        require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/deprecated.php';
+        $monsterinsights_settings  = monsterinsights_get_options();
+    }
+
+    /**
+     * Loads all files into scope.
+     *
+     * @access public
+     * @since 6.0.0
+     *
+     * @return 	void
+     */
+    public function require_files() {
+
+        if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+
+            // Lite and Pro files
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/pandora/class-am-notification.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'assets/lib/pandora/class-am-deactivation-survey.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/ajax.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/admin.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/common.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/notice.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/capabilities.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/licensing/license.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/licensing/autoupdate.php';
+
+            // Pages
+                // Multisite
+                    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/network-settings.php';
+
+                // Single Site
+                    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/dashboard.php';
+                    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/settings.php';
+                    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/tools.php';
+                    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/reports.php';
 				
-				// Both	
-					require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/addons.php';
-
-			// Settings Tabs
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/tab-general.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/tab-tracking.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/tab-status.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/tab-support.php';
+                // Both	
+                    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/pages/addons.php';
+
+            // Settings Tabs
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/tab-general.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/tab-tracking.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/tab-status.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/tab-support.php';
 			
-			// Register Settings + Settings API
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/settings-api.php';
-				require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/register-settings.php';	
-
-			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/reporting.php';
-			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/abstract-report.php';
-		}
-
-		// Load Google Config
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/google.php';
-
-		// Lazy Load for Frontend. Load for Admin.
-		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
-			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/google.php';
-		}
-
-		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
-			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/googleauth.php';
-			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/addons.php';
-			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/tools.php';
-			//require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/tab-support.php';
+            // Register Settings + Settings API
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/settings-api.php';
+                require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/settings/register-settings.php';	
+
+            require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/reporting.php';
+            require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/abstract-report.php';
+        }
+
+        // Load Google Config
+        require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/google.php';
+
+        // Lazy Load for Frontend. Load for Admin.
+        if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+            require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/google.php';
+        }
+
+        if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
+            require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/googleauth.php';
+            require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/addons.php';
+            require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/tools.php';
+            //require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/admin/tab-support.php';
 			
-			// Late loading classes (self instantiating)
-			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/reports/overview.php';
-			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/tracking.php';
-		}
-
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/frontend/frontend.php';
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/measurement-protocol.php';
-	}
-
-	/**
-	 * Loads all updater related files and functions into scope.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 *
-	 * @return null Return early if the license key is not set or there are key errors.
-	 */
-	public function require_updater() {
-
-		// Retrieve the license key. If it is not set, return early.
-		$key = monsterinsights_get_license_key();
-		if ( ! $key ) {
-			return;
-		}
-
-		// If there are any errors with the key itself, return early.
-		if ( monsterinsights_get_license_key_errors() ) {
-			return;
-		}
-
-		// Load the updater class.
-		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/licensing/updater.php';
-
-		// Fire a hook for Addons to register their updater since we know the key is present.
-		do_action( 'monsterinsights_updater', $key );
-	}
+            // Late loading classes (self instantiating)
+            require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/reports/overview.php';
+            require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/tracking.php';
+        }
+
+        require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/frontend/frontend.php';
+        require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/measurement-protocol.php';
+    }
+
+    /**
+     * Loads all updater related files and functions into scope.
+     *
+     * @access public
+     * @since 6.0.0
+     *
+     * @return null Return early if the license key is not set or there are key errors.
+     */
+    public function require_updater() {
+
+        // Retrieve the license key. If it is not set, return early.
+        $key = monsterinsights_get_license_key();
+        if ( ! $key ) {
+            return;
+        }
+
+        // If there are any errors with the key itself, return early.
+        if ( monsterinsights_get_license_key_errors() ) {
+            return;
+        }
+
+        // Load the updater class.
+        require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/admin/licensing/updater.php';
+
+        // Fire a hook for Addons to register their updater since we know the key is present.
+        do_action( 'monsterinsights_updater', $key );
+    }
 }
 
 /**
@@ -564,23 +564,23 @@ 
  */
 function monsterinsights_lite_activation_hook( $network_wide ) {
 
-	global $wp_version;
+    global $wp_version;
 	
-	$url = admin_url( 'plugins.php' );
-	// Check for MS dashboard
-	if ( is_network_admin() ) {
-		$url = network_admin_url( 'plugins.php' );
-	}
+    $url = admin_url( 'plugins.php' );
+    // Check for MS dashboard
+    if ( is_network_admin() ) {
+        $url = network_admin_url( 'plugins.php' );
+    }
 	
-	if ( version_compare( $wp_version, '3.8', '<' ) && ( ! defined( 'MONSTERINSIGHTS_FORCE_ACTIVATION' ) || ! MONSTERINSIGHTS_FORCE_ACTIVATION ) ) {
-		deactivate_plugins( plugin_basename( __FILE__ ) );
-		wp_die( sprintf( esc_html__( 'Sorry, but your version of WordPress does not meet MonsterInsight\'s required version of %1$s3.8%2$s to run properly. The plugin not been activated. %3$sClick here to return to the Dashboard%4$s.', 'google-analytics-by-wordpress' ), '<strong>', '</strong>', '<a href="' . $url . '">', '</a>' ) );
-	}
+    if ( version_compare( $wp_version, '3.8', '<' ) && ( ! defined( 'MONSTERINSIGHTS_FORCE_ACTIVATION' ) || ! MONSTERINSIGHTS_FORCE_ACTIVATION ) ) {
+        deactivate_plugins( plugin_basename( __FILE__ ) );
+        wp_die( sprintf( esc_html__( 'Sorry, but your version of WordPress does not meet MonsterInsight\'s required version of %1$s3.8%2$s to run properly. The plugin not been activated. %3$sClick here to return to the Dashboard%4$s.', 'google-analytics-by-wordpress' ), '<strong>', '</strong>', '<a href="' . $url . '">', '</a>' ) );
+    }
 	
-	if ( class_exists( 'MonsterInsights' ) ) {
-		deactivate_plugins( plugin_basename( __FILE__ ) );
-		wp_die( sprintf( esc_html__( 'Please uninstall and remove MonsterInsights Pro before activating MonsterInsights Lite. The Lite version has not been activated. %1$sClick here to return to the Dashboard%2$s.', 'google-analytics-by-wordpress' ), '<a href="' . $url . '">', '</a>' ) );
-	}
+    if ( class_exists( 'MonsterInsights' ) ) {
+        deactivate_plugins( plugin_basename( __FILE__ ) );
+        wp_die( sprintf( esc_html__( 'Please uninstall and remove MonsterInsights Pro before activating MonsterInsights Lite. The Lite version has not been activated. %1$sClick here to return to the Dashboard%2$s.', 'google-analytics-by-wordpress' ), '<a href="' . $url . '">', '</a>' ) );
+    }
 }
 register_activation_hook( __FILE__, 'monsterinsights_lite_activation_hook' );
 
@@ -593,31 +593,31 @@ 
  * @return 	void
  */
 function monsterinsights_lite_deactivation_hook( $network_wide ) {
-	// Note, if both MI Pro and Lite are active, this is an MI Pro instance
-	// Therefore MI Lite can only use functions of the instance common to
-	// both plugins. If it needs to be pro specific, then include a file that
-	// has that method.
-	$instance = MonsterInsights();
+    // Note, if both MI Pro and Lite are active, this is an MI Pro instance
+    // Therefore MI Lite can only use functions of the instance common to
+    // both plugins. If it needs to be pro specific, then include a file that
+    // has that method.
+    $instance = MonsterInsights();
 	
-	if ( is_multisite() && $network_wide ) {
-		$site_list = get_sites();
-		$options = array(
-			'cron_failed',
-			'cron_last_run',
-		);
-
-		foreach ( (array) $site_list as $site ) {
-			switch_to_blog( $site->blog_id );
-				monsterinsights_delete_options( $options );
-			restore_current_blog();
-		}
-	} else {
-		$options = array(
-			'cron_failed',
-			'cron_last_run',
-		);
-		monsterinsights_delete_options( $options );
-	}
+    if ( is_multisite() && $network_wide ) {
+        $site_list = get_sites();
+        $options = array(
+            'cron_failed',
+            'cron_last_run',
+        );
+
+        foreach ( (array) $site_list as $site ) {
+            switch_to_blog( $site->blog_id );
+                monsterinsights_delete_options( $options );
+            restore_current_blog();
+        }
+    } else {
+        $options = array(
+            'cron_failed',
+            'cron_last_run',
+        );
+        monsterinsights_delete_options( $options );
+    }
 }
 register_deactivation_hook( __FILE__, 'monsterinsights_lite_deactivation_hook' );
 
@@ -630,55 +630,55 @@ 
  * @return 	void
  */
 function monsterinsights_lite_uninstall_hook( $network_wide ) {
-	wp_cache_flush();
-	$instance = MonsterInsights();
-
-	// Note, if both MI Pro and Lite are active, this is an MI Pro instance
-	// Therefore MI Lite can only use functions of the instance common to
-	// both plugins. If it needs to be pro specific, then include a file that
-	// has that method.
-	if ( is_multisite() && $network_wide ) {
-		$site_list = get_sites();
-
-		$options = array(
-			'analytics_profile_code',
-			'analytics_profile',
-			'analytics_profile_name',
-			'analytics_name',
-			'oauth_version',
-			'cron_failed',
-			'cron_last_run',
-		);
-
-		foreach ( (array) $site_list as $site ) {
-			switch_to_blog( $site->blog_id );
-			monsterinsights_delete_options( $options );
-			delete_option( 'monsterinsights_lite_access_token' );
-			delete_option( 'monsterinsights_lite_refresh_token' );
-
-			// Destroy the data
-			$instance->reports->delete_aggregate_data();			
-			restore_current_blog();
-		}
-	} else {
-		$options = array(
-			'analytics_profile_code',
-			'analytics_profile',
-			'analytics_profile_name',
-			'analytics_name',
-			'oauth_version',
-			'cron_failed',
-			'cron_last_run',
-		);
-		monsterinsights_delete_options( $options );
-		delete_option( 'monsterinsights_lite_access_token' );
-		delete_option( 'monsterinsights_lite_refresh_token' );
-
-		// Destroy the data
-		if ( isset( $instance->reports ) && method_exists( $instance->reports,'delete_aggregate_data' ) ) {
-			$instance->reports->delete_aggregate_data();
-		}
-	}
+    wp_cache_flush();
+    $instance = MonsterInsights();
+
+    // Note, if both MI Pro and Lite are active, this is an MI Pro instance
+    // Therefore MI Lite can only use functions of the instance common to
+    // both plugins. If it needs to be pro specific, then include a file that
+    // has that method.
+    if ( is_multisite() && $network_wide ) {
+        $site_list = get_sites();
+
+        $options = array(
+            'analytics_profile_code',
+            'analytics_profile',
+            'analytics_profile_name',
+            'analytics_name',
+            'oauth_version',
+            'cron_failed',
+            'cron_last_run',
+        );
+
+        foreach ( (array) $site_list as $site ) {
+            switch_to_blog( $site->blog_id );
+            monsterinsights_delete_options( $options );
+            delete_option( 'monsterinsights_lite_access_token' );
+            delete_option( 'monsterinsights_lite_refresh_token' );
+
+            // Destroy the data
+            $instance->reports->delete_aggregate_data();			
+            restore_current_blog();
+        }
+    } else {
+        $options = array(
+            'analytics_profile_code',
+            'analytics_profile',
+            'analytics_profile_name',
+            'analytics_name',
+            'oauth_version',
+            'cron_failed',
+            'cron_last_run',
+        );
+        monsterinsights_delete_options( $options );
+        delete_option( 'monsterinsights_lite_access_token' );
+        delete_option( 'monsterinsights_lite_refresh_token' );
+
+        // Destroy the data
+        if ( isset( $instance->reports ) && method_exists( $instance->reports,'delete_aggregate_data' ) ) {
+            $instance->reports->delete_aggregate_data();
+        }
+    }
 
 }
 register_uninstall_hook( __FILE__, 'monsterinsights_lite_uninstall_hook' );
@@ -699,7 +699,7 @@ 
  * @return MonsterInsights_Lite The singleton MonsterInsights_Lite instance.
  */
 function MonsterInsights_Lite() {
-	return MonsterInsights_Lite::get_instance();
+    return MonsterInsights_Lite::get_instance();
 }
 
 /**
@@ -719,34 +719,34 @@ 
  * @return void
  */
 function monsterinsights_lite_install_and_upgrade() {
-	global $wp_version;
-
-	// If the WordPress site doesn't meet the correct WP version requirements, don't activate MonsterInsights
-	if ( version_compare( $wp_version, '3.8', '<' ) ) {
-		if ( is_plugin_active( plugin_basename( __FILE__ ) ) ) {
-			return;
-		}
-	}
-
-	// Don't run if MI Pro is installed
-	if ( class_exists( 'MonsterInsights' ) ) {
-		if ( is_plugin_active( plugin_basename( __FILE__ ) ) ) {
-			return;
-		}
-	}
-
-
-	// Load settings and globals (so we can use/set them during the upgrade process)
-	MonsterInsights_Lite()->define_globals();
-	MonsterInsights_Lite()->load_settings();
-
-	// Load upgrade file
-	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/install.php';
-	require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/install.php'; // Lite only install stuff
-
-	// Run the MonsterInsights upgrade routines
-	$updates = new MonsterInsights_Install();
-	$updates->init();
+    global $wp_version;
+
+    // If the WordPress site doesn't meet the correct WP version requirements, don't activate MonsterInsights
+    if ( version_compare( $wp_version, '3.8', '<' ) ) {
+        if ( is_plugin_active( plugin_basename( __FILE__ ) ) ) {
+            return;
+        }
+    }
+
+    // Don't run if MI Pro is installed
+    if ( class_exists( 'MonsterInsights' ) ) {
+        if ( is_plugin_active( plugin_basename( __FILE__ ) ) ) {
+            return;
+        }
+    }
+
+
+    // Load settings and globals (so we can use/set them during the upgrade process)
+    MonsterInsights_Lite()->define_globals();
+    MonsterInsights_Lite()->load_settings();
+
+    // Load upgrade file
+    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/install.php';
+    require_once MONSTERINSIGHTS_PLUGIN_DIR . 'lite/includes/install.php'; // Lite only install stuff
+
+    // Run the MonsterInsights upgrade routines
+    $updates = new MonsterInsights_Install();
+    $updates->init();
 }
 
 /**
@@ -764,7 +764,7 @@ 
  * @return void
  */
 function monsterinsights_lite_call_install_and_upgrade(){
-	add_action( 'wp_loaded', 'monsterinsights_lite_install_and_upgrade' );
+    add_action( 'wp_loaded', 'monsterinsights_lite_install_and_upgrade' );
 }
 
 /**
@@ -791,8 +791,8 @@ 
  * @return MonsterInsights The singleton MonsterInsights instance.
  */
 if ( ! function_exists( 'MonsterInsights' ) ) {
-	function MonsterInsights() {
-		return ( class_exists( 'MonsterInsights' ) ? MonsterInsights_Pro() : MonsterInsights_Lite() );
-	}
-	add_action( 'plugins_loaded', 'MonsterInsights' );
+    function MonsterInsights() {
+        return ( class_exists( 'MonsterInsights' ) ? MonsterInsights_Pro() : MonsterInsights_Lite() );
+    }
+    add_action( 'plugins_loaded', 'MonsterInsights' );
 }
\ No newline at end of file

includes/deprecated.php

Spacing +59 added lines, -59 removed lines

@@ -14,7 +14,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,14 +38,14 @@ 
  * @param string $version     The version of WordPress that deprecated the hook.
  * @param string $message     Optional. A message regarding the change. Default null.
  */
-function _monsterinsights_apply_filters_deprecated( $tag, $args, $version, $message = null ) {
-		if ( ! has_filter( $tag ) ) {
+function _monsterinsights_apply_filters_deprecated($tag, $args, $version, $message = null) {
+		if ( ! has_filter($tag)) {
 				return $args[0];
 		}
 
-		_monsterinsights_deprecated_hook( $tag, $version, $message );
+		_monsterinsights_deprecated_hook($tag, $version, $message);
 
-		return apply_filters_ref_array( $tag, $args );
+		return apply_filters_ref_array($tag, $args);
 }
 
 /**
@@ -68,14 +68,14 @@ 
  * @param string $version     The version of WordPress that deprecated the hook.
  * @param string $message     Optional. A message regarding the change.
  */
-function _monsterinsights_do_action_deprecated( $tag, $args, $version, $message = null ) {
-		if ( ! has_action( $tag ) ) {
+function _monsterinsights_do_action_deprecated($tag, $args, $version, $message = null) {
+		if ( ! has_action($tag)) {
 				return;
 		}
 
-		_monsterinsights_deprecated_hook( $tag, $version, $message );
+		_monsterinsights_deprecated_hook($tag, $version, $message);
 
-		do_action_ref_array( $tag, $args );
+		do_action_ref_array($tag, $args);
 }
 
 /**
@@ -101,7 +101,7 @@ 
  * @param string $version     The version of WordPress that deprecated the hook.
  * @param string $message     Optional. A message regarding the change.
  */
-function _monsterinsights_deprecated_hook( $hook, $version, $message = null ) {
+function _monsterinsights_deprecated_hook($hook, $version, $message = null) {
 	/**
 	 * Fires when a deprecated hook is called.
 	 *
@@ -111,7 +111,7 @@ 
 	 * @param string $version     The version of MonsterInsights that deprecated the hook used.
 	 * @param string $message     A message regarding the change.
 	 */
-	do_action( 'deprecated_hook_run', $hook, $version, $message );
+	do_action('deprecated_hook_run', $hook, $version, $message);
  
 	/**
 	 * Filters whether to trigger deprecated hook errors.
@@ -121,9 +121,9 @@ 
 	 * @param bool $trigger Whether to trigger deprecated hook errors. Requires
 	 *                      `WP_DEBUG` to be defined true.
 	 */
-	if ( ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
-		$message = empty( $message ) ? '' : ' ' . $message;
-		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s!', 'google-analytics-for-wordpress' ), $hook, $version, '<strong>', '</strong>' ) . esc_html ( $message ) );
+	if ((WP_DEBUG && apply_filters('deprecated_hook_trigger_error', true)) || monsterinsights_is_debug_mode()) {
+		$message = empty($message) ? '' : ' ' . $message;
+		trigger_error(sprintf(esc_html__('%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s!', 'google-analytics-for-wordpress'), $hook, $version, '<strong>', '</strong>') . esc_html($message));
 	}
 }
 
@@ -151,7 +151,7 @@ 
  * @param array   $backtrace   Optional. Contains stack backtrace of deprecated function
  * @return void
  */
-function _monsterinsights_deprecated_function( $function, $version, $backtrace = null ) {
+function _monsterinsights_deprecated_function($function, $version, $backtrace = null) {
 
 	/**
 	 * Deprecated Function Action.
@@ -166,7 +166,7 @@ 
 	 * @param string  $version     The version of WordPress that deprecated the function.
 	 * @param array   $backtrace   Optional. Contains stack backtrace of deprecated function.
 	 */	
-	do_action( 'deprecated_function_run', $function, $version, $backtrace );
+	do_action('deprecated_function_run', $function, $version, $backtrace);
 
 	/**
 	 * Filters whether to trigger an error for deprecated functions.
@@ -175,9 +175,9 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated functions. Default true.
 	 */
-	if ( ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
-		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s.', 'google-analytics-for-wordpress' ), $function, $version, '<strong>', '</strong>' ) );
-		trigger_error( print_r( $backtrace, 1 ) );// Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+	if ((WP_DEBUG && apply_filters('deprecated_function_trigger_error', true)) || monsterinsights_is_debug_mode()) {
+		trigger_error(sprintf(esc_html__('%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s.', 'google-analytics-for-wordpress'), $function, $version, '<strong>', '</strong>'));
+		trigger_error(print_r($backtrace, 1)); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
 		// Alternatively we could dump this to a file.
 	}
 }
@@ -196,7 +196,7 @@ 
  * @param string  $message     Deprecation message shown.
  * @return void
  */
-function _monsterinsights_deprecated( $message ) {
+function _monsterinsights_deprecated($message) {
 
 	/**
 	 * Deprecated Message Filter.
@@ -207,9 +207,9 @@ 
 	 * 
 	 * @param string $message Error message.
 	 */	
-	do_action( 'monsterinsights_deprecated_run', $message );
+	do_action('monsterinsights_deprecated_run', $message);
 
-	$show_errors = current_user_can( 'manage_options' );
+	$show_errors = current_user_can('manage_options');
 
 	/**
 	 * Deprecated Error Trigger.
@@ -220,9 +220,9 @@ 
 	 * 
 	 * @param bool $show_errors Whether to show errors.
 	 */
-	$show_errors = apply_filters( 'monsterinsights_deprecated_trigger_error', $show_errors );
-	if ( ( WP_DEBUG && $show_errors ) || monsterinsights_is_debug_mode() ) {
-		trigger_error( esc_html( $message ) );
+	$show_errors = apply_filters('monsterinsights_deprecated_trigger_error', $show_errors);
+	if ((WP_DEBUG && $show_errors) || monsterinsights_is_debug_mode()) {
+		trigger_error(esc_html($message));
 	}
 }
 
@@ -243,11 +243,11 @@ 
  * @param int $limit Number of rows to request at most in API calls. Default 300.
  * @return int Number of rows to request at most in API calls.
  */
-function monsterinsights_yst_ga_filter_api_limit( $limit ) {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_reporting_get_max_api_limit</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yst-ga-filter-api-limit', array( $limit ), '6.0.0', $message );
+function monsterinsights_yst_ga_filter_api_limit($limit) {
+	$message = sprintf(__('Use %s instead.', 'google-analytics-for-wordpress'), '<code>monsterinsights_reporting_get_max_api_limit</code>');
+	return _monsterinsights_apply_filters_deprecated('yst-ga-filter-api-limit', array($limit), '6.0.0', $message);
 }
-add_filter( 'monsterinsights_reporting_get_max_api_limit', 'monsterinsights_yst_ga_filter_api_limit' );
+add_filter('monsterinsights_reporting_get_max_api_limit', 'monsterinsights_yst_ga_filter_api_limit');
 
 /**
  * Deprecated Filter: 'yst_ga_track_super_admin'.
@@ -257,12 +257,12 @@ 
  * @param bool $track Whether to track super admins. Default false.
  * @return bool Whether to track super admins. Default false.
  */
-function monsterinsights_yst_ga_track_super_admin( $track ) {
+function monsterinsights_yst_ga_track_super_admin($track) {
 	$track = ! $track; // invert track as in Yoast it defaulted to track super admins
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_track_super_admins</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yst_ga_track_super_admin', array( $track ), '6.0.0', $message );
+	$message = sprintf(__('Use %s instead.', 'google-analytics-for-wordpress'), '<code>monsterinsights_track_super_admins</code>');
+	return _monsterinsights_apply_filters_deprecated('yst_ga_track_super_admin', array($track), '6.0.0', $message);
 }
-add_filter( 'monsterinsights_track_super_admins', 'monsterinsights_yst_ga_track_super_admin' );
+add_filter('monsterinsights_track_super_admins', 'monsterinsights_yst_ga_track_super_admin');
 
 
 /**
@@ -271,11 +271,11 @@ 
  * Allows output before the analytics and ga.js tracking output.
  */
 function monsterinsights_yst_tracking() {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_tracking_before{_$mode}</code>' );
-	_monsterinsights_do_action_deprecated( 'yst_tracking', array(), '6.0.0', $message );
+	$message = sprintf(__('Use %s instead.', 'google-analytics-for-wordpress'), '<code>monsterinsights_tracking_before{_$mode}</code>');
+	_monsterinsights_do_action_deprecated('yst_tracking', array(), '6.0.0', $message);
 }
-add_action( 'monsterinsights_tracking_before_ga', 'monsterinsights_yst_tracking' );
-add_action( 'monsterinsights_tracking_before_analytics', 'monsterinsights_yst_tracking' );
+add_action('monsterinsights_tracking_before_ga', 'monsterinsights_yst_tracking');
+add_action('monsterinsights_tracking_before_analytics', 'monsterinsights_yst_tracking');
 
 /**
  * Deprecated Filter: 'yoast-ga-push-array-ga-js'.
@@ -285,11 +285,11 @@ 
  * @param array $options GA.js options.
  * @return array GA.js options.
  */
-function monsterinsights_yoast_ga_push_array_ga_js( $options ) {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_frontend_tracking_options_analytics_end</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yoast-ga-push-array-ga-js', array( $options ), '6.0.0', $message );
+function monsterinsights_yoast_ga_push_array_ga_js($options) {
+	$message = sprintf(__('Use %s instead.', 'google-analytics-for-wordpress'), '<code>monsterinsights_frontend_tracking_options_analytics_end</code>');
+	return _monsterinsights_apply_filters_deprecated('yoast-ga-push-array-ga-js', array($options), '6.0.0', $message);
 }
-add_filter( 'monsterinsights_frontend_tracking_options_ga_end', 'monsterinsights_yoast_ga_push_array_ga_js' );
+add_filter('monsterinsights_frontend_tracking_options_ga_end', 'monsterinsights_yoast_ga_push_array_ga_js');
 
 /**
  * Deprecated Filter: 'yoast-ga-push-array-universal'.
@@ -299,11 +299,11 @@ 
  * @param array $options analytics.js options.
  * @return array Analytics.js options.
  */
-function monsterinsights_yoast_ga_push_array_universal( $options ) {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_frontend_tracking_options_analytics_end</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yoast-ga-push-array-universal', array( $options ), '6.0.0', $message );
+function monsterinsights_yoast_ga_push_array_universal($options) {
+	$message = sprintf(__('Use %s instead.', 'google-analytics-for-wordpress'), '<code>monsterinsights_frontend_tracking_options_analytics_end</code>');
+	return _monsterinsights_apply_filters_deprecated('yoast-ga-push-array-universal', array($options), '6.0.0', $message);
 }
-add_filter( 'monsterinsights_frontend_tracking_options_analytics_end', 'monsterinsights_yoast_ga_push_array_universal' );
+add_filter('monsterinsights_frontend_tracking_options_analytics_end', 'monsterinsights_yoast_ga_push_array_universal');
 
 /**
  * Deprecated Filter: 'yst_ga_filter_push_vars'.
@@ -313,17 +313,17 @@ 
  * @param array $options analytics.js options.
  * @return array Analytics.js options.
  */
-function monsterinsights_yst_ga_filter_push_vars( $options ) {
-	if ( ! has_filter('yst_ga_filter_push_vars' ) ) {
+function monsterinsights_yst_ga_filter_push_vars($options) {
+	if ( ! has_filter('yst_ga_filter_push_vars')) {
 		return $options;
 	} else {
-		$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_frontend_tracking_options_analytics_before_scripts</code>' );
-		_monsterinsights_deprecated_hook( 'yst_ga_filter_push_vars', '6.0.0', $message );
+		$message = sprintf(__('Use %s instead.', 'google-analytics-for-wordpress'), '<code>monsterinsights_frontend_tracking_options_analytics_before_scripts</code>');
+		_monsterinsights_deprecated_hook('yst_ga_filter_push_vars', '6.0.0', $message);
 
 		$i = 0;
-		while ( true ) {
-			if ( empty( $options[ 'yst_ga_filter_push_vars_' . $i ] ) ) {
-				$options[ 'yst_ga_filter_push_vars_' . $i ] = apply_filters( 'yst_ga_filter_push_vars', $options ); 
+		while (true) {
+			if (empty($options['yst_ga_filter_push_vars_' . $i])) {
+				$options['yst_ga_filter_push_vars_' . $i] = apply_filters('yst_ga_filter_push_vars', $options); 
 				break;
 			} else {
 				$i++;
@@ -332,7 +332,7 @@ 
 		return $options;
 	}
 }
-add_filter( 'monsterinsights_frontend_tracking_options_analytics_before_scripts', 'monsterinsights_yst_ga_filter_push_vars' );
+add_filter('monsterinsights_frontend_tracking_options_analytics_before_scripts', 'monsterinsights_yst_ga_filter_push_vars');
 
 
 /**
@@ -343,13 +343,13 @@ 
  * @param array $config GA App config.
  * @return array GA App config.
  */
-function monsterinsights_yst_ga_filter_ga_config( $config ) {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_{lite/pro}_google_app_config</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yst-ga-filter-ga-config', array( $config ), '6.0.0', $message );
+function monsterinsights_yst_ga_filter_ga_config($config) {
+	$message = sprintf(__('Use %s instead.', 'google-analytics-for-wordpress'), '<code>monsterinsights_{lite/pro}_google_app_config</code>');
+	return _monsterinsights_apply_filters_deprecated('yst-ga-filter-ga-config', array($config), '6.0.0', $message);
 }
-add_filter( 'monsterinsights_lite_google_app_config', 'monsterinsights_yst_ga_filter_ga_config' );
-add_filter( 'monsterinsights_pro_google_app_config', 'monsterinsights_yst_ga_filter_ga_config' );
+add_filter('monsterinsights_lite_google_app_config', 'monsterinsights_yst_ga_filter_ga_config');
+add_filter('monsterinsights_pro_google_app_config', 'monsterinsights_yst_ga_filter_ga_config');
 
-function monsterinsights_disabled_user_group(){
+function monsterinsights_disabled_user_group() {
 	return ! monsterinsights_track_user();
 }
\ No newline at end of file

Indentation +113 added lines, -113 removed lines

@@ -15,7 +15,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 /**
@@ -39,13 +39,13 @@ 
  * @param string $message     Optional. A message regarding the change. Default null.
  */
 function _monsterinsights_apply_filters_deprecated( $tag, $args, $version, $message = null ) {
-		if ( ! has_filter( $tag ) ) {
-				return $args[0];
-		}
+        if ( ! has_filter( $tag ) ) {
+                return $args[0];
+        }
 
-		_monsterinsights_deprecated_hook( $tag, $version, $message );
+        _monsterinsights_deprecated_hook( $tag, $version, $message );
 
-		return apply_filters_ref_array( $tag, $args );
+        return apply_filters_ref_array( $tag, $args );
 }
 
 /**
@@ -69,13 +69,13 @@ 
  * @param string $message     Optional. A message regarding the change.
  */
 function _monsterinsights_do_action_deprecated( $tag, $args, $version, $message = null ) {
-		if ( ! has_action( $tag ) ) {
-				return;
-		}
+        if ( ! has_action( $tag ) ) {
+                return;
+        }
 
-		_monsterinsights_deprecated_hook( $tag, $version, $message );
+        _monsterinsights_deprecated_hook( $tag, $version, $message );
 
-		do_action_ref_array( $tag, $args );
+        do_action_ref_array( $tag, $args );
 }
 
 /**
@@ -102,29 +102,29 @@ 
  * @param string $message     Optional. A message regarding the change.
  */
 function _monsterinsights_deprecated_hook( $hook, $version, $message = null ) {
-	/**
-	 * Fires when a deprecated hook is called.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param string $hook        The hook that was called.
-	 * @param string $version     The version of MonsterInsights that deprecated the hook used.
-	 * @param string $message     A message regarding the change.
-	 */
-	do_action( 'deprecated_hook_run', $hook, $version, $message );
+    /**
+     * Fires when a deprecated hook is called.
+     *
+     * @since 6.0.0
+     *
+     * @param string $hook        The hook that was called.
+     * @param string $version     The version of MonsterInsights that deprecated the hook used.
+     * @param string $message     A message regarding the change.
+     */
+    do_action( 'deprecated_hook_run', $hook, $version, $message );
  
-	/**
-	 * Filters whether to trigger deprecated hook errors.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param bool $trigger Whether to trigger deprecated hook errors. Requires
-	 *                      `WP_DEBUG` to be defined true.
-	 */
-	if ( ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
-		$message = empty( $message ) ? '' : ' ' . $message;
-		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s!', 'google-analytics-for-wordpress' ), $hook, $version, '<strong>', '</strong>' ) . esc_html ( $message ) );
-	}
+    /**
+     * Filters whether to trigger deprecated hook errors.
+     *
+     * @since 6.0.0
+     *
+     * @param bool $trigger Whether to trigger deprecated hook errors. Requires
+     *                      `WP_DEBUG` to be defined true.
+     */
+    if ( ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
+        $message = empty( $message ) ? '' : ' ' . $message;
+        trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s!', 'google-analytics-for-wordpress' ), $hook, $version, '<strong>', '</strong>' ) . esc_html ( $message ) );
+    }
 }
 
 /**
@@ -153,33 +153,33 @@ 
  */
 function _monsterinsights_deprecated_function( $function, $version, $backtrace = null ) {
 
-	/**
-	 * Deprecated Function Action.
-	 *
-	 * Allow plugin run an action on the use of a 
-	 * deprecated function. This could be used to
-	 * feed into an error logging program or file.
-	 *
-	 * @since 6.0.0
-	 * 
-	 * @param string  $function    The function that was called.
-	 * @param string  $version     The version of WordPress that deprecated the function.
-	 * @param array   $backtrace   Optional. Contains stack backtrace of deprecated function.
-	 */	
-	do_action( 'deprecated_function_run', $function, $version, $backtrace );
+    /**
+     * Deprecated Function Action.
+     *
+     * Allow plugin run an action on the use of a 
+     * deprecated function. This could be used to
+     * feed into an error logging program or file.
+     *
+     * @since 6.0.0
+     * 
+     * @param string  $function    The function that was called.
+     * @param string  $version     The version of WordPress that deprecated the function.
+     * @param array   $backtrace   Optional. Contains stack backtrace of deprecated function.
+     */	
+    do_action( 'deprecated_function_run', $function, $version, $backtrace );
 
-	/**
-	 * Filters whether to trigger an error for deprecated functions.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param bool $trigger Whether to trigger the error for deprecated functions. Default true.
-	 */
-	if ( ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
-		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s.', 'google-analytics-for-wordpress' ), $function, $version, '<strong>', '</strong>' ) );
-		trigger_error( print_r( $backtrace, 1 ) );// Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
-		// Alternatively we could dump this to a file.
-	}
+    /**
+     * Filters whether to trigger an error for deprecated functions.
+     *
+     * @since 6.0.0
+     *
+     * @param bool $trigger Whether to trigger the error for deprecated functions. Default true.
+     */
+    if ( ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
+        trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s.', 'google-analytics-for-wordpress' ), $function, $version, '<strong>', '</strong>' ) );
+        trigger_error( print_r( $backtrace, 1 ) );// Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+        // Alternatively we could dump this to a file.
+    }
 }
 
 /**
@@ -198,32 +198,32 @@ 
  */
 function _monsterinsights_deprecated( $message ) {
 
-	/**
-	 * Deprecated Message Filter.
-	 *
-	 * Allow plugin to filter the deprecated message.
-	 *
-	 * @since 6.0.0
-	 * 
-	 * @param string $message Error message.
-	 */	
-	do_action( 'monsterinsights_deprecated_run', $message );
+    /**
+     * Deprecated Message Filter.
+     *
+     * Allow plugin to filter the deprecated message.
+     *
+     * @since 6.0.0
+     * 
+     * @param string $message Error message.
+     */	
+    do_action( 'monsterinsights_deprecated_run', $message );
 
-	$show_errors = current_user_can( 'manage_options' );
+    $show_errors = current_user_can( 'manage_options' );
 
-	/**
-	 * Deprecated Error Trigger.
-	 *
-	 * Allow plugin to filter the output error trigger.
-	 *
-	 * @since 6.0.0
-	 * 
-	 * @param bool $show_errors Whether to show errors.
-	 */
-	$show_errors = apply_filters( 'monsterinsights_deprecated_trigger_error', $show_errors );
-	if ( ( WP_DEBUG && $show_errors ) || monsterinsights_is_debug_mode() ) {
-		trigger_error( esc_html( $message ) );
-	}
+    /**
+     * Deprecated Error Trigger.
+     *
+     * Allow plugin to filter the output error trigger.
+     *
+     * @since 6.0.0
+     * 
+     * @param bool $show_errors Whether to show errors.
+     */
+    $show_errors = apply_filters( 'monsterinsights_deprecated_trigger_error', $show_errors );
+    if ( ( WP_DEBUG && $show_errors ) || monsterinsights_is_debug_mode() ) {
+        trigger_error( esc_html( $message ) );
+    }
 }
 
 
@@ -244,8 +244,8 @@ 
  * @return int Number of rows to request at most in API calls.
  */
 function monsterinsights_yst_ga_filter_api_limit( $limit ) {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_reporting_get_max_api_limit</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yst-ga-filter-api-limit', array( $limit ), '6.0.0', $message );
+    $message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_reporting_get_max_api_limit</code>' );
+    return _monsterinsights_apply_filters_deprecated( 'yst-ga-filter-api-limit', array( $limit ), '6.0.0', $message );
 }
 add_filter( 'monsterinsights_reporting_get_max_api_limit', 'monsterinsights_yst_ga_filter_api_limit' );
 
@@ -258,9 +258,9 @@ 
  * @return bool Whether to track super admins. Default false.
  */
 function monsterinsights_yst_ga_track_super_admin( $track ) {
-	$track = ! $track; // invert track as in Yoast it defaulted to track super admins
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_track_super_admins</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yst_ga_track_super_admin', array( $track ), '6.0.0', $message );
+    $track = ! $track; // invert track as in Yoast it defaulted to track super admins
+    $message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_track_super_admins</code>' );
+    return _monsterinsights_apply_filters_deprecated( 'yst_ga_track_super_admin', array( $track ), '6.0.0', $message );
 }
 add_filter( 'monsterinsights_track_super_admins', 'monsterinsights_yst_ga_track_super_admin' );
 
@@ -271,8 +271,8 @@ 
  * Allows output before the analytics and ga.js tracking output.
  */
 function monsterinsights_yst_tracking() {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_tracking_before{_$mode}</code>' );
-	_monsterinsights_do_action_deprecated( 'yst_tracking', array(), '6.0.0', $message );
+    $message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_tracking_before{_$mode}</code>' );
+    _monsterinsights_do_action_deprecated( 'yst_tracking', array(), '6.0.0', $message );
 }
 add_action( 'monsterinsights_tracking_before_ga', 'monsterinsights_yst_tracking' );
 add_action( 'monsterinsights_tracking_before_analytics', 'monsterinsights_yst_tracking' );
@@ -286,8 +286,8 @@ 
  * @return array GA.js options.
  */
 function monsterinsights_yoast_ga_push_array_ga_js( $options ) {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_frontend_tracking_options_analytics_end</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yoast-ga-push-array-ga-js', array( $options ), '6.0.0', $message );
+    $message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_frontend_tracking_options_analytics_end</code>' );
+    return _monsterinsights_apply_filters_deprecated( 'yoast-ga-push-array-ga-js', array( $options ), '6.0.0', $message );
 }
 add_filter( 'monsterinsights_frontend_tracking_options_ga_end', 'monsterinsights_yoast_ga_push_array_ga_js' );
 
@@ -300,8 +300,8 @@ 
  * @return array Analytics.js options.
  */
 function monsterinsights_yoast_ga_push_array_universal( $options ) {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_frontend_tracking_options_analytics_end</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yoast-ga-push-array-universal', array( $options ), '6.0.0', $message );
+    $message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_frontend_tracking_options_analytics_end</code>' );
+    return _monsterinsights_apply_filters_deprecated( 'yoast-ga-push-array-universal', array( $options ), '6.0.0', $message );
 }
 add_filter( 'monsterinsights_frontend_tracking_options_analytics_end', 'monsterinsights_yoast_ga_push_array_universal' );
 
@@ -314,23 +314,23 @@ 
  * @return array Analytics.js options.
  */
 function monsterinsights_yst_ga_filter_push_vars( $options ) {
-	if ( ! has_filter('yst_ga_filter_push_vars' ) ) {
-		return $options;
-	} else {
-		$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_frontend_tracking_options_analytics_before_scripts</code>' );
-		_monsterinsights_deprecated_hook( 'yst_ga_filter_push_vars', '6.0.0', $message );
+    if ( ! has_filter('yst_ga_filter_push_vars' ) ) {
+        return $options;
+    } else {
+        $message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_frontend_tracking_options_analytics_before_scripts</code>' );
+        _monsterinsights_deprecated_hook( 'yst_ga_filter_push_vars', '6.0.0', $message );
 
-		$i = 0;
-		while ( true ) {
-			if ( empty( $options[ 'yst_ga_filter_push_vars_' . $i ] ) ) {
-				$options[ 'yst_ga_filter_push_vars_' . $i ] = apply_filters( 'yst_ga_filter_push_vars', $options ); 
-				break;
-			} else {
-				$i++;
-			}
-		}
-		return $options;
-	}
+        $i = 0;
+        while ( true ) {
+            if ( empty( $options[ 'yst_ga_filter_push_vars_' . $i ] ) ) {
+                $options[ 'yst_ga_filter_push_vars_' . $i ] = apply_filters( 'yst_ga_filter_push_vars', $options ); 
+                break;
+            } else {
+                $i++;
+            }
+        }
+        return $options;
+    }
 }
 add_filter( 'monsterinsights_frontend_tracking_options_analytics_before_scripts', 'monsterinsights_yst_ga_filter_push_vars' );
 
@@ -344,12 +344,12 @@ 
  * @return array GA App config.
  */
 function monsterinsights_yst_ga_filter_ga_config( $config ) {
-	$message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_{lite/pro}_google_app_config</code>' );
-	return _monsterinsights_apply_filters_deprecated( 'yst-ga-filter-ga-config', array( $config ), '6.0.0', $message );
+    $message = sprintf( __( 'Use %s instead.', 'google-analytics-for-wordpress' ), '<code>monsterinsights_{lite/pro}_google_app_config</code>' );
+    return _monsterinsights_apply_filters_deprecated( 'yst-ga-filter-ga-config', array( $config ), '6.0.0', $message );
 }
 add_filter( 'monsterinsights_lite_google_app_config', 'monsterinsights_yst_ga_filter_ga_config' );
 add_filter( 'monsterinsights_pro_google_app_config', 'monsterinsights_yst_ga_filter_ga_config' );
 
 function monsterinsights_disabled_user_group(){
-	return ! monsterinsights_track_user();
+    return ! monsterinsights_track_user();
 }
\ No newline at end of file

includes/admin/ajax.php

Spacing +60 added lines, -60 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -23,21 +23,21 @@ 
 function monsterinsights_ajax_set_user_setting() {
 
     // Run a security check first.
-    check_ajax_referer( 'monsterinsights-set-user-setting', 'nonce' );
+    check_ajax_referer('monsterinsights-set-user-setting', 'nonce');
 
     // Prepare variables.
-    $name    = stripslashes( $_POST['name'] );
-    $value   = stripslashes( $_POST['value'] );
+    $name    = stripslashes($_POST['name']);
+    $value   = stripslashes($_POST['value']);
 
     // Set user setting.
-    set_user_setting( $name, $value );
+    set_user_setting($name, $value);
 
     // Send back the response.
     wp_send_json_success();
     wp_die();
 
 }
-add_action( 'wp_ajax_monsterinsights_install_addon', 'monsterinsights_ajax_install_addon' );
+add_action('wp_ajax_monsterinsights_install_addon', 'monsterinsights_ajax_install_addon');
 
 /**
  * Installs a MonsterInsights addon.
@@ -48,14 +48,14 @@ 
 function monsterinsights_ajax_install_addon() {
     
     // Run a security check first.
-    check_ajax_referer( 'monsterinsights-install', 'nonce' );
+    check_ajax_referer('monsterinsights-install', 'nonce');
 
-    if ( ! current_user_can( 'install_plugins' ) ) {
-        echo json_encode( true );
+    if ( ! current_user_can('install_plugins')) {
+        echo json_encode(true);
     }
 
     // Install the addon.
-    if ( isset( $_POST['plugin'] ) ) {
+    if (isset($_POST['plugin'])) {
         $download_url = $_POST['plugin'];
         global $hook_suffix;
 
@@ -68,52 +68,52 @@ 
             array(
                 'page' => 'monsterinsights-settings'
             ),
-            admin_url( 'admin.php' )
+            admin_url('admin.php')
         );
-        $url = esc_url( $url );
+        $url = esc_url($url);
 
         // Start output bufferring to catch the filesystem form if credentials are needed.
         ob_start();
-        if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
+        if (false === ($creds = request_filesystem_credentials($url, $method, false, false, null))) {
             $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
+            echo json_encode(array('form' => $form));
             wp_die();
         }
 
         // If we are not authenticated, make it happen now.
-        if ( ! WP_Filesystem( $creds ) ) {
+        if ( ! WP_Filesystem($creds)) {
             ob_start();
-            request_filesystem_credentials( $url, $method, true, false, null );
+            request_filesystem_credentials($url, $method, true, false, null);
             $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
+            echo json_encode(array('form' => $form));
             wp_die();
         }
 
         // We do not need any extra credentials if we have gotten this far, so let's install the plugin.
         require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
         $base = MonsterInsights();
-        require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
+        require_once plugin_dir_path($base->file) . '/includes/admin/licensing/skin.php';
         
         // Create the plugin upgrader with our custom skin.
-        $installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
-        $installer->install( $download_url );
+        $installer = new Plugin_Upgrader($skin = new MonsterInsights_Skin());
+        $installer->install($download_url);
 
         // Flush the cache and return the newly installed plugin basename.
         wp_cache_flush();
-        if ( $installer->plugin_info() ) {
+        if ($installer->plugin_info()) {
             $plugin_basename = $installer->plugin_info();
-            echo json_encode( array( 'plugin' => $plugin_basename ) );
+            echo json_encode(array('plugin' => $plugin_basename));
             wp_die();
         }
     }
 
     // Send back a response.
-    echo json_encode( true );
+    echo json_encode(true);
     wp_die();
 
 }
 
-add_action( 'wp_ajax_monsterinsights_activate_addon', 'monsterinsights_ajax_activate_addon' );
+add_action('wp_ajax_monsterinsights_activate_addon', 'monsterinsights_ajax_activate_addon');
 /**
  * Activates a MonsterInsights addon.
  *
@@ -123,32 +123,32 @@ 
 function monsterinsights_ajax_activate_addon() {
 
     // Run a security check first.
-    check_ajax_referer( 'monsterinsights-activate', 'nonce' );
+    check_ajax_referer('monsterinsights-activate', 'nonce');
 
-    if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+    if ( ! current_user_can('activate_plugins')) {
+        echo json_encode(true);
     }
 
     // Activate the addon.
-    if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
-            $activate = activate_plugin( $_POST['plugin'], NULL, true );
+    if (isset($_POST['plugin'])) {
+        if (isset($_POST['isnetwork']) && $_POST['isnetwork']) {
+            $activate = activate_plugin($_POST['plugin'], NULL, true);
         } else {
-            $activate = activate_plugin( $_POST['plugin'] );
+            $activate = activate_plugin($_POST['plugin']);
         }
 
-        if ( is_wp_error( $activate ) ) {
-            echo json_encode( array( 'error' => $activate->get_error_message() ) );
+        if (is_wp_error($activate)) {
+            echo json_encode(array('error' => $activate->get_error_message()));
             wp_die();
         }
     }
 
-    echo json_encode( true );
+    echo json_encode(true);
     wp_die();
 
 }
 
-add_action( 'wp_ajax_monsterinsights_deactivate_addon', 'monsterinsights_ajax_deactivate_addon' );
+add_action('wp_ajax_monsterinsights_deactivate_addon', 'monsterinsights_ajax_deactivate_addon');
 /**
  * Deactivates a MonsterInsights addon.
  *
@@ -158,22 +158,22 @@ 
 function monsterinsights_ajax_deactivate_addon() {
 
     // Run a security check first.
-    check_ajax_referer( 'monsterinsights-deactivate', 'nonce' );
+    check_ajax_referer('monsterinsights-deactivate', 'nonce');
 
-    if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+    if ( ! current_user_can('activate_plugins')) {
+        echo json_encode(true);
     }
 
     // Deactivate the addon.
-    if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
-            $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
+    if (isset($_POST['plugin'])) {
+        if (isset($_POST['isnetwork']) && $_POST['isnetwork']) { 
+            $deactivate = deactivate_plugins($_POST['plugin'], false, true);
         } else {
-            $deactivate = deactivate_plugins( $_POST['plugin'] );
+            $deactivate = deactivate_plugins($_POST['plugin']);
         }
     }
 
-    echo json_encode( true );
+    echo json_encode(true);
     wp_die();
 }
 
@@ -189,46 +189,46 @@ 
 function monsterinsights_ajax_dismiss_notice() {
 
     // Run a security check first.
-    check_ajax_referer( 'monsterinsights-dismiss-notice', 'nonce' );
+    check_ajax_referer('monsterinsights-dismiss-notice', 'nonce');
 
     // Deactivate the notice
-    if ( isset( $_POST['notice'] ) ) {
+    if (isset($_POST['notice'])) {
         // Init the notice class and mark notice as deactivated
-        MonsterInsights()->notices->dismiss( $_POST['notice'] );
+        MonsterInsights()->notices->dismiss($_POST['notice']);
 
         // Return true
-        echo json_encode( true );
+        echo json_encode(true);
         wp_die();
     }
 
     // If here, an error occured
-    echo json_encode( false );
+    echo json_encode(false);
     wp_die();
 
 }
-add_action( 'wp_ajax_monsterinsights_ajax_dismiss_notice', 'monsterinsights_ajax_dismiss_notice' );
+add_action('wp_ajax_monsterinsights_ajax_dismiss_notice', 'monsterinsights_ajax_dismiss_notice');
 
 
 function monsterinsights_get_shortlink() {
     // Run a security check first.
-    check_ajax_referer( 'mi-admin-nonce', 'nonce' );
+    check_ajax_referer('mi-admin-nonce', 'nonce');
 
-    $shorten = ! empty( $_POST['url'] ) ? esc_url_raw( $_POST['url'] ) : '';
-    if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+    $shorten = ! empty($_POST['url']) ? esc_url_raw($_POST['url']) : '';
+    if ( ! current_user_can('monsterinsights_view_dashboard')) {
         echo $shorten;
         wp_die();
     }
 
-    $url     = 'https://www.googleapis.com/urlshortener/v1/url';
+    $url = 'https://www.googleapis.com/urlshortener/v1/url';
 
     // If no url passed die
-    if ( ! $shorten ) {
+    if ( ! $shorten) {
         echo $shorten;
         wp_die();
     }
 
     // if the url is already shortened, don't re-run
-    if ( strpos( $shorten, 'goo.g') !== false ) {
+    if (strpos($shorten, 'goo.g') !== false) {
         echo $shorten;
         wp_die();
     }
@@ -240,18 +240,18 @@ 
             'https://www.googleapis.com/urlshortener/v1/url'
         ), 
         array(
-            'body' => json_encode( array('longUrl' => esc_url_raw( $shorten ) ) ),
-            'headers' => array( 'Content-Type' => 'application/json')
+            'body' => json_encode(array('longUrl' => esc_url_raw($shorten))),
+            'headers' => array('Content-Type' => 'application/json')
         )
     );
 
-    if ( is_wp_error( $result ) ) {
+    if (is_wp_error($result)) {
         echo $shorten;
         wp_die();
     }
-    $result = json_decode( $result['body'] );
+    $result = json_decode($result['body']);
     $shortlink = $result->id;
     echo $shortlink;
     wp_die();
 }
-add_action( 'wp_ajax_monsterinsights_get_shortlink', 'monsterinsights_get_shortlink' );
\ No newline at end of file
+add_action('wp_ajax_monsterinsights_get_shortlink', 'monsterinsights_get_shortlink');
\ No newline at end of file

includes/admin/licensing/skin.php

Spacing +10 added lines, -10 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -23,7 +23,7 @@ 
      *
      * @param array $args Empty array of args (we will use defaults).
      */
-    public function __construct( $args = array() ) {
+    public function __construct($args = array()) {
 
         parent::__construct();
 
@@ -36,10 +36,10 @@ 
      *
      * @param object $upgrader The upgrader object (passed by reference).
      */
-    public function set_upgrader( &$upgrader ) {
+    public function set_upgrader(&$upgrader) {
 
-        if ( is_object( $upgrader ) ) {
-            $this->upgrader =& $upgrader;
+        if (is_object($upgrader)) {
+            $this->upgrader = & $upgrader;
         }
 
     }
@@ -51,7 +51,7 @@ 
      *
      * @param object $result The result of the install process.
      */
-    public function set_result( $result ) {
+    public function set_result($result) {
 
         $this->result = $result;
 
@@ -80,10 +80,10 @@ 
      *
      * @param array $errors Array of errors with the install process.
      */
-    function error( $errors ) {
+    function error($errors) {
 
-        if ( ! empty( $errors ) ) {
-            echo json_encode( array( 'error' => esc_html__( 'There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress' ) ) );
+        if ( ! empty($errors)) {
+            echo json_encode(array('error' => esc_html__('There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress')));
             die;
         }
 
@@ -97,7 +97,7 @@ 
      *
      * @param string $string The feedback string.
      */
-    function feedback( $string ) {
+    function feedback($string) {
         
     }
 

includes/admin/licensing/updater.php

Spacing +62 added lines, -62 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -113,7 +113,7 @@ 
      *
      * @param array $config Array of updater config args.
      */
-    public function __construct( array $config ) {
+    public function __construct(array $config) {
 
         // Load the base class object.
         $this->base = MonsterInsights();
@@ -128,20 +128,20 @@ 
             'version',
             'key'
         );
-        foreach ( $accepted_args as $arg ) {
+        foreach ($accepted_args as $arg) {
             $this->$arg = $config[$arg];
         }
 
         // If the user cannot update plugins, stop processing here.
-        if ( ! current_user_can( 'update_plugins' ) && ( ! defined( 'DOING_CRON' ) || ! DOING_CRON ) ) {
+        if ( ! current_user_can('update_plugins') && ( ! defined('DOING_CRON') || ! DOING_CRON)) {
             return;
         }
 
         // Load the updater hooks and filters.
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'update_plugins_filter' ) );
+        add_filter('pre_set_site_transient_update_plugins', array($this, 'update_plugins_filter'));
 
-        add_filter( 'http_request_args', array( $this, 'http_request_args' ), 10, 2 );
-        add_filter( 'plugins_api', array( $this, 'plugins_api' ), 10, 3 );
+        add_filter('http_request_args', array($this, 'http_request_args'), 10, 2);
+        add_filter('plugins_api', array($this, 'plugins_api'), 10, 3);
 
         // ManageWP premium update filters
         //add_filter( 'mwp_premium_update_notification', array( $this, 'premium_update_push' ) );
@@ -156,24 +156,24 @@ 
      * @param object $value  The WordPress update object.
      * @return object $value Amended WordPress update object on success, default if object is empty.
      */
-    public function update_plugins_filter( $value ) {
+    public function update_plugins_filter($value) {
 
         // If no update object exists, return early.
-        if ( empty( $value ) ) {
+        if (empty($value)) {
             return $value;
         }
 
         // Run update check by pinging the external API. If it fails, return the default update object.
-        if ( ! $this->update ) {
-            $this->update = $this->perform_remote_request( 'get-plugin-update', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
-            if ( ! $this->update || ! empty( $this->update->error ) ) {
+        if ( ! $this->update) {
+            $this->update = $this->perform_remote_request('get-plugin-update', array('tgm-updater-plugin' => $this->plugin_slug));
+            if ( ! $this->update || ! empty($this->update->error)) {
                 $this->update = false;
                 return $value;
             }
         }
 
         // Infuse the update object with our data if the version from the remote API is newer.
-        if ( isset( $this->update->new_version ) && version_compare( $this->version, $this->update->new_version, '<' ) ) {
+        if (isset($this->update->new_version) && version_compare($this->version, $this->update->new_version, '<')) {
             // The $plugin_update object contains new_version, package, slug and last_update keys.
             //$this->update->full_slug             = $this->plugin_slug;
             //$this->update->name                  = $this->plugin_name;
@@ -197,10 +197,10 @@ 
      * @param string $url  The URL to be pinged.
      * @return array $args Amended array of request args.
      */
-    public function http_request_args( $args, $url ) {
+    public function http_request_args($args, $url) {
 
         // If this is an SSL request and we are performing an upgrade routine, disable SSL verification.
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'tgm-updater-action=get-plugin-update' ) ) {
+        if (strpos($url, 'https://') !== false && strpos($url, 'tgm-updater-action=get-plugin-update')) {
             $args['sslverify'] = false;
         }
 
@@ -219,13 +219,13 @@ 
      * @param array $args    Additional args to send to plugins_api.
      * @return object $api   New stdClass with plugin information on success, default response on failure.
      */
-    public function plugins_api( $api, $action = '', $args = null ) {
+    public function plugins_api($api, $action = '', $args = null) {
 
-        $plugin = ( 'plugin_information' == $action ) && isset( $args->slug ) && ( $this->plugin_slug == $args->slug );
+        $plugin = ('plugin_information' == $action) && isset($args->slug) && ($this->plugin_slug == $args->slug);
 
         // If our plugin matches the request, set our own plugin data, else return the default response.
-        if ( $plugin ) {
-            return $this->set_plugins_api( $api );
+        if ($plugin) {
+            return $this->set_plugins_api($api);
         } else {
             return $api;
         }
@@ -240,12 +240,12 @@ 
      * @param object $default_api The default API object.
      * @return object $api        Return custom plugin information to plugins_api.
      */
-    public function set_plugins_api( $default_api ) {
+    public function set_plugins_api($default_api) {
 
         // Perform the remote request to retrieve our plugin information. If it fails, return the default object.
-        if ( ! $this->info ) {
-            $this->info = $this->perform_remote_request( 'get-plugin-info', array( 'tgm-updater-plugin' => $this->plugin_slug ) );
-            if ( ! $this->info || ! empty( $this->info->error ) ) {
+        if ( ! $this->info) {
+            $this->info = $this->perform_remote_request('get-plugin-info', array('tgm-updater-plugin' => $this->plugin_slug));
+            if ( ! $this->info || ! empty($this->info->error)) {
                 $this->info = false;
                 return $default_api;
             }
@@ -253,33 +253,33 @@ 
 
         // Create a new stdClass object and populate it with our plugin information.
         $api                        = new stdClass;
-        $api->name                  = isset( $this->info->name )           ? $this->info->name           : '';
-        $api->slug                  = isset( $this->info->slug )           ? $this->info->slug           : '';
-        $api->version               = isset( $this->info->version )        ? $this->info->version        : '';
-        $api->author                = isset( $this->info->author )         ? $this->info->author         : '';
-        $api->author_profile        = isset( $this->info->author_profile ) ? $this->info->author_profile : '';
-        $api->requires              = isset( $this->info->requires )       ? $this->info->requires       : '';
-        $api->tested                = isset( $this->info->tested )         ? $this->info->tested         : '';
-        $api->last_updated          = isset( $this->info->last_updated )   ? $this->info->last_updated   : '';
-        $api->homepage              = isset( $this->info->homepage )       ? $this->info->homepage       : '';
-
-        $changelog                  = isset( $this->info->changelog )      ? $this->info->changelog       : '';
-        $description                = isset( $this->info->description )    ? $this->info->description     : '';
-
-        if ( ! empty( $changelog ) ) {
-             if ( ! empty( $description ) ) {
+        $api->name                  = isset($this->info->name) ? $this->info->name : '';
+        $api->slug                  = isset($this->info->slug) ? $this->info->slug : '';
+        $api->version               = isset($this->info->version) ? $this->info->version : '';
+        $api->author                = isset($this->info->author) ? $this->info->author : '';
+        $api->author_profile        = isset($this->info->author_profile) ? $this->info->author_profile : '';
+        $api->requires              = isset($this->info->requires) ? $this->info->requires : '';
+        $api->tested                = isset($this->info->tested) ? $this->info->tested : '';
+        $api->last_updated          = isset($this->info->last_updated) ? $this->info->last_updated : '';
+        $api->homepage              = isset($this->info->homepage) ? $this->info->homepage : '';
+
+        $changelog                  = isset($this->info->changelog) ? $this->info->changelog : '';
+        $description                = isset($this->info->description) ? $this->info->description : '';
+
+        if ( ! empty($changelog)) {
+             if ( ! empty($description)) {
                 $api->sections['description'] = $description;
                 $api->sections['changelog']   = $changelog;
              } else {
                 $api->sections['changelog']   = $changelog;
              }
-        } else if ( ! empty( $description ) ) {
+        } else if ( ! empty($description)) {
             $api->sections['description'] = $description;
         } else {
             $api->sections = array();
         }     
 
-        $api->download_link         = isset( $this->info->download_link )  ? $this->info->download_link  : '';
+        $api->download_link = isset($this->info->download_link) ? $this->info->download_link : '';
 
         // Return the new API object with our custom data.
         return $api;
@@ -287,14 +287,14 @@ 
     }
 
     // Integration with ManageWP
-    public function premium_update_push( $premium_update ) {
-        if ( ! function_exists( 'get_plugin_data' ) ) {
-            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+    public function premium_update_push($premium_update) {
+        if ( ! function_exists('get_plugin_data')) {
+            include_once(ABSPATH . 'wp-admin/includes/plugin.php');
         }
 
-        $update = $this->set_plugins_api( array() );
-        if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
-            $plugin_data                = get_plugin_data( $update->slug );
+        $update = $this->set_plugins_api(array());
+        if ( ! empty($update) && version_compare(MONSTERINSIGHTS_VERSION, $update->version, '<')) {
+            $plugin_data                = get_plugin_data($update->slug);
             $plugin_data['type']        = 'plugin';
             $plugin_data['slug']        = $update->slug;
             $plugin_data['new_version'] = $update->version;
@@ -304,18 +304,18 @@ 
     }
 
     // Integration with ManageWP
-    public function premium_update( $premium_update ) {
-        if ( ! function_exists( 'get_plugin_data' ) ) {
-            include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+    public function premium_update($premium_update) {
+        if ( ! function_exists('get_plugin_data')) {
+            include_once(ABSPATH . 'wp-admin/includes/plugin.php');
         }
 
-        $update = $this->set_plugins_api( array() );
-        if ( ! empty( $update ) && version_compare( MONSTERINSIGHTS_VERSION, $update->version, '<' ) ) {
-            $plugin_data                = get_plugin_data( $update->slug );
+        $update = $this->set_plugins_api(array());
+        if ( ! empty($update) && version_compare(MONSTERINSIGHTS_VERSION, $update->version, '<')) {
+            $plugin_data                = get_plugin_data($update->slug);
             $plugin_data['type']        = 'plugin';
             $plugin_data['slug']        = $update->slug;
             $plugin_data['url']         = $update->download_link; // OR provide your own callback function for managing the update
-            array_push( $premium_update, $plugin_data );
+            array_push($premium_update, $plugin_data);
         }
         return $premium_update;
     }
@@ -331,7 +331,7 @@ 
      * @param string $return_format The format for returning content from the remote URL.
      * @return string|bool          Json decoded response on success, false on failure.
      */
-    public function perform_remote_request( $action, $body = array(), $headers = array(), $return_format = 'json' ) {
+    public function perform_remote_request($action, $body = array(), $headers = array(), $return_format = 'json') {
 
         // Build the body of the request.
         $body = wp_parse_args(
@@ -339,20 +339,20 @@ 
             array(
                 'tgm-updater-action'     => $action,
                 'tgm-updater-key'        => $this->key,
-                'tgm-updater-wp-version' => get_bloginfo( 'version' ),
+                'tgm-updater-wp-version' => get_bloginfo('version'),
                 'tgm-updater-referer'    => site_url(),
                 'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
                 'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
             )
         );
-        $body = http_build_query( $body, '', '&' );
+        $body = http_build_query($body, '', '&');
 
         // Build the headers of the request.
         $headers = wp_parse_args(
             $headers,
             array(
                 'Content-Type'   => 'application/x-www-form-urlencoded',
-                'Content-Length' => strlen( $body )
+                'Content-Length' => strlen($body)
             )
         );
 
@@ -363,17 +363,17 @@ 
         );
 
         // Perform the query and retrieve the response.
-        $response      = wp_remote_post( esc_url_raw( $this->remote_url ), $post );
-        $response_code = wp_remote_retrieve_response_code( $response );
-        $response_body = wp_remote_retrieve_body( $response );
+        $response      = wp_remote_post(esc_url_raw($this->remote_url), $post);
+        $response_code = wp_remote_retrieve_response_code($response);
+        $response_body = wp_remote_retrieve_body($response);
 
         // Bail out early if there are any errors.
-        if ( 200 != $response_code || is_wp_error( $response_body ) ) {
+        if (200 != $response_code || is_wp_error($response_body)) {
             return false;
         }
 
         // Return the json decoded content.
-        return json_decode( $response_body );
+        return json_decode($response_body);
 
     }
 }
\ No newline at end of file

Indentation +3 added lines, -3 removed lines

@@ -267,12 +267,12 @@
         $description                = isset( $this->info->description )    ? $this->info->description     : '';
 
         if ( ! empty( $changelog ) ) {
-             if ( ! empty( $description ) ) {
+                if ( ! empty( $description ) ) {
                 $api->sections['description'] = $description;
                 $api->sections['changelog']   = $changelog;
-             } else {
+                } else {
                 $api->sections['changelog']   = $changelog;
-             }
+                }
         } else if ( ! empty( $description ) ) {
             $api->sections['description'] = $description;
         } else {

includes/admin/licensing/autoupdate.php

Spacing +16 added lines, -16 removed lines

@@ -9,34 +9,34 @@ 
  * @param array $item   Update data about a specific plugin.
  * @return bool $update The new update state.
  */
-function monsterinsights_automatic_updates( $update, $item ) {
+function monsterinsights_automatic_updates($update, $item) {
 
     // If this is multisite and is not on the main site, return early.
-    if ( is_multisite() && ! is_main_site() ) {
+    if (is_multisite() && ! is_main_site()) {
         return $update;
     }
     
     // If we don't have everything we need, return early.
     $item = (array) $item;
-    if ( ! isset( $item['new_version'] ) || ! isset( $item['slug'] ) ) {
+    if ( ! isset($item['new_version']) || ! isset($item['slug'])) {
         return $update;
     }
 
     // If the plugin isn't ours, return early.
     $is_free = 'google-analytics-for-wordpress' === $item['slug'];
-    $is_paid = isset( $item['monsterinsights_plugin'] ); // see updater class
-    if ( ! $is_free && ! $is_paid ) {
+    $is_paid = isset($item['monsterinsights_plugin']); // see updater class
+    if ( ! $is_free && ! $is_paid) {
         return $update;
     }
 
     $version           = $is_free ? MONSTERINSIGHTS_LITE_VERSION : $item['old_version'];
-    $automatic_updates = monsterinsights_get_option( 'automatic_updates', false );
-    $current_major     = monsterinsights_get_major_version( $version );
-    $new_major         = monsterinsights_get_major_version( $item['new_version'] );
+    $automatic_updates = monsterinsights_get_option('automatic_updates', false);
+    $current_major     = monsterinsights_get_major_version($version);
+    $new_major         = monsterinsights_get_major_version($item['new_version']);
     
     // If the opt in update allows major updates but there is no major version update, return early.
-    if ( $current_major < $new_major ) {
-        if ( $automatic_updates === 'all' ) {
+    if ($current_major < $new_major) {
+        if ($automatic_updates === 'all') {
             return true;
         } else {
             return $update;
@@ -44,8 +44,8 @@ 
     }
     
     // If the opt in update allows minor updates but there is no minor version update, return early.
-    if ( $current_major == $new_major ) {
-        if ( $automatic_updates === 'all' || $automatic_updates === 'minor' ) {
+    if ($current_major == $new_major) {
+        if ($automatic_updates === 'all' || $automatic_updates === 'minor') {
             return true;
         } else {
             return $update;
@@ -56,7 +56,7 @@ 
     return true;
 }
 
-add_filter( 'auto_update_plugin', 'monsterinsights_automatic_updates', 10, 2 );
+add_filter('auto_update_plugin', 'monsterinsights_automatic_updates', 10, 2);
 /**
  * Notes about autoupdater:
  * This runs on the normal WordPress auto-update sequence:
@@ -84,9 +84,9 @@ 
  */
 
 
-function monsterinsights_get_major_version( $version ) {
-    $exploded_version = explode( '.', $version );
-    if ( isset( $exploded_version[2] ) ) {
+function monsterinsights_get_major_version($version) {
+    $exploded_version = explode('.', $version);
+    if (isset($exploded_version[2])) {
         return $exploded_version[0] . '.' . $exploded_version[1] . '.' . $exploded_version[2];
     } else {
         return $exploded_version[0] . '.' . $exploded_version[1] . '.0';

includes/admin/licensing/license.php

Spacing +124 added lines, -124 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -59,7 +59,7 @@ 
     public function __construct() {
         // Load the base class object.
         $this->base = MonsterInsights();
-        add_action( 'admin_init', array( $this, 'admin_init' ) );
+        add_action('admin_init', array($this, 'admin_init'));
     }
     
     public function admin_init() {
@@ -67,12 +67,12 @@ 
         $this->maybe_verify_key();
 
         // Add potential admin notices for actions around the admin.
-        add_action( 'admin_notices', array( $this, 'monsterinsights_notices' ) );
-        add_action( 'network_admin_notices', array( $this, 'monsterinsights_notices' ) );
+        add_action('admin_notices', array($this, 'monsterinsights_notices'));
+        add_action('network_admin_notices', array($this, 'monsterinsights_notices'));
 
         // Grab the license key. If it is not set (even after verification), return early.
         $this->key = monsterinsights_get_license_key();
-        if ( ! $this->key ) {
+        if ( ! $this->key) {
             return;
         }
 
@@ -91,11 +91,11 @@ 
      */
     public function maybe_verify_key() {
         
-        if ( ! $this->is_verifying_key() ) {
+        if ( ! $this->is_verifying_key()) {
             return;
         }
 
-        if ( ! $this->verify_key_action() ) {
+        if ( ! $this->verify_key_action()) {
             return;
         }
 
@@ -111,39 +111,39 @@ 
     public function verify_key() {
 
         // Perform a request to verify the key.
-        $verify = $this->perform_remote_request( 'verify-key', array( 'tgm-updater-key' => trim( $_POST['monsterinsights-license-key'] ) ) );
+        $verify = $this->perform_remote_request('verify-key', array('tgm-updater-key' => trim($_POST['monsterinsights-license-key'])));
 
         // If it returns false, send back a generic error message and return.
-        if ( ! $verify ) {
-            $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
+        if ( ! $verify) {
+            $this->errors[] = esc_html__('There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress');
             return;
         }
 
         // If an error is returned, set the error and return.
-        if ( ! empty( $verify->error ) ) {
+        if ( ! empty($verify->error)) {
             $this->errors[] = $verify->error;
             return;
         }
 
         // Otherwise, our request has been done successfully. Update the option and set the success message.
-        if ( is_multisite() && is_network_admin() ) {
-            $option                = get_site_option( 'monsterinsights_license' );
-            $option['key']         = trim( $_POST['monsterinsights-license-key'] );
-            $option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
+        if (is_multisite() && is_network_admin()) {
+            $option                = get_site_option('monsterinsights_license');
+            $option['key']         = trim($_POST['monsterinsights-license-key']);
+            $option['type']        = isset($verify->type) ? $verify->type : $option['type'];
             $option['is_expired']  = false;
             $option['is_disabled'] = false;
             $option['is_invalid']  = false;
-            $this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
-            update_site_option( 'monsterinsights_license', $option );
+            $this->success[]       = isset($verify->success) ? $verify->success : esc_html__('Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress');
+            update_site_option('monsterinsights_license', $option);
         } else {
-            $option                = get_option( 'monsterinsights_license' );
-            $option['key']         = trim( $_POST['monsterinsights-license-key'] );
-            $option['type']        = isset( $verify->type ) ? $verify->type : $option['type'];
+            $option                = get_option('monsterinsights_license');
+            $option['key']         = trim($_POST['monsterinsights-license-key']);
+            $option['type']        = isset($verify->type) ? $verify->type : $option['type'];
             $option['is_expired']  = false;
             $option['is_disabled'] = false;
             $option['is_invalid']  = false;
-            $this->success[]       = isset( $verify->success ) ? $verify->success : esc_html__( 'Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress' );
-            update_option( 'monsterinsights_license', $option );        
+            $this->success[]       = isset($verify->success) ? $verify->success : esc_html__('Congratulations! This site is now receiving automatic updates.', 'google-analytics-for-wordpress');
+            update_option('monsterinsights_license', $option);        
         }
 
     }
@@ -157,7 +157,7 @@ 
      */
     public function is_verifying_key() {
 
-        return isset( $_POST['monsterinsights-license-key'] ) && isset( $_POST['monsterinsights-verify-submit'] );
+        return isset($_POST['monsterinsights-license-key']) && isset($_POST['monsterinsights-verify-submit']);
 
     }
 
@@ -170,7 +170,7 @@ 
      */
     public function verify_key_action() {
 
-        return isset( $_POST['monsterinsights-verify-submit'] ) && wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' );
+        return isset($_POST['monsterinsights-verify-submit']) && wp_verify_nonce($_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce');
 
     }
 
@@ -184,17 +184,17 @@ 
     public function maybe_validate_key() {
 
         // Only run every 12 hours.
-        $timestamp = get_option( 'monsterinsights_license_updates' );
-        if ( ! $timestamp ) {
-             $timestamp = strtotime( '+8 hours' );
-             update_option( 'monsterinsights_license_updates', $timestamp );
+        $timestamp = get_option('monsterinsights_license_updates');
+        if ( ! $timestamp) {
+             $timestamp = strtotime('+8 hours');
+             update_option('monsterinsights_license_updates', $timestamp);
              $this->validate_key();
         } else {
             $current_timestamp = time();
-            if ( $current_timestamp < $timestamp ) {
+            if ($current_timestamp < $timestamp) {
                 return;
             } else {
-                update_option( 'monsterinsights_license_updates', strtotime( '+8 hours' ) );
+                update_option('monsterinsights_license_updates', strtotime('+8 hours'));
                 $this->validate_key();
             }
         }
@@ -207,104 +207,104 @@ 
      *
      * @param bool $forced Force to set contextual messages (false by default).
      */
-    public function validate_key( $forced = false ) {
+    public function validate_key($forced = false) {
 
-        $validate = $this->perform_remote_request( 'validate-key', array( 'tgm-updater-key' => $this->key ) );
+        $validate = $this->perform_remote_request('validate-key', array('tgm-updater-key' => $this->key));
 
         // If there was a basic API error in validation, only set the transient for 10 minutes before retrying.
-        if ( ! $validate ) {
+        if ( ! $validate) {
             // If forced, set contextual success message.
-            if ( $forced ) {
-                $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
+            if ($forced) {
+                $this->errors[] = esc_html__('There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress');
             }
             
             return;
         }
 
         // If a key or author error is returned, the license no longer exists or the user has been deleted, so reset license.
-        if ( isset( $validate->key ) || isset( $validate->author ) ) {
+        if (isset($validate->key) || isset($validate->author)) {
             $option = array();
-            if ( is_multisite() && is_network_admin() ) {
-                $option  = get_site_option( 'monsterinsights_license' );
+            if (is_multisite() && is_network_admin()) {
+                $option = get_site_option('monsterinsights_license');
             } else {
-                $option = get_option( 'monsterinsights_license' );
+                $option = get_option('monsterinsights_license');
             }
             $option['is_expired']  = false;
             $option['is_disabled'] = false;
             $option['is_invalid']  = true;
-            if ( is_multisite() && is_network_admin() ) {
-                update_site_option( 'monsterinsights_license', $option );
+            if (is_multisite() && is_network_admin()) {
+                update_site_option('monsterinsights_license', $option);
             } else {
-                update_option( 'monsterinsights_license', $option );
+                update_option('monsterinsights_license', $option);
             }
             return;
         }
 
         // If the license has expired, set the transient and expired flag and return.
-        if ( isset( $validate->expired ) ) {
+        if (isset($validate->expired)) {
             $option = array();
-            if ( is_multisite() && is_network_admin() ) {
-                $option  = get_site_option( 'monsterinsights_license' );
+            if (is_multisite() && is_network_admin()) {
+                $option = get_site_option('monsterinsights_license');
             } else {
-                $option = get_option( 'monsterinsights_license' );
+                $option = get_option('monsterinsights_license');
             }
             $option['is_expired']  = true;
             $option['is_disabled'] = false;
             $option['is_invalid']  = false;
-            if ( is_multisite() && is_network_admin() ) {
-                update_site_option( 'monsterinsights_license', $option );
+            if (is_multisite() && is_network_admin()) {
+                update_site_option('monsterinsights_license', $option);
             } else {
-                update_option( 'monsterinsights_license', $option );
+                update_option('monsterinsights_license', $option);
             }
             return;
         }
 
         // If the license is disabled, set the transient and disabled flag and return.
-        if ( isset( $validate->disabled ) ) {
+        if (isset($validate->disabled)) {
             $option = array();
-            if ( is_multisite() && is_network_admin() ) {
-                $option  = get_site_option( 'monsterinsights_license' );
+            if (is_multisite() && is_network_admin()) {
+                $option = get_site_option('monsterinsights_license');
             } else {
-                $option = get_option( 'monsterinsights_license' );
+                $option = get_option('monsterinsights_license');
             }
             $option['is_expired']  = false;
             $option['is_disabled'] = true;
             $option['is_invalid']  = false;
-            if ( is_multisite() && is_network_admin() ) {
-                update_site_option( 'monsterinsights_license', $option );
+            if (is_multisite() && is_network_admin()) {
+                update_site_option('monsterinsights_license', $option);
             } else {
-                update_option( 'monsterinsights_license', $option );
+                update_option('monsterinsights_license', $option);
             }
             return;
         }
 
         // If forced, set contextual success message.
-        if ( ( ! empty( $validate->key ) || ! empty( $this->key ) ) && $forced ) {
+        if (( ! empty($validate->key) || ! empty($this->key)) && $forced) {
             $key = '';
-            if ( ! empty( $validate->key ) ) {
+            if ( ! empty($validate->key)) {
                 $key = $validate->key;
             } else {
                 $key = $this->key;
             }
-            delete_transient( '_monsterinsights_addons' );
-            monsterinsights_get_addons_data( $key );
-            $this->success[] = esc_html__( 'Congratulations! Your key has been refreshed successfully.', 'google-analytics-for-wordpress' );
+            delete_transient('_monsterinsights_addons');
+            monsterinsights_get_addons_data($key);
+            $this->success[] = esc_html__('Congratulations! Your key has been refreshed successfully.', 'google-analytics-for-wordpress');
         }
 
         $option = array();
-        if ( is_multisite() && is_network_admin() ) {
-            $option  = get_site_option( 'monsterinsights_license' );
+        if (is_multisite() && is_network_admin()) {
+            $option = get_site_option('monsterinsights_license');
         } else {
-            $option = get_option( 'monsterinsights_license' );
+            $option = get_option('monsterinsights_license');
         }
-        $option['type']        = isset( $validate->type ) ? $validate->type : $option['type'];
+        $option['type']        = isset($validate->type) ? $validate->type : $option['type'];
         $option['is_expired']  = false;
         $option['is_disabled'] = false;
         $option['is_invalid']  = false;
-        if ( is_multisite() && is_network_admin() ) {
-            update_site_option( 'monsterinsights_license', $option );
+        if (is_multisite() && is_network_admin()) {
+            update_site_option('monsterinsights_license', $option);
         } else {
-            update_option( 'monsterinsights_license', $option );
+            update_option('monsterinsights_license', $option);
         }
 
     }
@@ -318,11 +318,11 @@ 
      */
     public function maybe_deactivate_key() {
 
-        if ( ! $this->is_deactivating_key() ) {
+        if ( ! $this->is_deactivating_key()) {
             return;
         }
 
-        if ( ! $this->deactivate_key_action() ) {
+        if ( ! $this->deactivate_key_action()) {
             return;
         }
 
@@ -338,27 +338,27 @@ 
     public function deactivate_key() {
 
         // Perform a request to deactivate the key.
-        $deactivate = $this->perform_remote_request( 'deactivate-key', array( 'tgm-updater-key' => $_POST['monsterinsights-license-key'] ) );
+        $deactivate = $this->perform_remote_request('deactivate-key', array('tgm-updater-key' => $_POST['monsterinsights-license-key']));
 
         // If it returns false, send back a generic error message and return.
-        if ( ! $deactivate ) {
-            $this->errors[] = esc_html__( 'There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress' );
+        if ( ! $deactivate) {
+            $this->errors[] = esc_html__('There was an error connecting to the remote key API. Please try again later.', 'google-analytics-for-wordpress');
             return;
         }
 
         // If an error is returned, set the error and return.
-        if ( ! empty( $deactivate->error ) && ! monsterinsights_is_debug_mode() ) {
+        if ( ! empty($deactivate->error) && ! monsterinsights_is_debug_mode()) {
             $this->errors[] = $deactivate->error;
             return;
         }
 
         // Otherwise, our request has been done successfully. Reset the option and set the success message.
-        $this->success[] = isset( $deactivate->success ) ? $deactivate->success : esc_html__( 'Congratulations! You have deactivated the key from this site successfully.', 'google-analytics-for-wordpress' );
-        update_option( 'monsterinsights_license', array() );
-        if ( is_multisite() && is_network_admin() ) {
-            update_site_option( 'monsterinsights_license', array() );
+        $this->success[] = isset($deactivate->success) ? $deactivate->success : esc_html__('Congratulations! You have deactivated the key from this site successfully.', 'google-analytics-for-wordpress');
+        update_option('monsterinsights_license', array());
+        if (is_multisite() && is_network_admin()) {
+            update_site_option('monsterinsights_license', array());
         } else {
-            update_option( 'monsterinsights_license', array() );
+            update_option('monsterinsights_license', array());
         }
 
     }
@@ -372,7 +372,7 @@ 
      */
     public function is_deactivating_key() {
 
-        return isset( $_POST['monsterinsights-license-key'] ) && isset( $_POST['monsterinsights-deactivate-submit'] );
+        return isset($_POST['monsterinsights-license-key']) && isset($_POST['monsterinsights-deactivate-submit']);
 
     }
 
@@ -385,7 +385,7 @@ 
      */
     public function deactivate_key_action() {
 
-        return isset( $_POST['monsterinsights-deactivate-submit'] ) && wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' );
+        return isset($_POST['monsterinsights-deactivate-submit']) && wp_verify_nonce($_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce');
 
     }
 
@@ -398,16 +398,16 @@ 
      */
     public function maybe_refresh_key() {
 
-        if ( ! $this->is_refreshing_key() ) {
+        if ( ! $this->is_refreshing_key()) {
             return;
         }
 
-        if ( ! $this->refresh_key_action() ) {
+        if ( ! $this->refresh_key_action()) {
             return;
         }
 
         // Refreshing is simply a word alias for validating a key. Force true to set contextual messages.
-        $this->validate_key( true );
+        $this->validate_key(true);
 
     }
 
@@ -420,7 +420,7 @@ 
      */
     public function is_refreshing_key() {
 
-        return isset( $_POST['monsterinsights-license-key'] ) && isset( $_POST['monsterinsights-refresh-submit'] );
+        return isset($_POST['monsterinsights-license-key']) && isset($_POST['monsterinsights-refresh-submit']);
 
     }
 
@@ -433,7 +433,7 @@ 
      */
     public function refresh_key_action() {
 
-        return isset( $_POST['monsterinsights-refresh-submit'] ) && wp_verify_nonce( $_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce' );
+        return isset($_POST['monsterinsights-refresh-submit']) && wp_verify_nonce($_POST['monsterinsights-key-nonce'], 'monsterinsights-key-nonce');
 
     }
 
@@ -448,119 +448,119 @@ 
         $key    = monsterinsights_get_license_key();
 
         $option = array();
-        if ( is_multisite() && is_network_admin() ) {
-            $option = get_site_option( 'monsterinsights_license' );
+        if (is_multisite() && is_network_admin()) {
+            $option = get_site_option('monsterinsights_license');
         } else {
-            $option = get_option( 'monsterinsights_license' );
+            $option = get_option('monsterinsights_license');
         }
 
-        if ( ! monsterinsights_is_pro_version() ) {
+        if ( ! monsterinsights_is_pro_version()) {
             return;
         }
 
-        if ( is_multisite() && is_network_admin() ) {
+        if (is_multisite() && is_network_admin()) {
             // If a key has expired, output nag about renewing the key.
-            if ( isset( $option['is_expired'] ) && $option['is_expired'] ) :
+            if (isset($option['is_expired']) && $option['is_expired']) :
             ?>
             <div class="error">
-                <p><?php printf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key and continue receiving automatic updates.%2$s', 'google-analytics-for-wordpress' ), '<a href="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ); ?></p>
+                <p><?php printf(esc_html__('Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key and continue receiving automatic updates.%2$s', 'google-analytics-for-wordpress'), '<a href="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>'); ?></p>
             </div>
             <?php
             endif;
 
             // If a key has been disabled, output nag about using another key.
-            if ( isset( $option['is_disabled'] ) && $option['is_disabled'] ) :
+            if (isset($option['is_disabled']) && $option['is_disabled']) :
             ?>
             <div class="error">
-                <p><?php esc_html_e( 'Your license key for MonsterInsights has been disabled. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress' ); ?></p>
+                <p><?php esc_html_e('Your license key for MonsterInsights has been disabled. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress'); ?></p>
             </div>
             <?php
             endif;
 
             // If a key is invalid, output nag about using another key.
-            if ( isset( $option['is_invalid'] ) && $option['is_invalid'] ) :
+            if (isset($option['is_invalid']) && $option['is_invalid']) :
             ?>
             <div class="error">
-                <p><?php esc_html_e( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress' ); ?></p>
+                <p><?php esc_html_e('Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress'); ?></p>
             </div>
             <?php
             endif;
 
             // If there are any license errors, output them now.
-            if ( ! empty( $this->errors ) ) :
+            if ( ! empty($this->errors)) :
             ?>
             <div class="error">
-                <p><?php echo implode( '<br>', $this->errors ); ?></p>
+                <p><?php echo implode('<br>', $this->errors); ?></p>
             </div>
             <?php
             endif;
 
             // If there are any success messages, output them now.
-            if ( ! empty( $this->success ) ) :
+            if ( ! empty($this->success)) :
             ?>
             <div class="updated">
-                <p><?php echo implode( '<br>', $this->success ); ?></p>
+                <p><?php echo implode('<br>', $this->success); ?></p>
             </div>
             <?php
             endif;
         } else {
             // If there is no license key, output nag about ensuring key is set for automatic updates.
-            if ( ! $key ) :
-                if ( ! monsterinsights_is_pro_version() ) { 
+            if ( ! $key) :
+                if ( ! monsterinsights_is_pro_version()) { 
                     return;
                 }
                 $screen = get_current_screen(); 
-                if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
+                if (empty($screen->id) || strpos($screen->id, 'monsterinsights') !== false) {
                     return;
                 }
             ?>
             <div class="error">
-                <p><?php printf( esc_html__( 'No valid license key has been entered, so automatic updates for MonsterInsights have been turned off. %1$sPlease click here to enter your license key and begin receiving automatic updates.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( add_query_arg( array( 'page' => 'monsterinsights_settings' ), admin_url( 'admin.php' ) ) ) . '" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
+                <p><?php printf(esc_html__('No valid license key has been entered, so automatic updates for MonsterInsights have been turned off. %1$sPlease click here to enter your license key and begin receiving automatic updates.%2$s', 'google-analytics-for-wordpress'), '<a href="' . esc_url(add_query_arg(array('page' => 'monsterinsights_settings'), admin_url('admin.php'))) . '" target="_blank" rel="noopener noreferrer">', '</a>'); ?></p>
             </div>
             <?php
             endif;
 
             // If a key has expired, output nag about renewing the key.
-            if ( isset( $option['is_expired'] ) && $option['is_expired'] ) :
+            if (isset($option['is_expired']) && $option['is_expired']) :
             ?>
             <div class="error">
-                <p><?php printf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key and continue receiving automatic updates.%2$s', 'google-analytics-for-wordpress' ), '<a href="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer">', '</a>' ); ?></p>
+                <p><?php printf(esc_html__('Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key and continue receiving automatic updates.%2$s', 'google-analytics-for-wordpress'), '<a href="https://www.monsterinsights.com/login/" target="_blank" rel="noopener noreferrer">', '</a>'); ?></p>
             </div>
             <?php
             endif;
 
             // If a key has been disabled, output nag about using another key.
-            if ( isset( $option['is_disabled'] ) && $option['is_disabled'] ) :
+            if (isset($option['is_disabled']) && $option['is_disabled']) :
             ?>
             <div class="error">
-                <p><?php esc_html_e( 'Your license key for MonsterInsights has been disabled. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress' ); ?></p>
+                <p><?php esc_html_e('Your license key for MonsterInsights has been disabled. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress'); ?></p>
             </div>
             <?php
             endif;
 
             // If a key is invalid, output nag about using another key.
-            if ( isset( $option['is_invalid'] ) && $option['is_invalid'] ) :
+            if (isset($option['is_invalid']) && $option['is_invalid']) :
             ?>
             <div class="error">
-                <p><?php esc_html_e( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress' ); ?></p>
+                <p><?php esc_html_e('Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key to continue receiving automatic updates.', 'google-analytics-for-wordpress'); ?></p>
             </div>
             <?php
             endif;
 
             // If there are any license errors, output them now.
-            if ( ! empty( $this->errors ) ) :
+            if ( ! empty($this->errors)) :
             ?>
             <div class="error">
-                <p><?php echo implode( '<br>', $this->errors ); ?></p>
+                <p><?php echo implode('<br>', $this->errors); ?></p>
             </div>
             <?php
             endif;
 
             // If there are any success messages, output them now.
-            if ( ! empty( $this->success ) ) :
+            if ( ! empty($this->success)) :
             ?>
             <div class="updated">
-                <p><?php echo implode( '<br>', $this->success ); ?></p>
+                <p><?php echo implode('<br>', $this->success); ?></p>
             </div>
             <?php
             endif;
@@ -578,7 +578,7 @@ 
      * @param string $return_format The format for returning content from the remote URL.
      * @return string|bool          Json decoded response on success, false on failure.
      */
-    public function perform_remote_request( $action, $body = array(), $headers = array(), $return_format = 'json' ) {
+    public function perform_remote_request($action, $body = array(), $headers = array(), $return_format = 'json') {
 
         // Build the body of the request.
         $body = wp_parse_args(
@@ -586,20 +586,20 @@ 
             array(
                 'tgm-updater-action'     => $action,
                 'tgm-updater-key'        => $this->key,
-                'tgm-updater-wp-version' => get_bloginfo( 'version' ),
+                'tgm-updater-wp-version' => get_bloginfo('version'),
                 'tgm-updater-referer'    => site_url(),
                 'tgm-updater-mi-version' => MONSTERINSIGHTS_VERSION,
                 'tgm-updater-is-pro'     => monsterinsights_is_pro_version(),
             )
         );
-        $body = http_build_query( $body, '', '&' );
+        $body = http_build_query($body, '', '&');
 
         // Build the headers of the request.
         $headers = wp_parse_args(
             $headers,
             array(
                 'Content-Type'   => 'application/x-www-form-urlencoded',
-                'Content-Length' => strlen( $body )
+                'Content-Length' => strlen($body)
             )
         );
 
@@ -610,17 +610,17 @@ 
         );
 
         // Perform the query and retrieve the response.
-        $response      = wp_remote_post( 'https://www.monsterinsights.com', $post );
-        $response_code = wp_remote_retrieve_response_code( $response );
-        $response_body = wp_remote_retrieve_body( $response );
+        $response      = wp_remote_post('https://www.monsterinsights.com', $post);
+        $response_code = wp_remote_retrieve_response_code($response);
+        $response_body = wp_remote_retrieve_body($response);
 
         // Bail out early if there are any errors.
-        if ( 200 != $response_code || is_wp_error( $response_body ) ) {
+        if (200 != $response_code || is_wp_error($response_body)) {
             return false;
         }
 
         // Return the json decoded content.
-        return json_decode( $response_body );
+        return json_decode($response_body);
 
     }
 }
\ No newline at end of file

Indentation +3 added lines, -3 removed lines

@@ -186,9 +186,9 @@
         // Only run every 12 hours.
         $timestamp = get_option( 'monsterinsights_license_updates' );
         if ( ! $timestamp ) {
-             $timestamp = strtotime( '+8 hours' );
-             update_option( 'monsterinsights_license_updates', $timestamp );
-             $this->validate_key();
+                $timestamp = strtotime( '+8 hours' );
+                update_option( 'monsterinsights_license_updates', $timestamp );
+                $this->validate_key();
         } else {
             $current_timestamp = time();
             if ( $current_timestamp < $timestamp ) {

includes/admin/capabilities.php

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -32,52 +32,52 @@ 
  * @param array  $args Extra parameters. Unused.
  * @return array Array of caps needed to have this meta cap. If returned array is empty, user has the capability.
  */
-function monsterinsights_add_capabilities( $caps, $cap, $user_id, $args ) {
-    switch( $cap ) {
+function monsterinsights_add_capabilities($caps, $cap, $user_id, $args) {
+    switch ($cap) {
         case 'monsterinsights_view_dashboard' :
-            $roles = monsterinsights_get_option( 'view_reports', array() );
+            $roles = monsterinsights_get_option('view_reports', array());
 
             $user_can_via_settings = false;
-            if ( ! empty( $roles ) && is_array( $roles ) ) {
-                foreach ( $roles as $role ) {
-                    if ( is_string( $role ) ) {
-                        if ( user_can( $user_id, $role ) ) {
+            if ( ! empty($roles) && is_array($roles)) {
+                foreach ($roles as $role) {
+                    if (is_string($role)) {
+                        if (user_can($user_id, $role)) {
                             $user_can_via_settings = true;
                             break;
                         }
                     }
                 }
-            } else if ( ! empty( $roles ) && is_string( $roles ) ) {
-                if ( user_can( $user_id, $roles ) ) {
+            } else if ( ! empty($roles) && is_string($roles)) {
+                if (user_can($user_id, $roles)) {
                     $user_can_via_settings = true;
                 }
             }
 
-            if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
+            if (user_can($user_id, 'manage_options') || $user_can_via_settings) {
                 $caps = array();
             }
             
             break;
          case 'monsterinsights_save_settings' :
-            $roles = monsterinsights_get_option( 'save_settings', array() );
+            $roles = monsterinsights_get_option('save_settings', array());
 
             $user_can_via_settings = false;
-            if ( ! empty( $roles ) && is_array( $roles ) ) {
-                foreach ( $roles as $role ) {
-                    if ( is_string( $role ) ) {
-                        if ( user_can( $user_id, $role ) ) {
+            if ( ! empty($roles) && is_array($roles)) {
+                foreach ($roles as $role) {
+                    if (is_string($role)) {
+                        if (user_can($user_id, $role)) {
                             $user_can_via_settings = true;
                             break;
                         }
                     }
                 }
-            } else if ( ! empty( $roles ) && is_string( $roles ) ) {
-                 if ( user_can( $user_id, $roles ) ) {
+            } else if ( ! empty($roles) && is_string($roles)) {
+                 if (user_can($user_id, $roles)) {
                     $user_can_via_settings = true;
                 }
             }
 
-            if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
+            if (user_can($user_id, 'manage_options') || $user_can_via_settings) {
                 $caps = array();
             }
 
@@ -85,4 +85,4 @@ 
     }
     return $caps;
 }
-add_filter( 'map_meta_cap','monsterinsights_add_capabilities', 10, 4 );
\ No newline at end of file
+add_filter('map_meta_cap', 'monsterinsights_add_capabilities', 10, 4);
\ No newline at end of file

Indentation +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
             }
             
             break;
-         case 'monsterinsights_save_settings' :
+            case 'monsterinsights_save_settings' :
             $roles = monsterinsights_get_option( 'save_settings', array() );
 
             $user_can_via_settings = false;
@@ -72,7 +72,7 @@ 
                     }
                 }
             } else if ( ! empty( $roles ) && is_string( $roles ) ) {
-                 if ( user_can( $user_id, $roles ) ) {
+                    if ( user_can( $user_id, $roles ) ) {
                     $user_can_via_settings = true;
                 }
             }