yikesinc / yikes-inc-easy-mailchimp-extender

public/partials/shortcodes/process/process_form_submission.php

Spacing +40 added lines, -40 removed lines

@@ -14,7 +14,7 @@ 
 $data = $_POST;
 
 // Confirm we have a form id to work with
-$form_id = ( isset( $data['yikes-mailchimp-submitted-form'] ) ) ? absint( $data['yikes-mailchimp-submitted-form'] ) : false;
+$form_id = ( isset( $data[ 'yikes-mailchimp-submitted-form' ] ) ) ? absint( $data[ 'yikes-mailchimp-submitted-form' ] ) : false;
 
 // Set the form id in our class
 $submission_handler->set_form_id( $form_id );
@@ -28,7 +28,7 @@ 
 }
 
 // Check our nonce
-if ( $submission_handler->handle_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) === false ) {
+if ( $submission_handler->handle_nonce( $_POST[ 'yikes_easy_mc_new_subscriber' ], 'yikes_easy_mc_form_submit' ) === false ) {
 	$process_submission_response = $submission_handler->wrap_form_submission_response( $submission_handler->handle_nonce_message, $is_success = false );
 	return;
 }
@@ -44,10 +44,10 @@ 
 }
 
 // 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
 if ( $submission_handler->handle_empty_fields_generic( array( $list_id, $submission_settings, $optin_settings, $form_fields ) ) === false ) {
@@ -70,8 +70,8 @@ 
 $submission_handler->set_list_id( $list_id );
 
 // 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(); // Do we need this?
+$error_messages      = isset( $form_data[ 'error_messages' ] ) ? $form_data[ 'error_messages' ] : array();
+$notifications       = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array(); // Do we need this?
 
 // Set the error messages in our class
 $submission_handler->set_error_messages( $error_messages );
@@ -87,7 +87,7 @@ 
 }
 
 // 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 );
 
@@ -98,7 +98,7 @@ 
 }
 
 // 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
 if ( $submission_handler->handle_non_empty_honeypot( $honey_pot_filled ) === false ) {
@@ -107,11 +107,11 @@ 
 }
 
 // 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' ];
 	$recaptcha_handle = $submission_handler->handle_recaptcha( $recaptcha_response );
-	if ( isset( $recaptcha_handle['success'] ) && $recaptcha_handle['success'] === false ) {
-		$process_submission_response = $submission_handler->wrap_form_submission_response( $recaptcha_handle['message'], $is_success = false );
+	if ( isset( $recaptcha_handle[ 'success' ] ) && $recaptcha_handle[ 'success' ] === false ) {
+		$process_submission_response = $submission_handler->wrap_form_submission_response( $recaptcha_handle[ 'message' ], $is_success = false );
 		return;
 	}
 }
@@ -120,7 +120,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 );
@@ -135,17 +135,17 @@ 
  *
  * @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;
-	$merge_vars_error_array = $submission_handler->handle_merge_variables_error( $merge_variables['error'], $merge_error_message );
-	if ( $merge_vars_error_array['success'] === false ) {
-		$process_submission_response = $submission_handler->wrap_form_submission_response( $merge_vars_error_array['message'], $is_success = false );
+if ( isset( $merge_variables[ 'error' ] ) ) {
+	$merge_error_message = isset( $merge_variables[ 'message' ] ) ? $merge_variables[ 'message' ] : $submission_handler->default_error_response_message;
+	$merge_vars_error_array = $submission_handler->handle_merge_variables_error( $merge_variables[ 'error' ], $merge_error_message );
+	if ( $merge_vars_error_array[ 'success' ] === false ) {
+		$process_submission_response = $submission_handler->wrap_form_submission_response( $merge_vars_error_array[ 'message' ], $is_success = false );
 		return;
 	}
 }
@@ -159,7 +159,7 @@ 
 
 // Only add groups if they exist
 if ( ! empty( $groups ) ) {
-	$member_data['interests'] = $groups;
+	$member_data[ 'interests' ] = $groups;
 }
 
 // Check if this member already exists
@@ -169,30 +169,30 @@ 
 // 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 ) {
 	$new_subscriber = true;
 
 	// 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 {
@@ -201,28 +201,28 @@ 
 
 	// 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 ) {
 		$disallow_update_array = $submission_handler->handle_disallowed_existing_user_update();
-		if ( $disallow_update_array['success'] === false ) {
-			$process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array['message'], $is_success = false );
+		if ( $disallow_update_array[ 'success' ] === false ) {
+			$process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array[ 'message' ], $is_success = false );
 			return;
 		}
 	}
 
 	// 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 ) {
 		$update_existing_user_array = $submission_handler->handle_updating_existing_user();
-		if ( $update_existing_user_array['success'] === false ) {
-			$process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array['message'], $is_success = false );
+		if ( $update_existing_user_array[ 'success' ] === false ) {
+			$process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array[ 'message' ], $is_success = false );
 			return;
 		}
 	}
@@ -258,9 +258,9 @@ 
 }
 
 // Handle errors in the response
-if ( isset( $success_array ) && isset( $success_array['success'] ) && $success_array['success'] === false ) {
-	$process_submission_response = isset( $success_array['message'] ) ? $success_array['message'] : '';
-	$process_submission_response = $submission_handler->wrap_form_submission_response( $success_array['message'], $is_success = false );
+if ( isset( $success_array ) && isset( $success_array[ 'success' ] ) && $success_array[ 'success' ] === false ) {
+	$process_submission_response = isset( $success_array[ 'message' ] ) ? $success_array[ 'message' ] : '';
+	$process_submission_response = $submission_handler->wrap_form_submission_response( $success_array[ 'message' ], $is_success = false );
 	return;
 }
 
@@ -270,7 +270,7 @@ 
 // For non-AJAX submissions, if we have a new subscriber we need to increment our submissions count by 1
 // For AJAX, this is an AJAX call that gets fired off after form submission
 if ( $new_subscriber === true ) {
-	$submissions = (int) $form_settings['submissions'] + 1;	
+	$submissions = (int) $form_settings[ 'submissions' ] + 1;	
 	$interface->update_form_field( $form_id, 'submissions', $submissions );
 }
 

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 ) {