awesomemotive / google-analytics-for-wordpress

includes/admin/partials/header.php

Spacing +3 added lines, -3 removed lines

@@ -10,12 +10,12 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 ?>
 <div id="monsterinsights-header-temp"></div>
 <div id="monsterinsights-header" class="monsterinsights-header">
-	<img class="monsterinsights-header-title" src="<?php echo esc_attr( $data['logo'] ); ?>" srcset="<?php echo esc_attr( $data['2xlogo'] ); ?> 2x" alt="<?php esc_attr__( 'MonsterInsights', 'google-analytics-for-wordpress' ); ?>"/>
-	<img class="monsterinsights-header-mascot" src="<?php echo esc_attr( $data['mascot'] ); ?>" srcset="<?php echo esc_attr( $data['2xmascot'] ); ?> 2x" alt="<?php esc_attr__( 'MonsterInsights Mascot', 'google-analytics-for-wordpress' ); ?>"/>
+	<img class="monsterinsights-header-title" src="<?php echo esc_attr($data['logo']); ?>" srcset="<?php echo esc_attr($data['2xlogo']); ?> 2x" alt="<?php esc_attr__('MonsterInsights', 'google-analytics-for-wordpress'); ?>"/>
+	<img class="monsterinsights-header-mascot" src="<?php echo esc_attr($data['mascot']); ?>" srcset="<?php echo esc_attr($data['2xmascot']); ?> 2x" alt="<?php esc_attr__('MonsterInsights Mascot', 'google-analytics-for-wordpress'); ?>"/>
 </div>
\ No newline at end of file

Indentation +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 ?>
 <div id="monsterinsights-header-temp"></div>

includes/admin/google.php

Spacing +178 added lines, -178 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -96,21 +96,21 @@ 
 		$this->name          = $this->get_name();
 		$this->oauth_version = $this->get_oauth_version();
 		$this->status        = $this->get_status();
-		$this->base 		 = MonsterInsights();
+		$this->base = MonsterInsights();
 
 
 		// Show any info/error notices
 		$this->get_notices();
 
 		// Authentication Actions
-		add_action( 'wp_ajax_monsterinsights_google_view',  array( $this, 'google_auth_view' ) );
-		add_action( 'wp_ajax_monsterinsights_google_cancel',  array( $this, 'google_cancel' ) );
+		add_action('wp_ajax_monsterinsights_google_view', array($this, 'google_auth_view'));
+		add_action('wp_ajax_monsterinsights_google_cancel', array($this, 'google_cancel'));
 
