awesomemotive / google-analytics-for-wordpress

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 );
@@ -319,7 +319,7 @@ 
 						<span class="am-deactivate-survey-desc">
 							<?php
 							// Translators: Placeholder for the plugin name.
-							echo sprintf( esc_html__('If you have a moment, please share why you are deactivating %s:', 'google-analytics-for-wordpress' ), $this->name );
+							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">
@@ -339,13 +339,13 @@ 
 							<button type="submit" class="am-deactivate-survey-submit button button-primary button-large">
 								<?php
 								// Translators: Adds an ampersand.
-								echo sprintf( esc_html__('Submit %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' );
+								echo sprintf( esc_html__( 'Submit %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' );
 								?>
 							</button>
 							<a href="#" class="am-deactivate-survey-deactivate">
 								<?php
 								// Translators: Adds an ampersand.
-								echo sprintf( esc_html__('Skip %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' );
+								echo sprintf( esc_html__( 'Skip %s Deactivate', 'google-analytics-for-wordpress' ), '&amp;' );
 								?>
 							</a>
 						</div>

includes/emails/class-emails.php

Spacing +12 added lines, -12 removed lines

@@ -193,7 +193,7 @@ 
 
 			foreach ( $addresses as $key => $address ) {
 				if ( ! is_email( $address ) ) {
-					unset( $addresses[ $key ] );
+					unset( $addresses[$key] );
 				}
 			}
 
@@ -294,11 +294,11 @@ 
 				continue;
 			}
 
-			if ( ! isset( $this->args[ $type ] ) || ! is_array( $this->args[ $type ] ) ) {
-				$this->args[ $type ] = array();
+			if ( ! isset( $this->args[$type] ) || ! is_array( $this->args[$type] ) ) {
+				$this->args[$type] = array();
 			}
 
-			$this->args[ $type ] = $merge ? array_merge( $this->args[ $type ], $value ) : $value;
+			$this->args[$type] = $merge ? array_merge( $this->args[$type], $value ) : $value;
 		}
 
 		return $this;
@@ -315,7 +315,7 @@ 
 	 */
 	public function get_args( $type ) {
 		if ( ! empty( $type ) ) {
-			return isset( $this->args[ $type ] ) ? apply_filters( 'monsterinsights_emails_templates_get_args_' . $type, $this->args[ $type ], $this ) : array();
+			return isset( $this->args[$type] ) ? apply_filters( 'monsterinsights_emails_templates_get_args_' . $type, $this->args[$type], $this ) : array();
 		}
 
 		return apply_filters( 'monsterinsights_emails_templates_get_args', $this->args, $this );
@@ -330,12 +330,12 @@ 
 	 *
 	 * @return string
 	 */
-	public function build_email( $message=null ) {
+	public function build_email( $message = null ) {
 		// process plain text email
 		if ( false === $this->html ) {
-			$body 		= $this->get_template_part( 'body', $this->get_template(), true );
-			$body 	 	= wp_strip_all_tags( $body );
-			$message 	= str_replace( '{email}', $message, $body );
+			$body = $this->get_template_part( 'body', $this->get_template(), true );
+			$body = wp_strip_all_tags( $body );
+			$message = str_replace( '{email}', $message, $body );
 
 			return apply_filters( 'monsterinsights_email_message', $message, $this );
 		}
@@ -358,7 +358,7 @@ 
 		do_action( 'monsterinsights_email_footer', $email_parts['footer'] );
 
 
-		$body 	 = implode( $email_parts );
+		$body = implode( $email_parts );
 		$message = $this->process_tag( $message, false );
 		$message = nl2br( $message );
 		$message = str_replace( '{email}', $message, $body );
@@ -379,7 +379,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function send( $to, $subject, $message=null, $attachments = array() ) {
+	public function send( $to, $subject, $message = null, $attachments = array() ) {
 
 		if ( ! did_action( 'init' ) && ! did_action( 'admin_init' ) ) {
 			_doing_it_wrong( __FUNCTION__, esc_html__( 'You cannot send emails with MI_WP_Emails() until init/admin_init has been reached.', 'google-analytics-for-wordpress' ), null );
@@ -510,7 +510,7 @@ 
 			$this->template = 'default';
 		}
 
-		return apply_filters( 'monsterinsights_email_template', $this->template);
+		return apply_filters( 'monsterinsights_email_template', $this->template );
 	}
 
 	/**

includes/admin/admin.php

Braces +1 added lines, -1 removed lines

@@ -303,7 +303,7 @@
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
         $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
+        if ( MonsterInsights()->license->get_site_license_key() ) {
             if ( MonsterInsights()->license->site_license_expired() ) {
 	            // Translators: Adds a link to the license renewal.
                 $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );

Indentation +163 added lines, -163 removed lines

@@ -27,22 +27,22 @@ 
     $menu_icon_inline = monsterinsights_get_inline_menu_icon();
 
     if ( $hook === 'monsterinsights_settings' ) {
-        // If dashboards disabled, first settings page
-        add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  $menu_icon_inline, '100.00013467543' );
-        $hook = 'monsterinsights_settings';
+	// If dashboards disabled, first settings page
+	add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  $menu_icon_inline, '100.00013467543' );
+	$hook = 'monsterinsights_settings';
 
-        add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
+	add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
     } else {
-        // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  $menu_icon_inline, '100.00013467543' );
+	// if dashboards enabled, first dashboard
+	add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  $menu_icon_inline, '100.00013467543' );
 
-        add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
+	add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
 
-        // then settings page
-        add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' );
+	// then settings page
+	add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page' );
 
-        // Add dashboard submenu.
-        add_submenu_page( 'index.php', __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'admin.php?page=monsterinsights_reports' );
+	// Add dashboard submenu.
+	add_submenu_page( 'index.php', __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'admin.php?page=monsterinsights_reports' );
     }
 
     $submenu_base = add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) );
@@ -51,9 +51,9 @@ 
 	add_submenu_page( $hook, __( 'Popular Posts:', 'google-analytics-for-wordpress' ), __( 'Popular Posts', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', $submenu_base . '#/popular-posts' );
 
     if ( function_exists( 'aioseo' ) ) {
-        $seo_url = monsterinsights_aioseo_dashboard_url();
+	$seo_url = monsterinsights_aioseo_dashboard_url();
     } else {
-        $seo_url = $submenu_base . '#/seo';
+	$seo_url = $submenu_base . '#/seo';
     }
     // then SEO
     add_submenu_page( $hook, __( 'SEO', 'google-analytics-for-wordpress' ), __( 'SEO', 'google-analytics-for-wordpress' ), 'manage_options', $seo_url );
@@ -64,7 +64,7 @@ 
     // then addons
     $network_key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_network_license_key() : '';
     if ( ! monsterinsights_is_network_active() || ( monsterinsights_is_network_active() && empty( $network_key ) ) ) {
-        add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons' );
+	add_submenu_page( $hook, __( 'Addons:', 'google-analytics-for-wordpress' ), '<span style="color:' . monsterinsights_menu_highlight_color() . '"> ' . __( 'Addons', 'google-analytics-for-wordpress' ) . '</span>', 'monsterinsights_save_settings', $submenu_base . '#/addons' );
     }
 
     // Add About us page.
@@ -97,9 +97,9 @@ 
 function monsterinsights_get_menu_hook() {
     $dashboards_disabled = monsterinsights_get_option( 'dashboards_disabled', false );
     if ( $dashboards_disabled || ( current_user_can( 'monsterinsights_save_settings' ) && ! current_user_can( 'monsterinsights_view_dashboard' ) ) ) {
-        return 'monsterinsights_settings';
+	return 'monsterinsights_settings';
     } else {
-        return 'monsterinsights_reports';
+	return 'monsterinsights_reports';
     }
 }
 
@@ -110,12 +110,12 @@ 
     // First, let's see if this is an MS network enabled plugin. If it is, we should load the license
     // menu page and the updater on the network panel
     if ( ! function_exists( 'is_plugin_active_for_network' ) ) {
-        require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
+	require_once( ABSPATH . '/wp-admin/includes/plugin.php' );
     }
 
     $plugin = plugin_basename( MONSTERINSIGHTS_PLUGIN_FILE );
     if ( ! is_plugin_active_for_network( $plugin ) ) {
-        return;
+	return;
     }
 
     $menu_icon_inline = monsterinsights_get_inline_menu_icon();
@@ -128,9 +128,9 @@ 
     add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
 
     if ( function_exists( 'aioseo' ) ) {
-        $seo_url = monsterinsights_aioseo_dashboard_url();
+	$seo_url = monsterinsights_aioseo_dashboard_url();
     } else {
-        $seo_url = $submenu_base . '#/seo';
+	$seo_url = $submenu_base . '#/seo';
     }
     // then seo
     add_submenu_page( $hook, __( 'SEO:', 'google-analytics-for-wordpress' ), __( 'SEO', 'google-analytics-for-wordpress' ), 'manage_options', $seo_url, 'monsterinsights_seo_page' );
@@ -154,7 +154,7 @@ 
 function monsterinsights_add_admin_body_class( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
     if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) === false ) {
-        return $classes;
+	return $classes;
     }
 
     return "$classes monsterinsights_page ";
@@ -171,7 +171,7 @@ 
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
 
     if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id  ) {
-        return $classes;
+	return $classes;
     }
 
     return "$classes insights_page_monsterinsights_tools ";
@@ -187,7 +187,7 @@ 
 function monsterinsights_add_admin_body_class_addons_page( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
     if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id  ) {
-        return $classes;
+	return $classes;
     }
 
     return "$classes insights_page_monsterinsights_addons ";
@@ -207,11 +207,11 @@ 
 
     // If Lite, support goes to forum. If pro, it goes to our website
     if ( monsterinsights_is_pro_version() ) {
-        $support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );
+	$support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $support );
     } else {
-        $support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
-        array_unshift( $links, $support );
+	$support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+	array_unshift( $links, $support );
     }
 
 	if ( is_network_admin() ) {
@@ -246,26 +246,26 @@ 
 function monsterinsights_load_admin_partial( $template, $data = array() ) {
 
     if ( monsterinsights_is_pro_version() ) {
-        $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
 
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
-            return true;
-        }
+	if ( file_exists( $dir . $template . '.php' ) ) {
+	    require_once(  $dir . $template . '.php' );
+	    return true;
+	}
     } else {
-        $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
+	$dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
 
-        if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
-            return true;
-        }
+	if ( file_exists( $dir . $template . '.php' ) ) {
+	    require_once(  $dir . $template . '.php' );
+	    return true;
+	}
     }
 
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
-        return true;
+	require_once(  $dir . $template . '.php' );
+	return true;
     }
 
     return false;
@@ -282,9 +282,9 @@ 
 function monsterinsights_admin_footer( $text ) {
     global $current_screen;
     if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
-        $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
-        // Translators: Placeholders add a link to the wordpress.org repository.
-        $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+	$url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
+	// Translators: Placeholders add a link to the wordpress.org repository.
+	$text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -295,12 +295,12 @@ 
     // Don't show on MonsterInsights pages
     $screen = get_current_screen();
     if ( empty( $screen->id ) || strpos( $screen->id, 'monsterinsights' ) !== false ) {
-        return;
+	return;
     }
 
     // Make sure they have the permissions to do something
     if ( ! current_user_can( 'monsterinsights_save_settings' ) ) {
-        return;
+	return;
     }
 
     // Priority:
@@ -318,58 +318,58 @@ 
     // 1. Google Analytics not authenticated
 	if ( ! is_network_admin() && ! monsterinsights_get_ua() && ! monsterinsights_get_v4_id() && ! defined( 'MONSTERINSIGHTS_DISABLE_TRACKING' ) ) {
 
-        $submenu_base = is_network_admin() ? add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) ) : add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) );
-        $title     = esc_html__( 'Please Setup Website Analytics to See Audience Insights', 'google-analytics-for-wordpress' );
-        $primary   = esc_html__( 'Connect MonsterInsights and Setup Website Analytics', 'google-analytics-for-wordpress' );
-        $urlone    = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights-onboarding' ) : admin_url( 'admin.php?page=monsterinsights-onboarding' );
-        $secondary = esc_html__( 'Learn More', 'google-analytics-for-wordpress' );
-        $urltwo    = $submenu_base . '#/about/getting-started';
-        $message   = esc_html__( 'MonsterInsights, WordPress analytics plugin, helps you connect your website with Google Analytics, so you can see how people find and use your website. Over 3 million website owners use MonsterInsights to see the stats that matter and grow their business.', 'google-analytics-for-wordpress' );
-        echo '<div class="notice notice-info"><p style="font-weight:700">'. $title .'</p><p>'. $message.'</p><p><a href="'. $urlone .'" class="button-primary">'. $primary .'</a>&nbsp;&nbsp;&nbsp;<a href="'. $urltwo .'" class="button-secondary">'. $secondary .'</a></p></div>';
-        return;
+	$submenu_base = is_network_admin() ? add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) ) : add_query_arg( 'page', 'monsterinsights_settings', admin_url( 'admin.php' ) );
+	$title     = esc_html__( 'Please Setup Website Analytics to See Audience Insights', 'google-analytics-for-wordpress' );
+	$primary   = esc_html__( 'Connect MonsterInsights and Setup Website Analytics', 'google-analytics-for-wordpress' );
+	$urlone    = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights-onboarding' ) : admin_url( 'admin.php?page=monsterinsights-onboarding' );
+	$secondary = esc_html__( 'Learn More', 'google-analytics-for-wordpress' );
+	$urltwo    = $submenu_base . '#/about/getting-started';
+	$message   = esc_html__( 'MonsterInsights, WordPress analytics plugin, helps you connect your website with Google Analytics, so you can see how people find and use your website. Over 3 million website owners use MonsterInsights to see the stats that matter and grow their business.', 'google-analytics-for-wordpress' );
+	echo '<div class="notice notice-info"><p style="font-weight:700">'. $title .'</p><p>'. $message.'</p><p><a href="'. $urlone .'" class="button-primary">'. $primary .'</a>&nbsp;&nbsp;&nbsp;<a href="'. $urltwo .'" class="button-secondary">'. $secondary .'</a></p></div>';
+	return;
     }
 
     // 2. License key not entered for pro
     $key = monsterinsights_is_pro_version() ? MonsterInsights()->license->get_license_key() : '';
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
-        $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-        // Translators: Adds a link to retrieve the license.
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
-        return;
+	$page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
+	// Translators: Adds a link to retrieve the license.
+	$message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
+	echo '<div class="error"><p>'. $message.'</p></div>';
+	return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
-        $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
-            if ( MonsterInsights()->license->site_license_expired() ) {
-	            // Translators: Adds a link to the license renewal.
-                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
-            } else if ( MonsterInsights()->license->site_license_disabled() ) {
-                $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
-            } else if ( MonsterInsights()->license->site_license_invalid() ) {
-                $message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
-            }
-        } else if ( MonsterInsights()->license->get_network_license_key() ) {
-            if ( MonsterInsights()->license->network_license_expired() ) {
-            	// Translators: Adds a link to renew license.
-                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
-            } else if ( MonsterInsights()->license->network_license_disabled() ) {
-                $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
-            } else if ( MonsterInsights()->license->network_license_invalid() ) {
-                $message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
-            }
-        }
-        if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
-            return;
-        }
+	$message = '';
+	if ( MonsterInsights()->license->get_site_license_key() ){
+	    if ( MonsterInsights()->license->site_license_expired() ) {
+		    // Translators: Adds a link to the license renewal.
+		$message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+	    } else if ( MonsterInsights()->license->site_license_disabled() ) {
+		$message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+	    } else if ( MonsterInsights()->license->site_license_invalid() ) {
+		$message = esc_html__( 'Your license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
+	    }
+	} else if ( MonsterInsights()->license->get_network_license_key() ) {
+	    if ( MonsterInsights()->license->network_license_expired() ) {
+	    	// Translators: Adds a link to renew license.
+		$message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+	    } else if ( MonsterInsights()->license->network_license_disabled() ) {
+		$message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
+	    } else if ( MonsterInsights()->license->network_license_invalid() ) {
+		$message = esc_html__( 'Your network license key for MonsterInsights is invalid. The key no longer exists or the user associated with the key has been deleted. Please use a different key.', 'google-analytics-for-wordpress' );
+	    }
+	}
+	if ( ! empty( $message ) ) {
+	    echo '<div class="error"><p>'. $message.'</p></div>';
+	    return;
+	}
     }
 
     // 4. Notices for PHP/WP version deprecations
     if ( current_user_can( 'update_core' ) ) {
-        global $wp_version;
+	global $wp_version;
 
 	    $compatible_php_version = apply_filters( 'monsterinsights_compatible_php_version', false );
 	    $compatible_wp_version  = apply_filters( 'monsterinsights_compatible_wp_version', false );
@@ -393,28 +393,28 @@ 
 		    return;
 	    }
 
-        // WordPress 4.9
-        /* else if ( version_compare( $wp_version, '5.0', '<' ) ) {
+	// WordPress 4.9
+	/* else if ( version_compare( $wp_version, '5.0', '<' ) ) {
             $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' );
             // Translators: Placeholders add the current WordPress version and links to the MonsterInsights blog
             $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 5.0 in 2021.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
             echo '<div class="error"><p>'. $message.'</p></div>';
             return;
         } */
-        // PHP 5.4/5.5
-        // else if ( version_compare( phpversion(), '5.6', '<' ) ) {
-        //  $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' );
-        //  $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress will stop supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
-        //  echo '<div class="error"><p>'. $message.'</p></div>';
-        //  return;
-        // }
-        // // WordPress 4.6 - 4.8
-        // else if ( version_compare( $wp_version, '4.9', '<' ) ) {
-        //  $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' );
-        //  $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.9 in October, 2019.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
-        //  echo '<div class="error"><p>'. $message.'</p></div>';
-        //  return;
-        // }
+	// PHP 5.4/5.5
+	// else if ( version_compare( phpversion(), '5.6', '<' ) ) {
+	//  $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-php/' );
+	//  $message = sprintf( esc_html__( 'Your site is running an outdated, insecure version of PHP (%1$s), which could be putting your site at risk for being hacked.%4$sWordPress will stop supporting your PHP version in April, 2019.%4$sUpdating PHP only takes a few minutes and will make your website significantly faster and more secure.%4$s%2$sLearn more about updating PHP%3$s', 'google-analytics-for-wordpress' ), phpversion(), '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
+	//  echo '<div class="error"><p>'. $message.'</p></div>';
+	//  return;
+	// }
+	// // WordPress 4.6 - 4.8
+	// else if ( version_compare( $wp_version, '4.9', '<' ) ) {
+	//  $url = monsterinsights_get_url( 'global-notice', 'settings-page', 'https://www.monsterinsights.com/docs/update-wordpress/' );
+	//  $message = sprintf( esc_html__( 'Your site is running an outdated version of WordPress (%1$s).%4$sMonsterInsights will stop supporting WordPress versions lower than 4.9 in October, 2019.%4$sUpdating WordPress takes just a few minutes and will also solve many bugs that exist in your WordPress install.%4$s%2$sLearn more about updating WordPress%3$s', 'google-analytics-for-wordpress' ), $wp_version, '<a href="' . $url . '" target="_blank">', '</a>', '<br>' );
+	//  echo '<div class="error"><p>'. $message.'</p></div>';
+	//  return;
+	// }
     }
 
     // 5. Optin setting not configured
@@ -444,7 +444,7 @@ 
 
     $notices   = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
-        $notices = array();
+	$notices = array();
     }
 
     // 6. Authenticate, not manual
@@ -488,75 +488,75 @@ 
 
     // 8. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) {
-            echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
-                echo '<div class="monsterinsights-wooedd-upsell-left">';
-                    echo '<p><strong>';
-                    echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' );
-                    echo '</strong></p>';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                    echo '<p>';
-                    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    // Translators: Placeholders add a link to the MonsterInsights website.
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' );
-                    echo '</p>';
-                echo '</div><div class="monsterinsights-wooedd-upsell-right">';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                echo '</div>';
-            echo '</div>';
-            echo '<style type="text/css">.monsterinsights-wooedd-upsell-left{width:50%;display:table-cell;float:left}.monsterinsights-wooedd-upsell-right{width:50%;display:table-cell;float:left}.monsterinsights-wooedd-upsell-image{width:100%;height:auto;padding:20px}.monsterinsights-wooedd-upsell-image-small{display:none}.monsterinsights-wooedd-upsell-row{display:table}.monsterinsights-wooedd-upsell-left p{margin:1em 0;font-size:16px}@media (max-width:900px){.monsterinsights-wooedd-upsell-left{width:100%}.monsterinsights-wooedd-upsell-right{display:none}.monsterinsights-wooedd-upsell-image-small{display:block}.monsterinsights-wooedd-upsell-image-large{display:none}}</style>';
-            return;
-        }
+	if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) {
+	    echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
+		echo '<div class="monsterinsights-wooedd-upsell-left">';
+		    echo '<p><strong>';
+		    echo esc_html( 'Enhanced Ecommerce Analytics for Your WooCommerce Store', 'google-analytics-for-wordpress' );
+		    echo '</strong></p>';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		    echo '<p>';
+		    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    // Translators: Placeholders add a link to the MonsterInsights website.
+		    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' );
+		    echo '</p>';
+		echo '</div><div class="monsterinsights-wooedd-upsell-right">';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		echo '</div>';
+	    echo '</div>';
+	    echo '<style type="text/css">.monsterinsights-wooedd-upsell-left{width:50%;display:table-cell;float:left}.monsterinsights-wooedd-upsell-right{width:50%;display:table-cell;float:left}.monsterinsights-wooedd-upsell-image{width:100%;height:auto;padding:20px}.monsterinsights-wooedd-upsell-image-small{display:none}.monsterinsights-wooedd-upsell-row{display:table}.monsterinsights-wooedd-upsell-left p{margin:1em 0;font-size:16px}@media (max-width:900px){.monsterinsights-wooedd-upsell-left{width:100%}.monsterinsights-wooedd-upsell-right{display:none}.monsterinsights-wooedd-upsell-image-small{display:block}.monsterinsights-wooedd-upsell-image-large{display:none}}</style>';
+	    return;
+	}
     }
 
     // 9. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) {
-            echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
-                echo '<div class="monsterinsights-wooedd-upsell-left">';
-                    echo '<p><strong>';
-                    echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' );
-                    echo '</strong></p>';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                    echo '<p>';
-                    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo '<p>';
-                    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
-                    echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' );
-                    echo '</p>';
-                echo '</div><div class="monsterinsights-wooedd-upsell-right">';
-                    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
-                echo '</div>';
-            echo '</div>';
-            return;
-        }
+	if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) {
+	    echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
+		echo '<div class="monsterinsights-wooedd-upsell-left">';
+		    echo '<p><strong>';
+		    echo esc_html( 'Enhanced Ecommerce Analytics for Your Easy Digital Downloads Store', 'google-analytics-for-wordpress' );
+		    echo '</strong></p>';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-small" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		    echo '<p>';
+		    echo esc_html( 'MonsterInsights Pro gives you detailed stats and insights about your customers.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'This helps you make data-driven decisions about your content, and marketing strategy so you can increase your website traffic, leads, and sales.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Pro customers also get Form Tracking, Custom Dimensions Tracking, UserID Tracking and much more.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo '<p>';
+		    echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
+		    echo '</p>';
+		    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' );
+		    echo '</p>';
+		echo '</div><div class="monsterinsights-wooedd-upsell-right">';
+		    echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
+		echo '</div>';
+	    echo '</div>';
+	    return;
+	}
     }
 
     if ( isset( $notices['monsterinsights_cross_domains_extracted'] ) && false === $notices['monsterinsights_cross_domains_extracted'] ) {
-        $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
-        $page = $page . '#/advanced';
-        // Translators: Adds a link to the settings panel.
-        $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>'. $message.'</p></div>';
-        return;
+	$page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
+	$page = $page . '#/advanced';
+	// Translators: Adds a link to the settings panel.
+	$message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
+	echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>'. $message.'</p></div>';
+	return;
     }
 }
 add_action( 'admin_notices', 'monsterinsights_admin_setup_notices' );
