awesomemotive / google-analytics-for-wordpress

includes/admin/pages/dashboard.php

Spacing +5 added lines, -5 removed lines

@@ -10,8 +10,8 @@ 
 function monsterinsights_get_dashboard_report() {
 	$reports = monsterinsights_get_reports();
 	$picked  = monsterinsights_get_option( 'dashboard_report', 'overview' );
-	if ( ! empty( $reports ) && is_array( $reports ) && array_key_exists ( $picked, $reports ) ) {
-		return array( 'id' => $picked, 'title' => $reports[ $picked ] );
+	if ( ! empty( $reports ) && is_array( $reports ) && array_key_exists( $picked, $reports ) ) {
+		return array( 'id' => $picked, 'title' => $reports[$picked] );
 	} else {
 		return array();
 	}
@@ -36,7 +36,7 @@ 
 	do_action( 'monsterinsights_head' );
 
 	if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-		wp_die( esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
+		wp_die( esc_html__( 'Access denied', 'google-analytics-for-wordpress' ) );
 	}
 
 	$dashboard_disabled = monsterinsights_get_option( 'dashboard_disabled', false );
@@ -46,14 +46,14 @@ 
 	$failed             = monsterinsights_get_option( 'cron_failed', false );
 	$pro_access_key     = get_option( 'monsterinsights_pro_access_token', false );
 	$lite_access_key    = get_option( 'monsterinsights_lite_access_token', false );
-	$needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) )  ) ? true : false;
+	$needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) ) ) ? true : false;
 	?>
 	<?php echo monsterinsights_ublock_notice(); ?>
 	<div id="monsterinsights-reports" class="wrap">
 		<div class="monsterinsights-clear">
 			<div class="monsterinsights-reports-action-bar">
 				<div class="monsterinsights-reports-action-bar-title">
-					<?php esc_html_e( 'Dashboard', 'google-analytics-for-wordpress' );?>
+					<?php esc_html_e( 'Dashboard', 'google-analytics-for-wordpress' ); ?>
 				</div>
 				<div class="monsterinsights-reports-action-bar-actions"><?php 
 					/** 

includes/admin/pages/reports.php

Spacing +4 added lines, -4 removed lines

@@ -30,7 +30,7 @@ 
 	 * not be used by other developers. This hook's behavior may be modified
 	 * or the hook may be removed at any time, without warning.
 	 */
-	$reports =  apply_filters( 'monsterinsights_get_reports', array() );
+	$reports = apply_filters( 'monsterinsights_get_reports', array() );
 	return $reports;
 }
 
@@ -53,7 +53,7 @@ 
 	do_action( 'monsterinsights_head' );
 
 	if ( ! current_user_can( 'monsterinsights_view_dashboard' ) ) {
-		wp_die( esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
+		wp_die( esc_html__( 'Access denied', 'google-analytics-for-wordpress' ) );
 	}
 	
 	$dashboard_disabled = monsterinsights_get_option( 'dashboard_disabled', false );
@@ -63,7 +63,7 @@ 
 	$failed             = monsterinsights_get_option( 'cron_failed', false );
 	$pro_access_key     = get_option( 'monsterinsights_pro_access_token', false );
 	$lite_access_key    = get_option( 'monsterinsights_lite_access_token', false );
-	$needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) )  ) ? true : false;
+	$needs_re_auth      = ( ( $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) || ( empty( $pro_access_key ) && empty( $lite_access_key ) ) || ( version_compare( $oauth_version, '1.0', '<' ) ) ) ? true : false;
 	?>
 	<?php echo monsterinsights_ublock_notice(); ?>
 	
@@ -90,7 +90,7 @@ 
 		<div class="monsterinsights-clear">
 			<div class="monsterinsights-reports-action-bar">
 				<div class="monsterinsights-reports-action-bar-title">
-					<?php esc_html_e( 'Reports', 'google-analytics-for-wordpress' );?>
+					<?php esc_html_e( 'Reports', 'google-analytics-for-wordpress' ); ?>
 				</div>
 				<div class="monsterinsights-reports-action-bar-actions"><?php 
 					/** 

includes/admin/pages/network-settings.php

Indentation +20 added lines, -20 removed lines

@@ -42,16 +42,16 @@ 
             <div id="monsterinsights-main-tab-general" class="monsterinsights-main-nav-tab monsterinsights-nav-tab monsterinsights-active">
                 <div id="monsterinsights-network-settings-general">
                     <?php 
-                    // Output any notices now
-                    /** 
-                     * Developer Alert:
-                     *
-                     * Per the README, this is considered an internal hook and should
-                     * not be used by other developers. This hook's behavior may be modified
-                     * or the hook may be removed at any time, without warning.
-                     */
-                    do_action( 'monsterinsights_network_settings_general_tab_notice' );
-                    ?>
+		    // Output any notices now
+		    /** 
+		     * Developer Alert:
+		     *
+		     * Per the README, this is considered an internal hook and should
+		     * not be used by other developers. This hook's behavior may be modified
+		     * or the hook may be removed at any time, without warning.
+		     */
+		    do_action( 'monsterinsights_network_settings_general_tab_notice' );
+		    ?>
                     <h1><?php esc_html_e( 'Network Settings', 'google-analytics-for-wordpress'); ?></h1>
                     <p><?php esc_html_e( 'Activate your MonsterInsights license key on this panel to hide the license key settings and addon pages for subsites.', 'google-analytics-for-wordpress'); ?></p>
                     <table class="form-table">
@@ -122,15 +122,15 @@ 
 
     // Check if user pressed the 'Update' button and nonce is valid
     if ( ! isset( $_POST['monsterinsights-network-settings-submit'] ) ) {
-        return;
+	return;
     }
 
     if ( ! wp_verify_nonce( $_POST['monsterinsights-network-settings-nonce'], 'monsterinsights-network-settings-nonce' ) ) {
-        return;
+	return;
     }
 
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        return;
+	return;
     }
 
     $throw_notice    = false;
@@ -138,19 +138,19 @@ 
     $network_manual_ua_code = monsterinsights_is_valid_ua( $network_manual_ua_code ); // also sanitizes the string
 
     if ( $network_manual_ua_code ) {
-        update_site_option( 'monsterinsights_network_manual_ua_code', $network_manual_ua_code );
+	update_site_option( 'monsterinsights_network_manual_ua_code', $network_manual_ua_code );
     } else {
-        if ( empty ( $network_manual_ua_code ) && isset( $_POST['network_manual_ua_code'] ) ) {
-             $throw_notice = true;
-        }
-        update_site_option( 'monsterinsights_network_manual_ua_code', '' );
+	if ( empty ( $network_manual_ua_code ) && isset( $_POST['network_manual_ua_code'] ) ) {
+	     $throw_notice = true;
+	}
+	update_site_option( 'monsterinsights_network_manual_ua_code', '' );
     }
 
     // Output an admin notice so the user knows what happened
     if ( $throw_notice ) {
-        add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
+	add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_invalid_ua_code' );
     } else {
-        add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_updated_settings' );
+	add_action( 'monsterinsights_network_settings_general_tab_notice', 'monsterinsights_updated_settings' );
     }
 }
 add_action( 'admin_init', 'monsterinsights_network_settings_save_general', 11 );
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -34,7 +34,7 @@ 
     $network_license             = get_site_option( 'monsterinsights_license' );
     $license_key                 = ! empty( $network_license['key'] ) ? esc_attr( $network_license['key'] ) : '';
     $license_key_type            = ! empty( $network_license['type'] ) ? esc_html( $network_license['type'] ) : '';
