yikesinc / yikes-inc-easy-mailchimp-extender

public/partials/shortcodes/process_form_shortcode_depracated.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 		), $atts )
 	);
 	
-	return '<p><em>' . __( 'This MailChimp shortcode is now deprecated. Please insert the new shortcode to display this form.' , 'yikes-inc-easy-mailchimp-extender' ) . '</em></p>';
+	return '<p><em>' . __( 'This MailChimp shortcode is now deprecated. Please insert the new shortcode to display this form.', 'yikes-inc-easy-mailchimp-extender' ) . '</em></p>';
 	
 }
 add_shortcode( 'yks-mailchimp-list', 'process_depracated_mailchimp_shortcode' ); ?>
\ No newline at end of file

public/partials/shortcodes/process/process_form_submission_ajax.php

Spacing +69 added lines, -69 removed lines

@@ -5,34 +5,34 @@ 
 */
 
 // 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' ];
 
 // Retreive the form data from the database instead of posting it with the form-submission
 global $wpdb;
 // return it as an array, so we can work with it to build our form below
 $form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form . '', ARRAY_A );
 
-if( $form_results ) {
-	$form_data = $form_results[0];
+if ( $form_results ) {
+	$form_data = $form_results[ 0 ];
 	// List ID
-	$list_id = $form_data['list_id'];
+	$list_id = $form_data[ 'list_id' ];
 	// decode our submission settings
-	$submission_settings = json_decode( stripslashes( $form_data['submission_settings'] ), true );
+	$submission_settings = json_decode( stripslashes( $form_data[ 'submission_settings' ] ), true );
 	// decode our optin settings
-	$optin_settings = json_decode( stripslashes( $form_data['optin_settings'] ), true );
+	$optin_settings = json_decode( stripslashes( $form_data[ 'optin_settings' ] ), true );
 	// decode our fields
-	$form_fields = json_decode( stripslashes( $form_data['fields'] ), true );
+	$form_fields = json_decode( stripslashes( $form_data[ 'fields' ] ), true );
 	/*	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 = ( get_magic_quotes_gpc() ) ? json_decode( stripslashes( $form_data['error_messages'] ), true ) : json_decode( $form_data['error_messages'], true );
+	$error_messages = ( get_magic_quotes_gpc() ) ? json_decode( stripslashes( $form_data[ 'error_messages' ] ), true ) : json_decode( $form_data[ 'error_messages' ], true );
 	/** Submit Process **/
-	$notifications = json_decode( stripslashes( $form_data['custom_notifications'] ), true );
+	$notifications = json_decode( stripslashes( $form_data[ 'custom_notifications' ] ), true );
 	/* Page Data */
-	$page_data = $_POST['page_data'];
+	$page_data = $_POST[ 'page_data' ];
 }
 
 // Empty array to build up merge variables
@@ -42,39 +42,39 @@ 
 $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 ) {
+if ( $honey_pot_filled ) {
 	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 be submitted." , 'yikes-inc-easy-mailchimp-extender' )
+		'response' => __( "Error: It looks like the honeypot was filled out and the form was not properly be submitted.", 'yikes-inc-easy-mailchimp-extender' )
 	) );
 	return;
 }
 
 // Check reCAPTCHA Response was submitted with the form data
