yikesinc / yikes-inc-easy-mailchimp-extender

public/classes/checkbox-integrations/class.registration_form-checkbox.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 */
 
 // Prevent direct access to the file
-defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 class Yikes_Easy_MC_Registration_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 
@@ -20,7 +20,7 @@ 
 		add_action( 'register_form', array( $this, 'output_checkbox' ), 20 );
 		add_action( 'user_register', array( $this, 'subscribe_from_registration' ), 90, 1 );
 		// alter the error message, if there was an error with the users email address
-		add_filter( 'wp_login_errors', array( $this , 'yikes_reg_complete_msg' ), 10,  2 );
+		add_filter( 'wp_login_errors', array( $this, 'yikes_reg_complete_msg' ), 10, 2 );
 	}
 	
 	/**
@@ -51,12 +51,12 @@ 
 		// build our merge vars
 		$merge_variables = $this->user_merge_vars( $user );
 		// only subscribe the user if they aren't already on the list
-		if ( $this->is_user_already_subscribed( 'registration_form', $user->user_email )) {
-			$this->subscribe_user_integration( sanitize_email( $user->user_email ) , $this->type , $merge_variables );
+		if ( $this->is_user_already_subscribed( 'registration_form', $user->user_email ) ) {
+			$this->subscribe_user_integration( sanitize_email( $user->user_email ), $this->type, $merge_variables );
 		} else {
 			// add a temporary option to pass our email address and let the user know they are already subscribed
-			$user_already_subscirbed_message = sprintf( __( "You have not been subscribed to our mailing list. %s is already subscribed to this list.", "yikes-inc-easy-mailchimp-extender" ), $user->user_email  );
-			add_option( 'yikes_register_subscription_error' , $user_already_subscirbed_message );
+			$user_already_subscirbed_message = sprintf( __( "You have not been subscribed to our mailing list. %s is already subscribed to this list.", "yikes-inc-easy-mailchimp-extender" ), $user->user_email );
+			add_option( 'yikes_register_subscription_error', $user_already_subscirbed_message );
 		}
 	}
 	

public/classes/checkbox-integrations/class.buddypress_form-checkbox.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_BuddyPress_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 		

public/classes/checkbox-integrations/class.woocommerce_checkout_form-checkbox.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 */
 
 // Prevent direct access to the file
-defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 
 class Yikes_Easy_MC_WooCommerce_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 
