awesomemotive / google-analytics-for-wordpress

googleanalytics.php

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

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/licensing/updater.php

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/license.php

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

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;
                 }
             }

includes/admin/tracking.php

Indentation +301 added lines, -301 removed lines

@@ -10,7 +10,7 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+  exit;
 }
 
 /**
@@ -22,308 +22,308 @@ 
  */
 class MonsterInsights_Tracking {
 
-	/**
-	 * The data to send to the EDD site
-	 *
-	 * @access private
-	 */
-	private $data;
-
-	/**
-	 * Get things going
-	 *
-	 * @access public
-	 */
-	public function __construct() {
-
-		add_action( 'init', array( $this, 'schedule_send' ) );
-		add_action( 'monsterinsights_settings_save_general_end', array( $this, 'check_for_settings_optin' ) );
-		add_action( 'admin_head', array( $this, 'check_for_optin' ) );
-		add_action( 'admin_head', array( $this, 'check_for_optout' ) );
-		add_action( 'admin_notices', array( $this, 'monsterinsights_admin_notice' ),7 );
-		add_filter( 'cron_schedules', array( $this, 'add_schedules' ) );
-		add_action( 'monsterinsights_daily_cron', array( $this, 'send_checkin' ) );
-	}
-
-	/**
-	 * Check if the user has opted into tracking
-	 *
-	 * @access private
-	 * @return bool
-	 */
-	private function tracking_allowed() {
-		return (bool) monsterinsights_get_option( 'anonymous_data', false );
-	}
-
-	/**
-	 * Setup the data that is going to be tracked
-	 *
-	 * @access private
-	 * @return void
-	 */
-	private function setup_data() {
-		$data = array();
-
-		// Retrieve current theme info
-		$theme_data    = wp_get_theme();
-		$theme         = $theme_data->Name . ' ' . $theme_data->Version;
-		$tracking_mode = monsterinsights_get_option( 'tracking_mode', 'analytics' );
-		$events_mode   = monsterinsights_get_option( 'events_mode', 'none' );
-		$update_mode   = monsterinsights_get_option( 'automatic_updates', false );
-
-		if ( $tracking_mode === false ) {
-			$tracking_mode = 'analytics';
-		}
-
-		if ( $events_mode === false ) {
-			$events_mode = 'none';
-		}
-
-		if ( $update_mode === false ) {
-			$update_mode = 'none';
-		}
-
-		$data['php_version'] = phpversion();
-		$data['mi_version']  = MONSTERINSIGHTS_VERSION;
-		$data['wp_version']  = get_bloginfo( 'version' );
-		$data['server']      = isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '';
-		$data['over_time']   = get_option( 'monsterinsights_over_time', array() );
-		$data['multisite']   = is_multisite();
-		$data['url']         = home_url();
-		$data['theme']       = $theme;
-		$data['email']       = get_bloginfo( 'admin_email' );
-		$data['key']         = monsterinsights_get_license();
-		$data['sas']         = monsterinsights_get_shareasale_id();
-		$data['setttings']     = monsterinsights_get_options();
-		$data['tracking_mode'] = $tracking_mode;
-		$data['events_mode']   = $events_mode;
-		$data['autoupdate']    = $update_mode;
-
-		// Retrieve current plugin information
-		if( ! function_exists( 'get_plugins' ) ) {
-			include ABSPATH . '/wp-admin/includes/plugin.php';
-		}
-
-		$plugins        = array_keys( get_plugins() );
-		$active_plugins = get_option( 'active_plugins', array() );
-
-		foreach ( $plugins as $key => $plugin ) {
-			if ( in_array( $plugin, $active_plugins ) ) {
-				// Remove active plugins from list so we can show active and inactive separately
-				unset( $plugins[ $key ] );
-			}
-		}
-
-		$data['active_plugins']   = $active_plugins;
-		$data['inactive_plugins'] = $plugins;
-		$data['locale']           = get_locale();
-
-		$this->data = $data;
-	}
-
-	/**
-	 * Send the data to the EDD server
-	 *
-	 * @access private
-	 * @return void
-	 */
-	public function send_checkin( $override = false, $ignore_last_checkin = false ) {
-
-		$home_url = trailingslashit( home_url() );
-		if ( $home_url === 'https://www.monsterinsights.com/'     || 
-			 $home_url === 'https://beta.monsterinsights.com/'    ||
-			 $home_url === 'https://staging.monsterinsights.com/' ||
-			 $home_url === 'https://testing.monsterinsights.com/'
-		) {
-			return false;
-		}
-
-		if( ! $this->tracking_allowed() && ! $override ) {
-			return false;
-		}
-
-		// Send a maximum of once per week
-		$last_send = $this->get_last_send();
-		if( is_numeric( $last_send ) && $last_send > strtotime( '-1 week' ) && ! $ignore_last_checkin ) {
-			return false;
-		}
-
-		$this->setup_data();
-
-		$request = wp_remote_post( 'https://www.monsterinsights.com/?edd_action=checkin', array(
-			'method'      => 'POST',
-			'timeout'     => 20,
-			'redirection' => 5,
-			'httpversion' => '1.1',
-			'blocking'    => true,
-			'body'        => $this->data,
-			'user-agent'  => 'MI/' . MONSTERINSIGHTS_VERSION . '; ' . get_bloginfo( 'url' )
-		) );
-
-		if( is_wp_error( $request ) ) {
-			return $request;
-		}
-
-		update_option( 'mi_tracking_last_send', time() );
-
-		return true;
-
-	}
-
-	/**
-	 * Check for a new opt-in on settings save
-	 *
-	 * This runs during the sanitation of General settings, thus the return
-	 *
-	 * @access public
-	 * @return array
-	 */
-	public function check_for_settings_optin() {
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			return;
-		}
-
-		// Send an intial check in on settings save
-		$anonymous_data = isset( $_POST['anonymous_data'] ) ? 1 : 0;
-		if ( $anonymous_data ) {
-			$this->send_checkin( true );
-		}
-
-	}
-
-	/**
-	 * Check for a new opt-in via the admin notice
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function check_for_optin() {
-		if ( ! ( ! empty( $_REQUEST['mi_action'] ) && 'opt_into_tracking' === $_REQUEST['mi_action'] ) ) {
-			return;
-		}
-
-		if ( monsterinsights_get_option( 'anonymous_data', false ) ) {
-			return;
-		}
-
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			return;
-		}
+  /**
+   * The data to send to the EDD site
+   *
+   * @access private
+   */
+  private $data;
+
+  /**
+   * Get things going
+   *
+   * @access public
+   */
+  public function __construct() {
+
+    add_action( 'init', array( $this, 'schedule_send' ) );
+    add_action( 'monsterinsights_settings_save_general_end', array( $this, 'check_for_settings_optin' ) );
+    add_action( 'admin_head', array( $this, 'check_for_optin' ) );
+    add_action( 'admin_head', array( $this, 'check_for_optout' ) );
+    add_action( 'admin_notices', array( $this, 'monsterinsights_admin_notice' ),7 );
+    add_filter( 'cron_schedules', array( $this, 'add_schedules' ) );
+    add_action( 'monsterinsights_daily_cron', array( $this, 'send_checkin' ) );
+  }
+
+  /**
+   * Check if the user has opted into tracking
+   *
+   * @access private
+   * @return bool
+   */
+  private function tracking_allowed() {
+    return (bool) monsterinsights_get_option( 'anonymous_data', false );
+  }
+
+  /**
+   * Setup the data that is going to be tracked
+   *
+   * @access private
+   * @return void
+   */
+  private function setup_data() {
+    $data = array();
+
+    // Retrieve current theme info
+    $theme_data    = wp_get_theme();
+    $theme         = $theme_data->Name . ' ' . $theme_data->Version;
+    $tracking_mode = monsterinsights_get_option( 'tracking_mode', 'analytics' );
+    $events_mode   = monsterinsights_get_option( 'events_mode', 'none' );
+    $update_mode   = monsterinsights_get_option( 'automatic_updates', false );
+
+    if ( $tracking_mode === false ) {
+      $tracking_mode = 'analytics';
+    }
+
+    if ( $events_mode === false ) {
+      $events_mode = 'none';
+    }
+
+    if ( $update_mode === false ) {
+      $update_mode = 'none';
+    }
+
+    $data['php_version'] = phpversion();
+    $data['mi_version']  = MONSTERINSIGHTS_VERSION;
+    $data['wp_version']  = get_bloginfo( 'version' );
+    $data['server']      = isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '';
+    $data['over_time']   = get_option( 'monsterinsights_over_time', array() );
+    $data['multisite']   = is_multisite();
+    $data['url']         = home_url();
+    $data['theme']       = $theme;
+    $data['email']       = get_bloginfo( 'admin_email' );
+    $data['key']         = monsterinsights_get_license();
+    $data['sas']         = monsterinsights_get_shareasale_id();
+    $data['setttings']     = monsterinsights_get_options();
+    $data['tracking_mode'] = $tracking_mode;
+    $data['events_mode']   = $events_mode;
+    $data['autoupdate']    = $update_mode;
+
+    // Retrieve current plugin information
+    if( ! function_exists( 'get_plugins' ) ) {
+      include ABSPATH . '/wp-admin/includes/plugin.php';
+    }
+
+    $plugins        = array_keys( get_plugins() );
+    $active_plugins = get_option( 'active_plugins', array() );
+
+    foreach ( $plugins as $key => $plugin ) {
+      if ( in_array( $plugin, $active_plugins ) ) {
+        // Remove active plugins from list so we can show active and inactive separately
+        unset( $plugins[ $key ] );
+      }
+    }
+
+    $data['active_plugins']   = $active_plugins;
+    $data['inactive_plugins'] = $plugins;
+    $data['locale']           = get_locale();
+
+    $this->data = $data;
+  }
+
+  /**
+   * Send the data to the EDD server
+   *
+   * @access private
+   * @return void
+   */
+  public function send_checkin( $override = false, $ignore_last_checkin = false ) {
+
+    $home_url = trailingslashit( home_url() );
+    if ( $home_url === 'https://www.monsterinsights.com/'     || 
+       $home_url === 'https://beta.monsterinsights.com/'    ||
+       $home_url === 'https://staging.monsterinsights.com/' ||
+       $home_url === 'https://testing.monsterinsights.com/'
+    ) {
+      return false;
+    }
+
+    if( ! $this->tracking_allowed() && ! $override ) {
+      return false;
+    }
+
+    // Send a maximum of once per week
+    $last_send = $this->get_last_send();
+    if( is_numeric( $last_send ) && $last_send > strtotime( '-1 week' ) && ! $ignore_last_checkin ) {
+      return false;
+    }
+
+    $this->setup_data();
+
+    $request = wp_remote_post( 'https://www.monsterinsights.com/?edd_action=checkin', array(
+      'method'      => 'POST',
+      'timeout'     => 20,
+      'redirection' => 5,
+      'httpversion' => '1.1',
+      'blocking'    => true,
+      'body'        => $this->data,
+      'user-agent'  => 'MI/' . MONSTERINSIGHTS_VERSION . '; ' . get_bloginfo( 'url' )
+    ) );
+
+    if( is_wp_error( $request ) ) {
+      return $request;
+    }
+
+    update_option( 'mi_tracking_last_send', time() );
+
+    return true;
+
+  }
+
+  /**
+   * Check for a new opt-in on settings save
+   *
+   * This runs during the sanitation of General settings, thus the return
+   *
+   * @access public
+   * @return array
+   */
+  public function check_for_settings_optin() {
+    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+      return;
+    }
+
+    // Send an intial check in on settings save
+    $anonymous_data = isset( $_POST['anonymous_data'] ) ? 1 : 0;
+    if ( $anonymous_data ) {
+      $this->send_checkin( true );
+    }
+
+  }
+
+  /**
+   * Check for a new opt-in via the admin notice
+   *
+   * @access public
+   * @return void
+   */
+  public function check_for_optin() {
+    if ( ! ( ! empty( $_REQUEST['mi_action'] ) && 'opt_into_tracking' === $_REQUEST['mi_action'] ) ) {
+      return;
+    }
+
+    if ( monsterinsights_get_option( 'anonymous_data', false ) ) {
+      return;
+    }
+
+    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+      return;
+    }
 		
