awesomemotive / google-analytics-for-wordpress

googleanalytics.php

Spacing +14 added lines, -14 removed lines

@@ -228,7 +228,7 @@ 
 				self::$instance->notices          = new MonsterInsights_Notice_Admin();
 				self::$instance->license_actions  = new MonsterInsights_License_Actions();
 				self::$instance->reporting 	      = new MonsterInsights_Reporting();
-				self::$instance->api_auth    	  = new MonsterInsights_API_Auth();
+				self::$instance->api_auth = new MonsterInsights_API_Auth();
 				if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
 					self::$instance->require_updater();
 				} else {
@@ -352,19 +352,19 @@ 
 		}
 
 		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_DIR' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file )  );
+			define( 'MONSTERINSIGHTS_PLUGIN_DIR', plugin_dir_path( $this->file ) );
 		}
 
 		if ( ! defined( 'GAWP_PATH' ) ) {
-			define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_DIR  );
+			define( 'GAWP_PATH', MONSTERINSIGHTS_PLUGIN_DIR );
 		}
 
 		if ( ! defined( 'MONSTERINSIGHTS_PLUGIN_URL' ) ) {
-			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file )  );
+			define( 'MONSTERINSIGHTS_PLUGIN_URL', plugin_dir_url( $this->file ) );
 		}
 
 		if ( ! defined( 'GAWP_URL' ) ) {
-			define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL  );
+			define( 'GAWP_URL', MONSTERINSIGHTS_PLUGIN_URL );
 		}
 	}	
 
@@ -384,7 +384,7 @@ 
 		}
 
 		// Traditional WordPress plugin locale filter.
-		$mi_locale  = apply_filters( 'plugin_locale',  $mi_locale, 'google-analytics-for-wordpress' );
+		$mi_locale  = apply_filters( 'plugin_locale', $mi_locale, 'google-analytics-for-wordpress' );
 		$mi_mofile  = sprintf( '%1$s-%2$s.mo', 'google-analytics-for-wordpress', $mi_locale ); 
 	
 		// Look for wp-content/languages/google-analytics-for-wordpress/google-analytics-for-wordpress-{lang}_{country}.mo
