Inspection of "6.8" - yikesinc/yikes-inc-easy-mailchimp-extender - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#862)

unknown

created 2020-10-19 14:21 UTC

Status

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -46,11 +46,11 @@  discard block
 block discarded – undo
 
 		// Convert the integration type to a list ID.
 		$checkbox_options = get_option( 'optin-checkbox-init', '' );
-		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
+		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ][ 'associated-list' ] ) ) {
 			return false;
 		}
 
-		$list_ids = $checkbox_options[ $type ]['associated-list'];
+		$list_ids = $checkbox_options[ $type ][ 'associated-list' ];
 		$list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids );
 
 		// Go through each list...
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 			$data = $response->get_error_data();
 
 			// If the error response is a 404, they are not subscribed.
-			if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
+			if ( isset( $data[ 'status' ] ) && 404 === (int) $data[ 'status' ] ) {
 				return false;
 			} else {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
 		}
 
 		// Look at the status from the API.
-		$subscribed = 'subscribed' === $response['status'];
+		$subscribed = 'subscribed' === $response[ 'status' ];
 
 		return apply_filters( 'yikes-mailchimp-integration-is-user-subscribed', $subscribed, $type );
 	}
@@ -114,12 +114,12 @@  discard block
 block discarded – undo
 
 		// Get our options.
 		$checkbox_options = get_option( 'optin-checkbox-init', array() );
-		$has_list_ids     = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'] && is_array( $checkbox_options[ $this->type ]['associated-list'] );
-		$has_list_ids     = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true );
+		$has_list_ids     = isset( $checkbox_options[ $this->type ][ 'associated-list' ] ) && '-' !== $checkbox_options[ $this->type ][ 'associated-list' ] && is_array( $checkbox_options[ $this->type ][ 'associated-list' ] );
+		$has_list_ids     = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ][ 'associated-list' ], true );
 
 		if ( $has_list_ids ) {
-			$label    = isset( $checkbox_options[ $this->type ]['label'] ) && ! empty( $checkbox_options[ $this->type ]['label'] ) ? trim( $checkbox_options[ $this->type ]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
-			$checked  = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : '';
+			$label    = isset( $checkbox_options[ $this->type ][ 'label' ] ) && ! empty( $checkbox_options[ $this->type ][ 'label' ] ) ? trim( $checkbox_options[ $this->type ][ 'label' ] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
+			$checked  = 'true' === $checkbox_options[ $this->type ][ 'precheck' ] ? 'checked="checked"' : '';
 			$before   = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );
 			$content  = '<p id="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox" class="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox">';
 			$content .= '<label>';
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
 		$options = get_option( 'optin-checkbox-init', '' );
 
 		// Make sure we have a list ID.
-		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {
+		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ][ 'associated-list' ] ) ) {
 			// @todo: Throw some kind of error?
 			return;
 		}
@@ -157,14 +157,14 @@  discard block
 block discarded – undo
 		$email = sanitize_email( $email );
 
 		// Check for an IP address.
-		$user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
-		if ( isset( $merge_vars['OPTIN_IP'] ) ) {
-			$user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );
+		$user_ip = sanitize_text_field( $_SERVER[ 'REMOTE_ADDR' ] );
+		if ( isset( $merge_vars[ 'OPTIN_IP' ] ) ) {
+			$user_ip = sanitize_text_field( $merge_vars[ 'OPTIN_IP' ] );
 		}
 
 		// Build our request data.
-		$list_ids = $options[ $type ]['associated-list'];
-		$list_ids = is_array( $options[ $type ]['associated-list'] ) ? $options[ $type ]['associated-list'] : array( $options[ $type ]['associated-list'] );
+		$list_ids = $options[ $type ][ 'associated-list' ];
+		$list_ids = is_array( $options[ $type ][ 'associated-list' ] ) ? $options[ $type ][ 'associated-list' ] : array( $options[ $type ][ 'associated-list' ] );
 		$id       = md5( $email );
 		$data     = array(
 			'email_address' => $email,
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
 
 		foreach ( $list_ids as $list_id ) {
 
-			$interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();
+			$interests = isset( $options[ $type ][ 'interest-groups' ] ) ? $options[ $type ][ 'interest-groups' ] : array();
 			$interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests;
 
 			// Only re-format and add interest groups if not empty.
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
 					}
 				}
 
