yikesinc / yikes-inc-easy-mailchimp-extender

src/Model/Recaptcha.php

Indentation +57 added lines, -57 removed lines

@@ -6,70 +6,70 @@
 
 final class Recaptcha {
 
-    public $recaptcha_options;
-    public $site_key;
-    public $secret_key;
+	 public $recaptcha_options;
+	 public $site_key;
+	 public $secret_key;
 
-    const STATUS     = 'yikes-mc-recaptcha-status';
-    const SITE_KEY   = 'yikes-mc-recaptcha-site-key';
-    const SECRET_KEY = 'yikes-mc-recaptcha-secret-key';
+	 const STATUS     = 'yikes-mc-recaptcha-status';
+	 const SITE_KEY   = 'yikes-mc-recaptcha-site-key';
+	 const SECRET_KEY = 'yikes-mc-recaptcha-secret-key';
 
-    public function setup( $recaptcha_options = [] ) {
-        if ( ! $this->has_recaptcha() ) {
-            return false;
-        }
-        return $this->get_options( $recaptcha_options );
-    }
+	 public function setup( $recaptcha_options = [] ) {
+		  if ( ! $this->has_recaptcha() ) {
+				return false;
+		  }
+		  return $this->get_options( $recaptcha_options );
+	 }
 
-    private function has_recaptcha() {
-        if ( get_option( static::STATUS, '' ) == '1' ) {
-            return true;
-        }
-        return false;
-    }
+	 private function has_recaptcha() {
+		  if ( get_option( static::STATUS, '' ) == '1' ) {
+				return true;
+		  }
+		  return false;
+	 }
 
-    private function get_site_key() {
-        $site_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
-        if ( ! $site_key ) {
-            throw InvalidRecaptcha::from_site_key();
-        }
-        return $site_key;
-    }
+	 private function get_site_key() {
+		  $site_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
+		  if ( ! $site_key ) {
+				throw InvalidRecaptcha::from_site_key();
+		  }
+		  return $site_key;
+	 }
 
-    private function get_secret_key() {
-        $secret_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
-        if ( ! $secret_key ) {
-            throw InvalidRecaptcha::from_secret_key();
-        }
-        return $secret_key;
-    }
+	 private function get_secret_key() {
+		  $secret_key = get_option( 'yikes-mc-recaptcha-secret-key' , '' );
+		  if ( ! $secret_key ) {
+				throw InvalidRecaptcha::from_secret_key();
+		  }
+		  return $secret_key;
+	 }
 
-    private function get_options( $defaults ) {
-        // Store the site language (to load recaptcha in a specific language).
-        $locale       = get_locale();
-        $locale_split = explode( '_', $locale );
+	 private function get_options( $defaults ) {
+		  // Store the site language (to load recaptcha in a specific language).
+		  $locale       = get_locale();
+		  $locale_split = explode( '_', $locale );
 
-        // Setup reCAPTCHA parameters.
-        $lang       = ! empty( $locale_split ) ? $locale_split[0] : $locale;
-        $lang       = ! empty( $defaults['recaptcha_lang'] ) ? $defaults['recaptcha_lang'] : $lang;
-        $type       = ! empty( $defaults['recaptcha_type'] ) ? strtolower( $defaults['recaptcha_type'] ) : 'image'; // setup recaptcha type
-        $theme      = ! empty( $defaults['recaptcha_theme'] ) ? strtolower( $defaults['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
-        $size       = ! empty( $defaults['recaptcha_size'] ) ? strtolower( $defaults['recaptcha_size'] ) : 'normal'; // setup recaptcha size
-        $data_cb    = ! empty( $defaults['recaptcha_data_callback'] ) ? $defaults['recaptcha_data_callback'] : false; // setup recaptcha size
-        $expired_cb = ! empty( $defaults['recaptcha_expired_callback'] ) ? $defaults['recaptcha_expired_callback'] : false; // setup recaptcha size
+		  // Setup reCAPTCHA parameters.
+		  $lang       = ! empty( $locale_split ) ? $locale_split[0] : $locale;
+		  $lang       = ! empty( $defaults['recaptcha_lang'] ) ? $defaults['recaptcha_lang'] : $lang;
+		  $type       = ! empty( $defaults['recaptcha_type'] ) ? strtolower( $defaults['recaptcha_type'] ) : 'image'; // setup recaptcha type
+		  $theme      = ! empty( $defaults['recaptcha_theme'] ) ? strtolower( $defaults['recaptcha_theme'] ) : 'light'; // setup recaptcha theme
+		  $size       = ! empty( $defaults['recaptcha_size'] ) ? strtolower( $defaults['recaptcha_size'] ) : 'normal'; // setup recaptcha size
+		  $data_cb    = ! empty( $defaults['recaptcha_data_callback'] ) ? $defaults['recaptcha_data_callback'] : false; // setup recaptcha size
+		  $expired_cb = ! empty( $defaults['recaptcha_expired_callback'] ) ? $defaults['recaptcha_expired_callback'] : false; // setup recaptcha size
 
-        $script_params = '?hl=' . $lang . '&onload=renderReCaptchaCallback&render=explicit';
+		  $script_params = '?hl=' . $lang . '&onload=renderReCaptchaCallback&render=explicit';
 
-        return [
-            'language'         => $lang,
-            'theme'            => $theme,
-            'type'             => $type,
-            'size'             => $size,
-            'success_callback' => $data_cb,
-            'expired_callback' => $expired_cb,
-            'script_params'    => $script_params,
-            'site_key'         => $this->get_site_key(),
-            'secret_key'       => $this->get_secret_key(),
-        ];
-    }
+		  return [
+				'language'         => $lang,
+				'theme'            => $theme,
+				'type'             => $type,
+				'size'             => $size,
+				'success_callback' => $data_cb,
+				'expired_callback' => $expired_cb,
+				'script_params'    => $script_params,
+				'site_key'         => $this->get_site_key(),
+				'secret_key'       => $this->get_secret_key(),
+		  ];
+	 }
 }
\ No newline at end of file

src/Form/SubmitButton.php

Indentation +24 added lines, -24 removed lines

@@ -4,31 +4,31 @@
 
 trait SubmitButton {
 
-    public function submit_button_classes() {
-        $submit_button_classes = 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-';
-        $submit_button_classes .= $this->form_id;
-        $submit_button_classes .= ' btn btn-primary';
-        // Adding additional space in front of these classes.
-        $submit_button_classes .= ' ' . $this->form_data['form_settings']['yikes-easy-mc-submit-button-classes'];
-        $submit_button_classes .= $this->admin_class;
-        return apply_filters( 'yikes-mailchimp-form-submit-button-classes', $submit_button_classes, $this->form_id );
-    }
+	 public function submit_button_classes() {
+		  $submit_button_classes = 'yikes-easy-mc-submit-button yikes-easy-mc-submit-button-';
+		  $submit_button_classes .= $this->form_id;
+		  $submit_button_classes .= ' btn btn-primary';
+		  // Adding additional space in front of these classes.
+		  $submit_button_classes .= ' ' . $this->form_data['form_settings']['yikes-easy-mc-submit-button-classes'];
+		  $submit_button_classes .= $this->admin_class;
+		  return apply_filters( 'yikes-mailchimp-form-submit-button-classes', $submit_button_classes, $this->form_id );
+	 }
 
-    public function submit_button_text( $shortcode_prop ) {
-        $submit_button_text = '';
-        switch( true ) {
-            case ! empty( $shortcode_prop ):
-                $submit_button_text = $shortcode_prop;
-            break;
+	 public function submit_button_text( $shortcode_prop ) {
+		  $submit_button_text = '';
+		  switch( true ) {
+				case ! empty( $shortcode_prop ):
+					 $submit_button_text = $shortcode_prop;
+				break;
 
-            case $this->form_data['form_settings']['yikes-easy-mc-submit-button-text']:
-                $submit_button_text = $this->form_data['form_settings']['yikes-easy-mc-submit-button-text'];
-            break;
+				case $this->form_data['form_settings']['yikes-easy-mc-submit-button-text']:
+					 $submit_button_text = $this->form_data['form_settings']['yikes-easy-mc-submit-button-text'];
+				break;
 
-            default:
-                $submit_button_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
-            break;
-        }
-        return apply_filters( 'yikes-mailchimp-form-submit-button-text', $submit_button_text, $this->form_id );
-    }
+				default:
+					 $submit_button_text = __( 'Submit', 'yikes-inc-easy-mailchimp-extender' );
+				break;
+		  }
+		  return apply_filters( 'yikes-mailchimp-form-submit-button-text', $submit_button_text, $this->form_id );
+	 }
 }
\ No newline at end of file

src/Field/BaseInput.php

Indentation +3 added lines, -3 removed lines

@@ -102,8 +102,8 @@ 
 	}
 
 	public function get_id() {
-        return 'yikes-easy-mc-form-' . $this->form_id . '-' . $this->merge;
-    }
+		  return 'yikes-easy-mc-form-' . $this->form_id . '-' . $this->merge;
+	 }
 
 	public function get_value() {
 		return $this->value;
@@ -139,7 +139,7 @@ 
 		</p>
 
         <?php
-        endif;
+		  endif;
 		?>
 		<input type="<?= esc_attr( $this->get_type() ); ?>"
 			class="<?= esc_attr( implode( ' ' , $this->field_classes() ) ); ?>"

src/Shortcode/EasyFormsShortcode.php

Indentation +54 added lines, -54 removed lines

@@ -28,7 +28,7 @@ 
 
 final class EasyFormsShortcode extends BaseShortcode {
 
-    const TAG           = 'yikes-mailchimp';
+	 const TAG           = 'yikes-mailchimp';
 	const VIEW_URI      = 'views/easy-forms-shortcode';
 	const SUBMITTED_URI = 'views/easy-forms-shortcode-completed';
 	const TITLE_URI     = 'views/easy-forms-shortcode-title';
@@ -51,14 +51,14 @@ 
 	 * @since %VERSION%
 	 * @var string
 	 */
-    private $view_uri = self::VIEW_URI;
+	 private $view_uri = self::VIEW_URI;
     
-    /**
-	 * Get the default array of attributes for the shortcode.
-	 *
-	 * @since %VERSION%
-	 * @return array
-	 */
+	 /**
+	  * Get the default array of attributes for the shortcode.
+	  *
+	  * @since %VERSION%
+	  * @return array
+	  */
 	public function get_default_atts() {
 		return [
 			'form'                       => '',
@@ -159,7 +159,7 @@ 
 		}
 	}
     
-   /**
+	/**
 	 * Get the View URI to use for rendering the shortcode.
 	 *
 	 * @since %VERSION%
@@ -168,15 +168,15 @@ 
 	 */
 	protected function get_view_uri() {
 		return $this->view_uri;
-    }
+	 }
     
-    /**
-	 * Set the view URI.
-	 *
-	 * @since %VERSION%
-	 *
-	 * @param string $uri The URI to use.
-	 */
+	 /**
+	  * Set the view URI.
+	  *
+	  * @since %VERSION%
+	  *
+	  * @param string $uri The URI to use.
+	  */
 	private function set_view_uri( $uri ) {
 		$this->view_uri = $uri;
 	}
@@ -191,15 +191,15 @@ 
 		return ! empty( $_POST );
 	}
     