@@ -32,7 +32,7 @@ 
 	 */
 	public function get_position() {
 		$opts = $this->get_options();
-		return $opts['woocommerce_position'];
+		return $opts[ 'woocommerce_position' ];
 	}
 	
 	/**
@@ -42,22 +42,22 @@ 
 	 */
 	public function add_checkout_field( $fields ) {
 		// get checkbox data
-		$checkbox_options = get_option( 'optin-checkbox-init' , '' );
+		$checkbox_options = get_option( 'optin-checkbox-init', '' );
 		// only display the field if a list is set
-		if( isset( $checkbox_options ) && $checkbox_options[$this->type]['associated-list'] != '-' ) {
-			if( $this->is_user_already_subscribed( $this->type ) ) {
+		if ( isset( $checkbox_options ) && $checkbox_options[ $this->type ][ 'associated-list' ] != '-' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) ) {
 				return $fields;
 			}
-			if( isset( $checkbox_options[$this->type]['precheck'] ) && $checkbox_options[$this->type]['precheck'] == 'true' ) {
+			if ( isset( $checkbox_options[ $this->type ][ 'precheck' ] ) && $checkbox_options[ $this->type ][ 'precheck' ] == 'true' ) {
 				$precheck = '1';
 			} else {
 				$precheck = '0';
 			}
-			$fields[ 'billing' ]['yikes_mailchimp_checkbox_'.$this->type] = array(
-				'id' => 'yikes_mailchimp_checkbox_'.$this->type,
+			$fields[ 'billing' ][ 'yikes_mailchimp_checkbox_' . $this->type ] = array(
+				'id' => 'yikes_mailchimp_checkbox_' . $this->type,
 				'type'    => 'checkbox',
 				'class' => array(),
-				'label'   => $checkbox_options[$this->type]['label'],
+				'label'   => $checkbox_options[ $this->type ][ 'label' ],
 				'default' => $precheck,
 			);
 		}
@@ -78,7 +78,7 @@ 
 	*/
 	public function subscribe_from_woocommerce_checkout( $order_id ) {
 		$do_optin = get_post_meta( $order_id, 'yikes_easy_mailchimp_optin', true );
-		if( $do_optin == '1' ) {
+		if ( $do_optin == '1' ) {
 			$order = new WC_Order( $order_id );
 			$email = $order->billing_email;
 			$merge_vars = array(
@@ -87,7 +87,7 @@ 
 				'LNAME' => $order->billing_last_name,
 			);
 			// subscribe the user
-			$this->subscribe_user_integration( sanitize_email( $email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $email ), $this->type, $merge_vars );
 		}
 		return false;
 	}

public/classes/checkbox-integrations/class.bbpress_forms-checkbox.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_bbPress_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -45,7 +45,7 @@ 
 		 */
 		public function subscribe_from_bbpress( $anonymous_data, $user_id, $trigger ) {
 			$user_data = get_userdata( $user_id );
-			return $this->subscribe_user_integration( $user_data->user_email, $this->type , array(
+			return $this->subscribe_user_integration( $user_data->user_email, $this->type, array(
 				'FNAME' => $user_data->first_name,
 				'LNAME' => $user_data->last_name,
 				'NAE' => $user_data->first_name,

public/classes/checkbox-integrations/class.comment_form-checkbox.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 	
 	class Yikes_Easy_MC_Comment_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -42,7 +42,7 @@ 
 		 *
 		 *	@since 6.0.0
 		**/
-		public function subscribe_from_comment( $comment_id , $comment_approved ) {	
+		public function subscribe_from_comment( $comment_id, $comment_approved ) {	
 			// was sign-up checkbox checked?
 			if ( $this->was_checkbox_checked( $this->type ) === false ) {
 				return false;
@@ -59,7 +59,7 @@ 
 				'OPTIN_IP' => $comment_data->comment_author_IP,
 			);
 			// subscribe the user 
-			$this->subscribe_user_integration( sanitize_email( $comment_data->comment_author_email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $comment_data->comment_author_email ), $this->type, $merge_vars );
 		}
 		
 	}

public/classes/checkbox-integrations/class.easy_digital_downloads_checkout_form-checkbox.php

Spacing +13 added lines, -13 removed lines

@@ -7,7 +7,7 @@ 
 	*/
 	
 	// Prevent direct access to the file
-	defined('ABSPATH') or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!" , 'yikes-inc-easy-mailchimp-extender' ) );
+	defined( 'ABSPATH' ) or die( __( "Whoops, you shouldn't be accessing this file directly. Abort!", 'yikes-inc-easy-mailchimp-extender' ) );
 
 	class Yikes_Easy_MC_EDD_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -21,8 +21,8 @@ 
 		 */
 		public function __construct() {
 			add_action( 'edd_purchase_form_user_info_fields', array( $this, 'output_checkbox' ) );
-			add_action( 'edd_insert_payment', array( $this, 'update_payment_post_meta' ) , 99999 );
-			add_action( 'edd_complete_purchase', array( $this, 'subscribe_from_edd_purchase'), 50 );
+			add_action( 'edd_insert_payment', array( $this, 'update_payment_post_meta' ), 99999 );
+			add_action( 'edd_complete_purchase', array( $this, 'subscribe_from_edd_purchase' ), 50 );
 		}
 		
 		
@@ -48,7 +48,7 @@ 
 		 */
 		public function update_payment_post_meta( $payment_id = 0, $payment_data = array() ) {
 			// don't save anything if the checkbox was not checked
-			if( ! $this->was_checkbox_checked( $this->type ) ) {
+			if ( ! $this->was_checkbox_checked( $this->type ) ) {
 				update_post_meta( $payment_id, '_yikes_easy_mc_optin', '0' );
 				return;
 			}
@@ -61,25 +61,25 @@ 
 		 * @return bool|string
 		 */
 		public function subscribe_from_edd_purchase( $payment_id ) {
-			$meta = get_post_meta( $payment_id , '_yikes_easy_mc_optin' , true );
-			if( $meta == '0' ) {
+			$meta = get_post_meta( $payment_id, '_yikes_easy_mc_optin', true );
+			if ( $meta == '0' ) {
 				return false;
 			}
 			$email = (string) edd_get_payment_user_email( $payment_id );
 			$merge_vars = array();
 			// add first and last name to merge vars, if given
 			$user_info = (array) edd_get_payment_meta_user_info( $payment_id );
-			if( isset( $user_info['first_name'] ) && isset( $user_info['last_name'] ) ) {
-				$merge_vars['NAME'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+			if ( isset( $user_info[ 'first_name' ] ) && isset( $user_info[ 'last_name' ] ) ) {
+				$merge_vars[ 'NAME' ] = $user_info[ 'first_name' ] . ' ' . $user_info[ 'last_name' ];
 			}
-			if( isset( $user_info['first_name'] ) ) {
-				$merge_vars['FNAME'] = $user_info['first_name'];
+			if ( isset( $user_info[ 'first_name' ] ) ) {
+				$merge_vars[ 'FNAME' ] = $user_info[ 'first_name' ];
 			}
-			if( isset( $user_info['last_name'] ) ) {
-				$merge_vars['LNAME'] = $user_info['last_name'];
+			if ( isset( $user_info[ 'last_name' ] ) ) {
+				$merge_vars[ 'LNAME' ] = $user_info[ 'last_name' ];
 			}
 			// subscribe the user
-			$this->subscribe_user_integration( sanitize_email( $email ) , $this->type , $merge_vars );
+			$this->subscribe_user_integration( sanitize_email( $email ), $this->type, $merge_vars );
 		}
 	
 	}

public/partials/ajax/class.public_ajax.php

Spacing +16 added lines, -16 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,9 +58,9 @@ 
 		@since v6.0.4.1
 	*/
 	public function sendUpdateProfileEmail() {
-		$user_email    = $_POST['user_email'];
+		$user_email    = $_POST[ 'user_email' ];
 		$user_id       = md5( $user_email );
-		$list_id       = $_POST['list_id'];
+		$list_id       = $_POST[ 'list_id' ];
 		$full_site_url = get_bloginfo( 'url' );
 		$manager       = yikes_get_mc_api_manager();
 
@@ -77,7 +77,7 @@ 
 				"class.public_ajax.php"
 			);
 			$is_error = true;
-			$errors[] = $list_details->get_error_message();
+			$errors[ ] = $list_details->get_error_message();
 		}
 
 		// account details api call
@@ -86,7 +86,7 @@ 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 			$error_logging->maybe_write_to_log( $account_details->get_error_code(), __( "Send Update Profile Email - Get Account Details", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 			$is_error = true;
-			$errors[] = $account_details->get_error_message();
+			$errors[ ] = $account_details->get_error_message();
 		}
 
 		// subscriber details api call
@@ -95,7 +95,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();
 		}
 
 		// check for errors in any of the calls
@@ -112,11 +112,11 @@ 
 		}
 
 		// send the email!
-		$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 );
 		$subject          = 'MailChimp Profile Update';
-		$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';
 		$email_content = '<p>Greetings,</p> <p>A request has been made to update your MailChimp account profile information. To do so please use the following link: <a href="' . $update_link_href . '" title="Update MailChimp Profile">Update MailChimp Profile Info.</a>';
 		$email_content .= "<p>If you did not request this update, please disregard this email.</p>";

public/partials/shortcodes/process/process_form_submission.php

Indentation +5 added lines, -5 removed lines

@@ -192,11 +192,11 @@
 	$merge_variables = apply_filters( 'yikes-mailchimp-before-submission-' . $form_id, $merge_variables );
 
 	/**
-	* Action hooks fired before API request
-	* @since 6.0.5.5
-	* @param $merge_variables 	array 	Array of merge variable to use
-	* @param $form_id						integer	The form ID to target (eg: 1, 2 etc.)
-	*/
+	 * Action hooks fired before API request
+	 * @since 6.0.5.5
+	 * @param $merge_variables 	array 	Array of merge variable to use
+	 * @param $form_id						integer	The form ID to target (eg: 1, 2 etc.)
+	 */
 	do_action( 'yikes-mailchimp-before-submission', $merge_variables );
 	do_action( 'yikes-mailchimp-before-submission-' . $form_id, $merge_variables );
 

Spacing +42 added lines, -42 removed lines

@@ -8,7 +8,7 @@ 
 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;
+$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? $_POST[ 'yikes-mailchimp-submitted-form' ] : false;
 
 if ( ! $form_id ) {
 
@@ -16,11 +16,11 @@ 
 
 }
 
-$list_id = $_POST['yikes-mailchimp-associated-list-id'];
+$list_id = $_POST[ 'yikes-mailchimp-associated-list-id' ];
 
-$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' ] );
 
-$replace_interests    = isset( $form_settings['submission_settings']['replace_interests'] ) ? (bool) $form_settings['submission_settings']['replace_interests'] : true;
+$replace_interests = isset( $form_settings[ 'submission_settings' ][ 'replace_interests' ] ) ? (bool) $form_settings[ 'submission_settings' ][ 'replace_interests' ] : true;
 
 $groups = array();
 
@@ -29,11 +29,11 @@ 
 
 	$list_handler = yikes_get_mc_api_manager()->get_list_handler();
 
-	$interest_groupings = $list_handler->get_interest_categories( $_POST['yikes-mailchimp-associated-list-id'] );
+	$interest_groupings = $list_handler->get_interest_categories( $_POST[ 'yikes-mailchimp-associated-list-id' ] );
 
 	foreach ( $interest_groupings as $group_id => $group_data ) {
 
-		foreach ( $group_data['items'] as $item_id => $item_data ) {
+		foreach ( $group_data[ 'items' ] as $item_id => $item_data ) {
 
 			$groups[ $item_id ] = false;
 
@@ -42,39 +42,39 @@ 
 }
 
 // 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'] ) ) {
+	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'] );
+		$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 ( 1 !== $response_body['success'] ) {
+		if ( 1 !== $response_body[ 'success' ] ) {
 
 			$recaptcha_error = array(); // empty array to store error messages
 
-			foreach ( $response_body['error-codes'] as $error_code ) {
+			foreach ( $response_body[ 'error-codes' ] as $error_code ) {
 
 				if ( 'missing-input-response' === $error_code ) {
 
@@ -82,11 +82,11 @@ 
 
 				}
 
-				$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;
 
@@ -98,18 +98,18 @@ 
 	*	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 ) {
+	foreach ( $form_settings[ 'fields' ] as $merge_tag => $field_data ) {
 
-		if ( isset( $field_data['group_id'] ) ) {
+		if ( isset( $field_data[ 'group_id' ] ) ) {
 
 			// check if the checkbox group was set to required, if so return an error
-			if ( isset( $field_data['require'] ) && 1 === $field_data['require'] ) {
+			if ( isset( $field_data[ 'require' ] ) && 1 === $field_data[ 'require' ] ) {
 
-				if ( 'checkboxes' === $field_data['type'] ) {
+				if ( 'checkboxes' === $field_data[ 'type' ] ) {
 
 					if ( ! isset( $_POST[ $merge_tag ] ) ) {
 
-						$missing_required_checkbox_interest_groups[] = $merge_tag;
+						$missing_required_checkbox_interest_groups[ ] = $merge_tag;
 
 					}
 				}
@@ -135,10 +135,10 @@ 
 
 			// 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 ( 'DD/MM/YYYY' === $form_settings['fields'][ $merge_tag ]['date_format'] || 'DD/MM' === $form_settings['fields'][ $merge_tag ]['date_format'] ) {
+				if ( 'DD/MM/YYYY' === $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] || 'DD/MM' === $form_settings[ 'fields' ][ $merge_tag ][ 'date_format' ] ) {
 
 					// convert '/' to '.' and to UNIX timestamp
 					$value = ( '' != $value ) ? str_replace( '/', '.', $value ) : '';
@@ -178,7 +178,7 @@ 
 	}
 
 	// 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 );
 
 	/*
 	*	yikes-mailchimp-before-submission
@@ -204,22 +204,22 @@ 
 	*	Allow users to check for submit value
 	*	and pass back an error to the user
 	*/
-	if ( isset( $merge_variables['error'] ) ) {
+	if ( isset( $merge_variables[ 'error' ] ) ) {
 
-		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content' , $merge_variables['message'] );
+		$process_submission_response = apply_filters( 'yikes-mailchimp-frontend-content', $merge_variables[ 'message' ] );
 
 		return;
 
 	}
 
 	$member_data = array(
-		'email_address' => sanitize_email( $_POST['EMAIL'] ),
+		'email_address' => sanitize_email( $_POST[ 'EMAIL' ] ),
 		'merge_fields'  => $merge_variables,
 		'interests'     => $groups,
 		'status'        => 'subscribed',
 	);
 
-	$subscribe_response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, md5( strtolower( sanitize_email( $_POST['EMAIL'] ) ) ), $member_data );
+	$subscribe_response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, md5( strtolower( sanitize_email( $_POST[ 'EMAIL' ] ) ) ), $member_data );
 
 	if ( is_wp_error( $subscribe_response ) ) {
 
@@ -227,7 +227,7 @@ 
 
 		$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 
-		$error_logging->maybe_write_to_log( $error_message, __( 'New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ), 'process_form_submission.php' );
+		$error_logging->maybe_write_to_log( $error_message, __( 'New Subscriber', 'yikes-inc-easy-mailchimp-extender' ), 'process_form_submission.php' );
 
 		$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $error_message . '</p>';
 
@@ -239,13 +239,13 @@ 
 	$form_submitted = 1;
 
 	// Display the success message
-	if ( ! empty( $form_settings['error_messages']['success'] ) ) {
+	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>';
+		$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>';
 
 	} 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>';
 
 	}
@@ -258,8 +258,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
@@ -277,8 +277,8 @@ 
 	*	@$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' ] );
 
 	/*
 		*	yikes-mailchimp-after-submission
@@ -288,8 +288,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
 		*	function: redirect_user_non_ajax_forms
@@ -305,15 +305,15 @@ 
 		*	@$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
 		*/
 		$interface   = yikes_easy_mailchimp_extender_get_form_interface();
-		$submissions = $form_settings['submissions'] + 1;
+		$submissions = $form_settings[ 'submissions' ] + 1;
 		$interface->update_form_field( $form_id, 'submissions', $submissions );
 
 }

Braces +4 added lines, -2 removed lines

@@ -151,7 +151,8 @@ 
 				}
 			}
 
-			if ( strpos( $merge_tag, 'group-' ) !== false ) { // this is is an interest group!
+			if ( strpos( $merge_tag, 'group-' ) !== false ) {
+// this is is an interest group!
 
 				$tag = str_replace( 'group-', '', $merge_tag );
 
@@ -169,7 +170,8 @@ 
 
 				$groups[ $value ] = true;
 
-			} else { // or else it's just a standard merge variable
+			} else {
+// or else it's just a standard merge variable
 
 				$merge_variables[ $merge_tag ] = $value;
 

public/partials/shortcodes/process/process_form_submission_ajax.php

Spacing +37 added lines, -37 removed lines

@@ -5,10 +5,10 @@ 
 */
 
 // parse our form data
-parse_str( $_POST['form_data'], $data );
+parse_str( $_POST[ 'form_data' ], $data );
 
 // store the form ID to use in our hooks and filters
-$form = $_POST['form_id'];
+$form = $_POST[ 'form_id' ];
 
 $interface = yikes_easy_mailchimp_extender_get_form_interface();
 $form_data = $interface->get_form( $form );
@@ -16,29 +16,29 @@ 
 if ( $form_data ) {
 
 	// List ID
-	$list_id = $form_data['list_id'];
+	$list_id = $form_data[ 'list_id' ];
 
 	// decode our submission settings
-	$submission_settings = $form_data['submission_settings'];
+	$submission_settings = $form_data[ 'submission_settings' ];
 
 	// decode our optin settings
-	$optin_settings = $form_data['optin_settings'];
+	$optin_settings = $form_data[ 'optin_settings' ];
 
 	// decode our fields
-	$form_fields = $form_data['fields'];
+	$form_fields = $form_data[ 'fields' ];
 
 	/**
 	 * Decode our error messages
 	 * Workaround for international characters (cyrillic etc)
 	 * See: https://wordpress.org/support/topic/custom-messages-do-not-support-cyrillic-characters?replies=11#post-7629620
 	 */
-	$error_messages = $form_data['error_messages'];
+	$error_messages = $form_data[ 'error_messages' ];
 
 	/** Submit Process **/
-	$notifications = isset( $form_data['custom_notifications'] ) ? $form_data['custom_notifications'] : array();
+	$notifications = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array();
 
 	/* Page Data */
-	$page_data = $_POST['page_data'];
+	$page_data = $_POST[ 'page_data' ];
 
 }
 
@@ -49,7 +49,7 @@ 
 $error = 0;
 
 /* 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;
 
 // if it was filled out, return an error...
 if ( $honey_pot_filled ) {
@@ -57,7 +57,7 @@ 
 	wp_send_json_error( array(
 		'hide' => '0',
 		'error' => 1,
-		'response' => __( 'Error: It looks like the honeypot was filled out and the form was not properly submitted.' , 'yikes-inc-easy-mailchimp-extender' ),
+		'response' => __( 'Error: It looks like the honeypot was filled out and the form was not properly submitted.', 'yikes-inc-easy-mailchimp-extender' ),
 	) );
 
 	return;
@@ -65,20 +65,20 @@ 
 }
 
 // Check reCAPTCHA Response was submitted with the form data
-if ( isset( $data['g-recaptcha-response'] ) ) {
+if ( isset( $data[ 'g-recaptcha-response' ] ) ) {
 
-	$url           = esc_url_raw( 'https://www.google.com/recaptcha/api/siteverify?secret=' . get_option( 'yikes-mc-recaptcha-secret-key' , '' ) . '&response=' . $data['g-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=' . $data[ '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 ( 1 !== $response_body['success'] ) {
+	if ( 1 !== $response_body[ 'success' ] ) {
 
 		$error_messages = array(); // empty array to store error messages
 
-		if ( isset( $response_body['error-codes'] ) ) {
+		if ( isset( $response_body[ 'error-codes' ] ) ) {
 
-			foreach ( $response_body['error-codes'] as $error_code ) {
+			foreach ( $response_body[ 'error-codes' ] as $error_code ) {
 
 				if ( 'missing-input-response' === $error_code ) {
 
@@ -86,12 +86,12 @@ 
 
 				}
 
-				$error_messages[] = __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . $error_code;
+				$error_messages[ ] = __( 'Error', 'yikes-inc-easy-mailchimp-extender' ) . ': ' . $error_code;
 
 			}
 		} else {
 
-			$error_messages[] = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' );
+			$error_messages[ ] = __( 'Please refresh the page and try again.', 'yikes-inc-easy-mailchimp-extender' );
 
 		}
 
@@ -108,7 +108,7 @@ 
 	}
 }
 
-$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;
 
 $groups = array();
 
@@ -121,7 +121,7 @@ 
 
 	foreach ( $interest_groupings as $group_id => $group_data ) {
 
-		foreach ( $group_data['items'] as $item_id => $item_data ) {
+		foreach ( $group_data[ 'items' ] as $item_id => $item_data ) {
 
 			$groups[ $item_id ] = false;
 
@@ -136,10 +136,10 @@ 
 
 		// check if the current iteration has a 'date_format' key set
 		// (aka - date/birthday fields)
-		if ( isset( $form_fields[ $merge_tag ]['date_format'] ) ) {
+		if ( isset( $form_fields[ $merge_tag ][ 'date_format' ] ) ) {
 
 			// check if EU date format
-			if ( 'DD/MM/YYYY' === $form_fields[ $merge_tag ]['date_format'] || 'DD/MM' === $form_fields[ $merge_tag ]['date_format'] ) {
+			if ( 'DD/MM/YYYY' === $form_fields[ $merge_tag ][ 'date_format' ] || 'DD/MM' === $form_fields[ $merge_tag ][ 'date_format' ] ) {
 
 				// convert '/' to '.' and to UNIX timestamp
 				$value = ( '' != $value ) ? str_replace( '/', '.', $value ) : '';
@@ -179,7 +179,7 @@ 
 	}
 }
 // store the opt-in time
-$merge_variables['timestamp_opt'] = current_time( 'Y-m-d H:i:s', 1 );
+$merge_variables[ 'timestamp_opt' ] = current_time( 'Y-m-d H:i:s', 1 );
 
 /*
 *	yikes-mailchimp-before-submission
@@ -203,14 +203,14 @@ 
 *	Allow users to check for submit value
 *	and pass back an error to the user
 */
-if ( isset( $merge_variables['error'] ) ) {
+if ( isset( $merge_variables[ 'error' ] ) ) {
 
 	// send our error response back
 	wp_send_json_error(
 		array(
 			'hide'     => '0',
-			'error'    => $merge_variables['error'],
-			'response' => $merge_variables['message'],
+			'error'    => $merge_variables[ 'error' ],
+			'response' => $merge_variables[ 'message' ],
 		)
 	);
 
@@ -219,13 +219,13 @@ 
 }
 
 $member_data = array(
-	'email_address' => sanitize_email( $data['EMAIL'] ),
+	'email_address' => sanitize_email( $data[ 'EMAIL' ] ),
 	'merge_fields'  => $merge_variables,
 	'interests'     => $groups,
 	'status'        => 'subscribed',
 );
 
-$subscribe_response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, md5( strtolower( sanitize_email( $data['EMAIL'] ) ) ), $member_data );
+$subscribe_response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, md5( strtolower( sanitize_email( $data[ 'EMAIL' ] ) ) ), $member_data );
 
 if ( is_wp_error( $subscribe_response ) ) {
 
@@ -233,7 +233,7 @@ 
 
 	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 
-	$error_logging->maybe_write_to_log( $error_message, __( 'New Subscriber' , 'yikes-inc-easy-mailchimp-extender' ), 'process_form_submission.php' );
+	$error_logging->maybe_write_to_log( $error_message, __( 'New Subscriber', 'yikes-inc-easy-mailchimp-extender' ), 'process_form_submission.php' );
 
 	$process_submission_response = '<p class="yikes-easy-mc-error-message">' . $error_message . '</p>';
 
@@ -255,11 +255,11 @@ 
 /*
 *	Successful form submission redirect
 */
-if ( '1' === $submission_settings['redirect_on_submission'] ) {
+if ( '1' === $submission_settings[ 'redirect_on_submission' ] ) {
 
 	$redirection = '1';
 
-	$redirect_url = ( 'custom_url' != $submission_settings['redirect_page'] ) ? get_permalink( $submission_settings['redirect_page'] ) : $submission_settings['custom_redirect_url'];
+	$redirect_url = ( 'custom_url' != $submission_settings[ 'redirect_page' ] ) ? get_permalink( $submission_settings[ 'redirect_page' ] ) : $submission_settings[ 'custom_redirect_url' ];
 
 	$redirect = '<script type="text/javascript">setTimeout(function() { window.location="' . apply_filters( 'yikes-mailchimp-redirect-url', esc_url( $redirect_url ), $form, $page_data ) . '"; }, ' . apply_filters( 'yikes-mailchimp-redirect-timer', 1500 ) . ');</script>';
 
@@ -277,16 +277,16 @@ 
 do_action( 'yikes-mailchimp-after-submission-' . $form, $merge_variables );
 
 // send our notifications if setup (must go before wp_send_json())
-do_action( 'yikes-mailchimp-form-submission' , sanitize_email( $data['EMAIL'] ), $merge_variables , $form , $notifications );
-do_action( 'yikes-mailchimp-form-submission-' . $form, sanitize_email( $data['EMAIL'] ), $merge_variables , $form , $notifications );
+do_action( 'yikes-mailchimp-form-submission', sanitize_email( $data[ 'EMAIL' ] ), $merge_variables, $form, $notifications );
+do_action( 'yikes-mailchimp-form-submission-' . $form, sanitize_email( $data[ 'EMAIL' ] ), $merge_variables, $form, $notifications );
 
-$default_success_response = ( 1 === $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 === $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' );
 
 wp_send_json_success(
 	array(
-		'hide' => $submission_settings['hide_form_post_signup'],
+		'hide' => $submission_settings[ 'hide_form_post_signup' ],
 		'error' => $error,
-		'response' => apply_filters( 'yikes-mailchimp-success-response', ( ! empty( $error_messages['success'] ) ? $error_messages['success'] : $default_success_response ), $form, $merge_variables ),
+		'response' => apply_filters( 'yikes-mailchimp-success-response', ( ! empty( $error_messages[ 'success' ] ) ? $error_messages[ 'success' ] : $default_success_response ), $form, $merge_variables ),
 		'redirection' => isset( $redirection ) ? '1' : '0',
 		'redirect' => isset( $redirect ) ? $redirect : '',
 	)

Braces +4 added lines, -2 removed lines

@@ -153,7 +153,8 @@ 
 
 		}
 
-		if ( strpos( $merge_tag, 'group-' ) !== false ) { // this is is an interest group!
+		if ( strpos( $merge_tag, 'group-' ) !== false ) {
+// this is is an interest group!
 
 			$tag = str_replace( 'group-', '', $merge_tag );
 
@@ -171,7 +172,8 @@ 
 
 			$groups[ $value ] = true;
 
-		} else { // or else it's just a standard merge variable
+		} else {
+// or else it's just a standard merge variable
 
 			$merge_variables[ $merge_tag ] = $value;