-		monsterinsights_update_option( 'anonymous_data', 1 );
-		$this->send_checkin( true );
-		update_option( 'monsterinsights_tracking_notice', 1 );
-	}
-
-	/**
-	 * Check for a new opt-in via the admin notice
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function check_for_optout() {
-		if ( ! ( ! empty( $_REQUEST['mi_action'] ) && 'opt_out_of_tracking' === $_REQUEST['mi_action'] ) ) {
-			return;
-		}
-
-		if ( monsterinsights_get_option( 'anonymous_data', false ) ) {
-			return;
-		}
-
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			return;
-		}
-
-		monsterinsights_update_option( 'anonymous_data', 0 );
-		update_option( 'monsterinsights_tracking_notice', 1 );
-	}
-
-	/**
-	 * Get the last time a checkin was sent
-	 *
-	 * @access private
-	 * @return false|string
-	 */
-	private function get_last_send() {
-		return get_option( 'monsterinsights_tracking_last_send' );
-	}
-
-	/**
-	 * Schedule a weekly checkin
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function schedule_send() {
-		// We send once a day (while tracking is allowed) to check in, which can be used to determine active sites
-		if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
-			// Set the next event of fetching data
-			wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:01:00 ' ), 'daily', 'monsterinsights_daily_cron' );
-		}
-	}
-
-	/**
-	 * Display the admin notice to users that have not opted-in or out
-	 *
-	 * @access public
-	 * @return void
-	 */
-	public function monsterinsights_admin_notice() {
-
-		$hide_notice = get_option( 'monsterinsights_tracking_notice' );
-
-		if ( $hide_notice ) {
-			return;
-		}
-
-		if ( monsterinsights_get_option( 'anonymous_data', false ) ) {
-			return;
-		}
-
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			return;
-		}
-
-		if ( defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) && MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE ) {
-			return;
-		}
+    monsterinsights_update_option( 'anonymous_data', 1 );
+    $this->send_checkin( true );
+    update_option( 'monsterinsights_tracking_notice', 1 );
+  }
+
+  /**
+   * Check for a new opt-in via the admin notice
+   *
+   * @access public
+   * @return void
+   */
+  public function check_for_optout() {
+    if ( ! ( ! empty( $_REQUEST['mi_action'] ) && 'opt_out_of_tracking' === $_REQUEST['mi_action'] ) ) {
+      return;
+    }
+
+    if ( monsterinsights_get_option( 'anonymous_data', false ) ) {
+      return;
+    }
+
+    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+      return;
+    }
+
+    monsterinsights_update_option( 'anonymous_data', 0 );
+    update_option( 'monsterinsights_tracking_notice', 1 );
+  }
+
+  /**
+   * Get the last time a checkin was sent
+   *
+   * @access private
+   * @return false|string
+   */
+  private function get_last_send() {
+    return get_option( 'monsterinsights_tracking_last_send' );
+  }
+
+  /**
+   * Schedule a weekly checkin
+   *
+   * @access public
+   * @return void
+   */
+  public function schedule_send() {
+    // We send once a day (while tracking is allowed) to check in, which can be used to determine active sites
+    if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
+      // Set the next event of fetching data
+      wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:01:00 ' ), 'daily', 'monsterinsights_daily_cron' );
+    }
+  }
+
+  /**
+   * Display the admin notice to users that have not opted-in or out
+   *
+   * @access public
+   * @return void
+   */
+  public function monsterinsights_admin_notice() {
+
+    $hide_notice = get_option( 'monsterinsights_tracking_notice' );
+
+    if ( $hide_notice ) {
+      return;
+    }
+
+    if ( monsterinsights_get_option( 'anonymous_data', false ) ) {
+      return;
+    }
+
+    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+      return;
+    }
+
+    if ( defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) && MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE ) {
+      return;
+    }
 		
