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

Completed

Pull Request — master (#808)

unknown

created 2019-01-30 17:01 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'];
-		$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' ];
+		$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>';
@@ -148,7 +148,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;
 		}
@@ -156,14 +156,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,
@@ -175,7 +175,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.
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
 					}
 				}
 
-				$data['interests'] = $groups;
+				$data[ 'interests' ] = $groups;
 			}
 
 			/**
@@ -217,8 +217,8 @@  discard block
 block discarded – undo
 			$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type );
 
 			// 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.
@@ -248,10 +248,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'];
 		$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', '' );
@@ -144,11 +144,11 @@  discard block
 block discarded – undo
 	 * @param string $type       The integration type.
 	 * @param array  $merge_vars The array of form data to send.
 	 */
-	public function subscribe_user_integration( $email, $type, $merge_vars ) {
+	public function subscribe_user_integration( $email, $type, $merge_vars ) {
 		$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,7 +157,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'] );
 		}
 
@@ -173,19 +173,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;
 						}
 					}
@@ -217,14 +217,14 @@  discard block
 block discarded – undo
 			$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type );
 
 			// 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(),
@@ -242,15 +242,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;
 		}
 
@@ -274,7 +274,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.

blocks/easy-forms-block/easy-forms-block.php 1 patch

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

@@ -66,47 +66,47 @@
 block discarded – undo
 	 */
 	public function render_block( $attributes, $content ) {
 
-		if ( ! isset( $attributes['form_id'] ) ) {
+		if ( ! isset( $attributes[ 'form_id' ] ) ) {
 			return;
 		}
 
 		$shortcode_attributes = array(
-			'form'                       => $attributes['form_id'],
-			'submit'                     => isset( $attributes['submit_button_text'] ) && ! empty( $attributes['submit_button_text'] ) ? $attributes['submit_button_text'] : '',
-			'title'                      => isset( $attributes['show_title'] ) && true === $attributes['show_title'] ? '1' : '0',
-			'custom_title'               => isset( $attributes['form_title'] ) ? $attributes['form_title'] : '',
-			'description'                => isset( $attributes['show_description'] ) && true === $attributes['show_description'] ? '1' : '0',
-			'custom_description'         => isset( $attributes['form_description'] ) ? $attributes['form_description'] : '',
-			'ajax'                       => isset( $attributes['is_ajax'] ) && true === $attributes['is_ajax'] ? '1' : '0',
-			'recaptcha'                  => isset( $attributes['recaptcha'] ) && false === $attributes['recaptcha'] ? '0' : '',
-			'recaptcha_lang'             => isset( $attributes['recaptcha_lang'] ) ? $attributes['recaptcha_lang'] : '',
-			'recaptcha_type'             => isset( $attributes['recaptcha_type'] ) ? $attributes['recaptcha_type'] : '',
-			'recaptcha_theme'            => isset( $attributes['recaptcha_theme'] ) ? $attributes['recaptcha_theme'] : '',
-			'recaptcha_size'             => isset( $attributes['recaptcha_size'] ) ? $attributes['recaptcha_size'] : '',
-			'recaptcha_data_callback'    => isset( $attributes['recaptcha_verify_callback'] ) ? $attributes['recaptcha_verify_callback'] : '',
-			'recaptcha_expired_callback' => isset( $attributes['recaptcha_expired_callback'] ) ? $attributes['recaptcha_expired_callback'] : '',
-			'inline'                     => isset( $attributes['inline'] ) && true === $attributes['inline'] ? '1' : '0',
+			'form'                       => $attributes[ 'form_id' ],
+			'submit'                     => isset( $attributes[ 'submit_button_text' ] ) && ! empty( $attributes[ 'submit_button_text' ] ) ? $attributes[ 'submit_button_text' ] : '',
+			'title'                      => isset( $attributes[ 'show_title' ] ) && true === $attributes[ 'show_title' ] ? '1' : '0',
+			'custom_title'               => isset( $attributes[ 'form_title' ] ) ? $attributes[ 'form_title' ] : '',
+			'description'                => isset( $attributes[ 'show_description' ] ) && true === $attributes[ 'show_description' ] ? '1' : '0',
+			'custom_description'         => isset( $attributes[ 'form_description' ] ) ? $attributes[ 'form_description' ] : '',
+			'ajax'                       => isset( $attributes[ 'is_ajax' ] ) && true === $attributes[ 'is_ajax' ] ? '1' : '0',
+			'recaptcha'                  => isset( $attributes[ 'recaptcha' ] ) && false === $attributes[ 'recaptcha' ] ? '0' : '',
+			'recaptcha_lang'             => isset( $attributes[ 'recaptcha_lang' ] ) ? $attributes[ 'recaptcha_lang' ] : '',
+			'recaptcha_type'             => isset( $attributes[ 'recaptcha_type' ] ) ? $attributes[ 'recaptcha_type' ] : '',
+			'recaptcha_theme'            => isset( $attributes[ 'recaptcha_theme' ] ) ? $attributes[ 'recaptcha_theme' ] : '',
+			'recaptcha_size'             => isset( $attributes[ 'recaptcha_size' ] ) ? $attributes[ 'recaptcha_size' ] : '',
+			'recaptcha_data_callback'    => isset( $attributes[ 'recaptcha_verify_callback' ] ) ? $attributes[ 'recaptcha_verify_callback' ] : '',
+			'recaptcha_expired_callback' => isset( $attributes[ 'recaptcha_expired_callback' ] ) ? $attributes[ 'recaptcha_expired_callback' ] : '',
+			'inline'                     => isset( $attributes[ 'inline' ] ) && true === $attributes[ 'inline' ] ? '1' : '0',
 		);
 
 		// We want to run process_mailchimp_shortcode() but we need to return 
 		// the plaintext shortcode or Gutenberg will autop() the shortcode content.
 		return sprintf(
 			'[yikes-mailchimp form="%s" submit="%s" title="%s" custom_title="%s" description="%s" custom_description="%s" ajax="%s" recaptcha="%s"  recaptcha_lang="%s" recaptcha_type="%s" recaptcha_theme="%s" recaptcha_size="%s" recaptcha_data_callback="%s" recaptcha_expired_callback="%s" inline="%s"]',
-			$shortcode_attributes['form'],
-			$shortcode_attributes['submit'],
-			$shortcode_attributes['title'],
-			$shortcode_attributes['custom_title'],
-			$shortcode_attributes['description'],
-			$shortcode_attributes['custom_description'],
-			$shortcode_attributes['ajax'],
-			$shortcode_attributes['recaptcha'],
-			$shortcode_attributes['recaptcha_lang'],
-			$shortcode_attributes['recaptcha_type'],
-			$shortcode_attributes['recaptcha_theme'],
-			$shortcode_attributes['recaptcha_size'],
-			$shortcode_attributes['recaptcha_data_callback'],
-			$shortcode_attributes['recaptcha_expired_callback'],
-			$shortcode_attributes['inline']
+			$shortcode_attributes[ 'form' ],
+			$shortcode_attributes[ 'submit' ],
+			$shortcode_attributes[ 'title' ],
+			$shortcode_attributes[ 'custom_title' ],
+			$shortcode_attributes[ 'description' ],
+			$shortcode_attributes[ 'custom_description' ],
+			$shortcode_attributes[ 'ajax' ],
+			$shortcode_attributes[ 'recaptcha' ],
+			$shortcode_attributes[ 'recaptcha_lang' ],
+			$shortcode_attributes[ 'recaptcha_type' ],
+			$shortcode_attributes[ 'recaptcha_theme' ],
+			$shortcode_attributes[ 'recaptcha_size' ],
+			$shortcode_attributes[ 'recaptcha_data_callback' ],
+			$shortcode_attributes[ 'recaptcha_expired_callback' ],
+			$shortcode_attributes[ 'inline' ]
 		);
 	}
 }

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'];
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' ];
	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>';
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	$options = get_option( 'optin-checkbox-init', '' );
149	149
150	150	// Make sure we have a list ID.
151		- if ( ! isset( $options[ $type ] ) \|\| ! isset( $options[ $type ]['associated-list'] ) ) {
	151	+ if ( ! isset( $options[ $type ] ) \|\| ! isset( $options[ $type ][ 'associated-list' ] ) ) {
152	152	// @todo: Throw some kind of error?
153	153	return;
154	154	}
		@@ -156,14 +156,14 @@ discard block
		block discarded – undo
156	156	$email = sanitize_email( $email );
157	157
158	158	// Check for an IP address.
159		- $user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
160		- if ( isset( $merge_vars['OPTIN_IP'] ) ) {
161		- $user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );
	159	+ $user_ip = sanitize_text_field( $_SERVER[ 'REMOTE_ADDR' ] );
	160	+ if ( isset( $merge_vars[ 'OPTIN_IP' ] ) ) {
	161	+ $user_ip = sanitize_text_field( $merge_vars[ 'OPTIN_IP' ] );
162	162	}
163	163
164	164	// Build our request data.
165		- $list_ids = $options[ $type ]['associated-list'];
166		- $list_ids = is_array( $options[ $type ]['associated-list'] ) ? $options[ $type ]['associated-list'] : array( $options[ $type ]['associated-list'] );
	165	+ $list_ids = $options[ $type ][ 'associated-list' ];
	166	+ $list_ids = is_array( $options[ $type ][ 'associated-list' ] ) ? $options[ $type ][ 'associated-list' ] : array( $options[ $type ][ 'associated-list' ] );
167	167	$id = md5( $email );
168	168	$data = array(
169	169	'email_address' => $email,
		@@ -175,7 +175,7 @@ discard block
		block discarded – undo
175	175
176	176	foreach ( $list_ids as $list_id ) {
177	177
178		- $interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();
	178	+ $interests = isset( $options[ $type ][ 'interest-groups' ] ) ? $options[ $type ][ 'interest-groups' ] : array();
179	179	$interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests;
180	180
181	181	// Only re-format and add interest groups if not empty.
		@@ -191,7 +191,7 @@ discard block
		block discarded – undo
191	191	}
192	192	}
193	193
194		- $data['interests'] = $groups;
	194	+ $data[ 'interests' ] = $groups;
195	195	}
196	196
197	197	/**
		@@ -217,8 +217,8 @@ discard block
		block discarded – undo
217	217	$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type );
218	218
219	219	// Don't send an empty merge fields array.
220		- if ( empty( $data['merge_fields'] ) ) {
221		- unset( $data['merge_fields'] );
	220	+ if ( empty( $data[ 'merge_fields' ] ) ) {
	221	+ unset( $data[ 'merge_fields' ] );
222	222	}
223	223
224	224	// Subscribe the user to the list via the API.
		@@ -248,10 +248,10 @@ discard block
		block discarded – undo
248	248	$merge_vars = array();
249	249
250	250	if ( ! empty( $user->first_name ) ) {
251		- $merge_vars['FNAME'] = $user->first_name;
	251	+ $merge_vars[ 'FNAME' ] = $user->first_name;
252	252	}
253	253	if ( ! empty( $user->last_name ) ) {
254		- $merge_vars['LNAME'] = $user->last_name;
	254	+ $merge_vars[ 'LNAME' ] = $user->last_name;
255	255	}
256	256
257	257	/**

		@@ -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'];
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', '' );
		@@ -144,11 +144,11 @@ discard block
		block discarded – undo
144	144	* @param string $type The integration type.
145	145	* @param array $merge_vars The array of form data to send.
146	146	*/
147		- public function subscribe_user_integration( $email, $type, $merge_vars ) {
	147	+ public function subscribe_user_integration( $email, $type, $merge_vars ) {
148	148	$options = get_option( 'optin-checkbox-init', '' );
149	149
150	150	// Make sure we have a list ID.
151		- if ( ! isset( $options[ $type ] ) \|\| ! isset( $options[ $type ]['associated-list'] ) ) {
	151	+ if ( ! isset( $options[ $type ] ) \|\| ! isset( $options[ $type ]['associated-list'] ) ) {
152	152	// @todo: Throw some kind of error?
153	153	return;
154	154	}
		@@ -157,7 +157,7 @@ discard block
		block discarded – undo
157	157
158	158	// Check for an IP address.
159	159	$user_ip = sanitize_text_field( $_SERVER['REMOTE_ADDR'] );
160		- if ( isset( $merge_vars['OPTIN_IP'] ) ) {
	160	+ if ( isset( $merge_vars['OPTIN_IP'] ) ) {
161	161	$user_ip = sanitize_text_field( $merge_vars['OPTIN_IP'] );
162	162	}
163	163
		@@ -173,19 +173,19 @@ discard block
		block discarded – undo
173	173	'ip_signup' => $user_ip,
174	174	);
175	175
176		- foreach ( $list_ids as $list_id ) {
	176	+ foreach ( $list_ids as $list_id ) {
177	177
178	178	$interests = isset( $options[ $type ]['interest-groups'] ) ? $options[ $type ]['interest-groups'] : array();
179	179	$interests = isset( $interests[ $list_id ] ) ? $interests[ $list_id ] : $interests;
180	180
181	181	// Only re-format and add interest groups if not empty.
182		- if ( ! empty( $interests ) ) {
	182	+ if ( ! empty( $interests ) ) {
183	183	$groups = array();
184	184
185	185	// Need to reformat interest groups array as $interest_group_ID => true.
186		- foreach ( $interests as $interest ) {
187		- if ( is_array( $interest ) ) {
188		- foreach ( $interest as $group_id ) {
	186	+ foreach ( $interests as $interest ) {
	187	+ if ( is_array( $interest ) ) {
	188	+ foreach ( $interest as $group_id ) {
189	189	$groups[ $group_id ] = true;
190	190	}
191	191	}
		@@ -217,14 +217,14 @@ discard block
		block discarded – undo
217	217	$list_id = apply_filters( 'yikes-mailchimp-checkbox-integration-list-id', $list_id, $data, $type );
218	218
219	219	// Don't send an empty merge fields array.
220		- if ( empty( $data['merge_fields'] ) ) {
	220	+ if ( empty( $data['merge_fields'] ) ) {
221	221	unset( $data['merge_fields'] );
222	222	}
223	223
224	224	// Subscribe the user to the list via the API.
225	225	$response = yikes_get_mc_api_manager()->get_list_handler()->member_subscribe( $list_id, $id, $data );
226	226
227		- if ( is_wp_error( $response ) ) {
	227	+ if ( is_wp_error( $response ) ) {
228	228	$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
229	229	$error_logging->maybe_write_to_log(
230	230	$response->get_error_code(),
		@@ -242,15 +242,15 @@ discard block
		block discarded – undo
242	242	*
243	243	* @param WP_User $user A WP User.
244	244	*/
245		- public function user_merge_vars( WP_User $user ) {
	245	+ public function user_merge_vars( WP_User $user ) {
246	246
247	247	// Setup our array.
248	248	$merge_vars = array();
249	249
250		- if ( ! empty( $user->first_name ) ) {
	250	+ if ( ! empty( $user->first_name ) ) {
251	251	$merge_vars['FNAME'] = $user->first_name;
252	252	}
253		- if ( ! empty( $user->last_name ) ) {
	253	+ if ( ! empty( $user->last_name ) ) {
254	254	$merge_vars['LNAME'] = $user->last_name;
255	255	}
256	256
		@@ -274,7 +274,7 @@ discard block
		block discarded – undo
274	274	*
275	275	* @return bool True if the checkbox was checked.
276	276	*/
277		- public function was_checkbox_checked( $type ) {
	277	+ public function was_checkbox_checked( $type ) {
278	278	return isset( $_POST[ 'yikes_mailchimp_checkbox_' . $type ] ) && '1' === filter_var( $_POST[ 'yikes_mailchimp_checkbox_' . $type ], FILTER_SANITIZE_STRING );
279	279	}
280	280	}

		@@ -66,47 +66,47 @@
		block discarded – undo
66	66	*/
67	67	public function render_block( $attributes, $content ) {
68	68
69		- if ( ! isset( $attributes['form_id'] ) ) {
	69	+ if ( ! isset( $attributes[ 'form_id' ] ) ) {
70	70	return;
71	71	}
72	72
73	73	$shortcode_attributes = array(
74		- 'form' => $attributes['form_id'],
75		- 'submit' => isset( $attributes['submit_button_text'] ) && ! empty( $attributes['submit_button_text'] ) ? $attributes['submit_button_text'] : '',
76		- 'title' => isset( $attributes['show_title'] ) && true === $attributes['show_title'] ? '1' : '0',
77		- 'custom_title' => isset( $attributes['form_title'] ) ? $attributes['form_title'] : '',
78		- 'description' => isset( $attributes['show_description'] ) && true === $attributes['show_description'] ? '1' : '0',
79		- 'custom_description' => isset( $attributes['form_description'] ) ? $attributes['form_description'] : '',
80		- 'ajax' => isset( $attributes['is_ajax'] ) && true === $attributes['is_ajax'] ? '1' : '0',
81		- 'recaptcha' => isset( $attributes['recaptcha'] ) && false === $attributes['recaptcha'] ? '0' : '',
82		- 'recaptcha_lang' => isset( $attributes['recaptcha_lang'] ) ? $attributes['recaptcha_lang'] : '',
83		- 'recaptcha_type' => isset( $attributes['recaptcha_type'] ) ? $attributes['recaptcha_type'] : '',
84		- 'recaptcha_theme' => isset( $attributes['recaptcha_theme'] ) ? $attributes['recaptcha_theme'] : '',
85		- 'recaptcha_size' => isset( $attributes['recaptcha_size'] ) ? $attributes['recaptcha_size'] : '',
86		- 'recaptcha_data_callback' => isset( $attributes['recaptcha_verify_callback'] ) ? $attributes['recaptcha_verify_callback'] : '',
87		- 'recaptcha_expired_callback' => isset( $attributes['recaptcha_expired_callback'] ) ? $attributes['recaptcha_expired_callback'] : '',
88		- 'inline' => isset( $attributes['inline'] ) && true === $attributes['inline'] ? '1' : '0',
	74	+ 'form' => $attributes[ 'form_id' ],
	75	+ 'submit' => isset( $attributes[ 'submit_button_text' ] ) && ! empty( $attributes[ 'submit_button_text' ] ) ? $attributes[ 'submit_button_text' ] : '',
	76	+ 'title' => isset( $attributes[ 'show_title' ] ) && true === $attributes[ 'show_title' ] ? '1' : '0',
	77	+ 'custom_title' => isset( $attributes[ 'form_title' ] ) ? $attributes[ 'form_title' ] : '',
	78	+ 'description' => isset( $attributes[ 'show_description' ] ) && true === $attributes[ 'show_description' ] ? '1' : '0',
	79	+ 'custom_description' => isset( $attributes[ 'form_description' ] ) ? $attributes[ 'form_description' ] : '',
	80	+ 'ajax' => isset( $attributes[ 'is_ajax' ] ) && true === $attributes[ 'is_ajax' ] ? '1' : '0',
	81	+ 'recaptcha' => isset( $attributes[ 'recaptcha' ] ) && false === $attributes[ 'recaptcha' ] ? '0' : '',
	82	+ 'recaptcha_lang' => isset( $attributes[ 'recaptcha_lang' ] ) ? $attributes[ 'recaptcha_lang' ] : '',
	83	+ 'recaptcha_type' => isset( $attributes[ 'recaptcha_type' ] ) ? $attributes[ 'recaptcha_type' ] : '',
	84	+ 'recaptcha_theme' => isset( $attributes[ 'recaptcha_theme' ] ) ? $attributes[ 'recaptcha_theme' ] : '',
	85	+ 'recaptcha_size' => isset( $attributes[ 'recaptcha_size' ] ) ? $attributes[ 'recaptcha_size' ] : '',
	86	+ 'recaptcha_data_callback' => isset( $attributes[ 'recaptcha_verify_callback' ] ) ? $attributes[ 'recaptcha_verify_callback' ] : '',
	87	+ 'recaptcha_expired_callback' => isset( $attributes[ 'recaptcha_expired_callback' ] ) ? $attributes[ 'recaptcha_expired_callback' ] : '',
	88	+ 'inline' => isset( $attributes[ 'inline' ] ) && true === $attributes[ 'inline' ] ? '1' : '0',
89	89	);
90	90
91	91	// We want to run process_mailchimp_shortcode() but we need to return
92	92	// the plaintext shortcode or Gutenberg will autop() the shortcode content.
93	93	return sprintf(
94	94	'[yikes-mailchimp form="%s" submit="%s" title="%s" custom_title="%s" description="%s" custom_description="%s" ajax="%s" recaptcha="%s" recaptcha_lang="%s" recaptcha_type="%s" recaptcha_theme="%s" recaptcha_size="%s" recaptcha_data_callback="%s" recaptcha_expired_callback="%s" inline="%s"]',
95		- $shortcode_attributes['form'],
96		- $shortcode_attributes['submit'],
97		- $shortcode_attributes['title'],
98		- $shortcode_attributes['custom_title'],
99		- $shortcode_attributes['description'],
100		- $shortcode_attributes['custom_description'],
101		- $shortcode_attributes['ajax'],
102		- $shortcode_attributes['recaptcha'],
103		- $shortcode_attributes['recaptcha_lang'],
104		- $shortcode_attributes['recaptcha_type'],
105		- $shortcode_attributes['recaptcha_theme'],
106		- $shortcode_attributes['recaptcha_size'],
107		- $shortcode_attributes['recaptcha_data_callback'],
108		- $shortcode_attributes['recaptcha_expired_callback'],
109		- $shortcode_attributes['inline']
	95	+ $shortcode_attributes[ 'form' ],
	96	+ $shortcode_attributes[ 'submit' ],
	97	+ $shortcode_attributes[ 'title' ],
	98	+ $shortcode_attributes[ 'custom_title' ],
	99	+ $shortcode_attributes[ 'description' ],
	100	+ $shortcode_attributes[ 'custom_description' ],
	101	+ $shortcode_attributes[ 'ajax' ],
	102	+ $shortcode_attributes[ 'recaptcha' ],
	103	+ $shortcode_attributes[ 'recaptcha_lang' ],
	104	+ $shortcode_attributes[ 'recaptcha_type' ],
	105	+ $shortcode_attributes[ 'recaptcha_theme' ],
	106	+ $shortcode_attributes[ 'recaptcha_size' ],
	107	+ $shortcode_attributes[ 'recaptcha_data_callback' ],
	108	+ $shortcode_attributes[ 'recaptcha_expired_callback' ],
	109	+ $shortcode_attributes[ 'inline' ]
110	110	);
111	111	}
112	112	}

yikesinc / yikes-inc-easy-mailchimp-extender

Pull Request — master (#808)

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

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