awesomemotive / google-analytics-for-wordpress

includes/measurement-protocol.php

Spacing +9 added lines, -9 removed lines

@@ -26,16 +26,16 @@ 
 
 	$defaults = array(
 		't'  => 'event', // Required: Hit type
-		'ec' => '',      // Optional: Event category
-		'ea' => '', 	 // Optional: Event Action
-		'el' => '', 	 // Optional: Event Label
-		'ev' => null, 	 // Optional: Event Value
+		'ec' => '', // Optional: Event category
+		'ea' => '', // Optional: Event Action
+		'el' => '', // Optional: Event Label
+		'ev' => null, // Optional: Event Value
 	);
 
-	$body  = array_merge( $defaults , $args );
+	$body = array_merge( $defaults, $args );
 
 	// We want to get the user's IP address when possible
-	$ip     = '';
+	$ip = '';
 	if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) && ! filter_var( $_SERVER['HTTP_CLIENT_IP'], FILTER_VALIDATE_IP ) === false ) {
 		$ip = $_SERVER['HTTP_CLIENT_IP'];
 	} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) && ! filter_var( $_SERVER['HTTP_X_FORWARDED_FOR'], FILTER_VALIDATE_IP ) === false ) {
@@ -81,7 +81,7 @@ 
 		'uip' => $ip,
 
 		// Optional: User Agent
-		'ua'  => ! empty( $user_agent ) ?  $user_agent : $_SERVER['HTTP_USER_AGENT'],
+		'ua'  => ! empty( $user_agent ) ? $user_agent : $_SERVER['HTTP_USER_AGENT'],
 
 		// Optional: Time of the event
 		'z'   => time()
@@ -99,7 +99,7 @@ 
 	// Unset empty values to reduce request size
 	foreach ( $body as $key => $value ) {
 		if ( empty( $value ) ) {
-			unset( $body[ $key ] );
+			unset( $body[$key] );
 		}
 	}
 
@@ -142,7 +142,7 @@ 
 		// Optional: Event Value
 		'ev' => null,
 	);
-	$args  = wp_parse_args( $args, $default_args );
+	$args = wp_parse_args( $args, $default_args );
 	//$args = apply_filters( 'monsterinsights_mp_track_event_call', $args );
 
 	return monsterinsights_mp_api_call( $args );

includes/admin/notice.php

Indentation +87 added lines, -87 removed lines

@@ -36,11 +36,11 @@ 
      */
     public function __construct() {
 
-        // Populate $notices
-        $this->notices = get_option( 'monsterinsights_notices' );
-        if ( ! is_array( $this->notices ) ) {
-            $this->notices = array();
-        }
+	// Populate $notices
+	$this->notices = get_option( 'monsterinsights_notices' );
+	if ( ! is_array( $this->notices ) ) {
+	    $this->notices = array();
+	}
 
     }
 
@@ -55,10 +55,10 @@ 
      */
 
     public function is_dismissed( $notice ) {
-        if ( ! isset( $this->notices[ $notice ] ) ) {
-            return false;
-        }
-        return true;
+	if ( ! isset( $this->notices[ $notice ] ) ) {
+	    return false;
+	}
+	return true;
 
     }
 
@@ -72,8 +72,8 @@ 
      * @return null
      */
     public function dismiss( $notice ) {
-        $this->notices[ $notice ] = true;
-        update_option( 'monsterinsights_notices', $this->notices );
+	$this->notices[ $notice ] = true;
+	update_option( 'monsterinsights_notices', $this->notices );
 
     }
 
@@ -88,8 +88,8 @@ 
      * @return null
      */
     public function undismiss( $notice ) {
-        unset( $this->notices[ $notice ] );
-        update_option( 'monsterinsights_notices', $this->notices );
+	unset( $this->notices[ $notice ] );
+	update_option( 'monsterinsights_notices', $this->notices );
 
     }
 