@@ -566,7 +566,7 @@ 
 // AM Notices
 function monsterinsights_am_notice_optout( $super_admin ) {
     if ( monsterinsights_get_option( 'hide_am_notices', false ) || monsterinsights_get_option( 'network_hide_am_notices', false ) ) {
-        return false;
+	return false;
     }
     return $super_admin;
 }

Spacing +30 added lines, -30 removed lines

@@ -28,13 +28,13 @@ 
 
     if ( $hook === 'monsterinsights_settings' ) {
         // If dashboards disabled, first settings page
-        add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page',  $menu_icon_inline, '100.00013467543' );
+        add_menu_page( __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_settings', 'monsterinsights_settings_page', $menu_icon_inline, '100.00013467543' );
         $hook = 'monsterinsights_settings';
 
         add_submenu_page( $hook, __( 'MonsterInsights', 'google-analytics-for-wordpress' ), __( 'Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_settings' );
     } else {
         // if dashboards enabled, first dashboard
-        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page',  $menu_icon_inline, '100.00013467543' );
+        add_menu_page( __( 'General:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page', $menu_icon_inline, '100.00013467543' );
 
         add_submenu_page( $hook, __( 'General Reports:', 'google-analytics-for-wordpress' ), __( 'Reports', 'google-analytics-for-wordpress' ), 'monsterinsights_view_dashboard', 'monsterinsights_reports', 'monsterinsights_reports_page' );
 
@@ -121,7 +121,7 @@ 
     $menu_icon_inline = monsterinsights_get_inline_menu_icon();
     $hook = 'monsterinsights_network';
     $submenu_base = add_query_arg( 'page', 'monsterinsights_network', network_admin_url( 'admin.php' ) );
-    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page',  $menu_icon_inline, '100.00013467543' );
+    add_menu_page( __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Insights', 'google-analytics-for-wordpress' ) . MonsterInsights()->notifications->get_menu_count(), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page', $menu_icon_inline, '100.00013467543' );
 
     add_submenu_page( $hook, __( 'Network Settings:', 'google-analytics-for-wordpress' ), __( 'Network Settings', 'google-analytics-for-wordpress' ), 'monsterinsights_save_settings', 'monsterinsights_network', 'monsterinsights_network_page' );
 
@@ -170,7 +170,7 @@ 
 function monsterinsights_add_admin_body_class_tools_page( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
 
-    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id  ) {
+    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_tools' ) === false || 'insights_page_monsterinsights_tools' === $screen->id ) {
         return $classes;
     }
 
@@ -186,7 +186,7 @@ 
  */
 function monsterinsights_add_admin_body_class_addons_page( $classes ) {
     $screen = function_exists( 'get_current_screen' ) ? get_current_screen() : false;
-    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id  ) {
+    if ( empty( $screen ) || empty( $screen->id ) || strpos( $screen->id, 'monsterinsights_addons' ) === false || 'insights_page_monsterinsights_addons' === $screen->id ) {
         return $classes;
     }
 
@@ -202,15 +202,15 @@ 
  * @return array $links
  */
 function monsterinsights_add_action_links( $links ) {
-    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="'. monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) .'">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
+    $docs = '<a title="' . esc_html__( 'MonsterInsights Knowledge Base', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_url( 'all-plugins', 'kb-link', "https://www.monsterinsights.com/docs/" ) . '">' . esc_html__( 'Documentation', 'google-analytics-for-wordpress' ) . '</a>';
     array_unshift( $links, $docs );
 
     // If Lite, support goes to forum. If pro, it goes to our website
     if ( monsterinsights_is_pro_version() ) {
-        $support = '<a title="MonsterInsights Pro Support" href="'. monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Pro Support" href="' . monsterinsights_get_url( 'all-plugins', 'pro-support-link', "https://www.monsterinsights.com/my-account/support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $support );
     } else {
-        $support = '<a title="MonsterInsights Lite Support" href="'. monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) .'">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
+        $support = '<a title="MonsterInsights Lite Support" href="' . monsterinsights_get_url( 'all-plugins', 'lite-support-link', "https://www.monsterinsights.com/lite-support/" ) . '">' . esc_html__( 'Support', 'google-analytics-for-wordpress' ) . '</a>';
         array_unshift( $links, $support );
     }
 
@@ -224,7 +224,7 @@ 
 
 	// If lite, show a link where they can get pro from
 	if ( ! monsterinsights_is_pro_version() ) {
-		$get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) .'" href="'. monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/lite/" ) .'" style="font-weight:700; color: #1da867;">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
+		$get_pro = '<a title="' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '" href="' . monsterinsights_get_upgrade_link( 'all-plugins', 'upgrade-link', "https://www.monsterinsights.com/lite/" ) . '" style="font-weight:700; color: #1da867;">' . esc_html__( 'Get MonsterInsights Pro', 'google-analytics-for-wordpress' ) . '</a>';
 		array_unshift( $links, $get_pro );
 	}
 
@@ -249,14 +249,14 @@ 
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'pro/includes/admin/partials' );
 
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     } else {
         $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'lite/includes/admin/partials' );
 
         if ( file_exists( $dir . $template . '.php' ) ) {
-            require_once(  $dir . $template . '.php' );
+            require_once( $dir . $template . '.php' );
             return true;
         }
     }
@@ -264,7 +264,7 @@ 
     $dir = trailingslashit( plugin_dir_path( MonsterInsights()->file ) . 'includes/admin/partials' );
 
     if ( file_exists( $dir . $template . '.php' ) ) {
-        require_once(  $dir . $template . '.php' );
+        require_once( $dir . $template . '.php' );
         return true;
     }
 
@@ -284,7 +284,7 @@ 
     if ( ! empty( $current_screen->id ) && strpos( $current_screen->id, 'monsterinsights' ) !== false ) {
         $url  = 'https://wordpress.org/support/view/plugin-reviews/google-analytics-for-wordpress?filter=5';
         // Translators: Placeholders add a link to the wordpress.org repository.
-        $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' .  $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
+        $text = sprintf( esc_html__( 'Please rate %1$sMonsterInsights%2$s on %3$s %4$sWordPress.org%5$s to help us spread the word. Thank you from the MonsterInsights team!', 'google-analytics-for-wordpress' ), '<strong>', '</strong>', '<a class="monsterinsights-no-text-decoration" href="' . $url . '" target="_blank" rel="noopener noreferrer"><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i><i class="monstericon-star"></i></a>', '<a href="' . $url . '" target="_blank" rel="noopener noreferrer">', '</a>' );
     }
     return $text;
 }
@@ -325,7 +325,7 @@ 
         $secondary = esc_html__( 'Learn More', 'google-analytics-for-wordpress' );
         $urltwo    = $submenu_base . '#/about/getting-started';
         $message   = esc_html__( 'MonsterInsights, WordPress analytics plugin, helps you connect your website with Google Analytics, so you can see how people find and use your website. Over 3 million website owners use MonsterInsights to see the stats that matter and grow their business.', 'google-analytics-for-wordpress' );
-        echo '<div class="notice notice-info"><p style="font-weight:700">'. $title .'</p><p>'. $message.'</p><p><a href="'. $urlone .'" class="button-primary">'. $primary .'</a>&nbsp;&nbsp;&nbsp;<a href="'. $urltwo .'" class="button-secondary">'. $secondary .'</a></p></div>';
+        echo '<div class="notice notice-info"><p style="font-weight:700">' . $title . '</p><p>' . $message . '</p><p><a href="' . $urlone . '" class="button-primary">' . $primary . '</a>&nbsp;&nbsp;&nbsp;<a href="' . $urltwo . '" class="button-secondary">' . $secondary . '</a></p></div>';
         return;
     }
 