-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"] );
+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" ] );
 	$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 ) {
 		$error_messages = array(); // empty array to store error messages
-		if( isset( $response_body['error-codes'] ) ) {
-			foreach( $response_body['error-codes'] as $error_code ) {
-				if( $error_code == 'missing-input-response' ) {
+		if ( isset( $response_body[ 'error-codes' ] ) ) {
+			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' );
 				}
-				$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' );
 		}
 		$error = 1;
 		wp_send_json_error( array(
 			'hide' => '0',
-			'error' => $error ,
+			'error' => $error,
 			'response' => apply_filters( 'yikes-mailchimp-recaptcha-required-error', implode( ' ', $error_messages ) ),
 		) );
 		exit();
@@ -83,12 +83,12 @@ 
 
 // loop to push variables to our array
 foreach ( $data 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_fields[$merge_tag]['date_format'] ) ) {
+		if ( isset( $form_fields[ $merge_tag ][ 'date_format' ] ) ) {
 			// check if EU date format
-			if( $form_fields[$merge_tag]['date_format'] == 'DD/MM/YYYY' ) {
+			if ( $form_fields[ $merge_tag ][ 'date_format' ] == 'DD/MM/YYYY' ) {
 				// convert '/' to '.' and to UNIX timestamp
 				$value = date( 'Y-m-d', strtotime( str_replace( '/', '.', $value ) ) );
 			} else {
@@ -96,22 +96,22 @@ 
 				$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';
 }
 
@@ -137,9 +137,9 @@ 
 *	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']  ) );
+	wp_send_json_error( array( 'hide' => '0', 'error' => $merge_variables[ 'error' ], 'response' => $merge_variables[ 'message' ] ) );
 	return;
 }
 
@@ -149,72 +149,72 @@ 
 		'body' => apply_filters( 'yikes-mailchimp-user-subscribe-api-request', array(
 			'apikey' => $api_key,
 			'id' => $list_id,
-			'email' => array( 'email' => sanitize_email( $data['EMAIL'] ) ),
+			'email' => array( 'email' => sanitize_email( $data[ 'EMAIL' ] ) ),
 			'merge_vars' => $merge_variables,
-			'double_optin' => $optin_settings['optin'],
+			'double_optin' => $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' => $optin_settings['send_welcome_email'],
-			'replace_interests' => ( isset( $submission_settings['replace_interests'] ) ) ? $submission_settings['replace_interests'] : 1, // defaults to replace
-		), $form, $list_id, $data['EMAIL'] ),
+			'send_welcome' => $optin_settings[ 'send_welcome_email' ],
+			'replace_interests' => ( isset( $submission_settings[ 'replace_interests' ] ) ) ? $submission_settings[ 'replace_interests' ] : 1, // defaults to replace
+		), $form, $list_id, $data[ 'EMAIL' ] ),
 		'timeout' => 10,
 		'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 	) );
 
 	$subscribe_response = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
 
-	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_ajax.php" );
+			$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscribe_response[ 'error' ], __( "Subscribe New User", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.php" );
 		}
 
 		$update_account_details_link = '';
 		$error = 1;
-		switch( $subscribe_response['code'] ) {
+		switch ( $subscribe_response[ 'code' ] ) {
 			// user already subscribed
 			case '214':
-				$update_account_details_link = ( $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="' . $list_id . '" data-user-email="' . sanitize_email( $data['EMAIL'] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ) ) : false;
-				if( ! empty( $error_messages['already-subscribed'] ) ) {
-					$error_response = $error_messages['already-subscribed'] . ' ' . $update_account_details_link;
+				$update_account_details_link = ( $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="' . $list_id . '" data-user-email="' . sanitize_email( $data[ 'EMAIL' ] ) . '" href="#">' . __( 'click to send yourself an update link', 'yikes-inc-easy-mailchimp-extender' ) . '</a>' ) ) : false;
+				if ( ! empty( $error_messages[ 'already-subscribed' ] ) ) {
+					$error_response = $error_messages[ 'already-subscribed' ] . ' ' . $update_account_details_link;
 				} else {
-					$error_response = $subscribe_response['error'] . ' ' . $update_account_details_link;
+					$error_response = $subscribe_response[ 'error' ] . ' ' . $update_account_details_link;
 				}
 				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( $list_id ) ,
+							'id' => array( $list_id ),
 						),
 						'timeout' => 10,
 						'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true ),
 					) );
 					$merge_variables = json_decode( wp_remote_retrieve_body( $merge_variables ), true );
-					if( is_wp_error( $merge_variables ) || isset( $merge_variables['error'] ) ) {
-						if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+					if ( is_wp_error( $merge_variables ) || 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_ajax.php" );
+							$error_logging->yikes_easy_mailchimp_write_to_error_log( $merge_variables[ 'error' ], __( "Get Merge Variables", 'yikes-inc-easy-mailchimp-extender' ), "process_form_submission_ajax.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 );
 					}
 					$error_response = $error_message;
@@ -222,14 +222,14 @@ 
 			// test@email.com is not allowed
 			case '-99':
 				// generic error
-				$error_response = str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response['error'] ) );
+				$error_response = str_replace( ' and cannot be imported', '', str_replace( 'List_RoleEmailMember:', '', $subscribe_response[ 'error' ] ) );
 				break;
 			// invalid email (or no email at all)
 				case '-100':
-					$error_response = ( ! empty( $error_messages['invalid-email'] ) ) ? $error_messages['invalid-email'] : __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' );
+					$error_response = ( ! empty( $error_messages[ 'invalid-email' ] ) ) ? $error_messages[ 'invalid-email' ] : __( 'Please provide a valid email address.', 'yikes-inc-easy-mailchimp-extender' );
 					break;
 			default:
-				$error_response = ( ! empty( $error_messages['general-error'] ) ) ? $error_messages['general-error'] : $subscribe_response['error'];
+				$error_response = ( ! empty( $error_messages[ 'general-error' ] ) ) ? $error_messages[ 'general-error' ] : $subscribe_response[ 'error' ];
 				break;
 		}
 		// send the response
@@ -247,9 +247,9 @@ 
 	/*
 	*	Successful form submission redirect
 	*/
-	if( $submission_settings['redirect_on_submission'] == '1' ) {
+	if ( $submission_settings[ 'redirect_on_submission' ] == '1' ) {
 		$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>';
 	}
 
@@ -265,16 +265,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 : '',
 		)

public/partials/ajax/class.public_ajax.php

Spacing +42 added lines, -42 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 );
 		}
 
 		/*
@@ -40,18 +40,18 @@ 
 		*/
 		public function increase_submission_count() {
 			// store our posted form ID
-			$form_id = $_POST['form_id'];
+			$form_id = $_POST[ 'form_id' ];
 			global $wpdb;
 			// query the form
 			$form_results = $wpdb->get_results( 'SELECT * FROM ' . $wpdb->prefix . 'yikes_easy_mc_forms WHERE id = ' . $form_id . '', ARRAY_A );
-			$form_data = $form_results[0];
+			$form_data = $form_results[ 0 ];
 			// increase the submission
-			$form_data['submissions']++;
+			$form_data[ 'submissions' ]++;
 			// update the value in the database
 			$wpdb->update(
 				$wpdb->prefix . 'yikes_easy_mc_forms',
 					array(
-						'submissions' => $form_data['submissions'],
+						'submissions' => $form_data[ 'submissions' ],
 					),
 					array( 'ID' => $form_id ),
 					array(
@@ -68,17 +68,17 @@ 
 			@since v6.0.4.1
 		*/
 		public function sendUpdateProfileEmail() {
-			$user_email = $_POST['user_email'];
-			$list_id = $_POST['list_id'];
+			$user_email = $_POST[ 'user_email' ];
+			$list_id = $_POST[ 'list_id' ];
 
-			$api_key = trim( get_option( 'yikes-mc-api-key' , '' ) );
+			$api_key = trim( get_option( 'yikes-mc-api-key', '' ) );
 			$dash_position = strpos( $api_key, '-' );
-			$explode_key = explode( '-' , $api_key );
-			$data_center = $explode_key[1];
-			$full_site_url = get_bloginfo('url');
+			$explode_key = explode( '-', $api_key );
+			$data_center = $explode_key[ 1 ];
+			$full_site_url = get_bloginfo( 'url' );
 
 			// list details api call
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/list.json';
 			}
 			$list_details = wp_remote_post( $api_endpoint, array(
@@ -92,16 +92,16 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$list_details = json_decode( wp_remote_retrieve_body( $list_details ), true );
-			if( isset( $list_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $list_details[ '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( $list_details['error'], __( "Send Update Profile Email - Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $list_details[ 'error' ], __( "Send Update Profile Email - Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 				}
 			}
 
 			// account details api call
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/helper/account-details.json';
 			}
 			$account_details = wp_remote_post( $api_endpoint, array(
@@ -112,16 +112,16 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$account_details = json_decode( wp_remote_retrieve_body( $account_details ), true );
-			if( isset( $account_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $account_details[ '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( $account_details['error'], __( "Send Update Profile Email - Get Account Details" , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $account_details[ 'error' ], __( "Send Update Profile Email - Get Account Details", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 				}
 			}
 
 			// subscriber details api call
-			if( $dash_position !== false ) {
+			if ( $dash_position !== false ) {
 				$api_endpoint = 'https://' . substr( $api_key, $dash_position + 1 ) . '.api.mailchimp.com/2.0/lists/member-info.json';
 			}
 			$subscriber_account_details = wp_remote_post( $api_endpoint, array(
@@ -136,27 +136,27 @@ 
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
 			$subscriber_account_details = json_decode( wp_remote_retrieve_body( $subscriber_account_details ), true );
-			if( isset( $subscriber_account_details['error'] ) ) {
-				if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+			if ( isset( $subscriber_account_details[ '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( $subscriber_account_details['error'], __( "Send Update Profile Email - Get Member Info." , 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
+					$error_logging->yikes_easy_mailchimp_write_to_error_log( $subscriber_account_details[ 'error' ], __( "Send Update Profile Email - Get Member Info.", 'yikes-inc-easy-mailchimp-extender' ), "class.public_ajax.php" );
 				}
 			}
 
 			// check for errors in any of the calls
-			if( isset( $list_details['error'] ) || isset( $account_details['error'] ) || isset( $subscriber_account_details['error'] ) ) {
-				$error_message = ( isset( $list_details['error'] ) ) ? $list_details['error'] : false;
-				if( ! $error_message ) {
-					$error_message = ( isset( $account_details['error'] ) ) ? $account_details['error'] : false;
-					if( ! $error_message ) {
-						$error_message = ( isset( $subscriber_account_details['error'] ) ) ? $subscriber_account_details['error'] : false;
-						if( ! $error_message ) {
+			if ( isset( $list_details[ 'error' ] ) || isset( $account_details[ 'error' ] ) || isset( $subscriber_account_details[ 'error' ] ) ) {
+				$error_message = ( isset( $list_details[ 'error' ] ) ) ? $list_details[ 'error' ] : false;
+				if ( ! $error_message ) {
+					$error_message = ( isset( $account_details[ 'error' ] ) ) ? $account_details[ 'error' ] : false;
+					if ( ! $error_message ) {
+						$error_message = ( isset( $subscriber_account_details[ 'error' ] ) ) ? $subscriber_account_details[ 'error' ] : false;
+						if ( ! $error_message ) {
 							$error_message = '';
 						}
 					}
 				}
-				$errorMessage = sprintf( __( 'Error sending update profile email. <strong>Error: %s</strong>. Please contact the site administrator.' , 'yikes-inc-easy-mailchimp-extender' ), $error_message );
+				$errorMessage = sprintf( __( 'Error sending update profile email. <strong>Error: %s</strong>. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), $error_message );
 				wp_send_json_error(
 					array(
 						'response_text' => '<div class="yikes-easy-mc-error-message">&#10005; ' . $errorMessage . '</div>',
@@ -166,11 +166,11 @@ 
 			}
 
 			// send the email!
-			$subscriber_id = $subscriber_account_details['data'][0]['id'];
-			$explode_url = explode( '.' , $account_details['contact']['url'] );
-			$update_link_href = 'http://' . $explode_url[1] . '.' . $data_center . '.list-manage1.com/profile?u=' . $account_details['user_id'] . '&id=' . $list_id .'&e=' . $subscriber_id;
+			$subscriber_id = $subscriber_account_details[ 'data' ][ 0 ][ 'id' ];
+			$explode_url = explode( '.', $account_details[ 'contact' ][ 'url' ] );
+			$update_link_href = 'http://' . $explode_url[ 1 ] . '.' . $data_center . '.list-manage1.com/profile?u=' . $account_details[ 'user_id' ] . '&id=' . $list_id . '&e=' . $subscriber_id;
 			$subject = 'MailChimp Profile Update';
-			$headers = 'From: ' . $list_details['data'][0]['default_from_name'] . ' <' . $list_details['data'][0]['default_from_email'] . '>' . "\r\n";
+			$headers = 'From: ' . $list_details[ 'data' ][ 0 ][ 'default_from_name' ] . ' <' . $list_details[ 'data' ][ 0 ][ 'default_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>";
@@ -183,14 +183,14 @@ 
 			if ( wp_mail( $user_email, apply_filters( 'yikes-mailchimp-update-email-subject', $subject ), apply_filters( 'yikes-mailchimp-update-email-content', $email_content, $update_link_href ), $headers ) ) {
 				wp_send_json_success(
 					array(
-						'response_text' => '<div class="yikes-easy-mc-success-message">' . sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.' , 'yikes-inc-easy-mailchimp-extender' ), '&#10004;' ) . '</div>',
+						'response_text' => '<div class="yikes-easy-mc-success-message">' . sprintf( __( '%s Update email successfully sent. Please check your inbox for the message.', 'yikes-inc-easy-mailchimp-extender' ), '&#10004;' ) . '</div>',
 					)
 				);
 				exit;
 			} else {
 				wp_send_json_error(
 					array(
-						'response_text' => '<div class="yikes-easy-mc-error-message">' . sprintf( __( '%s Email failed to send. Please contact the site administrator.' , 'yikes-inc-easy-mailchimp-extender' ), '&#10005;' ) . '</div>',
+						'response_text' => '<div class="yikes-easy-mc-error-message">' . sprintf( __( '%s Email failed to send. Please contact the site administrator.', 'yikes-inc-easy-mailchimp-extender' ), '&#10005;' ) . '</div>',
 					)
 				);
 				exit;

public/classes/checkbox-integrations.php

Spacing +58 added lines, -58 removed lines

@@ -5,7 +5,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_Checkbox_Integration_Class {
 	
@@ -25,35 +25,35 @@ 
 		*/
 		public function is_user_already_subscribed( $integration_type ) {
 			// first check if the user is logged in
-			if( is_user_logged_in() ) {
-				$checkbox_options = get_option( 'optin-checkbox-init' , '' );
+			if ( is_user_logged_in() ) {
+				$checkbox_options = get_option( 'optin-checkbox-init', '' );
 				$current_user = wp_get_current_user();
 				$email = $current_user->user_email;
 
-				$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/member-info.json';
 				}
 				$already_subscribed = wp_remote_post( $api_endpoint, array( 
 					'body' => array( 
 						'apikey' => $api_key, 
-						'id' => $checkbox_options[$integration_type]['associated-list'],
+						'id' => $checkbox_options[ $integration_type ][ 'associated-list' ],
 						'emails' => array( array( 'email' => sanitize_email( $email ) ) )
 					),
 					'timeout' => 10,
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$already_subscribed = json_decode( wp_remote_retrieve_body( $already_subscribed ), true );	
-				if( isset( $already_subscribed['error'] ) ) {	
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $already_subscribed[ '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( $already_subscribed['error'], __( "Get Member Info" , 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $already_subscribed[ 'error' ], __( "Get Member Info", 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
 					}
 				}
-				if( ! Isset( $already_subscribed['error'] ) ) {
-					return $already_subscribed['success_count'];
+				if ( ! Isset( $already_subscribed[ 'error' ] ) ) {
+					return $already_subscribed[ 'success_count' ];
 				}
 			} else {
 				// if the user isn't logged in
@@ -69,33 +69,33 @@ 
 		*	@$email - users email address entered into the form
 		*	@$integration_type - pass in the type of checkbox integration
 		*/
-		public function is_new_registration_already_subscribed( $email , $integration_type ) {
+		public function is_new_registration_already_subscribed( $email, $integration_type ) {
 			// first check if the user is logged in
-			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
+			$checkbox_options = get_option( 'optin-checkbox-init', '' );
 			try {
-				$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/member-info.json';
 				}
 				$already_subscribed = wp_remote_post( $api_endpoint, array( 
 					'body' => array( 
 						'apikey' => $api_key, 
-						'id' => $checkbox_options[$integration_type]['associated-list'],
+						'id' => $checkbox_options[ $integration_type ][ 'associated-list' ],
 						'emails' => array( array( 'email' => sanitize_email( $email ) ) )
 					),
 					'timeout' => 10,
 					'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 				) );
 				$already_subscribed = json_decode( wp_remote_retrieve_body( $already_subscribed ), true );
-				if( isset( $already_subscribed['error'] ) ) {	
-					if( WP_DEBUG || get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( isset( $already_subscribed[ '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( $already_subscribed['error'], __( "Get Member Info" , 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $already_subscribed[ 'error' ], __( "Get Member Info", 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations Page" );
 					}
 				}				
-				return $already_subscribed['success_count'];
+				return $already_subscribed[ 'success_count' ];
 			} catch ( Exception $error ) {
 				return $error->getMessage();
 			}
@@ -110,17 +110,17 @@ 
 			// 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' );
 			// store our options
-			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
-			if( isset( $checkbox_options[$this->type]['associated-list'] ) && $checkbox_options[$this->type]['associated-list'] != '-' ) {
-				$checked = ( $checkbox_options[$this->type]['precheck'] == 'true' ) ? 'checked' : '';
+			$checkbox_options = get_option( 'optin-checkbox-init', '' );
+			if ( isset( $checkbox_options[ $this->type ][ 'associated-list' ] ) && $checkbox_options[ $this->type ][ 'associated-list' ] != '-' ) {
+				$checked = ( $checkbox_options[ $this->type ][ 'precheck' ] == 'true' ) ? 'checked' : '';
 				// before checkbox HTML (comment, ...)
 				$before = '<!-- Easy Forms for MailChimp by YIKES, Inc. - https://www.yikesinc.com/ -->';
 				$before .= apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );
 				// checkbox
 				$content = '<p id="yikes-easy-mailchimp-' . $this->type . '-checkbox" class="yikes-easy-mailchimp-' . $this->type . '-checkbox">';
 					$content .= '<label>';
-						$content .= '<input type="checkbox" name="yikes_mailchimp_checkbox_' . $this->type . '" value="1" '. $checked . ' /> ';
-						$content .= ( isset( $checkbox_options[$this->type]['label'] ) && trim( $checkbox_options[$this->type]['label'] ) != '' ) ? trim( $checkbox_options[$this->type]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
+						$content .= '<input type="checkbox" name="yikes_mailchimp_checkbox_' . $this->type . '" value="1" ' . $checked . ' /> ';
+						$content .= ( isset( $checkbox_options[ $this->type ][ 'label' ] ) && trim( $checkbox_options[ $this->type ][ 'label' ] ) != '' ) ? trim( $checkbox_options[ $this->type ][ 'label' ] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
 					$content .= '</label>';
 				$content .= '</p>';
 				// after checkbox HTML (..., honeypot, closing comment)
@@ -138,43 +138,43 @@ 
 		**/
 		public function subscribe_user_integration( $email, $type, $merge_vars ) {			
 			// get checkbox data
-			$checkbox_options = get_option( 'optin-checkbox-init' , '' );
-			if( $type != 'registration_form' ) {
+			$checkbox_options = get_option( 'optin-checkbox-init', '' );
+			if ( $type != 'registration_form' ) {
 				$update = '1';
 			} else {
 				$update = '0';
 			}
 			// set ip address
-			if( ! isset( $merge_vars['OPTIN_IP'] ) && isset( $_SERVER['REMOTE_ADDR'] ) ) {
-				$merge_vars['OPTIN_IP'] = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
+			if ( ! isset( $merge_vars[ 'OPTIN_IP' ] ) && isset( $_SERVER[ 'REMOTE_ADDR' ] ) ) {
+				$merge_vars[ 'OPTIN_IP' ] = sanitize_text_field( $_SERVER[ 'REMOTE_ADDR' ] );
 			}
 			// set the optin time
-			$merge_vars['OPTIN_TIME'] = current_time( 'Y-m-d H:i:s', 1 );
+			$merge_vars[ 'OPTIN_TIME' ] = current_time( 'Y-m-d H:i:s', 1 );
 			// check for interest groups
-			$interest_groups = ( isset( $checkbox_options[$type]['interest-groups'] ) ) ? $checkbox_options[$type]['interest-groups'] : false;
+			$interest_groups = ( isset( $checkbox_options[ $type ][ 'interest-groups' ] ) ) ? $checkbox_options[ $type ][ 'interest-groups' ] : false;
 			// if interest groups were found, push them to the merge variable array
-			if( $interest_groups ) {
-				$merge_vars['groupings'] = array();
-				foreach( $interest_groups as $interest_group_id => $interest_group_selections ) {
+			if ( $interest_groups ) {
+				$merge_vars[ 'groupings' ] = array();
+				foreach ( $interest_groups as $interest_group_id => $interest_group_selections ) {
 					// merge variable interest groups array
-					$merge_vars['groupings'][] = array(
+					$merge_vars[ 'groupings' ][ ] = array(
 						'id' => $interest_group_id,
 						'groups' => $interest_group_selections,
 					); 	
 				}
 				// replace the interest groups - to avoid any errors thrown if the admin switches lists, or interest groups
-				$merge_vars['replace_interests'] = 1;
+				$merge_vars[ 'replace_interests' ] = 1;
 			}
 			// initialize MailChimp API
-			$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/subscribe.json';
 			}
 			$subscribe_response = wp_remote_post( $api_endpoint, array( 
 				'body' => apply_filters( 'yikes-mailchimp-checkbox-integration-subscribe-api-request', array( 
-					'apikey' => get_option( 'yikes-mc-api-key' , '' ),
-					'id' => $checkbox_options[$type]['associated-list'],
+					'apikey' => get_option( 'yikes-mc-api-key', '' ),
+					'id' => $checkbox_options[ $type ][ 'associated-list' ],
 					'email' => array( 'email' => sanitize_email( $email ) ),
 					'merge_vars' => apply_filters( 'yikes-mailchimp-checkbox-integration-merge-variables', $merge_vars, $type ), // filter merge variables
 					'double_optin' => 1,
@@ -184,13 +184,13 @@ 
 				'timeout' => 10,
 				'sslverify' => apply_filters( 'yikes-mailchimp-sslverify', true )
 			) );
-			if( ! Is_wp_error( $subscribe_response ) ) {
+			if ( ! Is_wp_error( $subscribe_response ) ) {
 				$response_body = json_decode( wp_remote_retrieve_body( $subscribe_response ), true );
-				if( WP_DEBUG || isset( $response_body['error'] ) ) {	
-					if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+				if ( WP_DEBUG || isset( $response_body[ 'error' ] ) ) {	
+					if ( 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( $response_body['error'], __( "Checkbox Integration Subscribe User" , 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations" );
+						$error_logging->yikes_easy_mailchimp_write_to_error_log( $response_body[ 'error' ], __( "Checkbox Integration Subscribe User", 'yikes-inc-easy-mailchimp-extender' ), "Checkbox Integrations" );
 					}
 				}		
 			}
@@ -206,15 +206,15 @@ 
 			$merge_vars = array(
 				'NAME' => $user->user_login,
 			);
-			if( '' !== $user->first_name ) {
-				$merge_vars['NAME'] = $user->first_name;
-				$merge_vars['FNAME'] = $user->first_name;
+			if ( '' !== $user->first_name ) {
+				$merge_vars[ 'NAME' ] = $user->first_name;
+				$merge_vars[ 'FNAME' ] = $user->first_name;
 			}
-			if( '' !== $user->last_name ) {
-				$merge_vars['LNAME'] = $user->last_name;
+			if ( '' !== $user->last_name ) {
+				$merge_vars[ 'LNAME' ] = $user->last_name;
 			}
-			if( '' !== $user->first_name && '' !== $user->last_name ) {
-				$merge_vars['NAME'] = sprintf( '%s %s', $user->first_name, $user->last_name );
+			if ( '' !== $user->first_name && '' !== $user->last_name ) {
+				$merge_vars[ 'NAME' ] = sprintf( '%s %s', $user->first_name, $user->last_name );
 			}
 			/**
 			 * @filter `yikes-mailchimp-user-merge-vars`
@@ -235,7 +235,7 @@ 
 		*/
 		public function was_checkbox_checked( $type ) {
 			// was sign-up checkbox checked - return the value
-			return ( isset( $_POST[ 'yikes_mailchimp_checkbox_'.$type ] ) && $_POST[ 'yikes_mailchimp_checkbox_'.$type ] == 1 );
+			return ( isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && $_POST[ 'yikes_mailchimp_checkbox_' . $type ] == 1 );
 		}
 		
 		
@@ -245,15 +245,15 @@ 
 		* 	@since 6.0.0
 		**/
 		public function yikes_reg_complete_msg( $errors, $redirect_to ) {
-			if( isset( $errors->errors['registered'] ) ) {
-				$email_error = get_option( 'yikes_register_subscription_error' , '' );
-				if( isset( $email_error ) && $email_error != '' ) {	
+			if ( isset( $errors->errors[ 'registered' ] ) ) {
+				$email_error = get_option( 'yikes_register_subscription_error', '' );
+				if ( isset( $email_error ) && $email_error != '' ) {	
 					// Use the magic __get method to retrieve the errors array:
 					$tmp = $errors->errors; 
 					$old = 'Registration complete. Please check your e-mail.';
-					foreach( $tmp['registered'] as $index => $msg ) {
-						if( $msg === $old ) {
-							$tmp['registered'][$index] = $old . ' <p class="message"><strong>' . __( 'Note' , 'yikes-inc-easy-mailchimp-extender' ) . '</strong>: ' . $email_error . '</p>';        
+					foreach ( $tmp[ 'registered' ] as $index => $msg ) {
+						if ( $msg === $old ) {
+							$tmp[ 'registered' ][ $index ] = $old . ' <p class="message"><strong>' . __( 'Note', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>: ' . $email_error . '</p>';        
 						}
 					}
 					// Use the magic __set method to override the errors property:

public/classes/checkbox-integrations/class.bbpress_forms-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_bbPress_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 	
@@ -31,7 +31,7 @@ 
 		*/
 		public function output_checkbox() {
 			// if the user is already subscribed, abort and don't render the checkbox
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;
 			}
 			echo $this->yikes_get_checkbox();
@@ -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.easy_digital_downloads_checkout_form-checkbox.php

Spacing +16 added lines, -16 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 );
 		}
 		
 		
@@ -30,13 +30,13 @@ 
 		* Outputs a checkbox
 		*/
 		public function output_checkbox() {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;
 			}
 			// render our field if the user isn't current subscribed
-			echo do_action( 'yikes-mailchimp-before-checkbox' , $this->type );
+			echo do_action( 'yikes-mailchimp-before-checkbox', $this->type );
 				echo $this->yikes_get_checkbox();
-			echo do_action( 'yikes-mailchimp-after-checkbox' , $this->type );
+			echo do_action( 'yikes-mailchimp-after-checkbox', $this->type );
 		}	
 		
 		
@@ -47,7 +47,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;
 			}
@@ -60,25 +60,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/classes/checkbox-integrations/class.comment_form-checkbox.php

Spacing +6 added lines, -6 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 {
 	
@@ -27,12 +27,12 @@ 
 		* Outputs a checkbox, if user is not already subscribed
 		*/
 		public function output_checkbox( $comment_field ) {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return $comment_field;
 			}
-				echo do_action( 'yikes-mailchimp-before-checkbox' , $this->type );
+				echo do_action( 'yikes-mailchimp-before-checkbox', $this->type );
 					echo $comment_field . $this->yikes_get_checkbox();
-				echo do_action( 'yikes-mailchimp-after-checkbox' , $this->type );
+				echo do_action( 'yikes-mailchimp-after-checkbox', $this->type );
 		}		
 	
 		/**
@@ -41,7 +41,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;
@@ -58,7 +58,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.buddypress_form-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_BuddyPress_Checkbox_Class extends Yikes_Easy_MC_Checkbox_Integration_Class {
 		
@@ -21,7 +21,7 @@ 
 		* Outputs a checkbox, if user is not already subscribed
 		*/
 		public function output_checkbox() {
-			if( $this->is_user_already_subscribed( $this->type ) == '1' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				return;
 			}
 			?>

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 ) == '1' ) {
+		if ( isset( $checkbox_options ) && $checkbox_options[ $this->type ][ 'associated-list' ] != '-' ) {
+			if ( $this->is_user_already_subscribed( $this->type ) == '1' ) {
 				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;
 	}