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>';

@@ -149,7 +149,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;

 		}

@@ -157,14 +157,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,

@@ -176,7 +176,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.

@@ -192,7 +192,7 @@ 
 					}

 				}

 

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

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

 			}

 

 			/**

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

 		}

 

 		/**

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

Spacing +3 added lines, -3 removed lines

@@ -75,14 +75,14 @@
 
 		// Create merge variables based on comment data.
 		$merge_vars = array(
-			'FNAME'    => $comment_data['comment_author'],
-			'OPTIN_IP' => $comment_data['comment_author_IP'],
+			'FNAME'    => $comment_data[ 'comment_author' ],
+			'OPTIN_IP' => $comment_data[ 'comment_author_IP' ],
 		);
 
 		$addl_vars = apply_filters( 'yikes_mailchimp_checkbox_integration_additional_vars', array( 'comment_data' => $comment_data ), $this->type );
 
 		// Subscribe the user.
-		$this->subscribe_user_integration( $comment_data['comment_author_email'], $this->type, $merge_vars, $addl_vars );
+		$this->subscribe_user_integration( $comment_data[ 'comment_author_email' ], $this->type, $merge_vars, $addl_vars );
 	}
 }
 $yikes_easy_mc_comment_checkbox_class = new Yikes_Easy_MC_Comment_Checkbox_Class();

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

Spacing +4 added lines, -4 removed lines

@@ -80,11 +80,11 @@
 
 		$user_info  = (array) edd_get_payment_meta_user_info( $payment_id );
 		$merge_vars = array();
-		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' ];
 		}
 
 		$addl_vars = apply_filters( 'yikes_mailchimp_checkbox_integration_additional_vars', array( 'user' => $user_info, 'payment_id' => $payment_id ), $this->type );

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

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 	 * @return array $data CF7 posted data.
 	 */
 	public function alter_cf7_data( $data = array() ) {
-		$data['yikes_mailchimp_checkbox'] = $this->was_checkbox_checked( $this->type ) ? __( 'Yes', 'yikes-inc-easy-mailchimp-extender' ) : __( 'No', 'yikes-inc-easy-mailchimp-extender' );
+		$data[ 'yikes_mailchimp_checkbox' ] = $this->was_checkbox_checked( $this->type ) ? __( 'Yes', 'yikes-inc-easy-mailchimp-extender' ) : __( 'No', 'yikes-inc-easy-mailchimp-extender' );
 		return $data;
 	}
 
@@ -65,7 +65,7 @@ 
 		$submission          = WPCF7_Submission::get_instance();
 		if ( $submission ) {
 			$data      = $submission->get_posted_data();
-			$email     = isset( $data['your-email'] ) ? $data['your-email'] : '';
+			$email     = isset( $data[ 'your-email' ] ) ? $data[ 'your-email' ] : '';
 			$fields    = array( 'email' => $email );
 			$addl_vars = apply_filters( 'yikes_mailchimp_checkbox_integration_additional_vars', array( 'cf7_data' => $data, 'contact_form' => $contact_form ), $this->type );
 			$this->subscribe_user_integration( $email, $this->type, apply_filters( 'yikes-mailchimp-contact-form-7', $fields, $data ), $addl_vars );