@@ -334,18 +334,18 @@ 
     if ( monsterinsights_is_pro_version() && empty( $key ) ) {
         $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
         // Translators: Adds a link to retrieve the license.
-        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="error"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Warning: No valid license key has been entered for MonsterInsights. You are currently not getting updates, and are not able to view reports. %1$sPlease click here to enter your license key and begin receiving updates and reports.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
+        echo '<div class="error"><p>' . $message . '</p></div>';
         return;
     }
 
     // 3. License key not valid/okay for pro
     if ( monsterinsights_is_pro_version() ) {
         $message = '';
-        if ( MonsterInsights()->license->get_site_license_key() ){
+        if ( MonsterInsights()->license->get_site_license_key() ) {
             if ( MonsterInsights()->license->site_license_expired() ) {
 	            // Translators: Adds a link to the license renewal.
-                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->site_license_disabled() ) {
                 $message = esc_html__( 'Your license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->site_license_invalid() ) {
@@ -354,7 +354,7 @@ 
         } else if ( MonsterInsights()->license->get_network_license_key() ) {
             if ( MonsterInsights()->license->network_license_expired() ) {
             	// Translators: Adds a link to renew license.
-                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) .'" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
+                $message = sprintf( esc_html__( 'Your network license key for MonsterInsights has expired. %1$sPlease click here to renew your license key.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . monsterinsights_get_url( 'admin-notices', 'expired-license', "https://www.monsterinsights.com/login/" ) . '" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>' );
             } else if ( MonsterInsights()->license->network_license_disabled() ) {
                 $message = esc_html__( 'Your network license key for MonsterInsights has been disabled. Please use a different key.', 'google-analytics-for-wordpress' );
             } else if ( MonsterInsights()->license->network_license_invalid() ) {
@@ -362,7 +362,7 @@ 
             }
         }
         if ( ! empty( $message ) ) {
-            echo '<div class="error"><p>'. $message.'</p></div>';
+            echo '<div class="error"><p>' . $message . '</p></div>';
             return;
         }
     }
@@ -389,7 +389,7 @@ 
 	    }
 
 	    if ( $message ) {
-		    echo '<div class="error"><p>'. $message.'</p></div>';
+		    echo '<div class="error"><p>' . $message . '</p></div>';
 		    return;
 	    }
 
@@ -442,7 +442,7 @@ 
     //     }
     // }
 
-    $notices   = get_option( 'monsterinsights_notices' );
+    $notices = get_option( 'monsterinsights_notices' );
     if ( ! is_array( $notices ) ) {
         $notices = array();
     }
@@ -488,7 +488,7 @@ 
 
     // 8. WooUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'WooCommerce' ) ) {
-        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available' ] ) ) {
+        if ( ! isset( $notices['monsterinsights_woocommerce_tracking_available'] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_woocommerce_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -508,7 +508,7 @@ 
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
                     // Translators: Placeholders add a link to the MonsterInsights website.
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) .'">', ' &raquo;</a>' );
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'woocommerce-upgrade' ) . '">', ' &raquo;</a>' );
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
@@ -521,7 +521,7 @@ 
 
     // 9. EDDUpsell
     if ( ! monsterinsights_is_pro_version() && class_exists( 'Easy_Digital_Downloads' ) ) {
-        if ( ! isset( $notices['monsterinsights_edd_tracking_available' ] ) ) {
+        if ( ! isset( $notices['monsterinsights_edd_tracking_available'] ) ) {
             echo '<div class="notice notice-success is-dismissible monsterinsights-notice monsterinsights-wooedd-upsell-row" data-notice="monsterinsights_edd_tracking_available">';
                 echo '<div class="monsterinsights-wooedd-upsell-left">';
                     echo '<p><strong>';
@@ -540,7 +540,7 @@ 
                     echo '<p>';
                     echo esc_html( 'Start making data-driven decisions to grow your business.', 'google-analytics-for-wordpress' );
                     echo '</p>';
-                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="'. monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) .'">', ' &raquo;</a>' );
+                    echo sprintf( esc_html__( '%1$sGet MonsterInsights Pro%2$s', 'google-analytics-for-wordpress' ), '<a class="button button-primary button-hero" href="' . monsterinsights_get_upgrade_link( 'admin-notices', 'edd-upgrade' ) . '">', ' &raquo;</a>' );
                     echo '</p>';
                 echo '</div><div class="monsterinsights-wooedd-upsell-right">';
                     echo '<img class="monsterinsights-wooedd-upsell-image monsterinsights-wooedd-upsell-image-large" src="' . trailingslashit( MONSTERINSIGHTS_PLUGIN_URL ) . 'assets/images/upsell/woo-edd-upsell.png">';
@@ -554,8 +554,8 @@ 
         $page = is_network_admin() ? network_admin_url( 'admin.php?page=monsterinsights_network' ) : admin_url( 'admin.php?page=monsterinsights_settings' );
         $page = $page . '#/advanced';
         // Translators: Adds a link to the settings panel.
-        $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="'. esc_url( $page ) . '">', '</a>' );
-        echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>'. $message.'</p></div>';
+        $message = sprintf( esc_html__( 'Warning: MonsterInsights found cross-domain settings in the custom code field and converted them to the new settings structure.  %1$sPlease click here to review and remove the code no longer needed.%2$s', 'google-analytics-for-wordpress' ), '<a href="' . esc_url( $page ) . '">', '</a>' );
+        echo '<div class="notice notice-success is-dismissible monsterinsights-notice" data-notice="monsterinsights_cross_domains_extracted"><p>' . $message . '</p></div>';
         return;
     }
 }
@@ -618,10 +618,10 @@ 
 			'Your Measurement Protocol API Secret is currently left blank, so you won\'t be able to use some of the tracking features with your GA4 property. %1$sPlease enter your Measurement Protocol API Secret here.%2$s',
 			'google-analytics-for-wordpress'
 		),
-		'<a href="' . esc_url( $page ). '">',
+		'<a href="' . esc_url( $page ) . '">',
 		'</a>'
 	);