-		if (
-			stristr( network_site_url( '/' ), 'dev'       ) !== false ||
-			stristr( network_site_url( '/' ), 'localhost' ) !== false ||
-			stristr( network_site_url( '/' ), ':8888'     ) !== false // This is common with MAMP on OS X
-		) {
-			update_option( 'monsterinsights_tracking_notice', '1' );
-		} else {
-			if ( ! defined( 'MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE' ) ) {
-				define( 'MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE', true );
-			}
-			$optin_url  = add_query_arg( 'mi_action', 'opt_into_tracking' );
-			$optout_url = add_query_arg( 'mi_action', 'opt_out_of_tracking' );
-			echo '<div class="updated"><p>';
-			echo esc_html__( 'Allow MonsterInsights to track plugin usage? Opt-in to tracking and our newsletter to stay informed of the latest changes to MonsterInsights and help us ensure compatibility.', 'google-analytics-for-wordpress' );
-			echo '&nbsp;<a href="' . esc_url( $optin_url ) . '" class="button-secondary">' . __( 'Allow', 'google-analytics-for-wordpress' ) . '</a>';
-			echo '&nbsp;<a href="' . esc_url( $optout_url ) . '" class="button-secondary">' . __( 'Do not allow', 'google-analytics-for-wordpress' ) . '</a>';
-			echo '</p></div>';
-		}
-	}
-
-	/**
-	 * Registers new cron schedules
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param array $schedules
-	 * @return array
-	 */
-	public function add_schedules( $schedules = array() ) {
-		// Adds once weekly to the existing schedules.
-		$schedules['weekly'] = array(
-			'interval' => 604800,
-			'display'  => __( 'Once Weekly', 'google-analytics-for-wordpress' )
-		);
-		return $schedules;
-	}
+    if (
+      stristr( network_site_url( '/' ), 'dev'       ) !== false ||
+      stristr( network_site_url( '/' ), 'localhost' ) !== false ||
+      stristr( network_site_url( '/' ), ':8888'     ) !== false // This is common with MAMP on OS X
+    ) {
+      update_option( 'monsterinsights_tracking_notice', '1' );
+    } else {
+      if ( ! defined( 'MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE' ) ) {
+        define( 'MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE', true );
+      }
+      $optin_url  = add_query_arg( 'mi_action', 'opt_into_tracking' );
+      $optout_url = add_query_arg( 'mi_action', 'opt_out_of_tracking' );
+      echo '<div class="updated"><p>';
+      echo esc_html__( 'Allow MonsterInsights to track plugin usage? Opt-in to tracking and our newsletter to stay informed of the latest changes to MonsterInsights and help us ensure compatibility.', 'google-analytics-for-wordpress' );
+      echo '&nbsp;<a href="' . esc_url( $optin_url ) . '" class="button-secondary">' . __( 'Allow', 'google-analytics-for-wordpress' ) . '</a>';
+      echo '&nbsp;<a href="' . esc_url( $optout_url ) . '" class="button-secondary">' . __( 'Do not allow', 'google-analytics-for-wordpress' ) . '</a>';
+      echo '</p></div>';
+    }
+  }
+
+  /**
+   * Registers new cron schedules
+   *
+   * @since 6.0.0
+   *
+   * @param array $schedules
+   * @return array
+   */
+  public function add_schedules( $schedules = array() ) {
+    // Adds once weekly to the existing schedules.
+    $schedules['weekly'] = array(
+      'interval' => 604800,
+      'display'  => __( 'Once Weekly', 'google-analytics-for-wordpress' )
+    );
+    return $schedules;
+  }
 
 }
 new MonsterInsights_Tracking();
