awesomemotive / google-analytics-for-wordpress

includes/admin/reports/overview.php

Braces +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
 	}
 
 	// Outputs the report.
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		ob_start();
 		if ( ! empty( $data['overviewgraph']['count'] ) && $data['overviewgraph']['count'] > 0 ) {
 			?>
@@ -508,7 +508,7 @@ 
 						foreach( $data['countries'] as $icountry => $countrydata ) {
 							if ( ! empty( $countries[ $countrydata['iso'] ] ) ) {
 								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[ $countrydata['iso'] ] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
-							} else { 
+							} else {
 								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							}
 							$i++;

Spacing +47 added lines, -47 removed lines

@@ -36,7 +36,7 @@ 
 	}
 
 	// Outputs the report.
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		ob_start();
 		if ( ! empty( $data['overviewgraph']['count'] ) && $data['overviewgraph']['count'] > 0 ) {
 			?>
@@ -97,7 +97,7 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['sessions']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
 					<?php echo esc_html( absint( $data['infobox']['sessions']['prev'] ) ) . '%'; ?>
@@ -124,7 +124,7 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['pageviews']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
 					<?php echo esc_html( absint( $data['infobox']['pageviews']['prev'] ) ) . '%'; ?>
@@ -151,10 +151,10 @@ 
 					<img src="<?php echo $up; ?>" srcset="<?php echo $up2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['duration']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $down; ?>" srcset="<?php echo $down2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
-					<?php echo esc_html( absint(  $data['infobox']['duration']['prev'] ) ) . '%'; ?>
+					<?php echo esc_html( absint( $data['infobox']['duration']['prev'] ) ) . '%'; ?>
 				</div>
 				<?php } ?>
 				<div class="monsterinsights-reports-infobox-compare">
@@ -178,7 +178,7 @@ 
 					<img src="<?php echo $upred; ?>" srcset="<?php echo $upred2x; ?> 2x" alt="<?php echo $uplabel; ?>"/>
 					<?php echo esc_html( $data['infobox']['bounce']['prev'] ) . '%'; ?>
 				</div>
-				<?php } else  { ?>
+				<?php } else { ?>
 				<div class="monsterinsights-reports-infobox-prev">
 					<img src="<?php echo $downgrn; ?>" srcset="<?php echo $downgrn2x; ?> 2x" alt="<?php echo $downlabel; ?>"/>
 					<?php echo esc_html( absint( $data['infobox']['bounce']['prev'] ) ) . '%'; ?>
@@ -190,12 +190,12 @@ 
 			  </div>
 			</div>
 		<?php } ?>
-		<?php if ( ! empty( $data['newvsreturn'] ) &&  ! empty( $data['devices'] ) ) { ?>
+		<?php if ( ! empty( $data['newvsreturn'] ) && ! empty( $data['devices'] ) ) { ?>
 			<div class="monsterinsights-reports-2-column-container row">
 			  <div class="monsterinsights-reports-2-column-item col-md-6">
 				<div class="monsterinsights-reports-2-column-panel panel monsterinsights-pie-chart-panel chart-panel">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'New vs. Returning Visitors', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'New vs. Returning Visitors', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'New vs. Returning Visitors', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This graph shows what percent of your user sessions come from new versus repeat visitors.', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-pie-graph monsterinsights-clear">
@@ -285,8 +285,8 @@ 
 										}],
 										values: [<?php echo esc_js( $data['newvsreturn']['new'] ); ?>,<?php echo esc_js( $data['newvsreturn']['returning'] ); ?> ],
 										labels: [
-											"<?php echo esc_js( __('New', 'google-analytics-for-wordpress' ) ); ?>",
-											"<?php echo esc_js( __('Returning', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'New', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Returning', 'google-analytics-for-wordpress' ) ); ?>",
 										]
 									},
 									options: {
@@ -344,7 +344,7 @@ 
 			<div class="monsterinsights-reports-2-column-item col-md-6">
 				<div class="monsterinsights-reports-2-column-panel panel monsterinsights-pie-chart-panel chart-panel">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'Device Breakdown', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Device Breakdown', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Device Breakdown', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This graph shows what percent of your visitor sessions are done using a traditional computer or laptop, tablet or mobile device to view your site.', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-pie-graph monsterinsights-clear">
@@ -436,9 +436,9 @@ 
 										}],
 										values: [<?php echo esc_js( $data['devices']['desktop'] ); ?>,<?php echo esc_js( $data['devices']['tablet'] ); ?>,<?php echo esc_js( $data['devices']['mobile'] ); ?>  ],
 										labels: [
-											"<?php echo esc_js( __('Desktop', 'google-analytics-for-wordpress' ) ); ?>",
-											"<?php echo esc_js( __('Tablet', 'google-analytics-for-wordpress' ) ); ?>",
-											"<?php echo esc_js( __('Mobile', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Desktop', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Tablet', 'google-analytics-for-wordpress' ) ); ?>",
+											"<?php echo esc_js( __( 'Mobile', 'google-analytics-for-wordpress' ) ); ?>",
 										]
 									},
 									options: {
@@ -496,12 +496,12 @@ 
 			</div>
 		<?php } ?>
 
-		<?php if ( ! empty( $data['countries'] ) &&  ! empty( $data['referrals'] ) ) { ?>
+		<?php if ( ! empty( $data['countries'] ) && ! empty( $data['referrals'] ) ) { ?>
 			<div class="monsterinsights-reports-2-column-container row">
 			  <div class="monsterinsights-reports-2-column-item col-md-6 list-has-icons">
 				<div class="monsterinsights-reports-2-column-panel panel nopadding">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'Top 10 Countries', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Top 10 Countries', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Top 10 Countries', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This list shows the top countries your website visitors are from.', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-list">
@@ -509,11 +509,11 @@ 
 						<?php 
 						$countries = monsterinsights_get_country_list( true );
 						$i = 1;
-						foreach( $data['countries'] as $icountry => $countrydata ) {
-							if ( ! empty( $countries[ $countrydata['iso'] ] ) ) {
-								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[ $countrydata['iso'] ] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
+						foreach ( $data['countries'] as $icountry => $countrydata ) {
+							if ( ! empty( $countries[$countrydata['iso']] ) ) {
+								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '.</span><span class="monsterinsights-reports-country-flag monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countries[$countrydata['iso']] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							} else { 
-								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">'. $i .'</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
+								echo '<li class="list-group-item"><span class="monsterinsights-reports-list-count">' . $i . '</span><span class="monsterinsights-flag-icon monsterinsights-flag-icon-' . strtolower( $countrydata['iso'] ) . ' "></span><span class="monsterinsights-reports-list-text">' . $countrydata['iso'] . '</span><span class="monsterinsights-reports-list-number">' . number_format_i18n( $countrydata['sessions'] ) . '</span></li>';
 							}
 							$i++;
 						}
@@ -521,35 +521,35 @@ 
 						</ul>
 					</div>
 					<?php 
-					$referral_url = 'https://analytics.google.com/analytics/web/#report/visitors-geo/'. MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
+					$referral_url = 'https://analytics.google.com/analytics/web/#report/visitors-geo/' . MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
 					?>
 					<div class="monsterinsights-reports-panel-footer">
-						<a href="<?php echo $referral_url; ?>" target="_blank"  title="<?php echo esc_html__( 'View Full Countries Report', 'google-analytics-for-wordpress' );?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Countries Report', 'google-analytics-for-wordpress' );?></a>
+						<a href="<?php echo $referral_url; ?>" target="_blank"  title="<?php echo esc_html__( 'View Full Countries Report', 'google-analytics-for-wordpress' ); ?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Countries Report', 'google-analytics-for-wordpress' ); ?></a>
 					</div>
 				</div>
 			  </div>
 			  <div class="monsterinsights-reports-2-column-item col-md-6 list-has-icons">
 				<div class="monsterinsights-reports-2-column-panel panel nopadding">
 					<div class="monsterinsights-reports-panel-title">
-						<?php echo esc_html__( 'Referrals', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Referrals', 'google-analytics-for-wordpress' ); ?>
 					</div>
 					<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Referrals', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This list shows the top websites that send your website traffic, known as "referral traffic".', 'google-analytics-for-wordpress' ) ); ?>"></div>
 					<div class="monsterinsights-reports-list">
 						<ul class="monsterinsights-reports-referral-list list-group">
 						<?php
 						$i = 1;
-						foreach( $data['referrals'] as $ireferrals => $referralsdata ) {
-								echo '<li class="list-group-item">'.
+						foreach ( $data['referrals'] as $ireferrals => $referralsdata ) {
+								echo '<li class="list-group-item">' .
 										'<span class="monsterinsights-reports-list-count">'
 											. $i .
-										'</span>'.
-										'<img class="monsterinsights-reports-referral-icon"  src="https://www.google.com/s2/favicons?domain=' . $referralsdata['url'] . '" width="16px" height="16px" />'.
+										'</span>' .
+										'<img class="monsterinsights-reports-referral-icon"  src="https://www.google.com/s2/favicons?domain=' . $referralsdata['url'] . '" width="16px" height="16px" />' .
 										'<span class="monsterinsights-reports-list-text">' 
 											. $referralsdata['url'] . 
 										'</span>
 										<span class="monsterinsights-reports-list-number">'
 											. number_format_i18n( $referralsdata['sessions'] ) . 
-										'</span>'.
+										'</span>' .
 									'</li>';
 							$i++;
 						}
@@ -557,10 +557,10 @@ 
 						</ul>
 					</div>
 					<?php 
-					$referral_url = 'https://analytics.google.com/analytics/web/#report/trafficsources-referrals/'. MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
+					$referral_url = 'https://analytics.google.com/analytics/web/#report/trafficsources-referrals/' . MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
 					?>
 					<div class="monsterinsights-reports-panel-footer">
-						<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' );?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' );?></a>
+						<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' ); ?>" class="monsterinsights-reports-panel-footer-button"><?php echo esc_html__( 'View All Referral Sources', 'google-analytics-for-wordpress' ); ?></a>
 					</div>
 				</div>
 			  </div>
@@ -570,7 +570,7 @@ 
 		<?php if ( ! empty( $data['toppages'] ) ) { ?>
 			<div class="monsterinsights-reports-1-column-row panel row container-fluid nopadding list-no-icons" style="position: relative;">
 				<div class="monsterinsights-reports-panel-title">
-					<?php echo esc_html__( 'Top Posts / Pages', 'google-analytics-for-wordpress' );?>
+					<?php echo esc_html__( 'Top Posts / Pages', 'google-analytics-for-wordpress' ); ?>
 				</div>
 				
 				<div class="monsterinsights-reports-uright-tooltip" data-tooltip-title="<?php echo esc_attr( __( 'Top Posts / Pages', 'google-analytics-for-wordpress' ) ); ?>" data-tooltip-description="<?php echo esc_attr( __( 'This list shows the most viewed posts and pages on your website.', 'google-analytics-for-wordpress' ) ); ?>"></div>
@@ -578,23 +578,23 @@ 
 					<ul class="monsterinsights-reports-pages-list list-group">
 						<?php
 						$i = 1;
-						foreach( $data['toppages'] as $itoppages => $toppagesdata ) {
-								$hide     = $i > 10 ? ' style="display: none;" ': '';
+						foreach ( $data['toppages'] as $itoppages => $toppagesdata ) {
+								$hide     = $i > 10 ? ' style="display: none;" ' : '';
 								$protocol = is_ssl() ? 'https://' : 'http://';
-								$opening  = ! empty( $toppagesdata['url'] ) && ! empty( $toppagesdata['hostname'] ) ? '<a href="' . $protocol . esc_attr( $toppagesdata['hostname'] . $toppagesdata['url'] ) .'" target="_blank">' : '';
+								$opening  = ! empty( $toppagesdata['url'] ) && ! empty( $toppagesdata['hostname'] ) ? '<a href="' . $protocol . esc_attr( $toppagesdata['hostname'] . $toppagesdata['url'] ) . '" target="_blank">' : '';
 								$closing = ! empty( $opening ) ? '</a>' : '';
-								echo '<li class="list-group-item  monsterinsights-listing-table-row"'. $hide . '>'.
+								echo '<li class="list-group-item  monsterinsights-listing-table-row"' . $hide . '>' .
 										'<span class="monsterinsights-reports-list-count">'
 											. $i .
-										'. </span>&nbsp;'.
+										'. </span>&nbsp;' .
 										'<span class="monsterinsights-reports-list-text">' 
 											. $opening
 											. $toppagesdata['title']
 											. $closing .
-										'</span>'.
+										'</span>' .
 										'<span class="monsterinsights-reports-list-number">' . 
 											number_format_i18n( $toppagesdata['sessions'] ) . 
-										'</span>'.
+										'</span>' .
 									'</li>';
 							$i++;
 						}
@@ -602,16 +602,16 @@ 
 					</ul>
 				</div>
 				<?php 
-				$referral_url = 'https://analytics.google.com/analytics/web/#report/content-pages/'. MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
+				$referral_url = 'https://analytics.google.com/analytics/web/#report/content-pages/' . MonsterInsights()->auth->get_referral_url() . $this->get_ga_report_range( $data );
 				?>
 				<div class="monsterinsights-reports-panel-footer monsterinsights-reports-panel-footer-large">
-					<?php echo esc_html__( 'Show', 'google-analytics-for-wordpress' );?>&nbsp;
-					<div class="monsterinsights-reports-show-selector-group btn-group" role="group" aria-label="<?php echo esc_html__( 'How many to show', 'google-analytics-for-wordpress' );?>">
+					<?php echo esc_html__( 'Show', 'google-analytics-for-wordpress' ); ?>&nbsp;
+					<div class="monsterinsights-reports-show-selector-group btn-group" role="group" aria-label="<?php echo esc_html__( 'How many to show', 'google-analytics-for-wordpress' ); ?>">
 						 <button type="button" data-tid="monsterinsights-report-top-page-list" class="monsterinsights-reports-show-selector-button ten btn btn-default active" disabled="disabled">10</button>
 						 <button type="button" data-tid="monsterinsights-report-top-page-list" class="monsterinsights-reports-show-selector-button twentyfive btn btn-default">25</button>
 						 <button type="button" data-tid="monsterinsights-report-top-page-list" class="monsterinsights-reports-show-selector-button fifty btn btn-default">50</button>
 					</div>
-					<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' );?>" class="monsterinsights-reports-panel-footer-button alignright" style="margin-right: 20px;"><?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' );?></a>
+					<a href="<?php echo $referral_url; ?>" target="_blank" title="<?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' ); ?>" class="monsterinsights-reports-panel-footer-button alignright" style="margin-right: 20px;"><?php echo esc_html__( 'View Full Post/Page Report', 'google-analytics-for-wordpress' ); ?></a>
 				</div>
 			</div>
 		<?php } ?>
@@ -648,7 +648,7 @@ 
 
 		ob_start(); ?>
 		<div class="monsterinsights-reports-box-datagraph" style="position:relative;">
-			<canvas id="monsterinsights-overview-<?php echo $class;?>" width="400px" height="400px"></canvas>
+			<canvas id="monsterinsights-overview-<?php echo $class; ?>" width="400px" height="400px"></canvas>
 			<script>
 				jQuery(document).ready(function() {
 					if ( window.uorigindetected != null){
@@ -679,7 +679,7 @@ 
 						   }
 						});
 						
-						var ctx = document.getElementById("monsterinsights-overview-<?php echo $class;?>");
+						var ctx = document.getElementById("monsterinsights-overview-<?php echo $class; ?>");
 						var data = {
 							labels: [<?php echo implode( ', ', $labels ); ?>],
 							datasets: [
@@ -704,8 +704,8 @@ 
 									pointHoverRadius: 6,//The radius of the point when hovered.
 
 
-									labels: [<?php echo implode( ', ', $labels );   ?>],
-									data: [<?php echo implode( ', ', $datapoints );   ?>],
+									labels: [<?php echo implode( ', ', $labels ); ?>],
+									data: [<?php echo implode( ', ', $datapoints ); ?>],
 									trend: [<?php echo implode( ', ', $trendpoints ); ?>],
 								},
 							]
@@ -787,7 +787,7 @@ 
 						  });
 						};
 