-    $network_ua_code             = get_site_option('monsterinsights_network_manual_ua_code', false );
+    $network_ua_code             = get_site_option( 'monsterinsights_network_manual_ua_code', false );
     ?>
     <?php echo monsterinsights_ublock_notice(); ?>
     <div id="monsterinsights-settings" class="wrap">
@@ -52,8 +52,8 @@ 
                      */
                     do_action( 'monsterinsights_network_settings_general_tab_notice' );
                     ?>
-                    <h1><?php esc_html_e( 'Network Settings', 'google-analytics-for-wordpress'); ?></h1>
-                    <p><?php esc_html_e( 'Activate your MonsterInsights license key on this panel to hide the license key settings and addon pages for subsites.', 'google-analytics-for-wordpress'); ?></p>
+                    <h1><?php esc_html_e( 'Network Settings', 'google-analytics-for-wordpress' ); ?></h1>
+                    <p><?php esc_html_e( 'Activate your MonsterInsights license key on this panel to hide the license key settings and addon pages for subsites.', 'google-analytics-for-wordpress' ); ?></p>
                     <table class="form-table">
                         <tbody>
                             <?php if ( monsterinsights_is_pro_version() ) : ?>
@@ -133,7 +133,7 @@ 
         return;
     }
 
-    $throw_notice    = false;
+    $throw_notice = false;
     $network_manual_ua_code = isset( $_POST['network_manual_ua_code'] ) ? $_POST['network_manual_ua_code'] : '';
     $network_manual_ua_code = monsterinsights_is_valid_ua( $network_manual_ua_code ); // also sanitizes the string
 

includes/admin/pages/tools.php

Spacing +20 added lines, -20 removed lines

@@ -51,13 +51,13 @@ 
 	<?php
 }
 