@@ -108,7 +108,7 @@ 
      * @param bool      $is_dismissible     User can Dismiss Message (default: false)
      */ 
     public function display_inline_notice( $name, $title, $message, $type = 'success', $is_dismissible = false, $args = array() ) {
-        /* Available/Planned $args options
+	/* Available/Planned $args options
          * $args = array(
          *  'primary'    => array(
          *      'text'   => '',
@@ -127,110 +127,110 @@ 
          */
 
 
-        // Check if the notice is dismissible, and if so has been dismissed.
-        if ( $is_dismissible && $this->is_dismissed( $name ) ) {
-            // Nothing to show here, return!
-            return '';
-        }
+	// Check if the notice is dismissible, and if so has been dismissed.
+	if ( $is_dismissible && $this->is_dismissed( $name ) ) {
+	    // Nothing to show here, return!
+	    return '';
+	}
 
-        $dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
+	$dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
 
-        // Display inline notice
-        ob_start();
-        ?>
+	// Display inline notice
+	ob_start();
+	?>
         <div class="monsterinsights-notice <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice' . $dismissible; ?>" data-notice="<?php echo esc_attr( $name ); ?>">
             <div class="monsterinsights-notice-icon <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-icon'?>">
             </div>
             <div class="monsterinsights-notice-text <?php echo 'monsterinsights-' . esc_attr( $type ) . '-notice-text'?>">
                 <?php
-                // Title
-                if ( ! empty ( $title ) ) {
-                    ?>
+		// Title
+		if ( ! empty ( $title ) ) {
+		    ?>
                     <p class="monsterinsights-notice-title"><?php echo esc_html( $title ); ?></p>
                     <?php
-                }
+		}
 
-                // Message
-                if ( ! empty( $message ) ) {
-                    if ( empty( $args['skip_message_escape'] ) ) {
-                        ?>
+		// Message
+		if ( ! empty( $message ) ) {
+		    if ( empty( $args['skip_message_escape'] ) ) {
+			?>
                         <p class="monsterinsights-notice-message"><?php echo esc_html( $message ); ?></p>
                         <?php
-                    } else {
-                        ?>
+		    } else {
+			?>
                         <p class="monsterinsights-notice-message"><?php echo $message; ?></p>
                         <?php
-                    }
-                }
+		    }
+		}
                 
-                // Primary Button
-                if ( ! empty( $args['primary']['text'] ) ) {
+		// Primary Button
+		if ( ! empty( $args['primary']['text'] ) ) {
                     
-                    $text = '';
-                    if ( ! empty( $args['primary']['text'] ) ) {
-                        $text = $args['primary']['text'];
-                    }
-
-                    $url = '#';
-                    if ( ! empty( $args['primary']['url'] ) ) {
-                        $url = $args['primary']['url'];
-                    }
-
-                    $target = '';
-                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
-                        $target = ' target="_blank" rel="noopener noreferrer"';
-                    }
-
-                    $class = 'button button-primary';
-                    if ( ! empty( $args['primary']['class'] ) ) {
-                        $class = ' class="'. $args['primary']['class'] . '"';
-                    }
-                    ?>
+		    $text = '';
+		    if ( ! empty( $args['primary']['text'] ) ) {
+			$text = $args['primary']['text'];
+		    }
+
+		    $url = '#';
+		    if ( ! empty( $args['primary']['url'] ) ) {
+			$url = $args['primary']['url'];
+		    }
+
+		    $target = '';
+		    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
+			$target = ' target="_blank" rel="noopener noreferrer"';
+		    }
+
+		    $class = 'button button-primary';
+		    if ( ! empty( $args['primary']['class'] ) ) {
+			$class = ' class="'. $args['primary']['class'] . '"';
+		    }
+		    ?>
                     <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
                     <?php
-                }
+		}
 
-                // Secondary Button
-                if ( ! empty( $args['secondary']['text'] ) ) {
+		// Secondary Button
+		if ( ! empty( $args['secondary']['text'] ) ) {
                     
-                    $text = '';
-                    if ( ! empty( $args['secondary']['text'] ) ) {
-                        $text = $args['secondary']['text'];
-                    }
-
-                    $url = '#';
-                    if ( ! empty( $args['secondary']['url'] ) ) {
-                        $url = $args['secondary']['url'];
-                    }           
-
-                    $target = '';
-                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
-                        $target = ' target="_blank" rel="noopener noreferrer"';
-                    }
-
-                    $class = 'button button-secondary';
-                    if ( ! empty( $args['secondary']['class'] ) ) {
-                        $class = ' class="'. $args['secondary']['class'] . '"';
-                    }
-                    ?>
+		    $text = '';
+		    if ( ! empty( $args['secondary']['text'] ) ) {
+			$text = $args['secondary']['text'];
+		    }
+
+		    $url = '#';
+		    if ( ! empty( $args['secondary']['url'] ) ) {
+			$url = $args['secondary']['url'];
+		    }           
+
+		    $target = '';
+		    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
+			$target = ' target="_blank" rel="noopener noreferrer"';
+		    }
+
+		    $class = 'button button-secondary';
+		    if ( ! empty( $args['secondary']['class'] ) ) {
+			$class = ' class="'. $args['secondary']['class'] . '"';
+		    }
+		    ?>
                     <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
                     <?php