-    /**
-	 * Render the current Renderable.
-	 *
-	 * @since %VERSION%
-	 *
-	 * @param array $context Context in which to render.
-	 *
-	 * @return string Rendered HTML.
-	 */
+	 /**
+	  * Render the current Renderable.
+	  *
+	  * @since %VERSION%
+	  *
+	  * @param array $context Context in which to render.
+	  *
+	  * @return string Rendered HTML.
+	  */
 	public function render( array $context = [] ) {
 		try {
 			$this->enqueue_assets();
@@ -250,15 +250,15 @@ 
 		return isset( $subscriber ) ? $subscriber : null;
 	}
     
-    /**
-	 * Convert an exception to a string.
-	 *
-	 * @since %VERSION%
-	 *
-	 * @param \Exception $e The exception object.
-	 *
-	 * @return string
-	 */
+	 /**
+	  * Convert an exception to a string.
+	  *
+	  * @since %VERSION%
+	  *
+	  * @param \Exception $e The exception object.
+	  *
+	  * @return string
+	  */
 	private function exception_to_string( \Exception $e ) {
 		return sprintf(
 			/* translators: %s refers to the error message */
@@ -269,14 +269,14 @@ 
 
 	public function load_assets() {
 		$submission_helper = new ScriptAsset(
-            'form-submission-helpers',
-            'assets/js/dev/form-submission-helpers',
-            [ 'jquery' ],
-            '1.0.0',
-            ScriptAsset::ENQUEUE_HEADER
-        );
+				'form-submission-helpers',
+				'assets/js/dev/form-submission-helpers',
+				[ 'jquery' ],
+				'1.0.0',
+				ScriptAsset::ENQUEUE_HEADER
+		  );
 
-        $submission_helper->add_localization( 'form_submission_helpers', array(
+		  $submission_helper->add_localization( 'form_submission_helpers', array(
 			'ajax_url'           => esc_url( admin_url( 'admin-ajax.php' ) ),
 			'preloader_url'      => apply_filters( 'yikes-mailchimp-preloader', esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) ),
 			'countries_with_zip' => $this->countries_with_zip(),
@@ -289,19 +289,19 @@ 
 	}
 
 	public function countries_with_zip() {
-        return [
-            'US' => 'US', 'GB' => 'GB', 'CA' => 'CA', 
-            'IE' => 'IE', 'CN' => 'CN', 'IN' => 'IN', 
-            'AU' => 'AU', 'BR' => 'BR', 'MX' => 'MX',
-            'IT' => 'IT', 'NZ' => 'NZ', 'JP' => 'JP',
-            'FR' => 'FR', 'GR' => 'GR', 'DE' => 'DE',
-            'NL' => 'NL', 'PT' => 'PT', 'ES' => 'ES'
-        ];
-    }
+		  return [
+				'US' => 'US', 'GB' => 'GB', 'CA' => 'CA', 
+				'IE' => 'IE', 'CN' => 'CN', 'IN' => 'IN', 
+				'AU' => 'AU', 'BR' => 'BR', 'MX' => 'MX',
+				'IT' => 'IT', 'NZ' => 'NZ', 'JP' => 'JP',
+				'FR' => 'FR', 'GR' => 'GR', 'DE' => 'DE',
+				'NL' => 'NL', 'PT' => 'PT', 'ES' => 'ES'
+		  ];
+	 }
 
-    public function page_data() {
-        global $post;
+	 public function page_data() {
+		  global $post;
 		$page_data = isset( $post->ID ) ? $post->ID : 0;
 		return apply_filters( 'yikes-mailchimp-page-data', $page_data );
-    }
+	 }
 }

src/Form/FormHelper.php

Indentation +18 added lines, -18 removed lines

@@ -3,8 +3,8 @@ 
 namespace YIKES\EasyForms\Form;
 
 trait FormHelper {
-    public function form_title( $title, $custom_title, $form_name ) {
-        if ( $title ) {
+	 public function form_title( $title, $custom_title, $form_name ) {
+		  if ( $title ) {
 			if ( ! empty( $custom_title ) ) {
 				/**
 				 * Filter the title that is displayed through the shortcode.
@@ -14,15 +14,15 @@ 
 				 */
 				return apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $custom_title ), $this->form_id );
 			} else {
-			    return apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_name ), $this->form_id );
+				 return apply_filters( 'yikes-mailchimp-form-title', apply_filters( 'the_title', $form_name ), $this->form_id );
 			}
-        }
+		  }
         
-        return false;
-    }
+		  return false;
+	 }
 