-	echo '<div class="error"><p>'. $message.'</p></div>';
+	echo '<div class="error"><p>' . $message . '</p></div>';
 }
 
 add_action( 'admin_notices', 'monsterinsights_empty_measurement_protocol_token' );

includes/admin/licensing/plugin-upgrader.php

Braces +8 added lines, -4 removed lines

@@ -97,7 +97,8 @@ 
 		 */
 		$options = apply_filters( 'upgrader_package_options', $options );
 
-		if ( ! $options['is_multi'] ) { // call $this->header separately if running multiple times
+		if ( ! $options['is_multi'] ) {
+// call $this->header separately if running multiple times
 			$this->skin->header();
 		}
 
@@ -288,7 +289,8 @@ 
 			return $reply;
 		}
 
-		if ( ! preg_match( '!^(http|https|ftp)://!i', $package ) && file_exists( $package ) ) { //Local file or remote?
+		if ( ! preg_match( '!^(http|https|ftp)://!i', $package ) && file_exists( $package ) ) {
+//Local file or remote?
 			return $package; //must be a local file..
 		}
 
@@ -443,11 +445,13 @@ 
 		$remote_destination = $wp_filesystem->find_folder( $local_destination );
 
 		//Locate which directory to copy to the new folder, This is based on the actual folder holding the files.
-		if ( 1 == count( $source_files ) && $wp_filesystem->is_dir( trailingslashit( $args['source'] ) . $source_files[0] . '/' ) ) { //Only one folder? Then we want its contents.
+		if ( 1 == count( $source_files ) && $wp_filesystem->is_dir( trailingslashit( $args['source'] ) . $source_files[0] . '/' ) ) {
+//Only one folder? Then we want its contents.
 			$source = trailingslashit( $args['source'] ) . trailingslashit( $source_files[0] );
 		} elseif ( count( $source_files ) == 0 ) {
 			return new WP_Error( 'incompatible_archive_empty', $this->strings['incompatible_archive'], $this->strings['no_files'] ); // There are no files?
-		} else { // It's only a single file, the upgrader will use the folder name of this file as the destination folder. Folder name is based on zip filename.
+		} else {
+// It's only a single file, the upgrader will use the folder name of this file as the destination folder. Folder name is based on zip filename.
 			$source = trailingslashit( $args['source'] );
 		}
 

includes/deprecated.php

Spacing +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
 	if ( ( WP_DEBUG && apply_filters( 'deprecated_hook_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
 		$message = empty( $message ) ? '' : ' ' . $message;
 		// Translators: Placeholders add the hook name, plugin version and bold text.
-		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 ) );
 	}
 }
 
@@ -179,7 +179,7 @@ 
 	if ( ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) || monsterinsights_is_debug_mode() ) {
 		// Translators: Placeholders add the hook name, plugin version and bold text.
 		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.
 	}
 }

