yikesinc / yikes-inc-easy-mailchimp-extender

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

Indentation +13 added lines, -13 removed lines

@@ -72,12 +72,12 @@ 
 			$precheck = isset( $checkbox_options[ $this->type ]['precheck'] ) && 'true' === $checkbox_options[ $this->type ]['precheck'] ? '1' : '0';
 
 			/**
-			* Filter where the checkbox goes.
-			*
-			* See this WooCo article for possible values: https://docs.woocommerce.com/document/tutorial-customising-checkout-fields-using-actions-and-filters/
-			*
-			* @param string | Which set of fields the checkbox should go into
-			*/
+			 * Filter where the checkbox goes.
+			 *
+			 * See this WooCo article for possible values: https://docs.woocommerce.com/document/tutorial-customising-checkout-fields-using-actions-and-filters/
+			 *
+			 * @param string | Which set of fields the checkbox should go into
+			 */
 			$field_placement = apply_filters( 'yikes-mailchimp-wooco-integration-checkbox-placement', 'billing' );
 
 			$yikes_checkbox = array(
@@ -89,13 +89,13 @@ 
 			);
 
 			/**
-			* Filter the checkbox data.
-			*
-			* See this WooCo article for possible values: https://docs.woocommerce.com/document/tutorial-customising-checkout-fields-using-actions-and-filters/
-			*
-			* @param  array $yikes_checkbox The checkbox's fields.
-			* @return array $yikes_checkbox The checkbox's fields.
-			*/
+			 * Filter the checkbox data.
+			 *
+			 * See this WooCo article for possible values: https://docs.woocommerce.com/document/tutorial-customising-checkout-fields-using-actions-and-filters/
+			 *
+			 * @param  array $yikes_checkbox The checkbox's fields.
+			 * @return array $yikes_checkbox The checkbox's fields.
+			 */
 			$yikes_checkbox = apply_filters( 'yikes_mailchimp_wooco_integration_checkbox_field', $yikes_checkbox, $checkbox_options[ $this->type ] );
 
 			$fields[ $field_placement ][ 'yikes_mailchimp_checkbox_' . $this->type ] = $yikes_checkbox;

public/classes/checkbox-integrations.php

Braces +27 added lines, -27 removed lines

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

  * Main Checkbox Integration class.

  */

