yikesinc / yikes-inc-easy-mailchimp-extender

blocks/easy-forms-block/easy-forms-block.php

Spacing +31 added lines, -31 removed lines

@@ -66,47 +66,47 @@
 	 */
 	public function render_block( $attributes, $content ) {
 
-		if ( ! isset( $attributes['form_id'] ) ) {
+		if ( ! isset( $attributes[ 'form_id' ] ) ) {
 			return;
 		}
 
 		$shortcode_attributes = array(
-			'form'                       => $attributes['form_id'],
-			'submit'                     => isset( $attributes['submit_button_text'] ) && ! empty( $attributes['submit_button_text'] ) ? $attributes['submit_button_text'] : '',
-			'title'                      => isset( $attributes['show_title'] ) && true === $attributes['show_title'] ? '1' : '0',
-			'custom_title'               => isset( $attributes['form_title'] ) ? $attributes['form_title'] : '',
-			'description'                => isset( $attributes['show_description'] ) && true === $attributes['show_description'] ? '1' : '0',
-			'custom_description'         => isset( $attributes['form_description'] ) ? $attributes['form_description'] : '',
-			'ajax'                       => isset( $attributes['is_ajax'] ) && true === $attributes['is_ajax'] ? '1' : '0',
-			'recaptcha'                  => isset( $attributes['recaptcha'] ) && false === $attributes['recaptcha'] ? '0' : '',
-			'recaptcha_lang'             => isset( $attributes['recaptcha_lang'] ) ? $attributes['recaptcha_lang'] : '',
-			'recaptcha_type'             => isset( $attributes['recaptcha_type'] ) ? $attributes['recaptcha_type'] : '',
-			'recaptcha_theme'            => isset( $attributes['recaptcha_theme'] ) ? $attributes['recaptcha_theme'] : '',
-			'recaptcha_size'             => isset( $attributes['recaptcha_size'] ) ? $attributes['recaptcha_size'] : '',
-			'recaptcha_data_callback'    => isset( $attributes['recaptcha_verify_callback'] ) ? $attributes['recaptcha_verify_callback'] : '',
-			'recaptcha_expired_callback' => isset( $attributes['recaptcha_expired_callback'] ) ? $attributes['recaptcha_expired_callback'] : '',
-			'inline'                     => isset( $attributes['inline'] ) && true === $attributes['inline'] ? '1' : '0',
+			'form'                       => $attributes[ 'form_id' ],
+			'submit'                     => isset( $attributes[ 'submit_button_text' ] ) && ! empty( $attributes[ 'submit_button_text' ] ) ? $attributes[ 'submit_button_text' ] : '',
+			'title'                      => isset( $attributes[ 'show_title' ] ) && true === $attributes[ 'show_title' ] ? '1' : '0',
+			'custom_title'               => isset( $attributes[ 'form_title' ] ) ? $attributes[ 'form_title' ] : '',
+			'description'                => isset( $attributes[ 'show_description' ] ) && true === $attributes[ 'show_description' ] ? '1' : '0',
+			'custom_description'         => isset( $attributes[ 'form_description' ] ) ? $attributes[ 'form_description' ] : '',
+			'ajax'                       => isset( $attributes[ 'is_ajax' ] ) && true === $attributes[ 'is_ajax' ] ? '1' : '0',
+			'recaptcha'                  => isset( $attributes[ 'recaptcha' ] ) && false === $attributes[ 'recaptcha' ] ? '0' : '',
+			'recaptcha_lang'             => isset( $attributes[ 'recaptcha_lang' ] ) ? $attributes[ 'recaptcha_lang' ] : '',
+			'recaptcha_type'             => isset( $attributes[ 'recaptcha_type' ] ) ? $attributes[ 'recaptcha_type' ] : '',
+			'recaptcha_theme'            => isset( $attributes[ 'recaptcha_theme' ] ) ? $attributes[ 'recaptcha_theme' ] : '',
+			'recaptcha_size'             => isset( $attributes[ 'recaptcha_size' ] ) ? $attributes[ 'recaptcha_size' ] : '',
+			'recaptcha_data_callback'    => isset( $attributes[ 'recaptcha_verify_callback' ] ) ? $attributes[ 'recaptcha_verify_callback' ] : '',
+			'recaptcha_expired_callback' => isset( $attributes[ 'recaptcha_expired_callback' ] ) ? $attributes[ 'recaptcha_expired_callback' ] : '',
+			'inline'                     => isset( $attributes[ 'inline' ] ) && true === $attributes[ 'inline' ] ? '1' : '0',
 		);
 
 		// We want to run process_mailchimp_shortcode() but we need to return 
 		// the plaintext shortcode or Gutenberg will autop() the shortcode content.
 		return sprintf(
 			'[yikes-mailchimp form="%s" submit="%s" title="%s" custom_title="%s" description="%s" custom_description="%s" ajax="%s" recaptcha="%s"  recaptcha_lang="%s" recaptcha_type="%s" recaptcha_theme="%s" recaptcha_size="%s" recaptcha_data_callback="%s" recaptcha_expired_callback="%s" inline="%s"]',
-			$shortcode_attributes['form'],
-			$shortcode_attributes['submit'],
-			$shortcode_attributes['title'],
-			$shortcode_attributes['custom_title'],
-			$shortcode_attributes['description'],
-			$shortcode_attributes['custom_description'],
-			$shortcode_attributes['ajax'],
-			$shortcode_attributes['recaptcha'],
-			$shortcode_attributes['recaptcha_lang'],
-			$shortcode_attributes['recaptcha_type'],
-			$shortcode_attributes['recaptcha_theme'],
-			$shortcode_attributes['recaptcha_size'],
-			$shortcode_attributes['recaptcha_data_callback'],
-			$shortcode_attributes['recaptcha_expired_callback'],
-			$shortcode_attributes['inline']
+			$shortcode_attributes[ 'form' ],
+			$shortcode_attributes[ 'submit' ],
+			$shortcode_attributes[ 'title' ],
+			$shortcode_attributes[ 'custom_title' ],
+			$shortcode_attributes[ 'description' ],
+			$shortcode_attributes[ 'custom_description' ],
+			$shortcode_attributes[ 'ajax' ],
+			$shortcode_attributes[ 'recaptcha' ],
+			$shortcode_attributes[ 'recaptcha_lang' ],
+			$shortcode_attributes[ 'recaptcha_type' ],
+			$shortcode_attributes[ 'recaptcha_theme' ],
+			$shortcode_attributes[ 'recaptcha_size' ],
+			$shortcode_attributes[ 'recaptcha_data_callback' ],
+			$shortcode_attributes[ 'recaptcha_expired_callback' ],
+			$shortcode_attributes[ 'inline' ]
 		);
 	}
 }

public/classes/process/class.process_form_submission_handler.php

Indentation +532 added lines, -532 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
@@ -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.
@@ -537,15 +537,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
@@ -574,13 +574,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 );
 
@@ -591,17 +591,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
@@ -610,27 +610,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 );
 
@@ -652,15 +652,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
@@ -679,13 +679,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
@@ -727,13 +727,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
@@ -758,15 +758,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 ] ) ) {
@@ -797,14 +797,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
@@ -813,13 +813,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
@@ -853,14 +853,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
@@ -869,12 +869,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.
@@ -882,11 +882,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 );
 		}
@@ -919,40 +919,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 
@@ -965,24 +965,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 );
@@ -990,12 +990,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 );
@@ -1003,12 +1003,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 );
@@ -1016,12 +1016,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 ) {
@@ -1031,12 +1031,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 );
@@ -1044,12 +1044,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 );
@@ -1057,10 +1057,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
@@ -1073,10 +1073,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
@@ -1101,15 +1101,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 ) {
@@ -1123,13 +1123,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;
@@ -1148,13 +1148,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;
@@ -1168,14 +1168,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;
@@ -1188,14 +1188,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;
@@ -1208,14 +1208,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;
@@ -1231,16 +1231,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;
@@ -1254,14 +1254,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
@@ -1275,14 +1275,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 );
@@ -1295,18 +1295,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 );
@@ -1319,17 +1319,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
@@ -1353,14 +1353,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;
@@ -1393,23 +1393,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 +63 added lines, -63 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,12 +517,12 @@ 
 			// Loop through the interest groups and create a single array like {group_id} => false
 			foreach ( $interest_groupings as $group_data ) {
 
-				if ( ! isset( $group_data['items'] ) || isset( $group_data['items'] ) && ( empty( $group_data['items'] ) || ! is_array( $group_data['items'] ) ) ) {
+				if ( ! isset( $group_data[ 'items' ] ) || isset( $group_data[ 'items' ] ) && ( empty( $group_data[ 'items' ] ) || ! is_array( $group_data[ 'items' ] ) ) ) {
 					continue;
 				}
 
-				foreach ( $group_data['items'] as $item ) {
-					$groups[$item['id']] = false;
+				foreach ( $group_data[ 'items' ] as $item ) {
+					$groups[ $item[ 'id' ] ] = false;
 				}
 
 			}
@@ -635,7 +635,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 ) {
 
@@ -665,13 +665,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
@@ -693,12 +693,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' ] );
 			}
 		}
 
@@ -741,21 +741,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'
@@ -774,13 +774,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 ];
 				}
 			}
 		}
