awesomemotive / google-analytics-for-wordpress

includes/admin/pages/addons.php

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

Indentation +105 added lines, -105 removed lines

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

includes/helpers.php

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
 

Spacing +29 added lines, -29 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;
@@ -295,7 +295,7 @@ 
 			
 		}
 		if ( substr_count( $host, '.' ) > 1 ) {
-			$subdomains_to_check =  array( 'dev.', '*.staging.', 'beta.', 'test.' );
+			$subdomains_to_check = array( 'dev.', '*.staging.', 'beta.', 'test.' );
 			foreach ( $subdomains_to_check as $subdomain ) {
 				$subdomain = str_replace( '.', '(.)', $subdomain );
 				$subdomain = str_replace( array( '*', '(.)' ), '(.*)', $subdomain );
@@ -311,16 +311,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 ) {
@@ -844,11 +844,11 @@ 
 	return $countries;
 }
 
-function monsterinsights_get_api_url(){
+function monsterinsights_get_api_url() {
 	return apply_filters( 'monsterinsights_get_api_url', 'www.monsterinsights.com/v1/' );
 }
 
-function monsterinsights_get_licensing_url(){
+function monsterinsights_get_licensing_url() {
 	return apply_filters( 'monsterinsights_get_licensing_url', 'https://www.monsterinsights.com' );
 }
 
@@ -896,7 +896,7 @@ 
 	}
 }
 
-if ( ! function_exists ( 'remove_class_filter' ) ) {
+if ( ! function_exists( 'remove_class_filter' ) ) {
 	/**
 	 * Remove Class Filter Without Access to Class Object
 	 *
@@ -917,7 +917,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.
@@ -926,33 +926,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;
 			}
@@ -961,7 +961,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 +23 added lines, -9 removed lines

@@ -844,11 +844,11 @@ 
 	return $countries;
 }
 
-function monsterinsights_get_api_url(){
+function monsterinsights_get_api_url() {
 	return apply_filters( 'monsterinsights_get_api_url', 'www.monsterinsights.com/v1/' );
 }
 
-function monsterinsights_get_licensing_url(){
+function monsterinsights_get_licensing_url() {
 	return apply_filters( 'monsterinsights_get_licensing_url', 'https://www.monsterinsights.com' );
 }
 
@@ -917,7 +917,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.
@@ -932,23 +934,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

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

Spacing +3 added lines, -3 removed lines

@@ -84,9 +84,9 @@
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-        $output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->';
-        $output .=  '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
-        $output .=  '<!-- / Google Analytics by MonsterInsights -->';
+        $output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION . ' - https://www.monsterinsights.com/ -->';
+        $output .= '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
+        $output .= '<!-- / Google Analytics by MonsterInsights -->';
         return $output;
     }
 }
\ No newline at end of file

Indentation +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
      * @return array Array of the options to use.
      */
     public function frontend_tracking_options( ) {
-        return array();
+	return array();
     }
 
     /**
@@ -73,9 +73,9 @@ 
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-        $output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->';
-        $output .=  '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
-        $output .=  '<!-- / Google Analytics by MonsterInsights -->';
-        return $output;
+	$output  = '<!-- This site uses the Google Analytics by MonsterInsights plugin v ' . MONSTERINSIGHTS_VERSION .' - https://www.monsterinsights.com/ -->';
+	$output .=  '<!-- ' . esc_html__( "You are currently in a preview window. MonsterInsights doesn't track preview window traffic to avoid false visit reports.", 'google-analytics-for-wordpress' ) . ' -->';
+	$output .=  '<!-- / Google Analytics by MonsterInsights -->';
+	return $output;
     }
 }
\ No newline at end of file

includes/frontend/frontend.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 function monsterinsights_rss_link_tagger( $guid ) {
     global $post;
 
-    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
+    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ) {
         if ( is_feed() ) {
             if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
                 $delimiter = '#';

Braces +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
 function monsterinsights_rss_link_tagger( $guid ) {
     global $post;
 
-    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
+    if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ) {
         if ( is_feed() ) {
             if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
                 $delimiter = '#';

Indentation +20 added lines, -20 removed lines

@@ -37,13 +37,13 @@ 
     do_action( 'monsterinsights_tracking_before_' . $mode );
     do_action( 'monsterinsights_tracking_before', $mode );
     if ( $mode === 'preview' ) {
-        require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-preview.php';
-        $tracking = new MonsterInsights_Tracking_Preview();
-        echo $tracking->frontend_output();
+	require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-preview.php';
+	$tracking = new MonsterInsights_Tracking_Preview();
+	echo $tracking->frontend_output();
     } else {
-         require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-analytics.php';
-         $tracking = new MonsterInsights_Tracking_Analytics();
-         echo $tracking->frontend_output();
+	 require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/tracking/class-tracking-analytics.php';
+	 $tracking = new MonsterInsights_Tracking_Analytics();
+	 echo $tracking->frontend_output();
     }
 
     do_action( 'monsterinsights_tracking_after_' . $mode );
@@ -69,10 +69,10 @@ 
     $track_user    = monsterinsights_track_user();
 
     if ( $track_user && ( $events_mode === 'js' || $events_mode === 'php' ) ) {
-        require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-analytics-events.php';
-        new MonsterInsights_Analytics_Events();
+	require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-analytics-events.php';
+	new MonsterInsights_Analytics_Events();
     } else {
-        // User is in the disabled group or events mode is off
+	// User is in the disabled group or events mode is off
     }
 }
 add_action( 'template_redirect', 'monsterinsights_events_tracking', 9 );
@@ -91,17 +91,17 @@ 
     global $post;
 
     if ( monsterinsights_get_option( 'tag_links_in_rss', false ) ){
-        if ( is_feed() ) {
-            if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
-                $delimiter = '#';
-            } else {
-                $delimiter = '?';
-                if ( strpos( $guid, $delimiter ) > 0 ) {
-                    $delimiter = '&';
-                }
-            }
-            return $guid . $delimiter . 'utm_source=rss&utm_medium=rss&utm_campaign=' . urlencode( $post->post_name );
-        }
+	if ( is_feed() ) {
+	    if ( monsterinsights_get_option( 'allow_anchor', false ) ) {
+		$delimiter = '#';
+	    } else {
+		$delimiter = '?';
+		if ( strpos( $guid, $delimiter ) > 0 ) {
+		    $delimiter = '&';
+		}
+	    }
+	    return $guid . $delimiter . 'utm_source=rss&utm_medium=rss&utm_campaign=' . urlencode( $post->post_name );
+	}
     }
     return $guid;
 }

includes/install.php

Braces +12 added lines, -10 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 
@@ -72,7 +72,8 @@ 
 			// This is the version used for MI upgrade routines.
 			update_option( 'monsterinsights_db_version', '6.2.0' );
 			
-		} else if ( ! $version && $yoast ) { // if new install and has used Yoast previously
+		} else if ( ! $version && $yoast ) {
+// if new install and has used Yoast previously
 
 			$this->upgrade_from_yoast();
 			// This is the version used for MI upgrade routines.
@@ -83,7 +84,8 @@ 
 				$cachec = true;
 			}
 			
-		} else { // if existing install
+		} else {
+// if existing install
 			if ( version_compare( $version, '6.0.2', '<' ) ) {
 				$this->v602_upgrades();
 			}
@@ -328,7 +330,7 @@ 
 			$network = false;
 			// Try network active Premium
 			$is_key = get_site_option( 'google-analytics-by-yoast-premium_license', array() );
-			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
 				$key    = $is_key['key'];
 				$found = true;
 				$network = true;
@@ -337,7 +339,7 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'google-analytics-by-yoast-premium_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
 					$key    = $is_key['key'];
 					$found = true;
 				}				
@@ -346,7 +348,7 @@ 
 			// Try network active Premium
 			if ( ! $found ) {
 				$is_key = get_site_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
 					$key    = $is_key['key'];
 					$found = true;
 					$network = true;
@@ -356,7 +358,7 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
 					$key    = $is_key['key'];
 					$found = true;
 				}				
@@ -365,7 +367,7 @@ 
 			// Try network active ecommmerce
 			if ( ! $found ) {
 				$is_key = get_site_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
 					$key    = $is_key['key'];
 					$found = true;
 					$network = true;
@@ -374,7 +376,7 @@ 
 			// Try single site ecommerce
 			if ( ! $found ) {
 				$is_key = get_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
 					$key    = $is_key['key'];
 					$found = true;
 				}				
@@ -516,7 +518,7 @@ 
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					}  else {
+					} else {
 					// if UA in profile profiles, remove others and use that
 						if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
 							foreach ( $profiles as $account ) {

Spacing +38 added lines, -38 removed lines

@@ -306,9 +306,9 @@ 
 		// Fallback to make sure every default option has a value
 		$defaults = $this->get_yoast_default_values();
 		if ( is_array( $defaults ) ) {
-			foreach ( $defaults[ 'ga_general' ] as $key => $value ) {
-				if ( ! isset( $options[ $key ] ) ) {
-					$options[ $key ] = $value;
+			foreach ( $defaults['ga_general'] as $key => $value ) {
+				if ( ! isset( $options[$key] ) ) {
+					$options[$key] = $value;
 				}
 			}
 		}
@@ -316,7 +316,7 @@ 
 		// Set to the current version now that we've done all needed upgrades
 		$options['version'] = '5.5.3'; // Last Yoast codebase version
 		$saved_options = get_option( 'yst_ga' );
-		$saved_options[ 'ga_general' ] = $options;
+		$saved_options['ga_general'] = $options;
 		update_option( 'yst_ga', $saved_options );
 
 
@@ -326,8 +326,8 @@ 
 			$network = false;
 			// Try network active Premium
 			$is_key = get_site_option( 'google-analytics-by-yoast-premium_license', array() );
-			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-				$key    = $is_key['key'];
+			if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
+				$key = $is_key['key'];
 				$found = true;
 				$network = true;
 			}
@@ -335,8 +335,8 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'google-analytics-by-yoast-premium_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
@@ -344,8 +344,8 @@ 
 			// Try network active Premium
 			if ( ! $found ) {
 				$is_key = get_site_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
+					$key = $is_key['key'];
 					$found = true;
 					$network = true;
 				}				
@@ -354,8 +354,8 @@ 
 			// Try single site Premium
 			if ( ! $found ) {
 				$is_key = get_option( 'monsterinsights-pro_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
@@ -363,8 +363,8 @@ 
 			// Try network active ecommmerce
 			if ( ! $found ) {
 				$is_key = get_site_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) && is_multisite() ) {
+					$key = $is_key['key'];
 					$found = true;
 					$network = true;
 				}
@@ -372,8 +372,8 @@ 
 			// Try single site ecommerce
 			if ( ! $found ) {
 				$is_key = get_option( 'ecommerce-addon_license', array() );
-				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ){
-					$key    = $is_key['key'];
+				if ( $is_key && ! empty( $is_key ) && is_array( $is_key ) && ! empty( $is_key['key'] ) ) {
+					$key = $is_key['key'];
 					$found = true;
 				}				
 			}
@@ -488,10 +488,10 @@ 
 							}
 						}
 					}
-					$options['cron_last_run'] = strtotime("-25 hours");
+					$options['cron_last_run'] = strtotime( "-25 hours" );
 				} else {
 					// if UA in manual code field, remove analytics profile fields if set
-					if ( ! empty( $options['manual_ua_code_field' ] ) ) {
+					if ( ! empty( $options['manual_ua_code_field'] ) ) {
 						if ( isset( $options['analytics_profile_code'] ) ) {
 							unset( $options['analytics_profile_code'] );
 						}
@@ -502,7 +502,7 @@ 
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					} else if ( ! empty( $options['analytics_profile_code' ] ) ) {
+					} else if ( ! empty( $options['analytics_profile_code'] ) ) {
 					// if UA in profile fields, remove others and use that
 						$options['manual_ua_code'] = $options['analytics_profile_code'];
 						if ( isset( $options['analytics_profile_code'] ) ) {
@@ -514,13 +514,13 @@ 
 						delete_option( 'yoast-ga-access_token' );
 						delete_option( 'yoast-ga-refresh_token' );
 						delete_option( 'yst_ga_api' );
-					}  else {
+					} else {
 					// if UA in profile profiles, remove others and use that
-						if ( ! empty( $options['analytics_profile' ] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
+						if ( ! empty( $options['analytics_profile'] ) && ! empty( $profiles['ga_api_response_accounts'] ) && is_array( $profiles['ga_api_response_accounts'] ) ) {
 							foreach ( $profiles as $account ) {
 								foreach ( $account['items'] as $profile ) {
 									foreach ( $profile['items'] as $subprofile ) {
-										if ( isset( $subprofile['id'] ) && $subprofile['id'] == $options['analytics_profile' ] ) {
+										if ( isset( $subprofile['id'] ) && $subprofile['id'] == $options['analytics_profile'] ) {
 											$options['manual_ua_code'] = $subprofile['ua_code'];
 											break 3;
 										}
@@ -640,8 +640,8 @@ 
 	 */
 	public function v602_upgrades() {
 		$options = get_option( 'yst_ga', array() );
-		if ( ( empty( $this->new_settings[ 'manual_ua_code'] ) || $this->new_settings[ 'manual_ua_code']  === '1' )  &&  
-			 empty( $this->new_settings[ 'analytics_profile_code'] ) &&
+		if ( ( empty( $this->new_settings['manual_ua_code'] ) || $this->new_settings['manual_ua_code'] === '1' ) &&  
+			 empty( $this->new_settings['analytics_profile_code'] ) &&
 			 ! empty( $options ) &&
 			 is_array( $options ) &&
 			 ! empty( $options['ga_general']['manual_ua_code_field'] )
@@ -689,8 +689,8 @@ 
 	 */
 	public function v620_upgrades() {
 		// Turns off debug mode if its on.
-		if ( empty( $this->new_settings['debug_mode' ] ) ) {
-			$this->new_settings['debug_mode' ] = 0;
+		if ( empty( $this->new_settings['debug_mode'] ) ) {
+			$this->new_settings['debug_mode'] = 0;
 		}
 	}
 
@@ -727,25 +727,25 @@ 
 
 		// 3. Default all event tracking and tracking to GA + JS respectively
 			// 3a Set tracking_mode to use analytics.js
-			$this->new_settings['tracking_mode' ] = 'analytics';
+			$this->new_settings['tracking_mode'] = 'analytics';
 			
 
 			// 3b Set events mode to use JS if the events mode is not set explicitly to none
-			if ( empty( $this->new_settings['events_mode' ] ) || $this->new_settings['events_mode' ] !== 'none' ) {
-				$this->new_settings['events_mode' ] = 'js';
+			if ( empty( $this->new_settings['events_mode'] ) || $this->new_settings['events_mode'] !== 'none' ) {
+				$this->new_settings['events_mode'] = 'js';
 			}
 
 		// 4. Migrate manual UA codes
 			// 4a Manual UA has the lowest priority
-			if ( ! empty( $this->new_settings['manual_ua_code' ] ) ) {
+			if ( ! empty( $this->new_settings['manual_ua_code'] ) ) {
 				// Set as manual UA code
-				is_network_admin() ? update_site_option( 'monsterinsights_network_profile', array( 'manual' => $this->new_settings['manual_ua_code' ] ) ) : update_option( 'monsterinsights_site_profile', array( 'manual' => $this->new_settings['manual_ua_code' ] ) );
+				is_network_admin() ? update_site_option( 'monsterinsights_network_profile', array( 'manual' => $this->new_settings['manual_ua_code'] ) ) : update_option( 'monsterinsights_site_profile', array( 'manual' => $this->new_settings['manual_ua_code'] ) );
 			}
 
 			// 4b Then try the oAuth UA code
-			if ( ! empty( $this->new_settings['analytics_profile_code' ] ) ) {
+			if ( ! empty( $this->new_settings['analytics_profile_code'] ) ) {
 				// Set as manual UA code
-				is_network_admin() ? update_site_option( 'monsterinsights_network_profile', array( 'manual' => $this->new_settings['analytics_profile_code' ] ) ) : update_option( 'monsterinsights_site_profile', array( 'manual' => $this->new_settings['analytics_profile_code' ] ) );
+				is_network_admin() ? update_site_option( 'monsterinsights_network_profile', array( 'manual' => $this->new_settings['analytics_profile_code'] ) ) : update_option( 'monsterinsights_site_profile', array( 'manual' => $this->new_settings['analytics_profile_code'] ) );
 			}
 
 		// 5. Migrate License keys
@@ -773,8 +773,8 @@ 
 							'grids', 'icl_post_language', 'mlcf_email', 'mlcf_name', 'navigation-skins', 'page', 'punch-fonts', 'return_tab', 'skins',
 							'wpcf_email', 'wpcf_your_name' );
 		foreach ( $settings as $setting ) {
-			if ( ! empty( $this->new_settings[ $setting ] ) ) {
-				unset( $this->new_settings[ $setting ] );
+			if ( ! empty( $this->new_settings[$setting] ) ) {
+				unset( $this->new_settings[$setting] );
 			}
 		}
 
@@ -797,11 +797,11 @@ 
 		// 5. Remove deprecated settings
 		$settings = array( '_repeated', 'ajax', 'asmselect0', 'bawac_force_nonce', 'cf_email', 'cf_message', 'cf_name', 'cf_number',
 							'cf_phone', 'cf_subject', 'credentials', 'cron_failed', 'cron_last_run', 'firebug_lite', 'global-css', 'google_auth_code', 
-							'grids', 'icl_post_language', 'mlcf_email', 'mlcf_name','navigation-skins', 'page', 'punch-fonts', 'return_tab', 'skins',
+							'grids', 'icl_post_language', 'mlcf_email', 'mlcf_name', 'navigation-skins', 'page', 'punch-fonts', 'return_tab', 'skins',
 							'wpcf_email', 'wpcf_your_name' );
 		foreach ( $settings as $setting ) {
-			if ( ! empty( $this->new_settings[ $setting ] ) ) {
-				unset( $this->new_settings[ $setting ] );
+			if ( ! empty( $this->new_settings[$setting] ) ) {
+				unset( $this->new_settings[$setting] );
 			}
 		}
 

lite/includes/admin/tools.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 }
 
 function monsterinsights_tools_url_builder() {
-	ob_start();?>
+	ob_start(); ?>
 	<div class="monsterinsights-upsell-under-box">
 		<h2><?php esc_html_e( "Want even more fine tuned control over your website analytics?", 'google-analytics-for-wordpress' ); ?></h2>
 		<p class="monsterinsights-upsell-lite-text"><?php esc_html_e( "By upgrading to MonsterInsights Pro, you can unlock the MonsterInsights URL builder that helps you better track your advertising and email marketing campaigns.", 'google-analytics-for-wordpress' ); ?></p>

lite/includes/admin/tab-support.php

Indentation +3 added lines, -3 removed lines

@@ -24,9 +24,9 @@
     ?>
     <div id="monsterinsights-settings-general">
         <?php 
-        // Output any notices now
-        do_action( 'monsterinsights_settings_support_tab_notice' );
-        ?>
+	// Output any notices now
+	do_action( 'monsterinsights_settings_support_tab_notice' );
+	?>
         <?php //Status page coming soon. ?>
         <!-- <hr /> -->
     </div>

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Callback for displaying the UI for support tab.

lite/includes/install.php

Braces +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) { 
+if ( ! defined( 'ABSPATH' ) ) {
 	exit;
 }
 

assets/lib/pandora/class-am-deactivation-survey.php

Spacing +8 added lines, -8 removed lines

@@ -54,9 +54,9 @@ 
 				return;
 			}
 
-			add_action( 'admin_print_scripts', array( $this, 'js'    ), 20 );
-			add_action( 'admin_print_scripts', array( $this, 'css'   )     );
-			add_action( 'admin_footer',        array( $this, 'modal' )     );
+			add_action( 'admin_print_scripts', array( $this, 'js' ), 20 );
+			add_action( 'admin_print_scripts', array( $this, 'css' ) );
+			add_action( 'admin_footer', array( $this, 'modal' ) );
 		}
 	
 		/**
@@ -67,7 +67,7 @@ 
 		 */
 		public function is_dev_url() {
 			// If it is an AM dev site, return false, so we can see them on our dev sites.
-			if ( defined ('AWESOMEMOTIVE_DEV_MODE' ) && AWESOMEMOTIVE_DEV_MODE ) {
+			if ( defined( 'AWESOMEMOTIVE_DEV_MODE' ) && AWESOMEMOTIVE_DEV_MODE ) {
 				return false;
 			}
 		
@@ -101,7 +101,7 @@ 
 
 				}
 				if ( substr_count( $host, '.' ) > 1 ) {
-					$subdomains_to_check =  array( 'dev.', '*.staging.', 'beta.', 'test.' );
+					$subdomains_to_check = array( 'dev.', '*.staging.', 'beta.', 'test.' );
 					foreach ( $subdomains_to_check as $subdomain ) {
 						$subdomain = str_replace( '.', '(.)', $subdomain );
 						$subdomain = str_replace( array( '*', '(.)' ), '(.*)', $subdomain );
@@ -313,7 +313,7 @@ 
 				<div class="am-deactivate-survey-wrap">
 					<form class="am-deactivate-survey" method="post">
 						<span class="am-deactivate-survey-title"><span class="dashicons dashicons-testimonial"></span><?php echo ' ' . esc_html__( 'Quick Feedback', 'google-analytics-for-wordpress' ); ?></span>
-						<span class="am-deactivate-survey-desc"><?php echo sprintf( esc_html__('If you have a moment, please share why you are deactivating %s:', 'google-analytics-for-wordpress' ), $this->name ); ?></span>
+						<span class="am-deactivate-survey-desc"><?php echo sprintf( esc_html__( 'If you have a moment, please share why you are deactivating %s:', 'google-analytics-for-wordpress' ), $this->name ); ?></span>
 						<div class="am-deactivate-survey-options">
 							<?php foreach ( $options as $id => $option ) : ?>
 							<div class="am-deactivate-survey-option">
@@ -328,8 +328,8 @@ 
 							<?php endforeach; ?>
 						</div>
 						<div class="am-deactivate-survey-footer">
-							<button type="submit" class="am-deactivate-survey-submit button button-primary button-large"><?php echo sprintf( esc_html__('Submit %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></button>
-							<a href="#" class="am-deactivate-survey-deactivate"><?php echo sprintf( esc_html__('Skip %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></a>
+							<button type="submit" class="am-deactivate-survey-submit button button-primary button-large"><?php echo sprintf( esc_html__( 'Submit %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></button>
+							<a href="#" class="am-deactivate-survey-deactivate"><?php echo sprintf( esc_html__( 'Skip %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' ); ?></a>
 						</div>
 					</form>
 				</div>