-class Yikes_Easy_MC_Checkbox_Integration_Class {

+class Yikes_Easy_MC_Checkbox_Integration_Class {
 

 	/**

 	 * The integration type.

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

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

 	 */

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

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

-		if ( empty( $email ) ) {

-			if ( ! is_user_logged_in() ) {

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

 			}

 

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

 

 		// Ensure we have a valid email.

-		if ( ! is_email( $email ) ) {

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

 		}

 

 		// Convert the integration type to a list ID.

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

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

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

 		}

 

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

 

 		// Go through each list...

-		foreach ( $list_ids as $list_id ) {

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

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

 			}

 		}

@@ -74,18 +74,18 @@ 
 	 *

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

 	 */

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

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

 

 		// Check the API to see the status.

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

-		if ( is_wp_error( $response ) ) {

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

 

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

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

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

-			} else {

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

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

@@ -109,7 +109,7 @@ 
 	 *

 	 * @return string The HTML for the checkbox.

 	 */

-	public function yikes_get_checkbox() {

+	public function yikes_get_checkbox() {
 

 		// Enqueue our checkbox styles whenever the checkbox is displayed.

 		wp_enqueue_style( 'yikes-easy-mailchimp-checkbox-integration-styles', plugin_dir_url( __FILE__ ) . '../css/yikes-inc-easy-mailchimp-checkbox-integration.min.css' );

@@ -119,7 +119,7 @@ 
 		$has_list_ids     = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'];

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

 

-		if ( $has_list_ids ) {

+		if ( $has_list_ids ) {
 			$checked  = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : '';

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

 			$content  = '<p id="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox" class="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox">';

@@ -145,18 +145,18 @@ 
 	 * @param string $type       The integration type.

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

 	 */

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

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

 

 		// Make sure we have a list ID.

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

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

 			return;

 		}

 

 		// Check for an IP address.

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

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

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

 		}

 

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

 		);

 

-		foreach ( $list_ids as $list_id ) {

+		foreach ( $list_ids as $list_id ) {
 

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

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

 

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

-			if ( ! empty( $interests ) ) {

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

 

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

-				foreach ( $interests as $interest ) {

-					if ( is_array( $interest ) ) {

-						foreach ( $interest as $group_id ) {

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

 						}

 					}

@@ -217,7 +217,7 @@ 
 

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

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

-			if ( is_wp_error( $response ) ) {

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

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

@@ -235,15 +235,15 @@ 
 	 *

 	 * @param WP_User $user A WP User.

 	 */

-	public function user_merge_vars( WP_User $user ) {

+	public function user_merge_vars( WP_User $user ) {
 

 		// Setup our array.

 		$merge_vars = array();

 		

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

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

 		}

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

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

 		}

 

@@ -267,7 +267,7 @@ 
 	 *

 	 * @return bool True if the checkbox was checked.

 	 */

-	public function was_checkbox_checked( $type ) {

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

 	}

 }

public/classes/process/class.process_form_submission_handler.php

Indentation +539 added lines, -539 removed lines

@@ -3,234 +3,234 @@ 
 class Yikes_Inc_Easy_MailChimp_Extender_Process_Submission_Handler {
 
 	/**
-	* A flag signifying whether we're dealing with an AJAX submission or standard form submission
-	* 
-	* @since 6.3.0
-	* @access protected
-	* @var bool | $is_ajax
-	*/
+	 * A flag signifying whether we're dealing with an AJAX submission or standard form submission
+	 * 
+	 * @since 6.3.0
+	 * @access protected
+	 * @var bool | $is_ajax
+	 */
 	protected $is_ajax;
 
 	/**** Hardcoded Internal Variables ****/
 
 	/**
-	* An array of form fields we don't process
-	* 
-	* @since 6.3.0
-	* @access protected
-	* @var array | $skipped_form_fields
-	*/
+	 * An array of form fields we don't process
+	 * 
+	 * @since 6.3.0
+	 * @access protected
+	 * @var array | $skipped_form_fields
+	 */
 	protected $skipped_form_fields;
 
 	/**** Form Variables ****/
 
 	/**
-	* The ID of the corresponding YIKES MailChimp form
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var int | $form_id
-	*/
+	 * The ID of the corresponding YIKES MailChimp form
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var int | $form_id
+	 */
 	public $form_id;
 
 	/**
-	* The ID of the corresponding MailChimp list
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var int | $list_id
-	*/
+	 * The ID of the corresponding MailChimp list
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var int | $list_id
+	 */
 	public $list_id;
 
 	/**
-	* The submitted email
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $email
-	*/
+	 * The submitted email
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $email
+	 */
 	public $email;
 
 	/**
-	* The array of error messages defined by the user and attached to this form
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var array | $error_messages
-	*/
+	 * The array of error messages defined by the user and attached to this form
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var array | $error_messages
+	 */
 	public $error_messages;
 
 	/**** Default Error Messages ****/
 
 	/**
-	* The error message for no form ID
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_empty_form_id_message
-	*/
+	 * The error message for no form ID
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_empty_form_id_message
+	 */
 	public $handle_empty_form_id_message;
 
 	/**
-	* The error message for no form found
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_empty_form_message
-	*/
+	 * The error message for no form found
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_empty_form_message
+	 */
 	public $handle_empty_form_message;
 
 	/**
-	* The error message for missing form fields
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_empty_fields_generic_message
-	*/
+	 * The error message for missing form fields
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_empty_fields_generic_message
+	 */
 	public $handle_empty_fields_generic_message;
 
 	/**
-	* The error message for missing $list_handler class
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_empty_list_handler_message
-	*/
+	 * The error message for missing $list_handler class
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_empty_list_handler_message
+	 */
 	public $handle_empty_list_handler_message;
 
 	/**
-	* The error message for no email
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_empty_email_message
-	*/
+	 * The error message for no email
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_empty_email_message
+	 */
 	public $handle_empty_email_message;
 
 	/**
-	* The error message for a filled in honeypot
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_non_empty_honeypot_message
-	*/
+	 * The error message for a filled in honeypot
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_non_empty_honeypot_message
+	 */
 	public $handle_non_empty_honeypot_message;
 
 	/**
-	* The error message for existing users trying to update when it's disallowed
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_disallowed_existing_user_update_message
-	*/
+	 * The error message for existing users trying to update when it's disallowed
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_disallowed_existing_user_update_message
+	 */
 	public $handle_disallowed_existing_user_update_message;
 
 	/**
-	* The first half of the error message for updating an existing user when it's done via a profile link
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_updating_existing_user_message
-	*/
+	 * The first half of the error message for updating an existing user when it's done via a profile link
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_updating_existing_user_message
+	 */
 	public $handle_updating_existing_user_message;
 
 	/**
-	* The second half of the error message (the link) for updating an existing user when it's done via a profile link
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_updating_existing_user_link_message
-	*/
+	 * The second half of the error message (the link) for updating an existing user when it's done via a profile link
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_updating_existing_user_link_message
+	 */
 	public $handle_updating_existing_user_link_message;
 
 	/**
-	* A default, generic error message
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $default_error_response_message
-	*/
+	 * A default, generic error message
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $default_error_response_message
+	 */
 	public $default_error_response_message;
 
 	/**
-	* The error message for not filling out a required form field
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_empty_required_field_message
-	*/
+	 * The error message for not filling out a required form field
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_empty_required_field_message
+	 */
 	public $handle_empty_required_field_message;
 
 	/**
-	* The error message for not filling out a required interest group
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_empty_required_interest_group_message
-	*/
+	 * The error message for not filling out a required interest group
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_empty_required_interest_group_message
+	 */
 	public $handle_empty_required_interest_group_message;
 
 	/**
-	* The error message for nonce failures
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_nonce_message
-	*/
+	 * The error message for nonce failures
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_nonce_message
+	 */
 	public $handle_nonce_message;
 
 	/**
-	* The error message for a recaptcha that is not checked/filled out
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_nonce_message
-	*/
+	 * The error message for a recaptcha that is not checked/filled out
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_nonce_message
+	 */
 	public $handle_non_filled_recaptcha_message_message;
 
 	/**
-	* The error message for recaptcha errors that we're not sure of
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $handle_nonce_message
-	*/
+	 * The error message for recaptcha errors that we're not sure of
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $handle_nonce_message
+	 */
 	public $generic_recaptcha_error_message;
 
 	/**** Default Success Messages ****/
 
 	/**
-	* The success message for single-optin forms
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $default_response_single_optin_success_message
-	*/
+	 * The success message for single-optin forms
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $default_response_single_optin_success_message
+	 */
 	public $default_response_single_optin_success_message;
 
 	/**
-	* The default success message for double-optin forms
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $default_response_double_optin_success_message
-	*/
+	 * The default success message for double-optin forms
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $default_response_double_optin_success_message
+	 */
 	public $default_response_double_optin_success_message;
 
 	/**
-	* The default success message for already subscribed users re-subscribing
-	* 
-	* @since 6.3.0
-	* @access public
-	* @var string | $existing_subscriber_profile_update_message
-	*/
+	 * The default success message for already subscribed users re-subscribing
+	 * 
+	 * @since 6.3.0
+	 * @access public
+	 * @var string | $existing_subscriber_profile_update_message
+	 */
 	public $existing_subscriber_profile_update_message;
 
 	/**
-	* The construct function - sets all of our hardcoded variables
-	*
-	* @param bool | $is_ajax | Flag signifying whether this submission request is coming from an AJAX response or basic form submission
-	*/
+	 * The construct function - sets all of our hardcoded variables
+	 *
+	 * @param bool | $is_ajax | Flag signifying whether this submission request is coming from an AJAX response or basic form submission
+	 */
 	public function __construct( $is_ajax ) {
 
 		// Set up our variables
@@ -268,45 +268,45 @@ 
 	/**** Setters for our Form Variables ****/
 
 	/**
-	* Set the form ID class property
-	*
-	* @since 6.3.0
-	*
-	* @param int | $form_id | ID of the corresponding YIKES MailChimp form
-	*/
+	 * Set the form ID class property
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int | $form_id | ID of the corresponding YIKES MailChimp form
+	 */
 	public function set_form_id( $form_id ) {
 		$this->form_id = $form_id;
 	}
 
 	/**
-	* Set the list ID class property
-	*
-	* @since 6.3.0
-	*
-	* @param int | $list_id | ID of the corresponding MailChimp list
-	*/
+	 * Set the list ID class property
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int | $list_id | ID of the corresponding MailChimp list
+	 */
 	public function set_list_id( $list_id ) {
 		$this->list_id = $list_id;
 	}
 
 	/**
-	* Set the email class property
-	*
-	* @since 6.3.0
-	*
-	* @param string | $sanitized_email | The sanitized email
-	*/
+	 * Set the email class property
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $sanitized_email | The sanitized email
+	 */
 	public function set_email( $sanitized_email ) {
 		$this->email = $sanitized_email;
 	}
 
 	/**
-	* Set the $error_messages class property
-	*
-	* @since 6.3.0
-	*
-	* @param array | $error_messages | The array of user-defined error messages for this form
-	*/
+	 * Set the $error_messages class property
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $error_messages | The array of user-defined error messages for this form
+	 */
 	public function set_error_messages( $error_messages ) {
 		$this->error_messages = $error_messages;
 	}
@@ -315,24 +315,24 @@ 
 	/**** Simple Return Functions ****/
 
 	/**
-	* Return a sanitized email
-	*
-	* @since 6.3.0
-	*
-	* @param string | $email | The user's email
-	* @return string| $email | The user's email, lowercased and sanitized
-	*/
+	 * Return a sanitized email
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $email | The user's email
+	 * @return string| $email | The user's email, lowercased and sanitized
+	 */
 	public function get_sanitized_email( $email ) {
 		return sanitize_email( strtolower( $email ) );
 	}
 
 	/**
-	* Return the class property $skipped_form_fields
-	*
-	* @since 6.3.0
-	*
-	* @return array | $skipped_form_fields
-	*/
+	 * Return the class property $skipped_form_fields
+	 *
+	 * @since 6.3.0
+	 *
+	 * @return array | $skipped_form_fields
+	 */
 	protected function get_skipped_merge_tags() {
 		return $this->skipped_form_fields;
 	}
@@ -341,14 +341,14 @@ 
 	/**** Collection of functions handling the incoming form and interest group data ****/
 
 	/**
-	* Loop through form data to sanitize, format, filter, and return.
-	*
-	* @since 6.3.0
-	*
-	* @param array | $data 			 | The array of user-submitted form values
-	* @param array | $form_fields	 | The array of form field definitions for this YIKES MailChimp form
-	* @return array| $merge_variables| The array of sanitized and formatted form values
-	*/
+	 * Loop through form data to sanitize, format, filter, and return.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $data 			 | The array of user-submitted form values
+	 * @param array | $form_fields	 | The array of form field definitions for this YIKES MailChimp form
+	 * @return array| $merge_variables| The array of sanitized and formatted form values
+	 */
 	public function get_submitted_merge_values( $data, $form_fields ) {
 
 		// Array to return
@@ -386,13 +386,13 @@ 
 		}
 
 		/**
-		*	yikes-mailchimp-filter-before-submission || yikes-mailchimp-filter-before-submission-{$form_id}
-		*
-		*	Catch the merge variables before they get sent over to MailChimp
-		*	@since 6.0.0
-		*
-		*	@param array | $merge_variables | The user submitted form data
-		*/
+		 *	yikes-mailchimp-filter-before-submission || yikes-mailchimp-filter-before-submission-{$form_id}
+		 *
+		 *	Catch the merge variables before they get sent over to MailChimp
+		 *	@since 6.0.0
+		 *
+		 *	@param array | $merge_variables | The user submitted form data
+		 */
 		$merge_variables = apply_filters( 'yikes-mailchimp-filter-before-submission', $merge_variables );
 		$merge_variables = apply_filters( "yikes-mailchimp-filter-before-submission-{$this->form_id}", $merge_variables );
 
@@ -400,14 +400,14 @@ 
 	}
 
 	/**
-	* Sanitize form values and return them
-	*
-	* @since 6.3.0
-	* 
-	* @param string | $key		 | The MERGE/Field-name for this value
-	* @param mixed  | $value	 | The form value - this could be an array or a string
-	* @return mixed | $sanitized | The $value sanitized
-	*/ 
+	 * Sanitize form values and return them
+	 *
+	 * @since 6.3.0
+	 * 
+	 * @param string | $key		 | The MERGE/Field-name for this value
+	 * @param mixed  | $value	 | The form value - this could be an array or a string
+	 * @return mixed | $sanitized | The $value sanitized
+	 */ 
 	protected function sanitize_form_values( $key, $value ) {
 		if ( is_scalar( $value ) ) {
 			$sanitized = sanitize_text_field( $value );
@@ -421,14 +421,14 @@ 
 	}
 
 	/**
-	* Check a date field's date format and pass it along to the appropriate function
-	*
-	* @since 6.3.0
-	* 
-	* @param string | $date			| The unformatted date value
-	* @param string | $date_format	| The date format
-	* @return string| $date			| The date formatted according to the $date_format
-	*/ 
+	 * Check a date field's date format and pass it along to the appropriate function
+	 *
+	 * @since 6.3.0
+	 * 
+	 * @param string | $date			| The unformatted date value
+	 * @param string | $date_format	| The date format
+	 * @return string| $date			| The date formatted according to the $date_format
+	 */ 
 	protected function handle_date_format_merge_values( $date, $date_format ) {
 		// Check if EU date format (for dates: 'DD/MM/YYYY', for birthdays: 'DD/MM')
 		if ( 'DD/MM/YYYY' === $date_format ) {
@@ -441,13 +441,13 @@ 
 	}
 
 	/**
-	* Format a date field whose date format is dd/mm/yyyy
-	*
-	* @since 6.3.0
-	*
-	* @param string | $date | A date in the format dd/mm/yyyy
-	* @return string| $date | A date in the format mm/dd/yyyy
-	*/
+	 * Format a date field whose date format is dd/mm/yyyy
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $date | A date in the format dd/mm/yyyy
+	 * @return string| $date | A date in the format mm/dd/yyyy
+	 */
 	protected function handle_dd_mm_yyyy_date( $date ) {
 
 		// MailChimp wants the dates as 'MM/DD/YYYY' regardless of user-specified format, so convert
@@ -466,13 +466,13 @@ 
 	}
 
 	/**
-	* Format a birthday field whose date format is dd/mm
-	*
-	* @since 6.3.0
-	*
-	* @param string | $birthday | A date in the format dd/mm
-	* @return string| $birthday | A date in the format mm/dd
-	*/
+	 * Format a birthday field whose date format is dd/mm
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $birthday | A date in the format dd/mm
+	 * @return string| $birthday | A date in the format mm/dd
+	 */
 	protected function handle_dd_mm_birthday( $birthday ) {
 
 		// MailChimp wants the birthdays as 'MM/DD' regardless of user-specified format, so convert
@@ -492,14 +492,14 @@ 
 
 
 	/**
-	* Create an array of available interest groups based on the $replace_interests flag
-	*
-	* @since 6.3.0
-	*
-	* @param bool	| $replace_interests| True if we're replacing interest groups, false if updating interest groups
-	* @param class 	| $list_class		| Class for interacting with the current list
-	* @return array | $groups			| Array of interest groups 
-	*/
+	 * Create an array of available interest groups based on the $replace_interests flag
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param bool	| $replace_interests| True if we're replacing interest groups, false if updating interest groups
+	 * @param class 	| $list_class		| Class for interacting with the current list
+	 * @return array | $groups			| Array of interest groups 
+	 */
 	public function get_default_interest_groups( $replace_interests, $list_class ) {
 
 		// If $replace_interests flag is true then loop through interest groups and set them all to false to start.
@@ -533,15 +533,15 @@ 
 
 
 	/**
-	* Loop through the interest group form data to sanitize, format, filter, and return.
-	*
-	* @since 6.3.0
-	*
-	* @param array | $data			| The array of user-submitted form values
-	* @param array | $form_fields	| The array of form field definitions for this YIKES MailChimp form
-	* @param array | $groups		| The array of interest groups created by `get_default_interest_groups()`
-	* @return array| $groups		| The array of sanitized and formatted form values
-	*/
+	 * Loop through the interest group form data to sanitize, format, filter, and return.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $data			| The array of user-submitted form values
+	 * @param array | $form_fields	| The array of form field definitions for this YIKES MailChimp form
+	 * @param array | $groups		| The array of interest groups created by `get_default_interest_groups()`
+	 * @return array| $groups		| The array of sanitized and formatted form values
+	 */
 	public function get_submitted_interest_groups( $data, $form_fields, $groups ) {
 
 		// loop to push variables to our array
@@ -570,13 +570,13 @@ 
 		}
 
 		/**
-		*	yikes-mailchimp-filter-groups-before-submission
-		*
-		*	Catch the interest groups before they get sent over to MailChimp
-		*	@param array | $groups | User submitted interest group data
-		*	@optional int| $form_id| the ID of the form to filter
-		*	@since 6.3.0
-		*/
+		 *	yikes-mailchimp-filter-groups-before-submission
+		 *
+		 *	Catch the interest groups before they get sent over to MailChimp
+		 *	@param array | $groups | User submitted interest group data
+		 *	@optional int| $form_id| the ID of the form to filter
+		 *	@since 6.3.0
+		 */
 		$groups = apply_filters( 'yikes-mailchimp-filter-groups-before-submission', $groups, $this->form_id );
 		$groups = apply_filters( 'yikes-mailchimp-filter-groups-before-submission-{$this->form_id}', $groups, $this->form_id );
 
@@ -587,17 +587,17 @@ 
 	/**** Functions to Handle Subscribe API Response ****/
 
 	/**
-	* Handle the response to a successful subscribe request
-	*
-	* @since 6.3.0
-	*
-	* @param array | $submission_settings	| Array of the form's submission settings
-	* @param array | $page_data				| Array of the page data
-	* @param array | $merge_variables		| Array of the submitted form variables
-	* @param array | $notifications			| Literally don't know what this is yet.
-	* @param array | $optin_settings 		| Array of the form's optin settings
-	* @param bool  | $new_subscriber 		| True if a new subscriber, false if an existing one
-	*/
+	 * Handle the response to a successful subscribe request
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $submission_settings	| Array of the form's submission settings
+	 * @param array | $page_data				| Array of the page data
+	 * @param array | $merge_variables		| Array of the submitted form variables
+	 * @param array | $notifications			| Literally don't know what this is yet.
+	 * @param array | $optin_settings 		| Array of the form's optin settings
+	 * @param bool  | $new_subscriber 		| True if a new subscriber, false if an existing one
+	 */
 	public function handle_submission_response_success( $submission_settings, $page_data, $merge_variables, $notifications, $optin_settings, $new_subscriber ) {
 
 		// Check if we should redirect, and collect the redirect info in an array
@@ -606,27 +606,27 @@ 
 		// Fire off our actions
 
 		/**
-		*	yikes-mailchimp-after-submission || yikes-mailchimp-after-submission-{$form_id}
-		*
-		*	Catch the merge variables after they've been sent over to MailChimp
-		*	@since 6.0.0
-		*
-		*	@param array | $merge_variables | The array of user submitted form data
-		*/
+		 *	yikes-mailchimp-after-submission || yikes-mailchimp-after-submission-{$form_id}
+		 *
+		 *	Catch the merge variables after they've been sent over to MailChimp
+		 *	@since 6.0.0
+		 *
+		 *	@param array | $merge_variables | The array of user submitted form data
+		 */
 		do_action( 'yikes-mailchimp-after-submission', $merge_variables, $this->form_id );
 		do_action( "yikes-mailchimp-after-submission-{$this->form_id}", $merge_variables, $this->form_id );
 
 		/**
-		*	yikes-mailchimp-form-submission || yikes-mailchimp-form-submission-{$form_id}
-		*
-		*	Catch our notifications and other form data
-		*
-		*	@param string | $email			 | The user's email
-		*	@param array  | $merge_variables | The array of user submitted form data
-		*	@param string | $form_id		 | The form ID
-		* 	@param array  | $notifications	 | Array of notification messages
-		*
-		*/
+		 *	yikes-mailchimp-form-submission || yikes-mailchimp-form-submission-{$form_id}
+		 *
+		 *	Catch our notifications and other form data
+		 *
+		 *	@param string | $email			 | The user's email
+		 *	@param array  | $merge_variables | The array of user submitted form data
+		 *	@param string | $form_id		 | The form ID
+		 * 	@param array  | $notifications	 | Array of notification messages
+		 *
+		 */
 		do_action( 'yikes-mailchimp-form-submission', $this->email, $merge_variables, $this->form_id, $notifications );
 		do_action( "yikes-mailchimp-form-submission-{$this->form_id}", $this->email, $merge_variables, $this->form_id, $notifications );
 
@@ -648,15 +648,15 @@ 
 		$default_response = ( $new_subscriber === false ) ? $this->check_for_user_defined_response_message( 'success-resubscribed', $this->existing_subscriber_profile_update_message ) : $default_response;
 
 		/**
-		*	yikes-mailchimp-success-response
-		*
-		*	Filter the success message displayed to the user
-		*
-		*	@param string | $default_response	| The response message that will be shown to the user if unchanged (see above for logic)
-		*	@param string | $form_id		 	| The form ID
-		*	@param array  | $merge_variables 	| The array of user submitted form data
-		*
-		*/
+		 *	yikes-mailchimp-success-response
+		 *
+		 *	Filter the success message displayed to the user
+		 *
+		 *	@param string | $default_response	| The response message that will be shown to the user if unchanged (see above for logic)
+		 *	@param string | $form_id		 	| The form ID
+		 *	@param array  | $merge_variables 	| The array of user submitted form data
+		 *
+		 */
 		$response_message = apply_filters( 'yikes-mailchimp-success-response', $default_response, $this->form_id, $merge_variables );
 
 		// Construct our success array variables
@@ -675,13 +675,13 @@ 
 	}
 
 	/**
-	* Handle an unsuccessful/error subscribe request
-	*
-	* @since 6.3.0
-	*
-	* @param object | $subscribe_response	| The response from the API
-	* @param array  | $form_fields			| The array of form field definitions for this YIKES MailChimp form
-	*/
+	 * Handle an unsuccessful/error subscribe request
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param object | $subscribe_response	| The response from the API
+	 * @param array  | $form_fields			| The array of form field definitions for this YIKES MailChimp form
+	 */
 	public function handle_submission_response_error( $subscribe_response, $form_fields ) {
 
 		// Get the error data
@@ -723,13 +723,13 @@ 
 	// Note: All of these functions return `return $this->yikes_fail()`. Check function for more info.
 
 	/**
-	* Check if the submitted form data is missing any required fields
-	*
-	* @since 6.3.0
-	*
-	* @param array | $data 			 | The array of user-submitted form values
-	* @param array | $form_fields	 | The array of form field definitions for this YIKES MailChimp form
-	*/
+	 * Check if the submitted form data is missing any required fields
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $data 			 | The array of user-submitted form values
+	 * @param array | $form_fields	 | The array of form field definitions for this YIKES MailChimp form
+	 */
 	public function check_for_required_form_fields( $data, $form_fields ) {
 
 		// Set up our defaults
@@ -754,15 +754,15 @@ 
 					foreach( $value as $field => $val ) {
 
 						/**
-						*	'yikes-mailchimp-ignore-required-array-field'
-						*
-						* 	Filter the default array of fields we're ignoring. As of now, this is only for address fields because no other field is an array.
-						*
-						*	@param array | Array of fields to ignore. Key of the array should be the field name.
-						*	@param int   | $form_id
-						*
-						*	@return Array of fields to ignore.
-						*/
+						 *	'yikes-mailchimp-ignore-required-array-field'
+						 *
+						 * 	Filter the default array of fields we're ignoring. As of now, this is only for address fields because no other field is an array.
+						 *
+						 *	@param array | Array of fields to ignore. Key of the array should be the field name.
+						 *	@param int   | $form_id
+						 *
+						 *	@return Array of fields to ignore.
+						 */
 						$ignored_fields = apply_filters( 'yikes-mailchimp-ignore-required-array-field', array( 'addr2' => true ), $this->form_id );
 
 						if ( empty( $val ) && ! isset( $ignored_fields[ $field ] ) ) {
@@ -793,14 +793,14 @@ 
 			);
 
 			/**
-			*	yikes-mailchimp-required-form-field-missing
-			*
-			*	Alter the response message shown to the user for missing required form fields
-			*
-			*	@param string | $handle_empty_required_field_message	| The default message displayed to the user
-			*	@param int	  | $form_id 								| The ID of the form
-			*	@param array  | $missing_fields							| Array of the missing required fields
-			*/
+			 *	yikes-mailchimp-required-form-field-missing
+			 *
+			 *	Alter the response message shown to the user for missing required form fields
+			 *
+			 *	@param string | $handle_empty_required_field_message	| The default message displayed to the user
+			 *	@param int	  | $form_id 								| The ID of the form
+			 *	@param array  | $missing_fields							| Array of the missing required fields
+			 */
 			$default_response = apply_filters( 'yikes-mailchimp-required-form-field-missing', $this->handle_empty_required_field_message, $this->form_id, $missing_fields );
 
 			// If we've found a missing field, return the array of field data
@@ -809,13 +809,13 @@ 
 	}
 
 	/**
-	* Check if the submitted form interest group data is missing any required fields
-	*
-	* @since 6.3.0
-	*
-	* @param array | $data 			 | The array of user-submitted form values
-	* @param array | $form_fields	 | The array of form field definitions for this YIKES MailChimp form
-	*/
+	 * Check if the submitted form interest group data is missing any required fields
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $data 			 | The array of user-submitted form values
+	 * @param array | $form_fields	 | The array of form field definitions for this YIKES MailChimp form
+	 */
 	public function check_for_required_interest_groups( $data, $form_fields ) {
 
 		// Set up our defaults
@@ -849,14 +849,14 @@ 
 			);
 
 			/**
-			*	yikes-mailchimp-required-interest-group-missing
-			*
-			*	Alter the response message shown to the user for missing required form fields
-			*
-			*	@param string | $handle_empty_required_interest_group_message	| The default message displayed to the user
-			*	@param int	  | $form_id 										| The ID of the form
-			*	@param array  | $missing_fields									| Array of the missing required fields
-			*/
+			 *	yikes-mailchimp-required-interest-group-missing
+			 *
+			 *	Alter the response message shown to the user for missing required form fields
+			 *
+			 *	@param string | $handle_empty_required_interest_group_message	| The default message displayed to the user
+			 *	@param int	  | $form_id 										| The ID of the form
+			 *	@param array  | $missing_fields									| Array of the missing required fields
+			 */
 			$default_response = apply_filters( 'yikes-mailchimp-required-interest-group-missing', $this->handle_empty_required_interest_group_message, $this->form_id, $missing_fields );
 
 			// If we find a required interest group with an empty value, send an error
@@ -865,12 +865,12 @@ 
 	}
 
 	/**
-	* Handle the reCAPTCHA
-	*
-	* @since 6.3.0
-	*
-	* @param string | $recaptcha_response | The form value of the recaptcha field
-	*/
+	 * Handle the reCAPTCHA
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $recaptcha_response | The form value of the recaptcha field
+	 */
 	public function handle_recaptcha( $recaptcha_response ) {
 
 		// Before we the hit the API, let's check that we actually got a response.
@@ -878,11 +878,11 @@ 
 		if ( empty( $recaptcha_response ) ) {
 
 			/**
-			*	yikes-mailchimp-recaptcha-required-error
-			*
-			*	Catch the recaptcha errors before they're returned to the user
-			*	@param string | $recaptcha_errors | A string of recaptcha errors separated by a space
-			*/
+			 *	yikes-mailchimp-recaptcha-required-error
+			 *
+			 *	Catch the recaptcha errors before they're returned to the user
+			 *	@param string | $recaptcha_errors | A string of recaptcha errors separated by a space
+			 */
 			$response = apply_filters( 'yikes-mailchimp-recaptcha-required-error', $this->handle_non_filled_recaptcha_message_message, $this->form_id );
 			return $this->yikes_fail( $hide = 0, $error = 1, $response, array(), $return_response_non_ajax = true );
 		}
@@ -915,40 +915,40 @@ 
 			}
 
 			/**
-			*	yikes-mailchimp-recaptcha-required-error
-			*
-			*	Catch the recaptcha errors before they're returned to the user
-			*	@param string | $recaptcha_errors | A string of recaptcha errors separated by a space
-			*/
+			 *	yikes-mailchimp-recaptcha-required-error
+			 *
+			 *	Catch the recaptcha errors before they're returned to the user
+			 *	@param string | $recaptcha_errors | A string of recaptcha errors separated by a space
+			 */
 			$response = apply_filters( 'yikes-mailchimp-recaptcha-required-error', implode( ' ', $recaptcha_errors ), $this->form_id );
 			return $this->yikes_fail( $hide = 0, $error = 1, $response, array(), $return_response_non_ajax = true );
 		}
 	}
 
 	/**
-	* Handle the nonce field
-	*
-	* @since 6.3.0
-	*
-	* @param string | $nonce_value | The form value of the nonce
-	* @param string | $nonce_name  | The name of the nonce
-	*/
+	 * Handle the nonce field
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $nonce_value | The form value of the nonce
+	 * @param string | $nonce_name  | The name of the nonce
+	 */
 	public function handle_nonce( $nonce_value, $nonce_name ) {
 
 		// First, check our option - this is set in the general settings page
 		if ( get_option( 'yikes-mailchimp-use-nonce' ) === '1' ) {
 
 			/**
-			*	yikes-mailchimp-use-nonce-verification
-			*
-			*	Decide if we're going to check the nonce value.
-			*	The reason we filter this is that some users are experiencing nonce issues repeatedly.
-			*	The default will always be to use the nonce.
-			*
-			*	@param  int  | $form_id  | The form id
-			*
-			*	@return bool | True if we should check the nonce
-			*/
+			 *	yikes-mailchimp-use-nonce-verification
+			 *
+			 *	Decide if we're going to check the nonce value.
+			 *	The reason we filter this is that some users are experiencing nonce issues repeatedly.
+			 *	The default will always be to use the nonce.
+			 *
+			 *	@param  int  | $form_id  | The form id
+			 *
+			 *	@return bool | True if we should check the nonce
+			 */
 			$use_nonce = apply_filters( 'yikes-mailchimp-use-nonce-verification', true, $this->form_id );
 
 			// We let the filter override the option because the filter is on a per-form basis 
@@ -961,24 +961,24 @@ 
 	}
 
 	/**
-	* Handle a merge_variables error
-	*
-	* @since 6.3.0
-	*
-	* @param int	| $error	| Int $error = 1 if an error
-	* @param string | $message  | The message shown to the user
-	*/
+	 * Handle a merge_variables error
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int	| $error	| Int $error = 1 if an error
+	 * @param string | $message  | The message shown to the user
+	 */
 	public function handle_merge_variables_error( $error, $message ) {
 		return $this->yikes_fail( $hide = 0, $error, $message, array(), $return_response_non_ajax = true );
 	}
 
 	/**
-	* Handle an empty email field and return the corresponding error message
-	*
-	* @since 6.3.0
-	*
-	* @param string | $email
-	*/
+	 * Handle an empty email field and return the corresponding error message
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $email
+	 */
 	public function handle_empty_email( $email ) {
 		if ( empty( $email ) ) {
 			return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_email_message );
@@ -986,12 +986,12 @@ 
 	}
 
 	/**
-	* Check if the form is empty and return the corresponding error message
-	*
-	* @since 6.3.0
-	*
-	* @param array | $form_data
-	*/
+	 * Check if the form is empty and return the corresponding error message
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $form_data
+	 */
 	public function handle_empty_form( $form_data ) {
 		if ( empty( $form_data ) ) {
 			return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_form_message );
@@ -999,12 +999,12 @@ 
 	}
 
 	/**
-	* Check if the honeypot is NOT empty and return the corresponding error message
-	*
-	* @since 6.3.0
-	*
-	* @param bool | $honey_pot_filled | True if the honeypot was filled out
-	*/
+	 * Check if the honeypot is NOT empty and return the corresponding error message
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param bool | $honey_pot_filled | True if the honeypot was filled out
+	 */
 	public function handle_non_empty_honeypot( $honey_pot_filled ) {
 		if ( $honey_pot_filled === true ) {
 			return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_non_empty_honeypot_message );
@@ -1012,12 +1012,12 @@ 
 	}
 
 	/**
-	* Loop through fields looking for null and return the corresponding error message
-	*
-	* @since 6.3.0
-	*
-	* @param array | $fields_array | An array of fields to loop through and make sure they're not null
-	*/
+	 * Loop through fields looking for null and return the corresponding error message
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $fields_array | An array of fields to loop through and make sure they're not null
+	 */
 	public function handle_empty_fields_generic( $fields_array ) {
 		foreach( $fields_array as $field ) {
 			if ( $field === null ) {
@@ -1027,12 +1027,12 @@ 
 	}
 
 	/**
-	* Check if the list handler is empty and return the corresponding error message
-	*
-	* @since 6.3.0
-	*
-	* @param class | $list_handler | A class that handles list functions
-	*/
+	 * Check if the list handler is empty and return the corresponding error message
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param class | $list_handler | A class that handles list functions
+	 */
 	public function handle_empty_list_handler( $list_handler ) {
 		if ( empty( $list_handler ) ) {
 			return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_list_handler_message );
@@ -1040,12 +1040,12 @@ 
 	}
 
 	/**
-	* Check if the form id is empty and return the corresponding error message
-	*
-	* @since 6.3.0
-	*
-	* @param int | $form_id | The form ID
-	*/
+	 * Check if the form id is empty and return the corresponding error message
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int | $form_id | The form ID
+	 */
 	public function handle_empty_form_id( $form_id ) {
 		if ( empty( $form_id ) ) {
 			return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_form_id_message );
@@ -1053,10 +1053,10 @@ 
 	}
 
 	/**
-	* Construct and filter the error message related to user's re-subscribing when it's not allowed
-	*
-	* @since 6.3.0
-	*/
+	 * Construct and filter the error message related to user's re-subscribing when it's not allowed
+	 *
+	 * @since 6.3.0
+	 */
 	public function handle_disallowed_existing_user_update() {
 
 		// Get the default response
@@ -1069,10 +1069,10 @@ 
 	}
 
 	/**
-	* Construct and filter the error message related to the profile link to update user's profile
-	*
-	* @since 6.3.0
-	*/
+	 * Construct and filter the error message related to the profile link to update user's profile
+	 *
+	 * @since 6.3.0
+	 */
 	public function handle_updating_existing_user() {
 
 		// Get the first half of the message
@@ -1097,15 +1097,15 @@ 
 	/**** Helper Functions ****/
 
 	/**
-	* Check the user-defined $error_messages array for a message, filter it, and return it. These messages overwrite the defaults.
-	*
-	* @since 6.3.0
-	*
-	* @param string | $slug 		| The type of message we're looking for
-	* @param string | $response_text| The default response message
-	* @param array  | $data			| An array of data that may be needed to construct the user's error message
-	* @return string| $response_text| The $response_text (after it's potentially been changed)
-	*/
+	 * Check the user-defined $error_messages array for a message, filter it, and return it. These messages overwrite the defaults.
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $slug 		| The type of message we're looking for
+	 * @param string | $response_text| The default response message
+	 * @param array  | $data			| An array of data that may be needed to construct the user's error message
+	 * @return string| $response_text| The $response_text (after it's potentially been changed)
+	 */
 	protected function check_for_user_defined_response_message( $slug, $response_text, $data = false ) {
 
 		switch( $slug ) {
@@ -1119,13 +1119,13 @@ 
 				}
 
 				/**
-				*	yikes-easy-mailchimp-user-already-subscribed-text
-				*
-				*	Catch the message for user's already subscrbed before we show it to the user
-				*	@param string | $message  | The response message
-				*	@param int	  | $form_id  | The form id
-				*	@param string | $email	  | The user's email
-				*/
+				 *	yikes-easy-mailchimp-user-already-subscribed-text
+				 *
+				 *	Catch the message for user's already subscrbed before we show it to the user
+				 *	@param string | $message  | The response message
+				 *	@param int	  | $form_id  | The form id
+				 *	@param string | $email	  | The user's email
+				 */
 				$response_text = apply_filters( 'yikes-mailchimp-user-already-subscribed-text', $response_text, $this->form_id, $this->email );
 
 				return $response_text;
@@ -1144,13 +1144,13 @@ 
 				}
 
 				/**
-				*	yikes-easy-mailchimp-user-already-subscribed-link-text
-				*
-				*	Catch the message for user's already subscrbed link text before we show it to the user
-				*
-				*	@param string | $response_text	| The response message that will be shown to the user
-				*	@param string | $form_id		| The form ID
-				*/
+				 *	yikes-easy-mailchimp-user-already-subscribed-link-text
+				 *
+				 *	Catch the message for user's already subscrbed link text before we show it to the user
+				 *
+				 *	@param string | $response_text	| The response message that will be shown to the user
+				 *	@param string | $form_id		| The form ID
+				 */
 				$response_text = apply_filters( 'yikes-mailchimp-user-already-subscribed-link-text', $response_text, $this->form_id );
 
 				return $response_text;
@@ -1164,14 +1164,14 @@ 
 				}
 
 				/**
-				*	yikes-mailchimp-success-double-optin-response
-				*
-				*	Filter the success message displayed to the user
-				*
-				*	@param string | $response_text	| The response message that will be shown to the user
-				*	@param string | $form_id		| The form ID
-				*
-				*/
+				 *	yikes-mailchimp-success-double-optin-response
+				 *
+				 *	Filter the success message displayed to the user
+				 *
+				 *	@param string | $response_text	| The response message that will be shown to the user
+				 *	@param string | $form_id		| The form ID
+				 *
+				 */
 				$response_text = apply_filters( 'yikes-mailchimp-success-double-optin-response', $response_text, $this->form_id );
 
 				return $response_text;
@@ -1184,14 +1184,14 @@ 
 				}
 
 				/**
-				*	yikes-mailchimp-success-single-optin-response
-				*
-				*	Filter the success message displayed to the user
-				*
-				*	@param string | $response_text	| The response message that will be shown to the user
-				*	@param string | $form_id		| The form ID
-				*
-				*/
+				 *	yikes-mailchimp-success-single-optin-response
+				 *
+				 *	Filter the success message displayed to the user
+				 *
+				 *	@param string | $response_text	| The response message that will be shown to the user
+				 *	@param string | $form_id		| The form ID
+				 *
+				 */
 				$response_text = apply_filters( 'yikes-mailchimp-success-single-optin-response', $response_text, $this->form_id );
 
 				return $response_text;
@@ -1204,14 +1204,14 @@ 
 				}
 
 				/**
-				*	yikes-mailchimp-success-resubscribed-response
-				*
-				*	Filter the success message displayed to the user
-				*
-				*	@param string | $response_text	| The response message that will be shown to the user
-				*	@param string | $form_id 		| The form ID
-				*
-				*/
+				 *	yikes-mailchimp-success-resubscribed-response
+				 *
+				 *	Filter the success message displayed to the user
+				 *
+				 *	@param string | $response_text	| The response message that will be shown to the user
+				 *	@param string | $form_id 		| The form ID
+				 *
+				 */
 				$response_text = apply_filters( 'yikes-mailchimp-success-resubscribed-response', $response_text, $this->form_id );
 
 				return $response_text;
@@ -1227,16 +1227,16 @@ 
 				}
 
 				/**
-				*	yikes-mailchimp-general-error-response
-				*
-				*	Filter the error message displayed to the user
-				*
-				*	@param string | $original_response_text     | The original response message returned from the API
-				*	@param string | $user_defined_response_text | The response message defined by the user
-				*	@param string | $form_id                    | The form ID
-				*
-				* 	@return string | $response_text | The message that will be shown to the user 
-				*/
+				 *	yikes-mailchimp-general-error-response
+				 *
+				 *	Filter the error message displayed to the user
+				 *
+				 *	@param string | $original_response_text     | The original response message returned from the API
+				 *	@param string | $user_defined_response_text | The response message defined by the user
+				 *	@param string | $form_id                    | The form ID
+				 *
+				 * 	@return string | $response_text | The message that will be shown to the user 
+				 */
 				$response_text = apply_filters( 'yikes-mailchimp-general-error-response', $original_response_text, $user_defined_response_text, $this->form_id );
 
 				return $response_text;
@@ -1250,14 +1250,14 @@ 
 	}
 
 	/**
-	* Wrap the response message in HTML for Non-AJAX form submissions
-	*
-	* @since 6.3.0
-	*
-	* @param string | $message		| The response message
-	* @param bool	| $is_success	| Boolean signifying if we're returning a success message or an error message
-	* @return string| The $message wrapping in HTML
-	*/
+	 * Wrap the response message in HTML for Non-AJAX form submissions
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $message		| The response message
+	 * @param bool	| $is_success	| Boolean signifying if we're returning a success message or an error message
+	 * @return string| The $message wrapping in HTML
+	 */
 	public function wrap_form_submission_response( $message, $is_success ) {
 
 		// If we're successful, we wrap the $message differently
@@ -1271,14 +1271,14 @@ 
 	/**** Returning Success / Failure Functions ****/
 
 	/**
-	* Return success. Method of returning success based on the $is_ajax flag
-	*
-	* @since 6.3.0
-	*
-	* @param array | $success_array | Array of success values to return
-	*
-	* @return If AJAX, return wp_send_json_success(). If not AJAX, set the global $process_submission_response variable and simply `return`.
-	*/
+	 * Return success. Method of returning success based on the $is_ajax flag
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $success_array | Array of success values to return
+	 *
+	 * @return If AJAX, return wp_send_json_success(). If not AJAX, set the global $process_submission_response variable and simply `return`.
+	 */
 	protected function yikes_success( $success_array ) {
 		if ( $this->is_ajax === true ) {
 			wp_send_json_success( $success_array );
@@ -1291,18 +1291,18 @@ 
 	}
 
 	/**
-	* Return failure. Method of returning failure based on the $is_ajax flag
-	*
-	* @since 6.3.0
-	*
-	* @param int	| $hide						| Flag whether to hide the form (1 = hide, 0 = do not hide)
-	* @param int	| $error					| Flag whether this is an error (1 = error, 0 = no error)
-	* @param string | $response					| The response message to display to the user
-	* @param array  | $additional_fields		| An array of additional fields to return
-	* @param bool	| $return_response_non_ajax | Boolean deciding if we need to return a message
-	*
-	* @return If AJAX, return $this->yikes_send_json_error(). If not AJAX, return an array || false.
-	*/	
+	 * Return failure. Method of returning failure based on the $is_ajax flag
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int	| $hide						| Flag whether to hide the form (1 = hide, 0 = do not hide)
+	 * @param int	| $error					| Flag whether this is an error (1 = error, 0 = no error)
+	 * @param string | $response					| The response message to display to the user
+	 * @param array  | $additional_fields		| An array of additional fields to return
+	 * @param bool	| $return_response_non_ajax | Boolean deciding if we need to return a message
+	 *
+	 * @return If AJAX, return $this->yikes_send_json_error(). If not AJAX, return an array || false.
+	 */	
 	protected function yikes_fail( $hide, $error, $response, $additional_fields = array(), $return_response_non_ajax = false ) {
 		if ( $this->is_ajax === true ) {
 			$this->yikes_send_json_error( $hide, $error, $response, $additional_fields );
@@ -1315,17 +1315,17 @@ 
 	}
 
 	/**
-	* Wrapper function for wp_send_json_error()
-	*
-	* @since 6.3.0
-	*
-	* @param int	| $hide						| Flag whether to hide the form (1 = hide, 0 = do not hide)
-	* @param int	| $error					| Flag whether this is an error (1 = error, 0 = no error)
-	* @param string | $translated_string		| The response message to display to the user
-	* @param array  | $additional_fields		| An array of additional fields to return
-	*
-	* @return func  | wp_send_json_error()
-	*/
+	 * Wrapper function for wp_send_json_error()
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param int	| $hide						| Flag whether to hide the form (1 = hide, 0 = do not hide)
+	 * @param int	| $error					| Flag whether this is an error (1 = error, 0 = no error)
+	 * @param string | $translated_string		| The response message to display to the user
+	 * @param array  | $additional_fields		| An array of additional fields to return
+	 *
+	 * @return func  | wp_send_json_error()
+	 */
 	protected function yikes_send_json_error( $hide, $error, $translated_string, $additional_fields = array() ) {
 
 		// Default response array
@@ -1349,14 +1349,14 @@ 
 	/** Static functions used in other places **/
 
 	/**
-	* Handle the redirect logic for successful submissions
-	*
-	* @since 6.3.0
-	*
-	* @param array | $submission_settings	| Array of the form's submission settings
-	* @param array | $page_data				| Page ID
-	* @return array| $redirect_array		| Array with two values: Redirection flag, Redirect URL
-	*/
+	 * Handle the redirect logic for successful submissions
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param array | $submission_settings	| Array of the form's submission settings
+	 * @param array | $page_data				| Page ID
+	 * @return array| $redirect_array		| Array with two values: Redirection flag, Redirect URL
+	 */
 	public static function handle_submission_response_success_redirect( $form_id, $submission_settings, $page_data ) {
 
 		$default_redirect_time_ms = 1500;
@@ -1389,23 +1389,23 @@ 
 			$redirect_url = 'custom_url' !== $redirect_page_setting ? get_permalink( $redirect_page_setting ) : $custom_redirect_setting;
 
 			/**
-			*	yikes-mailchimp-redirect-url
-			*
-			*	Catch the redirect URL before it's shown to the user
-			*
-			*	@param string | $redirect_url	| The URL that we will redirect to
-			*	@param string | $form_id		| The ID of the current form being subscribed to
-			*	@param array  | $page_data		| An array of data related to the page the form is on
-			*/
+			 *	yikes-mailchimp-redirect-url
+			 *
+			 *	Catch the redirect URL before it's shown to the user
+			 *
+			 *	@param string | $redirect_url	| The URL that we will redirect to
+			 *	@param string | $form_id		| The ID of the current form being subscribed to
+			 *	@param array  | $page_data		| An array of data related to the page the form is on
+			 */
 			$redirect_url = apply_filters( 'yikes-mailchimp-redirect-url', $redirect_url, $form_id, $page_data );
 
 			/**
-			*	yikes-mailchimp-redirect-timer
-			*
-			*	Catch the redirect timer before it's sent to the JavaScript file
-			*
-			*	@param int | $default_redirect_time_ms | The default time (1500 milliseconds) to wait before redirecting
-			*/
+			 *	yikes-mailchimp-redirect-timer
+			 *
+			 *	Catch the redirect timer before it's sent to the JavaScript file
+			 *
+			 *	@param int | $default_redirect_time_ms | The default time (1500 milliseconds) to wait before redirecting
+			 */
 			$redirect_timer = apply_filters( 'yikes-mailchimp-redirect-timer', $default_redirect_time_ms, $form_id, $page_data );
 
 			$redirect_array['redirect_timer'] = $redirect_timer;

Spacing +62 added lines, -62 removed lines

@@ -255,13 +255,13 @@ 
 		$this->handle_updating_existing_user_link_message     = __( 'To update your MailChimp profile, please click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' );
 		$this->handle_empty_required_field_message            = __( 'A required field is missing.', 'yikes-inc-easy-mailchimp-extender' );
 		$this->handle_empty_required_interest_group_message   = __( 'A required interest group is missing.', 'yikes-inc-easy-mailchimp-extender' );
-		$this->handle_nonce_message                           = __( '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' );
+		$this->handle_nonce_message                           = __( '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' );
 		$this->handle_non_filled_recaptcha_message_message    = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' );
 		$this->generic_recaptcha_error_message                = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' );
 
 		// Define our success messages
-		$this->default_response_single_optin_success_message  = __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' );
-		$this->default_response_double_optin_success_message  = __( 'Thank you for subscribing. Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' );
+		$this->default_response_single_optin_success_message  = __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' );
+		$this->default_response_double_optin_success_message  = __( 'Thank you for subscribing. Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' );
 		$this->existing_subscriber_profile_update_message     = __( 'Thank you for already being a subscriber! Your profile info has been updated.', 'yikes-inc-easy-mailchimp-extender' );
 	}
 
@@ -373,16 +373,16 @@ 
 			}
 
 			// Check if the current iteration has a 'date_format' key set (i.e. date/birthday fields)
-			if ( isset( $form_fields[ $merge_tag ]['date_format'] ) ) {
-				$sanitized = $this->handle_date_format_merge_values( $sanitized, $form_fields[ $merge_tag ]['date_format'] );
+			if ( isset( $form_fields[ $merge_tag ][ 'date_format' ] ) ) {
+				$sanitized = $this->handle_date_format_merge_values( $sanitized, $form_fields[ $merge_tag ][ 'date_format' ] );
 			}
 
 			$merge_variables[ $merge_tag ] = $sanitized;
 		}
 
 		// Make sure we send the lower-cased, sanitized email so it matches the one we're sending in the body of the request.
-		if ( isset( $merge_variables['EMAIL'] ) ) {
-			$merge_variables['EMAIL'] = $this->email;
+		if ( isset( $merge_variables[ 'EMAIL' ] ) ) {
+			$merge_variables[ 'EMAIL' ] = $this->email;
 		}
 
 		/**
@@ -459,7 +459,7 @@ 
 		if ( count( $pieces ) === 3 ) {
 
 			// $pieces[1] = MM. $pieces[0] = DD. $date = MM/DD/YYYY
-			$date = $pieces[1] . '/' . $pieces[0] . '/' . $pieces[2];
+			$date = $pieces[ 1 ] . '/' . $pieces[ 0 ] . '/' . $pieces[ 2 ];
 		}
 
 		return $date;
@@ -484,7 +484,7 @@ 
 		if ( count( $pieces ) === 2 ) {
 
 			// $pieces[1] = MM. $pieces[0] = DD. $birthday = MM/DD
-			$birthday = $pieces[1] . '/' . $pieces[0];
+			$birthday = $pieces[ 1 ] . '/' . $pieces[ 0 ];
 		}
 
 		return $birthday;
@@ -517,8 +517,8 @@ 
 			// Loop through the interest groups and create a single array like {group_id} => false
 			foreach ( $interest_groupings as $group_data ) {
 
-				foreach ( $group_data['items'] as $item ) {
-					$groups[$item['id']] = false;
+				foreach ( $group_data[ 'items' ] as $item ) {
+					$groups[ $item[ 'id' ] ] = false;
 				}
 
 			}
@@ -631,7 +631,7 @@ 
 		do_action( "yikes-mailchimp-form-submission-{$this->form_id}", $this->email, $merge_variables, $this->form_id, $notifications );
 
 		// Get the optin value
-		$optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0;
+		$optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0;
 
 		if ( 1 === $optin ) {
 
@@ -661,13 +661,13 @@ 
 
 		// Construct our success array variables
 		$return_success_array = array(
-			'hide'        		=> $submission_settings['hide_form_post_signup'],
+			'hide'        		=> $submission_settings[ 'hide_form_post_signup' ],
 			'error'       		=> 0,
 			'response'    		=> $response_message,
-			'redirection' 		=> $redirect_array['redirection'],
-			'redirect'    		=> $redirect_array['redirect'],
-			'new_window' 		=> $redirect_array['new_window'],
-			'redirect_timer'	=> $redirect_array['redirect_timer'],
+			'redirection' 		=> $redirect_array[ 'redirection' ],
+			'redirect'    		=> $redirect_array[ 'redirect' ],
+			'new_window' 		=> $redirect_array[ 'new_window' ],
+			'redirect_timer'	=> $redirect_array[ 'redirect_timer' ],
 		);
 
 		// Return success array
@@ -689,12 +689,12 @@ 
 		$details    = '';
 
 		// Loop through the error data and retrieve any fields and messages
-		if ( isset( $error_data['data'] ) ) {
-			foreach ( $error_data['data'] as $datum ) {
-				if ( ! isset( $datum['field'], $datum['message'] ) ) {
+		if ( isset( $error_data[ 'data' ] ) ) {
+			foreach ( $error_data[ 'data' ] as $datum ) {
+				if ( ! isset( $datum[ 'field' ], $datum[ 'message' ] ) ) {
 					continue;
 				}
-				$details .= sprintf( '<br>Error with %1$s field: <strong>%2$s</strong>', $form_fields[ $datum['field'] ]['label'], $datum['message'] );
+				$details .= sprintf( '<br>Error with %1$s field: <strong>%2$s</strong>', $form_fields[ $datum[ 'field' ] ][ 'label' ], $datum[ 'message' ] );
 			}
 		}
 
@@ -737,21 +737,21 @@ 
 		$missing_fields = array();
 
 		// Loop through submitted form data
-		foreach( $data as $merge_tag => $value ) {
+		foreach ( $data as $merge_tag => $value ) {
 
 			// Skip interest groups
-			if ( isset( $form_fields[ $merge_tag ]['group_id'] ) ) {
+			if ( isset( $form_fields[ $merge_tag ][ 'group_id' ] ) ) {
 				continue;
 			}
 
 			// check if this field is required
-			if ( isset( $form_fields[ $merge_tag ] ) && isset( $form_fields[ $merge_tag ]['require'] ) && $form_fields[ $merge_tag ]['require'] === '1' ) {
+			if ( isset( $form_fields[ $merge_tag ] ) && isset( $form_fields[ $merge_tag ][ 'require' ] ) && $form_fields[ $merge_tag ][ 'require' ] === '1' ) {
 
 				// Check if the field(s) are empty
 				if ( is_array( $value ) ) {
 
 					// Loop through the data and check if any are empty
-					foreach( $value as $field => $val ) {
+					foreach ( $value as $field => $val ) {
 
 						/**
 						*	'yikes-mailchimp-ignore-required-array-field'
@@ -770,13 +770,13 @@ 
 
 							// Set the merge label (e.g. MMERGE6) as the key so we don't get the same field multiple times
 							// (e.g. For arrays, like an address, where multiple address fields are empty)
-							$missing_fields[ $form_fields[ $merge_tag ]['merge'] ] = $form_fields[ $merge_tag ];
+							$missing_fields[ $form_fields[ $merge_tag ][ 'merge' ] ] = $form_fields[ $merge_tag ];
 						}
 					}
 
 				} else if ( empty( $value ) ) {
 					$field_is_missing = true;
-					$missing_fields[ $form_fields[ $merge_tag ]['merge'] ] = $form_fields[ $merge_tag ];
+					$missing_fields[ $form_fields[ $merge_tag ][ 'merge' ] ] = $form_fields[ $merge_tag ];
 				}
 			}
 		}
@@ -826,7 +826,7 @@ 
 		foreach ( $form_fields as $merge_tag => $field_data ) {
 
 			// If an interest group and it's required
-			if ( isset( $field_data['group_id'] ) && isset( $field_data['require'] ) && $field_data['require'] === '1' ) {
+			if ( isset( $field_data[ 'group_id' ] ) && isset( $field_data[ 'require' ] ) && $field_data[ 'require' ] === '1' ) {
 				
 				// Check if it was submitted (meaning, check if it's set in our $data array)
 				if ( ! isset( $data[ 'group-' . $merge_tag ] ) ) {
@@ -888,30 +888,30 @@ 
 		}
 
 		// Construct the API URL
-		$url           = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $recaptcha_response . '&remoteip=' . $_SERVER['REMOTE_ADDR'] );
+		$url           = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $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 );
 
 		// Set up errors array
 		$recaptcha_errors = array();
 
 		// if we've hit an error, lets return the error!
-		if ( true !== $response_body['success'] ) {
+		if ( true !== $response_body[ 'success' ] ) {
 
-			if( isset( $response_body['error-codes'] ) ) {
+			if ( isset( $response_body[ 'error-codes' ] ) ) {
 
 				// Loop through response error codes
-				foreach ( $response_body['error-codes'] as $error_code ) {
+				foreach ( $response_body[ 'error-codes' ] as $error_code ) {
 					if ( 'missing-input-response' === $error_code ) {
 						$error_code = $this->handle_non_filled_recaptcha_message;
 					}
 
 					// Add our error_code to the errors array
-					$recaptcha_errors[] = $error_code;
+					$recaptcha_errors[ ] = $error_code;
 				}
 
 			} else {
-				$recaptcha_errors[] = $this->generic_recaptcha_error_message;
+				$recaptcha_errors[ ] = $this->generic_recaptcha_error_message;
 			}
 
 			/**
@@ -1019,7 +1019,7 @@ 
 	* @param array | $fields_array | An array of fields to loop through and make sure they're not null
 	*/
 	public function handle_empty_fields_generic( $fields_array ) {
-		foreach( $fields_array as $field ) {
+		foreach ( $fields_array as $field ) {
 			if ( $field === null ) {
 				return $this->yikes_fail( $hide = 0, $error = 1, $this->handle_empty_fields_generic_message );
 			}
@@ -1085,7 +1085,7 @@ 
 
 		// Append our 'send-update-email' link and text
 		$response .= $link_start_tag;
-		$response .= 	$this->handle_updating_existing_user_link_message;
+		$response .= $this->handle_updating_existing_user_link_message;
 		$response .= $link_close_tag;
 
 		// Check for a user-defined message
@@ -1108,14 +1108,14 @@ 
 	*/
 	protected function check_for_user_defined_response_message( $slug, $response_text, $data = false ) {
 
-		switch( $slug ) {
+		switch ( $slug ) {
 			case 'already-subscribed':
 
 				// Check if this error message exists
-				if ( isset( $this->error_messages['already-subscribed'] ) && ! empty( $this->error_messages['already-subscribed'] ) ) {
+				if ( isset( $this->error_messages[ 'already-subscribed' ] ) && ! empty( $this->error_messages[ 'already-subscribed' ] ) ) {
 
 					// Check if the substring (that we replace) '[email]' is located in the string and replace it
-					$response_text = str_replace( '[email]', $this->email, $this->error_messages['already-subscribed'] );
+					$response_text = str_replace( '[email]', $this->email, $this->error_messages[ 'already-subscribed' ] );
 				}
 
 				/**
@@ -1134,13 +1134,13 @@ 
 			case 'update-link':
 
 				// Check if this error message exists
-				if ( $data !== false && isset( $this->error_messages['update-link'] ) && ! empty( $this->error_messages['update-link'] ) ) {
+				if ( $data !== false && isset( $this->error_messages[ 'update-link' ] ) && ! empty( $this->error_messages[ 'update-link' ] ) ) {
 
 					// Check if the substring (that we replace) '[link]' is located in the string and replace it
-					$response_text = str_replace( '[link]', $data['link_start_tag'], $this->error_messages['update-link'] );
+					$response_text = str_replace( '[link]', $data[ 'link_start_tag' ], $this->error_messages[ 'update-link' ] );
 
 					// Remove [/link]
-					$response_text = str_replace( '[/link]', $data['link_close_tag'], $response_text );
+					$response_text = str_replace( '[/link]', $data[ 'link_close_tag' ], $response_text );
 				}
 
 				/**
@@ -1159,8 +1159,8 @@ 
 			case 'success':
 
 				// 'success' is the user-defined success message for double opt-in
-				if ( isset( $this->error_messages['success'] ) && ! empty( $this->error_messages['success'] ) ) {
-					$response_text = $this->error_messages['success'];
+				if ( isset( $this->error_messages[ 'success' ] ) && ! empty( $this->error_messages[ 'success' ] ) ) {
+					$response_text = $this->error_messages[ 'success' ];
 				}
 
 				/**
@@ -1179,8 +1179,8 @@ 
 
 			case 'success-single-optin':
 
-				if ( isset( $this->error_messages['success-single-optin'] ) && ! empty( $this->error_messages['success-single-optin'] ) ) {
-					$response_text = $this->error_messages['success-single-optin'];
+				if ( isset( $this->error_messages[ 'success-single-optin' ] ) && ! empty( $this->error_messages[ 'success-single-optin' ] ) ) {
+					$response_text = $this->error_messages[ 'success-single-optin' ];
 				}
 
 				/**
@@ -1199,8 +1199,8 @@ 
 
 			case 'success-resubscribed':
 
-				if ( isset( $this->error_messages['success-resubscribed'] ) && ! empty( $this->error_messages['success-resubscribed'] ) ) {
-					$response_text = $this->error_messages['success-resubscribed'];
+				if ( isset( $this->error_messages[ 'success-resubscribed' ] ) && ! empty( $this->error_messages[ 'success-resubscribed' ] ) ) {
+					$response_text = $this->error_messages[ 'success-resubscribed' ];
 				}
 
 				/**
@@ -1222,8 +1222,8 @@ 
 				$original_response_text     = $response_text;
 				$user_defined_response_text = '';
 
-				if ( isset( $this->error_messages['general-error'] ) && ! empty( $this->error_messages['general-error'] ) ) {
-					$user_defined_response_text = $this->error_messages['general-error'];
+				if ( isset( $this->error_messages[ 'general-error' ] ) && ! empty( $this->error_messages[ 'general-error' ] ) ) {
+					$user_defined_response_text = $this->error_messages[ 'general-error' ];
 				}
 
 				/**
@@ -1285,7 +1285,7 @@ 
 		} else {
 			global $process_submission_response;
 
-			$process_submission_response = isset( $success_array['response'] ) ? $success_array['response'] : ''; // DEFAULT SUCCESS?
+			$process_submission_response = isset( $success_array[ 'response' ] ) ? $success_array[ 'response' ] : ''; // DEFAULT SUCCESS?
 			$process_submission_response = $this->wrap_form_submission_response( $process_submission_response, $is_success = true );
 		}
 	}
@@ -1338,8 +1338,8 @@ 
 		// Add additional fields we've been supplied
 		if ( ! empty( $additional_fields ) ) {
 
-			foreach( $additional_fields as $key => $value ) {
-				$response_array[$key] = $value;
+			foreach ( $additional_fields as $key => $value ) {
+				$response_array[ $key ] = $value;
 			}
 		}
 
@@ -1370,20 +1370,20 @@ 
 		);
 
 		// Let's confirm we have a value before trying to use it
-		$redirect_setting = isset( $submission_settings['redirect_on_submission'] ) ? $submission_settings['redirect_on_submission'] : false;
+		$redirect_setting = isset( $submission_settings[ 'redirect_on_submission' ] ) ? $submission_settings[ 'redirect_on_submission' ] : false;
 
 		// Check the redirect flag
 		if ( '1' === $redirect_setting ) {
 
 			// Supply return array with default value of 1
-			$redirect_array['redirection']	= apply_filters( 'yikes-mailchimp-redirection', 1, $form_id, $page_data );
+			$redirect_array[ 'redirection' ] = apply_filters( 'yikes-mailchimp-redirection', 1, $form_id, $page_data );
 
 			// Let's confirm we have redirect_page/custom_redirect_url/new_window values
-			$redirect_page_setting	 = isset( $submission_settings['redirect_page'] ) ? $submission_settings['redirect_page'] : false;
-			$custom_redirect_setting = isset( $submission_settings['custom_redirect_url'] ) ? $submission_settings['custom_redirect_url'] : false;
-			$redirect_new_window	 = isset( $submission_settings['redirect_new_window'] ) ? $submission_settings['redirect_new_window'] : false;
+			$redirect_page_setting = isset( $submission_settings[ 'redirect_page' ] ) ? $submission_settings[ 'redirect_page' ] : false;
+			$custom_redirect_setting = isset( $submission_settings[ 'custom_redirect_url' ] ) ? $submission_settings[ 'custom_redirect_url' ] : false;
+			$redirect_new_window = isset( $submission_settings[ 'redirect_new_window' ] ) ? $submission_settings[ 'redirect_new_window' ] : false;
 
-			$redirect_array['new_window'] = apply_filters( 'yikes-mailchimp-redirect-new-window', $redirect_new_window, $form_id, $page_data );
+			$redirect_array[ 'new_window' ] = apply_filters( 'yikes-mailchimp-redirect-new-window', $redirect_new_window, $form_id, $page_data );
 
 			// Check if we're redirecting to a custom_url or just the redirect_page
 			$redirect_url = 'custom_url' !== $redirect_page_setting ? get_permalink( $redirect_page_setting ) : $custom_redirect_setting;
@@ -1408,9 +1408,9 @@ 
 			*/
 			$redirect_timer = apply_filters( 'yikes-mailchimp-redirect-timer', $default_redirect_time_ms, $form_id, $page_data );
 
-			$redirect_array['redirect_timer'] = $redirect_timer;
+			$redirect_array[ 'redirect_timer' ] = $redirect_timer;
 
-			$redirect_array['redirect'] = $redirect_url;
+			$redirect_array[ 'redirect' ] = $redirect_url;
 		}
 
 		return $redirect_array;