-function monsterinsights_tools_url_builder_tab(){
+function monsterinsights_tools_url_builder_tab() {
 	do_action( 'monsterinsights_tools_url_builder_tab' );
 }
 
 function monsterinsights_tools_settings_tab() {
-	ob_start();?>
-	<h2><?php echo esc_html__( 'Setting Tools', 'google-analytics-for-wordpress' );?></h2>
+	ob_start(); ?>
+	<h2><?php echo esc_html__( 'Setting Tools', 'google-analytics-for-wordpress' ); ?></h2>
 	<p><?php echo esc_html__( 'You can use the below tools to import settings from other MonsterInsights websites or export settings to import into another MonsterInsights install.', 'google-analytics-for-wordpress' ); ?> </p>
 	<br />
 	<table class="form-table">
@@ -65,13 +65,13 @@ 
 			<tr>
 				<th scope="row">
 					<label for="monsterinsights-import-settings">
-						<?php echo esc_html__( 'Import Settings', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Import Settings', 'google-analytics-for-wordpress' ); ?>
 					</label>
 				</th>
 				<td>
 					<?php 
-					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ){
-						echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!','google-analytics-for-wordpress'), 'success', false, array() );
+					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ) {
+						echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!', 'google-analytics-for-wordpress' ), 'success', false, array() );
 					}
 					?>
 					<form method="post" enctype="multipart/form-data">
@@ -79,7 +79,7 @@ 
 							<input type="file" name="import_file"/>
 							<input type="hidden" name="monsterinsights_action" value="monsterinsights_import_settings" />
 						</p>
-						<p class="description"><?php echo esc_html__( 'Paste the import field content from another MonsterInsights site in above.', 'google-analytics-for-wordpress' );?></p>
+						<p class="description"><?php echo esc_html__( 'Paste the import field content from another MonsterInsights site in above.', 'google-analytics-for-wordpress' ); ?></p>
 						<p>
 							<?php wp_nonce_field( 'monsterinsights_import_settings', 'monsterinsights_import_settings' ); ?>
 						</p>
@@ -92,7 +92,7 @@ 
 			<tr>
 				<th scope="row">
 					<label for="monsterinsights-export-settings">
-						<?php echo esc_html__( 'Export Settings:', 'google-analytics-for-wordpress' );?>
+						<?php echo esc_html__( 'Export Settings:', 'google-analytics-for-wordpress' ); ?>
 					</label>
 				</th>
 				<td>
@@ -125,7 +125,7 @@ 
  * @return void
  */
 function monsterinsights_process_export_settings() {
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+	if ( ! isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
 		return;
 	}
 
@@ -133,7 +133,7 @@ 
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ){
+	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ) {
 		return;
 	}
 
@@ -156,7 +156,7 @@ 
 
 function monsterinsights_import_settings() {
 
-	if ( !isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
+	if ( ! isset( $_POST['monsterinsights_action'] ) || empty( $_POST['monsterinsights_action'] ) ) {
 		return;
 	}
 
@@ -164,11 +164,11 @@ 
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ){
+	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ) {
 		return;
 	}
 
-	if ( !wp_verify_nonce( $_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings' ) ) {
+	if ( ! wp_verify_nonce( $_POST['monsterinsights_import_settings'], 'monsterinsights_import_settings' ) ) {
 		return;
 	}
 
@@ -185,7 +185,7 @@ 
 		wp_die( __( 'Please upload a file to import', 'google-analytics-for-wordpress' ) );
 	}
 
-	$file     = file_get_contents( $import_file );
+	$file = file_get_contents( $import_file );
 	if ( empty( $file ) ) {
 		wp_die( __( 'Please upload a real settings export file to import', 'google-analytics-for-wordpress' ) );
 	}
@@ -203,20 +203,20 @@ 
 	);
 
 	foreach ( $exclude as $e ) {
-		if ( ! empty( $new_settings[ $e ] ) ) {
-			unset( $new_settings[ $e ] );
+		if ( ! empty( $new_settings[$e] ) ) {
+			unset( $new_settings[$e] );
 		}
 	}
 
 	if ( ! is_super_admin() ) {
-		if ( ! empty( $new_settings[ 'custom_code' ] ) ) {
-			unset( $new_settings[ 'custom_code' ] );
+		if ( ! empty( $new_settings['custom_code'] ) ) {
+			unset( $new_settings['custom_code'] );
 		}
 	}
 
 	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			$new_settings = $settings[ $e ];
+		if ( ! empty( $settings[$e] ) ) {
+			$new_settings = $settings[$e];
 		}
 	}
 

Braces +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
 	<?php
 }
 
-function monsterinsights_tools_url_builder_tab(){
+function monsterinsights_tools_url_builder_tab() {
 	do_action( 'monsterinsights_tools_url_builder_tab' );
 }
 
@@ -70,7 +70,7 @@ 
 				</th>
 				<td>
 					<?php 
-					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ){
+					if ( ! empty( $_REQUEST['action'] ) && ! empty( $_REQUEST['result'] ) && $_REQUEST['action'] === 'import' && $_REQUEST['result'] === 'success' ) {
 						echo MonsterInsights()->notices->display_inline_notice( 'monsterinsights_standard_notice', '', __( 'Successfully imported settings!','google-analytics-for-wordpress'), 'success', false, array() );
 					}
 					?>
@@ -133,7 +133,7 @@ 
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ){
+	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_export_settings' ) {
 		return;
 	}
 
@@ -164,7 +164,7 @@ 
 		return;
 	}
 
-	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ){
+	if ( $_POST['monsterinsights_action'] !== 'monsterinsights_import_settings' ) {
 		return;
 	}
 

includes/admin/pages/addons.php

Indentation +105 added lines, -105 removed lines

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

Spacing +12 added lines, -12 removed lines

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

includes/admin/pages/settings.php

Indentation +39 added lines, -39 removed lines

@@ -19,16 +19,16 @@ 
     global $admin_page_hooks;
    
     if ( ! is_object( $current_screen ) || empty( $current_screen->id ) || empty( $admin_page_hooks ) ) {
-        return false;
+	return false;
     }
 
     $settings_page = false;
     if ( ! empty( $admin_page_hooks['monsterinsights_dashboard'] ) && $current_screen->id === $admin_page_hooks['monsterinsights_dashboard'] . '_page_monsterinsights_settings' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     if ( $current_screen->id === 'toplevel_page_monsterinsights_settings' ) {
-        $settings_page = true;
+	$settings_page = true;
     }
 
     return $settings_page;
@@ -110,31 +110,31 @@ 
 function monsterinsights_save_general_settings_page() {
 
     if ( ! monsterinsights_is_settings_page() ) {
-        return;
+	return;
     }
 
     // Check if user pressed the 'Update' button and nonce is valid
     if ( ! isset( $_POST['monsterinsights-settings-submit'] ) ) {
-        return;
+	return;
     }
 
     if ( ! wp_verify_nonce( $_POST['monsterinsights-settings-nonce'], 'monsterinsights-settings-nonce' ) ) {
-        return;
+	return;
     }
 
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        return;
+	return;
     }
 
     if ( ! empty( $_POST['monsterinsights_settings_tab'] ) && $_POST['monsterinsights_settings_tab'] === 'general' ) {
-        /** 
-         * Developer Alert:
-         *
-         * Per the README, this is considered an internal hook and should
-         * not be used by other developers. This hook's behavior may be modified
-         * or the hook may be removed at any time, without warning.
-         */
-        do_action( 'monsterinsights_settings_save_general' );
+	/** 
+	 * Developer Alert:
+	 *
+	 * Per the README, this is considered an internal hook and should
+	 * not be used by other developers. This hook's behavior may be modified
+	 * or the hook may be removed at any time, without warning.
+	 */
+	do_action( 'monsterinsights_settings_save_general' );
     }
 }
 add_action( 'current_screen', 'monsterinsights_save_general_settings_page' );
@@ -205,33 +205,33 @@ 
 function monsterinsights_switch_to_analyticsjs() {
     $nonce = '';
     if ( ! empty( $_REQUEST['monsterinsights-switch-to-analyticsjs-nonce'] ) ) {
-        $nonce = 'monsterinsights-switch-to-analyticsjs-nonce';
+	$nonce = 'monsterinsights-switch-to-analyticsjs-nonce';
     } else if ( ! empty( $_REQUEST['_wpnonce'] ) ) {
-        $nonce = '_wpnonce';
+	$nonce = '_wpnonce';
     }
     
     if ( empty( $nonce ) ) {
-         return;
+	 return;
     }
     
     if ( ! wp_verify_nonce( $_REQUEST[$nonce], 'monsterinsights-switch-to-analyticsjs-nonce' ) ) {
-        return;
+	return;
     }
 
     if ( empty( $_REQUEST['monsterinsights-action'] ) || $_REQUEST['monsterinsights-action'] !== 'switch_to_analyticsjs' ) {
-        return;
+	return;
     }
 
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        wp_die( esc_html__( 'You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress' ), esc_html__( 'Error', 'google-analytics-for-wordpress' ), array( 'response' => 403 ) );
+	wp_die( esc_html__( 'You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress' ), esc_html__( 'Error', 'google-analytics-for-wordpress' ), array( 'response' => 403 ) );
     }
 
     $return       = '';
     if ( ! empty( $_REQUEST['return'] ) && monsterinsights_is_settings_tab( $_REQUEST['return'] ) ) {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
-        $return = add_query_arg( 'return', $_REQUEST['return'], $return );
+	$return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
+	$return = add_query_arg( 'return', $_REQUEST['return'], $return );
     } else {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched');
+	$return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched');
     }
     monsterinsights_update_option( 'tracking_mode', 'analytics' );
     wp_safe_redirect( $return );exit;
@@ -244,13 +244,13 @@ 
 
 function monsterinsights_switch_to_analyticsjs_show_notice() {
     if ( empty( $_REQUEST['monsterinsights-message'] ) || $_REQUEST['monsterinsights-message'] !== 'tracking_mode_switched' ) {
-        return;
+	return;
     }
     
     if ( ! empty( $_REQUEST['return'] ) && monsterinsights_is_settings_tab( $_REQUEST['return'] ) ) {
-        add_action( 'monsterinsights_tracking_' . $_REQUEST['return'] . '_tab_notice', 'monsterinsights_switched_to_analyticsjs' );
+	add_action( 'monsterinsights_tracking_' . $_REQUEST['return'] . '_tab_notice', 'monsterinsights_switched_to_analyticsjs' );
     } else {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_switched_to_analyticsjs' );
+	add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_switched_to_analyticsjs' );
     }
 }
 add_action( 'admin_init', 'monsterinsights_switch_to_analyticsjs_show_notice', 11 ); 
@@ -260,33 +260,33 @@ 
 function monsterinsights_switch_to_jsevents() {
     $nonce = '';
     if ( ! empty( $_REQUEST['monsterinsights-switch-to-jsevents-nonce'] ) ) {
-        $nonce = 'monsterinsights-switch-to-jsevents-nonce';
+	$nonce = 'monsterinsights-switch-to-jsevents-nonce';
     } else if ( ! empty( $_REQUEST['_wpnonce'] ) ) {
-        $nonce = '_wpnonce';
+	$nonce = '_wpnonce';
     }
     
     if ( empty( $nonce ) ) {
-         return;
+	 return;
     }
     
     if ( ! wp_verify_nonce( $_REQUEST[$nonce], 'monsterinsights-switch-to-jsevents-nonce' ) ) {
-        return;
+	return;
     }
 
     if ( empty( $_REQUEST['monsterinsights-action'] ) || $_REQUEST['monsterinsights-action'] !== 'switch_to_jsevents' ) {
-        return;
+	return;
     }
 
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        wp_die( esc_html__( 'You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress' ), esc_html__( 'Error', 'google-analytics-for-wordpress' ), array( 'response' => 403 ) );
+	wp_die( esc_html__( 'You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress' ), esc_html__( 'Error', 'google-analytics-for-wordpress' ), array( 'response' => 403 ) );
     }
 
     $return       = '';
     if ( ! empty( $_REQUEST['return'] ) && monsterinsights_is_settings_tab( $_REQUEST['return'] ) ) {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
-        $return = add_query_arg( 'return', $_REQUEST['return'], $return );
+	$return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
+	$return = add_query_arg( 'return', $_REQUEST['return'], $return );
     } else {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched');
+	$return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched');
     }
     monsterinsights_update_option( 'events_mode', 'js' );
     wp_safe_redirect( $return );exit;
@@ -299,14 +299,14 @@ 
 
 function monsterinsights_switch_to_jsevents_show_notice() {
     if ( empty( $_REQUEST['monsterinsights-message'] ) || $_REQUEST['monsterinsights-message'] !== 'jsvents_mode_switched' ) {
-        return;
+	return;
     }
     
     $allowed_tabs = array( 'engagement', 'performance', 'ecommerce', 'demographics', 'dimensions', 'goptimize' );
     if ( ! empty( $_REQUEST['return'] ) && in_array( $_REQUEST['return'], $allowed_tabs ) ) {
-        add_action( 'monsterinsights_tracking_' . $_REQUEST['return'] . '_tab_notice', 'monsterinsights_switched_to_jsevents' );
+	add_action( 'monsterinsights_tracking_' . $_REQUEST['return'] . '_tab_notice', 'monsterinsights_switched_to_jsevents' );
     } else {
-        add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_switched_to_jsevents' );
+	add_action( 'monsterinsights_settings_general_tab_notice', 'monsterinsights_switched_to_jsevents' );
     }
 }
 add_action( 'admin_init', 'monsterinsights_switch_to_jsevents_show_notice', 11 ); 
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -182,7 +182,7 @@ 
     ob_start();
     ?>
     <tr id="monsterinsights-input-<?php echo esc_attr( $option_class ); ?>">
-        <?php if ( !empty ( $title ) ) { ?>
+        <?php if ( ! empty ( $title ) ) { ?>
         <th scope="row">
             <label for="monsterinsights-<?php echo esc_attr( $option_class ); ?>"><?php echo $title; ?></label>
         </th>
@@ -226,17 +226,17 @@ 
         wp_die( esc_html__( 'You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress' ), esc_html__( 'Error', 'google-analytics-for-wordpress' ), array( 'response' => 403 ) );
     }
 
-    $return       = '';
+    $return = '';
     if ( ! empty( $_REQUEST['return'] ) && monsterinsights_is_settings_tab( $_REQUEST['return'] ) ) {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
+        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-' ) . $_REQUEST['return'];
         $return = add_query_arg( 'return', $_REQUEST['return'], $return );
     } else {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched');
+        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=tracking_mode_switched' );
     }
     monsterinsights_update_option( 'tracking_mode', 'analytics' );
-    wp_safe_redirect( $return );exit;
+    wp_safe_redirect( $return ); exit;
 }
-add_action( 'admin_init', 'monsterinsights_switch_to_analyticsjs',9 );
+add_action( 'admin_init', 'monsterinsights_switch_to_analyticsjs', 9 );
 
 function monsterinsights_switched_to_analyticsjs() {
     echo monsterinsights_get_message( 'success', esc_html__( 'Successfully migrated to Universal Analytics (analytics.js)!', 'google-analytics-for-wordpress' ) );
@@ -281,17 +281,17 @@ 
         wp_die( esc_html__( 'You do not have permission to manage MonsterInsights settings', 'google-analytics-for-wordpress' ), esc_html__( 'Error', 'google-analytics-for-wordpress' ), array( 'response' => 403 ) );
     }
 
-    $return       = '';
+    $return = '';
     if ( ! empty( $_REQUEST['return'] ) && monsterinsights_is_settings_tab( $_REQUEST['return'] ) ) {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-') . $_REQUEST['return'];
+        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched#monsterinsights-main-tab-tracking?monsterinsights-sub-tab-' ) . $_REQUEST['return'];
         $return = add_query_arg( 'return', $_REQUEST['return'], $return );
     } else {
-        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched');
+        $return = admin_url( 'admin.php?page=monsterinsights_settings&monsterinsights-message=jsvents_mode_switched' );
     }
     monsterinsights_update_option( 'events_mode', 'js' );
-    wp_safe_redirect( $return );exit;
+    wp_safe_redirect( $return ); exit;
 }
-add_action( 'admin_init', 'monsterinsights_switch_to_jsevents',9 );
+add_action( 'admin_init', 'monsterinsights_switch_to_jsevents', 9 );
 
 function monsterinsights_switched_to_jsevents() {
     echo monsterinsights_get_message( 'success', esc_html__( 'Successfully migrated to JS events tracking!', 'google-analytics-for-wordpress' ) );

includes/admin/google.php

Indentation +18 added lines, -18 removed lines

@@ -334,24 +334,24 @@
 
 						/**
 						 * Future:
-						* // Accounts
-						* 	// Properties
-						* 		// Views
-						* $items = array(
-						* 	{account_id} => array(
-						* 		{property_id} => array(
-						* 			{view_id} => array( 
-						* 				'account_id'  => '',
-						* 				'property_id' => '',
-						* 				'view_id'	  => '',
-						* 				'url'		  => '',
-						* 				'view_name'	  => '',
-						* 				'ua_code'	  => '',
-						* 			),
-						* 		),
-						* 	),
-						* ),
-						**/
+						 * // Accounts
+						 * 	// Properties
+						 * 		// Views
+						 * $items = array(
+						 * 	{account_id} => array(
+						 * 		{property_id} => array(
+						 * 			{view_id} => array( 
+						 * 				'account_id'  => '',
+						 * 				'property_id' => '',
+						 * 				'view_id'	  => '',
+						 * 				'url'		  => '',
+						 * 				'view_name'	  => '',
+						 * 				'ua_code'	  => '',
+						 * 			),
+						 * 		),
+						 * 	),
+						 * ),
+						 **/
 						/*
 						CurrenT:
 						$accounts[ $item['accountId'] ] = array( 

Spacing +25 added lines, -25 removed lines

@@ -96,15 +96,15 @@ 
 		$this->name          = $this->get_name();
 		$this->oauth_version = $this->get_oauth_version();
 		$this->status        = $this->get_status();
-		$this->base 		 = MonsterInsights();
+		$this->base = MonsterInsights();
 
 
 		// Show any info/error notices
 		$this->get_notices();
 
 		// Authentication Actions
-		add_action( 'wp_ajax_monsterinsights_google_view',  array( $this, 'google_auth_view' ) );
-		add_action( 'wp_ajax_monsterinsights_google_cancel',  array( $this, 'google_cancel' ) );
+		add_action( 'wp_ajax_monsterinsights_google_view', array( $this, 'google_auth_view' ) );
+		add_action( 'wp_ajax_monsterinsights_google_cancel', array( $this, 'google_cancel' ) );
 
 		add_action( 'admin_init', array( $this, 'deactivate_google' ) ); // Deactivate
 	}
@@ -152,7 +152,7 @@ 
 			$dash_dis = monsterinsights_get_option( 'dashboards_disabled', false );
 
 			// See if issue connecting or expired
-			if ( ! $dash_dis && $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 )  ) { 
+			if ( ! $dash_dis && $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 ) ) { 
 				$status = 'blocked';
 			}
 
@@ -183,7 +183,7 @@ 
 	private function get_notices() {
 		// Notice for no manual or profile GA
 		if ( $this->status === 'empty' ) {
-			add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_empty_notice' ),6 );
+			add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_empty_notice' ), 6 );
 		}
 
 		$current_page = filter_input( INPUT_GET, 'page' );
@@ -196,17 +196,17 @@ 
 		
 			// Notice for GA Access token expired (needs re-authenticate)
 			if ( $this->status === 'expired' ) {
-				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_expired_notice' ),6 );
+				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_expired_notice' ), 6 );
 			}
 			
 			// Notice for Needs Permissions
 			if ( $this->status === 'needs-permissions' ) {
-				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_needs_permissions_notice' ),6 );
+				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_needs_permissions_notice' ), 6 );
 			}
 
 			// Notice for trouble connecting to Google
 			if ( $this->status === 'blocked' ) {
-				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_blocked_notice' ),6 );
+				add_action( 'admin_notices', array( $this, 'monsterinsights_show_admin_config_blocked_notice' ), 6 );
 			}
 		}
 	}
@@ -256,7 +256,7 @@ 
 
 	public function find_selected_profile( $profile_id ) {
 		$profiles = $this->get_profiles();
-		$found  = array();
+		$found = array();
 		foreach ( $profiles as $account ) {
 			foreach ( $account['items'] as $profile ) {
 				foreach ( $profile['items'] as $subprofile ) {
@@ -298,7 +298,7 @@ 
 		$paginate    = false;
 		$continue    = true;
 		while ( $continue ) {
-			$body     = array(
+			$body = array(
 				'max-results'  => 1000,
 				'start-index'  => $paginate ? $start_index + 1000 : $start_index,
 			);
@@ -375,8 +375,8 @@ 
 						*/
 
 
-						if ( empty( $accounts[ $item['accountId'] ] ) ) {
-							$accounts[ $item['accountId'] ] = array( 
+						if ( empty( $accounts[$item['accountId']] ) ) {
+							$accounts[$item['accountId']] = array( 
 								'id'          => $item['accountId'],
 								'ua_code'     => $item['webPropertyId'],
 								'parent_name' => $item['websiteUrl'],
@@ -384,16 +384,16 @@ 
 							);
 						}
 
-						if ( empty( $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ] ) ) {
-							$accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]= array( 
+						if ( empty( $accounts[$item['accountId']]['items'][$item['internalWebPropertyId']] ) ) {
+							$accounts[$item['accountId']]['items'][$item['internalWebPropertyId']] = array( 
 								'id'          => $item['webPropertyId'],
 								'name'        => $item['websiteUrl'],
 								'items'       => array(),
 							);
 						}
 
-						if ( empty( $accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]['items'][ $item['id'] ] ) ) {
-							$accounts[ $item['accountId'] ]['items'][ $item['internalWebPropertyId'] ]['items'][ $item['id'] ] = array( 
+						if ( empty( $accounts[$item['accountId']]['items'][$item['internalWebPropertyId']]['items'][$item['id']] ) ) {
+							$accounts[$item['accountId']]['items'][$item['internalWebPropertyId']]['items'][$item['id']] = array( 
 								'name'    => $item['name'] . ' (' . $item['webPropertyId'] . ')',
 								'ua_code' => $item['webPropertyId'],
 								'id'      => $item['id'],
@@ -533,10 +533,10 @@ 
 
 	public function google_auth_view() {
 		$view   = isset( $_POST['view'] ) && in_array( $_POST['view'], array( 'prestart', 'start', 'enterkey', 'selectprofile', 'done' ) ) ? $_POST['view'] : '';
-		$reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false'  ? true : false;
+		$reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false' ? true : false;
 
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress');
+			echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress' );
 			wp_die();
 		}
 
@@ -640,10 +640,10 @@ 
 
 	public function google_cancel() {
 		$view   = isset( $_POST['view'] ) && in_array( $_POST['view'], array( 'prestart', 'start', 'enterkey', 'selectprofile', 'done' ) ) ? $_POST['view'] : '';
-		$reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false'  ? true : false;
+		$reauth = isset( $_POST['reauth'] ) && $_POST['reauth'] && $_POST['reauth'] !== 'false' ? true : false;
 
 		if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-			echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress');
+			echo esc_html__( 'Permission Denied', 'google-analytics-for-wordpress' );
 			wp_die();
 		}
 
@@ -674,10 +674,10 @@ 
 		$optgroups = array();
 		foreach ( $profiles as $key => $value ) {
 			foreach ( $value['items'] as $subitem ) {
-				if ( empty( $optgroups[ $subitem['name'] ]['items'] ) ) {
-					$optgroups[ $subitem['name'] ]['items'] = $subitem['items'];
+				if ( empty( $optgroups[$subitem['name']]['items'] ) ) {
+					$optgroups[$subitem['name']]['items'] = $subitem['items'];
 				} else {
-					$optgroups[ $subitem['name'] ]['items'] = array_merge( $optgroups[ $subitem['name'] ]['items'], $subitem['items'] );
+					$optgroups[$subitem['name']]['items'] = array_merge( $optgroups[$subitem['name']]['items'], $subitem['items'] );
 				}
 			}
 		}
@@ -750,7 +750,7 @@ 
 						'body'          => ''
 					);
 					$response = wp_remote_get( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params );
-					if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+					if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 						return false;
 					} else {
 						return true;
@@ -768,7 +768,7 @@ 
 			);
 			$response = wp_remote_get( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest', $params );
 			
-			if( !is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+			if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 				return false;
 			} else {
 				return true;

Braces +15 added lines, -14 removed lines

@@ -113,11 +113,11 @@ 
 		return ! empty( $this->client ) ? $this->client : monsterinsights_create_client();
 	}
 
-	private function set_test_client() { 
+	private function set_test_client() {
 		$this->client = monsterinsights_create_test_client();
 	}
 
-	private function set_client() { 
+	private function set_client() {
 		$this->client = monsterinsights_create_client();
 	}
 
@@ -152,7 +152,7 @@ 
 			$dash_dis = monsterinsights_get_option( 'dashboards_disabled', false );
 
 			// See if issue connecting or expired
-			if ( ! $dash_dis && $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 )  ) { 
+			if ( ! $dash_dis && $failed && ( $last_run === false || monsterinsights_hours_between( $last_run ) >= 48 )  ) {
 				$status = 'blocked';
 			}
 
@@ -165,7 +165,7 @@ 
 			}
 
 			// See if needs permissions
-			if ( version_compare( $this->oauth_version, '1.0', '<' ) ) { 
+			if ( version_compare( $this->oauth_version, '1.0', '<' ) ) {
 				$status = 'needs-permissions';
 			}
 			
@@ -218,7 +218,7 @@ 
 	 *
 	 * @return null
 	 */
-	private function reinitialize() { 
+	private function reinitialize() {
 		// Get object 
 		$this->client        = $this->get_client();
 		$this->profile       = $this->get_profile();
@@ -245,7 +245,8 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_profiles() { // @todo: this needs exception handling for a 401 login required		
+	public function get_profiles() {
+// @todo: this needs exception handling for a 401 login required		
 		$accounts = $this->get_profiles_request();
 		if ( is_array( $accounts ) ) {
 			return $accounts;
@@ -617,7 +618,7 @@ 
 						$select   = $this->ga_select( $profiles );
 						$nextview = monsterinsights_google_auth_selectprofile_view( $reauth, $select, esc_html__( 'Invalid profile selected.', 'google-analytics-for-wordpress' ) );
 					}
-				} else { 
+				} else {
 					// No profile selected
 					$profiles = get_option( 'monsterinsights_get_profiles', array() );
 					$select   = $this->ga_select( $profiles );
@@ -667,7 +668,7 @@ 
 	 * @return null|string
 	 */
 	private function ga_select( $profiles = array() ) {
-		if ( empty( $profiles ) || ! is_array( $profiles ) ) { 
+		if ( empty( $profiles ) || ! is_array( $profiles ) ) {
 			$profiles = $this->get_profiles();
 		}
 		
@@ -693,8 +694,7 @@ 
 			foreach ( $values as $optgroup => $value ) {
 				if ( ! empty( $value['items'] ) ) {
 					$select .= $this->create_optgroup( $optgroup, $value );
-				}
-				else {
+				} else {
 					$select .= '<option value="' . esc_attr( $value['id'] ) . '">' . esc_attr( stripslashes( $value['name'] ) ) . '</option>';
 				}
 			}
@@ -720,8 +720,7 @@ 
 			if ( ! empty( $option['items'] ) ) {
 
 				$optgroup .= $this->create_optgroup( esc_attr( $option['name'] ), $option );
-			}
-			else {
+			} else {
 				$optgroup .= '<option value="' . esc_attr( $option['id'] ) . '">' . esc_attr( stripslashes( $option['name'] ) ) . '</option>';
 			}
 		}
@@ -737,7 +736,8 @@ 
 	 * @return bool 
 	 */
 	private function is_wp_blocking_google() {
-		if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) { // @todo: put this in sysinfo 
+		if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) {
+// @todo: put this in sysinfo 
 			if ( defined( 'WP_ACCESSIBLE_HOSTS' ) ) {
 				$on_blacklist = $this->is_google_on_blacklist();
 				if ( $on_blacklist ) {
@@ -781,7 +781,8 @@ 
 	 *
 	 * @return bool 
 	 */
-	private function is_google_on_blacklist() { // @todo: put this in sysinfo
+	private function is_google_on_blacklist() {
+// @todo: put this in sysinfo
 		$wp_http = new WP_Http();
 		if ( $wp_http->block_request( 'https://www.googleapis.com/discovery/v1/apis/analytics/v3/rest' ) ) {
 			return true;

includes/helpers.php

Spacing +26 added lines, -26 removed lines

@@ -32,7 +32,7 @@ 
 function monsterinsights_track_user() {
 	$user        = wp_get_current_user();
 	$track_user  = true;
-	$roles     = monsterinsights_get_option( 'ignore_users', array() );
+	$roles = monsterinsights_get_option( 'ignore_users', array() );
 
 	if ( ! empty( $roles ) && is_array( $roles ) ) {
 		foreach ( $roles as $role ) {
@@ -98,7 +98,7 @@ 
 	 */
 
 	$ga_cookie    = $_COOKIE['_ga'];
-	$cookie_parts = explode('.', $ga_cookie );
+	$cookie_parts = explode( '.', $ga_cookie );
 	if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
 		$uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
 		if ( is_string( $uuid ) ) {
@@ -157,7 +157,7 @@ 
 	}
 	
 	$ga_cookie    = $_COOKIE['_ga'];
-	$cookie_parts = explode('.', $ga_cookie );
+	$cookie_parts = explode( '.', $ga_cookie );
 	if ( is_array( $cookie_parts ) && ! empty( $cookie_parts[2] ) && ! empty( $cookie_parts[3] ) ) {
 		$uuid = (string) $cookie_parts[2] . '.' . (string) $cookie_parts[3];
 		if ( is_string( $uuid ) ) {
@@ -172,7 +172,7 @@ 
 
 
 function monsterinsights_generate_ga_client_id() {
-	return rand(100000000,999999999) . '.' . time();
+	return rand( 100000000, 999999999 ) . '.' . time();
 }
  
 
@@ -192,7 +192,7 @@ 
 		$stop = time();
 	}
 
-	$diff = (int) abs( $stop -  $start );
+	$diff = (int) abs( $stop - $start );
 	$hours = round( $diff / HOUR_IN_SECONDS );
 	return $hours;
 }
@@ -250,7 +250,7 @@ 
 	$editable_roles = apply_filters( 'editable_roles', $all_roles );
 
 	foreach ( $editable_roles as $id => $name ) {
-		$roles[ $id ] = translate_user_role( $name['name'] );
+		$roles[$id] = translate_user_role( $name['name'] );
 	}
 
 	return $roles;
@@ -269,16 +269,16 @@ 
 
 // Set cookie to expire in 2 years
 function monsterinsights_get_cookie_expiration_date( $time ) {
-	return date('D, j F Y H:i:s', time() + $time );
+	return date( 'D, j F Y H:i:s', time() + $time );
 }
 
 function monsterinsights_string_ends_with( $string, $ending ) {
-	$strlen = strlen($string);
-	$endinglen = strlen($ending);
+	$strlen = strlen( $string );
+	$endinglen = strlen( $ending );
 	if ( $endinglen > $strlen ) {
 		return false;
 	}
-	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen) === 0;
+	return substr_compare( $string, $ending, $strlen - $endinglen, $endinglen ) === 0;
 }
 
 function monsterinsights_string_starts_with( $string, $start ) {
@@ -846,7 +846,7 @@ 
 	}
 }
 
-if ( ! function_exists ( 'remove_class_filter' ) ) {
+if ( ! function_exists( 'remove_class_filter' ) ) {
 	/**
 	 * Remove Class Filter Without Access to Class Object
 	 *
@@ -867,7 +867,7 @@ 
 	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset( $wp_filter[$tag] ) ) return FALSE;
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -876,33 +876,33 @@ 
 		 *
 		 * @see https://make.wordpress.org/core/2016/09/08/wp_hook-next-generation-actions-and-filters/
 		 */
-		if ( is_object( $wp_filter[ $tag ] ) && isset( $wp_filter[ $tag ]->callbacks ) ) {
-			$callbacks = &$wp_filter[ $tag ]->callbacks;
+		if ( is_object( $wp_filter[$tag] ) && isset( $wp_filter[$tag]->callbacks ) ) {
+			$callbacks = &$wp_filter[$tag]->callbacks;
 		} else {
-			$callbacks = &$wp_filter[ $tag ];
+			$callbacks = &$wp_filter[$tag];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset( $callbacks[$priority] ) || empty( $callbacks[$priority] ) ) return FALSE;
 		// Loop through each filter for the specified priority, looking for our class & method
-		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
+		foreach ( (array) $callbacks[$priority] as $filter_id => $filter ) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
-			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
+			if ( ! isset( $filter['function'] ) || ! is_array( $filter['function'] ) ) continue;
 			// If first value in array is not an object, it can't be a class
-			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
+			if ( ! is_object( $filter['function'][0] ) ) continue;
 			// Method doesn't match the one we're looking for, goto next
-			if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
+			if ( $filter['function'][1] !== $method_name ) continue;
 			// Method matched, now let's check the Class
-			if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
+			if ( get_class( $filter['function'][0] ) === $class_name ) {
 				// Now let's remove it from the array
-				unset( $callbacks[ $priority ][ $filter_id ] );
+				unset( $callbacks[$priority][$filter_id] );
 				// and if it was the only filter in that priority, unset that priority
-				if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
+				if ( empty( $callbacks[$priority] ) ) unset( $callbacks[$priority] );
 				// and if the only filter for that tag, set the tag to an empty array
 				if ( empty( $callbacks ) ) $callbacks = array();
 				// If using WordPress older than 4.7
-				if ( ! is_object( $wp_filter[ $tag ] ) ) {
+				if ( ! is_object( $wp_filter[$tag] ) ) {
 					// Remove this filter from merged_filters, which specifies if filters have been sorted
-					unset( $GLOBALS[ 'merged_filters' ][ $tag ] );
+					unset( $GLOBALS['merged_filters'][$tag] );
 				}
 				return TRUE;
 			}
@@ -911,7 +911,7 @@ 
 	}
 } // End function exists
 
-if ( ! function_exists ( 'remove_class_action' ) ) {
+if ( ! function_exists( 'remove_class_action' ) ) {
 	/**
 	 * Remove Class Action Without Access to Class Object
 	 *

Braces +21 added lines, -7 removed lines

@@ -867,7 +867,9 @@ 
 	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset( $wp_filter[ $tag ] ) ) {
+			return FALSE;
+		}
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -882,23 +884,35 @@ 
 			$callbacks = &$wp_filter[ $tag ];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) {
+			return FALSE;
+		}
 		// Loop through each filter for the specified priority, looking for our class & method
 		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
-			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) continue;
+			if ( ! isset( $filter[ 'function' ] ) || ! is_array( $filter[ 'function' ] ) ) {
+				continue;
+			}
 			// If first value in array is not an object, it can't be a class
-			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) continue;
+			if ( ! is_object( $filter[ 'function' ][ 0 ] ) ) {
+				continue;
+			}
 			// Method doesn't match the one we're looking for, goto next
-			if ( $filter[ 'function' ][ 1 ] !== $method_name ) continue;
+			if ( $filter[ 'function' ][ 1 ] !== $method_name ) {
+				continue;
+			}
 			// Method matched, now let's check the Class
 			if ( get_class( $filter[ 'function' ][ 0 ] ) === $class_name ) {
 				// Now let's remove it from the array
 				unset( $callbacks[ $priority ][ $filter_id ] );
 				// and if it was the only filter in that priority, unset that priority
-				if ( empty( $callbacks[ $priority ] ) ) unset( $callbacks[ $priority ] );
+				if ( empty( $callbacks[ $priority ] ) ) {
+					unset( $callbacks[ $priority ] );
+				}
 				// and if the only filter for that tag, set the tag to an empty array
-				if ( empty( $callbacks ) ) $callbacks = array();
+				if ( empty( $callbacks ) ) {
+					$callbacks = array();
+				}
 				// If using WordPress older than 4.7
 				if ( ! is_object( $wp_filter[ $tag ] ) ) {
 					// Remove this filter from merged_filters, which specifies if filters have been sorted

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -867,7 +867,7 @@ 
 	function remove_class_filter( $tag, $class_name = '', $method_name = '', $priority = 10 ) {
 		global $wp_filter;
 		// Check that filter actually exists first
-		if ( ! isset( $wp_filter[ $tag ] ) ) return FALSE;
+		if ( ! isset( $wp_filter[ $tag ] ) ) return false;
 		/**
 		 * If filter config is an object, means we're using WordPress 4.7+ and the config is no longer
 		 * a simple array, rather it is an object that implements the ArrayAccess interface.
@@ -882,7 +882,7 @@ 
 			$callbacks = &$wp_filter[ $tag ];
 		}
 		// Exit if there aren't any callbacks for specified priority
-		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return FALSE;
+		if ( ! isset( $callbacks[ $priority ] ) || empty( $callbacks[ $priority ] ) ) return false;
 		// Loop through each filter for the specified priority, looking for our class & method
 		foreach( (array) $callbacks[ $priority ] as $filter_id => $filter ) {
 			// Filter should always be an array - array( $this, 'method' ), if not goto next
@@ -904,10 +904,10 @@ 
 					// Remove this filter from merged_filters, which specifies if filters have been sorted
 					unset( $GLOBALS[ 'merged_filters' ][ $tag ] );
 				}
-				return TRUE;
+				return true;
 			}
 		}
-		return FALSE;
+		return false;
 	}
 } // End function exists
 

includes/options.php

Indentation +24 added lines, -24 removed lines

@@ -173,14 +173,14 @@ 
 }
 
  /**
- * Helper method for deleting a setting's value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting a setting's value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
 	if ( empty( $key ) ){
@@ -223,14 +223,14 @@ 
 }
 
  /**
- * Helper method for deleting multiple settings value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting multiple settings value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
 	if ( empty( $keys ) || ! is_array( $keys ) ){
@@ -359,14 +359,14 @@ 
 }
 
  /**
- * Helper method for deleting the license key.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting the license key.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_license_key( $network = false, $override = false ) {
 	if ( $network && is_multisite() && ( is_network_admin() || $override ) ) {
 		delete_site_option( 'monsterinsights_license' );

Spacing +19 added lines, -19 removed lines

@@ -47,7 +47,7 @@ 
  */
 function monsterinsights_get_option( $key = '', $default = false ) {
 	global $monsterinsights_settings;
-	$value = ! empty( $monsterinsights_settings[ $key ] ) ? $monsterinsights_settings[ $key ] : $default;
+	$value = ! empty( $monsterinsights_settings[$key] ) ? $monsterinsights_settings[$key] : $default;
 	$value = apply_filters( 'monsterinsights_get_option', $value, $key, $default );
 	return apply_filters( 'monsterinsights_get_option_' . $key, $value, $key, $default );
 }
@@ -124,7 +124,7 @@ 
 function monsterinsights_update_option( $key = '', $value = false ) {
 
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -155,7 +155,7 @@ 
 	$value = apply_filters( 'monsterinsights_update_option', $value, $key );
 
 	// Next let's try to update the value
-	$settings[ $key ] = $value;
+	$settings[$key] = $value;
 	$did_update = false;
 	//if ( $update_network_option ) {
 	//    $did_update = update_site_option( $option_name, $settings );
@@ -164,9 +164,9 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
-		$monsterinsights_settings[ $key ] = $value;
+		$monsterinsights_settings[$key] = $value;
 	}
 
 	return $did_update;
@@ -183,7 +183,7 @@ 
  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -202,8 +202,8 @@ 
 	//}
 
 	// Next let's try to remove the key
-	if( isset( $settings[ $key ] ) ) {
-		unset( $settings[ $key ] );
+	if ( isset( $settings[$key] ) ) {
+		unset( $settings[$key] );
 	}
 
 	$did_update = false;
@@ -214,7 +214,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -233,7 +233,7 @@ 
  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
+	if ( empty( $keys ) || ! is_array( $keys ) ) {
 		return false;
 	}
 
@@ -253,8 +253,8 @@ 
 
 	// Next let's try to remove the keys
 	foreach ( $keys as $key ) {
-		if( isset( $settings[ $key ] ) ) {
-			unset( $settings[ $key ] );
+		if ( isset( $settings[$key] ) ) {
+			unset( $settings[$key] );
 		}
 	}
 
@@ -266,7 +266,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -288,7 +288,7 @@ 
 	$license = false;
 	if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
 		$license = array( 'key' => MONSTERINSIGHTS_LICENSE_KEY );
-	} else if ( is_multisite() && monsterinsights_is_network_active() ){
+	} else if ( is_multisite() && monsterinsights_is_network_active() ) {
 		$network_license = get_site_option( 'monsterinsights_license' );
 		if ( ! empty( $network_license['key'] ) && is_string( $network_license['key'] ) && strlen( $network_license['key'] ) > 10 ) {
 			$license = $network_license;
@@ -345,7 +345,7 @@ 
  * @return boolean True if updated, false if not.
  */
 function monsterinsights_update_license_key( $license_key = false, $network = false, $override = false ) {
-	if ( ! $license_key || ! is_string( $license_key ) || ! strlen( $license_key ) > 10  ) {
+	if ( ! $license_key || ! is_string( $license_key ) || ! strlen( $license_key ) > 10 ) {
 		return false;
 	}
 
@@ -409,9 +409,9 @@ 
 	$errors = false;
 	$license = monsterinsights_get_license();
 	if ( ! empty( $license['type'] ) && is_string( $license['type'] ) && strlen( $license['type'] ) > 3 ) {
-		if ( ( isset( $license['is_expired'] )  && $license['is_expired'] ) 
+		if ( ( isset( $license['is_expired'] ) && $license['is_expired'] ) 
 		  || ( isset( $license['is_disabled'] ) && $license['is_disabled'] )
-		  || ( isset( $license['is_invalid'] )  && $license['is_invalid'] ) ) {
+		  || ( isset( $license['is_invalid'] ) && $license['is_invalid'] ) ) {
 			$errors = true;
 		}
 	}
@@ -466,8 +466,8 @@ 
 	);
 
 	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			unset( $settings[ $e ] );
+		if ( ! empty( $settings[$e] ) ) {
+			unset( $settings[$e] );
 		}
 	}
 	return wp_json_encode( $settings );

Braces +7 added lines, -7 removed lines

@@ -124,7 +124,7 @@ 
 function monsterinsights_update_option( $key = '', $value = false ) {
 
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -164,7 +164,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings[ $key ] = $value;
 	}
@@ -183,7 +183,7 @@ 
  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -214,7 +214,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -233,7 +233,7 @@ 
  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
+	if ( empty( $keys ) || ! is_array( $keys ) ) {
 		return false;
 	}
 
@@ -266,7 +266,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -288,7 +288,7 @@ 
 	$license = false;
 	if ( defined( 'MONSTERINSIGHTS_LICENSE_KEY' ) && is_string( MONSTERINSIGHTS_LICENSE_KEY ) && strlen( MONSTERINSIGHTS_LICENSE_KEY ) > 10 ) {
 		$license = array( 'key' => MONSTERINSIGHTS_LICENSE_KEY );
-	} else if ( is_multisite() && monsterinsights_is_network_active() ){
+	} else if ( is_multisite() && monsterinsights_is_network_active() ) {
 		$network_license = get_site_option( 'monsterinsights_license' );
 		if ( ! empty( $network_license['key'] ) && is_string( $network_license['key'] ) && strlen( $network_license['key'] ) > 10 ) {
 			$license = $network_license;