@@ -830,7 +830,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 ] ) ) {
@@ -892,30 +892,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;
 			}
 
 			/**
@@ -1023,7 +1023,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 );
 			}
@@ -1089,7 +1089,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
@@ -1112,14 +1112,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' ] );
 				}
 
 				/**
@@ -1138,13 +1138,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 );
 				}
 
 				/**
@@ -1163,8 +1163,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' ];
 				}
 
 				/**
@@ -1183,8 +1183,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' ];
 				}
 
 				/**
@@ -1203,8 +1203,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' ];
 				}
 
 				/**
@@ -1226,8 +1226,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' ];
 				}
 
 				/**
@@ -1289,7 +1289,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 );
 		}
 	}
@@ -1342,8 +1342,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;
 			}
 		}
 
@@ -1374,20 +1374,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;
@@ -1412,9 +1412,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;

public/partials/ajax/class.public_ajax.php

Spacing +34 added lines, -34 removed lines

@@ -11,16 +11,16 @@ 
 	 */
 	public function __construct() {
 		// ajax process form submission
-		add_action( 'wp_ajax_nopriv_process_form_submission', array( $this , 'process_form_submission' ), 10 );
-		add_action( 'wp_ajax_process_form_submission', array( $this , 'process_form_submission' ), 10 );
+		add_action( 'wp_ajax_nopriv_process_form_submission', array( $this, 'process_form_submission' ), 10 );
+		add_action( 'wp_ajax_process_form_submission', array( $this, 'process_form_submission' ), 10 );
 
 		// ajax send update emails
-		add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
-		add_action( 'wp_ajax_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
+		add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
+		add_action( 'wp_ajax_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
 
 		// increase submission count for a given form on successful submit
-		add_action( 'wp_ajax_nopriv_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
-		add_action( 'wp_ajax_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
+		add_action( 'wp_ajax_nopriv_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
+		add_action( 'wp_ajax_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
 	}
 
 	/*
@@ -37,7 +37,7 @@ 
 	 * Increase the submission count for a given form.
 	 */
 	public function increase_submission_count() {
-		$form_id   = intval( $_POST['form_id'] );
+		$form_id   = intval( $_POST[ 'form_id' ] );
 		$interface = yikes_easy_mailchimp_extender_get_form_interface();
 		$form      = $interface->get_form( $form_id );
 
@@ -47,7 +47,7 @@ 
 		}
 
 		// Update the form.
-		$submission_count = isset( $form['submissions'] ) ? $form['submissions'] + 1 : 1;
+		$submission_count = isset( $form[ 'submissions' ] ) ? $form[ 'submissions' ] + 1 : 1;
 		$interface->update_form_field( $form_id, 'submissions', $submission_count );
 
 		exit();
@@ -58,11 +58,11 @@ 
 		@since v6.0.4.1
 	*/
 	public function sendUpdateProfileEmail() {
-		$user_email    = filter_var( $_POST['user_email'], FILTER_SANITIZE_STRING );
+		$user_email    = filter_var( $_POST[ 'user_email' ], FILTER_SANITIZE_STRING );
 		$user_id       = md5( $user_email );
-		$list_id       = filter_var( $_POST['list_id'], FILTER_SANITIZE_STRING );
-		$form_id       = filter_var( $_POST['form_id'], FILTER_SANITIZE_NUMBER_INT );
-		$page_id       = filter_var( $_POST['page_id'], FILTER_SANITIZE_NUMBER_INT );
+		$list_id       = filter_var( $_POST[ 'list_id' ], FILTER_SANITIZE_STRING );
+		$form_id       = filter_var( $_POST[ 'form_id' ], FILTER_SANITIZE_NUMBER_INT );
+		$page_id       = filter_var( $_POST[ 'page_id' ], FILTER_SANITIZE_NUMBER_INT );
 		$full_site_url = get_bloginfo( 'url' );
 		$manager       = yikes_get_mc_api_manager();
 
@@ -79,7 +79,7 @@ 
 				'class.public_ajax.php'
 			);
 			$is_error = true;
-			$errors[] = $list_details->get_error_message();
+			$errors[ ] = $list_details->get_error_message();
 		}
 
 		// Subscriber details API call.
@@ -88,7 +88,7 @@ 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 			$error_logging->maybe_write_to_log( $subscriber_account_details->get_error_code(), __( 'Send Update Profile Email - Get Member Info.', 'yikes-inc-easy-mailchimp-extender' ), 'class.public_ajax.php' );
 			$is_error = true;
-			$errors[] = $subscriber_account_details->get_error_message();
+			$errors[ ] = $subscriber_account_details->get_error_message();
 		}
 
 		// Form details API call.
@@ -96,22 +96,22 @@ 
 		if ( ! empty( $interface ) && method_exists( $interface, 'get_form' ) && ! empty( $form_id ) ) {
 			$form_data = $interface->get_form( $form_id );
 			if ( ! empty( $form_data ) ) {
-				if ( isset( $form_data['error_messages'] ) ) {
+				if ( isset( $form_data[ 'error_messages' ] ) ) {
 
-					if ( isset( $form_data['error_messages']['email-body'] ) && ! empty( $form_data['error_messages']['email-body'] ) ) {
-						$email_body = apply_filters( 'the_content', $form_data['error_messages']['email-body'] );
+					if ( isset( $form_data[ 'error_messages' ][ 'email-body' ] ) && ! empty( $form_data[ 'error_messages' ][ 'email-body' ] ) ) {
+						$email_body = apply_filters( 'the_content', $form_data[ 'error_messages' ][ 'email-body' ] );
 					}
 
-					if ( isset( $form_data['error_messages']['email-subject'] ) && ! empty( $form_data['error_messages']['email-subject'] ) ) {
-						$email_subject = $form_data['error_messages']['email-subject'];
+					if ( isset( $form_data[ 'error_messages' ][ 'email-subject' ] ) && ! empty( $form_data[ 'error_messages' ][ 'email-subject' ] ) ) {
+						$email_subject = $form_data[ 'error_messages' ][ 'email-subject' ];
 					}
 
-					if ( isset( $form_data['error_messages']['update-email-success'] ) && ! empty( $form_data['error_messages']['update-email-success'] ) ) {
-						$update_email_success_message = $form_data['error_messages']['update-email-success'];
+					if ( isset( $form_data[ 'error_messages' ][ 'update-email-success' ] ) && ! empty( $form_data[ 'error_messages' ][ 'update-email-success' ] ) ) {
+						$update_email_success_message = $form_data[ 'error_messages' ][ 'update-email-success' ];
 					}
 
-					if ( isset( $form_data['error_messages']['update-email-failure'] ) && ! empty( $form_data['error_messages']['update-email-failure'] ) ) {
-						$update_email_failed_message = $form_data['error_messages']['update-email-failure'];
+					if ( isset( $form_data[ 'error_messages' ][ 'update-email-failure' ] ) && ! empty( $form_data[ 'error_messages' ][ 'update-email-failure' ] ) ) {
+						$update_email_failed_message = $form_data[ 'error_messages' ][ 'update-email-failure' ];
 					}
 				}
 			}
@@ -132,11 +132,11 @@ 
 		}
 
 		// Construct the headers & email message content.
-		$subscriber_id    = $subscriber_account_details['unique_email_id'];
-		$update_link_href = str_replace( '/subscribe', '/profile', $list_details['subscribe_url_long'] );
+		$subscriber_id    = $subscriber_account_details[ 'unique_email_id' ];
+		$update_link_href = str_replace( '/subscribe', '/profile', $list_details[ 'subscribe_url_long' ] );
 		$update_link_href = add_query_arg( 'e', $subscriber_id, $update_link_href );
 		$update_link_tag  = '<a href="' . $update_link_href . '">';
-		$headers          = 'From: ' . $list_details['campaign_defaults']['from_name'] . ' <' . $list_details['campaign_defaults']['from_email'] . '>' . "\r\n";
+		$headers          = 'From: ' . $list_details[ 'campaign_defaults' ][ 'from_name' ] . ' <' . $list_details[ 'campaign_defaults' ][ 'from_email' ] . '>' . "\r\n";
 		$headers         .= 'Content-type: text/html';
 
 		if ( ! isset( $email_subject ) ) {
@@ -178,26 +178,26 @@ 
 		$email_body = str_replace( array( '[subscriber_id]', '[SUBSCRIBER_ID]' ), $subscriber_id, $email_body );
 
 		// We let the user use [form_name] for the form's name so replace [form_name] with the form's name.
-		$email_body = str_replace( array( '[form_name]', '[FORM_NAME]' ), $form_data['form_name'], $email_body );
+		$email_body = str_replace( array( '[form_name]', '[FORM_NAME]' ), $form_data[ 'form_name' ], $email_body );
 
 		// We let the user use [fname] and [lname] so replace those.
-		$email_body = str_replace( array( '[fname]', '[FNAME]' ), isset( $subscriber_account_details['merge_fields']['FNAME'] ) ? $subscriber_account_details['merge_fields']['FNAME'] : '', $email_body );
-		$email_body = str_replace( array( '[lname]', '[LNAME]' ), isset( $subscriber_account_details['merge_fields']['LNAME'] ) ? $subscriber_account_details['merge_fields']['LNAME'] : '', $email_body );
+		$email_body = str_replace( array( '[fname]', '[FNAME]' ), isset( $subscriber_account_details[ 'merge_fields' ][ 'FNAME' ] ) ? $subscriber_account_details[ 'merge_fields' ][ 'FNAME' ] : '', $email_body );
+		$email_body = str_replace( array( '[lname]', '[LNAME]' ), isset( $subscriber_account_details[ 'merge_fields' ][ 'LNAME' ] ) ? $subscriber_account_details[ 'merge_fields' ][ 'LNAME' ] : '', $email_body );
 
 		/* Confirm that the email was sent */
 		if ( wp_mail( $user_email, apply_filters( 'yikes-mailchimp-update-email-subject', $email_subject ), apply_filters( 'yikes-mailchimp-update-email-content', $email_body, $update_link_href ), $headers ) ) {
 
 			$update_email_success_message = apply_filters( 'yikes-mailchimp-update-email-success-message', $update_email_success_message, $form_id, $user_email );
-			$submission_settings          = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null;
+			$submission_settings          = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null;
 			$redirect_settings            = Yikes_Inc_Easy_MailChimp_Extender_Process_Submission_Handler::handle_submission_response_success_redirect( $form_id, $submission_settings, $page_id );
 
 			wp_send_json_success(
 				array(
 					'response_text'  => '<div class="yikes-easy-mc-success-message">' . $update_email_success_message . '</div>',
-					'redirection'    => $redirect_settings['redirection'],
-					'redirect'       => $redirect_settings['redirect'],
-					'redirect_timer' => $redirect_settings['redirect_timer'],
-					'new_window'     => $redirect_settings['new_window'],
+					'redirection'    => $redirect_settings[ 'redirection' ],
+					'redirect'       => $redirect_settings[ 'redirect' ],
+					'redirect_timer' => $redirect_settings[ 'redirect_timer' ],
+					'new_window'     => $redirect_settings[ 'new_window' ],
 				)
 			);
 		} else {

admin/partials/edit-form.php

Spacing +194 added lines, -194 removed lines

@@ -2,23 +2,23 @@ 
 	<?php
 
 	// if an error was returned in the most recent query
-	if( isset( $_GET['sql_error'] ) ) {
+	if ( isset( $_GET[ 'sql_error' ] ) ) {
 		// if error logging is turned on, lets display a better error to help narrow things down
 		// lets also log things to the error log
-		if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
-			wp_die( '<strong>' . __( 'Error Creating Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong> <p>' . stripslashes( urldecode( $_GET['sql_error'] ) ) . '</p>' , __( 'Error Creating Form' , 'yikes-inc-easy-mailchimp-extender' ) );
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
+			wp_die( '<strong>' . __( 'Error Creating Form', 'yikes-inc-easy-mailchimp-extender' ) . '</strong> <p>' . stripslashes( urldecode( $_GET[ 'sql_error' ] ) ) . '</p>', __( 'Error Creating Form', 'yikes-inc-easy-mailchimp-extender' ) );
 		} else {
-			wp_die( '<strong>' . __( 'Error Creating Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p>' . __( "Please try again. If the error persists please get in contact with the YIKES Inc. support team." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>' );
+			wp_die( '<strong>' . __( 'Error Creating Form', 'yikes-inc-easy-mailchimp-extender' ) . '</strong><p>' . __( "Please try again. If the error persists please get in contact with the YIKES Inc. support team.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>' );
 		}
 	}
 
 	/* Get The Form ID we need to edit */
-	if ( ! isset( $_GET['id'] ) ) {
+	if ( ! isset( $_GET[ 'id' ] ) ) {
 		wp_die( __( 'Oh No!', 'yikes-inc-easy-mailchimp-extender' ), __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) );
 	}
 
 	// grab and store the form ID
-	$form_id = (int) $_GET['id'];
+	$form_id = (int) $_GET[ 'id' ];
 
 	// Get our form interface.
 	$form_interface = yikes_easy_mailchimp_extender_get_form_interface();
@@ -31,19 +31,19 @@ 
 
 	// if the form was not found return an error
 	if ( empty( $form ) ) {
-		wp_die( printf( __( "Whoops! It looks like this form doesn't exist. If this error persists you may want to toggle on debugging on the <a href='%s'>%s</a> " , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ), __( 'debug settings page' , 'yikes-inc-easy-mailchimp-extender' ) ), __( 'Error' , 'yikes-inc-easy-mailchimp-extender' ) );
+		wp_die( printf( __( "Whoops! It looks like this form doesn't exist. If this error persists you may want to toggle on debugging on the <a href='%s'>%s</a> ", 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings&section=debug-settings' ) ), __( 'debug settings page', 'yikes-inc-easy-mailchimp-extender' ) ), __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) );
 	}
 
 	// set global form data, mainly for use in custom form field declarations
-	$GLOBALS["form_data"] = $form;
+	$GLOBALS[ "form_data" ] = $form;
 
-	$custom_styles       = $form['custom_styles'];
-	$optin_settings      = $form['optin_settings'];
-	$submission_settings = $form['submission_settings'];
-	$error_messages      = $form['error_messages'];
+	$custom_styles       = $form[ 'custom_styles' ];
+	$optin_settings      = $form[ 'optin_settings' ];
+	$submission_settings = $form[ 'submission_settings' ];
+	$error_messages      = $form[ 'error_messages' ];
 
-	if ( isset( $form['form_settings'] ) ) {
-		$form_settings = $form['form_settings'];
+	if ( isset( $form[ 'form_settings' ] ) ) {
+		$form_settings = $form[ 'form_settings' ];
 	}
 
 	// get defaults if none are saved in the database yet
@@ -86,7 +86,7 @@ 
 	}
 
 	// Get the merge fields
-	$available_merge_variables = $list_handler->get_merge_fields( $form['list_id'] );
+	$available_merge_variables = $list_handler->get_merge_fields( $form[ 'list_id' ] );
 	if ( is_wp_error( $available_merge_variables ) ) {
 		$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 		$error_logging->maybe_write_to_log(
@@ -98,7 +98,7 @@ 
 	}
 
 	// get the interest group data
-	$interest_groupings = $list_handler->get_interest_categories( $form['list_id'] );
+	$interest_groupings = $list_handler->get_interest_categories( $form[ 'list_id' ] );
 	if ( is_wp_error( $interest_groupings ) ) {
 		$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 		$error_logging->maybe_write_to_log(
@@ -115,22 +115,22 @@ 
 		add_query_arg(
 			array(
 				'action' => 'yikes-easy-mc-update-form',
-				'nonce' => wp_create_nonce( 'update-mailchimp-form'.-$form['id'] )
+				'nonce' => wp_create_nonce( 'update-mailchimp-form' . -$form[ 'id' ] )
 			)
 		)
 	);
 	/* Display Our Form */
 	?>
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php __( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>YIKES Easy Forms for MailChimp | <?php echo __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $form['form_name']; ?></h1>
+	<h1>YIKES Easy Forms for MailChimp | <?php echo __( 'Edit', 'yikes-inc-easy-mailchimp-extender' ) . ' ' . $form[ 'form_name' ]; ?></h1>
 
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Update this MailChimp form\'s fields, styles and settings below.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Update this MailChimp form\'s fields, styles and settings below.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<?php
-	if ( isset( $_REQUEST['updated-form'] ) && $_REQUEST['updated-form'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'updated-form' ] ) && $_REQUEST[ 'updated-form' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'Opt-in form successfully updated.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -154,15 +154,15 @@ 
 						<div class="inside">
 
 							<label for="form-name">
-								<h3 class="bg-transparent"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
-								<input autocomplete="disabled" id="form-name" name="form-name" type="text" value="<?php echo stripslashes( esc_html( $form['form_name'] ) ); ?>" class="widefat" />
-								<p class="description"><?php _e( "The title of this signup form." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+								<h3 class="bg-transparent"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+								<input autocomplete="disabled" id="form-name" name="form-name" type="text" value="<?php echo stripslashes( esc_html( $form[ 'form_name' ] ) ); ?>" class="widefat" />
+								<p class="description"><?php _e( "The title of this signup form.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 							</label>
 
 							<label for="form-description">
-								<h3 class="bg-transparent"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
-								<textarea name="form-description" id="form-description" class="large-text edit-form-form-description"><?php echo isset( $form['form_description'] ) ? stripslashes( esc_textarea( $form['form_description'] ) ) : ''; ?></textarea>
-								<p class="description"><?php _e( "Descriptions are optional and you may choose to display it to visitors to your site." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+								<h3 class="bg-transparent"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+								<textarea name="form-description" id="form-description" class="large-text edit-form-form-description"><?php echo isset( $form[ 'form_description' ] ) ? stripslashes( esc_textarea( $form[ 'form_description' ] ) ) : ''; ?></textarea>
+								<p class="description"><?php _e( "Descriptions are optional and you may choose to display it to visitors to your site.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								<p class="description"><?php printf( __( 'To display the number of subscribers for the list associated with this form, use %s in the form description field above.', 'yikes-inc-easy-mailchimp-extender' ), '<code>[yikes-mailchimp-subscriber-count]</code>' ); ?><p>
 							</label>
 
@@ -178,16 +178,16 @@ 
 
 						<ul id="yikes_easy_mc_toolbar_links">
 							<li class="hidden_setting_list">
-								<a class="hidden_setting form-builder selected_hidden_setting" data-attr-container="form-builder" onclick="return false;" title="<?php esc_attr_e( 'Customize Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a class="hidden_setting form-builder selected_hidden_setting" data-attr-container="form-builder" onclick="return false;" title="<?php esc_attr_e( 'Customize Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 								<div class="selected_setting_triangle"></div>
 							</li>
 							<li class="hidden_setting_list">
-								<a class="hidden_setting form-settings" onclick="return false;" data-attr-container="form-settings" title="<?php esc_attr_e( 'Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a class="hidden_setting form-settings" onclick="return false;" data-attr-container="form-settings" title="<?php esc_attr_e( 'Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							</li>
 							<li class="hidden_setting_list">
-								<a class="hidden_setting error-messages" onclick="return false;" data-attr-container="error-messages" title="<?php esc_attr_e( 'Customize Form Messages' , 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Custom Messages' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+								<a class="hidden_setting error-messages" onclick="return false;" data-attr-container="error-messages" title="<?php esc_attr_e( 'Customize Form Messages', 'yikes-inc-easy-mailchimp-extender' ); ?>" href="#"> <?php _e( 'Custom Messages', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 							</li>
-							<?php do_action( 'yikes-mailchimp-edit-form-section-links' , $form ); ?>
+							<?php do_action( 'yikes-mailchimp-edit-form-section-links', $form ); ?>
 						</ul>
 
 					</div>
@@ -208,22 +208,22 @@ 
 											<div class="meta-box-sortables ui-sortable">
 												<div class="postbox yikes-easy-mc-postbox">
 													<!-- container title -->
-													<h3 class="edit-form-title" id="form-builder-div" data-list-id="<?php echo $form['list_id'] ?>" ><?php _e( 'Form Builder' , 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
-													<p id="edit-form-description" class="description edit-form-description-form-builder"><?php _e( 'Click a field to show its advanced options or drag fields to re-arrange them. Click <span class="dashicons dashicons-edit"></span> to edit a field label. Make sure you hit "Update Form" to save all of your changes.' , 'yikes-inc-easy-mailchimp-extender' );?></p>
+													<h3 class="edit-form-title" id="form-builder-div" data-list-id="<?php echo $form[ 'list_id' ] ?>" ><?php _e( 'Form Builder', 'yikes-inc-easy-mailchimp-extender' ); ?></h3>
+													<p id="edit-form-description" class="description edit-form-description-form-builder"><?php _e( 'Click a field to show its advanced options or drag fields to re-arrange them. Click <span class="dashicons dashicons-edit"></span> to edit a field label. Make sure you hit "Update Form" to save all of your changes.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 													<div id="form-builder-container" class="inside">
 														<!-- #poststuff -->
-														<?php echo $this->generate_form_editor( $form['fields'], $form['list_id'] , $available_merge_variables , isset( $interest_groupings ) ? $interest_groupings : array() ); ?>
+														<?php echo $this->generate_form_editor( $form[ 'fields' ], $form[ 'list_id' ], $available_merge_variables, isset( $interest_groupings ) ? $interest_groupings : array() ); ?>
 													</div>
 
 													<!-- Bulk Delete Form Fields -->
-													<a href="#" class="clear-form-fields" <?php if( isset( $form['fields'] ) && count( $form['fields'] ) <= 0 ) { ?> style="display:none;" <?php } ?>><?php _e( 'Clear Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+													<a href="#" class="clear-form-fields" <?php if ( isset( $form[ 'fields' ] ) && count( $form[ 'fields' ] ) <= 0 ) { ?> style="display:none;" <?php } ?>><?php _e( 'Clear Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 
 													<?php
-														$display_none = ( isset( $form['fields'] ) && count( $form['fields'] ) <= 0 ) ? 'display:none;' : '';
+														$display_none = ( isset( $form[ 'fields' ] ) && count( $form[ 'fields' ] ) <= 0 ) ? 'display:none;' : '';
 													?>
 
 													<!-- Save Fields Button -->
-													<?php submit_button( __( 'Update Form' ) , 'primary' , '' , false , array( 'onclick' => '', 'style' => 'float:right;margin-right:12px;'.$display_none ) ); ?>
+													<?php submit_button( __( 'Update Form' ), 'primary', '', false, array( 'onclick' => '', 'style' => 'float:right;margin-right:12px;' . $display_none ) ); ?>
 
 													<!-- .inside -->
 												</div>
@@ -236,15 +236,15 @@ 
 										<div id="postbox-container-1" class="postbox-container">
 											<div class="meta-box-sortables">
 												<div class="postbox yikes-easy-mc-postbox">
-													<h3 class="edit-form-title"><span><?php _e( "Form Fields &amp; Interest Groups" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+													<h3 class="edit-form-title"><span><?php _e( "Form Fields &amp; Interest Groups", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 													<div class="inside">
 
 														<h3 class="nav-tab-wrapper mv_ig_list">
-															<a href="#" class="nav-tab nav-tab-active" alt="merge-variables"><div class="arrow-down"></div><?php _e( 'Form Fields' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
-															<?php if( !isset( $merge_variable_error ) ) { ?>
-																<a href="#" class="nav-tab"><?php _e( 'Interest Groups' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+															<a href="#" class="nav-tab nav-tab-active" alt="merge-variables"><div class="arrow-down"></div><?php _e( 'Form Fields', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+															<?php if ( ! isset( $merge_variable_error ) ) { ?>
+																<a href="#" class="nav-tab"><?php _e( 'Interest Groups', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 															<?php } else { ?>
-																<a href="#" class="nav-tab no-interest-groups-found-message" disabled="disabled" title="<?php _e( "No Interest Groups Exist" , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Interest Groups' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+																<a href="#" class="nav-tab no-interest-groups-found-message" disabled="disabled" title="<?php _e( "No Interest Groups Exist", 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Interest Groups', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 															<?php } ?>
 														</h3>
 
@@ -252,11 +252,11 @@ 
 
 															<div id="merge-variables-container" class="list-container">
 																<?php
-																	if( ! isset( $merge_variable_error ) ) {
+																	if ( ! isset( $merge_variable_error ) ) {
 																		// build a list of available merge variables,
 																		// but exclude the ones already assigned to the form
-																		echo '<p class="description">' . __( "Select the fields below to add to the form builder." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
-																		$this->build_available_merge_vars( $form['fields'] , $available_merge_variables );
+																		echo '<p class="description">' . __( "Select the fields below to add to the form builder.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+																		$this->build_available_merge_vars( $form[ 'fields' ], $available_merge_variables );
 																	} else {
 																		echo $merge_variable_error;
 																	}
@@ -265,14 +265,14 @@ 
 
 															<div id="interest-groups-container" class="list-container">
 																<?php
-																	if( isset( $interest_groupings ) && ! isset( $interest_groupings['error'] ) ) {
+																	if ( isset( $interest_groupings ) && ! isset( $interest_groupings[ 'error' ] ) ) {
 																		// build a list of available merge variables,
 																		// but exclude the ones already assigned to the form
-																		echo '<p class="description">' . __( "Select an interest group below to add to the form builder." , 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+																		echo '<p class="description">' . __( "Select an interest group below to add to the form builder.", 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 																		// $this->build_available_merge_vars( $form['fields'] , $available_merge_variables );
-																		$this->build_available_interest_groups( $form['fields'] , $interest_groupings , $form['list_id'] );
+																		$this->build_available_interest_groups( $form[ 'fields' ], $interest_groupings, $form[ 'list_id' ] );
 																	} else {
-																		echo '<p class="description">' . $interest_groupings['error'] . '</p>';
+																		echo '<p class="description">' . $interest_groupings[ 'error' ] . '</p>';
 																	}
 																?>
 															</div>
@@ -305,19 +305,19 @@ 
 										<div id="post-body-content">
 											<div class="meta-box-sortables ui-sortable">
 												<div class="postbox yikes-easy-mc-postbox">
-													<h3 class="edit-form-title"><span><?php _e( "Additional Form Settings" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+													<h3 class="edit-form-title"><span><?php _e( "Additional Form Settings", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 													<div class="inside form-settings-container">
 
-														<p class="edit-form-description"><?php _e( "Adjust some additional form settings below." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+														<p class="edit-form-description"><?php _e( "Adjust some additional form settings below.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 														<!-- begin form classes section -->
 														<strong class="section-title first"><?php _e( 'Overall Form Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 														<section class="section-interior">
 
 															<!-- form classes -->
-															<label for="yikes-easy-mc-form-class-names"><strong><?php _e( 'Form Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																<input type="text" class="widefat" name="yikes-easy-mc-form-class-names" id="yikes-easy-mc-form-class-names" value="<?php echo $form_settings['yikes-easy-mc-form-class-names']; ?>" placeholder="<?php _e( 'Add additional classes to this opt-in form.', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+															<label for="yikes-easy-mc-form-class-names"><strong><?php _e( 'Form Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																<input type="text" class="widefat" name="yikes-easy-mc-form-class-names" id="yikes-easy-mc-form-class-names" value="<?php echo $form_settings[ 'yikes-easy-mc-form-class-names' ]; ?>" placeholder="<?php _e( 'Add additional classes to this opt-in form.', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 																<p class="description"><?php printf( __( 'Add additional class names to the %s element.', 'yikes-inc-easy-mailchimp-extender' ), '<code>' . htmlentities( '<form>' ) . '</code>' ); ?></p>
 															</label>
 
@@ -330,12 +330,12 @@ 
 
 															<!-- setup the checked state here -->
 															<!-- inline form -->
-															<strong><?php _e( 'Inline Form' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<strong><?php _e( 'Inline Form', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 															<label class="inline-form-label">
-																<input type="radio" name="yikes-easy-mc-inline-form[]" value="1" <?php checked( $form_settings['yikes-easy-mc-inline-form'], '1' ); ?>/><?php _e( 'Enable', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																<input type="radio" name="yikes-easy-mc-inline-form[]" value="1" <?php checked( $form_settings[ 'yikes-easy-mc-inline-form' ], '1' ); ?>/><?php _e( 'Enable', 'yikes-inc-easy-mailchimp-extender' ); ?>
 															</label>
 															<label class="inline-form-label">
-																<input type="radio" name="yikes-easy-mc-inline-form[]" value="0" <?php checked( $form_settings['yikes-easy-mc-inline-form'], '0' ); ?> /><?php _e( 'Disable', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																<input type="radio" name="yikes-easy-mc-inline-form[]" value="0" <?php checked( $form_settings[ 'yikes-easy-mc-inline-form' ], '0' ); ?> /><?php _e( 'Disable', 'yikes-inc-easy-mailchimp-extender' ); ?>
 															</label>
 															<p class="description"><?php _e( 'Programatically setup this form so that all fields are on the same line.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 															<p class="description"><?php printf( __( 'If you are having issues with your theme not displaying the inline form properly, please see the following %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a href="https://yikesplugins.com/support/knowledge-base/my-form-fields-are-not-fully-inline-after-enabling-the-inline-form-option-how-come/" target="_blank">' . __( 'knowledge base article', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ); ?></p>
@@ -348,21 +348,21 @@ 
 														<section class="section-interior">
 
 															<!-- Submit button type -->
-															<strong><?php _e( 'Submit Button Type' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<strong><?php _e( 'Submit Button Type', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 															<label class="inline-form-label">
-																<input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="text" <?php checked( $form_settings['yikes-easy-mc-submit-button-type'], 'text' ); ?> /><?php _e( 'Text', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																<input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="text" <?php checked( $form_settings[ 'yikes-easy-mc-submit-button-type' ], 'text' ); ?> /><?php _e( 'Text', 'yikes-inc-easy-mailchimp-extender' ); ?>
 															</label>
 															<label class="inline-form-label">
-																<input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="image" <?php checked( $form_settings['yikes-easy-mc-submit-button-type'], 'image' ); ?> /><?php _e( 'Image', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																<input type="radio" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-submit-button-type[]" value="image" <?php checked( $form_settings[ 'yikes-easy-mc-submit-button-type' ], 'image' ); ?> /><?php _e( 'Image', 'yikes-inc-easy-mailchimp-extender' ); ?>
 															</label>
 															<p class="description"><?php _e( 'Select the submit button type for this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 															<!-- end submit button type -->
 
 																<!-- Text submit button type -->
-																<section class="submit-button-type-text nested-child<?php if( $form_settings['yikes-easy-mc-submit-button-type'] == 'image' ) { echo ' hidden'; } ?>">
+																<section class="submit-button-type-text nested-child<?php if ( $form_settings[ 'yikes-easy-mc-submit-button-type' ] == 'image' ) { echo ' hidden'; } ?>">
 																	<!-- submit button text -->
-																	<label for="yikes-easy-mc-submit-button-text"><strong><?php _e( 'Submit Button Text' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="widefat" name="yikes-easy-mc-submit-button-text" id="yikes-easy-mc-submit-button-text" value="<?php echo $form_settings['yikes-easy-mc-submit-button-text']; ?>" placeholder="<?php _e( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+																	<label for="yikes-easy-mc-submit-button-text"><strong><?php _e( 'Submit Button Text', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="widefat" name="yikes-easy-mc-submit-button-text" id="yikes-easy-mc-submit-button-text" value="<?php echo $form_settings[ 'yikes-easy-mc-submit-button-text' ]; ?>" placeholder="<?php _e( 'Submit', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 																		<p class="description"><?php printf( __( 'Set the submit button text. Leaving this blank will default to %s.', 'yikes-inc-easy-mailchimp-extender' ), '"' . __( 'Submit', 'yikes-inc-easy-mailchimp-extender' ) . '"' ); ?></p>
 
 																		<p class="description"><?php _e( 'The submit button text set above, can be overwritten on a per-form basis using shortcodes.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -371,9 +371,9 @@ 
 																<!-- end text submit button type -->
 
 																<!-- Image submit button type -->
-																<section class="submit-button-type-image nested-child<?php if( $form_settings['yikes-easy-mc-submit-button-type'] == 'text' ) { echo ' hidden'; } ?>">
-																	<label for="yikes-easy-mc-submit-button-image"><strong><?php _e( 'Submit Button URL' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="widefat" name="yikes-easy-mc-submit-button-image" id="yikes-easy-mc-submit-button-image" value="<?php echo $form_settings['yikes-easy-mc-submit-button-image']; ?>" placeholder="<?php _e( 'http://', 'yikes-inc-easy-mailchimp-extender' ); ?>">
+																<section class="submit-button-type-image nested-child<?php if ( $form_settings[ 'yikes-easy-mc-submit-button-type' ] == 'text' ) { echo ' hidden'; } ?>">
+																	<label for="yikes-easy-mc-submit-button-image"><strong><?php _e( 'Submit Button URL', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="widefat" name="yikes-easy-mc-submit-button-image" id="yikes-easy-mc-submit-button-image" value="<?php echo $form_settings[ 'yikes-easy-mc-submit-button-image' ]; ?>" placeholder="<?php _e( 'http://', 'yikes-inc-easy-mailchimp-extender' ); ?>">
 																		<p class="description"><?php _e( 'Enter the URL of an image you would like to use as the submit button for this form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																	</label>
 																</section>
@@ -381,8 +381,8 @@ 
 
 
 															<!-- submit button classes -->
-															<label for="yikes-easy-mc-form-submit-button-classes"><strong style="float:left;"><?php _e( 'Submit Button Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																<input type="text" class="widefat" name="yikes-easy-mc-submit-button-classes" id="yikes-easy-mc-submit-button-classes" value="<?php echo $form_settings['yikes-easy-mc-submit-button-classes']; ?>" placeholder="<?php _e( 'Add additional classes to this submit button.', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
+															<label for="yikes-easy-mc-form-submit-button-classes"><strong style="float:left;"><?php _e( 'Submit Button Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																<input type="text" class="widefat" name="yikes-easy-mc-submit-button-classes" id="yikes-easy-mc-submit-button-classes" value="<?php echo $form_settings[ 'yikes-easy-mc-submit-button-classes' ]; ?>" placeholder="<?php _e( 'Add additional classes to this submit button.', 'yikes-inc-easy-mailchimp-extender' ); ?>" >
 																<p class="description"><?php _e( 'Add custom classes to the submit button.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 															</label>
 															<!-- end submit button classes -->
@@ -395,45 +395,45 @@ 
 														<section class="section-interior">
 															<!-- Schedule form -->
 															<label class="inline-form-label">
-																<input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-schedule" value="1" <?php checked( $form_settings['yikes-easy-mc-form-schedule'], '1' ); ?>/><?php _e( 'Schedule Form', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																<input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-schedule" value="1" <?php checked( $form_settings[ 'yikes-easy-mc-form-schedule' ], '1' ); ?>/><?php _e( 'Schedule Form', 'yikes-inc-easy-mailchimp-extender' ); ?>
 															</label>
 															<p class="description" style="margin-bottom:0;"><?php _e( 'Set a time period that this form should be active on your site. (mm/dd/yyyy)', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 															<p class="description" style="margin: 0 0 .5em 0;"><?php _e( 'Once the end date & time have passed, users will no longer be able to signup for your mailing list.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																<!-- Start Date Limitation Nested -->
-																<section class="date-restriction-section nested-child<?php if( $form_settings['yikes-easy-mc-form-schedule'] == '0' ) { echo ' hidden'; } ?>">
+																<section class="date-restriction-section nested-child<?php if ( $form_settings[ 'yikes-easy-mc-form-schedule' ] == '0' ) { echo ' hidden'; } ?>">
 																	<!-- Start Date -->
-																	<label for="yikes-easy-mc-form-restriction-start-date"><strong><?php _e( 'Start Date' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-start-date" id="yikes-easy-mc-form-restriction-start-date" value="<?php echo ! empty($form_settings['yikes-easy-mc-form-restriction-start'] ) ? date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings['yikes-easy-mc-form-restriction-start'] ) : ''; ?>" >
+																	<label for="yikes-easy-mc-form-restriction-start-date"><strong><?php _e( 'Start Date', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-start-date" id="yikes-easy-mc-form-restriction-start-date" value="<?php echo ! empty( $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ) ? date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ) : ''; ?>" >
 																		<?php _e( 'at', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																	</label>
 
 																	<!-- Start Time -->
-																	<label for="yikes-easy-mc-form-restriction-start-time"><strong><?php _e( 'Start Time' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-start-time" id="yikes-easy-mc-form-restriction-start-time" value="<?php echo ! empty( $form_settings['yikes-easy-mc-form-restriction-start'] ) ? date( 'g:iA', $form_settings['yikes-easy-mc-form-restriction-start'] ) : ''; ?>" >
+																	<label for="yikes-easy-mc-form-restriction-start-time"><strong><?php _e( 'Start Time', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-start-time" id="yikes-easy-mc-form-restriction-start-time" value="<?php echo ! empty( $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ) ? date( 'g:iA', $form_settings[ 'yikes-easy-mc-form-restriction-start' ] ) : ''; ?>" >
 																	</label>
 																	<p class="description"><?php _e( 'Set the dates that this form should display on your site.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 																</section>
 																<!-- end Start Date Limitation Nested -->
 
 																<!-- End Date Limitation Nested -->
-																<section class="date-restriction-section nested-child<?php if( $form_settings['yikes-easy-mc-form-schedule'] == '0' ) { echo ' hidden'; } ?> last">
+																<section class="date-restriction-section nested-child<?php if ( $form_settings[ 'yikes-easy-mc-form-schedule' ] == '0' ) { echo ' hidden'; } ?> last">
 																	<!-- End Date -->
-																	<label for="yikes-easy-mc-form-restriction-end-date"><strong><?php _e( 'End Date' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-end-date" id="yikes-easy-mc-form-restriction-end-date" value="<?php echo ! empty(  $form_settings['yikes-easy-mc-form-restriction-end'] ) ? date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings['yikes-easy-mc-form-restriction-end'] ) : ''; ?>" >
+																	<label for="yikes-easy-mc-form-restriction-end-date"><strong><?php _e( 'End Date', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="date-picker" name="yikes-easy-mc-form-restriction-end-date" id="yikes-easy-mc-form-restriction-end-date" value="<?php echo ! empty( $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ) ? date( $this->yikes_jQuery_datepicker_date_format( get_option( 'date_format' ) ), $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ) : ''; ?>" >
 																		<?php _e( 'at', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																	</label>
 
 																	<!-- End Time -->
-																	<label for="yikes-easy-mc-form-restriction-end-time"><strong><?php _e( 'End Time' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																		<input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-end-time" id="yikes-easy-mc-form-restriction-end-time" value="<?php echo ! empty( $form_settings['yikes-easy-mc-form-restriction-end'] ) ? date( 'g:iA', $form_settings['yikes-easy-mc-form-restriction-end'] ) : ''; ?>" >
+																	<label for="yikes-easy-mc-form-restriction-end-time"><strong><?php _e( 'End Time', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																		<input type="text" class="time-picker" name="yikes-easy-mc-form-restriction-end-time" id="yikes-easy-mc-form-restriction-end-time" value="<?php echo ! empty( $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ) ? date( 'g:iA', $form_settings[ 'yikes-easy-mc-form-restriction-end' ] ) : ''; ?>" >
 																	</label>
 																	<p class="description"><?php _e( 'Set the dates that this form should no longer display on your site.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 																	<!-- Form pending message -->
-																	<label for="yikes-easy-mc-form-restriction-pending-message"><strong><?php _e( 'Pending Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																	<label for="yikes-easy-mc-form-restriction-pending-message"><strong><?php _e( 'Pending Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																		<?php
 																			wp_editor(
-																				$form_settings['yikes-easy-mc-form-restriction-pending-message'],
+																				$form_settings[ 'yikes-easy-mc-form-restriction-pending-message' ],
 																				'yikes-easy-mc-form-restriction-pending-message',
 																				array(
 																					'editor_class' => 'yikes-easy-mc-form-restriction-pending-message',
@@ -445,10 +445,10 @@ 
 																	<p class="description"><?php _e( 'Set the message that should display prior to the form being active.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 																	<!-- form expired message -->
-																	<label for="yikes-easy-mc-form-restriction-expired-message"><strong><?php _e( 'Expired Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																	<label for="yikes-easy-mc-form-restriction-expired-message"><strong><?php _e( 'Expired Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																		<?php
 																			wp_editor(
-																				$form_settings['yikes-easy-mc-form-restriction-expired-message'],
+																				$form_settings[ 'yikes-easy-mc-form-restriction-expired-message' ],
 																				'yikes-easy-mc-form-restriction-expired-message',
 																				array(
 																					'editor_class' => 'yikes-easy-mc-form-restriction-expired-message',
@@ -463,16 +463,16 @@ 
 
 																<!-- Require Users to be Logged In -->
 																<label class="inline-form-label">
-																	<input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-login-required" value="1" <?php checked( $form_settings['yikes-easy-mc-form-login-required'], '1' ); ?> /><?php _e( 'Require Login', 'yikes-inc-easy-mailchimp-extender' ); ?>
+																	<input type="checkbox" onclick="toggle_nested_section( jQuery(this) );" name="yikes-easy-mc-form-login-required" value="1" <?php checked( $form_settings[ 'yikes-easy-mc-form-login-required' ], '1' ); ?> /><?php _e( 'Require Login', 'yikes-inc-easy-mailchimp-extender' ); ?>
 																</label>
 																<p class="description"><?php _e( 'Require users to be logged in before they can view and submit this opt-in form.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 																<!-- Require Login Message -->
-																<section class="login-restriction-section nested-child<?php if( $form_settings['yikes-easy-mc-form-login-required'] == '0' ) { echo ' hidden'; } ?>">
-																	<label for="yikes-easy-mc-form-restriction-login-message"><strong><?php _e( 'Required Login Message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																<section class="login-restriction-section nested-child<?php if ( $form_settings[ 'yikes-easy-mc-form-login-required' ] == '0' ) { echo ' hidden'; } ?>">
+																	<label for="yikes-easy-mc-form-restriction-login-message"><strong><?php _e( 'Required Login Message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																		<?php
 																			wp_editor(
-																				$form_settings['yikes-easy-mc-form-restriction-login-message'],
+																				$form_settings[ 'yikes-easy-mc-form-restriction-login-message' ],
 																				'yikes-easy-mc-form-restriction-login-message',
 																				array(
 																					'editor_class' => 'yikes-easy-mc-form-restriction-login-message',
@@ -501,14 +501,14 @@ 
 										<div id="postbox-container-1" class="postbox-container">
 											<div class="meta-box-sortables">
 												<div class="postbox yikes-easy-mc-postbox">
-													<h3 class="edit-form-title"><span><?php _e( "Form Settings Explained" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+													<h3 class="edit-form-title"><span><?php _e( "Form Settings Explained", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 													<div class="inside">
 
 														<ul>
-															<li><strong><?php _e( 'Classes' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Add additional classes to this form, allowing you to target it more easily for customization via CSS.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-															<li><strong><?php _e( 'Form Layout' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Toggle the layout of this form between single column and an inline layout. The inline layout places all of your form fields and the submit button on a single line.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-															<li><strong><?php _e( 'Submit Button' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust setting specific to the submit button. Change the submit button text, or set it to a specified image. Use the "Submit Button Classes" to  assign additional classes to your submit button - ensuring it fits better into your theme.' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
-															<li><strong><?php _e( 'Form Restrictions' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust the restrictions for this form. Limit form visibility to a given time period, require users to be logged in to sign up or combine the two!' , 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+															<li><strong><?php _e( 'Classes', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Add additional classes to this form, allowing you to target it more easily for customization via CSS.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+															<li><strong><?php _e( 'Form Layout', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Toggle the layout of this form between single column and an inline layout. The inline layout places all of your form fields and the submit button on a single line.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+															<li><strong><?php _e( 'Submit Button', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust setting specific to the submit button. Change the submit button text, or set it to a specified image. Use the "Submit Button Classes" to  assign additional classes to your submit button - ensuring it fits better into your theme.', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
+															<li><strong><?php _e( 'Form Restrictions', 'yikes-inc-easy-mailchimp-extender' ); ?></strong> : <?php _e( 'Adjust the restrictions for this form. Limit form visibility to a given time period, require users to be logged in to sign up or combine the two!', 'yikes-inc-easy-mailchimp-extender' ); ?></li>
 														</ul>
 
 													</div>
@@ -536,78 +536,78 @@ 
 										<div id="post-body-content">
 											<div class="meta-box-sortables ui-sortable">
 												<div class="postbox yikes-easy-mc-postbox">
-													<h3 class="edit-form-title"><span><?php _e( "Custom Messages" , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+													<h3 class="edit-form-title"><span><?php _e( "Custom Messages", 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 													<div class="inside error-message-container">
 														<?php
 															// build our default options
 															$error_message_array = array(
-																'success' => __( 'Thank You for subscribing! Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' ),
-																'success-single-optin' => __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' ),
+																'success' => __( 'Thank You for subscribing! Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' ),
+																'success-single-optin' => __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' ),
 																'success-resubscribed' => __( 'Thank you for already being a subscriber! Your profile info has been updated.', 'yikes-inc-easy-mailchimp-extender' ),
-																'general-error' => __( "Whoops! It looks like something went wrong. Please try again." , 'yikes-inc-easy-mailchimp-extender' ),
-																'email-exists-error' => __( "The email you entered is already a subscriber to this list." , 'yikes-inc-easy-mailchimp-extender' ),
+																'general-error' => __( "Whoops! It looks like something went wrong. Please try again.", 'yikes-inc-easy-mailchimp-extender' ),
+																'email-exists-error' => __( "The email you entered is already a subscriber to this list.", 'yikes-inc-easy-mailchimp-extender' ),
 																'update-link' => __( "You're already subscribed. To update your MailChimp profile, please [link]click to send yourself an update link[/link].", 'yikes-inc-easy-mailchimp-extender' ),
 																'email-subject' => __( 'MailChimp Profile Update', 'yikes-inc-easy-mailchimp-extender' ),
 																'update-email-success' => sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.', 'yikes-inc-easy-mailchimp-extender' ), '&#10004;' ),
 																'update-email-failure' => sprintf( __( '%s Email failed to send. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), '&#10005;' ),
 
 															);
-															$global_error_messages = get_option( 'yikes-easy-mc-global-error-messages' , $error_message_array );
+															$global_error_messages = get_option( 'yikes-easy-mc-global-error-messages', $error_message_array );
 														?>
-														<p class="edit-form-description"><?php _e( "Customize the response messages for this form. Leave the field blank to use the default message. The messages shown below depend on the Opt-in Settings chosen." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+														<p class="edit-form-description"><?php _e( "Customize the response messages for this form. Leave the field blank to use the default message. The messages shown below depend on the Opt-in Settings chosen.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 														<!-- Success Message (refactored @ 6.3.0 for double optin) -->
-														<label for="yikes-easy-mc-success-message"><strong><?php _e( 'Success: Double opt-in' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-															<input type="text" class="widefat" name="yikes-easy-mc-success-message" id="yikes-easy-mc-success-message" value="<?php echo isset( $error_messages['success'] ) ? stripslashes( esc_html( $error_messages['success'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['success']; ?>" >
+														<label for="yikes-easy-mc-success-message"><strong><?php _e( 'Success: Double opt-in', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<input type="text" class="widefat" name="yikes-easy-mc-success-message" id="yikes-easy-mc-success-message" value="<?php echo isset( $error_messages[ 'success' ] ) ? stripslashes( esc_html( $error_messages[ 'success' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'success' ]; ?>" >
 														</label>
 														<!-- Success Message (for single optin) -->
-														<label for="yikes-easy-mc-success-single-optin-message"><strong><?php _e( 'Success: Single opt-in' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-															<input type="text" class="widefat" name="yikes-easy-mc-success-single-optin-message" id="yikes-easy-mc-success-single-optin-message" value="<?php echo isset( $error_messages['success-single-optin'] ) ? stripslashes( esc_html( $error_messages['success-single-optin'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['success-single-optin']; ?>" >
+														<label for="yikes-easy-mc-success-single-optin-message"><strong><?php _e( 'Success: Single opt-in', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<input type="text" class="widefat" name="yikes-easy-mc-success-single-optin-message" id="yikes-easy-mc-success-single-optin-message" value="<?php echo isset( $error_messages[ 'success-single-optin' ] ) ? stripslashes( esc_html( $error_messages[ 'success-single-optin' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'success-single-optin' ]; ?>" >
 														</label>
 														<!-- Resubscribing users when updating your profile via the form is allowed -->
-														<label for="yikes-easy-mc-user-resubscribed-success-message"><strong><?php _e( 'Success: Re-subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-															<input type="text" class="widefat" name="yikes-easy-mc-user-resubscribed-success-message" id="yikes-easy-mc-user-resubscribed-success-message" value="<?php echo isset( $error_messages['success-resubscribed'] ) ? stripslashes( esc_html( $error_messages['success-resubscribed'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['success-resubscribed']; ?>">
+														<label for="yikes-easy-mc-user-resubscribed-success-message"><strong><?php _e( 'Success: Re-subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<input type="text" class="widefat" name="yikes-easy-mc-user-resubscribed-success-message" id="yikes-easy-mc-user-resubscribed-success-message" value="<?php echo isset( $error_messages[ 'success-resubscribed' ] ) ? stripslashes( esc_html( $error_messages[ 'success-resubscribed' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'success-resubscribed' ]; ?>">
 														</label>
 
 														<!-- Click the link to update user profile etc. etc. -->
-														<label for="yikes-easy-mc-user-subscribed-update-link"><strong><?php _e( 'Success: Re-subscriber with link to email profile update message' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-															<input type="text" class="widefat" name="yikes-easy-mc-user-update-link" id="yikes-easy-mc-user-update-link" value="<?php echo isset( $error_messages['update-link'] ) ? stripslashes( esc_html( $error_messages['update-link'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['update-link']; ?>">
+														<label for="yikes-easy-mc-user-subscribed-update-link"><strong><?php _e( 'Success: Re-subscriber with link to email profile update message', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<input type="text" class="widefat" name="yikes-easy-mc-user-update-link" id="yikes-easy-mc-user-update-link" value="<?php echo isset( $error_messages[ 'update-link' ] ) ? stripslashes( esc_html( $error_messages[ 'update-link' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'update-link' ]; ?>">
 														</label>
 
 														<!-- Email Address is already subscribed -->
-														<label for="yikes-easy-mc-user-subscribed-message"><strong><?php _e( 'Error: Re-subscribers not permitted' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-															<input type="text" class="widefat" name="yikes-easy-mc-user-subscribed-message" id="yikes-easy-mc-user-subscribed-message" value="<?php echo isset( $error_messages['already-subscribed'] ) ? stripslashes( esc_html( $error_messages['already-subscribed'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['email-exists-error']; ?>">
+														<label for="yikes-easy-mc-user-subscribed-message"><strong><?php _e( 'Error: Re-subscribers not permitted', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<input type="text" class="widefat" name="yikes-easy-mc-user-subscribed-message" id="yikes-easy-mc-user-subscribed-message" value="<?php echo isset( $error_messages[ 'already-subscribed' ] ) ? stripslashes( esc_html( $error_messages[ 'already-subscribed' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'email-exists-error' ]; ?>">
 														</label>
 
 														<!-- Update email successfully sent -->
-														<label for="yikes-easy-mc-update-email-successful"><strong><?php _e( 'Success: Update email successfully sent' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-															<input type="text" class="widefat" name="yikes-easy-mc-update-email-successful" id="yikes-easy-mc-update-email-successful" value="<?php echo isset( $error_messages['update-email-success'] ) ? stripslashes( esc_attr( $error_messages['update-email-success'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['update-email-success']; ?>" >
+														<label for="yikes-easy-mc-update-email-successful"><strong><?php _e( 'Success: Update email successfully sent', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<input type="text" class="widefat" name="yikes-easy-mc-update-email-successful" id="yikes-easy-mc-update-email-successful" value="<?php echo isset( $error_messages[ 'update-email-success' ] ) ? stripslashes( esc_attr( $error_messages[ 'update-email-success' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'update-email-success' ]; ?>" >
 														</label>
 
 														<!-- Update email failed to send -->
-														<label for="yikes-easy-mc-update-email-failure"><strong><?php _e( 'Error: Update email failed to send' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-															<input type="text" class="widefat" name="yikes-easy-mc-update-email-failure" id="yikes-easy-mc-update-email-failure" value="<?php echo isset( $error_messages['update-email-failure'] ) ? stripslashes( esc_attr( $error_messages['update-email-failure'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['update-email-failure']; ?>" >
+														<label for="yikes-easy-mc-update-email-failure"><strong><?php _e( 'Error: Update email failed to send', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<input type="text" class="widefat" name="yikes-easy-mc-update-email-failure" id="yikes-easy-mc-update-email-failure" value="<?php echo isset( $error_messages[ 'update-email-failure' ] ) ? stripslashes( esc_attr( $error_messages[ 'update-email-failure' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'update-email-failure' ]; ?>" >
 														</label>
 
 														<!-- General Error Message -->
-														<label for="yikes-easy-mc-general-error-message"><strong><?php _e( 'Error: General' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-															<input type="text" class="widefat" name="yikes-easy-mc-general-error-message" id="yikes-easy-mc-general-error-message" value="<?php echo isset( $error_messages['general-error'] ) ? stripslashes( esc_html( $error_messages['general-error'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['general-error']; ?>" >
+														<label for="yikes-easy-mc-general-error-message"><strong><?php _e( 'Error: General', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<input type="text" class="widefat" name="yikes-easy-mc-general-error-message" id="yikes-easy-mc-general-error-message" value="<?php echo isset( $error_messages[ 'general-error' ] ) ? stripslashes( esc_html( $error_messages[ 'general-error' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'general-error' ]; ?>" >
 														</label>
 
 														<!-- Email Section -->
 
 														<hr>
 														<div class="yikes-easy-mc-custom-messages-email-section">
-															<p class="edit-form-description"><?php _e( 'Customize the profile verification email sent to re-subscribers. Leave the text unedited to use the default message.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+															<p class="edit-form-description"><?php _e( 'Customize the profile verification email sent to re-subscribers. Leave the text unedited to use the default message.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 															<!-- Email Subject -->
-															<label for="yikes-easy-mc-user-email-subject"><strong><?php _e( 'Email Subject' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-																<input type="text" class="widefat" name="yikes-easy-mc-user-email-subject" id="yikes-easy-mc-user-email-subject" value="<?php echo isset( $error_messages['email-subject'] ) ? stripslashes( esc_html( $error_messages['email-subject'] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages['email-subject']; ?>">
+															<label for="yikes-easy-mc-user-email-subject"><strong><?php _e( 'Email Subject', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+																<input type="text" class="widefat" name="yikes-easy-mc-user-email-subject" id="yikes-easy-mc-user-email-subject" value="<?php echo isset( $error_messages[ 'email-subject' ] ) ? stripslashes( esc_html( $error_messages[ 'email-subject' ] ) ) : ''; ?>" placeholder="<?php echo $global_error_messages[ 'email-subject' ]; ?>">
 															</label>
 															<!-- Email Body -->
-															<label for="yikes-easy-mc-user-email-body"><strong><?php _e( 'Email Body' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+															<label for="yikes-easy-mc-user-email-body"><strong><?php _e( 'Email Body', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 																<?php 
-																	$editor_content = ( isset( $error_messages['email-body'] ) && ! empty( $error_messages['email-body'] ) ) ? $error_messages['email-body'] : Yikes_Inc_Easy_Mailchimp_Forms_Admin::generate_default_email_body();
+																	$editor_content = ( isset( $error_messages[ 'email-body' ] ) && ! empty( $error_messages[ 'email-body' ] ) ) ? $error_messages[ 'email-body' ] : Yikes_Inc_Easy_Mailchimp_Forms_Admin::generate_default_email_body();
 																	wp_editor( $editor_content, 'yikes-easy-mc-user-email-body', array( 'textarea_id' => 'yikes-easy-mc-user-email-body' ) ); 
 																?>
 															</label>
@@ -717,7 +717,7 @@ 
 																	<li>
 																	<?php
 																		/* translators: First two placeholders are HTML <code> tags, third one is the form's name  */
-																		echo sprintf( esc_html__( '%1$1s[form_name]%2$2s displays your form\'s name (i.e. %3$3s).', 'yikes-inc-easy-mailchimp-extender' ), '<code>', '</code>', esc_html( $form['form_name'] ) );
+																		echo sprintf( esc_html__( '%1$1s[form_name]%2$2s displays your form\'s name (i.e. %3$3s).', 'yikes-inc-easy-mailchimp-extender' ), '<code>', '</code>', esc_html( $form[ 'form_name' ] ) );
 																	?>
 																	</li>
 																	<li>
@@ -751,7 +751,7 @@ 
 							</label>
 							<!-- End Error Messages -->
 
-							<?php do_action( 'yikes-mailchimp-edit-form-sections' , $form ); ?>
+							<?php do_action( 'yikes-mailchimp-edit-form-sections', $form ); ?>
 
 						</div>
 						<!-- .inside -->
@@ -766,103 +766,103 @@ 
 			<div id="postbox-container-1" class="postbox-container  yikes-easy-forms-sidebar">
 				<div class="meta-box-sortables">
 					<div class="postbox yikes-easy-mc-postbox">
-						<h3><span><?php _e( 'Form Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+						<h3><span><?php _e( 'Form Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 						<div class="inside">
 								<p class="inside-section-1">
-									<label for="shortcode"><?php _e( 'Edit Another Form' , 'yikes-inc-easy-mailchimp-extender' ); ?><br />
+									<label for="shortcode"><?php _e( 'Edit Another Form', 'yikes-inc-easy-mailchimp-extender' ); ?><br />
 										<select class="widefat" name="form_switcher" id="form_switcher" onchange="YIKES_Easy_MC_SwitchForm(jQuery(this).val());">
-											<?php foreach( $all_forms as $single_form ) { ?>
-												<option <?php selected( $form_id , $single_form['id'] ); ?>value="<?php echo $single_form['id']; ?>"><?php echo $single_form['form_name']; ?></option>
+											<?php foreach ( $all_forms as $single_form ) { ?>
+												<option <?php selected( $form_id, $single_form[ 'id' ] ); ?>value="<?php echo $single_form[ 'id' ]; ?>"><?php echo $single_form[ 'form_name' ]; ?></option>
 											<?php } ?>
 										</select>
 									</label>
 								</p>
 
 								<p class="inside-section-2">
-									<label for="shortcode"><?php _e( 'Shortcode' , 'yikes-inc-easy-mailchimp-extender' ); ?><br />
-										<input type="text" onclick="this.setSelectionRange(0, this.value.length)" class="widefat shortcode-input-field" readonly value='[yikes-mailchimp form="<?php echo $form['id']; ?>"]' />
+									<label for="shortcode"><?php _e( 'Shortcode', 'yikes-inc-easy-mailchimp-extender' ); ?><br />
+										<input type="text" onclick="this.setSelectionRange(0, this.value.length)" class="widefat shortcode-input-field" readonly value='[yikes-mailchimp form="<?php echo $form[ 'id' ]; ?>"]' />
 									</label>
 								</p>
 
 
 							<a href="#" class="expansion-section-title settings-sidebar">
-								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Associated List Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Associated List Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</a>
 							<div class="yikes-mc-settings-expansion-section">
 								<!-- Associated List -->
 								<p class="form-field-container">
 									<!-- necessary to prevent skipping on slideToggle(); -->
-									<label for="associated-list"><strong><?php _e( 'Associated List' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+									<label for="associated-list"><strong><?php _e( 'Associated List', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 										<select name="associated-list" id="associated-list" <?php if ( empty( $list_data ) ) { echo 'disabled="disabled"'; } ?> onchange="jQuery('.view-list-link').attr( 'href', '<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' ) ); ?>' + jQuery( this ).val() );">
 											<?php
 											if ( ! empty( $list_data ) ) {
-												foreach( $list_data as $mailing_list ) {
+												foreach ( $list_data as $mailing_list ) {
 													?>
-													<option <?php selected( $form['list_id'] , $mailing_list['id'] ); ?> value="<?php echo $mailing_list['id']; ?>"><?php echo stripslashes( $mailing_list['name'] ) . ' (' . $mailing_list['stats']['member_count'] . ') '; ?></option>
+													<option <?php selected( $form[ 'list_id' ], $mailing_list[ 'id' ] ); ?> value="<?php echo $mailing_list[ 'id' ]; ?>"><?php echo stripslashes( $mailing_list[ 'name' ] ) . ' (' . $mailing_list[ 'stats' ][ 'member_count' ] . ') '; ?></option>
 													<?php
 												}
 											} else {
 												?>
-												<option value="no-forms"><?php _e( 'No Lists Found' , 'yikes-inc-easy-mailchimp-extender' ); ?></option>
+												<option value="no-forms"><?php _e( 'No Lists Found', 'yikes-inc-easy-mailchimp-extender' ); ?></option>
 												<?php
 											}
 											?>
 										</select>
-										<?php if( ! empty( $form['list_id'] ) ) { ?>
+										<?php if ( ! empty( $form[ 'list_id' ] ) ) { ?>
 											<p class="description view-list">
-												<a href="<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $form['list_id'] ) ); ?>" class="view-list-link"><?php _e( 'View List', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+												<a href="<?php echo esc_url( admin_url( 'admin.php?page=yikes-mailchimp-view-list&list-id=' . $form[ 'list_id' ] ) ); ?>" class="view-list-link"><?php _e( 'View List', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 											</p>
 											<p class="description">
-												<?php _e( "Users who sign up via this form will be added to the list selected above." , 'yikes-inc-easy-mailchimp-extender' ); ?>
+												<?php _e( "Users who sign up via this form will be added to the list selected above.", 'yikes-inc-easy-mailchimp-extender' ); ?>
 											</p>
 										<?php } else { ?>
 											<p class="description">
-												<?php _e( "It looks like you first need to create a list to assign this form to. Head over to" , 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" title="<?php _e( 'Create a new list' , 'yikes-inc-easy-mailchimp-extender' ); ?>">MailChimp</a> <?php _e( 'to create your first list' , 'yikes-inc-easy-mailchimp-extender' ); ?>.
+												<?php _e( "It looks like you first need to create a list to assign this form to. Head over to", 'yikes-inc-easy-mailchimp-extender' ); ?> <a href="http://www.MailChimp.com" title="<?php _e( 'Create a new list', 'yikes-inc-easy-mailchimp-extender' ); ?>">MailChimp</a> <?php _e( 'to create your first list', 'yikes-inc-easy-mailchimp-extender' ); ?>.
 											</p>
 										<?php } ?>
 
 										<!-- Display our Clear API Cache button -->
 										<?php if ( false === get_transient( 'yikes-easy-mailchimp-list-data' ) && false === get_transient( 'yikes-easy-mailchimp-profile-data' ) && false === get_transient( 'yikes-easy-mailchimp-account-data' ) && false === get_transient( 'yikesinc_eme_list_ids' ) && false === get_transient( 'yikes_eme_lists' ) ) { ?>
-											<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
+											<p><a href="#" class="button-secondary" disabled="disabled" title="<?php _e( 'No MailChimp data found in temporary cache storage.', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
 										<?php } else { ?>
-											<p><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data' , 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" class="button-primary"><?php _e( 'Clear MailChimp API Cache' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
+											<p><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-clear-transient-data', 'nonce' => wp_create_nonce( 'clear-mc-transient-data' ) ) ) ); ?>" class="button-primary"><?php _e( 'Clear MailChimp API Cache', 'yikes-inc-easy-mailchimp-extender' ); ?></a></p>
 										<?php } ?>
 									</label>
 								</p>
 							</div>
 
 							<a href="#" class="expansion-section-title settings-sidebar">
-								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Opt-in Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Opt-in Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</a>
 							<div class="yikes-mc-settings-expansion-section">
 
 								<!-- Single or Double Opt-in -->
 								<?php
-									if( !isset( $optin_settings['optin'] ) ) {
-										$optin_settings['optin'] = '1';
+									if ( ! isset( $optin_settings[ 'optin' ] ) ) {
+										$optin_settings[ 'optin' ] = '1';
 									}
 								?>
-								<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="single-double-optin"><strong><?php _e( 'Single or Double Opt-in' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+								<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="single-double-optin"><strong><?php _e( 'Single or Double Opt-in', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 									<span class="edit-form-field-container-span">
-										<label for="single"><input id="single" type="radio" name="single-double-optin" value="0" <?php checked( $optin_settings['optin'] , '0' ); ?>><?php _e( 'Single' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-										&nbsp;<label for="double"><input id="double" type="radio" name="single-double-optin" value="1" <?php checked( $optin_settings['optin'] , '1' ); ?>><?php _e( 'Double' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										<label for="single"><input id="single" type="radio" name="single-double-optin" value="0" <?php checked( $optin_settings[ 'optin' ], '0' ); ?>><?php _e( 'Single', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										&nbsp;<label for="double"><input id="double" type="radio" name="single-double-optin" value="1" <?php checked( $optin_settings[ 'optin' ], '1' ); ?>><?php _e( 'Double', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 									</span>
-									<p class="description"><?php _e( "Double opt-in requires users to confirm their email address before being added to a list (recommended)" , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+									<p class="description"><?php _e( "Double opt-in requires users to confirm their email address before being added to a list (recommended)", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								</label></p>
 
 								<!-- Update Existing Users -->
 								<?php
-									if( !isset( $optin_settings['update_existing_user'] ) ) {
-										$optin_settings['update_existing_user'] = '1';
+									if ( ! isset( $optin_settings[ 'update_existing_user' ] ) ) {
+										$optin_settings[ 'update_existing_user' ] = '1';
 									}
 								?>
-								<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Update Existing Subscriber' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+								<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Update Existing Subscriber', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 									<span class="form-field-container-span">
-										<label for="update-user"><input type="radio" id="update-user" onchange="toggleUpdateEmailContainer(this);return false;" name="update-existing-user" value="1" <?php checked( $optin_settings['update_existing_user'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-										&nbsp;<label for="do-not-update-user"><input type="radio" onchange="toggleUpdateEmailContainer(this);return false;" id="do-not-update-user"  name="update-existing-user" value="0" <?php checked( $optin_settings['update_existing_user'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										<label for="update-user"><input type="radio" id="update-user" onchange="toggleUpdateEmailContainer(this);return false;" name="update-existing-user" value="1" <?php checked( $optin_settings[ 'update_existing_user' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										&nbsp;<label for="do-not-update-user"><input type="radio" onchange="toggleUpdateEmailContainer(this);return false;" id="do-not-update-user"  name="update-existing-user" value="0" <?php checked( $optin_settings[ 'update_existing_user' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 									</span>
-									<p class="description"><?php printf( __( "Update an existing subscriber's profile information instead of displaying a %s message." , "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></p>
+									<p class="description"><?php printf( __( "Update an existing subscriber's profile information instead of displaying a %s message.", "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></p>
 								</label></p>
 
 								<!--
@@ -871,101 +871,101 @@ 
 									- No = Just update the user profile without an email
 								-->
 								<?php
-									$send_update_email = ( isset( $optin_settings['send_update_email'] ) && '' !== $optin_settings['send_update_email'] ) ? $optin_settings['send_update_email'] : 0;
+									$send_update_email = ( isset( $optin_settings[ 'send_update_email' ] ) && '' !== $optin_settings[ 'send_update_email' ] ) ? $optin_settings[ 'send_update_email' ] : 0;
 								?>
-								<p class="form-field-container send-update-email" <?php if ( 1 !== absint( $optin_settings['update_existing_user'] ) ) { ?>style="display:none;"<?php } ?>><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Send Update Email' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+								<p class="form-field-container send-update-email" <?php if ( 1 !== absint( $optin_settings[ 'update_existing_user' ] ) ) { ?>style="display:none;"<?php } ?>><!-- necessary to prevent skipping on slideToggle(); --><label for="update-existing-user"><strong><?php _e( 'Send Update Email', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 									<span class="form-field-container-span">
-										<label for="update-email"><input type="radio" id="update-email" name="update-existing-email" value="1" <?php checked( $send_update_email , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-										&nbsp;<label for="do-not-update-email"><input type="radio" id="do-not-update-email"  name="update-existing-email" value="0" <?php checked( $send_update_email , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										<label for="update-email"><input type="radio" id="update-email" name="update-existing-email" value="1" <?php checked( $send_update_email, '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										&nbsp;<label for="do-not-update-email"><input type="radio" id="do-not-update-email"  name="update-existing-email" value="0" <?php checked( $send_update_email, '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 									</span>
-									<em><?php printf( __( "Send an email to the user granting their permission to update their profile information. Otherwise, an existing subscriber filling out this form, will have their profile information updated without any further interaction." , "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></em>
+									<em><?php printf( __( "Send an email to the user granting their permission to update their profile information. Otherwise, an existing subscriber filling out this form, will have their profile information updated without any further interaction.", "yikes-inc-easy-mailchimp-extender" ), __( '"user already subscribed"', 'yikes-inc-easy-mailchimp-extender' ) ); ?></em>
 								</label></p>
 
 							</div>
 
 							<a href="#" class="expansion-section-title settings-sidebar">
-								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Submission Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+								<span class="dashicons dashicons-plus yikes-mc-expansion-toggle"></span><?php _e( 'Submission Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>
 							</a>
 							<div class="yikes-mc-settings-expansion-section">
 								<!-- AJAX form Submission -->
 								<?php
-									if( !isset( $submission_settings['ajax'] ) ) {
-										$submission_settings['ajax'] = '1';
+									if ( ! isset( $submission_settings[ 'ajax' ] ) ) {
+										$submission_settings[ 'ajax' ] = '1';
 									}
 								?>
-								<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="form-ajax-submission"><strong><?php _e( 'Enable AJAX Submission' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+								<p class="form-field-container"><!-- necessary to prevent skipping on slideToggle(); --><label for="form-ajax-submission"><strong><?php _e( 'Enable AJAX Submission', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 									<span class="form-field-container-span">
-										<label for="enable-ajax"><input type="radio" id="enable-ajax" name="form-ajax-submission" class="yikes-enable-disable-ajax" value="1" <?php checked( $submission_settings['ajax'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-										&nbsp;<label for="disable-ajax"><input type="radio" id="disable-ajax"  name="form-ajax-submission" class="yikes-enable-disable-ajax" value="0" <?php checked( $submission_settings['ajax'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										<label for="enable-ajax"><input type="radio" id="enable-ajax" name="form-ajax-submission" class="yikes-enable-disable-ajax" value="1" <?php checked( $submission_settings[ 'ajax' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										&nbsp;<label for="disable-ajax"><input type="radio" id="disable-ajax"  name="form-ajax-submission" class="yikes-enable-disable-ajax" value="0" <?php checked( $submission_settings[ 'ajax' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 									</span>
-									<p class="description"><?php _e( "AJAX form submissions transmit data without requiring the page to refresh." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+									<p class="description"><?php _e( "AJAX form submissions transmit data without requiring the page to refresh.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								</label></p>
 
 								<!-- Redirect User On Submission -->
 								<?php
-									if( !isset( $submission_settings['redirect_on_submission'] ) ) {
-										$submission_settings['redirect_on_submission'] = '0';
-										$submission_settings['redirect_page'] = '';
+									if ( ! isset( $submission_settings[ 'redirect_on_submission' ] ) ) {
+										$submission_settings[ 'redirect_on_submission' ] = '0';
+										$submission_settings[ 'redirect_page' ] = '';
 									}
 								?>
-								<p><label for="redirect-user-on-submission"><strong><?php _e( 'Redirect On Submission' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+								<p><label for="redirect-user-on-submission"><strong><?php _e( 'Redirect On Submission', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 									<span class="form-field-container-span">
-										<label for="redirect-user"><input type="radio" id="redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="1" <?php checked( $submission_settings['redirect_on_submission'] , '1' ); ?>><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-										&nbsp;<label for="do-not-redirect-user"><input type="radio" id="do-not-redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="0" <?php checked( $submission_settings['redirect_on_submission'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										<label for="redirect-user"><input type="radio" id="redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="1" <?php checked( $submission_settings[ 'redirect_on_submission' ], '1' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										&nbsp;<label for="do-not-redirect-user"><input type="radio" id="do-not-redirect-user" onclick="togglePageRedirection( this );" name="redirect-user-on-submission" value="0" <?php checked( $submission_settings[ 'redirect_on_submission' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 									</span>
-									<?php $this->generate_page_redirect_dropdown( $submission_settings['redirect_on_submission'] , $submission_settings['redirect_page'], ( isset( $submission_settings['custom_redirect_url'] ) ) ? esc_url( $submission_settings['custom_redirect_url'] ) : '' ); ?>
-									<p class="description"><?php _e( "When the user signs up would you like to redirect them to another page?" , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+									<?php $this->generate_page_redirect_dropdown( $submission_settings[ 'redirect_on_submission' ], $submission_settings[ 'redirect_page' ], ( isset( $submission_settings[ 'custom_redirect_url' ] ) ) ? esc_url( $submission_settings[ 'custom_redirect_url' ] ) : '' ); ?>
+									<p class="description"><?php _e( "When the user signs up would you like to redirect them to another page?", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								</label></p>
 
 								<?php
-									if ( ! isset( $submission_settings['redirect_new_window'] ) ) {
-										$submission_settings['redirect_new_window'] = '0';
+									if ( ! isset( $submission_settings[ 'redirect_new_window' ] ) ) {
+										$submission_settings[ 'redirect_new_window' ] = '0';
 									}
 								?>
 
 								<!-- Option to open the redirect URL in a new window -->
-								<div class="redirect-new-window-div" <?php if ( ( ! isset( $submission_settings['redirect_on_submission'] ) || $submission_settings['redirect_on_submission'] === '0' ) || ( ! isset( $submission_settings['ajax'] ) || $submission_settings['ajax'] !== '1' )  ) { echo 'style="display:none;"'; } ?>>
-										<p><strong><?php _e( "Open Redirect URL in a New Window" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+								<div class="redirect-new-window-div" <?php if ( ( ! isset( $submission_settings[ 'redirect_on_submission' ] ) || $submission_settings[ 'redirect_on_submission' ] === '0' ) || ( ! isset( $submission_settings[ 'ajax' ] ) || $submission_settings[ 'ajax' ] !== '1' ) ) { echo 'style="display:none;"'; } ?>>
+										<p><strong><?php _e( "Open Redirect URL in a New Window", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 										<label for="redirect-new-window-yes">
-											<input type="radio" class="widefat custom-redirect-new-window" id="redirect-new-window-yes" name="redirect_new_window" value="1" <?php checked( $submission_settings['redirect_new_window'], '1' ); ?>/><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+											<input type="radio" class="widefat custom-redirect-new-window" id="redirect-new-window-yes" name="redirect_new_window" value="1" <?php checked( $submission_settings[ 'redirect_new_window' ], '1' ); ?>/><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?>
 										</label>
 										&nbsp;
 										<label for="redirect-new-window-no">
-											<input type="radio" class="widefat redirect-new-window" id="redirect-new-window-no" name="redirect_new_window" value="0" <?php checked( $submission_settings['redirect_new_window'] , '0' ); ?>/><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?>
+											<input type="radio" class="widefat redirect-new-window" id="redirect-new-window-no" name="redirect_new_window" value="0" <?php checked( $submission_settings[ 'redirect_new_window' ], '0' ); ?>/><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?>
 										</label>
-										<p class="description"><?php _e( "Should the redirect URL open in a new window/tab?" , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+										<p class="description"><?php _e( "Should the redirect URL open in a new window/tab?", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								</div>
 
 								<!-- Hide Form On Submission -->
 								<?php
-									if( !isset( $submission_settings['hide_form_post_signup'] ) ) {
-										$submission_settings['hide_form_post_signup'] = '0';
+									if ( ! isset( $submission_settings[ 'hide_form_post_signup' ] ) ) {
+										$submission_settings[ 'hide_form_post_signup' ] = '0';
 									}
 								?>
-								<p><label for="hide-form-post-signup"><strong><?php _e( 'Hide Form After Sign Up' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+								<p><label for="hide-form-post-signup"><strong><?php _e( 'Hide Form After Sign Up', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 									<span class="form-field-container-span">
-										<label for="hide-form"><input type="radio"  id="hide-form" name="hide-form-post-signup" value="1" <?php checked( $submission_settings['hide_form_post_signup'] , '1' ); ?> checked><?php _e( 'Yes' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-										&nbsp;<label for="do-not-hide-form"><input type="radio" id="do-not-hide-form" name="hide-form-post-signup" value="0" <?php checked( $submission_settings['hide_form_post_signup'] , '0' ); ?>><?php _e( 'No' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										<label for="hide-form"><input type="radio"  id="hide-form" name="hide-form-post-signup" value="1" <?php checked( $submission_settings[ 'hide_form_post_signup' ], '1' ); ?> checked><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										&nbsp;<label for="do-not-hide-form"><input type="radio" id="do-not-hide-form" name="hide-form-post-signup" value="0" <?php checked( $submission_settings[ 'hide_form_post_signup' ], '0' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 									</span>
-									<p class="description"><?php _e( "Should the form be hidden after the user successfully signs up?" , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+									<p class="description"><?php _e( "Should the form be hidden after the user successfully signs up?", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 								</label></p>
 
 								<!-- Append or Replace Interest Groups -->
 								<?php
-									if( !isset( $submission_settings['replace_interests'] ) ) {
-										$submission_settings['replace_interests'] = '1'; // defaults to true
+									if ( ! isset( $submission_settings[ 'replace_interests' ] ) ) {
+										$submission_settings[ 'replace_interests' ] = '1'; // defaults to true
 									}
 								?>
-								<p><label for="replace-interest-groups"><strong><?php _e( 'Existing Interest Groups' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+								<p><label for="replace-interest-groups"><strong><?php _e( 'Existing Interest Groups', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 									<span class="form-field-container-span">
-										<label for="replace-interest-groups"><input type="radio"  id="replace-interest-groups" name="replace-interest-groups" value="1" <?php checked( $submission_settings['replace_interests'] , '1' ); ?> checked><?php _e( 'Replace' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
-										&nbsp;<label for="update-interest-groups"><input type="radio" id="update-interest-groups" name="replace-interest-groups" value="0" <?php checked( $submission_settings['replace_interests'] , '0' ); ?>><?php _e( 'Update' , 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										<label for="replace-interest-groups"><input type="radio"  id="replace-interest-groups" name="replace-interest-groups" value="1" <?php checked( $submission_settings[ 'replace_interests' ], '1' ); ?> checked><?php _e( 'Replace', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
+										&nbsp;<label for="update-interest-groups"><input type="radio" id="update-interest-groups" name="replace-interest-groups" value="0" <?php checked( $submission_settings[ 'replace_interests' ], '0' ); ?>><?php _e( 'Update', 'yikes-inc-easy-mailchimp-extender' ); ?></label>
 									</span>
 
-										<p class="description"><small><?php _e( "<strong>Replace</strong>: Replace all interest groups with the new ones submitted." , 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
+										<p class="description"><small><?php _e( "<strong>Replace</strong>: Replace all interest groups with the new ones submitted.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 
 
-										<p class="description"><small><?php _e( "<strong>Update</strong>: Update <em>only</em> the ones submitted. Leave existing interest groups as is." , 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
+										<p class="description"><small><?php _e( "<strong>Update</strong>: Update <em>only</em> the ones submitted. Leave existing interest groups as is.", 'yikes-inc-easy-mailchimp-extender' ); ?></small></p>
 
 								</label></p>
 
@@ -978,9 +978,9 @@ 
 
 							<span class="form-buttons-container" id="major-publishing-actions">
 								<?php
-									echo submit_button( __( 'Update Form' ) , 'primary' , '' , false , array( 'onclick' => 'jQuery(this).parent().prev().css({"display":"block","visibility":"inherit"});' ) );
-									$url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $form['id'] , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$form['id'] ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) );
-									echo '<a href="' . $url . '" class="yikes-delete-mailchimp-form" onclick="return confirm(\'' . __( "Are you sure you want to delete this form? This cannot be undone." , 'yikes-inc-easy-mailchimp-extender' ) . '\');">' . __( "Delete Form" , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
+									echo submit_button( __( 'Update Form' ), 'primary', '', false, array( 'onclick' => 'jQuery(this).parent().prev().css({"display":"block","visibility":"inherit"});' ) );
+									$url = esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $form[ 'id' ], 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $form[ 'id' ] ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) );
+									echo '<a href="' . $url . '" class="yikes-delete-mailchimp-form" onclick="return confirm(\'' . __( "Are you sure you want to delete this form? This cannot be undone.", 'yikes-inc-easy-mailchimp-extender' ) . '\');">' . __( "Delete Form", 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
 								?>
 							</span>