-    public function form_description( $description, $custom_description ) {
-        if ( $description ) {
+	 public function form_description( $description, $custom_description ) {
+		  if ( $description ) {
 			if ( ! empty( $custom_description ) ) {
 				/**
 				 * Filter the description that is displayed through the shortcode.
@@ -35,11 +35,11 @@ 
 				return apply_filters( 'yikes-mailchimp-form-description', $this->form_data['form_description'], $this->form_id );
 			}
 		} else {
-            return false;
-        }
-    }
+				return false;
+		  }
+	 }
 
-    protected function reduce_field_count() {
+	 protected function reduce_field_count() {
 		$this->field_count = $this->field_count --;
 	}
 
@@ -51,9 +51,9 @@ 
 		$form_classes = $this->form_data['form_settings']['yikes-easy-mc-form-class-names'];
 		$form_classes .= ' yikes-easy-mc-form yikes-easy-mc-form-' . $this->form_id;
 
-        if ( isset( $this->form_inline ) && $this->form_inline != 0 ) {
-            $form_classes .= ' yikes-mailchimp-form-inline ';
-        }
+		  if ( isset( $this->form_inline ) && $this->form_inline != 0 ) {
+				$form_classes .= ' yikes-mailchimp-form-inline ';
+		  }
 
 		$form_classes .= ' ';
 
@@ -63,14 +63,14 @@ 
 			$form_classes .= ' yikes-easy-mc-display-none';
 		}
 
-    	return $form_classes;
+	 	return $form_classes;
 	}
 
 	public function inline_form_override() {
 		return isset( $this->has_recaptcha ) || ( function_exists( 'is_plugin_active' ) && is_plugin_active( 'eu-opt-in-compliance-for-mailchimp/yikes-inc-easy-mailchimp-eu-law-compliance-extension.php' ) );
 	}
     
-    public function edit_form_link() {
+	 public function edit_form_link() {
 		if( current_user_can( apply_filters( 'yikes-mailchimp-user-role-access' , 'manage_options' ) ) ) {
 			$edit_form_link = '<span class="edit-link">';
 			$edit_form_link .= '<a class="post-edit-link" href="' . esc_url( admin_url( 'admin.php?page=yikes-mailchimp-edit-form&id=' . $this->form_id ) ) . '" title="' . __( 'Edit' , 'yikes-inc-easy-mailchimp-extender' ) . ' ' . ucwords( $this->form_data['form_name'] ) . '">' . __( 'Edit Form' , 'yikes-inc-easy-mailchimp-extender' ) . '</a>';
@@ -80,5 +80,5 @@ 
 			$edit_form_link = '';
 		}
 		return $edit_form_link;
-    }
+	 }
 }

src/Model/OptinMeta.php

Indentation +14 added lines, -14 removed lines

@@ -13,21 +13,21 @@
 
 interface OptinMeta {
 
-    const EMAIL     = 'email';
-    const TEXT      = 'text';
-    const NUMBER    = 'number';
-    const URL       = 'url';
-    const IMAGE_URL = 'imageurl';
-    const PHONE     = 'phone';
-    const ZIP       = 'zip';
-    const ADDRESS   = 'address';
-    const DATE      = 'date';
-    const BIRTHDAY  = 'birthday';
-    const DROPDOWN  = 'dropdown';
-    const RADIO     = 'radio';
-    const CHECKBOX  = 'checkbox';
+	 const EMAIL     = 'email';
+	 const TEXT      = 'text';
+	 const NUMBER    = 'number';
+	 const URL       = 'url';
+	 const IMAGE_URL = 'imageurl';
+	 const PHONE     = 'phone';
+	 const ZIP       = 'zip';
+	 const ADDRESS   = 'address';
+	 const DATE      = 'date';
+	 const BIRTHDAY  = 'birthday';
+	 const DROPDOWN  = 'dropdown';
+	 const RADIO     = 'radio';
+	 const CHECKBOX  = 'checkbox';
 
-    const FIELD_MAP = [
+	 const FIELD_MAP = [
 		self::EMAIL     => Types::EMAIL,
 		self::TEXT      => Types::TEXT,
 	];

src/Form/FieldBuilder.php

Indentation +108 added lines, -108 removed lines

@@ -10,126 +10,126 @@
 namespace YIKES\EasyForms\Form;
 
 trait FieldBuilder {
-    protected function get_field_classes( $field ) {
-        $field_classes = [];
-        $label_classes = [];
+	 protected function get_field_classes( $field ) {
+		  $field_classes = [];
+		  $label_classes = [];
 
-        $field_classes[] = 'yikes-easy-mc-' . $field['type'];
-        $label_classes[] = $field['merge'] . '-label';
+		  $field_classes[] = 'yikes-easy-mc-' . $field['type'];
+		  $label_classes[] = $field['merge'] . '-label';
 
-        if( $field['additional-classes'] != '' ) {
+		  if( $field['additional-classes'] != '' ) {
 
-            $field_classes = explode( ' ' , $field['additional-classes'] );
+				$field_classes = explode( ' ' , $field['additional-classes'] );
 
-            if( in_array( 'field-left-half' , $field_classes ) ) {
-                $$label_classes[] = 'field-left-half';
-                $key = array_search( 'field-left-half' , $field_classes );
-                unset( $field_classes[$key] );
-            } // input half right
-            if( in_array( 'field-right-half' , $field_classes ) ) {
-                $$label_classes[] = 'field-right-half';
-                $key = array_search( 'field-right-half' , $field_classes );
-                unset( $field_classes[$key] );
-            } // input thirds (1/3 width, floated left)
-            if( in_array( 'field-third' , $field_classes ) ) {
-                $$label_classes[] = 'field-third';
-                $key = array_search( 'field-third' , $field_classes );
-                unset( $field_classes[$key] );
-            } // 2 column radio
-            if( in_array( 'option-2-col' , $field_classes ) ) {
-                $$label_classes[] = 'option-2-col';
-                $key = array_search( 'option-2-col' , $field_classes );
-                unset( $field_classes[$key] );
-            } // 3 column radio
-            if( in_array( 'option-3-col' , $field_classes ) ) {
-                $$label_classes[] = 'option-3-col';
-                $key = array_search( 'option-3-col' , $field_classes );
-                unset( $field_classes[$key] );
-            } // 4 column radio
-            if( in_array( 'option-4-col' , $field_classes ) ) {
-                $$label_classes[] = 'option-4-col';
-                $key = array_search( 'option-4-col' , $field_classes );
-                unset( $field_classes[$key] );
-            } // inline radio & checkboxes etc
-            if( in_array( 'option-inline' , $field_classes ) ) {
-                $$label_classes[] = 'option-inline';
-                $key = array_search( 'option-inline' , $field_classes );
-                unset( $field_classes[$key] );
-            }
-        }
+				if( in_array( 'field-left-half' , $field_classes ) ) {
+					 $$label_classes[] = 'field-left-half';
+					 $key = array_search( 'field-left-half' , $field_classes );
+					 unset( $field_classes[$key] );
+				} // input half right
+				if( in_array( 'field-right-half' , $field_classes ) ) {
+					 $$label_classes[] = 'field-right-half';
+					 $key = array_search( 'field-right-half' , $field_classes );
+					 unset( $field_classes[$key] );
+				} // input thirds (1/3 width, floated left)
+				if( in_array( 'field-third' , $field_classes ) ) {
+					 $$label_classes[] = 'field-third';
+					 $key = array_search( 'field-third' , $field_classes );
+					 unset( $field_classes[$key] );
+				} // 2 column radio
+				if( in_array( 'option-2-col' , $field_classes ) ) {
+					 $$label_classes[] = 'option-2-col';
+					 $key = array_search( 'option-2-col' , $field_classes );
+					 unset( $field_classes[$key] );
+				} // 3 column radio
+				if( in_array( 'option-3-col' , $field_classes ) ) {
+					 $$label_classes[] = 'option-3-col';
+					 $key = array_search( 'option-3-col' , $field_classes );
+					 unset( $field_classes[$key] );
+				} // 4 column radio
+				if( in_array( 'option-4-col' , $field_classes ) ) {
+					 $$label_classes[] = 'option-4-col';
+					 $key = array_search( 'option-4-col' , $field_classes );
+					 unset( $field_classes[$key] );
+				} // inline radio & checkboxes etc
+				if( in_array( 'option-inline' , $field_classes ) ) {
+					 $$label_classes[] = 'option-inline';
+					 $key = array_search( 'option-inline' , $field_classes );
+					 unset( $field_classes[$key] );
+				}
+		  }
 
-        // if the form is set to inline, add the inline class to our labels
-        if( $this->form_inline ) {
-            $label_classes[] = 'label-inline';
-        }
+		  // if the form is set to inline, add the inline class to our labels
+		  if( $this->form_inline ) {
+				$label_classes[] = 'label-inline';
+		  }
         
-        if( isset( $field['hide-label'] ) ) {
-            if( absint( $field['hide-label'] ) === 1 ) {
-                $this->increase_hidden_label_count();
-                $field_classes[] = 'field-no-label';
-            }
-        }
+		  if( isset( $field['hide-label'] ) ) {
+				if( absint( $field['hide-label'] ) === 1 ) {
+					 $this->increase_hidden_label_count();
+					 $field_classes[] = 'field-no-label';
+				}
+		  }
 
-        return [
-            'field_classes' => $field_classes,
-            'label_classes' => $label_classes,
-        ];
-    }
+		  return [
+				'field_classes' => $field_classes,
+				'label_classes' => $label_classes,
+		  ];
+	 }
 
-    protected function increase_hidden_label_count() {
-        $this->hidden_label_count = $this->hidden_label_count++;
-    }
+	 protected function increase_hidden_label_count() {
+		  $this->hidden_label_count = $this->hidden_label_count++;
+	 }
 
-    protected function get_label( $field ) {
-        $label = [];
-        if( $field['type'] == 'email' ) {
-            $label['props']['visible'] = '';
-        } else {
-            $label['props']['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
-        }
-        if ( isset( $field['hide-label'] ) ) {
-            $label['hide-label'] = true;
-        }
-        if ( isset( $field['label'] ) ) {
-            $label['value'] = $field['label'];
-        }
-        return $label;
-    }
+	 protected function get_label( $field ) {
+		  $label = [];
+		  if( $field['type'] == 'email' ) {
+				$label['props']['visible'] = '';
+		  } else {
+				$label['props']['visible'] = isset( $field['hide'] ) ? 'style="display:none;"' : '';
+		  }
+		  if ( isset( $field['hide-label'] ) ) {
+				$label['hide-label'] = true;
+		  }
+		  if ( isset( $field['label'] ) ) {
+				$label['value'] = $field['label'];
+		  }
+		  return $label;
+	 }
 
-    protected function get_value( $field ) {
-        // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
-        $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
-        $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
-        return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id );
-    }
+	 protected function get_value( $field ) {
+		  // pass our default value through our filter to parse dynamic data by tag (used solely for 'text' type)
+		  $default_value = ( isset( $field['default'] ) ? esc_attr( $field['default'] ) : '' );
+		  $default_value = apply_filters( 'yikes-mailchimp-process-default-tag', $default_value );
+		  return apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-default-value', $default_value, $field, $this->form_id );
+	 }
 
-    protected function get_placeholder( $field ) {
-        return isset( $field['placeholder'] ) ? $field['placeholder'] : '';
-    }
+	 protected function get_placeholder( $field ) {
+		  return isset( $field['placeholder'] ) ? $field['placeholder'] : '';
+	 }
 
-    protected function get_hidden( $field ) {
-        $visible = false;
-        // if both hide label and hide field are checked, we gotta hide the field!
-        if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
-            if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
-                $visible = true;
-            }
-        }
-        return $visible;
-    }
+	 protected function get_hidden( $field ) {
+		  $visible = false;
+		  // if both hide label and hide field are checked, we gotta hide the field!
+		  if( isset( $field['hide' ] ) && $field['hide'] == 1 ) {
+				if( isset( $field['hide-label' ] ) && $field['hide-label'] == 1 ) {
+					 $visible = true;
+				}
+		  }
+		  return $visible;
+	 }
 
-    protected function get_description( $field ) {
-        $description       = '';
-        $show_description  = isset( $field['description'] ) ? true : false;
-        $description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false;
-        if ( $show_description === true ) {
-            $description = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $this->form_id );
-        }
+	 protected function get_description( $field ) {
+		  $description       = '';
+		  $show_description  = isset( $field['description'] ) ? true : false;
+		  $description_above = isset( $field['description_above'] ) && $field['description_above'] === '1' ? true : false;
+		  if ( $show_description === true ) {
+				$description = apply_filters( 'yikes-mailchimp-' . $field['merge'] . '-description', esc_attr( stripslashes( $field['description'] ) ), $this->form_id );
+		  }
         
-        return [
-            'show_description'  => $show_description,
-            'description_above' => $description_above,
-            'description'       => $description,
-        ];
-    }
+		  return [
+				'show_description'  => $show_description,
+				'description_above' => $description_above,
+				'description'       => $description,
+		  ];
+	 }
 }

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

Indentation +67 added lines, -67 removed lines

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

 			Remove the Review us notification when user clicks 'Dismiss'

 			@since v3.1.1

-		*/

+		 */

 		public function yikes_easy_mailchimp_stop_bugging_me() {

 			if ( isset( $_GET['yikes_easy_mc_icons_nobug'] ) && (int) filter_var( $_GET['yikes_easy_mc_icons_nobug'], FILTER_SANITIZE_NUMBER_INT ) === 1 ) {

 				add_option( 'yikes_easy_mailchimp_review_stop_bugging_me', true );

@@ -843,9 +843,9 @@ 
 	}

 

 	/**

-	*	Register our admin pages

-	*	used to display data back to the user

-	**/

+	 *	Register our admin pages

+	 *	used to display data back to the user

+	 **/

 	public function register_admin_pages() {

 

 		/* Top Level Menu 'Easy Mailchimp' */

@@ -964,28 +964,28 @@ 
 	}

 

 	/**

-	* Generate Us Easy Mailchimp Manage Forms Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us Easy Mailchimp Manage Forms Page

+	 *

+	 * @since    1.0.0

+	 */

 	function generateManageFormsPage() {

 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-forms.php'; // include our manage forms page

 	}

 

 	/**

-	* Generate Us Easy Mailchimp Manage Lists Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us Easy Mailchimp Manage Lists Page

+	 *

+	 * @since    1.0.0

+	 */

 	function generateManageListsPage() {

 		require_once YIKES_MC_PATH . 'admin/partials/menu/manage-lists.php'; // include our lists page

 	}

 

 	/**

-	* Generate Us Easy Mailchimp Support Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us Easy Mailchimp Support Page

+	 *

+	 * @since    1.0.0

+	 */

 	function generateSupportPage() {

 

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

@@ -993,37 +993,37 @@ 
 	}

 

 	/**

-	* Generate Us Easy Mailchimp Edit Form Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us Easy Mailchimp Edit Form Page

+	 *

+	 * @since    1.0.0

+	 */

 	function generateEditFormPage() {

 		require_once YIKES_MC_PATH . 'admin/partials/edit-form.php'; // include our options page

 	}

 

 	/**

-	* Generate Us Easy Mailchimp View List Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us Easy Mailchimp View List Page

+	 *

+	 * @since    1.0.0

+	 */

 	function generateViewListPage() {

 		require_once YIKES_MC_PATH . 'admin/partials/view-list.php'; // include our options page

 	}

 

 	/**

-	* Generate Us Easy Mailchimp View User Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us Easy Mailchimp View User Page

+	 *

+	 * @since    1.0.0

+	 */

 	function generateViewUserPage() {

 		require_once YIKES_MC_PATH . 'admin/partials/view-user.php'; // include our options page

 	}

 

 	/**

-	*	Register our plugin settings, and display them on our settings page

-	*

-	* @since v.5.4

-	**/

+	 *	Register our plugin settings, and display them on our settings page

+	 *

+	 * @since v.5.4

+	 **/

 	function yikes_easy_mc_settings_init() {

 

 		/* Register General Settings Section */

@@ -1141,9 +1141,9 @@ 
 	}

 

 	/**

-	*	Options Sanitization & Validation

-	*	@since complete re-write

-	**/

+	 *	Options Sanitization & Validation

+	 *	@since complete re-write

+	 **/

 	function yikes_mc_validate_api_key( $input ) {

 		if ( $input === '' ) {

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

@@ -1175,20 +1175,20 @@ 
 	}

 

 	/**

-	* Generate Us Easy Forms for Mailchimp Options Page

-	*

-	* @since    1.0.0

-	*/

+	 * Generate Us Easy Forms for Mailchimp Options Page

+	 *

+	 * @since    1.0.0

+	 */

 	function generatePageOptions() {

 		require_once YIKES_MC_PATH . 'admin/partials/menu/options.php'; // include our options page

 	}

 

 	/**

-	*	Check if users API key is valid, if not

-	*	this function will apply a disabled attribute

-	*	to form fields. (input, dropdowns, buttons etc.)

-	* 	@since v5.5 re-write

-	**/

+	 *	Check if users API key is valid, if not

+	 *	this function will apply a disabled attribute

+	 *	to form fields. (input, dropdowns, buttons etc.)

+	 * 	@since v5.5 re-write

+	 **/

 	public function is_user_mc_api_valid_form( $echo = true ) {

 		if ( $echo == true ) {

 			if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'invalid_api_key' ) {

@@ -1214,12 +1214,12 @@ 
 		*	- http://stackoverflow.com/questions/6661530/php-multi-dimensional-array-search

 		*/

 		function findMCListID($id, $array) {

-		   foreach ($array as $key => $val) {

-			   if ($val['id'] === $id) {

-				   return $key;

-			   }

-		   }

-		   return null;

+			foreach ($array as $key => $val) {

+				if ($val['id'] === $id) {

+					return $key;

+				}

+			}

+			return null;

 		} // end

 

 		/*

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

 

 					/**

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

-					*

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

-					*

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

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

-					*/

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

+					 *

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

+					 *

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

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

+					 */

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

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

 

@@ -1530,9 +1530,9 @@ 
 			}

 

 			/**

-			*	Custom action hook for our extensions to hook into

-			*	@parameter	get_current_screen()	current screen information

-			*/

+			 *	Custom action hook for our extensions to hook into

+			 *	@parameter	get_current_screen()	current screen information

+			 */

 			do_action( 'yikes-mailchimp-admin-sidebar', get_current_screen() );

 

 		}

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

 

 			/**

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

-			*

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

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

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

-			*

-			*/

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

+			 *

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

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

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

+			 *

+			 */

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

 

 			if ( false === $result ) {

public/classes/process/class.process_form_submission_handler.php

Indentation +533 added lines, -533 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,13 +869,13 @@ 
 	}
 
 	/**
-	* Handle the reCAPTCHA
-	*
-	* @since 6.3.0
-	*
-	* @param string | $recaptcha_response | The form value of the recaptcha field
-	* @param int    | $version            | The version of recaptcha to use.
-	*/
+	 * Handle the reCAPTCHA
+	 *
+	 * @since 6.3.0
+	 *
+	 * @param string | $recaptcha_response | The form value of the recaptcha field
+	 * @param int    | $version            | The version of recaptcha to use.
+	 */
 	public function handle_recaptcha( $recaptcha_response, $version = 2 ) {
 
 		// Before we the hit the API, let's check that we actually got a response.
@@ -883,11 +883,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 );
 		}
@@ -932,40 +932,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 
@@ -978,24 +978,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 );
@@ -1003,12 +1003,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 );
@@ -1016,12 +1016,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 );
@@ -1029,12 +1029,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 ) {
@@ -1044,12 +1044,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 );
@@ -1057,12 +1057,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 );
@@ -1070,10 +1070,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
@@ -1086,10 +1086,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
@@ -1114,15 +1114,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 ) {
@@ -1136,13 +1136,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;
@@ -1161,13 +1161,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;
@@ -1181,14 +1181,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;
@@ -1201,14 +1201,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;
@@ -1221,14 +1221,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;
@@ -1244,16 +1244,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;
@@ -1267,14 +1267,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
@@ -1288,14 +1288,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 );
@@ -1308,18 +1308,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 );
@@ -1332,17 +1332,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
@@ -1366,14 +1366,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;
@@ -1406,23 +1406,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;