lite/includes/admin/welcome.php

Braces +2 added lines, -1 removed lines

@@ -87,7 +87,8 @@
 		delete_transient( '_monsterinsights_activation_redirect' );
 
 		// Bail if activating from network, or bulk.
-		if ( isset( $_GET['activate-multi'] ) ) { // WPCS: CSRF ok, input var ok.
+		if ( isset( $_GET['activate-multi'] ) ) {
+// WPCS: CSRF ok, input var ok.
 			return;
 		}
 

includes/api-request.php

Spacing +19 added lines, -19 removed lines

@@ -155,25 +155,25 @@ 
 		$this->network   = is_network_admin() || ! empty( $args['network'] );
 
 		$default_token   = $this->network ? MonsterInsights()->auth->get_network_token() : MonsterInsights()->auth->get_token();
-		$default_key     = $this->network ? MonsterInsights()->auth->get_network_key()   : MonsterInsights()->auth->get_key();
+		$default_key     = $this->network ? MonsterInsights()->auth->get_network_key() : MonsterInsights()->auth->get_key();
 
-		$this->token     = ! empty( $args['token'] )     ? $args['token']  : $default_token;
-		$this->key       = ! empty( $args['key'] ) 	     ? $args['key']    : $default_key;
-		$this->tt        = ! empty( $args['tt'] ) 		 ? $args['tt']     : '';
-		$this->return    = ! empty( $args['return'] )    ? $args['return'] : '';
-		$this->start     = ! empty( $args['start'] )	 ? $args['start']  : '';
-		$this->end       = ! empty( $args['end'] )  	 ? $args['end']    : '';
+		$this->token     = ! empty( $args['token'] ) ? $args['token'] : $default_token;
+		$this->key       = ! empty( $args['key'] ) ? $args['key'] : $default_key;
+		$this->tt        = ! empty( $args['tt'] ) ? $args['tt'] : '';
+		$this->return    = ! empty( $args['return'] ) ? $args['return'] : '';
+		$this->start     = ! empty( $args['start'] ) ? $args['start'] : '';
+		$this->end       = ! empty( $args['end'] ) ? $args['end'] : '';
 
 		// We need to do this hack so that the network panel + the site_url of the main site are distinct
 		$this->site_url  = is_network_admin() ? network_admin_url() : site_url();
 
 		if ( monsterinsights_is_pro_version() ) {
-			$this->license   = $this->network ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
+			$this->license = $this->network ? MonsterInsights()->license->get_network_license_key() : MonsterInsights()->license->get_site_license_key();
 		}
 		$this->plugin    = MonsterInsights()->plugin_slug;
 		$this->miversion = MONSTERINSIGHTS_VERSION;
-		$this->sitei     = ! empty( $args['sitei'] )   ? $args['sitei'] : '';
-		$this->testurl   = ! empty( $args['testurl'] ) ? $args['testurl']    : '';
+		$this->sitei     = ! empty( $args['sitei'] ) ? $args['sitei'] : '';
+		$this->testurl   = ! empty( $args['testurl'] ) ? $args['testurl'] : '';
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	public function request() {
 		// Make sure we're not blocked
 		$blocked = $this->is_blocked( $this->url );
-		if ( $blocked || is_wp_error( $blocked )  ) {
+		if ( $blocked || is_wp_error( $blocked ) ) {
 			if ( is_wp_error( $blocked ) ) {
 				// Translators: Placeholder gets replaced with the error message.
 				return new WP_Error( 'api-error', sprintf( __( 'The firewall of your server is blocking outbound calls. Please contact your hosting provider to fix this issue. %s', 'google-analytics-for-wordpress' ), $blocked->get_error_message() ) );
@@ -244,14 +244,14 @@ 
 		}
 
 		if ( 'GET' == $this->method ) {
-			$body['time']   = time(); // just to avoid caching
+			$body['time'] = time(); // just to avoid caching
 		}
 
-		$body['timezone'] = date('e');
+		$body['timezone'] = date( 'e' );
 
 		$body['network']  = $this->network ? 'network' : 'site';
 
-		$body['ip']   = ! empty( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '';
+		$body['ip'] = ! empty( $_SERVER['SERVER_ADDR'] ) ? $_SERVER['SERVER_ADDR'] : '';
 
 		// This filter will be removed in the future.
 		$body   = apply_filters( 'monsterinsights_api_request_body', $body );
@@ -282,7 +282,7 @@ 
 		);
 
 		// Perform the query and retrieve the response.
-		$response      = 'GET' == $this->method ? wp_remote_get( esc_url_raw( $this->url ) . '?' . $string, $data ) : wp_remote_post( esc_url_raw( $this->url ), $data );
+		$response = 'GET' == $this->method ? wp_remote_get( esc_url_raw( $this->url ) . '?' . $string, $data ) : wp_remote_post( esc_url_raw( $this->url ), $data );
 
 		//return new WP_Error( 'debug', '<pre>' . var_export( $response, true ) . '</pre>' );
 
@@ -301,7 +301,7 @@ 
 
 		// If not a 200 status header, send back error.
 		if ( 200 != $response_code ) {
-			$type  = ! empty( $response_body['type'] ) ? $response_body['type'] : 'api-error';
+			$type = ! empty( $response_body['type'] ) ? $response_body['type'] : 'api-error';
 
 			if ( empty( $response_code ) ) {
 				return new WP_Error( $type, __( 'The API was unreachable.', 'google-analytics-for-wordpress' ) );
@@ -392,7 +392,7 @@ 
 		// and for image linking purposes in Google Images. We use it to test outbound connections since it is run on google.com
 		// and is only a few bytes large. Plus on Google's main CDN so it loads in most places in 0.07 seconds or less. Perfect for our
 		// use case of quickly testing outbound connections.
-		$testurl = ! empty( $this->testurl ) ? $this->testurl :'https://www.google.com/blank.html';
+		$testurl = ! empty( $this->testurl ) ? $this->testurl : 'https://www.google.com/blank.html';
 		if ( defined( 'WP_HTTP_BLOCK_EXTERNAL' ) && WP_HTTP_BLOCK_EXTERNAL ) {
 			if ( defined( 'WP_ACCESSIBLE_HOSTS' ) ) {
 				$wp_http      = new WP_Http();
@@ -407,7 +407,7 @@ 
 						'body'          => ''
 					);
 					$response = wp_remote_get( $testurl, $params );
-					if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+					if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 						return false;
 					} else {
 						if ( is_wp_error( $response ) ) {
@@ -429,7 +429,7 @@ 
 			);
 			$response = wp_remote_get( $testurl, $params );
 
-			if( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+			if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
 				return false;
 			} else {
 				if ( is_wp_error( $response ) ) {

includes/gutenberg/headline-tool/phpinsight/lib/PHPInsight/Autoloader.php

Indentation +11 added lines, -11 removed lines

@@ -13,9 +13,9 @@ 
      */
     public function __construct($baseDirectory = __DIR__)
     {
-        $this->directory = $baseDirectory;
-        $this->prefix = __NAMESPACE__ . '\\';
-        $this->prefixLength = strlen($this->prefix);
+	$this->directory = $baseDirectory;
+	$this->prefix = __NAMESPACE__ . '\\';
+	$this->prefixLength = strlen($this->prefix);
     }
 
     /**
@@ -25,7 +25,7 @@ 
      */
     public static function register($prepend = false)
     {
-        spl_autoload_register(array(new self, 'autoload'), true, $prepend);
+	spl_autoload_register(array(new self, 'autoload'), true, $prepend);
     }
 
     /**
@@ -35,13 +35,13 @@ 
      */
     public function autoload($className)
     {
-        if (0 === strpos($className, $this->prefix)) {
-            $parts = explode('\\', substr($className, $this->prefixLength));
-            $filepath = $this->directory.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts).'.php';
+	if (0 === strpos($className, $this->prefix)) {
+	    $parts = explode('\\', substr($className, $this->prefixLength));
+	    $filepath = $this->directory.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts).'.php';
 
-            if (is_file($filepath)) {
-                require($filepath);
-            }
-        }
+	    if (is_file($filepath)) {
+		require($filepath);
+	    }
+	}
     }
 }

Spacing +10 added lines, -10 removed lines

@@ -11,11 +11,11 @@ 
     /**
      * @param string $baseDirectory Base directory where the source files are located.
      */
-    public function __construct($baseDirectory = __DIR__)
+    public function __construct( $baseDirectory = __DIR__ )
     {
         $this->directory = $baseDirectory;
         $this->prefix = __NAMESPACE__ . '\\';
-        $this->prefixLength = strlen($this->prefix);
+        $this->prefixLength = strlen( $this->prefix );
     }
 
     /**
@@ -23,9 +23,9 @@ 
      *
      * @param bool $prepend Prepend the autoloader on the stack instead of appending it.
      */
-    public static function register($prepend = false)
+    public static function register( $prepend = false )
     {
-        spl_autoload_register(array(new self, 'autoload'), true, $prepend);
+        spl_autoload_register( array( new self, 'autoload' ), true, $prepend );
     }
 
     /**
@@ -33,14 +33,14 @@ 
      *
      * @param string $className Fully qualified name of a class.
      */
-    public function autoload($className)
+    public function autoload( $className )
     {
-        if (0 === strpos($className, $this->prefix)) {
-            $parts = explode('\\', substr($className, $this->prefixLength));
-            $filepath = $this->directory.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts).'.php';
+        if ( 0 === strpos( $className, $this->prefix ) ) {
+            $parts = explode( '\\', substr( $className, $this->prefixLength ) );
+            $filepath = $this->directory . DIRECTORY_SEPARATOR . implode( DIRECTORY_SEPARATOR, $parts ) . '.php';
 
-            if (is_file($filepath)) {
-                require($filepath);
+            if ( is_file( $filepath ) ) {
+                require( $filepath );
             }
         }
     }

Braces +4 added lines, -8 removed lines

@@ -2,8 +2,7 @@ 
 
 namespace PHPInsight;
 
-class Autoloader
-{
+class Autoloader {
     private $directory;
     private $prefix;
     private $prefixLength;
@@ -11,8 +10,7 @@ 
     /**
      * @param string $baseDirectory Base directory where the source files are located.
      */
-    public function __construct($baseDirectory = __DIR__)
-    {
+    public function __construct($baseDirectory = __DIR__) {
         $this->directory = $baseDirectory;
         $this->prefix = __NAMESPACE__ . '\\';
         $this->prefixLength = strlen($this->prefix);
@@ -23,8 +21,7 @@ 
      *
      * @param bool $prepend Prepend the autoloader on the stack instead of appending it.
      */
-    public static function register($prepend = false)
-    {
+    public static function register($prepend = false) {
         spl_autoload_register(array(new self, 'autoload'), true, $prepend);
     }
 
@@ -33,8 +30,7 @@ 
      *
      * @param string $className Fully qualified name of a class.
      */
-    public function autoload($className)
-    {
+    public function autoload($className) {
         if (0 === strpos($className, $this->prefix)) {
             $parts = explode('\\', substr($className, $this->prefixLength));
             $filepath = $this->directory.DIRECTORY_SEPARATOR.implode(DIRECTORY_SEPARATOR, $parts).'.php';

includes/gutenberg/headline-tool/phpinsight/lib/PHPInsight/Sentiment.php

Spacing +78 added lines, -78 removed lines

@@ -65,7 +65,7 @@ 
 	 * Classification of opinions
 	 * @var array
 	 */
-	private $classes = array('pos', 'neg', 'neu');
+	private $classes = array( 'pos', 'neg', 'neu' );
 
 	/**
 	 * Token score per class
@@ -114,10 +114,10 @@ 
 	 * @param str $dataFolder base folder
 	 * Sets defaults and loads/caches dictionaries
 	 */
-	public function __construct($dataFolder = false) {
+	public function __construct( $dataFolder = false ) {
 
 		//set the base folder for the data models
-		$this->setDataFolder($dataFolder);
+		$this->setDataFolder( $dataFolder );
 
 		//load and cache directories, get ignore and prefix lists
 		$this->loadDefaults();
@@ -129,20 +129,20 @@ 
 	 * @param str $sentence Text to analyze
 	 * @return int Score
 	 */
-	public function score($sentence) {
+	public function score( $sentence ) {
 
 		//For each negative prefix in the list
-		foreach ($this->negPrefixList as $negPrefix) {
+		foreach ( $this->negPrefixList as $negPrefix ) {
 
 			//Search if that prefix is in the document
-			if (strpos($sentence, $negPrefix) !== false) {
+			if ( strpos( $sentence, $negPrefix ) !== false ) {
 				//Reove the white space after the negative prefix
-				$sentence = str_replace($negPrefix . ' ', $negPrefix, $sentence);
+				$sentence = str_replace( $negPrefix . ' ', $negPrefix, $sentence );
 			}
 		}
 
 		//Tokenise Document
-		$tokens = $this->_getTokens($sentence);
+		$tokens = $this->_getTokens( $sentence );
 		// calculate the score in each category
 
 		$total_score = 0;
@@ -151,18 +151,18 @@ 
 		$scores = array();
 
 		//Loop through all of the different classes set in the $classes variable
-		foreach ($this->classes as $class) {
+		foreach ( $this->classes as $class ) {
 
 			//In the scores array add another dimention for the class and set it's value to 1. EG $scores->neg->1
 			$scores[$class] = 1;
 
 			//For each of the individual words used loop through to see if they match anything in the $dictionary
-			foreach ($tokens as $token) {
+			foreach ( $tokens as $token ) {
 
 				//If statement so to ignore tokens which are either too long or too short or in the $ignoreList
-				if (strlen($token) > $this->minTokenLength && strlen($token) < $this->maxTokenLength && !in_array($token, $this->ignoreList)) {
+				if ( strlen( $token ) > $this->minTokenLength && strlen( $token ) < $this->maxTokenLength && ! in_array( $token, $this->ignoreList ) ) {
 					//If dictionary[token][class] is set
-					if (isset($this->dictionary[$token][$class])) {
+					if ( isset( $this->dictionary[$token][$class] ) ) {
 						//Set count equal to it
 						$count = $this->dictionary[$token][$class];
 					} else {
@@ -170,7 +170,7 @@ 
 					}
 
 					//Score[class] is calcumeted by $scores[class] x $count +1 divided by the $classTokCounts[class] + $tokCount
-					$scores[$class] *= ($count + 1);
+					$scores[$class] *= ( $count + 1 );
 				}
 			}
 
@@ -179,16 +179,16 @@ 
 		}
 
 		//Makes the scores relative percents
-		foreach ($this->classes as $class) {
+		foreach ( $this->classes as $class ) {
 			$total_score += $scores[$class];
 		}
 
-		foreach ($this->classes as $class) {
-			$scores[$class] = round($scores[$class] / $total_score, 3);
+		foreach ( $this->classes as $class ) {
+			$scores[$class] = round( $scores[$class] / $total_score, 3 );
 		}
 
 		//Sort array in reverse order
-		arsort($scores);
+		arsort( $scores );
 
 		return $scores;
 	}
@@ -199,12 +199,12 @@ 
 	 * @param str $sentence
 	 * @return str pos|neu|neg
 	 */
-	public function categorise($sentence) {
+	public function categorise( $sentence ) {
 
-		$scores = $this->score($sentence);
+		$scores = $this->score( $sentence );
 
 		//Classification is the key to the scores array
-		$classification = key($scores);
+		$classification = key( $scores );
 
 		return $classification;
 	}
@@ -215,30 +215,30 @@ 
 	 * @param str $class
 	 * @return boolean
 	 */
-	public function setDictionary($class) {
+	public function setDictionary( $class ) {
 		/**
 		 *  For some people this file extention causes some problems!
 		 */
 		$fn = "{$this->dataFolder}data.{$class}.php";
 
-		if (file_exists($fn)) {
-			$temp = file_get_contents($fn);
-			$words = unserialize($temp);
+		if ( file_exists( $fn ) ) {
+			$temp = file_get_contents( $fn );
+			$words = unserialize( $temp );
 		} else {
 			echo 'File does not exist: ' . $fn;
 		}
 
 		//Loop through all of the entries
-		foreach ($words as $word) {
+		foreach ( $words as $word ) {
 
 			$this->docCount++;
 			$this->classDocCounts[$class]++;
 
 			//Trim word
-			$word = trim($word);
+			$word = trim( $word );
 
 			//If this word isn't already in the dictionary with this class
-			if (!isset($this->dictionary[$word][$class])) {
+			if ( ! isset( $this->dictionary[$word][$class] ) ) {
 
 				//Add to this word to the dictionary and set counter value as one. This function ensures that if a word is in the text file more than once it still is only accounted for one in the array
 				$this->dictionary[$word][$class] = 1;
@@ -256,22 +256,22 @@ 
 	 * @param str  $dataFolder base folder
 	 * @param bool $loadDefaults true - load everything by default | false - just change the directory
 	 */
-	public function setDataFolder($dataFolder = false, $loadDefaults = false){
+	public function setDataFolder( $dataFolder = false, $loadDefaults = false ) {
 		//if $dataFolder not provided, load default, else set the provided one
-		if($dataFolder == false){
+		if ( $dataFolder == false ) {
 			$this->dataFolder = __DIR__ . '/data/';
 		}
-		else{
-			if(file_exists($dataFolder)){
+		else {
+			if ( file_exists( $dataFolder ) ) {
 				$this->dataFolder = $dataFolder;
 			}
-			else{
-				echo 'Error: could not find the directory - '.$dataFolder;
+			else {
+				echo 'Error: could not find the directory - ' . $dataFolder;
 			}
 		}
 
 		//load default directories, ignore and prefixe lists
-		if($loadDefaults !== false){
+		if ( $loadDefaults !== false ) {
 			$this->loadDefaults();
 		}
 	}
@@ -279,29 +279,29 @@ 
 	/**
 	 * Load and cache directories, get ignore and prefix lists
 	 */
-	private function loadDefaults(){
+	private function loadDefaults() {
 		// Load and cache dictionaries
-		foreach ($this->classes as $class) {
-			if (!$this->setDictionary($class)) {
+		foreach ( $this->classes as $class ) {
+			if ( ! $this->setDictionary( $class ) ) {
 				echo "Error: Dictionary for class '$class' could not be loaded";
 			}
 		}
 
-		if (!isset($this->dictionary) || empty($this->dictionary))
+		if ( ! isset( $this->dictionary ) || empty( $this->dictionary ) )
 			echo 'Error: Dictionaries not set';
 
 		//Run function to get ignore list
-		$this->ignoreList = $this->getList('ign');
+		$this->ignoreList = $this->getList( 'ign' );
 
 		//If ingnoreList not get give error message
-		if (!isset($this->ignoreList))
+		if ( ! isset( $this->ignoreList ) )
 			echo 'Error: Ignore List not set';
 
 		//Get the list of negative prefixes
-		$this->negPrefixList = $this->getList('prefix');
+		$this->negPrefixList = $this->getList( 'prefix' );
 
 		//If neg prefix list not set give error
-		if (!isset($this->negPrefixList))
+		if ( ! isset( $this->negPrefixList ) )
 			echo 'Error: Ignore List not set';
 	}
 
@@ -311,20 +311,20 @@ 
 	 * @param str $string	String being broken up
 	 * @return array An array of tokens
 	 */
-	private function _getTokens($string) {
+	private function _getTokens( $string ) {
 
 		// Replace line endings with spaces
-		$string = str_replace("\r\n", " ", $string);
+		$string = str_replace( "\r\n", " ", $string );
 
 		//Clean the string so is free from accents
-		$string = $this->_cleanString($string);
+		$string = $this->_cleanString( $string );
 
 		//Make all texts lowercase as the database of words in in lowercase
-		$string = strtolower($string);
-		$string = preg_replace('/[[:punct:]]+/', '', $string);
+		$string = strtolower( $string );
+		$string = preg_replace( '/[[:punct:]]+/', '', $string );
 
 		//Break string into individual words using explode putting them into an array
-		$matches = explode(' ', $string);
+		$matches = explode( ' ', $string );
 
 		//Return array with each individual token
 		return $matches;
@@ -336,28 +336,28 @@ 
 	 * @param str $type
 	 * @return array
 	 */
-	public function getList($type) {
+	public function getList( $type ) {
 		//Set up empty word list array
 		$wordList = array();
 
 		$fn = "{$this->dataFolder}data.{$type}.php";
 		;
-		if (file_exists($fn)) {
-			$temp = file_get_contents($fn);
-			$words = unserialize($temp);
+		if ( file_exists( $fn ) ) {
+			$temp = file_get_contents( $fn );
+			$words = unserialize( $temp );
 		} else {
 			return 'File does not exist: ' . $fn;
 		}
 
 		//Loop through results
-		foreach ($words as $word) {
+		foreach ( $words as $word ) {
 			//remove any slashes
-			$word = stripcslashes($word);
+			$word = stripcslashes( $word );
 			//Trim word
-			$trimmed = trim($word);
+			$trimmed = trim( $word );
 
 			//Push results into $wordList array
-			array_push($wordList, $trimmed);
+			array_push( $wordList, $trimmed );
 		}
 		//Return $wordList
 		return $wordList;
@@ -369,49 +369,49 @@ 
 	 * @param str $string
 	 * @return str
 	 */
-	private function _cleanString($string) {
+	private function _cleanString( $string ) {
 
 		$diac =
-				/* A */ chr(192) . chr(193) . chr(194) . chr(195) . chr(196) . chr(197) .
-				/* a */ chr(224) . chr(225) . chr(226) . chr(227) . chr(228) . chr(229) .
-				/* O */ chr(210) . chr(211) . chr(212) . chr(213) . chr(214) . chr(216) .
-				/* o */ chr(242) . chr(243) . chr(244) . chr(245) . chr(246) . chr(248) .
-				/* E */ chr(200) . chr(201) . chr(202) . chr(203) .
-				/* e */ chr(232) . chr(233) . chr(234) . chr(235) .
-				/* Cc */ chr(199) . chr(231) .
-				/* I */ chr(204) . chr(205) . chr(206) . chr(207) .
-				/* i */ chr(236) . chr(237) . chr(238) . chr(239) .
-				/* U */ chr(217) . chr(218) . chr(219) . chr(220) .
-				/* u */ chr(249) . chr(250) . chr(251) . chr(252) .
-				/* yNn */ chr(255) . chr(209) . chr(241);
-
-		return strtolower(strtr($string, $diac, 'AAAAAAaaaaaaOOOOOOooooooEEEEeeeeCcIIIIiiiiUUUUuuuuyNn'));
+				/* A */ chr( 192 ) . chr( 193 ) . chr( 194 ) . chr( 195 ) . chr( 196 ) . chr( 197 ) .
+				/* a */ chr( 224 ) . chr( 225 ) . chr( 226 ) . chr( 227 ) . chr( 228 ) . chr( 229 ) .
+				/* O */ chr( 210 ) . chr( 211 ) . chr( 212 ) . chr( 213 ) . chr( 214 ) . chr( 216 ) .
+				/* o */ chr( 242 ) . chr( 243 ) . chr( 244 ) . chr( 245 ) . chr( 246 ) . chr( 248 ) .
+				/* E */ chr( 200 ) . chr( 201 ) . chr( 202 ) . chr( 203 ) .
+				/* e */ chr( 232 ) . chr( 233 ) . chr( 234 ) . chr( 235 ) .
+				/* Cc */ chr( 199 ) . chr( 231 ) .
+				/* I */ chr( 204 ) . chr( 205 ) . chr( 206 ) . chr( 207 ) .
+				/* i */ chr( 236 ) . chr( 237 ) . chr( 238 ) . chr( 239 ) .
+				/* U */ chr( 217 ) . chr( 218 ) . chr( 219 ) . chr( 220 ) .
+				/* u */ chr( 249 ) . chr( 250 ) . chr( 251 ) . chr( 252 ) .
+				/* yNn */ chr( 255 ) . chr( 209 ) . chr( 241 );
+
+		return strtolower( strtr( $string, $diac, 'AAAAAAaaaaaaOOOOOOooooooEEEEeeeeCcIIIIiiiiUUUUuuuuyNn' ) );
 	}
 
 	/**
 	 * Deletes old data/data.* files
 	 * Creates new files from updated source fi
 	 */
-	public function reloadDictionaries(){
+	public function reloadDictionaries() {
 
-		foreach($this->classes as $class){
+		foreach ( $this->classes as $class ) {
 			$fn = "{$this->dataFolder}data.{$class}.php";
-			if (file_exists($fn)) {
-				unlink($fn);
+			if ( file_exists( $fn ) ) {
+				unlink( $fn );
 			} 
 		}
 
 		$dictionaries = __DIR__ . '/dictionaries/';
 
-		foreach($this->classes as $class){
+		foreach ( $this->classes as $class ) {
 			$dict = "{$dictionaries}source.{$class}.php";
 
-			require_once($dict);
+			require_once( $dict );
 
 			$data = $class;
 
 			$fn = "{$this->dataFolder}data.{$class}.php";
-			file_put_contents($fn, serialize($$data));
+			file_put_contents( $fn, serialize( $$data ) );
 		}
 
 		

Braces +19 added lines, -18 removed lines

@@ -256,22 +256,20 @@ 
 	 * @param str  $dataFolder base folder
 	 * @param bool $loadDefaults true - load everything by default | false - just change the directory
 	 */
-	public function setDataFolder($dataFolder = false, $loadDefaults = false){
+	public function setDataFolder($dataFolder = false, $loadDefaults = false) {
 		//if $dataFolder not provided, load default, else set the provided one
-		if($dataFolder == false){
+		if($dataFolder == false) {
 			$this->dataFolder = __DIR__ . '/data/';
-		}
-		else{
-			if(file_exists($dataFolder)){
+		} else {
+			if(file_exists($dataFolder)) {
 				$this->dataFolder = $dataFolder;
-			}
-			else{
+			} else {
 				echo 'Error: could not find the directory - '.$dataFolder;
 			}
 		}
 
 		//load default directories, ignore and prefixe lists
-		if($loadDefaults !== false){
+		if($loadDefaults !== false) {
 			$this->loadDefaults();
 		}
 	}
@@ -279,7 +277,7 @@ 
 	/**
 	 * Load and cache directories, get ignore and prefix lists
 	 */
-	private function loadDefaults(){
+	private function loadDefaults() {
 		// Load and cache dictionaries
 		foreach ($this->classes as $class) {
 			if (!$this->setDictionary($class)) {
@@ -287,22 +285,25 @@ 
 			}
 		}
 
-		if (!isset($this->dictionary) || empty($this->dictionary))
-			echo 'Error: Dictionaries not set';
+		if (!isset($this->dictionary) || empty($this->dictionary)) {
+					echo 'Error: Dictionaries not set';
+		}
 
 		//Run function to get ignore list
 		$this->ignoreList = $this->getList('ign');
 
 		//If ingnoreList not get give error message
-		if (!isset($this->ignoreList))
-			echo 'Error: Ignore List not set';
+		if (!isset($this->ignoreList)) {
+					echo 'Error: Ignore List not set';
+		}
 
 		//Get the list of negative prefixes
 		$this->negPrefixList = $this->getList('prefix');
 
 		//If neg prefix list not set give error
-		if (!isset($this->negPrefixList))
-			echo 'Error: Ignore List not set';
+		if (!isset($this->negPrefixList)) {
+					echo 'Error: Ignore List not set';
+		}
 	}
 
 	/**
@@ -392,9 +393,9 @@ 
 	 * Deletes old data/data.* files
 	 * Creates new files from updated source fi
 	 */
-	public function reloadDictionaries(){
+	public function reloadDictionaries() {
 
-		foreach($this->classes as $class){
+		foreach($this->classes as $class) {
 			$fn = "{$this->dataFolder}data.{$class}.php";
 			if (file_exists($fn)) {
 				unlink($fn);
@@ -403,7 +404,7 @@ 
 
 		$dictionaries = __DIR__ . '/dictionaries/';
 
-		foreach($this->classes as $class){
+		foreach($this->classes as $class) {
 			$dict = "{$dictionaries}source.{$class}.php";
 
 			require_once($dict);