-		add_action( 'admin_init', array( $this, 'deactivate_google' ) ); // Deactivate
+		add_action('admin_init', array($this, 'deactivate_google')); // Deactivate
 	}
 
 	private function get_client() {
-		return ! empty( $this->client ) ? $this->client : monsterinsights_create_client();
+		return ! empty($this->client) ? $this->client : monsterinsights_create_client();
 	}
 
 	private function set_test_client() { 
@@ -127,11 +127,11 @@ 
 	 * @return null
 	 */
 	private function get_profile() {
-		return monsterinsights_get_option( 'analytics_profile', false );
+		return monsterinsights_get_option('analytics_profile', false);
 	}
 
 	private function get_name() {
-		return monsterinsights_get_option( 'analytics_profile_name', false );
+		return monsterinsights_get_option('analytics_profile_name', false);
 	}
 
 	private function get_ua() {
@@ -139,37 +139,37 @@ 
 	}
 
 	private function get_oauth_version() {
-		return monsterinsights_get_option( 'oauth_version', '1.0' );
+		return monsterinsights_get_option('oauth_version', '1.0');
 	}
 
 	private function get_status() {
 		$status = 'valid';
-		if ( ! empty( $this->profile ) ) {
+		if ( ! empty($this->profile)) {
 			// We are using oAuth
 			
-			$last_run = monsterinsights_get_option( 'cron_last_run', false );
-			$failed   = monsterinsights_get_option( 'cron_failed', false );
-			$dash_dis = monsterinsights_get_option( 'dashboards_disabled', false );
+			$last_run = monsterinsights_get_option('cron_last_run', false);
+			$failed   = monsterinsights_get_option('cron_failed', false);
+			$dash_dis = monsterinsights_get_option('dashboards_disabled', false);
 
 			// See if issue connecting or expired
-			if ( ! $dash_dis && $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 )  ) { 
+			if ( ! $dash_dis && $failed && ($last_run === false || monsterinsights_hours_between($last_run) >= 48)) { 
 				$status = 'blocked';
 			}
 
 			$access_token = $this->client->get_access_token();
 
 			// Check to make sure access token is there and not expired
-			if ( empty( $access_token ) || empty( $access_token['expires'] ) || current_time( 'timestamp' ) >= $access_token['expires'] ) {
+			if (empty($access_token) || empty($access_token['expires']) || current_time('timestamp') >= $access_token['expires']) {
 				$status = 'expired';
 				return $status;
 			}
 
 			// See if needs permissions
-			if ( version_compare( $this->oauth_version, '1.0', '<' ) ) { 
+			if (version_compare($this->oauth_version, '1.0', '<')) { 
 				$status = 'needs-permissions';
 			}
 			
-		} else if ( ! empty( $this->ua ) ) {
+		} else if ( ! empty($this->ua)) {
 			// We are using manual
 			
 		} else {
@@ -182,31 +182,31 @@ 
 
 	private function get_notices() {
 		// Notice for no manual or profile GA
-		if ( $this->status === 'empty' ) {
-			add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_empty_notice' ),6 );
+		if ($this->status === 'empty') {
+			add_action('admin_notices', array($this, 'monsterinsights_show_admin_config_empty_notice'), 6);
 		}
 
-		$current_page = filter_input( INPUT_GET, 'page' );
+		$current_page = filter_input(INPUT_GET, 'page');
 
 		// Only show expired, needs permission, or blocked notices on the MI pages
 		// We do this because unlike status empty, these only block reporting, not the frontend
 		// tracking from working, and as a result, these are not as urgent. Plus users generally
 		// don't like global notices.
-		if ( strpos( $current_page, 'monsterinsights' ) === 0 ) {
+		if (strpos($current_page, 'monsterinsights') === 0) {
 		
 			// Notice for GA Access token expired (needs re-authenticate)
-			if ( $this->status === 'expired' ) {
-				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_expired_notice' ),6 );
+			if ($this->status === 'expired') {
+				add_action('admin_notices', array($this, 'monsterinsights_show_admin_config_expired_notice'), 6);
 			}
 			
 			// Notice for Needs Permissions
-			if ( $this->status === 'needs-permissions' ) {
-				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_needs_permissions_notice' ),6 );
+			if ($this->status === 'needs-permissions') {
+				add_action('admin_notices', array($this, 'monsterinsights_show_admin_config_needs_permissions_notice'), 6);
 			}
 
 			// Notice for trouble connecting to Google
-			if ( $this->status === 'blocked' ) {
-				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_blocked_notice' ),6 );
+			if ($this->status === 'blocked') {
+				add_action('admin_notices', array($this, 'monsterinsights_show_admin_config_blocked_notice'), 6);
 			}
 		}
 	}
@@ -228,7 +228,7 @@ 
 		$this->status        = $this->get_status();
 
 		// Re-get data if possible
-		if ( $this->ua === 'valid' ) {
+		if ($this->ua === 'valid') {
 			$this->refresh_dashboard_data();
 		}
 	}
@@ -247,20 +247,20 @@ 
 	 */
 	public function get_profiles() { // @todo: this needs exception handling for a 401 login required		
 		$accounts = $this->get_profiles_request();
-		if ( is_array( $accounts ) ) {
+		if (is_array($accounts)) {
 			return $accounts;
 		} else {
 			return array();
 		}
 	}
 
-	public function find_selected_profile( $profile_id ) {
+	public function find_selected_profile($profile_id) {
 		$profiles = $this->get_profiles();
-		$found  = array();
-		foreach ( $profiles as $account ) {
-			foreach ( $account['items'] as $profile ) {
-				foreach ( $profile['items'] as $subprofile ) {
-					if ( isset( $subprofile['id'] ) && $subprofile['id'] == $profile_id ) {
+		$found = array();
+		foreach ($profiles as $account) {
+			foreach ($account['items'] as $profile) {
+				foreach ($profile['items'] as $subprofile) {
+					if (isset($subprofile['id']) && $subprofile['id'] == $profile_id) {
 						$found = array(
 							'id'   => $profile_id,
 							'ua'   => $subprofile['ua_code'],
@@ -275,10 +275,10 @@ 
 		return $found;
 	}
 
-	public function save_selected_profile( $profile ) {
-		monsterinsights_update_option( 'analytics_profile', $profile['id'] );
-		monsterinsights_update_option( 'analytics_profile_code', $profile['ua'] );
-		monsterinsights_update_option( 'analytics_profile_name', $profile['name'] );
+	public function save_selected_profile($profile) {
+		monsterinsights_update_option('analytics_profile', $profile['id']);
+		monsterinsights_update_option('analytics_profile_code', $profile['ua']);
+		monsterinsights_update_option('analytics_profile_name', $profile['name']);
 		monsterinsights_set_client_oauth_version();
 	}
 
@@ -292,43 +292,43 @@ 
 	 */
 	private function get_profiles_request() {
 		global $wp_version;
-		$version = str_replace( '-src', '', $wp_version );
+		$version = str_replace('-src', '', $wp_version);
 		$accounts    = array();
 		$start_index = 1;
 		$paginate    = false;
 		$continue    = true;
-		while ( $continue ) {
-			$body     = array(
+		while ($continue) {
+			$body = array(
 				'max-results'  => 1000,
 				'start-index'  => $paginate ? $start_index + 1000 : $start_index,
 			);
-			if ( $paginate ) {
+			if ($paginate) {
 				$start_index = $start_index + 1000;
 			}
-			$response = $this->client->do_request( 'https://www.googleapis.com/analytics/v3/management/accounts/~all/webproperties/~all/profiles', false, 'GET', $body );
-			if ( ! empty( $response ) ) {
+			$response = $this->client->do_request('https://www.googleapis.com/analytics/v3/management/accounts/~all/webproperties/~all/profiles', false, 'GET', $body);
+			if ( ! empty($response)) {
 				$response = array(
-					'response' => array( 'code' => $this->client->get_http_response_code() ),
-					'body'     => json_decode( $response->getResponseBody(), true ),
+					'response' => array('code' => $this->client->get_http_response_code()),
+					'body'     => json_decode($response->getResponseBody(), true),
 				);
 			} else {
-				if ( version_compare( $version, '4.6', '<' ) ) {
-					return esc_html__( 'MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please update your WordPress version.', 'google-analytics-for-wordpress' );
+				if (version_compare($version, '4.6', '<')) {
+					return esc_html__('MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please update your WordPress version.', 'google-analytics-for-wordpress');
 				} else {
-					if ( ! empty( $accounts ) ) {
+					if ( ! empty($accounts)) {
 						return $accounts;
 					} else {
-						return esc_html__( 'Google Analytics had a connection error or your Google account is not signed up for Google Analytics.', 'google-analytics-for-wordpress' );
+						return esc_html__('Google Analytics had a connection error or your Google account is not signed up for Google Analytics.', 'google-analytics-for-wordpress');
 					}
 				}
 			}
 			
-			if ( isset( $response['response']['code'] ) && $response['response']['code'] == 200 ) {
-				if ( ! empty( $response['body']['items'] ) && is_array( $response['body']['items'] ) ) {
-					foreach ( $response['body']['items'] as $item ) {
+			if (isset($response['response']['code']) && $response['response']['code'] == 200) {
+				if ( ! empty($response['body']['items']) && is_array($response['body']['items'])) {
+					foreach ($response['body']['items'] as $item) {
 
 						// Only deal with web properties, not apps.
-						if ( isset( $item['type'] ) && 'WEB' != $item['type'] ) {
+						if (isset($item['type']) && 'WEB' != $item['type']) {
 							continue;
 						}
 
@@ -375,8 +375,8 @@ 
 						*/
 
 
-						if ( empty( $accounts[ $item['accountId'] ] ) ) {
-							$accounts[ $item['accountId'] ] = array( 
+						if (empty($accounts[$item['accountId']])) {
+							$accounts[$item['accountId']] = array( 
 								'id'          => $item['accountId'],
 								'ua_code'     => $item['webPropertyId'],
 								'parent_name' => $item['websiteUrl'],
@@ -384,16 +384,16 @@ 
 							);
 						}
 
-						if ( empty( $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ] ) ) {
-							$accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]= array( 
+						if (empty($accounts[$item['accountId']]['items'][$item['internalWebPropertyId']])) {
+							$accounts[$item['accountId']]['items'][$item['internalWebPropertyId']] = array( 
 								'id'          => $item['webPropertyId'],
 								'name'        => $item['websiteUrl'],
 								'items'       => array(),
 							);
 						}
 
-						if ( empty( $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]['items'][ $item['id'] ] ) ) {
-							$accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]['items'][ $item['id'] ] = array( 
+						if (empty($accounts[$item['accountId']]['items'][$item['internalWebPropertyId']]['items'][$item['id']])) {
+							$accounts[$item['accountId']]['items'][$item['internalWebPropertyId']]['items'][$item['id']] = array( 
 								'name'    => $item['name'] . ' (' . $item['webPropertyId'] . ')',
 								'ua_code' => $item['webPropertyId'],
 								'id'      => $item['id'],
@@ -401,37 +401,37 @@ 
 						}
 					}
 				}
-			} else if ( isset( $response['response']['code'] ) && $response['response']['code'] !== 200 && ! $paginate ) {
-				if ( version_compare( $version, '4.6', '<' ) ) {
-					return esc_html__( 'MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please update your WordPress version.', 'google-analytics-for-wordpress' );
+			} else if (isset($response['response']['code']) && $response['response']['code'] !== 200 && ! $paginate) {
+				if (version_compare($version, '4.6', '<')) {
+					return esc_html__('MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please update your WordPress version.', 'google-analytics-for-wordpress');
 				} else {
-					if ( ! empty( $accounts ) ) {
+					if ( ! empty($accounts)) {
 						return $accounts;
 					} else {
-						$code = isset( $response['response']['code'] ) ? $response['response']['code'] : 'Unknown';
-						$type = isset( $response['body']['error']['errors'][0]['reason'] ) ? $response['body']['error']['errors'][0]['reason'] : false;
-						if ( $type === 'insufficientPermissions' ) {
-							return esc_html__( 'Please ensure your Google Account is signed up for Google Analytics.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'badRequest' ) {
-							return esc_html__( 'Bad Request. Please contact support.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'dailyLimitExceeded' ) {
-							return esc_html__( 'Daily Limit Exceeded. Please contact support.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'userRateLimitExceeded' ) {
-							return esc_html__( 'User Rate Limit Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'rateLimitExceeded' ) {
-							return esc_html__( 'Project Rate Limit Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'quotaExceeded' ) {
-							return esc_html__( 'Project Rate Limit Quota Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'internalServerError' || $type === 'backendError' ) {
-							return esc_html__( 'Google Analytics is having API issues on their side. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
+						$code = isset($response['response']['code']) ? $response['response']['code'] : 'Unknown';
+						$type = isset($response['body']['error']['errors'][0]['reason']) ? $response['body']['error']['errors'][0]['reason'] : false;
+						if ($type === 'insufficientPermissions') {
+							return esc_html__('Please ensure your Google Account is signed up for Google Analytics.', 'google-analytics-for-wordpress');
+						} else if ($type === 'badRequest') {
+							return esc_html__('Bad Request. Please contact support.', 'google-analytics-for-wordpress');
+						} else if ($type === 'dailyLimitExceeded') {
+							return esc_html__('Daily Limit Exceeded. Please contact support.', 'google-analytics-for-wordpress');
+						} else if ($type === 'userRateLimitExceeded') {
+							return esc_html__('User Rate Limit Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress');
+						} else if ($type === 'rateLimitExceeded') {
+							return esc_html__('Project Rate Limit Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress');
+						} else if ($type === 'quotaExceeded') {
+							return esc_html__('Project Rate Limit Quota Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress');
+						} else if ($type === 'internalServerError' || $type === 'backendError') {
+							return esc_html__('Google Analytics is having API issues on their side. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress');
 						} else {
-							return sprintf( esc_html__( 'Google Analytics had a connection error. Error code: %1$s. Reason: %2$s', 'google-analytics-for-wordpress' ), $code, $type );
+							return sprintf(esc_html__('Google Analytics had a connection error. Error code: %1$s. Reason: %2$s', 'google-analytics-for-wordpress'), $code, $type);
 						}
 					}
 				}
 			}
 
-			if ( isset( $response['body']['totalResults'] ) && $start_index < $response['body']['totalResults'] && ! empty( $response['body']['nextLink'] ) ) {
+			if (isset($response['body']['totalResults']) && $start_index < $response['body']['totalResults'] && ! empty($response['body']['nextLink'])) {
 				$paginate    = true;
 			} else {
 				$continue    = false;
@@ -450,7 +450,7 @@ 
 			'cron_failed',
 			'cron_last_run',
 		);
-		monsterinsights_delete_options( $options );
+		monsterinsights_delete_options($options);
 
 		// Destroy the data
 		$this->base->reports->delete_aggregate_data();
@@ -460,20 +460,20 @@ 
 
 	private function clear_manual_data() {
 		// Delete the manual ua code
-		monsterinsights_delete_option( 'manual_ua_code' );
+		monsterinsights_delete_option('manual_ua_code');
 	}
 
 	public function deactivate_google() {
 		// Check if user pressed the deactivate button and nonce is valid
-		if ( ! isset( $_POST['monsterinsights-google-deauthenticate-submit'] ) ) {
+		if ( ! isset($_POST['monsterinsights-google-deauthenticate-submit'])) {
 			return;
 		}
 
-		if ( ! wp_verify_nonce( $_POST['monsterinsights-google-authenticated-nonce'], 'monsterinsights-google-authenticated-nonce' ) ) {
+		if ( ! wp_verify_nonce($_POST['monsterinsights-google-authenticated-nonce'], 'monsterinsights-google-authenticated-nonce')) {
 			return;
 		}
 
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+		if ( ! current_user_can('monsterinsights_save_settings')) {
 			return;
 		}
 
@@ -508,12 +508,12 @@ 
 	 *
 	 * @return array|null
 	 */
-	public function do_request( $target_request_url ) {
-		$response = $this->client->do_request( $target_request_url );
-		if ( ! empty( $response ) ) {
+	public function do_request($target_request_url) {
+		$response = $this->client->do_request($target_request_url);
+		if ( ! empty($response)) {
 			return array(
-				'response' => array( 'code' => $this->client->get_http_response_code() ),
-				'body'     => json_decode( $response->getResponseBody(), true ),
+				'response' => array('code' => $this->client->get_http_response_code()),
+				'body'     => json_decode($response->getResponseBody(), true),
 			);
 		}
 	}
@@ -525,113 +525,113 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function authenticate( $authentication_code = null ) {
+	public function authenticate($authentication_code = null) {
 		// When authentication again we should clean up some stuff
-		monsterinsights_delete_options( array( 'cron_last_run', 'cron_failed' ) );
-		return $this->client->authenticate_client( $authentication_code );
+		monsterinsights_delete_options(array('cron_last_run', 'cron_failed'));
+		return $this->client->authenticate_client($authentication_code);
 	}
 
 	public function google_auth_view() {
-		$view   = isset( $_POST['view'] ) && in_array( $_POST['view'], array( 'prestart', 'start', 'enterkey', 'selectprofile', 'done' ) ) ? $_POST['view'] : '';
-		$reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false'  ? true : false;
+		$view   = isset($_POST['view']) && in_array($_POST['view'], array('prestart', 'start', 'enterkey', 'selectprofile', 'done')) ? $_POST['view'] : '';
+		$reauth = isset($_POST['reauth']) && $_POST['reauth'] && $_POST['reauth'] !== 'false' ? true : false;
 
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress');
+		if ( ! current_user_can('monsterinsights_save_settings')) {
+			echo esc_html__('Permission Denied', 'google-analytics-for-wordpress');
 			wp_die();
 		}
 
 		// We run the save routines, if required, for a view, and then after that send back the results + next view
 		$nextview = array();
 
-		switch ( $view ) {
+		switch ($view) {
 			case 'start':
-				if ( ! $this->is_wp_blocking_google() && ! $this->is_google_on_blacklist() ) {
+				if ( ! $this->is_wp_blocking_google() && ! $this->is_google_on_blacklist()) {
 					$auth_url = $this->create_auth_url();
-					$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url );
+					$nextview = monsterinsights_google_auth_enterkey_view($reauth, $auth_url);
 				} else {
-					$error    = esc_html__( 'Cannot connect to Google', 'google-analytics-for-wordpress' );
-					$nextview = monsterinsights_google_auth_error_view( $reauth, $error );
+					$error    = esc_html__('Cannot connect to Google', 'google-analytics-for-wordpress');
+					$nextview = monsterinsights_google_auth_error_view($reauth, $error);
 				}
 				break;
 
 			case 'enterkey':
-				$auth_key = ! empty( $_POST['stepdata'] ) ? sanitize_text_field( $_POST['stepdata'] ) : '';
-				if ( $auth_key ) {
-					if ( $this->test_authkey( $auth_key ) ) {
+				$auth_key = ! empty($_POST['stepdata']) ? sanitize_text_field($_POST['stepdata']) : '';
+				if ($auth_key) {
+					if ($this->test_authkey($auth_key)) {
 						$profiles = $this->get_profiles_request();
-						delete_option( 'monsterinsights_get_profiles' );
-						update_option( 'monsterinsights_get_profiles', $profiles );
-						if ( ! empty( $profiles ) && is_array( $profiles ) ) {
-							$select = $this->ga_select( $profiles );
-							$nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select );
-						} else if ( ! empty( $profiles ) && is_string( $profiles ) ) {
+						delete_option('monsterinsights_get_profiles');
+						update_option('monsterinsights_get_profiles', $profiles);
+						if ( ! empty($profiles) && is_array($profiles)) {
+							$select = $this->ga_select($profiles);
+							$nextview = monsterinsights_google_auth_selectprofile_view($reauth, $select);
+						} else if ( ! empty($profiles) && is_string($profiles)) {
 							// Error from Google
 							$auth_url = $this->create_auth_url();
 							$this->client->clear_data();
 							$this->set_test_client();
-							$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html( $profiles ) );
+							$nextview = monsterinsights_google_auth_enterkey_view($reauth, $auth_url, esc_html($profiles));
 						} else {
 							// No profiles or not enough permissions
 							$auth_url = $this->create_auth_url();
 							$this->client->clear_data();
 							$this->set_test_client();
-							$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html__( 'No profiles viewable for that account. Please use another account.', 'google-analytics-for-wordpress' ) );
+							$nextview = monsterinsights_google_auth_enterkey_view($reauth, $auth_url, esc_html__('No profiles viewable for that account. Please use another account.', 'google-analytics-for-wordpress'));
 						}
 					} else {
 						// if bad authentication error message
 						$auth_url = $this->create_auth_url();
 						$this->client->clear_data();
 						$this->set_test_client();
-						$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html__( 'Bad Google Code. Please try again.', 'google-analytics-for-wordpress' ) );
+						$nextview = monsterinsights_google_auth_enterkey_view($reauth, $auth_url, esc_html__('Bad Google Code. Please try again.', 'google-analytics-for-wordpress'));
 					}
 				} else {
 					$auth_url = $this->create_auth_url();
 					$this->client->clear_data();
 					$this->set_test_client();
 					// if no auth key error message
-					$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html__( 'Please paste in your Google code.', 'google-analytics-for-wordpress' ) );
+					$nextview = monsterinsights_google_auth_enterkey_view($reauth, $auth_url, esc_html__('Please paste in your Google code.', 'google-analytics-for-wordpress'));
 				}
 				break;
 
 			case 'selectprofile':
-				$profile = ! empty( $_POST['stepdata'] ) ? absint( sanitize_text_field( $_POST['stepdata'] ) ) : '';
-				if ( ! empty( $profile ) ) {
+				$profile = ! empty($_POST['stepdata']) ? absint(sanitize_text_field($_POST['stepdata'])) : '';
+				if ( ! empty($profile)) {
 					$this->set_test_client();
-					$profile = $this->find_selected_profile( $profile );
-					if ( ! empty( $profile ) ) {
+					$profile = $this->find_selected_profile($profile);
+					if ( ! empty($profile)) {
 
 						$this->clear_manual_data(); // Just in case we were manual, clear out UA
 
 						$this->client->move_test_to_live();
-						$this->save_selected_profile( $profile );
+						$this->save_selected_profile($profile);
 						$this->set_client();
 						$this->reinitialize();
 
 						// Refresh reporting data
 						$this->base->reports->refresh_aggregate_data();
 
-						$nextview = monsterinsights_google_auth_done_view( $reauth );
+						$nextview = monsterinsights_google_auth_done_view($reauth);
 					} else {
 						// Invalid profile selected
-						$profiles = get_option( 'monsterinsights_get_profiles', array() );
-						$select   = $this->ga_select( $profiles );
-						$nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select, esc_html__( 'Invalid profile selected.', 'google-analytics-for-wordpress' ) );
+						$profiles = get_option('monsterinsights_get_profiles', array());
+						$select   = $this->ga_select($profiles);
+						$nextview = monsterinsights_google_auth_selectprofile_view($reauth, $select, esc_html__('Invalid profile selected.', 'google-analytics-for-wordpress'));
 					}
 				} else { 
 					// No profile selected
-					$profiles = get_option( 'monsterinsights_get_profiles', array() );
-					$select   = $this->ga_select( $profiles );
-					$nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select, esc_html__( 'Please select a profile.', 'google-analytics-for-wordpress' ) );
+					$profiles = get_option('monsterinsights_get_profiles', array());
+					$select   = $this->ga_select($profiles);
+					$nextview = monsterinsights_google_auth_selectprofile_view($reauth, $select, esc_html__('Please select a profile.', 'google-analytics-for-wordpress'));
 				}
 				break;
 
 			case 'done':
-				$nextview = monsterinsights_google_auth_done_view( $reauth );
+				$nextview = monsterinsights_google_auth_done_view($reauth);
 				break;
 				
 			case 'prestart':
 			default:
-				 $nextview = monsterinsights_google_auth_start_view( $reauth );
+				 $nextview = monsterinsights_google_auth_start_view($reauth);
 				break;
 		}
 		echo $nextview;
@@ -639,25 +639,25 @@ 
 	}
 
 	public function google_cancel() {
-		$view   = isset( $_POST['view'] ) && in_array( $_POST['view'], array( 'prestart', 'start', 'enterkey', 'selectprofile', 'done' ) ) ? $_POST['view'] : '';
-		$reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false'  ? true : false;
+		$view   = isset($_POST['view']) && in_array($_POST['view'], array('prestart', 'start', 'enterkey', 'selectprofile', 'done')) ? $_POST['view'] : '';
+		$reauth = isset($_POST['reauth']) && $_POST['reauth'] && $_POST['reauth'] !== 'false' ? true : false;
 
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress');
+		if ( ! current_user_can('monsterinsights_save_settings')) {
+			echo esc_html__('Permission Denied', 'google-analytics-for-wordpress');
 			wp_die();
 		}
 
 		// If we cancelled on enterkey or selectprofile, delete the temp access tokens and set client back to normal client
-		if ( $view === 'enterkey' || $view === 'selectprofile' ) {
+		if ($view === 'enterkey' || $view === 'selectprofile') {
 			$this->client->clear_data();
-			delete_option( 'monsterinsights_get_profiles' );
+			delete_option('monsterinsights_get_profiles');
 			$this->set_client();
 		}
 	}
 
-	private function test_authkey( $authkey ) {
+	private function test_authkey($authkey) {
 		$this->set_test_client();
-		$result = $this->authenticate( $authkey );
+		$result = $this->authenticate($authkey);
 		return $result;
 	}
 
@@ -666,18 +666,18 @@ 
 	 *
 	 * @return null|string
 	 */
-	private function ga_select( $profiles = array() ) {
-		if ( empty( $profiles ) || ! is_array( $profiles ) ) { 
+	private function ga_select($profiles = array()) {
+		if (empty($profiles) || ! is_array($profiles)) { 
 			$profiles = $this->get_profiles();
 		}
 		
 		$optgroups = array();
-		foreach ( $profiles as $key => $value ) {
-			foreach ( $value['items'] as $subitem ) {
-				if ( empty( $optgroups[ $subitem['name'] ]['items'] ) ) {
-					$optgroups[ $subitem['name'] ]['items'] = $subitem['items'];
+		foreach ($profiles as $key => $value) {
+			foreach ($value['items'] as $subitem) {
+				if (empty($optgroups[$subitem['name']]['items'])) {
+					$optgroups[$subitem['name']]['items'] = $subitem['items'];
 				} else {
-					$optgroups[ $subitem['name'] ]['items'] = array_merge( $optgroups[ $subitem['name'] ]['items'], $subitem['items'] );
+					$optgroups[$subitem['name']]['items'] = array_merge($optgroups[$subitem['name']]['items'], $subitem['items']);
 				}
 			}
 		}
@@ -685,17 +685,17 @@ 
 		$values = $optgroups;
 		$select = '';
 		$select .= '<div class="monsterinsights_ga_form">';
-		$select .= '<label for="monsterinsights_step_data" id="monsterinsights_select_ga_profile_label">' . esc_html__( 'Analytics profile', 'google-analytics-for-wordpress' ) . ':</label>';
-		$select .= '<select data-placeholder="' . esc_attr__( 'Select a profile', 'google-analytics-for-wordpress' ) . '" name="monsterinsights_step_data" class="monsterinsights-select300 monsterinsights_select_ga_profile" id="monsterinsights_step_data" style="width:80%;margin-left:10%;margin-right:10%;background-color: #FFF;">';
+		$select .= '<label for="monsterinsights_step_data" id="monsterinsights_select_ga_profile_label">' . esc_html__('Analytics profile', 'google-analytics-for-wordpress') . ':</label>';
+		$select .= '<select data-placeholder="' . esc_attr__('Select a profile', 'google-analytics-for-wordpress') . '" name="monsterinsights_step_data" class="monsterinsights-select300 monsterinsights_select_ga_profile" id="monsterinsights_step_data" style="width:80%;margin-left:10%;margin-right:10%;background-color: #FFF;">';
 		$select .= '<option></option>';
 
-		if ( count( $values ) >= 1 ) {
-			foreach ( $values as $optgroup => $value ) {
-				if ( ! empty( $value['items'] ) ) {
-					$select .= $this->create_optgroup( $optgroup, $value );
+		if (count($values) >= 1) {
+			foreach ($values as $optgroup => $value) {
+				if ( ! empty($value['items'])) {
+					$select .= $this->create_optgroup($optgroup, $value);
 				}
 				else {
-					$select .= '<option value="' . esc_attr( $value['id'] ) . '">' . esc_attr( stripslashes( $value['name'] ) ) . '</option>';
+					$select .= '<option value="' . esc_attr($value['id']) . '">' . esc_attr(stripslashes($value['name'])) . '</option>';
 				}
 			}
 		}
@@ -713,16 +713,16 @@ 
 	 *
 	 * @return string
 	 */
-	private function create_optgroup( $optgroup, $value ) {
-		$optgroup = '<optgroup label="' . esc_attr( $optgroup ) . '" disabled>';
+	private function create_optgroup($optgroup, $value) {
+		$optgroup = '<optgroup label="' . esc_attr($optgroup) . '" disabled>';
 
-		foreach ( $value['items'] as $option ) {
-			if ( ! empty( $option['items'] ) ) {
+		foreach ($value['items'] as $option) {
+			if ( ! empty($option['items'])) {
 
-				$optgroup .= $this->create_optgroup( esc_attr( $option['name'] ), $option );
+				$optgroup .= $this->create_optgroup(esc_attr($option['name']), $option);
 			}
 			else {
-				$optgroup .= '<option value="' . esc_attr( $option['id'] ) . '">' . esc_attr( stripslashes( $option['name'] ) ) . '</option>';
+				$optgroup .= '<option value="' . esc_attr($option['id']) . '">' . esc_attr(stripslashes($option['name'])) . '</option>';
 			}
 		}
 
@@ -737,10 +737,10 @@ 
 	 * @return bool 
 	 */
 	private function is_wp_blocking_google() {
-		if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) { // @todo: put this in sysinfo 
-			if ( defined( 'WP_ACCESSIBLE_HOSTS' ) ) {
+		if (defined('WP_HTTP_BLOCK_EXTERNAL') && WP_HTTP_BLOCK_EXTERNAL) { // @todo: put this in sysinfo 
+			if (defined('WP_ACCESSIBLE_HOSTS')) {
 				$on_blacklist = $this->is_google_on_blacklist();
-				if ( $on_blacklist ) {
+				if ($on_blacklist) {
 					return true;
 				} else {
 					$params = array(
@@ -749,8 +749,8 @@ 
 						'user-agent'    => 'MonsterInsights/' . MONSTERINSIGHTS_VERSION,
 						'body'          => ''
 					);
-					$response = wp_remote_get( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params );
-					if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+					$response = wp_remote_get('https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params);
+					if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 						return false;
 					} else {
 						return true;
@@ -766,9 +766,9 @@ 
 				'user-agent'    => 'MonsterInsights/' . MONSTERINSIGHTS_VERSION,
 				'body'          => ''
 			);
-			$response = wp_remote_get( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params );
+			$response = wp_remote_get('https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params);
 			
-			if( !is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+			if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 				return false;
 			} else {
 				return true;
@@ -783,7 +783,7 @@ 
 	 */
 	private function is_google_on_blacklist() { // @todo: put this in sysinfo
 		$wp_http = new WP_Http();
-		if ( $wp_http->block_request( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest' ) ) {
+		if ($wp_http->block_request('https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest')) {
 			return true;
 		}
 
@@ -792,16 +792,16 @@ 
 
 	public function monsterinsights_show_admin_config_empty_notice() {
 		$screen = get_current_screen(); 
-		if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
+		if (empty($screen->id) || strpos($screen->id, 'monsterinsights') !== false) {
 			return;
 		}
 		
-		if ( ! defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) ) {
-			define( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE', true );
+		if ( ! defined('MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE')) {
+			define('MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE', true);
 		}
 		echo '<div class="error"><p>' . 
-			sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),
-				'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+			sprintf(esc_html__('Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress'),
+				'<a href="' . admin_url('admin.php?page=monsterinsights_settings') . '">',
 				'</a>'
 			)
 		. '</p></div>';
@@ -813,8 +813,8 @@ 
 	public function monsterinsights_show_admin_config_expired_notice() {
 		echo '<div class="error"><p>' . 
 			sprintf(
-				esc_html__( 'It seems the authentication for the plugin has expired or the connection to Google Analytics is blocked, please try %1$sre-authenticating%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-				'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+				esc_html__('It seems the authentication for the plugin has expired or the connection to Google Analytics is blocked, please try %1$sre-authenticating%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress'),
+				'<a href="' . admin_url('admin.php?page=monsterinsights_settings') . '">',
 				'</a>'
 			)
 		. '</p></div>';
@@ -826,8 +826,8 @@ 
 	public function monsterinsights_show_admin_config_needs_permissions_notice() {
 		echo '<div class="error"><p>' . 
 			sprintf(
-				esc_html__( 'It seems the authentication for the plugin is missing permissions. Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-				'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+				esc_html__('It seems the authentication for the plugin is missing permissions. Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress'),
+				'<a href="' . admin_url('admin.php?page=monsterinsights_settings') . '">',
 				'</a>'
 			)
 		. '</p></div>';
@@ -839,7 +839,7 @@ 
 	public function monsterinsights_show_admin_config_blocked_notice() {
 		echo '<div class="error"><p>' . 
 			sprintf(
-				esc_html__( 'Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress' ),
+				esc_html__('Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress'),
 				'<a href="https://www.monsterinsights.com/docs/blocked-connection/">',
 				'</a>'
 			)

Braces +2 added lines, -4 removed lines

@@ -693,8 +693,7 @@ 
 			foreach ( $values as $optgroup => $value ) {
 				if ( ! empty( $value['items'] ) ) {
 					$select .= $this->create_optgroup( $optgroup, $value );
-				}
-				else {
+				} else {
 					$select .= '<option value="' . esc_attr( $value['id'] ) . '">' . esc_attr( stripslashes( $value['name'] ) ) . '</option>';
 				}
 			}
@@ -720,8 +719,7 @@ 
 			if ( ! empty( $option['items'] ) ) {
 
 				$optgroup .= $this->create_optgroup( esc_attr( $option['name'] ), $option );
-			}
-			else {
+			} else {
 				$optgroup .= '<option value="' . esc_attr( $option['id'] ) . '">' . esc_attr( stripslashes( $option['name'] ) ) . '</option>';
 			}
 		}

Indentation +792 added lines, -792 removed lines

@@ -14,345 +14,345 @@ 
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 final class MonsterInsights_GA {
 
-	/**
-	 * Holds the GA client object if using oAuth.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var MonsterInsights_GA_Client $client GA client object.
-	 */
-	public $client;
-
-	/**
-	 * Google Profile ID.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var int $profile ID of profile in use.
-	 */
-	public $profile;
-
-	/**
-	 * Google UA code.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var string|false $ua Google UA code for the current profile if valid oAuth in use, else false.
-	 */
-	public $ua;
-
-	/**
-	 * Google profile name.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var string|false $ua Google profile name for the current profile if valid oAuth in use, else false.
-	 */
-	public $name;
-
-	/**
-	 * Status of Google client object.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var string $status Possible values include manual, expired, valid, needs-permissions, blocked and none.
-	 */
-	public $status;
-
-	/**
-	 * oAuth Permissions Version.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var string $oauth_version Version of oAuth permissions granted.
-	 */
-	public $oauth_version;	
-
-	/**
-	 * Holds the base object.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var MonsterInsights $base MonsterInsights Base object.
-	 */
-	public $base;
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 */
-	public function __construct() {
-		// Get object 
-		$this->client        = $this->get_client();
-		$this->profile       = $this->get_profile();
-		$this->ua            = $this->get_ua();
-		$this->name          = $this->get_name();
-		$this->oauth_version = $this->get_oauth_version();
-		$this->status        = $this->get_status();
-		$this->base 		 = MonsterInsights();
-
-
-		// Show any info/error notices
-		$this->get_notices();
-
-		// Authentication Actions
-		add_action( 'wp_ajax_monsterinsights_google_view',  array( $this, 'google_auth_view' ) );
-		add_action( 'wp_ajax_monsterinsights_google_cancel',  array( $this, 'google_cancel' ) );
-
-		add_action( 'admin_init', array( $this, 'deactivate_google' ) ); // Deactivate
-	}
-
-	private function get_client() {
-		return ! empty( $this->client ) ? $this->client : monsterinsights_create_client();
-	}
-
-	private function set_test_client() { 
-		$this->client = monsterinsights_create_test_client();
-	}
-
-	private function set_client() { 
-		$this->client = monsterinsights_create_client();
-	}
-
-	/**
-	 * Get the current GA profile
-	 *
-	 * @return null
-	 */
-	private function get_profile() {
-		return monsterinsights_get_option( 'analytics_profile', false );
-	}
-
-	private function get_name() {
-		return monsterinsights_get_option( 'analytics_profile_name', false );
-	}
-
-	private function get_ua() {
-		return monsterinsights_get_ua();
-	}
-
-	private function get_oauth_version() {
-		return monsterinsights_get_option( 'oauth_version', '1.0' );
-	}
-
-	private function get_status() {
-		$status = 'valid';
-		if ( ! empty( $this->profile ) ) {
-			// We are using oAuth
+    /**
+     * Holds the GA client object if using oAuth.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var MonsterInsights_GA_Client $client GA client object.
+     */
+    public $client;
+
+    /**
+     * Google Profile ID.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var int $profile ID of profile in use.
+     */
+    public $profile;
+
+    /**
+     * Google UA code.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var string|false $ua Google UA code for the current profile if valid oAuth in use, else false.
+     */
+    public $ua;
+
+    /**
+     * Google profile name.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var string|false $ua Google profile name for the current profile if valid oAuth in use, else false.
+     */
+    public $name;
+
+    /**
+     * Status of Google client object.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var string $status Possible values include manual, expired, valid, needs-permissions, blocked and none.
+     */
+    public $status;
+
+    /**
+     * oAuth Permissions Version.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var string $oauth_version Version of oAuth permissions granted.
+     */
+    public $oauth_version;	
+
+    /**
+     * Holds the base object.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var MonsterInsights $base MonsterInsights Base object.
+     */
+    public $base;
+
+    /**
+     * Primary class constructor.
+     *
+     * @access public
+     * @since 6.0.0
+     */
+    public function __construct() {
+        // Get object 
+        $this->client        = $this->get_client();
+        $this->profile       = $this->get_profile();
+        $this->ua            = $this->get_ua();
+        $this->name          = $this->get_name();
+        $this->oauth_version = $this->get_oauth_version();
+        $this->status        = $this->get_status();
+        $this->base 		 = MonsterInsights();
+
+
+        // Show any info/error notices
+        $this->get_notices();
+
+        // Authentication Actions
+        add_action( 'wp_ajax_monsterinsights_google_view',  array( $this, 'google_auth_view' ) );
+        add_action( 'wp_ajax_monsterinsights_google_cancel',  array( $this, 'google_cancel' ) );
+
+        add_action( 'admin_init', array( $this, 'deactivate_google' ) ); // Deactivate
+    }
+
+    private function get_client() {
+        return ! empty( $this->client ) ? $this->client : monsterinsights_create_client();
+    }
+
+    private function set_test_client() { 
+        $this->client = monsterinsights_create_test_client();
+    }
+
+    private function set_client() { 
+        $this->client = monsterinsights_create_client();
+    }
+
+    /**
+     * Get the current GA profile
+     *
+     * @return null
+     */
+    private function get_profile() {
+        return monsterinsights_get_option( 'analytics_profile', false );
+    }
+
+    private function get_name() {
+        return monsterinsights_get_option( 'analytics_profile_name', false );
+    }
+
+    private function get_ua() {
+        return monsterinsights_get_ua();
+    }
+
+    private function get_oauth_version() {
+        return monsterinsights_get_option( 'oauth_version', '1.0' );
+    }
+
+    private function get_status() {
+        $status = 'valid';
+        if ( ! empty( $this->profile ) ) {
+            // We are using oAuth
 			
-			$last_run = monsterinsights_get_option( 'cron_last_run', false );
-			$failed   = monsterinsights_get_option( 'cron_failed', false );
-			$dash_dis = monsterinsights_get_option( 'dashboards_disabled', false );
-
-			// See if issue connecting or expired
-			if ( ! $dash_dis && $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 )  ) { 
-				$status = 'blocked';
-			}
-
-			$access_token = $this->client->get_access_token();
-
-			// Check to make sure access token is there and not expired
-			if ( empty( $access_token ) || empty( $access_token['expires'] ) || current_time( 'timestamp' ) >= $access_token['expires'] ) {
-				$status = 'expired';
-				return $status;
-			}
-
-			// See if needs permissions
-			if ( version_compare( $this->oauth_version, '1.0', '<' ) ) { 
-				$status = 'needs-permissions';
-			}
+            $last_run = monsterinsights_get_option( 'cron_last_run', false );
+            $failed   = monsterinsights_get_option( 'cron_failed', false );
+            $dash_dis = monsterinsights_get_option( 'dashboards_disabled', false );
+
+            // See if issue connecting or expired
+            if ( ! $dash_dis && $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 )  ) { 
+                $status = 'blocked';
+            }
+
+            $access_token = $this->client->get_access_token();
+
+            // Check to make sure access token is there and not expired
+            if ( empty( $access_token ) || empty( $access_token['expires'] ) || current_time( 'timestamp' ) >= $access_token['expires'] ) {
+                $status = 'expired';
+                return $status;
+            }
+
+            // See if needs permissions
+            if ( version_compare( $this->oauth_version, '1.0', '<' ) ) { 
+                $status = 'needs-permissions';
+            }
 			
-		} else if ( ! empty( $this->ua ) ) {
-			// We are using manual
+        } else if ( ! empty( $this->ua ) ) {
+            // We are using manual
 			
-		} else {
-			// We do not have oAuth or manual active
-			$status = 'empty';
-		}
-
-		return $status;
-	}
-
-	private function get_notices() {
-		// Notice for no manual or profile GA
-		if ( $this->status === 'empty' ) {
-			add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_empty_notice' ),6 );
-		}
-
-		$current_page = filter_input( INPUT_GET, 'page' );
-
-		// Only show expired, needs permission, or blocked notices on the MI pages
-		// We do this because unlike status empty, these only block reporting, not the frontend
-		// tracking from working, and as a result, these are not as urgent. Plus users generally
-		// don't like global notices.
-		if ( strpos( $current_page, 'monsterinsights' ) === 0 ) {
+        } else {
+            // We do not have oAuth or manual active
+            $status = 'empty';
+        }
+
+        return $status;
+    }
+
+    private function get_notices() {
+        // Notice for no manual or profile GA
+        if ( $this->status === 'empty' ) {
+            add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_empty_notice' ),6 );
+        }
+
+        $current_page = filter_input( INPUT_GET, 'page' );
+
+        // Only show expired, needs permission, or blocked notices on the MI pages
+        // We do this because unlike status empty, these only block reporting, not the frontend
+        // tracking from working, and as a result, these are not as urgent. Plus users generally
+        // don't like global notices.
+        if ( strpos( $current_page, 'monsterinsights' ) === 0 ) {
 		
-			// Notice for GA Access token expired (needs re-authenticate)
-			if ( $this->status === 'expired' ) {
-				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_expired_notice' ),6 );
-			}
+            // Notice for GA Access token expired (needs re-authenticate)
+            if ( $this->status === 'expired' ) {
+                add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_expired_notice' ),6 );
+            }
 			
-			// Notice for Needs Permissions
-			if ( $this->status === 'needs-permissions' ) {
-				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_needs_permissions_notice' ),6 );
-			}
-
-			// Notice for trouble connecting to Google
-			if ( $this->status === 'blocked' ) {
-				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_blocked_notice' ),6 );
-			}
-		}
-	}
-
-	/**
-	 * Used when switching GA profiles, or switching
-	 * to/from oAuth <--> manual, or when reauthenticating
-	 * or deleting GA profile.
-	 *
-	 * @return null
-	 */
-	private function reinitialize() { 
-		// Get object 
-		$this->client        = $this->get_client();
-		$this->profile       = $this->get_profile();
-		$this->ua            = $this->get_ua();
-		$this->name          = $this->get_name();
-		$this->oauth_version = $this->get_oauth_version();
-		$this->status        = $this->get_status();
-
-		// Re-get data if possible
-		if ( $this->ua === 'valid' ) {
-			$this->refresh_dashboard_data();
-		}
-	}
-
-	public function create_auth_url() {
-		return $this->client->createAuthUrl();
-	}
-
-	/**
-	 * Getting the analytics profiles
-	 *
-	 * Doing the request to the Google analytics API and if there is a response, parses this response and return its
-	 * array
-	 *
-	 * @return array
-	 */
-	public function get_profiles() { // @todo: this needs exception handling for a 401 login required		
-		$accounts = $this->get_profiles_request();
-		if ( is_array( $accounts ) ) {
-			return $accounts;
-		} else {
-			return array();
-		}
-	}
-
-	public function find_selected_profile( $profile_id ) {
-		$profiles = $this->get_profiles();
-		$found  = array();
-		foreach ( $profiles as $account ) {
-			foreach ( $account['items'] as $profile ) {
-				foreach ( $profile['items'] as $subprofile ) {
-					if ( isset( $subprofile['id'] ) && $subprofile['id'] == $profile_id ) {
-						$found = array(
-							'id'   => $profile_id,
-							'ua'   => $subprofile['ua_code'],
-							'name' => $subprofile['name'],
-
-						);
-						break 3;
-					}
-				}
-			}
-		}
-		return $found;
-	}
-
-	public function save_selected_profile( $profile ) {
-		monsterinsights_update_option( 'analytics_profile', $profile['id'] );
-		monsterinsights_update_option( 'analytics_profile_code', $profile['ua'] );
-		monsterinsights_update_option( 'analytics_profile_name', $profile['name'] );
-		monsterinsights_set_client_oauth_version();
-	}
-
-
-	/**
-	 * Get accounts request
-	 *
-	 * @param array $response
-	 *
-	 * @return mixed
-	 */
-	private function get_profiles_request() {
-		global $wp_version;
-		$version = str_replace( '-src', '', $wp_version );
-		$accounts    = array();
-		$start_index = 1;
-		$paginate    = false;
-		$continue    = true;
-		while ( $continue ) {
-			$body     = array(
-				'max-results'  => 1000,
-				'start-index'  => $paginate ? $start_index + 1000 : $start_index,
-			);
-			if ( $paginate ) {
-				$start_index = $start_index + 1000;
-			}
-			$response = $this->client->do_request( 'https://www.googleapis.com/analytics/v3/management/accounts/~all/webproperties/~all/profiles', false, 'GET', $body );
-			if ( ! empty( $response ) ) {
-				$response = array(
-					'response' => array( 'code' => $this->client->get_http_response_code() ),
-					'body'     => json_decode( $response->getResponseBody(), true ),
-				);
-			} else {
-				if ( version_compare( $version, '4.6', '<' ) ) {
-					return esc_html__( 'MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please update your WordPress version.', 'google-analytics-for-wordpress' );
-				} else {
-					if ( ! empty( $accounts ) ) {
-						return $accounts;
-					} else {
-						return esc_html__( 'Google Analytics had a connection error or your Google account is not signed up for Google Analytics.', 'google-analytics-for-wordpress' );
-					}
-				}
-			}
+            // Notice for Needs Permissions
+            if ( $this->status === 'needs-permissions' ) {
+                add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_needs_permissions_notice' ),6 );
+            }
+
+            // Notice for trouble connecting to Google
+            if ( $this->status === 'blocked' ) {
+                add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_blocked_notice' ),6 );
+            }
+        }
+    }
+
+    /**
+     * Used when switching GA profiles, or switching
+     * to/from oAuth <--> manual, or when reauthenticating
+     * or deleting GA profile.
+     *
+     * @return null
+     */
+    private function reinitialize() { 
+        // Get object 
+        $this->client        = $this->get_client();
+        $this->profile       = $this->get_profile();
+        $this->ua            = $this->get_ua();
+        $this->name          = $this->get_name();
+        $this->oauth_version = $this->get_oauth_version();
+        $this->status        = $this->get_status();
+
+        // Re-get data if possible
+        if ( $this->ua === 'valid' ) {
+            $this->refresh_dashboard_data();
+        }
+    }
+
+    public function create_auth_url() {
+        return $this->client->createAuthUrl();
+    }
+
+    /**
+     * Getting the analytics profiles
+     *
+     * Doing the request to the Google analytics API and if there is a response, parses this response and return its
+     * array
+     *
+     * @return array
+     */
+    public function get_profiles() { // @todo: this needs exception handling for a 401 login required		
+        $accounts = $this->get_profiles_request();
+        if ( is_array( $accounts ) ) {
+            return $accounts;
+        } else {
+            return array();
+        }
+    }
+
+    public function find_selected_profile( $profile_id ) {
+        $profiles = $this->get_profiles();
+        $found  = array();
+        foreach ( $profiles as $account ) {
+            foreach ( $account['items'] as $profile ) {
+                foreach ( $profile['items'] as $subprofile ) {
+                    if ( isset( $subprofile['id'] ) && $subprofile['id'] == $profile_id ) {
+                        $found = array(
+                            'id'   => $profile_id,
+                            'ua'   => $subprofile['ua_code'],
+                            'name' => $subprofile['name'],
+
+                        );
+                        break 3;
+                    }
+                }
+            }
+        }
+        return $found;
+    }
+
+    public function save_selected_profile( $profile ) {
+        monsterinsights_update_option( 'analytics_profile', $profile['id'] );
+        monsterinsights_update_option( 'analytics_profile_code', $profile['ua'] );
+        monsterinsights_update_option( 'analytics_profile_name', $profile['name'] );
+        monsterinsights_set_client_oauth_version();
+    }
+
+
+    /**
+     * Get accounts request
+     *
+     * @param array $response
+     *
+     * @return mixed
+     */
+    private function get_profiles_request() {
+        global $wp_version;
+        $version = str_replace( '-src', '', $wp_version );
+        $accounts    = array();
+        $start_index = 1;
+        $paginate    = false;
+        $continue    = true;
+        while ( $continue ) {
+            $body     = array(
+                'max-results'  => 1000,
+                'start-index'  => $paginate ? $start_index + 1000 : $start_index,
+            );
+            if ( $paginate ) {
+                $start_index = $start_index + 1000;
+            }
+            $response = $this->client->do_request( 'https://www.googleapis.com/analytics/v3/management/accounts/~all/webproperties/~all/profiles', false, 'GET', $body );
+            if ( ! empty( $response ) ) {
+                $response = array(
+                    'response' => array( 'code' => $this->client->get_http_response_code() ),
+                    'body'     => json_decode( $response->getResponseBody(), true ),
+                );
+            } else {
+                if ( version_compare( $version, '4.6', '<' ) ) {
+                    return esc_html__( 'MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please update your WordPress version.', 'google-analytics-for-wordpress' );
+                } else {
+                    if ( ! empty( $accounts ) ) {
+                        return $accounts;
+                    } else {
+                        return esc_html__( 'Google Analytics had a connection error or your Google account is not signed up for Google Analytics.', 'google-analytics-for-wordpress' );
+                    }
+                }
+            }
 			
-			if ( isset( $response['response']['code'] ) && $response['response']['code'] == 200 ) {
-				if ( ! empty( $response['body']['items'] ) && is_array( $response['body']['items'] ) ) {
-					foreach ( $response['body']['items'] as $item ) {
-
-						// Only deal with web properties, not apps.
-						if ( isset( $item['type'] ) && 'WEB' != $item['type'] ) {
-							continue;
-						}
-
-						/**
-						 * Future:
-						* // Accounts
-						* 	// Properties
-						* 		// Views
-						* $items = array(
-						* 	{account_id} => array(
-						* 		{property_id} => array(
-						* 			{view_id} => array( 
-						* 				'account_id'  => '',
-						* 				'property_id' => '',
-						* 				'view_id'	  => '',
-						* 				'url'		  => '',
-						* 				'view_name'	  => '',
-						* 				'ua_code'	  => '',
-						* 			),
-						* 		),
-						* 	),
-						* ),
-						**/
-						/*
+            if ( isset( $response['response']['code'] ) && $response['response']['code'] == 200 ) {
+                if ( ! empty( $response['body']['items'] ) && is_array( $response['body']['items'] ) ) {
+                    foreach ( $response['body']['items'] as $item ) {
+
+                        // Only deal with web properties, not apps.
+                        if ( isset( $item['type'] ) && 'WEB' != $item['type'] ) {
+                            continue;
+                        }
+
+                        /**
+                         * Future:
+                         * // Accounts
+                         * 	// Properties
+                         * 		// Views
+                         * $items = array(
+                         * 	{account_id} => array(
+                         * 		{property_id} => array(
+                         * 			{view_id} => array( 
+                         * 				'account_id'  => '',
+                         * 				'property_id' => '',
+                         * 				'view_id'	  => '',
+                         * 				'url'		  => '',
+                         * 				'view_name'	  => '',
+                         * 				'ua_code'	  => '',
+                         * 			),
+                         * 		),
+                         * 	),
+                         * ),
+                         **/
+                        /*
 						CurrenT:
 						$accounts[ $item['accountId'] ] = array( 
 							'id'          => $item['accountId'],
@@ -375,474 +375,474 @@ 
 						*/
 
 
-						if ( empty( $accounts[ $item['accountId'] ] ) ) {
-							$accounts[ $item['accountId'] ] = array( 
-								'id'          => $item['accountId'],
-								'ua_code'     => $item['webPropertyId'],
-								'parent_name' => $item['websiteUrl'],
-								'items'       => array(),
-							);
-						}
-
-						if ( empty( $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ] ) ) {
-							$accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]= array( 
-								'id'          => $item['webPropertyId'],
-								'name'        => $item['websiteUrl'],
-								'items'       => array(),
-							);
-						}
-
-						if ( empty( $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]['items'][ $item['id'] ] ) ) {
-							$accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]['items'][ $item['id'] ] = array( 
-								'name'    => $item['name'] . ' (' . $item['webPropertyId'] . ')',
-								'ua_code' => $item['webPropertyId'],
-								'id'      => $item['id'],
-							);
-						}
-					}
-				}
-			} else if ( isset( $response['response']['code'] ) && $response['response']['code'] !== 200 && ! $paginate ) {
-				if ( version_compare( $version, '4.6', '<' ) ) {
-					return esc_html__( 'MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please update your WordPress version.', 'google-analytics-for-wordpress' );
-				} else {
-					if ( ! empty( $accounts ) ) {
-						return $accounts;
-					} else {
-						$code = isset( $response['response']['code'] ) ? $response['response']['code'] : 'Unknown';
-						$type = isset( $response['body']['error']['errors'][0]['reason'] ) ? $response['body']['error']['errors'][0]['reason'] : false;
-						if ( $type === 'insufficientPermissions' ) {
-							return esc_html__( 'Please ensure your Google Account is signed up for Google Analytics.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'badRequest' ) {
-							return esc_html__( 'Bad Request. Please contact support.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'dailyLimitExceeded' ) {
-							return esc_html__( 'Daily Limit Exceeded. Please contact support.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'userRateLimitExceeded' ) {
-							return esc_html__( 'User Rate Limit Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'rateLimitExceeded' ) {
-							return esc_html__( 'Project Rate Limit Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'quotaExceeded' ) {
-							return esc_html__( 'Project Rate Limit Quota Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
-						} else if ( $type === 'internalServerError' || $type === 'backendError' ) {
-							return esc_html__( 'Google Analytics is having API issues on their side. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
-						} else {
-							return sprintf( esc_html__( 'Google Analytics had a connection error. Error code: %1$s. Reason: %2$s', 'google-analytics-for-wordpress' ), $code, $type );
-						}
-					}
-				}
-			}
-
-			if ( isset( $response['body']['totalResults'] ) && $start_index < $response['body']['totalResults'] && ! empty( $response['body']['nextLink'] ) ) {
-				$paginate    = true;
-			} else {
-				$continue    = false;
-			}
-		}
-		return $accounts;
-	}
-
-	private function clear_oauth_data() {
-		// Delete the stored profiles
-		$options = array(
-			'analytics_profile_code',
-			'analytics_profile',
-			'analytics_profile_name',
-			'oauth_version',
-			'cron_failed',
-			'cron_last_run',
-		);
-		monsterinsights_delete_options( $options );
-
-		// Destroy the data
-		$this->base->reports->delete_aggregate_data();
+                        if ( empty( $accounts[ $item['accountId'] ] ) ) {
+                            $accounts[ $item['accountId'] ] = array( 
+                                'id'          => $item['accountId'],
+                                'ua_code'     => $item['webPropertyId'],
+                                'parent_name' => $item['websiteUrl'],
+                                'items'       => array(),
+                            );
+                        }
+
+                        if ( empty( $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ] ) ) {
+                            $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]= array( 
+                                'id'          => $item['webPropertyId'],
+                                'name'        => $item['websiteUrl'],
+                                'items'       => array(),
+                            );
+                        }
+
+                        if ( empty( $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]['items'][ $item['id'] ] ) ) {
+                            $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]['items'][ $item['id'] ] = array( 
+                                'name'    => $item['name'] . ' (' . $item['webPropertyId'] . ')',
+                                'ua_code' => $item['webPropertyId'],
+                                'id'      => $item['id'],
+                            );
+                        }
+                    }
+                }
+            } else if ( isset( $response['response']['code'] ) && $response['response']['code'] !== 200 && ! $paginate ) {
+                if ( version_compare( $version, '4.6', '<' ) ) {
+                    return esc_html__( 'MonsterInsights requires WordPress version 4.6 or newer to use oAuth. Please update your WordPress version.', 'google-analytics-for-wordpress' );
+                } else {
+                    if ( ! empty( $accounts ) ) {
+                        return $accounts;
+                    } else {
+                        $code = isset( $response['response']['code'] ) ? $response['response']['code'] : 'Unknown';
+                        $type = isset( $response['body']['error']['errors'][0]['reason'] ) ? $response['body']['error']['errors'][0]['reason'] : false;
+                        if ( $type === 'insufficientPermissions' ) {
+                            return esc_html__( 'Please ensure your Google Account is signed up for Google Analytics.', 'google-analytics-for-wordpress' );
+                        } else if ( $type === 'badRequest' ) {
+                            return esc_html__( 'Bad Request. Please contact support.', 'google-analytics-for-wordpress' );
+                        } else if ( $type === 'dailyLimitExceeded' ) {
+                            return esc_html__( 'Daily Limit Exceeded. Please contact support.', 'google-analytics-for-wordpress' );
+                        } else if ( $type === 'userRateLimitExceeded' ) {
+                            return esc_html__( 'User Rate Limit Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
+                        } else if ( $type === 'rateLimitExceeded' ) {
+                            return esc_html__( 'Project Rate Limit Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
+                        } else if ( $type === 'quotaExceeded' ) {
+                            return esc_html__( 'Project Rate Limit Quota Exceeded. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
+                        } else if ( $type === 'internalServerError' || $type === 'backendError' ) {
+                            return esc_html__( 'Google Analytics is having API issues on their side. Wait 2 minutes and then try again.', 'google-analytics-for-wordpress' );
+                        } else {
+                            return sprintf( esc_html__( 'Google Analytics had a connection error. Error code: %1$s. Reason: %2$s', 'google-analytics-for-wordpress' ), $code, $type );
+                        }
+                    }
+                }
+            }
+
+            if ( isset( $response['body']['totalResults'] ) && $start_index < $response['body']['totalResults'] && ! empty( $response['body']['nextLink'] ) ) {
+                $paginate    = true;
+            } else {
+                $continue    = false;
+            }
+        }
+        return $accounts;
+    }
+
+    private function clear_oauth_data() {
+        // Delete the stored profiles
+        $options = array(
+            'analytics_profile_code',
+            'analytics_profile',
+            'analytics_profile_name',
+            'oauth_version',
+            'cron_failed',
+            'cron_last_run',
+        );
+        monsterinsights_delete_options( $options );
+
+        // Destroy the data
+        $this->base->reports->delete_aggregate_data();
 		
-		$this->client->clear_data();
-	}
-
-	private function clear_manual_data() {
-		// Delete the manual ua code
-		monsterinsights_delete_option( 'manual_ua_code' );
-	}
-
-	public function deactivate_google() {
-		// Check if user pressed the deactivate button and nonce is valid
-		if ( ! isset( $_POST['monsterinsights-google-deauthenticate-submit'] ) ) {
-			return;
-		}
-
-		if ( ! wp_verify_nonce( $_POST['monsterinsights-google-authenticated-nonce'], 'monsterinsights-google-authenticated-nonce' ) ) {
-			return;
-		}
-
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			return;
-		}
-
-		// Destroy the client
-		$this->clear_oauth_data();
-
-		// Refresh the client
-		$this->reinitialize();
-	}
-
-	public function refresh_dashboard_data( ) {
-		// Destroy the data
-		$this->base->reports->delete_aggregate_data();
+        $this->client->clear_data();
+    }
+
+    private function clear_manual_data() {
+        // Delete the manual ua code
+        monsterinsights_delete_option( 'manual_ua_code' );
+    }
+
+    public function deactivate_google() {
+        // Check if user pressed the deactivate button and nonce is valid
+        if ( ! isset( $_POST['monsterinsights-google-deauthenticate-submit'] ) ) {
+            return;
+        }
+
+        if ( ! wp_verify_nonce( $_POST['monsterinsights-google-authenticated-nonce'], 'monsterinsights-google-authenticated-nonce' ) ) {
+            return;
+        }
+
+        if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+            return;
+        }
+
+        // Destroy the client
+        $this->clear_oauth_data();
+
+        // Refresh the client
+        $this->reinitialize();
+    }
+
+    public function refresh_dashboard_data( ) {
+        // Destroy the data
+        $this->base->reports->delete_aggregate_data();
 		
-		$this->base->reports->run_cron();
-	}
-
-	/**
-	 * Check if client has a refresh token
-	 * @return bool
-	 */
-	public function has_refresh_token() {
-		return $this->client->is_authenticated();
-	}
-
-	/**
-	 * Doing request to Google Analytics
-	 *
-	 * This method will do a request to google and get the response code and body from content
-	 *
-	 * @param string $target_request_url
-	 *
-	 * @return array|null
-	 */
-	public function do_request( $target_request_url ) {
-		$response = $this->client->do_request( $target_request_url );
-		if ( ! empty( $response ) ) {
-			return array(
-				'response' => array( 'code' => $this->client->get_http_response_code() ),
-				'body'     => json_decode( $response->getResponseBody(), true ),
-			);
-		}
-	}
+        $this->base->reports->run_cron();
+    }
+
+    /**
+     * Check if client has a refresh token
+     * @return bool
+     */
+    public function has_refresh_token() {
+        return $this->client->is_authenticated();
+    }
+
+    /**
+     * Doing request to Google Analytics
+     *
+     * This method will do a request to google and get the response code and body from content
+     *
+     * @param string $target_request_url
+     *
+     * @return array|null
+     */
+    public function do_request( $target_request_url ) {
+        $response = $this->client->do_request( $target_request_url );
+        if ( ! empty( $response ) ) {
+            return array(
+                'response' => array( 'code' => $this->client->get_http_response_code() ),
+                'body'     => json_decode( $response->getResponseBody(), true ),
+            );
+        }
+    }
 	
-	/**
-	 * Wrapper for authenticate the client. If authentication code is send it will get and check an access token.
-	 *
-	 * @param mixed $authentication_code
-	 *
-	 * @return boolean
-	 */
-	public function authenticate( $authentication_code = null ) {
-		// When authentication again we should clean up some stuff
-		monsterinsights_delete_options( array( 'cron_last_run', 'cron_failed' ) );
-		return $this->client->authenticate_client( $authentication_code );
-	}
-
-	public function google_auth_view() {
-		$view   = isset( $_POST['view'] ) && in_array( $_POST['view'], array( 'prestart', 'start', 'enterkey', 'selectprofile', 'done' ) ) ? $_POST['view'] : '';
-		$reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false'  ? true : false;
-
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress');
-			wp_die();
-		}
-
-		// We run the save routines, if required, for a view, and then after that send back the results + next view
-		$nextview = array();
-
-		switch ( $view ) {
-			case 'start':
-				if ( ! $this->is_wp_blocking_google() && ! $this->is_google_on_blacklist() ) {
-					$auth_url = $this->create_auth_url();
-					$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url );
-				} else {
-					$error    = esc_html__( 'Cannot connect to Google', 'google-analytics-for-wordpress' );
-					$nextview = monsterinsights_google_auth_error_view( $reauth, $error );
-				}
-				break;
-
-			case 'enterkey':
-				$auth_key = ! empty( $_POST['stepdata'] ) ? sanitize_text_field( $_POST['stepdata'] ) : '';
-				if ( $auth_key ) {
-					if ( $this->test_authkey( $auth_key ) ) {
-						$profiles = $this->get_profiles_request();
-						delete_option( 'monsterinsights_get_profiles' );
-						update_option( 'monsterinsights_get_profiles', $profiles );
-						if ( ! empty( $profiles ) && is_array( $profiles ) ) {
-							$select = $this->ga_select( $profiles );
-							$nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select );
-						} else if ( ! empty( $profiles ) && is_string( $profiles ) ) {
-							// Error from Google
-							$auth_url = $this->create_auth_url();
-							$this->client->clear_data();
-							$this->set_test_client();
-							$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html( $profiles ) );
-						} else {
-							// No profiles or not enough permissions
-							$auth_url = $this->create_auth_url();
-							$this->client->clear_data();
-							$this->set_test_client();
-							$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html__( 'No profiles viewable for that account. Please use another account.', 'google-analytics-for-wordpress' ) );
-						}
-					} else {
-						// if bad authentication error message
-						$auth_url = $this->create_auth_url();
-						$this->client->clear_data();
-						$this->set_test_client();
-						$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html__( 'Bad Google Code. Please try again.', 'google-analytics-for-wordpress' ) );
-					}
-				} else {
-					$auth_url = $this->create_auth_url();
-					$this->client->clear_data();
-					$this->set_test_client();
-					// if no auth key error message
-					$nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html__( 'Please paste in your Google code.', 'google-analytics-for-wordpress' ) );
-				}
-				break;
-
-			case 'selectprofile':
-				$profile = ! empty( $_POST['stepdata'] ) ? absint( sanitize_text_field( $_POST['stepdata'] ) ) : '';
-				if ( ! empty( $profile ) ) {
-					$this->set_test_client();
-					$profile = $this->find_selected_profile( $profile );
-					if ( ! empty( $profile ) ) {
-
-						$this->clear_manual_data(); // Just in case we were manual, clear out UA
-
-						$this->client->move_test_to_live();
-						$this->save_selected_profile( $profile );
-						$this->set_client();
-						$this->reinitialize();
-
-						// Refresh reporting data
-						$this->base->reports->refresh_aggregate_data();
-
-						$nextview = monsterinsights_google_auth_done_view( $reauth );
-					} else {
-						// Invalid profile selected
-						$profiles = get_option( 'monsterinsights_get_profiles', array() );
-						$select   = $this->ga_select( $profiles );
-						$nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select, esc_html__( 'Invalid profile selected.', 'google-analytics-for-wordpress' ) );
-					}
-				} else { 
-					// No profile selected
-					$profiles = get_option( 'monsterinsights_get_profiles', array() );
-					$select   = $this->ga_select( $profiles );
-					$nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select, esc_html__( 'Please select a profile.', 'google-analytics-for-wordpress' ) );
-				}
-				break;
-
-			case 'done':
-				$nextview = monsterinsights_google_auth_done_view( $reauth );
-				break;
+    /**
+     * Wrapper for authenticate the client. If authentication code is send it will get and check an access token.
+     *
+     * @param mixed $authentication_code
+     *
+     * @return boolean
+     */
+    public function authenticate( $authentication_code = null ) {
+        // When authentication again we should clean up some stuff
+        monsterinsights_delete_options( array( 'cron_last_run', 'cron_failed' ) );
+        return $this->client->authenticate_client( $authentication_code );
+    }
+
+    public function google_auth_view() {
+        $view   = isset( $_POST['view'] ) && in_array( $_POST['view'], array( 'prestart', 'start', 'enterkey', 'selectprofile', 'done' ) ) ? $_POST['view'] : '';
+        $reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false'  ? true : false;
+
+        if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+            echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress');
+            wp_die();
+        }
+
+        // We run the save routines, if required, for a view, and then after that send back the results + next view
+        $nextview = array();
+
+        switch ( $view ) {
+            case 'start':
+                if ( ! $this->is_wp_blocking_google() && ! $this->is_google_on_blacklist() ) {
+                    $auth_url = $this->create_auth_url();
+                    $nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url );
+                } else {
+                    $error    = esc_html__( 'Cannot connect to Google', 'google-analytics-for-wordpress' );
+                    $nextview = monsterinsights_google_auth_error_view( $reauth, $error );
+                }
+                break;
+
+            case 'enterkey':
+                $auth_key = ! empty( $_POST['stepdata'] ) ? sanitize_text_field( $_POST['stepdata'] ) : '';
+                if ( $auth_key ) {
+                    if ( $this->test_authkey( $auth_key ) ) {
+                        $profiles = $this->get_profiles_request();
+                        delete_option( 'monsterinsights_get_profiles' );
+                        update_option( 'monsterinsights_get_profiles', $profiles );
+                        if ( ! empty( $profiles ) && is_array( $profiles ) ) {
+                            $select = $this->ga_select( $profiles );
+                            $nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select );
+                        } else if ( ! empty( $profiles ) && is_string( $profiles ) ) {
+                            // Error from Google
+                            $auth_url = $this->create_auth_url();
+                            $this->client->clear_data();
+                            $this->set_test_client();
+                            $nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html( $profiles ) );
+                        } else {
+                            // No profiles or not enough permissions
+                            $auth_url = $this->create_auth_url();
+                            $this->client->clear_data();
+                            $this->set_test_client();
+                            $nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html__( 'No profiles viewable for that account. Please use another account.', 'google-analytics-for-wordpress' ) );
+                        }
+                    } else {
+                        // if bad authentication error message
+                        $auth_url = $this->create_auth_url();
+                        $this->client->clear_data();
+                        $this->set_test_client();
+                        $nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html__( 'Bad Google Code. Please try again.', 'google-analytics-for-wordpress' ) );
+                    }
+                } else {
+                    $auth_url = $this->create_auth_url();
+                    $this->client->clear_data();
+                    $this->set_test_client();
+                    // if no auth key error message
+                    $nextview = monsterinsights_google_auth_enterkey_view( $reauth, $auth_url, esc_html__( 'Please paste in your Google code.', 'google-analytics-for-wordpress' ) );
+                }
+                break;
+
+            case 'selectprofile':
+                $profile = ! empty( $_POST['stepdata'] ) ? absint( sanitize_text_field( $_POST['stepdata'] ) ) : '';
+                if ( ! empty( $profile ) ) {
+                    $this->set_test_client();
+                    $profile = $this->find_selected_profile( $profile );
+                    if ( ! empty( $profile ) ) {
+
+                        $this->clear_manual_data(); // Just in case we were manual, clear out UA
+
+                        $this->client->move_test_to_live();
+                        $this->save_selected_profile( $profile );
+                        $this->set_client();
+                        $this->reinitialize();
+
+                        // Refresh reporting data
+                        $this->base->reports->refresh_aggregate_data();
+
+                        $nextview = monsterinsights_google_auth_done_view( $reauth );
+                    } else {
+                        // Invalid profile selected
+                        $profiles = get_option( 'monsterinsights_get_profiles', array() );
+                        $select   = $this->ga_select( $profiles );
+                        $nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select, esc_html__( 'Invalid profile selected.', 'google-analytics-for-wordpress' ) );
+                    }
+                } else { 
+                    // No profile selected
+                    $profiles = get_option( 'monsterinsights_get_profiles', array() );
+                    $select   = $this->ga_select( $profiles );
+                    $nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select, esc_html__( 'Please select a profile.', 'google-analytics-for-wordpress' ) );
+                }
+                break;
+
+            case 'done':
+                $nextview = monsterinsights_google_auth_done_view( $reauth );
+                break;
 				
-			case 'prestart':
-			default:
-				 $nextview = monsterinsights_google_auth_start_view( $reauth );
-				break;
-		}
-		echo $nextview;
-		wp_die();
-	}
-
-	public function google_cancel() {
-		$view   = isset( $_POST['view'] ) && in_array( $_POST['view'], array( 'prestart', 'start', 'enterkey', 'selectprofile', 'done' ) ) ? $_POST['view'] : '';
-		$reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false'  ? true : false;
-
-		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress');
-			wp_die();
-		}
-
-		// If we cancelled on enterkey or selectprofile, delete the temp access tokens and set client back to normal client
-		if ( $view === 'enterkey' || $view === 'selectprofile' ) {
-			$this->client->clear_data();
-			delete_option( 'monsterinsights_get_profiles' );
-			$this->set_client();
-		}
-	}
-
-	private function test_authkey( $authkey ) {
-		$this->set_test_client();
-		$result = $this->authenticate( $authkey );
-		return $result;
-	}
-
-	/**
-	 * Generates the GA select box
-	 *
-	 * @return null|string
-	 */
-	private function ga_select( $profiles = array() ) {
-		if ( empty( $profiles ) || ! is_array( $profiles ) ) { 
-			$profiles = $this->get_profiles();
-		}
+            case 'prestart':
+            default:
+                 $nextview = monsterinsights_google_auth_start_view( $reauth );
+                break;
+        }
+        echo $nextview;
+        wp_die();
+    }
+
+    public function google_cancel() {
+        $view   = isset( $_POST['view'] ) && in_array( $_POST['view'], array( 'prestart', 'start', 'enterkey', 'selectprofile', 'done' ) ) ? $_POST['view'] : '';
+        $reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false'  ? true : false;
+
+        if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+            echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress');
+            wp_die();
+        }
+
+        // If we cancelled on enterkey or selectprofile, delete the temp access tokens and set client back to normal client
+        if ( $view === 'enterkey' || $view === 'selectprofile' ) {
+            $this->client->clear_data();
+            delete_option( 'monsterinsights_get_profiles' );
+            $this->set_client();
+        }
+    }
+
+    private function test_authkey( $authkey ) {
+        $this->set_test_client();
+        $result = $this->authenticate( $authkey );
+        return $result;
+    }
+
+    /**
+     * Generates the GA select box
+     *
+     * @return null|string
+     */
+    private function ga_select( $profiles = array() ) {
+        if ( empty( $profiles ) || ! is_array( $profiles ) ) { 
+            $profiles = $this->get_profiles();
+        }
 		
-		$optgroups = array();
-		foreach ( $profiles as $key => $value ) {
-			foreach ( $value['items'] as $subitem ) {
-				if ( empty( $optgroups[ $subitem['name'] ]['items'] ) ) {
-					$optgroups[ $subitem['name'] ]['items'] = $subitem['items'];
-				} else {
-					$optgroups[ $subitem['name'] ]['items'] = array_merge( $optgroups[ $subitem['name'] ]['items'], $subitem['items'] );
-				}
-			}
-		}
-
-		$values = $optgroups;
-		$select = '';
-		$select .= '<div class="monsterinsights_ga_form">';
-		$select .= '<label for="monsterinsights_step_data" id="monsterinsights_select_ga_profile_label">' . esc_html__( 'Analytics profile', 'google-analytics-for-wordpress' ) . ':</label>';
-		$select .= '<select data-placeholder="' . esc_attr__( 'Select a profile', 'google-analytics-for-wordpress' ) . '" name="monsterinsights_step_data" class="monsterinsights-select300 monsterinsights_select_ga_profile" id="monsterinsights_step_data" style="width:80%;margin-left:10%;margin-right:10%;background-color: #FFF;">';
-		$select .= '<option></option>';
-
-		if ( count( $values ) >= 1 ) {
-			foreach ( $values as $optgroup => $value ) {
-				if ( ! empty( $value['items'] ) ) {
-					$select .= $this->create_optgroup( $optgroup, $value );
-				}
-				else {
-					$select .= '<option value="' . esc_attr( $value['id'] ) . '">' . esc_attr( stripslashes( $value['name'] ) ) . '</option>';
-				}
-			}
-		}
-		$select .= '</select>';
-		$select .= '</div>';
-		return $select;
-	}
-
-	/**
-	 * Creates a optgroup with the items. If items contain items it will create a nested optgroup
-	 *
-	 * @param string $optgroup
-	 * @param array  $value
-	 * @param array  $select_value
-	 *
-	 * @return string
-	 */
-	private function create_optgroup( $optgroup, $value ) {
-		$optgroup = '<optgroup label="' . esc_attr( $optgroup ) . '" disabled>';
-
-		foreach ( $value['items'] as $option ) {
-			if ( ! empty( $option['items'] ) ) {
-
-				$optgroup .= $this->create_optgroup( esc_attr( $option['name'] ), $option );
-			}
-			else {
-				$optgroup .= '<option value="' . esc_attr( $option['id'] ) . '">' . esc_attr( stripslashes( $option['name'] ) ) . '</option>';
-			}
-		}
-
-		$optgroup .= '</optgroup>';
-
-		return $optgroup;
-	}
-
-	/**
-	 * See if Google is on the block_request list.
-	 *
-	 * @return bool 
-	 */
-	private function is_wp_blocking_google() {
-		if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) { // @todo: put this in sysinfo 
-			if ( defined( 'WP_ACCESSIBLE_HOSTS' ) ) {
-				$on_blacklist = $this->is_google_on_blacklist();
-				if ( $on_blacklist ) {
-					return true;
-				} else {
-					$params = array(
-						'sslverify'     => false,
-						'timeout'       => 60,
-						'user-agent'    => 'MonsterInsights/' . MONSTERINSIGHTS_VERSION,
-						'body'          => ''
-					);
-					$response = wp_remote_get( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params );
-					if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
-						return false;
-					} else {
-						return true;
-					}
-				}
-			} else {
-				return true;
-			}
-		} else {
-			$params = array(
-				'sslverify'     => false,
-				'timeout'       => 60,
-				'user-agent'    => 'MonsterInsights/' . MONSTERINSIGHTS_VERSION,
-				'body'          => ''
-			);
-			$response = wp_remote_get( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params );
+        $optgroups = array();
+        foreach ( $profiles as $key => $value ) {
+            foreach ( $value['items'] as $subitem ) {
+                if ( empty( $optgroups[ $subitem['name'] ]['items'] ) ) {
+                    $optgroups[ $subitem['name'] ]['items'] = $subitem['items'];
+                } else {
+                    $optgroups[ $subitem['name'] ]['items'] = array_merge( $optgroups[ $subitem['name'] ]['items'], $subitem['items'] );
+                }
+            }
+        }
+
+        $values = $optgroups;
+        $select = '';
+        $select .= '<div class="monsterinsights_ga_form">';
+        $select .= '<label for="monsterinsights_step_data" id="monsterinsights_select_ga_profile_label">' . esc_html__( 'Analytics profile', 'google-analytics-for-wordpress' ) . ':</label>';
+        $select .= '<select data-placeholder="' . esc_attr__( 'Select a profile', 'google-analytics-for-wordpress' ) . '" name="monsterinsights_step_data" class="monsterinsights-select300 monsterinsights_select_ga_profile" id="monsterinsights_step_data" style="width:80%;margin-left:10%;margin-right:10%;background-color: #FFF;">';
+        $select .= '<option></option>';
+
+        if ( count( $values ) >= 1 ) {
+            foreach ( $values as $optgroup => $value ) {
+                if ( ! empty( $value['items'] ) ) {
+                    $select .= $this->create_optgroup( $optgroup, $value );
+                }
+                else {
+                    $select .= '<option value="' . esc_attr( $value['id'] ) . '">' . esc_attr( stripslashes( $value['name'] ) ) . '</option>';
+                }
+            }
+        }
+        $select .= '</select>';
+        $select .= '</div>';
+        return $select;
+    }
+
+    /**
+     * Creates a optgroup with the items. If items contain items it will create a nested optgroup
+     *
+     * @param string $optgroup
+     * @param array  $value
+     * @param array  $select_value
+     *
+     * @return string
+     */
+    private function create_optgroup( $optgroup, $value ) {
+        $optgroup = '<optgroup label="' . esc_attr( $optgroup ) . '" disabled>';
+
+        foreach ( $value['items'] as $option ) {
+            if ( ! empty( $option['items'] ) ) {
+
+                $optgroup .= $this->create_optgroup( esc_attr( $option['name'] ), $option );
+            }
+            else {
+                $optgroup .= '<option value="' . esc_attr( $option['id'] ) . '">' . esc_attr( stripslashes( $option['name'] ) ) . '</option>';
+            }
+        }
+
+        $optgroup .= '</optgroup>';
+
+        return $optgroup;
+    }
+
+    /**
+     * See if Google is on the block_request list.
+     *
+     * @return bool 
+     */
+    private function is_wp_blocking_google() {
+        if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) { // @todo: put this in sysinfo 
+            if ( defined( 'WP_ACCESSIBLE_HOSTS' ) ) {
+                $on_blacklist = $this->is_google_on_blacklist();
+                if ( $on_blacklist ) {
+                    return true;
+                } else {
+                    $params = array(
+                        'sslverify'     => false,
+                        'timeout'       => 60,
+                        'user-agent'    => 'MonsterInsights/' . MONSTERINSIGHTS_VERSION,
+                        'body'          => ''
+                    );
+                    $response = wp_remote_get( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params );
+                    if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }
+            } else {
+                return true;
+            }
+        } else {
+            $params = array(
+                'sslverify'     => false,
+                'timeout'       => 60,
+                'user-agent'    => 'MonsterInsights/' . MONSTERINSIGHTS_VERSION,
+                'body'          => ''
+            );
+            $response = wp_remote_get( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params );
 			
-			if( !is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
-				return false;
-			} else {
-				return true;
-			}
-		}
-	}
-
-	/**
-	 * See if Google is on the block_request list.
-	 *
-	 * @return bool 
-	 */
-	private function is_google_on_blacklist() { // @todo: put this in sysinfo
-		$wp_http = new WP_Http();
-		if ( $wp_http->block_request( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest' ) ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public function monsterinsights_show_admin_config_empty_notice() {
-		$screen = get_current_screen(); 
-		if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
-			return;
-		}
+            if( !is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+    }
+
+    /**
+     * See if Google is on the block_request list.
+     *
+     * @return bool 
+     */
+    private function is_google_on_blacklist() { // @todo: put this in sysinfo
+        $wp_http = new WP_Http();
+        if ( $wp_http->block_request( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest' ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    public function monsterinsights_show_admin_config_empty_notice() {
+        $screen = get_current_screen(); 
+        if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
+            return;
+        }
 		
-		if ( ! defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) ) {
-			define( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE', true );
-		}
-		echo '<div class="error"><p>' . 
-			sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),
-				'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
-				'</a>'
-			)
-		. '</p></div>';
-	}
-
-	/**
-	 * Throw a warning when the fetching failed
-	 */
-	public function monsterinsights_show_admin_config_expired_notice() {
-		echo '<div class="error"><p>' . 
-			sprintf(
-				esc_html__( 'It seems the authentication for the plugin has expired or the connection to Google Analytics is blocked, please try %1$sre-authenticating%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-				'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
-				'</a>'
-			)
-		. '</p></div>';
-	}
-
-	/**
-	 * Throw a warning when the fetching failed
-	 */
-	public function monsterinsights_show_admin_config_needs_permissions_notice() {
-		echo '<div class="error"><p>' . 
-			sprintf(
-				esc_html__( 'It seems the authentication for the plugin is missing permissions. Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
-				'<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
-				'</a>'
-			)
-		. '</p></div>';
-	}
-
-	/**
-	 * Throw a warning when the fetching failed
-	 */
-	public function monsterinsights_show_admin_config_blocked_notice() {
-		echo '<div class="error"><p>' . 
-			sprintf(
-				esc_html__( 'Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress' ),
-				'<a href="https://www.monsterinsights.com/docs/blocked-connection/">',
-				'</a>'
-			)
-		. '</p></div>';
-	}
+        if ( ! defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) ) {
+            define( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE', true );
+        }
+        echo '<div class="error"><p>' . 
+            sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),
+                '<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+                '</a>'
+            )
+        . '</p></div>';
+    }
+
+    /**
+     * Throw a warning when the fetching failed
+     */
+    public function monsterinsights_show_admin_config_expired_notice() {
+        echo '<div class="error"><p>' . 
+            sprintf(
+                esc_html__( 'It seems the authentication for the plugin has expired or the connection to Google Analytics is blocked, please try %1$sre-authenticating%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
+                '<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+                '</a>'
+            )
+        . '</p></div>';
+    }
+
+    /**
+     * Throw a warning when the fetching failed
+     */
+    public function monsterinsights_show_admin_config_needs_permissions_notice() {
+        echo '<div class="error"><p>' . 
+            sprintf(
+                esc_html__( 'It seems the authentication for the plugin is missing permissions. Please %1$sre-authenticate%2$s with Google Analytics to allow the plugin to fetch data.', 'google-analytics-for-wordpress' ),
+                '<a href="' . admin_url( 'admin.php?page=monsterinsights_settings' ) . '">',
+                '</a>'
+            )
+        . '</p></div>';
+    }
+
+    /**
+     * Throw a warning when the fetching failed
+     */
+    public function monsterinsights_show_admin_config_blocked_notice() {
+        echo '<div class="error"><p>' . 
+            sprintf(
+                esc_html__( 'Data is not up-to-date, there was an error in retrieving the data from Google Analytics. This error could be caused by several issues. If the error persists, please see %1$sthis page%2$s.', 'google-analytics-for-wordpress' ),
+                '<a href="https://www.monsterinsights.com/docs/blocked-connection/">',
+                '</a>'
+            )
+        . '</p></div>';
+    }
 }
\ No newline at end of file

includes/admin/abstract-report.php

Spacing +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -39,28 +39,28 @@ 
 	 * @access public
 	 * @since 6.0.0
 	 */
-	public function __construct( $range = array() ) {
+	public function __construct($range = array()) {
 
 		$this->range = monsterinsights_get_report_date_range();
 
 		// filter to add tab for this report
-		add_filter( 'monsterinsights_get_reports', array( $this, 'add_report' ), 10, 1 );
+		add_filter('monsterinsights_get_reports', array($this, 'add_report'), 10, 1);
 
 		// filter to show the view for this report
-		add_action( 'monsterinsights_tab_reports_' . $this->report_hook, array( $this, 'show_report' ), 10, 1 );
+		add_action('monsterinsights_tab_reports_' . $this->report_hook, array($this, 'show_report'), 10, 1);
 
-		add_action( 'monsterinsights_add_aggregate_data', array( $this, 'add_report_data' ), 10, 2 );
-		add_action( 'monsterinsights_delete_aggregate_data', array( $this, 'delete_report_data' ), 10, 2 );
+		add_action('monsterinsights_add_aggregate_data', array($this, 'add_report_data'), 10, 2);
+		add_action('monsterinsights_delete_aggregate_data', array($this, 'delete_report_data'), 10, 2);
 
 	}
 
 	 // Adds the report to the array of reports.
-	public function add_report( $reports ) {
-		$reports[ $this->report_hook ] = $this->report_name;
+	public function add_report($reports) {
+		$reports[$this->report_hook] = $this->report_name;
 		return $reports;
 	}
 
-	abstract public function add_report_data( $client, $id ); // Adds/Refreshes the data
+	abstract public function add_report_data($client, $id); // Adds/Refreshes the data
 	abstract public function get_report_data(); // Gets the data
 	abstract public function delete_report_data(); // Removes report data
 	abstract public function show_report(); // Outputs the report.
@@ -88,6 +88,6 @@ 
 	 * @return int
 	 */
 	protected function get_api_max_limit() {
-		return apply_filters( 'monsterinsights_reporting_get_max_api_limit', 300 );
+		return apply_filters('monsterinsights_reporting_get_max_api_limit', 300);
 	}
 }
\ No newline at end of file

Indentation +73 added lines, -73 removed lines

@@ -13,81 +13,81 @@
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {
-	exit;
+    exit;
 }
 
 abstract class MonsterInsights_Report {
 
-	public $report_name;
-
-	public $report_hook;
-
-	public $range;
-
-	/**
-	 * Holds the GA client object if using oAuth.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 * @var MonsterInsights_GA_Client $client GA client object.
-	 */
-	public $client;
-
-	/**
-	 * Primary class constructor.
-	 *
-	 * @access public
-	 * @since 6.0.0
-	 */
-	public function __construct( $range = array() ) {
-
-		$this->range = monsterinsights_get_report_date_range();
-
-		// filter to add tab for this report
-		add_filter( 'monsterinsights_get_reports', array( $this, 'add_report' ), 10, 1 );
-
-		// filter to show the view for this report
-		add_action( 'monsterinsights_tab_reports_' . $this->report_hook, array( $this, 'show_report' ), 10, 1 );
-
-		add_action( 'monsterinsights_add_aggregate_data', array( $this, 'add_report_data' ), 10, 2 );
-		add_action( 'monsterinsights_delete_aggregate_data', array( $this, 'delete_report_data' ), 10, 2 );
-
-	}
-
-	 // Adds the report to the array of reports.
-	public function add_report( $reports ) {
-		$reports[ $this->report_hook ] = $this->report_name;
-		return $reports;
-	}
-
-	abstract public function add_report_data( $client, $id ); // Adds/Refreshes the data
-	abstract public function get_report_data(); // Gets the data
-	abstract public function delete_report_data(); // Removes report data
-	abstract public function show_report(); // Outputs the report.
-
-	/**
-	 * Get the start and and date for aggregation functionality.
-	 *
-	 * @return array
-	 */
-	protected function get_date_range() {
-		return $this->range;
-	}
-
-	/**
-	 * Get the api limit for aggregation functionality.
-	 *
-	 * By default Google will return 1000 rows at most. They will return less in certain circumstances.
-	 * For example, the countries query will never return more than 300 rows as there's not more than 300 values
-	 * for ga:countries dimension. If you are a large site you might need to use this filter to lower the number requested. 
-	 * We only request 300, as it's the max number for the largest report we need (by country maxes at 300 countries).
-	 *
-	 * In the future, we'll likely have each report use the limit returned in this function, or a report-set default limit,
-	 * whichever is lower.
-	 *
-	 * @return int
-	 */
-	protected function get_api_max_limit() {
-		return apply_filters( 'monsterinsights_reporting_get_max_api_limit', 300 );
-	}
+    public $report_name;
+
+    public $report_hook;
+
+    public $range;
+
+    /**
+     * Holds the GA client object if using oAuth.
+     *
+     * @access public
+     * @since 6.0.0
+     * @var MonsterInsights_GA_Client $client GA client object.
+     */
+    public $client;
+
+    /**
+     * Primary class constructor.
+     *
+     * @access public
+     * @since 6.0.0
+     */
+    public function __construct( $range = array() ) {
+
+        $this->range = monsterinsights_get_report_date_range();
+
+        // filter to add tab for this report
+        add_filter( 'monsterinsights_get_reports', array( $this, 'add_report' ), 10, 1 );
+
+        // filter to show the view for this report
+        add_action( 'monsterinsights_tab_reports_' . $this->report_hook, array( $this, 'show_report' ), 10, 1 );
+
+        add_action( 'monsterinsights_add_aggregate_data', array( $this, 'add_report_data' ), 10, 2 );
+        add_action( 'monsterinsights_delete_aggregate_data', array( $this, 'delete_report_data' ), 10, 2 );
+
+    }
+
+        // Adds the report to the array of reports.
+    public function add_report( $reports ) {
+        $reports[ $this->report_hook ] = $this->report_name;
+        return $reports;
+    }
+
+    abstract public function add_report_data( $client, $id ); // Adds/Refreshes the data
+    abstract public function get_report_data(); // Gets the data
+    abstract public function delete_report_data(); // Removes report data
+    abstract public function show_report(); // Outputs the report.
+
+    /**
+     * Get the start and and date for aggregation functionality.
+     *
+     * @return array
+     */
+    protected function get_date_range() {
+        return $this->range;
+    }
+
+    /**
+     * Get the api limit for aggregation functionality.
+     *
+     * By default Google will return 1000 rows at most. They will return less in certain circumstances.
+     * For example, the countries query will never return more than 300 rows as there's not more than 300 values
+     * for ga:countries dimension. If you are a large site you might need to use this filter to lower the number requested. 
+     * We only request 300, as it's the max number for the largest report we need (by country maxes at 300 countries).
+     *
+     * In the future, we'll likely have each report use the limit returned in this function, or a report-set default limit,
+     * whichever is lower.
+     *
+     * @return int
+     */
+    protected function get_api_max_limit() {
+        return apply_filters( 'monsterinsights_reporting_get_max_api_limit', 300 );
+    }
 }
\ No newline at end of file

includes/admin/admin.php

Indentation +2 added lines, -2 removed lines

@@ -269,13 +269,13 @@
     }
 
     if ( $analytics === 'ga' && ! isset( $notices ['monsterinsights_deprecated_ga' ] ) ){
-       echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_ga">';
+        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_ga">';
             echo '<p>';
             echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking which we will be removing support for in an upcoming release. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
             echo '</p>';
         echo '</div>';
     } else if ( $events === 'php' && ! isset( $notices ['monsterinsights_deprecated_php' ] ) ){
-       echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_php">';
+        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_php">';
             echo '<p>';
             echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking which we will be removing support for in an upcoming release. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking. To switch %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
             echo '</p>';

Spacing +84 added lines, -84 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -27,43 +27,43 @@ 
     // Get the base class object.
     $base = MonsterInsights();
     
-    $dashboards_disabled = monsterinsights_get_option( 'dashboards_disabled', false );
+    $dashboards_disabled = monsterinsights_get_option('dashboards_disabled', false);
 
     $hook = 'monsterinsights_settings';
 
-    if ( $dashboards_disabled || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
+    if ($dashboards_disabled || (current_user_can('monsterinsights_save_settings') && ! current_user_can('monsterinsights_view_dashboard'))) {
         // If dashboards disabled, first settings page
-        add_menu_page( __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page(__('Settings:', 'google-analytics-for-wordpress'), __('Insights', 'google-analytics-for-wordpress'), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', plugins_url('assets/css/images/menu-icon@2x.png', $base->file), '100.00013467543');
         $hook = 'monsterinsights_settings';
 
-        add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
+        add_submenu_page($hook, __('Settings:', 'google-analytics-for-wordpress'), __('Settings', 'google-analytics-for-wordpress'), 'monsterinsights_save_settings', 'monsterinsights_settings');
     } else {
         // if dashboards enabled, first dashboard
-        add_menu_page( __( 'Dashboard:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard', 'monsterinsights_dashboard_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page(__('Dashboard:', 'google-analytics-for-wordpress'), __('Insights', 'google-analytics-for-wordpress'), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard', 'monsterinsights_dashboard_page', plugins_url('assets/css/images/menu-icon@2x.png', $base->file), '100.00013467543');
 
         $hook = 'monsterinsights_dashboard';
 
-        add_submenu_page( $hook, __( 'Dashboard:', 'google-analytics-for-wordpress' ), __( 'Dashboard', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard' );
+        add_submenu_page($hook, __('Dashboard:', 'google-analytics-for-wordpress'), __('Dashboard', 'google-analytics-for-wordpress'), 'monsterinsights_view_dashboard', 'monsterinsights_dashboard');
 
         // then settings page
-        add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' );
+        add_submenu_page($hook, __('Settings:', 'google-analytics-for-wordpress'), __('Settings', 'google-analytics-for-wordpress'), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page');
     }
 
-    if ( ! $dashboards_disabled ) {
+    if ( ! $dashboards_disabled) {
         // then reports
-        add_submenu_page( $hook, __( 'Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
+        add_submenu_page($hook, __('Reports:', 'google-analytics-for-wordpress'), __('Reports', 'google-analytics-for-wordpress'), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page');
     }
     
     // then tools
-    add_submenu_page( $hook, __( 'Tools:', 'google-analytics-for-wordpress' ), __( 'Tools', 'google-analytics-for-wordpress' ), 'manage_options', 'monsterinsights_tools', 'monsterinsights_tools_page' );
+    add_submenu_page($hook, __('Tools:', 'google-analytics-for-wordpress'), __('Tools', 'google-analytics-for-wordpress'), 'manage_options', 'monsterinsights_tools', 'monsterinsights_tools_page');
     
     // then addons
-    $network_license = get_site_option( 'monsterinsights_license' );
-    if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty( $network_license ) ) ) {
-        add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:#7cc048"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page' );
+    $network_license = get_site_option('monsterinsights_license');
+    if ( ! monsterinsights_is_network_active() || (monsterinsights_is_network_active() && empty($network_license))) {
+        add_submenu_page($hook, __('Addons:', 'google-analytics-for-wordpress'), '<span style="color:#7cc048"> ' . __('Addons', 'google-analytics-for-wordpress') . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page');
     }
 }
-add_action( 'admin_menu', 'monsterinsights_admin_menu' );
+add_action('admin_menu', 'monsterinsights_admin_menu');
 
 
 
@@ -73,24 +73,24 @@ 
 
     // First, let's see if this is an MS network enabled plugin. If it is, we should load the license 
     // menu page and the updater on the network panel
-    if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
-        require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+    if ( ! function_exists('is_plugin_active_for_network')) {
+        require_once(ABSPATH . '/wp-admin/includes/plugin.php');
     }
 
-    $plugin = plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE );
-    if ( ! is_plugin_active_for_network( $plugin ) ) {
+    $plugin = plugin_basename(MONSTERINSIGHTS_PLUGIN_FILE);
+    if ( ! is_plugin_active_for_network($plugin)) {
         return;
     }
 
     $hook = 'monsterinsights_network';
-    add_menu_page( __( 'Network Settings', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+    add_menu_page(__('Network Settings', 'google-analytics-for-wordpress'), __('Insights', 'google-analytics-for-wordpress'), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', plugins_url('assets/css/images/menu-icon@2x.png', $base->file), '100.00013467543');
 
-    add_submenu_page( $hook, __( 'Network Settings', 'google-analytics-for-wordpress' ), __( 'Network Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page' );
+    add_submenu_page($hook, __('Network Settings', 'google-analytics-for-wordpress'), __('Network Settings', 'google-analytics-for-wordpress'), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page');
 
     // then addons
-    add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:#7cc048"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page' );
+    add_submenu_page($hook, __('Addons:', 'google-analytics-for-wordpress'), '<span style="color:#7cc048"> ' . __('Addons', 'google-analytics-for-wordpress') . '</span>', 'monsterinsights_save_settings', 'monsterinsights_addons', 'monsterinsights_addons_page');
 }
-add_action( 'network_admin_menu', 'monsterinsights_network_admin_menu', 5 );
+add_action('network_admin_menu', 'monsterinsights_network_admin_menu', 5);
 
 /**
  * Adds one or more classes to the body tag in the dashboard.
@@ -98,15 +98,15 @@ 
  * @param  String $classes Current body classes.
  * @return String          Altered body classes.
  */
-function monsterinsights_add_admin_body_class( $classes ) {
+function monsterinsights_add_admin_body_class($classes) {
     $screen = get_current_screen(); 
-    if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
+    if (empty($screen->id) || strpos($screen->id, 'monsterinsights') === false) {
         return $classes;
     }
        
     return "$classes monsterinsights_page ";
 }
-add_filter( 'admin_body_class', 'monsterinsights_add_admin_body_class', 10, 1 );
+add_filter('admin_body_class', 'monsterinsights_add_admin_body_class', 10, 1);
 
 /**
  * Add a link to the settings page to the plugins list
@@ -115,31 +115,31 @@ 
  *
  * @return array $links
  */
-function monsterinsights_add_action_links( $links ) {
-    $docs = '<a title="MonsterInsights Knowledge Base" href="https://www.monsterinsights.com/docs/">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
-    array_unshift( $links, $docs );
+function monsterinsights_add_action_links($links) {
+    $docs = '<a title="MonsterInsights Knowledge Base" href="https://www.monsterinsights.com/docs/">' . esc_html__('Documentation', 'google-analytics-for-wordpress') . '</a>';
+    array_unshift($links, $docs);
 
     // If lite, show a link where they can get pro from
-    if ( ! monsterinsights_is_pro_version() ) {
-        $get_pro = '<a title="Get MonsterInsights Pro" href="https://www.monsterinsights.com/upgrade-to-pro/">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $get_pro );
+    if ( ! monsterinsights_is_pro_version()) {
+        $get_pro = '<a title="Get MonsterInsights Pro" href="https://www.monsterinsights.com/upgrade-to-pro/">' . esc_html__('Get MonsterInsights Pro', 'google-analytics-for-wordpress') . '</a>';
+        array_unshift($links, $get_pro);
     }   
     
     // If Lite, support goes to forum. If pro, it goes to our website
-    if ( monsterinsights_is_pro_version() ) {
-        $support = '<a title="MonsterInsights Pro Support" href="https://www.monsterinsights.com/my-account/support/">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );
+    if (monsterinsights_is_pro_version()) {
+        $support = '<a title="MonsterInsights Pro Support" href="https://www.monsterinsights.com/my-account/support/">' . esc_html__('Support', 'google-analytics-for-wordpress') . '</a>';
+        array_unshift($links, $support);
     } else {
-        $support = '<a title="MonsterInsights Lite Support" href="https://wordpress.org/support/plugin/google-analytics-for-wordpress">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );      
+        $support = '<a title="MonsterInsights Lite Support" href="https://wordpress.org/support/plugin/google-analytics-for-wordpress">' . esc_html__('Support', 'google-analytics-for-wordpress') . '</a>';
+        array_unshift($links, $support);      
     }
 
-    $settings_link = '<a href="' . esc_url( admin_url( 'admin.php?page=monsterinsights_settings' ) ) . '">' . esc_html__( 'Settings', 'google-analytics-for-wordpress' ) . '</a>';
-    array_unshift( $links, $settings_link );
+    $settings_link = '<a href="' . esc_url(admin_url('admin.php?page=monsterinsights_settings')) . '">' . esc_html__('Settings', 'google-analytics-for-wordpress') . '</a>';
+    array_unshift($links, $settings_link);
 
     return $links;
 }
-add_filter( 'plugin_action_links_' . plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE ), 'monsterinsights_add_action_links' );
+add_filter('plugin_action_links_' . plugin_basename(MONSTERINSIGHTS_PLUGIN_FILE), 'monsterinsights_add_action_links');
 
 
 
@@ -153,30 +153,30 @@ 
  * @param   array   $data       Any data to pass to the view
  * @return  void
  */
-function monsterinsights_load_admin_partial( $template, $data = array() ) {
+function monsterinsights_load_admin_partial($template, $data = array()) {
     // Get the base class object.
     $base = MonsterInsights();
 
-    if ( monsterinsights_is_pro_version() ) {
-        $dir = trailingslashit( plugin_dir_path( $base->file ) . 'pro/includes/admin/partials' );
+    if (monsterinsights_is_pro_version()) {
+        $dir = trailingslashit(plugin_dir_path($base->file) . 'pro/includes/admin/partials');
     
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+        if (file_exists($dir . $template . '.php')) {
+            require_once($dir . $template . '.php');
             return true;
         }
     } else {
-        $dir = trailingslashit( plugin_dir_path( $base->file ) . 'lite/includes/admin/partials' );
+        $dir = trailingslashit(plugin_dir_path($base->file) . 'lite/includes/admin/partials');
     
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+        if (file_exists($dir . $template . '.php')) {
+            require_once($dir . $template . '.php');
             return true;
         }   
     }
         
-    $dir = trailingslashit( plugin_dir_path( $base->file ) . 'includes/admin/partials' );
+    $dir = trailingslashit(plugin_dir_path($base->file) . 'includes/admin/partials');
 
-    if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
+    if (file_exists($dir . $template . '.php')) {
+        require_once($dir . $template . '.php');
         return true;
     }
                 
@@ -195,36 +195,36 @@ 
     
     // Get the current screen, and check whether we're viewing a MonsterInsights screen;
     $screen = get_current_screen(); 
-    if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
+    if (empty($screen->id) || strpos($screen->id, 'monsterinsights') === false) {
         return;
     }
 
     // If here, we're on an MonsterInsights screen, so output the header.
-    monsterinsights_load_admin_partial( 'header', array(
-        'mascot'   => plugins_url( 'assets/css/images/mascot.png', $base->file ),
-        'logo'     => plugins_url( 'assets/css/images/logo.png', $base->file ),
-        '2xmascot' => plugins_url( 'assets/css/images/mascot@2x.png', $base->file ),
-        '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', $base->file ),
-    ) );
+    monsterinsights_load_admin_partial('header', array(
+        'mascot'   => plugins_url('assets/css/images/mascot.png', $base->file),
+        'logo'     => plugins_url('assets/css/images/logo.png', $base->file),
+        '2xmascot' => plugins_url('assets/css/images/mascot@2x.png', $base->file),
+        '2xlogo'   => plugins_url('assets/css/images/logo@2x.png', $base->file),
+    ));
 }
-add_action( 'in_admin_header','monsterinsights_admin_header', 100 );
+add_action('in_admin_header', 'monsterinsights_admin_header', 100);
 
 function monsterinsights_welcome_redirect() {
     // Bail if no activation redirect
-    if ( ! get_transient( '_monsterinsights_activation_redirect' ) ) {
+    if ( ! get_transient('_monsterinsights_activation_redirect')) {
         return;
     }
 
     // Delete the redirect transient
-    delete_transient( '_monsterinsights_activation_redirect' );
+    delete_transient('_monsterinsights_activation_redirect');
 
     // Bail if activating from network, or bulk
-    if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+    if (is_network_admin() || isset($_GET['activate-multi'])) {
         return;
     }
 
-    $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    $upgrade = get_option('monsterinsights_version_upgraded_from');
+    if ( ! $upgrade) { // First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     } else { // Update
         return;
@@ -241,57 +241,57 @@ 
  * @param string $text
  * @return string
  */
-function monsterinsights_admin_footer( $text ) {
+function monsterinsights_admin_footer($text) {
     global $current_screen;
-    if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
+    if ( ! empty($current_screen->id) && strpos($current_screen->id, 'monsterinsights') !== false) {
         $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
-        $text = sprintf( esc_html__( 'Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+        $text = sprintf(esc_html__('Please rate %sMonsterInsights%s %s on %sWordPress.org%s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress'), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer">&#9733;&#9733;&#9733;&#9733;&#9733;</a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>');
     }
     return $text;
 }
-add_filter( 'admin_footer_text', 'monsterinsights_admin_footer', 1, 2 );
+add_filter('admin_footer_text', 'monsterinsights_admin_footer', 1, 2);
 
 function monsterinsights_deprecated_notices() {
     // Don't show on MonsterInsights pages
     $screen = get_current_screen(); 
-    if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
+    if (empty($screen->id) || strpos($screen->id, 'monsterinsights') !== false) {
         return;
     }
     
-    $analytics = monsterinsights_get_option( 'tracking_mode', 'analytics' );
-    $events    = monsterinsights_get_option( 'events_mode', false );
-    $updates   = monsterinsights_get_option( 'automatic_updates', false );
-    $url       = admin_url( 'admin.php?page=monsterinsights_settings' );
-    $notices   = get_option( 'monsterinsights_notices' );
+    $analytics = monsterinsights_get_option('tracking_mode', 'analytics');
+    $events    = monsterinsights_get_option('events_mode', false);
+    $updates   = monsterinsights_get_option('automatic_updates', false);
+    $url       = admin_url('admin.php?page=monsterinsights_settings');
+    $notices   = get_option('monsterinsights_notices');
 
-    if ( ! is_array( $notices ) ) {
+    if ( ! is_array($notices)) {
         $notices = array();
     }
 
-    if ( $analytics === 'ga' && ! isset( $notices ['monsterinsights_deprecated_ga' ] ) ){
+    if ($analytics === 'ga' && ! isset($notices ['monsterinsights_deprecated_ga'])) {
        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_ga">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking which we will be removing support for in an upcoming release. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf(esc_html__('Warning: You\'re currently using deprecated ga.js tracking which we will be removing support for in an upcoming release. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress'), '<a href="' . $url . '">', '</a>'); 
             echo '</p>';
         echo '</div>';
-    } else if ( $events === 'php' && ! isset( $notices ['monsterinsights_deprecated_php' ] ) ){
+    } else if ($events === 'php' && ! isset($notices ['monsterinsights_deprecated_php'])) {
        echo '<div class="notice notice-error is-dismissible monsterinsights-notice" data-notice="monsterinsights_deprecated_php">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking which we will be removing support for in an upcoming release. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking. To switch %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf(esc_html__('Warning: You\'re currently using deprecated PHP based events tracking which we will be removing support for in an upcoming release. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking. To switch %1$sclick here%2$s. Users who do not manually switch over will be automatically switched over in an upcoming release.', 'google-analytics-for-wordpress'), '<a href="' . $url . '">', '</a>'); 
             echo '</p>';
         echo '</div>';
-    } else if ( empty( $updates) && ! isset( $notices ['monsterinsights_automatic_updates' ] ) ){ 
-        if ( defined( 'MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE' ) && MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE ) {
+    } else if (empty($updates) && ! isset($notices ['monsterinsights_automatic_updates'])) { 
+        if (defined('MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE') && MONSTERINSIGHTS_SHOWING_EMPTY_CONFIG_NOTICE) {
             return;
         }
-        if ( defined( 'MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE' ) && MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE ) {
+        if (defined('MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE') && MONSTERINSIGHTS_SHOWING_OPTIN_TRACKING_NOTICE) {
             return;
         }
         echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_automatic_updates">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Important: Please %1$sconfigure the Automatic Updates Settings%2$s in MonsterInsights.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf(esc_html__('Important: Please %1$sconfigure the Automatic Updates Settings%2$s in MonsterInsights.', 'google-analytics-for-wordpress'), '<a href="' . $url . '">', '</a>'); 
             echo '</p>';
         echo '</div>';
     }
 }
-add_action( 'admin_notices', 'monsterinsights_deprecated_notices' );
\ No newline at end of file
+add_action('admin_notices', 'monsterinsights_deprecated_notices');
\ No newline at end of file

includes/admin/settings/tab-tracking.php

Spacing +23 added lines, -23 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -32,14 +32,14 @@ 
             $i      = 0;
             $class  = '';
             $is_pro = monsterinsights_is_pro_version();
-            foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
-                if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
+            foreach ((array) monsterinsights_get_settings_tabs() as $id => $item) {
+                if (isset($item['comingsoon']) && $item['comingsoon'] || empty($item['title'])) {
                     continue;
                 }
-                $class = ( 0 === $i ? 'monsterinsights-active' : '' );
+                $class = (0 === $i ? 'monsterinsights-active' : '');
                 ?>
-                <a class="monsterinsights-sub-nav-item monsterinsights-nav-item monsterinsights-active monstericon-<?php echo esc_attr( $id ); ?> <?php echo esc_attr( $class ); ?>" href="#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" title="<?php echo esc_attr( $item['title'] ); ?>">
-                    <?php echo esc_html( $item['title'] ); ?>
+                <a class="monsterinsights-sub-nav-item monsterinsights-nav-item monsterinsights-active monstericon-<?php echo esc_attr($id); ?> <?php echo esc_attr($class); ?>" href="#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-<?php echo esc_attr($id); ?>" title="<?php echo esc_attr($item['title']); ?>">
+                    <?php echo esc_html($item['title']); ?>
                 </a>
                 <?php 
                 $i++; 
@@ -58,22 +58,22 @@ 
          * 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_settings_tracking_tab_notice' );
+        do_action('monsterinsights_settings_tracking_tab_notice');
         ?>
 
         <!-- Tab Panels -->
         <div id="monsterinsights-settings-sub-pages" class="monsterinsights-sub-nav-tabs monsterinsights-nav-tabs" data-navigation="#monsterinsights-settings-page-sub-nav">
             <?php 
             $i = 0; 
-            foreach ( (array) monsterinsights_get_settings_tabs() as $id => $item ) {
-                if ( isset( $item['comingsoon'] ) && $item['comingsoon'] || empty( $item['title'] ) ) {
+            foreach ((array) monsterinsights_get_settings_tabs() as $id => $item) {
+                if (isset($item['comingsoon']) && $item['comingsoon'] || empty($item['title'])) {
                     continue;
                 }
-                $class = ( 0 === $i ? ' monsterinsights-active' : '' ); 
+                $class = (0 === $i ? ' monsterinsights-active' : ''); 
                 ?>
-                 <div id="monsterinsights-sub-tab-<?php echo esc_attr( $id ); ?>" class="monsterinsights-sub-nav-tab monsterinsights-nav-tab<?php echo esc_attr( $class ); ?>">
-                    <?php if ( $item['level'] === 'lite' ||  $is_pro ) { ?>
-                    <?php echo '<h2 class="monsterinsights-sub-tab-header">' . esc_html( $item['title'] ) . '</h2>'; ?>
+                 <div id="monsterinsights-sub-tab-<?php echo esc_attr($id); ?>" class="monsterinsights-sub-nav-tab monsterinsights-nav-tab<?php echo esc_attr($class); ?>">
+                    <?php if ($item['level'] === 'lite' || $is_pro) { ?>
+                    <?php echo '<h2 class="monsterinsights-sub-tab-header">' . esc_html($item['title']) . '</h2>'; ?>
                     <?php } ?>
                      <div class="monsterinsights-subtab-settings-notices">
                         <?php 
@@ -85,27 +85,27 @@ 
                          * 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_tracking_' . $id . '_tab_notice' );
+                        do_action('monsterinsights_tracking_' . $id . '_tab_notice');
                         ?>
                     </div>
                     <!-- Settings Form -->
-                    <?php $class = ( $item['level'] !== 'lite' && ! $is_pro ) ? 'monsterinsights-no-settings-shown' : ''; ?>
-                    <form id="monsterinsights-tracking-<?php echo esc_attr( $id );?>-tab" class="<?php echo $class; ?>" method="post">
+                    <?php $class = ($item['level'] !== 'lite' && ! $is_pro) ? 'monsterinsights-no-settings-shown' : ''; ?>
+                    <form id="monsterinsights-tracking-<?php echo esc_attr($id); ?>-tab" class="<?php echo $class; ?>" method="post">
                         <table class="form-table">
                             <tbody>
                                 <?php
                                 //do_action( 'monsterinsights_settings_tab_top_' . $id  );
-                                echo monsterinsights_get_section_settings( $id, 'tracking' );
+                                echo monsterinsights_get_section_settings($id, 'tracking');
                                 //do_action( 'monsterinsights_settings_tab_bottom_' . $id  );
                                 ?>
                             </tbody>
                         </table>
-                        <?php echo monsterinsights_render_submit_field( $id, 'tracking' ); ?>
-                        <?php if ( $item['level'] === 'lite' && !$is_pro ) { ?>
+                        <?php echo monsterinsights_render_submit_field($id, 'tracking'); ?>
+                        <?php if ($item['level'] === 'lite' && ! $is_pro) { ?>
                             <div class="monsterinsights-upsell-under-box">
-                                <h2><?php esc_html_e( "Want even more fine tuned control over your website analytics?", 'google-analytics-for-wordpress' ); ?></h2>
-                                <p class="monsterinsights-upsell-lite-text"><?php esc_html_e( "By upgrading to MonsterInsights Pro, you get access to numerous addons and tools that help you better understand what people are doing on your website, so you can keep doing more of what's working. Some of the features include: Ecommerce tracking, Author tracking, Post Type tracking, Ads tracking, Google AMP tracking, Performance optimization, and so much more!", 'google-analytics-for-wordpress' ); ?></p>
-                                <p class="monsterinsights-upsell-button-par"><a href="https://www.monsterinsights.com/lite/" class="button button-primary"><?php esc_html_e( "Click here to Upgrade", 'google-analytics-for-wordpress' ); ?></a></p></div>
+                                <h2><?php esc_html_e("Want even more fine tuned control over your website analytics?", 'google-analytics-for-wordpress'); ?></h2>
+                                <p class="monsterinsights-upsell-lite-text"><?php esc_html_e("By upgrading to MonsterInsights Pro, you get access to numerous addons and tools that help you better understand what people are doing on your website, so you can keep doing more of what's working. Some of the features include: Ecommerce tracking, Author tracking, Post Type tracking, Ads tracking, Google AMP tracking, Performance optimization, and so much more!", 'google-analytics-for-wordpress'); ?></p>
+                                <p class="monsterinsights-upsell-button-par"><a href="https://www.monsterinsights.com/lite/" class="button button-primary"><?php esc_html_e("Click here to Upgrade", 'google-analytics-for-wordpress'); ?></a></p></div>
                         <?php } ?>
                     </form>
                 </div>
@@ -117,4 +117,4 @@ 
     </div>
     <?php
 }
-add_action( 'monsterinsights_tab_settings_tracking', 'monsterinsights_settings_tracking_tab' );
\ No newline at end of file
+add_action('monsterinsights_tab_settings_tracking', 'monsterinsights_settings_tracking_tab');
\ No newline at end of file

includes/admin/settings/settings-api.php

Spacing +279 added lines, -279 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Get the settings for a section
@@ -18,12 +18,12 @@ 
  * @since 6.0.0
  * @return void
 */
-function monsterinsights_get_section_settings( $section, $page = 'tracking' ) {
+function monsterinsights_get_section_settings($section, $page = 'tracking') {
 	$output = '';
 	$settings = monsterinsights_get_registered_settings();
-	if ( is_array( $settings ) && ! empty( $settings[$section] ) && is_array( $settings[$section] ) ) {
-		foreach ( $settings[$section] as $setting ) {
-			$args = wp_parse_args( $setting, array(
+	if (is_array($settings) && ! empty($settings[$section]) && is_array($settings[$section])) {
+		foreach ($settings[$section] as $setting) {
+			$args = wp_parse_args($setting, array(
 				'id'            => null,
 				'desc'          => '',
 				'name'          => '',
@@ -45,8 +45,8 @@ 
 				'allowclear'    => true,
 				'notice_type'   => 'info',
 				'no_label'      => false,
-			) );
-			$output .= monsterinsights_render_field( $args );
+			));
+			$output .= monsterinsights_render_field($args);
 		}
 	}
 	return $output;
@@ -63,46 +63,46 @@ 
 function monsterinsights_save_settings() {
 
 	// Check if user pressed the 'Update' button and nonce is valid
-	if ( ! isset( $_POST['monsterinsights-settings-submit'] ) ) {
+	if ( ! isset($_POST['monsterinsights-settings-submit'])) {
 		return;
 	}
 
-	if ( ! wp_verify_nonce( $_POST['monsterinsights-settings-nonce'], 'monsterinsights-settings-nonce' ) ) {
+	if ( ! wp_verify_nonce($_POST['monsterinsights-settings-nonce'], 'monsterinsights-settings-nonce')) {
 		return;
 	}
 
-	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+	if ( ! current_user_can('monsterinsights_save_settings')) {
 		return;
 	}
 
-	if ( empty( $_POST['monsterinsights_settings_tab'] ) || empty( $_POST['monsterinsights_settings_sub_tab'] ) || $_POST['monsterinsights_settings_tab'] !== 'tracking' ) {
+	if (empty($_POST['monsterinsights_settings_tab']) || empty($_POST['monsterinsights_settings_sub_tab']) || $_POST['monsterinsights_settings_tab'] !== 'tracking') {
 		return;
 	}
 
 	// get subtab
 	$settings = monsterinsights_get_registered_settings();
 	$tab      = $_POST['monsterinsights_settings_sub_tab'];
-	if ( empty( $settings ) || !is_array( $settings ) || empty( $settings[ $tab ] ) || ! is_array( $settings[ $tab ] ) ) {
+	if (empty($settings) || ! is_array($settings) || empty($settings[$tab]) || ! is_array($settings[$tab])) {
 		return;
 	}
 
 	// Okay we're good to sanitize, validate, and save this section's settings
 
 	// We only care about this sections's settings
-	$settings = $settings[ $tab ]; 
+	$settings = $settings[$tab]; 
 
 	// Run a general sanitization for the tab for special fields
-	$input    = ! empty( $_POST['monsterinsights_settings'] ) ? $_POST['monsterinsights_settings'] : array();
-	$input    = apply_filters( 'monsterinsights_settings_' . $tab . '_sanitize', $input );
+	$input    = ! empty($_POST['monsterinsights_settings']) ? $_POST['monsterinsights_settings'] : array();
+	$input    = apply_filters('monsterinsights_settings_' . $tab . '_sanitize', $input);
 
-	foreach( $settings as $id => $setting ) {
+	foreach ($settings as $id => $setting) {
 
 		// If the value wasn't passed in, set to false, which will delete the option
-		$value          = isset( $input[ $id ] ) ? $input[ $id ] : false;
-		$previous_value = monsterinsights_get_option( $id, false );
+		$value          = isset($input[$id]) ? $input[$id] : false;
+		$previous_value = monsterinsights_get_option($id, false);
 
 		// Sanitize/Validate
-		if ( empty( $setting['type'] ) ) {
+		if (empty($setting['type'])) {
 			continue;
 		}
 
@@ -110,11 +110,11 @@ 
 		$non_setting_types = monsterinsights_get_non_setting_types();
 		$type              = $setting['type'];
 
-		if ( in_array( $type, $non_setting_types ) ) {
+		if (in_array($type, $non_setting_types)) {
 			continue;
 		}
 
-		$args = wp_parse_args( $setting, array(
+		$args = wp_parse_args($setting, array(
 			'id'            => null,
 			'desc'          => '',
 			'name'          => '',
@@ -135,31 +135,31 @@ 
 			'multiple'      => false,
 			'allowclear'    => true,
 			'notice_type'   => 'info',
-		) );
+		));
 
 		// Sanitize settings
-		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $id  , $value, $id, $args, $previous_value );
-		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $type, $value, $id, $args, $previous_value );
-		$value = apply_filters( 'monsterinsights_settings_sanitize'         , $value, $id, $args, $previous_value );
+		$value = apply_filters('monsterinsights_settings_sanitize_' . $id, $value, $id, $args, $previous_value);
+		$value = apply_filters('monsterinsights_settings_sanitize_' . $type, $value, $id, $args, $previous_value);
+		$value = apply_filters('monsterinsights_settings_sanitize', $value, $id, $args, $previous_value);
 
 		// Save
-		if ( ! has_action( 'monsterinsights_settings_save_' . $args['type'] ) ) {
-			monsterinsights_update_option( $id, $value );
+		if ( ! has_action('monsterinsights_settings_save_' . $args['type'])) {
+			monsterinsights_update_option($id, $value);
 		} else {
-			do_action( 'monsterinsights_settings_save_' . $args['type'], $value, $id, $args, $previous_value );
+			do_action('monsterinsights_settings_save_' . $args['type'], $value, $id, $args, $previous_value);
 		}
 	}
-	add_action( 'monsterinsights_tracking_' . $tab . '_tab_notice', 'monsterinsights_updated_settings' );
+	add_action('monsterinsights_tracking_' . $tab . '_tab_notice', 'monsterinsights_updated_settings');
 }
-add_action( 'current_screen', 'monsterinsights_save_settings' );
+add_action('current_screen', 'monsterinsights_save_settings');
 
-function monsterinsights_is_settings_tab( $tab = '' ){
+function monsterinsights_is_settings_tab($tab = '') {
 	$tabs = monsterinsights_get_settings_tabs();
-	if ( empty( $tab ) || empty( $tabs ) || ! is_string( $tab ) || ! is_array( $tabs ) ) {
+	if (empty($tab) || empty($tabs) || ! is_string($tab) || ! is_array($tabs)) {
 		return false;
 	}
 
-	return !empty( $tabs[$tab]);
+	return ! empty($tabs[$tab]);
 }
 
 /**
@@ -169,22 +169,22 @@ 
  * @since  6.0.0
  * @return array Key is the setting ID, value is the type of setting it is registered as
  */
-function monsterinsights_get_registered_settings_types( $section = '' ) {
+function monsterinsights_get_registered_settings_types($section = '') {
 	$settings      = monsterinsights_get_registered_settings();
 	$setting_types = array();
-	if ( ! empty( $section ) ) {
-		if ( ! empty( $settings[$section] ) ) {
-			foreach ( $settings[$section] as $setting ) {
-				if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
-					$setting_types[ $setting['id'] ] = $setting['type'];
+	if ( ! empty($section)) {
+		if ( ! empty($settings[$section])) {
+			foreach ($settings[$section] as $setting) {
+				if (is_array($setting) && array_key_exists('type', $setting)) {
+					$setting_types[$setting['id']] = $setting['type'];
 				}
 			}
 		}
 	} else {
-		foreach ( $settings as $tab ) {
-			foreach ( $tab as $setting ) {
-				if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
-					$setting_types[ $setting['id'] ] = $setting['type'];
+		foreach ($settings as $tab) {
+			foreach ($tab as $setting) {
+				if (is_array($setting) && array_key_exists('type', $setting)) {
+					$setting_types[$setting['id']] = $setting['type'];
 				}
 			}
 		}
@@ -199,7 +199,7 @@ 
  * @param array $input The field value
  * @return string $input Sanitizied value
  */
-function monsterinsights_sanitize_rich_editor_field( $input ) {
+function monsterinsights_sanitize_rich_editor_field($input) {
 	$tags = array(
 		'p' => array(
 			'class' => array(),
@@ -241,45 +241,45 @@ 
 
 	//$allowed_tags = apply_filters( 'monsterinsights_allowed_html_tags', $tags );
 
-	return trim( wp_kses( $input, $allowed_tags ) );
+	return trim(wp_kses($input, $allowed_tags));
 }
-add_filter( 'monsterinsights_settings_sanitize_rich_editor', 'monsterinsights_sanitize_rich_editor_field' );
+add_filter('monsterinsights_settings_sanitize_rich_editor', 'monsterinsights_sanitize_rich_editor_field');
 
-if ( ! function_exists( 'sanitize_textarea_field' ) ) {
-	function sanitize_textarea_field( $str ) {
-		$filtered = _sanitize_text_fields( $str, true );
-		return apply_filters( 'sanitize_textarea_field', $filtered, $str );
+if ( ! function_exists('sanitize_textarea_field')) {
+	function sanitize_textarea_field($str) {
+		$filtered = _sanitize_text_fields($str, true);
+		return apply_filters('sanitize_textarea_field', $filtered, $str);
 	}
 }
 
-if ( ! function_exists( 'sanitize_textarea_field' ) ) {
-	function _sanitize_text_fields( $str, $keep_newlines = false ) {
-		$filtered = wp_check_invalid_utf8( $str );
+if ( ! function_exists('sanitize_textarea_field')) {
+	function _sanitize_text_fields($str, $keep_newlines = false) {
+		$filtered = wp_check_invalid_utf8($str);
 	 
-		if ( strpos($filtered, '<') !== false ) {
-			$filtered = wp_pre_kses_less_than( $filtered );
+		if (strpos($filtered, '<') !== false) {
+			$filtered = wp_pre_kses_less_than($filtered);
 			// This will strip extra whitespace for us.
-			$filtered = wp_strip_all_tags( $filtered, false );
+			$filtered = wp_strip_all_tags($filtered, false);
 	 
 			// Use html entities in a special case to make sure no later
 			// newline stripping stage could lead to a functional tag
 			$filtered = str_replace("<\n", "&lt;\n", $filtered);
 		}
 	 
-		if ( ! $keep_newlines ) {
-			$filtered = preg_replace( '/[\r\n\t ]+/', ' ', $filtered );
+		if ( ! $keep_newlines) {
+			$filtered = preg_replace('/[\r\n\t ]+/', ' ', $filtered);
 		}
-		$filtered = trim( $filtered );
+		$filtered = trim($filtered);
 	 
 		$found = false;
-		while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
+		while (preg_match('/%[a-f0-9]{2}/i', $filtered, $match)) {
 			$filtered = str_replace($match[0], '', $filtered);
 			$found = true;
 		}
 	 
-		if ( $found ) {
+		if ($found) {
 			// Strip out the whitespace that may now exist after removing the octets.
-			$filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+			$filtered = trim(preg_replace('/ +/', ' ', $filtered));
 		}
 	 
 		return $filtered;
@@ -292,10 +292,10 @@ 
  * @since 6.0.0
  * @todo  docbloc
  */
-function monsterinsights_sanitize_textarea_field( $value, $id, $setting, $previous_value ) {
-	return sanitize_textarea_field( $value );
+function monsterinsights_sanitize_textarea_field($value, $id, $setting, $previous_value) {
+	return sanitize_textarea_field($value);
 }
-add_filter( 'monsterinsights_settings_sanitize_textarea', 'monsterinsights_sanitize_textarea_field', 10, 4 );
+add_filter('monsterinsights_settings_sanitize_textarea', 'monsterinsights_sanitize_textarea_field', 10, 4);
 
 /**
  * Sanitize checkbox fields
@@ -303,10 +303,10 @@ 
  * @since 6.0.0
  * @todo  docbloc
  */
-function monsterinsights_sanitize_checkbox_field( $value, $id, $setting, $previous_value ) {
+function monsterinsights_sanitize_checkbox_field($value, $id, $setting, $previous_value) {
 	return (bool) $value;
 }
-add_filter( 'monsterinsights_settings_sanitize_checkbox', 'monsterinsights_sanitize_checkbox_field', 10, 4 );
+add_filter('monsterinsights_settings_sanitize_checkbox', 'monsterinsights_sanitize_checkbox_field', 10, 4);
 
 /**
  * Sanitize multicheck fields
@@ -314,18 +314,18 @@ 
  * @since 6.0.0
  * @todo  docbloc
  */
-function monsterinsights_sanitize_multicheck_field( $value, $id, $setting, $previous_value ) {
+function monsterinsights_sanitize_multicheck_field($value, $id, $setting, $previous_value) {
 	$save_value = array();
-	if ( ! empty( $value ) && is_array( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
-			if ( in_array( $key, $value ) ) {
+	if ( ! empty($value) && is_array($value)) {
+		foreach ($setting['options'] as $key => $option) {
+			if (in_array($key, $value)) {
 				$save_value[] = $key;
 			}
 		}
 	}
 	return $save_value;
 }
-add_filter( 'monsterinsights_settings_sanitize_multicheck', 'monsterinsights_sanitize_multicheck_field', 10, 4 );
+add_filter('monsterinsights_settings_sanitize_multicheck', 'monsterinsights_sanitize_multicheck_field', 10, 4);
 
 /**
  * Sanitize select fields
@@ -333,28 +333,28 @@ 
  * @since 6.0.0
  * @todo  docbloc
  */
-function monsterinsights_sanitize_select_field( $value, $id, $setting, $previous_value ) {
-	if ( ! empty( $setting['multiple'] ) && $setting['multiple'] ) {
+function monsterinsights_sanitize_select_field($value, $id, $setting, $previous_value) {
+	if ( ! empty($setting['multiple']) && $setting['multiple']) {
 		$save_value = array();
 	} else {
 		$save_value = '';
 	}
-	if ( ! empty( $value ) && is_array( $value ) ) {
-		if ( $setting['multiple'] ) {
-			foreach ( $value as $vid => $vname ) {
-				foreach( $setting['options'] as $key => $option ){
-					if ( $key === $vname ) {
+	if ( ! empty($value) && is_array($value)) {
+		if ($setting['multiple']) {
+			foreach ($value as $vid => $vname) {
+				foreach ($setting['options'] as $key => $option) {
+					if ($key === $vname) {
 						$save_value[] = $key;
 						break;
 					}
 				}
 			}
 		} else {
-			foreach( $setting['options'] as $key => $option ){
-				if ( is_array( $value ) && in_array( $key, $value ) ) {
+			foreach ($setting['options'] as $key => $option) {
+				if (is_array($value) && in_array($key, $value)) {
 					$save_value = $key;
 					break;
-				} else if ( is_string( $value ) && $key === $value ){
+				} else if (is_string($value) && $key === $value) {
 					$save_value = $key;
 					break;
 				}
@@ -363,7 +363,7 @@ 
 	}
 	return $save_value;
 }
-add_filter( 'monsterinsights_settings_sanitize_select', 'monsterinsights_sanitize_select_field', 10, 4 );
+add_filter('monsterinsights_settings_sanitize_select', 'monsterinsights_sanitize_select_field', 10, 4);
 
 
 /**
@@ -372,18 +372,18 @@ 
  * @since 6.0.0
  * @todo  docbloc
  */
-function monsterinsights_sanitize_radio_field( $value, $id, $setting, $previous_value ) {
+function monsterinsights_sanitize_radio_field($value, $id, $setting, $previous_value) {
 	$save_value = '';
-	if ( ! empty( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
-			if ( $key === $value ) {
+	if ( ! empty($value)) {
+		foreach ($setting['options'] as $key => $option) {
+			if ($key === $value) {
 				$save_value = $key;
 			}
 		}
 	}
 	return $save_value;
 }
-add_filter( 'monsterinsights_settings_sanitize_radio', 'monsterinsights_sanitize_radio_field', 10, 4 );
+add_filter('monsterinsights_settings_sanitize_radio', 'monsterinsights_sanitize_radio_field', 10, 4);
 
 /**
  * Sanitize text fields
@@ -391,10 +391,10 @@ 
  * @since 6.0.0
  * @todo  docbloc
  */
-function monsterinsights_sanitize_text_field( $value, $id, $setting, $previous_value ) {
-	return sanitize_text_field( $value );
+function monsterinsights_sanitize_text_field($value, $id, $setting, $previous_value) {
+	return sanitize_text_field($value);
 }
-add_filter( 'monsterinsights_settings_sanitize_text', 'monsterinsights_sanitize_text_field', 10, 4 );
+add_filter('monsterinsights_settings_sanitize_text', 'monsterinsights_sanitize_text_field', 10, 4);
 
 /**
  * Sanitize password fields
@@ -402,10 +402,10 @@ 
  * @since 6.0.0
  * @todo  docbloc
  */
-function monsterinsights_sanitize_password_field( $value, $id, $setting, $previous_value ) {
-	return sanitize_text_field( $value );
+function monsterinsights_sanitize_password_field($value, $id, $setting, $previous_value) {
+	return sanitize_text_field($value);
 }
-add_filter( 'monsterinsights_settings_sanitize_password', 'monsterinsights_sanitize_password_field', 10, 4 );
+add_filter('monsterinsights_settings_sanitize_password', 'monsterinsights_sanitize_password_field', 10, 4);
 
 /**
  * Sanitize number fields
@@ -413,16 +413,16 @@ 
  * @since 6.0.0
  * @todo  docbloc
  */
-function monsterinsights_sanitize_number_field( $value, $id, $setting, $previous_value ) {
-	if ( is_int( (int) $value ) ) {
+function monsterinsights_sanitize_number_field($value, $id, $setting, $previous_value) {
+	if (is_int((int) $value)) {
 		return $value;
-	} else if ( is_int( $previous_value ) ) {
+	} else if (is_int($previous_value)) {
 		return $previous_value;
 	} else {
 		return 0;
 	}
 }
-add_filter( 'monsterinsights_settings_sanitize_number', 'monsterinsights_sanitize_number_field', 10, 4 );
+add_filter('monsterinsights_settings_sanitize_number', 'monsterinsights_sanitize_number_field', 10, 4);
 
 /**
  * Sanitize unfiltered textarea fields
@@ -430,14 +430,14 @@ 
  * @since 6.0.0
  * @todo  docbloc
  */
-function monsterinsights_sanitize_unfiltered_textarea_field( $value, $id, $setting, $previous_value ) {
-	if ( current_user_can( 'unfiltered_html' ) || current_user_can( 'monsterinsights_unfiltered_html' ) ) {
+function monsterinsights_sanitize_unfiltered_textarea_field($value, $id, $setting, $previous_value) {
+	if (current_user_can('unfiltered_html') || current_user_can('monsterinsights_unfiltered_html')) {
 		return $value;
 	} else {
 		return $previous_value;
 	}
 }
-add_filter( 'monsterinsights_settings_unfiltered_textarea_number', 'monsterinsights_sanitize_unfiltered_textarea_field', 10, 4 );
+add_filter('monsterinsights_settings_unfiltered_textarea_number', 'monsterinsights_sanitize_unfiltered_textarea_field', 10, 4);
 
 /**
  * Sanitizes a string key for MonsterInsights Settings
@@ -448,9 +448,9 @@ 
  * @param  string $key String key
  * @return string Sanitized key
  */
-function monsterinsights_sanitize_key( $key ) {
+function monsterinsights_sanitize_key($key) {
 	$raw_key = $key;
-	$key = preg_replace( '/[^a-zA-Z0-9_\-\.\:\/]/', '', $key );
+	$key = preg_replace('/[^a-zA-Z0-9_\-\.\:\/]/', '', $key);
 	/**
 	 * Filter a sanitized key string.
 	 *
@@ -458,7 +458,7 @@ 
 	 * @param string $key     Sanitized key.
 	 * @param string $raw_key The key prior to sanitization.
 	 */
-	return apply_filters( 'monsterinsights_sanitize_key', $key, $raw_key );
+	return apply_filters('monsterinsights_sanitize_key', $key, $raw_key);
 }
 
 /**
@@ -468,13 +468,13 @@ 
  * @param  string|array $class HTML Class Name(s)
  * @return string $class
  */
-function monsterinsights_sanitize_html_class( $class = '' ) {
+function monsterinsights_sanitize_html_class($class = '') {
 
-	if ( is_string( $class ) ) {
-		$class = sanitize_html_class( $class );
-	} else if ( is_array( $class ) ) {
-		$class = array_values( array_map( 'sanitize_html_class', $class ) );
-		$class = implode( ' ', array_unique( $class ) );
+	if (is_string($class)) {
+		$class = sanitize_html_class($class);
+	} else if (is_array($class)) {
+		$class = array_values(array_map('sanitize_html_class', $class));
+		$class = implode(' ', array_unique($class));
 	}
 
 	return $class;
@@ -490,16 +490,16 @@ 
  * @param bool $force Force the pages to be loaded even if not on settings
  * @return array $pages_options An array of the pages
  */
-function monsterinsights_get_pages( $force = false ) {
-	$pages_options = array( '' => '' ); // Blank option
-	if( ( ! isset( $_GET['page'] ) || 'monsterinsights_settings' != $_GET['page'] ) && ! $force ) {
+function monsterinsights_get_pages($force = false) {
+	$pages_options = array('' => ''); // Blank option
+	if (( ! isset($_GET['page']) || 'monsterinsights_settings' != $_GET['page']) && ! $force) {
 		return $pages_options;
 	}
 
 	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$pages_options[ $page->ID ] = $page->post_title;
+	if ($pages) {
+		foreach ($pages as $page) {
+			$pages_options[$page->ID] = $page->post_title;
 		}
 	}
 
@@ -516,33 +516,33 @@ 
  *
  * @return void
  */
-function monsterinsights_checkbox_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+function monsterinsights_checkbox_callback($args) {
+	$monsterinsights_option = monsterinsights_get_option($args['id']);
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$name = '';
 	} else {
-		$name = 'name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']"';
+		$name = 'name="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']"';
 	}
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+	$class = monsterinsights_sanitize_html_class($args['field_class']);
 
-	$checked  = ! empty( $monsterinsights_option ) ? checked( 1, $monsterinsights_option, false ) : '';
+	$checked  = ! empty($monsterinsights_option) ? checked(1, $monsterinsights_option, false) : '';
 
 	$disabled = '';
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		// Disable class
 		$disabled = 'disabled="disabled"';
 		
 		// Checked
-		$checked  = isset( $args['std'] ) && true === $args['std'] ? checked( 1, 1, false ) : '';
+		$checked  = isset($args['std']) && true === $args['std'] ? checked(1, 1, false) : '';
 	}
 
-	$html     = '<input type="checkbox" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']"' . $name . ' value="1" ' . $checked . ' class="' . $class . '" ' . $disabled . ' />';
-	$html    .= '<p class="description">'  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html     = '<input type="checkbox" id="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']"' . $name . ' value="1" ' . $checked . ' class="' . $class . '" ' . $disabled . ' />';
+	$html    .= '<p class="description">' . wp_kses_post($args['desc']) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 /**
@@ -555,22 +555,22 @@ 
  *
  * @return void
  */
-function monsterinsights_multicheck_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+function monsterinsights_multicheck_callback($args) {
+	$monsterinsights_option = monsterinsights_get_option($args['id']);
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+	$class = monsterinsights_sanitize_html_class($args['field_class']);
 
 	$html = '';
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ):
-			if( isset( $monsterinsights_option[ $key ] ) ) { $enabled = $option; } else { $enabled = NULL; }
-			$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
-			$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">' . wp_kses_post( $option ) . '</label><br/>';
+	if ( ! empty($args['options'])) {
+		foreach ($args['options'] as $key => $option):
+			if (isset($monsterinsights_option[$key])) { $enabled = $option; } else { $enabled = NULL; }
+			$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . '][' . monsterinsights_sanitize_key($key) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . '][' . monsterinsights_sanitize_key($key) . ']" class="' . $class . '" type="checkbox" value="' . esc_attr($option) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
+			$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . '][' . monsterinsights_sanitize_key($key) . ']">' . wp_kses_post($option) . '</label><br/>';
 		endforeach;
 		$html .= '<p class="description">' . $args['desc'] . '</p>';
 	}
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 
@@ -584,28 +584,28 @@ 
  *
  * @return void
  */
-function monsterinsights_radio_callback( $args ) {
-	$monsterinsights_options = monsterinsights_get_option( $args['id'] );
+function monsterinsights_radio_callback($args) {
+	$monsterinsights_options = monsterinsights_get_option($args['id']);
 
 	$html = '';
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+	$class = monsterinsights_sanitize_html_class($args['field_class']);
 
-	foreach ( $args['options'] as $key => $option ) :
+	foreach ($args['options'] as $key => $option) :
 		$checked = false;
 
-		if ( $monsterinsights_options && $monsterinsights_options == $key ) {
+		if ($monsterinsights_options && $monsterinsights_options == $key) {
 			$checked = true;
-		} else if( isset( $args['std'] ) && $args['std'] == $key && ! $monsterinsights_options ) {
+		} else if (isset($args['std']) && $args['std'] == $key && ! $monsterinsights_options) {
 			$checked = true;
 		}
 
-		$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">';
-		$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="radio" value="' . monsterinsights_sanitize_key( $key ) . '" ' . checked(true, $checked, false) . '/>&nbsp;';
-		$html .= esc_html( $option ) . '</label>';
+		$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . '][' . monsterinsights_sanitize_key($key) . ']">';
+		$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . '][' . monsterinsights_sanitize_key($key) . ']" class="' . $class . '" type="radio" value="' . monsterinsights_sanitize_key($key) . '" ' . checked(true, $checked, false) . '/>&nbsp;';
+		$html .= esc_html($option) . '</label>';
 	endforeach;
 
-	$html .= '<p class="description">' . apply_filters( 'monsterinsights_after_setting_output', wp_kses_post( $args['desc'] ), $args ) . '</p>';
+	$html .= '<p class="description">' . apply_filters('monsterinsights_after_setting_output', wp_kses_post($args['desc']), $args) . '</p>';
 
 	return $html;
 }
@@ -620,34 +620,34 @@ 
  *
  * @return void
  */
-function monsterinsights_text_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+function monsterinsights_text_callback($args) {
+	$monsterinsights_option = monsterinsights_get_option($args['id']);
 
-	if ( $monsterinsights_option ) {
+	if ($monsterinsights_option) {
 		$value = $monsterinsights_option;
-	} elseif( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
+	} elseif ( ! empty($args['allow_blank']) && empty($monsterinsights_option)) {
 		$value = '';
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="monsterinsights_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+	$class = monsterinsights_sanitize_html_class($args['field_class']);
 
-	$disabled = ! empty( $args['disabled'] ) ? ' disabled="disabled"' : '';
+	$disabled = ! empty($args['disabled']) ? ' disabled="disabled"' : '';
 	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
-	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html     = '<input type="text" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . $disabled . ' placeholder="' . esc_attr( $args['placeholder'] ) . '"/>';
-	$html    .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+	$size     = (isset($args['size']) && ! is_null($args['size'])) ? $args['size'] : 'regular';
+	$html     = '<input type="text" class="' . $class . ' ' . sanitize_html_class($size) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '"' . $readonly . $disabled . ' placeholder="' . esc_attr($args['placeholder']) . '"/>';
+	$html    .= '<p class="description"> ' . wp_kses_post($args['desc']) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 /**
@@ -660,34 +660,34 @@ 
  *
  * @return void
  */
-function monsterinsights_number_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+function monsterinsights_number_callback($args) {
+	$monsterinsights_option = monsterinsights_get_option($args['id']);
 
-	if ( $monsterinsights_option ) {
+	if ($monsterinsights_option) {
 		$value = $monsterinsights_option;
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+	if (isset($args['faux']) && true === $args['faux']) {
 		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 		$name  = '';
 	} else {
-		$name = 'name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']"';
+		$name = 'name="monsterinsights_settings[' . esc_attr($args['id']) . ']"';
 	}
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+	$class = monsterinsights_sanitize_html_class($args['field_class']);
 
-	$max  = isset( $args['max'] )  ? $args['max']   : 999999;
-	$min  = isset( $args['min'] )  ? $args['min']   : 0;
-	$step = isset( $args['step'] ) ? $args['step'] : 1;
+	$max  = isset($args['max']) ? $args['max'] : 999999;
+	$min  = isset($args['min']) ? $args['min'] : 0;
+	$step = isset($args['step']) ? $args['step'] : 1;
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+	$size = (isset($args['size']) && ! is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="number" step="' . esc_attr($step) . '" max="' . esc_attr($max) . '" min="' . esc_attr($min) . '" class="' . $class . ' ' . sanitize_html_class($size) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']" ' . $name . ' value="' . esc_attr(stripslashes($value)) . '"/>';
+	$html .= '<p class="description"> ' . wp_kses_post($args['desc']) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 /**
@@ -700,21 +700,21 @@ 
  *
  * @return void
  */
-function monsterinsights_textarea_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+function monsterinsights_textarea_callback($args) {
+	$monsterinsights_option = monsterinsights_get_option($args['id']);
 
-	if ( $monsterinsights_option ) {
+	if ($monsterinsights_option) {
 		$value = $monsterinsights_option;
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+	$class = monsterinsights_sanitize_html_class($args['field_class']);
 
-	$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']" name="monsterinsights_settings[' . esc_attr($args['id']) . ']">' . esc_textarea(stripslashes($value)) . '</textarea>';
+	$html .= '<p class="description"> ' . wp_kses_post($args['desc']) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 
@@ -728,26 +728,26 @@ 
  *
  * @return void
  */
-function monsterinsights_unfiltered_textarea_callback( $args ) {
+function monsterinsights_unfiltered_textarea_callback($args) {
 	
-	if ( current_user_can( 'unfiltered_html' ) || current_user_can( 'monsterinsights_unfiltered_html' ) ) {
-		$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+	if (current_user_can('unfiltered_html') || current_user_can('monsterinsights_unfiltered_html')) {
+		$monsterinsights_option = monsterinsights_get_option($args['id']);
 
-		if ( $monsterinsights_option ) {
+		if ($monsterinsights_option) {
 			$value = $monsterinsights_option;
 		} else {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
+			$value = isset($args['std']) ? $args['std'] : '';
 		}
 
-		$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+		$class = monsterinsights_sanitize_html_class($args['field_class']);
 
-		$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . stripslashes( $value ) . '</textarea>';
-		$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+		$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']" name="monsterinsights_settings[' . esc_attr($args['id']) . ']">' . stripslashes($value) . '</textarea>';
+		$html .= '<p class="description"> ' . wp_kses_post($args['desc']) . '</p>';
 	} else {
-		$html .= sprintf( esc_html__( 'You must have the %s capability to view/edit this setting', 'google-analytics-for-wordpress' ), '"unfiltered_html"' );
+		$html .= sprintf(esc_html__('You must have the %s capability to view/edit this setting', 'google-analytics-for-wordpress'), '"unfiltered_html"');
 	}
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 /**
@@ -760,22 +760,22 @@ 
  *
  * @return void
  */
-function monsterinsights_password_callback( $args ) {
-	$monsterinsights_options = monsterinsights_get_option( $args['id'] );
+function monsterinsights_password_callback($args) {
+	$monsterinsights_options = monsterinsights_get_option($args['id']);
 
-	if ( $monsterinsights_options ) {
+	if ($monsterinsights_options) {
 		$value = $monsterinsights_options;
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+	$class = monsterinsights_sanitize_html_class($args['field_class']);
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
+	$size = (isset($args['size']) && ! is_null($args['size'])) ? $args['size'] : 'regular';
+	$html = '<input type="password" class="' . $class . ' ' . sanitize_html_class($size) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']" name="monsterinsights_settings[' . esc_attr($args['id']) . ']" value="' . esc_attr($value) . '"/>';
+	$html .= '<p class="description"> ' . wp_kses_post($args['desc']) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 /**
@@ -789,43 +789,43 @@ 
  * @return void
  */
 function monsterinsights_select_callback($args) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+	$monsterinsights_option = monsterinsights_get_option($args['id']);
 
-	if ( $monsterinsights_option ) {
+	if ($monsterinsights_option) {
 		$value = $monsterinsights_option;
 	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
+		$value = isset($args['std']) ? $args['std'] : '';
 	}
 
-	if ( isset( $args['placeholder'] ) ) {
+	if (isset($args['placeholder'])) {
 		$placeholder = $args['placeholder'];
 	} else {
 		$placeholder = '';
 	}
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+	$class = monsterinsights_sanitize_html_class($args['field_class']);
 
-	if ( isset( $args['select2'] ) ) {
+	if (isset($args['select2'])) {
 		$class .= ' monsterinsights-select300';
 	}
 
-	$allowclear   = isset( $args['allowclear'] ) ? (bool) $args['allowclear'] : false;
-	$multiple     = isset( $args['multiple'] )   ? (bool) $args['multiple'] : false;
+	$allowclear   = isset($args['allowclear']) ? (bool) $args['allowclear'] : false;
+	$multiple     = isset($args['multiple']) ? (bool) $args['multiple'] : false;
 	$multiple     = $multiple ? 'multiple="multiple"' : '';
 	$multiple_arg = $multiple ? '[]' : '';
 
-	$html = '<select id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']' . $multiple_arg .'" class="' . $class . '" data-placeholder="' . esc_html( $placeholder ) . '" data-allow-clear="' . $allowclear . '" ' . $multiple . ' />';
+	$html = '<select id="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']" name="monsterinsights_settings[' . esc_attr($args['id']) . ']' . $multiple_arg . '" class="' . $class . '" data-placeholder="' . esc_html($placeholder) . '" data-allow-clear="' . $allowclear . '" ' . $multiple . ' />';
 
-	foreach ( $args['options'] as $option => $name ) {
-		$selected = ! empty( $value ) && is_array( $value ) ? in_array( $option, $value ) :  $value === $option;
-		$selected = selected( true, $selected, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+	foreach ($args['options'] as $option => $name) {
+		$selected = ! empty($value) && is_array($value) ? in_array($option, $value) : $value === $option;
+		$selected = selected(true, $selected, false);
+		$html .= '<option value="' . esc_attr($option) . '" ' . $selected . '>' . esc_html($name) . '</option>';
 	}
 
 	$html .= '</select>';
-	$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
+	$html .= '<p class="description"> ' . wp_kses_post($args['desc']) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 /**
@@ -836,30 +836,30 @@ 
  * @since 6.0.0
  * @param array $args Arguments passed by the setting
  */
-function monsterinsights_rich_editor_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+function monsterinsights_rich_editor_callback($args) {
+	$monsterinsights_option = monsterinsights_get_option($args['id']);
 
-	if ( $monsterinsights_option ) {
+	if ($monsterinsights_option) {
 		$value = $monsterinsights_option;
 	} else {
-		if( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
+		if ( ! empty($args['allow_blank']) && empty($monsterinsights_option)) {
 			$value = '';
 		} else {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
+			$value = isset($args['std']) ? $args['std'] : '';
 		}
 	}
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+	$rows = isset($args['size']) ? $args['size'] : 20;
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+	$class = monsterinsights_sanitize_html_class($args['field_class']);
 
 	ob_start();
-	wp_editor( stripslashes( $value ), 'monsterinsights_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'monsterinsights_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'editor_class' => $class ) );
+	wp_editor(stripslashes($value), 'monsterinsights_settings_' . esc_attr($args['id']), array('textarea_name' => 'monsterinsights_settings[' . esc_attr($args['id']) . ']', 'textarea_rows' => absint($rows), 'editor_class' => $class));
 	$html = ob_get_clean();
 
-	$html .= '<br/><p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
+	$html .= '<br/><p class="description"> ' . wp_kses_post($args['desc']) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 /**
@@ -871,9 +871,9 @@ 
  * @param array $args Arguments passed by the setting
  * @return void
  */
-function monsterinsights_descriptive_text_callback( $args ) {
-	$html = wp_kses_post( $args['desc'] );
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+function monsterinsights_descriptive_text_callback($args) {
+	$html = wp_kses_post($args['desc']);
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 /**
@@ -886,9 +886,9 @@ 
  *
  * @return void
  */
-function monsterinsights_notice_callback( $args ) {
-	$html = monsterinsights_get_message( $args['notice_type'], $args['desc'] );
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+function monsterinsights_notice_callback($args) {
+	$html = monsterinsights_get_message($args['notice_type'], $args['desc']);
+	return apply_filters('monsterinsights_after_setting_output', $html, $args);
 }
 
 /**
@@ -901,12 +901,12 @@ 
  *
  * @return void
  */
-function monsterinsights_upgrade_notice_callback( $args ) {
-	$html =   '<div class="monsterinsights-upsell-box"><h2>' . esc_html( $args['name' ] ) . '</h2>'
+function monsterinsights_upgrade_notice_callback($args) {
+	$html = '<div class="monsterinsights-upsell-box"><h2>' . esc_html($args['name']) . '</h2>'
 			. '<p class="monsterinsights-upsell-lite-text">' . $args['desc'] . '</p>'
-			. '<p class="monsterinsights-upsell-button-par"><a href="https://www.monsterinsights.com/lite/" class="monsterinsights-upsell-box-button button button-primary">' . __( 'Click here to Upgrade', 'google-analytics-for-wordpress' ) . '</a></p>'
+			. '<p class="monsterinsights-upsell-button-par"><a href="https://www.monsterinsights.com/lite/" class="monsterinsights-upsell-box-button button button-primary">' . __('Click here to Upgrade', 'google-analytics-for-wordpress') . '</a></p>'
 			. '</div>';
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args ); 
+	return apply_filters('monsterinsights_after_setting_output', $html, $args); 
 }
 
 /**
@@ -918,8 +918,8 @@ 
  * @param array $args Arguments passed by the setting
  * @return void
  */
-function monsterinsights_hook_callback( $args ) {
-	do_action( 'monsterinsights_' . $args['id'], $args );
+function monsterinsights_hook_callback($args) {
+	do_action('monsterinsights_' . $args['id'], $args);
 	return '';
 }
 
@@ -934,7 +934,7 @@ 
  */
 function monsterinsights_missing_callback($args) {
 	return sprintf(
-		__( 'The callback function used for the %s setting is missing.', 'google-analytics-for-wordpress' ),
+		__('The callback function used for the %s setting is missing.', 'google-analytics-for-wordpress'),
 		'<strong>' . $args['id'] . '</strong>'
 	);
 }
@@ -948,27 +948,27 @@ 
  * @param array $args Arguments passed by the setting
  * @return void
  */
-function monsterinsights_render_submit_field( $section, $page = 'tracking' ) {
+function monsterinsights_render_submit_field($section, $page = 'tracking') {
 	$html = '';
 	$settings = monsterinsights_get_registered_settings();
-	if ( is_array( $settings ) && ! empty( $settings[$section] ) && is_array( $settings[$section] ) ) {
+	if (is_array($settings) && ! empty($settings[$section]) && is_array($settings[$section])) {
 		$non_setting_types = monsterinsights_get_non_setting_types();
 		$submit_button     = false;
-		foreach ( $settings[$section] as $setting ) {
-			if ( ! empty( $non_setting_types ) && ! empty( $setting['type'] ) && ! in_array( $setting['type'], $non_setting_types ) ) {
-				if ( empty( $setting['faux'] ) ) {
+		foreach ($settings[$section] as $setting) {
+			if ( ! empty($non_setting_types) && ! empty($setting['type']) && ! in_array($setting['type'], $non_setting_types)) {
+				if (empty($setting['faux'])) {
 					$submit_button = true;
 					break;
 				}
 			}
 		}
-		if ( $submit_button ) {
-			$html .= '<input type="hidden" name="monsterinsights_settings_tab" value="' . esc_attr( $page ). '"/>';
-			$html .= '<input type="hidden" name="monsterinsights_settings_sub_tab" value="' .  esc_attr( $section ) . '"/>';
-			$html .= wp_nonce_field( 'monsterinsights-settings-nonce', 'monsterinsights-settings-nonce', true, false );
-			$html .= get_submit_button( esc_html__( 'Save Changes', 'google-analytics-for-wordpress' ), 'primary', 'monsterinsights-settings-submit', false );
+		if ($submit_button) {
+			$html .= '<input type="hidden" name="monsterinsights_settings_tab" value="' . esc_attr($page) . '"/>';
+			$html .= '<input type="hidden" name="monsterinsights_settings_sub_tab" value="' . esc_attr($section) . '"/>';
+			$html .= wp_nonce_field('monsterinsights-settings-nonce', 'monsterinsights-settings-nonce', true, false);
+			$html .= get_submit_button(esc_html__('Save Changes', 'google-analytics-for-wordpress'), 'primary', 'monsterinsights-settings-submit', false);
 		}
-		$html      = apply_filters( 'monsterinsights_html_after_submit_field', $html, $page, $section );
+		$html = apply_filters('monsterinsights_html_after_submit_field', $html, $page, $section);
 	}
 	return $html;
 }
@@ -976,17 +976,17 @@ 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_render_field( $args ) {
+function monsterinsights_render_field($args) {
 	$output = '';
-	$output .='<tr id="monsterinsights-input-' . monsterinsights_sanitize_key( $args['id'] ) .'">';
-		if ( ! empty( $args['name'] ) && empty( $args['no_label'] ) ) {
+	$output .= '<tr id="monsterinsights-input-' . monsterinsights_sanitize_key($args['id']) . '">';
+		if ( ! empty($args['name']) && empty($args['no_label'])) {
 			$output .= '<th scope="row">';
-				$output .='<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']">' . esc_html( $args["name"] ) . '</label>';
+				$output .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key($args['id']) . ']">' . esc_html($args["name"]) . '</label>';
 			$output .= '</th>';
 		}
 		$output .= '<td>';
-			$render  = ! empty( $args['type'] ) && function_exists( 'monsterinsights_' . $args['type'] . '_callback' ) ? 'monsterinsights_' . $args['type'] . '_callback' : 'monsterinsights_missing_callback';
-			$output .= call_user_func( $render, $args );
+			$render  = ! empty($args['type']) && function_exists('monsterinsights_' . $args['type'] . '_callback') ? 'monsterinsights_' . $args['type'] . '_callback' : 'monsterinsights_missing_callback';
+			$output .= call_user_func($render, $args);
 		$output .= '</td>';
 	$output .= '</tr>';
 	return $output;
@@ -995,24 +995,24 @@ 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_add_setting_tooltip( $html, $args ) { // @todo: enqueue tooltips
+function monsterinsights_add_setting_tooltip($html, $args) { // @todo: enqueue tooltips
 
-	if ( ! empty( $args['tooltip_title'] ) && ! empty( $args['tooltip_desc'] ) ) {
+	if ( ! empty($args['tooltip_title']) && ! empty($args['tooltip_desc'])) {
 		$tooltip = '<span alt="f223" class="monsterinsights-help-tip dashicons dashicons-editor-help" title="<strong>' . $args['tooltip_title'] . '</strong>: ' . $args['tooltip_desc'] . '"></span>';
 		$html .= $tooltip;
 	}
 
 	return $html;
 }
-add_filter( 'monsterinsights_after_setting_output', 'monsterinsights_add_setting_tooltip', 10, 2 );
+add_filter('monsterinsights_after_setting_output', 'monsterinsights_add_setting_tooltip', 10, 2);
 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_get_settings_notices( $delete_on_retrieve = true ) {
-	$notices = get_transient( 'monsterinsights_settings_notices' );
-	if ( $delete_on_retrieve ) {
-		delete_transient( 'monsterinsights_settings_notices' );
+function monsterinsights_get_settings_notices($delete_on_retrieve = true) {
+	$notices = get_transient('monsterinsights_settings_notices');
+	if ($delete_on_retrieve) {
+		delete_transient('monsterinsights_settings_notices');
 	}
 	return $notices;
 }
@@ -1020,30 +1020,30 @@ 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_add_settings_notice( $name, $type = 'success', $message = '' ) {
-	$notices = get_transient( 'monsterinsights_settings_notices' );
-	if ( empty( $notices ) ) {
+function monsterinsights_add_settings_notice($name, $type = 'success', $message = '') {
+	$notices = get_transient('monsterinsights_settings_notices');
+	if (empty($notices)) {
 		$notices          = array();
-		$notices[ $name ] = array( "type" => $type, "message" => $message );
+		$notices[$name] = array("type" => $type, "message" => $message);
 	} else {
-		$notices[ $name ] = array( "type" => $type, "message" => $message );
+		$notices[$name] = array("type" => $type, "message" => $message);
 	}
-	set_transient( 'monsterinsights_settings_notices', $notices );
+	set_transient('monsterinsights_settings_notices', $notices);
 }
 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_remove_settings_notice( $name ) {
-	$notices = get_transient( 'monsterinsights_settings_notices' );
+function monsterinsights_remove_settings_notice($name) {
+	$notices = get_transient('monsterinsights_settings_notices');
 	$found   = false;
-	if ( ! empty( $notices ) ) {
-		if ( isset( $notices[ $name] ) ) {
-			unset( $notices[ $name] );
-			set_transient( 'monsterinsights_settings_notices', $notices );
+	if ( ! empty($notices)) {
+		if (isset($notices[$name])) {
+			unset($notices[$name]);
+			set_transient('monsterinsights_settings_notices', $notices);
 			$found = true;
 		} else {
-			set_transient( 'monsterinsights_settings_notices', $notices );
+			set_transient('monsterinsights_settings_notices', $notices);
 		}
 	}
 	return $found;
@@ -1052,6 +1052,6 @@ 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_get_non_setting_types(){
-	return apply_filters( 'monsterinsights_non_setting_types', array(  'descriptive_text', 'hook', 'upgrade_notice', 'install_notice', 'notice' ) );
+function monsterinsights_get_non_setting_types() {
+	return apply_filters('monsterinsights_non_setting_types', array('descriptive_text', 'hook', 'upgrade_notice', 'install_notice', 'notice'));
 }
\ No newline at end of file

Indentation +562 added lines, -562 removed lines

@@ -19,37 +19,37 @@ 
  * @return void
 */
 function monsterinsights_get_section_settings( $section, $page = 'tracking' ) {
-	$output = '';
-	$settings = monsterinsights_get_registered_settings();
-	if ( is_array( $settings ) && ! empty( $settings[$section] ) && is_array( $settings[$section] ) ) {
-		foreach ( $settings[$section] as $setting ) {
-			$args = wp_parse_args( $setting, array(
-				'id'            => null,
-				'desc'          => '',
-				'name'          => '',
-				'size'          => null,
-				'options'       => '',
-				'std'           => '',
-				'min'           => null,
-				'max'           => null,
-				'step'          => null,
-				'select2'        => null,
-				'placeholder'   => null,
-				'allow_blank'   => true,
-				'readonly'      => false,
-				'faux'          => false,
-				'tooltip_title' => false,
-				'tooltip_desc'  => false,
-				'field_class'   => '',
-				'multiple'      => false,
-				'allowclear'    => true,
-				'notice_type'   => 'info',
-				'no_label'      => false,
-			) );
-			$output .= monsterinsights_render_field( $args );
-		}
-	}
-	return $output;
+    $output = '';
+    $settings = monsterinsights_get_registered_settings();
+    if ( is_array( $settings ) && ! empty( $settings[$section] ) && is_array( $settings[$section] ) ) {
+        foreach ( $settings[$section] as $setting ) {
+            $args = wp_parse_args( $setting, array(
+                'id'            => null,
+                'desc'          => '',
+                'name'          => '',
+                'size'          => null,
+                'options'       => '',
+                'std'           => '',
+                'min'           => null,
+                'max'           => null,
+                'step'          => null,
+                'select2'        => null,
+                'placeholder'   => null,
+                'allow_blank'   => true,
+                'readonly'      => false,
+                'faux'          => false,
+                'tooltip_title' => false,
+                'tooltip_desc'  => false,
+                'field_class'   => '',
+                'multiple'      => false,
+                'allowclear'    => true,
+                'notice_type'   => 'info',
+                'no_label'      => false,
+            ) );
+            $output .= monsterinsights_render_field( $args );
+        }
+    }
+    return $output;
 }
 
 /**
@@ -62,104 +62,104 @@ 
  */
 function monsterinsights_save_settings() {
 
-	// Check if user pressed the 'Update' button and nonce is valid
-	if ( ! isset( $_POST['monsterinsights-settings-submit'] ) ) {
-		return;
-	}
-
-	if ( ! wp_verify_nonce( $_POST['monsterinsights-settings-nonce'], 'monsterinsights-settings-nonce' ) ) {
-		return;
-	}
-
-	if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-		return;
-	}
-
-	if ( empty( $_POST['monsterinsights_settings_tab'] ) || empty( $_POST['monsterinsights_settings_sub_tab'] ) || $_POST['monsterinsights_settings_tab'] !== 'tracking' ) {
-		return;
-	}
-
-	// get subtab
-	$settings = monsterinsights_get_registered_settings();
-	$tab      = $_POST['monsterinsights_settings_sub_tab'];
-	if ( empty( $settings ) || !is_array( $settings ) || empty( $settings[ $tab ] ) || ! is_array( $settings[ $tab ] ) ) {
-		return;
-	}
-
-	// Okay we're good to sanitize, validate, and save this section's settings
-
-	// We only care about this sections's settings
-	$settings = $settings[ $tab ]; 
-
-	// Run a general sanitization for the tab for special fields
-	$input    = ! empty( $_POST['monsterinsights_settings'] ) ? $_POST['monsterinsights_settings'] : array();
-	$input    = apply_filters( 'monsterinsights_settings_' . $tab . '_sanitize', $input );
-
-	foreach( $settings as $id => $setting ) {
-
-		// If the value wasn't passed in, set to false, which will delete the option
-		$value          = isset( $input[ $id ] ) ? $input[ $id ] : false;
-		$previous_value = monsterinsights_get_option( $id, false );
-
-		// Sanitize/Validate
-		if ( empty( $setting['type'] ) ) {
-			continue;
-		}
-
-		// Some setting types are not actually settings, just keep moving along here
-		$non_setting_types = monsterinsights_get_non_setting_types();
-		$type              = $setting['type'];
-
-		if ( in_array( $type, $non_setting_types ) ) {
-			continue;
-		}
-
-		$args = wp_parse_args( $setting, array(
-			'id'            => null,
-			'desc'          => '',
-			'name'          => '',
-			'size'          => null,
-			'options'       => '',
-			'std'           => '',
-			'min'           => null,
-			'max'           => null,
-			'step'          => null,
-			'select2'        => null,
-			'placeholder'   => null,
-			'allow_blank'   => true,
-			'readonly'      => false,
-			'faux'          => false,
-			'tooltip_title' => false,
-			'tooltip_desc'  => false,
-			'field_class'   => '',
-			'multiple'      => false,
-			'allowclear'    => true,
-			'notice_type'   => 'info',
-		) );
-
-		// Sanitize settings
-		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $id  , $value, $id, $args, $previous_value );
-		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $type, $value, $id, $args, $previous_value );
-		$value = apply_filters( 'monsterinsights_settings_sanitize'         , $value, $id, $args, $previous_value );
-
-		// Save
-		if ( ! has_action( 'monsterinsights_settings_save_' . $args['type'] ) ) {
-			monsterinsights_update_option( $id, $value );
-		} else {
-			do_action( 'monsterinsights_settings_save_' . $args['type'], $value, $id, $args, $previous_value );
-		}
-	}
-	add_action( 'monsterinsights_tracking_' . $tab . '_tab_notice', 'monsterinsights_updated_settings' );
+    // Check if user pressed the 'Update' button and nonce is valid
+    if ( ! isset( $_POST['monsterinsights-settings-submit'] ) ) {
+        return;
+    }
+
+    if ( ! wp_verify_nonce( $_POST['monsterinsights-settings-nonce'], 'monsterinsights-settings-nonce' ) ) {
+        return;
+    }
+
+    if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+        return;
+    }
+
+    if ( empty( $_POST['monsterinsights_settings_tab'] ) || empty( $_POST['monsterinsights_settings_sub_tab'] ) || $_POST['monsterinsights_settings_tab'] !== 'tracking' ) {
+        return;
+    }
+
+    // get subtab
+    $settings = monsterinsights_get_registered_settings();
+    $tab      = $_POST['monsterinsights_settings_sub_tab'];
+    if ( empty( $settings ) || !is_array( $settings ) || empty( $settings[ $tab ] ) || ! is_array( $settings[ $tab ] ) ) {
+        return;
+    }
+
+    // Okay we're good to sanitize, validate, and save this section's settings
+
+    // We only care about this sections's settings
+    $settings = $settings[ $tab ]; 
+
+    // Run a general sanitization for the tab for special fields
+    $input    = ! empty( $_POST['monsterinsights_settings'] ) ? $_POST['monsterinsights_settings'] : array();
+    $input    = apply_filters( 'monsterinsights_settings_' . $tab . '_sanitize', $input );
+
+    foreach( $settings as $id => $setting ) {
+
+        // If the value wasn't passed in, set to false, which will delete the option
+        $value          = isset( $input[ $id ] ) ? $input[ $id ] : false;
+        $previous_value = monsterinsights_get_option( $id, false );
+
+        // Sanitize/Validate
+        if ( empty( $setting['type'] ) ) {
+            continue;
+        }
+
+        // Some setting types are not actually settings, just keep moving along here
+        $non_setting_types = monsterinsights_get_non_setting_types();
+        $type              = $setting['type'];
+
+        if ( in_array( $type, $non_setting_types ) ) {
+            continue;
+        }
+
+        $args = wp_parse_args( $setting, array(
+            'id'            => null,
+            'desc'          => '',
+            'name'          => '',
+            'size'          => null,
+            'options'       => '',
+            'std'           => '',
+            'min'           => null,
+            'max'           => null,
+            'step'          => null,
+            'select2'        => null,
+            'placeholder'   => null,
+            'allow_blank'   => true,
+            'readonly'      => false,
+            'faux'          => false,
+            'tooltip_title' => false,
+            'tooltip_desc'  => false,
+            'field_class'   => '',
+            'multiple'      => false,
+            'allowclear'    => true,
+            'notice_type'   => 'info',
+        ) );
+
+        // Sanitize settings
+        $value = apply_filters( 'monsterinsights_settings_sanitize_' . $id  , $value, $id, $args, $previous_value );
+        $value = apply_filters( 'monsterinsights_settings_sanitize_' . $type, $value, $id, $args, $previous_value );
+        $value = apply_filters( 'monsterinsights_settings_sanitize'         , $value, $id, $args, $previous_value );
+
+        // Save
+        if ( ! has_action( 'monsterinsights_settings_save_' . $args['type'] ) ) {
+            monsterinsights_update_option( $id, $value );
+        } else {
+            do_action( 'monsterinsights_settings_save_' . $args['type'], $value, $id, $args, $previous_value );
+        }
+    }
+    add_action( 'monsterinsights_tracking_' . $tab . '_tab_notice', 'monsterinsights_updated_settings' );
 }
 add_action( 'current_screen', 'monsterinsights_save_settings' );
 
 function monsterinsights_is_settings_tab( $tab = '' ){
-	$tabs = monsterinsights_get_settings_tabs();
-	if ( empty( $tab ) || empty( $tabs ) || ! is_string( $tab ) || ! is_array( $tabs ) ) {
-		return false;
-	}
+    $tabs = monsterinsights_get_settings_tabs();
+    if ( empty( $tab ) || empty( $tabs ) || ! is_string( $tab ) || ! is_array( $tabs ) ) {
+        return false;
+    }
 
-	return !empty( $tabs[$tab]);
+    return !empty( $tabs[$tab]);
 }
 
 /**
@@ -170,26 +170,26 @@ 
  * @return array Key is the setting ID, value is the type of setting it is registered as
  */
 function monsterinsights_get_registered_settings_types( $section = '' ) {
-	$settings      = monsterinsights_get_registered_settings();
-	$setting_types = array();
-	if ( ! empty( $section ) ) {
-		if ( ! empty( $settings[$section] ) ) {
-			foreach ( $settings[$section] as $setting ) {
-				if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
-					$setting_types[ $setting['id'] ] = $setting['type'];
-				}
-			}
-		}
-	} else {
-		foreach ( $settings as $tab ) {
-			foreach ( $tab as $setting ) {
-				if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
-					$setting_types[ $setting['id'] ] = $setting['type'];
-				}
-			}
-		}
-	}
-	return $setting_types;
+    $settings      = monsterinsights_get_registered_settings();
+    $setting_types = array();
+    if ( ! empty( $section ) ) {
+        if ( ! empty( $settings[$section] ) ) {
+            foreach ( $settings[$section] as $setting ) {
+                if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
+                    $setting_types[ $setting['id'] ] = $setting['type'];
+                }
+            }
+        }
+    } else {
+        foreach ( $settings as $tab ) {
+            foreach ( $tab as $setting ) {
+                if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
+                    $setting_types[ $setting['id'] ] = $setting['type'];
+                }
+            }
+        }
+    }
+    return $setting_types;
 }
 
 /**
@@ -200,90 +200,90 @@ 
  * @return string $input Sanitizied value
  */
 function monsterinsights_sanitize_rich_editor_field( $input ) {
-	$tags = array(
-		'p' => array(
-			'class' => array(),
-			'id'    => array(),
-		),
-		'span' => array(
-			'class' => array(),
-			'id'    => array(),
-		),
-		'a' => array(
-			'href' => array(),
-			'title' => array(),
-			'class' => array(),
-			'title' => array(),
-			'id'    => array(),
-		),
-		'strong' => array(),
-		'em' => array(),
-		'br' => array(),
-		'img' => array(
-			'src'   => array(),
-			'title' => array(),
-			'alt'   => array(),
-			'id'    => array(),
-		),
-		'div' => array(
-			'class' => array(),
-			'id'    => array(),
-		),
-		'ul' => array(
-			'class' => array(),
-			'id'    => array(),
-		),
-		'li' => array(
-			'class' => array(),
-			'id'    => array(),
-		)
-	);
-
-	//$allowed_tags = apply_filters( 'monsterinsights_allowed_html_tags', $tags );
-
-	return trim( wp_kses( $input, $allowed_tags ) );
+    $tags = array(
+        'p' => array(
+            'class' => array(),
+            'id'    => array(),
+        ),
+        'span' => array(
+            'class' => array(),
+            'id'    => array(),
+        ),
+        'a' => array(
+            'href' => array(),
+            'title' => array(),
+            'class' => array(),
+            'title' => array(),
+            'id'    => array(),
+        ),
+        'strong' => array(),
+        'em' => array(),
+        'br' => array(),
+        'img' => array(
+            'src'   => array(),
+            'title' => array(),
+            'alt'   => array(),
+            'id'    => array(),
+        ),
+        'div' => array(
+            'class' => array(),
+            'id'    => array(),
+        ),
+        'ul' => array(
+            'class' => array(),
+            'id'    => array(),
+        ),
+        'li' => array(
+            'class' => array(),
+            'id'    => array(),
+        )
+    );
+
+    //$allowed_tags = apply_filters( 'monsterinsights_allowed_html_tags', $tags );
+
+    return trim( wp_kses( $input, $allowed_tags ) );
 }
 add_filter( 'monsterinsights_settings_sanitize_rich_editor', 'monsterinsights_sanitize_rich_editor_field' );
 
 if ( ! function_exists( 'sanitize_textarea_field' ) ) {
-	function sanitize_textarea_field( $str ) {
-		$filtered = _sanitize_text_fields( $str, true );
-		return apply_filters( 'sanitize_textarea_field', $filtered, $str );
-	}
+    function sanitize_textarea_field( $str ) {
+        $filtered = _sanitize_text_fields( $str, true );
+        return apply_filters( 'sanitize_textarea_field', $filtered, $str );
+    }
 }
 
 if ( ! function_exists( 'sanitize_textarea_field' ) ) {
-	function _sanitize_text_fields( $str, $keep_newlines = false ) {
-		$filtered = wp_check_invalid_utf8( $str );
+    function _sanitize_text_fields( $str, $keep_newlines = false ) {
+        $filtered = wp_check_invalid_utf8( $str );
 	 
-		if ( strpos($filtered, '<') !== false ) {
-			$filtered = wp_pre_kses_less_than( $filtered );
-			// This will strip extra whitespace for us.
-			$filtered = wp_strip_all_tags( $filtered, false );
+        if ( strpos($filtered, '<') !== false ) {
+            $filtered = wp_pre_kses_less_than( $filtered );
+            // This will strip extra whitespace for us.
+            $filtered = wp_strip_all_tags( $filtered, false );
 	 
-			// Use html entities in a special case to make sure no later
-			// newline stripping stage could lead to a functional tag
-			$filtered = str_replace("<\n", "&lt;\n", $filtered);
-		}
+            // Use html entities in a special case to make sure no later
+            // newline stripping stage could lead to a functional tag
+            $filtered = str_replace("<\n", "&lt;\n", $filtered);
+        }
 	 
-		if ( ! $keep_newlines ) {
-			$filtered = preg_replace( '/[\r\n\t ]+/', ' ', $filtered );
-		}
-		$filtered = trim( $filtered );
+        if ( ! $keep_newlines ) {
+            $filtered = preg_replace( '/[\r\n\t ]+/', ' ', $filtered );
+        }
+        $filtered = trim( $filtered );
 	 
-		$found = false;
-		while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
-			$filtered = str_replace($match[0], '', $filtered);
-			$found = true;
-		}
+        $found = false;
+        while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
+            $filtered = str_replace($match[0], '', $filtered);
+            $found = true;
+        }
 	 
-		if ( $found ) {
-			// Strip out the whitespace that may now exist after removing the octets.
-			$filtered = trim( preg_replace('/ +/', ' ', $filtered) );
-		}
+        if ( $found ) {
+            // Strip out the whitespace that may now exist after removing the octets.
+            $filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+        }
 	 
-		return $filtered;
-	}
+        return $filtered;
+    }
 }
 
 /**
@@ -293,7 +293,7 @@ 
  * @todo  docbloc
  */
 function monsterinsights_sanitize_textarea_field( $value, $id, $setting, $previous_value ) {
-	return sanitize_textarea_field( $value );
+    return sanitize_textarea_field( $value );
 }
 add_filter( 'monsterinsights_settings_sanitize_textarea', 'monsterinsights_sanitize_textarea_field', 10, 4 );
 
@@ -304,7 +304,7 @@ 
  * @todo  docbloc
  */
 function monsterinsights_sanitize_checkbox_field( $value, $id, $setting, $previous_value ) {
-	return (bool) $value;
+    return (bool) $value;
 }
 add_filter( 'monsterinsights_settings_sanitize_checkbox', 'monsterinsights_sanitize_checkbox_field', 10, 4 );
 
@@ -315,15 +315,15 @@ 
  * @todo  docbloc
  */
 function monsterinsights_sanitize_multicheck_field( $value, $id, $setting, $previous_value ) {
-	$save_value = array();
-	if ( ! empty( $value ) && is_array( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
-			if ( in_array( $key, $value ) ) {
-				$save_value[] = $key;
-			}
-		}
-	}
-	return $save_value;
+    $save_value = array();
+    if ( ! empty( $value ) && is_array( $value ) ) {
+        foreach( $setting['options'] as $key => $option ){
+            if ( in_array( $key, $value ) ) {
+                $save_value[] = $key;
+            }
+        }
+    }
+    return $save_value;
 }
 add_filter( 'monsterinsights_settings_sanitize_multicheck', 'monsterinsights_sanitize_multicheck_field', 10, 4 );
 
@@ -334,34 +334,34 @@ 
  * @todo  docbloc
  */
 function monsterinsights_sanitize_select_field( $value, $id, $setting, $previous_value ) {
-	if ( ! empty( $setting['multiple'] ) && $setting['multiple'] ) {
-		$save_value = array();
-	} else {
-		$save_value = '';
-	}
-	if ( ! empty( $value ) && is_array( $value ) ) {
-		if ( $setting['multiple'] ) {
-			foreach ( $value as $vid => $vname ) {
-				foreach( $setting['options'] as $key => $option ){
-					if ( $key === $vname ) {
-						$save_value[] = $key;
-						break;
-					}
-				}
-			}
-		} else {
-			foreach( $setting['options'] as $key => $option ){
-				if ( is_array( $value ) && in_array( $key, $value ) ) {
-					$save_value = $key;
-					break;
-				} else if ( is_string( $value ) && $key === $value ){
-					$save_value = $key;
-					break;
-				}
-			}
-		}
-	}
-	return $save_value;
+    if ( ! empty( $setting['multiple'] ) && $setting['multiple'] ) {
+        $save_value = array();
+    } else {
+        $save_value = '';
+    }
+    if ( ! empty( $value ) && is_array( $value ) ) {
+        if ( $setting['multiple'] ) {
+            foreach ( $value as $vid => $vname ) {
+                foreach( $setting['options'] as $key => $option ){
+                    if ( $key === $vname ) {
+                        $save_value[] = $key;
+                        break;
+                    }
+                }
+            }
+        } else {
+            foreach( $setting['options'] as $key => $option ){
+                if ( is_array( $value ) && in_array( $key, $value ) ) {
+                    $save_value = $key;
+                    break;
+                } else if ( is_string( $value ) && $key === $value ){
+                    $save_value = $key;
+                    break;
+                }
+            }
+        }
+    }
+    return $save_value;
 }
 add_filter( 'monsterinsights_settings_sanitize_select', 'monsterinsights_sanitize_select_field', 10, 4 );
 
@@ -373,15 +373,15 @@ 
  * @todo  docbloc
  */
 function monsterinsights_sanitize_radio_field( $value, $id, $setting, $previous_value ) {
-	$save_value = '';
-	if ( ! empty( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
-			if ( $key === $value ) {
-				$save_value = $key;
-			}
-		}
-	}
-	return $save_value;
+    $save_value = '';
+    if ( ! empty( $value ) ) {
+        foreach( $setting['options'] as $key => $option ){
+            if ( $key === $value ) {
+                $save_value = $key;
+            }
+        }
+    }
+    return $save_value;
 }
 add_filter( 'monsterinsights_settings_sanitize_radio', 'monsterinsights_sanitize_radio_field', 10, 4 );
 
@@ -392,7 +392,7 @@ 
  * @todo  docbloc
  */
 function monsterinsights_sanitize_text_field( $value, $id, $setting, $previous_value ) {
-	return sanitize_text_field( $value );
+    return sanitize_text_field( $value );
 }
 add_filter( 'monsterinsights_settings_sanitize_text', 'monsterinsights_sanitize_text_field', 10, 4 );
 
@@ -403,7 +403,7 @@ 
  * @todo  docbloc
  */
 function monsterinsights_sanitize_password_field( $value, $id, $setting, $previous_value ) {
-	return sanitize_text_field( $value );
+    return sanitize_text_field( $value );
 }
 add_filter( 'monsterinsights_settings_sanitize_password', 'monsterinsights_sanitize_password_field', 10, 4 );
 
@@ -414,13 +414,13 @@ 
  * @todo  docbloc
  */
 function monsterinsights_sanitize_number_field( $value, $id, $setting, $previous_value ) {
-	if ( is_int( (int) $value ) ) {
-		return $value;
-	} else if ( is_int( $previous_value ) ) {
-		return $previous_value;
-	} else {
-		return 0;
-	}
+    if ( is_int( (int) $value ) ) {
+        return $value;
+    } else if ( is_int( $previous_value ) ) {
+        return $previous_value;
+    } else {
+        return 0;
+    }
 }
 add_filter( 'monsterinsights_settings_sanitize_number', 'monsterinsights_sanitize_number_field', 10, 4 );
 
@@ -431,11 +431,11 @@ 
  * @todo  docbloc
  */
 function monsterinsights_sanitize_unfiltered_textarea_field( $value, $id, $setting, $previous_value ) {
-	if ( current_user_can( 'unfiltered_html' ) || current_user_can( 'monsterinsights_unfiltered_html' ) ) {
-		return $value;
-	} else {
-		return $previous_value;
-	}
+    if ( current_user_can( 'unfiltered_html' ) || current_user_can( 'monsterinsights_unfiltered_html' ) ) {
+        return $value;
+    } else {
+        return $previous_value;
+    }
 }
 add_filter( 'monsterinsights_settings_unfiltered_textarea_number', 'monsterinsights_sanitize_unfiltered_textarea_field', 10, 4 );
 
@@ -449,16 +449,16 @@ 
  * @return string Sanitized key
  */
 function monsterinsights_sanitize_key( $key ) {
-	$raw_key = $key;
-	$key = preg_replace( '/[^a-zA-Z0-9_\-\.\:\/]/', '', $key );
-	/**
-	 * Filter a sanitized key string.
-	 *
-	 * @since 6.0.0
-	 * @param string $key     Sanitized key.
-	 * @param string $raw_key The key prior to sanitization.
-	 */
-	return apply_filters( 'monsterinsights_sanitize_key', $key, $raw_key );
+    $raw_key = $key;
+    $key = preg_replace( '/[^a-zA-Z0-9_\-\.\:\/]/', '', $key );
+    /**
+     * Filter a sanitized key string.
+     *
+     * @since 6.0.0
+     * @param string $key     Sanitized key.
+     * @param string $raw_key The key prior to sanitization.
+     */
+    return apply_filters( 'monsterinsights_sanitize_key', $key, $raw_key );
 }
 
 /**
@@ -470,14 +470,14 @@ 
  */
 function monsterinsights_sanitize_html_class( $class = '' ) {
 
-	if ( is_string( $class ) ) {
-		$class = sanitize_html_class( $class );
-	} else if ( is_array( $class ) ) {
-		$class = array_values( array_map( 'sanitize_html_class', $class ) );
-		$class = implode( ' ', array_unique( $class ) );
-	}
+    if ( is_string( $class ) ) {
+        $class = sanitize_html_class( $class );
+    } else if ( is_array( $class ) ) {
+        $class = array_values( array_map( 'sanitize_html_class', $class ) );
+        $class = implode( ' ', array_unique( $class ) );
+    }
 
-	return $class;
+    return $class;
 
 }
 
@@ -491,19 +491,19 @@ 
  * @return array $pages_options An array of the pages
  */
 function monsterinsights_get_pages( $force = false ) {
-	$pages_options = array( '' => '' ); // Blank option
-	if( ( ! isset( $_GET['page'] ) || 'monsterinsights_settings' != $_GET['page'] ) && ! $force ) {
-		return $pages_options;
-	}
-
-	$pages = get_pages();
-	if ( $pages ) {
-		foreach ( $pages as $page ) {
-			$pages_options[ $page->ID ] = $page->post_title;
-		}
-	}
-
-	return $pages_options;
+    $pages_options = array( '' => '' ); // Blank option
+    if( ( ! isset( $_GET['page'] ) || 'monsterinsights_settings' != $_GET['page'] ) && ! $force ) {
+        return $pages_options;
+    }
+
+    $pages = get_pages();
+    if ( $pages ) {
+        foreach ( $pages as $page ) {
+            $pages_options[ $page->ID ] = $page->post_title;
+        }
+    }
+
+    return $pages_options;
 }
 
 /**
@@ -517,32 +517,32 @@ 
  * @return void
  */
 function monsterinsights_checkbox_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+    $monsterinsights_option = monsterinsights_get_option( $args['id'] );
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$name = '';
-	} else {
-		$name = 'name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']"';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $name = '';
+    } else {
+        $name = 'name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']"';
+    }
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+    $class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	$checked  = ! empty( $monsterinsights_option ) ? checked( 1, $monsterinsights_option, false ) : '';
+    $checked  = ! empty( $monsterinsights_option ) ? checked( 1, $monsterinsights_option, false ) : '';
 
-	$disabled = '';
+    $disabled = '';
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		// Disable class
-		$disabled = 'disabled="disabled"';
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        // Disable class
+        $disabled = 'disabled="disabled"';
 		
-		// Checked
-		$checked  = isset( $args['std'] ) && true === $args['std'] ? checked( 1, 1, false ) : '';
-	}
+        // Checked
+        $checked  = isset( $args['std'] ) && true === $args['std'] ? checked( 1, 1, false ) : '';
+    }
 
-	$html     = '<input type="checkbox" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']"' . $name . ' value="1" ' . $checked . ' class="' . $class . '" ' . $disabled . ' />';
-	$html    .= '<p class="description">'  . wp_kses_post( $args['desc'] ) . '</p>';
+    $html     = '<input type="checkbox" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']"' . $name . ' value="1" ' . $checked . ' class="' . $class . '" ' . $disabled . ' />';
+    $html    .= '<p class="description">'  . wp_kses_post( $args['desc'] ) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 /**
@@ -556,21 +556,21 @@ 
  * @return void
  */
 function monsterinsights_multicheck_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+    $monsterinsights_option = monsterinsights_get_option( $args['id'] );
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+    $class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	$html = '';
-	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ):
-			if( isset( $monsterinsights_option[ $key ] ) ) { $enabled = $option; } else { $enabled = NULL; }
-			$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
-			$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">' . wp_kses_post( $option ) . '</label><br/>';
-		endforeach;
-		$html .= '<p class="description">' . $args['desc'] . '</p>';
-	}
+    $html = '';
+    if ( ! empty( $args['options'] ) ) {
+        foreach( $args['options'] as $key => $option ):
+            if( isset( $monsterinsights_option[ $key ] ) ) { $enabled = $option; } else { $enabled = NULL; }
+            $html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
+            $html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">' . wp_kses_post( $option ) . '</label><br/>';
+        endforeach;
+        $html .= '<p class="description">' . $args['desc'] . '</p>';
+    }
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 
@@ -585,29 +585,29 @@ 
  * @return void
  */
 function monsterinsights_radio_callback( $args ) {
-	$monsterinsights_options = monsterinsights_get_option( $args['id'] );
+    $monsterinsights_options = monsterinsights_get_option( $args['id'] );
 
-	$html = '';
+    $html = '';
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+    $class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	foreach ( $args['options'] as $key => $option ) :
-		$checked = false;
+    foreach ( $args['options'] as $key => $option ) :
+        $checked = false;
 
-		if ( $monsterinsights_options && $monsterinsights_options == $key ) {
-			$checked = true;
-		} else if( isset( $args['std'] ) && $args['std'] == $key && ! $monsterinsights_options ) {
-			$checked = true;
-		}
+        if ( $monsterinsights_options && $monsterinsights_options == $key ) {
+            $checked = true;
+        } else if( isset( $args['std'] ) && $args['std'] == $key && ! $monsterinsights_options ) {
+            $checked = true;
+        }
 
-		$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">';
-		$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="radio" value="' . monsterinsights_sanitize_key( $key ) . '" ' . checked(true, $checked, false) . '/>&nbsp;';
-		$html .= esc_html( $option ) . '</label>';
-	endforeach;
+        $html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">';
+        $html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="radio" value="' . monsterinsights_sanitize_key( $key ) . '" ' . checked(true, $checked, false) . '/>&nbsp;';
+        $html .= esc_html( $option ) . '</label>';
+    endforeach;
 
-	$html .= '<p class="description">' . apply_filters( 'monsterinsights_after_setting_output', wp_kses_post( $args['desc'] ), $args ) . '</p>';
+    $html .= '<p class="description">' . apply_filters( 'monsterinsights_after_setting_output', wp_kses_post( $args['desc'] ), $args ) . '</p>';
 
-	return $html;
+    return $html;
 }
 
 /**
@@ -621,33 +621,33 @@ 
  * @return void
  */
 function monsterinsights_text_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
-
-	if ( $monsterinsights_option ) {
-		$value = $monsterinsights_option;
-	} elseif( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
-		$value = '';
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
-
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
-
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
-
-	$disabled = ! empty( $args['disabled'] ) ? ' disabled="disabled"' : '';
-	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
-	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html     = '<input type="text" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . $disabled . ' placeholder="' . esc_attr( $args['placeholder'] ) . '"/>';
-	$html    .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
-
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    $monsterinsights_option = monsterinsights_get_option( $args['id'] );
+
+    if ( $monsterinsights_option ) {
+        $value = $monsterinsights_option;
+    } elseif( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
+        $value = '';
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
+
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
+
+    $class = monsterinsights_sanitize_html_class( $args['field_class'] );
+
+    $disabled = ! empty( $args['disabled'] ) ? ' disabled="disabled"' : '';
+    $readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
+    $size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html     = '<input type="text" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . $disabled . ' placeholder="' . esc_attr( $args['placeholder'] ) . '"/>';
+    $html    .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 /**
@@ -661,33 +661,33 @@ 
  * @return void
  */
 function monsterinsights_number_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+    $monsterinsights_option = monsterinsights_get_option( $args['id'] );
 
-	if ( $monsterinsights_option ) {
-		$value = $monsterinsights_option;
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( $monsterinsights_option ) {
+        $value = $monsterinsights_option;
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	if ( isset( $args['faux'] ) && true === $args['faux'] ) {
-		$args['readonly'] = true;
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-		$name  = '';
-	} else {
-		$name = 'name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']"';
-	}
+    if ( isset( $args['faux'] ) && true === $args['faux'] ) {
+        $args['readonly'] = true;
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+        $name  = '';
+    } else {
+        $name = 'name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']"';
+    }
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+    $class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	$max  = isset( $args['max'] )  ? $args['max']   : 999999;
-	$min  = isset( $args['min'] )  ? $args['min']   : 0;
-	$step = isset( $args['step'] ) ? $args['step'] : 1;
+    $max  = isset( $args['max'] )  ? $args['max']   : 999999;
+    $min  = isset( $args['min'] )  ? $args['min']   : 0;
+    $step = isset( $args['step'] ) ? $args['step'] : 1;
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
+    $html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 /**
@@ -701,20 +701,20 @@ 
  * @return void
  */
 function monsterinsights_textarea_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+    $monsterinsights_option = monsterinsights_get_option( $args['id'] );
 
-	if ( $monsterinsights_option ) {
-		$value = $monsterinsights_option;
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( $monsterinsights_option ) {
+        $value = $monsterinsights_option;
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+    $class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+    $html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
+    $html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 
@@ -730,24 +730,24 @@ 
  */
 function monsterinsights_unfiltered_textarea_callback( $args ) {
 	
-	if ( current_user_can( 'unfiltered_html' ) || current_user_can( 'monsterinsights_unfiltered_html' ) ) {
-		$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+    if ( current_user_can( 'unfiltered_html' ) || current_user_can( 'monsterinsights_unfiltered_html' ) ) {
+        $monsterinsights_option = monsterinsights_get_option( $args['id'] );
 
-		if ( $monsterinsights_option ) {
-			$value = $monsterinsights_option;
-		} else {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
-		}
+        if ( $monsterinsights_option ) {
+            $value = $monsterinsights_option;
+        } else {
+            $value = isset( $args['std'] ) ? $args['std'] : '';
+        }
 
-		$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+        $class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-		$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . stripslashes( $value ) . '</textarea>';
-		$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
-	} else {
-		$html .= sprintf( esc_html__( 'You must have the %s capability to view/edit this setting', 'google-analytics-for-wordpress' ), '"unfiltered_html"' );
-	}
+        $html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . stripslashes( $value ) . '</textarea>';
+        $html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+    } else {
+        $html .= sprintf( esc_html__( 'You must have the %s capability to view/edit this setting', 'google-analytics-for-wordpress' ), '"unfiltered_html"' );
+    }
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 /**
@@ -761,21 +761,21 @@ 
  * @return void
  */
 function monsterinsights_password_callback( $args ) {
-	$monsterinsights_options = monsterinsights_get_option( $args['id'] );
+    $monsterinsights_options = monsterinsights_get_option( $args['id'] );
 
-	if ( $monsterinsights_options ) {
-		$value = $monsterinsights_options;
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( $monsterinsights_options ) {
+        $value = $monsterinsights_options;
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+    $class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
-	$html = '<input type="password" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
-	$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
+    $size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
+    $html = '<input type="password" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']" value="' . esc_attr( $value ) . '"/>';
+    $html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 /**
@@ -789,43 +789,43 @@ 
  * @return void
  */
 function monsterinsights_select_callback($args) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+    $monsterinsights_option = monsterinsights_get_option( $args['id'] );
 
-	if ( $monsterinsights_option ) {
-		$value = $monsterinsights_option;
-	} else {
-		$value = isset( $args['std'] ) ? $args['std'] : '';
-	}
+    if ( $monsterinsights_option ) {
+        $value = $monsterinsights_option;
+    } else {
+        $value = isset( $args['std'] ) ? $args['std'] : '';
+    }
 
-	if ( isset( $args['placeholder'] ) ) {
-		$placeholder = $args['placeholder'];
-	} else {
-		$placeholder = '';
-	}
+    if ( isset( $args['placeholder'] ) ) {
+        $placeholder = $args['placeholder'];
+    } else {
+        $placeholder = '';
+    }
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+    $class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	if ( isset( $args['select2'] ) ) {
-		$class .= ' monsterinsights-select300';
-	}
+    if ( isset( $args['select2'] ) ) {
+        $class .= ' monsterinsights-select300';
+    }
 
-	$allowclear   = isset( $args['allowclear'] ) ? (bool) $args['allowclear'] : false;
-	$multiple     = isset( $args['multiple'] )   ? (bool) $args['multiple'] : false;
-	$multiple     = $multiple ? 'multiple="multiple"' : '';
-	$multiple_arg = $multiple ? '[]' : '';
+    $allowclear   = isset( $args['allowclear'] ) ? (bool) $args['allowclear'] : false;
+    $multiple     = isset( $args['multiple'] )   ? (bool) $args['multiple'] : false;
+    $multiple     = $multiple ? 'multiple="multiple"' : '';
+    $multiple_arg = $multiple ? '[]' : '';
 
-	$html = '<select id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']' . $multiple_arg .'" class="' . $class . '" data-placeholder="' . esc_html( $placeholder ) . '" data-allow-clear="' . $allowclear . '" ' . $multiple . ' />';
+    $html = '<select id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']' . $multiple_arg .'" class="' . $class . '" data-placeholder="' . esc_html( $placeholder ) . '" data-allow-clear="' . $allowclear . '" ' . $multiple . ' />';
 
-	foreach ( $args['options'] as $option => $name ) {
-		$selected = ! empty( $value ) && is_array( $value ) ? in_array( $option, $value ) :  $value === $option;
-		$selected = selected( true, $selected, false );
-		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
-	}
+    foreach ( $args['options'] as $option => $name ) {
+        $selected = ! empty( $value ) && is_array( $value ) ? in_array( $option, $value ) :  $value === $option;
+        $selected = selected( true, $selected, false );
+        $html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
+    }
 
-	$html .= '</select>';
-	$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
+    $html .= '</select>';
+    $html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 /**
@@ -837,29 +837,29 @@ 
  * @param array $args Arguments passed by the setting
  */
 function monsterinsights_rich_editor_callback( $args ) {
-	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
+    $monsterinsights_option = monsterinsights_get_option( $args['id'] );
 
-	if ( $monsterinsights_option ) {
-		$value = $monsterinsights_option;
-	} else {
-		if( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
-			$value = '';
-		} else {
-			$value = isset( $args['std'] ) ? $args['std'] : '';
-		}
-	}
+    if ( $monsterinsights_option ) {
+        $value = $monsterinsights_option;
+    } else {
+        if( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
+            $value = '';
+        } else {
+            $value = isset( $args['std'] ) ? $args['std'] : '';
+        }
+    }
 
-	$rows = isset( $args['size'] ) ? $args['size'] : 20;
+    $rows = isset( $args['size'] ) ? $args['size'] : 20;
 
-	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
+    $class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	ob_start();
-	wp_editor( stripslashes( $value ), 'monsterinsights_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'monsterinsights_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'editor_class' => $class ) );
-	$html = ob_get_clean();
+    ob_start();
+    wp_editor( stripslashes( $value ), 'monsterinsights_settings_' . esc_attr( $args['id'] ), array( 'textarea_name' => 'monsterinsights_settings[' . esc_attr( $args['id'] ) . ']', 'textarea_rows' => absint( $rows ), 'editor_class' => $class ) );
+    $html = ob_get_clean();
 
-	$html .= '<br/><p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
+    $html .= '<br/><p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 /**
@@ -872,8 +872,8 @@ 
  * @return void
  */
 function monsterinsights_descriptive_text_callback( $args ) {
-	$html = wp_kses_post( $args['desc'] );
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    $html = wp_kses_post( $args['desc'] );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 /**
@@ -887,8 +887,8 @@ 
  * @return void
  */
 function monsterinsights_notice_callback( $args ) {
-	$html = monsterinsights_get_message( $args['notice_type'], $args['desc'] );
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
+    $html = monsterinsights_get_message( $args['notice_type'], $args['desc'] );
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
 
 /**
@@ -902,11 +902,11 @@ 
  * @return void
  */
 function monsterinsights_upgrade_notice_callback( $args ) {
-	$html =   '<div class="monsterinsights-upsell-box"><h2>' . esc_html( $args['name' ] ) . '</h2>'
-			. '<p class="monsterinsights-upsell-lite-text">' . $args['desc'] . '</p>'
-			. '<p class="monsterinsights-upsell-button-par"><a href="https://www.monsterinsights.com/lite/" class="monsterinsights-upsell-box-button button button-primary">' . __( 'Click here to Upgrade', 'google-analytics-for-wordpress' ) . '</a></p>'
-			. '</div>';
-	return apply_filters( 'monsterinsights_after_setting_output', $html, $args ); 
+    $html =   '<div class="monsterinsights-upsell-box"><h2>' . esc_html( $args['name' ] ) . '</h2>'
+            . '<p class="monsterinsights-upsell-lite-text">' . $args['desc'] . '</p>'
+            . '<p class="monsterinsights-upsell-button-par"><a href="https://www.monsterinsights.com/lite/" class="monsterinsights-upsell-box-button button button-primary">' . __( 'Click here to Upgrade', 'google-analytics-for-wordpress' ) . '</a></p>'
+            . '</div>';
+    return apply_filters( 'monsterinsights_after_setting_output', $html, $args ); 
 }
 
 /**
@@ -919,8 +919,8 @@ 
  * @return void
  */
 function monsterinsights_hook_callback( $args ) {
-	do_action( 'monsterinsights_' . $args['id'], $args );
-	return '';
+    do_action( 'monsterinsights_' . $args['id'], $args );
+    return '';
 }
 
 /**
@@ -933,10 +933,10 @@ 
  * @return void
  */
 function monsterinsights_missing_callback($args) {
-	return sprintf(
-		__( 'The callback function used for the %s setting is missing.', 'google-analytics-for-wordpress' ),
-		'<strong>' . $args['id'] . '</strong>'
-	);
+    return sprintf(
+        __( 'The callback function used for the %s setting is missing.', 'google-analytics-for-wordpress' ),
+        '<strong>' . $args['id'] . '</strong>'
+    );
 }
 
 /**
@@ -949,47 +949,47 @@ 
  * @return void
  */
 function monsterinsights_render_submit_field( $section, $page = 'tracking' ) {
-	$html = '';
-	$settings = monsterinsights_get_registered_settings();
-	if ( is_array( $settings ) && ! empty( $settings[$section] ) && is_array( $settings[$section] ) ) {
-		$non_setting_types = monsterinsights_get_non_setting_types();
-		$submit_button     = false;
-		foreach ( $settings[$section] as $setting ) {
-			if ( ! empty( $non_setting_types ) && ! empty( $setting['type'] ) && ! in_array( $setting['type'], $non_setting_types ) ) {
-				if ( empty( $setting['faux'] ) ) {
-					$submit_button = true;
-					break;
-				}
-			}
-		}
-		if ( $submit_button ) {
-			$html .= '<input type="hidden" name="monsterinsights_settings_tab" value="' . esc_attr( $page ). '"/>';
-			$html .= '<input type="hidden" name="monsterinsights_settings_sub_tab" value="' .  esc_attr( $section ) . '"/>';
-			$html .= wp_nonce_field( 'monsterinsights-settings-nonce', 'monsterinsights-settings-nonce', true, false );
-			$html .= get_submit_button( esc_html__( 'Save Changes', 'google-analytics-for-wordpress' ), 'primary', 'monsterinsights-settings-submit', false );
-		}
-		$html      = apply_filters( 'monsterinsights_html_after_submit_field', $html, $page, $section );
-	}
-	return $html;
+    $html = '';
+    $settings = monsterinsights_get_registered_settings();
+    if ( is_array( $settings ) && ! empty( $settings[$section] ) && is_array( $settings[$section] ) ) {
+        $non_setting_types = monsterinsights_get_non_setting_types();
+        $submit_button     = false;
+        foreach ( $settings[$section] as $setting ) {
+            if ( ! empty( $non_setting_types ) && ! empty( $setting['type'] ) && ! in_array( $setting['type'], $non_setting_types ) ) {
+                if ( empty( $setting['faux'] ) ) {
+                    $submit_button = true;
+                    break;
+                }
+            }
+        }
+        if ( $submit_button ) {
+            $html .= '<input type="hidden" name="monsterinsights_settings_tab" value="' . esc_attr( $page ). '"/>';
+            $html .= '<input type="hidden" name="monsterinsights_settings_sub_tab" value="' .  esc_attr( $section ) . '"/>';
+            $html .= wp_nonce_field( 'monsterinsights-settings-nonce', 'monsterinsights-settings-nonce', true, false );
+            $html .= get_submit_button( esc_html__( 'Save Changes', 'google-analytics-for-wordpress' ), 'primary', 'monsterinsights-settings-submit', false );
+        }
+        $html      = apply_filters( 'monsterinsights_html_after_submit_field', $html, $page, $section );
+    }
+    return $html;
 }
 
 /** 
  * @todo  docbloc
  */
 function monsterinsights_render_field( $args ) {
-	$output = '';
-	$output .='<tr id="monsterinsights-input-' . monsterinsights_sanitize_key( $args['id'] ) .'">';
-		if ( ! empty( $args['name'] ) && empty( $args['no_label'] ) ) {
-			$output .= '<th scope="row">';
-				$output .='<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']">' . esc_html( $args["name"] ) . '</label>';
-			$output .= '</th>';
-		}
-		$output .= '<td>';
-			$render  = ! empty( $args['type'] ) && function_exists( 'monsterinsights_' . $args['type'] . '_callback' ) ? 'monsterinsights_' . $args['type'] . '_callback' : 'monsterinsights_missing_callback';
-			$output .= call_user_func( $render, $args );
-		$output .= '</td>';
-	$output .= '</tr>';
-	return $output;
+    $output = '';
+    $output .='<tr id="monsterinsights-input-' . monsterinsights_sanitize_key( $args['id'] ) .'">';
+        if ( ! empty( $args['name'] ) && empty( $args['no_label'] ) ) {
+            $output .= '<th scope="row">';
+                $output .='<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']">' . esc_html( $args["name"] ) . '</label>';
+            $output .= '</th>';
+        }
+        $output .= '<td>';
+            $render  = ! empty( $args['type'] ) && function_exists( 'monsterinsights_' . $args['type'] . '_callback' ) ? 'monsterinsights_' . $args['type'] . '_callback' : 'monsterinsights_missing_callback';
+            $output .= call_user_func( $render, $args );
+        $output .= '</td>';
+    $output .= '</tr>';
+    return $output;
 }
 
 /** 
@@ -997,12 +997,12 @@ 
  */
 function monsterinsights_add_setting_tooltip( $html, $args ) { // @todo: enqueue tooltips
 
-	if ( ! empty( $args['tooltip_title'] ) && ! empty( $args['tooltip_desc'] ) ) {
-		$tooltip = '<span alt="f223" class="monsterinsights-help-tip dashicons dashicons-editor-help" title="<strong>' . $args['tooltip_title'] . '</strong>: ' . $args['tooltip_desc'] . '"></span>';
-		$html .= $tooltip;
-	}
+    if ( ! empty( $args['tooltip_title'] ) && ! empty( $args['tooltip_desc'] ) ) {
+        $tooltip = '<span alt="f223" class="monsterinsights-help-tip dashicons dashicons-editor-help" title="<strong>' . $args['tooltip_title'] . '</strong>: ' . $args['tooltip_desc'] . '"></span>';
+        $html .= $tooltip;
+    }
 
-	return $html;
+    return $html;
 }
 add_filter( 'monsterinsights_after_setting_output', 'monsterinsights_add_setting_tooltip', 10, 2 );
 
@@ -1010,48 +1010,48 @@ 
  * @todo  docbloc
  */
 function monsterinsights_get_settings_notices( $delete_on_retrieve = true ) {
-	$notices = get_transient( 'monsterinsights_settings_notices' );
-	if ( $delete_on_retrieve ) {
-		delete_transient( 'monsterinsights_settings_notices' );
-	}
-	return $notices;
+    $notices = get_transient( 'monsterinsights_settings_notices' );
+    if ( $delete_on_retrieve ) {
+        delete_transient( 'monsterinsights_settings_notices' );
+    }
+    return $notices;
 }
 
 /** 
  * @todo  docbloc
  */
 function monsterinsights_add_settings_notice( $name, $type = 'success', $message = '' ) {
-	$notices = get_transient( 'monsterinsights_settings_notices' );
-	if ( empty( $notices ) ) {
-		$notices          = array();
-		$notices[ $name ] = array( "type" => $type, "message" => $message );
-	} else {
-		$notices[ $name ] = array( "type" => $type, "message" => $message );
-	}
-	set_transient( 'monsterinsights_settings_notices', $notices );
+    $notices = get_transient( 'monsterinsights_settings_notices' );
+    if ( empty( $notices ) ) {
+        $notices          = array();
+        $notices[ $name ] = array( "type" => $type, "message" => $message );
+    } else {
+        $notices[ $name ] = array( "type" => $type, "message" => $message );
+    }
+    set_transient( 'monsterinsights_settings_notices', $notices );
 }
 
 /** 
  * @todo  docbloc
  */
 function monsterinsights_remove_settings_notice( $name ) {
-	$notices = get_transient( 'monsterinsights_settings_notices' );
-	$found   = false;
-	if ( ! empty( $notices ) ) {
-		if ( isset( $notices[ $name] ) ) {
-			unset( $notices[ $name] );
-			set_transient( 'monsterinsights_settings_notices', $notices );
-			$found = true;
-		} else {
-			set_transient( 'monsterinsights_settings_notices', $notices );
-		}
-	}
-	return $found;
+    $notices = get_transient( 'monsterinsights_settings_notices' );
+    $found   = false;
+    if ( ! empty( $notices ) ) {
+        if ( isset( $notices[ $name] ) ) {
+            unset( $notices[ $name] );
+            set_transient( 'monsterinsights_settings_notices', $notices );
+            $found = true;
+        } else {
+            set_transient( 'monsterinsights_settings_notices', $notices );
+        }
+    }
+    return $found;
 }
 
 /** 
  * @todo  docbloc
  */
 function monsterinsights_get_non_setting_types(){
-	return apply_filters( 'monsterinsights_non_setting_types', array(  'descriptive_text', 'hook', 'upgrade_notice', 'install_notice', 'notice' ) );
+    return apply_filters( 'monsterinsights_non_setting_types', array(  'descriptive_text', 'hook', 'upgrade_notice', 'install_notice', 'notice' ) );
 }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  */
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
+if ( !defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 /**
  * Get the settings for a section

includes/admin/settings/tab-general.php

Spacing +97 added lines, -97 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -24,25 +24,25 @@ 
  */
 function monsterinsights_settings_general_tab() {
     // Get settings
-    $manual_ua_code              = monsterinsights_get_option( 'manual_ua_code', '' );
-    $manual_ua_code              = esc_html( $manual_ua_code );
+    $manual_ua_code              = monsterinsights_get_option('manual_ua_code', '');
+    $manual_ua_code              = esc_html($manual_ua_code);
 
     $ua_code                     = monsterinsights_get_ua();
     $license_key_type            = '';
 
-    $network_license             = get_site_option( 'monsterinsights_license' );
-    if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty ( $network_license ) ) ) {
-        $site_license                = get_option( 'monsterinsights_license' );
-        $license_key                 = ! empty( $site_license['key'] ) ? esc_attr( $site_license['key'] ) : '';
-        $license_key_type            = ! empty( $site_license['type'] ) ? esc_html( $site_license['type'] ) : '';
+    $network_license             = get_site_option('monsterinsights_license');
+    if ( ! monsterinsights_is_network_active() || (monsterinsights_is_network_active() && empty ($network_license))) {
+        $site_license                = get_option('monsterinsights_license');
+        $license_key                 = ! empty($site_license['key']) ? esc_attr($site_license['key']) : '';
+        $license_key_type            = ! empty($site_license['type']) ? esc_html($site_license['type']) : '';
     }
 
-    $profile_name                = monsterinsights_get_option( 'analytics_profile_name', '' );
-    $profile_id                  = monsterinsights_get_option( 'analytics_profile', '' );
-    $tracking_mode               = monsterinsights_get_option( 'tracking_mode', 'analytics' );
-    $events_mode                 = monsterinsights_get_option( 'events_mode', 'js' );
-    $automatic_updates           = monsterinsights_get_option( 'automatic_updates', false );
-    $anon_tracking               = monsterinsights_get_option( 'anonymous_data', false );
+    $profile_name                = monsterinsights_get_option('analytics_profile_name', '');
+    $profile_id                  = monsterinsights_get_option('analytics_profile', '');
+    $tracking_mode               = monsterinsights_get_option('tracking_mode', 'analytics');
+    $events_mode                 = monsterinsights_get_option('events_mode', 'js');
+    $automatic_updates           = monsterinsights_get_option('automatic_updates', false);
+    $anon_tracking               = monsterinsights_get_option('anonymous_data', false);
     ?>
     <div id="monsterinsights-settings-general">
         <div class="monsterinsights-tab-settings-notices">
@@ -55,38 +55,38 @@ 
          * 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_settings_general_tab_notice' );
+        do_action('monsterinsights_settings_general_tab_notice');
         ?>
         </div>
         <table class="form-table">
             <tbody>
-                <?php if ( ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty ( $network_license ) ) ) && monsterinsights_is_pro_version() ) { ?>
+                <?php if (( ! monsterinsights_is_network_active() || (monsterinsights_is_network_active() && empty ($network_license))) && monsterinsights_is_pro_version()) { ?>
                     <tr id="monsterinsights-settings-key-box">
                         <th scope="row">
-                            <label for="monsterinsights-settings-key"><?php esc_html_e( 'License Key', 'google-analytics-for-wordpress' ); ?></label>
+                            <label for="monsterinsights-settings-key"><?php esc_html_e('License Key', 'google-analytics-for-wordpress'); ?></label>
                         </th>
                         <td>
                             <form id="monsterinsights-settings-verify-key" method="post">
                                 <input type="password" name="monsterinsights-license-key" id="monsterinsights-settings-key" value="<?php echo $license_key; ?>" />
-                                <?php wp_nonce_field( 'monsterinsights-key-nonce', 'monsterinsights-key-nonce' ); ?>
-                                <?php submit_button( esc_html__( 'Verify Key', 'google-analytics-for-wordpress' ), 'button-action', 'monsterinsights-verify-submit', false ); ?>
-                                <?php submit_button( esc_html__( 'Deactivate Key', 'google-analytics-for-wordpress' ), 'button-danger', 'monsterinsights-deactivate-submit', false ); ?>
-                                <p class="description"><?php esc_html_e( 'License key to enable automatic updates for MonsterInsights Pro & addons. Deactivate your license if you want to use it on another WordPress site.', 'google-analytics-for-wordpress' ); ?></p>
+                                <?php wp_nonce_field('monsterinsights-key-nonce', 'monsterinsights-key-nonce'); ?>
+                                <?php submit_button(esc_html__('Verify Key', 'google-analytics-for-wordpress'), 'button-action', 'monsterinsights-verify-submit', false); ?>
+                                <?php submit_button(esc_html__('Deactivate Key', 'google-analytics-for-wordpress'), 'button-danger', 'monsterinsights-deactivate-submit', false); ?>
+                                <p class="description"><?php esc_html_e('License key to enable automatic updates for MonsterInsights Pro & addons. Deactivate your license if you want to use it on another WordPress site.', 'google-analytics-for-wordpress'); ?></p>
                             </form>
                         </td>
                     </tr>
-                    <?php if ( ! empty( $license_key_type ) && monsterinsights_is_pro_version() ) : ?>
+                    <?php if ( ! empty($license_key_type) && monsterinsights_is_pro_version()) : ?>
                     <tr id="monsterinsights-settings-key-type-box">
                         <th scope="row">
-                            <label for="monsterinsights-settings-key-type"><?php esc_html_e( 'License Key Type', 'google-analytics-for-wordpress' ); ?></label>
+                            <label for="monsterinsights-settings-key-type"><?php esc_html_e('License Key Type', 'google-analytics-for-wordpress'); ?></label>
                         </th>
                         <td>
                             <form id="monsterinsights-settings-key-type" method="post">
-                                <span class="monsterinsights-license-type"><?php printf( esc_html__( 'Your license key type for this site is %s.', 'google-analytics-for-wordpress' ), '<strong>' . $license_key_type . '</strong>' ); ?>
+                                <span class="monsterinsights-license-type"><?php printf(esc_html__('Your license key type for this site is %s.', 'google-analytics-for-wordpress'), '<strong>' . $license_key_type . '</strong>'); ?>
                                 <input type="hidden" name="monsterinsights-license-key" value="<?php echo $license_key; ?>" />
-                                <?php wp_nonce_field( 'monsterinsights-key-nonce', 'monsterinsights-key-nonce' ); ?>
-                                <?php submit_button( esc_html__( 'Refresh Key', 'google-analytics-for-wordpress' ), 'button-action', 'monsterinsights-refresh-submit', false ); ?>
-                                <p class="description"><?php esc_html_e( 'Your license key type (handles updates and Addons). Click refresh if your license has been upgraded or the type is incorrect.', 'google-analytics-for-wordpress' ); ?></p>
+                                <?php wp_nonce_field('monsterinsights-key-nonce', 'monsterinsights-key-nonce'); ?>
+                                <?php submit_button(esc_html__('Refresh Key', 'google-analytics-for-wordpress'), 'button-action', 'monsterinsights-refresh-submit', false); ?>
+                                <p class="description"><?php esc_html_e('Your license key type (handles updates and Addons). Click refresh if your license has been upgraded or the type is incorrect.', 'google-analytics-for-wordpress'); ?></p>
                             </form>
                         </td>
                     </tr>
@@ -95,23 +95,23 @@ 
 
                 <tr id="monsterinsights-google-authenticate-box">
                     <th scope="row">
-                        <?php if ( $profile_name && $ua_code ) { ?>
-                            <label for="monsterinsights-google-authenticate"><?php esc_html_e( 'Analytics Profile', 'google-analytics-for-wordpress' ); ?></label>
+                        <?php if ($profile_name && $ua_code) { ?>
+                            <label for="monsterinsights-google-authenticate"><?php esc_html_e('Analytics Profile', 'google-analytics-for-wordpress'); ?></label>
                         <?php } else { ?>
-                            <label for="monsterinsights-google-authenticate"><?php esc_html_e( 'Google Authentication', 'google-analytics-for-wordpress' ); ?></label>
+                            <label for="monsterinsights-google-authenticate"><?php esc_html_e('Google Authentication', 'google-analytics-for-wordpress'); ?></label>
                         <?php } ?>
                     </th>
                     <td>
                         <form id="monsterinsights-google-authenticate" method="post">
-                            <?php if ( $profile_name && $ua_code ) { ?>
-                                <p><?php echo esc_html__( 'Profile Active: ', 'google-analytics-for-wordpress' ) . $profile_name; ?></p>
-                                <p><?php wp_nonce_field( 'monsterinsights-google-authenticated-nonce', 'monsterinsights-google-authenticated-nonce' ); ?>
-                                <?php submit_button( esc_html__( 'Re-Authenticate with your Google account', 'google-analytics-for-wordpress' ), 'button-action', 'monsterinsights-google-reauthenticate-submit', false ); ?>
-                                <?php submit_button( esc_html__( 'Deauthenticate', 'google-analytics-for-wordpress' ), 'button-danger', 'monsterinsights-google-deauthenticate-submit', false ); ?></p>
+                            <?php if ($profile_name && $ua_code) { ?>
+                                <p><?php echo esc_html__('Profile Active: ', 'google-analytics-for-wordpress') . $profile_name; ?></p>
+                                <p><?php wp_nonce_field('monsterinsights-google-authenticated-nonce', 'monsterinsights-google-authenticated-nonce'); ?>
+                                <?php submit_button(esc_html__('Re-Authenticate with your Google account', 'google-analytics-for-wordpress'), 'button-action', 'monsterinsights-google-reauthenticate-submit', false); ?>
+                                <?php submit_button(esc_html__('Deauthenticate', 'google-analytics-for-wordpress'), 'button-danger', 'monsterinsights-google-deauthenticate-submit', false); ?></p>
                             <?php } else { ?>
-                                <?php wp_nonce_field( 'monsterinsights-google-authenticate-nonce', 'monsterinsights-google-authenticate-nonce' ); ?>
-                                <?php submit_button( esc_html__( 'Authenticate with your Google account', 'google-analytics-for-wordpress' ), 'button-action', 'monsterinsights-google-authenticate-submit', false ); ?>
-                                <p class="description"><?php printf( esc_html__( 'Having issues automatically authenticating? %s Click here to authenticate manually %s.', 'google-analytics-for-wordpress' ), '<a href="javascript:monsterinsights_show_manual()" data-action="show-manual-ua-box">', '</a>' ); ?></p>
+                                <?php wp_nonce_field('monsterinsights-google-authenticate-nonce', 'monsterinsights-google-authenticate-nonce'); ?>
+                                <?php submit_button(esc_html__('Authenticate with your Google account', 'google-analytics-for-wordpress'), 'button-action', 'monsterinsights-google-authenticate-submit', false); ?>
+                                <p class="description"><?php printf(esc_html__('Having issues automatically authenticating? %s Click here to authenticate manually %s.', 'google-analytics-for-wordpress'), '<a href="javascript:monsterinsights_show_manual()" data-action="show-manual-ua-box">', '</a>'); ?></p>
                             <?php } ?>
                         </form>
                     </td>
@@ -125,80 +125,80 @@ 
         <form id="monsterinsights-general-tab" method="post">
             <table class="form-table">
                 <tbody>
-                    <?php if ( ! $profile_name ) { ?>
+                    <?php if ( ! $profile_name) { ?>
                     <!-- Manual UA -->
                     <tr id="monsterinsights-google-ua-box" <?php echo ( ! $ua_code ? 'class="monsterinsights-hideme"' : ''); ?> >
                         <th scope="row">
-                            <label for="monsterinsights-google-ua"><?php esc_html_e( 'Manually enter your UA code', 'google-analytics-for-wordpress' ); ?></label>
+                            <label for="monsterinsights-google-ua"><?php esc_html_e('Manually enter your UA code', 'google-analytics-for-wordpress'); ?></label>
                         </th>
                         <td>
                             <input type="text" id="monsterinsights-google-ua" name="manual_ua_code" value="<?php echo $manual_ua_code; ?>" />
-                            <p class="description"><?php esc_html_e( 'Warning: If you use a manual UA code, you won\'t be able to use the dashboard or reports.', 'google-analytics-for-wordpress' ); ?></p>
+                            <p class="description"><?php esc_html_e('Warning: If you use a manual UA code, you won\'t be able to use the dashboard or reports.', 'google-analytics-for-wordpress'); ?></p>
                         </td>
                     </tr>
                     <?php } ?>
 
                     <!-- Disable Dashboard -->
                     <?php
-                    $title       = esc_html__( 'Disable Dashboard', 'google-analytics-for-wordpress' );
-                    $description = esc_html__( 'Hide the dashboard and reports pages.', 'google-analytics-for-wordpress' );
-                    echo monsterinsights_make_checkbox( 'dashboards_disabled', $title, $description );
+                    $title       = esc_html__('Disable Dashboard', 'google-analytics-for-wordpress');
+                    $description = esc_html__('Hide the dashboard and reports pages.', 'google-analytics-for-wordpress');
+                    echo monsterinsights_make_checkbox('dashboards_disabled', $title, $description);
                     ?>
 
-                    <?php if ( $tracking_mode === 'ga' || monsterinsights_is_debug_mode() ){  ?>
+                    <?php if ($tracking_mode === 'ga' || monsterinsights_is_debug_mode()) {  ?>
                     <tr id="monsterinsights-tracking-mode">
                         <th scope="row">
-                            <label for="monsterinsights-tracking-mode"><?php esc_html_e( 'Pick Tracking Mode', 'google-analytics-for-wordpress' ); ?></label>
+                            <label for="monsterinsights-tracking-mode"><?php esc_html_e('Pick Tracking Mode', 'google-analytics-for-wordpress'); ?></label>
                         </th>
                         <td>
                             <?php
-                            $url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'general' ) ), 'monsterinsights-switch-to-analyticsjs-nonce' ) );
+                            $url = esc_url(wp_nonce_url(add_query_arg(array('monsterinsights-action' => 'switch_to_analyticsjs', 'return' => 'general')), 'monsterinsights-switch-to-analyticsjs-nonce'));
                             ?>
-                            <label><input type="radio" name="tracking_mode" value="ga" <?php checked( $tracking_mode, 'ga' ); ?> ><?php esc_html_e('GA.js (Deprecated)', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="tracking_mode" value="analytics" <?php checked( $tracking_mode, 'analytics' ); ?> ><?php esc_html_e( 'Analytics.js (Universal Analytics)', 'google-analytics-for-wordpress'); ?> </label>
-                            <?php if ($tracking_mode === 'ga' ) { ?>
-                            <?php echo monsterinsights_get_message( 'error', sprintf( esc_html__( 'Warning: You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ) );
+                            <label><input type="radio" name="tracking_mode" value="ga" <?php checked($tracking_mode, 'ga'); ?> ><?php esc_html_e('GA.js (Deprecated)', 'google-analytics-for-wordpress'); ?> </label>
+                            <label><input type="radio" name="tracking_mode" value="analytics" <?php checked($tracking_mode, 'analytics'); ?> ><?php esc_html_e('Analytics.js (Universal Analytics)', 'google-analytics-for-wordpress'); ?> </label>
+                            <?php if ($tracking_mode === 'ga') { ?>
+                            <?php echo monsterinsights_get_message('error', sprintf(esc_html__('Warning: You\'re currently using deprecated ga.js tracking. We recommend switching to analytics.js, as it is significantly more accurate than ga.js, and allows for functionality (like the more accurate Javascript based events tracking we offer). Further Google Analytics has deprecated support for ga.js, and it may stop working at any time when Google decides to disable it from their server. To switch to using the newer Universal Analytics (analytics.js) %1$sclick here%2$s.', 'google-analytics-for-wordpress'), '<a href="' . $url . '">', '</a>'));
                             ?>
                             <?php } ?>
                         </td>
                     </tr>
                     <?php } ?>
 
-                    <?php if ( $tracking_mode !== 'ga' && $events_mode === 'php' ){  ?>
+                    <?php if ($tracking_mode !== 'ga' && $events_mode === 'php') {  ?>
                     <tr id="monsterinsights-tracking-mode">
                         <th scope="row">
-                            <label for="monsterinsights-tracking-mode"><?php esc_html_e( 'Switch to JS events tracking', 'google-analytics-for-wordpress' ); ?></label>
+                            <label for="monsterinsights-tracking-mode"><?php esc_html_e('Switch to JS events tracking', 'google-analytics-for-wordpress'); ?></label>
                         </th>
                         <td>
                             <?php
-                            $url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_jsevents', 'return' => 'general' ) ), 'monsterinsights-switch-to-jsevents-nonce' ) );
+                            $url = esc_url(wp_nonce_url(add_query_arg(array('monsterinsights-action' => 'switch_to_jsevents', 'return' => 'general')), 'monsterinsights-switch-to-jsevents-nonce'));
                             ?>
-                            <?php echo monsterinsights_get_message( 'error', sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking and we will eventually discontinue PHP based events tracking. To switch %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ) );
+                            <?php echo monsterinsights_get_message('error', sprintf(esc_html__('Warning: You\'re currently using deprecated PHP based events tracking. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking and we will eventually discontinue PHP based events tracking. To switch %1$sclick here%2$s.', 'google-analytics-for-wordpress'), '<a href="' . $url . '">', '</a>'));
                          ?>
                         </td>
                     </tr>
                     <?php } ?>
 
-                    <?php if ( $automatic_updates !== 'all' && $automatic_updates !== 'minor' ){  ?>
+                    <?php if ($automatic_updates !== 'all' && $automatic_updates !== 'minor') {  ?>
                     <?php $automatic_updates = $automatic_updates ? $automatic_updates : 'none'; ?>
                     <tr id="monsterinsights-automatic-updates-mode">
                         <th scope="row">
-                            <label for="monsterinsights-tracking-mode"><?php esc_html_e( 'Automatic Updates', 'google-analytics-for-wordpress' ); ?></label>
+                            <label for="monsterinsights-tracking-mode"><?php esc_html_e('Automatic Updates', 'google-analytics-for-wordpress'); ?></label>
                         </th>
                         <td>
-                            <label><input type="radio" name="automatic_updates" value="all" <?php checked( $automatic_updates, 'all' ); ?> ><?php esc_html_e('Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="automatic_updates" value="minor" <?php checked( $automatic_updates, 'minor' ); ?> ><?php esc_html_e( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress'); ?> </label>
-                            <label><input type="radio" name="automatic_updates" value="none" <?php checked( $automatic_updates, 'none' ); ?> ><?php esc_html_e( 'None - Manually update everything.', 'google-analytics-for-wordpress'); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="all" <?php checked($automatic_updates, 'all'); ?> ><?php esc_html_e('Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress'); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="minor" <?php checked($automatic_updates, 'minor'); ?> ><?php esc_html_e('Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress'); ?> </label>
+                            <label><input type="radio" name="automatic_updates" value="none" <?php checked($automatic_updates, 'none'); ?> ><?php esc_html_e('None - Manually update everything.', 'google-analytics-for-wordpress'); ?> </label>
                         </td>
                     </tr>
                     <?php } ?>
 
                     <!-- Tracking -->
                     <?php
-                    $title       = esc_html__( 'Allow Usage Tracking', 'google-analytics-for-wordpress' );
-                    $description = esc_html__( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' );
-                    if ( ! $anon_tracking || monsterinsights_is_debug_mode() ){
-                        echo monsterinsights_make_checkbox( 'anonymous_data', $title, $description );
+                    $title       = esc_html__('Allow Usage Tracking', 'google-analytics-for-wordpress');
+                    $description = esc_html__('By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress');
+                    if ( ! $anon_tracking || monsterinsights_is_debug_mode()) {
+                        echo monsterinsights_make_checkbox('anonymous_data', $title, $description);
                     }
                     ?>
 
@@ -210,18 +210,18 @@ 
                      * 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_settings_general_box' ); 
+                    do_action('monsterinsights_settings_general_box'); 
                     ?>
                 </tbody>
             </table>
             <input type="hidden" name="monsterinsights_settings_tab" value="general"/>
-            <?php wp_nonce_field( 'monsterinsights-settings-nonce', 'monsterinsights-settings-nonce' ); ?>
-            <?php submit_button( esc_html__( 'Save Changes', 'google-analytics-for-wordpress' ), 'primary', 'monsterinsights-settings-submit', false ); ?>
+            <?php wp_nonce_field('monsterinsights-settings-nonce', 'monsterinsights-settings-nonce'); ?>
+            <?php submit_button(esc_html__('Save Changes', 'google-analytics-for-wordpress'), 'primary', 'monsterinsights-settings-submit', false); ?>
         </form>
     </div>
     <?php
 }
-add_action( 'monsterinsights_tab_settings_general', 'monsterinsights_settings_general_tab' );
+add_action('monsterinsights_tab_settings_general', 'monsterinsights_settings_general_tab');
 
 /**
  * Callback for saving the general settings tab.
@@ -232,27 +232,27 @@ 
  * @return void
  */
 function monsterinsights_settings_save_general() {
-    $throw_notice    = false;
-    $manual_ua_code = isset( $_POST['manual_ua_code'] ) ? $_POST['manual_ua_code'] : '';
-    $manual_ua_code = monsterinsights_is_valid_ua( $manual_ua_code ); // also sanitizes the string
+    $throw_notice = false;
+    $manual_ua_code = isset($_POST['manual_ua_code']) ? $_POST['manual_ua_code'] : '';
+    $manual_ua_code = monsterinsights_is_valid_ua($manual_ua_code); // also sanitizes the string
     
-    if ( $manual_ua_code ) {
-        monsterinsights_update_option( 'manual_ua_code', $manual_ua_code );
+    if ($manual_ua_code) {
+        monsterinsights_update_option('manual_ua_code', $manual_ua_code);
     } else {
-        if ( empty ( $manual_ua_code ) && ! empty( $_POST['manual_ua_code'] ) ) {
+        if (empty ($manual_ua_code) && ! empty($_POST['manual_ua_code'])) {
              $throw_notice = true;
         }
-        monsterinsights_update_option( 'manual_ua_code', '' );
+        monsterinsights_update_option('manual_ua_code', '');
     }
 
-    $dashboards_disabled = isset( $_POST['dashboards_disabled'] ) ? 1 : 0;
-    monsterinsights_update_option( 'dashboards_disabled', $dashboards_disabled );
+    $dashboards_disabled = isset($_POST['dashboards_disabled']) ? 1 : 0;
+    monsterinsights_update_option('dashboards_disabled', $dashboards_disabled);
 
-    $old_tracking_mode = monsterinsights_get_option( 'tracking_mode', 'analytics' );
-    $tracking_mode     = isset( $_POST['tracking_mode'] ) ? $_POST['tracking_mode'] : 'analytics';
+    $old_tracking_mode = monsterinsights_get_option('tracking_mode', 'analytics');
+    $tracking_mode     = isset($_POST['tracking_mode']) ? $_POST['tracking_mode'] : 'analytics';
 
-    if ( $old_tracking_mode === 'ga' || monsterinsights_is_debug_mode() ) {
-        if ( $tracking_mode !== 'analytics' && $tracking_mode !== 'ga' ) {
+    if ($old_tracking_mode === 'ga' || monsterinsights_is_debug_mode()) {
+        if ($tracking_mode !== 'analytics' && $tracking_mode !== 'ga') {
             /** 
              * Developer Alert:
              *
@@ -260,11 +260,11 @@ 
              * not be used by other developers. This hook's behavior may be modified
              * or the hook may be removed at any time, without warning.
              */
-            $tracking_mode = apply_filters( 'monsterinsights_settings_save_general_tracking_mode', 'analytics' );
+            $tracking_mode = apply_filters('monsterinsights_settings_save_general_tracking_mode', 'analytics');
         }
-        monsterinsights_update_option( 'tracking_mode', $tracking_mode );
+        monsterinsights_update_option('tracking_mode', $tracking_mode);
     } else {
-        if ( $tracking_mode !== 'analytics' ) {
+        if ($tracking_mode !== 'analytics') {
             /** 
              * Developer Alert:
              *
@@ -272,19 +272,19 @@ 
              * not be used by other developers. This hook's behavior may be modified
              * or the hook may be removed at any time, without warning.
              */
-            $tracking_mode = apply_filters( 'monsterinsights_settings_save_general_tracking_mode', 'analytics' );
+            $tracking_mode = apply_filters('monsterinsights_settings_save_general_tracking_mode', 'analytics');
         }
-        monsterinsights_update_option( 'tracking_mode', $tracking_mode );
+        monsterinsights_update_option('tracking_mode', $tracking_mode);
     }
 
-    $automatic_updates = isset( $_POST['automatic_updates'] ) && in_array( $_POST['automatic_updates'], array( 'all', 'minor', 'none' ) ) ? $_POST['automatic_updates'] : false;
-    if ( $automatic_updates ) {
-        monsterinsights_update_option( 'automatic_updates', $automatic_updates );
+    $automatic_updates = isset($_POST['automatic_updates']) && in_array($_POST['automatic_updates'], array('all', 'minor', 'none')) ? $_POST['automatic_updates'] : false;
+    if ($automatic_updates) {
+        monsterinsights_update_option('automatic_updates', $automatic_updates);
     }
 
-    $anonymous_data = isset( $_POST['anonymous_data'] ) ? 1 : 0;
-    if ( $anonymous_data ) {
-        monsterinsights_update_option( 'anonymous_data', $anonymous_data );
+    $anonymous_data = isset($_POST['anonymous_data']) ? 1 : 0;
+    if ($anonymous_data) {
+        monsterinsights_update_option('anonymous_data', $anonymous_data);
     }
 
     /** 
@@ -294,13 +294,13 @@ 
      * 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_settings_save_general_end' );
+    do_action('monsterinsights_settings_save_general_end');
 
     // Output an admin notice so the user knows what happened
-    if ( $throw_notice ) {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
+    if ($throw_notice) {
+        add_action('monsterinsights_settings_general_tab_notice', 'monsterinsights_invalid_ua_code');
     } else {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_updated_settings' );
+        add_action('monsterinsights_settings_general_tab_notice', 'monsterinsights_updated_settings');
     }
 }
-add_action( 'monsterinsights_settings_save_general', 'monsterinsights_settings_save_general', 11 );
\ No newline at end of file
+add_action('monsterinsights_settings_save_general', 'monsterinsights_settings_save_general', 11);
\ No newline at end of file

Indentation +2 added lines, -2 removed lines

@@ -174,7 +174,7 @@ 
                             $url = esc_url( wp_nonce_url( add_query_arg( array( 'monsterinsights-action' => 'switch_to_jsevents', 'return' => 'general' ) ), 'monsterinsights-switch-to-jsevents-nonce' ) );
                             ?>
                             <?php echo monsterinsights_get_message( 'error', sprintf( esc_html__( 'Warning: You\'re currently using deprecated PHP based events tracking. We recommend switching to JS events tracking, as it is significantly more accurate than PHP based events tracking and we will eventually discontinue PHP based events tracking. To switch %1$sclick here%2$s.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ) );
-                         ?>
+                            ?>
                         </td>
                     </tr>
                     <?php } ?>
@@ -240,7 +240,7 @@ 
         monsterinsights_update_option( 'manual_ua_code', $manual_ua_code );
     } else {
         if ( empty ( $manual_ua_code ) && ! empty( $_POST['manual_ua_code'] ) ) {
-             $throw_notice = true;
+                $throw_notice = true;
         }
         monsterinsights_update_option( 'manual_ua_code', '' );
     }

includes/admin/settings/register-settings.php

Spacing +72 added lines, -72 removed lines

@@ -20,93 +20,93 @@ 
 	// coming soon = true (don't count on this)
 	$tabs = array(
 		'engagement' => array( 
-			'title' => esc_html__( 'Engagement', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Engagement', 'google-analytics-for-wordpress'),
 			'level' => 'lite'
 		),
 		'demographics' => array( 
-			'title' => esc_html__( 'Demographics', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Demographics', 'google-analytics-for-wordpress'),
 			'level' => 'lite'
 		),
 		'links' => array( 
-			'title' => esc_html__( 'Link Attribution', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Link Attribution', 'google-analytics-for-wordpress'),
 			'level' => 'lite'
 		),
 		'files' => array( 
-			'title' => esc_html__( 'File Downloads', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('File Downloads', 'google-analytics-for-wordpress'),
 			'level' => 'lite'
 		),  
 		'affiliates' => array( 
-			'title' => esc_html__( 'Affiliate Links', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Affiliate Links', 'google-analytics-for-wordpress'),
 			'level' => 'lite'
 		),  
 		'social' => array( 
-			'title' => esc_html__( 'Social', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Social', 'google-analytics-for-wordpress'),
 			'level' => 'basic',
 			'comingsoon' => true
 		),
 		'ads' => array( 
-			'title' => esc_html__( 'Ads', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Ads', 'google-analytics-for-wordpress'),
 			'level' => 'plus',
 		),
 		'forms' => array( 
-			'title' => esc_html__( 'Forms', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Forms', 'google-analytics-for-wordpress'),
 			'level' => 'pro',
 		),
 		'ecommerce' => array( 
-			'title' => esc_html__( 'eCommerce', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('eCommerce', 'google-analytics-for-wordpress'),
 			'level' => 'pro'
 		),
 		'media' => array( 
-			'title' => esc_html__( 'Media', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Media', 'google-analytics-for-wordpress'),
 			'level' => 'plus',
 			'comingsoon' => true
 		),
 		'memberships' => array( 
-			'title' => esc_html__( 'Memberships', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Memberships', 'google-analytics-for-wordpress'),
 			'level' => 'plus',
 			'comingsoon' => true
 		),
 		'dimensions' => array( 
-			'title' => esc_html__( 'Custom Dimensions', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Custom Dimensions', 'google-analytics-for-wordpress'),
 			'level' => 'pro',
 		),
 		'performance' => array( 
-			'title' => esc_html__( 'Performance', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Performance', 'google-analytics-for-wordpress'),
 			'level' => 'plus'
 		),
 		'amp' => array( 
-			'title' => esc_html__( 'Google AMP', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Google AMP', 'google-analytics-for-wordpress'),
 			'level' => 'plus'
 		),
 		'goptimize' => array( 
-			'title' => esc_html__( 'Google Optimize', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Google Optimize', 'google-analytics-for-wordpress'),
 			'level' => 'pro'
 		),
 		'fbia' => array( 
-			'title' => esc_html__( 'FB Instant Articles', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('FB Instant Articles', 'google-analytics-for-wordpress'),
 			'level' => 'plus'
 		),
 		'bounce' => array( 
-			'title' => esc_html__( 'Bounce Reduction', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Bounce Reduction', 'google-analytics-for-wordpress'),
 			'level' => 'plus',
 			'comingsoon' => true
 		),
 		'reporting' => array( 
-			'title' => esc_html__( 'Additional Reporting', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Additional Reporting', 'google-analytics-for-wordpress'),
 			'level' => 'plus',
 			'comingsoon' => true
 		),
 		'notifications' => array( 
-			'title' => esc_html__( 'Notifications', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Notifications', 'google-analytics-for-wordpress'),
 			'level' => 'basic',
 			'comingsoon' => true
 		),
 		'compatibility' => array( 
-			'title' => esc_html__( 'Compatibility', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Compatibility', 'google-analytics-for-wordpress'),
 			'level' => 'lite'
 		),
 		'permissions' => array( 
-			'title' => esc_html__( 'Permissions', 'google-analytics-for-wordpress' ),
+			'title' => esc_html__('Permissions', 'google-analytics-for-wordpress'),
 			'level' => 'lite'
 		),
 	);
@@ -116,7 +116,7 @@ 
 	 * versions after 6.0 to ensure we've got the right layout for the long term. 
 	 * Changes may be done without advance warning or announcement. You've been warned. 
 	 */
-	return apply_filters( 'monsterinsights_settings_tabs', $tabs );
+	return apply_filters('monsterinsights_settings_tabs', $tabs);
 }
 
 /**
@@ -146,12 +146,12 @@ 
 	 */
 	$monsterinsights_settings = array(
 		/** Engagement Settings */
-		'engagement' => apply_filters( 'monsterinsights_settings_engagement',
+		'engagement' => apply_filters('monsterinsights_settings_engagement',
 			array(
 				'ignore_users' => array(
 					'id'          => 'ignore_users',
-					'name'        => __( 'Ignore these user roles from tracking:', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'Users that have at least one of these roles will not be tracked into Google Analytics.', 'google-analytics-for-wordpress' ),
+					'name'        => __('Ignore these user roles from tracking:', 'google-analytics-for-wordpress'),
+					'desc'        => __('Users that have at least one of these roles will not be tracked into Google Analytics.', 'google-analytics-for-wordpress'),
 					'type'        => 'select',
 					'options'     => monsterinsights_get_roles(),
 					'select2'     => true,
@@ -160,14 +160,14 @@ 
 				),
 				'events_mode' => array(
 					'id'          => 'events_mode',
-					'name'        => __( 'Track outbound clicks and download links?', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'We recommend tracking clicks and downloads, so you know where users are exiting your site, and what downloads they are interacting with. ', 'google-analytics-for-wordpress', 'google-analytics-for-wordpress' ),
+					'name'        => __('Track outbound clicks and download links?', 'google-analytics-for-wordpress'),
+					'desc'        => __('We recommend tracking clicks and downloads, so you know where users are exiting your site, and what downloads they are interacting with. ', 'google-analytics-for-wordpress', 'google-analytics-for-wordpress'),
 					'type' 		  => 'radio',
 					'std'  		  => 'js',
 					'options'     => array(
-						'none' => __( 'No', 'google-analytics-for-wordpress' ),
-						'php'  => __( 'Yes, using PHP (deprecated)', 'google-analytics-for-wordpress' ),
-						'js'   => __( 'Using Javascript (recommended)', 'google-analytics-for-wordpress' ),
+						'none' => __('No', 'google-analytics-for-wordpress'),
+						'php'  => __('Yes, using PHP (deprecated)', 'google-analytics-for-wordpress'),
+						'js'   => __('Using Javascript (recommended)', 'google-analytics-for-wordpress'),
 					),
 				),
 			)
@@ -177,16 +177,16 @@ 
 			array(
 				'demographics' => array(
 					'id'          => 'demographics',
-					'name'        => __( 'Enable Demographics and Interests Reports for Remarketing and Advertising', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Check this setting to add the Demographics and Remarketing features to your Google Analytics tracking code. Make sure to enable Demographics and Remarketing in your Google Analaytics account. We have a guide for how to do that in our %1$sknowledge base%2$s. For more information about Remarketing, we refer you to %3$sGoogle\'s documentation%2$s.', 'google-analytics-for-wordpress. Note that usage of this function is affected by privacy and cookie laws around the world. Be sure to follow the laws that affect your target audience.' ), '<a href="https://www.monsterinsights.com/docs/enable-demographics-and-interests-report-in-google-analytics/#utm_medium=kb-link&amp;utm_source=gawp-config&amp;utm_campaign=wpgaplugin" target="_blank" rel="noopener noreferrer" referrer="no-referrer">',
-									'</a>','<a href="https://support.google.com/analytics/answer/2444872?hl=' . get_locale() . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">'
+					'name'        => __('Enable Demographics and Interests Reports for Remarketing and Advertising', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('Check this setting to add the Demographics and Remarketing features to your Google Analytics tracking code. Make sure to enable Demographics and Remarketing in your Google Analaytics account. We have a guide for how to do that in our %1$sknowledge base%2$s. For more information about Remarketing, we refer you to %3$sGoogle\'s documentation%2$s.', 'google-analytics-for-wordpress. Note that usage of this function is affected by privacy and cookie laws around the world. Be sure to follow the laws that affect your target audience.'), '<a href="https://www.monsterinsights.com/docs/enable-demographics-and-interests-report-in-google-analytics/#utm_medium=kb-link&amp;utm_source=gawp-config&amp;utm_campaign=wpgaplugin" target="_blank" rel="noopener noreferrer" referrer="no-referrer">',
+									'</a>', '<a href="https://support.google.com/analytics/answer/2444872?hl=' . get_locale() . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">'
 					),
 					'type' 		  => 'checkbox',
 				),
 				'anonymize_ips' => array(
 					'id'          => 'anonymize_ips',
-					'name'        => __( 'Anonymize IP addresses?', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This adds %1$s, telling Google Analytics to anonymize the information sent by the tracker objects by removing the last octet of the IP address prior to its storage.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApi_gat?csw=1#_gat._anonymizeIp" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_anonymizeIp</code></a>' ),
+					'name'        => __('Anonymize IP addresses?', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('This adds %1$s, telling Google Analytics to anonymize the information sent by the tracker objects by removing the last octet of the IP address prior to its storage.', 'google-analytics-for-wordpress'), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApi_gat?csw=1#_gat._anonymizeIp" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_anonymizeIp</code></a>'),
 					'type' 		  => 'checkbox',
 				),
 			)
@@ -196,32 +196,32 @@ 
 			array(
 				'enhanced_link_attribution' => array(
 					'id'          => 'enhanced_link_attribution',
-					'name'        => __( 'Enable enhanced link attribution?', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Add %1$sEnhanced Link Attribution%2$s to your tracking code.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-link-attribution" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', ' </a>' ),
+					'name'        => __('Enable enhanced link attribution?', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('Add %1$sEnhanced Link Attribution%2$s to your tracking code.', 'google-analytics-for-wordpress'), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-link-attribution" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', ' </a>'),
 					'type' 		  => 'checkbox',
 				),
 				'hash_tracking' => array(
 					'id'          => 'hash_tracking',
-					'name'        => __( 'Turn on anchor tracking', 'google-analytics-for-wordpress' ),
-					'desc'        => esc_html__( 'Many WordPress "1-page" style themes rely on anchor tags for navigation to show virtual pages. The problem is that to Google Analytics, these are all just a single page, and it makes it hard to get meaningful statistics about pages viewed. This feature allows proper tracking in those themes.', 'google-analytics-for-wordpress' ),
+					'name'        => __('Turn on anchor tracking', 'google-analytics-for-wordpress'),
+					'desc'        => esc_html__('Many WordPress "1-page" style themes rely on anchor tags for navigation to show virtual pages. The problem is that to Google Analytics, these are all just a single page, and it makes it hard to get meaningful statistics about pages viewed. This feature allows proper tracking in those themes.', 'google-analytics-for-wordpress'),
 					'type' 		  => 'checkbox',
 				),
 				'allow_anchor' => array(
 					'id'          => 'allow_anchor',
-					'name'        => __( 'Turn on allowAnchor', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This adds a %1$s call to your tracking code, and makes RSS link tagging use a %2$s as well.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiCampaignTracking?csw=1#_gat.GA_Tracker_._setAllowAnchor" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setAllowAnchor</code></a>', '<code>#</code>' ),
+					'name'        => __('Turn on allowAnchor', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('This adds a %1$s call to your tracking code, and makes RSS link tagging use a %2$s as well.', 'google-analytics-for-wordpress'), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiCampaignTracking?csw=1#_gat.GA_Tracker_._setAllowAnchor" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setAllowAnchor</code></a>', '<code>#</code>'),
 					'type' 		  => 'checkbox',
 				),
 				'add_allow_linker' => array(
 					'id'          => 'add_allow_linker',
-					'name'        => __( 'Turn on allowLinker', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This adds a %1$s call to your tracking code, allowing you to use %2$s and related functions.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory?csw=1#_gat.GA_Tracker_._setAllowLinker" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setAllowLinker</code></a>', ' <code>_link</code>' ),
+					'name'        => __('Turn on allowLinker', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('This adds a %1$s call to your tracking code, allowing you to use %2$s and related functions.', 'google-analytics-for-wordpress'), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory?csw=1#_gat.GA_Tracker_._setAllowLinker" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setAllowLinker</code></a>', ' <code>_link</code>'),
 					'type' 		  => 'checkbox',
 				),
 				'tag_links_in_rss' => array(
 					'id'          => 'tag_links_in_rss',
-					'name'        => __( 'Turn on tag links in RSS', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Do not use this feature if you use FeedBurner, as FeedBurner can do this automatically and better than this plugin can. Check %1$sthis help page%2$s for info on how to enable this feature in FeedBurner.', 'google-analytics-for-wordpress' ), '<a href="https://support.google.com/feedburner/answer/165769?hl=en&amp;ref_topic=13075" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ),
+					'name'        => __('Turn on tag links in RSS', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('Do not use this feature if you use FeedBurner, as FeedBurner can do this automatically and better than this plugin can. Check %1$sthis help page%2$s for info on how to enable this feature in FeedBurner.', 'google-analytics-for-wordpress'), '<a href="https://support.google.com/feedburner/answer/165769?hl=en&amp;ref_topic=13075" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>'),
 					'type' 		  => 'checkbox',
 				),
 			)
@@ -231,19 +231,19 @@ 
 			array(
 				'track_download_as' => array(
 					'id'          => 'track_download_as',
-					'name'        => __( 'Track downloads as an:', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'Tracking as pageviews is not recommended, as this would skew your statistics, but it does make it possible to track downloads as goals. This feature requires that event tracking be turned on.', 'google-analytics-for-wordpress' ),
+					'name'        => __('Track downloads as an:', 'google-analytics-for-wordpress'),
+					'desc'        => __('Tracking as pageviews is not recommended, as this would skew your statistics, but it does make it possible to track downloads as goals. This feature requires that event tracking be turned on.', 'google-analytics-for-wordpress'),
 					'type' 		  => 'radio',
 					'std'  		  => 'event',
 					'options'     => array(
-						'event'     => __( 'Event (recommended)', 'google-analytics-for-wordpress' ),
-						'pageview'  => __( 'Pageview', 'google-analytics-for-wordpress' )
+						'event'     => __('Event (recommended)', 'google-analytics-for-wordpress'),
+						'pageview'  => __('Pageview', 'google-analytics-for-wordpress')
 					),
 				),
 				'extensions_of_files' => array( 		/* @todo: Select2 extensions of files */
 					'id'          => 'extensions_of_files',
-					'name'        => __( 'Extensions of files to track as downloads:', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'If you have enabled event tracking, MonsterInsights will send an event/pageview to GA if a link to a local file has one of the above extensions.', 'google-analytics-for-wordpress' ),
+					'name'        => __('Extensions of files to track as downloads:', 'google-analytics-for-wordpress'),
+					'desc'        => __('If you have enabled event tracking, MonsterInsights will send an event/pageview to GA if a link to a local file has one of the above extensions.', 'google-analytics-for-wordpress'),
 					'type' 		  => 'text',
 				),
 			)
@@ -253,14 +253,14 @@ 
 			array(
 				'track_internal_as_outbound' => array(
 					'id'          => 'track_internal_as_outbound',
-					'name'        => __( 'Set path for internal links to track as outbound links', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'If you want to track all internal links that begin with %1$s, enter %1$s in the box above. If you have multiple prefixes you can separate them with comma\'s: %2$s', 'google-analytics-for-wordpress' ), '<code>/out/</code>', '<code>/out/,/recommends/</code>' ),
+					'name'        => __('Set path for internal links to track as outbound links', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('If you want to track all internal links that begin with %1$s, enter %1$s in the box above. If you have multiple prefixes you can separate them with comma\'s: %2$s', 'google-analytics-for-wordpress'), '<code>/out/</code>', '<code>/out/,/recommends/</code>'),
 					'type' 		  => 'text',
 				),
 				'track_internal_as_label' => array(
 					'id'          => 'track_internal_as_label',
-					'name'        => __( 'Label for those links:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'The label to use for these links, this will be added to where the click came from, so if the label is %s, the label for a click from the content of an article becomes "outbound-article-aff".', 'google-analytics-for-wordpress' ), '"aff"' ),
+					'name'        => __('Label for those links:', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('The label to use for these links, this will be added to where the click came from, so if the label is %s, the label for a click from the content of an article becomes "outbound-article-aff".', 'google-analytics-for-wordpress'), '"aff"'),
 					'type' 		  => 'text',
 				),
 			)
@@ -326,20 +326,20 @@ 
 			array(
 				'subdomain_tracking' => array(
 					'id'          => 'subdomain_tracking',
-					'name'        => __( 'Domain to track as:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This allows you to %1$sset the domain%2$s that\'s used for tracking. Only is used if set to a value, else defaults to automatic determination. It is very rare that you would need to use this setting.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/tracking-snippet-reference" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' ,'</a>' ),
+					'name'        => __('Domain to track as:', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('This allows you to %1$sset the domain%2$s that\'s used for tracking. Only is used if set to a value, else defaults to automatic determination. It is very rare that you would need to use this setting.', 'google-analytics-for-wordpress'), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/tracking-snippet-reference" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>'),
 					'type' 		  => 'text',
 				),
 				'custom_code' => array(
 					'id'          => 'custom_code',
-					'name'        => __( 'Custom code', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Not for the average user: this allows you to add a line of code, to be added before the %1$s call.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiBasicConfiguration#_gat.GA_Tracker_._trackPageview" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_trackPageview</code></a>' ),
+					'name'        => __('Custom code', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('Not for the average user: this allows you to add a line of code, to be added before the %1$s call.', 'google-analytics-for-wordpress'), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiBasicConfiguration#_gat.GA_Tracker_._trackPageview" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_trackPageview</code></a>'),
 					'type' 		  => 'unfiltered_textarea',
 				),
 				'debug_mode' => array(
 					'id'          => 'debug_mode',
-					'name'        => __( 'Enable Debug Mode', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'Turns on debugging in JS events tracking, logging of eCommerce requests and enables debug settings.', 'google-analytics-for-wordpress'),
+					'name'        => __('Enable Debug Mode', 'google-analytics-for-wordpress'),
+					'desc'        => __('Turns on debugging in JS events tracking, logging of eCommerce requests and enables debug settings.', 'google-analytics-for-wordpress'),
 					'type' 		  => 'checkbox',
 				),
 			)
@@ -349,8 +349,8 @@ 
 			array(
 				'view_reports' => array(
 					'id'          => 'view_reports',
-					'name'        => __( 'Let these user roles see reports (and the dashboard):', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html( 'Users that have at least one of these roles will be able to view the reports and dashboard, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>'),
+					'name'        => __('Let these user roles see reports (and the dashboard):', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html('Users that have at least one of these roles will be able to view the reports and dashboard, along with any user with the %s capability.', 'google-analytics-for-wordpress'), '<code>manage_options</code>'),
 					'type'        => 'select',
 					'options'     => monsterinsights_get_roles(),
 					'select2'     => true,
@@ -359,8 +359,8 @@ 
 				),
 				'save_settings' => array(
 					'id'          => 'save_settings',
-					'name'        => __( 'Let these user roles save settings:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Users that have at least one of these roles will be able to view and save the settings panel, along with any user with the %s capability.', 'google-analytics-for-wordpress'), '<code>manage_options</code>' ),
+					'name'        => __('Let these user roles save settings:', 'google-analytics-for-wordpress'),
+					'desc'        => sprintf(esc_html__('Users that have at least one of these roles will be able to view and save the settings panel, along with any user with the %s capability.', 'google-analytics-for-wordpress'), '<code>manage_options</code>'),
 					'type'        => 'select',
 					'options'     => monsterinsights_get_roles(),
 					'select2'     => true,
@@ -369,23 +369,23 @@ 
 				),
 				'automatic_updates' => array(
 					'id'          => 'automatic_updates',
-					'name'        => __( 'Automatic Updates', 'google-analytics-for-wordpress' ),
+					'name'        => __('Automatic Updates', 'google-analytics-for-wordpress'),
 					'type' 		  => 'radio',
 					'std'  		  => 'none',
 					'options'     => array(
-						'all'     => __( 'Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress' ),
-						'minor'   => __( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress' ),
-						'none'    => __( 'None - Manually update everything.', 'google-analytics-for-wordpress' ),
+						'all'     => __('Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress'),
+						'minor'   => __('Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress'),
+						'none'    => __('None - Manually update everything.', 'google-analytics-for-wordpress'),
 					),
 				),
 				'anonymous_data' => array(
 					'id'          => 'anonymous_data',
-					'name'        => __( 'Allow Usage Tracking', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' ),
+					'name'        => __('Allow Usage Tracking', 'google-analytics-for-wordpress'),
+					'desc'        => __('By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress'),
 					'type' 		  => 'checkbox',
 				),
 			)
 		),
 	);
-	return apply_filters( 'monsterinsights_registered_settings', $monsterinsights_settings );
+	return apply_filters('monsterinsights_registered_settings', $monsterinsights_settings);
 }

Indentation +361 added lines, -361 removed lines

@@ -16,107 +16,107 @@ 
  * @return array $tabs
  */
 function monsterinsights_get_settings_tabs() {
-	// Levels: lite, basic, plus, pro
-	// coming soon = true (don't count on this)
-	$tabs = array(
-		'engagement' => array( 
-			'title' => esc_html__( 'Engagement', 'google-analytics-for-wordpress' ),
-			'level' => 'lite'
-		),
-		'demographics' => array( 
-			'title' => esc_html__( 'Demographics', 'google-analytics-for-wordpress' ),
-			'level' => 'lite'
-		),
-		'links' => array( 
-			'title' => esc_html__( 'Link Attribution', 'google-analytics-for-wordpress' ),
-			'level' => 'lite'
-		),
-		'files' => array( 
-			'title' => esc_html__( 'File Downloads', 'google-analytics-for-wordpress' ),
-			'level' => 'lite'
-		),  
-		'affiliates' => array( 
-			'title' => esc_html__( 'Affiliate Links', 'google-analytics-for-wordpress' ),
-			'level' => 'lite'
-		),  
-		'social' => array( 
-			'title' => esc_html__( 'Social', 'google-analytics-for-wordpress' ),
-			'level' => 'basic',
-			'comingsoon' => true
-		),
-		'ads' => array( 
-			'title' => esc_html__( 'Ads', 'google-analytics-for-wordpress' ),
-			'level' => 'plus',
-		),
-		'forms' => array( 
-			'title' => esc_html__( 'Forms', 'google-analytics-for-wordpress' ),
-			'level' => 'pro',
-		),
-		'ecommerce' => array( 
-			'title' => esc_html__( 'eCommerce', 'google-analytics-for-wordpress' ),
-			'level' => 'pro'
-		),
-		'media' => array( 
-			'title' => esc_html__( 'Media', 'google-analytics-for-wordpress' ),
-			'level' => 'plus',
-			'comingsoon' => true
-		),
-		'memberships' => array( 
-			'title' => esc_html__( 'Memberships', 'google-analytics-for-wordpress' ),
-			'level' => 'plus',
-			'comingsoon' => true
-		),
-		'dimensions' => array( 
-			'title' => esc_html__( 'Custom Dimensions', 'google-analytics-for-wordpress' ),
-			'level' => 'pro',
-		),
-		'performance' => array( 
-			'title' => esc_html__( 'Performance', 'google-analytics-for-wordpress' ),
-			'level' => 'plus'
-		),
-		'amp' => array( 
-			'title' => esc_html__( 'Google AMP', 'google-analytics-for-wordpress' ),
-			'level' => 'plus'
-		),
-		'goptimize' => array( 
-			'title' => esc_html__( 'Google Optimize', 'google-analytics-for-wordpress' ),
-			'level' => 'pro'
-		),
-		'fbia' => array( 
-			'title' => esc_html__( 'FB Instant Articles', 'google-analytics-for-wordpress' ),
-			'level' => 'plus'
-		),
-		'bounce' => array( 
-			'title' => esc_html__( 'Bounce Reduction', 'google-analytics-for-wordpress' ),
-			'level' => 'plus',
-			'comingsoon' => true
-		),
-		'reporting' => array( 
-			'title' => esc_html__( 'Additional Reporting', 'google-analytics-for-wordpress' ),
-			'level' => 'plus',
-			'comingsoon' => true
-		),
-		'notifications' => array( 
-			'title' => esc_html__( 'Notifications', 'google-analytics-for-wordpress' ),
-			'level' => 'basic',
-			'comingsoon' => true
-		),
-		'compatibility' => array( 
-			'title' => esc_html__( 'Compatibility', 'google-analytics-for-wordpress' ),
-			'level' => 'lite'
-		),
-		'permissions' => array( 
-			'title' => esc_html__( 'Permissions', 'google-analytics-for-wordpress' ),
-			'level' => 'lite'
-		),
-	);
-	/**
-	 * Developers Warning: MonsterInsights does not guarantee backwards compatiblity
-	 * of tabs yet. We might add/remove/reorder/edit tabs for the first few major
-	 * versions after 6.0 to ensure we've got the right layout for the long term. 
-	 * Changes may be done without advance warning or announcement. You've been warned. 
-	 */
-	return apply_filters( 'monsterinsights_settings_tabs', $tabs );
+    // Levels: lite, basic, plus, pro
+    // coming soon = true (don't count on this)
+    $tabs = array(
+        'engagement' => array( 
+            'title' => esc_html__( 'Engagement', 'google-analytics-for-wordpress' ),
+            'level' => 'lite'
+        ),
+        'demographics' => array( 
+            'title' => esc_html__( 'Demographics', 'google-analytics-for-wordpress' ),
+            'level' => 'lite'
+        ),
+        'links' => array( 
+            'title' => esc_html__( 'Link Attribution', 'google-analytics-for-wordpress' ),
+            'level' => 'lite'
+        ),
+        'files' => array( 
+            'title' => esc_html__( 'File Downloads', 'google-analytics-for-wordpress' ),
+            'level' => 'lite'
+        ),  
+        'affiliates' => array( 
+            'title' => esc_html__( 'Affiliate Links', 'google-analytics-for-wordpress' ),
+            'level' => 'lite'
+        ),  
+        'social' => array( 
+            'title' => esc_html__( 'Social', 'google-analytics-for-wordpress' ),
+            'level' => 'basic',
+            'comingsoon' => true
+        ),
+        'ads' => array( 
+            'title' => esc_html__( 'Ads', 'google-analytics-for-wordpress' ),
+            'level' => 'plus',
+        ),
+        'forms' => array( 
+            'title' => esc_html__( 'Forms', 'google-analytics-for-wordpress' ),
+            'level' => 'pro',
+        ),
+        'ecommerce' => array( 
+            'title' => esc_html__( 'eCommerce', 'google-analytics-for-wordpress' ),
+            'level' => 'pro'
+        ),
+        'media' => array( 
+            'title' => esc_html__( 'Media', 'google-analytics-for-wordpress' ),
+            'level' => 'plus',
+            'comingsoon' => true
+        ),
+        'memberships' => array( 
+            'title' => esc_html__( 'Memberships', 'google-analytics-for-wordpress' ),
+            'level' => 'plus',
+            'comingsoon' => true
+        ),
+        'dimensions' => array( 
+            'title' => esc_html__( 'Custom Dimensions', 'google-analytics-for-wordpress' ),
+            'level' => 'pro',
+        ),
+        'performance' => array( 
+            'title' => esc_html__( 'Performance', 'google-analytics-for-wordpress' ),
+            'level' => 'plus'
+        ),
+        'amp' => array( 
+            'title' => esc_html__( 'Google AMP', 'google-analytics-for-wordpress' ),
+            'level' => 'plus'
+        ),
+        'goptimize' => array( 
+            'title' => esc_html__( 'Google Optimize', 'google-analytics-for-wordpress' ),
+            'level' => 'pro'
+        ),
+        'fbia' => array( 
+            'title' => esc_html__( 'FB Instant Articles', 'google-analytics-for-wordpress' ),
+            'level' => 'plus'
+        ),
+        'bounce' => array( 
+            'title' => esc_html__( 'Bounce Reduction', 'google-analytics-for-wordpress' ),
+            'level' => 'plus',
+            'comingsoon' => true
+        ),
+        'reporting' => array( 
+            'title' => esc_html__( 'Additional Reporting', 'google-analytics-for-wordpress' ),
+            'level' => 'plus',
+            'comingsoon' => true
+        ),
+        'notifications' => array( 
+            'title' => esc_html__( 'Notifications', 'google-analytics-for-wordpress' ),
+            'level' => 'basic',
+            'comingsoon' => true
+        ),
+        'compatibility' => array( 
+            'title' => esc_html__( 'Compatibility', 'google-analytics-for-wordpress' ),
+            'level' => 'lite'
+        ),
+        'permissions' => array( 
+            'title' => esc_html__( 'Permissions', 'google-analytics-for-wordpress' ),
+            'level' => 'lite'
+        ),
+    );
+    /**
+     * Developers Warning: MonsterInsights does not guarantee backwards compatiblity
+     * of tabs yet. We might add/remove/reorder/edit tabs for the first few major
+     * versions after 6.0 to ensure we've got the right layout for the long term. 
+     * Changes may be done without advance warning or announcement. You've been warned. 
+     */
+    return apply_filters( 'monsterinsights_settings_tabs', $tabs );
 }
 
 /**
@@ -127,265 +127,265 @@ 
 */
 function monsterinsights_get_registered_settings() {
 
-	/**
-	 * 'Whitelisted' MonsterInsights settings, filters are provided for each settings
-	 * section to allow extensions and other plugins to add their own settings
-	 */
+    /**
+     * 'Whitelisted' MonsterInsights settings, filters are provided for each settings
+     * section to allow extensions and other plugins to add their own settings
+     */
 	
-	/**
-	 * Developers Warning: MonsterInsights does not guarantee backwards compatiblity
-	 * of settings or tabs. We may add/remove settings and/or tabs, or re-arrange the 
-	 * settings panel as we need to. We provide these filters here right now for internal use only.
-	 * As such the filters below may be removed or altered at any time, without advance
-	 * warning or announcement. You've been warned. 
-	 *
-	 * We will eventually promise backwards compatibility on these filters below but we want to ensure
-	 * for the first few major releases after 6.0 we do that the current settings arrangement won't stifle
-	 * our development progress. Once we're confident we've made the correct decision on settings layout, 
-	 * we'll remove this notice, and only at that point should you rely on the filters below.
-	 */
-	$monsterinsights_settings = array(
-		/** Engagement Settings */
-		'engagement' => apply_filters( 'monsterinsights_settings_engagement',
-			array(
-				'ignore_users' => array(
-					'id'          => 'ignore_users',
-					'name'        => __( 'Ignore these user roles from tracking:', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'Users that have at least one of these roles will not be tracked into Google Analytics.', 'google-analytics-for-wordpress' ),
-					'type'        => 'select',
-					'options'     => monsterinsights_get_roles(),
-					'select2'     => true,
-					'multiple'    => true,
-					'allowclear'  => true,
-				),
-				'events_mode' => array(
-					'id'          => 'events_mode',
-					'name'        => __( 'Track outbound clicks and download links?', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'We recommend tracking clicks and downloads, so you know where users are exiting your site, and what downloads they are interacting with. ', 'google-analytics-for-wordpress', 'google-analytics-for-wordpress' ),
-					'type' 		  => 'radio',
-					'std'  		  => 'js',
-					'options'     => array(
-						'none' => __( 'No', 'google-analytics-for-wordpress' ),
-						'php'  => __( 'Yes, using PHP (deprecated)', 'google-analytics-for-wordpress' ),
-						'js'   => __( 'Using Javascript (recommended)', 'google-analytics-for-wordpress' ),
-					),
-				),
-			)
-		),
-		/** Demographics Settings */
-		'demographics' => apply_filters('monsterinsights_settings_demographics',
-			array(
-				'demographics' => array(
-					'id'          => 'demographics',
-					'name'        => __( 'Enable Demographics and Interests Reports for Remarketing and Advertising', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Check this setting to add the Demographics and Remarketing features to your Google Analytics tracking code. Make sure to enable Demographics and Remarketing in your Google Analaytics account. We have a guide for how to do that in our %1$sknowledge base%2$s. For more information about Remarketing, we refer you to %3$sGoogle\'s documentation%2$s.', 'google-analytics-for-wordpress. Note that usage of this function is affected by privacy and cookie laws around the world. Be sure to follow the laws that affect your target audience.' ), '<a href="https://www.monsterinsights.com/docs/enable-demographics-and-interests-report-in-google-analytics/#utm_medium=kb-link&amp;utm_source=gawp-config&amp;utm_campaign=wpgaplugin" target="_blank" rel="noopener noreferrer" referrer="no-referrer">',
-									'</a>','<a href="https://support.google.com/analytics/answer/2444872?hl=' . get_locale() . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">'
-					),
-					'type' 		  => 'checkbox',
-				),
-				'anonymize_ips' => array(
-					'id'          => 'anonymize_ips',
-					'name'        => __( 'Anonymize IP addresses?', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This adds %1$s, telling Google Analytics to anonymize the information sent by the tracker objects by removing the last octet of the IP address prior to its storage.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApi_gat?csw=1#_gat._anonymizeIp" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_anonymizeIp</code></a>' ),
-					'type' 		  => 'checkbox',
-				),
-			)
-		),
-		/** Enhanced Link Attribution Settings */
-		'links' => apply_filters('monsterinsights_settings_links',
-			array(
-				'enhanced_link_attribution' => array(
-					'id'          => 'enhanced_link_attribution',
-					'name'        => __( 'Enable enhanced link attribution?', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Add %1$sEnhanced Link Attribution%2$s to your tracking code.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-link-attribution" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', ' </a>' ),
-					'type' 		  => 'checkbox',
-				),
-				'hash_tracking' => array(
-					'id'          => 'hash_tracking',
-					'name'        => __( 'Turn on anchor tracking', 'google-analytics-for-wordpress' ),
-					'desc'        => esc_html__( 'Many WordPress "1-page" style themes rely on anchor tags for navigation to show virtual pages. The problem is that to Google Analytics, these are all just a single page, and it makes it hard to get meaningful statistics about pages viewed. This feature allows proper tracking in those themes.', 'google-analytics-for-wordpress' ),
-					'type' 		  => 'checkbox',
-				),
-				'allow_anchor' => array(
-					'id'          => 'allow_anchor',
-					'name'        => __( 'Turn on allowAnchor', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This adds a %1$s call to your tracking code, and makes RSS link tagging use a %2$s as well.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiCampaignTracking?csw=1#_gat.GA_Tracker_._setAllowAnchor" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setAllowAnchor</code></a>', '<code>#</code>' ),
-					'type' 		  => 'checkbox',
-				),
-				'add_allow_linker' => array(
-					'id'          => 'add_allow_linker',
-					'name'        => __( 'Turn on allowLinker', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This adds a %1$s call to your tracking code, allowing you to use %2$s and related functions.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory?csw=1#_gat.GA_Tracker_._setAllowLinker" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setAllowLinker</code></a>', ' <code>_link</code>' ),
-					'type' 		  => 'checkbox',
-				),
-				'tag_links_in_rss' => array(
-					'id'          => 'tag_links_in_rss',
-					'name'        => __( 'Turn on tag links in RSS', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Do not use this feature if you use FeedBurner, as FeedBurner can do this automatically and better than this plugin can. Check %1$sthis help page%2$s for info on how to enable this feature in FeedBurner.', 'google-analytics-for-wordpress' ), '<a href="https://support.google.com/feedburner/answer/165769?hl=en&amp;ref_topic=13075" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ),
-					'type' 		  => 'checkbox',
-				),
-			)
-		),
-		/** File Download Settings */
-		'files' => apply_filters('monsterinsights_settings_files',
-			array(
-				'track_download_as' => array(
-					'id'          => 'track_download_as',
-					'name'        => __( 'Track downloads as an:', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'Tracking as pageviews is not recommended, as this would skew your statistics, but it does make it possible to track downloads as goals. This feature requires that event tracking be turned on.', 'google-analytics-for-wordpress' ),
-					'type' 		  => 'radio',
-					'std'  		  => 'event',
-					'options'     => array(
-						'event'     => __( 'Event (recommended)', 'google-analytics-for-wordpress' ),
-						'pageview'  => __( 'Pageview', 'google-analytics-for-wordpress' )
-					),
-				),
-				'extensions_of_files' => array( 		/* @todo: Select2 extensions of files */
-					'id'          => 'extensions_of_files',
-					'name'        => __( 'Extensions of files to track as downloads:', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'If you have enabled event tracking, MonsterInsights will send an event/pageview to GA if a link to a local file has one of the above extensions.', 'google-analytics-for-wordpress' ),
-					'type' 		  => 'text',
-				),
-			)
-		),
-		/** Affiliate Tracking Settings */
-		'affiliates' => apply_filters('monsterinsights_settings_affiliates',
-			array(
-				'track_internal_as_outbound' => array(
-					'id'          => 'track_internal_as_outbound',
-					'name'        => __( 'Set path for internal links to track as outbound links', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'If you want to track all internal links that begin with %1$s, enter %1$s in the box above. If you have multiple prefixes you can separate them with comma\'s: %2$s', 'google-analytics-for-wordpress' ), '<code>/out/</code>', '<code>/out/,/recommends/</code>' ),
-					'type' 		  => 'text',
-				),
-				'track_internal_as_label' => array(
-					'id'          => 'track_internal_as_label',
-					'name'        => __( 'Label for those links:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'The label to use for these links, this will be added to where the click came from, so if the label is %s, the label for a click from the content of an article becomes "outbound-article-aff".', 'google-analytics-for-wordpress' ), '"aff"' ),
-					'type' 		  => 'text',
-				),
-			)
-		),
-		/** Social Tracking Settings */
-		'social' => apply_filters('monsterinsights_settings_social',
-			array()
-		),
-		/** Ad Tracking Settings */
-		'ads' => apply_filters('monsterinsights_settings_ads',
-			array()
-		),
-		/** Forms Tracking Settings */
-		'forms' => apply_filters('monsterinsights_settings_forms',
-			array()
-		),
-		/** eCommerce Tracking Settings */
-		'ecommerce' => apply_filters('monsterinsights_settings_ecommerce',
-			array()
-		),
-		/** Media Tracking Settings */
-		'media' => apply_filters('monsterinsights_settings_media',
-			array()
-		),
-		/** Members Tracking Settings */
-		'memberships' => apply_filters('monsterinsights_settings_memberships',
-			array()
-		),
-		/** Dimensions Tracking Settings */
-		'dimensions' => apply_filters('monsterinsights_settings_dimensions',
-			array()
-		),
-		/** Performance Tracking Settings */
-		'performance' => apply_filters('monsterinsights_settings_performance',
-			array()
-		),
-		/** AMP Tracking Settings */
-		'amp' => apply_filters('monsterinsights_settings_amp',
-			array()
-		),
-		/** Google Optimize Tracking Settings */
-		'goptimize' => apply_filters('monsterinsights_settings_goptimize',
-			array()
-		),
-		/** Facebook Instant Articles Tracking Settings */
-		'fbia' => apply_filters('monsterinsights_settings_fbia',
-			array()
-		),
-		/** Bounce Reduction Settings */
-		'bounce' => apply_filters('monsterinsights_settings_bounce',
-			array()
-		),
-		/** Reporting Tracking Settings */
-		'reporting' => apply_filters('monsterinsights_settings_reporting',
-			array()
-		),
-		/** Notifications Tracking Settings */
-		'notifications' => apply_filters('monsterinsights_settings_notifications',
-			array()
-		),
-		/** Compatibility Tracking Settings */
-		'compatibility' => apply_filters('monsterinsights_settings_compatibility',
-			array(
-				'subdomain_tracking' => array(
-					'id'          => 'subdomain_tracking',
-					'name'        => __( 'Domain to track as:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'This allows you to %1$sset the domain%2$s that\'s used for tracking. Only is used if set to a value, else defaults to automatic determination. It is very rare that you would need to use this setting.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/tracking-snippet-reference" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' ,'</a>' ),
-					'type' 		  => 'text',
-				),
-				'custom_code' => array(
-					'id'          => 'custom_code',
-					'name'        => __( 'Custom code', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Not for the average user: this allows you to add a line of code, to be added before the %1$s call.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiBasicConfiguration#_gat.GA_Tracker_._trackPageview" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_trackPageview</code></a>' ),
-					'type' 		  => 'unfiltered_textarea',
-				),
-				'debug_mode' => array(
-					'id'          => 'debug_mode',
-					'name'        => __( 'Enable Debug Mode', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'Turns on debugging in JS events tracking, logging of eCommerce requests and enables debug settings.', 'google-analytics-for-wordpress'),
-					'type' 		  => 'checkbox',
-				),
-			)
-		),
-		/** Permissions Tracking Settings */
-		'permissions' => apply_filters('monsterinsights_settings_permissions',
-			array(
-				'view_reports' => array(
-					'id'          => 'view_reports',
-					'name'        => __( 'Let these user roles see reports (and the dashboard):', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html( 'Users that have at least one of these roles will be able to view the reports and dashboard, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>'),
-					'type'        => 'select',
-					'options'     => monsterinsights_get_roles(),
-					'select2'     => true,
-					'multiple'    => true,
-					'allowclear'  => true
-				),
-				'save_settings' => array(
-					'id'          => 'save_settings',
-					'name'        => __( 'Let these user roles save settings:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html__( 'Users that have at least one of these roles will be able to view and save the settings panel, along with any user with the %s capability.', 'google-analytics-for-wordpress'), '<code>manage_options</code>' ),
-					'type'        => 'select',
-					'options'     => monsterinsights_get_roles(),
-					'select2'     => true,
-					'multiple'    => true,
-					'allowclear'  => true
-				),
-				'automatic_updates' => array(
-					'id'          => 'automatic_updates',
-					'name'        => __( 'Automatic Updates', 'google-analytics-for-wordpress' ),
-					'type' 		  => 'radio',
-					'std'  		  => 'none',
-					'options'     => array(
-						'all'     => __( 'Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress' ),
-						'minor'   => __( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress' ),
-						'none'    => __( 'None - Manually update everything.', 'google-analytics-for-wordpress' ),
-					),
-				),
-				'anonymous_data' => array(
-					'id'          => 'anonymous_data',
-					'name'        => __( 'Allow Usage Tracking', 'google-analytics-for-wordpress' ),
-					'desc'        => __( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' ),
-					'type' 		  => 'checkbox',
-				),
-			)
-		),
-	);
-	return apply_filters( 'monsterinsights_registered_settings', $monsterinsights_settings );
+    /**
+     * Developers Warning: MonsterInsights does not guarantee backwards compatiblity
+     * of settings or tabs. We may add/remove settings and/or tabs, or re-arrange the 
+     * settings panel as we need to. We provide these filters here right now for internal use only.
+     * As such the filters below may be removed or altered at any time, without advance
+     * warning or announcement. You've been warned. 
+     *
+     * We will eventually promise backwards compatibility on these filters below but we want to ensure
+     * for the first few major releases after 6.0 we do that the current settings arrangement won't stifle
+     * our development progress. Once we're confident we've made the correct decision on settings layout, 
+     * we'll remove this notice, and only at that point should you rely on the filters below.
+     */
+    $monsterinsights_settings = array(
+        /** Engagement Settings */
+        'engagement' => apply_filters( 'monsterinsights_settings_engagement',
+            array(
+                'ignore_users' => array(
+                    'id'          => 'ignore_users',
+                    'name'        => __( 'Ignore these user roles from tracking:', 'google-analytics-for-wordpress' ),
+                    'desc'        => __( 'Users that have at least one of these roles will not be tracked into Google Analytics.', 'google-analytics-for-wordpress' ),
+                    'type'        => 'select',
+                    'options'     => monsterinsights_get_roles(),
+                    'select2'     => true,
+                    'multiple'    => true,
+                    'allowclear'  => true,
+                ),
+                'events_mode' => array(
+                    'id'          => 'events_mode',
+                    'name'        => __( 'Track outbound clicks and download links?', 'google-analytics-for-wordpress' ),
+                    'desc'        => __( 'We recommend tracking clicks and downloads, so you know where users are exiting your site, and what downloads they are interacting with. ', 'google-analytics-for-wordpress', 'google-analytics-for-wordpress' ),
+                    'type' 		  => 'radio',
+                    'std'  		  => 'js',
+                    'options'     => array(
+                        'none' => __( 'No', 'google-analytics-for-wordpress' ),
+                        'php'  => __( 'Yes, using PHP (deprecated)', 'google-analytics-for-wordpress' ),
+                        'js'   => __( 'Using Javascript (recommended)', 'google-analytics-for-wordpress' ),
+                    ),
+                ),
+            )
+        ),
+        /** Demographics Settings */
+        'demographics' => apply_filters('monsterinsights_settings_demographics',
+            array(
+                'demographics' => array(
+                    'id'          => 'demographics',
+                    'name'        => __( 'Enable Demographics and Interests Reports for Remarketing and Advertising', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'Check this setting to add the Demographics and Remarketing features to your Google Analytics tracking code. Make sure to enable Demographics and Remarketing in your Google Analaytics account. We have a guide for how to do that in our %1$sknowledge base%2$s. For more information about Remarketing, we refer you to %3$sGoogle\'s documentation%2$s.', 'google-analytics-for-wordpress. Note that usage of this function is affected by privacy and cookie laws around the world. Be sure to follow the laws that affect your target audience.' ), '<a href="https://www.monsterinsights.com/docs/enable-demographics-and-interests-report-in-google-analytics/#utm_medium=kb-link&amp;utm_source=gawp-config&amp;utm_campaign=wpgaplugin" target="_blank" rel="noopener noreferrer" referrer="no-referrer">',
+                                    '</a>','<a href="https://support.google.com/analytics/answer/2444872?hl=' . get_locale() . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">'
+                    ),
+                    'type' 		  => 'checkbox',
+                ),
+                'anonymize_ips' => array(
+                    'id'          => 'anonymize_ips',
+                    'name'        => __( 'Anonymize IP addresses?', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'This adds %1$s, telling Google Analytics to anonymize the information sent by the tracker objects by removing the last octet of the IP address prior to its storage.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApi_gat?csw=1#_gat._anonymizeIp" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_anonymizeIp</code></a>' ),
+                    'type' 		  => 'checkbox',
+                ),
+            )
+        ),
+        /** Enhanced Link Attribution Settings */
+        'links' => apply_filters('monsterinsights_settings_links',
+            array(
+                'enhanced_link_attribution' => array(
+                    'id'          => 'enhanced_link_attribution',
+                    'name'        => __( 'Enable enhanced link attribution?', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'Add %1$sEnhanced Link Attribution%2$s to your tracking code.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/enhanced-link-attribution" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', ' </a>' ),
+                    'type' 		  => 'checkbox',
+                ),
+                'hash_tracking' => array(
+                    'id'          => 'hash_tracking',
+                    'name'        => __( 'Turn on anchor tracking', 'google-analytics-for-wordpress' ),
+                    'desc'        => esc_html__( 'Many WordPress "1-page" style themes rely on anchor tags for navigation to show virtual pages. The problem is that to Google Analytics, these are all just a single page, and it makes it hard to get meaningful statistics about pages viewed. This feature allows proper tracking in those themes.', 'google-analytics-for-wordpress' ),
+                    'type' 		  => 'checkbox',
+                ),
+                'allow_anchor' => array(
+                    'id'          => 'allow_anchor',
+                    'name'        => __( 'Turn on allowAnchor', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'This adds a %1$s call to your tracking code, and makes RSS link tagging use a %2$s as well.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiCampaignTracking?csw=1#_gat.GA_Tracker_._setAllowAnchor" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setAllowAnchor</code></a>', '<code>#</code>' ),
+                    'type' 		  => 'checkbox',
+                ),
+                'add_allow_linker' => array(
+                    'id'          => 'add_allow_linker',
+                    'name'        => __( 'Turn on allowLinker', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'This adds a %1$s call to your tracking code, allowing you to use %2$s and related functions.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiDomainDirectory?csw=1#_gat.GA_Tracker_._setAllowLinker" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_setAllowLinker</code></a>', ' <code>_link</code>' ),
+                    'type' 		  => 'checkbox',
+                ),
+                'tag_links_in_rss' => array(
+                    'id'          => 'tag_links_in_rss',
+                    'name'        => __( 'Turn on tag links in RSS', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'Do not use this feature if you use FeedBurner, as FeedBurner can do this automatically and better than this plugin can. Check %1$sthis help page%2$s for info on how to enable this feature in FeedBurner.', 'google-analytics-for-wordpress' ), '<a href="https://support.google.com/feedburner/answer/165769?hl=en&amp;ref_topic=13075" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' ),
+                    'type' 		  => 'checkbox',
+                ),
+            )
+        ),
+        /** File Download Settings */
+        'files' => apply_filters('monsterinsights_settings_files',
+            array(
+                'track_download_as' => array(
+                    'id'          => 'track_download_as',
+                    'name'        => __( 'Track downloads as an:', 'google-analytics-for-wordpress' ),
+                    'desc'        => __( 'Tracking as pageviews is not recommended, as this would skew your statistics, but it does make it possible to track downloads as goals. This feature requires that event tracking be turned on.', 'google-analytics-for-wordpress' ),
+                    'type' 		  => 'radio',
+                    'std'  		  => 'event',
+                    'options'     => array(
+                        'event'     => __( 'Event (recommended)', 'google-analytics-for-wordpress' ),
+                        'pageview'  => __( 'Pageview', 'google-analytics-for-wordpress' )
+                    ),
+                ),
+                'extensions_of_files' => array( 		/* @todo: Select2 extensions of files */
+                    'id'          => 'extensions_of_files',
+                    'name'        => __( 'Extensions of files to track as downloads:', 'google-analytics-for-wordpress' ),
+                    'desc'        => __( 'If you have enabled event tracking, MonsterInsights will send an event/pageview to GA if a link to a local file has one of the above extensions.', 'google-analytics-for-wordpress' ),
+                    'type' 		  => 'text',
+                ),
+            )
+        ),
+        /** Affiliate Tracking Settings */
+        'affiliates' => apply_filters('monsterinsights_settings_affiliates',
+            array(
+                'track_internal_as_outbound' => array(
+                    'id'          => 'track_internal_as_outbound',
+                    'name'        => __( 'Set path for internal links to track as outbound links', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'If you want to track all internal links that begin with %1$s, enter %1$s in the box above. If you have multiple prefixes you can separate them with comma\'s: %2$s', 'google-analytics-for-wordpress' ), '<code>/out/</code>', '<code>/out/,/recommends/</code>' ),
+                    'type' 		  => 'text',
+                ),
+                'track_internal_as_label' => array(
+                    'id'          => 'track_internal_as_label',
+                    'name'        => __( 'Label for those links:', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'The label to use for these links, this will be added to where the click came from, so if the label is %s, the label for a click from the content of an article becomes "outbound-article-aff".', 'google-analytics-for-wordpress' ), '"aff"' ),
+                    'type' 		  => 'text',
+                ),
+            )
+        ),
+        /** Social Tracking Settings */
+        'social' => apply_filters('monsterinsights_settings_social',
+            array()
+        ),
+        /** Ad Tracking Settings */
+        'ads' => apply_filters('monsterinsights_settings_ads',
+            array()
+        ),
+        /** Forms Tracking Settings */
+        'forms' => apply_filters('monsterinsights_settings_forms',
+            array()
+        ),
+        /** eCommerce Tracking Settings */
+        'ecommerce' => apply_filters('monsterinsights_settings_ecommerce',
+            array()
+        ),
+        /** Media Tracking Settings */
+        'media' => apply_filters('monsterinsights_settings_media',
+            array()
+        ),
+        /** Members Tracking Settings */
+        'memberships' => apply_filters('monsterinsights_settings_memberships',
+            array()
+        ),
+        /** Dimensions Tracking Settings */
+        'dimensions' => apply_filters('monsterinsights_settings_dimensions',
+            array()
+        ),
+        /** Performance Tracking Settings */
+        'performance' => apply_filters('monsterinsights_settings_performance',
+            array()
+        ),
+        /** AMP Tracking Settings */
+        'amp' => apply_filters('monsterinsights_settings_amp',
+            array()
+        ),
+        /** Google Optimize Tracking Settings */
+        'goptimize' => apply_filters('monsterinsights_settings_goptimize',
+            array()
+        ),
+        /** Facebook Instant Articles Tracking Settings */
+        'fbia' => apply_filters('monsterinsights_settings_fbia',
+            array()
+        ),
+        /** Bounce Reduction Settings */
+        'bounce' => apply_filters('monsterinsights_settings_bounce',
+            array()
+        ),
+        /** Reporting Tracking Settings */
+        'reporting' => apply_filters('monsterinsights_settings_reporting',
+            array()
+        ),
+        /** Notifications Tracking Settings */
+        'notifications' => apply_filters('monsterinsights_settings_notifications',
+            array()
+        ),
+        /** Compatibility Tracking Settings */
+        'compatibility' => apply_filters('monsterinsights_settings_compatibility',
+            array(
+                'subdomain_tracking' => array(
+                    'id'          => 'subdomain_tracking',
+                    'name'        => __( 'Domain to track as:', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'This allows you to %1$sset the domain%2$s that\'s used for tracking. Only is used if set to a value, else defaults to automatic determination. It is very rare that you would need to use this setting.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/analyticsjs/tracking-snippet-reference" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' ,'</a>' ),
+                    'type' 		  => 'text',
+                ),
+                'custom_code' => array(
+                    'id'          => 'custom_code',
+                    'name'        => __( 'Custom code', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'Not for the average user: this allows you to add a line of code, to be added before the %1$s call.', 'google-analytics-for-wordpress' ), '<a href="https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiBasicConfiguration#_gat.GA_Tracker_._trackPageview" target="_blank" rel="noopener noreferrer" referrer="no-referrer"><code>_trackPageview</code></a>' ),
+                    'type' 		  => 'unfiltered_textarea',
+                ),
+                'debug_mode' => array(
+                    'id'          => 'debug_mode',
+                    'name'        => __( 'Enable Debug Mode', 'google-analytics-for-wordpress' ),
+                    'desc'        => __( 'Turns on debugging in JS events tracking, logging of eCommerce requests and enables debug settings.', 'google-analytics-for-wordpress'),
+                    'type' 		  => 'checkbox',
+                ),
+            )
+        ),
+        /** Permissions Tracking Settings */
+        'permissions' => apply_filters('monsterinsights_settings_permissions',
+            array(
+                'view_reports' => array(
+                    'id'          => 'view_reports',
+                    'name'        => __( 'Let these user roles see reports (and the dashboard):', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html( 'Users that have at least one of these roles will be able to view the reports and dashboard, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>'),
+                    'type'        => 'select',
+                    'options'     => monsterinsights_get_roles(),
+                    'select2'     => true,
+                    'multiple'    => true,
+                    'allowclear'  => true
+                ),
+                'save_settings' => array(
+                    'id'          => 'save_settings',
+                    'name'        => __( 'Let these user roles save settings:', 'google-analytics-for-wordpress' ),
+                    'desc'        => sprintf( esc_html__( 'Users that have at least one of these roles will be able to view and save the settings panel, along with any user with the %s capability.', 'google-analytics-for-wordpress'), '<code>manage_options</code>' ),
+                    'type'        => 'select',
+                    'options'     => monsterinsights_get_roles(),
+                    'select2'     => true,
+                    'multiple'    => true,
+                    'allowclear'  => true
+                ),
+                'automatic_updates' => array(
+                    'id'          => 'automatic_updates',
+                    'name'        => __( 'Automatic Updates', 'google-analytics-for-wordpress' ),
+                    'type' 		  => 'radio',
+                    'std'  		  => 'none',
+                    'options'     => array(
+                        'all'     => __( 'Yes (Recommended) - Get the latest features, bugfixes, and security updates as they are released.', 'google-analytics-for-wordpress' ),
+                        'minor'   => __( 'Minor Only - Only get bugfixes and security updates, but not major features.', 'google-analytics-for-wordpress' ),
+                        'none'    => __( 'None - Manually update everything.', 'google-analytics-for-wordpress' ),
+                    ),
+                ),
+                'anonymous_data' => array(
+                    'id'          => 'anonymous_data',
+                    'name'        => __( 'Allow Usage Tracking', 'google-analytics-for-wordpress' ),
+                    'desc'        => __( 'By allowing us to track usage data we can better help you, because we know with which WordPress configurations, themes and plugins we should test.', 'google-analytics-for-wordpress' ),
+                    'type' 		  => 'checkbox',
+                ),
+            )
+        ),
+    );
+    return apply_filters( 'monsterinsights_registered_settings', $monsterinsights_settings );
 }

includes/admin/settings/tab-status.php

Spacing +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
     exit;
 }
 
@@ -32,21 +32,21 @@ 
     </div>
     <?php
 }
-add_action( 'monsterinsights_tab_settings_status', 'monsterinsights_settings_status_tab' );
+add_action('monsterinsights_tab_settings_status', 'monsterinsights_settings_status_tab');
 
 
 /**
  * Output System Info file
  */
 function monsterinsights_system_info() {
-    if ( ! empty( $_REQUEST['monsterinsights-action'] ) && $_REQUEST['monsterinsights-action'] === 'download_sysinfo' ) {
-        if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
+    if ( ! empty($_REQUEST['monsterinsights-action']) && $_REQUEST['monsterinsights-action'] === 'download_sysinfo') {
+        if ( ! current_user_can('monsterinsights_save_settings')) {
             return;
         }
         nocache_headers();
-        header( 'Content-Type: text/plain' );
-        header( 'Content-Disposition: attachment; filename="monsterinsights-system-info.txt"' );
-        echo wp_strip_all_tags( $_POST['monsterinsights-sysinfo'] );
+        header('Content-Type: text/plain');
+        header('Content-Disposition: attachment; filename="monsterinsights-system-info.txt"');
+        echo wp_strip_all_tags($_POST['monsterinsights-sysinfo']);
         die();
     }
 }