yikesinc / yikes-inc-easy-mailchimp-extender

public/partials/shortcodes/process/process_form_submission.php

Spacing +75 added lines, -75 removed lines

@@ -8,45 +8,45 @@ 
 global $form_submitted, $process_submission_response;
 
 // confirm we have a form id to work with
-$form_id = ( ! empty( $_POST['yikes-mailchimp-submitted-form'] ) ) ? $_POST['yikes-mailchimp-submitted-form'] : false;
-if( ! $form_id ) {
+$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? $_POST[ 'yikes-mailchimp-submitted-form' ] : false;
+if ( ! $form_id ) {
 	return;
 }
 
-$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $_POST['yikes-mailchimp-submitted-form'] );
+$form_settings = Yikes_Inc_Easy_Mailchimp_Extender_Public::yikes_retrieve_form_settings( $_POST[ 'yikes-mailchimp-submitted-form' ] );
 
 // Process our form submissions (non ajax forms)
-if ( ! isset( $_POST['yikes_easy_mc_new_subscriber'] ) || ! wp_verify_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) ) {
+if ( ! isset( $_POST[ 'yikes_easy_mc_new_subscriber' ] ) || ! wp_verify_nonce( $_POST[ 'yikes_easy_mc_new_subscriber' ], 'yikes_easy_mc_form_submit' ) ) {
 
-    $process_submission_response = '<p><small class="form_submission_error">' . __( "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' ) . '</small></p>';
+    $process_submission_response = '<p><small class="form_submission_error">' . __( "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' ) . '</small></p>';
 	return;
 
 } else {
 
 	/* Check for Honeypot filled */
-	$honey_pot_filled = ( isset( $_POST['yikes-mailchimp-honeypot'] ) && $_POST['yikes-mailchimp-honeypot'] != '' ) ? true : false;
+	$honey_pot_filled = ( isset( $_POST[ 'yikes-mailchimp-honeypot' ] ) && $_POST[ 'yikes-mailchimp-honeypot' ] != '' ) ? true : false;
 	// if it was filled out, return an error...
 	if ( $honey_pot_filled ) {
-		$process_submission_response = '<p><small class="form_submission_error">' . __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted." , 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
+		$process_submission_response = '<p><small class="form_submission_error">' . __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted.", 'yikes-inc-easy-mailchimp-extender' ) . '</small></p>';
 		return;
 	}
 
 	// Check reCAPTCHA Response
-	if( isset( $_POST['g-recaptcha-response'] ) ) {
-		$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key' , '' ) . '&response=' . $_POST['g-recaptcha-response'] . '&remoteip=' . $_SERVER["REMOTE_ADDR"] );
+	if ( isset( $_POST[ 'g-recaptcha-response' ] ) ) {
+		$url = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key', '' ) . '&response=' . $_POST[ 'g-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 );
 
 		// if we've hit an error, lets return the error!
-		if( $response_body['success'] != 1 ) {
+		if ( $response_body[ 'success' ] != 1 ) {
 			$recaptcha_error = array(); // empty array to store error messages
-			foreach( $response_body['error-codes'] as $error_code ) {
-				if( $error_code == 'missing-input-response' ) {
+			foreach ( $response_body[ 'error-codes' ] as $error_code ) {
+				if ( $error_code == 'missing-input-response' ) {
 					$error_code = __( 'Please check the reCAPTCHA field.', 'yikes-inc-easy-mailchimp-extender' );
 				}
-				$recaptcha_error[] = $error_code;
+				$recaptcha_error[ ] = $error_code;
 			}
-			$process_submission_response .= "<p class='yikes-easy-mc-error-message'>" . apply_filters( 'yikes-mailchimp-recaptcha-required-error', __( 'Error' , 'yikes-inc-easy-mailchimp-extender' )  . ': ' . implode( ' ' , $recaptcha_error ) ) . "</p>";
+			$process_submission_response .= "<p class='yikes-easy-mc-error-message'>" . apply_filters( 'yikes-mailchimp-recaptcha-required-error', __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . implode( ' ', $recaptcha_error ) ) . "</p>";
 			return;
 		}
 	}
@@ -56,20 +56,20 @@ 
 	*	No HTML5 validation, and don't want to use jQuery for non-ajax forms
 	*/
 	$missing_required_checkbox_interest_groups = array();
-	foreach( $form_settings['fields'] as $merge_tag => $field_data ) {
-		if( is_numeric( $merge_tag ) ) {
+	foreach ( $form_settings[ 'fields' ] as $merge_tag => $field_data ) {
+		if ( is_numeric( $merge_tag ) ) {
 			// check if the checkbox group was set to required, if so return an error
-			if( isset( $field_data['require'] ) && $field_data['require'] == 1 ) {
-				if( $field_data['type'] == 'checkboxes' ) {
-					if( ! isset( $_POST[$merge_tag] ) ) {
-						$missing_required_checkbox_interest_groups[] = $merge_tag;
+			if ( isset( $field_data[ 'require' ] ) && $field_data[ 'require' ] == 1 ) {
+				if ( $field_data[ 'type' ] == 'checkboxes' ) {
+					if ( ! isset( $_POST[ $merge_tag ] ) ) {
+						$missing_required_checkbox_interest_groups[ ] = $merge_tag;
 					}
 				}
 			}
 		}
 	}
 
-	if( ! empty( $missing_required_checkbox_interest_groups ) ) {
+	if ( ! empty( $missing_required_checkbox_interest_groups ) ) {
 		$process_submission_response = '<p class="yikes-easy-mc-error-message">' . apply_filters( 'yikes-mailchimp-interest-group-required-top-error', sprintf( _n( 'It looks like you forgot to fill in a required field.', 'It looks like you forgot to fill in %s required fields.', count( $missing_required_checkbox_interest_groups ), 'yikes-inc-easy-mailchimp-extender' ), count( $missing_required_checkbox_interest_groups ) ), count( $missing_required_checkbox_interest_groups ), $form_id ) . '</p>';
 		return;
 	}
@@ -79,12 +79,12 @@ 
 
 	// loop to push variables to our array
 	foreach ( $_POST as $merge_tag => $value ) {
-		if( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
+		if ( $merge_tag != 'yikes_easy_mc_new_subscriber' && $merge_tag != '_wp_http_referer' ) {
 			// check if the current iteration has a 'date_format' key set
 			// (aka - date/birthday fields)
-			if( isset( $form_settings['fields'][$merge_tag]['date_format'] ) ) {
+			if ( isset( $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] ) ) {
 				// check if EU date format
-				if( $form_settings['fields'][$merge_tag]['date_format'] == 'DD/MM/YYYY' ) {
+				if ( $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] == 'DD/MM/YYYY' ) {
 					// convert '/' to '.' and to UNIX timestamp
 					$value = ( '' != $value ) ? date( 'Y-m-d', strtotime( str_replace( '/', '.', $value ) ) ) : '';
 				} else {
@@ -92,23 +92,23 @@ 
 					$value = ( '' != $value ) ? date( 'Y-m-d', strtotime( $value ) ) : '';
 				}
 			}
-			if( is_numeric( $merge_tag ) ) { // this is is an interest group!
-				$merge_variables['groupings'][] = array( 'id' => $merge_tag , 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
+			if ( is_numeric( $merge_tag ) ) { // this is is an interest group!
+				$merge_variables[ 'groupings' ][ ] = array( 'id' => $merge_tag, 'groups' => ( is_array( $value ) ) ? $value : array( $value ) );
 			} else { // or else it's just a standard merge variable
-				$merge_variables[$merge_tag] = $value;
+				$merge_variables[ $merge_tag ] = $value;
 			}
 		}
 	}
 
 	// store the opt-in time
-	$merge_variables['optin_time'] = current_time( 'Y-m-d H:i:s', 1 );
+	$merge_variables[ 'optin_time' ] = current_time( 'Y-m-d H:i:s', 1 );
 
 	// Submit our form data
-	$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+	$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 	$dash_position = strpos( $api_key, '-' );
 
 	// setup the end point
-	if( $dash_position !== false ) {
+	if ( $dash_position !== false ) {
 		$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/subscribe.json';
 	}
 
@@ -136,8 +136,8 @@ 
 	*	Allow users to check for submit value
 	*	and pass back an error to the user
 	*/
-	if( isset( $merge_variables['error'] ) ) {
-		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content' , $merge_variables['message'] );
+	if ( isset( $merge_variables[ 'error' ] ) ) {
+		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content', $merge_variables[ 'message' ] );
 		return;
 	}
 
@@ -146,14 +146,14 @@ 
 		$subscribe_response = wp_remote_post( $api_endpoint, array(
 			'body' => apply_filters( 'yikes-mailchimp-user-subscribe-api-request', array(
 				'apikey' => $api_key,
-				'id' => $_POST['yikes-mailchimp-associated-list-id'],
-				'email' => array( 'email' => sanitize_email( $_POST['EMAIL'] ) ),
+				'id' => $_POST[ 'yikes-mailchimp-associated-list-id' ],
+				'email' => array( 'email' => sanitize_email( $_POST[ 'EMAIL' ] ) ),
 				'merge_vars' => $merge_variables,
-				'double_optin' => $form_settings['optin_settings']['optin'],
+				'double_optin' => $form_settings[ 'optin_settings' ][ 'optin' ],
 				'update_existing' => 0, // always set to 0 (when 0, users cannot update. when 1, users can click a link to send an email where they can then update their details)
-				'send_welcome' => $form_settings['optin_settings']['send_welcome_email'],
-				'replace_interests' => ( isset( $form_settings['submission_settings']['replace_interests'] ) ) ? $form_settings['submission_settings']['replace_interests'] : 1, // defaults to replace
-			), $form_id, $_POST['yikes-mailchimp-associated-list-id'], $_POST['EMAIL'] ),
+				'send_welcome' => $form_settings[ 'optin_settings' ][ 'send_welcome_email' ],
+				'replace_interests' => ( isset( $form_settings[ 'submission_settings' ][ 'replace_interests' ] ) ) ? $form_settings[ 'submission_settings' ][ 'replace_interests' ] : 1, // defaults to replace
+			), $form_id, $_POST[ 'yikes-mailchimp-associated-list-id' ], $_POST[ 'EMAIL' ] ),
 			'timeout' => 10,
 			'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 		) );
@@ -161,66 +161,66 @@ 
 		$subscribe_response = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
 
 		// check for any errors
-		if( isset( $subscribe_response['error'] ) ) {
+		if ( isset( $subscribe_response[ 'error' ] ) ) {
 
-			if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 				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();
-				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response['error'], __( "Subscribe New User" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
+				$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response[ 'error' ], __( "Subscribe New User", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
 			}
 
 			$update_account_details_link = '';
-			switch( $subscribe_response['code'] ) {
+			switch ( $subscribe_response[ 'code' ] ) {
 				// user already subscribed
 				case '214':
-					$update_account_details_link = ( $form_settings['optin_settings']['update_existing_user'] == 1 ) ? apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $_POST['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), '<a class="send-update-email" data-list-id="' . $_POST['yikes-mailchimp-associated-list-id'] . '" data-user-email="' . sanitize_email( $_POST['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ) : false;
-					if( $update_account_details_link ) {
+					$update_account_details_link = ( $form_settings[ 'optin_settings' ][ 'update_existing_user' ] == 1 ) ? apply_filters( 'yikes-easy-mailchimp-update-existing-subscriber-text', sprintf( __( ' To update your MailChimp profile, please %s.', 'yikes-inc-easy-mailchimp-extender' ), '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $_POST[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ), '<a class="send-update-email" data-list-id="' . $_POST[ 'yikes-mailchimp-associated-list-id' ] . '" data-user-email="' . sanitize_email( $_POST[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ) : false;
+					if ( $update_account_details_link ) {
 						// if update account details is set, we need to include our script to send out the update email
-						wp_enqueue_script( 'update-existing-subscriber.js', YIKES_MC_URL . 'public/js/yikes-update-existing-subscriber.js' , array( 'jquery' ), 'all' );
+						wp_enqueue_script( 'update-existing-subscriber.js', YIKES_MC_URL . 'public/js/yikes-update-existing-subscriber.js', array( 'jquery' ), 'all' );
 						wp_localize_script( 'update-existing-subscriber.js', 'update_subscriber_details_data', array(
 							'ajax_url' => esc_url( admin_url( 'admin-ajax.php' ) ),
 							'preloader_url' => apply_filters( 'yikes-mailchimp-preloader', esc_url_raw( admin_url( 'images/wpspin_light.gif' ) ) ),
 						) );
 					}
-					if( ! empty( $form_settings['error_messages']['already-subscribed'] ) ) {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['already-subscribed'] . ' ' . $update_account_details_link . '</p>';
+					if ( ! empty( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) ) {
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'already-subscribed' ] . ' ' . $update_account_details_link . '</p>';
 					} else {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response['error'] . ' ' . $update_account_details_link . '</p>';
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response[ 'error' ] . ' ' . $update_account_details_link . '</p>';
 					}
 					break;
 				// missing a required field
 				case '250':
 						// get all merge variables in array, loop and str_replace error code with field name
-						$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+						$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 						$dash_position = strpos( $api_key, '-' );
-						if( $dash_position !== false ) {
+						if ( $dash_position !== false ) {
 							$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/merge-vars.json';
 						}
 						$merge_variables = wp_remote_post( $api_endpoint, array(
 							'body' => array(
 								'apikey' => $api_key,
-								'id' => array( $_POST['yikes-mailchimp-associated-list-id'] ) ,
+								'id' => array( $_POST[ 'yikes-mailchimp-associated-list-id' ] ),
 							),
 							'timeout' => 10,
 							'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 						) );
 						$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-						if( isset( $merge_variables['error'] ) ) {
-							if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+						if ( isset( $merge_variables[ 'error' ] ) ) {
+							if ( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 								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();
-								$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables['error'], __( "Get Merge Variables" , 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
+								$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission.php" );
 							}
 						}
 						// re-store our data
-						$merge_variables = $merge_variables['data'][0]['merge_vars'];
+						$merge_variables = $merge_variables[ 'data' ][ 0 ][ 'merge_vars' ];
 						$merge_variable_name_array = array();
-						foreach( $merge_variables as $merge_var ) {
-							$merge_variables_name_array[$merge_var['tag']] = $merge_var['name'];
+						foreach ( $merge_variables as $merge_var ) {
+							$merge_variables_name_array[ $merge_var[ 'tag' ] ] = $merge_var[ 'name' ];
 						}
-						$error_message = $subscribe_response['error'];
+						$error_message = $subscribe_response[ 'error' ];
 						// replace tag with name in the error message.
-						foreach( $merge_variables_name_array as $tag => $name ) {
+						foreach ( $merge_variables_name_array as $tag => $name ) {
 							$error_message = str_replace( $tag, $name, $error_message );
 						}
 						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $error_message . '.</p>';
@@ -228,18 +228,18 @@ 
 				// test@email.com is not allowed
 				case '-99':
 					// generic error
-					$process_submission_response = '<p class="yikes-easy-mc-error-message">' .  str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response['error'] ) ) . '</p>';
+					$process_submission_response = '<p class="yikes-easy-mc-error-message">' . str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response[ 'error' ] ) ) . '</p>';
 					break;
 				// invalid email (or no email at all)
 				case '-100':
-					$process_submission_response = ( ! empty( $form_settings['error_messages']['invalid-email'] ) ) ? '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['invalid-email'] . '</p>' : '<p class="yikes-easy-mc-error-message">' . __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
+					$process_submission_response = ( ! empty( $form_settings[ 'error_messages' ][ 'invalid-email' ] ) ) ? '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'invalid-email' ] . '</p>' : '<p class="yikes-easy-mc-error-message">' . __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' ) . '</p>';
 					break;
 				default:
 					// generic error
-					if( ! empty( $form_settings['error_messages']['general-error'] ) ) {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings['error_messages']['general-error'] . '</p>';
+					if ( ! empty( $form_settings[ 'error_messages' ][ 'general-error' ] ) ) {
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $form_settings[ 'error_messages' ][ 'general-error' ] . '</p>';
 					} else {
-						$process_submission_response = '<p class="yikes-easy-mc-error-message">' .  $subscribe_response['error'] . '</p>';
+						$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $subscribe_response[ 'error' ] . '</p>';
 					}
 					break;
 			}
@@ -250,11 +250,11 @@ 
 		$form_submitted = 1;
 
 		// Display the success message
-		if( ! empty( $form_settings['error_messages']['success'] ) ) {
-			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', stripslashes( esc_html( $form_settings['error_messages']['success'] ) ), $form_id, $merge_variables ) . '</p>';
+		if ( ! empty( $form_settings[ 'error_messages' ][ 'success' ] ) ) {
+			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', stripslashes( esc_html( $form_settings[ 'error_messages' ][ 'success' ] ) ), $form_id, $merge_variables ) . '</p>';
 			// echo stripslashes( esc_html( $error_messages['success'] ) );
 		} else {
-			$default_success_response = ( 1 === $form_settings['optin_settings']['optin'] ) ? __( 'Thank you for subscribing! Check your email for the confirmation message.' , 'yikes-inc-easy-mailchimp-extender' ) : __( 'Thank you for subscribing!' , 'yikes-inc-easy-mailchimp-extender' );
+			$default_success_response = ( 1 === $form_settings[ 'optin_settings' ][ 'optin' ] ) ? __( 'Thank you for subscribing! Check your email for the confirmation message.', 'yikes-inc-easy-mailchimp-extender' ) : __( 'Thank you for subscribing!', 'yikes-inc-easy-mailchimp-extender' );
 			$process_submission_response = '<p class="yikes-easy-mc-success-message">' . apply_filters( 'yikes-mailchimp-success-response', $default_success_response, $form_id, $merge_variables ) . '</p>';
 			// echo $default_success_response;
 		}
@@ -267,8 +267,8 @@ 
 		* 	optional @form - the ID of the form to filter
 		*	@since 6.0.0
 		*/
-		do_action( 'yikes-mailchimp-after-submission' , $merge_variables );
-		do_action( 'yikes-mailchimp-after-submission-' . $form_id , $merge_variables );
+		do_action( 'yikes-mailchimp-after-submission', $merge_variables );
+		do_action( 'yikes-mailchimp-after-submission-' . $form_id, $merge_variables );
 
 		/*
 		*	Non-AJAX redirects now handled in class-yikes-inc-easy-mailchimp-extender-public.php
@@ -286,23 +286,23 @@ 
 		*	@$notifications - the notification array
 		*	@since 6.0.0
 		*/
-		do_action( 'yikes-mailchimp-form-submission' , $_POST['EMAIL'] , $merge_variables , $form_id , $form_settings['notifications'] );
-		do_action( 'yikes-mailchimp-form-submission-' . $form_id , $_POST['EMAIL'] , $merge_variables , $form_id , $form_settings['notifications'] );
+		do_action( 'yikes-mailchimp-form-submission', $_POST[ 'EMAIL' ], $merge_variables, $form_id, $form_settings[ 'notifications' ] );
+		do_action( 'yikes-mailchimp-form-submission-' . $form_id, $_POST[ 'EMAIL' ], $merge_variables, $form_id, $form_settings[ 'notifications' ] );
 
 		/*
 		*	Increase the submission count for this form
 		*	on a successful submission
 		*	@since 6.0.0
 		*/
-		$form_settings['submissions']++;
+		$form_settings[ 'submissions' ]++;
 		$wpdb->update(
 			$wpdb->prefix . 'yikes_easy_mc_forms',
 			array(
-				'submissions' => $form_settings['submissions'],
+				'submissions' => $form_settings[ 'submissions' ],
 			),
 			array( 'ID' => $form_id ),
 			array(
-				'%d',	// send welcome email
+				'%d', // send welcome email
 			),
 			array( '%d' )
 		);