-                }
+		}
 
-                // Dismiss Button
-                if ( $is_dismissible ) {
-                    ?>
+		// Dismiss Button
+		if ( $is_dismissible ) {
+		    ?>
                     <button type="button" class="notice-dismiss<?php echo $dismissible; ?>">
                         <span class="screen-reader-text">
                             <?php esc_html_e( 'Dismiss this notice', 'google-analytics-for-wordpress' ); ?>
                         </span>
                     </button>
                     <?php
-                }
-                ?>
+		}
+		?>
             </div>
         </div>
         <?php
-        return ob_get_clean();
+	return ob_get_clean();
     }
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -55,7 +55,7 @@ 
      */
 
     public function is_dismissed( $notice ) {
-        if ( ! isset( $this->notices[ $notice ] ) ) {
+        if ( ! isset( $this->notices[$notice] ) ) {
             return false;
         }
         return true;
@@ -72,7 +72,7 @@ 
      * @return null
      */
     public function dismiss( $notice ) {
-        $this->notices[ $notice ] = true;
+        $this->notices[$notice] = true;
         update_option( 'monsterinsights_notices', $this->notices );
 
     }
@@ -88,7 +88,7 @@ 
      * @return null
      */
     public function undismiss( $notice ) {
-        unset( $this->notices[ $notice ] );
+        unset( $this->notices[$notice] );
         update_option( 'monsterinsights_notices', $this->notices );
 
     }
@@ -133,7 +133,7 @@ 
             return '';
         }
 
-        $dismissible = ( $is_dismissible ) ? ' is-dismissible': '';
+        $dismissible = ( $is_dismissible ) ? ' is-dismissible' : '';
 
         // Display inline notice
         ob_start();
@@ -177,16 +177,16 @@ 
                     }
 
                     $target = '';
-                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank') {
+                    if ( ! empty( $args['primary']['target'] ) && $args['primary']['target'] === 'blank' ) {
                         $target = ' target="_blank" rel="noopener noreferrer"';
                     }
 
                     $class = 'button button-primary';
                     if ( ! empty( $args['primary']['class'] ) ) {
-                        $class = ' class="'. $args['primary']['class'] . '"';
+                        $class = ' class="' . $args['primary']['class'] . '"';
                     }
                     ?>
-                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
+                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class; ?>><?php echo esc_html( $text ); ?></a>
                     <?php
                 }
 
@@ -204,16 +204,16 @@ 
                     }           
 
                     $target = '';
-                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank') {
+                    if ( ! empty( $args['secondary']['target'] ) && $args['secondary']['target'] === 'blank' ) {
                         $target = ' target="_blank" rel="noopener noreferrer"';
                     }
 
                     $class = 'button button-secondary';
                     if ( ! empty( $args['secondary']['class'] ) ) {
-                        $class = ' class="'. $args['secondary']['class'] . '"';
+                        $class = ' class="' . $args['secondary']['class'] . '"';
                     }
                     ?>
-                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class;?>><?php echo esc_html( $text ); ?></a>
+                    <a href="<?php echo esc_attr( $url ); ?>"<?php echo $target; ?><?php echo $class; ?>><?php echo esc_html( $text ); ?></a>
                     <?php
                 }
 

includes/admin/licensing/skin.php

Indentation +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
      */
     public function __construct( $args = array() ) {
 
-        parent::__construct();
+	parent::__construct();
 
     }
 
@@ -38,9 +38,9 @@ 
      */
     public function set_upgrader( &$upgrader ) {
 
-        if ( is_object( $upgrader ) ) {
-            $this->upgrader =& $upgrader;
-        }
+	if ( is_object( $upgrader ) ) {
+	    $this->upgrader =& $upgrader;
+	}
 
     }
 
