yikesinc / yikes-inc-easy-mailchimp-extender

admin/class-yikes-inc-easy-mailchimp-extender-admin.php

Doc Comments -4 removed lines

@@ -1214,8 +1214,6 @@ 
 	 * the correct WordPress options API (old plugin stored options wierdly)
 	 *
 	 * @since    1.0.0
-	 * @param      string    $yikes_inc_easy_mailchimp_extender       The name of this plugin.
-	 * @param      string    $version    The version of this plugin.
 	 */
 	public function check_for_old_yks_mc_options() {
 		$old_plugin_options = get_option( 'ykseme_storage' );
@@ -1250,8 +1248,6 @@ 
 		 * the correct WordPress options API (old plugin stored options wierdly)
 		 *
 		 * @since    1.0.0
-		 * @param      string    $yikes_inc_easy_mailchimp_extender       The name of this plugin.
-		 * @param      string    $version    The version of this plugin.
 		 */
 		public function display_options_migrate_notice() {
 			

Indentation +91 added lines, -91 removed lines

@@ -184,9 +184,9 @@ 
 		*	@ return	array	$links		New array of plugin actions
 		*/
 		public function easy_forms_plugin_action_links( $links ) {
-		   $links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
-		   $links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
-		   return $links;
+			$links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+			$links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+			return $links;
 		}
 
 		/**
@@ -419,10 +419,10 @@ 
 		}
 
 		/**
-		*	Dismiss the migrate options notice (incase the user wants to do things manually)
-		*
-		*	@since 6.0.0
-		**/
+		 *	Dismiss the migrate options notice (incase the user wants to do things manually)
+		 *
+		 *	@since 6.0.0
+		 **/
 		public function yikes_easy_mailchimp_dismiss_option_migrate() {
 			// delete the options and allow the user to manually updadte things
 
@@ -560,10 +560,10 @@ 
 		}
 
 		/**
-		* Localize Script
-		* Pass our imported list data, to the JS file
-		* to build the drop down list in the modal
-		*/
+		 * Localize Script
+		 * Pass our imported list data, to the JS file
+		 * to build the drop down list in the modal
+		 */
 		public function tinymce_yikes_easy_mc() {
 			// check capabilities
 			if( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
@@ -727,9 +727,9 @@ 
 
 
 	/**
-	*	Localization functions for jQuery ui datepicker
-	*	@since 6.0.3.8
-	*/
+	 *	Localization functions for jQuery ui datepicker
+	 *	@since 6.0.3.8
+	 */
 		/**
 		 * Format array for the datepicker
 		 * WordPress stores the locale information in an array with a alphanumeric index, and
@@ -788,13 +788,13 @@ 
 			 }
 		}
 	/**
-	*	end Localization functions for jQuery ui datepicker
-	*/
+	 *	end Localization functions for jQuery ui datepicker
+	 */
 
 	/**
-	*	Register our admin pages
-	*	used to display data back to the user
-	**/
+	 *	Register our admin pages
+	 *	used to display data back to the user
+	 **/
 	public function register_admin_pages() {
 
 		/* Top Level Menu 'Easy MailChimp' */
@@ -948,82 +948,82 @@ 
 	}
 
 	/**
-	* Generate YIKES Inc. Easy MailChimp Manage Forms Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate YIKES Inc. Easy MailChimp Manage Forms Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateManageFormsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page
 	}
 
 	/**
-	* Generate YIKES Inc. Easy MailChimp Manage Lists Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate YIKES Inc. Easy MailChimp Manage Lists Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateManageListsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page
 	}
 
 	/**
-	* Generate YIKES Inc. Easy MailChimp Account Details Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate YIKES Inc. Easy MailChimp Account Details Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateAccountDetailsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/account-details.php'; // include our account details page
 	}
 
 	/**
-	* Generate YIKES Inc. Easy MailChimp Support Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate YIKES Inc. Easy MailChimp Support Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateSupportPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/support.php'; // include our options page
 	}
 
 	/**
-	* Generate YIKES Inc. Easy MailChimp Edit Form Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate YIKES Inc. Easy MailChimp Edit Form Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateEditFormPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page
 	}
 
 	/**
-	* Generate YIKES Inc. Easy MailChimp Welcome Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate YIKES Inc. Easy MailChimp Welcome Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateWelcomePage() {
 		require_once YIKES_MC_PATH . 'admin/partials/welcome-page/welcome.php'; // include our options page
 	}
 
 	/**
-	* Generate YIKES Inc. Easy MailChimp View List Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate YIKES Inc. Easy MailChimp View List Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateViewListPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page
 	}
 
 	/**
-	* Generate YIKES Inc. Easy MailChimp View User Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate YIKES Inc. Easy MailChimp View User Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generateViewUserPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page
 	}
 
 	/**
-	*	Register our plugin settings, and display them on our settings page
-	*
-	* @since v.5.4
-	**/
+	 *	Register our plugin settings, and display them on our settings page
+	 *
+	 * @since v.5.4
+	 **/
 	function yikes_easy_mc_settings_init() {
 
 		/* Register General Settings Section */
@@ -1139,9 +1139,9 @@ 
 	}
 
 	/**
-	*	Options Sanitization & Validation
-	*	@since complete re-write
-	**/
+	 *	Options Sanitization & Validation
+	 *	@since complete re-write
+	 **/
 	function yikes_mc_validate_api_key( $input ) {
 		if( $input == '' ) {
 			return;
@@ -1180,20 +1180,20 @@ 
 	}
 
 	/**
-	* Generate YIKES Inc. Easy Forms for MailChimp Options Page
-	*
-	* @since    1.0.0
-	*/
+	 * Generate YIKES Inc. Easy Forms for MailChimp Options Page
+	 *
+	 * @since    1.0.0
+	 */
 	function generatePageOptions() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page
 	}
 
 	/**
-	*	Check if users API key is valid, if not
-	*	this function will apply a disabled attribute
-	*	to form fields. (input, dropdowns, buttons etc.)
-	* 	@since v5.5 re-write
-	**/
+	 *	Check if users API key is valid, if not
+	 *	this function will apply a disabled attribute
+	 *	to form fields. (input, dropdowns, buttons etc.)
+	 * 	@since v5.5 re-write
+	 **/
 	public function is_user_mc_api_valid_form( $echo=true ) {
 		if( $echo == true ) {
 			if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
@@ -1233,7 +1233,7 @@ 
 	 * Migrate our old options , to the new options API
 	 * moving from 5.5 and beyond..
 	 * @since
-	*/
+	 */
 	public function migrate_old_yks_mc_options() {
 		// include our migrate options helper file
 		include_once YIKES_MC_PATH . 'admin/partials/upgrade-helpers/upgrade-migrate-options.php';
@@ -1242,7 +1242,7 @@ 
 	/**
 		Admin Notices
 		- Notifications displayed at the top of admin pages, back to the user
-	**/
+	 **/
 
 		/**
 		 * Check for existing plugin options
@@ -1301,12 +1301,12 @@ 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
 		*/
 		function findMCListID($id, $array) {
-		   foreach ($array as $key => $val) {
-			   if ($val['id'] === $id) {
-				   return $key;
-			   }
-		   }
-		   return null;
+			foreach ($array as $key => $val) {
+				if ($val['id'] === $id) {
+					return $key;
+				}
+			}
+			return null;
 		} // end
 
 		/* Ajax Migrate Options */
@@ -1643,9 +1643,9 @@ 
 			}
 
 			/**
-			*	Custom action hook for our extensions to hook into
-			*	@parameter	get_current_screen()	current screen information
-			*/
+			 *	Custom action hook for our extensions to hook into
+			 *	@parameter	get_current_screen()	current screen information
+			 */
 			do_action( 'yikes-mailchimp-admin-sidebar', get_current_screen() );
 
 		}
@@ -2795,12 +2795,12 @@ 
 		}
 
 		/**
-		*	Return an array of MailChimp lists associated with this account
-		*
-		*	Used when deleting the sites MailChimp cache stored
-		*	@since 6.0.2
-		*	@return 	$list_id_array - array of list id's to loop over
-		*/
+		 *	Return an array of MailChimp lists associated with this account
+		 *
+		 *	Used when deleting the sites MailChimp cache stored
+		 *	@since 6.0.2
+		 *	@return 	$list_id_array - array of list id's to loop over
+		 */
 		public function get_mailchimp_list_ids_on_account() {
 			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
 			if( ! $api_key ) {
@@ -2910,18 +2910,18 @@ 
 		}
 
 		/**
-		*	Hook in and display our support page/knowledge base articles
-		*	on the support page
-		*	@since 6.0.3.8
-		*/
+		 *	Hook in and display our support page/knowledge base articles
+		 *	on the support page
+		 *	@since 6.0.3.8
+		 */
 		public function hook_and_display_kb_article_RSS() {
 			include_once( YIKES_MC_PATH . 'admin/partials/helpers/knowledge-base-articles-RSS.php' );
 		}
 
 		/**
-		*	Check the users version number, and display a notice to upgrade the databse if needed
-		*	@since 6.0.4
-		*/
+		 *	Check the users version number, and display a notice to upgrade the databse if needed
+		 *	@since 6.0.4
+		 */
 		public function check_yikes_mc_table_version() {
 			if( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
 				require_once YIKES_MC_PATH . 'includes/class-yikes-inc-easy-mailchimp-extender-activator.php';

Braces +6 added lines, -4 removed lines

@@ -413,8 +413,9 @@ 
 			$create_ticket_response = wp_remote_retrieve_body( $response );
 
 			// display it
-			if( $create_ticket_response )
-				echo $create_ticket_response;
+			if( $create_ticket_response ) {
+							echo $create_ticket_response;
+			}
 
 		}
 
@@ -1160,7 +1161,7 @@ 
 			if( isset( $body['msg'] ) && $body['msg'] == "Everything's Chimpy!" ) {
 				update_option( 'yikes-mc-api-validation' , 'valid_api_key' );
 			}
-		}  else {
+		} else {
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 			$error_logging->yikes_easy_mailchimp_write_to_error_log( $api_key_response->get_error_message() , __( "Connecting to MailChimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );
@@ -2009,7 +2010,8 @@ 
 
 
 
-					} else { // THIS IS AN INTEREST GROUP!
+					} else {
+// THIS IS AN INTEREST GROUP!
 
 						?>
 						<section class="draggable" id="<?php echo $field['group_id']; ?>">

Spacing +556 added lines, -556 removed lines

@@ -38,19 +38,19 @@ 
 		$this->yikes_inc_easy_mailchimp_extender = $yikes_inc_easy_mailchimp_extender;
 		$this->version = $version;
 		// check for old plugin options and migrate if exist
-		add_action( 'admin_menu' , array( $this , 'register_admin_pages' ) , 11 );
+		add_action( 'admin_menu', array( $this, 'register_admin_pages' ), 11 );
 		// check for old plugin options and migrate if exist
-		add_action( 'admin_init' , array( $this , 'check_for_old_yks_mc_options' ) );
+		add_action( 'admin_init', array( $this, 'check_for_old_yks_mc_options' ) );
 		// Ajax function to update new options...
-		add_action( 'wp_ajax_migrate_old_plugin_settings', array( $this , 'migrate_archived_options' ) );
+		add_action( 'wp_ajax_migrate_old_plugin_settings', array( $this, 'migrate_archived_options' ) );
 		// Ajax function to migrate our forms
-		add_action( 'wp_ajax_migrate_prevoious_forms', array( $this , 'migrate_previously_setup_forms' ) );
+		add_action( 'wp_ajax_migrate_prevoious_forms', array( $this, 'migrate_previously_setup_forms' ) );
 		// fix menu icon spacing
-		add_action( 'admin_head' , array( $this , 'fix_menu_icon_spacing' ) );
+		add_action( 'admin_head', array( $this, 'fix_menu_icon_spacing' ) );
 		// register our plugin settings
-		add_action( 'admin_init', array( $this , 'yikes_easy_mc_settings_init' ) );
+		add_action( 'admin_init', array( $this, 'yikes_easy_mc_settings_init' ) );
 		// plugin redirect on activation
-		add_action( 'admin_init' , array( $this , 'yikes_easy_mc_activation_redirect' ) );
+		add_action( 'admin_init', array( $this, 'yikes_easy_mc_activation_redirect' ) );
 		// Include Third Party Extensions
 		include_once( YIKES_MC_PATH . 'includes/third-party-integrations/third-party-init.php' );
 		// Include our dashboard widget class
@@ -60,111 +60,111 @@ 
 		// Include our ajax processing class
 		include_once( YIKES_MC_PATH . 'admin/partials/ajax/class.ajax.php' );
 		// load up our helper class
-		add_action( 'admin_init' , array( $this , 'yikes_mailchimp_load_helper_class' ) );
+		add_action( 'admin_init', array( $this, 'yikes_mailchimp_load_helper_class' ) );
 		// process the subscriber count shortcode in form descriptions
 		add_action( 'yikes-mailchimp-form-description', array( $this, 'process_subscriber_count_shortcode_in_form_descriptions' ), 10, 2 );
 		/***********************/
 		/** Create A Form **/
 		/**********************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-form' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_create_form' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );
 		}
 		/***********************/
 		/** Delete A Form **/
 		/**********************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-delete-form' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_delete_form' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );
 		}
 		/**********************************/
 		/** Duplicate/Clone A Form 	**/
 		/********************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-duplicate-form' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_duplicate_form' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );
 		}
 		/*************************************/
 		/**  Reset Form Impression Stats **/
 		/***********************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-reset-stats' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_reset_impression_stats' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );
 		}
 		/**********************************/
 		/** 	     Update A Form 		**/
 		/********************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-update-form' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_update_form' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );
 		}
 		/**************************************************/
 		/** 	 Clear Store MailChimp Transient Data   **/
 		/*************************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-transient-data' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_clear_transient_data' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_transient_data' ) );
 		}
 		/*******************************************/
 		/** Remove a user from a mailing list 	 **/
 		/*****************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-unsubscribe-user' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_unsubscribe_user' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );
 		}
 		/*******************************************/
 		/** 	Create misisng error log file  **/
 		/*****************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-create-error-log' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_create_missing_error_log' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );
 		}
 		/*******************************************/
 		/**   TinyMCE Initialization Functions	 **/
 		/*****************************************/
-		add_action( 'admin_head' , array( $this, 'add_tinyMCE_buttons' ) );
+		add_action( 'admin_head', array( $this, 'add_tinyMCE_buttons' ) );
 		// pass our lists data to tinyMCE button for use
-		foreach ( array('post.php','post-new.php') as $hook ) {
+		foreach ( array( 'post.php', 'post-new.php' ) as $hook ) {
 			add_action( "admin_head-$hook", array( $this, 'tinymce_yikes_easy_mc' ) );
 		}
 		// display an admin notice for users on PHP < 5.3
-		if( phpversion() < '5.3' ) {
+		if ( phpversion() < '5.3' ) {
 			add_action( "admin_notices", array( $this, 'display_php_warning' ), 999 );
 		}
 		// two week , dismissable notification - check the users plugin installation date
-		add_action( 'admin_init', array( $this , 'yikes_easy_mailchimp_check_installation_date' ) );
+		add_action( 'admin_init', array( $this, 'yikes_easy_mailchimp_check_installation_date' ) );
 		// dismissable notice admin side
-		add_action( 'admin_init', array( $this , 'yikes_easy_mailchimp_stop_bugging_me' ), 5 );
+		add_action( 'admin_init', array( $this, 'yikes_easy_mailchimp_stop_bugging_me' ), 5 );
 		/**************************************************/
 		/** 	 	Clear MailChimp Error Log Data 	    **/
 		/*************************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-clear-error-log' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_clear_error_log' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );
 		}
 		/*********************************************/
 		/** 		Export MailChimp Opt-in Forms   **/
 		/*******************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-forms' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_export_forms' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );
 		}
 		/*********************************************/
 		/** 				Export Plugin Settings    	   **/
 		/*******************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-export-settings' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_export_plugin_settings' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );
 		}
 		/*******************************************/
 		/** 		Import Class Inclusion	   **/
 		/*****************************************/
 		if ( isset( $_REQUEST[ 'action' ] ) && $_REQUEST[ 'action' ] == 'yikes-easy-mc-import-forms' ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_import_forms' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );
 		}
 		/*******************************************/
 		/** 	Premium Support Request     **/
 		/*****************************************/
 		if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_premium_support_request' ) );
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );
 		}
 		/****************************************/
 		/**	Dismiss Options Migrations		**/
 		/****************************************/
-		if( isset( $_REQUEST['dismiss_migration_nonce'] ) ) {
-			add_action( 'init' , array( $this , 'yikes_easy_mailchimp_dismiss_option_migrate' ) );
+		if ( isset( $_REQUEST[ 'dismiss_migration_nonce' ] ) ) {
+			add_action( 'init', array( $this, 'yikes_easy_mailchimp_dismiss_option_migrate' ) );
 		}
 		/** Parse default value into usable dynamic data **/
-		add_filter( 'yikes-mailchimp-process-default-tag' , array( $this , 'parse_mailchimp_default_tag' ) );
+		add_filter( 'yikes-mailchimp-process-default-tag', array( $this, 'parse_mailchimp_default_tag' ) );
 		/** Add a disclaimer to ensure that we let people know we are not endorsed/backed by MailChimp at all **/
 		add_filter( 'admin_footer_text', array( $this, 'yikes_easy_forms_admin_disclaimer' ) );
 		/** Add custom plugin action links **/
@@ -184,8 +184,8 @@ 
 		*	@ return	array	$links		New array of plugin actions
 		*/
 		public function easy_forms_plugin_action_links( $links ) {
-		   $links[] = '<a href="'. esc_url( get_admin_url(null, 'admin.php?page=yikes-inc-easy-mailchimp-settings') ) .'">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
-		   $links[] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+		   $links[ ] = '<a href="' . esc_url( get_admin_url( null, 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) . '">' . __( 'Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+		   $links[ ] = '<a href="' . esc_url( 'http://www.yikesplugins.com?utm_source=plugins-page&utm_medium=plugin-row&utm_campaign=admin' ) . '" target="_blank">' . __( 'More plugins by YIKES', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 		   return $links;
 		}
 
@@ -218,29 +218,29 @@ 
 		*	@return	parsed tag content
 		*/
 		public function parse_mailchimp_default_tag( $default_tag ) {
-			if( ! $default_tag || $default_tag == '' ) {
+			if ( ! $default_tag || $default_tag == '' ) {
 				return $default_tag;
 			}
 			global $post;
 			// page title
-			if( $default_tag == '{page_title}' ) {
+			if ( $default_tag == '{page_title}' ) {
 				$default_tag = get_the_title( $post->ID );
 			}
 			// page id
-			if( $default_tag == '{page_title}' ) {
+			if ( $default_tag == '{page_title}' ) {
 				$default_tag = $post->ID;
 			}
 			// page url
-			if( $default_tag == '{page_url}' ) {
+			if ( $default_tag == '{page_url}' ) {
 				$default_tag = get_permalink( $post->ID );
 			}
 			// blog name
-			if( $default_tag == '{blog_name}' ) {
+			if ( $default_tag == '{blog_name}' ) {
 				$default_tag = get_bloginfo( 'name' );
 			}
 			// is user logged in
-			if( $default_tag == '{user_logged_in}' ) {
-				if( is_user_logged_in() ) {
+			if ( $default_tag == '{user_logged_in}' ) {
+				if ( is_user_logged_in() ) {
 					$default_tag = 'Registered User';
 				} else {
 					$default_tag = 'Guest User';
@@ -258,12 +258,12 @@ 
 		*/
 		public function yikes_easy_mailchimp_clear_error_log() {
 			// file put contents $returned error + other data
-			if( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
+			if ( file_exists( YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php' ) ) {
 				$clear_log = file_put_contents(
 					YIKES_MC_PATH . 'includes/error_log/yikes-easy-mailchimp-error-log.php',
 					''
 				);
-				if( $clear_log === false ) {
+				if ( $clear_log === false ) {
 					// redirect the user to the manage forms page, display error message
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=false' ) ) );
 				} else {
@@ -281,20 +281,20 @@ 
 		*/
 		public function yikes_easy_mailchimp_export_forms() {
 			// grab our nonce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// grab the forms
-			$forms = isset( $_REQUEST['export_forms'] ) ? $_REQUEST['export_forms'] : 'all';
+			$forms = isset( $_REQUEST[ 'export_forms' ] ) ? $_REQUEST[ 'export_forms' ] : 'all';
 			// validate nonce
-			if( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			// include the export class
-			if( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Export_Class' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Export_Class' ) ) {
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-export.class.php' );
 			}
 			// run the export function
 			// parameters: ( $table_name, $form_ids, $file_name )
-			Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export( 'yikes_easy_mc_forms' , $forms, 'Yikes-Inc-Easy-MailChimp-Forms-Export' );
+			Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export( 'yikes_easy_mc_forms', $forms, 'Yikes-Inc-Easy-MailChimp-Forms-Export' );
 			// re-direct the user back to the page
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) );
 			die();
@@ -308,13 +308,13 @@ 
 		*/
 		public function yikes_easy_mailchimp_export_plugin_settings() {
 			// grab our nonce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// validate nonce
-			if( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			// include the export class
-			if( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Export_Class' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Export_Class' ) ) {
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-export.class.php' );
 			}
 			// run the export function
@@ -331,13 +331,13 @@ 
 		*/
 		public function yikes_easy_mailchimp_import_forms() {
 			// grab our nonce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// validate nonce
-			if( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			// include the export class
-			if( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Import_Class' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_MailChimp_Import_Class' ) ) {
 				include_once( YIKES_MC_PATH . 'includes/import-export/yikes-easy-mailchimp-import.class.php' );
 			}
 			// run the import function
@@ -355,15 +355,15 @@ 
 		*/
 		public function yikes_easy_mailchimp_premium_support_request() {
 
-			if( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-support-request' ) {
-				return __( 'We encountered an error. Please contact the YIKES Inc. support team.' , 'yikes-inc-easy-mailchimp-extender' );
+			if ( isset( $_POST[ 'action' ] ) && $_POST[ 'action' ] != 'yikes-support-request' ) {
+				return __( 'We encountered an error. Please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' );
 			}
 
-			$license = $_POST['license_key'];
-			$user_email = $_POST['user-email'];
-			$support_topic = $_POST['support-topic'];
-			$support_priority = $_POST['support-priority'];
-			$support_content = $_POST['support-content'];
+			$license = $_POST[ 'license_key' ];
+			$user_email = $_POST[ 'user-email' ];
+			$support_topic = $_POST[ 'support-topic' ];
+			$support_priority = $_POST[ 'support-priority' ];
+			$support_content = $_POST[ 'support-content' ];
 
 			// wp_die( print_r( $support_content) );
 
@@ -379,18 +379,18 @@ 
 
 			$yikes_plugin_support_url = 'https://yikesplugins.com';
 
-			if( $license != 'plugin-core' ) {
+			if ( $license != 'plugin-core' ) {
 				$split_license = explode( '|', $license );
 				// first let's check that the license key is actually active
 				$is_license_key_active = wp_remote_post( esc_url( $yikes_plugin_support_url ), array(
 					'action' => 'check_license',
-					'product_name' => urlencode( str_replace( '-', '', $split_license[1] ) . 'for Easy MailChimp' ),
-					'license' => $split_license[0],
+					'product_name' => urlencode( str_replace( '-', '', $split_license[ 1 ] ) . 'for Easy MailChimp' ),
+					'license' => $split_license[ 0 ],
 				) );
 
-				$response_body =  wp_remote_retrieve_body( $is_license_key_active );
-				if( $response_body ) {
-					if( $response_body->status != 'valid' ) {
+				$response_body = wp_remote_retrieve_body( $is_license_key_active );
+				if ( $response_body ) {
+					if ( $response_body->status != 'valid' ) {
 						wp_die( 'Invalid License Key...' );
 					}
 				}
@@ -404,7 +404,7 @@ 
 			) );
 
 			// catch the error
-			if( is_wp_error( $response ) ) {
+			if ( is_wp_error( $response ) ) {
 				wp_die( $create_ticket_request->getMessage() );
 				return;
 			}
@@ -413,7 +413,7 @@ 
 			$create_ticket_response = wp_remote_retrieve_body( $response );
 
 			// display it
-			if( $create_ticket_response )
+			if ( $create_ticket_response )
 				echo $create_ticket_response;
 
 		}
@@ -427,7 +427,7 @@ 
 			// delete the options and allow the user to manually updadte things
 
 			// Verify the NONCE is valid
-			check_admin_referer( 'yikes-mc-dismiss-migration' , 'dismiss_migration_nonce' );
+			check_admin_referer( 'yikes-mc-dismiss-migration', 'dismiss_migration_nonce' );
 
 			// re-direct the user back to the page
 			wp_redirect( esc_url_raw( admin_url( 'index.php?yikes-mc-options-migration-dismissed="true"' ) ) );
@@ -442,7 +442,7 @@ 
 		 * @since 6.0.0
 		 */
 		public function load_error_logging_class() {
-			if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				// if error logging is enabled we should include our error logging class
 				/* Generate oure error logging table */
 				require_once YIKES_MC_PATH . '/includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
@@ -461,17 +461,17 @@ 
 			// add a new option to store the plugin activation date/time
 			// @since v6.0.0
 			// this is used to notify the user that they should review after 2 weeks
-			if ( !get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
+			if ( ! get_option( 'yikes_easy_mailchimp_activation_date' ) ) {
 				add_option( 'yikes_easy_mailchimp_activation_date', strtotime( "now" ) );
 			}
 
 			$stop_bugging_me = get_option( 'yikes_easy_mailchimp_review_stop_bugging_me' );
 
-			if( !$stop_bugging_me ) {
+			if ( ! $stop_bugging_me ) {
 				$install_date = get_option( 'yikes_easy_mailchimp_activation_date' );
 				$past_date = strtotime( '-14 days' );
 				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
-					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );
+					add_action( 'admin_notices', array( $this, 'yikes_easy_mailchimp_display_review_us_notice' ) );
 				}
 			}
 
@@ -484,13 +484,13 @@ 
 		*/
 		public function yikes_easy_mailchimp_display_review_us_notice() {
 			/* Lets only display our admin notice on YT4WP pages to not annoy the hell out of people :) */
-			if ( in_array( get_current_screen()->base , array( 'dashboard' , 'post' , 'edit' ) ) || strpos( get_current_screen()->base ,'yikes-inc-easy-mailchimp') !== false ) {
+			if ( in_array( get_current_screen()->base, array( 'dashboard', 'post', 'edit' ) ) || strpos( get_current_screen()->base, 'yikes-inc-easy-mailchimp' ) !== false ) {
 				// Review URL - Change to the URL of your plugin on WordPress.org
 				$reviewurl = 'https://wordpress.org/support/view/plugin-reviews/yikes-inc-easy-mailchimp-extender';
 				$addons_url = esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) );
 				$nobugurl = esc_url_raw( add_query_arg( 'yikes_easy_mc_icons_nobug', '1', admin_url() ) );
 				$review_message = '<div id="yikes-mailchimp-logo"></div>';
-				$review_message .= sprintf( __( "It looks like you've been using %s for 2 weeks now. We hope you're enjoying the features included with the free version. If so, please consider leaving us a review. Reviews only help to catch other users attention as well as provide us with feedback to grow and improve upon. If you're really enjoying the plugin, consider buying an add-on or developer license for some really awesome features and premium support." , 'yikes-inc-easy-mailchimp-extender' ) . "<span class='button-container'> <a href='%s' target='_blank' class='button-secondary'><span class='dashicons dashicons-star-filled'></span>" . __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' ) . "</a> <a href='%s' class='button-secondary'><span class='dashicons dashicons-upload'></span>" . __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' ) . "</a> <a href='%s' class='button-secondary'><span class='dashicons dashicons-no-alt'></span>" . __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' ) . "</a> </span>", '<strong>Easy Forms for MailChimp by YIKES Inc.</strong>', $reviewurl, $addons_url, $nobugurl ) . '';
+				$review_message .= sprintf( __( "It looks like you've been using %s for 2 weeks now. We hope you're enjoying the features included with the free version. If so, please consider leaving us a review. Reviews only help to catch other users attention as well as provide us with feedback to grow and improve upon. If you're really enjoying the plugin, consider buying an add-on or developer license for some really awesome features and premium support.", 'yikes-inc-easy-mailchimp-extender' ) . "<span class='button-container'> <a href='%s' target='_blank' class='button-secondary'><span class='dashicons dashicons-star-filled'></span>" . __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' ) . "</a> <a href='%s' class='button-secondary'><span class='dashicons dashicons-upload'></span>" . __( "View Addons", 'yikes-inc-easy-mailchimp-extender' ) . "</a> <a href='%s' class='button-secondary'><span class='dashicons dashicons-no-alt'></span>" . __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' ) . "</a> </span>", '<strong>Easy Forms for MailChimp by YIKES Inc.</strong>', $reviewurl, $addons_url, $nobugurl ) . '';
 				?>
 					<div id="review-yikes-easy-mailchimp-notice">
 						<?php echo $review_message; ?>
@@ -506,8 +506,8 @@ 
 		*/
 		public function yikes_easy_mailchimp_stop_bugging_me() {
 			$nobug = "";
-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) ) {
-				$nobug = (int) esc_attr( $_GET['yikes_easy_mc_icons_nobug'] );
+			if ( isset( $_GET[ 'yikes_easy_mc_icons_nobug' ] ) ) {
+				$nobug = (int) esc_attr( $_GET[ 'yikes_easy_mc_icons_nobug' ] );
 			}
 			if ( 1 == $nobug ) {
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', TRUE );
@@ -518,7 +518,7 @@ 
 
 		/* Display a warning users who are using PHP < 5.3 */
 		public function display_php_warning() {
-			$message = __( 'YIKES Inc. Easy Forms for MailChimp requires a minimum of PHP 5.3. The plugin will not function properly until you update. Reach out to your host provider for assistance.' , 'yikes-inc-easy-mailchimp-extender' );
+			$message = __( 'YIKES Inc. Easy Forms for MailChimp requires a minimum of PHP 5.3. The plugin will not function properly until you update. Reach out to your host provider for assistance.', 'yikes-inc-easy-mailchimp-extender' );
 			echo "<div class='error'> <p><span class='dashicons dashicons-no-alt' style='color:rgb(231, 98, 98)'></span> $message</p></div>";
 		}
 
@@ -529,7 +529,7 @@ 
 		public function add_tinyMCE_buttons() {
 			global $typenow;
 			// only on Post Type: post and page
-			if( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
+			if ( ! in_array( $typenow, array( 'post', 'page' ) ) ) {
 				return;
 			}
 			add_filter( 'mce_buttons', array( $this, 'yks_mc_add_tinymce_button' ) );
@@ -545,7 +545,7 @@ 
 
 		// inlcude the js for tinymce
 		public function yks_mc_add_tinymce_plugin( $plugin_array ) {
-			$plugin_array['yks_mc_tinymce_button'] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
+			$plugin_array[ 'yks_mc_tinymce_button' ] = plugins_url( '/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js', __FILE__ );
 			// Print all plugin js path
 			// var_dump( $plugin_array );
 			return $plugin_array;
@@ -558,25 +558,25 @@ 
 		*/
 		public function tinymce_yikes_easy_mc() {
 			// check capabilities
-			if( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+			if ( ! current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 				return;
 			}
 			global $wpdb;
 			$list_data = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms', ARRAY_A );
 			$lists = array();
 			$i = 0;
-			if( !empty( $list_data ) ) {
+			if ( ! empty( $list_data ) ) {
 				// build an array to pass to our javascript
-				foreach( $list_data as $form ) {
-						$lists[$i] = array(
-							'text' => urlencode( $form['form_name'] ),
-							'value' => $form['id']
+				foreach ( $list_data as $form ) {
+						$lists[ $i ] = array(
+							'text' => urlencode( $form[ 'form_name' ] ),
+							'value' => $form[ 'id' ]
 						);
 						$i++;
 				}
 			} else {
-				$lists[0] = array(
-					'text' => __( 'Please Import Some MailChimp Lists' , 'yikes-inc-easy-mailchimp-extender' ),
+				$lists[ 0 ] = array(
+					'text' => __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ),
 					'value' => '-'
 				);
 			}
@@ -589,10 +589,10 @@ 
 				var localized_data = {
 					'button_title' : '<?php _e( 'Easy Forms for MailChimp by YIKES', 'yikes-inc-easy-mailchimp-extender' ); ?>',
 					'popup_title' : '<?php _e( 'Easy Forms for MailChimp by YIKES', 'yikes-inc-easy-mailchimp-extender' ); ?>',
-					'list_id_label' : '<?php _e( 'MailChimp Opt-In Form' , 'yikes-inc-easy-mailchimp-extender' ); ?>',
-					'show_title_label' : '<?php _e( 'Display Form Title' , 'yikes-inc-easy-mailchimp-extender' ); ?>',
-					'show_description_label' : '<?php _e( 'Display Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>',
-					'submit_button_text_label' : '<?php _e( 'Submit Button Text' , 'yikes-inc-easy-mailchimp-extender' ); ?>',
+					'list_id_label' : '<?php _e( 'MailChimp Opt-In Form', 'yikes-inc-easy-mailchimp-extender' ); ?>',
+					'show_title_label' : '<?php _e( 'Display Form Title', 'yikes-inc-easy-mailchimp-extender' ); ?>',
+					'show_description_label' : '<?php _e( 'Display Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?>',
+					'submit_button_text_label' : '<?php _e( 'Submit Button Text', 'yikes-inc-easy-mailchimp-extender' ); ?>',
 				};
 				<?php
 					$link = sprintf( __( 'You need to <a href="%s" title="%s">create a form</a> before you can add one to a page or post.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ), __( 'Create a form', 'yikes-inc-easy-mailchimp-extender' ) );
@@ -611,7 +611,7 @@ 
 		if ( get_option( 'yikes_mailchimp_activation_redirect', 'true' ) == 'true' ) {
 			update_option( 'yikes_mailchimp_activation_redirect', 'false' );
 			/* If the user had this plugin activated prior to today, redirect to 'Whats New' */
-			if( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
+			if ( get_option( 'yikes_easy_mailchimp_activation_date', strtotime( 'now' ) ) == strtotime( 'now' ) ) {
 				wp_redirect( esc_url( admin_url( 'admin.php?page=yikes-mailchimp-welcome' ) ) );
 			} else {
 				/* Else redirect the user over to the 'Getting Started' tab */
@@ -667,7 +667,7 @@ 
 		/**
 		 * Enqueue our scripts across the dashboard as needed
 		 */
-		wp_register_script( 'yikes-inc-easy-mailchimp-extender-admin-js', plugin_dir_url( __FILE__ ) . 'js/min/yikes-inc-easy-mailchimp-extender-admin.min.js', array( 'jquery' , 'jquery-ui-sortable' ), $this->version, false );
+		wp_register_script( 'yikes-inc-easy-mailchimp-extender-admin-js', plugin_dir_url( __FILE__ ) . 'js/min/yikes-inc-easy-mailchimp-extender-admin.min.js', array( 'jquery', 'jquery-ui-sortable' ), $this->version, false );
 		$localized_data = array(
 			'admin_url' => esc_url_raw( admin_url() ),
 			'ajax_url' => esc_url_raw( admin_url( 'admin-ajax.php' ) ),
@@ -675,19 +675,19 @@ 
 			'search_preloader_url' => YIKES_MC_URL . 'includes/images/search-interest-group-preloader.gif',
 			'preloader_url' => esc_url_raw( admin_url( '/images/wpspin_light.gif' ) )
 		);
-		wp_localize_script( 'yikes-inc-easy-mailchimp-extender-admin-js' , 'object_data' , $localized_data );
+		wp_localize_script( 'yikes-inc-easy-mailchimp-extender-admin-js', 'object_data', $localized_data );
 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-admin-js' );
 
 
 		/*
 		*	Enqueue required scripts for the form editor
 		*/
-		if( get_current_screen()->base == 'admin_page_yikes-mailchimp-edit-form' ) {
+		if ( get_current_screen()->base == 'admin_page_yikes-mailchimp-edit-form' ) {
 			global $wp_locale;
 			wp_enqueue_style( 'wp-color-picker' );
 			wp_enqueue_script( 'wp-color-picker' );
-			wp_enqueue_script( 'jquery.timepicker.js',YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js' , array( 'jquery' ) , $this->version, false );
-			wp_register_script( 'edit-form-js' , YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js' , array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ) , $this->version, false );
+			wp_enqueue_script( 'jquery.timepicker.js', YIKES_MC_URL . 'admin/js/jquery.timepicker.min.js', array( 'jquery' ), $this->version, false );
+			wp_register_script( 'edit-form-js', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js', array( 'jquery.timepicker.js', 'jquery-ui-datepicker' ), $this->version, false );
 			$localized_data = array(
 				'ajax_url' => esc_url_raw( admin_url( 'admin-ajax.php' ) ),
 				'no_fields_assigned' => __( 'No fields assigned to this form. Select some fields to add to this form from the right hand column.', 'yikes-inc-easy-mailchimp-extender' ),
@@ -708,7 +708,7 @@ 
 				'isRTL'             => $wp_locale->is_rtl(),
 				'start_date_exceeds_end_date_error' => __( 'Error: The start date and time cannot occur after the end date and time. Chosen date reverted to previous selection.', 'yikes-inc-easy-mailchimp-extender' ),
 			);
-			wp_localize_script( 'edit-form-js' , 'object' , $localized_data );
+			wp_localize_script( 'edit-form-js', 'object', $localized_data );
 			wp_enqueue_script( 'edit-form-js' );
 		}
 
@@ -728,8 +728,8 @@ 
 		 * the datepicker wants a numerical index. This function replaces the index with a number
 		 */
 		public function yikes_jQuery_datepicker_strip_array_indices( $ArrayToStrip ) {
-			foreach( $ArrayToStrip as $objArrayItem) {
-				$NewArray[] =  $objArrayItem;
+			foreach ( $ArrayToStrip as $objArrayItem ) {
+				$NewArray[ ] = $objArrayItem;
 			}
 			return( $NewArray );
 		}
@@ -738,7 +738,7 @@ 
 		 * Convert the php date format string to a js date format
 		 */
 		public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat ) {
-			switch( $sFormat ) {
+			switch ( $sFormat ) {
 				//Predefined WP date formats
 				case 'F j, Y':
 				case 'j F Y':
@@ -764,7 +764,7 @@ 
 		 * Convert the php date format string to a js date format
 		 */
 		public function yikes_jQuery_datepicker_date_format( $site_option ) {
-			switch( $site_option ) {
+			switch ( $site_option ) {
 				//Predefined WP date formats
 				default:
 				case 'F j, Y':
@@ -791,9 +791,9 @@ 
 
 		/* Top Level Menu 'Easy MailChimp' */
 		add_menu_page(
-			__( 'Easy Forms' , 'yikes-inc-easy-mailchimp-extender' ),
+			__( 'Easy Forms', 'yikes-inc-easy-mailchimp-extender' ),
 			'Easy Forms',
-			apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+			apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 			'yikes-inc-easy-mailchimp',
 			'', // no callback,
 			YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_wink_icon.png'
@@ -807,9 +807,9 @@ 
 				/* YIKES Inc. Easy MailChimp Manage Forms */
 				add_submenu_page(
 					'yikes-inc-easy-mailchimp',
-					__( 'Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-inc-easy-mailchimp',
 					array( $this, 'generateManageFormsPage' )
 				);
@@ -817,9 +817,9 @@ 
 				/* YIKES Inc. Easy MailChimp Manage Lists */
 				add_submenu_page(
 					'yikes-inc-easy-mailchimp',
-					__( 'Mailing Lists' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Mailing Lists' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Mailing Lists', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Mailing Lists', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-inc-easy-mailchimp-lists',
 					array( $this, 'generateManageListsPage' )
 				);
@@ -833,13 +833,13 @@ 
 
 
 			/* YIKES Inc. Easy MailChimp Account Overview */
-			if ( get_option('yikes-mc-api-validation') == 'valid_api_key' ) {
+			if ( get_option( 'yikes-mc-api-validation' ) == 'valid_api_key' ) {
 				/* YIKES Inc. Easy MailChimp Settings */
 				add_submenu_page(
 					'yikes-inc-easy-mailchimp',
-					__( 'Account' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Account' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Account', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Account', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-inc-easy-mailchimp-account-overview',
 					array( $this, 'generateAccountDetailsPage' )
 				);
@@ -849,9 +849,9 @@ 
 			/* YIKES Inc. Easy MailChimp Settings */
 			add_submenu_page(
 				'yikes-inc-easy-mailchimp',
-				__( 'Settings.' , 'yikes-inc-easy-mailchimp-extender' ),
-				__( 'Settings' , 'yikes-inc-easy-mailchimp-extender' ),
-				apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+				__( 'Settings.', 'yikes-inc-easy-mailchimp-extender' ),
+				__( 'Settings', 'yikes-inc-easy-mailchimp-extender' ),
+				apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 				'yikes-inc-easy-mailchimp-settings',
 				array( $this, 'generatePageOptions' )
 			);
@@ -859,9 +859,9 @@ 
 			/* Support Page */
 			add_submenu_page(
 				'yikes-inc-easy-mailchimp',
-				__( 'Support' , 'yikes-inc-easy-mailchimp-extender' ),
-				__( 'Support' , 'yikes-inc-easy-mailchimp-extender' ),
-				apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+				__( 'Support', 'yikes-inc-easy-mailchimp-extender' ),
+				__( 'Support', 'yikes-inc-easy-mailchimp-extender' ),
+				apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 				'yikes-inc-easy-mailchimp-support',
 				array( $this, 'generateSupportPage' )
 			);
@@ -869,11 +869,11 @@ 
 			/* Add-Ons Page */
 			add_submenu_page(
 				'yikes-inc-easy-mailchimp',
-				__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ),
-				__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ),
-				apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+				__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ),
+				__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ),
+				apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 				'yikes-inc-easy-mailchimp-addons',
-				array( $this , 'generateAddOnsPage' )
+				array( $this, 'generateAddOnsPage' )
 			);
 
 			/** Hidden Pages **/
@@ -881,9 +881,9 @@ 
 				/* Add Hidden Edit Form Page */
 				add_submenu_page(
 					'options.php',
-					__( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-mailchimp-edit-form',
 					array( $this, 'generateEditFormPage' )
 				);
@@ -891,19 +891,19 @@ 
 				/* Add Hidden Migrate Options Page */
 				add_submenu_page(
 					'options-writing.php',
-					__( 'YIKES Inc. Easy Forms for MailChimp Upgrade Options Structure' , 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'YIKES Inc. Easy Forms for MailChimp Upgrade Options Structure', 'yikes-inc-easy-mailchimp-extender' ),
 					'YIKES Inc. Easy Forms for MailChimp Upgrade Options Structure',
 					'manage_options',
-					'yikes-inc-easy-mailchimp-update' ,
-					array( $this , 'migrate_old_yks_mc_options' )
+					'yikes-inc-easy-mailchimp-update',
+					array( $this, 'migrate_old_yks_mc_options' )
 				);
 
 				/* Add Hidden Welcome Page */
 				add_submenu_page(
 					'options.php',
-					__( 'Welcome' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'Welcome' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'Welcome', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'Welcome', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-mailchimp-welcome',
 					array( $this, 'generateWelcomePage' )
 				);
@@ -911,9 +911,9 @@ 
 				/* Add Hidden 'View List' Page */
 				add_submenu_page(
 					'options.php',
-					__( 'View List' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'View List' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'View List', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'View List', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-mailchimp-view-list',
 					array( $this, 'generateViewListPage' )
 				);
@@ -921,9 +921,9 @@ 
 				/* Add Hidden View User Page */
 				add_submenu_page(
 					'options.php',
-					__( 'View User' , 'yikes-inc-easy-mailchimp-extender' ),
-					__( 'View User' , 'yikes-inc-easy-mailchimp-extender' ),
-					apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ),
+					__( 'View User', 'yikes-inc-easy-mailchimp-extender' ),
+					__( 'View User', 'yikes-inc-easy-mailchimp-extender' ),
+					apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ),
 					'yikes-mailchimp-view-user',
 					array( $this, 'generateViewUserPage' )
 				);
@@ -1020,7 +1020,7 @@ 
 
 		/* Register General Settings Section */
 
-		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this , 'yikes_mc_validate_api_key' ) );
+		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mc-api-key', array( $this, 'yikes_mc_validate_api_key' ) );
 
 		add_settings_section(
 			'yikes_easy_mc_settings_general_section_callback',
@@ -1063,16 +1063,16 @@ 
 		add_settings_field(
 			'optin-checkbox-init',
 			__( 'Select Checkboxes to Generate', 'yikes-inc-easy-mailchimp-extender' ),
-			'',  // callback + validation inside of admin/partials/menu/options.php
+			'', // callback + validation inside of admin/partials/menu/options.php
 			'yikes_inc_easy_mc_checkbox_settings'
 		);
 		/* End Checkbox Settings */
 
 		/* reCAPTCHA Settings */
 
-			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page' , 'yikes-mc-recaptcha-status' );
-			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page' , 'yikes-mc-recaptcha-site-key' );
-			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page' , 'yikes-mc-recaptcha-secret-key' );
+			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page', 'yikes-mc-recaptcha-status' );
+			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page', 'yikes-mc-recaptcha-site-key' );
+			register_setting( 'yikes_inc_easy_mc_recaptcha_settings_page', 'yikes-mc-recaptcha-secret-key' );
 
 			/* Register reCAPTCHA Settings Section */
 			add_settings_section(
@@ -1085,28 +1085,28 @@ 
 			add_settings_field(
 				'yikes-mc-recaptcha-site-key',
 				__( 'Enter reCAPTCHA Site Key', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 			add_settings_field(
 				'yikes-mc-recaptcha-secret-key',
 				__( 'Enter reCAPTCHA Secret Key', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 			add_settings_field(
 				'yikes-mc-recaptcha-status',
 				__( 'Enable ReCaptcha', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_recpatcha_section'
 			);
 
 		/* End reCAPTCHA Settings */
 
 		/* Debug Settings */
-			register_setting( 'yikes_inc_easy_mc_debug_settings_page' , 'yikes-mailchimp-debug-status' );
+			register_setting( 'yikes_inc_easy_mc_debug_settings_page', 'yikes-mailchimp-debug-status' );
 
 			/* Register Debug Settings Section */
 			add_settings_section(
@@ -1119,7 +1119,7 @@ 
 			add_settings_field(
 				'yikes-mailchimp-debug-status',
 				__( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ),
-				'',  // callback + validation inside of admin/partials/menu/options.php
+				'', // callback + validation inside of admin/partials/menu/options.php
 				'yikes_easy_mc_settings_debug_section'
 			);
 
@@ -1135,16 +1135,16 @@ 
 	*	@since complete re-write
 	**/
 	function yikes_mc_validate_api_key( $input ) {
-		if( $input == '' ) {
+		if ( $input == '' ) {
 			return;
 		}
 		$api_key = trim( $input );
 		$dash_position = strpos( trim( $input ), '-' );
-		if( $dash_position !== false ) {
+		if ( $dash_position !== false ) {
 			$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/ping.json';
 		} else {
 			update_option( 'yikes-mc-api-invalid-key-response', __( 'Your API key appears to be invalid.', 'yikes-inc-easy-mailchimp-extender' ) );
-			update_option( 'yikes-mc-api-validation' , 'invalid_api_key' );
+			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
 			return $api_key;
 		}
 		$request_args = array(
@@ -1155,17 +1155,17 @@ 
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 		);
 		$api_key_response = wp_remote_post( $api_endpoint, $request_args );
-		if( ! is_wp_error( $api_key_response ) ) {
+		if ( ! is_wp_error( $api_key_response ) ) {
 			$body = json_decode( wp_remote_retrieve_body( $api_key_response ), true );
-			if( isset( $body['msg'] ) && $body['msg'] == "Everything's Chimpy!" ) {
-				update_option( 'yikes-mc-api-validation' , 'valid_api_key' );
+			if ( isset( $body[ 'msg' ] ) && $body[ 'msg' ] == "Everything's Chimpy!" ) {
+				update_option( 'yikes-mc-api-validation', 'valid_api_key' );
 			}
-		}  else {
+		} else {
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-			$error_logging->yikes_easy_mailchimp_write_to_error_log( $api_key_response->get_error_message() , __( "Connecting to MailChimp" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Settings Page/General Settings" , 'yikes-inc-easy-mailchimp-extender' ) );
-			update_option( 'yikes-mc-api-invalid-key-response' , $api_key_response->get_error_message() );
-			update_option( 'yikes-mc-api-validation' , 'invalid_api_key' );
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $api_key_response->get_error_message(), __( "Connecting to MailChimp", 'yikes-inc-easy-mailchimp-extender' ), __( "Settings Page/General Settings", 'yikes-inc-easy-mailchimp-extender' ) );
+			update_option( 'yikes-mc-api-invalid-key-response', $api_key_response->get_error_message() );
+			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );
 		}
 		// returned the api key
 		return $api_key;
@@ -1186,13 +1186,13 @@ 
 	*	to form fields. (input, dropdowns, buttons etc.)
 	* 	@since v5.5 re-write
 	**/
-	public function is_user_mc_api_valid_form( $echo=true ) {
-		if( $echo == true ) {
-			if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
+	public function is_user_mc_api_valid_form( $echo = true ) {
+		if ( $echo == true ) {
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				echo 'disabled="disabled"';
 			}
 		} else {
-			if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				return false;
 			} else {
 				return true;
@@ -1212,11 +1212,11 @@ 
 	public function check_for_old_yks_mc_options() {
 		$old_plugin_options = get_option( 'ykseme_storage' );
 		// only perform options migrations if the site is not a multi-site setup
-		if ( !is_multisite() ) {
-			if( apply_filters( 'yikes_mc_old_options_filter' , $old_plugin_options ) ) {
+		if ( ! is_multisite() ) {
+			if ( apply_filters( 'yikes_mc_old_options_filter', $old_plugin_options ) ) {
 				// display a notice to the user that they should 'migrate'
 				// from the old plugin settings to the new ones
-				add_action( 'admin_notices', array( $this , 'display_options_migrate_notice' ) , 11 );
+				add_action( 'admin_notices', array( $this, 'display_options_migrate_notice' ), 11 );
 			}
 		}
 	}
@@ -1249,11 +1249,11 @@ 
 
 			// Confirm that the necessary forms table in the database exists, else bail
 			global $wpdb;
-			if( $wpdb->get_var("show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'") != $wpdb->prefix . "yikes_easy_mc_forms" ) {
+			if ( $wpdb->get_var( "show tables like '" . $wpdb->prefix . "yikes_easy_mc_forms'" ) != $wpdb->prefix . "yikes_easy_mc_forms" ) {
 				return;
 			}
 
-			if( isset( $_GET['yikes-mc-options-migration-dismissed'] ) && $_GET['yikes-mc-options-migration-dismissed'] == 'true' ) {
+			if ( isset( $_GET[ 'yikes-mc-options-migration-dismissed' ] ) && $_GET[ 'yikes-mc-options-migration-dismissed' ] == 'true' ) {
 					// Delete the options, start a-new! (this will disable the migration notice altogether)
 					delete_option( 'widget_yikes_mc_widget' );
 					delete_option( 'api_validation' );
@@ -1267,18 +1267,18 @@ 
 			} else {
 			?>
 				<div class="yikes-easy-mc-updated migrate-options-notice">
-					<p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>YIKES Inc. Easy Forms for MailChimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list." , 'yikes-inc-easy-mailchimp-extender' ), '<strong>YIKES Inc. Easy Forms for MailChimp</strong>' ); ?></p>
+					<p><?php printf( __( "It looks like you're upgrading from a previous version of %s.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>YIKES Inc. Easy Forms for MailChimp</strong>' ); ?> <?php printf( __( "In the newest version of %s, the options data structure has changed. We've also moved the mailing lists into its own database table to allow for some higher level customization. Now you can easily create multiple forms and assign them to the same mailing list.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>YIKES Inc. Easy Forms for MailChimp</strong>' ); ?></p>
 					<p><?php _e( "Before you continue, it's strongly recommended you the perform the migration to ensure the plugin continues to function properly.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					<p><em><?php _e( "It's also strongly recommended that you take a backup of your database.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
 					<section id="migration-buttons">
 						<!-- migrate button -->
 						<form>
 							<input type="hidden" name="yikes-mc-update-option-structure" value="yikes-mc-update-option-structure" />
-							<a href="<?php echo wp_nonce_url( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-update' ) ), 'yikes-mc-migrate-options' , 'migrate_options_nonce' ); ?>" class="button-secondary"><?php _e( 'Perform Migration' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+							<a href="<?php echo wp_nonce_url( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-update' ) ), 'yikes-mc-migrate-options', 'migrate_options_nonce' ); ?>" class="button-secondary"><?php _e( 'Perform Migration', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 						</form>
 						<!-- dismiss button -->
 						<form>
-							<a href="<?php echo wp_nonce_url( esc_url_raw( admin_url() ), 'yikes-mc-dismiss-migration' , 'dismiss_migration_nonce' ); ?>" class="button-secondary"><?php _e( 'Dismiss Notice' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+							<a href="<?php echo wp_nonce_url( esc_url_raw( admin_url() ), 'yikes-mc-dismiss-migration', 'dismiss_migration_nonce' ); ?>" class="button-secondary"><?php _e( 'Dismiss Notice', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 						</form>
 					</section>
 
@@ -1292,9 +1292,9 @@ 
 		*	and return the index ( used to find the list name assigned to a form )
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search
 		*/
-		function findMCListID($id, $array) {
-		   foreach ($array as $key => $val) {
-			   if ($val['id'] === $id) {
+		function findMCListID( $id, $array ) {
+		   foreach ( $array as $key => $val ) {
+			   if ( $val[ 'id' ] === $id ) {
 				   return $key;
 			   }
 		   }
@@ -1304,9 +1304,9 @@ 
 		/* Ajax Migrate Options */
 		function migrate_archived_options() {
 			// all options prefixed with 'yikes-mc-'
-			$option_name = 'yikes-mc-'.$_POST['option_name'];
-			$option_value = $_POST['option_value'];
-			if( json_decode( $option_value ) ) {
+			$option_name = 'yikes-mc-' . $_POST[ 'option_name' ];
+			$option_value = $_POST[ 'option_value' ];
+			if ( json_decode( $option_value ) ) {
 				// decode our lists() array, and store it
 				$opt_value = json_decode( $option_value, true );
 			} else {
@@ -1319,24 +1319,24 @@ 
 
 		/* Ajax Migrate Forms */
 		function migrate_previously_setup_forms() {
-			$option_name = $_POST['option_name'];
-			$done = $_POST['done_import'];
+			$option_name = $_POST[ 'option_name' ];
+			$done = $_POST[ 'done_import' ];
 			// Create some starter forms for the user
 			// based on previously imported lists (to our old version)
-			if( $option_name == 'yikes-mc-lists' ) {
+			if ( $option_name == 'yikes-mc-lists' ) {
 				global $wpdb;
-				$option_value = $_POST['option_value'];
-				$new_options = json_decode( stripslashes_deep( $option_value ) , true );
+				$option_value = $_POST[ 'option_value' ];
+				$new_options = json_decode( stripslashes_deep( $option_value ), true );
 
-				$list_id = $new_options['id'];
-				$form_name = $new_options['name'];
-				$fields = $new_options['fields']; // our fields array
+				$list_id = $new_options[ 'id' ];
+				$form_name = $new_options[ 'name' ];
+				$fields = $new_options[ 'fields' ]; // our fields array
 
-				$custom_styles = isset( $new_options['custom_styles'] ) ? json_encode( $new_options['custom_styles'] ) : '0'; // store as an array with all of our styles
-				$custom_template = isset( $new_options['custom_template'] ) ? json_encode( $new_options['custom_template'] ) : '0'; // store template data as an array ( active , template used )
-				$send_welcome_email = isset( $new_options['yks_mailchimp_send_welcome_'.$list_id] ) ? '0' : '1';
-				$redirect_user_on_submit = isset( $new_options['yks_mailchimp_redirect_'.$list_id] ) ? '1' : '0';
-				$redirect_page = isset( $new_options['page_id_'.$list_id] ) ? $new_options['page_id_'.$list_id] : '';
+				$custom_styles = isset( $new_options[ 'custom_styles' ] ) ? json_encode( $new_options[ 'custom_styles' ] ) : '0'; // store as an array with all of our styles
+				$custom_template = isset( $new_options[ 'custom_template' ] ) ? json_encode( $new_options[ 'custom_template' ] ) : '0'; // store template data as an array ( active , template used )
+				$send_welcome_email = isset( $new_options[ 'yks_mailchimp_send_welcome_' . $list_id ] ) ? '0' : '1';
+				$redirect_user_on_submit = isset( $new_options[ 'yks_mailchimp_redirect_' . $list_id ] ) ? '1' : '0';
+				$redirect_page = isset( $new_options[ 'page_id_' . $list_id ] ) ? $new_options[ 'page_id_' . $list_id ] : '';
 
 				/* Insert Forms Function  */
 				$wpdb->insert(
@@ -1361,7 +1361,7 @@ 
 					)
 				);
 			}
-			if( $done == 'done' ) {
+			if ( $done == 'done' ) {
 				wp_send_json( array( 'form_name' => $form_name, 'completed_import' => true ) );
 			} else {
 				wp_send_json( array( 'form_name' => $form_name, 'completed_import' => false ) );
@@ -1376,35 +1376,35 @@ 
 		*	@since v5.6 - complete re-write
 		*/
 		public function generate_options_pages_sidebar_menu() {
-			if( isset( $_REQUEST['section'] ) ) {
-				$selected = $_REQUEST['section'];
+			if ( isset( $_REQUEST[ 'section' ] ) ) {
+				$selected = $_REQUEST[ 'section' ];
 			}
-			$installed_addons = get_option( 'yikes-easy-mc-active-addons' , array() );
+			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );
 			// sort our addons array alphabetically so they appear in similar orders across all sites
 			asort( $installed_addons );
 			?>
-				<h3><span><?php _e( 'Additional Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+				<h3><span><?php _e( 'Additional Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 				<div class="inside">
 					<ul id="settings-nav">
-						<li><?php if( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'general-settings' || !isset( $_REQUEST['section'] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if( isset( $_REQUEST['section'] ) && $_REQUEST['section'] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
-						<li><?php if( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'general-settings' || ! isset( $_REQUEST[ 'section' ] ) ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'general-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=general-settings' ) ) ); ?>"><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'integration-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'integration-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=integration-settings' ) ) ); ?>"><?php _e( 'Integration Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'recaptcha-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'recaptcha-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) ); ?>"><?php _e( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'api-cache-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'api-cache-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings' ) ) ); ?>"><?php _e( 'API Cache Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'debug-settings' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'debug-settings' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ) ); ?>"><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
+						<li><?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == 'import-export-forms' ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => 'import-export-forms' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=import-export-forms' ) ) ); ?>"><?php _e( 'Import/Export', 'yikes-inc-easy-mailchimp-extender' ); ?></a></li>
 					</ul>
 					<?php
 						// create our add-on settings pages
-						if( !empty( $installed_addons ) ) {
+						if ( ! empty( $installed_addons ) ) {
 							?>
 							<hr class="add-on-settings-divider" />
-							<strong><?php _e( 'Addon Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+							<strong><?php _e( 'Addon Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 							<ul id="addon-settings-nav">
 							<?php
-							foreach( $installed_addons as $addon_name ) {
+							foreach ( $installed_addons as $addon_name ) {
 								?>
 									<li>
-										<?php if( isset( $_REQUEST['section'] ) && $_REQUEST['section'] ==  $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section='.$addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-' , ' ' , $addon_name ) ); ?></a></li>
+										<?php if ( isset( $_REQUEST[ 'section' ] ) && $_REQUEST[ 'section' ] == $addon_name ) { ?><div class="option-menu-selected-arrow"></div><?php } ?><a href="<?php echo esc_url_raw( add_query_arg( array( 'section' => $addon_name, 'addon' => 'true' ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=' . $addon_name ) ) ); ?>"><?php echo ucwords( str_replace( '-', ' ', $addon_name ) ); ?></a></li>
 								<?php
 							}
 							?>
@@ -1432,7 +1432,7 @@ 
 				)
 			);
 			?>
-				<h3><?php _e( 'Create a New Signup Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+				<h3><?php _e( 'Create a New Signup Form', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 
 				<div class="inside">
 
@@ -1441,31 +1441,31 @@ 
 					<form id="import-list-to-site" method="POST" action="<?php echo $url; ?>">
 						<input type="hidden" name="import-list-to-site" value="1" />
 						<!-- Name your new form -->
-						<label for="form-name"><strong><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-							<input type="text" class="widefat input-field" placeholder="<?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?>" name="form-name" id="form-name" <?php $this->is_user_mc_api_valid_form( true ); ?> required>
+						<label for="form-name"><strong><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+							<input type="text" class="widefat input-field" placeholder="<?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?>" name="form-name" id="form-name" <?php $this->is_user_mc_api_valid_form( true ); ?> required>
 						</label>
 						<!-- Name your new form -->
-						<label for="form-description"><strong><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-							<textarea class="widefat input-field form-description" placeholder="<?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>" name="form-description" id="form-description" <?php $this->is_user_mc_api_valid_form( true ); ?>></textarea>
+						<label for="form-description"><strong><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+							<textarea class="widefat input-field form-description" placeholder="<?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?>" name="form-description" id="form-description" <?php $this->is_user_mc_api_valid_form( true ); ?>></textarea>
 						</label>
 						<!-- Associate this form with a list! -->
-						<label for="associated-list"><strong><?php _e( 'Associated List' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-							<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); if( isset( $lists ) && empty( $lists ) ) { echo 'disabled="disabled"'; } ?>>
+						<label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+							<select name="associated-list" id="associated-list" class=" input-field" <?php $this->is_user_mc_api_valid_form( true ); if ( isset( $lists ) && empty( $lists ) ) { echo 'disabled="disabled"'; } ?>>
 								<?php
-									if( isset( $lists ) && !empty( $lists ) ) {
-										foreach( $lists as $mailing_list ) {
+									if ( isset( $lists ) && ! empty( $lists ) ) {
+										foreach ( $lists as $mailing_list ) {
 											?>
-												<option value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
+												<option value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
 											<?php
 										}
 									} else {
-										if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'invalid_api_key' ) {
+										if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 											?>
-												<option><?php echo __( "Please enter a valid API key." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+												<option><?php echo __( "Please enter a valid API key.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 											<?php
 										} else {
 											?>
-												<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+												<option><?php echo __( "No lists were found on the account.", 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 											<?php
 
 										}
@@ -1474,8 +1474,8 @@ 
 							</select>
 
 							<?php
-							if ( isset( $_GET['transient-cleared'] ) ) {
-								if ( 'true' === $_GET['transient-cleared'] ) {
+							if ( isset( $_GET[ 'transient-cleared' ] ) ) {
+								if ( 'true' === $_GET[ 'transient-cleared' ] ) {
 									?>
 									<div class="yikes-list-refreshed-notice">
 										<p><?php esc_attr_e( 'MailChimp list data has been succesfully refreshed.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -1484,11 +1484,11 @@ 
 								}
 							}
 
-							if( isset( $lists ) && empty( $lists ) ) {
-								if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'invalid_api_key' ) {
+							if ( isset( $lists ) && empty( $lists ) ) {
+								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'invalid_api_key' ) {
 									?>
 										<p class="description">
-											<?php printf( __( 'Head over to <a href="http://www.MailChimp.com" title="%s">MailChimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ) , __( 'Create a list' , 'yikes-inc-easy-mailchimp-extender' ) ); ?>
+											<?php printf( __( 'Head over to <a href="http://www.MailChimp.com" title="%s">MailChimp</a> to create a new list.', 'yikes-inc-easy-mailchimp-extender' ), __( 'Create a list', 'yikes-inc-easy-mailchimp-extender' ) ); ?>
 										</p>
 									<?php
 								}
@@ -1496,12 +1496,12 @@ 
 							?>
 						</label>
 						<?php
-							if( $this->is_user_mc_api_valid_form( false ) ) {
-								echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ) , 'primary' , '' , false , array( 'style' => 'margin:.75em 0 .5em 0;' ) );
+							if ( $this->is_user_mc_api_valid_form( false ) ) {
+								echo submit_button( __( 'Create', 'yikes-inc-easy-mailchimp-extender' ), 'primary', '', false, array( 'style' => 'margin:.75em 0 .5em 0;' ) );
 							} else {
-								echo '<p class="description">' . __( "Please enter a valid MailChimp API key to get started." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+								echo '<p class="description">' . __( "Please enter a valid MailChimp API key to get started.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 								?>
-									<a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+									<a href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&settings-updated=true' ) ); ?>"><?php _e( 'general settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 								<?php
 							}
 						?>
@@ -1509,10 +1509,10 @@ 
 
 					<!-- Clear API CACHE -->
 					<?php
-					if( isset( $lists ) && ! empty( $lists ) ) {
+					if ( isset( $lists ) && ! empty( $lists ) ) {
 						if ( false !== get_transient( 'yikes-easy-mailchimp-list-data' ) ) { ?>
-							<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data' , 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">
-								<input type="submit" class="button-secondary clear-mailchimp-api-cache" value="<?php _e( 'Refresh Lists' , 'yikes-inc-easy-mailchimp-extender' ); ?>" />
+							<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" method="post">
+								<input type="submit" class="button-secondary clear-mailchimp-api-cache" value="<?php _e( 'Refresh Lists', 'yikes-inc-easy-mailchimp-extender' ); ?>" />
 							</form>
 						<?php }
 					}
@@ -1528,14 +1528,14 @@ 
 		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {
 				$post_types = get_post_types();
 				?>
-				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
-					<?php _e( "Select A Page or Post" , 'yikes-inc-easy-mailchimp-extender' ); ?>
+				<label id="redirect-user-to-selection-label" for="redirect-user-to-selection" class="<?php if ( $redirect == '0' ) { echo 'yikes-easy-mc-hidden'; } ?>">
+					<?php _e( "Select A Page or Post", 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<select id="redirect-user-to-selection" name="redirect-user-to-selection" onchange="shouldWeDisplayCustomURL( this );return;">
 				<?php
 					// loop over registered post types, and query!
-						foreach( $post_types as $registered_post_type ) {
+						foreach ( $post_types as $registered_post_type ) {
 							// exclude a few built in custom post types
-							if( ! in_array( $registered_post_type , array( 'attachment' , 'revision' , 'nav_menu_item' ) ) ) {
+							if ( ! in_array( $registered_post_type, array( 'attachment', 'revision', 'nav_menu_item' ) ) ) {
 								// run our query, to retreive the posts
 								$pages = get_posts( array(
 									'order' => 'ASC',
@@ -1545,12 +1545,12 @@ 
 									'numberposts' => -1
 								) );
 								// only show cpt's that have posts assigned
-								if( !empty( $pages ) ) {
+								if ( ! empty( $pages ) ) {
 									?>
-									<optgroup label="<?php echo ucwords( str_replace( '_' , ' ' , $registered_post_type ) ); ?>">
+									<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">
 									<?php
-										foreach( $pages as $page ) {
-											?><option <?php selected( $redirect_page , $page->ID ); ?> value="<?php echo $page->ID; ?>"><?php echo $page->post_title; ?></option><?php
+										foreach ( $pages as $page ) {
+											?><option <?php selected( $redirect_page, $page->ID ); ?> value="<?php echo $page->ID; ?>"><?php echo $page->post_title; ?></option><?php
 										}
 									?>
 									<option <?php selected( $redirect_page, 'custom_url' ); ?> value="custom_url"><?php echo __( 'Custom URL', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
@@ -1562,8 +1562,8 @@ 
 					?>
 					</select>
 
-					<label name="custom-redirect-url" class="custom_redirect_url_label" <?php if( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
-						<?php _e( "Enter Custom URL" , 'yikes-inc-easy-mailchimp-extender' ); ?>
+					<label name="custom-redirect-url" class="custom_redirect_url_label" <?php if ( ! isset( $redirect_page ) || $redirect_page != 'custom_url' ) { echo 'style="display:none;"'; } ?>>
+						<?php _e( "Enter Custom URL", 'yikes-inc-easy-mailchimp-extender' ); ?>
 						<input type="text" class="widefat custom-redirect-url" name="custom-redirect-url" value="<?php echo $custom_redirect_url; ?>" />
 					</label>
 
@@ -1580,11 +1580,11 @@ 
 		public function generate_show_some_love_container() {
 			// if no active add-ons are installed,
 			// lets display our branding and add-on sidebar
-			if( get_option( 'yikes-easy-mc-active-addons' , array() ) == array() ) {
+			if ( get_option( 'yikes-easy-mc-active-addons', array() ) == array() ) {
 
 				/* On Edit Forms Page Display Upsell to Customizer */
 				$screen = get_current_screen();
-				if( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
+				if ( isset( $screen ) && $screen->base == 'admin_page_yikes-mailchimp-edit-form' ) {
 				?>
 
 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">
@@ -1598,11 +1598,11 @@ 
 					<div class="postbox yikes-easy-mc-postbox show-some-love-container">
 
 						<!-- review us container -->
-						<h3 data-alt-text="<?php _e( 'About YIKES Inc.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Show YIKES Inc. Some Love' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+						<h3 data-alt-text="<?php _e( 'About YIKES Inc.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Show YIKES Inc. Some Love', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 						<div id="review-yikes-easy-mc" class="inside">
 
 							<p>
-								<?php _e( 'Leave a review' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<?php _e( 'Leave a review', 'yikes-inc-easy-mailchimp-extender' ); ?>
 								<p class="star-container">
 									<a href="https://wordpress.org/support/view/plugin-reviews/yikes-inc-easy-mailchimp-extender" target="_blank">
 										<b class="dashicons dashicons-star-filled"></b>
@@ -1614,21 +1614,21 @@ 
 								</p>
 							</p>
 
-							<?php _e( 'Tweet about it' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Tweet about it', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							<p class="sidebar-container">
 								<a href="https://twitter.com/share" class="twitter-share-button" data-url="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" data-text="I'm using the Easy Forms for MailChimp plugin by @YikesInc to grow my mailing list - it's awesome! -" data-hashtags="MailChimp">Tweet</a>
 								<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script>
 							</p>
 
-							<?php _e( 'Vote that the plugin works' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+							<?php _e( 'Vote that the plugin works', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							<p class="sidebar-container">
 								<a href="https://wordpress.org/plugins/yikes-inc-easy-mailchimp-extender/" target="_blank">
-									<?php _e( 'Vote for Compatibility' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+									<?php _e( 'Vote for Compatibility', 'yikes-inc-easy-mailchimp-extender' ); ?>
 								</a>
 							</p>
 						</div>
 
-						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s" , 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>
+						<p class="description sidebar-footer-text"><?php printf( __( "This plugin made with %s by %s", 'yikes-inc-easy-mailchimp-extender' ), '<span class="dashicons dashicons-heart yikes-love"></span>', '<a href="http://www.yikesinc.com" target="_blank" title="YIKES Inc.">YIKES Inc.</a>' ); ?> </p>
 
 						<section id="about-yikes-inc" class="inside">
 							<a href="https://www.yikesinc.com" target="_blank" title="YIKES Inc.">
@@ -1644,10 +1644,10 @@ 
 					<div class="postbox yikes-easy-mc-postbox">
 
 						<!-- review us container -->
-						<h3><?php _e( 'Easy Forms for MailChimp Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+						<h3><?php _e( 'Easy Forms for MailChimp Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
 						<div id="review-yikes-easy-mc" class="inside">
-							<p><?php _e( "Check out available add-ons for some seriously enhanced features." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-							<p><a class="button-secondary" href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) ); ?>" title="<?php _e( 'View Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'View Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
+							<p><?php _e( "Check out available add-ons for some seriously enhanced features.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+							<p><a class="button-secondary" href="<?php echo esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-addons' ) ); ?>" title="<?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'View Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
 						</div>
 
 					</div>
@@ -1672,76 +1672,76 @@ 
 		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
 
 			// if no list id, die!
-			if( ! $list_id ) {
-				die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );
+			if ( ! $list_id ) {
+				die( __( "We've encountered an error. No list ID was sent.", 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
-			if( ! $merge_variables ) {
-				die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support." , 'yikes-inc-easy-mailchimp-extender' ) );
+			if ( ! $merge_variables ) {
+				die( __( "We've encountered an error. Reload the page and try again. If the error persists, please reach out to support.", 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 
-			if( ! empty( $form_fields ) ) {
+			if ( ! empty( $form_fields ) ) {
 
 				// find any fields that are assigned to this form, that don't exist in MailChimp
 				// or else were going to run into issues when we submit the form
 				$available_merge_variables = array();
 				$available_interest_groups = array();
 
-				$assigned_fields= array();
+				$assigned_fields = array();
 
 				// loop over merge variables
-				if( ! empty( $merge_variables['data'][0]['merge_vars'] ) ) {
-					foreach( $merge_variables['data'][0]['merge_vars'] as $merge_tag ) {
-						$available_merge_variables[] = $merge_tag['tag'];
+				if ( ! empty( $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ] ) ) {
+					foreach ( $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ] as $merge_tag ) {
+						$available_merge_variables[ ] = $merge_tag[ 'tag' ];
 					}
 				}
 
 				// loop over interest groups
-				if( ! empty( $interest_groups ) && ! isset( $interest_groups['error'] ) ) {
-					foreach( $interest_groups as $interest_group ) {
-						$available_interest_groups[] = $interest_group['id'];
+				if ( ! empty( $interest_groups ) && ! isset( $interest_groups[ 'error' ] ) ) {
+					foreach ( $interest_groups as $interest_group ) {
+						$available_interest_groups[ ] = $interest_group[ 'id' ];
 					}
 				}
 
 				// build our assigned fields
-				foreach( $form_fields as $field => $value ) {
-					$assigned_fields[] = $field;
+				foreach ( $form_fields as $field => $value ) {
+					$assigned_fields[ ] = $field;
 				}
 
-				$merged_fields = array_merge( $available_merge_variables , $available_interest_groups );
-				$excluded_fields = array_diff( $assigned_fields , $merged_fields );
+				$merged_fields = array_merge( $available_merge_variables, $available_interest_groups );
+				$excluded_fields = array_diff( $assigned_fields, $merged_fields );
 
 				$i = 1;
-				foreach( $form_fields as $field ) {
+				foreach ( $form_fields as $field ) {
 
-					if( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 					?>
-						<section class="draggable" id="<?php echo $field['merge']; ?>">
+						<section class="draggable" id="<?php echo $field[ 'merge' ]; ?>">
 							<!-- top -->
 							<a href="#" class="expansion-section-title settings-sidebar">
-								<span class="dashicons dashicons-plus"></span><?php echo stripslashes( $field['label'] ); ?>
-								<?php if( in_array( $field['merge'] , $excluded_fields ) ) { ?>
-									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-doesnt-exist-notice" title="<?php _e( 'Field no longer exists.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
+								<span class="dashicons dashicons-plus"></span><?php echo stripslashes( $field[ 'label' ] ); ?>
+								<?php if ( in_array( $field[ 'merge' ], $excluded_fields ) ) { ?>
+									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-doesnt-exist-notice" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 								<?php } ?>
-								<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
 							</a>
 							<!-- expansion section -->
 							<div class="yikes-mc-settings-expansion-section">
 
-								<?php if( in_array( $field['merge'] , $excluded_fields ) ) { ?>
-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+								<?php if ( in_array( $field[ 'merge' ], $excluded_fields ) ) { ?>
+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on your website.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								<?php } ?>
 
 								<!-- store the label -->
-								<input type="hidden" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo $field['label']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['merge']; ?>][merge]" value="<?php echo $field['merge']; ?>" />
-								<input type="hidden" class="field-<?php echo $field['merge']; ?>-position position-input" name="field[<?php echo $field['merge']; ?>][position]" value="<?php echo $i++; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo $field[ 'label' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][merge]" value="<?php echo $field[ 'merge' ]; ?>" />
+								<input type="hidden" class="field-<?php echo $field[ 'merge' ]; ?>-position position-input" name="field[<?php echo $field[ 'merge' ]; ?>][position]" value="<?php echo $i++; ?>" />
 
-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {
-									$choices = json_decode( $field['choices'], true );
+								<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'dropdown' || $field[ 'type' ] == 'select' ) {
+									$choices = json_decode( $field[ 'choices' ], true );
 								?>
-									<input type="hidden" name="field[<?php echo $field['merge']; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
+									<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][choices]" value='<?php echo esc_attr( json_encode( $choices ) ); ?>' />
 								<?php } ?>
 
 								<!-- Single or Double Opt-in -->
@@ -1753,16 +1753,16 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="merge-tag">
-													<?php _e( 'Merge Tag' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Merge Tag', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field['merge']; ?>">
+												<input class="widefat merge-tag-text" type="text" readonly value="<?php echo $field[ 'merge' ]; ?>">
 											</td>
 										</tr>
 
 										<!-- Placeholder Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch ( $field[ 'type' ] ) {
 
 											case 'text':
 											case 'email':
@@ -1777,12 +1777,12 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Placeholder' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="text" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="<?php echo isset( $field['placeholder'] ) ? $field['placeholder'] : '' ; ?>" />
-												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<input type="text" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="<?php echo isset( $field[ 'placeholder' ] ) ? $field[ 'placeholder' ] : ''; ?>" />
+												<p class="description"><small><?php _e( "Assign a placeholder value to this field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<?php
@@ -1791,7 +1791,7 @@ 
 										?>
 
 										<!-- Default Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch ( $field[ 'type' ] ) {
 											default:
 											case 'text':
 											case 'number':
@@ -1800,17 +1800,17 @@ 
 											<tr valign="top">
 												<td scope="row">
 													<label for="placeholder">
-														<?php _e( 'Default Value' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+														<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>
 													</label>
 												</td>
 												<td>
-													<input <?php if( $field['type'] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field['merge']; ?>][default]" <?php if( $field['type'] != 'url' ) { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( $field['default'] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field['default'] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field['default'] ) ) ) : ''; ?>" <?php } ?> />
-													<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+													<input <?php if ( $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else { ?> type="number" <?php } ?> class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][default]" <?php if ( $field[ 'type' ] != 'url' ) { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'default' ] ) ) : ''; ?>" <?php } else { ?> value="<?php echo isset( $field[ 'default' ] ) ? stripslashes( wp_strip_all_tags( esc_url_raw( $field[ 'default' ] ) ) ) : ''; ?>" <?php } ?> />
+													<p class="description"><small><?php _e( "Assign a default value to populate this field with on initial page load.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													<?php
-													switch( $field['type'] ) {
+													switch ( $field[ 'type' ] ) {
 														case 'text':
 															?>
-																<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
+																<p><small class="pre-defined-tag-link"><a href="#TB_inline?width=600&height=550&inlineId=pre-defined-tag-container" onclick="storeGlobalClicked( jQuery( this ) );" class="thickbox"><?php _e( 'View Pre-Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
 															<?php
 														break;
 													} ?>
@@ -1824,18 +1824,18 @@ 
 												<tr valign="top">
 													<td scope="row">
 														<label for="placeholder">
-															<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+															<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
-														<?php if( ! isset( $field['default_choice'] ) || empty( $field['default_choice'] ) ) { $decode = json_decode( $field['choices'], true ); $field['default_choice'] = $decode[0]; }
+														<?php if ( ! isset( $field[ 'default_choice' ] ) || empty( $field[ 'default_choice' ] ) ) { $decode = json_decode( $field[ 'choices' ], true ); $field[ 'default_choice' ] = $decode[ 0 ]; }
 														$x = 0;
-														foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
-															<label for="<?php echo $field['merge'].'-'.$x; ?>">
-																<input id="<?php echo $field['merge'].'-'.$x; ?>" type="radio" name="field[<?php echo $field['merge']; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $field['default_choice'], $x ); ?>><?php echo $value; ?>&nbsp;
+														foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
+															<label for="<?php echo $field[ 'merge' ] . '-' . $x; ?>">
+																<input id="<?php echo $field[ 'merge' ] . '-' . $x; ?>" type="radio" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]" value="<?php echo $x; ?>" <?php checked( $field[ 'default_choice' ], $x ); ?>><?php echo $value; ?>&nbsp;
 															</label>
 														<?php $x++; } ?>
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -1847,16 +1847,16 @@ 
 												<tr valign="top">
 													<td scope="row">
 														<label for="placeholder">
-															<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+															<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
-														<select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]">
-															<?php foreach( json_decode( $field['choices'], true ) as $choice => $value ) { ?>
-																<option value="<?php echo $choice; ?>" <?php selected( $field['default_choice'] , $choice ); ?>><?php echo $value; ?></option>
+														<select type="default" name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]">
+															<?php foreach ( json_decode( $field[ 'choices' ], true ) as $choice => $value ) { ?>
+																<option value="<?php echo $choice; ?>" <?php selected( $field[ 'default_choice' ], $choice ); ?>><?php echo $value; ?></option>
 															<?php } ?>
 														</select>
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -1876,69 +1876,69 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<textarea class="widefat field-description-input" name="field[<?php echo $field['merge']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
-												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<textarea class="widefat field-description-input" name="field[<?php echo $field[ 'merge' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
+												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and will provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Additional Classes -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="text" class="widefat" name="field[<?php echo $field['merge']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />
-												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+												<input type="text" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />
+												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Required Toggle -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="field-required">
-													<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
-												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][require]" <?php checked( $checked , 1 ); ?> <?php if( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
+												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][require]" <?php checked( $checked, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" checked="checked" title="<?php echo __( 'Email is a required field.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Visible Toggle -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="hide-field">
-													<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
-												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field['merge']; ?>][hide]" <?php checked( $hide , 1 ); ?> <?php if( $field['merge'] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.' , 'yikes-inc-easy-mailchimp-extender' ); } ?>">
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
+												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'merge' ]; ?>][hide]" <?php checked( $hide, 1 ); ?> <?php if ( $field[ 'merge' ] == 'EMAIL' ) {  ?> disabled="disabled" title="<?php echo __( 'Cannot toggle email field visibility.', 'yikes-inc-easy-mailchimp-extender' ); } ?>">
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Toggle Field Label Visibility -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
-												<input type="checkbox" name="field[<?php echo $field['merge']; ?>][hide-label]" value="1" <?php checked( $hide_label , 1 ); ?>/>
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide_label = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
+												<input type="checkbox" name="field[<?php echo $field[ 'merge' ]; ?>][hide-label]" value="1" <?php checked( $hide_label, 1 ); ?>/>
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Display Phone/Date Formats back to the user -->
 										<!-- Phone Format Initial Load -->
 										<?php
-											switch( $field['type'] ) {
+											switch ( $field[ 'type' ] ) {
 												/* Store the phone format, for properly regex pattern */
 												case 'phone':
 												case 'birthday':
@@ -1948,23 +1948,23 @@ 
 															<td scope="row">
 																<label for="placeholder">
 																	<?php
-																		switch( $field['type'] ) {
+																		switch ( $field[ 'type' ] ) {
 																			default:
 																			case 'birthday':
-																				$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD';
+																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD';
 																				$format_name = 'date_format';
 																				break;
 
 																			case 'date':
-																				$type = __( 'Date Format' , 'yikes-inc-easy-mailchimp-extender' );
-																				$format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'MM/DD/YYYY';
+																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );
+																				$format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'MM/DD/YYYY';
 																				$format_name = 'date_format';
 																				break;
 
 																			case 'phone':
-																				$type = __( 'Phone Format' , 'yikes-inc-easy-mailchimp-extender' );
-																				$format = ( ( $field['phone_format'] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $field['phone_format'] . ' - (###) ### - ####' );
+																				$type = __( 'Phone Format', 'yikes-inc-easy-mailchimp-extender' );
+																				$format = ( ( $field[ 'phone_format' ] == 'none' ) ? __( 'International', 'yikes-inc-easy-mailchimp-extender' ) : $field[ 'phone_format' ] . ' - (###) ### - ####' );
 																				$format_name = 'phone_format';
 																				break;
 																		}
@@ -1974,7 +1974,7 @@ 
 															</td>
 															<td>
 																<strong><?php echo $format; ?></strong>
-																<input type="hidden" name="field[<?php echo $field['merge']; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
+																<input type="hidden" name="field[<?php echo $field[ 'merge' ]; ?>][<?php echo $format_name; ?>]" value="<?php echo $format; ?>" />
 																<p class="description"><small>
 																	<?php printf( __( 'To change the %s please head over to <a href="%s" title="MailChimp" target="_blank">MailChimp</a>. If you alter the format, you should re-import this field.', 'yikes-inc-easy-mailchimp-extender' ), strtolower( $type ), esc_url( 'http://www.mailchimp.com' ) ); ?>
 																</small></p>
@@ -1995,8 +1995,8 @@ 
 											</td>
 											<td>
 												<span class="toggle-container">
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-													<a href="#" class="remove-field" alt="<?php echo $field['merge']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'merge' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 												</span>
 											</td>
 										</tr>
@@ -2012,35 +2012,35 @@ 
 					} else { // THIS IS AN INTEREST GROUP!
 
 						?>
-						<section class="draggable" id="<?php echo $field['group_id']; ?>">
+						<section class="draggable" id="<?php echo $field[ 'group_id' ]; ?>">
 							<!-- top -->
 							<a href="#" class="expansion-section-title settings-sidebar">
-								<span class="dashicons dashicons-plus"></span><?php echo stripslashes( $field['label'] ); ?>
-								<?php if( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
-									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-no-longer-exists-warning" title="<?php _e( 'Field no longer exists.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.' , 'yikes-inc-easy-mailchimp-extender' ); ?>">
+								<span class="dashicons dashicons-plus"></span><?php echo stripslashes( $field[ 'label' ] ); ?>
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
+									<img src="<?php echo YIKES_MC_URL . 'includes/images/warning.svg'; ?>" class="field-no-longer-exists-warning" title="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>" alt="<?php _e( 'Field no longer exists.', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 								<?php } ?>
-								<span class="field-type-text"><small><?php echo __( 'type' , 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field['type']; ?></small></span>
+								<span class="field-type-text"><small><?php echo __( 'type', 'yikes-inc-easy-mailchimp-extender' ) . ' : ' . $field[ 'type' ]; ?></small></span>
 							</a>
 							<!-- expansion section -->
 							<div class="yikes-mc-settings-expansion-section">
 
 								<!-- check if this field exists in the available interest group array -->
-								<?php if( in_array( $field['group_id'] , $excluded_fields ) ) { ?>
-									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+								<?php if ( in_array( $field[ 'group_id' ], $excluded_fields ) ) { ?>
+									<p class="yikes-mc-warning-message"><?php _e( "This field no longer exists in this list. Delete this field from the form to prevent issues on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								<?php } ?>
 
 								<!-- store the label -->
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][label]" value="<?php echo $field['label']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][type]" value="<?php echo $field['type']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][group_id]" value="<?php echo $field['group_id']; ?>" />
-								<input type="hidden" name="field[<?php echo $field['group_id']; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field['groups'], true ) ) ); ?>' />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][label]" value="<?php echo $field[ 'label' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][type]" value="<?php echo $field[ 'type' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][group_id]" value="<?php echo $field[ 'group_id' ]; ?>" />
+								<input type="hidden" name="field[<?php echo $field[ 'group_id' ]; ?>][groups]" value='<?php echo esc_attr( json_encode( json_decode( $field[ 'groups' ], true ) ) ); ?>' />
 
 								<!-- Single or Double Opt-in -->
 								<p class="type-container"><!-- necessary to prevent skipping on slideToggle(); -->
 
 									<table class="form-table form-field-container">
 										<!-- Default Value -->
-										<?php switch( $field['type'] ) {
+										<?php switch ( $field[ 'type' ] ) {
 
 											default:
 											case 'radio':
@@ -2049,26 +2049,26 @@ 
 												<tr valign="top">
 													<td scope="row">
 														<label for="placeholder">
-															<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+															<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
 														<?php
-															if( $field['type'] != 'checkboxes' ) {
-																if( !isset( $field['default_choice'] ) ) { $field['default_choice'] =  json_decode( stripslashes( $field['groups'] ) , true ); }
+															if ( $field[ 'type' ] != 'checkboxes' ) {
+																if ( ! isset( $field[ 'default_choice' ] ) ) { $field[ 'default_choice' ] = json_decode( stripslashes( $field[ 'groups' ] ), true ); }
 															} else {
-																if( !isset( $field['default_choice'] ) ) { $field['default_choice'] = array(); }
+																if ( ! isset( $field[ 'default_choice' ] ) ) { $field[ 'default_choice' ] = array(); }
 															}
 														$i = 0;
-														foreach( json_decode( $field['groups'], true ) as $group ) { ?>
-															<label for="<?php echo $field['group_id'].'-'.$i; ?>">
-																<input id="<?php echo $field['group_id'].'-'.$i; ?>" type="<?php if( $field['type'] == 'radio' || $field['type'] == 'hidden' ) { ?>radio<?php } else if( $field['type'] == 'checkboxes' ) { ?>checkbox<?php } ?>" name="field[<?php echo $field['group_id']; ?>][default_choice]<?php if( $field['type'] == 'checkboxes' ) {echo '[]';}?>" value="<?php echo $i; ?>" <?php if( $field['type'] == 'radio' || $field['type'] == 'hidden' ) { checked( $field['default_choice'][0] , $i ); } else if( $field['type'] == 'checkboxes' ) { if( in_array( $i , $field['default_choice'] ) ) { echo 'checked="checked"'; } }?>><?php echo stripslashes( str_replace( '' , '\'' , $group['name'] ) ); ?>&nbsp;
+														foreach ( json_decode( $field[ 'groups' ], true ) as $group ) { ?>
+															<label for="<?php echo $field[ 'group_id' ] . '-' . $i; ?>">
+																<input id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" type="<?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'hidden' ) { ?>radio<?php } else if ( $field[ 'type' ] == 'checkboxes' ) { ?>checkbox<?php } ?>" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]<?php if ( $field[ 'type' ] == 'checkboxes' ) {echo '[]'; }?>" value="<?php echo $i; ?>" <?php if ( $field[ 'type' ] == 'radio' || $field[ 'type' ] == 'hidden' ) { checked( $field[ 'default_choice' ][ 0 ], $i ); } else if ( $field[ 'type' ] == 'checkboxes' ) { if ( in_array( $i, $field[ 'default_choice' ] ) ) { echo 'checked="checked"'; } }?>><?php echo stripslashes( str_replace( '', '\'', $group[ 'name' ] ) ); ?>&nbsp;
 															</label>
 														<?php
 															$i++;
 															}
 														?>
-														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Select the option that should be selected by default.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -2080,16 +2080,16 @@ 
 												<tr valign="top">
 													<td scope="row">
 														<label for="placeholder">
-															<?php _e( 'Default Selection' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+															<?php _e( 'Default Selection', 'yikes-inc-easy-mailchimp-extender' ); ?>
 														</label>
 													</td>
 													<td>
-														<select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]">
-															<?php $i = 0; foreach( json_decode( stripslashes_deep( $field['groups'] ) , true ) as  $group ) { ?>
-																<option value="<?php echo $i; ?>" <?php selected( $field['default_choice'] , $i ); ?>><?php echo stripslashes( $group['name'] ); ?></option>
+														<select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]">
+															<?php $i = 0; foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as  $group ) { ?>
+																<option value="<?php echo $i; ?>" <?php selected( $field[ 'default_choice' ], $i ); ?>><?php echo stripslashes( $group[ 'name' ] ); ?></option>
 															<?php $i++; } ?>
 														</select>
-														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+														<p class="description"><small><?php _e( "Which option should be selected by default?", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 													</td>
 												</tr>
 
@@ -2103,12 +2103,12 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Description' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<textarea class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description]"><?php echo isset( $field['description'] ) ? stripslashes( esc_html( $field['description'] ) ) : '' ; ?></textarea>
-												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<textarea class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description]"><?php echo isset( $field[ 'description' ] ) ? stripslashes( esc_html( $field[ 'description' ] ) ) : ''; ?></textarea>
+												<p class="description"><small><?php _e( "Enter the description for the form field. This will be displayed to the user and provide some direction on how the field should be filled out or selected.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 
@@ -2116,51 +2116,51 @@ 
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Additional Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<input type="text" class="widefat" name="field[<?php echo $field['group_id']; ?>][additional-classes]" value="<?php echo isset( $field['additional-classes'] ) ? stripslashes( wp_strip_all_tags( $field['additional-classes'] ) ) : '' ; ?>" />
-												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );?></small></p>
+												<input type="text" class="widefat" name="field[<?php echo $field[ 'group_id' ]; ?>][additional-classes]" value="<?php echo isset( $field[ 'additional-classes' ] ) ? stripslashes( wp_strip_all_tags( $field[ 'additional-classes' ] ) ) : ''; ?>" />
+												<p class="description"><small><?php printf( __( "Assign additional classes to this field. %s.", 'yikes-inc-easy-mailchimp-extender' ), '<a target="_blank" href="' . esc_url( 'https://yikesplugins.com/support/knowledge-base/bundled-css-classes/' ) . '">' . __( 'View bundled classes', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Required Toggle -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="field-required">
-													<?php _e( 'Field Required?' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>
-												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][require]" <?php checked( $checked , 1 ); ?>>
-												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $checked = isset( $field[ 'require' ] ) ? $field[ 'require' ] : '0'; ?>
+												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][require]" <?php checked( $checked, 1 ); ?>>
+												<p class="description"><small><?php _e( "Require this field to be filled in before the form can be submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Visible Toggle -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="hide-field">
-													<?php _e( 'Hide Field' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>
-												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field['group_id']; ?>][hide]" <?php checked( $hide , 1 ); ?>>
-												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide = isset( $field[ 'hide' ] ) ? $field[ 'hide' ] : '0'; ?>
+												<input type="checkbox" class="widefat" value="1" name="field[<?php echo $field[ 'group_id' ]; ?>][hide]" <?php checked( $hide, 1 ); ?>>
+												<p class="description"><small><?php _e( "Hide this field from being displayed on the front end.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Toggle Field Label Visibility -->
 										<tr valign="top">
 											<td scope="row">
 												<label for="placeholder">
-													<?php _e( 'Hide Label' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>
 												</label>
 											</td>
 											<td>
-												<?php $hide = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>
-												<input type="checkbox" name="field[<?php echo $field['group_id']; ?>][hide-label]" value="1" <?php checked( $hide , 1 ); ?>/>
-												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>
+												<?php $hide = isset( $field[ 'hide-label' ] ) ? $field[ 'hide-label' ] : '0'; ?>
+												<input type="checkbox" name="field[<?php echo $field[ 'group_id' ]; ?>][hide-label]" value="1" <?php checked( $hide, 1 ); ?>/>
+												<p class="description"><small><?php _e( "Toggle field label visibility.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 											</td>
 										</tr>
 										<!-- Toggle Buttons -->
@@ -2170,8 +2170,8 @@ 
 											</td>
 											<td>
 												<span class="toggle-container">
-													<a href="#" class="close-form-expansion"><?php _e( "Close" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
-													<a href="#" class="remove-field" alt="<?php echo $field['group_id']; ?>"><?php _e( "Remove Field" , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+													<a href="#" class="close-form-expansion"><?php _e( "Close", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |
+													<a href="#" class="remove-field" alt="<?php echo $field[ 'group_id' ]; ?>"><?php _e( "Remove Field", 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 												</span>
 											</td>
 										</tr>
@@ -2185,38 +2185,38 @@ 
 				}
 			} else {
 				?>
-					<h4 class="no-fields-assigned-notice non-draggable-yikes"><em><?php _e( 'No fields are assigned to this form. Select fields from the right hand column to add to this form.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></h4>
+					<h4 class="no-fields-assigned-notice non-draggable-yikes"><em><?php _e( 'No fields are assigned to this form. Select fields from the right hand column to add to this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></h4>
 				<?php
 			}
 				/* Pre Defined Merge Tag Container - Always rendered so the modal appears and links are clickable on initial page load */
 				add_thickbox();
 				// enqueue jquery qtip for our tooltip
-				wp_enqueue_script( 'jquery-qtip-tooltip' , YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js' , array( 'jquery' ) );
-				wp_enqueue_style( 'jquery-qtip-style' ,  YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
+				wp_enqueue_script( 'jquery-qtip-tooltip', YIKES_MC_URL . 'admin/js/min/jquery.qtip.min.js', array( 'jquery' ) );
+				wp_enqueue_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );
 					$available_tags = array(
 						array(
 							'tag' => '{page_title}',
-							'description' => '<h4 class="tooltip-title">' . __( 'Page Title', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_title}</small></h4><hr />' . __( 'Pre-populate the field with the current page or post title that the user is on when opting in to your mailing list.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'Page Title', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_title}</small></h4><hr />' . __( 'Pre-populate the field with the current page or post title that the user is on when opting in to your mailing list.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'Page Title', 'yikes-inc-easy-mailchimp-extender' )
 						),
 						array(
 							'tag' => '{page_id}',
-							'description' => '<h4 class="tooltip-title">' . __( 'Page ID', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_id}</small></h4><hr />' . __( 'Pre-populate the field with the current page or post ID that the user is on when opting in to your mailing list.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'Page ID', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_id}</small></h4><hr />' . __( 'Pre-populate the field with the current page or post ID that the user is on when opting in to your mailing list.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'Page ID', 'yikes-inc-easy-mailchimp-extender' )
 						),
 						array(
 							'tag' => '{page_url}',
-							'description' => '<h4 class="tooltip-title">' . __( 'Page URL', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_url}</small></h4><hr />' . __( 'Pre-populate the field with the current page URL that the user is on when opting in to your mailing list.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'Page URL', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{page_url}</small></h4><hr />' . __( 'Pre-populate the field with the current page URL that the user is on when opting in to your mailing list.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'Page URL', 'yikes-inc-easy-mailchimp-extender' )
 						),
 						array(
 							'tag' => '{blog_name}',
-							'description' => '<h4 class="tooltip-title">' . __( 'Blog Name', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{blog_name}</small></h4><hr />' . __( 'Pre-populate the field with the current blog name that the user is on when opting in to your mailing list. This is especially helpful for multi-site networks.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'Blog Name', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{blog_name}</small></h4><hr />' . __( 'Pre-populate the field with the current blog name that the user is on when opting in to your mailing list. This is especially helpful for multi-site networks.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'Blog Name', 'yikes-inc-easy-mailchimp-extender' )
 						),
 						array(
 							'tag' => '{user_logged_in}',
-							'description' => '<h4 class="tooltip-title">' . __( 'User Logged In', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{user_logged_in}</small></h4><hr />' . __( 'Detects if a user is logged in and pre-populates the field with an appropriate value.' , 'yikes-inc-easy-mailchimp-extender' ),
+							'description' => '<h4 class="tooltip-title">' . __( 'User Logged In', 'yikes-inc-easy-mailchimp-extender' ) . ' | <small>{user_logged_in}</small></h4><hr />' . __( 'Detects if a user is logged in and pre-populates the field with an appropriate value.', 'yikes-inc-easy-mailchimp-extender' ),
 							'title' => __( 'User Logged In', 'yikes-inc-easy-mailchimp-extender' )
 						),
 					);
@@ -2244,17 +2244,17 @@ 
 				<div id="pre-defined-tag-container">
 					<input type="hidden" value="" class="clicked-input">
 					<div id="pre-defined-tag-interior-container">
-						<h3><?php _e( 'Pre Defined Tags' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
-						<p class="description"><?php _e( 'You can use any of the following tags to populate a MailChimp text field with dynamic content. This can be used to determine which page the user signed up on, if the user was logged in and more.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+						<h3><?php _e( 'Pre Defined Tags', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+						<p class="description"><?php _e( 'You can use any of the following tags to populate a MailChimp text field with dynamic content. This can be used to determine which page the user signed up on, if the user was logged in and more.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 						<ul>
-							<?php foreach( apply_filters( 'yikes-mailchimp-custom-default-value-tags' , $available_tags ) as $tag ) { ?>
+							<?php foreach ( apply_filters( 'yikes-mailchimp-custom-default-value-tags', $available_tags ) as $tag ) { ?>
 								<li class="tooltop-tag">
 									<!-- link/tag -->
-									<a href="#" onclick="populateDefaultValue( '<?php echo $tag['tag']; ?>' );return false;" data-attr-tag="<?php echo $tag['tag']; ?>" title="<?php echo $tag['title']; ?>"><?php echo $tag['title']; ?></a>
+									<a href="#" onclick="populateDefaultValue( '<?php echo $tag[ 'tag' ]; ?>' );return false;" data-attr-tag="<?php echo $tag[ 'tag' ]; ?>" title="<?php echo $tag[ 'title' ]; ?>"><?php echo $tag[ 'title' ]; ?></a>
 									<!-- help icon -->
 									<span class="dashicons dashicons-editor-help"></span>
 									<!-- tooltip -->
-									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag['description']; ?></div>
+									<div class="tooltiptext qtip-bootstrap yikes-easy-mc-hidden"><?php echo $tag[ 'description' ]; ?></div>
 								</li>
 							<?php } ?>
 						</ul>
@@ -2270,32 +2270,32 @@ 
 		*	-
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
 		*/
-		public function build_available_merge_vars( $form_fields , $available_merge_variables ) {
+		public function build_available_merge_vars( $form_fields, $available_merge_variables ) {
 			$fields_assigned_to_form = array();
-			if( !empty( $form_fields ) ) {
-				foreach( $form_fields as $assigned_field ) {
+			if ( ! empty( $form_fields ) ) {
+				foreach ( $form_fields as $assigned_field ) {
 					// print_r( $assigned_field) ;
 					// switch between merge variables and interest groups
-					if( isset( $assigned_field['merge'] ) ) {
-						$fields_assigned_to_form[] = $assigned_field['merge'];
+					if ( isset( $assigned_field[ 'merge' ] ) ) {
+						$fields_assigned_to_form[ ] = $assigned_field[ 'merge' ];
 					}
 				}
 			}
-			if( !empty( $available_merge_variables['data'][0] ) ) {
+			if ( ! empty( $available_merge_variables[ 'data' ][ 0 ] ) ) {
 				?><ul id="available-fields"><?php
-				foreach( $available_merge_variables['data'][0]['merge_vars'] as $merge_var ) {
-					if( in_array( $merge_var['tag'] , $fields_assigned_to_form ) ) {
+				foreach ( $available_merge_variables[ 'data' ][ 0 ][ 'merge_vars' ] as $merge_var ) {
+					if ( in_array( $merge_var[ 'tag' ], $fields_assigned_to_form ) ) {
 						?>
-							<li class="available-form-field not-available" alt="<?php echo $merge_var['tag']; ?>" data-attr-field-type="<?php echo $merge_var['field_type']; ?>" data-attr-field-name="<?php echo $merge_var['name']; ?>" data-attr-form-id="<?php echo $available_merge_variables['data'][0]['id']; ?>" title="<?php _e( 'Already assigned to your form' , 'yikes-inc-easy-mailchimp-extender' ); ?>" disabled="disabled"><?php echo stripslashes( $merge_var['name'] ); if( $merge_var['req'] == '1' ) { echo ' <span class="field-required" title="' . __( 'required field' , 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; } ?> <small class="field-type-text"><?php echo $merge_var['field_type']; ?></small></li>
+							<li class="available-form-field not-available" alt="<?php echo $merge_var[ 'tag' ]; ?>" data-attr-field-type="<?php echo $merge_var[ 'field_type' ]; ?>" data-attr-field-name="<?php echo $merge_var[ 'name' ]; ?>" data-attr-form-id="<?php echo $available_merge_variables[ 'data' ][ 0 ][ 'id' ]; ?>" title="<?php _e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>" disabled="disabled"><?php echo stripslashes( $merge_var[ 'name' ] ); if ( $merge_var[ 'req' ] == '1' ) { echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; } ?> <small class="field-type-text"><?php echo $merge_var[ 'field_type' ]; ?></small></li>
 						<?php
 					} else {
 						?>
-							<li class="available-form-field" alt="<?php echo $merge_var['tag']; ?>" data-attr-field-type="<?php echo $merge_var['field_type']; ?>" data-attr-field-name="<?php echo $merge_var['name']; ?>" data-attr-form-id="<?php echo $available_merge_variables['data'][0]['id']; ?>"><?php echo stripslashes( $merge_var['name'] ); if( $merge_var['req'] == '1' ) { echo ' <span class="field-required" title="' . __( 'required field' , 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; } ?> <small class="field-type-text"><?php echo $merge_var['field_type']; ?></small></li>
+							<li class="available-form-field" alt="<?php echo $merge_var[ 'tag' ]; ?>" data-attr-field-type="<?php echo $merge_var[ 'field_type' ]; ?>" data-attr-field-name="<?php echo $merge_var[ 'name' ]; ?>" data-attr-form-id="<?php echo $available_merge_variables[ 'data' ][ 0 ][ 'id' ]; ?>"><?php echo stripslashes( $merge_var[ 'name' ] ); if ( $merge_var[ 'req' ] == '1' ) { echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>'; } ?> <small class="field-type-text"><?php echo $merge_var[ 'field_type' ]; ?></small></li>
 						<?php
 					}
 				}
 				?></ul>
-				<a href="#" class="add-field-to-editor button-secondary yikes-easy-mc-hidden" style="display:none;"><small><span class="dashicons dashicons-arrow-left-alt add-to-form-builder-arrow"></span> <?php _e( 'Add to Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></small></a>
+				<a href="#" class="add-field-to-editor button-secondary yikes-easy-mc-hidden" style="display:none;"><small><span class="dashicons dashicons-arrow-left-alt add-to-form-builder-arrow"></span> <?php _e( 'Add to Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></small></a>
 				<?php
 			}
 		}
@@ -2307,30 +2307,30 @@ 
 		*	-
 		* @parameters - $list_id - pass in the list ID to retreive merge variables from
 		*/
-		public function build_available_interest_groups( $form_fields , $available_interest_groups , $list_id ) {
+		public function build_available_interest_groups( $form_fields, $available_interest_groups, $list_id ) {
 			$fields_assigned_to_form = array();
-			if( !empty( $form_fields ) ) {
-					foreach( $form_fields as $assigned_interest_group ) {
-					if( isset( $assigned_interest_group['group_id'] ) ) {
-						$fields_assigned_to_form[] = $assigned_interest_group['group_id'];
+			if ( ! empty( $form_fields ) ) {
+					foreach ( $form_fields as $assigned_interest_group ) {
+					if ( isset( $assigned_interest_group[ 'group_id' ] ) ) {
+						$fields_assigned_to_form[ ] = $assigned_interest_group[ 'group_id' ];
 					}
 				}
 			}
-			if( !empty( $available_interest_groups) ) {
+			if ( ! empty( $available_interest_groups ) ) {
 				?><ul id="available-interest-groups"><?php
-				foreach( $available_interest_groups as $interest_group ) {
-					if( in_array( $interest_group['id'] , $fields_assigned_to_form ) ) {
+				foreach ( $available_interest_groups as $interest_group ) {
+					if ( in_array( $interest_group[ 'id' ], $fields_assigned_to_form ) ) {
 						?>
-							<li class="available-interest-group not-available" alt="<?php echo $interest_group['id']; ?>" data-attr-field-name="<?php echo stripslashes( $interest_group['name'] ); ?>" data-attr-field-type="<?php echo $interest_group['form_field']; ?>" data-attr-form-id="<?php echo $list_id; ?>" title="<?php _e( 'Already assigned to your form' , 'yikes-inc-easy-mailchimp-extender' ); ?>" disabled="disabled"><?php echo stripslashes( $interest_group['name'] ); ?> <small class="field-type-text"><?php echo $interest_group['form_field']; ?></small></li>
+							<li class="available-interest-group not-available" alt="<?php echo $interest_group[ 'id' ]; ?>" data-attr-field-name="<?php echo stripslashes( $interest_group[ 'name' ] ); ?>" data-attr-field-type="<?php echo $interest_group[ 'form_field' ]; ?>" data-attr-form-id="<?php echo $list_id; ?>" title="<?php _e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>" disabled="disabled"><?php echo stripslashes( $interest_group[ 'name' ] ); ?> <small class="field-type-text"><?php echo $interest_group[ 'form_field' ]; ?></small></li>
 						<?php
 					} else {
 						?>
-							<li class="available-interest-group" alt="<?php echo $interest_group['id']; ?>" data-attr-field-name="<?php echo stripslashes( $interest_group['name'] ); ?>" data-attr-field-type="<?php echo $interest_group['form_field']; ?>" data-attr-form-id="<?php echo $list_id; ?>"><?php echo stripslashes( $interest_group['name'] ); ?> <small class="field-type-text"><?php echo $interest_group['form_field']; ?></small></li>
+							<li class="available-interest-group" alt="<?php echo $interest_group[ 'id' ]; ?>" data-attr-field-name="<?php echo stripslashes( $interest_group[ 'name' ] ); ?>" data-attr-field-type="<?php echo $interest_group[ 'form_field' ]; ?>" data-attr-form-id="<?php echo $list_id; ?>"><?php echo stripslashes( $interest_group[ 'name' ] ); ?> <small class="field-type-text"><?php echo $interest_group[ 'form_field' ]; ?></small></li>
 						<?php
 					}
 				}
 				?></ul>
-				<a href="#" class="add-interest-group-to-editor button-secondary yikes-easy-mc-hidden" style="display:none;"><small><span class="dashicons dashicons-arrow-left-alt add-to-form-builder-arrow"></span> <?php _e( 'Add to Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></small></a>
+				<a href="#" class="add-interest-group-to-editor button-secondary yikes-easy-mc-hidden" style="display:none;"><small><span class="dashicons dashicons-arrow-left-alt add-to-form-builder-arrow"></span> <?php _e( 'Add to Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></small></a>
 				<?php
 			}
 		}
@@ -2342,9 +2342,9 @@ 
 		*	- must clean up db tables , ensure what data is going in and what is needed...
 		*/
 		public function yikes_easy_mailchimp_create_form() {
-			$nonce = $_REQUEST['nonce'];
-			if( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
-				die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );
+			$nonce = $_REQUEST[ 'nonce' ];
+			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
+				die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ) );
 			}
 			global $wpdb;
 				/* Default values */
@@ -2367,7 +2367,7 @@ 
 					)
 				);
 				// setup our default error message array
-				$error_settings= json_encode(
+				$error_settings = json_encode(
 					array(
 						'success' => '',
 						'general-error' => '',
@@ -2381,9 +2381,9 @@ 
 				$wpdb->insert(
 					$wpdb->prefix . 'yikes_easy_mc_forms',
 					array(
-						'list_id' => $_POST['associated-list'],
-						'form_name' => stripslashes( $_POST['form-name'] ),
-						'form_description' => stripslashes( $_POST['form-description'] ),
+						'list_id' => $_POST[ 'associated-list' ],
+						'form_name' => stripslashes( $_POST[ 'form-name' ] ),
+						'form_description' => stripslashes( $_POST[ 'form-description' ] ),
 						'fields' => '',
 						'custom_styles' => 0,
 						'custom_template' => 0,
@@ -2404,33 +2404,33 @@ 
 						'%s', // form description
 						'%s', // fields
 						'%s', // custom styles
-						'%d',	// custom template
-						'%d',	// send welcome email
-						'%s',	// redirect user
-						'%s',	// redirect page
-						'%s',	// submission
-						'%s',	// optin
+						'%d', // custom template
+						'%d', // send welcome email
+						'%s', // redirect user
+						'%s', // redirect page
+						'%s', // submission
+						'%s', // optin
 						'%s', // error
 						'%s', // custom notifications
-						'%d',	// impressions #
-						'%d',	// submissions #
+						'%d', // impressions #
+						'%d', // submissions #
 						'%s', // custom fields
 					)
 				);
 
 			// if an error occurs during the form creation process
-			if( $wpdb->insert_id == '0' ) {
+			if ( $wpdb->insert_id == '0' ) {
 				// write it to the error log
 				// if the form was not created successfully
-				if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 					require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 					$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-					$error_logging->yikes_easy_mailchimp_write_to_error_log( $wpdb->last_error , __( "Creating a new form" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Forms" , 'yikes-inc-easy-mailchimp-extender' ) );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $wpdb->last_error, __( "Creating a new form", 'yikes-inc-easy-mailchimp-extender' ), __( "Forms", 'yikes-inc-easy-mailchimp-extender' ) );
 				}
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error='.urlencode( $wpdb->last_error ) ) ) );
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&sql_error=' . urlencode( $wpdb->last_error ) ) ) );
 			} else {
 				// redirect the user to the new form edit page
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id='.$wpdb->insert_id ) ) );
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $wpdb->insert_id ) ) );
 			}
 			exit();
 			die();
@@ -2444,11 +2444,11 @@ 
 		*/
 		public function yikes_easy_mailchimp_delete_form() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$post_id_to_delete = $_REQUEST['mailchimp-form'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$post_id_to_delete = $_REQUEST[ 'mailchimp-form' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-' . $post_id_to_delete ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			global $wpdb;
 				/* Working Insert Function */
@@ -2473,39 +2473,39 @@ 
 		*/
 		public function yikes_easy_mailchimp_duplicate_form() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$post_id_to_clone = $_REQUEST['mailchimp-form'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$post_id_to_clone = $_REQUEST[ 'mailchimp-form' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-' . $post_id_to_clone ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			global $wpdb;
 				/* Working Insert Function */
-				$form_data = $wpdb->get_row("SELECT * FROM " . $wpdb->prefix . "yikes_easy_mc_forms WHERE id = ".$post_id_to_clone."");
+				$form_data = $wpdb->get_row( "SELECT * FROM " . $wpdb->prefix . "yikes_easy_mc_forms WHERE id = " . $post_id_to_clone . "" );
 				// create empty array to populate with row data
 				$data = array();
 				// build a data array to duplicate
-				foreach( $form_data as $id => $value ) {
+				foreach ( $form_data as $id => $value ) {
 					// skip the ID field this is unique
-					if( $id != 'id' ) {
+					if ( $id != 'id' ) {
 						// append -Copy- to our new form
-						if( $id == 'form_name' ) {
+						if ( $id == 'form_name' ) {
 							$value = $value . ' - Copy -';
 						}
 						// reset the impressions and submissions back to 0
-						if( $id == 'impressions' || $id == 'submissions' ) {
+						if ( $id == 'impressions' || $id == 'submissions' ) {
 							$value = '0';
 						}
 
 						// add data to our array
-						$data[$id] = $value;
+						$data[ $id ] = $value;
 					}
 				}
 				// insert our new data
-				if( $wpdb->insert(
+				if ( $wpdb->insert(
 					$wpdb->prefix . 'yikes_easy_mc_forms',
 					apply_filters( 'yikes-mailchimp-duplicate-form-data', $data )
-				)  === FALSE ) {
+				) === FALSE ) {
 					// redirect the user to the manage forms page, display error
 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=false' ) ) );
 				} else {
@@ -2521,15 +2521,15 @@ 
 		*/
 		public function yikes_easy_mailchimp_reset_impression_stats() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$form_id_to_reset = $_REQUEST['mailchimp-form'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$form_id_to_reset = $_REQUEST[ 'mailchimp-form' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-' . $form_id_to_reset ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			global $wpdb;
 			/* Update 'Impressions/Submissions' */
-			if( $wpdb->update(
+			if ( $wpdb->update(
 				$wpdb->prefix . 'yikes_easy_mc_forms',
 				array(
 					'impressions' => 0,
@@ -2553,35 +2553,35 @@ 
 		*/
 		public function yikes_easy_mailchimp_update_form() {
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
-			$form_id = $_REQUEST['id'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$form_id = $_REQUEST[ 'id' ];
 
 			// store our values!
-			$list_id = $_POST['associated-list'];
-			$form_name = stripslashes( $_POST['form-name'] );
-			$form_description = sanitize_text_field( stripslashes( $_POST['form-description'] ) );
-			$send_welcome_email = $_POST['send-welcome-email'];
-			$redirect_user_on_submit = $_POST['redirect-user-on-submission'];
-			$redirect_page = $_POST['redirect-user-to-selection'];
-			if( isset( $_POST['custom-styles'] ) ) {
-				$custom_styles = $_POST['custom-styles'];
+			$list_id = $_POST[ 'associated-list' ];
+			$form_name = stripslashes( $_POST[ 'form-name' ] );
+			$form_description = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) );
+			$send_welcome_email = $_POST[ 'send-welcome-email' ];
+			$redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ];
+			$redirect_page = $_POST[ 'redirect-user-to-selection' ];
+			if ( isset( $_POST[ 'custom-styles' ] ) ) {
+				$custom_styles = $_POST[ 'custom-styles' ];
 			}
 
 			// stripslashes_deep on save, to prevent foreign languages from added excessive backslashes
-			$assigned_fields = isset( $_POST['field'] ) ? json_encode( stripslashes_deep( $_POST['field'] ) ) : '';
+			$assigned_fields = isset( $_POST[ 'field' ] ) ? json_encode( stripslashes_deep( $_POST[ 'field' ] ) ) : '';
 
 			// setup our custom styles serialized array
-			if( isset( $custom_styles ) ) {
+			if ( isset( $custom_styles ) ) {
 				$custom_styles = json_encode( array(
-					'active' => $_POST['custom-styles'],
-					'background_color' => $_POST['form-background-color'],
-					'font_color' => $_POST['form-font-color'],
-					'submit_button_color' => $_POST['form-submit-button-color'],
-					'submit_button_text_color' => $_POST['form-submit-button-text-color'],
-					'form_padding' => $_POST['form-padding'],
-					'form_width' => $_POST['form-width'],
-					'form_alignment' => $_POST['form-alignment'],
-					'label_visible' => $_POST['label-visible']
+					'active' => $_POST[ 'custom-styles' ],
+					'background_color' => $_POST[ 'form-background-color' ],
+					'font_color' => $_POST[ 'form-font-color' ],
+					'submit_button_color' => $_POST[ 'form-submit-button-color' ],
+					'submit_button_text_color' => $_POST[ 'form-submit-button-text-color' ],
+					'form_padding' => $_POST[ 'form-padding' ],
+					'form_width' => $_POST[ 'form-width' ],
+					'form_alignment' => $_POST[ 'form-alignment' ],
+					'label_visible' => $_POST[ 'label-visible' ]
 				) );
 			} else {
 				$custom_styles = 0;
@@ -2590,33 +2590,33 @@ 
 			// setup our submission settings serialized array
 			$submission_settings = json_encode(
 				array(
-					'ajax' => $_POST['form-ajax-submission'],
-					'redirect_on_submission' => $_POST['redirect-user-on-submission'],
-					'redirect_page' => $_POST['redirect-user-to-selection'],
-					'custom_redirect_url' => esc_url( $_POST['custom-redirect-url'] ),
-					'hide_form_post_signup' => $_POST['hide-form-post-signup'],
-					'replace_interests' => $_POST['replace-interest-groups'],
+					'ajax' => $_POST[ 'form-ajax-submission' ],
+					'redirect_on_submission' => $_POST[ 'redirect-user-on-submission' ],
+					'redirect_page' => $_POST[ 'redirect-user-to-selection' ],
+					'custom_redirect_url' => esc_url( $_POST[ 'custom-redirect-url' ] ),
+					'hide_form_post_signup' => $_POST[ 'hide-form-post-signup' ],
+					'replace_interests' => $_POST[ 'replace-interest-groups' ],
 				)
 			);
 
 			// setup our opt-in settings serialized array
 			$optin_settings = json_encode(
 				array(
-					'optin' => $_POST['single-double-optin'],
-					'update_existing_user' => $_POST['update-existing-user'],
-					'send_update_email' => $_POST['update-existing-email'],
-					'send_welcome_email' => $_POST['send-welcome-email'],
+					'optin' => $_POST[ 'single-double-optin' ],
+					'update_existing_user' => $_POST[ 'update-existing-user' ],
+					'send_update_email' => $_POST[ 'update-existing-email' ],
+					'send_welcome_email' => $_POST[ 'send-welcome-email' ],
 				)
 			);
 
 			// setup our error settings serialized array
 			$error_settings = json_encode(
 				array(
-					'success' => trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',
-					'general-error' => trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-message'] ) ) : '',
-					'invalid-email' => trim( $_POST['yikes-easy-mc-invalid-email-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-invalid-email-message'] ) ) : '',
-					'already-subscribed' => trim( $_POST['yikes-easy-mc-user-subscribed-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-subscribed-message'] ) ) : '',
-					'update-link' => trim( $_POST['yikes-easy-mc-user-update-link'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-update-link'] ) ) : '',
+					'success' => trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',
+					'general-error' => trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ) : '',
+					'invalid-email' => trim( $_POST[ 'yikes-easy-mc-invalid-email-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-invalid-email-message' ] ) ) : '',
+					'already-subscribed' => trim( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-subscribed-message' ] ) ) : '',
+					'update-link' => trim( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-update-link' ] ) ) : '',
 				)
 			);
 
@@ -2625,33 +2625,33 @@ 
 			// To Do: Combine date & time so it's a single unix timestamp
 			$form_settings = json_encode(
 				array(
-					'yikes-easy-mc-form-class-names' => trim( $_POST['yikes-easy-mc-form-class-names'] ),
-					'yikes-easy-mc-inline-form' => $_POST['yikes-easy-mc-inline-form'][0],
-					'yikes-easy-mc-submit-button-type' => $_POST['yikes-easy-mc-submit-button-type'][0],
-					'yikes-easy-mc-submit-button-text' => trim( $_POST['yikes-easy-mc-submit-button-text'] ),
-					'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST['yikes-easy-mc-submit-button-image'] ) ),
-					'yikes-easy-mc-submit-button-classes' => trim( $_POST['yikes-easy-mc-submit-button-classes'] ),
-					'yikes-easy-mc-form-schedule' => ( isset( $_POST['yikes-easy-mc-form-schedule'] ) ) ? '1' : '0',
-					'yikes-easy-mc-form-restriction-start' => strtotime( $_POST['yikes-easy-mc-form-restriction-start-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-start-time'] ),
-					'yikes-easy-mc-form-restriction-end' => strtotime( $_POST['yikes-easy-mc-form-restriction-end-date'] . ' ' . $_POST['yikes-easy-mc-form-restriction-end-time'] ),
-					'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST['yikes-easy-mc-form-restriction-pending-message'] ),
-					'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST['yikes-easy-mc-form-restriction-expired-message'] ),
-					'yikes-easy-mc-form-login-required' => ( isset( $_POST['yikes-easy-mc-form-login-required'] ) ) ? '1' : '0',
-					'yikes-easy-mc-form-restriction-login-message' => trim( $_POST['yikes-easy-mc-form-restriction-login-message'] ),
+					'yikes-easy-mc-form-class-names' => trim( $_POST[ 'yikes-easy-mc-form-class-names' ] ),
+					'yikes-easy-mc-inline-form' => $_POST[ 'yikes-easy-mc-inline-form' ][ 0 ],
+					'yikes-easy-mc-submit-button-type' => $_POST[ 'yikes-easy-mc-submit-button-type' ][ 0 ],
+					'yikes-easy-mc-submit-button-text' => trim( $_POST[ 'yikes-easy-mc-submit-button-text' ] ),
+					'yikes-easy-mc-submit-button-image' => esc_url( trim( $_POST[ 'yikes-easy-mc-submit-button-image' ] ) ),
+					'yikes-easy-mc-submit-button-classes' => trim( $_POST[ 'yikes-easy-mc-submit-button-classes' ] ),
+					'yikes-easy-mc-form-schedule' => ( isset( $_POST[ 'yikes-easy-mc-form-schedule' ] ) ) ? '1' : '0',
+					'yikes-easy-mc-form-restriction-start' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-start-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-start-time' ] ),
+					'yikes-easy-mc-form-restriction-end' => strtotime( $_POST[ 'yikes-easy-mc-form-restriction-end-date' ] . ' ' . $_POST[ 'yikes-easy-mc-form-restriction-end-time' ] ),
+					'yikes-easy-mc-form-restriction-pending-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-pending-message' ] ),
+					'yikes-easy-mc-form-restriction-expired-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-expired-message' ] ),
+					'yikes-easy-mc-form-login-required' => ( isset( $_POST[ 'yikes-easy-mc-form-login-required' ] ) ) ? '1' : '0',
+					'yikes-easy-mc-form-restriction-login-message' => trim( $_POST[ 'yikes-easy-mc-form-restriction-login-message' ] ),
 				)
 			);
 
 			// setup and store our notification array
-			$custom_notifications = isset( $_POST['custom-notification'] ) ? stripslashes( json_encode( $_POST['custom-notification'] ) ) : '';
+			$custom_notifications = isset( $_POST[ 'custom-notification' ] ) ? stripslashes( json_encode( $_POST[ 'custom-notification' ] ) ) : '';
 
 			// additional custom fields (extensions / user defined fields)
-			if( isset( $_POST['custom-field'] ) ) {
+			if ( isset( $_POST[ 'custom-field' ] ) ) {
 				$custom_field_array = array();
-				foreach( $_POST['custom-field'] as $custom_field => $custom_value ) {
-					if( is_array( $custom_value ) ) {
-						$custom_field_array[$custom_field] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
+				foreach ( $_POST[ 'custom-field' ] as $custom_field => $custom_value ) {
+					if ( is_array( $custom_value ) ) {
+						$custom_field_array[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)
 					} else {
-						$custom_field_array[$custom_field] = stripslashes( $custom_value );
+						$custom_field_array[ $custom_field ] = stripslashes( $custom_value );
 					}
 				}
 				$custom_fields = json_encode( $custom_field_array );
@@ -2660,8 +2660,8 @@ 
 			}
 
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-'.$form_id ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 
 				global $wpdb;
@@ -2693,12 +2693,12 @@ 
 						'%s', // form description
 						'%s', // fields
 						'%s', // custom styles
-						'%d',	//custom template
-						'%d',	// send welcome email
-						'%s',	// redirect user
-						'%s',	// redirect page
-						'%s',	// submission
-						'%s',	// opt-in
+						'%d', //custom template
+						'%d', // send welcome email
+						'%s', // redirect user
+						'%s', // redirect page
+						'%s', // submission
+						'%s', // opt-in
 						'%s', // error
 						'%s', // custom notifications
 						'%s', // custom fields
@@ -2707,7 +2707,7 @@ 
 				);
 
 			/* Custom action hook which allows users to update specific options when a form is updated - used in add ons */
-			do_action( 'yikes-mailchimp-save-form', $form_id,  json_decode( $custom_fields, true ) );
+			do_action( 'yikes-mailchimp-save-form', $form_id, json_decode( $custom_fields, true ) );
 
 			// redirect the user to the manage forms page, display confirmation
 			wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $form_id . '&updated-form=true' ) ) );
@@ -2717,18 +2717,18 @@ 
 
 		/* Unsubscribe a given user from our list */
 		public function yikes_easy_mailchimp_unsubscribe_user() {
-			$nonce = $_REQUEST['nonce'];
-			$list_id = $_REQUEST['mailchimp-list'];
-			$email_id = $_REQUEST['email_id'];
+			$nonce = $_REQUEST[ 'nonce' ];
+			$list_id = $_REQUEST[ 'mailchimp-list' ];
+			$email_id = $_REQUEST[ 'email_id' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'unsubscribe-user-' . $email_id ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			// only re-run the API request if our API key has changed
 			// initialize MailChimp Class
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			$dash_position = strpos( $api_key, '-' );
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/unsubscribe.json';
 			}
 			$response = wp_remote_post( $api_endpoint, array(
@@ -2742,13 +2742,13 @@ 
 				'timeout' => 10,
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
-			if( ! is_wp_error( $response ) ) {
+			if ( ! is_wp_error( $response ) ) {
 				$response_body = json_decode( wp_remote_retrieve_body( $response ), true );
-				if( isset( $response_body['error'] ) ) {
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $response_body[ 'error' ] ) ) {
+					if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $response_body['error'], __( "Unsubscribe User" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Manage List Page" , 'yikes-inc-easy-mailchimp-extender' ) );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $response_body[ 'error' ], __( "Unsubscribe User", 'yikes-inc-easy-mailchimp-extender' ), __( "Manage List Page", 'yikes-inc-easy-mailchimp-extender' ) );
 					}
 				}
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $list_id . '&user-unsubscribed=true' ) ) );
@@ -2759,21 +2759,21 @@ 
 
 		public function yikes_easy_mailchimp_create_missing_error_log() {
 			// grab our nonnce
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// validate nonce
-			if( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'create_error_log' ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			// setup the path to the error log
-			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php' , 'w' );
+			$error_log = fopen( plugin_dir_path( __FILE__ ) . '../includes/error_log/yikes-easy-mailchimp-error-log.php', 'w' );
 			try {
 				// create the file
-				fwrite( $error_log , '' );
+				fwrite( $error_log, '' );
 				// close out
 				fclose( $error_log );
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=true' ) ) );
 			} catch ( Exception $e ) {
-				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message='.urlencode( $e->getMessage() ) ) ) );
+				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error_log_created=false&error_message=' . urlencode( $e->getMessage() ) ) ) );
 			}
 		}
 
@@ -2784,16 +2784,16 @@ 
 		public function yikes_easy_mailchimp_clear_transient_data() {
 			$referer = wp_get_referer();
 			// grab & store our variables ( associated list & form name )
-			$nonce = $_REQUEST['nonce'];
+			$nonce = $_REQUEST[ 'nonce' ];
 			// verify our nonce
-			if( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
-				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) , __( "Failed nonce validation" , 'yikes-inc-easy-mailchimp-extender' ) , array( 'response' => 500 , 'back_link' => true ) );
+			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {
+				wp_die( __( "We've run into an error. The security check didn't pass. Please try again.", 'yikes-inc-easy-mailchimp-extender' ), __( "Failed nonce validation", 'yikes-inc-easy-mailchimp-extender' ), array( 'response' => 500, 'back_link' => true ) );
 			}
 			// delete all of the integration settings list data in the cache
 			$list_ids = $this->get_mailchimp_list_ids_on_account();
 			// confirm the list IDs was returned and is not empty
-			if( isset( $list_ids ) && ! empty( $list_ids ) ) {
-				foreach( $list_ids as $id ) {
+			if ( isset( $list_ids ) && ! empty( $list_ids ) ) {
+				foreach ( $list_ids as $id ) {
 					// loop over each interest group and delete the transient associated with it
 					// this is created & stored on the integration list page
 					// id = groupID_interest_group
@@ -2825,13 +2825,13 @@ 
 		*	@return 	$list_id_array - array of list id's to loop over
 		*/
 		public function get_mailchimp_list_ids_on_account() {
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
-			if( ! $api_key ) {
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
+			if ( ! $api_key ) {
 				// if no api key is set/site is not connected, return an empty array
 				return array();
 			}
 			$dash_position = strpos( $api_key, '-' );
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 			}
 			$mailchimp_lists = wp_remote_post( $api_endpoint, array(
@@ -2842,19 +2842,19 @@ 
 				'timeout' => 10,
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
-			if( ! is_wp_error( $mailchimp_lists ) ) {
+			if ( ! is_wp_error( $mailchimp_lists ) ) {
 				$list_data = json_decode( wp_remote_retrieve_body( $mailchimp_lists ), true );
-				if( isset( $list_data['error'] ) ) {
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $list_data[ 'error' ] ) ) {
+					if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get List IDs" , 'yikes-inc-easy-mailchimp-extender' ) , __( "Clear API Cache" , 'yikes-inc-easy-mailchimp-extender' ) );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get List IDs", 'yikes-inc-easy-mailchimp-extender' ), __( "Clear API Cache", 'yikes-inc-easy-mailchimp-extender' ) );
 					}
 				}
 				$mail_chimp_list_ids = array();
-				if( $mailchimp_lists ) {
-					foreach( $list_data as $list ) {
-						$mail_chimp_list_ids[] = $list['id'];
+				if ( $mailchimp_lists ) {
+					foreach ( $list_data as $list ) {
+						$mail_chimp_list_ids[ ] = $list[ 'id' ];
 					}
 					return $mail_chimp_list_ids;
 				} else {
@@ -2870,7 +2870,7 @@ 
 		*/
 		public function yikes_mailchimp_load_helper_class() {
 			// check to see if it's already loaded up
-			if( !class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
+			if ( ! class_exists( 'Yikes_Inc_Easy_Mailchimp_Forms_Helper' ) ) {
 				// Include our main helper class file
 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/init.php' );
 			}
@@ -2947,7 +2947,7 @@ 
 		*	@since 6.0.4
 		*/
 		public function check_yikes_mc_table_version() {
-			if( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
+			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {
 				require_once YIKES_MC_PATH . 'includes/class-yikes-inc-easy-mailchimp-extender-activator.php';
 				global $wpdb;
 				Yikes_Inc_Easy_Mailchimp_Extender_Activator::_activate_yikes_easy_mailchimp( $wpdb );

includes/import-export/yikes-easy-mailchimp-export.class.php

Doc Comments +9 added lines

@@ -9,6 +9,11 @@ 
 	*	@form_ids 		array of form ID's to export ie: array( 1,4,5,6 ) (user can select specific forms)
 	*	@file_name 	the name of the exported file
 	*/	
+
+	/**
+	 * @param string $table_name
+	 * @param string $file_name
+	 */
 	public static function yikes_mailchimp_form_export( $table_name, $form_ids , $file_name ) {
 		global $wpdb;
 		$wpdb->show_errors(); 															
@@ -64,6 +69,10 @@ 
 	*	@parameters
 	*	@file_name 	the name of the exported file
 	*/	
+
+	/**
+	 * @param string $file_name
+	 */
 	public static function yikes_mailchimp_settings_export( $file_name ) {
 		
 		// get an array of all of our plugin settings (on the settings pages), to loop over

Indentation +3 added lines, -3 removed lines

@@ -48,9 +48,9 @@
 				 $first = false;
 			  }
 			  
-			   $leadArray = (array) $row; // Cast the Object to an array
-			   // Add row to file
-			   fputcsv( $output_handle, $leadArray );
+				$leadArray = (array) $row; // Cast the Object to an array
+				// Add row to file
+				fputcsv( $output_handle, $leadArray );
 			}
 			 
 			// Close output file stream

Spacing +27 added lines, -27 removed lines

@@ -9,22 +9,22 @@ 
 	*	@form_ids 		array of form ID's to export ie: array( 1,4,5,6 ) (user can select specific forms)
 	*	@file_name 	the name of the exported file
 	*/	
-	public static function yikes_mailchimp_form_export( $table_name, $form_ids , $file_name ) {
+	public static function yikes_mailchimp_form_export( $table_name, $form_ids, $file_name ) {
 		global $wpdb;
 		$wpdb->show_errors(); 															
-		if( is_array( $form_ids ) ) {
-			$results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . $table_name . ' where ID in (' . implode( ', ' , $form_ids ) . ')' );
+		if ( is_array( $form_ids ) ) {
+			$results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . $table_name . ' where ID in (' . implode( ', ', $form_ids ) . ')' );
 		} else {
 			$results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . $table_name );
 		}
 					
 		// Process report request
-		if (! $results) {
+		if ( ! $results ) {
 			$Error = $wpdb->print_error();
-			die("The following error was found: $Error");
+			die( "The following error was found: $Error" );
 		} else {
 			// Set header row values
-			$output_filename = $file_name . '-'. date( 'm-d-Y' )  . '.csv';
+			$output_filename = $file_name . '-' . date( 'm-d-Y' ) . '.csv';
 			$output_handle = @fopen( 'php://output', 'w' );
 			 
 			header( 'Cache-Control: must-revalidate, post-check=0, pre-check=0' );
@@ -36,15 +36,15 @@ 
 
 			$first = true;
 			// Parse results to csv format
-			foreach ($results as $row) {
+			foreach ( $results as $row ) {
 			 
 			  // Add table headers
-			  if($first){
+			  if ( $first ) {
 				 $titles = array();
-				 foreach($row as $key=>$val){
-					$titles[] = $key;
+				 foreach ( $row as $key=>$val ) {
+					$titles[ ] = $key;
 				 }
-				 fputcsv($output_handle, $titles);
+				 fputcsv( $output_handle, $titles );
 				 $first = false;
 			  }
 			  
@@ -68,25 +68,25 @@ 
 		
 		// get an array of all of our plugin settings (on the settings pages), to loop over
 		$plugin_settings = array();
-		$plugin_settings['yikes-mc-api-key'] = get_option( 'yikes-mc-api-key' , '' ); // api key
-		$plugin_settings['yikes-mc-api-validation'] = get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ); // api key validation
-		$plugin_settings['optin-checkbox-init'] = get_option( 'optin-checkbox-init', '' ); // checkbox settings
-		$plugin_settings['yikes-mc-recaptcha-status'] = get_option( 'yikes-mc-recaptcha-status' , '' ); // recaptcha status
-		$plugin_settings['yikes-mc-recaptcha-site-key'] = get_option( 'yikes-mc-recaptcha-site-key', '' ); // recaptcha site key
-		$plugin_settings['yikes-mc-recaptcha-secret-key'] = get_option( 'yikes-mc-recaptcha-secret-key', '' ); // recaptcha secret key
-		$plugin_settings['yikes-mailchimp-debug-status'] = get_option( 'yikes-mailchimp-debug-status' , '' ); // debug settings
+		$plugin_settings[ 'yikes-mc-api-key' ] = get_option( 'yikes-mc-api-key', '' ); // api key
+		$plugin_settings[ 'yikes-mc-api-validation' ] = get_option( 'yikes-mc-api-validation', 'invalid_api_key' ); // api key validation
+		$plugin_settings[ 'optin-checkbox-init' ] = get_option( 'optin-checkbox-init', '' ); // checkbox settings
+		$plugin_settings[ 'yikes-mc-recaptcha-status' ] = get_option( 'yikes-mc-recaptcha-status', '' ); // recaptcha status
+		$plugin_settings[ 'yikes-mc-recaptcha-site-key' ] = get_option( 'yikes-mc-recaptcha-site-key', '' ); // recaptcha site key
+		$plugin_settings[ 'yikes-mc-recaptcha-secret-key' ] = get_option( 'yikes-mc-recaptcha-secret-key', '' ); // recaptcha secret key
+		$plugin_settings[ 'yikes-mailchimp-debug-status' ] = get_option( 'yikes-mailchimp-debug-status', '' ); // debug settings
 		$titles = array();
 		$content = array();
-		foreach ($plugin_settings as $option_name => $option_value ) {
-			$titles[] = $option_name;
+		foreach ( $plugin_settings as $option_name => $option_value ) {
+			$titles[ ] = $option_name;
 		}
 		// Process report request
-		if (! $plugin_settings) {
+		if ( ! $plugin_settings ) {
 			$Error = $wpdb->print_error();
-			die("The following error was found: $Error");
+			die( "The following error was found: $Error" );
 		} else {
 			// Set header row values
-			$output_filename = $file_name . '-'. date( 'm-d-Y' )  . '.csv';
+			$output_filename = $file_name . '-' . date( 'm-d-Y' ) . '.csv';
 			$output_handle = @fopen( 'php://output', 'w' );
 			 
 			header( 'Cache-Control: must-revalidate, post-check=0, pre-check=0' );
@@ -98,14 +98,14 @@ 
 
 			$first = true;
 			// Parse results to csv format
-			foreach ($plugin_settings as $option_name => $option_value ) {
+			foreach ( $plugin_settings as $option_name => $option_value ) {
 			
 			// Add table headers
-			  if( $first ) {
-				 fputcsv($output_handle, $titles);
+			  if ( $first ) {
+				 fputcsv( $output_handle, $titles );
 				 $first = false;
 			  }
-			  $content[] = $option_value;		   
+			  $content[ ] = $option_value;		   
 
 			}
 			fputcsv( $output_handle, $content );

Braces +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
 			foreach ($results as $row) {
 			 
 			  // Add table headers
-			  if($first){
+			  if($first) {
 				 $titles = array();
-				 foreach($row as $key=>$val){
+				 foreach($row as $key=>$val) {
 					$titles[] = $key;
 				 }
 				 fputcsv($output_handle, $titles);

public/classes/checkbox-integrations.php

Doc Comments +12 added lines

@@ -23,6 +23,10 @@ 
 		*	@since 6.0.0
 		*	@$integration_type - pass in the type of checkbox integration
 		*/
+
+		/**
+		 * @param string $integration_type
+		 */
 		public function is_user_already_subscribed( $integration_type ) {
 			// first check if the user is logged in
 			if( is_user_logged_in() ) {
@@ -69,6 +73,10 @@ 
 		*	@$email - users email address entered into the form
 		*	@$integration_type - pass in the type of checkbox integration
 		*/
+
+		/**
+		 * @param string $integration_type
+		 */
 		public function is_new_registration_already_subscribed( $email , $integration_type ) {
 			// first check if the user is logged in
 			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
@@ -233,6 +241,10 @@ 
 		*	before continuing
 		*	@since 6.0.0
 		*/
+
+		/**
+		 * @param string $type
+		 */
 		public function was_checkbox_checked( $type ) {
 			// was sign-up checkbox checked - return the value
 			return ( isset( $_POST[ 'yikes_mailchimp_checkbox_'.$type ] ) && $_POST[ 'yikes_mailchimp_checkbox_'.$type ] == 1 );

Indentation +14 added lines, -14 removed lines

@@ -102,10 +102,10 @@ 
 		}
 			
 		/**
-		* 	Get the checkbox for the given integration and render it on the front end
-		* 	@return string
-		*	@since 6.0.0
-		*/
+		 * 	Get the checkbox for the given integration and render it on the front end
+		 * 	@return string
+		 *	@since 6.0.0
+		 */
 		public function yikes_get_checkbox() {
 			// enqueue our checkbox styles whenever the checkbox is displayed
 			wp_enqueue_style( 'yikes-easy-mailchimp-checkbox-integration-styles', plugin_dir_url( __FILE__ ) . '../css/yikes-inc-easy-mailchimp-checkbox-integration.min.css' );
@@ -135,7 +135,7 @@ 
 		 *	a new integration type is submitted
 		 *
 		 *	@since 6.0.0
-		**/
+		 **/
 		public function subscribe_user_integration( $email, $type, $merge_vars ) {			
 			// get checkbox data
 			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
@@ -198,9 +198,9 @@ 
 		}
 		
 		/**
-		* Build merge varaibles array
-		*	@since 6.0.0
-		*/	
+		 * Build merge varaibles array
+		 *	@since 6.0.0
+		 */	
 		public function user_merge_vars( WP_User $user ) {
 			// start with user_login as name, since that's always known
 			$merge_vars = array(
@@ -240,10 +240,10 @@ 
 		
 		
 		/**
-		*	Alter the registraton complete message	
-		*	if the registration form checkbox integration is toggled on
-		* 	@since 6.0.0
-		**/
+		 *	Alter the registraton complete message	
+		 *	if the registration form checkbox integration is toggled on
+		 * 	@since 6.0.0
+		 **/
 		public function yikes_reg_complete_msg( $errors, $redirect_to ) {
 			if( isset( $errors->errors['registered'] ) ) {
 				$email_error = get_option( 'yikes_register_subscription_error' , '' );
@@ -262,8 +262,8 @@ 
 					unset( $tmp );
 					delete_option( 'yikes_register_subscription_error' );
 				}
-		   }
-		   return $errors;
+			}
+			return $errors;
 		}
 		
 	}

Spacing +58 added lines, -58 removed lines

@@ -5,7 +5,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -25,35 +25,35 @@ 
 		*/
 		public function is_user_already_subscribed( $integration_type ) {
 			// first check if the user is logged in
-			if( is_user_logged_in() ) {
-				$checkbox_options = get_option( 'optin-checkbox-init' , '' );
+			if ( is_user_logged_in() ) {
+				$checkbox_options = get_option( 'optin-checkbox-init', '' );
 				$current_user = wp_get_current_user();
 				$email = $current_user->user_email;
 
-				$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+				$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 				$dash_position = strpos( $api_key, '-' );
-				if( $dash_position !== false ) {
+				if ( $dash_position !== false ) {
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/member-info.json';
 				}
 				$already_subscribed = wp_remote_post( $api_endpoint, array( 
 					'body' => array( 
 						'apikey' => $api_key, 
-						'id' => $checkbox_options[$integration_type]['associated-list'],
+						'id' => $checkbox_options[ $integration_type ][ 'associated-list' ],
 						'emails' => array( array( 'email' => sanitize_email( $email ) ) )
 					),
 					'timeout' => 10,
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$already_subscribed = json_decode( wp_remote_retrieve_body( $already_subscribed ), true );	
-				if( isset( $already_subscribed['error'] ) ) {	
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $already_subscribed[ 'error' ] ) ) {	
+					if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $already_subscribed['error'], __( "Get Member Info" , 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $already_subscribed[ 'error' ], __( "Get Member Info", 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
 					}
 				}
-				if( ! Isset( $already_subscribed['error'] ) ) {
-					return $already_subscribed['success_count'];
+				if ( ! Isset( $already_subscribed[ 'error' ] ) ) {
+					return $already_subscribed[ 'success_count' ];
 				}
 			} else {
 				// if the user isn't logged in
@@ -69,33 +69,33 @@ 
 		*	@$email - users email address entered into the form
 		*	@$integration_type - pass in the type of checkbox integration
 		*/
-		public function is_new_registration_already_subscribed( $email , $integration_type ) {
+		public function is_new_registration_already_subscribed( $email, $integration_type ) {
 			// first check if the user is logged in
-			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
+			$checkbox_options = get_option( 'optin-checkbox-init', '' );
 			try {
-				$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+				$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 				$dash_position = strpos( $api_key, '-' );
-				if( $dash_position !== false ) {
+				if ( $dash_position !== false ) {
 					$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/member-info.json';
 				}
 				$already_subscribed = wp_remote_post( $api_endpoint, array( 
 					'body' => array( 
 						'apikey' => $api_key, 
-						'id' => $checkbox_options[$integration_type]['associated-list'],
+						'id' => $checkbox_options[ $integration_type ][ 'associated-list' ],
 						'emails' => array( array( 'email' => sanitize_email( $email ) ) )
 					),
 					'timeout' => 10,
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$already_subscribed = json_decode( wp_remote_retrieve_body( $already_subscribed ), true );
-				if( isset( $already_subscribed['error'] ) ) {	
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $already_subscribed[ 'error' ] ) ) {	
+					if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $already_subscribed['error'], __( "Get Member Info" , 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $already_subscribed[ 'error' ], __( "Get Member Info", 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
 					}
 				}				
-				return $already_subscribed['success_count'];
+				return $already_subscribed[ 'success_count' ];
 			} catch ( Exception $error ) {
 				return $error->getMessage();
 			}
@@ -110,17 +110,17 @@ 
 			// enqueue our checkbox styles whenever the checkbox is displayed
 			wp_enqueue_style( 'yikes-easy-mailchimp-checkbox-integration-styles', plugin_dir_url( __FILE__ ) . '../css/yikes-inc-easy-mailchimp-checkbox-integration.min.css' );
 			// store our options
-			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
-			if( isset( $checkbox_options[$this->type]['associated-list'] ) && $checkbox_options[$this->type]['associated-list'] != '-' ) {
-				$checked = ( $checkbox_options[$this->type]['precheck'] == 'true' ) ? 'checked' : '';
+			$checkbox_options = get_option( 'optin-checkbox-init', '' );
+			if ( isset( $checkbox_options[ $this->type ][ 'associated-list' ] ) && $checkbox_options[ $this->type ][ 'associated-list' ] != '-' ) {
+				$checked = ( $checkbox_options[ $this->type ][ 'precheck' ] == 'true' ) ? 'checked' : '';
 				// before checkbox HTML (comment, ...)
 				$before = '<!-- Easy Forms for MailChimp by YIKES, Inc. - https://www.yikesinc.com/ -->';
 				$before .= apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );
 				// checkbox
 				$content = '<p id="yikes-easy-mailchimp-' . $this->type . '-checkbox" class="yikes-easy-mailchimp-' . $this->type . '-checkbox">';
 					$content .= '<label>';
-						$content .= '<input type="checkbox" name="yikes_mailchimp_checkbox_' . $this->type . '" value="1" '. $checked . ' /> ';
-						$content .= ( isset( $checkbox_options[$this->type]['label'] ) && trim( $checkbox_options[$this->type]['label'] ) != '' ) ? trim( $checkbox_options[$this->type]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
+						$content .= '<input type="checkbox" name="yikes_mailchimp_checkbox_' . $this->type . '" value="1" ' . $checked . ' /> ';
+						$content .= ( isset( $checkbox_options[ $this->type ][ 'label' ] ) && trim( $checkbox_options[ $this->type ][ 'label' ] ) != '' ) ? trim( $checkbox_options[ $this->type ][ 'label' ] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
 					$content .= '</label>';
 				$content .= '</p>';
 				// after checkbox HTML (..., honeypot, closing comment)
@@ -138,43 +138,43 @@ 
 		**/
 		public function subscribe_user_integration( $email, $type, $merge_vars ) {			
 			// get checkbox data
-			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
-			if( $type != 'registration_form' ) {
+			$checkbox_options = get_option( 'optin-checkbox-init', '' );
+			if ( $type != 'registration_form' ) {
 				$update = '1';
 			} else {
 				$update = '0';
 			}
 			// set ip address
-			if( ! isset( $merge_vars['OPTIN_IP'] ) && isset( $_SERVER['REMOTE_ADDR'] ) ) {
-				$merge_vars['OPTIN_IP'] = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
+			if ( ! isset( $merge_vars[ 'OPTIN_IP' ] ) && isset( $_SERVER[ 'REMOTE_ADDR' ] ) ) {
+				$merge_vars[ 'OPTIN_IP' ] = sanitize_text_field( $_SERVER[ 'REMOTE_ADDR' ] );
 			}
 			// set the optin time
-			$merge_vars['OPTIN_TIME'] = current_time( 'Y-m-d H:i:s', 1 );
+			$merge_vars[ 'OPTIN_TIME' ] = current_time( 'Y-m-d H:i:s', 1 );
 			// check for interest groups
-			$interest_groups = ( isset( $checkbox_options[$type]['interest-groups'] ) ) ? $checkbox_options[$type]['interest-groups'] : false;
+			$interest_groups = ( isset( $checkbox_options[ $type ][ 'interest-groups' ] ) ) ? $checkbox_options[ $type ][ 'interest-groups' ] : false;
 			// if interest groups were found, push them to the merge variable array
-			if( $interest_groups ) {
-				$merge_vars['groupings'] = array();
-				foreach( $interest_groups as $interest_group_id => $interest_group_selections ) {
+			if ( $interest_groups ) {
+				$merge_vars[ 'groupings' ] = array();
+				foreach ( $interest_groups as $interest_group_id => $interest_group_selections ) {
 					// merge variable interest groups array
-					$merge_vars['groupings'][] = array(
+					$merge_vars[ 'groupings' ][ ] = array(
 						'id' => $interest_group_id,
 						'groups' => $interest_group_selections,
 					); 	
 				}
 				// replace the interest groups - to avoid any errors thrown if the admin switches lists, or interest groups
-				$merge_vars['replace_interests'] = 1;
+				$merge_vars[ 'replace_interests' ] = 1;
 			}
 			// initialize MailChimp API
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			$dash_position = strpos( $api_key, '-' );
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/subscribe.json';
 			}
 			$subscribe_response = wp_remote_post( $api_endpoint, array( 
 				'body' => apply_filters( 'yikes-mailchimp-checkbox-integration-subscribe-api-request', array( 
-					'apikey' => get_option( 'yikes-mc-api-key' , '' ),
-					'id' => $checkbox_options[$type]['associated-list'],
+					'apikey' => get_option( 'yikes-mc-api-key', '' ),
+					'id' => $checkbox_options[ $type ][ 'associated-list' ],
 					'email' => array( 'email' => sanitize_email( $email ) ),
 					'merge_vars' => apply_filters( 'yikes-mailchimp-checkbox-integration-merge-variables', $merge_vars, $type ), // filter merge variables
 					'double_optin' => 1,
@@ -184,13 +184,13 @@ 
 				'timeout' => 10,
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
-			if( ! Is_wp_error( $subscribe_response ) ) {
+			if ( ! Is_wp_error( $subscribe_response ) ) {
 				$response_body = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
-				if( WP_DEBUG || isset( $response_body['error'] ) ) {	
-					if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( WP_DEBUG || isset( $response_body[ 'error' ] ) ) {	
+					if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-						$error_logging->yikes_easy_mailchimp_write_to_error_log( $response_body['error'], __( "Checkbox Integration Subscribe User" , 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $response_body[ 'error' ], __( "Checkbox Integration Subscribe User", 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations" );
 					}
 				}		
 			}
@@ -206,15 +206,15 @@ 
 			$merge_vars = array(
 				'NAME' => $user->user_login,
 			);
-			if( '' !== $user->first_name ) {
-				$merge_vars['NAME'] = $user->first_name;
-				$merge_vars['FNAME'] = $user->first_name;
+			if ( '' !== $user->first_name ) {
+				$merge_vars[ 'NAME' ] = $user->first_name;
+				$merge_vars[ 'FNAME' ] = $user->first_name;
 			}
-			if( '' !== $user->last_name ) {
-				$merge_vars['LNAME'] = $user->last_name;
+			if ( '' !== $user->last_name ) {
+				$merge_vars[ 'LNAME' ] = $user->last_name;
 			}
-			if( '' !== $user->first_name && '' !== $user->last_name ) {
-				$merge_vars['NAME'] = sprintf( '%s %s', $user->first_name, $user->last_name );
+			if ( '' !== $user->first_name && '' !== $user->last_name ) {
+				$merge_vars[ 'NAME' ] = sprintf( '%s %s', $user->first_name, $user->last_name );
 			}
 			/**
 			 * @filter `yikes-mailchimp-user-merge-vars`
@@ -235,7 +235,7 @@ 
 		*/
 		public function was_checkbox_checked( $type ) {
 			// was sign-up checkbox checked - return the value
-			return ( isset( $_POST[ 'yikes_mailchimp_checkbox_'.$type ] ) && $_POST[ 'yikes_mailchimp_checkbox_'.$type ] == 1 );
+			return ( isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && $_POST[ 'yikes_mailchimp_checkbox_' . $type ] == 1 );
 		}
 		
 		
@@ -245,15 +245,15 @@ 
 		* 	@since 6.0.0
 		**/
 		public function yikes_reg_complete_msg( $errors, $redirect_to ) {
-			if( isset( $errors->errors['registered'] ) ) {
-				$email_error = get_option( 'yikes_register_subscription_error' , '' );
-				if( isset( $email_error ) && $email_error != '' ) {	
+			if ( isset( $errors->errors[ 'registered' ] ) ) {
+				$email_error = get_option( 'yikes_register_subscription_error', '' );
+				if ( isset( $email_error ) && $email_error != '' ) {	
 					// Use the magic __get method to retrieve the errors array:
 					$tmp = $errors->errors; 
 					$old = 'Registration complete. Please check your e-mail.';
-					foreach( $tmp['registered'] as $index => $msg ) {
-						if( $msg === $old ) {
-							$tmp['registered'][$index] = $old . ' <p class="message"><strong>' . __( 'Note' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong>: ' . $email_error . '</p>';        
+					foreach ( $tmp[ 'registered' ] as $index => $msg ) {
+						if ( $msg === $old ) {
+							$tmp[ 'registered' ][ $index ] = $old . ' <p class="message"><strong>' . __( 'Note', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>: ' . $email_error . '</p>';        
 						}
 					}
 					// Use the magic __set method to override the errors property:

Braces +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
 		protected $type = 'integration';
 		private $text_domain = 'yikes-inc-easy-mailchimp-extender';
 		
-		public function __construct() {	
+		public function __construct() {
 			
 		}
 			
@@ -45,7 +45,7 @@ 
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$already_subscribed = json_decode( wp_remote_retrieve_body( $already_subscribed ), true );	
-				if( isset( $already_subscribed['error'] ) ) {	
+				if( isset( $already_subscribed['error'] ) ) {
 					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
@@ -88,7 +88,7 @@ 
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$already_subscribed = json_decode( wp_remote_retrieve_body( $already_subscribed ), true );
-				if( isset( $already_subscribed['error'] ) ) {	
+				if( isset( $already_subscribed['error'] ) ) {
 					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
@@ -136,7 +136,7 @@ 
 		 *
 		 *	@since 6.0.0
 		**/
-		public function subscribe_user_integration( $email, $type, $merge_vars ) {			
+		public function subscribe_user_integration( $email, $type, $merge_vars ) {
 			// get checkbox data
 			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
 			if( $type != 'registration_form' ) {
@@ -186,7 +186,7 @@ 
 			) );
 			if( ! Is_wp_error( $subscribe_response ) ) {
 				$response_body = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
-				if( WP_DEBUG || isset( $response_body['error'] ) ) {	
+				if( WP_DEBUG || isset( $response_body['error'] ) ) {
 					if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
 						require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 						$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
@@ -247,7 +247,7 @@ 
 		public function yikes_reg_complete_msg( $errors, $redirect_to ) {
 			if( isset( $errors->errors['registered'] ) ) {
 				$email_error = get_option( 'yikes_register_subscription_error' , '' );
-				if( isset( $email_error ) && $email_error != '' ) {	
+				if( isset( $email_error ) && $email_error != '' ) {
 					// Use the magic __get method to retrieve the errors array:
 					$tmp = $errors->errors; 
 					$old = 'Registration complete. Please check your e-mail.';

public/classes/checkbox-integrations/class.bbpress_forms-checkbox.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 		 * @param array $anonymous_data
 		 * @param int $user_id
 		 * @param string $trigger
-		 * @return boolean
+		 * @return boolean|null
 		 */
 		public function subscribe_from_bbpress( $anonymous_data, $user_id, $trigger ) {
 			$user_data = get_userdata( $user_id );

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_bbPress_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -31,7 +31,7 @@ 
 		*/
 		public function output_checkbox() {
 			// if the user is already subscribed, abort and don't render the checkbox
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;
 			}
 			echo $this->yikes_get_checkbox();
@@ -45,7 +45,7 @@ 
 		 */
 		public function subscribe_from_bbpress( $anonymous_data, $user_id, $trigger ) {
 			$user_data = get_userdata( $user_id );
-			return $this->subscribe_user_integration( $user_data->user_email, $this->type , array(
+			return $this->subscribe_user_integration( $user_data->user_email, $this->type, array(
 				'FNAME' => $user_data->first_name,
 				'LNAME' => $user_data->last_name,
 				'NAE' => $user_data->first_name,

Indentation +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
 		
 		
 		/**
-		* Outputs a checkbox
-		*/
+		 * Outputs a checkbox
+		 */
 		public function output_checkbox() {
 			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;

public/classes/checkbox-integrations/class.buddypress_form-checkbox.php

Doc Comments -1 removed lines

@@ -40,7 +40,6 @@
 		 * @param string $user_login
 		 * @param string $user_password
 		 * @param string $user_email
-		 * @param array $usermeta
 		 */
 		public function subscribe_from_buddypress_form( $user_id, $user_login, $user_password, $user_email ) {
 			if ( $this->was_checkbox_checked( $this->type ) === false ) {

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 		}
 		
 		/**
-		* Outputs a checkbox, if user is not already subscribed
-		*/
+		 * Outputs a checkbox, if user is not already subscribed
+		 */
 		public function output_checkbox() {
 			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_BuddyPress_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 		
@@ -21,7 +21,7 @@ 
 		* Outputs a checkbox, if user is not already subscribed
 		*/
 		public function output_checkbox() {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;
 			}
 			?>

public/classes/checkbox-integrations/class.easy_digital_downloads_checkout_form-checkbox.php

Doc Comments +1 added lines, -2 removed lines

@@ -41,7 +41,6 @@ 
 		
 		
 		/**
-		 * @param array $meta
 		 *
 		 * @return array
 		 */
@@ -57,7 +56,7 @@ 
 		/**
 		 * @param int $payment_id The ID of the payment
 		 *
-		 * @return bool|string
+		 * @return false|null
 		 */
 		public function subscribe_from_edd_purchase( $payment_id ) {
 			$meta = get_post_meta( $payment_id , '_yikes_easy_mc_optin' , true );

Indentation +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
 		
 		
 		/**
-		* Outputs a checkbox
-		*/
+		 * Outputs a checkbox
+		 */
 		public function output_checkbox() {
 			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;

Spacing +16 added lines, -16 removed lines

@@ -7,7 +7,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 
 	class Yikes_Easy_MC_EDD_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -21,8 +21,8 @@ 
 		 */
 		public function __construct() {
 			add_action( 'edd_purchase_form_user_info_fields', array( $this, 'output_checkbox' ) );
-			add_action( 'edd_insert_payment', array( $this, 'update_payment_post_meta' ) , 99999 );
-			add_action( 'edd_complete_purchase', array( $this, 'subscribe_from_edd_purchase'), 50 );
+			add_action( 'edd_insert_payment', array( $this, 'update_payment_post_meta' ), 99999 );
+			add_action( 'edd_complete_purchase', array( $this, 'subscribe_from_edd_purchase' ), 50 );
 		}
 		
 		
@@ -30,13 +30,13 @@ 
 		* Outputs a checkbox
 		*/
 		public function output_checkbox() {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;
 			}
 			// render our field if the user isn't current subscribed
-			echo do_action( 'yikes-mailchimp-before-checkbox' , $this->type );
+			echo do_action( 'yikes-mailchimp-before-checkbox', $this->type );
 				echo $this->yikes_get_checkbox();
-			echo do_action( 'yikes-mailchimp-after-checkbox' , $this->type );
+			echo do_action( 'yikes-mailchimp-after-checkbox', $this->type );
 		}	
 		
 		
@@ -47,7 +47,7 @@ 
 		 */
 		public function update_payment_post_meta( $payment_id = 0, $payment_data = array() ) {
 			// don't save anything if the checkbox was not checked
-			if( ! $this->was_checkbox_checked( $this->type ) ) {
+			if ( ! $this->was_checkbox_checked( $this->type ) ) {
 				update_post_meta( $payment_id, '_yikes_easy_mc_optin', '0' );
 				return;
 			}
@@ -60,25 +60,25 @@ 
 		 * @return bool|string
 		 */
 		public function subscribe_from_edd_purchase( $payment_id ) {
-			$meta = get_post_meta( $payment_id , '_yikes_easy_mc_optin' , true );
-			if( $meta == '0' ) {
+			$meta = get_post_meta( $payment_id, '_yikes_easy_mc_optin', true );
+			if ( $meta == '0' ) {
 				return false;
 			}
 			$email = (string) edd_get_payment_user_email( $payment_id );
 			$merge_vars = array();
 			// add first and last name to merge vars, if given
 			$user_info = (array) edd_get_payment_meta_user_info( $payment_id );
-			if( isset( $user_info['first_name'] ) && isset( $user_info['last_name'] ) ) {
-				$merge_vars['NAME'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+			if ( isset( $user_info[ 'first_name' ] ) && isset( $user_info[ 'last_name' ] ) ) {
+				$merge_vars[ 'NAME' ] = $user_info[ 'first_name' ] . ' ' . $user_info[ 'last_name' ];
 			}
-			if( isset( $user_info['first_name'] ) ) {
-				$merge_vars['FNAME'] = $user_info['first_name'];
+			if ( isset( $user_info[ 'first_name' ] ) ) {
+				$merge_vars[ 'FNAME' ] = $user_info[ 'first_name' ];
 			}
-			if( isset( $user_info['last_name'] ) ) {
-				$merge_vars['LNAME'] = $user_info['last_name'];
+			if ( isset( $user_info[ 'last_name' ] ) ) {
+				$merge_vars[ 'LNAME' ] = $user_info[ 'last_name' ];
 			}
 			// subscribe the user
-			$this->subscribe_user_integration( sanitize_email( $email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $email ), $this->type, $merge_vars );
 		}
 	
 	}

public/classes/checkbox-integrations/class.registration_form-checkbox.php

Doc Comments +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 	 *
 	 * @param int $user_id
 	 *
-	 * @return bool|string
+	 * @return false|null
 	*/
 	public function subscribe_from_registration( $user_id ) {
 		// was sign-up checkbox checked?

Indentation +3 added lines, -3 removed lines

@@ -24,8 +24,8 @@ 
 	}
 	
 	/**
-	* Outputs a checkbox
-	*/
+	 * Outputs a checkbox
+	 */
 	public function output_checkbox() {
 		echo $this->yikes_get_checkbox();
 	}
@@ -36,7 +36,7 @@ 
 	 * @param int $user_id
 	 *
 	 * @return bool|string
-	*/
+	 */
 	public function subscribe_from_registration( $user_id ) {
 		// was sign-up checkbox checked?
 		if ( $this->was_checkbox_checked( $this->type ) === false ) {

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 */
 
 // Prevent direct access to the file
-defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 class Yikes_Easy_MC_Registration_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 
@@ -20,7 +20,7 @@ 
 		add_action( 'register_form', array( $this, 'output_checkbox' ), 20 );
 		add_action( 'user_register', array( $this, 'subscribe_from_registration' ), 90, 1 );
 		// alter the error message, if there was an error with the users email address
-		add_filter( 'wp_login_errors', array( $this , 'yikes_reg_complete_msg' ), 10,  2 );
+		add_filter( 'wp_login_errors', array( $this, 'yikes_reg_complete_msg' ), 10, 2 );
 	}
 	
 	/**
@@ -51,12 +51,12 @@ 
 		// build our merge vars
 		$merge_variables = $this->user_merge_vars( $user );
 		// only subscribe the user if they aren't already on the list
-		if( $this->is_new_registration_already_subscribed( $user->user_email , 'registration_form' ) != '1' ) {
-			$this->subscribe_user_integration( sanitize_email( $user->user_email ) , $this->type , $merge_variables );
+		if ( $this->is_new_registration_already_subscribed( $user->user_email, 'registration_form' ) != '1' ) {
+			$this->subscribe_user_integration( sanitize_email( $user->user_email ), $this->type, $merge_variables );
 		} else {
 			// add a temporary option to pass our email address and let the user know they are already subscribed
-			$user_already_subscirbed_message = sprintf( __( "You have not been subscribed to our mailing list. %s is already subscribed to this list.", "yikes-inc-easy-mailchimp-extender" ), $user->user_email  );
-			add_option( 'yikes_register_subscription_error' , $user_already_subscirbed_message );
+			$user_already_subscirbed_message = sprintf( __( "You have not been subscribed to our mailing list. %s is already subscribed to this list.", "yikes-inc-easy-mailchimp-extender" ), $user->user_email );
+			add_option( 'yikes_register_subscription_error', $user_already_subscirbed_message );
 		}
 	}
 	

yikes-inc-easy-mailchimp-extender.php

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
  *	@return void
  */
 if ( ! defined( 'YIKES_MC_PATH' ) ) {
-	define( 'YIKES_MC_PATH' , plugin_dir_path( __FILE__ ) );
+	define( 'YIKES_MC_PATH', plugin_dir_path( __FILE__ ) );
 }
 
 /**
@@ -53,7 +53,7 @@ 
  *	@return void
  */
 if ( ! defined( 'YIKES_MC_URL' ) ) {
-	define( 'YIKES_MC_URL' , plugin_dir_url( __FILE__ ) );
+	define( 'YIKES_MC_URL', plugin_dir_url( __FILE__ ) );
 }
 
 /**

admin/partials/dashboard-widgets/class.list-activity-widget.php

Indentation +4 added lines, -4 removed lines

@@ -54,8 +54,8 @@ 
 		}
 					
 		/**
-		* Create the function to output our list stats dashboard widget
-		*/
+		 * Create the function to output our list stats dashboard widget
+		 */
 		function list_stats_dashboard_widget() {
 				// Get our list data!
 				// Check for a transient, if not - set one up for one hour
@@ -115,8 +115,8 @@ 
 		} 
 		
 		/**
-		* Create the function to output our account activity dashboard widget
-		*/
+		 * Create the function to output our account activity dashboard widget
+		 */
 		function account_activity_dashboard_widget() {
 				// Get our list data!
 				// Check for a transient, if not - set one up for one hour

Spacing +31 added lines, -31 removed lines

@@ -7,23 +7,23 @@ 
 
 		// Construction
 		public function __construct() {
-			if( get_option( 'yikes-mc-api-key' , '' ) != '' && get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) == 'valid_api_key' ) {
+			if ( get_option( 'yikes-mc-api-key', '' ) != '' && get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'valid_api_key' ) {
 				// hook in and display our list stats dashboard widget
-				add_action( 'wp_dashboard_setup', array( $this , 'yks_mc_add_chimp_chatter_dashboard_widget' ) , 10 );
+				add_action( 'wp_dashboard_setup', array( $this, 'yks_mc_add_chimp_chatter_dashboard_widget' ), 10 );
 			}
-			add_action( 'admin_enqueue_scripts' , array( $this, 'enqueue_dashboard_widget_script' ) );
+			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_dashboard_widget_script' ) );
 		}
 
 		// enqueue our JS file on the main dashboard page
 		function enqueue_dashboard_widget_script( $hook ) {
-			if( 'index.php' == $hook ) { // default 'dashboard' page
-				wp_register_script( 'yikes-easy-mc-dashboard-widget-script' , YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-dashboard-widget.min.js' , array( 'jquery' ) , 'all' , false );
+			if ( 'index.php' == $hook ) { // default 'dashboard' page
+				wp_register_script( 'yikes-easy-mc-dashboard-widget-script', YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-dashboard-widget.min.js', array( 'jquery' ), 'all', false );
 				$data_array = array(
 					'ajax_url' => esc_url_raw( admin_url( 'admin-ajax.php' ) ),
-					'preloader' => '<img src="' . esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) . '" title="' . __( 'Preloader' , 'yikes-inc-easy-mailchimp-extender' ) . '" alt="' . __( 'Preloader' , 'yikes-inc-easy-mailchimp-extender' ) . '" class="yikes-easy-mc-widget-preloader">'
+					'preloader' => '<img src="' . esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) . '" title="' . __( 'Preloader', 'yikes-inc-easy-mailchimp-extender' ) . '" alt="' . __( 'Preloader', 'yikes-inc-easy-mailchimp-extender' ) . '" class="yikes-easy-mc-widget-preloader">'
 				);
 				// localize our data, to pass along to JS file
-				wp_localize_script( 'yikes-easy-mc-dashboard-widget-script' , 'object' , $data_array );
+				wp_localize_script( 'yikes-easy-mc-dashboard-widget-script', 'object', $data_array );
 				wp_enqueue_script( 'yikes-easy-mc-dashboard-widget-script' );
 			}
 		}
@@ -41,15 +41,15 @@ 
 			if ( apply_filters( 'yikes-mailchimp-user-role-access', current_user_can( 'manage_options' ) ) ) {
 				/* List Stats Dashboard Widget */
 				wp_add_dashboard_widget(
-					 'yikes_easy_mc_list_stats_widget',         // Widget slug.
-					 __( 'MailChimp List Stats', 'yikes-inc-easy-mailchimp-extender' ),         // Title.
-					array( $this , 'list_stats_dashboard_widget' ) // Display function.
+					 'yikes_easy_mc_list_stats_widget', // Widget slug.
+					 __( 'MailChimp List Stats', 'yikes-inc-easy-mailchimp-extender' ), // Title.
+					array( $this, 'list_stats_dashboard_widget' ) // Display function.
 				);
 				/* Chimp Chatter Dashboard Widget */
 				wp_add_dashboard_widget(
-					 'yikes_easy_mc_account_activity_widget',         // Widget slug.
-					 __( 'MailChimp Account Activity', 'yikes-inc-easy-mailchimp-extender' ),         // Title.
-					array( $this , 'account_activity_dashboard_widget' ) // Display function.
+					 'yikes_easy_mc_account_activity_widget', // Widget slug.
+					 __( 'MailChimp Account Activity', 'yikes-inc-easy-mailchimp-extender' ), // Title.
+					array( $this, 'account_activity_dashboard_widget' ) // Display function.
 				);
 			}
 		}
@@ -61,9 +61,9 @@ 
 				// Get our list data!
 				// Check for a transient, if not - set one up for one hour
 				if ( false === ( $list_data = get_transient( 'yikes-easy-mailchimp-list-data' ) ) ) {
-					$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+					$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 					$dash_position = strpos( $api_key, '-' );
-					if( $dash_position !== false ) {
+					if ( $dash_position !== false ) {
 						$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 					}
 					$list_data = wp_remote_post( $api_endpoint, array(
@@ -75,11 +75,11 @@ 
 						'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 					) );
 					$list_data = json_decode( wp_remote_retrieve_body( $list_data ), true );
-					if( isset( $list_data['error'] ) ) {
-						if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+					if ( isset( $list_data[ 'error' ] ) ) {
+						if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 							require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 							$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-							$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data['error'], __( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
+							$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_data[ 'error' ], __( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
 						}
 					} else {
 						// set our transient
@@ -88,29 +88,29 @@ 
 				}
 			?>
 				<!-- Dropdown to Change the list -->
-				<?php if( ! empty( $list_data['data'] ) ) {
+				<?php if ( ! empty( $list_data[ 'data' ] ) ) {
 					?><section class="inside-widget yikes-dashboard-widget-section">
-							<strong class="select-list-title"><?php _e( 'Select a list' , 'yikes-inc-easy-mailchimp-extender' ) ?>:</strong>
+							<strong class="select-list-title"><?php _e( 'Select a list', 'yikes-inc-easy-mailchimp-extender' ) ?>:</strong>
 							<select id="yikes-easy-mc-dashboard-change-list" class="widefat">
 								<?php
-									foreach( $list_data['data'] as $list ) {
-										?><option val="<?php echo $list['id']; ?>"><?php echo $list['name']; ?></option><?php
+									foreach ( $list_data[ 'data' ] as $list ) {
+										?><option val="<?php echo $list[ 'id' ]; ?>"><?php echo $list[ 'name' ]; ?></option><?php
 									}
 								?>
 							</select>
-							<p class="description"><?php _e( 'Select a list from the dropdown above. View statistics related to this list below.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+							<p class="description"><?php _e( 'Select a list from the dropdown above. View statistics related to this list below.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</section>
 					<!-- display stats here! -->
 					<section id="yikes-easy-mc-dashboard-widget-stats">
 						<?php
-							if( !empty( $list_data['data'] ) ) {
+							if ( ! empty( $list_data[ 'data' ] ) ) {
 								include_once( YIKES_MC_PATH . 'admin/partials/dashboard-widgets/templates/stats-list-template.php' );
 							}
 						?>
 					</section>
 				<?php } else { ?>
 					<section id="yikes-easy-mc-dashboard-widget-stats">
-						<p class="no-lists-error"><?php _e( "Whoops, you don't have any lists set up. Head over to MailChimp to set up lists." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+						<p class="no-lists-error"><?php _e( "Whoops, you don't have any lists set up. Head over to MailChimp to set up lists.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 					</section>
 				<?php }
 		}
@@ -122,9 +122,9 @@ 
 				// Get our list data!
 				// Check for a transient, if not - set one up for one hour
 				if ( false === ( $account_activity = get_transient( 'yikes-easy-mailchimp-account-activity' ) ) ) {
-					$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+					$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 					$dash_position = strpos( $api_key, '-' );
-					if( $dash_position !== false ) {
+					if ( $dash_position !== false ) {
 						$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/chimp-chatter.json';
 					}
 					$account_activity = wp_remote_post( $api_endpoint, array(
@@ -135,18 +135,18 @@ 
 						'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 					) );
 					$account_activity = json_decode( wp_remote_retrieve_body( $account_activity ), true );
-					if( isset( $account_activity['error'] ) ) {
-						if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+					if ( isset( $account_activity[ 'error' ] ) ) {
+						if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 							require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 							$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-							$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_activity['error'], __( "Get Account Activity" , 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
+							$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_activity[ 'error' ], __( "Get Account Activity", 'yikes-inc-easy-mailchimp-extender' ), "Dashboard Activity Widget" );
 						}
 					} else {
 						// set our transient for one hour
 						set_transient( 'yikes-easy-mailchimp-account-activity', $account_activity, 1 * HOUR_IN_SECONDS );
 					}
 				}
-				if( ! empty( $account_activity ) ) {
+				if ( ! empty( $account_activity ) ) {
 					include_once( YIKES_MC_PATH . 'admin/partials/dashboard-widgets/templates/account-activity-template.php' );
 				}
 		}

Braces +3 added lines, -3 removed lines

@@ -2,8 +2,7 @@ 
 	/*
 	* Our ajax is processed inside of class.ajax.php
 	*/
-	class YIKES_Inc_Easy_MailChimp_Dashboard_Widgets
-	{
+	class YIKES_Inc_Easy_MailChimp_Dashboard_Widgets {
 
 		// Construction
 		public function __construct() {
@@ -16,7 +15,8 @@ 
 
 		// enqueue our JS file on the main dashboard page
 		function enqueue_dashboard_widget_script( $hook ) {
-			if( 'index.php' == $hook ) { // default 'dashboard' page
+			if( 'index.php' == $hook ) {
+// default 'dashboard' page
 				wp_register_script( 'yikes-easy-mc-dashboard-widget-script' , YIKES_MC_URL . 'admin/js/min/yikes-inc-easy-mailchimp-dashboard-widget.min.js' , array( 'jquery' ) , 'all' , false );
 				$data_array = array(
 					'ajax_url' => esc_url_raw( admin_url( 'admin-ajax.php' ) ),