yikesinc / yikes-inc-easy-mailchimp-extender

public/partials/shortcodes/process_form_shortcode.php

Spacing +293 added lines, -293 removed lines

@@ -30,54 +30,54 @@ 
 	$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>';
 			}
 
-			if( ! empty( $atts['recaptcha_type'] ) ) {
-				echo $atts['recaptcha_type'];
+			if ( ! empty( $atts[ 'recaptcha_type' ] ) ) {
+				echo $atts[ 'recaptcha_type' ];
 			}
 
 			// Store the site language (to load recaptcha in a specific language)
 			$locale = get_locale();
 			$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_callback = ( ! empty( $atts['recaptcha_data_callback'] ) ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size
-			$expired_callback = ( ! 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_callback = ( ! empty( $atts[ 'recaptcha_data_callback' ] ) ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size
+			$expired_callback = ( ! 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(
 				'language' => $lang,
@@ -86,48 +86,48 @@ 
 				'size' => $size,
 				'success_callback' => $data_callback,
 				'expired_callback' => $expired_callback,
-			), $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--;
 			}
 		}
 	}
@@ -136,8 +136,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">
@@ -153,19 +153,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
@@ -174,14 +174,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' );
 	}
@@ -189,19 +189,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 = '';
 		}
@@ -211,16 +211,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 {
@@ -228,7 +228,7 @@ 
 		}
 	}
 
-	if( $form_inline ) {
+	if ( $form_inline ) {
 		$field_width          = (float) ( 100 / $field_count );
 		$submit_button_width  = (float) ( 20 / $field_count );
 		$inline_offset        = apply_filters( 'yikes-mailchimp-inline-offset', 1.0, $form_id );
@@ -293,17 +293,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 );
@@ -313,24 +313,24 @@ 
 		*	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 );
 		}
 
 		// 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 ) {
 
 			// Used in `yikes-mailchimp-redirect-url` filter
 			// Note: as of 6.4, this is now just the post ID - not the entire post object.
@@ -339,7 +339,7 @@ 
 
 			// enqueue our ajax script
 			$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-			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'                     => apply_filters( 'yikes-mailchimp-page-data', $page_data, $form_id ),
@@ -351,7 +351,7 @@ 
 		}
 
 		// Generic JavaScript functions for interacting with the form
-		wp_enqueue_script( 'form-submission-helpers', YIKES_MC_URL . 'public/js/form-submission-helpers.min.js' , array( 'jquery' ), YIKES_MC_VERSION, false );
+		wp_enqueue_script( 'form-submission-helpers', YIKES_MC_URL . 'public/js/form-submission-helpers.min.js', array( 'jquery' ), YIKES_MC_VERSION, false );
 		wp_localize_script( 'form-submission-helpers', 'form_submission_helpers', array(
 			'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ),
 			'preloader_url' => apply_filters( 'yikes-mailchimp-preloader', esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) ),
@@ -369,67 +369,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();
@@ -437,19 +437,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 {
@@ -459,28 +459,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;"';
 						}
 					}
 
@@ -488,20 +488,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>';
 
 							/**
@@ -513,11 +513,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':
@@ -525,24 +525,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; } ?>
@@ -554,23 +554,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; } ?>
@@ -581,24 +581,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; } ?>
@@ -608,23 +608,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; } ?>
@@ -637,7 +637,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).
@@ -653,55 +653,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
@@ -710,16 +710,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' ); 
 															/**
@@ -745,21 +745,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 { 
 
@@ -779,7 +779,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
@@ -789,16 +789,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>
@@ -844,40 +844,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; } ?>
@@ -888,26 +888,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' ] ] );
 											}
 
 										?>
@@ -915,11 +915,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"'; } ?>>
@@ -942,17 +942,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 );
@@ -960,29 +960,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++;
@@ -1003,11 +1003,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>';
 
 							/**
@@ -1019,26 +1019,26 @@ 
 							*	@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 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 );
 
 						// 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();
 
 						$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':
@@ -1046,11 +1046,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
 										}
@@ -1059,8 +1059,8 @@ 
 										if ( $show_description === true && $description_above === true ) { echo $description; }
 
 										// Display Submission Errors
-										if( ! empty( $missing_required_checkbox_interest_groups ) ) {
-											if( in_array( $field['group_id'], $missing_required_checkbox_interest_groups ) ) {
+										if ( ! empty( $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 ); ?>
@@ -1072,20 +1072,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 ); ?>
@@ -1107,32 +1107,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 
@@ -1160,12 +1160,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 }
 
@@ -1175,17 +1175,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++;
@@ -1206,11 +1206,11 @@ 
 				do_action( 'yikes-mailchimp-additional-form-fields', $form_data );
 
 				/* if we've enabled reCAPTCHA protection */
-				if( isset( $recaptcha_box ) ) {
+				if ( isset( $recaptcha_box ) ) {
 					echo $recaptcha_box;
 				}
-				if( is_user_logged_in() ) {
-					$admin_class = ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) ? ' admin-logged-in' : '';
+				if ( is_user_logged_in() ) {
+					$admin_class = ( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access', 'manage_options' ) ) ) ? ' admin-logged-in' : '';
 				} else {
 					$admin_class = '';
 				}
@@ -1220,29 +1220,29 @@ 
 				<input type="hidden" name="yikes-mailchimp-honeypot" id="yikes-mailchimp-honeypot" value="">
 
 				<!-- List ID -->
-				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-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" 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" value="<?php echo esc_attr( $form_id ); ?>">
 
 				<!-- Submit Button -->
 				<?php
-					if( $form_inline ) {
+					if ( $form_inline ) {
 						$submit_button_label_classes = array( 'empty-label' );
 						// 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'] );
+					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' ] );
 					} 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 ) {
+					if ( $form_inline ) {
 						echo '</label>';
 					}
 				?>
@@ -1254,8 +1254,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;
 				}
 			}
@@ -1271,7 +1271,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 );
 		}