yikesinc / yikes-inc-easy-mailchimp-extender

includes/add_ons/eu-compliance.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	<div class="addon-footer-wrap give-clearfix">
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		<span class="dashicons dashicons-external"></span></a>
 	</div>
 

includes/add_ons/incentives.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	<div class="addon-footer-wrap give-clearfix">
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		<span class="dashicons dashicons-external"></span></a>
 	</div>
 

includes/add_ons/customizer.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
 	<div class="addon-footer-wrap give-clearfix">
 		<a href="<?php echo esc_attr( $permalink ); ?>" title="<?php echo esc_attr( $add_on_title ); ?>" class="button-secondary" target="_blank">
-			<?php esc_attr_e( 'View Add-on' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php esc_attr_e( 'View Add-on', 'yikes-inc-easy-mailchimp-extender' ); ?>
 		<span class="dashicons dashicons-external"></span></a>
 	</div>
 

public/partials/shortcodes/process_form_shortcode.php

Indentation +64 added lines, -64 removed lines

@@ -154,9 +154,9 @@ 
 	}
 
 	/**
-	*	If login is required, abort
-	*	@since 6.0.3.8
-	*/
+	 *	If login is required, abort
+	 *	@since 6.0.3.8
+	 */
 	if( $form_login_required ) {
 		if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
 			ob_start();
@@ -171,9 +171,9 @@ 
 	}
 
 	/**
-	*	Check if schedule is set for this form
-	*	@since 6.0.3.8
-	*/
+	 *	Check if schedule is set for this form
+	 *	@since 6.0.3.8
+	 */
 	if( $form_schedule_state ) {
 		// store current date
 		$current_date = strtotime( current_time( 'm/d/Y g:iA' ) );
@@ -226,8 +226,8 @@ 
 	}
 
 	/**
-	*	Check for form inline parameter
-	*/
+	 *	Check for form inline parameter
+	 */
 	$form_inline = ( $atts['inline'] == 1 || $atts['inline'] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension
 	// recheck from our form options
 	if ( ! $form_inline ) {
@@ -291,21 +291,21 @@ 
 	/**** Set up any filter'able content (that needs to be filtered before the rest of the logic kicks off) ****/
 
 	/**
-	*	yikes-mailchimp-countries-with-zip
-	*
-	*	Filter which countries show the zip field
-	*
-	*	@param array | An array of country codes that the zip field will appear for - default: US, GB, CA
-	*				   Note: please return the array with the country code as the KEY! This allows for optimal searching. 
-	*	@param int   | $form_id
-	*/
+	 *	yikes-mailchimp-countries-with-zip
+	 *
+	 *	Filter which countries show the zip field
+	 *
+	 *	@param array | An array of country codes that the zip field will appear for - default: US, GB, CA
+	 *				   Note: please return the array with the country code as the KEY! This allows for optimal searching. 
+	 *	@param int   | $form_id
+	 */
 	$countries_with_zip_code_field = apply_filters( 'yikes-mailchimp-countries-with-zip', 
 										array( 'US' => 'US', 'GB' => 'GB', 'CA' => 'CA', 
-											   'IE' => 'IE', 'CN' => 'CN', 'IN' => 'IN', 
-											   'AU' => 'AU', 'BR' => 'BR', 'MX' => 'MX',
-											   'IT' => 'IT', 'NZ' => 'NZ', 'JP' => 'JP',
-											   'FR' => 'FR', 'GR' => 'GR', 'DE' => 'DE',
-											   'NL' => 'NL', 'PT' => 'PT', 'ES' => 'ES'
+												'IE' => 'IE', 'CN' => 'CN', 'IN' => 'IN', 
+												'AU' => 'AU', 'BR' => 'BR', 'MX' => 'MX',
+												'IT' => 'IT', 'NZ' => 'NZ', 'JP' => 'JP',
+												'FR' => 'FR', 'GR' => 'GR', 'DE' => 'DE',
+												'NL' => 'NL', 'PT' => 'PT', 'ES' => 'ES'
 										), $form_id
 									);
 
@@ -532,14 +532,14 @@ 
 							$description .= '</p>';
 
 							/**
-							*	'yikes-mailchimp-' . $field['merge'] . '-description-html' (e.g. yikes-mailchimp-FNAME-description-html)
-							*
-							* 	Filter the description HTML block
-							*	
-							*	@param string | $description 			| The full HTML description block
-							*	@param string | $field['description']	| The field's description text
-							*	@param int	  | $form_id
-							*/
+							 *	'yikes-mailchimp-' . $field['merge'] . '-description-html' (e.g. yikes-mailchimp-FNAME-description-html)
+							 *
+							 * 	Filter the description HTML block
+							 *	
+							 *	@param string | $description 			| The full HTML description block
+							 *	@param string | $field['description']	| The field's description text
+							 *	@param int	  | $form_id
+							 */
 							$description = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id );
 						}
 
@@ -684,13 +684,13 @@ 
 								$required_fields = array( 'addr1' => 'address' , 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip' , 'country' => 'country' );
 
 								/**
-								* Filter to control the default country (the option pre-selected in the country dropdown).
-								*
-								*	'yikes-mailchimp-default-country-value'
-								*
-								* @param string | $country_slug | The slug of the desired default country. Default: 'US'
-								* @param int	| $form_id		| ID of the form
-								*/
+								 * Filter to control the default country (the option pre-selected in the country dropdown).
+								 *
+								 *	'yikes-mailchimp-default-country-value'
+								 *
+								 * @param string | $country_slug | The slug of the desired default country. Default: 'US'
+								 * @param int	| $form_id		| ID of the form
+								 */
 								$default_country = apply_filters( 'yikes-mailchimp-default-country-value', 'US', $form_id );
 
 								// <!-- Description Above -->
@@ -756,15 +756,15 @@ 
 														<?php
 															$state_and_province_list = file_get_contents( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-and-province-dropdown.php' ); 
 															/**
-															*	'yikes-mailchimp-state-province-list'
-															*
-															*	Filter the HTML options for the states dropdown
-															*
-															* 	@param string  | $state_and_province_list | HTML string of state/province options
-															*	@param int	   | $form_id				  | The form ID
-															*
-															*	@return string | $state_and_province_list | Filtered HTML string of state/province options
-															*/
+															 *	'yikes-mailchimp-state-province-list'
+															 *
+															 *	Filter the HTML options for the states dropdown
+															 *
+															 * 	@param string  | $state_and_province_list | HTML string of state/province options
+															 *	@param int	   | $form_id				  | The form ID
+															 *
+															 *	@return string | $state_and_province_list | Filtered HTML string of state/province options
+															 */
 															echo apply_filters( 'yikes-mailchimp-state-province-list', $state_and_province_list, $form_id );
 															
 														?>
@@ -797,17 +797,17 @@ 
 													} else { 
 
 														/**
-														* A filter to set the default zip code value.
-														*
-														* U.S. users may want to default their subscribers. 
-														* However, this filter is more for non-U.S. users, where the zip field is hidden. 
-														* MailChimp requires a zip code (for all submissions/countries), so this filter allows users users to set a default value.
-														*
-														*	'yikes-mailchimp-default-zip-code'
-														*
-														* @param string | $zip		| A value to pre-populate the zip code with.
-														* @param int	| $form_id	| ID of the form
-														*/
+														 * A filter to set the default zip code value.
+														 *
+														 * U.S. users may want to default their subscribers. 
+														 * However, this filter is more for non-U.S. users, where the zip field is hidden. 
+														 * MailChimp requires a zip code (for all submissions/countries), so this filter allows users users to set a default value.
+														 *
+														 *	'yikes-mailchimp-default-zip-code'
+														 *
+														 * @param string | $zip		| A value to pre-populate the zip code with.
+														 * @param int	| $form_id	| ID of the form
+														 */
 														$zip_value = apply_filters( 'yikes-mailchimp-default-zip-code', '', $form_id );
 													}
 												?>
@@ -1038,14 +1038,14 @@ 
 							$description .= '</p>';
 
 							/**
-							*	'yikes-mailchimp-' . $field['group_id'] . '-description-html' (e.g. yikes-mailchimp-0ab8f8c84b-description-html)
-							*
-							* 	Filter the description HTML block
-							*	
-							*	@param string | $description 			| The full HTML description block
-							*	@param string | $field['description']	| The field's description text
-							*	@param int	  | $form_id
-							*/
+							 *	'yikes-mailchimp-' . $field['group_id'] . '-description-html' (e.g. yikes-mailchimp-0ab8f8c84b-description-html)
+							 *
+							 * 	Filter the description HTML block
+							 *	
+							 *	@param string | $description 			| The full HTML description block
+							 *	@param string | $field['description']	| The field's description text
+							 *	@param int	  | $form_id
+							 */
 							$description = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id );
 						}
 

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 

Spacing +284 added lines, -284 removed lines

@@ -30,39 +30,39 @@ 
 	$form_submitted = isset( $form_submitted ) ? $form_submitted : 0;
 
 	/* If the user hasn't authenticated yet, lets kill off */
-	if ( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
-		return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to Mailchimp. You need to enter a valid Mailchimp API key." , 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>';
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
+		return '<div class="invalid-api-key-error"><p>' . __( "Whoops, you're not connected to Mailchimp. You need to enter a valid Mailchimp API key.", 'yikes-inc-easy-mailchimp-extender' ) . '</p></div>';
 	}
 
 	// if the user forgot to specify a form ID, lets kill of and warn them.