@@ -441,7 +441,7 @@ 
 	public function monsterinsights_wp_notice() {
 		$url = admin_url( 'plugins.php' );
 		// Check for MS dashboard
-		if( is_network_admin() ) {
+		if ( is_network_admin() ) {
 			$url = network_admin_url( 'plugins.php' );
 		}
 		?>
@@ -462,7 +462,7 @@ 
 	public function monsterinsights_pro_notice() {
 		$url = admin_url( 'plugins.php' );
 		// Check for MS dashboard
-		if( is_network_admin() ) {
+		if ( is_network_admin() ) {
 			$url = network_admin_url( 'plugins.php' );
 		}
 		?>
@@ -488,7 +488,7 @@ 
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/options.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/helpers.php';
 		require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/deprecated.php';
-		$monsterinsights_settings  = monsterinsights_get_options();
+		$monsterinsights_settings = monsterinsights_get_options();
 	}
 
 
@@ -502,7 +502,7 @@ 
 	 * 
 	 * @return void
 	 */
-	public function load_licensing(){
+	public function load_licensing() {
 		if ( is_admin() || ( defined( 'DOING_CRON' ) && DOING_CRON ) ) {
 			require_once MONSTERINSIGHTS_PLUGIN_DIR . 'includes/license.php';
 			self::$instance->license = new MonsterInsights_License();
@@ -680,7 +680,7 @@ 
 			$instance->api_auth->delete_auth();
 
 			// Delete data
-			$instance->reporting->delete_aggregate_data('site');
+			$instance->reporting->delete_aggregate_data( 'site' );
 
 			// Delete license
 			$instance->license->delete_site_license();
@@ -691,7 +691,7 @@ 
 		$instance->api_auth->uninstall_network_auth();
 
 		// Delete network data
-		$instance->reporting->delete_aggregate_data('network');
+		$instance->reporting->delete_aggregate_data( 'network' );
 
 		// Delete network license
 		$instance->license->delete_network_license();
@@ -700,7 +700,7 @@ 
 		$instance->api_auth->delete_auth();
 
 		// Delete data
-		$instance->reporting->delete_aggregate_data('site');
+		$instance->reporting->delete_aggregate_data( 'site' );
 
 		// Delete license
 		$instance->license->delete_site_license();
@@ -795,7 +795,7 @@ 
  * 
  * @return void
  */
-function monsterinsights_lite_call_install_and_upgrade(){
+function monsterinsights_lite_call_install_and_upgrade() {
 	add_action( 'wp_loaded', 'monsterinsights_lite_install_and_upgrade' );
 }
 

includes/api-request.php

Spacing +15 added lines, -15 removed lines

@@ -146,20 +146,20 @@ 
 		$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;
@@ -176,7 +176,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 ) ) {
 				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() ) );
 			} else {
@@ -233,14 +233,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 );
@@ -284,7 +284,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' ) );
@@ -389,7 +389,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 ) ) {
@@ -411,7 +411,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/frontend/seedprod.php

Indentation +6 added lines, -6 removed lines

@@ -34,13 +34,13 @@
     $track_user    = monsterinsights_track_user();
 
     if ( $track_user && ( $events_mode === 'js' || $events_mode === 'php' ) ) {
-        require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-analytics-events.php';
-        new MonsterInsights_Analytics_Events();
+	require_once plugin_dir_path( MONSTERINSIGHTS_PLUGIN_FILE ) . 'includes/frontend/events/class-analytics-events.php';
+	new MonsterInsights_Analytics_Events();
 
-        // Let's run form tracking if we find it
-        if ( function_exists( 'monsterinsights_forms_output_after_script' ) ) {
-            monsterinsights_forms_output_after_script( array() );
-        }
+	// Let's run form tracking if we find it
+	if ( function_exists( 'monsterinsights_forms_output_after_script' ) ) {
+	    monsterinsights_forms_output_after_script( array() );
+	}
     }
 }
 add_action( 'seedprod_monsterinsights_output_tracking', 'monsterinsights_seedprod_tracking', 6, 1 );
\ No newline at end of file

includes/admin/common.php

Spacing +103 added lines, -103 removed lines

@@ -155,32 +155,32 @@ 
 				'copytoclip'       				=> esc_html__( 'Copy to Clipboard', 'google-analytics-for-wordpress' ),
 				'failed'           				=> esc_html__( 'Failed!', 'google-analytics-for-wordpress' ),
 				'admin_nonce'      				=> wp_create_nonce( 'mi-admin-nonce' ),
-				'shorten'         				=> esc_html__( 'Shorten URL' ,'google-analytics-for-wordpress'),
-				'shortened'        				=> esc_html__( 'Shortened!' ,'google-analytics-for-wordpress'),
-				'working'          				=> esc_html__( 'Working...' ,'google-analytics-for-wordpress'),
-				'importtext'       				=> esc_html__( 'Import' ,'google-analytics-for-wordpress'),
-				'imported'         				=> esc_html__( 'Imported!' ,'google-analytics-for-wordpress'),
-				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:' ,'google-analytics-for-wordpress'),
-				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'redirect_loading_error_title'  => esc_html__( "Authentication Error:" ,'google-analytics-for-wordpress'),
-				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....' ,'google-analytics-for-wordpress'),
-				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:" ,'google-analytics-for-wordpress'),
-				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!' ,'google-analytics-for-wordpress'),
-				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore." ,'google-analytics-for-wordpress'),
-				'verify_loading_title_text'  	=> esc_html__( 'Verifying....' ,'google-analytics-for-wordpress'),
-				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds." ,'google-analytics-for-wordpress'),
-				'verify_loading_error_title' 	=> esc_html__( "Verification Error:" ,'google-analytics-for-wordpress'),
-				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!' ,'google-analytics-for-wordpress'),
-				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!" ,'google-analytics-for-wordpress'),
-				'ok_text' 						=> esc_html__( "OK" ,'google-analytics-for-wordpress'),
-				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate" ,'google-analytics-for-wordpress'),
+				'shorten'         				=> esc_html__( 'Shorten URL', 'google-analytics-for-wordpress' ),
+				'shortened'        				=> esc_html__( 'Shortened!', 'google-analytics-for-wordpress' ),
+				'working'          				=> esc_html__( 'Working...', 'google-analytics-for-wordpress' ),
+				'importtext'       				=> esc_html__( 'Import', 'google-analytics-for-wordpress' ),
+				'imported'         				=> esc_html__( 'Imported!', 'google-analytics-for-wordpress' ),
+				'redirect_loading_title_text'   => esc_html__( 'Preparing to redirect:', 'google-analytics-for-wordpress' ),
+				'redirect_loading_text_text'    => esc_html__( "You'll be redirected momentarily to complete authentication. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'redirect_loading_error_title'  => esc_html__( "Authentication Error:", 'google-analytics-for-wordpress' ),
+				'deauth_loading_title_text'  	=> esc_html__( 'Deauthenticating....', 'google-analytics-for-wordpress' ),
+				'deauth_loading_text_text'   	=> esc_html__( "We're deactivating your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'deauth_loading_error_title' 	=> esc_html__( "Deactivation Error:", 'google-analytics-for-wordpress' ),
+				'deauth_success_title_text'  	=> esc_html__( 'Deactivated Successfully!', 'google-analytics-for-wordpress' ),
+				'deauth_success_text_text'   	=> esc_html__( "You've disconnected your site from MonsterInsights. Your site is no longer being tracked by Google Analytics and you won't see reports anymore.", 'google-analytics-for-wordpress' ),
+				'verify_loading_title_text'  	=> esc_html__( 'Verifying....', 'google-analytics-for-wordpress' ),
+				'verify_loading_text_text'   	=> esc_html__( "We're verifying your site. This may take a couple seconds.", 'google-analytics-for-wordpress' ),
+				'verify_loading_error_title' 	=> esc_html__( "Verification Error:", 'google-analytics-for-wordpress' ),
+				'verify_success_title_text' 	=> esc_html__( 'Verified Successfully!', 'google-analytics-for-wordpress' ),
+				'verify_success_text_text'  	=> esc_html__( "Your site is connected to MonsterInsights!", 'google-analytics-for-wordpress' ),
+				'ok_text' 						=> esc_html__( "OK", 'google-analytics-for-wordpress' ),
+				'force_deauth_button_text'  	=> esc_html__( "Force Deauthenticate", 'google-analytics-for-wordpress' ),
 				'refresh_report_title'          => esc_html__( 'Refreshing Report', 'google-analytics-for-wordpress' ),
 				'refresh_report_text'           => esc_html__( 'Loading new report data...', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Success', 'google-analytics-for-wordpress' ),
 				'refresh_report_success_text'   => esc_html__( 'Retrieved the new report data successfully', 'google-analytics-for-wordpress' ),
 				'refresh_report_failure_title'  => esc_html__( 'Error', 'google-analytics-for-wordpress' ),
-				'timezone'						=> date('e'),
+				'timezone'						=> date( 'e' ),
 				'resume_report_title'			=> esc_html__( 'Real-Time Report Paused', 'google-analytics-for-wordpress' ),
 				'resume_report_text'			=> esc_html__( 'The Real-Time Report automatically paused due to inactivity. Please refresh the page to resume the Real-Time Report.', 'google-analytics-for-wordpress' ),
 			)
@@ -244,7 +244,7 @@ 
 		'kad_admin_js', // Pinnacle theme
 		'dt-chart', // DesignThemes core features plugin
 		'tweeetshare_font_script', // TweetShare - Click To Tweet
-		'tweeetshare_jquery_script',  // TweetShare - Click To Tweet
+		'tweeetshare_jquery_script', // TweetShare - Click To Tweet
 		'tweeetshare_jqueryui_script', // TweetShare - Click To Tweet
 		'tweeetshare_custom_script', // TweetShare - Click To Tweet
 		'imagify-promise-polyfill', // Imagify 
@@ -263,16 +263,16 @@ 
 		'rml-modal', // WP Real Media Library
 		'rml-order', // WP Real Media Library
 		'rml-meta', // WP Real Media Library
-		'rml-uploader',  // WP Real Media Library
-		'rml-options',  // WP Real Media Library
-		'rml-usersettings',  // WP Real Media Library
+		'rml-uploader', // WP Real Media Library
+		'rml-options', // WP Real Media Library
+		'rml-usersettings', // WP Real Media Library
 		'rml-main', // WP Real Media Library
 		'control-panel-sweet-alert', // Ken Theme
 		'sweet-alert-js', // Vitrine Theme
 		'theme-admin-script', // Vitrine Theme
 		'sweetalert', //  Church Suite Theme by Webnus
 		'be_alerts_charts', //  WooCommerce bolder product alerts
- 		'magayo-lottery-results',  //  Magayo Lottery Results
+ 		'magayo-lottery-results', //  Magayo Lottery Results
 		'control-panel-sweet-alert', // Ken Theme
 		'cpm_chart', // WP Project Manager
 		'adminscripts', //  Artisan Nayma Theme
@@ -358,15 +358,15 @@ 
 
 	global $wp_styles;
 	foreach ( $wp_styles->queue as $handle ) {
-		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content') === false ) {
+		if ( strpos( $wp_styles->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 		
-		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights') !== false ) {
+		if ( strpos( $wp_styles->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
-		foreach( $third_party as $partial ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_styles->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_style( $handle ); // Remove css file from MI screen
 				wp_deregister_style( $handle );
@@ -381,15 +381,15 @@ 
 
 	global $wp_scripts;
 	foreach ( $wp_scripts->queue as $handle ) {
-		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content') === false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->src, 'wp-content' ) === false ) {
 			return;
 		}
 		
-		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights') !== false ) {
+		if ( strpos( $wp_scripts->registered[$handle]->handle, 'monsterinsights' ) !== false ) {
 			return;
 		}
 
-		foreach( $third_party as $partial ) {
+		foreach ( $third_party as $partial ) {
 			if ( strpos( $wp_scripts->registered[$handle]->handle, $partial ) !== false ) {
 				wp_dequeue_script( $handle ); // Remove JS file from MI screen
 				wp_deregister_script( $handle );
@@ -404,47 +404,47 @@ 
 
 	// Remove actions from themes that are not following best practices and break the admin doing so
 		// Theme: Newspaper by tagDiv
-			remove_action('admin_enqueue_scripts', 'load_wp_admin_js');
-			remove_action('admin_enqueue_scripts', 'load_wp_admin_css');
-			remove_action('admin_print_scripts-widgets.php', 'td_on_admin_print_scripts_farbtastic');
-			remove_action('admin_print_styles-widgets.php', 'td_on_admin_print_styles_farbtastic');
-			remove_action('admin_print_footer_scripts', 'check_if_media_uploads_is_loaded', 9999);
-			remove_action('print_media_templates', 'td_custom_gallery_settings_hook');
-			remove_action('print_media_templates', 'td_change_backbone_js_hook');
-			remove_action('admin_head', 'tdc_on_admin_head'); //  TagDiv Composer Fix
-			remove_action('print_media_templates', 'us_media_templates'); // Impreza Theme Fix
-			remove_action('admin_footer', 'gt3pg_add_gallery_template'); // GT3 Photo & Video Gallery By GT3 Themes Plugin Fix
+			remove_action( 'admin_enqueue_scripts', 'load_wp_admin_js' );
+			remove_action( 'admin_enqueue_scripts', 'load_wp_admin_css' );
+			remove_action( 'admin_print_scripts-widgets.php', 'td_on_admin_print_scripts_farbtastic' );
+			remove_action( 'admin_print_styles-widgets.php', 'td_on_admin_print_styles_farbtastic' );
+			remove_action( 'admin_print_footer_scripts', 'check_if_media_uploads_is_loaded', 9999 );
+			remove_action( 'print_media_templates', 'td_custom_gallery_settings_hook' );
+			remove_action( 'print_media_templates', 'td_change_backbone_js_hook' );
+			remove_action( 'admin_head', 'tdc_on_admin_head' ); //  TagDiv Composer Fix
+			remove_action( 'print_media_templates', 'us_media_templates' ); // Impreza Theme Fix
+			remove_action( 'admin_footer', 'gt3pg_add_gallery_template' ); // GT3 Photo & Video Gallery By GT3 Themes Plugin Fix
 		// Plugin WP Booklist:
-			remove_action('admin_footer', 'wpbooklist_jre_dismiss_prem_notice_forever_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_dashboard_add_book_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_show_form_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_show_book_in_colorbox_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_new_lib_shortcode_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_dashboard_save_library_display_options_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_dashboard_save_post_display_options_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_dashboard_save_page_display_options_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_update_display_options_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_pagination_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_switch_lib_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_search_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_edit_book_actual_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_delete_book_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_user_apis_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_upload_new_stylepak_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_upload_new_post_template_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_upload_new_page_template_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_create_db_library_backup_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_restore_db_library_backup_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_create_csv_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_amazon_localization_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_delete_book_bulk_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_reorder_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_exit_results_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_storytime_select_category_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_storytime_get_story_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_storytime_expand_browse_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_storytime_save_settings_action_javascript');
-			remove_action('admin_footer', 'wpbooklist_delete_story_action_javascript');
+			remove_action( 'admin_footer', 'wpbooklist_jre_dismiss_prem_notice_forever_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_dashboard_add_book_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_show_form_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_show_book_in_colorbox_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_new_lib_shortcode_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_dashboard_save_library_display_options_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_dashboard_save_post_display_options_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_dashboard_save_page_display_options_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_update_display_options_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_pagination_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_switch_lib_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_search_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_edit_book_actual_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_delete_book_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_user_apis_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_upload_new_stylepak_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_upload_new_post_template_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_upload_new_page_template_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_create_db_library_backup_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_restore_db_library_backup_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_create_csv_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_amazon_localization_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_delete_book_bulk_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_reorder_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_exit_results_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_storytime_select_category_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_storytime_get_story_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_storytime_expand_browse_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_storytime_save_settings_action_javascript' );
+			remove_action( 'admin_footer', 'wpbooklist_delete_story_action_javascript' );
 }
 add_action( 'admin_enqueue_scripts', 'monsterinsights_remove_conflicting_asset_files', 9999 );
 
@@ -456,66 +456,66 @@ 
  *
  * @return null Return early if not on the proper screen.
  */
-function hide_non_monsterinsights_warnings () {
+function hide_non_monsterinsights_warnings() {
 	// Bail if we're not on a MonsterInsights screen.
 	if ( empty( $_REQUEST['page'] ) || strpos( $_REQUEST['page'], 'monsterinsights' ) === false ) {
 		return;
 	}
 
 	global $wp_filter;
-	if ( !empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['user_admin_notices']->callbacks ) && is_array( $wp_filter['user_admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['user_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['user_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['user_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['admin_notices']->callbacks ) && is_array( $wp_filter['admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 
-	if ( !empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
-		foreach( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
+	if ( ! empty( $wp_filter['all_admin_notices']->callbacks ) && is_array( $wp_filter['all_admin_notices']->callbacks ) ) {
+		foreach ( $wp_filter['all_admin_notices']->callbacks as $priority => $hooks ) {
 			foreach ( $hooks as $name => $arr ) {
 				if ( is_object( $arr['function'] ) && $arr['function'] instanceof Closure ) {
-					unset( $wp_filter['all_admin_notices']->callbacks[ $priority ][ $name ] );
+					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 					continue;
 				}
 				if ( ! empty( $arr['function'][0] ) && is_object( $arr['function'][0] ) && strpos( strtolower( get_class( $arr['function'][0] ) ), 'monsterinsights' ) !== false ) {
 					continue;
 				}
-				if ( !empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
+				if ( ! empty( $name ) && strpos( $name, 'monsterinsights' ) === false ) {
 					unset( $wp_filter['all_admin_notices']->callbacks[$priority][$name] );
 				}
 			}
 		}
 	}
 }
-add_action('admin_print_scripts', 'hide_non_monsterinsights_warnings');  
-add_action('admin_head', 'hide_non_monsterinsights_warnings', PHP_INT_MAX  );  
+add_action( 'admin_print_scripts', 'hide_non_monsterinsights_warnings' );  
+add_action( 'admin_head', 'hide_non_monsterinsights_warnings', PHP_INT_MAX );  
 
 /**
  * Called whenever an upgrade button / link is displayed in Lite, this function will
@@ -544,33 +544,33 @@ 
 	}
 
 	// Get the ShareASale ID
-	$shareasale_id   = monsterinsights_get_shareasale_id();
+	$shareasale_id = monsterinsights_get_shareasale_id();
 
 	// If we have a shareasale ID return the shareasale url
 	if ( ! empty( $shareasale_id ) ) {
-		$shareasale_id  = absint( $shareasale_id );
+		$shareasale_id = absint( $shareasale_id );
 		return esc_url( monsterinsights_get_shareasale_url( $shareasale_id, $url ) );
 	} else {
 		return esc_url( $url );
 	}
 }
 
-function monsterinsights_get_url( $medium = '', $campaign = '', $url = '', $escape = true  ) {
+function monsterinsights_get_url( $medium = '', $campaign = '', $url = '', $escape = true ) {
 	// Setup Campaign variables
-	$source          = monsterinsights_is_pro_version()   ? 'proplugin' : 'liteplugin';
-	$medium          = ! empty( $medium )   ? $medium     : 'defaultmedium';
-	$campaign        = ! empty( $campaign ) ? $campaign   : 'defaultcampaign';
-	$content 		 = MONSTERINSIGHTS_VERSION;
-	$default_url     = monsterinsights_is_pro_version()   ? '' : 'lite/';
+	$source          = monsterinsights_is_pro_version() ? 'proplugin' : 'liteplugin';
+	$medium          = ! empty( $medium ) ? $medium : 'defaultmedium';
+	$campaign        = ! empty( $campaign ) ? $campaign : 'defaultcampaign';
+	$content = MONSTERINSIGHTS_VERSION;
+	$default_url     = monsterinsights_is_pro_version() ? '' : 'lite/';
 	$url             = ! empty( $url ) ? $url : 'https://www.monsterinsights.com/' . $default_url;
 
 	// Put together redirect URL
 	$url = add_query_arg(
 		array(
-		    'utm_source'   => $source,   // Pro/Lite Plugin
-		    'utm_medium'   => sanitize_key( $medium ),   // Area of MonsterInsights (example Reports)
+		    'utm_source'   => $source, // Pro/Lite Plugin
+		    'utm_medium'   => sanitize_key( $medium ), // Area of MonsterInsights (example Reports)
 		    'utm_campaign' => sanitize_key( $campaign ), // Which link (example eCommerce Report)
-		    'utm_content'  => $content,  // Version number of MI
+		    'utm_content'  => $content, // Version number of MI
 		),
 		trailingslashit( $url )
 	);
@@ -608,13 +608,13 @@ 
 	$custom = false;
 	if ( defined( 'MONSTERINSIGHTS_SHAREASALE_REDIRECT_URL' ) ) {
 		$shareasale_redirect = MONSTERINSIGHTS_SHAREASALE_REDIRECT_URL;
-		$custom 			 = true;
+		$custom = true;
 	}
 
 	// If there's no constant, check if there's an option.
 	if ( empty( $custom ) ) {
 		$shareasale_redirect = get_option( 'monsterinsights_shareasale_redirect_url', '' );
-		$custom 			 = true;
+		$custom = true;
 	}
 
 	// Whether we have an ID or not, filter the ID.
@@ -623,7 +623,7 @@ 
 	return $shareasale_url;
 }
 
-function monsterinsights_settings_ublock_error_js(){
+function monsterinsights_settings_ublock_error_js() {
 	echo "<script type='text/javascript'>\n";
 	echo "jQuery( document ).ready( function( $ ) {
 			if ( window.uorigindetected == null){
@@ -639,9 +639,9 @@ 
 }
 
 function monsterinsights_ublock_notice() {
-	ob_start();?>
+	ob_start(); ?>
 	<div id="monsterinsights-ublock-origin-error" class="error inline" style="display:none;">
-		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress'), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">');
+		<?php echo sprintf( esc_html__( 'MonsterInsights has detected that it\'s files are being blocked. This is usually caused by a adblock browser plugin (particularly uBlock Origin), or a conflicting WordPress theme or plugin. This issue only affects the admin side of MonsterInsights. To solve this, ensure MonsterInsights is whitelisted for your website URL in any adblock browser plugin you use. For step by step directions on how to do this, %1$sclick here%2$s. If this doesn\'t solve the issue (rare), send us a ticket %3$shere%2$s and we\'ll be happy to help diagnose the issue.', 'google-analytics-for-wordpress' ), '<a href="https://monsterinsights.com/docs/monsterinsights-asset-files-blocked/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">', '</a>', '<a href="https://monsterinsights.com/contact/" target="_blank" rel="noopener noreferrer" referrer="no-referrer">' );
 		?>
 	</div>
 	<?php