@@ -53,7 +53,7 @@ 
      */
     public function set_result( $result ) {
 
-        $this->result = $result;
+	$this->result = $result;
 
     }
 
@@ -82,10 +82,10 @@ 
      */
     function error( $errors ) {
 
-        if ( ! empty( $errors ) ) {
-            echo json_encode( array( 'error' => esc_html__( 'There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress' ) ) );
-            die;
-        }
+	if ( ! empty( $errors ) ) {
+	    echo json_encode( array( 'error' => esc_html__( 'There was an error installing the addon. Please try again.', 'google-analytics-for-wordpress' ) ) );
+	    die;
+	}
 
     }
 

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     public function set_upgrader( &$upgrader ) {
 
         if ( is_object( $upgrader ) ) {
-            $this->upgrader =& $upgrader;
+            $this->upgrader = & $upgrader;
         }
 
     }

includes/admin/licensing/autoupdate.php

Indentation +15 added lines, -15 removed lines

@@ -13,20 +13,20 @@ 
 
     // If this is multisite and is not on the main site, return early.
     if ( is_multisite() && ! is_main_site() ) {
-        return $update;
+	return $update;
     }
     
     // If we don't have everything we need, return early.
     $item = (array) $item;
     if ( ! isset( $item['new_version'] ) || ! isset( $item['slug'] ) ) {
-        return $update;
+	return $update;
     }
 
     // If the plugin isn't ours, return early.
     $is_free = 'google-analytics-for-wordpress' === $item['slug'];
     $is_paid = isset( $item['monsterinsights_plugin'] ); // see updater class
     if ( ! $is_free && ! $is_paid ) {
-        return $update;
+	return $update;
     }
 
     $version           = $is_free ? MONSTERINSIGHTS_LITE_VERSION : $item['old_version'];
@@ -36,20 +36,20 @@ 
     
     // If the opt in update allows major updates but there is no major version update, return early.
     if ( $current_major < $new_major ) {
-        if ( $automatic_updates === 'all' ) {
-            return true;
-        } else {
-            return $update;
-        }
+	if ( $automatic_updates === 'all' ) {
+	    return true;
+	} else {
+	    return $update;
+	}
     }
     
     // If the opt in update allows minor updates but there is no minor version update, return early.
     if ( $current_major == $new_major ) {
-        if ( $automatic_updates === 'all' || $automatic_updates === 'minor' ) {
-            return true;
-        } else {
-            return $update;
-        }
+	if ( $automatic_updates === 'all' || $automatic_updates === 'minor' ) {
+	    return true;
+	} else {
+	    return $update;
+	}
     }
 
     // All our checks have passed - this plugin can be updated!
@@ -87,8 +87,8 @@ 
 function monsterinsights_get_major_version( $version ) {
     $exploded_version = explode( '.', $version );
     if ( isset( $exploded_version[2] ) ) {
-        return $exploded_version[0] . '.' . $exploded_version[1] . '.' . $exploded_version[2];
+	return $exploded_version[0] . '.' . $exploded_version[1] . '.' . $exploded_version[2];
     } else {
-        return $exploded_version[0] . '.' . $exploded_version[1] . '.0';
+	return $exploded_version[0] . '.' . $exploded_version[1] . '.0';
     }
 }
\ No newline at end of file

includes/admin/ajax.php

Braces +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
 
     // Deactivate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
+        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) {
             $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
         } else {
             $deactivate = deactivate_plugins( $_POST['plugin'] );

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

@@ -132,7 +132,7 @@
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
         if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
-            $activate = activate_plugin( $_POST['plugin'], NULL, true );
+            $activate = activate_plugin( $_POST['plugin'], null, true );
         } else {
             $activate = activate_plugin( $_POST['plugin'] );
         }

Indentation +71 added lines, -71 removed lines