\ No newline at end of file

includes/admin/reporting.php

Indentation +163 added lines, -163 removed lines

@@ -14,172 +14,172 @@
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+  exit;
 }
 
 final class MonsterInsights_Reporting {
 
-	/**
-	 * Holds the base object.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var MonsterInsights $base MonsterInsights Base object.
-	 */
-	public $base;
-
-	/**
-	 * Holds the GA client object if using oAuth.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var MonsterInsights_GA_Client $client GA client object.
-	 */
-	public $client;
-
-	/**
-	 * Is the dashboard/reporting pages disabled?
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var bool $dashboard_disabled If the dashboard is disabled.
-	 */
-	public $dashboard_disabled;
-
-	/**
-	 * Dashboard report
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var string $dashboard_report Report hook name of dashboard report.
-	 */
-	public $dashboard_report;
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 */
-	public function __construct( ) {
-
-		// Get object 
-		$this->base        		  = MonsterInsights();
-		$this->client       	  = $this->base->ga;
-		$this->dashboard_disabled = monsterinsights_get_option( 'dashboards_disabled', false );
-		$this->dashboard_report   = monsterinsights_get_option( 'dashboard_report', 'overview' );
-
-		if ( isset( $this->client->status ) && $this->client->status === 'valid' ) {
-			// Cron actions
-				// Add cron if its not there
-				add_action( 'wp', array( $this, 'schedule_cron' ) );
+  /**
+   * Holds the base object.
+   *
+   * @access public
+   * @since 6.0.0
+   * @var MonsterInsights $base MonsterInsights Base object.
+   */
+  public $base;
+
+  /**
+   * Holds the GA client object if using oAuth.
+   *
+   * @access public
+   * @since 6.0.0
+   * @var MonsterInsights_GA_Client $client GA client object.
+   */
+  public $client;
+
+  /**
+   * Is the dashboard/reporting pages disabled?
+   *
+   * @access public
+   * @since 6.0.0
+   * @var bool $dashboard_disabled If the dashboard is disabled.
+   */
+  public $dashboard_disabled;
+
+  /**
+   * Dashboard report
+   *
+   * @access public
+   * @since 6.0.0
+   * @var string $dashboard_report Report hook name of dashboard report.
+   */
+  public $dashboard_report;
+
+  /**
+   * Primary class constructor.
+   *
+   * @access public
+   * @since 6.0.0
+   */
+  public function __construct( ) {
+
+    // Get object 
+    $this->base        		  = MonsterInsights();
+    $this->client       	  = $this->base->ga;
+    $this->dashboard_disabled = monsterinsights_get_option( 'dashboards_disabled', false );
+    $this->dashboard_report   = monsterinsights_get_option( 'dashboard_report', 'overview' );
+
+    if ( isset( $this->client->status ) && $this->client->status === 'valid' ) {
+      // Cron actions
+        // Add cron if its not there
+        add_action( 'wp', array( $this, 'schedule_cron' ) );
 				
-				// Collect analytics data on cron event
-				add_action( 'monsterinsights_daily_cron', array( $this, 'run_cron' ) );
-
-				// If cron did not run for some reason (no users visited site), run it now
-				if ( filter_input( INPUT_GET, 'page' ) === 'monsterinsights_dashboard' || filter_input( INPUT_GET, 'page' ) === 'monsterinsights_reports' ) {
-					add_action( 'admin_init', array( $this, 'maybe_get_data' ) );
-				}
-		}
-
-
-		// Dashboard disabled setting
-		add_action( 'monsterinsights_settings_save_general', array( $this, 'dashboard_disabled' ), 9 );
-	}
-
-	public function dashboard_disabled( ) {
-		$dashboards_disabled     = isset( $_POST['dashboards_disabled'] ) ? 1 : 0;
-		$dashboards_disabled_old = monsterinsights_get_option( 'dashboards_disabled', false );
-
-		// We only care if the switch is going on or off
-		if ( $dashboards_disabled && ! $dashboards_disabled_old ) {
-			// The dashboards are now being disabled
-				// Clear data + last run + failed
-				$this->delete_aggregate_data();
-
-		} else if ( ! $dashboards_disabled && $dashboards_disabled_old ){
-			// The dashboards are now being enabled
-				// Refresh data + schedule cron
-				$this->refresh_aggregate_data();
-				$this->schedule_cron();
-		}
-	}
-
-	public function schedule_cron() {
-		if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
-			// Set the next event of fetching data
-			wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:01:00 ' ), 'daily', 'monsterinsights_daily_cron' );
-		}
-	}
-
-	public function maybe_get_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return false;
-		}
-
-		$last_run = monsterinsights_get_option( 'cron_last_run', false );
-
-		// See if issue connecting or expired
-		if ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 24 || date( 'Ymd', $last_run ) !== date('Ymd', time() ) ) { 
-			$this->run_cron();
-		}
-	}
-
-	public function run_cron() {
-		if ( $this->dashboard_disabled ) {
-			return;
-		}
-
-		if ( is_numeric( (int) $this->client->profile ) && $this->client->status === 'valid' ) {
-			// Profile is set
-			$this->add_aggregate_data();
-		}
-	}
-
-	public function refresh_aggregate_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return false;
-		}
-
-		$this->delete_aggregate_data();
-		$this->add_aggregate_data();
-	}
-
-	private function add_aggregate_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return false;
-		}
-		/** 
-		 * Developer Alert:
-		 *
-		 * Per the README, this is considered an internal hook and should
-		 * not be used by other developers. This hook's behavior may be modified
-		 * or the hook may be removed at any time, without warning.
-		 */
-		do_action( 'monsterinsights_add_aggregate_data', $this->client, $this->client->profile );
-		monsterinsights_update_option( 'cron_last_run', time() );
-		monsterinsights_delete_option( 'cron_failed' );
-	}
-
-	public function delete_aggregate_data() {
-		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return false;
-		}
-		/** 
-		 * Developer Alert:
-		 *
-		 * Per the README, this is considered an internal hook and should
-		 * not be used by other developers. This hook's behavior may be modified
-		 * or the hook may be removed at any time, without warning.
-		 */
-		if ( ! empty( $this->client ) && ! empty( $this->client->profile ) ) {
-			do_action( 'monsterinsights_delete_aggregate_data', $this->client, $this->client->profile );
-		}
-		$options = array(
-			'cron_failed',
-			'cron_last_run',
-		);
-		monsterinsights_delete_options( $options );
-	}
+        // Collect analytics data on cron event
+        add_action( 'monsterinsights_daily_cron', array( $this, 'run_cron' ) );
+
+        // If cron did not run for some reason (no users visited site), run it now
+        if ( filter_input( INPUT_GET, 'page' ) === 'monsterinsights_dashboard' || filter_input( INPUT_GET, 'page' ) === 'monsterinsights_reports' ) {
+          add_action( 'admin_init', array( $this, 'maybe_get_data' ) );
+        }
+    }
+
+
+    // Dashboard disabled setting
+    add_action( 'monsterinsights_settings_save_general', array( $this, 'dashboard_disabled' ), 9 );
+  }
+
+  public function dashboard_disabled( ) {
+    $dashboards_disabled     = isset( $_POST['dashboards_disabled'] ) ? 1 : 0;
+    $dashboards_disabled_old = monsterinsights_get_option( 'dashboards_disabled', false );
+
+    // We only care if the switch is going on or off
+    if ( $dashboards_disabled && ! $dashboards_disabled_old ) {
+      // The dashboards are now being disabled
+        // Clear data + last run + failed
+        $this->delete_aggregate_data();
+
+    } else if ( ! $dashboards_disabled && $dashboards_disabled_old ){
+      // The dashboards are now being enabled
+        // Refresh data + schedule cron
+        $this->refresh_aggregate_data();
+        $this->schedule_cron();
+    }
+  }
+
+  public function schedule_cron() {
+    if ( ! wp_next_scheduled( 'monsterinsights_daily_cron' ) ) {
+      // Set the next event of fetching data
+      wp_schedule_event( strtotime( date( 'Y-m-d', strtotime( 'tomorrow' ) ) . ' 00:01:00 ' ), 'daily', 'monsterinsights_daily_cron' );
+    }
+  }
+
+  public function maybe_get_data() {
+    if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+      return false;
+    }
+
+    $last_run = monsterinsights_get_option( 'cron_last_run', false );
+
+    // See if issue connecting or expired
+    if ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 24 || date( 'Ymd', $last_run ) !== date('Ymd', time() ) ) { 
+      $this->run_cron();
+    }
+  }
+
+  public function run_cron() {
+    if ( $this->dashboard_disabled ) {
+      return;
+    }
+
+    if ( is_numeric( (int) $this->client->profile ) && $this->client->status === 'valid' ) {
+      // Profile is set
+      $this->add_aggregate_data();
+    }
+  }
+
+  public function refresh_aggregate_data() {
+    if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+      return false;
+    }
+
+    $this->delete_aggregate_data();
+    $this->add_aggregate_data();
+  }
+
+  private function add_aggregate_data() {
+    if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+      return false;
+    }
+    /** 
+     * Developer Alert:
+     *
+     * Per the README, this is considered an internal hook and should
+     * not be used by other developers. This hook's behavior may be modified
+     * or the hook may be removed at any time, without warning.
+     */
+    do_action( 'monsterinsights_add_aggregate_data', $this->client, $this->client->profile );
+    monsterinsights_update_option( 'cron_last_run', time() );
+    monsterinsights_delete_option( 'cron_failed' );
+  }
+
+  public function delete_aggregate_data() {
+    if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
+      return false;
+    }
+    /** 
+     * Developer Alert:
+     *
+     * Per the README, this is considered an internal hook and should
+     * not be used by other developers. This hook's behavior may be modified
+     * or the hook may be removed at any time, without warning.
+     */
+    if ( ! empty( $this->client ) && ! empty( $this->client->profile ) ) {
+      do_action( 'monsterinsights_delete_aggregate_data', $this->client, $this->client->profile );
+    }
+    $options = array(
+      'cron_failed',
+      'cron_last_run',
+    );
+    monsterinsights_delete_options( $options );
+  }
 }
