awesomemotive / google-analytics-for-wordpress

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

includes/admin/reports/overview.php

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/reports/abstract-report.php

Spacing +33 added lines, -33 removed lines

@@ -30,7 +30,7 @@ 
 	 * @since 6.0.0
 	 */
 	public function __construct() {
-		add_filter( 'monsterinsights_reports_abstract_get_data_pre_cache', array( $this, 'requirements' ), 10 , 3 );
+		add_filter( 'monsterinsights_reports_abstract_get_data_pre_cache', array( $this, 'requirements' ), 10, 3 );
 	}
 
 	// Let's get the HTML to output for a particular report. This is not the AJAX endpoint. Args can hold things (generally start/end date range)
@@ -40,7 +40,7 @@ 
 		return ''; 
 	}
 
-	public function additional_data(){
+	public function additional_data() {
 		return array();
 	}
 
@@ -51,7 +51,7 @@ 
 	public function show_report( $args = array() ) {
 
 		if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-			return monsterinsights_get_message( 'error', esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
+			return monsterinsights_get_message( 'error', esc_html__( 'Access denied', 'google-analytics-for-wordpress' ) );
 		}
 
 		if ( monsterinsights_get_option( 'dashboard_disabled', false ) ) { 
@@ -69,10 +69,10 @@ 
 			}
 		}
 
-		if ( monsterinsights_is_pro_version() ){
+		if ( monsterinsights_is_pro_version() ) {
 			if ( ! MonsterInsights()->license->has_license() ) {
 				$url = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_settings' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-				return monsterinsights_get_message( 'error', esc_html__( 'You do not have an active license. Please %1$scheck your license configuration.%2$s', 'google-analytics-for-wordpress' ),'<a href="' . $url . '">','</a>' );
+				return monsterinsights_get_message( 'error', esc_html__( 'You do not have an active license. Please %1$scheck your license configuration.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . $url . '">', '</a>' );
 			} else if ( MonsterInsights()->license->license_has_error() ) {
 				return monsterinsights_get_message( 'error', $this->get_license_error() );
 			}
@@ -107,13 +107,13 @@ 
 			return monsterinsights_get_message( 'error', $args['error'] );
 		}
 
-		if ( empty( $args['data' ] ) || ! is_array( $args['data' ] ) ) {
+		if ( empty( $args['data'] ) || ! is_array( $args['data'] ) ) {
 			if ( monsterinsights_is_pro_version() ) {
 				return '';
 			} else {
 				// Try to get default data.
 				$args = $this->get_data( array( 'default' => true ) );
-				if ( empty( $args['data'] ) || is_array( $args['data' ] ) ) {
+				if ( empty( $args['data'] ) || is_array( $args['data'] ) ) {
 					return monsterinsights_get_message( 'error', __( 'No data found', 'google-analytics-for-wordpress' ) );
 				}
 
@@ -147,7 +147,7 @@ 
 		}
 		
 		$start = ! empty( $args['start'] ) && $this->is_valid_date( $args['start'] ) ? $args['start'] : '';
-		$end   = ! empty( $args['end'] )   && $this->is_valid_date( $args['end'] )   ? $args['end']   : '';
+		$end   = ! empty( $args['end'] ) && $this->is_valid_date( $args['end'] ) ? $args['end'] : '';
 
 		if ( ! MonsterInsights()->license->license_can( $this->level ) ) {
 			return array(
@@ -202,11 +202,11 @@ 
 				$data = ! $site_auth && $ms_auth ? get_site_transient( $transient ) : get_transient( $transient );
 			}
 
-			if ( ! empty( $data )             &&
-				 ! empty( $data['expires'] )  &&
+			if ( ! empty( $data ) &&
+				 ! empty( $data['expires'] ) &&
 				   $data['expires'] >= time() &&
-				 ! empty( $data['data'] )     && 
-				 ! empty( $data['p'] )        && 
+				 ! empty( $data['data'] ) && 
+				 ! empty( $data['p'] ) && 
 				   $data['p'] === $p
 			) {
 				return array(
@@ -216,12 +216,12 @@ 
 			}
 
 			// Nothing in cache, either not saved before, expired or mismatch. Let's grab from API
-			$api_options = array( 'start' => $start, 'end' => $end);
+			$api_options = array( 'start' => $start, 'end' => $end );
 			if ( ! $site_auth && $ms_auth ) {
 				$api_options['network'] = true;
 			}
 			
-			$api   = new MonsterInsights_API_Request( 'analytics/reports/' . $this->name . '/', $api_options, 'GET' );
+			$api = new MonsterInsights_API_Request( 'analytics/reports/' . $this->name . '/', $api_options, 'GET' );
 
 			$additional_data = $this->additional_data();
 			
@@ -229,7 +229,7 @@ 
 				$api->set_additional_data( $additional_data );
 			}
 			
-			$ret   = $api->request();
+			$ret = $api->request();
 			//echo print_r( $ret['data']);wp_die();
 			
 			if ( is_wp_error( $ret ) ) {
@@ -290,44 +290,44 @@ 
 	// Is a valid date value
 	public function is_valid_date( $date = '' ) {
 		$d = MonsterInsightsDateTime::createFromFormat( 'Y-m-d', $date );
-		return $d && $d->format('Y-m-d') === $date;
+		return $d && $d->format( 'Y-m-d' ) === $date;
 	}
 
 	/**
 	 * Do not use the functions below this. They are unused and are just here so people
 	 * with out of date MonsterInsights addons won't get fatal errors.
 	 */
-	protected function get_api_max_limit() {return 300;}
-	protected function get_date_range() {return array();}
+	protected function get_api_max_limit() {return 300; }
+	protected function get_date_range() {return array(); }
 
 	public function get_upsell_notice() {
 		$has_level = MonsterInsights()->license->get_license_type();
 		$has_level = $has_level ? $has_level : 'lite';
 		$message = sprintf( __( 'You currently have a %s level license, but this report requires at least a %s level license to view the %s. Please upgrade to view this report.', 'google-analytics-for-wordpress' ), $has_level, $this->level, $this->title );
-		ob_start();?>
-		<div class="monsterinsights-upsell-report-container monsterinsights-upsell-report-<?php echo $this->name;?>-bg">
+		ob_start(); ?>
+		<div class="monsterinsights-upsell-report-container monsterinsights-upsell-report-<?php echo $this->name; ?>-bg">
 			<div class="monsterinsights-upsell-container">
 		  		<div class="row justify-content-center">
 					<div class="col-lg-10 col-lg-offset-1 align-self-center">
 						<div class="monsterinsights-upsell-card">
-							  <img class="monsterinsights-upgrade-mascot" src="<?php echo trailingslashit( MONSTERINSIGHTS_PLUGIN_URL );?>assets/css/images/mascot.png" srcset="<?php echo trailingslashit( MONSTERINSIGHTS_PLUGIN_URL );?>assets/css/images/mascot@2x.png 2x" alt="">
+							  <img class="monsterinsights-upgrade-mascot" src="<?php echo trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ); ?>assets/css/images/mascot.png" srcset="<?php echo trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ); ?>assets/css/images/mascot@2x.png 2x" alt="">
 								<div class="monsterinsights-upsell-card-card-content">
-								  <span class="monsterinsights-upsell-card-title"><?php esc_html_e( 'Ready to Get Analytics Super-Powers?', 'google-analytics-for-wordpress' );?></span>
-								  <p class="monsterinsights-upsell-card-subtitle"><strong><?php esc_html_e( '(And Crush Your Competition?)', 'google-analytics-for-wordpress' );?></strong></p> &nbsp;
+								  <span class="monsterinsights-upsell-card-title"><?php esc_html_e( 'Ready to Get Analytics Super-Powers?', 'google-analytics-for-wordpress' ); ?></span>
+								  <p class="monsterinsights-upsell-card-subtitle"><strong><?php esc_html_e( '(And Crush Your Competition?)', 'google-analytics-for-wordpress' ); ?></strong></p> &nbsp;
 								  <?php if ( monsterinsights_is_pro_version() ) { ?>
 									  <p ><?php echo sprintf( esc_html__( "Hey there! It looks like you've got the %s license installed on your site.
-									  That's awesome! %s",'google-analytics-for-wordpress'), $has_level, '<span class="dashicons dashicons-smiley"></span>' ); ?></p>
+									  That's awesome! %s",'google-analytics-for-wordpress' ), $has_level, '<span class="dashicons dashicons-smiley"></span>' ); ?></p>
 									   &nbsp;
-									  <p><?php echo sprintf( esc_html__( "Do you want to access to %s reporting right now%s in your WordPress Dashboard? That comes with the <strong>%s level%s</strong> of our paid packages. You'll need to upgrade your license to get instant access.",'google-analytics-for-wordpress'), '<strong>' . $this->title, '</strong>','<a href="https://monsterinsights.com/my-account/">' . $this->level,'</a>' ); ?></p>
-									   &nbsp;<p><?php echo sprintf( esc_html__( "It's easy! To upgrade, navigate to %sMy Account%s on MonsterInsights.com, go to the licenses tab, and click upgrade. We also have a %sstep by step guide%s with pictures of this process.",'google-analytics-for-wordpress'), '<a href="https://monsterinsights.com/my-account/?utm_source=wpdashboard&utm_campaign=reportupsellpro"><strong>','</strong></a>', '<a href="https://www.monsterinsights.com/docs/upgrade-monsterinsights-license/" style="text-decoration:underline !important">', '</a>' ); ?></p>
-									   &nbsp;<p><?php esc_html_e( "If you have any questions, don't hesitate to reach out. We're here to help.", 'google-analytics-for-wordpress');?></p>
+									  <p><?php echo sprintf( esc_html__( "Do you want to access to %s reporting right now%s in your WordPress Dashboard? That comes with the <strong>%s level%s</strong> of our paid packages. You'll need to upgrade your license to get instant access.", 'google-analytics-for-wordpress' ), '<strong>' . $this->title, '</strong>', '<a href="https://monsterinsights.com/my-account/">' . $this->level, '</a>' ); ?></p>
+									   &nbsp;<p><?php echo sprintf( esc_html__( "It's easy! To upgrade, navigate to %sMy Account%s on MonsterInsights.com, go to the licenses tab, and click upgrade. We also have a %sstep by step guide%s with pictures of this process.", 'google-analytics-for-wordpress' ), '<a href="https://monsterinsights.com/my-account/?utm_source=wpdashboard&utm_campaign=reportupsellpro"><strong>', '</strong></a>', '<a href="https://www.monsterinsights.com/docs/upgrade-monsterinsights-license/" style="text-decoration:underline !important">', '</a>' ); ?></p>
+									   &nbsp;<p><?php esc_html_e( "If you have any questions, don't hesitate to reach out. We're here to help.", 'google-analytics-for-wordpress' ); ?></p>
 									<?php } else { ?>
 									   <p><?php echo sprintf( esc_html__( "Hey there! %s It looks like you've got the free version of MonsterInsights installed on your site.
-									  That's awesome!",'google-analytics-for-wordpress'), '<span class="dashicons dashicons-smiley"></span>' ); ?></p>
+									  That's awesome!",'google-analytics-for-wordpress' ), '<span class="dashicons dashicons-smiley"></span>' ); ?></p>
 									   &nbsp;
-									  <p><?php echo sprintf( esc_html__( "Do you you want to access to %s reporting right now%s in your WordPress Dashboard? That comes with %s level%s of our paid packages. To get instant access, you'll want to buy a MonsterInsights license, which also gives you access to powerful addons, expanded reporting (including the ability to use custom date ranges), comprehensive tracking features (like UserID tracking) and access to our world-class support team.",'google-analytics-for-wordpress'), '<strong>' . $this->title, '</strong>','<a href="https://monsterinsights.com/lite/">' . $this->level,'</a>' ); ?></p>
-									   &nbsp;<p><?php echo sprintf( esc_html__( "Upgrading is easy! To upgrade, navigate to %sour pricing page%s, purchase the required license, and then follow the %sinstructions in the email receipt%s to upgrade. It only takes a few minutes to unlock the most powerful, yet easy to use analytics tracking system for WordPress.",'google-analytics-for-wordpress'), '<a href="https://monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=reportupselllite"><strong>', '</strong></a>','<a style="text-decoration:underline !important" href="https://www.monsterinsights.com/docs/go-lite-pro/">', '</a>' ); ?></p>
-									   &nbsp;<p><?php esc_html_e( "If you have any questions, don't hesitate to reach out. We're here to help.", 'google-analytics-for-wordpress');?></p>
+									  <p><?php echo sprintf( esc_html__( "Do you you want to access to %s reporting right now%s in your WordPress Dashboard? That comes with %s level%s of our paid packages. To get instant access, you'll want to buy a MonsterInsights license, which also gives you access to powerful addons, expanded reporting (including the ability to use custom date ranges), comprehensive tracking features (like UserID tracking) and access to our world-class support team.", 'google-analytics-for-wordpress' ), '<strong>' . $this->title, '</strong>', '<a href="https://monsterinsights.com/lite/">' . $this->level, '</a>' ); ?></p>
+									   &nbsp;<p><?php echo sprintf( esc_html__( "Upgrading is easy! To upgrade, navigate to %sour pricing page%s, purchase the required license, and then follow the %sinstructions in the email receipt%s to upgrade. It only takes a few minutes to unlock the most powerful, yet easy to use analytics tracking system for WordPress.", 'google-analytics-for-wordpress' ), '<a href="https://monsterinsights.com/lite/?utm_source=wpdashboard&utm_campaign=reportupselllite"><strong>', '</strong></a>', '<a style="text-decoration:underline !important" href="https://www.monsterinsights.com/docs/go-lite-pro/">', '</a>' ); ?></p>
+									   &nbsp;<p><?php esc_html_e( "If you have any questions, don't hesitate to reach out. We're here to help.", 'google-analytics-for-wordpress' ); ?></p>
 									<?php } ?>
 								</div>
 								<div class="monsterinsights-upsell-card-action">
@@ -352,9 +352,9 @@ 
     		return '';
     	} else {
     		if ( ! empty( $data['reportprevrange'] ) && ! empty( $data['reportprevrange']['startDate'] ) && ! empty( $data['reportprevrange']['endDate'] ) ) {
-    			return '%3F_u.date00%3D' . str_replace( '-', '', $data['reportcurrentrange']['startDate'] ) .'%26_u.date01%3D' . str_replace( '-', '', $data['reportcurrentrange']['endDate'] ) . '%26_u.date10%3D' . str_replace( '-', '', $data['reportprevrange']['startDate'] ) .'%26_u.date11%3D' . str_replace( '-', '', $data['reportprevrange']['endDate'] ) . '/';
+    			return '%3F_u.date00%3D' . str_replace( '-', '', $data['reportcurrentrange']['startDate'] ) . '%26_u.date01%3D' . str_replace( '-', '', $data['reportcurrentrange']['endDate'] ) . '%26_u.date10%3D' . str_replace( '-', '', $data['reportprevrange']['startDate'] ) . '%26_u.date11%3D' . str_replace( '-', '', $data['reportprevrange']['endDate'] ) . '/';
     		} else {
-    			return '%3F_u.date00%3D' . str_replace( '-', '', $data['reportcurrentrange']['startDate'] ) .'%26_u.date01%3D' . str_replace( '-', '', $data['reportcurrentrange']['endDate'] ) . '/';
+    			return '%3F_u.date00%3D' . str_replace( '-', '', $data['reportcurrentrange']['startDate'] ) . '%26_u.date01%3D' . str_replace( '-', '', $data['reportcurrentrange']['endDate'] ) . '/';
     		}
     	}
     }

includes/admin/common.php

Spacing +49 added lines, -49 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
@@ -305,15 +305,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 );
@@ -328,15 +328,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 );
@@ -359,65 +359,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
@@ -478,7 +478,7 @@ 
 	return $shareasale_id;
 }
 
-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){
@@ -494,9 +494,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

includes/admin/settings/register-settings.php

Spacing +26 added lines, -26 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="https://www.monsterinsights.com/docs/enable-demographics-and-interests-report-in-google-analytics/#utm_medium=kb-link&amp;utm_source=gawp-config&amp;utm_campaign=wpgaplugin" target="_blank" rel="noopener noreferrer" referrer="no-referrer">',
-									'</a>','<a href="https://support.google.com/analytics/answer/2444872?hl=' . get_locale() . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">'
+									'</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/settings/settings-api.php

Spacing +54 added lines, -54 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( !defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) exit;
 
 /**
  * Get the settings for a section
@@ -82,23 +82,23 @@ 
 	// get subtab
 	$settings = monsterinsights_get_registered_settings();
 	$tab      = $_POST['monsterinsights_settings_sub_tab'];
-	if ( empty( $settings ) || !is_array( $settings ) || empty( $settings[ $tab ] ) || ! is_array( $settings[ $tab ] ) ) {
+	if ( empty( $settings ) || ! is_array( $settings ) || empty( $settings[$tab] ) || ! is_array( $settings[$tab] ) ) {
 		return;
 	}
 
 	// Okay we're good to sanitize, validate, and save this section's settings
 
 	// We only care about this sections's settings
-	$settings = $settings[ $tab ]; 
+	$settings = $settings[$tab]; 
 
 	// Run a general sanitization for the tab for special fields
 	$input    = ! empty( $_POST['monsterinsights_settings'] ) ? $_POST['monsterinsights_settings'] : array();
 	$input    = apply_filters( 'monsterinsights_settings_' . $tab . '_sanitize', $input );
 
-	foreach( $settings as $id => $setting ) {
+	foreach ( $settings as $id => $setting ) {
 
 		// If the value wasn't passed in, set to false, which will delete the option
-		$value          = isset( $input[ $id ] ) ? $input[ $id ] : false;
+		$value          = isset( $input[$id] ) ? $input[$id] : false;
 		$previous_value = monsterinsights_get_option( $id, false );
 
 		// Sanitize/Validate
@@ -138,9 +138,9 @@ 
 		) );
 
 		// Sanitize settings
-		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $id  , $value, $id, $args, $previous_value );
+		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $id, $value, $id, $args, $previous_value );
 		$value = apply_filters( 'monsterinsights_settings_sanitize_' . $type, $value, $id, $args, $previous_value );
-		$value = apply_filters( 'monsterinsights_settings_sanitize'         , $value, $id, $args, $previous_value );
+		$value = apply_filters( 'monsterinsights_settings_sanitize', $value, $id, $args, $previous_value );
 
 		// Save
 		if ( ! has_action( 'monsterinsights_settings_save_' . $args['type'] ) ) {
@@ -153,13 +153,13 @@ 
 }
 add_action( 'current_screen', 'monsterinsights_save_settings' );
 
-function monsterinsights_is_settings_tab( $tab = '' ){
+function monsterinsights_is_settings_tab( $tab = '' ) {
 	$tabs = monsterinsights_get_settings_tabs();
 	if ( empty( $tab ) || empty( $tabs ) || ! is_string( $tab ) || ! is_array( $tabs ) ) {
 		return false;
 	}
 
-	return !empty( $tabs[$tab]);
+	return ! empty( $tabs[$tab] );
 }
 
 /**
@@ -176,7 +176,7 @@ 
 		if ( ! empty( $settings[$section] ) ) {
 			foreach ( $settings[$section] as $setting ) {
 				if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
-					$setting_types[ $setting['id'] ] = $setting['type'];
+					$setting_types[$setting['id']] = $setting['type'];
 				}
 			}
 		}
@@ -184,7 +184,7 @@ 
 		foreach ( $settings as $tab ) {
 			foreach ( $tab as $setting ) {
 				if ( is_array( $setting ) && array_key_exists( 'type', $setting ) ) {
-					$setting_types[ $setting['id'] ] = $setting['type'];
+					$setting_types[$setting['id']] = $setting['type'];
 				}
 			}
 		}
@@ -256,14 +256,14 @@ 
 	function _sanitize_text_fields( $str, $keep_newlines = false ) {
 		$filtered = wp_check_invalid_utf8( $str );
 	 
-		if ( strpos($filtered, '<') !== false ) {
+		if ( strpos( $filtered, '<' ) !== false ) {
 			$filtered = wp_pre_kses_less_than( $filtered );
 			// This will strip extra whitespace for us.
 			$filtered = wp_strip_all_tags( $filtered, false );
 	 
 			// Use html entities in a special case to make sure no later
 			// newline stripping stage could lead to a functional tag
-			$filtered = str_replace("<\n", "&lt;\n", $filtered);
+			$filtered = str_replace( "<\n", "&lt;\n", $filtered );
 		}
 	 
 		if ( ! $keep_newlines ) {
@@ -272,14 +272,14 @@ 
 		$filtered = trim( $filtered );
 	 
 		$found = false;
-		while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
-			$filtered = str_replace($match[0], '', $filtered);
+		while ( preg_match( '/%[a-f0-9]{2}/i', $filtered, $match ) ) {
+			$filtered = str_replace( $match[0], '', $filtered );
 			$found = true;
 		}
 	 
 		if ( $found ) {
 			// Strip out the whitespace that may now exist after removing the octets.
-			$filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+			$filtered = trim( preg_replace( '/ +/', ' ', $filtered ) );
 		}
 	 
 		return $filtered;
@@ -317,7 +317,7 @@ 
 function monsterinsights_sanitize_multicheck_field( $value, $id, $setting, $previous_value ) {
 	$save_value = array();
 	if ( ! empty( $value ) && is_array( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
+		foreach ( $setting['options'] as $key => $option ) {
 			if ( in_array( $key, $value ) ) {
 				$save_value[] = $key;
 			}
@@ -342,7 +342,7 @@ 
 	if ( ! empty( $value ) && is_array( $value ) ) {
 		if ( $setting['multiple'] ) {
 			foreach ( $value as $vid => $vname ) {
-				foreach( $setting['options'] as $key => $option ){
+				foreach ( $setting['options'] as $key => $option ) {
 					if ( $key === $vname ) {
 						$save_value[] = $key;
 						break;
@@ -350,11 +350,11 @@ 
 				}
 			}
 		} else {
-			foreach( $setting['options'] as $key => $option ){
+			foreach ( $setting['options'] as $key => $option ) {
 				if ( is_array( $value ) && in_array( $key, $value ) ) {
 					$save_value = $key;
 					break;
-				} else if ( is_string( $value ) && $key === $value ){
+				} else if ( is_string( $value ) && $key === $value ) {
 					$save_value = $key;
 					break;
 				}
@@ -375,7 +375,7 @@ 
 function monsterinsights_sanitize_radio_field( $value, $id, $setting, $previous_value ) {
 	$save_value = '';
 	if ( ! empty( $value ) ) {
-		foreach( $setting['options'] as $key => $option ){
+		foreach ( $setting['options'] as $key => $option ) {
 			if ( $key === $value ) {
 				$save_value = $key;
 			}
@@ -492,14 +492,14 @@ 
  */
 function monsterinsights_get_pages( $force = false ) {
 	$pages_options = array( '' => '' ); // Blank option
-	if( ( ! isset( $_GET['page'] ) || 'monsterinsights_settings' != $_GET['page'] ) && ! $force ) {
+	if ( ( ! isset( $_GET['page'] ) || 'monsterinsights_settings' != $_GET['page'] ) && ! $force ) {
 		return $pages_options;
 	}
 
 	$pages = get_pages();
 	if ( $pages ) {
 		foreach ( $pages as $page ) {
-			$pages_options[ $page->ID ] = $page->post_title;
+			$pages_options[$page->ID] = $page->post_title;
 		}
 	}
 
@@ -540,7 +540,7 @@ 
 	}
 
 	$html     = '<input type="checkbox" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']"' . $name . ' value="1" ' . $checked . ' class="' . $class . '" ' . $disabled . ' />';
-	$html    .= '<p class="description">'  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html    .= '<p class="description">' . wp_kses_post( $args['desc'] ) . '</p>';
 
 	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
@@ -562,9 +562,9 @@ 
 
 	$html = '';
 	if ( ! empty( $args['options'] ) ) {
-		foreach( $args['options'] as $key => $option ):
-			if( isset( $monsterinsights_option[ $key ] ) ) { $enabled = $option; } else { $enabled = NULL; }
-			$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked($option, $enabled, false) . '/>&nbsp;';
+		foreach ( $args['options'] as $key => $option ):
+			if ( isset( $monsterinsights_option[$key] ) ) { $enabled = $option; } else { $enabled = NULL; }
+			$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="checkbox" value="' . esc_attr( $option ) . '" ' . checked( $option, $enabled, false ) . '/>&nbsp;';
 			$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">' . wp_kses_post( $option ) . '</label><br/>';
 		endforeach;
 		$html .= '<p class="description">' . $args['desc'] . '</p>';
@@ -596,12 +596,12 @@ 
 
 		if ( $monsterinsights_options && $monsterinsights_options == $key ) {
 			$checked = true;
-		} else if( isset( $args['std'] ) && $args['std'] == $key && ! $monsterinsights_options ) {
+		} else if ( isset( $args['std'] ) && $args['std'] == $key && ! $monsterinsights_options ) {
 			$checked = true;
 		}
 
 		$html .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']">';
-		$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="radio" value="' . monsterinsights_sanitize_key( $key ) . '" ' . checked(true, $checked, false) . '/>&nbsp;';
+		$html .= '<input name="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . '][' . monsterinsights_sanitize_key( $key ) . ']" class="' . $class . '" type="radio" value="' . monsterinsights_sanitize_key( $key ) . '" ' . checked( true, $checked, false ) . '/>&nbsp;';
 		$html .= esc_html( $option ) . '</label>';
 	endforeach;
 
@@ -625,7 +625,7 @@ 
 
 	if ( $monsterinsights_option ) {
 		$value = $monsterinsights_option;
-	} elseif( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
+	} elseif ( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
 		$value = '';
 	} else {
 		$value = isset( $args['std'] ) ? $args['std'] : '';
@@ -645,7 +645,7 @@ 
 	$readonly = $args['readonly'] === true ? ' readonly="readonly"' : '';
 	$size     = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
 	$html     = '<input type="text" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"' . $readonly . $disabled . ' placeholder="' . esc_attr( $args['placeholder'] ) . '"/>';
-	$html    .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html    .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 
 	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
@@ -679,13 +679,13 @@ 
 
 	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
-	$max  = isset( $args['max'] )  ? $args['max']   : 999999;
-	$min  = isset( $args['min'] )  ? $args['min']   : 0;
+	$max  = isset( $args['max'] ) ? $args['max'] : 999999;
+	$min  = isset( $args['min'] ) ? $args['min'] : 0;
 	$step = isset( $args['step'] ) ? $args['step'] : 1;
 
 	$size = ( isset( $args['size'] ) && ! is_null( $args['size'] ) ) ? $args['size'] : 'regular';
 	$html = '<input type="number" step="' . esc_attr( $step ) . '" max="' . esc_attr( $max ) . '" min="' . esc_attr( $min ) . '" class="' . $class . ' ' . sanitize_html_class( $size ) . '-text" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" ' . $name . ' value="' . esc_attr( stripslashes( $value ) ) . '"/>';
-	$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 
 	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
@@ -712,7 +712,7 @@ 
 	$class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
 	$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . esc_textarea( stripslashes( $value ) ) . '</textarea>';
-	$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+	$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 
 	return apply_filters( 'monsterinsights_after_setting_output', $html, $args );
 }
@@ -742,7 +742,7 @@ 
 		$class = monsterinsights_sanitize_html_class( $args['field_class'] );
 
 		$html = '<textarea class="' . $class . ' large-text" cols="50" rows="5" id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']">' . stripslashes( $value ) . '</textarea>';
-		$html .= '<p class="description"> '  . wp_kses_post( $args['desc'] ) . '</p>';
+		$html .= '<p class="description"> ' . wp_kses_post( $args['desc'] ) . '</p>';
 	} else {
 		$html .= sprintf( esc_html__( 'You must have the %s capability to view/edit this setting', 'google-analytics-for-wordpress' ), '"unfiltered_html"' );
 	}
@@ -788,7 +788,7 @@ 
  *
  * @return void
  */
-function monsterinsights_select_callback($args) {
+function monsterinsights_select_callback( $args ) {
 	$monsterinsights_option = monsterinsights_get_option( $args['id'] );
 
 	if ( $monsterinsights_option ) {
@@ -810,14 +810,14 @@ 
 	}
 
 	$allowclear   = isset( $args['allowclear'] ) ? (bool) $args['allowclear'] : false;
-	$multiple     = isset( $args['multiple'] )   ? (bool) $args['multiple'] : false;
+	$multiple     = isset( $args['multiple'] ) ? (bool) $args['multiple'] : false;
 	$multiple     = $multiple ? 'multiple="multiple"' : '';
 	$multiple_arg = $multiple ? '[]' : '';
 
-	$html = '<select id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']' . $multiple_arg .'" class="' . $class . '" data-placeholder="' . esc_html( $placeholder ) . '" data-allow-clear="' . $allowclear . '" ' . $multiple . ' />';
+	$html = '<select id="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']" name="monsterinsights_settings[' . esc_attr( $args['id'] ) . ']' . $multiple_arg . '" class="' . $class . '" data-placeholder="' . esc_html( $placeholder ) . '" data-allow-clear="' . $allowclear . '" ' . $multiple . ' />';
 
 	foreach ( $args['options'] as $option => $name ) {
-		$selected = ! empty( $value ) && is_array( $value ) ? in_array( $option, $value ) :  $value === $option;
+		$selected = ! empty( $value ) && is_array( $value ) ? in_array( $option, $value ) : $value === $option;
 		$selected = selected( true, $selected, false );
 		$html .= '<option value="' . esc_attr( $option ) . '" ' . $selected . '>' . esc_html( $name ) . '</option>';
 	}
@@ -842,7 +842,7 @@ 
 	if ( $monsterinsights_option ) {
 		$value = $monsterinsights_option;
 	} else {
-		if( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
+		if ( ! empty( $args['allow_blank'] ) && empty( $monsterinsights_option ) ) {
 			$value = '';
 		} else {
 			$value = isset( $args['std'] ) ? $args['std'] : '';
@@ -902,7 +902,7 @@ 
  * @return void
  */
 function monsterinsights_upgrade_notice_callback( $args ) {
-	$html =   '<div class="monsterinsights-upsell-box"><h2>' . esc_html( $args['name' ] ) . '</h2>'
+	$html = '<div class="monsterinsights-upsell-box"><h2>' . esc_html( $args['name'] ) . '</h2>'
 			. '<p class="monsterinsights-upsell-lite-text">' . $args['desc'] . '</p>'
 			. '<p class="monsterinsights-upsell-button-par"><a href="https://www.monsterinsights.com/lite/" class="monsterinsights-upsell-box-button button button-primary">' . __( 'Click here to Upgrade', 'google-analytics-for-wordpress' ) . '</a></p>'
 			. '</div>';
@@ -932,7 +932,7 @@ 
  * @param array $args Arguments passed by the setting
  * @return void
  */
-function monsterinsights_missing_callback($args) {
+function monsterinsights_missing_callback( $args ) {
 	return sprintf(
 		__( 'The callback function used for the %s setting is missing.', 'google-analytics-for-wordpress' ),
 		'<strong>' . $args['id'] . '</strong>'
@@ -963,12 +963,12 @@ 
 			}
 		}
 		if ( $submit_button ) {
-			$html .= '<input type="hidden" name="monsterinsights_settings_tab" value="' . esc_attr( $page ). '"/>';
-			$html .= '<input type="hidden" name="monsterinsights_settings_sub_tab" value="' .  esc_attr( $section ) . '"/>';
+			$html .= '<input type="hidden" name="monsterinsights_settings_tab" value="' . esc_attr( $page ) . '"/>';
+			$html .= '<input type="hidden" name="monsterinsights_settings_sub_tab" value="' . esc_attr( $section ) . '"/>';
 			$html .= wp_nonce_field( 'monsterinsights-settings-nonce', 'monsterinsights-settings-nonce', true, false );
 			$html .= get_submit_button( esc_html__( 'Save Changes', 'google-analytics-for-wordpress' ), 'primary', 'monsterinsights-settings-submit', false );
 		}
-		$html      = apply_filters( 'monsterinsights_html_after_submit_field', $html, $page, $section );
+		$html = apply_filters( 'monsterinsights_html_after_submit_field', $html, $page, $section );
 	}
 	return $html;
 }
@@ -978,10 +978,10 @@ 
  */
 function monsterinsights_render_field( $args ) {
 	$output = '';
-	$output .='<tr id="monsterinsights-input-' . monsterinsights_sanitize_key( $args['id'] ) .'">';
+	$output .= '<tr id="monsterinsights-input-' . monsterinsights_sanitize_key( $args['id'] ) . '">';
 		if ( ! empty( $args['name'] ) && empty( $args['no_label'] ) ) {
 			$output .= '<th scope="row">';
-				$output .='<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']">' . esc_html( $args["name"] ) . '</label>';
+				$output .= '<label for="monsterinsights_settings[' . monsterinsights_sanitize_key( $args['id'] ) . ']">' . esc_html( $args["name"] ) . '</label>';
 			$output .= '</th>';
 		} 
 
@@ -1029,9 +1029,9 @@ 
 	$notices = get_transient( 'monsterinsights_settings_notices' );
 	if ( empty( $notices ) ) {
 		$notices          = array();
-		$notices[ $name ] = array( "type" => $type, "message" => $message );
+		$notices[$name] = array( "type" => $type, "message" => $message );
 	} else {
-		$notices[ $name ] = array( "type" => $type, "message" => $message );
+		$notices[$name] = array( "type" => $type, "message" => $message );
 	}
 	set_transient( 'monsterinsights_settings_notices', $notices );
 }
@@ -1043,8 +1043,8 @@ 
 	$notices = get_transient( 'monsterinsights_settings_notices' );
 	$found   = false;
 	if ( ! empty( $notices ) ) {
-		if ( isset( $notices[ $name] ) ) {
-			unset( $notices[ $name] );
+		if ( isset( $notices[$name] ) ) {
+			unset( $notices[$name] );
 			set_transient( 'monsterinsights_settings_notices', $notices );
 			$found = true;
 		} else {
@@ -1057,6 +1057,6 @@ 
 /** 
  * @todo  docbloc
  */
-function monsterinsights_get_non_setting_types(){
-	return apply_filters( 'monsterinsights_non_setting_types', array(  'descriptive_text', 'hook', 'upgrade_notice', 'install_notice', 'notice' ) );
+function monsterinsights_get_non_setting_types() {
+	return apply_filters( 'monsterinsights_non_setting_types', array( 'descriptive_text', 'hook', 'upgrade_notice', 'install_notice', 'notice' ) );
 }
\ No newline at end of file

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,22 +175,22 @@ 
 	 */
 	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     	= '';
 		$cookie_notice  = class_exists( 'Cookie_Notice' );
-		$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 {
@@ -204,20 +204,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() ) { ?>
@@ -265,7 +265,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() {
@@ -288,7 +288,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 {

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

lite/includes/admin/settings.php

Spacing +15 added lines, -15 removed lines

@@ -11,7 +11,7 @@ 
 			$settings['social']['social_notice'] = array( 
 				'id' => 'social_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Social tracking to see who's clicking on your social share links, so you can track and maximize your social sharing exposure.", 'google-analytics-for-wordpress' )
 			);
@@ -20,7 +20,7 @@ 
 			$settings['eucompliance']['eucompliance_notice'] = array( 
 				'id' => 'eucompliance_notice',
 				'no_label' => true,
-				'name' => __( 'Google Analytics EU Compliance', 'google-analytics-for-wordpress'),
+				'name' => __( 'Google Analytics EU Compliance', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "The MonsterInsights EU Compliance addon allows you to improve compliance with GDPR and other privacy regulations.", 'google-analytics-for-wordpress' )
 			);
@@ -29,7 +29,7 @@ 
 			$settings['ads']['ads_notice'] = array( 
 				'id' => 'ads_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ads tracking to see who's clicking on your Google Ads, so you can increase your revenue.", 'google-analytics-for-wordpress' )
 			);
@@ -38,7 +38,7 @@ 
 			$settings['forms']['forms_notice'] = array( 
 				'id' => 'forms_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Forms tracking to see who's seeing and submitting your forms, so you can increase your conversion rate.", 'google-analytics-for-wordpress' )
 			);
@@ -47,7 +47,7 @@ 
 			$settings['media']['media_notice'] = array( 
 				'id' => 'media_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Media tracking to see who's interacting with the media on your site, so you know what your users are most interested in on your site. You can use this to tailor future content to meet your audience's interest to promote repeat visitors and expand your average user's time spent visiting your website on each visit.", 'google-analytics-for-wordpress' )
 			);
@@ -56,7 +56,7 @@ 
 			$settings['membership']['membership_notice'] = array( 
 				'id' => 'membership_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Membership tracking.", 'google-analytics-for-wordpress' )
 			);
@@ -65,7 +65,7 @@ 
 			$settings['dimensions']['dimensions_notice'] = array( 
 				'id' => 'dimensions_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Custom Dimensions and track who's the most popular author on your site, which post types get the most traffic, and more. Why not check it out?", 'google-analytics-for-wordpress' )
 			);
@@ -74,7 +74,7 @@ 
 			$settings['performance']['performance_notice'] = array( 
 				'id' => 'performance_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust the sample rate so you don't exceed Google Analytics' processing limit. You can also use it to enable Google Optimize for A/B testing and personalization.", 'google-analytics-for-wordpress' )
 			);
@@ -83,7 +83,7 @@ 
 			$settings['reporting']['reporting_notice'] = array( 
 				'id' => 'reporting_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable enhanced reporting.", 'google-analytics-for-wordpress' )
 			);
@@ -92,7 +92,7 @@ 
 			$settings['amp']['amp_notice'] = array( 
 				'id' => 'amp_notice',
 				'no_label' => true,
-				'name' => __( 'Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to use track users visiting your AMP pages?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable AMP page tracking.", 'google-analytics-for-wordpress' )
 			);
@@ -101,7 +101,7 @@ 
 			$settings['goptimize']['goptimize_notice'] = array( 
 				'id' => 'goptimize_notice',
 				'no_label' => true,
-				'name' => __( 'Want to use Google Optimize to retarget your website visitors and perform A/B split tests with ease?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to use Google Optimize to retarget your website visitors and perform A/B split tests with ease?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable Google Optimize.", 'google-analytics-for-wordpress' )
 			);
@@ -110,7 +110,7 @@ 
 			$settings['fbia']['fbia_notice'] = array( 
 				'id' => 'fbia_notice',
 				'no_label' => true,
-				'name' => __( 'Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to expand your website audience beyond your website with Facebook Instant Articles?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can track your Facebook Instant Article visitors with MonsterInsights.", 'google-analytics-for-wordpress' )
 			);
@@ -119,7 +119,7 @@ 
 			$settings['bounce']['bounce_notice'] = array( 
 				'id' => 'bounce_notice',
 				'no_label' => true,
-				'name' => __( 'Want to adjust your website bounce rate?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to adjust your website bounce rate?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can adjust your Google Analytics bounce rate with MonsterInsights.", 'google-analytics-for-wordpress' )
 			);
@@ -128,7 +128,7 @@ 
 			$settings['notifications']['notifications_notice'] = array( 
 				'id' => 'notifications_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can enable notifications.", 'google-analytics-for-wordpress' )
 			);
@@ -137,7 +137,7 @@ 
 			$settings['ecommerce']['ecommerce_notice'] = array( 
 				'id' => 'ecommerce_notice',
 				'no_label' => true,
-				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress'),
+				'name' => __( 'Want to increase your traffic, conversion, & engagement?', 'google-analytics-for-wordpress' ),
 				'type' => 'upgrade_notice',
 				'desc' => esc_html__( "By upgrading to MonsterInsights Pro, you can add Ecommerce tracking to see who's buying your product, what's the most popular item on your store, the average order value, and tons more.", 'google-analytics-for-wordpress' )
 			);