-				$data['interests'] = $groups;
+				$data[ 'interests' ] = $groups;
 			}
 
 			/**
@@ -218,8 +218,8 @@  discard block
 block discarded – undo
 			$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type, $integration_vars );
 
 			// Don't send an empty merge fields array.
-			if ( empty( $data['merge_fields'] ) ) {
-				unset( $data['merge_fields'] );
+			if ( empty( $data[ 'merge_fields' ] ) ) {
+				unset( $data[ 'merge_fields' ] );
 			}
 
 			// Subscribe the user to the list via the API.
@@ -249,10 +249,10 @@  discard block
 block discarded – undo
 		$merge_vars = array();
 
 		if ( ! empty( $user->first_name ) ) {
-			$merge_vars['FNAME'] = $user->first_name;
+			$merge_vars[ 'FNAME' ] = $user->first_name;
 		}
 		if ( ! empty( $user->last_name ) ) {
-			$merge_vars['LNAME'] = $user->last_name;
+			$merge_vars[ 'LNAME' ] = $user->last_name;
 		}
 
 		/**

Please login to merge, or discard this patch.

Braces +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
 /**
  * Main Checkbox Integration class.
  */
-class Yikes_Easy_MC_Checkbox_Integration_Class {
+class Yikes_Easy_MC_Checkbox_Integration_Class {
 
 	/**
 	 * The integration type.
@@ -28,10 +28,10 @@  discard block
 block discarded – undo
 	 *
 	 * @return bool Whether the current user is subscribed to a list.
 	 */
-	public function is_user_already_subscribed( $type, $email = '' ) {
+	public function is_user_already_subscribed( $type, $email = '' ) {
 		// Make sure we have an email address to use.
-		if ( empty( $email ) ) {
-			if ( ! is_user_logged_in() ) {
+		if ( empty( $email ) ) {
+			if ( ! is_user_logged_in() ) {
 				return false;
 			}
 
@@ -40,13 +40,13 @@  discard block
 block discarded – undo
 		}
 
 		// Ensure we have a valid email.
-		if ( ! is_email( $email ) ) {
+		if ( ! is_email( $email ) ) {
 			return false;
 		}
 
 		// Convert the integration type to a list ID.
 		$checkbox_options = get_option( 'optin-checkbox-init', '' );
-		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
+		if ( empty( $checkbox_options ) || ! isset( $checkbox_options[ $type ] ) || ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
 			return false;
 		}
 
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
 		$list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids );
 
 		// Go through each list...
-		foreach ( $list_ids as $list_id ) {
-			if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {
+		foreach ( $list_ids as $list_id ) {
+			if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {
 				return false;
 			}
 		}
@@ -74,19 +74,19 @@  discard block
 block discarded – undo
 	 *
 	 * @return bool Whether the email is subscribed to the list.
 	 */
-	public function is_user_subscribed( $email, $list_id, $type ) {
+	public function is_user_subscribed( $email, $list_id, $type ) {
 		$email      = sanitize_email( $email );
 		$email_hash = md5( $email );
 
 		// Check the API to see the status.
 		$response = yikes_get_mc_api_manager()->get_list_handler()->get_member( $list_id, $email_hash, false );
-		if ( is_wp_error( $response ) ) {
+		if ( is_wp_error( $response ) ) {
 			$data = $response->get_error_data();
 
 			// If the error response is a 404, they are not subscribed.
-			if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
+			if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
 				return false;
-			} else {
+			} else {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 				$error_logging->maybe_write_to_log(
 					$response->get_error_code(),
@@ -110,14 +110,14 @@  discard block
 block discarded – undo
 	 *
 	 * @return string The HTML for the checkbox.
 	 */
-	public function yikes_get_checkbox() {
+	public function yikes_get_checkbox() {
 
 		// Get our options.
 		$checkbox_options = get_option( 'optin-checkbox-init', array() );
 		$has_list_ids     = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'] && is_array( $checkbox_options[ $this->type ]['associated-list'] );
 		$has_list_ids     = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true );
 
-		if ( $has_list_ids ) {
+		if ( $has_list_ids ) {
 			$label    = isset( $checkbox_options[ $this->type ]['label'] ) && ! empty( $checkbox_options[ $this->type ]['label'] ) ? trim( $checkbox_options[ $this->type ]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
 			$checked  = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : '';
 			$before   = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );
@@ -145,11 +145,11 @@  discard block
 block discarded – undo
 	 * @param array  $merge_vars       The array of form data to send.
 	 * @param array  $integration_vars An array of additional information that can be used to filter the subscribe request.
 	 */
-	public function subscribe_user_integration( $email, $type, $merge_vars, $integration_vars = array() ) {
+	public function subscribe_user_integration( $email, $type, $merge_vars, $integration_vars = array() ) {
 		$options = get_option( 'optin-checkbox-init', '' );
 
 		// Make sure we have a list ID.
-		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {
+		if ( ! isset( $options[ $type ] ) || ! isset( $options[ $type ]['associated-list'] ) ) {
 			// @todo: Throw some kind of error?
 			return;
 		}
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
 
 		// Check for an IP address.
 		$user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
-		if ( isset( $merge_vars['OPTIN_IP'] ) ) {
+		if ( isset( $merge_vars['OPTIN_IP'] ) ) {
 			$user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );
 		}
 
@@ -174,19 +174,19 @@  discard block
 block discarded – undo
 			'ip_signup'     => $user_ip,
 		);
 
-		foreach ( $list_ids as $list_id ) {
+		foreach ( $list_ids as $list_id ) {
 
 			$interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();
 			$interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests;
 
 			// Only re-format and add interest groups if not empty.
-			if ( ! empty( $interests ) ) {
+			if ( ! empty( $interests ) ) {
 				$groups = array();
 
 				// Need to reformat interest groups array as $interest_group_ID => true.
-				foreach ( $interests as $interest ) {
-					if ( is_array( $interest ) ) {
-						foreach ( $interest as $group_id ) {
+				foreach ( $interests as $interest ) {
+					if ( is_array( $interest ) ) {
+						foreach ( $interest as $group_id ) {
 							$groups[ $group_id ] = true;
 						}
 					}
@@ -218,14 +218,14 @@  discard block
 block discarded – undo
 			$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type, $integration_vars );
 
 			// Don't send an empty merge fields array.
-			if ( empty( $data['merge_fields'] ) ) {
+			if ( empty( $data['merge_fields'] ) ) {
 				unset( $data['merge_fields'] );
 			}
 
 			// Subscribe the user to the list via the API.
 			$response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, $id, $data );
 
-			if ( is_wp_error( $response ) ) {
+			if ( is_wp_error( $response ) ) {
 				$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 				$error_logging->maybe_write_to_log(
 					$response->get_error_code(),
@@ -243,15 +243,15 @@  discard block
 block discarded – undo
 	 *
 	 * @param WP_User $user A WP User.
 	 */
-	public function user_merge_vars( WP_User $user ) {
+	public function user_merge_vars( WP_User $user ) {
 
 		// Setup our array.
 		$merge_vars = array();
 
-		if ( ! empty( $user->first_name ) ) {
+		if ( ! empty( $user->first_name ) ) {
 			$merge_vars['FNAME'] = $user->first_name;
 		}
-		if ( ! empty( $user->last_name ) ) {
+		if ( ! empty( $user->last_name ) ) {
 			$merge_vars['LNAME'] = $user->last_name;
 		}
 
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
 	 *
 	 * @return bool True if the checkbox was checked.
 	 */
-	public function was_checkbox_checked( $type ) {
+	public function was_checkbox_checked( $type ) {
 		return isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && '1' === filter_var( $_POST[ 'yikes_mailchimp_checkbox_' . $type ], FILTER_SANITIZE_STRING );
 	}
 }

Please login to merge, or discard this patch.

		@@ -46,11 +46,11 @@ discard block
		block discarded – undo
46	46
47	47	// Convert the integration type to a list ID.
48	48	$checkbox_options = get_option( 'optin-checkbox-init', '' );
49		- if ( empty( $checkbox_options ) \|\| ! isset( $checkbox_options[ $type ] ) \|\| ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
	49	+ if ( empty( $checkbox_options ) \|\| ! isset( $checkbox_options[ $type ] ) \|\| ! isset( $checkbox_options[ $type ][ 'associated-list' ] ) ) {
50	50	return false;
51	51	}
52	52
53		- $list_ids = $checkbox_options[ $type ]['associated-list'];
	53	+ $list_ids = $checkbox_options[ $type ][ 'associated-list' ];
54	54	$list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids );
55	55
56	56	// Go through each list...
		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84	$data = $response->get_error_data();
85	85
86	86	// If the error response is a 404, they are not subscribed.
87		- if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
	87	+ if ( isset( $data[ 'status' ] ) && 404 === (int) $data[ 'status' ] ) {
88	88	return false;
89	89	} else {
90	90	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
		@@ -100,7 +100,7 @@ discard block
		block discarded – undo
100	100	}
101	101
102	102	// Look at the status from the API.
103		- $subscribed = 'subscribed' === $response['status'];
	103	+ $subscribed = 'subscribed' === $response[ 'status' ];
104	104
105	105	return apply_filters( 'yikes-mailchimp-integration-is-user-subscribed', $subscribed, $type );
106	106	}
		@@ -114,12 +114,12 @@ discard block
		block discarded – undo
114	114
115	115	// Get our options.
116	116	$checkbox_options = get_option( 'optin-checkbox-init', array() );
117		- $has_list_ids = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'] && is_array( $checkbox_options[ $this->type ]['associated-list'] );
118		- $has_list_ids = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true );
	117	+ $has_list_ids = isset( $checkbox_options[ $this->type ][ 'associated-list' ] ) && '-' !== $checkbox_options[ $this->type ][ 'associated-list' ] && is_array( $checkbox_options[ $this->type ][ 'associated-list' ] );
	118	+ $has_list_ids = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ][ 'associated-list' ], true );
119	119
120	120	if ( $has_list_ids ) {
121		- $label = isset( $checkbox_options[ $this->type ]['label'] ) && ! empty( $checkbox_options[ $this->type ]['label'] ) ? trim( $checkbox_options[ $this->type ]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
122		- $checked = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : '';
	121	+ $label = isset( $checkbox_options[ $this->type ][ 'label' ] ) && ! empty( $checkbox_options[ $this->type ][ 'label' ] ) ? trim( $checkbox_options[ $this->type ][ 'label' ] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
	122	+ $checked = 'true' === $checkbox_options[ $this->type ][ 'precheck' ] ? 'checked="checked"' : '';
123	123	$before = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );
124	124	$content = '<p id="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox" class="yikes-easy-mailchimp-' . esc_attr( $this->type ) . '-checkbox">';
125	125	$content .= '<label>';
		@@ -149,7 +149,7 @@ discard block
		block discarded – undo
149	149	$options = get_option( 'optin-checkbox-init', '' );
150	150
151	151	// Make sure we have a list ID.
152		- if ( ! isset( $options[ $type ] ) \|\| ! isset( $options[ $type ]['associated-list'] ) ) {
	152	+ if ( ! isset( $options[ $type ] ) \|\| ! isset( $options[ $type ][ 'associated-list' ] ) ) {
153	153	// @todo: Throw some kind of error?
154	154	return;
155	155	}
		@@ -157,14 +157,14 @@ discard block
		block discarded – undo
157	157	$email = sanitize_email( $email );
158	158
159	159	// Check for an IP address.
160		- $user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
161		- if ( isset( $merge_vars['OPTIN_IP'] ) ) {
162		- $user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );
	160	+ $user_ip = sanitize_text_field( $_SERVER[ 'REMOTE_ADDR' ] );
	161	+ if ( isset( $merge_vars[ 'OPTIN_IP' ] ) ) {
	162	+ $user_ip = sanitize_text_field( $merge_vars[ 'OPTIN_IP' ] );
163	163	}
164	164
165	165	// Build our request data.
166		- $list_ids = $options[ $type ]['associated-list'];
167		- $list_ids = is_array( $options[ $type ]['associated-list'] ) ? $options[ $type ]['associated-list'] : array( $options[ $type ]['associated-list'] );
	166	+ $list_ids = $options[ $type ][ 'associated-list' ];
	167	+ $list_ids = is_array( $options[ $type ][ 'associated-list' ] ) ? $options[ $type ][ 'associated-list' ] : array( $options[ $type ][ 'associated-list' ] );
168	168	$id = md5( $email );
169	169	$data = array(
170	170	'email_address' => $email,
		@@ -176,7 +176,7 @@ discard block
		block discarded – undo
176	176
177	177	foreach ( $list_ids as $list_id ) {
178	178
179		- $interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();
	179	+ $interests = isset( $options[ $type ][ 'interest-groups' ] ) ? $options[ $type ][ 'interest-groups' ] : array();
180	180	$interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests;
181	181
182	182	// Only re-format and add interest groups if not empty.
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	}
193	193	}
194	194
195		- $data['interests'] = $groups;
	195	+ $data[ 'interests' ] = $groups;
196	196	}
197	197
198	198	/**
		@@ -218,8 +218,8 @@ discard block
		block discarded – undo
218	218	$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type, $integration_vars );
219	219
220	220	// Don't send an empty merge fields array.
221		- if ( empty( $data['merge_fields'] ) ) {
222		- unset( $data['merge_fields'] );
	221	+ if ( empty( $data[ 'merge_fields' ] ) ) {
	222	+ unset( $data[ 'merge_fields' ] );
223	223	}
224	224
225	225	// Subscribe the user to the list via the API.
		@@ -249,10 +249,10 @@ discard block
		block discarded – undo
249	249	$merge_vars = array();
250	250
251	251	if ( ! empty( $user->first_name ) ) {
252		- $merge_vars['FNAME'] = $user->first_name;
	252	+ $merge_vars[ 'FNAME' ] = $user->first_name;
253	253	}
254	254	if ( ! empty( $user->last_name ) ) {
255		- $merge_vars['LNAME'] = $user->last_name;
	255	+ $merge_vars[ 'LNAME' ] = $user->last_name;
256	256	}
257	257
258	258	/**

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	/**
10	10	* Main Checkbox Integration class.
11	11	*/
12		-class Yikes_Easy_MC_Checkbox_Integration_Class {
	12	+class Yikes_Easy_MC_Checkbox_Integration_Class {
13	13
14	14	/**
15	15	* The integration type.
		@@ -28,10 +28,10 @@ discard block
		block discarded – undo
28	28	*
29	29	* @return bool Whether the current user is subscribed to a list.
30	30	*/
31		- public function is_user_already_subscribed( $type, $email = '' ) {
	31	+ public function is_user_already_subscribed( $type, $email = '' ) {
32	32	// Make sure we have an email address to use.
33		- if ( empty( $email ) ) {
34		- if ( ! is_user_logged_in() ) {
	33	+ if ( empty( $email ) ) {
	34	+ if ( ! is_user_logged_in() ) {
35	35	return false;
36	36	}
37	37
		@@ -40,13 +40,13 @@ discard block
		block discarded – undo
40	40	}
41	41
42	42	// Ensure we have a valid email.
43		- if ( ! is_email( $email ) ) {
	43	+ if ( ! is_email( $email ) ) {
44	44	return false;
45	45	}
46	46
47	47	// Convert the integration type to a list ID.
48	48	$checkbox_options = get_option( 'optin-checkbox-init', '' );
49		- if ( empty( $checkbox_options ) \|\| ! isset( $checkbox_options[ $type ] ) \|\| ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
	49	+ if ( empty( $checkbox_options ) \|\| ! isset( $checkbox_options[ $type ] ) \|\| ! isset( $checkbox_options[ $type ]['associated-list'] ) ) {
50	50	return false;
51	51	}
52	52
		@@ -54,8 +54,8 @@ discard block
		block discarded – undo
54	54	$list_ids = is_array( $list_ids ) ? $list_ids : array( $list_ids );
55	55
56	56	// Go through each list...
57		- foreach ( $list_ids as $list_id ) {
58		- if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {
	57	+ foreach ( $list_ids as $list_id ) {
	58	+ if ( ! $this->is_user_subscribed( $email, $list_id, $type ) ) {
59	59	return false;
60	60	}
61	61	}
		@@ -74,19 +74,19 @@ discard block
		block discarded – undo
74	74	*
75	75	* @return bool Whether the email is subscribed to the list.
76	76	*/
77		- public function is_user_subscribed( $email, $list_id, $type ) {
	77	+ public function is_user_subscribed( $email, $list_id, $type ) {
78	78	$email = sanitize_email( $email );
79	79	$email_hash = md5( $email );
80	80
81	81	// Check the API to see the status.
82	82	$response = yikes_get_mc_api_manager()->get_list_handler()->get_member( $list_id, $email_hash, false );
83		- if ( is_wp_error( $response ) ) {
	83	+ if ( is_wp_error( $response ) ) {
84	84	$data = $response->get_error_data();
85	85
86	86	// If the error response is a 404, they are not subscribed.
87		- if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
	87	+ if ( isset( $data['status'] ) && 404 === (int) $data['status'] ) {
88	88	return false;
89		- } else {
	89	+ } else {
90	90	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
91	91	$error_logging->maybe_write_to_log(
92	92	$response->get_error_code(),
		@@ -110,14 +110,14 @@ discard block
		block discarded – undo
110	110	*
111	111	* @return string The HTML for the checkbox.
112	112	*/
113		- public function yikes_get_checkbox() {
	113	+ public function yikes_get_checkbox() {
114	114
115	115	// Get our options.
116	116	$checkbox_options = get_option( 'optin-checkbox-init', array() );
117	117	$has_list_ids = isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'] && is_array( $checkbox_options[ $this->type ]['associated-list'] );
118	118	$has_list_ids = $has_list_ids && ! in_array( '-', $checkbox_options[ $this->type ]['associated-list'], true );
119	119
120		- if ( $has_list_ids ) {
	120	+ if ( $has_list_ids ) {
121	121	$label = isset( $checkbox_options[ $this->type ]['label'] ) && ! empty( $checkbox_options[ $this->type ]['label'] ) ? trim( $checkbox_options[ $this->type ]['label'] ) : __( 'Sign me up for your mailing list.', 'yikes-inc-easy-mailchimp-extender' );
122	122	$checked = 'true' === $checkbox_options[ $this->type ]['precheck'] ? 'checked="checked"' : '';
123	123	$before = apply_filters( 'yikes-mailchimp-before-checkbox-html', '' );
		@@ -145,11 +145,11 @@ discard block
		block discarded – undo
145	145	* @param array $merge_vars The array of form data to send.
146	146	* @param array $integration_vars An array of additional information that can be used to filter the subscribe request.
147	147	*/
148		- public function subscribe_user_integration( $email, $type, $merge_vars, $integration_vars = array() ) {
	148	+ public function subscribe_user_integration( $email, $type, $merge_vars, $integration_vars = array() ) {
149	149	$options = get_option( 'optin-checkbox-init', '' );
150	150
151	151	// Make sure we have a list ID.
152		- if ( ! isset( $options[ $type ] ) \|\| ! isset( $options[ $type ]['associated-list'] ) ) {
	152	+ if ( ! isset( $options[ $type ] ) \|\| ! isset( $options[ $type ]['associated-list'] ) ) {
153	153	// @todo: Throw some kind of error?
154	154	return;
155	155	}
		@@ -158,7 +158,7 @@ discard block
		block discarded – undo
158	158
159	159	// Check for an IP address.
160	160	$user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
161		- if ( isset( $merge_vars['OPTIN_IP'] ) ) {
	161	+ if ( isset( $merge_vars['OPTIN_IP'] ) ) {
162	162	$user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );
163	163	}
164	164
		@@ -174,19 +174,19 @@ discard block
		block discarded – undo
174	174	'ip_signup' => $user_ip,
175	175	);
176	176
177		- foreach ( $list_ids as $list_id ) {
	177	+ foreach ( $list_ids as $list_id ) {
178	178
179	179	$interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();
180	180	$interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests;
181	181
182	182	// Only re-format and add interest groups if not empty.
183		- if ( ! empty( $interests ) ) {
	183	+ if ( ! empty( $interests ) ) {
184	184	$groups = array();
185	185
186	186	// Need to reformat interest groups array as $interest_group_ID => true.
187		- foreach ( $interests as $interest ) {
188		- if ( is_array( $interest ) ) {
189		- foreach ( $interest as $group_id ) {
	187	+ foreach ( $interests as $interest ) {
	188	+ if ( is_array( $interest ) ) {
	189	+ foreach ( $interest as $group_id ) {
190	190	$groups[ $group_id ] = true;
191	191	}
192	192	}
		@@ -218,14 +218,14 @@ discard block
		block discarded – undo
218	218	$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type, $integration_vars );
219	219
220	220	// Don't send an empty merge fields array.
221		- if ( empty( $data['merge_fields'] ) ) {
	221	+ if ( empty( $data['merge_fields'] ) ) {
222	222	unset( $data['merge_fields'] );
223	223	}
224	224
225	225	// Subscribe the user to the list via the API.
226	226	$response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, $id, $data );
227	227
228		- if ( is_wp_error( $response ) ) {
	228	+ if ( is_wp_error( $response ) ) {
229	229	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
230	230	$error_logging->maybe_write_to_log(
231	231	$response->get_error_code(),
		@@ -243,15 +243,15 @@ discard block
		block discarded – undo
243	243	*
244	244	* @param WP_User $user A WP User.
245	245	*/
246		- public function user_merge_vars( WP_User $user ) {
	246	+ public function user_merge_vars( WP_User $user ) {
247	247
248	248	// Setup our array.
249	249	$merge_vars = array();
250	250
251		- if ( ! empty( $user->first_name ) ) {
	251	+ if ( ! empty( $user->first_name ) ) {
252	252	$merge_vars['FNAME'] = $user->first_name;
253	253	}
254		- if ( ! empty( $user->last_name ) ) {
	254	+ if ( ! empty( $user->last_name ) ) {
255	255	$merge_vars['LNAME'] = $user->last_name;
256	256	}
257	257
		@@ -275,7 +275,7 @@ discard block
		block discarded – undo
275	275	*
276	276	* @return bool True if the checkbox was checked.
277	277	*/
278		- public function was_checkbox_checked( $type ) {
	278	+ public function was_checkbox_checked( $type ) {
279	279	return isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && '1' === filter_var( $_POST[ 'yikes_mailchimp_checkbox_' . $type ], FILTER_SANITIZE_STRING );
280	280	}
281	281	}

yikesinc / yikes-inc-easy-mailchimp-extender

Pull Request — master (#862)

Status

Category

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

Braces +28 added lines, -28 removed lines patch added patch discarded remove patch