\ No newline at end of file

includes/admin/pages/settings.php

Indentation +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
     }
     
     if ( empty( $nonce ) ) {
-         return;
+          return;
     }
     
     if ( ! wp_verify_nonce( $_REQUEST[$nonce], 'monsterinsights-switch-to-analyticsjs-nonce' ) ) {
@@ -266,7 +266,7 @@ 
     }
     
     if ( empty( $nonce ) ) {
-         return;
+          return;
     }
     
     if ( ! wp_verify_nonce( $_REQUEST[$nonce], 'monsterinsights-switch-to-jsevents-nonce' ) ) {

includes/admin/pages/tools.php

Indentation +106 added lines, -106 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+  exit;
 }
 
 /**
@@ -13,15 +13,15 @@ 
  * @return void
  */
 function monsterinsights_tools_page() {
-	/** 
-	 * Developer Alert:
-	 *
-	 * Per the README, this is considered an internal hook and should
-	 * not be used by other developers. This hook's behavior may be modified
-	 * or the hook may be removed at any time, without warning.
-	 */
-	do_action( 'monsterinsights_head' );
-	?>
+  /** 
+   * Developer Alert:
+   *
+   * Per the README, this is considered an internal hook and should
+   * not be used by other developers. This hook's behavior may be modified
+   * or the hook may be removed at any time, without warning.
+   */
+  do_action( 'monsterinsights_head' );
+  ?>
 	<?php echo monsterinsights_ublock_notice(); ?>
 
 	<!-- Tabs -->
@@ -52,11 +52,11 @@ 
 }
 
 function monsterinsights_tools_url_builder_tab(){
-	do_action( 'monsterinsights_tools_url_builder_tab' );
+  do_action( 'monsterinsights_tools_url_builder_tab' );
 }
 
 function monsterinsights_tools_settings_tab() {
-	ob_start();?>
+  ob_start();?>
 	<h2><?php echo esc_html__( 'Setting Tools', 'google-analytics-for-wordpress' );?></h2>
 	<p><?php echo esc_html__( 'You can use the below tools to import settings from other MonsterInsights websites or export settings to import into another MonsterInsights install.', 'google-analytics-for-wordpress' ); ?> </p>
 	<br />
@@ -70,10 +70,10 @@ 
 				</th>
 				<td>
 					<?php 
-					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ){
-						echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!','google-analytics-for-wordpress'), 'success', false, array() );
-					}
-					?>
+          if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ){
+            echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!','google-analytics-for-wordpress'), 'success', false, array() );
+          }
+          ?>
 					<form method="post" enctype="multipart/form-data">
 						<p>
 							<input type="file" name="import_file"/>