-	if( ! $atts['form'] ) {
+	if ( ! $atts[ 'form' ] ) {
 		return __( 'Whoops, it looks like you forgot to specify a form to display.', 'yikes-inc-easy-mailchimp-extender' );
 	}
 
 	// store our variables
-	$form_id   = (int) $atts['form']; // form id (the id of the form in the database)
+	$form_id   = (int) $atts[ 'form' ]; // form id (the id of the form in the database)
 	$interface = yikes_easy_mailchimp_extender_get_form_interface();
 	$form_data = $interface->get_form( $form_id );
 
 	// confirm we have some results, or return an error
 	if ( empty( $form_data ) ) {
-		return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form." , 'yikes-inc-easy-mailchimp-extender' );
+		return __( "Oh no...This form doesn't exist. Head back to the manage forms page and select a different form.", 'yikes-inc-easy-mailchimp-extender' );
 	}
 
 	/*
 	*	Check if the user wants to use reCAPTCHA Spam Prevention
 	*/
-	if ( get_option( 'yikes-mc-recaptcha-status' , '' ) == '1' ) {
+	if ( get_option( 'yikes-mc-recaptcha-status', '' ) == '1' ) {
 
 		// Allow users to manually set recaptcha (instead of globally - recaptcha="1"/recaptcha="0" - but still needs to be globally enabled on the settings page).
-		if ( $atts['recaptcha'] != '0' ) {
+		if ( $atts[ 'recaptcha' ] != '0' ) {
 
 			// If either of the Private the Secret key is left blank, we should display an error back to the user.
-			if ( get_option( 'yikes-mc-recaptcha-site-key' , '' ) == '' ) {
-				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
+			if ( get_option( 'yikes-mc-recaptcha-site-key', '' ) == '' ) {
+				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA site key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
 			}
-			if ( get_option( 'yikes-mc-recaptcha-secret-key' , '' ) == '' ) {
-				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!" , 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings' , 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
+			if ( get_option( 'yikes-mc-recaptcha-secret-key', '' ) == '' ) {
+				return __( "Whoops! It looks like you enabled reCAPTCHA but forgot to enter the reCAPTCHA secret key!", 'yikes-inc-easy-mailchimp-extender' ) . '<span class="edit-link yikes-easy-mc-edit-link"><a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=recaptcha-settings' ) ) . '" title="' . __( 'ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '">' . __( 'Edit ReCaptcha Settings', 'yikes-inc-easy-mailchimp-extender' ) . '</a></span>';
 			}
 
 			$has_recaptcha = true;
@@ -72,13 +72,13 @@ 
 			$locale_split = explode( '_', $locale );
 
 			// Setup reCAPTCHA parameters.
-			$lang       = ! empty( $locale_split ) ? $locale_split[0] : $locale;
-			$lang       = ! empty( $atts['recaptcha_lang'] ) ? $atts['recaptcha_lang'] : $lang;
-			$type       = ! empty( $atts['recaptcha_type'] ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type
-			$theme      = ! empty( $atts['recaptcha_theme'] ) ? strtolower( $atts['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
-			$size       = ! empty( $atts['recaptcha_size'] ) ? strtolower( $atts['recaptcha_size'] ) : 'normal'; // setup recaptcha size
-			$data_cb    = ! empty( $atts['recaptcha_data_callback'] ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size
-			$expired_cb = ! empty( $atts['recaptcha_expired_callback'] ) ? $atts['recaptcha_expired_callback'] : false; // setup recaptcha size
+			$lang       = ! empty( $locale_split ) ? $locale_split[ 0 ] : $locale;
+			$lang       = ! empty( $atts[ 'recaptcha_lang' ] ) ? $atts[ 'recaptcha_lang' ] : $lang;
+			$type       = ! empty( $atts[ 'recaptcha_type' ] ) ? strtolower( $atts[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type
+			$theme      = ! empty( $atts[ 'recaptcha_theme' ] ) ? strtolower( $atts[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme
+			$size       = ! empty( $atts[ 'recaptcha_size' ] ) ? strtolower( $atts[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size
+			$data_cb    = ! empty( $atts[ 'recaptcha_data_callback' ] ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size
+			$expired_cb = ! empty( $atts[ 'recaptcha_expired_callback' ] ) ? $atts[ 'recaptcha_expired_callback' ] : false; // setup recaptcha size
 
 			// Pass the shortcode parameters through a filter.
 			$recaptcha_shortcode_params = apply_filters( 'yikes-mailchimp-recaptcha-parameters', array(
@@ -88,49 +88,49 @@ 
 				'size'             => $size,
 				'success_callback' => $data_cb,
 				'expired_callback' => $expired_cb,
-			), $atts['form'] );
+			), $atts[ 'form' ] );
 
 			// Enqueue Google recaptcha JS.
-			wp_register_script( 'google-recaptcha-js' , 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params['language'] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery', 'form-submission-helpers' ) , 'all' );
+			wp_register_script( 'google-recaptcha-js', 'https://www.google.com/recaptcha/api.js?hl=' . $recaptcha_shortcode_params[ 'language' ] . '&onload=renderReCaptchaCallback&render=explicit', array( 'jquery', 'form-submission-helpers' ), 'all' );
 			wp_enqueue_script( 'google-recaptcha-js' );
 
-			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
-			$recaptcha_box      = '<div class="g-recaptcha" data-sitekey="' . esc_attr( $recaptcha_site_key ) . '" data-theme="' . esc_attr( $recaptcha_shortcode_params['theme'] ) . '" data-type="' . esc_attr( $recaptcha_shortcode_params['type'] ) . '" data-size="' . esc_attr( $recaptcha_shortcode_params['size'] ) . '" data-callback="' . esc_attr( $recaptcha_shortcode_params['success_callback'] ) . '" data-expired-callback="' . esc_attr( $recaptcha_shortcode_params['expired_callback'] ) . '"></div>';
+			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key', '' );
+			$recaptcha_box      = '<div class="g-recaptcha" data-sitekey="' . esc_attr( $recaptcha_site_key ) . '" data-theme="' . esc_attr( $recaptcha_shortcode_params[ 'theme' ] ) . '" data-type="' . esc_attr( $recaptcha_shortcode_params[ 'type' ] ) . '" data-size="' . esc_attr( $recaptcha_shortcode_params[ 'size' ] ) . '" data-callback="' . esc_attr( $recaptcha_shortcode_params[ 'success_callback' ] ) . '" data-expired-callback="' . esc_attr( $recaptcha_shortcode_params[ 'expired_callback' ] ) . '"></div>';
 		}
 	}
 
 	// place our results into a separate variable for easy looping
-	$additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? $form_data['form_settings'] : false;
+	$additional_form_settings = ( isset( $form_data[ 'form_settings' ] ) ) ? $form_data[ 'form_settings' ] : false;
 	
 	// store our options from the additional form settings array
-	$form_classes = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-class-names'] : '';
-	$inline_form = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-inline-form'] : '';
-	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-submit-button-type'] : 'text';
-	$submit_button_text = ( $additional_form_settings && $additional_form_settings['yikes-easy-mc-submit-button-text'] != '' ) ? esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-text'] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
-	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings['yikes-easy-mc-submit-button-image'] ) : '';
-	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings['yikes-easy-mc-submit-button-classes'] ) : '';
+	$form_classes = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-class-names' ] : '';
+	$inline_form = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-inline-form' ] : '';
+	$submit_button_type = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-submit-button-type' ] : 'text';
+	$submit_button_text = ( $additional_form_settings && $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] != '' ) ? esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-text' ] ) : __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
+	$submit_button_image = ( $additional_form_settings ) ? esc_url( $additional_form_settings[ 'yikes-easy-mc-submit-button-image' ] ) : '';
+	$submit_button_classes = ( $additional_form_settings ) ? ' ' . esc_attr( $additional_form_settings[ 'yikes-easy-mc-submit-button-classes' ] ) : '';
 
 	// scheuldes
-	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-schedule'] : false;
-	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-start'] : '';;
-	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-end'] : '';
-	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-pending-message'] : '';
-	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-expired-message'] : '';
+	$form_schedule_state = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-schedule' ] : false;
+	$form_schedule_start = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-start' ] : ''; ;
+	$form_schedule_end = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-end' ] : '';
+	$form_pending_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ] : '';
+	$form_expired_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ] : '';
 
 	// register required
-	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-login-required'] : false;
-	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings['yikes-easy-mc-form-restriction-login-message'] : '';
+	$form_login_required = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-login-required' ] : false;
+	$form_login_message = ( $additional_form_settings ) ? $additional_form_settings[ 'yikes-easy-mc-form-restriction-login-message' ] : '';
 
 	// store number of fields
-	$field_count = (int) count( $form_data['fields'] );
+	$field_count = (int) count( $form_data[ 'fields' ] );
 
 	// confirm we actually have fields, before looping
-	if ( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) {
+	if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) {
 		// loop over each field, if it's set to hidden -- subtract it from the field count
 		// this throws off the layout for inline forms setup below
-		foreach ( $form_data['fields'] as $form_field ) {
-			if ( isset( $form_field['hide'] ) && (string) $form_field['hide'] === '1' ) {
-				$field_count --;
+		foreach ( $form_data[ 'fields' ] as $form_field ) {
+			if ( isset( $form_field[ 'hide' ] ) && (string) $form_field[ 'hide' ] === '1' ) {
+				$field_count--;
 			}
 		}
 	}
@@ -139,8 +139,8 @@ 
 	*	If login is required, abort
 	*	@since 6.0.3.8
 	*/
-	if( $form_login_required ) {
-		if( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
+	if ( $form_login_required ) {
+		if ( apply_filters( 'yikes-mailchimp-required-login-requirement', ! is_user_logged_in() ) ) {
 			ob_start();
 				?>
 					<div class="yikes-mailchimp-login-required yikes-mailchimp-form-<?php echo $form_id; ?>-login-required">
@@ -156,19 +156,19 @@ 
 	*	Check if schedule is set for this form
 	*	@since 6.0.3.8
 	*/
-	if( $form_schedule_state ) {
+	if ( $form_schedule_state ) {
 		// store current date
 		$current_date = strtotime( current_time( 'm/d/Y g:iA' ) );
 
 		// the the current date is less than the form scheduled start date
-		if( $current_date < $form_schedule_start ) {
+		if ( $current_date < $form_schedule_start ) {
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_pending_message, $form_id, $form_schedule_start );
 			return;
 			// abort
 		}
 
 		// The current date is past or equal to the end date, aka form has now expired
-		if( $current_date >= $form_schedule_end ) {
+		if ( $current_date >= $form_schedule_end ) {
 			echo apply_filters( 'yikes-mailchimp-frontend-content', $form_expired_message, $form_id, $form_schedule_end );
 			return;
 			// abort
@@ -177,14 +177,14 @@ 
 
 	// setup the submit button text
 	// shortcode parameter takes precedence over option
-	$submit = ( ! empty( $atts['submit'] ) ) ? $atts['submit'] : $submit_button_text;
+	$submit = ( ! empty( $atts[ 'submit' ] ) ) ? $atts[ 'submit' ] : $submit_button_text;
 
 	/*
 	*	Check for the constant to prevent styles from loading
 	*	to exclude styles from loading, add `define( 'YIKES_MAILCHIMP_EXCLUDE_STYLES', true );` to functions.php
 	*	@since 6.0.3.8
 	*/
-	if( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
+	if ( ! defined( 'YIKES_MAILCHIMP_EXCLUDE_STYLES' ) ) {
 		// enqueue the form styles
 		wp_enqueue_style( 'yikes-inc-easy-mailchimp-public-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-extender-public.min.css' );
 	}
@@ -192,19 +192,19 @@ 
 	/**
 	*	Check for form inline parameter
 	*/
-	$form_inline = ( $atts['inline'] == 1 || $atts['inline'] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension
+	$form_inline = ( $atts[ 'inline' ] == 1 || $atts[ 'inline' ] == 'true' || get_theme_mod( 'form-inline-' . $form_id, '' ) === true ); // form-inline-{$form_id} comes from customizer extension
 	// recheck from our form options
 	if ( ! $form_inline ) {
-		$form_inline = (bool) $additional_form_settings['yikes-easy-mc-inline-form'];
+		$form_inline = (bool) $additional_form_settings[ 'yikes-easy-mc-inline-form' ];
 	}
 
 	/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
-	if( is_user_logged_in() ) {
-		if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+	if ( is_user_logged_in() ) {
+		if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 			$edit_form_link = '<span class="edit-link">';
-			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts['form'] ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $atts[ 'form' ] ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_data[ 'form_name' ] ) . '">' . __( 'Edit Form', 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 			$edit_form_link .= '</span>';
-			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts['form'], ucwords( $form_data['form_name'] ) );
+			$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $atts[ 'form' ], ucwords( $form_data[ 'form_name' ] ) );
 		} else {
 			$edit_form_link = '';
 		}
@@ -214,16 +214,16 @@ 
 	// or else MailChimp throws errors at you
 	// extract our array keys
 	// @todo Remove array_keys() and in_array() usage here.
-	if( isset( $form_data['fields'] ) && ! empty( $form_data['fields'] ) ) {
-		$array_keys = array_keys( $form_data['fields'] );
+	if ( isset( $form_data[ 'fields' ] ) && ! empty( $form_data[ 'fields' ] ) ) {
+		$array_keys = array_keys( $form_data[ 'fields' ] );
 		// check for EMAIL in that array
-		if( !in_array( 'EMAIL', $array_keys ) && !in_array( 'email', $array_keys ) ) {
-			return '<p>' . __( "An email field is required for all Mailchimp forms. Please add an email field to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>';
+		if ( ! in_array( 'EMAIL', $array_keys ) && ! in_array( 'email', $array_keys ) ) {
+			return '<p>' . __( "An email field is required for all Mailchimp forms. Please add an email field to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p><p>' . $edit_form_link . '</p>';
 		}
 	} else {
-		$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
-		if( is_user_logged_in() ) {
-			if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+		$error = '<p>' . __( "Whoops, it looks like you forgot to assign fields to this form.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+		if ( is_user_logged_in() ) {
+			if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 				return $error . $edit_form_link;
 			}
 		} else {
@@ -325,17 +325,17 @@ 
 		*	Set a custom title using custom_title="lorem ipsum" parameter in the shortcode
 		*	- This takes precedence over the title set
 		*/
-		if ( $atts['title'] ) {
-			if ( ! empty( $atts['custom_title'] ) ) {
+		if ( $atts[ 'title' ] ) {
+			if ( ! empty( $atts[ 'custom_title' ] ) ) {
 				/**
 				 * Filter the title that is displayed through the shortcode.
 				 *
 				 * @param string $title   The title to display.
 				 * @param int    $form_id The form ID.
 				 */
-				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts['custom_title'] ), $form_id );
+				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts[ 'custom_title' ] ), $form_id );
 			} else {
-				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data['form_name'] ), $form_id );
+				$title = apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_data[ 'form_name' ] ), $form_id );
 			}
 
 			echo sprintf( '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-%1$s">%2$s</h3>', $form_id, $title );
@@ -345,17 +345,17 @@ 
 		*	Allow users to specify a custom description for this form, no html support
 		*	@since 6.0.3.8
 		*/
-		if ( $atts['description'] ) {
-			if ( ! empty( $atts['custom_description'] ) ) {
+		if ( $atts[ 'description' ] ) {
+			if ( ! empty( $atts[ 'custom_description' ] ) ) {
 				/**
 				 * Filter the description that is displayed through the shortcode.
 				 *
 				 * @param string $title   The title to display.
 				 * @param int    $form_id The form ID.
 				 */
-				$description = apply_filters( 'yikes-mailchimp-form-description', $atts['custom_description'], $form_id );
+				$description = apply_filters( 'yikes-mailchimp-form-description', $atts[ 'custom_description' ], $form_id );
 			} else {
-				$description = apply_filters( 'yikes-mailchimp-form-description', $form_data['form_description'], $form_id );
+				$description = apply_filters( 'yikes-mailchimp-form-description', $form_data[ 'form_description' ], $form_id );
 			}
 
 			echo sprintf( '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-%1$s">%2$s</section>', $form_id, $description );
@@ -370,10 +370,10 @@ 
 		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
 
 		// Check for AJAX
-		if( ( ! empty( $atts['ajax'] ) && $atts['ajax'] == 1 ) || $form_data['submission_settings']['ajax'] == 1 ) {
+		if ( ( ! empty( $atts[ 'ajax' ] ) && $atts[ 'ajax' ] == 1 ) || $form_data[ 'submission_settings' ][ 'ajax' ] == 1 ) {
 
 			// Enqueue our ajax script
-			wp_enqueue_script( 'yikes-easy-mc-ajax' , YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js" , array( 'jquery' ), YIKES_MC_VERSION, false );
+			wp_enqueue_script( 'yikes-easy-mc-ajax', YIKES_MC_URL . "public/js/yikes-mc-ajax-forms{$min}.js", array( 'jquery' ), YIKES_MC_VERSION, false );
 			wp_localize_script( 'yikes-easy-mc-ajax', 'yikes_mailchimp_ajax', array(
 				'ajax_url'                      => esc_url( admin_url( 'admin-ajax.php' ) ),
 				'page_data'                     => $page_data,
@@ -404,67 +404,67 @@ 
 
 		// render the form!
 		?>
-			<form id="<?php echo sanitize_title( $form_data['form_name'] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline )  { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if( !empty( $_POST ) && $form_submitted == 1 && $form_data['submission_settings']['hide_form_post_signup'] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" method="POST" data-attr-form-id="<?php echo esc_attr( $form_id ); ?>">
+			<form id="<?php echo sanitize_title( $form_data[ 'form_name' ] ); ?>-<?php echo $form_id; ?>" class="yikes-easy-mc-form yikes-easy-mc-form-<?php echo $form_id . ' '; if ( $form_inline ) { echo 'yikes-mailchimp-form-inline '; } echo ' ' . apply_filters( 'yikes-mailchimp-form-class', $form_classes, $form_id ); if ( ! empty( $_POST ) && $form_submitted == 1 && $form_data[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" method="POST" data-attr-form-id="<?php echo esc_attr( $form_id ); ?>">
 
 				<?php
 				// Set a default constant for hidden fields
 				$hidden_label_count = 0;
 
 				// Loop over our form fields
-				foreach( $form_data['fields'] as $field ) {
+				foreach ( $form_data[ 'fields' ] as $field ) {
 						// input array
 						$field_array = array();
 						// label array
 						$label_array = array();
 						// label classes array
 						$label_class_array = array();
-						if( $field['additional-classes'] != '' ) {
+						if ( $field[ 'additional-classes' ] != '' ) {
 							// split custom classes at spaces
-							$custom_classes = explode( ' ' , $field['additional-classes'] );
+							$custom_classes = explode( ' ', $field[ 'additional-classes' ] );
 							// check our custom class array for field-left/field-right
 							// if it's set we need to assign it to our label and remove it from the field classes
 							 // input half left
-							if( in_array( 'field-left-half' , $custom_classes ) ) {
+							if ( in_array( 'field-left-half', $custom_classes ) ) {
 								// $label_array['class'] = 'class="field-left-half"';
-								$label_class_array[] = 'field-left-half';
-								$key = array_search( 'field-left-half' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'field-left-half';
+								$key = array_search( 'field-left-half', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // input half right
-							if( in_array( 'field-right-half' , $custom_classes ) ) {
+							if ( in_array( 'field-right-half', $custom_classes ) ) {
 								// $label_array['class'] = 'class="field-right-half"';
-								$label_class_array[] = 'field-right-half';
-								$key = array_search( 'field-right-half' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'field-right-half';
+								$key = array_search( 'field-right-half', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // input thirds (1/3 width, floated left)
-							if( in_array( 'field-third' , $custom_classes ) ) {
+							if ( in_array( 'field-third', $custom_classes ) ) {
 								// $label_array['class'] = 'class="field-third"';
-								$label_class_array[] = 'field-third';
-								$key = array_search( 'field-third' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'field-third';
+								$key = array_search( 'field-third', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // 2 column radio
-							if( in_array( 'option-2-col' , $custom_classes ) ) {
+							if ( in_array( 'option-2-col', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-2-col"';
-								$label_class_array[] = 'option-2-col';
-								$key = array_search( 'option-2-col' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-2-col';
+								$key = array_search( 'option-2-col', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // 3 column radio
-							if( in_array( 'option-3-col' , $custom_classes ) ) {
+							if ( in_array( 'option-3-col', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-3-col"';
-								$label_class_array[] = 'option-3-col';
-								$key = array_search( 'option-3-col' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-3-col';
+								$key = array_search( 'option-3-col', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // 4 column radio
-							if( in_array( 'option-4-col' , $custom_classes ) ) {
+							if ( in_array( 'option-4-col', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-4-col"';
-								$label_class_array[] = 'option-4-col';
-								$key = array_search( 'option-4-col' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-4-col';
+								$key = array_search( 'option-4-col', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							} // inline radio & checkboxes etc
-							if( in_array( 'option-inline' , $custom_classes ) ) {
+							if ( in_array( 'option-inline', $custom_classes ) ) {
 								// $label_array['class'] = 'class="option-inline"';
-								$label_class_array[] = 'option-inline';
-								$key = array_search( 'option-inline' , $custom_classes );
-								unset( $custom_classes[$key] );
+								$label_class_array[ ] = 'option-inline';
+								$key = array_search( 'option-inline', $custom_classes );
+								unset( $custom_classes[ $key ] );
 							}
 						} else {
 							$custom_classes = array();
@@ -472,19 +472,19 @@ 
 
 						// if the form is set to inline, add the inline class to our labels
 						// since @6.0.3.8
-						if( $form_inline ) {
-							$label_class_array[] = 'label-inline';
+						if ( $form_inline ) {
+							$label_class_array[ ] = 'label-inline';
 						}
 
-						if( isset( $field['hide-label'] ) ) {
-							if( absint( $field['hide-label'] ) === 1 ) {
+						if ( isset( $field[ 'hide-label' ] ) ) {
+							if ( absint( $field[ 'hide-label' ] ) === 1 ) {
 								$hidden_label_count++;
-								$custom_classes[] = 'field-no-label';
+								$custom_classes[ ] = 'field-no-label';
 							}
 						}
 
 					/* Store tag variable based on field type */
-					if( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 						$group = '';
 						$tag = 'merge';
 					} else {
@@ -494,28 +494,28 @@ 
 
 					// build up our array
 					$field_id_string   = 'yikes-easy-mc-form-' . $form_id . '-' . $field[ $tag ];
-					$field_array['id'] = 'id="' . esc_attr( $field_id_string ) . '" ';
-					$field_array['name'] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" ';
-					$field_array['placeholder'] = isset( $field['placeholder'] ) ? 'placeholder="' . esc_attr( stripslashes( $field['placeholder'] ) ) . '" ' : '';
-					$field_array['classes'] = 'class="yikes-easy-mc-'.$field['type'] . ' ' .  esc_attr( trim( implode( ' ' , $custom_classes ) ) ) . '" ';
+					$field_array[ 'id' ] = 'id="' . esc_attr( $field_id_string ) . '" ';
+					$field_array[ 'name' ] = 'name="' . $group . esc_attr( $field[ $tag ] ) . '" ';
+					$field_array[ 'placeholder' ] = isset( $field[ 'placeholder' ] ) ? 'placeholder="' . esc_attr( stripslashes( $field[ 'placeholder' ] ) ) . '" ' : '';
+					$field_array[ 'classes' ] = 'class="yikes-easy-mc-' . $field[ 'type' ] . ' ' . esc_attr( trim( implode( ' ', $custom_classes ) ) ) . '" ';
 
 					// email must always be required and visible
-					if( $field['type'] == 'email' ) {
-						$field_array['required'] = 'required="required"';
-						$label_array['visible'] = '';
-						$label_class_array[] = $field['merge'] . '-label';
-						$label_class_array[] = 'yikes-mailchimp-field-required';
+					if ( $field[ 'type' ] == 'email' ) {
+						$field_array[ 'required' ] = 'required="required"';
+						$label_array[ 'visible' ] = '';
+						$label_class_array[ ] = $field[ 'merge' ] . '-label';
+						$label_class_array[ ] = 'yikes-mailchimp-field-required';
 					} else {
-						$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';
+						$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 both hide label and hide field are checked, we gotta hide the field!
-					if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
-						if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
-							$field_array['visible'] = 'style="display:none;"';
+					if ( isset( $field[ 'hide' ] ) && $field[ 'hide' ] == 1 ) {
+						if ( isset( $field[ 'hide-label' ] ) && $field[ 'hide-label' ] == 1 ) {
+							$field_array[ 'visible' ] = 'style="display:none;"';
 						}
 					}
 
@@ -523,20 +523,20 @@ 
 					$label_class_array = function_exists( 'sanitize_html_class' ) ? array_map( 'sanitize_html_class', $label_class_array ) : $label_class_array;
 
 					// Turn the clases into a string
-					$label_array['classes'] = 'class="' . implode( ' ', $label_class_array ) . ' "';
+					$label_array[ 'classes' ] = 'class="' . implode( ' ', $label_class_array ) . ' "';
 
 					// Filter the field array data
 					$field_array = apply_filters( 'yikes-mailchimp-field-data', $field_array, $field, $form_id );
 
 					/* Loop Over Standard Fields (aka merge variables) */
-					if( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 
 						// Handle the Description logic in one spot, here:
-						$show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false;
-						$description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false;
+						$show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false;
+						$description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false;
 						if ( $show_description === true ) {
-							$description = '<p class="form-field-description" id="form-field-description-' . $field['merge'] . '">';
-							$description .= apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id );
+							$description = '<p class="form-field-description" id="form-field-description-' . $field[ 'merge' ] . '">';
+							$description .= apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id );
 							$description .= '</p>';
 
 							/**
@@ -548,11 +548,11 @@ 
 							*	@param string | $field['description']	| The field's description text
 							*	@param int	  | $form_id
 							*/
-							$description = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id );
+							$description = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id );
 						}
 
 						// loop over our fields by Type
-						switch ( $field['type'] ) {
+						switch ( $field[ 'type' ] ) {
 
 							default:
 							case 'email':
@@ -560,24 +560,24 @@ 
 							case 'number':
 
 								// pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
 								$default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
 
 									?>
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php if( ! isset( $field['hide-label'] ) ) { echo apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label' , esc_attr( stripslashes( $field['label'] ) ), $form_id ); } ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ), $form_id ); } ?>
 											</span>
 										<?php } ?>
 
 										<!-- Description Above -->
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); if( $field['type'] != 'email' && $field['type'] != 'number' ) { ?> type="text" <?php } else if( $field['type'] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); if ( $field[ 'type' ] != 'email' && $field[ 'type' ] != 'number' ) { ?> type="text" <?php } else if ( $field[ 'type' ] == 'email' ) { ?> type="email" <?php } else { ?> type="number" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- Description Below -->
 										<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -589,23 +589,23 @@ 
 
 							case 'url':
 							case 'imageurl':
-								$default_value = ( isset( $field['default'] ) ) ? $field['default'] : '';
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
+								$default_value = ( isset( $field[ 'default' ] ) ) ? $field[ 'default' ] : '';
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
 									?>
 
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
 										<!-- Description Above -->
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="url" <?php if( $field['type'] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.' , 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>" >
+										<input <?php echo implode( ' ', $field_array ); ?> type="url" <?php if ( $field[ 'type' ] == 'url' ) { ?> title="<?php _e( 'Please enter a valid URL to the website.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } else { ?> title="<?php _e( 'Please enter a valid URL to the image.', 'yikes-inc-easy-mailchimp-extender' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>" >
 
 										<!-- Description Below -->
 										<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -616,24 +616,24 @@ 
 							break;
 
 							case 'phone':
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
-								$phone_format = $field['phone_format'];
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
+								$phone_format = $field[ 'phone_format' ];
 								?>
 
-									<label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field_id_string ) ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
 										<!-- Description Above -->
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $phone_format != 'US' ) { ?> data-phone-type="international" title="<?php _e( 'International Phone Number' , 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern' , '[0-9,-,+]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####' , 'yikes-inc-easy-mailchimp-extender' ); ?>" data-phone-type="us" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern' , '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $phone_format != 'US' ) { ?> data-phone-type="international" title="<?php _e( 'International Phone Number', 'yikes-inc-easy-mailchimp-extender' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-international-phone-pattern', '[0-9,-,+]{1,}' ); ?>" <?php } else { ?> title="<?php _e( 'US Phone Number (###) ### - ####', 'yikes-inc-easy-mailchimp-extender' ); ?>" data-phone-type="us" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern', '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- Description Below -->
 										<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -643,23 +643,23 @@ 
 							break;
 
 							case 'zip':
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
 
 									?>
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 									<!-- dictate label visibility -->
-									<?php if( ! isset( $field['hide-label'] ) ) { ?>
-										<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-											<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+									<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+										<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+											<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 										</span>
 									<?php } ?>
 
 									<!-- Description Above -->
 									<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
 
-									<input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>">
+									<input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="\d{5,5}(-\d{4,4})?" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>">
 
 									<!-- Description Below -->
 									<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -672,7 +672,7 @@ 
 							case 'address':
 
 								// required fields
-								$required_fields = array( 'addr1' => 'address' , 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip' , 'country' => 'country' );
+								$required_fields = array( 'addr1' => 'address', 'addr2' => 'address 2', 'city' => 'city', 'state' =>'state', 'zip' =>'zip', 'country' => 'country' );
 
 								/**
 								* Filter to control the default country (the option pre-selected in the country dropdown).
@@ -688,55 +688,55 @@ 
 								if ( $show_description === true && $description_above === true ) { echo $description; }
 
 								// Placeholder logic
-								if ( ! empty( $field_array['placeholder'] ) ) {
+								if ( ! empty( $field_array[ 'placeholder' ] ) ) {
 									
 									$use_address_placeholder = true;
 
 									// Don't use the address field's array placeholder - use the custom placeholder
-									unset( $field_array['placeholder'] );
+									unset( $field_array[ 'placeholder' ] );
 								}
 
 								// store number for looping
 								$x = 1;
-								foreach( $required_fields as $type => $label ) {
+								foreach ( $required_fields as $type => $label ) {
 
 									// set the field names for the address fields
-									$field_array['name'] = 'name="' . $field[$tag] . '[' . $type . ']' . '"';
+									$field_array[ 'name' ] = 'name="' . $field[ $tag ] . '[' . $type . ']' . '"';
 
 									// Set the placeholder value if we need to
 									$placeholder = isset( $use_address_placeholder ) ? apply_filters( 'yikes-mailchimp-address-' . $type . '-placeholder', ucwords( $label ) ) : '';
 
 									// reset the label classes for left-half/right-half for addresses
-									if( isset( $label_array['class'] ) ) {
+									if ( isset( $label_array[ 'class' ] ) ) {
 										if ( $x % 2 == 0 ) {
-											$label_array['class'] = str_replace( 'field-left-half', 'field-right-half', $label_array['class'] );
+											$label_array[ 'class' ] = str_replace( 'field-left-half', 'field-right-half', $label_array[ 'class' ] );
 										} else {
-											$label_array['class'] = str_replace( 'field-right-half', 'field-left-half', $label_array['class'] );
+											$label_array[ 'class' ] = str_replace( 'field-right-half', 'field-left-half', $label_array[ 'class' ] );
 										}
 									}
 
 									// Never force addr2 to be required
 									if ( $type === 'addr2' ) {
-										$field_array['required'] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id );
+										$field_array[ 'required' ] = apply_filters( 'yikes-mailchimp-address-2-required', '', $form_id );
 									}
 
-									switch( $type ) {
+									switch ( $type ) {
 
 										default:
 										case 'addr1':
 										case 'addr2':
 										case 'city':
 											?>
-											<label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>>
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>>
 
 												<!-- dictate label visibility -->
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?>
 													</span>
 												<?php } ?>
 												
-												<input <?php echo implode( ' ' , $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" value="<?php if( isset( $_POST[$field['merge']][$type] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']][$type] ); } ?>">
+												<input <?php echo implode( ' ', $field_array ); ?> placeholder="<?php echo $placeholder; ?>" type="text" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ][ $type ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ][ $type ] ); } ?>">
 
 											</label>
 											<?php
@@ -745,16 +745,16 @@ 
 
 										case 'state':
 											?>
-											<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="state-dropdown">
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="state-dropdown">
 
 												<!-- dictate label visibility -->
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?>
 													</span>
 												<?php } ?>
 
-													<select <?php echo implode( ' ' , $field_array ); ?>>
+													<select <?php echo implode( ' ', $field_array ); ?>>
 														<?php
 															$state_and_province_list = file_get_contents( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-and-province-dropdown.php' ); 
 															/**
@@ -780,21 +780,21 @@ 
 										case 'zip':
 
 											?>
-											<label for="<?php echo esc_attr( $field['merge'] ); ?>"  placeholder="<?php echo $placeholder; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="zip-input"<?php if ( ! isset( $countries_with_zip_code_field[ $default_country ] ) ) { ?> style="display: none;"<?php } ?>>
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>"  placeholder="<?php echo $placeholder; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="zip-input"<?php if ( ! isset( $countries_with_zip_code_field[ $default_country ] ) ) { ?> style="display: none;"<?php } ?>>
 
-												<?php if( ! isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?>
 													</span>
 												<?php } ?>
 
 												<?php 
 													// If zip lookup plugin is installed, the ZIP field comes back as an array and we need to handle it differently...
-													if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) {
-														if ( is_array( $_POST[$field['merge']] ) && isset( $_POST[$field['merge']]['zip'] ) ) {
-															$zip_value = $_POST[$field['merge']]['zip'];
+													if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) {
+														if ( is_array( $_POST[ $field[ 'merge' ] ] ) && isset( $_POST[ $field[ 'merge' ] ][ 'zip' ] ) ) {
+															$zip_value = $_POST[ $field[ 'merge' ] ][ 'zip' ];
 														} else {
-															$zip_value = $_POST[$field['merge']]; 
+															$zip_value = $_POST[ $field[ 'merge' ] ]; 
 														}
 													} else { 
 
@@ -814,7 +814,7 @@ 
 													}
 												?>
 
-												<input <?php echo implode( ' ' , $field_array ); ?>  placeholder="<?php echo $placeholder; ?>" type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?', $form_id ); ?>" title="<?php _e( '5 digit zip code, numbers only' , 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo esc_attr( $zip_value ); ?>">
+												<input <?php echo implode( ' ', $field_array ); ?>  placeholder="<?php echo $placeholder; ?>" type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-pattern', '\d{5,5}(-\d{4,4})?', $form_id ); ?>" title="<?php _e( '5 digit zip code, numbers only', 'yikes-inc-easy-mailchimp-extender' ); ?>" value="<?php echo esc_attr( $zip_value ); ?>">
 
 											</label>
 											<?php
@@ -824,16 +824,16 @@ 
 										case 'country':
 											?>
 
-											<label for="<?php echo esc_attr( $field['merge'] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ' , $label_array ); ?>>
+											<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" data-attr-name="<?php echo esc_attr( $type ); ?>-field" <?php echo implode( ' ', $label_array ); ?>>
 
 												<!-- dictate label visibility -->
-												<?php if( !isset( $field['hide-label'] ) ) { ?>
-													<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label' , esc_attr( $label ), $form_id ) ); ?>
+												<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+													<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+														<?php echo ucwords( apply_filters( 'yikes-mailchimp-address-' . $type . '-label', esc_attr( $label ), $form_id ) ); ?>
 													</span>
 												<?php } ?>
 
-												<select <?php echo implode( ' ' , $field_array ); ?> data-country="true">
+												<select <?php echo implode( ' ', $field_array ); ?> data-country="true">
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/country-dropdown.php' ); ?>
 												</select>
 											</label>
@@ -879,40 +879,40 @@ 
 								wp_register_script( 'yikes-datepicker-scripts', YIKES_MC_URL . "public/js/yikes-datepicker-scripts{$min}.js", array( 'jquery-ui-datepicker' ), YIKES_MC_VERSION, false );
 								wp_localize_script( 'yikes-datepicker-scripts', 'datepicker_settings', $datepicker_options );
 								wp_enqueue_script( 'yikes-datepicker-scripts' );
-								wp_enqueue_style( 'jquery-datepicker-styles' , YIKES_MC_URL . 'public/css/jquery-ui.min.css' );
-								wp_enqueue_style( 'yikes-datepicker-styles' , YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' );
+								wp_enqueue_style( 'jquery-datepicker-styles', YIKES_MC_URL . 'public/css/jquery-ui.min.css' );
+								wp_enqueue_style( 'yikes-datepicker-styles', YIKES_MC_URL . 'public/css/yikes-datepicker-styles.min.css' );
 
-								switch ( $field['type'] ) {
+								switch ( $field[ 'type' ] ) {
 									default:
 									case 'date':
-										$date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd/yyyy';
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd/yyyy';
 										break;
 
 									case 'birthday':
-										$date_format = ( isset( $field['date_format'] ) ) ? strtolower( $field['date_format'] ) : 'mm/dd';
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? strtolower( $field[ 'date_format' ] ) : 'mm/dd';
 										break;
 								}
 
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
-								$default_value = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $form_id );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
+								$default_value = apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-default-value', $default_value, $field, $form_id );
 								
 								// store empty number for looping
 								$x = 0;
 
 								?>
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( !isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
 										<!-- Description Above -->
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $field['type'] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[$field['merge']] ); } else { echo esc_attr( $default_value ); } ?>" data-date-format="<?php echo esc_attr( strtolower( $date_format ) ); ?>">
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $field[ 'type' ] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo esc_attr( $_POST[ $field[ 'merge' ] ] ); } else { echo esc_attr( $default_value ); } ?>" data-date-format="<?php echo esc_attr( strtolower( $date_format ) ); ?>">
 
 										<!-- Description Below -->
 										<?php if ( $show_description === true && $description_above === false ) { echo $description; } ?>
@@ -923,26 +923,26 @@ 
 							break;
 
 							case 'dropdown':
-								$no_default     = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default';
-								$default_choice = is_array( $field['default_choice'] ) ? $field['default_choice'] : array( $field['default_choice'] );
+								$no_default     = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default';
+								$default_choice = is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : array( $field[ 'default_choice' ] );
 
 								// store empty number for looping
 								$x = 0;
 									?>
-									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['merge'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php }
 
 											// decode for looping
-											$choices = json_decode( $field['choices'], true );
+											$choices = json_decode( $field[ 'choices' ], true );
 
 											// If the form was submitted, but failed, let's default to the chosen option
-											if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) {
-												$default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] );
+											if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) {
+												$default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] );
 											}
 
 										?>
@@ -950,11 +950,11 @@ 
 										<!-- Description Above -->
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
 
-										<select <?php echo implode( ' ' , $field_array ); ?>>
+										<select <?php echo implode( ' ', $field_array ); ?>>
 											<?php
 												$no_default_name = apply_filters( 'yikes-mailchimp-dropdown-field-no-default-option-name', __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ), $form_id );
 												echo $no_default === true ? '<option value="">' . $no_default_name . '</option>' : '';
-												foreach( $choices as $choice ) { ?>
+												foreach ( $choices as $choice ) { ?>
 													<option 
 														value="<?php echo esc_attr( $choice ); ?>"
 														<?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'selected="selected"'; } ?>>
@@ -977,17 +977,17 @@ 
 							case 'radio':
 							case 'checkbox':
 								// remove the ID (as to not assign the same ID to every radio button)
-								unset( $field_array['id'] );
-								$choices = json_decode( $field['choices'], true );
+								unset( $field_array[ 'id' ] );
+								$choices = json_decode( $field[ 'choices' ], true );
 
 								// assign a default choice
-								$no_default     = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default';
-								$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? $field['default_choice'] : $choices[0];
+								$no_default     = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default';
+								$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? $field[ 'default_choice' ] : $choices[ 0 ];
 								$default_choice = ( is_array( $default_choice ) ) ? $default_choice : array( $default_choice );
 
 								// If the form was submitted, but failed, let's default to the chosen option
-								if( isset( $_POST[ $field['merge'] ] ) && $form_submitted === 0 ) {
-									$default_choice = is_array( $_POST[ $field['merge'] ] ) ? $_POST[ $field['merge'] ] : array( $_POST[ $field['merge'] ] );
+								if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted === 0 ) {
+									$default_choice = is_array( $_POST[ $field[ 'merge' ] ] ) ? $_POST[ $field[ 'merge' ] ] : array( $_POST[ $field[ 'merge' ] ] );
 								}
 
 								$count = count( $choices );
@@ -995,29 +995,29 @@ 
 								$x = 0;
 
 								?>
-								<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+								<label for="<?php echo esc_attr( $field_id_string ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 									<!-- dictate label visibility -->
-									<?php if( ! isset( $field['hide-label'] ) ) { ?>
-										<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?> checkbox-parent-label">
-											<?php echo esc_attr( apply_filters( 'yikes-mailchimp-'.$field['merge'].'-label', stripslashes( $field['label'] ) ) ); ?>
+									<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+										<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?> checkbox-parent-label">
+											<?php echo esc_attr( apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', stripslashes( $field[ 'label' ] ) ) ); ?>
 										</span>
 									<?php }
 
 									// <!-- Description Above -->
 									if ( $show_description === true && $description_above === true ) { echo $description; }
 
-									foreach( $choices as $choice ) {
+									foreach ( $choices as $choice ) {
 										?>
-										<label for="<?php echo esc_attr( $field['merge'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $i === $count ) { ?> last-selection<?php } ?>">
+										<label for="<?php echo esc_attr( $field[ 'merge' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $i === $count ) { ?> last-selection<?php } ?>">
 											<input 
-												type="<?php echo esc_attr( $field['type'] ); ?>" 
-												name="<?php echo esc_attr( $field['merge'] ); ?>" 
-												id="<?php echo esc_attr( $field['merge'] . '-' . $i ); ?>" 
+												type="<?php echo esc_attr( $field[ 'type' ] ); ?>" 
+												name="<?php echo esc_attr( $field[ 'merge' ] ); ?>" 
+												id="<?php echo esc_attr( $field[ 'merge' ] . '-' . $i ); ?>" 
 												<?php if ( $no_default !== true && in_array( $x, $default_choice ) || in_array( $choice, $default_choice, true ) ) { echo 'checked="checked"'; } ?>
-												<?php echo $field_array['required']; ?>
+												<?php echo $field_array[ 'required' ]; ?>
 												value="<?php echo esc_attr( $choice ); ?>">
-											<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
+											<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
 										</label>
 										<?php
 										$i++;
@@ -1038,11 +1038,11 @@ 
 						/**** Interest Groups ****/
 
 						// Handle the Description logic in one spot, here:
-						$show_description = isset( $field['description'] ) && trim( $field['description'] ) !== '' ? true : false;
-						$description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false;
+						$show_description = isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) !== '' ? true : false;
+						$description_above = isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? true : false;
 						if ( $show_description === true ) {
-							$description = '<p class="form-field-description" id="form-field-description-' . $field['group_id'] . '">';
-							$description .= apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id );
+							$description = '<p class="form-field-description" id="form-field-description-' . $field[ 'group_id' ] . '">';
+							$description .= apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id );
 							$description .= '</p>';
 
 							/**
@@ -1054,27 +1054,27 @@ 
 							*	@param string | $field['description']	| The field's description text
 							*	@param int	  | $form_id
 							*/
-							$description = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description-html', $description, esc_attr( stripslashes( $field['description'] ) ), $form_id );
+							$description = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description-html', $description, esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id );
 						}
 
 						// Get our groups
-						$groups = isset( $field['groups'] ) && ! empty( $field['groups'] ) ? json_decode( $field['groups'], true ) : array();
+						$groups = isset( $field[ 'groups' ] ) && ! empty( $field[ 'groups' ] ) ? json_decode( $field[ 'groups' ], true ) : array();
 
 						// Get the default choice(s) from the field settings and turn them into an array if not already
-						$default_choice = isset( $field['default_choice'] ) ? $field['default_choice'] : '';
+						$default_choice = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '';
 						$default_choice = is_array( $default_choice ) ? $default_choice : array( $default_choice );
-						$default_choice = apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-default', $default_choice, $groups, $field, $form_id );
+						$default_choice = apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-default', $default_choice, $groups, $field, $form_id );
 
 						$count = count( $groups );
 
-						if( $field['type'] === 'checkboxes' ) {
+						if ( $field[ 'type' ] === 'checkboxes' ) {
 							$type = 'checkbox';
-						} else if( $field['type'] === 'radio' ) {
+						} else if ( $field[ 'type' ] === 'radio' ) {
 							$type = 'radio';
 						}
 
 						// loop over the interest group field types
-						switch ( $field['type'] ) {
+						switch ( $field[ 'type' ] ) {
 
 							case 'checkboxes':
 							case 'radio':
@@ -1082,11 +1082,11 @@ 
 								$x = 1; // used to find the last item of our array
 
 									?>
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
 											<!-- dictate label visibility -->
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label">
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 									<?php
 										}
@@ -1096,7 +1096,7 @@ 
 
 										// Display Submission Errors
 										if ( ! empty( $missing_required_checkbox_interest_groups ) ) {
-											if( in_array( $field['group_id'], $missing_required_checkbox_interest_groups ) ) {
+											if ( in_array( $field[ 'group_id' ], $missing_required_checkbox_interest_groups ) ) {
 												?>
 													<p class="yikes-mailchimp-required-interest-group-error">
 														<?php echo apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ); ?>
@@ -1108,20 +1108,20 @@ 
 										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 ) {
+											if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) {
 
 												// Format default choice as array
-												$default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] );
+												$default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] );
 											}
 
 											?>
-											<label for="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>">
+											<label for="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>">
 												<input 
-													<?php if( isset( $field['require'] ) && $field['require'] == 1 ) { if ( $field['type'] !== 'checkboxes' ) { ?> required="required" <?php } ?> 
+													<?php if ( isset( $field[ 'require' ] ) && $field[ 'require' ] == 1 ) { if ( $field[ 'type' ] !== 'checkboxes' ) { ?> required="required" <?php } ?> 
 													class="yikes-interest-group-required" <?php } ?> 
 													type="<?php echo esc_attr( $type ); ?>"
-													name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" 
-													id="<?php echo esc_attr( $field['group_id'] . '-' . $i ); ?>"
+													name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" 
+													id="<?php echo esc_attr( $field[ 'group_id' ] . '-' . $i ); ?>"
 													<?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?> 
 													value="<?php echo esc_attr( $group_id ); ?>">
 													<?php echo esc_attr( $name ); ?>
@@ -1143,32 +1143,32 @@ 
 
 									?>
 
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?>">
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?>">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php } ?>
 
 										<!-- Description Above -->
 										<?php if ( $show_description === true && $description_above === true ) { echo $description; } ?>
 
-										<select <?php echo implode( ' ' , $field_array ); ?>>
+										<select <?php echo implode( ' ', $field_array ); ?>>
 
 											<?php
-												$no_default      = $field['default_choice'] === 'no-default' || isset( $field['default_choice'][0] ) && $field['default_choice'][0] === 'no-default';
+												$no_default      = $field[ 'default_choice' ] === 'no-default' || isset( $field[ 'default_choice' ][ 0 ] ) && $field[ 'default_choice' ][ 0 ] === 'no-default';
 												$no_default_name = apply_filters( 'yikes-mailchimp-dropdown-ig-no-default-option-name', __( 'Select...', 'yikes-inc-easy-mailchimp-extender' ), $form_id );
 												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 ) {
+													if ( isset( $_POST[ 'group-' . $field[ 'group_id' ] ] ) && $form_submitted === 0 ) {
 
 														// Format default choice as array
-														$default_choice = ( is_array( $_POST[ 'group-' . $field['group_id'] ] ) ) ? $_POST[ 'group-' . $field['group_id'] ] : array( $_POST[ 'group-' . $field['group_id'] ] );
+														$default_choice = ( is_array( $_POST[ 'group-' . $field[ 'group_id' ] ] ) ) ? $_POST[ 'group-' . $field[ 'group_id' ] ] : array( $_POST[ 'group-' . $field[ 'group_id' ] ] );
 													}
 											?>
 													<option 
@@ -1196,12 +1196,12 @@ 
 
 									?>
 
-									<label for="<?php echo esc_attr( $field['group_id'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'group_id' ] ); ?>" <?php echo implode( ' ', $label_array ); ?>>
 
 										<!-- dictate label visibility -->
-										<?php if( ! isset( $field['hide-label'] ) ) { ?>
-											<span class="<?php echo esc_attr( $field['group_id'] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
-												<?php echo apply_filters( 'yikes-mailchimp-'.$field['group_id'].'-label' , esc_attr( stripslashes( $field['label'] ) ) ); ?>
+										<?php if ( ! isset( $field[ 'hide-label' ] ) ) { ?>
+											<span class="<?php echo esc_attr( $field[ 'group_id' ] ) . '-label'; ?> checkbox-parent-label" style="display:none;">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php }
 
@@ -1211,17 +1211,17 @@ 
 										// 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;">
+											<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 
 													type="checkbox" 
-													name="group-<?php echo esc_attr( $field['group_id'] ); ?>[]" 
-													id="<?php echo esc_attr( $field['group_id'] ) . '-' . $i; ?>"
+													name="group-<?php echo esc_attr( $field[ 'group_id' ] ); ?>[]" 
+													id="<?php echo esc_attr( $field[ 'group_id' ] ) . '-' . $i; ?>"
 													value="<?php echo esc_attr( $group_id ) ?>"
 													<?php if ( in_array( $group_id, $default_choice ) ) { echo 'checked="checked"'; } ?>
 												>
-												<?php echo esc_attr( stripslashes( str_replace( '' , '\'', $name ) ) ); ?>
+												<?php echo esc_attr( stripslashes( str_replace( '', '\'', $name ) ) ); ?>
 											</label>
 											<?php
 											$i++;
@@ -1246,14 +1246,14 @@ 
 					echo $recaptcha_box;
 				}
 
-				$admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ? ' admin-logged-in' : '';
+				$admin_class = is_user_logged_in() && current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ? ' admin-logged-in' : '';
 				?>
 
 				<!-- Honeypot Trap -->
 				<input type="hidden" name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot-<?php echo esc_attr( $form_id ); ?>" value="">
 
 				<!-- List ID -->
-				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id-<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $form_data['list_id'] ); ?>">
+				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id-<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $form_data[ 'list_id' ] ); ?>">
 
 				<!-- The form that is being submitted! Used to display error/success messages above the correct form -->
 				<input type="hidden" name="yikes-mailchimp-submitted-form" id="yikes-mailchimp-submitted-form-<?php echo esc_attr( $form_id ); ?>" value="<?php echo esc_attr( $form_id ); ?>">
@@ -1267,15 +1267,15 @@ 
 						// If the number of fields, is equal to the hidden label count, add our class
 						// eg: All field labels are set to hidden.
 						if ( absint( $field_count ) === absint( $hidden_label_count ) ) {
-							$submit_button_label_classes[] = 'labels-hidden';
+							$submit_button_label_classes[ ] = 'labels-hidden';
 						}
 						echo '<label class="empty-form-inline-label submit-button-inline-label"><span class="' . implode( ' ', $submit_button_label_classes ) . '">&nbsp;</span>';
 					}
 					// Display the image or text based button.
 					if ( $submit_button_type === 'text' ) {
-						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '"> <span class="yikes-mailchimp-submit-button-span-text">' .  apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '</span></button>', $form_data['id'] );
+						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<button type="submit" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '"> <span class="yikes-mailchimp-submit-button-span-text">' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '</span></button>', $form_data[ 'id' ] );
 					} else {
-						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data['id'] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data['id'] ) . '">', $form_data['id'] );
+						echo apply_filters( 'yikes-mailchimp-form-submit-button', '<input type="image" alt="' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '" src="' . $submit_button_image . '" class="' . apply_filters( 'yikes-mailchimp-form-submit-button-classes', 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-image yikes-easy-mc-submit-button-' . esc_attr( $form_data[ 'id' ] ) . ' btn btn-primary' . $submit_button_classes . $admin_class, $form_data[ 'id' ] ) . '">', $form_data[ 'id' ] );
 					}
 					if ( $form_inline && ! $inline_form_override ) {
 						echo '</label>';
@@ -1290,8 +1290,8 @@ 
 
 		<?php
 			/* If the current user is logged in, and an admin...lets display our 'Edit Form' link */
-			if( is_user_logged_in() ) {
-				if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
+			if ( is_user_logged_in() ) {
+				if ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) {
 					echo $edit_form_link;
 				}
 			}
@@ -1307,7 +1307,7 @@ 
 		*	for non-admins
 		*/
 		if ( ! current_user_can( 'manage_options' ) ) {
-			$impressions = $form_data['impressions'] + 1;
+			$impressions = $form_data[ 'impressions' ] + 1;
 			$interface->update_form_field( $form_id, 'impressions', $impressions );
 		}
 

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

Doc Comments +4 added lines, -4 removed lines

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

 		}

 

+		/**
+		 * @return string
+		 */
 		public function get_premium_license( $plugin_slug ) {

 

 			switch( $plugin_slug ) {

@@ -823,6 +826,7 @@ 
 

 	/**

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

+	 * @param string $type
 	 */

 	public function yikes_jQuery_datepicker_date_format_php_to_js( $sFormat, $type ) {

 		switch ( $type ) {

@@ -1318,8 +1322,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' );

@@ -1354,8 +1356,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() {

 

Spacing +354 added lines, -354 removed lines

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

 

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

 

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

 			return $links;

 		}

 

@@ -379,17 +379,17 @@ 
 		*/

 		public function yikes_easy_mailchimp_export_forms() {

 			// grab our nonce.

-			$nonce = $_REQUEST['nonce'];

+			$nonce = $_REQUEST[ 'nonce' ];

 			// grab the forms.

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

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

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

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

 			}

 

 			// run the export function.

 			// parameters: ( $table_name, $form_ids, $file_name ).

-			Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export('Yikes-Inc-Easy-MailChimp-Forms-Export', $forms );

+			Yikes_Inc_Easy_MailChimp_Export_Class::yikes_mailchimp_form_export( 'Yikes-Inc-Easy-MailChimp-Forms-Export', $forms );

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

@@ -403,10 +403,10 @@ 
 		*/

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

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

 			}

 

 			// run the export function.

@@ -423,10 +423,10 @@ 
 		*/

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

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

@@ -447,18 +447,18 @@ 
 		*/

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

 			}

 

-			$email       = isset( $_POST['user-email'] ) ? $_POST['user-email'] : '';

-			$topic       = isset( $_POST['support-topic'] ) ? $_POST['support-topic'] : '';

-			$issue       = isset( $_POST['support-content'] ) ? $_POST['support-content'] : '';

-			$priority    = isset( $_POST['support-priority'] ) ? $_POST['support-priority'] : 1;

-			$license     = isset( $_POST['license_key'] ) ? $_POST['license_key'] : '';

-			$plugin_name = isset( $_POST['plugin-name'] ) ? $_POST['plugin-name'] : '';

-			$plugin_slug = isset( $_POST['plugin-slug'] ) ? $_POST['plugin-slug'] : '';

-			$name        = isset( $_POST['user-name'] ) ? $_POST['user-name'] : 'Mailchimp Support';

+			$email       = isset( $_POST[ 'user-email' ] ) ? $_POST[ 'user-email' ] : '';

+			$topic       = isset( $_POST[ 'support-topic' ] ) ? $_POST[ 'support-topic' ] : '';

+			$issue       = isset( $_POST[ 'support-content' ] ) ? $_POST[ 'support-content' ] : '';

+			$priority    = isset( $_POST[ 'support-priority' ] ) ? $_POST[ 'support-priority' ] : 1;

+			$license     = isset( $_POST[ 'license_key' ] ) ? $_POST[ 'license_key' ] : '';

+			$plugin_name = isset( $_POST[ 'plugin-name' ] ) ? $_POST[ 'plugin-name' ] : '';

+			$plugin_slug = isset( $_POST[ 'plugin-slug' ] ) ? $_POST[ 'plugin-slug' ] : '';

+			$name        = isset( $_POST[ 'user-name' ] ) ? $_POST[ 'user-name' ] : 'Mailchimp Support';

 

 			$edd_item_id = $this->get_premium_license( $plugin_slug );

 

@@ -493,7 +493,7 @@ 
 

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

@@ -553,7 +553,7 @@ 
 			// 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" ) );

 			}

 

@@ -563,7 +563,7 @@ 
 				$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' ) );

 				}

 			}

 

@@ -576,13 +576,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 ) {

 

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

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

-				$current_host	  = isset( $_SERVER['HTTP_HOST'] ) && ! empty( $_SERVER['HTTP_HOST'] ) ? $_SERVER['HTTP_HOST'] : false;

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

+				$current_host = isset( $_SERVER[ 'HTTP_HOST' ] ) && ! empty( $_SERVER[ 'HTTP_HOST' ] ) ? $_SERVER[ 'HTTP_HOST' ] : false;

 				$current_protocol = is_ssl() === true ? 'https://' : 'http://';

-				$current_url	  = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();

+				$current_url = ( $current_uri !== false && $current_host !== false ) ? $current_protocol . $current_host . $current_uri : admin_url();

 

 				$plugin_name = '<strong>Easy Forms for Mailchimp</strong>';

 				// Review URL - Change to the URL of your plugin on WordPress.org.

@@ -593,17 +593,17 @@ 
 				// Make sure all of our variables have values.

 				$reviewurl  = ( ! empty( $reviewurl ) ) ? $reviewurl : '';

 				$addons_url = ( ! empty( $addons_url ) ) ? $addons_url : '';

-				$nobugurl	= ( ! empty( $nobugurl ) ) ? $nobugurl : '';

+				$nobugurl = ( ! empty( $nobugurl ) ) ? $nobugurl : '';

 

 				$review_message = '<div id="yikes-mailchimp-logo"></div>';

 				$review_message .= sprintf( 

 					__( 'It looks like you\'ve been using %1$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="%2$s" target="_blank" class="button-secondary"><span class="dashicons dashicons-star-filled"></span>'

-						. __( "Leave A Review" , 'yikes-inc-easy-mailchimp-extender' ) 

+						. __( "Leave A Review", 'yikes-inc-easy-mailchimp-extender' ) 

 					. '</a> <a href="%3$s" class="button-secondary"><span class="dashicons dashicons-upload"></span>'

-						. __( "View Addons" , 'yikes-inc-easy-mailchimp-extender' ) 

+						. __( "View Addons", 'yikes-inc-easy-mailchimp-extender' ) 

 					. '</a> <a href="%4$s" class="button-secondary"><span class="dashicons dashicons-no-alt"></span>'

-						. __( "Dismiss" , 'yikes-inc-easy-mailchimp-extender' ) 

+						. __( "Dismiss", 'yikes-inc-easy-mailchimp-extender' ) 

 					. "</a> </span>", 

 				$plugin_name, $reviewurl, $addons_url, $nobugurl );

 				?>

@@ -620,7 +620,7 @@ 
 			@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 ) {

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

 			}

 		}

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

 

 		return $plugin_array;

 	}

@@ -679,13 +679,13 @@ 
 		if ( ! empty( $list_data ) ) {

 			// build an array to pass to our javascript.

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

-				$lists[] = array(

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

+				$lists[ ] = array(

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

 					'value' => $id,

 				);

 			}

 		} else {

-			$lists[0] = array(

+			$lists[ 0 ] = array(

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

 				'value' => '-',

 			);

@@ -773,8 +773,8 @@ 
 

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

 			'add_tag_nonce'                     => wp_create_nonce( 'add-tag' ),

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

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

 

 		register_setting( 'yikes_inc_easy_mc_general_settings_page', 'yikes-mailchimp-use-nonce' );

 

@@ -1127,7 +1127,7 @@ 
 		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 */

@@ -1149,21 +1149,21 @@ 
 			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'

 			);

 

@@ -1183,7 +1183,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'

 			);

 

@@ -1203,7 +1203,7 @@ 
 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

 			return '';

 		}

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

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

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

 		if ( $dash_position !== false ) {

 			$manager = new Yikes_Inc_Easy_MailChimp_API_Manager( $api_key );

@@ -1218,9 +1218,9 @@ 
 			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' ) );

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

 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

 		}

@@ -1269,11 +1269,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 ( ! 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 );

 			}

 		}

 	}

@@ -1306,11 +1306,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' );

@@ -1324,7 +1324,7 @@ 
 			} 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>

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

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

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

 			   }

 		   }

@@ -1361,8 +1361,8 @@ 
 		/* 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'];

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

@@ -1376,22 +1376,22 @@ 
 

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

-				$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'] ) ? $new_options['custom_styles']: '0'; // store as an array with all of our styles

-				$custom_template = isset( $new_options['custom_template'] ) ? $new_options['custom_template'] : '0'; // store template data as an array ( active , template used )

-				$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' ] ) ? $new_options[ 'custom_styles' ] : '0'; // store as an array with all of our styles

+				$custom_template = isset( $new_options[ 'custom_template' ] ) ? $new_options[ 'custom_template' ] : '0'; // store template data as an array ( active , template used )

+				$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  */

 				$this->form_interface->create_form( array(

@@ -1427,8 +1427,8 @@ 
 		*	@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() );

 

@@ -1445,25 +1445,25 @@ 
 				<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>

 							<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

 							}

 							?>

@@ -1512,19 +1512,19 @@ 
 						<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 ) {

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

 									?>

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

 

 								}

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

@@ -1547,7 +1547,7 @@ 
 							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

 							}

@@ -1556,9 +1556,9 @@ 
 					</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;' ) );

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

 							<?php

@@ -1588,7 +1588,7 @@ 
 				$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' ); ?>

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

 

@@ -1604,7 +1604,7 @@ 
 					$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 ) ) {

@@ -1626,8 +1626,8 @@ 
 									?>

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

 									<?php

-											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

+											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

 											}

 									?>

 										</optgroup>

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

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

 

@@ -1702,7 +1702,7 @@ 
 							</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.">

@@ -1720,7 +1720,7 @@ 
 						<!-- review us container -->

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

 

@@ -1747,11 +1747,11 @@ 
 

 			// if no list id, die!

 			if ( ! $list_id ) {

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

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

 			}

 

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

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

@@ -1762,17 +1762,17 @@ 
 				$available_interest_groups	= array();

 

 				// Default variables as arrays - these are used for holding the MailChimp merge field ID

-				$merge_field_ids			= array();

-				$mailchimp_merge_field_ids	= array();

+				$merge_field_ids = array();

+				$mailchimp_merge_field_ids = array();

 

 				// loop over merge variables

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

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

-						$merge_field_ids[$merge_tag] = $mailchimp_merge_field_ids[$index];

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

+						$merge_field_ids[ $merge_tag ] = $mailchimp_merge_field_ids[ $index ];

 					}

 				}

 

@@ -1787,46 +1787,46 @@ 
 				$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 );

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

 						?>

-						<section class="draggable" id="<?php echo $field['merge']; ?>">

+						<section class="draggable" id="<?php echo $field[ 'merge' ]; ?>">

 							<!-- top -->

 							<a class="expansion-section-title settings-sidebar">

 								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span>

-								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field['label'] ); ?> </span>

+								<span class="yikes-mc-expansion-section-field-label"> <?php echo stripslashes( $field[ 'label' ] ); ?> </span>

 								<?php if ( $excluded_field ) { ?>

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

-								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field['label'] ); ?>" />

+								<input maxlength="50" type="text" class="yikes-mc-edit-field-label-input" value="<?php echo stripslashes( $field[ 'label' ] ); ?>" />

 								<span class="dashicons dashicons-yes yikes-mc-save-field-label-edits-icon" title="<?php _e( 'Click to save changes.', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>

 								<span class="dashicons dashicons-edit yikes-mc-edit-field-label-icon" title="<?php _e( 'Click to edit the label', 'yikes-inc-easy-mailchimp-extender' ); ?>"></span>

 								<span class="yikes-mc-edit-field-label-message"></span>

-								<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 ( $excluded_field ) { ?>

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

+									<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 field data -->

-								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field['merge']; ?>][label]" value="<?php echo htmlspecialchars( $field['label'] ); ?>" />

-								<input type="hidden" class="yikes-mc-merge-field-type" name="field[<?php echo $field['merge']; ?>][type]" value="<?php echo $field['type']; ?>" />

-								<input type="hidden" class="yikes-mc-merge-field-tag" 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 ( isset( $merge_field_ids[ $field['merge'] ] ) && is_int( $merge_field_ids[ $field['merge'] ] ) ) { ?> 

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

+								<input type="hidden" class="yikes-mc-merge-field-label" name="field[<?php echo $field[ 'merge' ]; ?>][label]" value="<?php echo htmlspecialchars( $field[ 'label' ] ); ?>" />

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

+								<input type="hidden" class="yikes-mc-merge-field-tag" 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 ( isset( $merge_field_ids[ $field[ 'merge' ] ] ) && is_int( $merge_field_ids[ $field[ 'merge' ] ] ) ) { ?> 

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

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

@@ -1842,12 +1842,12 @@ 
 												</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':

@@ -1861,13 +1861,13 @@ 
 										<!-- Placeholder -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="text" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" 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" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" 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

@@ -1878,13 +1878,13 @@ 
 											?>

 												<tr valign="top">

 													<td scope="row">

-														<label for="placeholder_<?php echo esc_attr( $field['merge'] ); ?>">

+														<label for="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 															<?php _e( 'Placeholder', 'yikes-inc-easy-mailchimp-extender' ); ?>

 														</label>

 													</td>

 													<td>

-														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat" name="field[<?php echo $field['merge']; ?>][placeholder]" value="1" <?php echo isset( $field['placeholder'] ) && ! empty( $field['placeholder'] ) ? 'checked="checked"' : '' ; ?> />

-														<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' );?></small></span>

+														<input type="checkbox" id="placeholder_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat" name="field[<?php echo $field[ 'merge' ]; ?>][placeholder]" value="1" <?php echo isset( $field[ 'placeholder' ] ) && ! empty( $field[ 'placeholder' ] ) ? 'checked="checked"' : ''; ?> />

+														<span class="description"><small><?php _e( "Use placeholders for this field (these will be automatically filled in with field names).", 'yikes-inc-easy-mailchimp-extender' ); ?></small></span>

 													</td>

 												</tr>

 											<?php

@@ -1894,7 +1894,7 @@ 
 										?>

 

 										<!-- Default Value -->

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

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

 											default:

 											case 'text':

 											case 'number':

@@ -1902,15 +1902,15 @@ 
 										?>

 											<tr valign="top">

 												<td scope="row">

-													<label for="default_value_<?php echo esc_attr( $field['merge'] ); ?>">

+													<label for="default_value_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 														<?php _e( 'Default Value', 'yikes-inc-easy-mailchimp-extender' ); ?>

 													</label>

 												</td>

 												<td>

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

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

@@ -1932,28 +1932,28 @@ 
 													</td>

 													<td>

 														<?php

-															$field['default_choice'] = ! isset( $field['default_choice'] ) ? 'no-default' : $field['default_choice'];

+															$field[ 'default_choice' ] = ! isset( $field[ 'default_choice' ] ) ? 'no-default' : $field[ 'default_choice' ];

 															$x = 0;

 														?>

-														<label for="<?php echo $field['merge'] . '-no-default'; ?>">

-															<input id="<?php echo $field['merge'] . '-no-default'; ?>"

+														<label for="<?php echo $field[ 'merge' ] . '-no-default'; ?>">

+															<input id="<?php echo $field[ 'merge' ] . '-no-default'; ?>"

 															       type="radio"

-															       name="field[<?php echo $field['merge']; ?>][default_choice]"

-															       value="no-default" <?php checked( $field['default_choice'], 'no-default' ); ?>

+															       name="field[<?php echo $field[ 'merge' ]; ?>][default_choice]"

+															       value="no-default" <?php checked( $field[ 'default_choice' ], 'no-default' ); ?>

 															>

 															No Default&nbsp;

 														</label>

 														<?php

 														foreach ( $choices as $choice => $value ) { ?>

-															<label for="<?php echo $field['merge'].'-'.$x; ?>">

-																<input id="<?php echo $field['merge'].'-'.$x; ?>"

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

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

 

@@ -1969,13 +1969,13 @@ 
 														</label>

 													</td>

 													<td>

-														<select type="default" name="field[<?php echo $field['merge']; ?>][default_choice]">

-															<option value="no-default" <?php selected( $field['default_choice'] , 'no-default' ); ?>>No Default</option>

-															<?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]">

+															<option value="no-default" <?php selected( $field[ 'default_choice' ], 'no-default' ); ?>>No Default</option>

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

 

@@ -1992,82 +1992,82 @@ 
 										<!-- Field Description -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="description_<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<textarea class="widefat field-description-input" id="description_<?php echo esc_attr( $field['merge'] ); ?>" 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" id="description_<?php echo esc_attr( $field[ 'merge' ] ); ?>" 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>

 										<!-- Description Above Field -->

 										<tr valign="top" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="description_above_<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="checkbox" id="description_above_<?php echo esc_attr( $field['merge'] ); ?>" class="widefat field-description-input" name="field[<?php echo $field['merge']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />

-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<input type="checkbox" id="description_above_<?php echo esc_attr( $field[ 'merge' ] ); ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'merge' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />

+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 										<!-- Additional Classes -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="classes_<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="text" id="classes_<?php echo esc_attr( $field['merge'] ); ?>" 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" id="classes_<?php echo esc_attr( $field[ 'merge' ] ); ?>" 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" class="yikes-checkbox-container yikes-checkbox-container-first">

 											<td scope="row">

-												<label for="field-required-<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>

-												<input id="field-required-<?php echo esc_attr( $field['merge'] ); ?>" 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 id="field-required-<?php echo esc_attr( $field[ 'merge' ] ); ?>" 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" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="hide-field-<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>

-												<input id="hide-field-<?php echo esc_attr( $field['merge'] ); ?>" 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 id="hide-field-<?php echo esc_attr( $field[ 'merge' ] ); ?>" 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" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="hide-label-<?php echo esc_attr( $field['merge'] ); ?>">

+												<label for="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>">

 													<?php _e( 'Hide Label', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $hide_label = isset( $field['hide-label'] ) ? $field['hide-label'] : '0'; ?>

-												<input id="hide-label-<?php echo esc_attr( $field['merge'] ); ?>" 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 id="hide-label-<?php echo esc_attr( $field[ 'merge' ] ); ?>" 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':

@@ -2077,23 +2077,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';

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

+																				$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 = isset( $field['phone_format'] ) && ! empty( $field['phone_format'] ) ? $field['phone_format'] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );

+																				$format = isset( $field[ 'phone_format' ] ) && ! empty( $field[ 'phone_format' ] ) ? $field[ 'phone_format' ] : __( 'International', 'yikes-inc-easy-mailchimp-extender' );

 																				$format_name = 'phone_format';

 																				break;

 																		}

@@ -2103,7 +2103,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>

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

@@ -2143,35 +2143,35 @@ 
 						/**** 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 yikes-mc-expansion-toggle"></span><?php echo stripslashes( $field['label'] ); ?>

-								<?php if ( in_array( $field['group_id'] , $excluded_fields ) ) { ?>

+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></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 htmlspecialchars( $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 htmlspecialchars( $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':

 											case 'checkboxes':

@@ -2184,15 +2184,15 @@ 
 													</td>

 													<td>

 														<?php

-														$field['default_choice'] = isset( $field['default_choice'] ) ? $field['default_choice'] : '';

+														$field[ 'default_choice' ] = isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '';

 

 														$default_shown = false;

 

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

-															$field_id   = "{$field['group_id']}-{$id}";

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

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

-															$field_name = "field[{$field['group_id']}][default_choice]";

+															$field_name = "field[{$field[ 'group_id' ]}][default_choice]";

 															$field_name = 'checkbox' == $field_type ? $field_name . '[]' : $field_name;

 

 															// Determine if the current group is checked.

@@ -2200,13 +2200,13 @@ 
 															switch ( $field_type ) {

 																case 'radio':

 																default:

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

-																	$checked = is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), $id, false ) : checked( $field['default_choice'], $id, false );

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

+																	$checked = is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), $id, false ) : checked( $field[ 'default_choice' ], $id, false );

 																break;

 

 																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;

@@ -2221,7 +2221,7 @@ 
 																	    type="<?php echo $field_type; ?>"

 																	    name="<?php echo $field_name; ?>"

 																	    value="no-default" 

-																	    <?php is_array( $field['default_choice'] ) ? checked( current( $field['default_choice'] ), 'no-default' ) : checked( $field['default_choice'], 'no-default' ); ?>>

+																	    <?php is_array( $field[ 'default_choice' ] ) ? checked( current( $field[ 'default_choice' ] ), 'no-default' ) : checked( $field[ 'default_choice' ], 'no-default' ); ?>>

 																	No Default&nbsp;

 																</label>

 																<?php

@@ -2237,7 +2237,7 @@ 
 															</label>

 															<?php

 														} ?>

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

 

@@ -2253,13 +2253,13 @@ 
 														</label>

 													</td>

 													<td>

-														<select type="default" name="field[<?php echo $field['group_id']; ?>][default_choice]">

+														<select type="default" name="field[<?php echo $field[ 'group_id' ]; ?>][default_choice]">

 															<option value="no-default">No Default</option>

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

-																<option value="<?php echo $id; ?>" <?php selected( $field['default_choice'] , $id ); ?>><?php echo stripslashes( $group ); ?></option>

+															<?php foreach ( json_decode( stripslashes_deep( $field[ 'groups' ] ), true ) as $id => $group ) { ?>

+																<option value="<?php echo $id; ?>" <?php selected( $field[ 'default_choice' ], $id ); ?>><?php echo stripslashes( $group ); ?></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>

 

@@ -2272,78 +2272,78 @@ 
 										<!-- Field Description -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="description_<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?php _e( 'Description', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<textarea id="description_<?php echo esc_attr( $field['group_id'] ); ?>" 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 id="description_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" 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>

 

 										<!-- Description Above Field -->

 										<tr valign="top" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="description_above_<?php echo $field['group_id']; ?>">

+												<label for="description_above_<?php echo $field[ 'group_id' ]; ?>">

 													<?php _e( 'Description Above Field', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="checkbox" id="description_above_<?php echo $field['group_id']; ?>" class="widefat field-description-input" name="field[<?php echo $field['group_id']; ?>][description_above]" value="1" <?php echo isset( $field['description_above'] ) && $field['description_above'] === '1' ? 'checked="checked"' : ''; ?> />

-												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' );?></small></p>

+												<input type="checkbox" id="description_above_<?php echo $field[ 'group_id' ]; ?>" class="widefat field-description-input" name="field[<?php echo $field[ 'group_id' ]; ?>][description_above]" value="1" <?php echo isset( $field[ 'description_above' ] ) && $field[ 'description_above' ] === '1' ? 'checked="checked"' : ''; ?> />

+												<p class="description"><small><?php _e( "By default the description will appear undearneath the field. Check this box if you'd like the description to appear above the field.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>

 											</td>

 										</tr>

 

 										<!-- Additional Classes -->

 										<tr valign="top">

 											<td scope="row">

-												<label for="classes_<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?php _e( 'Additional Classes', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<input type="text" id="classes_<?php echo esc_attr( $field['group_id'] ); ?>" 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" id="classes_<?php echo esc_attr( $field[ 'group_id' ] ); ?>" 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" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="field-required-<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?php _e( 'Field Required?', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $checked = isset( $field['require'] ) ? $field['require'] : '0'; ?>

-												<input type="checkbox" id="field-required-<?php echo esc_attr( $field['group_id'] ); ?>" 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" id="field-required-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" 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" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?php _e( 'Hide Field', 'yikes-inc-easy-mailchimp-extender' ); ?>

 												</label>

 											</td>

 											<td>

-												<?php $hide = isset( $field['hide'] ) ? $field['hide'] : '0'; ?>

-												<input type="checkbox" id="hide-field-<?php echo esc_attr( $field['group_id'] ); ?>" 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" id="hide-field-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" 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" class="yikes-checkbox-container">

 											<td scope="row">

-												<label for="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>">

+												<label for="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>">

 													<?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" id="hide-label-<?php echo esc_attr( $field['group_id'] ); ?>" 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" id="hide-label-<?php echo esc_attr( $field[ 'group_id' ] ); ?>" 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 -->

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

@@ -2375,7 +2375,7 @@ 
 				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_style( 'jquery-qtip-style', YIKES_MC_URL . 'admin/css/jquery.qtip.min.css' );

 					$available_tags = array(

 						array(

 							'tag' => '{page_title}',

@@ -2430,14 +2430,14 @@ 
 						<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>

@@ -2456,32 +2456,32 @@ 
 		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'] ) ) {

-					$fields_assigned_to_form[ $field['merge'] ] = true;

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

-					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );

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

+					$not_available = isset( $fields_assigned_to_form[ $merge_var[ 'tag' ] ] );

 					?>

 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

-						alt="<?php echo esc_attr( $merge_var['tag'] ); ?>"

-						data-attr-field-type="<?php echo esc_attr( $merge_var['type'] ); ?>"

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

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

+						alt="<?php echo esc_attr( $merge_var[ 'tag' ] ); ?>"

+						data-attr-field-type="<?php echo esc_attr( $merge_var[ 'type' ] ); ?>"

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

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

 						title="<?php echo $not_available ? esc_attr__( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"

 						<?php echo $not_available ? 'disabled="disabled"' : ''; ?>

 					>

 						<?php

-							echo esc_html( stripslashes( $merge_var['name'] ) );

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

+							echo esc_html( stripslashes( $merge_var[ 'name' ] ) );

+							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 esc_html( $merge_var['type'] ); ?></small>

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

 					</li>

 					<?php

 				}

@@ -2506,8 +2506,8 @@ 
 			$fields_assigned_to_form = array();

 			if ( ! empty( $form_fields ) ) {

 				foreach ( $form_fields as $field ) {

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

-						$fields_assigned_to_form[ $field['group_id'] ] = true;

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

+						$fields_assigned_to_form[ $field[ 'group_id' ] ] = true;

 					}

 				}

 			}

@@ -2517,19 +2517,19 @@ 
 				<ul id="available-interest-groups">

 				<?php

 					foreach ( $available_interest_groups as $interest_group ) {

-						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );

+						$not_available = isset( $fields_assigned_to_form[ $interest_group[ 'id' ] ] );

 						?>

 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" 

-							alt="<?php echo esc_attr( $interest_group['id'] ); ?>" 

-							data-group-id="<?php echo esc_attr( $interest_group['id'] ); ?>" 

-							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group['title'] ) ); ?>" 

-							data-attr-field-type="<?php echo esc_attr( $interest_group['type'] ); ?>" 

+							alt="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" 

+							data-group-id="<?php echo esc_attr( $interest_group[ 'id' ] ); ?>" 

+							data-attr-field-name="<?php echo esc_attr( htmlspecialchars( $interest_group[ 'title' ] ) ); ?>" 

+							data-attr-field-type="<?php echo esc_attr( $interest_group[ 'type' ] ); ?>" 

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

 							title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : ''; ?>"

 							<?php echo $not_available ? 'disabled="disabled"' : ''; ?>

 						>

-							<?php echo esc_html( stripslashes( $interest_group['title'] ) ); ?>

-							<small class="field-type-text"><?php echo esc_html( $interest_group['type'] ); ?></small>

+							<?php echo esc_html( stripslashes( $interest_group[ 'title' ] ) ); ?>

+							<small class="field-type-text"><?php echo esc_html( $interest_group[ 'type' ] ); ?></small>

 						</li>

 						<?php

 					}

@@ -2555,13 +2555,13 @@ 
 				$not_available = isset( $form_tags[ $tag_id ] );

 				?>

 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

-					id="tag-<?php echo esc_attr( $tag['id'] ); ?>"

-					data-tag-id="<?php echo esc_attr( $tag['id'] ); ?>"

-					data-tag-name="<?php echo esc_attr( $tag['name'] ); ?>"

-					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag['name'] ); ?>"

+					id="tag-<?php echo esc_attr( $tag[ 'id' ] ); ?>"

+					data-tag-id="<?php echo esc_attr( $tag[ 'id' ] ); ?>"

+					data-tag-name="<?php echo esc_attr( $tag[ 'name' ] ); ?>"

+					title="<?php echo $not_available ? __( 'Already assigned to your form', 'yikes-inc-easy-mailchimp-extender' ) : esc_attr( $tag[ 'name' ] ); ?>"

 					<?php echo $not_available ? 'disabled="disabled"' : ''; ?>

 				>

-					<?php echo esc_html( $tag['name'] ); ?>

+					<?php echo esc_html( $tag[ 'name' ] ); ?>

 				</li>

 				<?php

 			}

@@ -2582,15 +2582,15 @@ 
 		*	- 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'];

+			$nonce = $_REQUEST[ 'nonce' ];

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

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

 			}

 

 			$result = $this->form_interface->create_form( array(

-				'list_id'          => sanitize_key( $_POST['associated-list'] ),

-				'form_name'        => stripslashes( $_POST['form-name'] ),

-				'form_description' => stripslashes( $_POST['form-description'] ),

+				'list_id'          => sanitize_key( $_POST[ 'associated-list' ] ),

+				'form_name'        => stripslashes( $_POST[ 'form-name' ] ),

+				'form_description' => stripslashes( $_POST[ 'form-description' ] ),

 			) );

 

 			// if an error occurs during the form creation process

@@ -2598,11 +2598,11 @@ 
 				// 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' ) );

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

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

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

 			}

 			exit();

 		}

@@ -2615,11 +2615,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 ) );

 			}

 

 			$this->form_interface->delete_form( $post_id_to_delete );

@@ -2635,19 +2635,19 @@ 
 		*/

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

 			}

 

 			// Get the current form data.

 			$form_data = $this->form_interface->get_form( $post_id_to_clone );

 

 			// Update some of the data before duplication

-			$form_data['form_name'] .= ' - Copy';

-			$form_data['impressions'] = $form_data['submissions'] = 0;

+			$form_data[ 'form_name' ] .= ' - Copy';

+			$form_data[ 'impressions' ] = $form_data[ 'submissions' ] = 0;

 

 			// Create the new form, and handle the result.

 			$result = $this->form_interface->create_form( $form_data );

@@ -2678,11 +2678,11 @@ 
 		*/

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

 			}

 

 			$result = $this->form_interface->update_form(

@@ -2710,8 +2710,8 @@ 
 		*/

 		public function yikes_easy_mailchimp_update_form() {

 

-			$nonce   = $_REQUEST['nonce'];

-			$form_id = $_REQUEST['id'];

+			$nonce   = $_REQUEST[ 'nonce' ];

+			$form_id = $_REQUEST[ 'id' ];

 

 			// verify our nonce

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

@@ -2725,70 +2725,70 @@ 
 			}

 

 			// Store our values!

-			$list_id                 = $_POST['associated-list'];

-			$form_name               = stripslashes( $_POST['form-name'] );

-			$form_description        = sanitize_text_field( stripslashes( $_POST['form-description'] ) );

-			$redirect_user_on_submit = $_POST['redirect-user-on-submission'];

-			$redirect_page           = $_POST['redirect-user-to-selection'];

+			$list_id                 = $_POST[ 'associated-list' ];

+			$form_name               = stripslashes( $_POST[ 'form-name' ] );

+			$form_description        = sanitize_text_field( stripslashes( $_POST[ 'form-description' ] ) );

+			$redirect_user_on_submit = $_POST[ 'redirect-user-on-submission' ];

+			$redirect_page           = $_POST[ 'redirect-user-to-selection' ];

 

 			// stripslashes_deep on save, to prevent foreign languages from added excessive backslashes

-			$assigned_fields = isset( $_POST['field'] ) ? stripslashes_deep( $_POST['field'] ): array();

+			$assigned_fields = isset( $_POST[ 'field' ] ) ? stripslashes_deep( $_POST[ 'field' ] ) : array();

 

 			// setup our submission settings serialized array

 			$submission_settings = 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'] ),

-				'redirect_new_window'	 => $_POST['redirect_new_window'],

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

+				'redirect_new_window'	 => $_POST[ 'redirect_new_window' ],

+				'hide_form_post_signup'  => $_POST[ 'hide-form-post-signup' ],

+				'replace_interests'      => $_POST[ 'replace-interest-groups' ],

 			);

 

 			// setup our opt-in settings serialized array

 			$optin_settings = array(

-				'optin'                => $_POST['single-double-optin'],

-				'update_existing_user' => $_POST['update-existing-user'],

-				'send_update_email'    => $_POST['update-existing-email'],

+				'optin'                => $_POST[ 'single-double-optin' ],

+				'update_existing_user' => $_POST[ 'update-existing-user' ],

+				'send_update_email'    => $_POST[ 'update-existing-email' ],

 			);

 

 			// Setup our error settings serialized array

 			$error_settings = array(

-				'success'				=> trim( $_POST['yikes-easy-mc-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-message'] ) ) : '',

-				'success-single-optin'	=> trim( $_POST['yikes-easy-mc-success-single-optin-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-success-single-optin-message'] ) ) : '',

-				'success-resubscribed'	=> trim( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-resubscribed-success-message'] ) ) : '',

-				'general-error'			=> trim( $_POST['yikes-easy-mc-general-error-message'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-general-error-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'] ) ) : '',

-				'email-subject'			=> trim( $_POST['yikes-easy-mc-user-email-subject'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-subject'] ) ) : '',

-				'email-body'			=> trim( $_POST['yikes-easy-mc-user-email-body'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-user-email-body'] ) ) : '',

-				'update-email-success'  => trim( $_POST['yikes-easy-mc-update-email-successful'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-successful'] ) ) : '',

-				'update-email-failure'  => trim( $_POST['yikes-easy-mc-update-email-failure'] ) ? trim( stripslashes( $_POST['yikes-easy-mc-update-email-failure'] ) ) : '',

+				'success'				=> trim( $_POST[ 'yikes-easy-mc-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-message' ] ) ) : '',

+				'success-single-optin'	=> trim( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-success-single-optin-message' ] ) ) : '',

+				'success-resubscribed'	=> trim( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-resubscribed-success-message' ] ) ) : '',

+				'general-error'			=> trim( $_POST[ 'yikes-easy-mc-general-error-message' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-general-error-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' ] ) ) : '',

+				'email-subject'			=> trim( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-subject' ] ) ) : '',

+				'email-body'			=> trim( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-user-email-body' ] ) ) : '',

+				'update-email-success'  => trim( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-successful' ] ) ) : '',

+				'update-email-failure'  => trim( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ? trim( stripslashes( $_POST[ 'yikes-easy-mc-update-email-failure' ] ) ) : '',

 			);

 

 			// Setup the new form settings array

 			// @since 6.0.3.8

 			// To Do: Combine date & time so it's a single unix timestamp

 			$form_settings = 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' ] ),

 			);

 

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

@@ -2820,7 +2820,7 @@ 
 			$this->form_interface->update_form( $form_id, $form_updates );

 

 			/* 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,  $custom_fields );

+			do_action( 'yikes-mailchimp-save-form', $form_id, $custom_fields );

 

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

@@ -2831,11 +2831,11 @@ 
 			$email_body  = '<p>' . __( 'Greetings,', 'yikes-inc-easy-mailchimp-extender' ) . '</p>'; 

 

 			$email_body .= '<p>';

-			$email_body .= 	__( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );

-			$email_body .=	__( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );

-			$email_body .=	'[link]';

-			$email_body .=		__( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );

-			$email_body .= 	'[/link]';

+			$email_body .= __( 'A request has been made to update your Mailchimp account profile information.', 'yikes-inc-easy-mailchimp-extender' );

+			$email_body .= __( ' To do so please use the following link: ', 'yikes-inc-easy-mailchimp-extender' );

+			$email_body .= '[link]';

+			$email_body .= __( 'Update Mailchimp Profile Info', 'yikes-inc-easy-mailchimp-extender' );

+			$email_body .= '[/link]';

 			$email_body .= '</p>';

 

 			$email_body .= '<p>' . __( 'If you did not request this update, please disregard this email.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';

@@ -2851,13 +2851,13 @@ 
 

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

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

@@ -2876,21 +2876,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' );

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

 			}

 		}

 

@@ -2901,9 +2901,9 @@ 
 		public function yikes_easy_mailchimp_clear_transient_data() {

 

 			// verify our nonce

-			$nonce = $_REQUEST['nonce'];

+			$nonce = $_REQUEST[ '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 ) );

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

 			}

 

 			$this->delete_yikes_mailchimp_transients();

@@ -2912,10 +2912,10 @@ 
 			$referer = wp_get_referer();

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

+				$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 redirect to the manage forms page.

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

 			}

Indentation +72 added lines, -72 removed lines

@@ -510,10 +510,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 update things.

 

@@ -618,7 +618,7 @@ 
 			yikes_easy_mailchimp_stop_bugging_me()

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

 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );

@@ -880,9 +880,9 @@ 
 	}

 

 	/**

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

@@ -1001,28 +1001,28 @@ 
 	}

 

 	/**

-	* Generate Us Easy MailChimp Manage Forms Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us 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 Us Easy MailChimp Manage Lists Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us 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 Us Easy MailChimp Support Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us Easy MailChimp Support Page

+	 *

+	 * @since    1.0.0

+	 */

 	function generateSupportPage() {

 

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

@@ -1030,37 +1030,37 @@ 
 	}

 

 	/**

-	* Generate Us Easy MailChimp Edit Form Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us 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 Us Easy MailChimp View List Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us 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 Us Easy MailChimp View User Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us 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 */

@@ -1178,9 +1178,9 @@ 
 	}

 

 	/**

-	*	Options Sanitization & Validation

-	*	@since complete re-write

-	**/

+	 *	Options Sanitization & Validation

+	 *	@since complete re-write

+	 **/

 	function yikes_mc_validate_api_key( $input ) {

 		if ( $input === '' ) {

 			update_option( 'yikes-mc-api-validation', 'invalid_api_key' );

@@ -1212,20 +1212,20 @@ 
 	}

 

 	/**

-	* Generate Us Easy Forms for MailChimp Options Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us 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' ) {

@@ -1264,7 +1264,7 @@ 
 	/**

 		Admin Notices

 		- Notifications displayed at the top of admin pages, back to the user

-	**/

+	 **/

 

 		/**

 		 * Check for existing plugin options

@@ -1323,12 +1323,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 */

@@ -1566,13 +1566,13 @@ 
 				<?php

 

 					/**

-					*	yikes-mailchimp-excluded-redirect-post-types

-					*

-					*	Filter the post types that will not show on the redirect list dropdown.

-					*

-					* 	@param array | $excluded_post_types | The array of default excluded post types

-					*	@return array| $excluded_post_types | The array of user-defined excluded post types

-					*/

+					 *	yikes-mailchimp-excluded-redirect-post-types

+					 *

+					 *	Filter the post types that will not show on the redirect list dropdown.

+					 *

+					 * 	@param array | $excluded_post_types | The array of default excluded post types

+					 *	@return array| $excluded_post_types | The array of user-defined excluded post types

+					 */

 					$excluded_post_types = array( 'attachment', 'revision', 'nav_menu_item', 'shop_order', 'shop_order_refund', 'custom_css', 'customize_changeset', 'forum', 'topic', 'reply' );

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

 

@@ -1702,9 +1702,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() );

 

 		}

@@ -2626,13 +2626,13 @@ 
 			$result = $this->form_interface->create_form( $form_data );

 

 			/**

-			* `yikes-mailchimp-after-duplicating-form`

-			*

-			* @param $post_id_to_clone | int   | ID of the original form

-			* @param $result           | mixed | ID of the new form OR false if the operation failed

-			* @param $form_data        | array | Array of the form data 

-			*

-			*/

+			 * `yikes-mailchimp-after-duplicating-form`

+			 *

+			 * @param $post_id_to_clone | int   | ID of the original form

+			 * @param $result           | mixed | ID of the new form OR false if the operation failed

+			 * @param $form_data        | array | Array of the form data 

+			 *

+			 */

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

 

 			if ( false === $result ) {

Braces +238 added lines, -238 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,7 +733,7 @@ 
 		/*

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

 		}

 	}

@@ -742,7 +742,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(

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

 		}

 

@@ -805,12 +805,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':

@@ -833,7 +833,7 @@ 
 				break;

 			// Birthday Fields

 			case 'birthday':

-				switch ( $sFormat ) {

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

 					case 'F j, Y':

 					case 'j F Y':

@@ -862,8 +862,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':

@@ -883,7 +883,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(

@@ -996,7 +996,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

 	}

 

@@ -1005,7 +1005,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

 	}

 

@@ -1014,7 +1014,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateManageListsPage() {

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

 	}

 

@@ -1023,7 +1023,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';

@@ -1034,7 +1034,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateEditFormPage() {

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

 	}

 

@@ -1043,7 +1043,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateViewListPage() {

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

 	}

 

@@ -1052,7 +1052,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generateViewUserPage() {

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

 	}

 

@@ -1061,7 +1061,7 @@ 
 	*

 	* @since v.5.4

 	**/

-	function yikes_easy_mc_settings_init() {

+	function yikes_easy_mc_settings_init() {
 

 		/* Register General Settings Section */

 

@@ -1181,27 +1181,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() );

@@ -1216,7 +1216,7 @@ 
 	*

 	* @since    1.0.0

 	*/

-	function generatePageOptions() {

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

 	}

 

@@ -1226,15 +1226,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;

 			}

 		}

@@ -1249,11 +1249,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 );

@@ -1275,15 +1275,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' );

@@ -1294,7 +1294,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>

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

 			   }

 		   }

@@ -1332,14 +1332,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 );

@@ -1348,12 +1348,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 );

 

@@ -1385,9 +1385,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();

@@ -1399,8 +1399,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() );

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

@@ -1453,7 +1453,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(

@@ -1484,18 +1484,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

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

@@ -1516,8 +1516,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' ) ); ?>

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

@@ -1541,7 +1541,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' ); ?>" />

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

@@ -1577,10 +1577,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(

@@ -1595,11 +1595,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

 											}

 									?>

@@ -1630,15 +1630,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">

@@ -1716,18 +1716,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

@@ -1739,18 +1739,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 );

 				}

 

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

 						?>

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

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

 

 										<!-- Placeholder Value -->

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

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

 											case 'text':

 											case 'email':

@@ -1867,7 +1867,7 @@ 
 										?>

 

 										<!-- Default Value -->

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

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

 											case 'text':

 											case 'number':

@@ -1883,7 +1883,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>

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

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

@@ -2111,7 +2111,7 @@ 
 

 

 

-					} else {

+					} else {
 

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

 

@@ -2144,7 +2144,7 @@ 
 

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

 										<!-- Default Value -->

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

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

 											case 'radio':

 											case 'checkboxes':

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

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

@@ -2179,14 +2179,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'; ?>">

@@ -2339,7 +2339,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

@@ -2426,18 +2426,18 @@ 
 		 *	-

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

+				foreach ( $available_merge_variables['merge_fields'] as $merge_var ) {
 					$not_available = isset( $fields_assigned_to_form[ $merge_var['tag'] ] );

 					?>

 					<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

@@ -2450,7 +2450,7 @@ 
 					>

 						<?php

 							echo esc_html( 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>';

 							}

 						?>

@@ -2475,21 +2475,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 ) {

+					foreach ( $available_interest_groups as $interest_group ) {
 						$not_available = isset( $fields_assigned_to_form[ $interest_group['id'] ] );

 						?>

 						<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>" 

@@ -2520,11 +2520,11 @@ 
 		/**

 		 * Smt.

 		 */

-		public function build_available_tags( $form_tags, $tags, $list_id ) {

+		public function build_available_tags( $form_tags, $tags, $list_id ) {
 			?>

 			<ul id="available-tags">

 			<?php

-			foreach ( $tags as $tag_id => $tag ) {

+			foreach ( $tags as $tag_id => $tag ) {
 				$not_available = isset( $form_tags[ $tag_id ] );

 				?>

 				<li class="available-field <?php echo $not_available ? 'not-available' : ''; ?>"

@@ -2554,9 +2554,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' ) );

 			}

 

@@ -2567,13 +2567,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) ) );

 			}

@@ -2586,12 +2586,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 ) );

 			}

 

@@ -2606,12 +2606,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 ) );

 			}

 

@@ -2635,10 +2635,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' ) ) );

 			}

@@ -2649,12 +2649,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 ) );

 			}

 

@@ -2666,10 +2666,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' ) ) );

 			}

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

@@ -2760,11 +2760,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 );

 					}

 				}

@@ -2800,7 +2800,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>';

@@ -2823,18 +2823,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(),

@@ -2847,22 +2847,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() ) ) ) );

 			}

 		}

@@ -2871,11 +2871,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 ) );

 			}

 

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

 			}

@@ -2906,17 +2906,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 );

@@ -2930,9 +2930,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' );

 			}

@@ -2945,11 +2945,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';

@@ -2997,16 +2997,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' );

@@ -3018,8 +3018,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 );

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

 		}

@@ -3043,9 +3043,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();

@@ -3062,11 +3062,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}" );

@@ -3088,13 +3088,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 );

 		}

 	}

@@ -3104,7 +3104,7 @@ 
 	 *

 	 * @author Jeremy Pry

 	 */

-	public function convert_db_to_option() {

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

 		global $wpdb;

 

@@ -3113,11 +3113,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 );

 		}

 

@@ -3129,7 +3129,7 @@ 
 	 *

 	 * @author Jeremy Pry

 	 */

-	public function register_optin_widget() {

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

 	}

 }

admin/partials/helpers/free-support.php

Spacing +3 added lines, -3 removed lines

@@ -5,10 +5,10 @@ 
 	<div id="col-left">
 
 		<div class="col-wrap">
-			<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory' , 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
+			<h1><span class="dashicons dashicons-wordpress-alt support-page-wordpress-font"></span>&nbsp;<?php _e( 'WordPress.org Plugin Directory', 'yikes-inc-easy-mailchimp-extender' ); ?></h1>
 			<div class="inside">
 				<p><?php _e( 'Use your WordPress.org username to submit support requests on the WordPress Directory support forum.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-				<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+				<img class="support-page-logo" src="<?php echo YIKES_MC_URL; ?>includes/images/Support_Page/wordpress-issue-screenshot.png" title="<?php esc_attr_e( 'WordPress.org Issue Tracker Screenshot', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 				<a href="https://wordpress.org/support/plugin/yikes-inc-easy-mailchimp-extender" target="_blank" class="button-secondary support-page-button"><?php _e( 'Submit a New WordPress.org Support Request', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 			</div>
 		</div>
@@ -60,7 +60,7 @@ 
 						printf( '<h2>' . esc_attr__( 'Popular Knowledge Base Articles', 'yikes-inc-easy-mailchimp-extender' ) . '</h2>' );
 						printf( '<ol>' );
 						foreach ( $knowledge_base_links as $kb_link ) {
-							echo wp_kses_post( '<li><a href="' . esc_url( $kb_link['href'] ) . '" title="' . esc_attr( $kb_link['title'] ) . '" target="_blank">' . esc_attr( $kb_link['title'] ) . '</a></li>' );
+							echo wp_kses_post( '<li><a href="' . esc_url( $kb_link[ 'href' ] ) . '" title="' . esc_attr( $kb_link[ 'title' ] ) . '" target="_blank">' . esc_attr( $kb_link[ 'title' ] ) . '</a></li>' );
 						}
 						printf( '</ol>' );
 					}

admin/partials/helpers/premium-support.php

Spacing +14 added lines, -14 removed lines

@@ -6,7 +6,7 @@ 
 			<h2 class="premium-support-title"><?php _e( 'Priority & Add-on Support', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 
 			<?php
-				if ( isset( $_POST['submit-premium-support-request'] ) ) {
+				if ( isset( $_POST[ 'submit-premium-support-request' ] ) ) {
 			?>
 					<h4><?php _e( 'Success!', 'yikes-inc-easy-mailchimp-extender' ); ?></h2>
 					<p><?php _e( 'We have received your support request and will get in touch shortly regarding your issue.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -15,7 +15,7 @@ 
 			?>
 
 			<!-- Premium Support Form -->
-			<form id="premium-support-form" method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#premium-support-form' ) ); ?>" <?php echo (isset($_POST['submit-premium-support-request'])) ? 'class="support-form-hidden"' : ''; ?>>
+			<form id="premium-support-form" method="post" action="<?php echo esc_url( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-support#premium-support-form' ) ); ?>" <?php echo ( isset( $_POST[ 'submit-premium-support-request' ] ) ) ? 'class="support-form-hidden"' : ''; ?>>
 
 				<label><?php _e( 'Add-On:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<select name="license_key" id="license-key">
@@ -25,13 +25,13 @@ 
 								// get the license for the respective extension
 								$options = get_option( 'yikes-mailchimp-' . $extension . '-settings', array() );
 
-								if ( isset( $options['license'] ) && $options['status'] == 'valid' ) {
-									echo '<option data-plugin-slug="' . esc_attr( $extension ) . '" data-plugin-name="' . esc_attr( ucwords( str_replace( '-', ' ', $extension ) ) ) . '" value="' . esc_attr( trim( $options['license'] ) ) . '">' . ucwords( str_replace( '-', ' ', $extension ) ) . ' ' . '</option>';
+								if ( isset( $options[ 'license' ] ) && $options[ 'status' ] == 'valid' ) {
+									echo '<option data-plugin-slug="' . esc_attr( $extension ) . '" data-plugin-name="' . esc_attr( ucwords( str_replace( '-', ' ', $extension ) ) ) . '" value="' . esc_attr( trim( $options[ 'license' ] ) ) . '">' . ucwords( str_replace( '-', ' ', $extension ) ) . ' ' . '</option>';
 								}
 							}
 						?>
 					</select>
-					<p class="description"><?php _e( 'Select the add-on that you are looking for help with.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Select the add-on that you are looking for help with.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 					<input type="hidden" name="plugin-slug" id="plugin-slug" value="">
 					<input type="hidden" name="plugin-name" id="plugin-name" value="">
@@ -39,31 +39,31 @@ 
 
 				<label><?php _e( 'Name:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<input type="text" name="user-name" required>
-					<p class="description"><?php _e( 'Enter your name.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Enter your name.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<label><?php _e( 'Contact Email:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<input type="email" name="user-email" required>
-					<p class="description"><?php _e( 'Enter the email address you would prefer to be contact at.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Enter the email address you would prefer to be contact at.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<label><?php _e( 'Topic:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<input type="text" name="support-topic" required>
-					<p class="description"><?php _e( 'Pleae enter the topic of your support request.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Pleae enter the topic of your support request.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<label><?php _e( 'Priority:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<select name="support-priority">
-						<option value="1"><?php _e( 'Low' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-						<option value="2"><?php _e( 'Medium' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-						<option value="3"><?php _e( 'High' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
-						<option value="4"><?php _e( 'Urgent' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="1"><?php _e( 'Low', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="2"><?php _e( 'Medium', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="3"><?php _e( 'High', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+						<option value="4"><?php _e( 'Urgent', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 					</select>
-					<p class="description"><?php _e( 'Select the priority of this ticket.' , 'yikes-inc-easy-mailchimp-extender' ); ?><em><?php _e( 'Note: Please do not abuse "urgent".' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
+					<p class="description"><?php _e( 'Select the priority of this ticket.', 'yikes-inc-easy-mailchimp-extender' ); ?><em><?php _e( 'Note: Please do not abuse "urgent".', 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>
 				</label>
 				<label><?php _e( 'Issue:', 'yikes-inc-easy-mailchimp-extender' ); ?>
 					<?php wp_editor( '', 'support-content', array( 'textarea_name' => 'support-content', 'media_buttons' => false ) ); ?>
-					<p class="description"><?php _e( 'Enter as much detail about the issue you are encontering as possible. After we make initial contact you can attach any screenshots necessary.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+					<p class="description"><?php _e( 'Enter as much detail about the issue you are encontering as possible. After we make initial contact you can attach any screenshots necessary.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 				</label>
 
 				<input type="hidden" name="action" value="yikes-support-request">

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

Spacing +8 added lines, -8 removed lines

@@ -122,10 +122,10 @@ 
 	*	@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;

 		}

 		

@@ -171,12 +171,12 @@ 
 	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 ) {

-					return _e( 'File get contents not available' , 'yikes-inc-easy-mailchimp-extender' );

+				if ( $error_log_contents === FALSE ) {

+					return _e( 'File get contents not available', 'yikes-inc-easy-mailchimp-extender' );

 				}

 				if ( $error_log_contents != '' ) {

 					// return $error_log_contents;

@@ -187,7 +187,7 @@ 
 						<tr class="error-log-tr">

 							<td class="row-title colspanchange" colspan="2">

 								<strong><span class='dashicons dashicons-no-alt'></span> <?php _e( 'No errors logged.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

-								<?php if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '' ) { ?>

+								<?php if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '' ) { ?>

 									<br />

 									<p class="to-start-logging-errors-notice"><em><?php _e( "To start logging errors toggle on the 'Enable Debugging' option above.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>

 								<?php } ?>

@@ -215,7 +215,7 @@ 
 									);

 									?>

 									<form id="create-error-log" method="POST" action="<?php echo $url; ?>">

-										<?php submit_button( __( 'Attempt to Create Error Log' , 'yikes-inc-easy-mailchimp-extender' ) , 'secondary' , '' , '' , array() ); ?>

+										<?php submit_button( __( 'Attempt to Create Error Log', 'yikes-inc-easy-mailchimp-extender' ), 'secondary', '', '', array() ); ?>

 									</form>

 									

 								</p>

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>

admin/partials/menu/options-sections/integration-settings.php

Spacing +25 added lines, -25 removed lines

@@ -54,23 +54,23 @@ 
 

 	// Easy Digital Downloads.

 	if ( class_exists( 'Easy_Digital_Downloads' ) ) {

-		$active_plugins['easy_digital_downloads_checkout_form'] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'easy_digital_downloads_checkout_form' ] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// WooCommerce.

 	if ( class_exists( 'WooCommerce' ) ) {

-		$active_plugins['woocommerce_checkout_form'] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'woocommerce_checkout_form' ] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// BuddyPress.

 	if ( class_exists( 'BuddyPress' ) ) {

-		$active_plugins['buddypress_form'] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'buddypress_form' ] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// bbPress.

 	if ( class_exists( 'bbPress' ) ) {

-		$active_plugins['bbpress_forms'] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'bbpress_forms' ] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// Contact Form 7.

 	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {

-		$active_plugins['contact_form_7'] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'contact_form_7' ] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );

 	}

 

 	// store our checkbox options.

@@ -87,7 +87,7 @@ 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 			$error_logging->maybe_write_to_log(

 				$list_data->get_error_code(),

-				__( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ),

+				__( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ),

 				"Integration Settings Page"

 			);

 		}

@@ -118,26 +118,26 @@ 
 		<?php

 			if ( ! empty( $active_plugins ) ) {

 

-				foreach( $active_plugins as $class => $value ) {

+				foreach ( $active_plugins as $class => $value ) {

 

-					$checked              = isset( $options[$class]['value'] ) ? 'checked="checked"' : '';

-					$hidden               = ! isset( $options[$class]['value'] ) ? 'yikes-easy-mc-hidden' : '';

-					$checkbox_label       = isset( $options[$class]['label'] ) ? esc_attr( $options[$class]['label'] ) : '';

-					$precheck_checkbox    = isset( $options[$class]['precheck'] ) ? $options[$class]['precheck'] : '';

-					$selected_list        = isset( $options[$class]['associated-list'] ) ? $options[$class]['associated-list'] : '-';

-					$list_interest_groups = isset( $options[$class]['interest-groups'] ) ? $options[$class]['interest-groups'] : false;

+					$checked              = isset( $options[ $class ][ 'value' ] ) ? 'checked="checked"' : '';

+					$hidden               = ! isset( $options[ $class ][ 'value' ] ) ? 'yikes-easy-mc-hidden' : '';

+					$checkbox_label       = isset( $options[ $class ][ 'label' ] ) ? esc_attr( $options[ $class ][ 'label' ] ) : '';

+					$precheck_checkbox    = isset( $options[ $class ][ 'precheck' ] ) ? $options[ $class ][ 'precheck' ] : '';

+					$selected_list        = isset( $options[ $class ][ 'associated-list' ] ) ? $options[ $class ][ 'associated-list' ] : '-';

+					$list_interest_groups = isset( $options[ $class ][ 'interest-groups' ] ) ? $options[ $class ][ 'interest-groups' ] : false;

 

 					// Force the selected list to be an array (@since 6.4).

 					$selected_list        = is_array( $selected_list ) ? $selected_list : array( $selected_list );

 					?>

 						<li class="yikes-mailchimp-checkbox-integration-item">

 							<label>

-								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[$class]; ?></div>

+								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[ $class ]; ?></div>

 							</label>

 						</li>

 						<!-- checkbox settings, text - associated list etc. -->

 						<li class="optin-checkbox-init[<?php echo $class; ?>]-settings <?php echo $hidden; ?>">

-							<?php if( $class == 'contact_form_7' ) { ?>

+							<?php if ( $class == 'contact_form_7' ) { ?>

 								<p style="margin-top:0;"><small class="contact-form-7-notice"><?php printf( __( 'Use %s in Contact Form 7 to display the checkbox.', 'yikes-inc-easy-mailchimp-extender' ), '<code>[yikes_mailchimp_checkbox]</code>' ); ?></small></p>

 							<?php } ?>

 							<p style="margin-top:0;padding-top:0;margin-bottom:0;padding-bottom:0;">

@@ -147,24 +147,24 @@ 
 									<?php

 									if ( count( $list_data ) > 0 ) {

 									?>

-										<?php foreach( $list_data as $list ) { ?>

+										<?php foreach ( $list_data as $list ) { ?>

 

 											<?php

-												$list_interest_groups = isset( $list_interest_groups[ $list['id'] ] ) ? $list_interest_groups[ $list['id'] ] : $list_interest_groups;

+												$list_interest_groups = isset( $list_interest_groups[ $list[ 'id' ] ] ) ? $list_interest_groups[ $list[ 'id' ] ] : $list_interest_groups;

 											?>

 

-											<label class="yikes-mailchimp-checkbox-integration-list" for="list-<?php echo $class ?>-<?php echo $list['id']; ?>">

+											<label class="yikes-mailchimp-checkbox-integration-list" for="list-<?php echo $class ?>-<?php echo $list[ 'id' ]; ?>">

 												<input type="checkbox" class="checkbox-settings-list-item" data-integration="<?php echo $class; ?>" 

 													name="optin-checkbox-init[<?php echo $class; ?>][associated-list][]"

-													value="<?php echo $list['id']; ?>" <?php echo in_array( $list['id'], $selected_list ) ? 'checked="checked"' : ''; ?> 

-													id="list-<?php echo $class ?>-<?php echo $list['id']; ?>">

-												<?php echo $list['name']; ?>

+													value="<?php echo $list[ 'id' ]; ?>" <?php echo in_array( $list[ 'id' ], $selected_list ) ? 'checked="checked"' : ''; ?> 

+													id="list-<?php echo $class ?>-<?php echo $list[ 'id' ]; ?>">

+												<?php echo $list[ 'name' ]; ?>

 											</label>

 

 											<!-- If interest groups have been selected already, load them here -->

 											<?php

-											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {

-												YIKES_Inc_Easy_MailChimp_Process_Ajax::check_list_for_interest_groups( $list['id'], $class, true );

+											if ( in_array( $list[ 'id' ], $selected_list ) && $list_interest_groups ) {

+												YIKES_Inc_Easy_MailChimp_Process_Ajax::check_list_for_interest_groups( $list[ 'id' ], $class, true );

 											}

 											?>

 

@@ -185,8 +185,8 @@ 
 								<label class="optin-checkbox-label">

 									<strong><?php _e( 'Precheck Checkbox?', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

 									<select id="optin-checkbox-init[<?php echo $class; ?>][precheck]" name="optin-checkbox-init[<?php echo $class; ?>][precheck]" class="optin-checkbox-init[<?php echo $class; ?>][precheck] checkbox-settings-list-dropdown">

-										<option value="true" <?php selected( $precheck_checkbox , 'true' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></option>

-										<option value="false" <?php selected( $precheck_checkbox , 'false' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></option>

+										<option value="true" <?php selected( $precheck_checkbox, 'true' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></option>

+										<option value="false" <?php selected( $precheck_checkbox, 'false' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></option>

 									</select>

 								</label>

 							</p>

Braces +14 added lines, -14 removed lines

@@ -53,23 +53,23 @@ 
 	);

 

 	// Easy Digital Downloads.

-	if ( class_exists( 'Easy_Digital_Downloads' ) ) {

+	if ( class_exists( 'Easy_Digital_Downloads' ) ) {
 		$active_plugins['easy_digital_downloads_checkout_form'] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// WooCommerce.

-	if ( class_exists( 'WooCommerce' ) ) {

+	if ( class_exists( 'WooCommerce' ) ) {
 		$active_plugins['woocommerce_checkout_form'] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// BuddyPress.

-	if ( class_exists( 'BuddyPress' ) ) {

+	if ( class_exists( 'BuddyPress' ) ) {
 		$active_plugins['buddypress_form'] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// bbPress.

-	if ( class_exists( 'bbPress' ) ) {

+	if ( class_exists( 'bbPress' ) ) {
 		$active_plugins['bbpress_forms'] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// Contact Form 7.

-	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {

+	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
 		$active_plugins['contact_form_7'] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );

 	}

 

@@ -81,9 +81,9 @@ 
 

 	<?php

 	// lets confirm the user has a valid API key stored.

-	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {

+	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 		$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists();

-		if ( is_wp_error( $list_data ) ) {

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

 			$error_logging->maybe_write_to_log(

 				$list_data->get_error_code(),

@@ -91,7 +91,7 @@ 
 				"Integration Settings Page"

 			);

 		}

-	} else {

+	} else {
 		?>

 		<div class="inside">

 			<?php

@@ -116,9 +116,9 @@ 
 

 	<ul>

 		<?php

-			if ( ! empty( $active_plugins ) ) {

+			if ( ! empty( $active_plugins ) ) {
 

-				foreach( $active_plugins as $class => $value ) {

+				foreach( $active_plugins as $class => $value ) {
 

 					$checked              = isset( $options[$class]['value'] ) ? 'checked="checked"' : '';

 					$hidden               = ! isset( $options[$class]['value'] ) ? 'yikes-easy-mc-hidden' : '';

@@ -145,7 +145,7 @@ 
 								<!-- Associated Lists -->

 								<div class="checkbox-lists"><strong><?php _e( 'Choose Lists: ', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

 									<?php

-									if ( count( $list_data ) > 0 ) {

+									if ( count( $list_data ) > 0 ) {
 									?>

 										<?php foreach( $list_data as $list ) { ?>

 

@@ -163,14 +163,14 @@ 
 

 											<!-- If interest groups have been selected already, load them here -->

 											<?php

-											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {

+											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {
 												YIKES_Inc_Easy_MailChimp_Process_Ajax::check_list_for_interest_groups( $list['id'], $class, true );

 											}

 											?>

 

 										<?php } ?>

 									<?php

-								} else {

+								} else {
 									echo '<p class="description no-lists-setup-notice"><strong>' . __( 'You have not setup any lists. Head over to Mailchimp and setup your first list.', 'yikes-inc-easy-mailchimp-extender' ) . '</strong></p>';

 								}

 								?>

@@ -193,7 +193,7 @@ 
 						</li>

 					<?php

 			}

-		} else {

+		} else {
 			?>

 				<li>

 					<?php _e( 'Nothing is active.', 'yikes-inc-easy-mailchimp-extender' ); ?>