yikesinc / yikes-inc-easy-mailchimp-extender

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

Indentation +5 added lines, -5 removed lines

@@ -73,10 +73,10 @@ 
 	}
 	
 	/**
-	*	Create our own custom the_content(); filter to prevent plugins and such from hooking in where not wanted
-	*
-	*	@since 6.0.3
-	*/
+	 *	Create our own custom the_content(); filter to prevent plugins and such from hooking in where not wanted
+	 *
+	 *	@since 6.0.3
+	 */
 	public function yikes_custom_frontend_content_filter() {
 		add_filter( 'yikes-mailchimp-frontend-content', 'wptexturize' );
 		add_filter( 'yikes-mailchimp-frontend-content', 'convert_smilies' );
@@ -93,7 +93,7 @@ 
 	 *	load our checkbox classes
 	 *
 	 *	@since 6.0.0
-	**/
+	 **/
 	public function load_checkbox_integration_classes() {
 		// store our options
 		$integrations = get_option( 'optin-checkbox-init' , '' );

Spacing +36 added lines, -36 removed lines

@@ -46,7 +46,7 @@ 
 		 * 	@since 6.0.0
 		 */
 		if ( ! defined( 'YIKES_MC_VERSION' ) ) {
-			define( 'YIKES_MC_VERSION' , $version );
+			define( 'YIKES_MC_VERSION', $version );
 		}
 		/*
 		*	Include our helper functions
@@ -63,9 +63,9 @@ 
 		// include our ajax processing class
 		require_once( YIKES_MC_PATH . 'public/partials/ajax/class.public_ajax.php' );
 		// Include our error logging class
-		add_action( 'init' , array( $this , 'load_error_logging_class' ) , 1 );
+		add_action( 'init', array( $this, 'load_error_logging_class' ), 1 );
 		// load our checkbox classes
-		add_action( 'init' , array( $this , 'load_checkbox_integration_classes' ) , 1 );
+		add_action( 'init', array( $this, 'load_checkbox_integration_classes' ), 1 );
 		// custom front end filter
 		add_action( 'init', array( $this, 'yikes_custom_frontend_content_filter' ) );
 		// Process non-ajax forms in the header
@@ -100,15 +100,15 @@ 
 	**/
 	public function load_checkbox_integration_classes() {
 		// store our options
-		$integrations = get_option( 'optin-checkbox-init' , '' );
-		if( !empty( $integrations ) ) {
+		$integrations = get_option( 'optin-checkbox-init', '' );
+		if ( ! empty( $integrations ) ) {
 			// load our mail integrations class
 			require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations.php';
 			// loop over selected classes and load them up!
-			foreach( $integrations as $integration => $value ) {
-				if( isset( $value['value'] ) && $value['value'] == 'on' ) {
+			foreach ( $integrations as $integration => $value ) {
+				if ( isset( $value[ 'value' ] ) && $value[ 'value' ] == 'on' ) {
 					// load our class extensions
-					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.'.$integration.'-checkbox.php';
+					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.' . $integration . '-checkbox.php';
 				}
 			}
 		}
@@ -122,7 +122,7 @@ 
 	 * @since 6.0.0
 	 */
 	public function load_error_logging_class() {
-		if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 			// if error logging is enabled we should include our error logging class
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging;
@@ -135,18 +135,18 @@ 
 	*	@since 6.0.3.4
 	*/
 	public function yikes_process_non_ajax_forms( $form_submitted ) {
-		global $wpdb,$post;
-		$form_id = ( ! empty( $_POST['yikes-mailchimp-submitted-form'] ) ) ? (int) $_POST['yikes-mailchimp-submitted-form'] : false; // store form id
-		if( $form_id ) {
+		global $wpdb, $post;
+		$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? (int) $_POST[ 'yikes-mailchimp-submitted-form' ] : false; // store form id
+		if ( $form_id ) {
 			$form_settings = self::yikes_retrieve_form_settings( $form_id );
-			if( isset( $_POST ) && !empty( $_POST ) && isset( $form_id ) && $form_settings['submission_settings']['ajax'] == 0 ) {
-				if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) { // ensure we only process the form that was submitted
+			if ( isset( $_POST ) && ! empty( $_POST ) && isset( $form_id ) && $form_settings[ 'submission_settings' ][ 'ajax' ] == 0 ) {
+				if ( $_POST[ 'yikes-mailchimp-submitted-form' ] == $form_id ) { // ensure we only process the form that was submitted
 					// lets include our form processing file
 					include_once( YIKES_MC_PATH . 'public/partials/shortcodes/process/process_form_submission.php' );
-					if( $form_settings['submission_settings']['redirect_on_submission'] == '1' ) {
-						if( $form_submitted == 1 ) {
+					if ( $form_settings[ 'submission_settings' ][ 'redirect_on_submission' ] == '1' ) {
+						if ( $form_submitted == 1 ) {
 							// decode our settings
-							$redirect_page = ( 'custom_url' != $form_settings['submission_settings']['redirect_page'] ) ? get_permalink( (int) $form_settings['submission_settings']['redirect_page'] ) : $form_settings['submission_settings']['custom_redirect_url'];
+							$redirect_page = ( 'custom_url' != $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) ? get_permalink( (int) $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) : $form_settings[ 'submission_settings' ][ 'custom_redirect_url' ];
 							wp_redirect( apply_filters( 'yikes-mailchimp-redirect-url', esc_url( $redirect_page ), $form_id, $post ) );
 							exit;
 						}
@@ -162,27 +162,27 @@ 
 	*/
 	public static function yikes_retrieve_form_settings( $form_id ) {
 		// if no form id, abort
-		if( ! $form_id ) {
+		if ( ! $form_id ) {
 			return;
 		}
 		global $wpdb;
 		$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form_id . '', ARRAY_A ); // query for our form data
-		if( $form_results ) {
+		if ( $form_results ) {
 			// empty array, to populate with form settings
 			$form_settings = array();
-			$form_data = $form_results[0]; // store the results
+			$form_data = $form_results[ 0 ]; // store the results
 			// store the settings in our array
-			$form_settings['list_id'] = sanitize_key( $form_data['list_id'] ); // associated list id (users who fill out the form will be subscribed to this list)
-			$form_settings['form_name'] = esc_attr( $form_data['form_name'] ); // form name
-			$form_settings['form_description'] = esc_attr( stripslashes( $form_data['form_description'] ) );
-			$form_settings['fields'] = json_decode( $form_data['fields'] , true );
-			$form_settings['styles'] = json_decode( stripslashes( $form_data['custom_styles'] ) , true );
-			$form_settings['send_welcome'] = $form_data['send_welcome_email'];
-			$form_settings['submission_settings'] = json_decode( stripslashes( $form_data['submission_settings'] ) , true );
-			$form_settings['optin_settings'] = json_decode( stripslashes( $form_data['optin_settings'] ) , true );
-			$form_settings['error_messages'] = json_decode( $form_data['error_messages'] , true );
-			$form_settings['notifications'] = isset( $form_data['custom_notifications'] ) ? json_decode( stripslashes( $form_data['custom_notifications'] ) , true ) : '';
-			$form_settings['submissions'] = $form_data['submissions'];
+			$form_settings[ 'list_id' ] = sanitize_key( $form_data[ 'list_id' ] ); // associated list id (users who fill out the form will be subscribed to this list)
+			$form_settings[ 'form_name' ] = esc_attr( $form_data[ 'form_name' ] ); // form name
+			$form_settings[ 'form_description' ] = esc_attr( stripslashes( $form_data[ 'form_description' ] ) );
+			$form_settings[ 'fields' ] = json_decode( $form_data[ 'fields' ], true );
+			$form_settings[ 'styles' ] = json_decode( stripslashes( $form_data[ 'custom_styles' ] ), true );
+			$form_settings[ 'send_welcome' ] = $form_data[ 'send_welcome_email' ];
+			$form_settings[ 'submission_settings' ] = json_decode( stripslashes( $form_data[ 'submission_settings' ] ), true );
+			$form_settings[ 'optin_settings' ] = json_decode( stripslashes( $form_data[ 'optin_settings' ] ), true );
+			$form_settings[ 'error_messages' ] = json_decode( $form_data[ 'error_messages' ], true );
+			$form_settings[ 'notifications' ] = isset( $form_data[ 'custom_notifications' ] ) ? json_decode( stripslashes( $form_data[ 'custom_notifications' ] ), true ) : '';
+			$form_settings[ 'submissions' ] = $form_data[ 'submissions' ];
 			// return the given form settings in an array
 			return $form_settings;
 		}
@@ -209,13 +209,13 @@ 
 			return;
 		}
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['update-link'] ) && ! empty( $form_settings['error_messages']['update-link'] ) ) {
-			$response_text = $form_settings['error_messages']['update-link'];
+		if ( isset( $form_settings[ 'error_messages' ][ 'update-link' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'update-link' ] ) ) {
+			$response_text = $form_settings[ 'error_messages' ][ 'update-link' ];
 			// extract the link text
 			preg_match( '/\[link].*?\[\/link\]/', $response_text, $link_text );
 			if ( $link_text && ! empty( $link_text ) ) {
 				// Extract the custom link text ([link]*[/link])
-				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[0], $link ) ) );
+				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[ 0 ], $link ) ) );
 				// Replace the link text, with our custom link text
 				$response_text = str_replace( $link_text, $custom_link_text, $response_text );
 			}
@@ -242,8 +242,8 @@ 
 			return;
 		}
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['already-subscribed'] ) && ! empty( $form_settings['error_messages']['already-subscribed'] ) ) {
-			$response_text = str_replace( '[email]', $email, $form_settings['error_messages']['already-subscribed'] );
+		if ( isset( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) ) {
+			$response_text = str_replace( '[email]', $email, $form_settings[ 'error_messages' ][ 'already-subscribed' ] );
 		}
 		// Return our new string
 		return $response_text;

public/partials/shortcodes/process/process_form_submission.php

Indentation +6 added lines, -6 removed lines

@@ -18,7 +18,7 @@ 
 // Process our form submissions (non ajax forms)
 if ( ! isset( $_POST['yikes_easy_mc_new_subscriber'] ) || ! wp_verify_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) ) {
 
-    $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
+	 $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
 	return;
 
 } else {
@@ -124,11 +124,11 @@ 
 	$merge_variables = apply_filters( 'yikes-mailchimp-before-submission-' . $form_id, $merge_variables );
 
 	/**
-	* Action hooks fired before API request
-	* @since 6.0.5.5
-	* @param $merge_variables 	array 	Array of merge variable to use
-	* @param $form_id						integer	The form ID to target (eg: 1, 2 etc.)
-	*/
+	 * Action hooks fired before API request
+	 * @since 6.0.5.5
+	 * @param $merge_variables 	array 	Array of merge variable to use
+	 * @param $form_id						integer	The form ID to target (eg: 1, 2 etc.)
+	 */
 	do_action( 'yikes-mailchimp-before-submission', $merge_variables );
 	do_action( 'yikes-mailchimp-before-submission-' . $form_id, $merge_variables );
 

Spacing +78 added lines, -78 removed lines

@@ -8,45 +8,45 @@ 
 global $form_submitted, $process_submission_response;
 
 // confirm we have a form id to work with
-$form_id = ( ! empty( $_POST['yikes-mailchimp-submitted-form'] ) ) ? $_POST['yikes-mailchimp-submitted-form'] : false;
-if( ! $form_id ) {
+$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? $_POST[ 'yikes-mailchimp-submitted-form' ] : false;
+if ( ! $form_id ) {
 	return;
 }
 
-$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $_POST['yikes-mailchimp-submitted-form'] );
+$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $_POST[ 'yikes-mailchimp-submitted-form' ] );
 
 // Process our form submissions (non ajax forms)
-if ( ! isset( $_POST['yikes_easy_mc_new_subscriber'] ) || ! wp_verify_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) ) {
+if ( ! isset( $_POST[ 'yikes_easy_mc_new_subscriber' ] ) || ! wp_verify_nonce( $_POST[ 'yikes_easy_mc_new_subscriber' ], 'yikes_easy_mc_form_submit' ) ) {
 
-    $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
+    $process_submission_response = '<p><small class="form_submission_error">' . __( "Error : Sorry, the nonce security check didn't pass. Please reload the page and try again. You may want to try clearing your browser cache as a last attempt.", 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
 	return;
 
 } else {
 
 	/* Check for Honeypot filled */
-	$honey_pot_filled = ( isset( $_POST['yikes-mailchimp-honeypot'] ) && $_POST['yikes-mailchimp-honeypot'] != '' ) ? true : false;
+	$honey_pot_filled = ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $_POST[ 'yikes-mailchimp-honeypot' ] != '' ) ? true : false;
 	// if it was filled out, return an error...
 	if ( $honey_pot_filled ) {
-		$process_submission_response = '<p><small class="form_submission_error">' . __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
+		$process_submission_response = '<p><small class="form_submission_error">' . __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted.", 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
 		return;
 	}
 
 	// Check reCAPTCHA Response
-	if( isset( $_POST['g-recaptcha-response'] ) ) {
-		$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key' , '' ) . '&response=' . $_POST['g-recaptcha-response'] . '&remoteip=' . $_SERVER["REMOTE_ADDR"] );
+	if ( isset( $_POST[ 'g-recaptcha-response' ] ) ) {
+		$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $_POST[ 'g-recaptcha-response' ] . '&remoteip=' . $_SERVER[ "REMOTE_ADDR" ] );
 		$response = wp_remote_get( $url );
-		$response_body = json_decode( $response['body'] , true );
+		$response_body = json_decode( $response[ 'body' ], true );
 
 		// if we've hit an error, lets return the error!
-		if( $response_body['success'] != 1 ) {
+		if ( $response_body[ 'success' ] != 1 ) {
 			$recaptcha_error = array(); // empty array to store error messages
-			foreach( $response_body['error-codes'] as $error_code ) {
-				if( $error_code == 'missing-input-response' ) {
+			foreach ( $response_body[ 'error-codes' ] as $error_code ) {
+				if ( $error_code == 'missing-input-response' ) {
 					$error_code = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' );
 				}
-				$recaptcha_error[] = $error_code;
+				$recaptcha_error[ ] = $error_code;
 			}
-			$process_submission_response .= "<p class='yikes-easy-mc-error-message'>" . apply_filters( 'yikes-mailchimp-recaptcha-required-error', __( 'Error' , 'yikes-inc-easy-mailchimp-extender' )  . ': ' . implode( ' ' , $recaptcha_error ) ) . "</p>";
+			$process_submission_response .= "<p class='yikes-easy-mc-error-message'>" . apply_filters( 'yikes-mailchimp-recaptcha-required-error', __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . implode( ' ', $recaptcha_error ) ) . "</p>";
 			return;
 		}
 	}
@@ -56,20 +56,20 @@ 
 	*	No HTML5 validation, and don't want to use jQuery for non-ajax forms
 	*/
 	$missing_required_checkbox_interest_groups = array();
-	foreach( $form_settings['fields'] as $merge_tag => $field_data ) {
-		if( is_numeric( $merge_tag ) ) {
+	foreach ( $form_settings[ 'fields' ] as $merge_tag => $field_data ) {
+		if ( is_numeric( $merge_tag ) ) {
 			// check if the checkbox group was set to required, if so return an error
-			if( isset( $field_data['require'] ) && $field_data['require'] == 1 ) {
-				if( $field_data['type'] == 'checkboxes' ) {
-					if( ! isset( $_POST[$merge_tag] ) ) {
-						$missing_required_checkbox_interest_groups[] = $merge_tag;
+			if ( isset( $field_data[ 'require' ] ) && $field_data[ 'require' ] == 1 ) {
+				if ( $field_data[ 'type' ] == 'checkboxes' ) {
+					if ( ! isset( $_POST[ $merge_tag ] ) ) {
+						$missing_required_checkbox_interest_groups[ ] = $merge_tag;
 					}
 				}
 			}
 		}
 	}
 
-	if( ! empty( $missing_required_checkbox_interest_groups ) ) {
+	if ( ! empty( $missing_required_checkbox_interest_groups ) ) {
 		$process_submission_response = '<p class="yikes-easy-mc-error-message">' . apply_filters( 'yikes-mailchimp-interest-group-required-top-error', sprintf( _n( 'It looks like you forgot to fill in a required field.', 'It looks like you forgot to fill in %s required fields.', count( $missing_required_checkbox_interest_groups ), 'yikes-inc-easy-mailchimp-extender' ), count( $missing_required_checkbox_interest_groups ) ), count( $missing_required_checkbox_interest_groups ), $form_id ) . '</p>';
 		return;
 	}
@@ -79,12 +79,12 @@ 
 
 	// loop to push variables to our array
 	foreach ( $_POST as $merge_tag => $value ) {
-		if( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
+		if ( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
 			// check if the current iteration has a 'date_format' key set
 			// (aka - date/birthday fields)
-			if( isset( $form_settings['fields'][$merge_tag]['date_format'] ) ) {
+			if ( isset( $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] ) ) {
 				// check if EU date format
-				if( $form_settings['fields'][$merge_tag]['date_format'] == 'DD/MM/YYYY' ) {
+				if ( $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] == 'DD/MM/YYYY' ) {
 					// convert '/' to '.' and to UNIX timestamp
 					$value = ( '' != $value ) ? date( 'Y-m-d', strtotime( str_replace( '/', '.', $value ) ) ) : '';
 				} else {
@@ -92,23 +92,23 @@ 
 					$value = ( '' != $value ) ? date( 'Y-m-d', strtotime( $value ) ) : '';
 				}
 			}
-			if( is_numeric( $merge_tag ) ) { // this is is an interest group!
-				$merge_variables['groupings'][] = array( 'id' => $merge_tag , 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
+			if ( is_numeric( $merge_tag ) ) { // this is is an interest group!
+				$merge_variables[ 'groupings' ][ ] = array( 'id' => $merge_tag, 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
 			} else { // or else it's just a standard merge variable
-				$merge_variables[$merge_tag] = $value;
+				$merge_variables[ $merge_tag ] = $value;
 			}
 		}
 	}
 
 	// store the opt-in time
-	$merge_variables['optin_time'] = current_time( 'Y-m-d H:i:s', 1 );
+	$merge_variables[ 'optin_time' ] = current_time( 'Y-m-d H:i:s', 1 );
 
 	// Submit our form data
-	$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+	$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 	$dash_position = strpos( $api_key, '-' );
 
 	// setup the end point
-	if( $dash_position !== false ) {
+	if ( $dash_position !== false ) {
 		$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/subscribe.json';
 	}
 
@@ -136,8 +136,8 @@ 
 	*	Allow users to check for submit value
 	*	and pass back an error to the user
 	*/
-	if( isset( $merge_variables['error'] ) ) {
-		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content' , $merge_variables['message'] );
+	if ( isset( $merge_variables[ 'error' ] ) ) {
+		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content', $merge_variables[ 'message' ] );
 		return;
 	}
 
@@ -145,10 +145,10 @@ 
 	 * Setup whether or not we should update the user, or display the error with email generation
 	 * @since 6.1
 	 */
-	if ( isset( $form_settings['optin_settings']['update_existing_user'] ) && 1 === absint( $form_settings['optin_settings']['update_existing_user'] ) ) {
+	if ( isset( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] ) && 1 === absint( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] ) ) {
 		$update_existing_user = 1;
 		// Should we send the update email
-		if ( isset( $form_settings['optin_settings']['send_update_email'] ) && 1 === absint( $form_settings['optin_settings']['send_update_email'] ) ) {
+		if ( isset( $form_settings[ 'optin_settings' ][ 'send_update_email' ] ) && 1 === absint( $form_settings[ 'optin_settings' ][ 'send_update_email' ] ) ) {
 			$update_existing_user = 0;
 		}
 	} else {
@@ -160,14 +160,14 @@ 
 		$subscribe_response = wp_remote_post( $api_endpoint, array(
 			'body' => apply_filters( 'yikes-mailchimp-user-subscribe-api-request', array(
 				'apikey' => $api_key,
-				'id' => $_POST['yikes-mailchimp-associated-list-id'],
-				'email' => array( 'email' => sanitize_email( $_POST['EMAIL'] ) ),
+				'id' => $_POST[ 'yikes-mailchimp-associated-list-id' ],
+				'email' => array( 'email' => sanitize_email( $_POST[ 'EMAIL' ] ) ),
 				'merge_vars' => $merge_variables,
-				'double_optin' => $form_settings['optin_settings']['optin'],
+				'double_optin' => $form_settings[ 'optin_settings' ][ 'optin' ],
 				'update_existing' => $update_existing_user, // Decide if we should update the user or not
-				'send_welcome' => $form_settings['optin_settings']['send_welcome_email'],
-				'replace_interests' => ( isset( $form_settings['submission_settings']['replace_interests'] ) ) ? $form_settings['submission_settings']['replace_interests'] : 1, // defaults to replace
-			), $form_id, $_POST['yikes-mailchimp-associated-list-id'], $_POST['EMAIL'] ),
+				'send_welcome' => $form_settings[ 'optin_settings' ][ 'send_welcome_email' ],
+				'replace_interests' => ( isset( $form_settings[ 'submission_settings' ][ 'replace_interests' ] ) ) ? $form_settings[ 'submission_settings' ][ 'replace_interests' ] : 1, // defaults to replace
+			), $form_id, $_POST[ 'yikes-mailchimp-associated-list-id' ], $_POST[ 'EMAIL' ] ),
 			'timeout' => 10,
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 		) );
@@ -175,67 +175,67 @@ 
 		$subscribe_response = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
 
 		// check for any errors
-		if( isset( $subscribe_response['error'] ) ) {
+		if ( isset( $subscribe_response[ 'error' ] ) ) {
 
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response['error'], __( "Subscribe New User" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response[ 'error' ], __( "Subscribe New User", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
 			}
 
 			$update_account_details_link = '';
-			switch( $subscribe_response['code'] ) {
+			switch ( $subscribe_response[ 'code' ] ) {
 				// user already subscribed
 				case '214':
-					$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $_POST['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form_id, '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $_POST['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
-					$update_account_details_link = ( 1 === absint( $form_settings['optin_settings']['update_existing_user'] ) && 1 === absint( $form_settings['optin_settings']['send_update_email'] ) ) ? $custom_already_subscribed_text : false;
-					if( $update_account_details_link ) {
+					$custom_already_subscribed_text = apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $_POST[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), $form_id, '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $_POST[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' );
+					$update_account_details_link = ( 1 === absint( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] ) && 1 === absint( $form_settings[ 'optin_settings' ][ 'send_update_email' ] ) ) ? $custom_already_subscribed_text : false;
+					if ( $update_account_details_link ) {
 						// if update account details is set, we need to include our script to send out the update email
-						wp_enqueue_script( 'update-existing-subscriber.js', YIKES_MC_URL . 'public/js/yikes-update-existing-subscriber.js' , array( 'jquery' ), 'all' );
+						wp_enqueue_script( 'update-existing-subscriber.js', YIKES_MC_URL . 'public/js/yikes-update-existing-subscriber.js', array( 'jquery' ), 'all' );
 						wp_localize_script( 'update-existing-subscriber.js', 'update_subscriber_details_data', 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' ) ) ),
 						) );
 					}
-					if( ! empty( $form_settings['error_messages']['already-subscribed'] ) ) {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . apply_filters( 'yikes-easy-mailchimp-user-already-subscribed-text', $form_settings['error_messages']['already-subscribed'], $form_id, $_POST['EMAIL'] ) . ' ' . $update_account_details_link . '</p>';
+					if ( ! empty( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) ) {
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . apply_filters( 'yikes-easy-mailchimp-user-already-subscribed-text', $form_settings[ 'error_messages' ][ 'already-subscribed' ], $form_id, $_POST[ 'EMAIL' ] ) . ' ' . $update_account_details_link . '</p>';
 					} else {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response['error'] . ' ' . $update_account_details_link . '</p>';
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response[ 'error' ] . ' ' . $update_account_details_link . '</p>';
 					}
 					break;
 				// missing a required field
 				case '250':
 						// get all merge variables in array, loop and str_replace error code with field name
-						$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+						$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 						$dash_position = strpos( $api_key, '-' );
-						if( $dash_position !== false ) {
+						if ( $dash_position !== false ) {
 							$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/merge-vars.json';
 						}
 						$merge_variables = wp_remote_post( $api_endpoint, array(
 							'body' => array(
 								'apikey' => $api_key,
-								'id' => array( $_POST['yikes-mailchimp-associated-list-id'] ) ,
+								'id' => array( $_POST[ 'yikes-mailchimp-associated-list-id' ] ),
 							),
 							'timeout' => 10,
 							'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 						) );
 						$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-						if( isset( $merge_variables['error'] ) ) {
-							if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+						if ( isset( $merge_variables[ 'error' ] ) ) {
+							if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 								require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 								$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
-								$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
+								$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
 							}
 						}
 						// re-store our data
-						$merge_variables = $merge_variables['data'][0]['merge_vars'];
+						$merge_variables = $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ];
 						$merge_variable_name_array = array();
-						foreach( $merge_variables as $merge_var ) {
-							$merge_variables_name_array[$merge_var['tag']] = $merge_var['name'];
+						foreach ( $merge_variables as $merge_var ) {
+							$merge_variables_name_array[ $merge_var[ 'tag' ] ] = $merge_var[ 'name' ];
 						}
-						$error_message = $subscribe_response['error'];
+						$error_message = $subscribe_response[ 'error' ];
 						// replace tag with name in the error message.
-						foreach( $merge_variables_name_array as $tag => $name ) {
+						foreach ( $merge_variables_name_array as $tag => $name ) {
 							$error_message = str_replace( $tag, $name, $error_message );
 						}
 						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $error_message . '.</p>';
@@ -243,18 +243,18 @@ 
 				// test@email.com is not allowed
 				case '-99':
 					// generic error
-					$process_submission_response = '<p class="yikes-easy-mc-error-message">' .  str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response['error'] ) ) . '</p>';
+					$process_submission_response = '<p class="yikes-easy-mc-error-message">' . str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response[ 'error' ] ) ) . '</p>';
 					break;
 				// invalid email (or no email at all)
 				case '-100':
-					$process_submission_response = ( ! empty( $form_settings['error_messages']['invalid-email'] ) ) ? '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['invalid-email'] . '</p>' : '<p class="yikes-easy-mc-error-message">' . __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+					$process_submission_response = ( ! empty( $form_settings[ 'error_messages' ][ 'invalid-email' ] ) ) ? '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'invalid-email' ] . '</p>' : '<p class="yikes-easy-mc-error-message">' . __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 					break;
 				default:
 					// generic error
-					if( ! empty( $form_settings['error_messages']['general-error'] ) ) {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['general-error'] . '</p>';
+					if ( ! empty( $form_settings[ 'error_messages' ][ 'general-error' ] ) ) {
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'general-error' ] . '</p>';
 					} else {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' .  $subscribe_response['error'] . '</p>';
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response[ 'error' ] . '</p>';
 					}
 					break;
 			}
@@ -265,11 +265,11 @@ 
 		$form_submitted = 1;
 
 		// Display the success message
-		if( ! empty( $form_settings['error_messages']['success'] ) ) {
-			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', stripslashes( esc_html( $form_settings['error_messages']['success'] ) ), $form_id, $merge_variables ) . '</p>';
+		if ( ! empty( $form_settings[ 'error_messages' ][ 'success' ] ) ) {
+			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', stripslashes( esc_html( $form_settings[ 'error_messages' ][ 'success' ] ) ), $form_id, $merge_variables ) . '</p>';
 			// echo stripslashes( esc_html( $error_messages['success'] ) );
 		} else {
-			$default_success_response = ( 1 === $form_settings['optin_settings']['optin'] ) ? __( 'Thank you for subscribing! Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' ) : __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' );
+			$default_success_response = ( 1 === $form_settings[ 'optin_settings' ][ 'optin' ] ) ? __( 'Thank you for subscribing! Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' ) : __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' );
 			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', $default_success_response, $form_id, $merge_variables ) . '</p>';
 			// echo $default_success_response;
 		}
@@ -282,8 +282,8 @@ 
 		* 	optional @form - the ID of the form to filter
 		*	@since 6.0.0
 		*/
-		do_action( 'yikes-mailchimp-after-submission' , $merge_variables );
-		do_action( 'yikes-mailchimp-after-submission-' . $form_id , $merge_variables );
+		do_action( 'yikes-mailchimp-after-submission', $merge_variables );
+		do_action( 'yikes-mailchimp-after-submission-' . $form_id, $merge_variables );
 
 		/*
 		*	Non-AJAX redirects now handled in class-yikes-inc-easy-mailchimp-extender-public.php
@@ -301,23 +301,23 @@ 
 		*	@$notifications - the notification array
 		*	@since 6.0.0
 		*/
-		do_action( 'yikes-mailchimp-form-submission' , $_POST['EMAIL'] , $merge_variables , $form_id , $form_settings['notifications'] );
-		do_action( 'yikes-mailchimp-form-submission-' . $form_id , $_POST['EMAIL'] , $merge_variables , $form_id , $form_settings['notifications'] );
+		do_action( 'yikes-mailchimp-form-submission', $_POST[ 'EMAIL' ], $merge_variables, $form_id, $form_settings[ 'notifications' ] );
+		do_action( 'yikes-mailchimp-form-submission-' . $form_id, $_POST[ 'EMAIL' ], $merge_variables, $form_id, $form_settings[ 'notifications' ] );
 
 		/*
 		*	Increase the submission count for this form
 		*	on a successful submission
 		*	@since 6.0.0
 		*/
-		$form_settings['submissions']++;
+		$form_settings[ 'submissions' ]++;
 		$wpdb->update(
 			$wpdb->prefix . 'yikes_easy_mc_forms',
 			array(
-				'submissions' => $form_settings['submissions'],
+				'submissions' => $form_settings[ 'submissions' ],
 			),
 			array( 'ID' => $form_id ),
 			array(
-				'%d',	// send welcome email
+				'%d', // send welcome email
 			),
 			array( '%d' )
 		);

public/partials/shortcodes/process_form_shortcode.php

Spacing +304 added lines, -304 removed lines

@@ -21,7 +21,7 @@ 
 			'recaptcha_data_callback' => '', // set a custom js callback function to run after a successful recaptcha response - default none
 			'recaptcha_expired_callback' => '', // set a custom js callback function to run after the recaptcha has expired - default none
 			'inline' => '0',
-		), $atts , 'yikes-mailchimp' )
+		), $atts, 'yikes-mailchimp' )
 	);
 
 	// set globals
@@ -31,12 +31,12 @@ 
 	$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( ! $form ) {
+	if ( ! $form ) {
 		return __( 'Whoops, it looks like you forgot to specify a form to display.', 'yikes-inc-easy-mailchimp-extender' );
 	}
 
@@ -45,39 +45,39 @@ 
 	$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form . '', ARRAY_A );
 
 	// confirm we have some results, or return an error
-	if( !$form_results ) {
-		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' );
+	if ( ! $form_results ) {
+		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( ! isset( $atts['recaptcha'] ) || ( isset( $atts['recaptcha'] ) && $atts['recaptcha'] == '1' ) ) {
+		if ( ! isset( $atts[ 'recaptcha' ] ) || ( isset( $atts[ 'recaptcha' ] ) && $atts[ 'recaptcha' ] == '1' ) ) {
 			// 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 = ( isset( $locale_split ) ? $locale_split[0] : $locale );
-			$lang = ( isset( $atts['recaptcha_lang'] ) ) ? $atts['recaptcha_lang'] : $locale_split[0];
-			$type = ( isset( $atts['recaptcha_type'] ) ) ? strtolower( $atts['recaptcha_type'] ) : 'image'; // setup recaptcha type
-			$theme= ( isset( $atts['recaptcha_theme'] ) ) ? strtolower( $atts['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
-			$size = ( isset( $atts['recaptcha_size'] ) ) ? strtolower( $atts['recaptcha_size'] ) : 'normal'; // setup recaptcha size
-			$data_callback = ( isset( $atts['recaptcha_data_callback'] ) ) ? $atts['recaptcha_data_callback'] : false; // setup recaptcha size
-			$expired_callback = ( isset( $atts['recaptcha_expired_callback'] ) ) ? $atts['recaptcha_expired_callback'] : false; // setup recaptcha size
+			$lang = ( isset( $locale_split ) ? $locale_split[ 0 ] : $locale );
+			$lang = ( isset( $atts[ 'recaptcha_lang' ] ) ) ? $atts[ 'recaptcha_lang' ] : $locale_split[ 0 ];
+			$type = ( isset( $atts[ 'recaptcha_type' ] ) ) ? strtolower( $atts[ 'recaptcha_type' ] ) : 'image'; // setup recaptcha type
+			$theme = ( isset( $atts[ 'recaptcha_theme' ] ) ) ? strtolower( $atts[ 'recaptcha_theme' ] ) : 'light'; // setup recaptcha theme
+			$size = ( isset( $atts[ 'recaptcha_size' ] ) ) ? strtolower( $atts[ 'recaptcha_size' ] ) : 'normal'; // setup recaptcha size
+			$data_callback = ( isset( $atts[ 'recaptcha_data_callback' ] ) ) ? $atts[ 'recaptcha_data_callback' ] : false; // setup recaptcha size
+			$expired_callback = ( isset( $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,
@@ -88,10 +88,10 @@ 
 				'expired_callback' => $expired_callback,
 			), $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' ) , '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' ), 'all' );
 			wp_enqueue_script( 'google-recaptcha-js' );
-			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key' , '' );
-			$recaptcha_box = '<div name="g-recaptcha" class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params['theme'] . '" data-type="' . $recaptcha_shortcode_params['type'] . '" data-size="' . $recaptcha_shortcode_params['size'] . '" data-callback="' . $recaptcha_shortcode_params['success_callback'] . '" data-expired-callback="' . $recaptcha_shortcode_params['expired_callback'] . '"></div>';
+			$recaptcha_site_key = get_option( 'yikes-mc-recaptcha-site-key', '' );
+			$recaptcha_box = '<div name="g-recaptcha" class="g-recaptcha" data-sitekey="' . $recaptcha_site_key . '" data-theme="' . $recaptcha_shortcode_params[ 'theme' ] . '" data-type="' . $recaptcha_shortcode_params[ 'type' ] . '" data-size="' . $recaptcha_shortcode_params[ 'size' ] . '" data-callback="' . $recaptcha_shortcode_params[ 'success_callback' ] . '" data-expired-callback="' . $recaptcha_shortcode_params[ 'expired_callback' ] . '"></div>';
 			?>
 			<script type="text/javascript">
 				/* Script Callback to init. multiple recaptchas on a single page */
@@ -118,10 +118,10 @@ 
 	}
 
 	// place our results into a seperate variable for easy looping
-	$form_data = $form_results[0];
+	$form_data = $form_results[ 0 ];
 
 	// store our variables
-	$form_id = (int) $form_data['id']; // form id (the id of the form in the database)
+	$form_id = (int) $form_data[ 'id' ]; // form id (the id of the form in the database)
 
 	/*
 	*	Get the stored form settings
@@ -130,32 +130,32 @@ 
 	*/
 	$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $form_id );
 
-	$additional_form_settings = ( isset( $form_data['form_settings'] ) ) ? json_decode( $form_data['form_settings'], true ) : false;
+	$additional_form_settings = ( isset( $form_data[ 'form_settings' ] ) ) ? json_decode( $form_data[ 'form_settings' ], true ) : 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_settings['fields'] );
+	$field_count = (int) count( $form_settings[ '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( json_decode( $form_data['fields'] ) as $form_field ) {
-			if( isset( $form_field->hide ) && $form_field->hide == 1 ) {
+		foreach ( json_decode( $form_data[ 'fields' ] ) as $form_field ) {
+			if ( isset( $form_field->hide ) && $form_field->hide == 1 ) {
 				$field_count--;
 			}
 		}
@@ -165,8 +165,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">
@@ -182,19 +182,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 );
 			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 );
 			return;
 			// abort
@@ -203,8 +203,8 @@ 
 
 	// setup the submit button text
 	// shortcode parameter takes precedence over option
-	if( isset( $atts['submit'] ) ) {
-		$submit = $atts['submit'];
+	if ( isset( $atts[ 'submit' ] ) ) {
+		$submit = $atts[ 'submit' ];
 	} else {
 		$submit = $submit_button_text;
 	}
@@ -214,7 +214,7 @@ 
 	$page_data = $post;
 
 	// Remove the post_password from this for security
-	if( isset( $page_data->post_password ) ) {
+	if ( isset( $page_data->post_password ) ) {
 		unset( $page_data->post_password );
 	}
 
@@ -228,7 +228,7 @@ 
 	*	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', array( $last_key ) );
 	}
@@ -236,12 +236,12 @@ 
 	/**
 	*	Check for form inline parameter
 	*/
-	$form_inline = ( isset( $atts['inline'] ) && ( $atts['inline'] == 1 || $atts['inline'] == 'true' ) ) ? true : false;
+	$form_inline = ( isset( $atts[ 'inline' ] ) && ( $atts[ 'inline' ] == 1 || $atts[ 'inline' ] == 'true' ) ) ? true : false;
 	// recheck from our form options
-	if( ! $form_inline ) {
-		$form_inline = ( isset( $additional_form_settings['yikes-easy-mc-inline-form'] ) && $additional_form_settings['yikes-easy-mc-inline-form'] == 1 ) ? true : false;
+	if ( ! $form_inline ) {
+		$form_inline = ( isset( $additional_form_settings[ 'yikes-easy-mc-inline-form' ] ) && $additional_form_settings[ 'yikes-easy-mc-inline-form' ] == 1 ) ? true : false;
 	}
-	if( $form_inline ) {
+	if ( $form_inline ) {
 		$field_width = (float) ( 100 / $field_count );
 		$submit_button_width = (float) ( 20 / $field_count );
 		/*
@@ -270,12 +270,12 @@ 
 	<?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' ) ) ) {
 				$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=' . $form ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_settings['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=' . $form ) ) . '" title="' . __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $form_settings[ '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, $form, ucwords( $form_settings['form_name'] ) );
+				$edit_form_link = apply_filters( 'yikes-mailchimp-front-end-form-action-links', $edit_form_link, $form, ucwords( $form_settings[ 'form_name' ] ) );
 			} else {
 				$edit_form_link = '';
 			}
@@ -284,16 +284,16 @@ 
 		// ensure there is an 'email' field the user can fill out
 		// or else MailChimp throws errors at you
 			// extract our array keys
-			if( isset( $form_settings['fields'] ) && ! empty( $form_settings['fields'] ) ) {
-				$array_keys = array_keys( $form_settings['fields'] );
+			if ( isset( $form_settings[ 'fields' ] ) && ! empty( $form_settings[ 'fields' ] ) ) {
+				$array_keys = array_keys( $form_settings[ '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 {
@@ -311,13 +311,13 @@ 
 		*	Set a custom title using custom_title="lorem ipsum" parameter in the shortcode
 		*	- This takes precedence over the title set
 		*/
-		if( ! empty( $title ) && $title == 1 && isset( $atts['custom_title'] ) ) {
-			echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts['custom_title'] ), $form_id ) . '</h3>';
+		if ( ! empty( $title ) && $title == 1 && isset( $atts[ 'custom_title' ] ) ) {
+			echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $atts[ 'custom_title' ] ), $form_id ) . '</h3>';
 		} else {
 			// display the form description if the user
 			// has specified to do so
-			if( ! empty( $title ) && $title == 1 ) {
-				echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_settings['form_name'] ), $form_id ) . '</h3>';
+			if ( ! empty( $title ) && $title == 1 ) {
+				echo '<h3 class="yikes-mailchimp-form-title yikes-mailchimp-form-title-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_settings[ 'form_name' ] ), $form_id ) . '</h3>';
 			}
 		}
 
@@ -325,21 +325,21 @@ 
 		*	Allow users to specify a custom description for this form, no html support
 		*	@since 6.0.3.8
 		*/
-		if( ! empty( $description ) && $description == 1 && isset( $atts['custom_description'] ) ) {
-			echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $atts['custom_description'], $form_id ) ) . '</section>';
+		if ( ! empty( $description ) && $description == 1 && isset( $atts[ 'custom_description' ] ) ) {
+			echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $atts[ 'custom_description' ], $form_id ) ) . '</section>';
 		} else {
 			// display the form description if the user
 			// has specified to do so
-			if( ! empty( $description ) && $description == 1 ) {
-				echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-'.$form_id.'">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $form_settings['form_description'], $form_id ) ) . '</section>';
+			if ( ! empty( $description ) && $description == 1 ) {
+				echo '<section class="yikes-mailchimp-form-description yikes-mailchimp-form-description-' . $form_id . '">' . apply_filters( 'yikes-mailchimp-frontend-content', apply_filters( 'yikes-mailchimp-form-description', $form_settings[ 'form_description' ], $form_id ) ) . '</section>';
 			}
 		}
 
 		// Check for AJAX
-		if( ( ! empty( $atts['ajax'] ) && $atts['ajax'] == 1 ) || $form_settings['submission_settings']['ajax'] == 1 ) {
+		if ( ( ! empty( $atts[ 'ajax' ] ) && $atts[ 'ajax' ] == 1 ) || $form_settings[ 'submission_settings' ][ 'ajax' ] == 1 ) {
 			// enqueue our ajax script
-			wp_register_script( 'yikes-easy-mc-ajax' , YIKES_MC_URL . 'public/js/yikes-mc-ajax-forms.min.js' , array( 'jquery' ) , 'yikes-inc-easy-mailchimp-extender', false );
-			wp_localize_script( 'yikes-easy-mc-ajax' , 'object' , array(
+			wp_register_script( 'yikes-easy-mc-ajax', YIKES_MC_URL . 'public/js/yikes-mc-ajax-forms.min.js', array( 'jquery' ), 'yikes-inc-easy-mailchimp-extender', false );
+			wp_localize_script( 'yikes-easy-mc-ajax', 'object', array(
 				'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ),
 				'page_data' => $page_data,
 				'interest_group_checkbox_error' => apply_filters( 'yikes-mailchimp-interest-group-checkbox-error', __( 'This field is required.', 'yikes-inc-easy-mailchimp-extender' ), $form_id ),
@@ -357,63 +357,63 @@ 
 
 		// render the form!
 		?>
-			<form id="<?php echo sanitize_title( $form_settings['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_settings['submission_settings']['hide_form_post_signup'] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" action="" method="POST" data-attr-form-id="<?php echo $form_id; ?>">
+			<form id="<?php echo sanitize_title( $form_settings[ '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_settings[ 'submission_settings' ][ 'hide_form_post_signup' ] == 1 ) { echo ' yikes-easy-mc-display-none'; } ?>" action="" method="POST" data-attr-form-id="<?php echo $form_id; ?>">
 
 				<?php
-				foreach( $form_settings['fields'] as $field ) {
+				foreach ( $form_settings[ '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();
@@ -421,67 +421,67 @@ 
 
 						// 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( $field['hide-label'] == 1 ) {
-								$custom_classes[] = 'field-no-label';
+						if ( isset( $field[ 'hide-label' ] ) ) {
+							if ( $field[ 'hide-label' ] == 1 ) {
+								$custom_classes[ ] = 'field-no-label';
 							}
 						}
 
 					/* Store tag variable based on field type */
-					if( isset( $field['merge'] ) ) {
+					if ( isset( $field[ 'merge' ] ) ) {
 						$tag = 'merge';
 					} else {
 						$tag = 'group_id';
 					}
 
 					// build up our array
-					$field_array['id'] = 'id="yikes-easy-mc-form-' . $form_id . '-' . esc_attr( $field[$tag] ) . '" ';
-					$field_array['name'] = 'name="' . 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="yikes-easy-mc-form-' . $form_id . '-' . esc_attr( $field[ $tag ] ) . '" ';
+					$field_array[ 'name' ] = 'name="' . 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'] = '';
+					if ( $field[ 'type' ] == 'email' ) {
+						$field_array[ 'required' ] = 'required="required"';
+						$label_array[ 'visible' ] = '';
 						// $label_array['required'] = 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"';
-						$label_class_array[] = $field['merge'] . '-label';
-						$label_class_array[] = 'yikes-mailchimp-field-required';
+						$label_class_array[ ] = $field[ 'merge' ] . '-label';
+						$label_class_array[ ] = 'yikes-mailchimp-field-required';
 					} else {
-						if( $tag == 'merge' ) {
-							$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
-							$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
+						if ( $tag == 'merge' ) {
+							$field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : '';
+							$label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
 							// $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['merge'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['merge'] . '-label"';
-							$label_class_array[] = isset( $field['require'] ) ? $field['merge'] . '-label yikes-mailchimp-field-required' : $field['merge'] . '-label';
+							$label_class_array[ ] = isset( $field[ 'require' ] ) ? $field[ 'merge' ] . '-label yikes-mailchimp-field-required' : $field[ 'merge' ] . '-label';
 						} else {
-							$field_array['required'] = isset( $field['require'] ) ? 'required="required"' : '';
-							$label_array['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
+							$field_array[ 'required' ] = isset( $field[ 'require' ] ) ? 'required="required"' : '';
+							$label_array[ 'visible' ] = isset( $field[ 'hide' ] ) ? 'style="display:none;"' : '';
 							// $label_array['required'] = isset( $field['require'] ) ? 'class="' . $field['group_id'] . '-label yikes-mailchimp-field-required"' : 'class="' . $field['group_id'] . '-label"';
-							$label_class_array[] = isset( $field['require'] ) ? $field['group_id'] . '-label yikes-mailchimp-field-required' : $field['group_id'] . '-label';
+							$label_class_array[ ] = isset( $field[ 'require' ] ) ? $field[ 'group_id' ] . '-label yikes-mailchimp-field-required' : $field[ 'group_id' ] . '-label';
 						}
 					}
 
 					// 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;"';
 						}
 					}
 
-					$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' ] ) ) {
 
 						// loop over our fields by Type
-						switch ( $field['type'] ) {
+						switch ( $field[ 'type' ] ) {
 
 							default:
 							case 'email':
@@ -489,25 +489,25 @@ 
 							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 );
 									?>
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?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 } ?>
 
-										<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 $_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 $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -519,7 +519,7 @@ 
 
 							case 'url':
 							case 'imageurl':
-								$default_value = ( isset( $field['default'] ) ) ? $field['default'] : '';
+								$default_value = ( isset( $field[ 'default' ] ) ) ? $field[ 'default' ] : '';
 									?>
 
 									<script type="text/javascript">
@@ -531,22 +531,22 @@ 
 										}
 									</script>
 
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?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 } ?>
 
-										<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 $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>" onblur="properlyFormatURLField(this);return false;">
+										<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 $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>" onblur="properlyFormatURLField(this);return false;">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -557,8 +557,8 @@ 
 							break;
 
 							case 'phone':
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
-								$phone_format = $field['phone_format'];
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
+								$phone_format = $field[ 'phone_format' ];
 								?>
 									<script type="text/javascript">
 										/* Replace incorrect values and format it correctly for MailChimp API */
@@ -571,22 +571,22 @@ 
 										}
 									</script>
 
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?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 } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $phone_format != 'US' ) { ?>  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' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern' , '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" onblur="formatUSPhoneNumber(this);"<?php } ?> value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $phone_format != 'US' ) { ?>  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' ); ?>" pattern="<?php echo apply_filters( 'yikes-mailchimp-us-phone-pattern', '^(\([0-9]{3}\)|[0-9]{3}-)[0-9]{3}-[0-9]{4}$' ); ?>" onblur="formatUSPhoneNumber(this);"<?php } ?> value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . esc_attr( $field['merge'] ) . '-description', stripslashes( $field['description'] ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . esc_attr( $field[ 'merge' ] ) . '-description', stripslashes( $field[ 'description' ] ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -596,25 +596,25 @@ 
 							break;
 
 							case 'zip':
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
 
 									?>
-									<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo $field[ 'merge' ]; ?>" <?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 } ?>
 
-									<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 $_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 $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 									<!-- description -->
-									<?php if( isset( $field['description'] ) ) { ?>
+									<?php if ( isset( $field[ 'description' ] ) ) { ?>
 										<p class="form-field-description">
 											<small>
-												<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $form_id ); ?>
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( stripslashes( $field[ 'description' ] ) ), $form_id ); ?>
 											</small>
 										</p>
 									<?php } ?>
@@ -626,28 +626,28 @@ 
 
 							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' );
 
 								// setup the default country value
 								$default_country = apply_filters( 'yikes-mailchimp-default-country-value', 'US' );
 
 								// store number for looping
 								$x = 1;
-								foreach( $required_fields as $type => $label ) {
+								foreach ( $required_fields as $type => $label ) {
 
 									// set the field names for the addrress fields
-									$field_array['name'] = 'name="'.$field[$tag].'['.$type.']'.'"';
+									$field_array[ 'name' ] = 'name="' . $field[ $tag ] . '[' . $type . ']' . '"';
 
 									// 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' ] );
 										}
 									}
 
-									switch( $type ) {
+									switch ( $type ) {
 
 										default:
 										case 'addr1':
@@ -656,17 +656,17 @@ 
 
 
 											?>
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?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 ) ) ); ?>
+												<?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 ) ) ); ?>
 													</span>
 												<?php } ?>
 
 
-												<input <?php echo implode( ' ' , $field_array ); ?> type="text"  value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } ?>">
+												<input <?php echo implode( ' ', $field_array ); ?> type="text"  value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } ?>">
 
 											</label>
 											<?php
@@ -676,16 +676,16 @@ 
 										case 'state':
 
 											?>
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="state-dropdown"<?php if( ! in_array( $default_country, array( 'US' ) ) ) { ?> style="display: none;"<?php } ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="state-dropdown"<?php if ( ! in_array( $default_country, array( 'US' ) ) ) { ?> style="display: none;"<?php } ?>>
 
 												<!-- 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 ) ) ); ?>
+												<?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 ) ) ); ?>
 													</span>
 												<?php } ?>
 
-												<select <?php echo implode( ' ' , $field_array ); ?>>
+												<select <?php echo implode( ' ', $field_array ); ?>>
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/state-dropdown.php' ); ?>
 												</select>
 
@@ -698,15 +698,15 @@ 
 										case 'zip':
 
 											?>
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?> data-attr-name="zip-input"<?php if( ! in_array( $default_country, array( 'US', 'GB' ) ) ) { ?> style="display: none;"<?php } ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?php echo implode( ' ', $label_array ); ?> data-attr-name="zip-input"<?php if ( ! in_array( $default_country, array( 'US', 'GB' ) ) ) { ?> 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 ) ) ); ?>
+												<?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 ) ) ); ?>
 													</span>
 												<?php } ?>
 
-												<input <?php echo implode( ' ' , $field_array ); ?> type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-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 $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+												<input <?php echo implode( ' ', $field_array ); ?> type="text" pattern="<?php echo apply_filters( 'yikes-mailchimp-zip-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 $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 											</label>
 											<?php
@@ -744,16 +744,16 @@ 
 												$default_country = apply_filters( 'yikes-mailchimp-default-country-value', 'US' );
 											?>
 
-											<label for="<?php echo $field['merge']; ?>" <?php echo implode( ' ' , $label_array ); ?>>
+											<label for="<?php echo $field[ 'merge' ]; ?>" <?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 ) ) ); ?>
+												<?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 ) ) ); ?>
 													</span>
 												<?php } ?>
 
-												<select <?php echo implode( ' ' , $field_array ); ?> onchange="checkCountry(this);return false;">
+												<select <?php echo implode( ' ', $field_array ); ?> onchange="checkCountry(this);return false;">
 													<?php include( YIKES_MC_PATH . 'public/partials/shortcodes/templates/country-dropdown.php' ); ?>
 												</select>
 											</label>
@@ -764,10 +764,10 @@ 
 								}
 
 								// description
-								if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+								if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 									<p class="form-field-description">
 										<small>
-											<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+											<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 										</small>
 									</p>
 									<?php }
@@ -777,19 +777,19 @@ 
 							case 'birthday':
 
 								// bootstrap datepicker requirements
-								wp_enqueue_script( 'bootstrap-hover-dropdown' , YIKES_MC_URL . 'public/js/bootstrap-hover-dropdown.min.js' , array( 'jquery' ) );
-								wp_enqueue_script( 'bootstrap-datepicker-script' , YIKES_MC_URL . 'public/js/bootstrap-datepicker.min.js' , array( 'jquery' , 'bootstrap-hover-dropdown' ) );
-								wp_enqueue_style( 'bootstrap-datepicker-styles' , YIKES_MC_URL . 'public/css/bootstrap-datepicker3.standalone.min.css' );
-								wp_enqueue_style( 'override-datepicker-styles' , YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-datepicker-styles.css' , array( 'bootstrap-datepicker-styles' ) );
+								wp_enqueue_script( 'bootstrap-hover-dropdown', YIKES_MC_URL . 'public/js/bootstrap-hover-dropdown.min.js', array( 'jquery' ) );
+								wp_enqueue_script( 'bootstrap-datepicker-script', YIKES_MC_URL . 'public/js/bootstrap-datepicker.min.js', array( 'jquery', 'bootstrap-hover-dropdown' ) );
+								wp_enqueue_style( 'bootstrap-datepicker-styles', YIKES_MC_URL . 'public/css/bootstrap-datepicker3.standalone.min.css' );
+								wp_enqueue_style( 'override-datepicker-styles', YIKES_MC_URL . 'public/css/yikes-inc-easy-mailchimp-datepicker-styles.css', array( 'bootstrap-datepicker-styles' ) );
 
-								switch ( $field['type'] ) {
+								switch ( $field[ 'type' ] ) {
 									default:
 									case 'date':
-										$date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd/yy';
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd/yy';
 										break;
 
 									case 'birthday':
-										$date_format = ( isset( $field['date_format'] ) ) ? $field['date_format'] : 'mm/dd';
+										$date_format = ( isset( $field[ 'date_format' ] ) ) ? $field[ 'date_format' ] : 'mm/dd';
 										break;
 								}
 								// initialize the datepicker
@@ -800,7 +800,7 @@ 
 											padding: .85em .5em !important;
 										}
 										<?php
-											if( wp_is_mobile() ) {
+											if ( wp_is_mobile() ) {
 												?>
 												.datepicker-dropdown {
 													margin-top: 0px;
@@ -836,10 +836,10 @@ 
 												numberOfMonths: 1,
 												today: '<?php _e( 'Today', 'yikes-inc-easy-mailchimp-extender' ); ?>'
 											};
-											jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').datepicker().on( 'show', function( e ) {
-												var date_picker_height = jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').css( 'height' );
+											jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').datepicker().on( 'show', function( e ) {
+												var date_picker_height = jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').css( 'height' );
 												date_picker_height = parseInt( date_picker_height.replace( 'px', '' ) ) + parseInt( 15 ) + 'px';
-												var date_picker_width = jQuery('input[data-attr-type="<?php echo $field['type']; ?>"]').css( 'width' ).replace( 'px', '' );
+												var date_picker_width = jQuery('input[data-attr-type="<?php echo $field[ 'type' ]; ?>"]').css( 'width' ).replace( 'px', '' );
 												if( date_picker_width > 500 ) {
 													date_picker_width = 500;
 												}
@@ -849,27 +849,27 @@ 
 									</script>
 								<?php
 
-								$default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+								$default_value = ( isset( $field[ 'default' ] ) ? esc_attr( $field[ 'default' ] ) : '' );
 								// store empty number for looping
 								$x = 0;
 
 								?>
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?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 } ?>
 
-										<input <?php echo implode( ' ' , $field_array ); ?> type="text" <?php if( $field['type'] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> placeholder="<?php echo esc_attr( $field['placeholder'] ); ?>" value="<?php if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) { echo $_POST[$field['merge']]; } else { echo esc_attr( $default_value ); } ?>">
+										<input <?php echo implode( ' ', $field_array ); ?> type="text" <?php if ( $field[ 'type' ] == 'date' ) { ?> data-attr-type="date" <?php } else { ?> data-attr-type="birthday" <?php } ?> placeholder="<?php echo esc_attr( $field[ 'placeholder' ] ); ?>" value="<?php if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) { echo $_POST[ $field[ 'merge' ] ]; } else { echo esc_attr( $default_value ); } ?>">
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -880,36 +880,36 @@ 
 							break;
 
 							case 'dropdown':
-								$default_value = $field['default_choice'];
+								$default_value = $field[ 'default_choice' ];
 								// store empty number for looping
 								$x = 0;
 								// hidden labels
 
 									?>
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?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 } ?>
 
-										<select <?php echo implode( ' ' , $field_array ); ?>>
+										<select <?php echo implode( ' ', $field_array ); ?>>
 											<?php
 												// decode for looping
-												$choices = json_decode( $field['choices'], true );
-												foreach( $choices as $choice ) {
-													?><option value="<?php echo $choice; ?>" <?php selected( $default_value , $x ); ?>><?php echo esc_attr( stripslashes( $choice ) ); ?></option><?php
+												$choices = json_decode( $field[ 'choices' ], true );
+												foreach ( $choices as $choice ) {
+													?><option value="<?php echo $choice; ?>" <?php selected( $default_value, $x ); ?>><?php echo esc_attr( stripslashes( $choice ) ); ?></option><?php
 													$x++;
 												}
 											?>
 										</select>
 
 										<!-- description -->
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -923,13 +923,13 @@ 
 							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
-								$default_value = ( isset( $field['default_choice'] ) && $field['default_choice'] != '' ) ? $field['default_choice'] : $choices[0];
+								$default_value = ( isset( $field[ 'default_choice' ] ) && $field[ 'default_choice' ] != '' ) ? $field[ 'default_choice' ] : $choices[ 0 ];
 								// if the form was submit, but failed, let's reset the post data
-								if( isset( $_POST[$field['merge']] ) && $form_submitted != 1 ) {
-									$default_value = $_POST[$field['merge']];
+								if ( isset( $_POST[ $field[ 'merge' ] ] ) && $form_submitted != 1 ) {
+									$default_value = $_POST[ $field[ 'merge' ] ];
 								}
 								$count = count( $choices );
 								$i = 1;
@@ -938,20 +938,20 @@ 
 								// hidden labels
 
 									?>
-									<label for="<?php echo esc_attr( $field['merge'] ); ?>" <?php echo implode( ' ' , $label_array ); ?>>
+									<label for="<?php echo esc_attr( $field[ 'merge' ] ); ?>" <?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 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'; ?> checkbox-parent-label">
+												<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-label', esc_attr( stripslashes( $field[ 'label' ] ) ) ); ?>
 											</span>
 										<?php }
 
-										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 } ?>" <?php if( $i == 1 ) { echo $field_array['required']; } ?>>
-												<input type="<?php echo esc_attr( $field['type'] ); ?>" name="<?php echo $field['merge']; ?>" id="<?php echo $field['merge'] . '-' . $i; ?>" <?php checked( $default_value , $x ); ?> value="<?php echo esc_attr( $choice ); ?>">
-												<span class="<?php echo esc_attr( $field['merge'] ). '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
+											<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 } ?>" <?php if ( $i == 1 ) { echo $field_array[ 'required' ]; } ?>>
+												<input type="<?php echo esc_attr( $field[ 'type' ] ); ?>" name="<?php echo $field[ 'merge' ]; ?>" id="<?php echo $field[ 'merge' ] . '-' . $i; ?>" <?php checked( $default_value, $x ); ?> value="<?php echo esc_attr( $choice ); ?>">
+												<span class="<?php echo esc_attr( $field[ 'merge' ] ) . '-label'; ?>"><?php echo stripslashes( $choice ); ?></span>
 											</label>
 											<?php
 											$i++;
@@ -959,10 +959,10 @@ 
 										}
 
 										// description
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'merge' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -978,26 +978,26 @@ 
 
 
 						// store default choice
-						$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? ( is_array( $field['default_choice'] ) ? $field['default_choice'] : $field['default_choice'] ) : ( isset( $field['default_choice'] ) ? $field['default_choice'] : '' );
+						$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? ( is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : $field[ 'default_choice' ] ) : ( isset( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : '' );
 
 						// if the form was submit, but failed, let's reset the post data
-						if( isset( $_POST[$field['group_id']] ) && $form_submitted != 1 ) {
-							$default_choice = $_POST[$field['group_id']];
+						if ( isset( $_POST[ $field[ 'group_id' ] ] ) && $form_submitted != 1 ) {
+							$default_choice = $_POST[ $field[ 'group_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();
 
 						$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':
@@ -1005,18 +1005,18 @@ 
 								$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( $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( $field[ 'label' ] ) ); ?>
 											</span>
 									<?php
 										}
 
 										// 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 ); ?>
@@ -1027,19 +1027,19 @@ 
 
 
 
-										foreach( $groups as $group ) {
-											if( $field['type'] == 'checkboxes' ) {
+										foreach ( $groups as $group ) {
+											if ( $field[ 'type' ] == 'checkboxes' ) {
 												/* Setup the defaults for this field - varies if the field was previously submitted */
-												if( isset( $_POST[$field['group_id']] ) && $form_submitted != 1 ) {
-													$default_choice = $_POST[$field['group_id']];
-												} elseif( ( ! isset( $_POST['yikes-mailchimp-honeypot'] ) && $form_submitted != 1 ) || ( isset( $_POST['yikes-mailchimp-honeypot'] ) && $form_submitted == 1 ) ) {
-													$default_choice = ( isset( $field['default_choice'] ) && ! empty( $field['default_choice'] ) ) ? ( is_array( $field['default_choice'] ) ? $field['default_choice'] : $field['default_choice'] ) : array();
+												if ( isset( $_POST[ $field[ 'group_id' ] ] ) && $form_submitted != 1 ) {
+													$default_choice = $_POST[ $field[ 'group_id' ] ];
+												} elseif ( ( ! isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 ) || ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 ) ) {
+													$default_choice = ( isset( $field[ 'default_choice' ] ) && ! empty( $field[ 'default_choice' ] ) ) ? ( is_array( $field[ 'default_choice' ] ) ? $field[ 'default_choice' ] : $field[ 'default_choice' ] ) : array();
 												}
 											}
 											?>
-											<label for="<?php echo $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 ) { ?> class="yikes-interest-group-required" <?php } ?> type="<?php echo $type; ?>" name="<?php echo $field['group_id']; ?>[]" id="<?php echo $field['group_id'] . '-' . $i; ?>" <?php if( $field['type'] == 'checkboxes' ) { if( ( ( isset( $_POST['yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 && in_array( $i , $default_choice )) || ! isset( $_POST['yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 && in_array( $i , $default_choice ) ) || ( ( $form_submitted != 1 && isset( $_POST[$field['group_id']] ) ) && in_array( esc_attr( $group['name'] ), $default_choice ) ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[0] : $default_choice , $i ); } ?> value="<?php echo esc_attr( $group['name'] ); ?>">
-												<?php echo $group['name']; ?>
+											<label for="<?php echo $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 ) { ?> class="yikes-interest-group-required" <?php } ?> type="<?php echo $type; ?>" name="<?php echo $field[ 'group_id' ]; ?>[]" id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" <?php if ( $field[ 'type' ] == 'checkboxes' ) { if ( ( ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted == 1 && in_array( $i, $default_choice ) ) || ! isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $form_submitted != 1 && in_array( $i, $default_choice ) ) || ( ( $form_submitted != 1 && isset( $_POST[ $field[ 'group_id' ] ] ) ) && in_array( esc_attr( $group[ 'name' ] ), $default_choice ) ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[ 0 ] : $default_choice, $i ); } ?> value="<?php echo esc_attr( $group[ 'name' ] ); ?>">
+												<?php echo $group[ 'name' ]; ?>
 											</label>
 											<?php
 											$i++;
@@ -1047,10 +1047,10 @@ 
 										}
 
 										// description
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -1064,28 +1064,28 @@ 
 
 									?>
 
-									<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( $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( $field[ 'label' ] ) ); ?>
 											</span>
 										<?php } ?>
 
-										<select <?php echo implode( ' ' , $field_array ); ?>>
+										<select <?php echo implode( ' ', $field_array ); ?>>
 											<?php
 												$i = 0;
-												foreach( $groups as $group ) {
-													?><option <?php selected( $i , $default_choice ); ?> value="<?php echo $group['name']; ?>"><?php echo esc_attr( $group['name'] ); ?></option><?php
+												foreach ( $groups as $group ) {
+													?><option <?php selected( $i, $default_choice ); ?> value="<?php echo $group[ 'name' ]; ?>"><?php echo esc_attr( $group[ 'name' ] ); ?></option><?php
 													$i++;
 												}
 											?>
 										</select>
 
-										<?php if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										<?php if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( $field['description'] ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( $field[ 'description' ] ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php } ?>
@@ -1102,21 +1102,21 @@ 
 
 									?>
 
-									<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 }
 
 
-										foreach( $groups as $group ) {
+										foreach ( $groups as $group ) {
 											?>
-											<label for="<?php echo $field['group_id'] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ' , $custom_classes ); if( $x === $count ) { ?> last-selection<?php } ?>" style="display:none;">
-												<input type="radio" name="<?php echo $field['group_id']; ?>[]" id="<?php echo $field['group_id'] . '-' . $i; ?>" <?php if( $field['type'] == 'checkboxes' ) { if( in_array( $i , $default_choice ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[0] : $default_choice , $i ); } ?> value="<?php echo esc_attr( $group['name'] ); ?>">
-												<?php echo esc_attr( stripslashes( str_replace( '' , '\'', $group['name'] ) ) ); ?>
+											<label for="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" class="yikes-easy-mc-checkbox-label <?php echo implode( ' ', $custom_classes ); if ( $x === $count ) { ?> last-selection<?php } ?>" style="display:none;">
+												<input type="radio" name="<?php echo $field[ 'group_id' ]; ?>[]" id="<?php echo $field[ 'group_id' ] . '-' . $i; ?>" <?php if ( $field[ 'type' ] == 'checkboxes' ) { if ( in_array( $i, $default_choice ) ) { echo 'checked="checked"'; } } else { checked( ( isset( $default_choice ) && is_array( $default_choice ) ) ? $default_choice[ 0 ] : $default_choice, $i ); } ?> value="<?php echo esc_attr( $group[ 'name' ] ); ?>">
+												<?php echo esc_attr( stripslashes( str_replace( '', '\'', $group[ 'name' ] ) ) ); ?>
 											</label>
 											<?php
 											$i++;
@@ -1124,10 +1124,10 @@ 
 										}
 
 										// description
-										if( isset( $field['description'] ) && trim( $field['description'] ) != '' ) { ?>
+										if ( isset( $field[ 'description' ] ) && trim( $field[ 'description' ] ) != '' ) { ?>
 											<p class="form-field-description">
 												<small>
-													<?php echo apply_filters( 'yikes-mailchimp-' . $field['group_id'] . '-description', esc_attr( trim( stripslashes( $field['description'] ) ) ), $form_id ); ?>
+													<?php echo apply_filters( 'yikes-mailchimp-' . $field[ 'group_id' ] . '-description', esc_attr( trim( stripslashes( $field[ 'description' ] ) ) ), $form_id ); ?>
 												</small>
 											</p>
 										<?php }
@@ -1144,11 +1144,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 = '';
 				}
@@ -1158,23 +1158,23 @@ 
 				<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 $form_settings['list_id']; ?>">
+				<input type="hidden" name="yikes-mailchimp-associated-list-id" id="yikes-mailchimp-associated-list-id" value="<?php echo $form_settings[ 'list_id' ]; ?>">
 
 				<!-- 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 $form_id; ?>">
 
 				<!-- Submit Button -->
 				<?php
-					if( $form_inline ) {
+					if ( $form_inline ) {
 						echo '<label class="empty-form-inline-label submit-button-inline-label"><span class="empty-label">&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'] ) . '">' .  apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data['id'] ) . '</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' ] ) . '">' . apply_filters( 'yikes-mailchimp-form-submit-button-text', esc_attr( stripslashes( $submit ) ), $form_data[ 'id' ] ) . '</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>';
 					}
 				?>
@@ -1186,8 +1186,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;
 				}
 			}
@@ -1202,16 +1202,16 @@ 
 		*	Update the impressions count
 		*	for non-admins
 		*/
-		if( !current_user_can( 'manage_options' ) ) {
-			$form_data['impressions']++;
+		if ( ! current_user_can( 'manage_options' ) ) {
+			$form_data[ 'impressions' ]++;
 			$wpdb->update(
 				$wpdb->prefix . 'yikes_easy_mc_forms',
 					array(
-						'impressions' => $form_data['impressions'],
+						'impressions' => $form_data[ 'impressions' ],
 					),
 					array( 'ID' => $form ),
 					array(
-						'%d',	// send welcome email
+						'%d', // send welcome email
 					),
 					array( '%d' )
 				);

includes/add_ons/reverse-zip-lookup.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>
 

admin/partials/menu/add-ons.php

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
 <div class="wrap">
 
 	<!-- Freddie Logo -->
-	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo esc_url( YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png' ); ?>" alt="<?php esc_attr_e( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>YIKES Easy Forms for MailChimp | <?php echo esc_attr__( 'Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=MailChimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons' , 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
+	<h1>YIKES Easy Forms for MailChimp | <?php echo esc_attr__( 'Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="https://yikesplugins.com/plugins/?plugins=MailChimp" target="_blank" class="button-primary coming-soon-button" title="<?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php esc_attr_e( 'View All Add-Ons', 'yikes-inc-easy-mailchimp-extender' ); ?> <span class="dashicons dashicons-external"></span></a></h1>
 
 	<!-- Addons Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find a list of add-ons available for YIKES Easy Forms for MailChimp. Each add-on extends the base functionality of the free plugin." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php esc_attr_e( "Below you'll find a list of add-ons available for YIKES Easy Forms for MailChimp. Each add-on extends the base functionality of the free plugin.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<!-- Add-On Container -->
 	<section id="add-ons">

includes/add_ons/popups.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/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/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>
 

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>