yikesinc / yikes-inc-easy-mailchimp-extender

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

Braces +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
  * @subpackage Yikes_Inc_Easy_Mailchimp_Extender/includes

  * @author     YIKES Inc. <plugins@yikesinc.com>

  */

-class Yikes_Inc_Easy_Mailchimp_Extender {

+class Yikes_Inc_Easy_Mailchimp_Extender {
 	/**

 	 * The loader that's responsible for maintaining and registering all hooks that power

 	 * the plugin.

@@ -70,7 +70,7 @@ 
 	 *

 	 * @param Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface

 	 */

-	public function __construct( Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface ) {

+	public function __construct( Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface ) {
 		$this->version = YIKES_MC_VERSION;

 		$this->form_interface = $form_interface;

 		$this->load_dependencies();

@@ -93,7 +93,7 @@ 
 	 * @since    1.0.0

 	 * @access   private

 	 */

-	private function load_dependencies() {

+	private function load_dependencies() {
 		/**

 		 * The class responsible for orchestrating the actions and filters of the

 		 * core plugin.

@@ -121,7 +121,7 @@ 
 	 * @since    1.0.0

 	 * @access   private

 	 */

-	private function define_admin_hooks() {

+	private function define_admin_hooks() {
 		$plugin_admin = new Yikes_Inc_Easy_Mailchimp_Forms_Admin( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version(), $this->form_interface );

 		$plugin_admin->hooks();

 		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );

@@ -134,7 +134,7 @@ 
 	 * @since    1.0.0

 	 * @access   private

 	 */

-	private function define_public_hooks() {

+	private function define_public_hooks() {
 		$plugin_public = new Yikes_Inc_Easy_Mailchimp_Extender_Public( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version() );

 	}

 	/**

@@ -142,7 +142,7 @@ 
 	 *

 	 * @since    1.0.0

 	 */

-	public function run() {

+	public function run() {
 		$this->loader->run();

 	}

 	/**

@@ -152,7 +152,7 @@ 
 	 * @since     1.0.0

 	 * @return    string    The name of the plugin.

 	 */

-	public function get_yikes_inc_easy_mailchimp_extender() {

+	public function get_yikes_inc_easy_mailchimp_extender() {
 		return $this->yikes_inc_easy_mailchimp_extender;

 	}

 	/**

@@ -161,7 +161,7 @@ 
 	 * @since     1.0.0

 	 * @return    Yikes_Inc_Easy_Mailchimp_Extender_Loader    Orchestrates the hooks of the plugin.

 	 */

-	public function get_loader() {

+	public function get_loader() {
 		return $this->loader;

 	}

 	/**

@@ -170,7 +170,7 @@ 
 	 * @since     1.0.0

 	 * @return    string    The version number of the plugin.

 	 */

-	public function get_version() {

+	public function get_version() {
 		return $this->version;

 	}

 }

includes/api/class-yikes-inc-easy-mailchimp-api-manager.php

Spacing +5 added lines, -5 removed lines

@@ -72,8 +72,8 @@ 
 
 		$this->api_key = $api_key;
 		$parts         = $this->get_api_key_parts();
-		$this->key     = $parts['key'];
-		$this->dc      = $parts['dc'];
+		$this->key     = $parts[ 'key' ];
+		$this->dc      = $parts[ 'dc' ];
 	}
 
 	/**
@@ -98,8 +98,8 @@ 
 		$parts = explode( '-', $this->api_key );
 
 		return array(
-			'key' => $parts[0],
-			'dc'  => isset( $parts[1] ) ? $parts[1] : '',
+			'key' => $parts[ 0 ],
+			'dc'  => isset( $parts[ 1 ] ) ? $parts[ 1 ] : '',
 		);
 	}
 
@@ -143,7 +143,7 @@ 
 	 * @return Yikes_Inc_Easy_Mailchimp_API
 	 */
 	public function get_api( $version = '' ) {
-		$version = $version ?: $this->get_default_api_version();
+		$version = $version ? : $this->get_default_api_version();
 
 		if ( ! array_key_exists( $version, $this->api ) || null === $this->api[ $version ] ) {
 			$this->api[ $version ] = new Yikes_Inc_Easy_Mailchimp_API( $this->get_datacenter(), $this->get_api_key(), $version );

includes/third-party-integrations/visual-composer/visual-composer.php

Braces +10 added lines, -10 removed lines

@@ -5,18 +5,18 @@ 
 *	@since 6.0.3

 */

 

-class YIKES_Mailchimp_Visual_Composer_Extension {

+class YIKES_Mailchimp_Visual_Composer_Extension {
 

 	/**

 	 * Constructor

 	 *

 	 * @since 6.0.3

 	 */

-	function __construct() {

+	function __construct() {
 		

 		add_action( 'admin_init', array( $this, 'extend_visual_composer' ) );

 

-		if ( function_exists( 'vc_add_shortcode_param' ) ) {

+		if ( function_exists( 'vc_add_shortcode_param' ) ) {
 			vc_add_shortcode_param( 'yikes_mailchimp_logo', array( $this, 'yikes_mailchimp_logo_vc_section' ) );

 		}

 	}

@@ -26,9 +26,9 @@ 
 	 *

 	 * @since 6.0.3

 	 */

-	public function extend_visual_composer() {

+	public function extend_visual_composer() {
 

-		if ( ! function_exists( 'vc_map' ) ) {

+		if ( ! function_exists( 'vc_map' ) ) {
 			return;

 		}

 

@@ -98,7 +98,7 @@ 
 	 *

 	 * @since 6.0.3

 	 */

-	public function yikes_mailchimp_logo_vc_section() {

+	public function yikes_mailchimp_logo_vc_section() {
 		return '<img style="width:250px;display:block;margin:0 auto;" src="' . YIKES_MC_URL . 'includes/images/Mailchimp_Assets/mailchimp-logo.png" title="' . __( 'Easy Forms for Mailchimp', 'yikes-inc-easy-mailchimp-extender' ) . '" />';

 	}

 

@@ -107,17 +107,17 @@ 
 	 *

 	 * @since 6.0.3

 	 */

-	public function yikes_mailchimp_retreive_user_created_forms() {

+	public function yikes_mailchimp_retreive_user_created_forms() {
 		$interface = yikes_easy_mailchimp_extender_get_form_interface();

 		$all_forms = $interface->get_all_forms();

 

 		$lists = array();

-		if ( ! empty( $all_forms ) ) {

+		if ( ! empty( $all_forms ) ) {
 			// build an array to pass to our javascript

-			foreach ( $all_forms as $id => $form ) {

+			foreach ( $all_forms as $id => $form ) {
 				$lists[ $form['form_name'] ] = $id;

 			}

-		} else {

+		} else {
 			$lists[ __( 'Please Import Some Mailchimp Lists', 'yikes-inc-easy-mailchimp-extender' ) ] = '-';

 		}

 

includes/third-party-integrations/third-party-init.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		// required..*
 		include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 		/* Visual Composer */
-		if( is_plugin_active( 'js_composer/js_composer.php' ) ) {
+		if ( is_plugin_active( 'js_composer/js_composer.php' ) ) {
 			new YIKES_Mailchimp_Visual_Composer_Extension();
 		}
 	}

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 {

public/partials/shortcodes/process/process_form_submission_ajax.php

Spacing +31 added lines, -31 removed lines

@@ -8,10 +8,10 @@ 
 $submission_handler = new Yikes_Inc_Easy_Mailchimp_Extender_Process_Submission_Handler( $is_ajax = true );
 
 // parse our form data
-parse_str( $_POST['form_data'], $data );
+parse_str( $_POST[ 'form_data' ], $data );
 
 // Get the form_id
-$form_id   = absint( $_POST['form_id'] );
+$form_id = absint( $_POST[ 'form_id' ] );
 
 // Send an error if for some reason we can't find the $form_id
 $submission_handler->handle_empty_form_id( $form_id );
@@ -20,7 +20,7 @@ 
 $submission_handler->set_form_id( $form_id ); 
 
 // Check our nonce
-$submission_handler->handle_nonce( $_POST['ajax_security_nonce'], 'yikes_mc_form_submission_security_nonce' );
+$submission_handler->handle_nonce( $_POST[ 'ajax_security_nonce' ], 'yikes_mc_form_submission_security_nonce' );
 
 // Get the form data
 $interface = yikes_easy_mailchimp_extender_get_form_interface();
@@ -30,10 +30,10 @@ 
 $submission_handler->handle_empty_form( $form_data ); 
 
 // Set up some variables from the form data -- these are required
-$list_id             = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null;
-$submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null;
-$optin_settings      = isset( $form_data['optin_settings'] ) ? $form_data['optin_settings'] : null;
-$form_fields         = isset( $form_data['fields'] ) ? $form_data['fields'] : null;
+$list_id             = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null;
+$submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null;
+$optin_settings      = isset( $form_data[ 'optin_settings' ] ) ? $form_data[ 'optin_settings' ] : null;
+$form_fields         = isset( $form_data[ 'fields' ] ) ? $form_data[ 'fields' ] : null;
 
 // Send an error if for some reason we can't find the required form data
 $submission_handler->handle_empty_fields_generic( array( $list_id, $submission_settings, $optin_settings, $form_fields ) );
@@ -47,14 +47,14 @@ 
 $submission_handler->check_for_required_interest_groups( $data, $form_fields );
 
 // Set up some variables from the form data -- these are not required
-$error_messages      = isset( $form_data['error_messages'] ) ? $form_data['error_messages'] : array();
-$notifications       = isset( $form_data['custom_notifications'] ) ? $form_data['custom_notifications'] : array();
+$error_messages      = isset( $form_data[ 'error_messages' ] ) ? $form_data[ 'error_messages' ] : array();
+$notifications       = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array();
 
 // Set the error messages in our class
 $submission_handler->set_error_messages( $error_messages );
 
 // Some other variables we'll need.
-$page_data       = isset( $_POST['page_data'] ) ? $_POST['page_data'] : '';
+$page_data       = isset( $_POST[ 'page_data' ] ) ? $_POST[ 'page_data' ] : '';
 $merge_variables = array();
 $error           = 0;
 $list_handler    = yikes_get_mc_api_manager()->get_list_handler();
@@ -62,13 +62,13 @@ 
 // As of 6.4 we no longer pass the post object, only the ID.
 // For any users relying on the $post object for their `yikes-mailchimp-redirect-url` filter we'll grab the post object here.
 // Eventually we should just pass the $post_id into the filter instead of the whole object.
-$page_data       = ! empty( $page_data ) ? get_post( $page_data ) : '';
+$page_data = ! empty( $page_data ) ? get_post( $page_data ) : '';
 
 // Send an error if for some reason we can't find the list_handler
 $submission_handler->handle_empty_list_handler( $list_handler ); 
 
 // Get, sanitize and lowercasify the email
-$submitted_email = isset( $data['EMAIL'] ) ? $data['EMAIL'] : '';
+$submitted_email = isset( $data[ 'EMAIL' ] ) ? $data[ 'EMAIL' ] : '';
 $sanitized_email = $submission_handler->get_sanitized_email( $submitted_email ); 
 $submission_handler->set_email( $sanitized_email );
 
@@ -76,14 +76,14 @@ 
 $submission_handler->handle_empty_email( $sanitized_email );
 
 // Check for Honeypot filled
-$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && '' !== $data['yikes-mailchimp-honeypot'] ) ? true : false;
+$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && '' !== $data[ 'yikes-mailchimp-honeypot' ] ) ? true : false;
 
 // Send an error if honey pot is not empty
 $submission_handler->handle_non_empty_honeypot( $honey_pot_filled ); 
 
 // Check if reCAPTCHA Response was submitted with the form data, and handle it if needed
-if ( isset( $data['g-recaptcha-response'] ) ) {
-	$recaptcha_response = $data['g-recaptcha-response'];
+if ( isset( $data[ 'g-recaptcha-response' ] ) ) {
+	$recaptcha_response = $data[ 'g-recaptcha-response' ];
 	$submission_handler->handle_recaptcha( $recaptcha_response );
 }
 
@@ -91,7 +91,7 @@ 
 $merge_variables = $submission_handler->get_submitted_merge_values( $data, $form_fields );
 
 // Submission Setting: Replace interest groups or update interest groups
-$replace_interests = isset( $submission_settings['replace_interests'] ) ? (bool) $submission_settings['replace_interests'] : true;
+$replace_interests = isset( $submission_settings[ 'replace_interests' ] ) ? (bool) $submission_settings[ 'replace_interests' ] : true;
 
 // Get the default groups
 $groups = $submission_handler->get_default_interest_groups( $replace_interests, $list_handler );
@@ -106,15 +106,15 @@ 
  *
  * @param $merge_variables array Array of merge variable to use
  */
-do_action( 'yikes-mailchimp-before-submission',            $merge_variables );
+do_action( 'yikes-mailchimp-before-submission', $merge_variables );
 do_action( "yikes-mailchimp-before-submission-{$form_id}", $merge_variables );
 
 // Allow users to check for form values (using the `yikes-mailchimp-filter-before-submission` filter hook in function `get_submitted_merge_values`) 
 // and pass back an error and message to the user
 // If error is set and no message, default to our class variable's default error message
-if ( isset( $merge_variables['error'] ) ) {
-	$merge_error_message = isset( $merge_variables['message'] ) ? $merge_variables['message'] : $submission_handler->default_error_response_message;
-	$submission_handler->handle_merge_variables_error( $merge_variables['error'], $merge_error_message );
+if ( isset( $merge_variables[ 'error' ] ) ) {
+	$merge_error_message = isset( $merge_variables[ 'message' ] ) ? $merge_variables[ 'message' ] : $submission_handler->default_error_response_message;
+	$submission_handler->handle_merge_variables_error( $merge_variables[ 'error' ], $merge_error_message );
 }
 
 // This is the array we're going to pass through to the Mailchimp API
@@ -126,7 +126,7 @@ 
 
 // Only add groups if they exist
 if ( ! empty( $groups ) ) {
-	$member_data['interests'] = $groups;
+	$member_data[ 'interests' ] = $groups;
 }
 
 // Check if this member already exists
@@ -136,7 +136,7 @@ 
 // Likewise, if this member exists but their status is 'pending' it means we're dealing with a double opt-in list and they never confirmed
 // Or, if this member but their status is 'unsubscribed' it means we're dealing with someone who unsubscribed and they need to re-subscribe
 // Continue as if they're a new member to force another double opt-in email
-$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists['status'] ) && ( $member_exists['status'] === 'pending' || $member_exists['status'] === 'unsubscribed' );
+$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && ( $member_exists[ 'status' ] === 'pending' || $member_exists[ 'status' ] === 'unsubscribed' );
 
 if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) {
 
@@ -144,23 +144,23 @@ 
 
 	// Check the opt-in value - is it double or single?
 	// Double opt-in means 'status_if_new' => 'pending'
-	$double_optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0;
+	$double_optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0;
 
 	// If the user was unsubscribed and is re-subscribing, we set the status to 'pending', which
 	// causes Mailchimp to send them a confirmation email.  This is the only way Mailchimp will
 	// allow us to re-subscribe the user.
-	$was_unsubscribed = is_array( $member_exists ) && isset( $member_exists['status'] ) && $member_exists['status'] === 'unsubscribed';
+	$was_unsubscribed = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && $member_exists[ 'status' ] === 'unsubscribed';
 
 	if ( $double_optin === 1 || $was_unsubscribed === true ) {
 
 		// Double opt-in
-		$member_data['status_if_new'] = 'pending';
-		$member_data['status']        = 'pending';
+		$member_data[ 'status_if_new' ] = 'pending';
+		$member_data[ 'status' ]        = 'pending';
 	} else {
 
 		// Single opt-in
-		$member_data['status_if_new'] = 'subscribed';
-		$member_data['status']        = 'subscribed';
+		$member_data[ 'status_if_new' ] = 'subscribed';
+		$member_data[ 'status' ]        = 'subscribed';
 	}
 	
 } else {
@@ -169,10 +169,10 @@ 
 
 	// But first let's set our flag, and set the Mailchimp status flag
 	$new_subscriber = false;
-	$member_data['status'] = 'subscribed';
+	$member_data[ 'status' ] = 'subscribed';
 
 	// Check our update_existing_user optin setting
-	$update_existing_user = ( $optin_settings['update_existing_user'] === '1' ) ? true : false;
+	$update_existing_user = ( $optin_settings[ 'update_existing_user' ] === '1' ) ? true : false;
 
 	// If update_existing_user is false (not allowed) then simply fail and return a response message
 	if ( $update_existing_user === false ) {
@@ -180,7 +180,7 @@ 
 	}
 
 	// If update_existing_user is true, we need to check our 'send_update_email' option
-	$send_update_email = ( $optin_settings['send_update_email'] === '1' ) ? true : false;
+	$send_update_email = ( $optin_settings[ 'send_update_email' ] === '1' ) ? true : false;
 
 	// If $send_update_email is true (we send the email) then we need to fire off the 'send update email' logic
 	if ( $send_update_email === true ) {

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;

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

Spacing +22 added lines, -22 removed lines

@@ -57,9 +57,9 @@ 
 		new YIKES_Inc_Easy_Mailchimp_Public_Ajax();
 
 		// Include our error logging class
-		add_action( 'init' , array( $this , 'load_error_logging_class' ) , 1 );
+		add_action( 'init', array( $this, 'load_error_logging_class' ), 1 );
 		// load our checkbox classes
-		add_action( 'init' , array( $this , 'load_checkbox_integration_classes' ) , 1 );
+		add_action( 'init', array( $this, 'load_checkbox_integration_classes' ), 1 );
 		// custom front end filter
 		add_action( 'init', array( $this, 'yikes_custom_frontend_content_filter' ) );
 		// Process non-ajax forms in the header
@@ -94,15 +94,15 @@ 
 	**/
 	public function load_checkbox_integration_classes() {
 		// store our options
-		$integrations = get_option( 'optin-checkbox-init' , array() );
-		if( ! empty( $integrations ) && is_array( $integrations ) ) {
+		$integrations = get_option( 'optin-checkbox-init', array() );
+		if ( ! empty( $integrations ) && is_array( $integrations ) ) {
 			// load our mail integrations class
 			require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations.php';
 			// loop over selected classes and load them up!
-			foreach( $integrations as $integration => $value ) {
-				if( isset( $value['value'] ) && $value['value'] == 'on' ) {
+			foreach ( $integrations as $integration => $value ) {
+				if ( isset( $value[ 'value' ] ) && $value[ 'value' ] == 'on' ) {
 					// load our class extensions
-					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.'.$integration.'-checkbox.php';
+					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.' . $integration . '-checkbox.php';
 				}
 			}
 		}
@@ -116,7 +116,7 @@ 
 	 * @since 6.0.0
 	 */
 	public function load_error_logging_class() {
-		if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 			// if error logging is enabled we should include our error logging class
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging;
@@ -129,19 +129,19 @@ 
 	*	@since 6.0.3.4
 	*/
 	public function yikes_process_non_ajax_forms( $form_submitted ) {
-		global $wpdb,$post;
-		$form_id = ( ! empty( $_POST['yikes-mailchimp-submitted-form'] ) ) ? (int) $_POST['yikes-mailchimp-submitted-form'] : false; // store form id
-		if( $form_id ) {
+		global $wpdb, $post;
+		$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? (int) $_POST[ 'yikes-mailchimp-submitted-form' ] : false; // store form id
+		if ( $form_id ) {
 			$form_settings = self::yikes_retrieve_form_settings( $form_id );
-			if( isset( $_POST ) && !empty( $_POST ) && isset( $form_id ) && $form_settings['submission_settings']['ajax'] == 0 ) {
-				if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) { // ensure we only process the form that was submitted
+			if ( isset( $_POST ) && ! empty( $_POST ) && isset( $form_id ) && $form_settings[ 'submission_settings' ][ 'ajax' ] == 0 ) {
+				if ( $_POST[ 'yikes-mailchimp-submitted-form' ] == $form_id ) { // ensure we only process the form that was submitted
 
 					// Lets include our form processing file
 					include_once( YIKES_MC_PATH . 'public/partials/shortcodes/process/process_form_submission.php' );
-					if( $form_settings['submission_settings']['redirect_on_submission'] == '1' ) {
-						if( $form_submitted == 1 ) {
+					if ( $form_settings[ 'submission_settings' ][ 'redirect_on_submission' ] == '1' ) {
+						if ( $form_submitted == 1 ) {
 							// decode our settings
-							$redirect_page = ( 'custom_url' != $form_settings['submission_settings']['redirect_page'] ) ? get_permalink( (int) $form_settings['submission_settings']['redirect_page'] ) : $form_settings['submission_settings']['custom_redirect_url'];
+							$redirect_page = ( 'custom_url' != $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) ? get_permalink( (int) $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) : $form_settings[ 'submission_settings' ][ 'custom_redirect_url' ];
 							wp_redirect( apply_filters( 'yikes-mailchimp-redirect-url', esc_url( $redirect_page ), $form_id, $post ) );
 							exit;
 						}
@@ -169,7 +169,7 @@ 
 	 */
 	public static function yikes_retrieve_form_settings( $form_id ) {
 		// if no form id, abort
-		if( ! $form_id ) {
+		if ( ! $form_id ) {
 			return array();
 		}
 
@@ -198,13 +198,13 @@ 
 			return;
 		}
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['update-link'] ) && ! empty( $form_settings['error_messages']['update-link'] ) ) {
-			$response_text = $form_settings['error_messages']['update-link'];
+		if ( isset( $form_settings[ 'error_messages' ][ 'update-link' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'update-link' ] ) ) {
+			$response_text = $form_settings[ 'error_messages' ][ 'update-link' ];
 			// extract the link text
 			preg_match( '/\[link].*?\[\/link\]/', $response_text, $link_text );
 			if ( $link_text && ! empty( $link_text ) ) {
 				// Extract the custom link text ([link]*[/link])
-				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[0], $link ) ) );
+				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[ 0 ], $link ) ) );
 				// Replace the link text, with our custom link text
 				$response_text = str_replace( $link_text, $custom_link_text, $response_text );
 			}
@@ -233,8 +233,8 @@ 
 		}
 
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['already-subscribed'] ) && ! empty( $form_settings['error_messages']['already-subscribed'] ) ) {
-			$response_text = str_replace( '[email]', $email, $form_settings['error_messages']['already-subscribed'] );
+		if ( isset( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) ) {
+			$response_text = str_replace( '[email]', $email, $form_settings[ 'error_messages' ][ 'already-subscribed' ] );
 		}
 		// Return our new string
 		return $response_text;