yikesinc / yikes-inc-easy-mailchimp-extender

public/classes/checkbox-integrations.php

Braces +27 added lines, -27 removed lines

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

  * Main Checkbox Integration class.

  */

-class Yikes_Easy_MC_Checkbox_Integration_Class {

+class Yikes_Easy_MC_Checkbox_Integration_Class {
 

 	/**

 	 * The integration type.

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

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

 	 */

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

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

-		if ( empty( $email ) ) {

-			if ( ! is_user_logged_in() ) {

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

 			}

 

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

 

 		// Ensure we have a valid email.

-		if ( ! is_email( $email ) ) {

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

 		}

 

 		// Convert the integration type to a list ID.

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

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

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

 		}

 

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

 

 		// Go through each list...

-		foreach ( $list_ids as $list_id ) {

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

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

 			}

 		}

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

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

 	 */

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

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

 

 		// Check the API to see the status.

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

-		if ( is_wp_error( $response ) ) {

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

 

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

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

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

-			} else {

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

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

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

 	 * @return string The HTML for the checkbox.

 	 */

-	public function yikes_get_checkbox() {

+	public function yikes_get_checkbox() {
 

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

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

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

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

 

-		if ( $has_list_ids ) {

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

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

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

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

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

 	 */

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

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

 

 		// Make sure we have a list ID.

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

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

 			return;

 		}

 

 		// Check for an IP address.

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

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

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

 		}

 

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

 		);

 

-		foreach ( $list_ids as $list_id ) {

+		foreach ( $list_ids as $list_id ) {
 

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

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

 

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

-			if ( ! empty( $interests ) ) {

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

 

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

-				foreach ( $interests as $interest ) {

-					if ( is_array( $interest ) ) {

-						foreach ( $interest as $group_id ) {

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

 						}

 					}

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

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

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

-			if ( is_wp_error( $response ) ) {

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

 				$error_logging->maybe_write_to_log(

 					$response->get_error_code(),

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

 	 * @param WP_User $user A WP User.

 	 */

-	public function user_merge_vars( WP_User $user ) {

+	public function user_merge_vars( WP_User $user ) {
 

 		// Setup our array.

 		$merge_vars = array();

 		

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

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

 		}

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

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

 		}

 

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

 	 * @return bool True if the checkbox was checked.

 	 */

-	public function was_checkbox_checked( $type ) {

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

 	}

 }

public/classes/process/class.process_form_submission_handler.php

Spacing +62 added lines, -62 removed lines

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