@@ -51,60 +51,60 @@ 
     check_ajax_referer( 'monsterinsights-install', 'nonce' );
 
     if ( ! current_user_can( 'install_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Install the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        $download_url = $_POST['plugin'];
-        global $hook_suffix;
-
-        // Set the current screen to avoid undefined notices.
-        set_current_screen();
-
-        // Prepare variables.
-        $method = '';
-        $url    = add_query_arg(
-            array(
-                'page' => 'monsterinsights-settings'
-            ),
-            admin_url( 'admin.php' )
-        );
-        $url = esc_url( $url );
-
-        // Start output bufferring to catch the filesystem form if credentials are needed.
-        ob_start();
-        if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // If we are not authenticated, make it happen now.
-        if ( ! WP_Filesystem( $creds ) ) {
-            ob_start();
-            request_filesystem_credentials( $url, $method, true, false, null );
-            $form = ob_get_clean();
-            echo json_encode( array( 'form' => $form ) );
-            wp_die();
-        }
-
-        // We do not need any extra credentials if we have gotten this far, so let's install the plugin.
-        require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-        $base = MonsterInsights();
-        require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
+	$download_url = $_POST['plugin'];
+	global $hook_suffix;
+
+	// Set the current screen to avoid undefined notices.
+	set_current_screen();
+
+	// Prepare variables.
+	$method = '';
+	$url    = add_query_arg(
+	    array(
+		'page' => 'monsterinsights-settings'
+	    ),
+	    admin_url( 'admin.php' )
+	);
+	$url = esc_url( $url );
+
+	// Start output bufferring to catch the filesystem form if credentials are needed.
+	ob_start();
+	if ( false === ( $creds = request_filesystem_credentials( $url, $method, false, false, null ) ) ) {
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// If we are not authenticated, make it happen now.
+	if ( ! WP_Filesystem( $creds ) ) {
+	    ob_start();
+	    request_filesystem_credentials( $url, $method, true, false, null );
+	    $form = ob_get_clean();
+	    echo json_encode( array( 'form' => $form ) );
+	    wp_die();
+	}
+
+	// We do not need any extra credentials if we have gotten this far, so let's install the plugin.
+	require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+	$base = MonsterInsights();
+	require_once plugin_dir_path( $base->file ) . '/includes/admin/licensing/skin.php';
         
-        // Create the plugin upgrader with our custom skin.
-        $installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
-        $installer->install( $download_url );
-
-        // Flush the cache and return the newly installed plugin basename.
-        wp_cache_flush();
-        if ( $installer->plugin_info() ) {
-            $plugin_basename = $installer->plugin_info();
-            echo json_encode( array( 'plugin' => $plugin_basename ) );
-            wp_die();
-        }
+	// Create the plugin upgrader with our custom skin.
+	$installer = new Plugin_Upgrader( $skin = new MonsterInsights_Skin() );
+	$installer->install( $download_url );
+
+	// Flush the cache and return the newly installed plugin basename.
+	wp_cache_flush();
+	if ( $installer->plugin_info() ) {
+	    $plugin_basename = $installer->plugin_info();
+	    echo json_encode( array( 'plugin' => $plugin_basename ) );
+	    wp_die();
+	}
     }
 
     // Send back a response.
@@ -126,21 +126,21 @@ 
     check_ajax_referer( 'monsterinsights-activate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
-            $activate = activate_plugin( $_POST['plugin'], NULL, true );
-        } else {
-            $activate = activate_plugin( $_POST['plugin'] );
-        }
-
-        if ( is_wp_error( $activate ) ) {
-            echo json_encode( array( 'error' => $activate->get_error_message() ) );
-            wp_die();
-        }
+	if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
+	    $activate = activate_plugin( $_POST['plugin'], NULL, true );
+	} else {
+	    $activate = activate_plugin( $_POST['plugin'] );
+	}
+
+	if ( is_wp_error( $activate ) ) {
+	    echo json_encode( array( 'error' => $activate->get_error_message() ) );
+	    wp_die();
+	}
     }
 
     echo json_encode( true );
@@ -161,16 +161,16 @@ 
     check_ajax_referer( 'monsterinsights-deactivate', 'nonce' );
 
     if ( ! current_user_can( 'activate_plugins' ) ) {
-        echo json_encode( true );
+	echo json_encode( true );
     }
 
     // Deactivate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
-            $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
-        } else {
-            $deactivate = deactivate_plugins( $_POST['plugin'] );
-        }
+	if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) { 
+	    $deactivate = deactivate_plugins( $_POST['plugin'], false, true );
+	} else {
+	    $deactivate = deactivate_plugins( $_POST['plugin'] );
+	}
     }
 
     echo json_encode( true );