@@ -113,7 +113,7 @@ 
 		</tbody>
 	</table>
 	<?php
-	echo ob_get_clean();
+  echo ob_get_clean();
 }
 
 /**
@@ -125,105 +125,105 @@ 
  * @return void
  */
 function monsterinsights_process_export_settings() {
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
-		return;
-	}
+  if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+    return;
+  }
 
-	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-		return;
-	}
+  if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+    return;
+  }
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ){
-		return;
-	}
+  if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ){
+    return;
+  }
 
-	if ( empty( $_POST['monsterinsights_export_settings'] ) || ! wp_verify_nonce( $_POST['monsterinsights_export_settings'], 'monsterinsights_export_settings' ) ) {
-		return;
-	}
+  if ( empty( $_POST['monsterinsights_export_settings'] ) || ! wp_verify_nonce( $_POST['monsterinsights_export_settings'], 'monsterinsights_export_settings' ) ) {
+    return;
+  }
 	
-	$settings = monsterinsights_export_settings();
-	ignore_user_abort( true );
+  $settings = monsterinsights_export_settings();
+  ignore_user_abort( true );
 
-	nocache_headers();
-	header( 'Content-Type: application/json; charset=utf-8' );
-	header( 'Content-Disposition: attachment; filename=monsterinsights-settings-export-' . date( 'm-d-Y' ) . '.json' );
-	header( "Expires: 0" );
+  nocache_headers();
+  header( 'Content-Type: application/json; charset=utf-8' );
+  header( 'Content-Disposition: attachment; filename=monsterinsights-settings-export-' . date( 'm-d-Y' ) . '.json' );
+  header( "Expires: 0" );
 
