awesomemotive / google-analytics-for-wordpress

assets/lib/pandora/class-am-notification.php

Spacing +8 added lines, -8 removed lines

@@ -190,7 +190,7 @@ 
 				return;
 			}
 
-			$plugin_notifications = $this->get_plugin_notifications( - 1, array(
+			$plugin_notifications = $this->get_plugin_notifications( -1, array(
 				'post_status' => 'all',
 				'meta_key'    => 'viewed',
 				'meta_value'  => '0',
@@ -249,7 +249,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 
@@ -264,7 +264,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 
@@ -273,7 +273,7 @@ 
 				$continue = (string) wp_get_theme() === $theme;
 
 				if ( ! empty( $theme ) && ! $continue ) {
-					unset( $plugin_notifications[ $key ] );
+					unset( $plugin_notifications[$key] );
 				}
 
 				// Version validation.
@@ -285,7 +285,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 
@@ -298,7 +298,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 
@@ -312,7 +312,7 @@ 
 					}
 
 					if ( ! $continue ) {
-						unset( $plugin_notifications[ $key ] );
+						unset( $plugin_notifications[$key] );
 					}
 				}
 			}
@@ -444,7 +444,7 @@ 
 		public function revoke_notifications( $ids ) {
 			// Loop through each of the IDs and find the post that has it as meta.
 			foreach ( (array) $ids as $id ) {
-				$notifications = $this->get_plugin_notifications( - 1, array( 'post_status' => 'all', 'meta_key' => 'notification_id', 'meta_value' => $id ) );
+				$notifications = $this->get_plugin_notifications( -1, array( 'post_status' => 'all', 'meta_key' => 'notification_id', 'meta_value' => $id ) );
 				if ( $notifications ) {
 					foreach ( $notifications as $notification ) {
 						update_post_meta( $notification->ID, 'viewed', 1 );

includes/options.php

Indentation +16 added lines, -16 removed lines

@@ -195,14 +195,14 @@ 
 }
 
  /**
- * Helper method for deleting a setting's value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting a setting's value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
 	if ( empty( $key ) ){
@@ -245,14 +245,14 @@ 
 }
 
  /**
- * Helper method for deleting multiple settings value.
- *
- * @since 6.0.0
- * @access public
- *
- * @param string $key   The setting key.
- * @return boolean True if removed, false if not.
- */
+  * Helper method for deleting multiple settings value.
+  *
+  * @since 6.0.0
+  * @access public
+  *
+  * @param string $key   The setting key.
+  * @return boolean True if removed, false if not.
+  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
 	if ( empty( $keys ) || ! is_array( $keys ) ){

Spacing +15 added lines, -15 removed lines

@@ -47,7 +47,7 @@ 
  */
 function monsterinsights_get_option( $key = '', $default = false ) {
 	global $monsterinsights_settings;
-	$value = ! empty( $monsterinsights_settings[ $key ] ) ? $monsterinsights_settings[ $key ] : $default;
+	$value = ! empty( $monsterinsights_settings[$key] ) ? $monsterinsights_settings[$key] : $default;
 	$value = apply_filters( 'monsterinsights_get_option', $value, $key, $default );
 	return apply_filters( 'monsterinsights_get_option_' . $key, $value, $key, $default );
 }
@@ -146,7 +146,7 @@ 
 function monsterinsights_update_option( $key = '', $value = false ) {
 
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -177,7 +177,7 @@ 
 	$value = apply_filters( 'monsterinsights_update_option', $value, $key );
 
 	// Next let's try to update the value
-	$settings[ $key ] = $value;
+	$settings[$key] = $value;
 	$did_update = false;
 	//if ( $update_network_option ) {
 	//    $did_update = update_site_option( $option_name, $settings );
@@ -186,9 +186,9 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
-		$monsterinsights_settings[ $key ] = $value;
+		$monsterinsights_settings[$key] = $value;
 	}
 
 	return $did_update;
@@ -205,7 +205,7 @@ 
  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -224,8 +224,8 @@ 
 	//}
 
 	// Next let's try to remove the key
-	if( isset( $settings[ $key ] ) ) {
-		unset( $settings[ $key ] );
+	if ( isset( $settings[$key] ) ) {
+		unset( $settings[$key] );
 	}
 
 	$did_update = false;
@@ -236,7 +236,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -255,7 +255,7 @@ 
  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
+	if ( empty( $keys ) || ! is_array( $keys ) ) {
 		return false;
 	}
 
@@ -275,8 +275,8 @@ 
 
 	// Next let's try to remove the keys
 	foreach ( $keys as $key ) {
-		if( isset( $settings[ $key ] ) ) {
-			unset( $settings[ $key ] );
+		if ( isset( $settings[$key] ) ) {
+			unset( $settings[$key] );
 		}
 	}
 
@@ -288,7 +288,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -379,8 +379,8 @@ 
 	);
 
 	foreach ( $exclude as $e ) {
-		if ( ! empty( $settings[ $e ] ) ) {
-			unset( $settings[ $e ] );
+		if ( ! empty( $settings[$e] ) ) {
+			unset( $settings[$e] );
 		}
 	}
 	return wp_json_encode( $settings );

Braces +6 added lines, -6 removed lines

@@ -146,7 +146,7 @@ 
 function monsterinsights_update_option( $key = '', $value = false ) {
 
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -186,7 +186,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings[ $key ] = $value;
 	}
@@ -205,7 +205,7 @@ 
  */
 function monsterinsights_delete_option( $key = '' ) {
 	// If no key, exit
-	if ( empty( $key ) ){
+	if ( empty( $key ) ) {
 		return false;
 	}
 
@@ -236,7 +236,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}
@@ -255,7 +255,7 @@ 
  */
 function monsterinsights_delete_options( $keys = array() ) {
 	// If no keys, exit
-	if ( empty( $keys ) || ! is_array( $keys ) ){
+	if ( empty( $keys ) || ! is_array( $keys ) ) {
 		return false;
 	}
 
@@ -288,7 +288,7 @@ 
 	//}
 
 	// If it updated, let's update the global variable
-	if ( $did_update ){
+	if ( $did_update ) {
 		global $monsterinsights_settings;
 		$monsterinsights_settings = $settings;
 	}

includes/deprecated.php

Spacing +2 added lines, -2 removed lines

@@ -123,7 +123,7 @@ 
 	 */
 	if ( ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
 		$message = empty( $message ) ? '' : ' ' . $message;
-		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s!', 'google-analytics-for-wordpress' ), $hook, $version, '<strong>', '</strong>' ) . esc_html ( $message ) );
+		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s!', 'google-analytics-for-wordpress' ), $hook, $version, '<strong>', '</strong>' ) . esc_html( $message ) );
 	}
 }
 
@@ -177,7 +177,7 @@ 
 	 */
 	if ( ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
 		trigger_error( sprintf( esc_html__( '%1$s is %3$sdeprecated%4$s since MonsterInsights version %2$s.', 'google-analytics-for-wordpress' ), $function, $version, '<strong>', '</strong>' ) );
-		trigger_error( print_r( $backtrace, 1 ) );// Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+		trigger_error( print_r( $backtrace, 1 ) ); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
 		// Alternatively we could dump this to a file.
 	}
 }

includes/frontend/class-tracking-abstract.php

Indentation +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
      * @return array Array of the options to use.
      */
     public function frontend_tracking_options( ) {
-        return array();
+	return array();
     }
 
     /**
@@ -74,6 +74,6 @@ 
      * @return string Javascript to output.
      */
     public function frontend_output( ) {
-         return "<!-- MonsterInsights Abstract Tracking class -->";
+	 return "<!-- MonsterInsights Abstract Tracking class -->";
     }
 }
\ No newline at end of file

includes/admin/capabilities.php

Indentation +42 added lines, -42 removed lines

@@ -35,54 +35,54 @@
 function monsterinsights_add_capabilities( $caps, $cap, $user_id, $args ) {
  
     switch( $cap ) {
-        case 'monsterinsights_view_dashboard' :
-            $roles = monsterinsights_get_option( 'view_reports', array() );
+	case 'monsterinsights_view_dashboard' :
+	    $roles = monsterinsights_get_option( 'view_reports', array() );
 
-            $user_can_via_settings = false;
-            if ( ! empty( $roles ) && is_array( $roles ) ) {
-                foreach ( $roles as $role ) {
-                    if ( is_string( $role ) ) {
-                        if ( user_can( $user_id, $role ) ) {
-                            $user_can_via_settings = true;
-                            break;
-                        }
-                    }
-                }
-            } else if ( ! empty( $roles ) && is_string( $roles ) ) {
-                if ( user_can( $user_id, $roles ) ) {
-                    $user_can_via_settings = true;
-                }
-            }
+	    $user_can_via_settings = false;
+	    if ( ! empty( $roles ) && is_array( $roles ) ) {
+		foreach ( $roles as $role ) {
+		    if ( is_string( $role ) ) {
+			if ( user_can( $user_id, $role ) ) {
+			    $user_can_via_settings = true;
+			    break;
+			}
+		    }
+		}
+	    } else if ( ! empty( $roles ) && is_string( $roles ) ) {
+		if ( user_can( $user_id, $roles ) ) {
+		    $user_can_via_settings = true;
+		}
+	    }
 
-            if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
-                $caps = array();
-            }
+	    if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
+		$caps = array();
+	    }
             
-            break;
-         case 'monsterinsights_save_settings' :
-            $roles = monsterinsights_get_option( 'save_settings', array() );
+	    break;
+	 case 'monsterinsights_save_settings' :
+	    $roles = monsterinsights_get_option( 'save_settings', array() );
 
-            $user_can_via_settings = false;
-            if ( ! empty( $roles ) && is_array( $roles ) ) {
-                foreach ( $roles as $role ) {
-                    if ( is_string( $role ) ) {
-                        if ( user_can( $user_id, $role ) ) {
-                            $user_can_via_settings = true;
-                            break;
-                        }
-                    }
-                }
-            } else if ( ! empty( $roles ) && is_string( $roles ) ) {
-                 if ( user_can( $user_id, $roles ) ) {
-                    $user_can_via_settings = true;
-                }
-            }
+	    $user_can_via_settings = false;
+	    if ( ! empty( $roles ) && is_array( $roles ) ) {
+		foreach ( $roles as $role ) {
+		    if ( is_string( $role ) ) {
+			if ( user_can( $user_id, $role ) ) {
+			    $user_can_via_settings = true;
+			    break;
+			}
+		    }
+		}
+	    } else if ( ! empty( $roles ) && is_string( $roles ) ) {
+		 if ( user_can( $user_id, $roles ) ) {
+		    $user_can_via_settings = true;
+		}
+	    }
 
-            if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
-                $caps = array();
-            }
+	    if ( user_can( $user_id, 'manage_options' ) || $user_can_via_settings ) {
+		$caps = array();
+	    }
 
-            break;
+	    break;
     }
     return $caps;
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
  */
 function monsterinsights_add_capabilities( $caps, $cap, $user_id, $args ) {
  
-    switch( $cap ) {
+    switch ( $cap ) {
         case 'monsterinsights_view_dashboard' :
             $roles = monsterinsights_get_option( 'view_reports', array() );
 
@@ -86,4 +86,4 @@ 
     }
     return $caps;
 }
-add_filter( 'map_meta_cap','monsterinsights_add_capabilities', 10, 4 );
\ No newline at end of file
+add_filter( 'map_meta_cap', 'monsterinsights_add_capabilities', 10, 4 );
\ No newline at end of file

includes/admin/reporting.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 	}
 
-	public function add_report( $report = false ){
+	public function add_report( $report = false ) {
 		if ( empty( $report ) || ! is_object( $report ) ) {
 			return;
 		}

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 	}
 
-	public function add_report( $report = false ){
+	public function add_report( $report = false ) {
 		if ( empty( $report ) || ! is_object( $report ) ) {
 			return;
 		}

includes/admin/reports/abstract-report.php

Braces +5 added lines, -5 removed lines

@@ -34,13 +34,13 @@ 
 	}
 
 	// Let's get the HTML to output for a particular report. This is not the AJAX endpoint. Args can hold things (generally start/end date range)
-	protected function get_report_html( $args = array() ) { 
+	protected function get_report_html( $args = array() ) {
 		/* Defined in the report class */ 
 		// For ajax, args start, end, and data will be set with the data to use. Else call $this->get_data( array( 'default' => true ) )
 		return ''; 
 	}
 
-	public function additional_data(){
+	public function additional_data() {
 		return array();
 	}
 
@@ -54,7 +54,7 @@ 
 			return monsterinsights_get_message( 'error', esc_html__( 'Access denied' , 'google-analytics-for-wordpress' ) );
 		}
 
-		if ( monsterinsights_get_option( 'dashboard_disabled', false ) ) { 
+		if ( monsterinsights_get_option( 'dashboard_disabled', false ) ) {
 			if ( current_user_can( 'monsterinsights_save_settings' ) ) {
 				$url = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_settings' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 				return monsterinsights_get_message( 'error',
@@ -69,7 +69,7 @@ 
 			}
 		}
 
-		if ( monsterinsights_is_pro_version() ){
+		if ( monsterinsights_is_pro_version() ) {
 			if ( ! MonsterInsights()->license->has_license() ) {
 				$url = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_settings' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
 				return monsterinsights_get_message( 'error', esc_html__( 'You do not have an active license. Please %1$scheck your license configuration.%2$s', 'google-analytics-for-wordpress' ),'<a href="' . $url . '">','</a>' );
@@ -351,7 +351,7 @@ 
 if ( ! class_exists( 'MonsterInsightsDateTime' ) ) {
 	class MonsterInsightsDateTime extends DateTime {
 		public static function createFromFormat( $format, $time, $timezone = null ) {
-			if ( ! $timezone ) { 
+			if ( ! $timezone ) {
 				$timezone = new DateTimeZone( date_default_timezone_get() );
 			}
 			if ( version_compare( PHP_VERSION, '5.3', '>=' ) ) {

Spacing +32 added lines, -32 removed lines

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

includes/auth.php

Spacing +21 added lines, -21 removed lines

@@ -18,7 +18,7 @@ 
 
 final class MonsterInsights_Auth {
 
-	private $profile  = array();
+	private $profile = array();
 	private $network = array();
 
 	/**
@@ -67,17 +67,17 @@ 
 		}
 	}
 
-	public function set_analytics_profile( $data = array() ){
+	public function set_analytics_profile( $data = array() ) {
 		update_option( 'monsterinsights_site_profile', $data );
-		$this->profile      = $data;
+		$this->profile = $data;
 	}
 
-	public function set_network_analytics_profile( $data = array() ){
+	public function set_network_analytics_profile( $data = array() ) {
 		update_site_option( 'monsterinsights_network_profile', $data );
-		$this->network      = $data;
+		$this->network = $data;
 	}
 
-	public function delete_analytics_profile( $migrate = true ){
+	public function delete_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->profile['ua'] ) ) {
@@ -91,7 +91,7 @@ 
 		}
 	}
 
-	public function delete_network_analytics_profile( $migrate = true ){
+	public function delete_network_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->network['ua'] ) ) {
@@ -124,7 +124,7 @@ 
 		
 		do_action( 'monsterinsights_reports_delete_aggregate_data' );
 
-		$this->profile      = $data;
+		$this->profile = $data;
 		$this->set_analytics_profile( $data );
 	}
 
@@ -181,55 +181,55 @@ 
 		return ! empty( $this->network['ua'] ) ? monsterinsights_is_valid_ua( $this->network['ua'] ) : '';
 	}
 
-	public function get_viewname(){
+	public function get_viewname() {
 		return ! empty( $this->profile['viewname'] ) ? $this->profile['viewname'] : '';
 	}
 
-	public function get_network_viewname(){
+	public function get_network_viewname() {
 		return ! empty( $this->network['viewname'] ) ? $this->network['viewname'] : '';
 	}
 
-	public function get_accountid(){
+	public function get_accountid() {
 		return ! empty( $this->profile['a'] ) ? $this->profile['a'] : '';
 	}
 
-	public function get_network_accountid(){
+	public function get_network_accountid() {
 		return ! empty( $this->network['a'] ) ? $this->network['a'] : '';
 	}
 
-	public function get_propertyid(){
+	public function get_propertyid() {
 		return ! empty( $this->profile['w'] ) ? $this->profile['w'] : '';
 	}
 
-	public function get_network_propertyid(){
+	public function get_network_propertyid() {
 		return ! empty( $this->network['w'] ) ? $this->network['w'] : '';
 	}
 
-	public function get_viewid(){ // also known as profileID
+	public function get_viewid() { // also known as profileID
 		return ! empty( $this->profile['p'] ) ? $this->profile['p'] : '';
 	}
 
-	public function get_network_viewid(){ // also known as profileID
+	public function get_network_viewid() { // also known as profileID
 		return ! empty( $this->network['p'] ) ? $this->network['p'] : '';
 	}
 
-	public function get_key(){
+	public function get_key() {
 		return ! empty( $this->profile['key'] ) ? $this->profile['key'] : '';
 	}
 
-	public function get_network_key(){
+	public function get_network_key() {
 		return ! empty( $this->network['key'] ) ? $this->network['key'] : '';
 	}
 
-	public function get_token(){
+	public function get_token() {
 		return ! empty( $this->profile['token'] ) ? $this->profile['token'] : '';
 	}
 
-	public function get_network_token(){
+	public function get_network_token() {
 		return ! empty( $this->network['token'] ) ? $this->network['token'] : '';
 	}
 
-	public function get_referral_url(){
+	public function get_referral_url() {
 		$url = '';
 
 		if ( $this->is_authed() ) {

Braces +19 added lines, -17 removed lines

@@ -67,17 +67,17 @@ 
 		}
 	}
 
-	public function set_analytics_profile( $data = array() ){
+	public function set_analytics_profile( $data = array() ) {
 		update_option( 'monsterinsights_site_profile', $data );
 		$this->profile      = $data;
 	}
 
-	public function set_network_analytics_profile( $data = array() ){
+	public function set_network_analytics_profile( $data = array() ) {
 		update_site_option( 'monsterinsights_network_profile', $data );
 		$this->network      = $data;
 	}
 
-	public function delete_analytics_profile( $migrate = true ){
+	public function delete_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->profile['ua'] ) ) {
@@ -91,7 +91,7 @@ 
 		}
 	}
 
-	public function delete_network_analytics_profile( $migrate = true ){
+	public function delete_network_analytics_profile( $migrate = true ) {
 		if ( $migrate ) {
 			$newdata = array();
 			if ( isset( $this->network['ua'] ) ) {
@@ -181,55 +181,57 @@ 
 		return ! empty( $this->network['ua'] ) ? monsterinsights_is_valid_ua( $this->network['ua'] ) : '';
 	}
 
-	public function get_viewname(){
+	public function get_viewname() {
 		return ! empty( $this->profile['viewname'] ) ? $this->profile['viewname'] : '';
 	}
 
-	public function get_network_viewname(){
+	public function get_network_viewname() {
 		return ! empty( $this->network['viewname'] ) ? $this->network['viewname'] : '';
 	}
 
-	public function get_accountid(){
+	public function get_accountid() {
 		return ! empty( $this->profile['a'] ) ? $this->profile['a'] : '';
 	}
 
-	public function get_network_accountid(){
+	public function get_network_accountid() {
 		return ! empty( $this->network['a'] ) ? $this->network['a'] : '';
 	}
 
-	public function get_propertyid(){
+	public function get_propertyid() {
 		return ! empty( $this->profile['w'] ) ? $this->profile['w'] : '';
 	}
 
-	public function get_network_propertyid(){
+	public function get_network_propertyid() {
 		return ! empty( $this->network['w'] ) ? $this->network['w'] : '';
 	}
 
-	public function get_viewid(){ // also known as profileID
+	public function get_viewid() {
+// also known as profileID
 		return ! empty( $this->profile['p'] ) ? $this->profile['p'] : '';
 	}
 
-	public function get_network_viewid(){ // also known as profileID
+	public function get_network_viewid() {
+// also known as profileID
 		return ! empty( $this->network['p'] ) ? $this->network['p'] : '';
 	}
 
-	public function get_key(){
+	public function get_key() {
 		return ! empty( $this->profile['key'] ) ? $this->profile['key'] : '';
 	}
 
-	public function get_network_key(){
+	public function get_network_key() {
 		return ! empty( $this->network['key'] ) ? $this->network['key'] : '';
 	}
 
-	public function get_token(){
+	public function get_token() {
 		return ! empty( $this->profile['token'] ) ? $this->profile['token'] : '';
 	}
 
-	public function get_network_token(){
+	public function get_network_token() {
 		return ! empty( $this->network['token'] ) ? $this->network['token'] : '';
 	}
 
-	public function get_referral_url(){
+	public function get_referral_url() {
 		$url = '';
 
 		if ( $this->is_authed() ) {

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

Spacing +1 added lines, -1 removed lines

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

Braces +1 added lines, -1 removed lines

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