yikesinc / yikes-inc-easy-mailchimp-extender

public/classes/checkbox-integrations.php

Spacing +20 added lines, -20 removed lines

@@ -46,11 +46,11 @@ 
 

 		// 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 @@ 
 			$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 @@ 
 		}

 

 		// 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 @@ 
 

 		// 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 @@ 
 		$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 @@ 
 		$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 @@ 
 

 		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 @@ 
 					}

 				}

 

-				$data['interests'] = $groups;

+				$data[ 'interests' ] = $groups;

 			}

 

 			/**

@@ -217,8 +217,8 @@ 
 			$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 @@ 
 		$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;

 		}

 

 		/**

yikes-inc-easy-mailchimp-extender.php

Spacing +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
  * 	@since 6.1.3
  */
 if ( ! defined( 'YIKES_MC_VERSION' ) ) {
-	define( 'YIKES_MC_VERSION' , '6.4.11' );
+	define( 'YIKES_MC_VERSION', '6.4.11' );
 }
 
 /**
@@ -52,7 +52,7 @@ 
  * 	@since 6.0.0
  */
 if ( ! defined( 'YIKES_MC_PATH' ) ) {
-	define( 'YIKES_MC_PATH' , plugin_dir_path( __FILE__ ) );
+	define( 'YIKES_MC_PATH', plugin_dir_path( __FILE__ ) );
 }
 
 /**
@@ -61,7 +61,7 @@ 
  * 	@since 6.0.0
  */
 if ( ! defined( 'YIKES_MC_URL' ) ) {
-	define( 'YIKES_MC_URL' , plugin_dir_url( __FILE__ ) );
+	define( 'YIKES_MC_URL', plugin_dir_url( __FILE__ ) );
 }
 
 // Include our autoloader