yikesinc / 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/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;