-	echo $settings;
-	exit;
+  echo $settings;
+  exit;
 }
 add_action( 'admin_init', 'monsterinsights_process_export_settings' );
 
 function monsterinsights_import_settings() {
 
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
-		return;
-	}
-
-	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-		return;
-	}
-
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ){
-		return;
-	}
-
-	if ( !wp_verify_nonce( $_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings' ) ) {
-		return;
-	}
-
-	$extension = explode( '.', $_FILES['import_file']['name'] );
-	$extension = end( $extension );
-
-	if ( $extension != 'json' ) {
-		wp_die( __( 'Please upload a valid .json file', 'google-analytics-for-wordpress' ) );
-	}
-
-	$import_file = $_FILES['import_file']['tmp_name'];
-
-	if ( empty( $import_file ) ) {
-		wp_die( __( 'Please upload a file to import', 'google-analytics-for-wordpress' ) );
-	}
-
-	$file     = file_get_contents( $import_file );
-	if ( empty( $file ) ) {
-		wp_die( __( 'Please upload a real settings export file to import', 'google-analytics-for-wordpress' ) );
-	}
-
-	// Retrieve the settings from the file and convert the json object to an array.
-	$new_settings = json_decode( wp_json_encode( json_decode( $file ) ), true );
-	$settings     = monsterinsights_get_options();
-	$exclude      = array( 
-						'analytics_profile',
-						'analytics_profile_code',
-						'analytics_profile_name',
-						'oauth_version',
-						'cron_last_run',
-						'monsterinsights_oauth_status',
-	);
-
-	foreach ( $exclude as $e ) {
-		if ( ! empty( $new_settings[ $e ] ) ) {
-			unset( $new_settings[ $e ] );
-		}
-	}
-
-	if ( ! is_super_admin() ) {
-		if ( ! empty( $new_settings[ 'custom_code' ] ) ) {
-			unset( $new_settings[ 'custom_code' ] );
-		}
-	}
-
-	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			$new_settings = $settings[ $e ];
-		}
-	}
-
-	global $monsterinsights_settings;
-	$monsterinsights_settings = $new_settings;
-
-	update_option( monsterinsights_get_option_name(), $new_settings );
-	wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_tools&action=import&result=success#monsterinsights-main-tab-settings' ) ); exit;
+  if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+    return;
+  }
+
+  if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+    return;
+  }
+
+  if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ){
+    return;
+  }
+
+  if ( !wp_verify_nonce( $_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings' ) ) {
+    return;
+  }
+
+  $extension = explode( '.', $_FILES['import_file']['name'] );
+  $extension = end( $extension );
+
+  if ( $extension != 'json' ) {
+    wp_die( __( 'Please upload a valid .json file', 'google-analytics-for-wordpress' ) );
+  }
+
+  $import_file = $_FILES['import_file']['tmp_name'];
+
+  if ( empty( $import_file ) ) {
+    wp_die( __( 'Please upload a file to import', 'google-analytics-for-wordpress' ) );
+  }
+
+  $file     = file_get_contents( $import_file );
+  if ( empty( $file ) ) {
+    wp_die( __( 'Please upload a real settings export file to import', 'google-analytics-for-wordpress' ) );
+  }
+
+  // Retrieve the settings from the file and convert the json object to an array.
+  $new_settings = json_decode( wp_json_encode( json_decode( $file ) ), true );
+  $settings     = monsterinsights_get_options();
+  $exclude      = array( 
+            'analytics_profile',
+            'analytics_profile_code',
+            'analytics_profile_name',
+            'oauth_version',
+            'cron_last_run',
+            'monsterinsights_oauth_status',
+  );
+
+  foreach ( $exclude as $e ) {
+    if ( ! empty( $new_settings[ $e ] ) ) {
+      unset( $new_settings[ $e ] );
+    }
+  }
+
+  if ( ! is_super_admin() ) {
+    if ( ! empty( $new_settings[ 'custom_code' ] ) ) {
+      unset( $new_settings[ 'custom_code' ] );
+    }
+  }
+
+  foreach ( $exclude as $e ) {
+    if ( ! empty( $settings[ $e ] ) ) {
+      $new_settings = $settings[ $e ];
+    }
+  }
+
+  global $monsterinsights_settings;
+  $monsterinsights_settings = $new_settings;
+
+  update_option( monsterinsights_get_option_name(), $new_settings );
+  wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_tools&action=import&result=success#monsterinsights-main-tab-settings' ) ); exit;
 }
 add_action( 'admin_init', 'monsterinsights_import_settings' );
\ No newline at end of file