yikesinc / yikes-inc-easy-mailchimp-extender

public/partials/shortcodes/process_form_shortcode.php

Braces +6 added lines, -4 removed lines

@@ -474,7 +474,9 @@ 
 						$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
 						$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
 						$label_class_array[] = ( $tag === 'merge' ) ? $field['merge'] . '-label' : $field['group_id'] . '-label';
-						if ( isset( $field['require'] ) ) $label_class_array[] = 'yikes-mailchimp-field-required';
+						if ( isset( $field['require'] ) ) {
+							$label_class_array[] = 'yikes-mailchimp-field-required';
+						}
 					}
 
 					// if both hide label and hide field are checked, we gotta hide the field!
@@ -761,7 +763,7 @@ 
 														} else {
 															$zip_value = $_POST[$field['merge']]; 
 														}
-													} else { 
+													} else {
 
 														/**
 														* A filter to set the default zip code value.
@@ -1125,7 +1127,7 @@ 
 												echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : '';
 
 												$i = 0;
-												foreach( $groups as $group_id => $name ) { 
+												foreach( $groups as $group_id => $name ) {
 
 													// If the form was submitted and failed, set the submitted/chosen values as the default
 													if( isset( $_POST[ 'group-' . $field['group_id'] ] ) && $form_submitted === 0 ) {
@@ -1174,7 +1176,7 @@ 
 										// Turn $default_choice into an array if it isn't already
 										$default_choice = ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice : array( $default_choice );
 
-										foreach( $groups as $group_id => $name ) { 
+										foreach( $groups as $group_id => $name ) {
 											?>
 											<label for="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if ( $x === $count ) { echo ' last-selection'; } ?>" style="display:none;">
 												<input 

includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php

Braces +22 added lines, -21 removed lines

@@ -25,7 +25,7 @@ 
  * @subpackage Yikes_Inc_Easy_Mailchimp_Extender/includes

  * @author     YIKES Inc. <plugins@yikesinc.com>

  */

-class Yikes_Inc_Easy_Mailchimp_Error_Logging {

+class Yikes_Inc_Easy_Mailchimp_Error_Logging {
 

 	/**

 	 * Whether we're doing debugging.

@@ -57,7 +57,7 @@ 
 	 *

 	 * @since    1.0.0

 	 */

-	public function __construct() {

+	public function __construct() {
 		$this->is_debugging          = WP_DEBUG || (string) get_option( 'yikes-mailchimp-debug-status', '' ) === '1';

 		$this->error_log_file_path   = $this->get_error_log_file_path();

 		$this->error_log_folder_path = $this->get_error_log_folder();

@@ -78,35 +78,35 @@ 
 	 * @param string $error_type     The error type.

 	 * @param string $page           The page information.

 	 */

-	public function maybe_write_to_log( $returned_error, $error_type, $page = '' ) {

-		if ( ! $this->is_debugging ) {

+	public function maybe_write_to_log( $returned_error, $error_type, $page = '' ) {
+		if ( ! $this->is_debugging ) {
 			return;

 		}

 

 		$this->yikes_easy_mailchimp_write_to_error_log( $returned_error, $error_type, $page );

 	}

 

-	public function create_error_log_folder() {

+	public function create_error_log_folder() {
 

 		// If our directory doesn't exist, make it.

-		if ( ! file_exists( $this->get_error_log_folder() ) ) {

+		if ( ! file_exists( $this->get_error_log_folder() ) ) {
 			mkdir( $this->get_error_log_folder() );

 		}

 	}

 

-	public function create_error_log_file() {

+	public function create_error_log_file() {
 

 		// If our error log doesn't exist, make it.

-		if ( ! file_exists( $this->error_log_file_path ) ) {

+		if ( ! file_exists( $this->error_log_file_path ) ) {
 			file_put_contents( $this->error_log_file_path, '' );

 		}

 	}

 

-	private function get_error_log_folder() {

+	private function get_error_log_folder() {
 		return WP_CONTENT_DIR . '/uploads/yikes-log/';

 	}

 

-	private function get_error_log_file_path() {

+	private function get_error_log_file_path() {
 		return WP_CONTENT_DIR . '/uploads/yikes-log/yikes-easy-mailchimp-error-log.txt';

 	}

 	

@@ -122,17 +122,17 @@ 
 	*	@returned_error 

 	*	@error_type - what was running when the error occured ie (new user subscription, remove user etc)

 	*/

-	public function yikes_easy_mailchimp_write_to_error_log( $returned_error , $error_type , $page='' ) {

+	public function yikes_easy_mailchimp_write_to_error_log( $returned_error , $error_type , $page='' ) {
 		

 		// confirm error logging is toggled on, else lets exit

-		if( get_option( 'yikes-mailchimp-debug-status' , '' )  != '1' ) {

+		if( get_option( 'yikes-mailchimp-debug-status' , '' )  != '1' ) {
 			return;

 		}

 		

 		$contents = file_get_contents( $this->error_log_file_path, true );

 		

 		// if we pass in a custom page, don't set things up

-		if ( empty( $page ) ) {

+		if ( empty( $page ) ) {
 

 			// get the current page, admin or front end?

 			$page = is_admin() ? __( 'Admin', 'yikes-inc-easy-mailchimp-extender' ) : __( 'Front End', 'yikes-inc-easy-mailchimp-extender' );

@@ -168,20 +168,20 @@ 
 	*

 	*  @since 5.6

 	*/	

-	public function yikes_easy_mailchimp_generate_error_log_table() {		

+	public function yikes_easy_mailchimp_generate_error_log_table() {
 

 		// ensure file_get_contents exists

-		if( function_exists( 'file_get_contents' ) ) {	

+		if( function_exists( 'file_get_contents' ) ) {
 			// confirm that our file exists

-			if( file_exists( $this->error_log_file_path ) ) {

+			if( file_exists( $this->error_log_file_path ) ) {
 				$error_log_contents = file_get_contents( $this->error_log_file_path, true );							

-				if( $error_log_contents === FALSE ) {

+				if( $error_log_contents === FALSE ) {
 					return _e( 'File get contents not available' , 'yikes-inc-easy-mailchimp-extender' );

 				}

-				if ( $error_log_contents != '' ) {

+				if ( $error_log_contents != '' ) {
 					// return $error_log_contents;

 					print_r( $error_log_contents );

-				} else {

+				} else {
 					?>

 						<!-- table body -->

 						<tr class="error-log-tr">

@@ -195,7 +195,7 @@ 
 						</tr>

 					<?php

 				}

-			} else {

+			} else {
 				?>

 						<!-- table body -->

 						<tr class="error-log-tr">

@@ -223,7 +223,8 @@ 
 						</tr>

 					<?php

 			}

-		} else { // if file_get_contents is disabled server side

+		} else {
+// if file_get_contents is disabled server side

 			?>

 				<!-- table body -->

 				<tr>

public/classes/checkbox-integrations.php

Braces +28 added lines, -28 removed lines

@@ -9,7 +9,7 @@ 
 /**

  * Main Checkbox Integration class.

  */

-class Yikes_Easy_MC_Checkbox_Integration_Class {

+class Yikes_Easy_MC_Checkbox_Integration_Class {
 

 	/**

 	 * The integration type.

@@ -28,10 +28,10 @@ 
 	 *

 	 * @return bool Whether the current user is subscribed to a list.

 	 */

-	public function is_user_already_subscribed( $type, $email = '' ) {

+	public function is_user_already_subscribed( $type, $email = '' ) {
 		// Make sure we have an email address to use.

-		if ( empty( $email ) ) {

-			if ( ! is_user_logged_in() ) {

+		if ( empty( $email ) ) {
+			if ( ! is_user_logged_in() ) {
 				return false;

 			}

 

@@ -40,13 +40,13 @@ 
 		}

 

 		// Ensure we have a valid email.

-		if ( ! is_email( $email ) ) {

+		if ( ! is_email( $email ) ) {
 			return false;

 		}

 

 		// Convert the integration type to a list ID.

 		$checkbox_options = get_option( 'optin-checkbox-init', '' );

-		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {

+		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
 			return false;

 		}

 

@@ -54,8 +54,8 @@ 
 		$list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids );

 

 		// Go through each list...

-		foreach ( $list_ids as $list_id ) {

-			if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {

+		foreach ( $list_ids as $list_id ) {
+			if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {
 				return false;

 			}

 		}

@@ -74,19 +74,19 @@ 
 	 *

 	 * @return bool Whether the email is subscribed to the list.

 	 */

-	public function is_user_subscribed( $email, $list_id, $type ) {

+	public function is_user_subscribed( $email, $list_id, $type ) {
 		$email      = sanitize_email( $email );

 		$email_hash = md5( $email );

 

 		// Check the API to see the status.

 		$response = yikes_get_mc_api_manager()->get_list_handler()->get_member( $list_id, $email_hash, false );

-		if ( is_wp_error( $response ) ) {

+		if ( is_wp_error( $response ) ) {
 			$data = $response->get_error_data();

 

 			// If the error response is a 404, they are not subscribed.

-			if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {

+			if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
 				return false;

-			} else {

+			} else {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

@@ -110,14 +110,14 @@ 
 	 *

 	 * @return string The HTML for the checkbox.

 	 */

-	public function yikes_get_checkbox() {

+	public function yikes_get_checkbox() {
 

 		// Get our options.

 		$checkbox_options = get_option( 'optin-checkbox-init', array() );

 		$has_list_ids     = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'];

 		$has_list_ids     = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true );

 

-		if ( $has_list_ids ) {

+		if ( $has_list_ids ) {
 			$label    = isset( $checkbox_options[ $this->type ]['label'] ) && ! empty( $checkbox_options[ $this->type ]['label'] ) ? trim( $checkbox_options[ $this->type ]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );

 			$checked  = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : '';

 			$before   = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );

@@ -144,11 +144,11 @@ 
 	 * @param string $type       The integration type.

 	 * @param array  $merge_vars The array of form data to send.

 	 */

-	public function subscribe_user_integration( $email, $type, $merge_vars ) {

+	public function subscribe_user_integration( $email, $type, $merge_vars ) {
 		$options = get_option( 'optin-checkbox-init', '' );

 

 		// Make sure we have a list ID.

-		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {

+		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {
 			// @todo: Throw some kind of error?

 			return;

 		}

@@ -157,7 +157,7 @@ 
 

 		// Check for an IP address.

 		$user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );

-		if ( isset( $merge_vars['OPTIN_IP'] ) ) {

+		if ( isset( $merge_vars['OPTIN_IP'] ) ) {
 			$user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );

 		}

 

@@ -173,19 +173,19 @@ 
 			'ip_signup'     => $user_ip,

 		);

 

-		foreach ( $list_ids as $list_id ) {

+		foreach ( $list_ids as $list_id ) {
 

 			$interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();

 			$interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests;

 

 			// Only re-format and add interest groups if not empty.

-			if ( ! empty( $interests ) ) {

+			if ( ! empty( $interests ) ) {
 				$groups = array();

 

 				// Need to reformat interest groups array as $interest_group_ID => true.

-				foreach ( $interests as $interest ) {

-					if ( is_array( $interest ) ) {

-						foreach ( $interest as $group_id ) {

+				foreach ( $interests as $interest ) {
+					if ( is_array( $interest ) ) {
+						foreach ( $interest as $group_id ) {
 							$groups[ $group_id ] = true;

 						}

 					}

@@ -217,14 +217,14 @@ 
 			$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type );

 

 			// Don't send an empty merge fields array.

-			if ( empty( $data['merge_fields'] ) ) {

+			if ( empty( $data['merge_fields'] ) ) {
 				unset( $data['merge_fields'] );

 			}

 

 			// Subscribe the user to the list via the API.

 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, $id, $data );

 

-			if ( is_wp_error( $response ) ) {

+			if ( is_wp_error( $response ) ) {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

@@ -242,15 +242,15 @@ 
 	 *

 	 * @param WP_User $user A WP User.

 	 */

-	public function user_merge_vars( WP_User $user ) {

+	public function user_merge_vars( WP_User $user ) {
 

 		// Setup our array.

 		$merge_vars = array();

 

-		if ( ! empty( $user->first_name ) ) {

+		if ( ! empty( $user->first_name ) ) {
 			$merge_vars['FNAME'] = $user->first_name;

 		}

-		if ( ! empty( $user->last_name ) ) {

+		if ( ! empty( $user->last_name ) ) {
 			$merge_vars['LNAME'] = $user->last_name;

 		}

 

@@ -274,7 +274,7 @@ 
 	 *

 	 * @return bool True if the checkbox was checked.

 	 */

-	public function was_checkbox_checked( $type ) {

+	public function was_checkbox_checked( $type ) {
 		return isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && '1' === filter_var( $_POST[ 'yikes_mailchimp_checkbox_' . $type ], FILTER_SANITIZE_STRING );

 	}

 }

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

Braces +243 added lines, -243 removed lines

@@ -9,7 +9,7 @@ 
  * @subpackage Yikes_Inc_Easy_Mailchimp_Forms/admin

  * @author     YIKES, Inc. <plugins@yikesinc.com>

  */

-class Yikes_Inc_Easy_Mailchimp_Forms_Admin {

+class Yikes_Inc_Easy_Mailchimp_Forms_Admin {
 

 	/**

 	 * The ID of this plugin.

@@ -49,7 +49,7 @@ 
 		$yikes_inc_easy_mailchimp_extender,

 		$version,

 		Yikes_Inc_Easy_MailChimp_Extender_Form_Interface $form_interface

-	) {

+	) {
 		$this->yikes_inc_easy_mailchimp_extender = $yikes_inc_easy_mailchimp_extender;

 		$this->version                           = $version;

 		$this->form_interface                    = $form_interface;

@@ -60,7 +60,7 @@ 
 	 *

 	 * @author Jeremy Pry

 	 */

-	public function hooks() {

+	public function hooks() {
 

 		// check for old plugin options and migrate if exist.

 		add_action( 'admin_menu', array( $this, 'register_admin_pages' ), 11 );

@@ -101,7 +101,7 @@ 
 		/***********************/

 		/** Create A Form **/

 		/**********************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-form' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_form' ) );

 

@@ -110,7 +110,7 @@ 
 		/***********************/

 		/** Delete A Form **/

 		/**********************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-delete-form' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_delete_form' ) );

 

@@ -119,7 +119,7 @@ 
 		/**********************************/

 		/** Duplicate/Clone A Form    **/

 		/********************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-duplicate-form' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_duplicate_form' ) );

 

@@ -128,7 +128,7 @@ 
 		/*************************************/

 		/**  Reset Form Impression Stats **/

 		/***********************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-reset-stats' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_reset_impression_stats' ) );

 

@@ -137,7 +137,7 @@ 
 		/**********************************/

 		/**         Update A Form        **/

 		/********************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-update-form' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_update_form' ) );

 

@@ -146,7 +146,7 @@ 
 		/**************************************************/

 		/**     Clear Store MailChimp Transient Data   **/

 		/*************************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-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' ) );

 

@@ -155,7 +155,7 @@ 
 		/*******************************************/

 		/** Remove a user from a mailing list     **/

 		/*****************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-unsubscribe-user' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_unsubscribe_user' ) );

 

@@ -164,7 +164,7 @@ 
 		/*******************************************/

 		/**    Create misisng error log file  **/

 		/*****************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-create-error-log' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_create_missing_error_log' ) );

 

@@ -176,14 +176,14 @@ 
 		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_enqueue_scripts', 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 );

 		}

 

@@ -196,7 +196,7 @@ 
 		/**************************************************/

 		/**        Clear MailChimp Error Log Data        **/

 		/*************************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-clear-error-log' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_clear_error_log' ) );

 

@@ -205,7 +205,7 @@ 
 		/*********************************************/

 		/**        Export MailChimp Opt-in Forms   **/

 		/*******************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-forms' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_forms' ) );

 

@@ -214,7 +214,7 @@ 
 		/*********************************************/

 		/**                Export Plugin Settings           **/

 		/*******************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-export-settings' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_export_plugin_settings' ) );

 

@@ -223,7 +223,7 @@ 
 		/*******************************************/

 		/**        Import Class Inclusion       **/

 		/*****************************************/

-		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {

+		if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'yikes-easy-mc-import-forms' ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_import_forms' ) );

 

@@ -232,7 +232,7 @@ 
 		/*******************************************/

 		/**    Premium Support Request     **/

 		/*****************************************/

-		if ( isset( $_POST['submit-premium-support-request'] ) ) {

+		if ( isset( $_POST['submit-premium-support-request'] ) ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_premium_support_request' ) );

 

@@ -241,7 +241,7 @@ 
 		/****************************************/

 		/**    Dismiss Options Migrations        **/

 		/****************************************/

-		if ( isset( $_REQUEST['dismiss_migration_nonce'] ) ) {

+		if ( isset( $_REQUEST['dismiss_migration_nonce'] ) ) {
 

 			add_action( 'init', array( $this, 'yikes_easy_mailchimp_dismiss_option_migrate' ) );

 

@@ -276,7 +276,7 @@ 
 		 * @ param  array  $links  Pre-existing plugin action links

 		 * @ return array  $links  New array of plugin actions

 		 */

-		public function easy_forms_plugin_action_links( $links ) {

+		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, Inc.', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';

 			return $links;

@@ -292,13 +292,13 @@ 
 		 *

 		 * @return string

 		 */

-		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {

+		public function yikes_easy_forms_admin_disclaimer( $footer_text ) {
 			$page = get_current_screen();

 			$base = $page->base;

-			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {

+			if ( strpos( $base, 'yikes-inc-easy-mailchimp' ) !== false || strpos( $base, 'yikes-mailchimp' ) !== false ) {
 				$disclaimer_text = sprintf( '<em>' . __( 'Disclaimer: <strong>Easy Forms for MailChimp</strong> is in no way endorsed, affiliated or backed by MailChimp, or its parent company Rocket Science Group.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="https://wordpress.org/support/view/plugin-reviews/give?filter=5#postform" target="_blank" class="give-rating-link" data-rated="' . __( 'Thanks :)', 'yikes-inc-easy-mailchimp-extender' ) . '">', '</a></em>' );

 				return $disclaimer_text;

-			} else {

+			} else {
 				return $footer_text;

 			}

 		}

@@ -310,32 +310,32 @@ 
 		*	@since 6.0.0

 		*	@return	parsed tag content

 		*/

-		public function parse_mailchimp_default_tag( $default_tag ) {

-			if ( ! $default_tag || $default_tag == '' ) {

+		public function parse_mailchimp_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_id}' ) {

+			if ( $default_tag == '{page_id}' ) {
 				$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 {

+				} else {
 					$default_tag = 'Guest User';

 				}

 			}

@@ -349,21 +349,21 @@ 
 		*	When a user clicks 'Clear Log' on the debug settings page, this funciton

 		*	is used to clear the data out of our php file.

 		*/

-		public function yikes_easy_mailchimp_clear_error_log() {

+		public function yikes_easy_mailchimp_clear_error_log() {
 

 			// Get our error log class.

 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 

 			// file put contents $returned error + other data.

-			if ( file_exists( $error_logging->error_log_file_path ) ) {

+			if ( file_exists( $error_logging->error_log_file_path ) ) {
 

 				$clear_log = file_put_contents( $error_logging->error_log_file_path, '' );

 

-				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 {

+				} else {
 

 					// redirect the user to the manage forms page, display confirmation.

 					wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings&error-log-cleared=true' ) ) );

@@ -377,13 +377,13 @@ 
 		*	@since 		6.0.0

 		*	@return 	CSV export file

 		*/

-		public function yikes_easy_mailchimp_export_forms() {

+		public function yikes_easy_mailchimp_export_forms() {
 			// grab our nonce.

 			$nonce = $_REQUEST['nonce'];

 			// grab the forms.

 			$forms = isset( $_REQUEST['yikes_export_forms'] ) ? $_REQUEST['yikes_export_forms'] : array();

 			// validate nonce.

-			if ( ! wp_verify_nonce( $nonce, 'export-forms' ) ) {

+			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 ) );

 			}

 

@@ -401,11 +401,11 @@ 
 		*	@since 		6.0.0

 		*	@return 	CSV export file

 		*/

-		public function yikes_easy_mailchimp_export_plugin_settings() {

+		public function yikes_easy_mailchimp_export_plugin_settings() {
 			// grab our nonce

 			$nonce = $_REQUEST['nonce'];

 			// validate nonce.

-			if ( ! wp_verify_nonce( $nonce, 'export-settings' ) ) {

+			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 ) );

 			}

 

@@ -421,15 +421,15 @@ 
 		*	Custom import function to import all or specific forms

 		*	@since 6.0.0

 		*/

-		public function yikes_easy_mailchimp_import_forms() {

+		public function yikes_easy_mailchimp_import_forms() {
 			// grab our nonce.

 			$nonce = $_REQUEST['nonce'];

 			// validate nonce.

-			if ( ! wp_verify_nonce( $nonce, 'import-forms' ) ) {

+			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.

@@ -445,9 +445,9 @@ 
 		*	Premium Support Request

 		*	@since 6.0.0

 		*/

-		public function yikes_easy_mailchimp_premium_support_request() {

+		public function yikes_easy_mailchimp_premium_support_request() {
 

-			if ( isset( $_POST['action'] ) && $_POST['action'] != 'yikes-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' );

 			}

 

@@ -483,7 +483,7 @@ 
 			) );

 

 			// Catch the error.

-			if ( is_wp_error( $response ) ) {

+			if ( is_wp_error( $response ) ) {
 				wp_send_json_error( $response->getMessage() );

 			}

 

@@ -491,9 +491,9 @@ 
 			$response_body = json_decode( wp_remote_retrieve_body( $response ) );

 		}

 

-		public function get_premium_license( $plugin_slug ) {

+		public function get_premium_license( $plugin_slug ) {
 

-			switch( $plugin_slug ) {

+			switch( $plugin_slug ) {
 

 				case 'form-customizer':

 					return defined( 'YIKES_CUSTOMIZER_EDD_ITEM_ID' ) ? YIKES_CUSTOMIZER_EDD_ITEM_ID : '';

@@ -514,7 +514,7 @@ 
 		*

 		*	@since 6.0.0

 		**/

-		public function yikes_easy_mailchimp_dismiss_option_migrate() {

+		public function yikes_easy_mailchimp_dismiss_option_migrate() {
 			// delete the options and allow the user to manually update things.

 

 			// Verify the NONCE is valid.

@@ -532,8 +532,8 @@ 
 		 *

 		 * @since 6.0.0

 		 */

-		public function load_error_logging_class() {

-			if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {

+		public function load_error_logging_class() {
+			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';

@@ -548,21 +548,21 @@ 
 		 *

 		 * @since v6.0.0

 		 */

-		public function yikes_easy_mailchimp_check_installation_date() {

+		public function yikes_easy_mailchimp_check_installation_date() {
 

 			// 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' ) ) {

+				if ( $past_date >= $install_date && current_user_can( 'install_plugins' ) ) {
 					add_action( 'admin_notices', array( $this , 'yikes_easy_mailchimp_display_review_us_notice' ) );

 				}

 			}

@@ -574,9 +574,9 @@ 
 			asking for a review, and for user feedback

 			@since v6.0.0

 		*/

-		public function yikes_easy_mailchimp_display_review_us_notice() {

+		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 ) {
 

 				// The URL of the page the user is currently on 

 				$current_uri  	  = isset( $_SERVER['REQUEST_URI'] ) && ! empty( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : false;

@@ -619,8 +619,8 @@ 
 			Remove the Review us notification when user clicks 'Dismiss'

 			@since v3.1.1

 		*/

-		public function yikes_easy_mailchimp_stop_bugging_me() {

-			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {

+		public function yikes_easy_mailchimp_stop_bugging_me() {
+			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {
 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );

 			}

 		}

@@ -628,7 +628,7 @@ 
 	/* End Two Week Notification */

 

 		/* Display a warning users who are using PHP < 5.3 */

-		public function display_php_warning() {

+		public function display_php_warning() {
 			$message = __( 'Easy Forms for MailChimp requires a minimum of PHP 5.3. The plugin will not function properly until you update. Please 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>";

 		}

@@ -638,10 +638,10 @@ 
 	 * TinyMCE Functions

 	 */

 	// load our button and pass in the JS form data variable.

-	public function add_tinyMCE_buttons() {

+	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' ) );

@@ -649,14 +649,14 @@ 
 	}

 

 	// Add the button key for address via JS.

-	public function yks_mc_add_tinymce_button( $buttons ) {

+	public function yks_mc_add_tinymce_button( $buttons ) {
 		array_push( $buttons, 'yks_mc_tinymce_button_key' );

 		// Print all buttons.

 		return $buttons;

 	}

 

 	// inlcude the js for tinymce.

-	public function yks_mc_add_tinymce_plugin( $plugin_array ) {

+	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__ );

 

@@ -668,23 +668,23 @@ 
 		 * Pass our imported list data, to the JS file

 		 * to build the drop down list in the modal

 		 */

-	public function tinymce_yikes_easy_mc() {

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

 		}

 

 		$list_data = $this->form_interface->get_all_forms();

 		$lists     = array();

-		if ( ! empty( $list_data ) ) {

+		if ( ! empty( $list_data ) ) {
 			// build an array to pass to our javascript.

-			foreach ( $list_data as $id => $form ) {

+			foreach ( $list_data as $id => $form ) {
 				$lists[] = array(

 					'text'  => urlencode( $form['form_name'] ),

 					'value' => $id,

 				);

 			}

-		} else {

+		} else {
 			$lists[0] = array(

 				'text'  => __( 'Please Import Some MailChimp Lists', 'yikes-inc-easy-mailchimp-extender' ),

 				'value' => '-',

@@ -709,7 +709,7 @@ 
 	/**

 	 *  Fix the MailChimp icon spacing in the admin menu.

 	 */

-	public function fix_menu_icon_spacing() {

+	public function fix_menu_icon_spacing() {
 		?>

 			<style>

 			a[href="admin.php?page=yikes-inc-easy-mailchimp"] .wp-menu-image img {

@@ -724,7 +724,7 @@ 
 	 *

 	 * @since    6.0.0

 	 */

-	public function enqueue_styles() {

+	public function enqueue_styles() {
 		/**

 		 *	Enqueue our global dashboard styles.

 		 */

@@ -733,14 +733,14 @@ 
 		/*

 		*	Enqueue Add-ons styles.

 		*/

-		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {

+		if ( get_current_screen()->base == 'easy-forms_page_yikes-inc-easy-mailchimp-addons' ) {
 			wp_enqueue_style( 'yikes-inc-easy-mailchimp-extender-addons-styles', plugin_dir_url( __FILE__ ) . 'css/yikes-inc-easy-mailchimp-extender-addons.min.css', array(), $this->version, 'all' );

 		}

 

 		/*

 		*	Enqueue Subscriber Profile Flags.

 		*/

-		if ( get_current_screen()->base == 'admin_page_yikes-mailchimp-view-user' ) {

+		if ( get_current_screen()->base == 'admin_page_yikes-mailchimp-view-user' ) {
 			wp_enqueue_style( 'yikes-inc-easy-mailchimp-extender-subscriber-flags', plugin_dir_url( __FILE__ ) . 'css/flag-icon.min.css', array(), $this->version, 'all' );

 		}

 	}

@@ -749,7 +749,7 @@ 
 	 *

 	 * @since    6.0.0

 	 */

-	public function enqueue_scripts() {

+	public function enqueue_scripts() {
 		wp_enqueue_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(

@@ -764,7 +764,7 @@ 
 

 		// Enqueue required scripts for the form editor

 		$screen = get_current_screen();

-		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {

+		if ( ! isset( $screen->base ) || 'admin_page_yikes-mailchimp-edit-form' !== $screen->base ) {
 			return;

 		}

 

@@ -810,12 +810,12 @@ 
 	/**

 	 * Convert the php date format string to a js date format

 	 */

-	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {

-		switch ( $type ) {

+	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {
+		switch ( $type ) {
 			default:

 			case 'date':

 				// Standard Date Fields

-				switch ( $sFormat ) {

+				switch ( $sFormat ) {
 					//Predefined WP date formats

 					case 'F j, Y':

 					case 'j F Y':

@@ -838,7 +838,7 @@ 
 				break;

 			// Birthday Fields

 			case 'birthday':

-				switch ( $sFormat ) {

+				switch ( $sFormat ) {
 					//Predefined WP date formats

 					case 'F j, Y':

 					case 'j F Y':

@@ -867,8 +867,8 @@ 
 	/**

 	 * Convert the php date format string to a js date format

 	 */

-	public function yikes_jQuery_datepicker_date_format( $site_option ) {

-		switch( $site_option ) {

+	public function yikes_jQuery_datepicker_date_format( $site_option ) {
+		switch( $site_option ) {
 			//Predefined WP date formats

 			default:

 			case 'F j, Y':

@@ -888,7 +888,7 @@ 
 	*	Register our admin pages

 	*	used to display data back to the user

 	**/

-	public function register_admin_pages() {

+	public function register_admin_pages() {
 

 		/* Top Level Menu 'Easy MailChimp' */

 		add_menu_page(

@@ -1011,7 +1011,7 @@ 
 	*	when they click 'Go Pro' in the admin menu

 	*	to do: populate with sales URL

 	*/

-	public function generateAddOnsPage() {

+	public function generateAddOnsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/add-ons.php'; // include our add-ons page

 	}

 

@@ -1020,7 +1020,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateManageFormsPage() {

+	function generateManageFormsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page

 	}

 

@@ -1029,7 +1029,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateManageListsPage() {

+	function generateManageListsPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page

 	}

 

@@ -1038,7 +1038,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateSupportPage() {

+	function generateSupportPage() {
 

 		wp_enqueue_script( 'yikes-inc-easy-mailchimp-extender-support-scripts', plugin_dir_url( __FILE__ ) . 'js/support.js', array( 'jquery' ), $this->version, false );	

 		require_once YIKES_MC_PATH . 'admin/partials/menu/support.php';

@@ -1049,7 +1049,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateEditFormPage() {

+	function generateEditFormPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page

 	}

 

@@ -1058,7 +1058,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateViewListPage() {

+	function generateViewListPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page

 	}

 

@@ -1067,7 +1067,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateViewUserPage() {

+	function generateViewUserPage() {
 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page

 	}

 

@@ -1076,7 +1076,7 @@ 
 	*

 	* @since v.5.4

 	**/

-	function yikes_easy_mc_settings_init() {

+	function yikes_easy_mc_settings_init() {
 

 		/* Register General Settings Section */

 

@@ -1196,27 +1196,27 @@ 
 	*	Options Sanitization & Validation

 	*	@since complete re-write

 	**/

-	function yikes_mc_validate_api_key( $input ) {

-		if ( $input === '' ) {

+	function yikes_mc_validate_api_key( $input ) {
+		if ( $input === '' ) {
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

 			return '';

 		}

 		$api_key = strip_tags ( trim( $input ) );

 		$dash_position = strpos( trim( $input ), '-' );

-		if ( $dash_position !== false ) {

+		if ( $dash_position !== false ) {
 			$manager = new Yikes_Inc_Easy_MailChimp_API_Manager( $api_key );

-		} else {

+		} 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' );

 			return $api_key;

 		}

 

 		$response = $manager->get_account_handler()->get_account( false );

-		if ( ! is_wp_error( $response ) ) {

+		if ( ! is_wp_error( $response ) ) {
 			update_option( 'yikes-mc-api-validation', 'valid_api_key' );

 				// Clear the API key transient data

 			$this->delete_yikes_mailchimp_transients();

-		}  else {

+		} else {
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 			$error_logging->yikes_easy_mailchimp_write_to_error_log( $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', $response->get_error_message() );

@@ -1231,7 +1231,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generatePageOptions() {

+	function generatePageOptions() {
 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page

 	}

 

@@ -1241,15 +1241,15 @@ 
 	*	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' ) {

+		} else {
+			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {
 				return false;

-			} else {

+			} else {
 				return true;

 			}

 		}

@@ -1264,11 +1264,11 @@ 
 	 * @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() {

+	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 );

@@ -1281,7 +1281,7 @@ 
 	 * moving from 5.5 and beyond..

 	 * @since

 	*/

-	public function migrate_old_yks_mc_options() {

+	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';

 	}

@@ -1300,15 +1300,15 @@ 
 		 * @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() {

+		public function display_options_migrate_notice() {
 

 			// 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' );

@@ -1319,7 +1319,7 @@ 
 						<p><?php printf( __( "The previously stored options for %s have been cleared from the database. You should update the plugin options on the <a href='%s' title='Settings Page'>settings page</a> before continuing. You should also update the shortcodes used to generate your forms, and any widgets you may have previously set-up.", 'yikes-inc-easy-mailchimp-extender' ), '<strong>Us Easy Forms for MailChimp</strong>', admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ); ?></p>

 					</div>

 				<?php

-			} else {

+			} 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>Us 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>Us Easy Forms for MailChimp</strong>' ); ?></p>

@@ -1347,9 +1347,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;

 			   }

 		   }

@@ -1357,14 +1357,14 @@ 
 		} // end

 

 		/* Ajax Migrate Options */

-		function migrate_archived_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 ) ) {

+			if ( json_decode( $option_value ) ) {
 				// decode our lists() array, and store it

 				$opt_value = json_decode( $option_value, true );

-			} else {

+			} else {
 				$opt_value = $option_value;

 			}

 			update_option( $option_name, $opt_value );

@@ -1373,12 +1373,12 @@ 
 		}

 

 		/* Ajax Migrate Forms */

-		function migrate_previously_setup_forms() {

+		function migrate_previously_setup_forms() {
 			$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' ) {
 				$option_value = $_POST['option_value'];

 				$new_options = json_decode( stripslashes_deep( $option_value ) , true );

 

@@ -1410,9 +1410,9 @@ 
 					'custom_fields'           => '',

 				) );

 			}

-			if ( $done == 'done' ) {

+			if ( $done == 'done' ) {
 				wp_send_json( array( 'form_name' => $form_name, 'completed_import' => true ) );

-			} else {

+			} else {
 				wp_send_json( array( 'form_name' => $form_name, 'completed_import' => false ) );

 			}

 			wp_die();

@@ -1424,8 +1424,8 @@ 
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )

 		*	@since v5.6 - complete re-write

 		*/

-		public function generate_options_pages_sidebar_menu() {

-			if ( isset( $_REQUEST['section'] ) ) {

+		public function generate_options_pages_sidebar_menu() {
+			if ( isset( $_REQUEST['section'] ) ) {
 				$selected = $_REQUEST['section'];

 			}

 			$installed_addons = get_option( 'yikes-easy-mc-active-addons', array() );

@@ -1452,13 +1452,13 @@ 
 					</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>

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

@@ -1478,7 +1478,7 @@ 
 		*	Render our sidebar menu on all of the setings pages (general, form, checkbox, recaptcha, popup, debug etc. )

 		*	@since v5.6 - complete re-write

 		*/

-		public function generate_manage_forms_sidebar( $lists ) {

+		public function generate_manage_forms_sidebar( $lists ) {
 			// create a custom URL to allow for creating fields

 			$url = esc_url_raw(

 				add_query_arg(

@@ -1509,18 +1509,18 @@ 
 					<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 ); disabled( true, empty( $lists ) ); ?>>

 							<?php

-							if ( ! empty( $lists ) ) {

-								foreach( $lists as $mailing_list ) {

+							if ( ! 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>

 									<?php

 								}

-							} else {

-								if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {

+							} else {
+								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>

 									<?php

-								} else {

+								} else {
 									?>

 									<option><?php echo __( "No lists were found on the account." , 'yikes-inc-easy-mailchimp-extender' ); ?></option>

 									<?php

@@ -1531,8 +1531,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>

@@ -1541,8 +1541,8 @@ 
 							}

 						}

 

-						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' ) ); ?>

@@ -1553,9 +1553,9 @@ 
 						?>

 					</label>

 					<?php

-						if ( $this->is_user_mc_api_valid_form( false ) ) {

+						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 {

+						} else {
 							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>

@@ -1566,7 +1566,7 @@ 
 

 				<!-- 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' ); ?>" />

@@ -1582,7 +1582,7 @@ 
 		*	Generate a dropdown of post and pages

 		*	so the user can send the user to on form submission

 		*/

-		public function generate_page_redirect_dropdown( $redirect, $redirect_page, $custom_redirect_url ) {

+		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'; } ?>">

@@ -1602,10 +1602,10 @@ 
 					$excluded_post_types = apply_filters( 'yikes-mailchimp-excluded-redirect-post-types', $excluded_post_types );

 

 						// 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 and any defined by the filter

-							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {

+							if ( ! in_array( $registered_post_type, $excluded_post_types ) ) {
 

 								// Grab only the post IDs - in the past we've created timeout issues on some servers with lots of posts

 								$wp_query_args = array(

@@ -1620,11 +1620,11 @@ 
 

 								$post_ids = ! empty( $wp_query_result->posts ) ? $wp_query_result->posts : array();

 

-								if ( ! empty ( $post_ids ) ) {

+								if ( ! empty ( $post_ids ) ) {
 									?>

 										<optgroup label="<?php echo ucwords( str_replace( '_', ' ', $registered_post_type ) ); ?>">

 									<?php

-											foreach( $post_ids as $post_id ) {

+											foreach( $post_ids as $post_id ) {
 												?><option <?php selected( $redirect_page , $post_id ); ?> value="<?php echo $post_id; ?>"><?php echo get_the_title( $post_id ) ?></option><?php

 											}

 									?>

@@ -1655,15 +1655,15 @@ 
 		*

 		* 	Displayed in sidebars

 		*/

-		public function generate_show_some_love_container() {

+		public function generate_show_some_love_container() {
 			// if no active add-ons are installed,

 			// lets display our branding and add-on sidebar

 			$options = get_option( 'yikes-easy-mc-active-addons', array() );

-			if ( empty( $options ) ) {

+			if ( empty( $options ) ) {
 

 				/* 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">

@@ -1741,18 +1741,18 @@ 
 		*	-

 		* @parameters - $list_id - pass in the list ID to retreive merge variables from

 		*/

-		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {

+		public function generate_form_editor( $form_fields, $list_id, $merge_variables, $interest_groups ) {
 

 			// if no list id, die!

-			if ( ! $list_id ) {

+			if ( ! $list_id ) {
 				wp_die( __( "We've encountered an error. No list ID was sent." , 'yikes-inc-easy-mailchimp-extender' ) );

 			}

 

-			if ( ! $merge_variables ) {

+			if ( ! $merge_variables ) {
 				wp_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

@@ -1764,18 +1764,18 @@ 
 				$mailchimp_merge_field_ids	= array();

 

 				// loop over merge variables

-				if ( ! empty( $merge_variables['merge_fields'] ) ) {

+				if ( ! empty( $merge_variables['merge_fields'] ) ) {
 					$available_merge_variables = wp_list_pluck( $merge_variables['merge_fields'], 'tag' );

 					$mailchimp_merge_field_ids = wp_list_pluck( $merge_variables['merge_fields'], 'merge_id' );

 					

 					// Array will look like $merge_tag => $merge_id

-					foreach( $available_merge_variables as $index => $merge_tag ) { 

+					foreach( $available_merge_variables as $index => $merge_tag ) {
 						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];

 					}

 				}

 

 				// loop over interest groups

-				if ( ! empty( $interest_groups ) ) {

+				if ( ! empty( $interest_groups ) ) {
 					$available_interest_groups = array_keys( $interest_groups );

 				}

 

@@ -1785,9 +1785,9 @@ 
 				$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'] ) ) {
 						// @todo: don't use in_array()

 						$excluded_field = in_array( $field['merge'], $excluded_fields, true );

 						?>

@@ -1821,7 +1821,7 @@ 
 									<input type="hidden" class="yikes-mc-merge-field-id" name="field[<?php echo $field['merge']; ?>][id]" value="<?php echo $merge_field_ids[ $field['merge'] ] ?>" />  

 								<?php } ?>

 

-								<?php if ( $field['type'] == 'radio' || $field['type'] == 'dropdown' || $field['type'] == 'select' ) {

+								<?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 ) ); ?>' />

@@ -1845,7 +1845,7 @@ 
 										</tr>

 

 										<!-- Placeholder Value -->

-										<?php switch( $field['type'] ) {

+										<?php switch( $field['type'] ) {
 

 											case 'text':

 											case 'email':

@@ -1892,7 +1892,7 @@ 
 										?>

 

 										<!-- Default Value -->

-										<?php switch( $field['type'] ) {

+										<?php switch( $field['type'] ) {
 											default:

 											case 'text':

 											case 'number':

@@ -1908,7 +1908,7 @@ 
 													<input id="default_value_<?php echo esc_attr( $field['merge'] ); ?>" <?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>

@@ -2065,7 +2065,7 @@ 
 										<!-- 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':

@@ -2075,7 +2075,7 @@ 
 															<td scope="row">

 																<label for="placeholder">

 																	<?php

-																		switch( $field['type'] ) {

+																		switch( $field['type'] ) {
 																			default:

 																			case 'birthday':

 																				$type = __( 'Date Format', 'yikes-inc-easy-mailchimp-extender' );

@@ -2136,7 +2136,7 @@ 
 

 

 

-					} else {

+					} else {
 

 						/**** Interest Group ****/

 

@@ -2169,7 +2169,7 @@ 
 

 									<table class="form-table form-field-container">

 										<!-- Default Value -->

-										<?php switch( $field['type'] ) {

+										<?php switch( $field['type'] ) {
 											default:

 											case 'radio':

 											case 'checkboxes':

@@ -2186,7 +2186,7 @@ 
 

 														$default_shown = false;

 

-														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {

+														foreach ( json_decode( $field['groups'], true ) as $id => $group ) {
 															$field_id   = "{$field['group_id']}-{$id}";

 															$field_type = 'hidden' == $field['type'] ? 'checkbox' : $field['type'];

 															$field_type = 'checkboxes' == $field_type ? 'checkbox' : $field_type;

@@ -2195,7 +2195,7 @@ 
 

 															// Determine if the current group is checked.

 															$checked = '';

-															switch ( $field_type ) {

+															switch ( $field_type ) {
 																case 'radio':

 																default:

 																	$default = is_array( $field['default_choice'] ) ? current( $field['default_choice'] ) : $field['default_choice'];

@@ -2204,14 +2204,14 @@ 
 

 																case 'checkbox':

 																case 'hidden':

-																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {

+																	if ( is_array( $field['default_choice'] ) && in_array( $id, $field['default_choice'] ) ) {
 																		$checked = checked( true, true, false );

 																	}

 																break;

 															}

 

 															// Allow users to not set a default choice for radio buttons.

-															if ( $field_type === 'radio' && $default_shown === false ) {

+															if ( $field_type === 'radio' && $default_shown === false ) {
 																$default_shown = true;

 																?>

 																<label for="<?php echo $field_id . 'no-default'; ?>">

@@ -2364,7 +2364,7 @@ 
 						<?php

 					}

 				}

-			} else {

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

 				<?php

@@ -2451,19 +2451,19 @@ 
 		*	-

 		* @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();

-			foreach ( $form_fields as $field ) {

-				if ( isset( $field['merge'] ) ) {

+			foreach ( $form_fields as $field ) {
+				if ( isset( $field['merge'] ) ) {
 					$fields_assigned_to_form[ $field['merge'] ] = true;

 				}

 			}

 

-			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {

+			if ( ! empty( $available_merge_variables['merge_fields'] ) ) {
 				?>

 				<ul id="available-fields"><?php

-				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {

-					if ( isset( $fields_assigned_to_form[ $merge_var['tag'] ] ) ) {

+				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
+					if ( isset( $fields_assigned_to_form[ $merge_var['tag'] ] ) ) {
 						?>

 						<li class="available-form-field not-available"

 						    alt="<?php echo $merge_var['tag']; ?>"

@@ -2473,13 +2473,13 @@ 
 						    title="<?php esc_attr_e( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ); ?>"

 						    disabled="disabled">

 							<?php echo stripslashes( $merge_var['name'] );

-							if ( $merge_var['required'] ) {

+							if ( $merge_var['required'] ) {
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';

 							} ?>

 							<small class="field-type-text"><?php echo $merge_var['type']; ?></small>

 						</li>

 						<?php

-					} else {

+					} else {
 						?>

 						<li class="available-form-field"

 						    alt="<?php echo $merge_var['tag']; ?>"

@@ -2487,7 +2487,7 @@ 
 						    data-attr-field-name="<?php echo esc_attr( $merge_var['name'] ); ?>"

 						    data-attr-form-id="<?php echo esc_attr( $available_merge_variables['list_id'] ); ?>">

 							<?php echo stripslashes( $merge_var['name'] );

-							if ( $merge_var['required'] ) {

+							if ( $merge_var['required'] ) {
 								echo ' <span class="field-required" title="' . __( 'required field', 'yikes-inc-easy-mailchimp-extender' ) . '">*</span>';

 							} ?>

 							<small class="field-type-text"><?php echo $merge_var['type']; ?></small>

@@ -2512,21 +2512,21 @@ 
 		*	-

 		* @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 $field ) {

-					if ( isset( $field['group_id'] ) ) {

+			if ( ! empty( $form_fields ) ) {
+				foreach ( $form_fields as $field ) {
+					if ( isset( $field['group_id'] ) ) {
 						$fields_assigned_to_form[ $field['group_id'] ] = true;

 					}

 				}

 			}

 

-			if ( ! empty( $available_interest_groups ) ) {

+			if ( ! empty( $available_interest_groups ) ) {
 				?>

 				<ul id="available-interest-groups"><?php

-				foreach ( $available_interest_groups as $interest_group ) {

-					if ( isset( $fields_assigned_to_form[ $interest_group['id'] ] ) ) {

+				foreach ( $available_interest_groups as $interest_group ) {
+					if ( isset( $fields_assigned_to_form[ $interest_group['id'] ] ) ) {
 						?>

 						<li class="available-interest-group not-available" 

 							alt="<?php echo $interest_group['id']; ?>" 

@@ -2539,7 +2539,7 @@ 
 							<small class="field-type-text"><?php echo $interest_group['type']; ?></small>

 						</li>

 						<?php

-					} else {

+					} else {
 						?>

 						<li class="available-interest-group" 

 							alt="<?php echo $interest_group['id']; ?>" 

@@ -2569,9 +2569,9 @@ 
 		*	and include it here for easy maintenance

 		*	- must clean up db tables , ensure what data is going in and what is needed...

 		*/

-		public function yikes_easy_mailchimp_create_form() {

+		public function yikes_easy_mailchimp_create_form() {
 			$nonce = $_REQUEST['nonce'];

-			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {

+			if ( ! wp_verify_nonce( $nonce, 'create_mailchimp_form' ) ) {
 				wp_die( __( "We've run into an error. The security check didn't pass. Please try again." , 'yikes-inc-easy-mailchimp-extender' ) );

 			}

 

@@ -2582,13 +2582,13 @@ 
 			) );

 

 			// if an error occurs during the form creation process

-			if ( false == $result ) {

+			if ( false == $result ) {
 				// write it to the error log

 				// if the form was not created successfully

 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 				$error_logging->maybe_write_to_log( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender') , __( "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( __( 'Error creating a new form', 'yikes-inc-easy-mailchimp-extender' ) ) ) ) );

-			} else {

+			} 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=' . $result) ) );

 			}

@@ -2601,12 +2601,12 @@ 
 		*	and include it here for easy maintenance

 		*	- must clean up db tables , ensure what data is going in and what is needed...

 		*/

-		public function yikes_easy_mailchimp_delete_form() {

+		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'];

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'delete-mailchimp-form-'.$post_id_to_delete ) ) {

+			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 ) );

 			}

 

@@ -2621,12 +2621,12 @@ 
 		*	Duplicate an entire form !

 		*	Probably Move these to its own file,

 		*/

-		public function yikes_easy_mailchimp_duplicate_form() {

+		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'];

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'duplicate-mailchimp-form-'.$post_id_to_clone ) ) {

+			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 ) );

 			}

 

@@ -2650,10 +2650,10 @@ 
 			*/

 			do_action( 'yikes-mailchimp-after-duplicating-form', $post_id_to_clone, $result, $form_data );

 

-			if ( false === $result ) {

+			if ( false === $result ) {
 				// 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 {

+			} else {
 				// redirect the user to the manage forms page, display confirmation

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&duplicated-form=true' ) ) );

 			}

@@ -2664,12 +2664,12 @@ 
 		/*

 		*	Reset a forms impression stats

 		*/

-		public function yikes_easy_mailchimp_reset_impression_stats() {

+		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'];

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'reset-stats-mailchimp-form-'.$form_id_to_reset ) ) {

+			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 ) );

 			}

 

@@ -2681,10 +2681,10 @@ 
 				)

 			);

 

-			if ( false === $result ) {

+			if ( false === $result ) {
 				// redirect the user to the manage forms page, display error

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=false' ) ) );

-			} else {

+			} else {
 				// redirect the user to the manage forms page, display confirmation

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&reset-stats=true' ) ) );

 			}

@@ -2696,13 +2696,13 @@ 
 		*	Update an entire form !

 		*	Probably Move these to its own file,

 		*/

-		public function yikes_easy_mailchimp_update_form() {

+		public function yikes_easy_mailchimp_update_form() {
 

 			$nonce   = $_REQUEST['nonce'];

 			$form_id = $_REQUEST['id'];

 

 			// verify our nonce

-			if ( ! wp_verify_nonce( $nonce, 'update-mailchimp-form-' . $form_id ) ) {

+			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' ),

@@ -2775,11 +2775,11 @@ 
 

 			// additional custom fields (extensions / user defined fields)

 			$custom_fields = array();

-			if ( isset( $_POST['custom-field'] ) ) {

-				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {

-					if ( is_array( $custom_value ) ) {

+			if ( isset( $_POST['custom-field'] ) ) {
+				foreach ( $_POST['custom-field'] as $custom_field => $custom_value ) {
+					if ( is_array( $custom_value ) ) {
 						$custom_fields[ $custom_field ] = array_filter( stripslashes_deep( $custom_value ) ); // array_filters to remove empty items (don't save them!)

-					} else {

+					} else {
 						$custom_fields[ $custom_field ] = stripslashes( $custom_value );

 					}

 				}

@@ -2815,7 +2815,7 @@ 
 			exit();

 		}

 

-		public static function generate_default_email_body() {

+		public static function generate_default_email_body() {
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; 

 

 			$email_body .= '<p>';

@@ -2838,18 +2838,18 @@ 
 		}

 

 		/* Unsubscribe a given user from our list */

-		public function yikes_easy_mailchimp_unsubscribe_user() {

+		public function yikes_easy_mailchimp_unsubscribe_user() {
 			$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 ) ) {

+			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 ) );

 			}

 

 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_unsubscribe( $list_id, $email_id );

-			if ( is_wp_error( $response ) ) {

+			if ( is_wp_error( $response ) ) {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

@@ -2862,22 +2862,22 @@ 
 			exit;

 		}

 

-		public function yikes_easy_mailchimp_create_missing_error_log() {

+		public function yikes_easy_mailchimp_create_missing_error_log() {
 			// grab our nonnce

 			$nonce = $_REQUEST['nonce'];

 			// validate nonce

-			if ( !wp_verify_nonce( $nonce, 'create_error_log' ) ) {

+			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' );

-			try {

+			try {
 				// create the file

 				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 ) {

+			} 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() ) ) ) );

 			}

 		}

@@ -2886,11 +2886,11 @@ 
 		*	Clear Transient Data !

 		*	Probably Move these to its own file,

 		*/

-		public function yikes_easy_mailchimp_clear_transient_data() {

+		public function yikes_easy_mailchimp_clear_transient_data() {
 

 			// verify our nonce

 			$nonce = $_REQUEST['nonce'];

-			if ( ! wp_verify_nonce( $nonce, 'clear-mc-transient-data' ) ) {

+			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 ) );

 			}

 

@@ -2898,14 +2898,14 @@ 
 

 			// if the request came from the settings page, redirect to the settings page.

 			$referer = wp_get_referer();

-			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {

+			if ( $referer && ( strpos( $referer, 'yikes-inc-easy-mailchimp-settings' ) > 0 ) ) {
 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=api-cache-settings&transient-cleared=true' ) ) );

-			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {

+			} elseif ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] === 'yikes-mailchimp-edit-form' && isset( $_REQUEST['id'] ) && ! empty( $_REQUEST['id'] ) ) {
 

 				// else check if we were editing a form.

 				$id = filter_var( $_REQUEST['id'], FILTER_SANITIZE_NUMBER_INT );

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $id ) ) );

-			} else {

+			} else {
 				// else redirect to the manage forms page.

 				wp_redirect( esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp&transient-cleared=true' ) ) );

 			}

@@ -2921,17 +2921,17 @@ 
 		 * @since 6.0.2

 		 * @return $list_id_array - array of list id's to loop over

 		 */

-		public function get_mailchimp_list_ids_on_account() {

+		public function get_mailchimp_list_ids_on_account() {
 			$api_key = yikes_get_mc_api_key();

-			if ( ! $api_key ) {

+			if ( ! $api_key ) {
 				// if no api key is set/site is not connected, return an empty array.

 				return array();

 			}

 

 			$lists = get_transient( 'yikesinc_eme_list_ids' );

-			if ( false === $lists ) {

+			if ( false === $lists ) {
 				$lists = yikes_get_mc_api_manager()->get_list_handler()->get_list_ids();

-				if ( is_wp_error( $lists ) ) {

+				if ( is_wp_error( $lists ) ) {
 					return array();

 				}

 				set_transient( 'yikesinc_eme_list_ids', $lists, HOUR_IN_SECONDS );

@@ -2945,9 +2945,9 @@ 
 		 *

 		 *	@since 6.0

 		 */

-		public function yikes_mailchimp_load_helper_class() {

+		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' );

 			}

@@ -2960,11 +2960,11 @@ 
 		 * @order requires that yikes-inc-easy-mailchimp-extender-admin.min.css be enqueued, so we can override the defaults (handle: yikes-inc-easy-mailchimp-extender-admin)

 		 * @return print out custom styles to the admin header to alter the default blue color

 		 */

-		public function alter_yikes_easy_mc_color_scheme() {

+		public function alter_yikes_easy_mc_color_scheme() {
 			// get the current set color scheme for the logged in user

 			$current_color_scheme = get_user_option( 'admin_color' );

 			// switch over each color scheme, and set our variable

-			switch ( $current_color_scheme ) {

+			switch ( $current_color_scheme ) {
 				default:

 				case 'fresh': // default blue (defined by this plugin)

 					$main_color = '#00a0d2';

@@ -3012,16 +3012,16 @@ 
 		/**

 		 *	Display premium support page if any add-ons are installed, otherwise display free support page

 		 */

-		public function display_support_page_content() {

+		public function display_support_page_content() {
 

 			$addons = get_option( 'yikes-easy-mc-active-addons', array() );

 

 			// If we have premium add-ons...

-			if ( ! empty( $addons ) ) { 

+			if ( ! empty( $addons ) ) {
 

 				// Add our premium support partial.

 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/premium-support.php' );

-			} else {

+			} else {
 

 				// Otherwise add our free support partial.

 				include_once( YIKES_MC_PATH . 'admin/partials/helpers/free-support.php' );

@@ -3033,8 +3033,8 @@ 
 		 *

 		 * @since 6.0.4

 		 */

-		public function check_yikes_mc_table_version() {

-			if ( get_option( 'yikes_mc_database_version', '0.00' ) < '1.0' ) {

+		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';

 				global $wpdb;

 				Yikes_Inc_Easy_Mailchimp_Extender_Activator::_activate_yikes_easy_mailchimp( $wpdb );

@@ -3048,7 +3048,7 @@ 
 		 *

 		 * @since 6.0.4.4

 		 */

-		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {

+		public function process_subscriber_count_shortcode_in_form_descriptions( $form_description, $form_id ) {
 			$form_description = str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $form_id . '"]' ), $form_description );

 			return $form_description;

 		}

@@ -3058,9 +3058,9 @@ 
 		 *

 		 * @since 6.0.3

 		 */

-		public function generate_edit_forms_upsell_ad() {

+		public function generate_edit_forms_upsell_ad() {
 		$upsell_ads = glob( YIKES_MC_PATH . 'includes/upsells/*.php' );

-		if ( $upsell_ads && ! empty( $upsell_ads ) ) {

+		if ( $upsell_ads && ! empty( $upsell_ads ) ) {
 			$ad_count = absint( count( $upsell_ads ) - 1 );

 			$ad       = $upsell_ads[ mt_rand( 0, $ad_count ) ];

 			ob_start();

@@ -3077,11 +3077,11 @@ 
 		 * Mainly used when the API key is altered, changed or removed.

 		 * @since 6.1.3

 		 */

-		public function delete_yikes_mailchimp_transients() {

+		public function delete_yikes_mailchimp_transients() {
 

 		// delete all of the list_id transients.

 		$list_ids = $this->get_mailchimp_list_ids_on_account();

-		foreach ( $list_ids as $id ) {

+		foreach ( $list_ids as $id ) {
 			delete_transient( "yikes_eme_list_{$id}" );

 			delete_transient( "yikes_eme_merge_variables_{$id}" );

 			delete_transient( "yikes_eme_interest_categories_{$id}" );

@@ -3101,13 +3101,13 @@ 
 	 *

 	 * @author Jeremy Pry

 	 */

-	public function check_db_version() {

+	public function check_db_version() {
 		$option = get_option( 'yikes_easy_mailchimp_extender_version', '0.0.0' );

-		if ( version_compare( $option, '6.2.0', '<' ) ) {

+		if ( version_compare( $option, '6.2.0', '<' ) ) {
 			$this->convert_db_to_option();

 		}

 

-		if ( version_compare( $option, YIKES_MC_VERSION, '<' ) ) {

+		if ( version_compare( $option, YIKES_MC_VERSION, '<' ) ) {
 			update_option( 'yikes_easy_mailchimp_extender_version', YIKES_MC_VERSION );

 		}

 	}

@@ -3117,7 +3117,7 @@ 
 	 *

 	 * @author Jeremy Pry

 	 */

-	public function convert_db_to_option() {

+	public function convert_db_to_option() {
 		/** @var wpdb */

 		global $wpdb;

 

@@ -3126,11 +3126,11 @@ 
 		$form_option      = array();

 		$form_ids         = $db_interface->get_form_ids();

 

-		if ( empty( $form_ids ) ) {

+		if ( empty( $form_ids ) ) {
 			return;

 		}

 

-		foreach ( $form_ids as $form_id ) {

+		foreach ( $form_ids as $form_id ) {
 			$form_option[ $form_id ] = $db_interface->get_form( $form_id );

 		}

 

@@ -3142,7 +3142,7 @@ 
 	 *

 	 * @author Jeremy Pry

 	 */

-	public function register_optin_widget() {

+	public function register_optin_widget() {
 		register_widget( 'Yikes_Inc_Easy_Mailchimp_Extender_Widget' );

 	}

 }