@@ -193,12 +193,12 @@ 
 
     // Deactivate the notice
     if ( isset( $_POST['notice'] ) ) {
-        // Init the notice class and mark notice as deactivated
-        MonsterInsights()->notices->dismiss( $_POST['notice'] );
+	// Init the notice class and mark notice as deactivated
+	MonsterInsights()->notices->dismiss( $_POST['notice'] );
 
-        // Return true
-        echo json_encode( true );
-        wp_die();
+	// Return true
+	echo json_encode( true );
+	wp_die();
     }
 
     // If here, an error occurred

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 
     // Activate the addon.
     if ( isset( $_POST['plugin'] ) ) {
-        if ( isset( $_POST['isnetwork'] ) &&  $_POST['isnetwork'] ) {
+        if ( isset( $_POST['isnetwork'] ) && $_POST['isnetwork'] ) {
             $activate = activate_plugin( $_POST['plugin'], NULL, true );
         } else {
             $activate = activate_plugin( $_POST['plugin'] );

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
 

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', 'api.monsterinsights.com/v2/' );
 }
 
-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

Spacing +32 added lines, -32 removed lines

@@ -32,8 +32,8 @@ 
 		$user = new WP_User( $user_id );
 	}
 
-	$track_user  = true;
-	$roles     = monsterinsights_get_option( 'ignore_users', array() );
+	$track_user = true;
+	$roles = monsterinsights_get_option( 'ignore_users', array() );
 
 	if ( ! empty( $roles ) && is_array( $roles ) ) {
 		foreach ( $roles as $role ) {
@@ -99,7 +99,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 ) ) {
@@ -158,7 +158,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 ) ) {
@@ -173,7 +173,7 @@ 
 
 
 function monsterinsights_generate_ga_client_id() {
-	return rand(100000000,999999999) . '.' . time();
+	return rand( 100000000, 999999999 ) . '.' . time();
 }
 
 
@@ -193,7 +193,7 @@ 
 		$stop = time();
 	}
 
-	$diff = (int) abs( $stop -  $start );
+	$diff = (int) abs( $stop - $start );
 	$hours = round( $diff / HOUR_IN_SECONDS );
 	return $hours;
 }
@@ -251,7 +251,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;
@@ -277,7 +277,7 @@ 
 
 	foreach ( $editable_roles as $id => $role ) {
 		if ( isset( $role['capabilities']['manage_options'] ) && $role['capabilities']['manage_options'] ) {
-			$roles[ $id ] = translate_user_role( $role['name'] );
+			$roles[$id] = translate_user_role( $role['name'] );
 		}
 	}
 
@@ -323,7 +323,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 );
@@ -339,16 +339,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 ) {
@@ -872,11 +872,11 @@ 
 	return $countries;
 }
 
-function monsterinsights_get_api_url(){
+function monsterinsights_get_api_url() {
 	return apply_filters( 'monsterinsights_get_api_url', 'api.monsterinsights.com/v2/' );
 }
 
-function monsterinsights_get_licensing_url(){
+function monsterinsights_get_licensing_url() {
 	return apply_filters( 'monsterinsights_get_licensing_url', 'https://www.monsterinsights.com' );
 }
 
@@ -920,7 +920,7 @@ 
 	}
 }
 
-if ( ! function_exists ( 'remove_class_filter' ) ) {
+if ( ! function_exists( 'remove_class_filter' ) ) {
 	/**
 	 * Remove Class Filter Without Access to Class Object
 	 *
@@ -941,7 +941,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.
@@ -950,33 +950,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;
 			}
@@ -985,7 +985,7 @@ 
 	}
 } // End function exists
 
-if ( ! function_exists ( 'remove_class_action' ) ) {
+if ( ! function_exists( 'remove_class_action' ) ) {
 	/**
 	 * Remove Class Action Without Access to Class Object
 	 *
@@ -1055,7 +1055,7 @@ 
 		}
 
 		foreach ( $translations->entries as $msgid => $entry ) {
-			$locale[ $msgid ] = $entry->translations;
+			$locale[$msgid] = $entry->translations;
 		}
 
 		return $locale;

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

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>