-						var MonsterInsightsOverview<?php echo time();?> = new Chart(ctx, {
+						var MonsterInsightsOverview<?php echo time(); ?> = new Chart(ctx, {
 							type: 'LineWithLine',
 							data: data,
 							plugins: [{

includes/admin/tracking.php

Spacing +8 added lines, -8 removed lines

@@ -93,12 +93,12 @@ 
 		$data['usagetracking'] = get_option( 'monsterinsights_usage_tracking_config', false );
 		$data['usercount']     = function_exists( 'get_user_count' ) ? get_user_count() : 'Not Set';
 		$data['usesauth']      = $usesauth;
-		$data['timezoneoffset']= date('P');
+		$data['timezoneoffset'] = date( 'P' );
 
 
 
 		// Retrieve current plugin information
-		if( ! function_exists( 'get_plugins' ) ) {
+		if ( ! function_exists( 'get_plugins' ) ) {
 			include ABSPATH . '/wp-admin/includes/plugin.php';
 		}
 
@@ -108,7 +108,7 @@ 
 		foreach ( $plugins as $key => $plugin ) {
 			if ( in_array( $plugin, $active_plugins ) ) {
 				// Remove active plugins from list so we can show active and inactive separately
-				unset( $plugins[ $key ] );
+				unset( $plugins[$key] );
 			}
 		}
 
@@ -126,7 +126,7 @@ 
 			return false;
 		}
 
-		if( ! $this->tracking_allowed() && ! $override ) {
+		if ( ! $this->tracking_allowed() && ! $override ) {
 			return false;
 		}
 
@@ -158,15 +158,15 @@ 
 	public function schedule_send() {
 		if ( ! wp_next_scheduled( 'monsterinsights_usage_tracking_cron' ) ) {
 			$tracking             = array();
-			$tracking['day']      = rand( 0, 6  );
+			$tracking['day']      = rand( 0, 6 );
 			$tracking['hour']     = rand( 0, 23 );
 			$tracking['minute']   = rand( 0, 59 );
 			$tracking['second']   = rand( 0, 59 );
-			$tracking['offset']   = ( $tracking['day']    * DAY_IN_SECONDS    ) +
-									( $tracking['hour']   * HOUR_IN_SECONDS   ) +
+			$tracking['offset']   = ( $tracking['day'] * DAY_IN_SECONDS ) +
+									( $tracking['hour'] * HOUR_IN_SECONDS ) +
 									( $tracking['minute'] * MINUTE_IN_SECONDS ) +
 									 $tracking['second'];
-			$tracking['initsend'] = strtotime("next sunday") + $tracking['offset'];
+			$tracking['initsend'] = strtotime( "next sunday" ) + $tracking['offset'];
 
 			wp_schedule_event( $tracking['initsend'], 'weekly', 'monsterinsights_usage_tracking_cron' );
 			update_option( 'monsterinsights_usage_tracking_config', $tracking );

lite/includes/admin/reports/report-forms.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 		parent::__construct();
 	}
 
-	protected function get_report_html( $data = array() ){
+	protected function get_report_html( $data = array() ) {
 		return $this->get_upsell_notice();
 	}
 }
\ No newline at end of file

includes/frontend/tracking/class-tracking-analytics.php

Spacing +16 added lines, -16 removed lines

@@ -98,8 +98,8 @@ 
 
 		if ( $create && ! empty( $create ) && is_array( $create ) ) {
 			$create = json_encode( $create );
-			$create = str_replace( '"', "'",  $create );
-			$options['create'] = "'create', '" . esc_js( $ua_code ). "', '" . esc_js( $domain ) . "', " . $create;
+			$create = str_replace( '"', "'", $create );
+			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "', " . $create;
 		} else {
 			$options['create'] = "'create', '" . esc_js( $ua_code ) . "', '" . esc_js( $domain ) . "'";
 		}
@@ -175,21 +175,21 @@ 
 	 */
 	public function frontend_output( ) {
 		$options        = $this->frontend_tracking_options();
-		$is_debug_mode  =  monsterinsights_is_debug_mode();
-		$src     	    = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
+		$is_debug_mode  = monsterinsights_is_debug_mode();
+		$src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics.js' );
 		if ( current_user_can( 'manage_options' ) && $is_debug_mode ) {
-			$src       = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
+			$src = apply_filters( 'monsterinsights_frontend_output_analytics_src', '//www.google-analytics.com/analytics_debug.js' );
 		}
 		$compat     	= monsterinsights_get_option( 'gatracker_compatibility_mode', false );
-		$compat    	 	= $compat ? 'window.ga = __gaTracker;' : '';
+		$compat = $compat ? 'window.ga = __gaTracker;' : '';
 		$track_user 	= monsterinsights_track_user();
 		$ua         	= monsterinsights_get_ua();
 		$output     	= '';
 		$reason     	= '';
-		$attributes     = apply_filters( 'monsterinsights_tracking_analytics_script_attributes', array( 'type' => "text/javascript", 'data-cfasync' => 'false'  ) );
+		$attributes     = apply_filters( 'monsterinsights_tracking_analytics_script_attributes', array( 'type' => "text/javascript", 'data-cfasync' => 'false' ) );
 		$attr_string    = '';
 		if ( ! empty( $attributes ) ) {
-			foreach( $attributes as $attr_name => $attr_value ) {
+			foreach ( $attributes as $attr_name => $attr_value ) {
 	 			if ( ! empty( $attr_name ) ) {
 	 				$attr_string .= ' ' . sanitize_key( $attr_name ) . '="' . esc_attr( $attr_value ) . '"';
 	 			} else {
@@ -203,20 +203,20 @@ 
 <?php if ( ! $track_user ) {
 	if ( empty( $ua ) ) {
 		$reason = __( 'Note: MonsterInsights is not currently configured on this site. The site owner needs to authenticate with Google Analytics in the MonsterInsights settings panel.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	} else if ( current_user_can( 'monsterinsights_save_settings' ) ) {
-		$reason = __( 'Note: MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.'. PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+		$reason = __( 'Note: MonsterInsights does not track you as a logged in site administrator to prevent site owners from accidentally skewing their own Google Analytics data.' . PHP_EOL . 'If you are testing Google Analytics code, please do so either logged out or in the private browsing/incognito mode of your web browser.', 'google-analytics-for-wordpress' );
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	} else {
 		$reason = __( 'Note: The site owner has disabled Google Analytics tracking for your user role.', 'google-analytics-for-wordpress' );
-	    $output .=  '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
+	    $output .= '<!-- ' . esc_html( $reason ) . ' -->' . PHP_EOL;
 	}
 	echo $output;
 } ?>
 <?php if ( $ua ) { ?>
-<script<?php echo $attr_string;?>>
+<script<?php echo $attr_string; ?>>
 	var mi_track_user      = <?php echo ( $track_user ? 'true' : 'false' ); ?>;
-	var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason)  . "'": "''" ); ?>;
+	var mi_no_track_reason = <?php echo ( $reason ? "'" . esc_js( $reason ) . "'" : "''" ); ?>;
 	<?php do_action( 'monsterinsights_tracking_analytics_frontend_output_after_mi_track_user' ); ?>
 
 <?php if ( $this->should_do_optout() ) { ?>
@@ -264,7 +264,7 @@ 
 	?>
 	} else {
 <?php if ( $this->should_do_optout() ) { ?>
-		console.log( "<?php echo esc_js( $reason );?>" );
+		console.log( "<?php echo esc_js( $reason ); ?>" );
 		(function() {
 			/* https://developers.google.com/analytics/devguides/collection/analyticsjs/ */
 			var noopfn = function() {
@@ -287,7 +287,7 @@ 
 				}
 				var f = arguments[len-1];
 				if ( typeof f !== 'object' || f === null || typeof f.hitCallback !== 'function' ) {
-					console.log( '<?php echo esc_js( __("Not running function", "google-analytics-for-wordpress" ) );?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) );?> " + mi_no_track_reason );
+					console.log( '<?php echo esc_js( __( "Not running function", "google-analytics-for-wordpress" ) ); ?> __gaTracker(' + arguments[0] + " ....) <?php echo esc_js( __( "because you are not being tracked.", 'google-analytics-for-wordpress' ) ); ?> " + mi_no_track_reason );
 					return;
 				}
 				try {

includes/license.php

Spacing +33 added lines, -33 removed lines

@@ -87,10 +87,10 @@ 
 		$license_key  = ! empty( $license_key ) ? $license_key : MonsterInsights()->license->get_default_license_key();
 		return $license_key;
 	}
-	public function get_site_license_key(){
+	public function get_site_license_key() {
 		return ( ! empty( $this->site['key'] ) && is_string( $this->site['key'] ) && strlen( $this->site['key'] ) > 10 ) ? $this->site['key'] : '';
 	}
-	public function get_network_license_key(){
+	public function get_network_license_key() {
 		return ( ! empty( $this->network['key'] ) && is_string( $this->network['key'] ) && strlen( $this->network['key'] ) > 10 ) ? $this->network['key'] : '';
 	}
 
@@ -98,7 +98,7 @@ 
 		return $this->licensed;
 	}
 
-	public function is_site_licensed(){
+	public function is_site_licensed() {
 		return    ! empty( $this->site['key'] ) // has key
 			   &&   $this->get_site_license_type() // has type
 			   && ! $this->site_license_expired()  // isn't expired
@@ -117,28 +117,28 @@ 
 	}
 
 
-	public function get_site_license_updates(){
+	public function get_site_license_updates() {
 		return get_option( 'monsterinsights_license_updates', '' );
 	}
-	public function get_network_license_updates(){
+	public function get_network_license_updates() {
 		return get_site_option( 'monsterinsights_network_license_updates', '' );
 	}
 
-	public function set_site_license_updates(){
+	public function set_site_license_updates() {
 		update_option( 'monsterinsights_license_updates', strtotime( '+8 hours' ) );
 	}
 	public function set_network_license_updates() {
 		update_site_option( 'monsterinsights_network_license_updates', strtotime( '+8 hours' ) );
 	}
 
-	public function delete_site_license_updates(){
+	public function delete_site_license_updates() {
 		delete_option( 'monsterinsights_license_updates' );
 	}
-	public function delete_network_license_updates(){
+	public function delete_network_license_updates() {
 		delete_site_option( 'monsterinsights_license_updates' );
 	}
 
-	public function time_to_check_site_license(){
+	public function time_to_check_site_license() {
 		$timestamp = get_option( 'monsterinsights_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -151,7 +151,7 @@ 
 			}
 		}
 	}	
-	public function time_to_check_network_license(){
+	public function time_to_check_network_license() {
 		$timestamp = get_site_option( 'monsterinsights_network_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -165,21 +165,21 @@ 
 		}
 	}
 
-	public function set_site_license( $data = array() ){
+	public function set_site_license( $data = array() ) {
 		update_option( 'monsterinsights_license', $data );
 		$this->set_site_license_updates();
-		$this->site      = $data;
+		$this->site = $data;
 	}
-	public function set_network_license( $data = array() ){
+	public function set_network_license( $data = array() ) {
 		update_site_option( 'monsterinsights_network_license', $data );
 		$this->set_network_license_updates();
-		$this->network   = $data;
+		$this->network = $data;
 	}
 
 	public function delete_site_license() {
 		delete_option( 'monsterinsights_license' );
 		$this->delete_site_license_updates();
-		$this->site      = array();
+		$this->site = array();
 	}
 	public function delete_network_license() {
 		delete_site_option( 'monsterinsights_network_license' );
@@ -187,21 +187,21 @@ 
 		$this->network = array();
 	}
 
-	public function get_license_type(){
+	public function get_license_type() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 
 		return $this->using_network_license() ? $this->get_network_license_type() : $this->get_site_license_type();
 	}
-	public function get_site_license_type(){
+	public function get_site_license_type() {
 		return ( $this->get_site_license_key() && ! empty( $this->site['type'] ) && $this->is_valid_license_type( $this->site['type'] ) ) ? $this->site['type'] : '';
 	}
-	public function get_network_license_type(){
+	public function get_network_license_type() {
 		return ( $this->get_network_license_key() && ! empty( $this->network['type'] ) && $this->is_valid_license_type( $this->network['type'] ) ) ? $this->network['type'] : '';
 	}
 
-	public function license_has_error(){
+	public function license_has_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -215,7 +215,7 @@ 
 			   || $this->site_license_invalid()  // is invalid
 		;
 	}
-	public function network_license_has_error(){
+	public function network_license_has_error() {
 		return 
 				  $this->network_license_expired()  // is expired
 			   || $this->network_license_disabled()  // is disabled
@@ -223,21 +223,21 @@ 
 		;
 	}
 
-	public function license_expired(){
+	public function license_expired() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->network_license_expired() : $this->site_license_expired();
 	}
-	public function site_license_expired(){
+	public function site_license_expired() {
 		return ! empty( $this->site['is_expired'] );
 	}
-	public function network_license_expired(){
+	public function network_license_expired() {
 		return ! empty( $this->network['is_expired'] );
 	}
 
-	public function license_disabled(){
+	public function license_disabled() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -247,11 +247,11 @@ 
 	public function site_license_disabled() {
 		return ! empty( $this->site['is_disabled'] );
 	}
-	public function network_license_disabled(){
+	public function network_license_disabled() {
 		return ! empty( $this->network['is_disabled'] );
 	}
 
-	public function license_invalid(){
+	public function license_invalid() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -261,21 +261,21 @@ 
 	public function site_license_invalid() {
 		return ! empty( $this->site['is_invalid'] );
 	}
-	public function network_license_invalid(){
+	public function network_license_invalid() {
 		return ! empty( $this->network['is_invalid'] );
 	}
 
 
-	public function get_license_error(){
+	public function get_license_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->get_network_license_error() : $this->get_site_license_error();
 	}
-	public function get_site_license_error(){
+	public function get_site_license_error() {
 		if ( $this->site_license_expired() ) {
-			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
 			return esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
 		} else if ( $this->site_license_invalid() ) {
@@ -284,9 +284,9 @@ 
 		return '';
 	}
 
-	public function get_network_license_error(){
+	public function get_network_license_error() {
 		if ( $this->site_license_expired() ) {
-			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
 			return esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
 		} else if ( $this->site_license_invalid() ) {
@@ -362,7 +362,7 @@ 
 		return $can_access;
 	}
 
-	public function get_default_license_key(){
+	public function get_default_license_key() {
 		if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
 			return MONSTERINSIGHTS_LICENSE_KEY;
 		}

Braces +30 added lines, -30 removed lines

@@ -87,18 +87,18 @@ 
 		$license_key  = ! empty( $license_key ) ? $license_key : MonsterInsights()->license->get_default_license_key();
 		return $license_key;
 	}
-	public function get_site_license_key(){
+	public function get_site_license_key() {
 		return ( ! empty( $this->site['key'] ) && is_string( $this->site['key'] ) && strlen( $this->site['key'] ) > 10 ) ? $this->site['key'] : '';
 	}
-	public function get_network_license_key(){
+	public function get_network_license_key() {
 		return ( ! empty( $this->network['key'] ) && is_string( $this->network['key'] ) && strlen( $this->network['key'] ) > 10 ) ? $this->network['key'] : '';
 	}
 
-	public function has_license() { 
+	public function has_license() {
 		return $this->licensed;
 	}
 
-	public function is_site_licensed(){
+	public function is_site_licensed() {
 		return    ! empty( $this->site['key'] ) // has key
 			   &&   $this->get_site_license_type() // has type
 			   && ! $this->site_license_expired()  // isn't expired
@@ -117,28 +117,28 @@ 
 	}
 
 
-	public function get_site_license_updates(){
+	public function get_site_license_updates() {
 		return get_option( 'monsterinsights_license_updates', '' );
 	}
-	public function get_network_license_updates(){
+	public function get_network_license_updates() {
 		return get_site_option( 'monsterinsights_network_license_updates', '' );
 	}
 
-	public function set_site_license_updates(){
+	public function set_site_license_updates() {
 		update_option( 'monsterinsights_license_updates', strtotime( '+8 hours' ) );
 	}
 	public function set_network_license_updates() {
 		update_site_option( 'monsterinsights_network_license_updates', strtotime( '+8 hours' ) );
 	}
 
-	public function delete_site_license_updates(){
+	public function delete_site_license_updates() {
 		delete_option( 'monsterinsights_license_updates' );
 	}
-	public function delete_network_license_updates(){
+	public function delete_network_license_updates() {
 		delete_site_option( 'monsterinsights_license_updates' );
 	}
 
-	public function time_to_check_site_license(){
+	public function time_to_check_site_license() {
 		$timestamp = get_option( 'monsterinsights_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -151,7 +151,7 @@ 
 			}
 		}
 	}	
-	public function time_to_check_network_license(){
+	public function time_to_check_network_license() {
 		$timestamp = get_site_option( 'monsterinsights_network_license_updates' );
 		if ( ! $timestamp ) {
 			 return true;
@@ -165,12 +165,12 @@ 
 		}
 	}
 
-	public function set_site_license( $data = array() ){
+	public function set_site_license( $data = array() ) {
 		update_option( 'monsterinsights_license', $data );
 		$this->set_site_license_updates();
 		$this->site      = $data;
 	}
-	public function set_network_license( $data = array() ){
+	public function set_network_license( $data = array() ) {
 		update_site_option( 'monsterinsights_network_license', $data );
 		$this->set_network_license_updates();
 		$this->network   = $data;
@@ -187,21 +187,21 @@ 
 		$this->network = array();
 	}
 
-	public function get_license_type(){
+	public function get_license_type() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 
 		return $this->using_network_license() ? $this->get_network_license_type() : $this->get_site_license_type();
 	}
-	public function get_site_license_type(){
+	public function get_site_license_type() {
 		return ( $this->get_site_license_key() && ! empty( $this->site['type'] ) && $this->is_valid_license_type( $this->site['type'] ) ) ? $this->site['type'] : '';
 	}
-	public function get_network_license_type(){
+	public function get_network_license_type() {
 		return ( $this->get_network_license_key() && ! empty( $this->network['type'] ) && $this->is_valid_license_type( $this->network['type'] ) ) ? $this->network['type'] : '';
 	}
 
-	public function license_has_error(){
+	public function license_has_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -215,7 +215,7 @@ 
 			   || $this->site_license_invalid()  // is invalid
 		;
 	}
-	public function network_license_has_error(){
+	public function network_license_has_error() {
 		return 
 				  $this->network_license_expired()  // is expired
 			   || $this->network_license_disabled()  // is disabled
@@ -223,21 +223,21 @@ 
 		;
 	}
 
-	public function license_expired(){
+	public function license_expired() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->network_license_expired() : $this->site_license_expired();
 	}
-	public function site_license_expired(){
+	public function site_license_expired() {
 		return ! empty( $this->site['is_expired'] );
 	}
-	public function network_license_expired(){
+	public function network_license_expired() {
 		return ! empty( $this->network['is_expired'] );
 	}
 
-	public function license_disabled(){
+	public function license_disabled() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -247,11 +247,11 @@ 
 	public function site_license_disabled() {
 		return ! empty( $this->site['is_disabled'] );
 	}
-	public function network_license_disabled(){
+	public function network_license_disabled() {
 		return ! empty( $this->network['is_disabled'] );
 	}
 
-	public function license_invalid(){
+	public function license_invalid() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
@@ -261,19 +261,19 @@ 
 	public function site_license_invalid() {
 		return ! empty( $this->site['is_invalid'] );
 	}
-	public function network_license_invalid(){
+	public function network_license_invalid() {
 		return ! empty( $this->network['is_invalid'] );
 	}
 
 
-	public function get_license_error(){
+	public function get_license_error() {
 		if ( ! $this->has_license() ) {
 			return false;
 		}
 		
 		return $this->using_network_license() ? $this->get_network_license_error() : $this->get_site_license_error();
 	}
-	public function get_site_license_error(){
+	public function get_site_license_error() {
 		if ( $this->site_license_expired() ) {
 			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
@@ -284,7 +284,7 @@ 
 		return '';
 	}
 
-	public function get_network_license_error(){
+	public function get_network_license_error() {
 		if ( $this->site_license_expired() ) {
 			return sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'license-error', 'expired-license', 'https://www.monsterinsights.com/login/' ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
 		} else if ( $this->site_license_disabled() ) {
@@ -295,7 +295,7 @@ 
 		return '';
 	}
 
-	public function license_can( $requires = 'lite' ) {		
+	public function license_can( $requires = 'lite' ) {
 		if ( ! monsterinsights_is_pro_version() || ! $this->has_license() ) {
 			return $requires === 'lite';
 		}
@@ -362,7 +362,7 @@ 
 		return $can_access;
 	}
 
-	public function get_default_license_key(){
+	public function get_default_license_key() {
 		if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
 			return MONSTERINSIGHTS_LICENSE_KEY;
 		}

includes/admin/common.php

Spacing +69 added lines, -69 removed lines

@@ -150,32 +150,32 @@ 
 				'copytoclip'       				=> esc_html__( 'Copy to Clipboard', 'google-analytics-for-wordpress' ),
 				'failed'           				=> esc_html__( 'Failed!', 'google-analytics-for-wordpress' ),
 				'admin_nonce'      				=> wp_create_nonce( 'mi-admin-nonce' ),
-				'shorten'         				=> esc_html__( 'Shorten URL' ,'google-analytics-for-wordpress'),
-				'shortened'        				=> esc_html__( 'Shortened!' ,'google-analytics-for-wordpress'),
-				'working'          				=> esc_html__( 'Working...' ,'google-analytics-for-wordpress'),
-				'importtext'       				=> esc_html__( 'Import' ,'google-analytics-for-wordpress'),
-				'imported'         				=> esc_html__( 'Imported!' ,'google-analytics-for-wordpress'),
-				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:' ,'google-analytics-for-wordpress'),
-				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'redirect_loading_error_title'  => esc_html__( "Authentication Error:" ,'google-analytics-for-wordpress'),
-				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....' ,'google-analytics-for-wordpress'),
-				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:" ,'google-analytics-for-wordpress'),
-				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!' ,'google-analytics-for-wordpress'),
-				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore." ,'google-analytics-for-wordpress'),
-				'verify_loading_title_text'  	=> esc_html__( 'Verifying....' ,'google-analytics-for-wordpress'),
-				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'verify_loading_error_title' 	=> esc_html__( "Verification Error:" ,'google-analytics-for-wordpress'),
-				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!' ,'google-analytics-for-wordpress'),
-				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!" ,'google-analytics-for-wordpress'),
-				'ok_text' 						=> esc_html__( "OK" ,'google-analytics-for-wordpress'),
-				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate" ,'google-analytics-for-wordpress'),
+				'shorten'         				=> esc_html__( 'Shorten URL', 'google-analytics-for-wordpress' ),
+				'shortened'        				=> esc_html__( 'Shortened!', 'google-analytics-for-wordpress' ),
+				'working'          				=> esc_html__( 'Working...', 'google-analytics-for-wordpress' ),
+				'importtext'       				=> esc_html__( 'Import', 'google-analytics-for-wordpress' ),
+				'imported'         				=> esc_html__( 'Imported!', 'google-analytics-for-wordpress' ),
+				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:', 'google-analytics-for-wordpress' ),
+				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'redirect_loading_error_title'  => esc_html__( "Authentication Error:", 'google-analytics-for-wordpress' ),
+				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....', 'google-analytics-for-wordpress' ),
+				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:", 'google-analytics-for-wordpress' ),
+				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!', 'google-analytics-for-wordpress' ),
+				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore.", 'google-analytics-for-wordpress' ),
+				'verify_loading_title_text'  	=> esc_html__( 'Verifying....', 'google-analytics-for-wordpress' ),
+				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'verify_loading_error_title' 	=> esc_html__( "Verification Error:", 'google-analytics-for-wordpress' ),
+				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!', 'google-analytics-for-wordpress' ),
+				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!", 'google-analytics-for-wordpress' ),
+				'ok_text' 						=> esc_html__( "OK", 'google-analytics-for-wordpress' ),
+				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate", 'google-analytics-for-wordpress' ),
 				'refresh_report_title'          => esc_html__( 'Refreshing Report', 'google-analytics-for-wordpress' ),
 				'refresh_report_text'           => esc_html__( 'Loading new report data...', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Success', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Retrieved the new report data successfully', 'google-analytics-for-wordpress' ),
 				'refresh_report_failure_title'  => esc_html__( 'Error', 'google-analytics-for-wordpress' ),
-				'timezone'						=> date('e'),
+				'timezone'						=> date( 'e' ),
 			)
 		);
 
@@ -230,7 +230,7 @@ 
 		'kad_admin_js', // Pinnacle theme
 		'dt-chart', // DesignThemes core features plugin
 		'tweeetshare_font_script', // TweetShare - Click To Tweet
-		'tweeetshare_jquery_script',  // TweetShare - Click To Tweet
+		'tweeetshare_jquery_script', // TweetShare - Click To Tweet
 		'tweeetshare_jqueryui_script', // TweetShare - Click To Tweet
 		'tweeetshare_custom_script', // TweetShare - Click To Tweet
 		'imagify-promise-polyfill', // Imagify 
@@ -249,16 +249,16 @@ 
 		'rml-modal', // WP Real Media Library
 		'rml-order', // WP Real Media Library
 		'rml-meta', // WP Real Media Library
-		'rml-uploader',  // WP Real Media Library
-		'rml-options',  // WP Real Media Library
-		'rml-usersettings',  // WP Real Media Library
+		'rml-uploader', // WP Real Media Library
+		'rml-options', // WP Real Media Library
+		'rml-usersettings', // WP Real Media Library
 		'rml-main', // WP Real Media Library
 		'control-panel-sweet-alert', // Ken Theme
 		'sweet-alert-js', // Vitrine Theme
 		'theme-admin-script', // Vitrine Theme
 		'sweetalert', //  Church Suite Theme by Webnus
 		'be_alerts_charts', //  WooCommerce bolder product alerts
- 		'magayo-lottery-results',  //  Magayo Lottery Results
+ 		'magayo-lottery-results', //  Magayo Lottery Results
 		'control-panel-sweet-alert', // Ken Theme
 		'cpm_chart', // WP Project Manager
 		'adminscripts', //  Artisan Nayma Theme
@@ -314,15 +314,15 @@ 
 
 	global $wp_styles;
 	foreach ( $wp_styles->queue as $handle ) {
-		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content') === false ) {
+		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 		
-		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights') !== false ) {
+		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
-		foreach( $third_party as $partial ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_styles->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_style( $handle ); // Remove css file from MI screen
 				wp_deregister_style( $handle );
@@ -337,15 +337,15 @@ 
 
 	global $wp_scripts;
 	foreach ( $wp_scripts->queue as $handle ) {
-		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content') === false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 		
-		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights') !== false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
-		foreach( $third_party as $partial ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_scripts->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_script( $handle ); // Remove JS file from MI screen
 				wp_deregister_script( $handle );
@@ -360,13 +360,13 @@ 
 
 	// Remove actions from themes that are not following best practices and break the admin doing so
 		// Theme: Newspaper by tagDiv
-			remove_action('admin_enqueue_scripts', 'load_wp_admin_js');
-			remove_action('admin_enqueue_scripts', 'load_wp_admin_css');
-			remove_action('admin_print_scripts-widgets.php', 'td_on_admin_print_scripts_farbtastic');
-			remove_action('admin_print_styles-widgets.php', 'td_on_admin_print_styles_farbtastic');
-			remove_action('admin_print_footer_scripts', 'check_if_media_uploads_is_loaded', 9999);
-			remove_action('print_media_templates', 'td_custom_gallery_settings_hook');
-			remove_action('print_media_templates', 'td_change_backbone_js_hook');
+			remove_action( 'admin_enqueue_scripts', 'load_wp_admin_js' );
+			remove_action( 'admin_enqueue_scripts', 'load_wp_admin_css' );
+			remove_action( 'admin_print_scripts-widgets.php', 'td_on_admin_print_scripts_farbtastic' );
+			remove_action( 'admin_print_styles-widgets.php', 'td_on_admin_print_styles_farbtastic' );
+			remove_action( 'admin_print_footer_scripts', 'check_if_media_uploads_is_loaded', 9999 );
+			remove_action( 'print_media_templates', 'td_custom_gallery_settings_hook' );
+			remove_action( 'print_media_templates', 'td_change_backbone_js_hook' );
 }
 add_action( 'admin_enqueue_scripts', 'monsterinsights_remove_conflicting_asset_files', 9999 );
 
@@ -378,65 +378,65 @@ 
  *
  * @return null Return early if not on the proper screen.
  */
-function hide_non_monsterinsights_warnings () {
+function hide_non_monsterinsights_warnings() {
 	// Bail if we're not on a MonsterInsights screen.
 	if ( empty( $_REQUEST['page'] ) || strpos( $_REQUEST['page'], 'monsterinsights' ) === false ) {
 		return;
 	}
 
 	global $wp_filter;
-	if ( !empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['user_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['all_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 }
-add_action('admin_print_scripts', 'hide_non_monsterinsights_warnings');  
+add_action( 'admin_print_scripts', 'hide_non_monsterinsights_warnings' );  
 
 /**
  * Called whenever an upgrade button / link is displayed in Lite, this function will
@@ -465,33 +465,33 @@ 
 	}
 
 	// Get the ShareASale ID
-	$shareasale_id   = monsterinsights_get_shareasale_id();
+	$shareasale_id = monsterinsights_get_shareasale_id();
 
 	// If we have a shareasale ID return the shareasale url
 	if ( ! empty( $shareasale_id ) ) {
-		$shareasale_id  = absint( $shareasale_id );
+		$shareasale_id = absint( $shareasale_id );
 		return esc_url( monsterinsights_get_shareasale_url( $shareasale_id, $url ) );
 	} else {
 		return esc_url( $url );
 	}
 }
 
-function monsterinsights_get_url( $medium = '', $campaign = '', $url = '', $escape = true  ) {
+function monsterinsights_get_url( $medium = '', $campaign = '', $url = '', $escape = true ) {
 	// Setup Campaign variables
-	$source          = monsterinsights_is_pro_version()   ? 'proplugin' : 'liteplugin';
-	$medium          = ! empty( $medium )   ? $medium     : 'defaultmedium';
-	$campaign        = ! empty( $campaign ) ? $campaign   : 'defaultcampaign';
-	$content 		 = MONSTERINSIGHTS_VERSION;
-	$default_url     = monsterinsights_is_pro_version()   ? '' : 'lite/';
+	$source          = monsterinsights_is_pro_version() ? 'proplugin' : 'liteplugin';
+	$medium          = ! empty( $medium ) ? $medium : 'defaultmedium';
+	$campaign        = ! empty( $campaign ) ? $campaign : 'defaultcampaign';
+	$content = MONSTERINSIGHTS_VERSION;
+	$default_url     = monsterinsights_is_pro_version() ? '' : 'lite/';
 	$url             = ! empty( $url ) ? $url : 'https://www.monsterinsights.com/' . $default_url;
 
 	// Put together redirect URL
 	$url = add_query_arg(
 		array(
-		    'utm_source'   => $source,   // Pro/Lite Plugin
-		    'utm_medium'   => sanitize_key( $medium ),   // Area of MonsterInsights (example Reports)
+		    'utm_source'   => $source, // Pro/Lite Plugin
+		    'utm_medium'   => sanitize_key( $medium ), // Area of MonsterInsights (example Reports)
 		    'utm_campaign' => sanitize_key( $campaign ), // Which link (example eCommerce Report)
-		    'utm_content'  => $content,  // Version number of MI
+		    'utm_content'  => $content, // Version number of MI
 		),
 		trailingslashit( $url )
 	);
@@ -529,13 +529,13 @@ 
 	$custom = false;
 	if ( defined( 'MONSTERINSIGHTS_SHAREASALE_REDIRECT_URL' ) ) {
 		$shareasale_redirect = MONSTERINSIGHTS_SHAREASALE_REDIRECT_URL;
-		$custom 			 = true;
+		$custom = true;
 	}
 
 	// If there's no constant, check if there's an option.
 	if ( empty( $custom ) ) {
 		$shareasale_redirect = get_option( 'monsterinsights_shareasale_redirect_url', '' );
-		$custom 			 = true;
+		$custom = true;
 	}
 
 	// Whether we have an ID or not, filter the ID.
@@ -544,7 +544,7 @@ 
 	return $shareasale_url;
 }
 
-function monsterinsights_settings_ublock_error_js(){
+function monsterinsights_settings_ublock_error_js() {
 	echo "<script type='text/javascript'>\n";
 	echo "jQuery( document ).ready( function( $ ) {
 			if ( window.uorigindetected == null){
@@ -560,9 +560,9 @@ 
 }
 
 function monsterinsights_ublock_notice() {
-	ob_start();?>
+	ob_start(); ?>
 	<div id="monsterinsights-ublock-origin-error" class="error inline" style="display:none;">
-		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress'), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">');
+		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress' ), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' );
 		?>
 	</div>
 	<?php

Braces +1 added lines, -1 removed lines

@@ -544,7 +544,7 @@
 	return $shareasale_url;
 }
 
-function monsterinsights_settings_ublock_error_js(){
+function monsterinsights_settings_ublock_error_js() {
 	echo "<script type='text/javascript'>\n";
 	echo "jQuery( document ).ready( function( $ ) {
 			if ( window.uorigindetected == null){

includes/admin/admin.php

Braces +8 added lines, -6 removed lines

@@ -221,9 +221,11 @@ 
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    if( ! $upgrade ) {
+// First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
-    } else { // Update
+    } else {
+// Update
         return;
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     }
@@ -289,7 +291,7 @@ 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
         $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
+        if ( MonsterInsights()->license->get_site_license_key() ) {
             if ( MonsterInsights()->license->site_license_expired() ) {
                 $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
@@ -346,7 +348,7 @@ 
     $authed   = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
-    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
+    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) {
         echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
             echo '<p>';
             echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
@@ -372,7 +374,7 @@ 
 
     // 7. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -403,7 +405,7 @@ 
 
     // 8. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';

Indentation +140 added lines, -140 removed lines

@@ -33,24 +33,24 @@ 
     $hook = 'monsterinsights_settings';
 
     if ( $dashboards_disabled || ! $is_authed || ( 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' );
-        $hook = 'monsterinsights_settings';
+	// 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' );
+	$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 - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
+	add_submenu_page( $hook, __( 'Settings:', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
+	add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
     } else {
-        // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+	// if dashboards enabled, first dashboard
+	add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
-        $hook = 'monsterinsights_reports';
+	$hook = 'monsterinsights_reports';
 
-        add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
+	add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
 
-        // 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' );
+	// 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 - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
+	add_submenu_page( $hook, __( 'Settings - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
 
     }
     
@@ -60,7 +60,7 @@ 
     // then addons
     $network_key = MonsterInsights()->license->get_network_license_key();
     if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty( $network_key ) ) ) {
-        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( 'admin_menu', 'monsterinsights_admin_menu' );
@@ -74,12 +74,12 @@ 
     // 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' );
+	require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
     }
 
     $plugin = plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE );
     if ( ! is_plugin_active_for_network( $plugin ) ) {
-        return;
+	return;
     }
 
     $hook = 'monsterinsights_network';
@@ -103,7 +103,7 @@ 
 function monsterinsights_add_admin_body_class( $classes ) {
     $screen = get_current_screen(); 
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
-        return $classes;
+	return $classes;
     }
        
     return "$classes monsterinsights_page ";
@@ -123,17 +123,17 @@ 
 
     // If lite, show a link where they can get pro from
     if ( ! monsterinsights_is_pro_version() ) {
-        $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $get_pro );
+	$get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) .'">' . 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="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );
+	$support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "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="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );
+	$support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . 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>';
@@ -158,26 +158,26 @@ 
 function monsterinsights_load_admin_partial( $template, $data = array() ) {
 
     if ( monsterinsights_is_pro_version() ) {
-        $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
     
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
-            return true;
-        }
+	if ( file_exists( $dir . $template . '.php' ) ) {
+	    require_once(  $dir . $template . '.php' );
+	    return true;
+	}
     } else {
-        $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
     
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
-            return true;
-        }   
+	if ( file_exists( $dir . $template . '.php' ) ) {
+	    require_once(  $dir . $template . '.php' );
+	    return true;
+	}   
     }
         
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
-        return true;
+	require_once(  $dir . $template . '.php' );
+	return true;
     }
                 
     return false;
@@ -193,15 +193,15 @@ 
     // 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 ) {
-        return;
+	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', MonsterInsights()->file ),
-        'logo'     => plugins_url( 'assets/css/images/logo.png', MonsterInsights()->file ),
-        '2xmascot' => plugins_url( 'assets/css/images/mascot@2x.png', MonsterInsights()->file ),
-        '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->file ),
+	'mascot'   => plugins_url( 'assets/css/images/mascot.png', MonsterInsights()->file ),
+	'logo'     => plugins_url( 'assets/css/images/logo.png', MonsterInsights()->file ),
+	'2xmascot' => plugins_url( 'assets/css/images/mascot@2x.png', MonsterInsights()->file ),
+	'2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->file ),
     ) );
 }
 add_action( 'in_admin_header','monsterinsights_admin_header', 100 );
@@ -209,7 +209,7 @@ 
 function monsterinsights_welcome_redirect() {
     // Bail if no activation redirect
     if ( ! get_transient( '_monsterinsights_activation_redirect' ) ) {
-        return;
+	return;
     }
 
     // Delete the redirect transient
@@ -217,15 +217,15 @@ 
 
     // Bail if activating from network, or bulk
     if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
-        return;
+	return;
     }
 
     $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;
+	//wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     } else { // Update
-        return;
-        //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
+	return;
+	//wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     }
 }
 //add_action( 'admin_init', 'monsterinsights_welcome_redirect', 11 ); @todo: Investigate
@@ -241,8 +241,8 @@ 
 function monsterinsights_admin_footer( $text ) {
     global $current_screen;
     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>' );
+	$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>' );
     }
     return $text;
 }
@@ -253,12 +253,12 @@ 
     // Don't show on MonsterInsights pages
     $screen = get_current_screen(); 
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
-        return;
+	return;
     }
 
     // Make sure they have the permissions to do something
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        return;
+	return;
     }
 
     // Priority:
@@ -271,45 +271,45 @@ 
 
     // 1. Google Analytics not authenticated
     if ( ! is_network_admin() && ! monsterinsights_get_ua() ) {
-        $page = admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
-        return;
+	$page = admin_url( 'admin.php?page=monsterinsights_settings' );
+	$message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
+	echo '<div class="error"><p>'. $message.'</p></div>';
+	return;
     }
 
     // 2. License key not entered for pro
     $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : '';
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
-        $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
-        return;
+	$page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
+	$message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
+	echo '<div class="error"><p>'. $message.'</p></div>';
+	return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
-        $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
-            if ( MonsterInsights()->license->site_license_expired() ) {
-                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
-            } else if ( MonsterInsights()->license->site_license_disabled() ) {
-                $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
-            } else if ( MonsterInsights()->license->site_license_invalid() ) {
-                $message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
-            }
-        } else if ( MonsterInsights()->license->get_network_license_key() ) {
-            if ( MonsterInsights()->license->network_license_expired() ) {
-                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
-            } else if ( MonsterInsights()->license->network_license_disabled() ) {
-                $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
-            } else if ( MonsterInsights()->license->network_license_invalid() ) {
-                $message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
-            }
-        }
-        if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
-            return;
-        }
+	$message = '';
+	if ( MonsterInsights()->license->get_site_license_key() ){
+	    if ( MonsterInsights()->license->site_license_expired() ) {
+		$message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+	    } else if ( MonsterInsights()->license->site_license_disabled() ) {
+		$message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+	    } else if ( MonsterInsights()->license->site_license_invalid() ) {
+		$message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
+	    }
+	} else if ( MonsterInsights()->license->get_network_license_key() ) {
+	    if ( MonsterInsights()->license->network_license_expired() ) {
+		$message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+	    } else if ( MonsterInsights()->license->network_license_disabled() ) {
+		$message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+	    } else if ( MonsterInsights()->license->network_license_invalid() ) {
+		$message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
+	    }
+	}
+	if ( ! empty( $message ) ) {
+	    echo '<div class="error"><p>'. $message.'</p></div>';
+	    return;
+	}
     }
 
     // 4. Optin setting not configured
@@ -339,7 +339,7 @@ 
 
     $notices   = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
-        $notices = array();
+	$notices = array();
     }
 
     // 5. Authenticate, not manual
@@ -347,12 +347,12 @@ 
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
     if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
-        echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
-            echo '<p>';
-            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
-            echo '</p>';
-        echo '</div>';
-        return;
+	echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
+	    echo '<p>';
+	    echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+	    echo '</p>';
+	echo '</div>';
+	return;
     }
 
     // 6. Automatic updates not configured
@@ -372,64 +372,64 @@ 
 
     // 7. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { 
-            echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
-                echo '<div class="monsterinsights-wooedd-upsell-left">';
-                    echo '<p><strong>';
-                    echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' );
-                    echo '</strong></p>';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                    echo '<p>';
-                    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' ); 
-                    echo '</p>';
-                echo '</div><div class="monsterinsights-wooedd-upsell-right">';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                echo '</div>';
-            echo '</div>';
-            return;
-        }
+	if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { 
+	    echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
+		echo '<div class="monsterinsights-wooedd-upsell-left">';
+		    echo '<p><strong>';
+		    echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' );
+		    echo '</strong></p>';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		    echo '<p>';
+		    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' ); 
+		    echo '</p>';
+		echo '</div><div class="monsterinsights-wooedd-upsell-right">';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		echo '</div>';
+	    echo '</div>';
+	    return;
+	}
     }
 
     // 8. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { 
-            echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
-                echo '<div class="monsterinsights-wooedd-upsell-left">';
-                    echo '<p><strong>';
-                    echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' );
-                    echo '</strong></p>';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                    echo '<p>';
-                    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' ); 
-                    echo '</p>';
-                echo '</div><div class="monsterinsights-wooedd-upsell-right">';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                echo '</div>';
-            echo '</div>';
-            return;
-        }
+	if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { 
+	    echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
+		echo '<div class="monsterinsights-wooedd-upsell-left">';
+		    echo '<p><strong>';
+		    echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' );
+		    echo '</strong></p>';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		    echo '<p>';
+		    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' ); 
+		    echo '</p>';
+		echo '</div><div class="monsterinsights-wooedd-upsell-right">';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		echo '</div>';
+	    echo '</div>';
+	    return;
+	}
     }
 }
 add_action( 'admin_notices', 'monsterinsights_admin_setup_notices' );
@@ -439,7 +439,7 @@ 
 // AM Notices
 function monsterinsights_am_notice_optout( $super_admin ) {
     if ( monsterinsights_get_option( 'hide_am_notices', false ) || monsterinsights_get_option( 'network_hide_am_notices', false ) ) {
-        return false;
+	return false;
     }
     return $super_admin;
 }

Spacing +28 added lines, -28 removed lines

@@ -34,14 +34,14 @@ 
 
     if ( $dashboards_disabled || ! $is_authed || ( 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 - Tracking:', 'google-analytics-for-wordpress' ), __( 'Settings - Tracking', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_tracking', 'monsterinsights_tracking_page' );
     } else {
         // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
+        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', plugins_url( 'assets/css/images/menu-icon@2x.png', $base->file ), '100.00013467543' );
 
         $hook = 'monsterinsights_reports';
 
@@ -83,7 +83,7 @@ 
     }
 
     $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' );
 
@@ -118,21 +118,21 @@ 
  * @return array $links
  */
 function monsterinsights_add_action_links( $links ) {
-    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="'. monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) .'"">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
+    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_url( 'all-plugins', 'kb-link', "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="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+        $get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/docs/" ) . '">' . 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="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Pro Support" href="' . monsterinsights_get_url( 'all-plugins', 'pro-support-link', "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="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Lite Support" href="' . monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $support );
     }
 
@@ -161,14 +161,14 @@ 
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
     
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     } else {
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
     
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }   
     }
@@ -176,7 +176,7 @@ 
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
+        require_once( $dir . $template . '.php' );
         return true;
     }
                 
@@ -204,7 +204,7 @@ 
         '2xlogo'   => plugins_url( 'assets/css/images/logo@2x.png', MonsterInsights()->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
@@ -221,7 +221,7 @@ 
     }
 
     $upgrade = get_option( 'monsterinsights_version_upgraded_from' );
-    if( ! $upgrade ) { // First time install
+    if ( ! $upgrade ) { // First time install
         //wp_safe_redirect( admin_url( 'admin.php?page=monsterinsights_settings#monsterinsights-main-tab-general' ) ); exit;
     } else { // Update
         return;
@@ -242,7 +242,7 @@ 
     global $current_screen;
     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;
 }
@@ -272,8 +272,8 @@ 
     // 1. Google Analytics not authenticated
     if ( ! is_network_admin() && ! monsterinsights_get_ua() ) {
         $page = admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ),'<a href="' . $page . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Please configure your %1$sGoogle Analytics settings%2$s!', 'google-analytics-for-wordpress' ), '<a href="' . $page . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
@@ -281,17 +281,17 @@ 
     $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : '';
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
         $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
         $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
+        if ( MonsterInsights()->license->get_site_license_key() ) {
             if ( MonsterInsights()->license->site_license_expired() ) {
-                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
                 $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->site_license_invalid() ) {
@@ -299,7 +299,7 @@ 
             }
         } else if ( MonsterInsights()->license->get_network_license_key() ) {
             if ( MonsterInsights()->license->network_license_expired() ) {
-                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->network_license_disabled() ) {
                 $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->network_license_invalid() ) {
@@ -307,7 +307,7 @@ 
             }
         }
         if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
+            echo '<div class="error"><p>' . $message . '</p></div>';
             return;
         }
     }
@@ -337,7 +337,7 @@ 
     //     }
     // }
 
-    $notices   = get_option( 'monsterinsights_notices' );
+    $notices = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
         $notices = array();
     }
@@ -346,10 +346,10 @@ 
     $authed   = MonsterInsights()->auth->is_authed() || MonsterInsights()->auth->is_network_authed();
     $url      = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 
-    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual' ] ) ) { 
+    if ( empty( $authed ) && ! isset( $notices['monsterinsights_auth_not_manual'] ) ) { 
         echo '<div class="notice notice-info is-dismissible monsterinsights-notice" data-notice="monsterinsights_auth_not_manual">';
             echo '<p>';
-            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url .'">', '</a>' ); 
+            echo sprintf( esc_html__( 'Important: You are currently using manual UA code output. We highly recommend %1$sauthenticating with MonsterInsights%2$s so that you can access our new reporting area and take advantage of new MonsterInsights features.', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' ); 
             echo '</p>';
         echo '</div>';
         return;
@@ -372,7 +372,7 @@ 
 
     // 7. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available'] ) ) { 
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -391,7 +391,7 @@ 
                     echo '<p>';
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' ); 
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) . '">', ' &raquo;</a>' ); 
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
@@ -403,7 +403,7 @@ 
 
     // 8. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) { 
+        if ( ! isset( $notices['monsterinsights_edd_tracking_available'] ) ) { 
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -422,7 +422,7 @@ 
                     echo '<p>';
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' ); 
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) . '">', ' &raquo;</a>' ); 
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';

includes/admin/settings/register-settings.php

Spacing +27 added lines, -27 removed lines

@@ -176,13 +176,13 @@ 
 			)
 		),
 		/** Demographics Settings */
-		'demographics' => apply_filters('monsterinsights_settings_demographics',
+		'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 Analytics 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. 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.', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'settings-page', 'demographics-setting-doc-link', 'https://www.monsterinsights.com/docs/enable-demographics-and-interests-report-in-google-analytics/' ) .'" 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">'
+					'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 Analytics 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. 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.', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'settings-page', 'demographics-setting-doc-link', 'https://www.monsterinsights.com/docs/enable-demographics-and-interests-report-in-google-analytics/' ) . '" 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',
 				),
@@ -195,7 +195,7 @@ 
 			)
 		),
 		/** Enhanced Link Attribution Settings */
-		'links' => apply_filters('monsterinsights_settings_links',
+		'links' => apply_filters( 'monsterinsights_settings_links',
 			array(
 				'enhanced_link_attribution' => array(
 					'id'          => 'enhanced_link_attribution',
@@ -230,7 +230,7 @@ 
 			)
 		),
 		/** File Download Settings */
-		'files' => apply_filters('monsterinsights_settings_files',
+		'files' => apply_filters( 'monsterinsights_settings_files',
 			array(
 				'track_download_as' => array(
 					'id'          => 'track_download_as',
@@ -252,7 +252,7 @@ 
 			)
 		),
 		/** Affiliate Tracking Settings */
-		'affiliates' => apply_filters('monsterinsights_settings_affiliates',
+		'affiliates' => apply_filters( 'monsterinsights_settings_affiliates',
 			array(
 				'track_internal_as_outbound' => array(
 					'id'          => 'track_internal_as_outbound',
@@ -269,68 +269,68 @@ 
 			)
 		),
 		/** Social Tracking Settings */
-		'social' => apply_filters('monsterinsights_settings_social',
+		'social' => apply_filters( 'monsterinsights_settings_social',
 			array()
 		),
 		/** Ad Tracking Settings */
-		'ads' => apply_filters('monsterinsights_settings_ads',
+		'ads' => apply_filters( 'monsterinsights_settings_ads',
 			array()
 		),
 		/** Forms Tracking Settings */
-		'forms' => apply_filters('monsterinsights_settings_forms',
+		'forms' => apply_filters( 'monsterinsights_settings_forms',
 			array()
 		),
 		/** eCommerce Tracking Settings */
-		'ecommerce' => apply_filters('monsterinsights_settings_ecommerce',
+		'ecommerce' => apply_filters( 'monsterinsights_settings_ecommerce',
 			array()
 		),
 		/** Media Tracking Settings */
-		'media' => apply_filters('monsterinsights_settings_media',
+		'media' => apply_filters( 'monsterinsights_settings_media',
 			array()
 		),
 		/** Members Tracking Settings */
-		'memberships' => apply_filters('monsterinsights_settings_memberships',
+		'memberships' => apply_filters( 'monsterinsights_settings_memberships',
 			array()
 		),
 		/** Dimensions Tracking Settings */
-		'dimensions' => apply_filters('monsterinsights_settings_dimensions',
+		'dimensions' => apply_filters( 'monsterinsights_settings_dimensions',
 			array()
 		),
 		/** Performance Tracking Settings */
-		'performance' => apply_filters('monsterinsights_settings_performance',
+		'performance' => apply_filters( 'monsterinsights_settings_performance',
 			array()
 		),
 		/** AMP Tracking Settings */
-		'amp' => apply_filters('monsterinsights_settings_amp',
+		'amp' => apply_filters( 'monsterinsights_settings_amp',
 			array()
 		),
 		/** Google Optimize Tracking Settings */
-		'goptimize' => apply_filters('monsterinsights_settings_goptimize',
+		'goptimize' => apply_filters( 'monsterinsights_settings_goptimize',
 			array()
 		),
 		/** Facebook Instant Articles Tracking Settings */
-		'fbia' => apply_filters('monsterinsights_settings_fbia',
+		'fbia' => apply_filters( 'monsterinsights_settings_fbia',
 			array()
 		),
 		/** Bounce Reduction Settings */
-		'bounce' => apply_filters('monsterinsights_settings_bounce',
+		'bounce' => apply_filters( 'monsterinsights_settings_bounce',
 			array()
 		),
 		/** Reporting Tracking Settings */
-		'reporting' => apply_filters('monsterinsights_settings_reporting',
+		'reporting' => apply_filters( 'monsterinsights_settings_reporting',
 			array()
 		),
 		/** Notifications Tracking Settings */
-		'notifications' => apply_filters('monsterinsights_settings_notifications',
+		'notifications' => apply_filters( 'monsterinsights_settings_notifications',
 			array()
 		),
 		/** Compatibility Tracking Settings */
-		'compatibility' => apply_filters('monsterinsights_settings_compatibility',
+		'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>' ),
+					'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(
@@ -342,22 +342,22 @@ 
 				'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'),
+					'desc'        => __( 'Turns on debugging in JS events tracking, logging of eCommerce requests and enables debug settings.', 'google-analytics-for-wordpress' ),
 					'type' 		  => 'checkbox',
 				),
 			)
 		),
 		/** EU Compliance Tracking Settings */
-		'eucompliance' => apply_filters('monsterinsights_settings_eucompliance',
+		'eucompliance' => apply_filters( 'monsterinsights_settings_eucompliance',
 			array()
 		),
 		/** Permissions Tracking Settings */
-		'permissions' => apply_filters('monsterinsights_settings_permissions',
+		'permissions' => apply_filters( 'monsterinsights_settings_permissions',
 			array(
 				'view_reports' => array(
 					'id'          => 'view_reports',
 					'name'        => __( 'Let these user roles see reports:', 'google-analytics-for-wordpress' ),
-					'desc'        => sprintf( esc_html( 'Users that have at least one of these roles will be able to view the reports, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>'),
+					'desc'        => sprintf( esc_html( 'Users that have at least one of these roles will be able to view the reports, along with any user with the %s capability.', 'google-analytics-for-wordpress' ), '<code>manage_options</code>' ),
 					'type'        => 'select',
 					'options'     => monsterinsights_get_roles(),
 					'select2'     => true,
@@ -367,7 +367,7 @@ 
 				'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>' ),
+					'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,

includes/admin/pages/addons.php

Indentation +105 added lines, -105 removed lines

@@ -18,20 +18,20 @@ 
     global $admin_page_hooks;
    
     if ( ! is_object( $current_screen ) || empty( $current_screen->id ) || empty( $admin_page_hooks ) ) {
-        return false;
+	return false;
     }
 
     $settings_page = false;
     if ( ! empty( $admin_page_hooks['monsterinsights_dashboard'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_dashboard'] . '_page_monsterinsights_addons' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     if ( ! empty( $admin_page_hooks['monsterinsights_settings'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_settings'] . '_page_monsterinsights_addons' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     if ( ! empty( $admin_page_hooks['monsterinsights_network'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_network'] . '_page_monsterinsights_addons-network' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     return $settings_page;
@@ -46,16 +46,16 @@ 
  */
 function monsterinsights_maybe_refresh_addons() {
     if ( ! monsterinsights_is_addons_page() ) {
-        return;
+	return;
     }
 
 
     if ( empty( $_POST['google-analytics-for-wordpress-refresh-addons-submit'] ) ) {
-        return;
+	return;
     }
 
     if ( ! wp_verify_nonce( $_POST['google-analytics-for-wordpress-refresh-addons'], 'google-analytics-for-wordpress-refresh-addons' ) ) {
-        return;
+	return;
     }
 
     monsterinsights_get_addons_data( MonsterInsights()->license->get_valid_license_key() );
@@ -93,14 +93,14 @@ 
     <div id="monsterinsights-addons" class="wrap">
         <div class="monsterinsights-clear">
             <?php
-            /** 
-             * Developer Alert:
-             *
-             * Per the README, this is considered an internal hook and should
-             * not be used by other developers. This hook's behavior may be modified
-             * or the hook may be removed at any time, without warning.
-             */
-            ?>
+	    /** 
+	     * Developer Alert:
+	     *
+	     * Per the README, this is considered an internal hook and should
+	     * not be used by other developers. This hook's behavior may be modified
+	     * or the hook may be removed at any time, without warning.
+	     */
+	    ?>
             <?php do_action( 'monsterinsights_addons_section' ); ?>
         </div>
     </div>
@@ -117,14 +117,14 @@ 
 
     // If error(s) occurred during license key verification, display them and exit now.
     if ( monsterinsights_is_pro_version() && ! MonsterInsights()->license->get_valid_license_key() ) {
-        ?>
+	?>
         <div class="error below-h2">
             <p>
                 <?php esc_html_e( 'In order to get access to Addons, you need to resolve your license key errors.', 'google-analytics-for-wordpress' ); ?>
             </p>
         </div>
         <?php
-        return;
+	return;
     }
 
     // Get Addons
@@ -133,7 +133,7 @@ 
     // If no Addon(s) were returned, our API call returned an error.
     // Show an error message with a button to reload the page, which will trigger another API call.
     if ( ! $addons ) {
-        ?>
+	?>
         <form id="monsterinsights-addons-refresh-addons-form" method="post">
             <p>
                 <?php esc_html_e( 'There was an issue retrieving the addons for this site. Please click on the button below the refresh the addons data.', 'google-analytics-for-wordpress' ); ?>
@@ -143,7 +143,7 @@ 
             </p>
         </form>
         <?php
-        return;
+	return;
     }
 
     // If here, we have Addons to display, so let's output them now.
@@ -153,9 +153,9 @@ 
     ?>
     <div id="monsterinsights-addons">
         <?php
-        // Output Addons the User is licensed to use.
-        if ( count( $addons['licensed'] )> 0 ) {
-            ?>
+	// Output Addons the User is licensed to use.
+	if ( count( $addons['licensed'] )> 0 ) {
+	    ?>
             <div class="monsterinsights-addons-area licensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Available Addons:', 'google-analytics-for-wordpress' ); ?></h3>
                 
@@ -163,19 +163,19 @@ 
                     <!-- list container class required for list.js -->
                     <div class="list">
                         <?php
-                        foreach ( (array) $addons['licensed'] as $i => $addon ) {
-                            monsterinsights_get_addon_card( $addon, $i, true, $installed_plugins );
-                        }
-                        ?>
+			foreach ( (array) $addons['licensed'] as $i => $addon ) {
+			    monsterinsights_get_addon_card( $addon, $i, true, $installed_plugins );
+			}
+			?>
                     </div>
                 </div>
             </div>
             <?php
-        } // Close licensed addons
+	} // Close licensed addons
 
-        // Output Addons the User isn't licensed to use.
-        if ( count( $addons['unlicensed'] ) > 0 ) {
-            ?>
+	// Output Addons the User isn't licensed to use.
+	if ( count( $addons['unlicensed'] ) > 0 ) {
+	    ?>
             <div class="monsterinsights-addons-area unlicensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Unlock More Addons', 'google-analytics-for-wordpress' ); ?></h3>
                 <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url. '">', '</a>' ); ?></p>
@@ -184,16 +184,16 @@ 
                     <!-- list container class required for list.js -->
                     <div class="list">
                         <?php
-                        foreach ( (array) $addons['unlicensed'] as $i => $addon ) {
-                            monsterinsights_get_addon_card( $addon, $i, false, $installed_plugins );
-                        }
-                        ?>
+			foreach ( (array) $addons['unlicensed'] as $i => $addon ) {
+			    monsterinsights_get_addon_card( $addon, $i, false, $installed_plugins );
+			}
+			?>
                     </div>
                 </div>
             </div>
             <?php
-        } // Close unlicensed addons
-        ?>
+	} // Close unlicensed addons
+	?>
     </div>
     <?php
 
@@ -215,37 +215,37 @@ 
     
     // Get addons data from transient or perform API query if no transient.
     if ( false === ( $addons = get_transient( '_monsterinsights_addons' ) ) ) {
-        $addons = monsterinsights_get_addons_data( $key );
+	$addons = monsterinsights_get_addons_data( $key );
     }
 
     // If no Addons exist, return false
     if ( ! $addons ) {
-        return false;
+	return false;
     }
 
     // Iterate through Addons, to build two arrays: 
     // - Addons the user is licensed to use,
     // - Addons the user isn't licensed to use.
     $results = array(
-        'licensed'  => array(),
-        'unlicensed'=> array(),
+	'licensed'  => array(),
+	'unlicensed'=> array(),
     );
     foreach ( (array) $addons as $i => $addon ) {
 
-        // Determine whether the user is licensed to use this Addon or not.
-        if ( 
-            empty( $type ) ||
-            ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) ||
-            ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) ||
-            ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) )
-        ) {
-            // Unlicensed
-            $results['unlicensed'][] = $addon;
-            continue;
-        }
-
-        // Licensed
-        $results['licensed'][] = $addon;
+	// Determine whether the user is licensed to use this Addon or not.
+	if ( 
+	    empty( $type ) ||
+	    ( in_array( 'Pro', $addon->categories ) && ( $type != 'pro' && $type != 'master' ) ) ||
+	    ( in_array( 'Plus', $addon->categories ) && $type != 'plus' && $type != 'pro' && $type != 'master' ) ||
+	    ( in_array( 'Basic', $addon->categories ) && ( $type != 'basic' && $type != 'plus' && $type != 'pro' && $type != 'master' ) )
+	) {
+	    // Unlicensed
+	    $results['unlicensed'][] = $addon;
+	    continue;
+	}
+
+	// Licensed
+	$results['licensed'][] = $addon;
 
     }
 
@@ -268,21 +268,21 @@ 
     // Get Addons
     // If the key is valid, we'll get personalised upgrade URLs for each Addon (if necessary) and plugin update information.
     if ( $key ) {
-        $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); 
+	$addons = MonsterInsights()->license_actions->perform_remote_request( 'get-addons-data-v600', array( 'tgm-updater-key' => $key ) ); 
     } else {
-        $addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); 
+	$addons = MonsterInsights()->license_actions->perform_remote_request( 'get-all-addons-data', array() ); 
     }
     
     // If there was an API error, set transient for only 10 minutes.
     if ( ! $addons ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
-        return false;
+	set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+	return false;
     }
 
     // If there was an error retrieving the addons, set the error.
     if ( isset( $addons->error ) ) {
-        set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
-        return false;
+	set_transient( '_monsterinsights_addons', false, 10 * MINUTE_IN_SECONDS );
+	return false;
     }
 
     // Otherwise, our request worked. Save the data and return it.
@@ -303,9 +303,9 @@ 
     $keys = array_keys( get_plugins() );
 
     foreach ( $keys as $key ) {
-        if ( preg_match( '|^' . $slug . '|', $key ) ) {
-            return $key;
-        }
+	if ( preg_match( '|^' . $slug . '|', $key ) ) {
+	    return $key;
+	}
     }
 
     return $slug;
@@ -328,24 +328,24 @@ 
     $slug = str_replace( 'monsterinsights-', '', $addon->slug );
     $slug = 'monsterinsights-' . $addon->slug;
     if ( $slug === 'monsterinsights-ecommerce' ) {
-        $slug = 'ga-ecommerce';
+	$slug = 'ga-ecommerce';
     } 
 
     $plugin_basename   = monsterinsights_get_plugin_basename_from_slug( $slug );
     $categories = implode( ',', $addon->categories );
     if ( ! $installed_plugins ) {
-        $installed_plugins = get_plugins();
+	$installed_plugins = get_plugins();
     }
    
     // If the Addon doesn't supply an upgrade_url key, it's because the user hasn't provided a license
     // get_upgrade_link() will return the Lite or Pro link as necessary for us.
     if ( ! isset( $addon->upgrade_url ) ) {
-        $addon->upgrade_url = monsterinsights_get_upgrade_link();
+	$addon->upgrade_url = monsterinsights_get_upgrade_link();
     }
 
     // Link user to doc to install MI pro to install addons
     if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[ $plugin_basename ] ) ) {
-        $addon->url = monsterinsights_get_url( 'addons-page', 'install-addons-link', "https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons" );
+	$addon->url = monsterinsights_get_url( 'addons-page', 'install-addons-link', "https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons" );
     }
 
     // Output the card
@@ -353,19 +353,19 @@ 
     <div class="monsterinsights-addon">
         <h3 class="monsterinsights-addon-title"><?php echo esc_html( $addon->title ); ?></h3>
         <?php
-        if ( ! empty( $addon->image ) ) {
-            ?>
+	if ( ! empty( $addon->image ) ) {
+	    ?>
             <img class="monsterinsights-addon-thumb" src="<?php echo esc_attr( esc_url( $addon->image ) ); ?>" alt="<?php echo esc_attr( $addon->title ); ?>" />
             <?php
-        }
-        ?>
+	}
+	?>
 
         <p class="monsterinsights-addon-excerpt"><?php echo esc_html( $addon->excerpt ); ?></p>
 
         <?php
-        // If the Addon is unlicensed, show the upgrade button 
-        if ( ! $is_licensed ) {
-            ?>
+	// If the Addon is unlicensed, show the upgrade button 
+	if ( ! $is_licensed ) {
+	    ?>
             <div class="monsterinsights-addon-active monsterinsights-addon-message">
                 <div class="interior">
                     <div class="monsterinsights-addon-upgrade">
@@ -377,15 +377,15 @@ 
                 </div>
             </div>
             <?php
-        } else {
-            // Addon is licensed
-
-            // If the plugin is not installed, display an install message and button.
-            if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) {
-                if ( empty( $addon->url ) ) {
-                    $addon->url = '';
-                }
-                ?>
+	} else {
+	    // Addon is licensed
+
+	    // If the plugin is not installed, display an install message and button.
+	    if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) {
+		if ( empty( $addon->url ) ) {
+		    $addon->url = '';
+		}
+		?>
                 <div class="monsterinsights-addon-not-installed monsterinsights-addon-message">
                     <div class="interior">
                          <?php if ( monsterinsights_is_pro_version() ) { ?>
@@ -408,22 +408,22 @@ 
                     </div>
                 </div>
                 <?php
-            } else {
-                // Plugin is installed.
+	    } else {
+		// Plugin is installed.
                 
-                $active = false;
-                $ms_active = is_plugin_active_for_network( $plugin_basename );
-                $ss_active = is_plugin_active( $plugin_basename );
-
-                if ( is_multisite() && is_network_admin() ) {
-                    $active = is_plugin_active_for_network( $plugin_basename );
-                } else {
-                    $active = is_plugin_active( $plugin_basename );
-                }
-
-                if ( $active ) {
-                    // Plugin is active. Display the active message and deactivate button.
-                    ?>
+		$active = false;
+		$ms_active = is_plugin_active_for_network( $plugin_basename );
+		$ss_active = is_plugin_active( $plugin_basename );
+
+		if ( is_multisite() && is_network_admin() ) {
+		    $active = is_plugin_active_for_network( $plugin_basename );
+		} else {
+		    $active = is_plugin_active( $plugin_basename );
+		}
+
+		if ( $active ) {
+		    // Plugin is active. Display the active message and deactivate button.
+		    ?>
                     <div class="monsterinsights-addon-active monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
@@ -449,9 +449,9 @@ 
                         </div>
                     </div>
                     <?php
-                } else {
-                    // Plugin is inactivate. Display the inactivate mesage and activate button.
-                    ?>
+		} else {
+		    // Plugin is inactivate. Display the inactivate mesage and activate button.
+		    ?>
                     <div class="monsterinsights-addon-inactive monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
@@ -474,10 +474,10 @@ 
                         </div>
                     </div>
                     <?php
-                }
-            }
-        }
-        ?>
+		}
+	    }
+	}
+	?>
     </div>
     <?php
 }
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -76,7 +76,7 @@ 
      * not be used by other developers. This hook's behavior may be modified
      * or the hook may be removed at any time, without warning.
      */
-    do_action('monsterinsights_head');
+    do_action( 'monsterinsights_head' );
     ?>
     <?php echo monsterinsights_ublock_notice(); ?>
     <div id="monsterinsights-addon-heading" class="monsterinsights-addons-subheading monsterinsights-clearfix-after">
@@ -154,7 +154,7 @@ 
     <div id="monsterinsights-addons">
         <?php
         // Output Addons the User is licensed to use.
-        if ( count( $addons['licensed'] )> 0 ) {
+        if ( count( $addons['licensed'] ) > 0 ) {
             ?>
             <div class="monsterinsights-addons-area licensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Available Addons:', 'google-analytics-for-wordpress' ); ?></h3>
@@ -178,7 +178,7 @@ 
             ?>
             <div class="monsterinsights-addons-area unlicensed" class="monsterinsights-clear">
                 <h3><?php esc_html_e( 'Unlock More Addons', 'google-analytics-for-wordpress' ); ?></h3>
-                <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url. '">', '</a>' ); ?></p>
+                <p><?php echo sprintf( esc_html__( '%1$sWant even more addons?%2$sUpgrade your MonsterInsights account%3$s and unlock the following addons:', 'google-analytics-for-wordpress' ), '<strong>', '</strong> <a href="' . $upgrade_url . '">', '</a>' ); ?></p>
                 
                 <div id="monsterinsights-addons-unlicensed" class="monsterinsights-addons">
                     <!-- list container class required for list.js -->
@@ -331,7 +331,7 @@ 
         $slug = 'ga-ecommerce';
     } 
 
-    $plugin_basename   = monsterinsights_get_plugin_basename_from_slug( $slug );
+    $plugin_basename = monsterinsights_get_plugin_basename_from_slug( $slug );
     $categories = implode( ',', $addon->categories );
     if ( ! $installed_plugins ) {
         $installed_plugins = get_plugins();
@@ -344,7 +344,7 @@ 
     }
 
     // Link user to doc to install MI pro to install addons
-    if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[ $plugin_basename ] ) ) {
+    if ( ! monsterinsights_is_pro_version() && $is_licensed && ! isset( $installed_plugins[$plugin_basename] ) ) {
         $addon->url = monsterinsights_get_url( 'addons-page', 'install-addons-link', "https://www.monsterinsights.com/docs/install-monsterinsights-pro-to-use-addons" );
     }
 
@@ -381,7 +381,7 @@ 
             // Addon is licensed
 
             // If the plugin is not installed, display an install message and button.
-            if ( ! isset( $installed_plugins[ $plugin_basename ] ) ) {
+            if ( ! isset( $installed_plugins[$plugin_basename] ) ) {
                 if ( empty( $addon->url ) ) {
                     $addon->url = '';
                 }
@@ -427,17 +427,17 @@ 
                     <div class="monsterinsights-addon-active monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Active%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Active%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span>
                             <?php } else { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sActive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sActive%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span>
                             <?php } ?> 
-                            <?php if ( ( is_multisite() && is_network_admin() && $ms_active ) || ! is_multisite() || ( is_multisite() && !is_network_admin() && !$ms_active && $ss_active ) ) { ?>
+                            <?php if ( ( is_multisite() && is_network_admin() && $ms_active ) || ! is_multisite() || ( is_multisite() && ! is_network_admin() && ! $ms_active && $ss_active ) ) { ?>
                             <div class="monsterinsights-addon-action">
                                 <a class="button button-primary monsterinsights-addon-action-button monsterinsights-deactivate-addon" href="#" rel="<?php echo esc_attr( $plugin_basename ); ?>">
                                     <i class="monsterinsights-toggle-on"></i>
                                     <?php if ( is_multisite() && is_network_admin() && $ms_active ) { ?>
                                         <?php esc_html_e( 'Network deactivate', 'google-analytics-for-wordpress' ); ?> 
-                                    <?php } else if ( is_multisite() && !is_network_admin() && !$ms_active && $ss_active ) { ?>
+                                    <?php } else if ( is_multisite() && ! is_network_admin() && ! $ms_active && $ss_active ) { ?>
                                         <?php esc_html_e( 'Deactivate', 'google-analytics-for-wordpress' ); ?> 
                                     <?php } else { ?>
                                         <?php esc_html_e( 'Deactivate', 'google-analytics-for-wordpress' ); ?> 
@@ -455,9 +455,9 @@ 
                     <div class="monsterinsights-addon-inactive monsterinsights-addon-message">
                         <div class="interior">
                             <?php if ( $ms_active ) { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Inactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sNetwork Inactive%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span>
                             <?php } else { ?>
-                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sInactive%2$s', 'google-analytics-for-wordpress'), '<span>', '</span>' ); ?></span>
+                            <span class="addon-status"><?php echo sprintf( esc_html__( 'Status: %1$sInactive%2$s', 'google-analytics-for-wordpress' ), '<span>', '</span>' ); ?></span>
                             <?php } ?> 
                             <div class="monsterinsights-addon-action">
                                 <a class="button button-primary monsterinsights-addon-action-button monsterinsights-activate-addon" href="#" rel="<?php echo esc_attr( $plugin_basename ); ?>">