yikesinc / yikes-inc-easy-mailchimp-extender

admin/partials/menu/options-sections/general-settings.php

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 $yikes_mc_api_constant = ( defined( 'YIKES_MC_API_KEY' ) ) ? true : false;
 ?>
 
-<h3><span><?php _e( 'General Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
+<h3><span><?php _e( 'General Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span><?php echo $api_connection; ?></h3>
 <div class="inside">
 
 	<!-- Settings Form -->
@@ -21,11 +21,11 @@ 
 		<!-- MailChimp API Input Field -->
 		<label for="yks-mailchimp-api-key">
 
-			<p><?php _e( 'Enter your API key in the field below to connect your site to your MailChimp account.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+			<p><?php _e( 'Enter your API key in the field below to connect your site to your MailChimp account.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
-			<p><strong><?php _e( 'MailChimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+			<p><strong><?php _e( 'MailChimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 
-			<input autocomplete="off" <?php if ( $yikes_mc_api_constant ) { echo 'readonly="readonly"'; } if( strlen( yikes_get_mc_api_key() ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo yikes_get_mc_api_key(); ?>" placeholder="<?php _e( 'MailChimp API Key' , 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" />
+			<input autocomplete="off" <?php if ( $yikes_mc_api_constant ) { echo 'readonly="readonly"'; } if ( strlen( yikes_get_mc_api_key() ) > 0 ) { ?> type="password" <?php } else { ?> type="text" <?php } ?> value="<?php echo yikes_get_mc_api_key(); ?>" placeholder="<?php _e( 'MailChimp API Key', 'yikes-inc-easy-mailchimp-extender' ); ?>" name="yikes-mc-api-key" id="yikes-mc-api-key" class="settings-page-input" />
 
 			<?php if ( $yikes_mc_api_constant ) { ?>
 				<p class="description"><?php printf( __( "Your MailChimp API key has been defined using the %s constant, in a PHP file.", "yikes-inc-easy-mailchimp-extender" ), '<code>YIKES_MC_API_KEY</code>' ); ?></p>
@@ -34,21 +34,21 @@ 
 			<?php echo $api_error_response; ?>
 
 			<?php if ( ! $yikes_mc_api_constant ) { ?>
-				<p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here' , 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
+				<p class="description"><small><a href="https://admin.mailchimp.com/account/api" target="_blank" title="<?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( 'Get your API key here', 'yikes-inc-easy-mailchimp-extender' ); ?></a></small></p>
 			<?php } ?>
 
 			<p class="description">Warning: changing your API key will break your current forms.</p>
 		</label>
 
 		<!-- Use Nonce Validation Field -->		
-		<p><strong><?php _e( 'Enable nonce validation on this site?' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+		<p><strong><?php _e( 'Enable nonce validation on this site?', 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<label for="yikes-mailchimp-use-nonce-yes">
 			Yes
-			<input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-yes" class="settings-page-input" value="1" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ) , '1' ); ?> />
+			<input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-yes" class="settings-page-input" value="1" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ), '1' ); ?> />
 		</label>
 		<label for="yikes-mailchimp-use-nonce-no">
 			No
-			<input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-no" class="settings-page-input" value="0" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ) , '0' ); ?> />
+			<input type="radio" name="yikes-mailchimp-use-nonce" id="yikes-mailchimp-use-nonce-no" class="settings-page-input" value="0" <?php checked( get_option( 'yikes-mailchimp-use-nonce', '1' ), '0' ); ?> />
 		</label>
 
 	<?php submit_button(); ?>

admin/partials/menu/options-sections/import-export-forms.php

Spacing +17 added lines, -17 removed lines

@@ -3,15 +3,15 @@ 
 $form_interface = yikes_easy_mailchimp_extender_get_form_interface();
 $all_forms = $form_interface->get_all_forms();
 ?>
-<h3><span><?php _e( 'Import/Export Forms & Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Import/Export Forms & Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 
 	<!-- Export Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms' , 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">
-		<p><strong><?php _e( "Export Forms" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-forms', 'nonce' => wp_create_nonce( 'export-forms' ) ) ) ); ?>" method="post">
+		<p><strong><?php _e( "Export Forms", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for MailChimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site." , "yikes-inc-easy-mailchimp-extender" ); ?>
+			<?php _e( "Select the forms you would like to export. When you click the download button below, Easy Forms for MailChimp will create a CSV file for you to save to your computer. Once you've saved the download file, you can use the Import tool to import the forms to this or any other site.", "yikes-inc-easy-mailchimp-extender" ); ?>
 		</p>
 
 		<?php if ( empty( $all_forms ) ) { ?>
@@ -20,44 +20,44 @@ 
 			</p>
 		<?php } else { ?>
 			<!-- custom list so users can export specific forms -->
-			<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?></a>
+			<a class="toggle-custom-lists button-secondary" onclick="jQuery(this).next().slideToggle();return false;"><?php _e( 'Select Forms', 'yikes-inc-easy-mailchimp-extender' ); ?></a>
 			<ul class="export-custom-forms-list">
-				<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
-				<?php foreach( $all_forms as $id => $form ) { ?>
-					<li><label><input type="checkbox" name="yikes_export_forms[]" value="<?php echo (int) $id; ?>"><?php echo esc_html( $form['form_name'] ); ?></label></li>
+				<p class="description"><?php _e( 'Select which forms to export. Leave all checkboxes unchecked to export all of your forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+				<?php foreach ( $all_forms as $id => $form ) { ?>
+					<li><label><input type="checkbox" name="yikes_export_forms[]" value="<?php echo (int) $id; ?>"><?php echo esc_html( $form[ 'form_name' ] ); ?></label></li>
 				<?php } ?>
 			</ul>
 		<?php } ?>
 		<!-- check if any of our transients contain data -->
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Opt-in Forms', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 	</form>
 	
 	<hr />
 	
 	<!-- Export Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings' , 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">
-		<p><strong><?php _e( "Export Settings" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-export-settings', 'nonce' => wp_create_nonce( 'export-settings' ) ) ) ); ?>" method="post">
+		<p><strong><?php _e( "Export Settings", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Export YIKES Easy Forms for MailChimp plugin settings." , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php _e( "Export YIKES Easy Forms for MailChimp plugin settings.", 'yikes-inc-easy-mailchimp-extender' ); ?>
 		</p>
 
 		<!-- check if any of our transients contain data -->
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Export Plugin Settings', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 	</form>
 	
 	<hr />
 	
 	<!-- Import Form -->
-	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms' , 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">
-		<p><strong><?php _e( "Import" , 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
+	<form action="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-import-forms', 'nonce' => wp_create_nonce( 'import-forms' ) ) ) ); ?>" method="post" enctype="multipart/form-data">
+		<p><strong><?php _e( "Import", 'yikes-inc-easy-mailchimp-extender' ); ?></strong></p>
 		<p class="description">
-			<?php _e( "Select the Easy Forms for MailChimp export file you would like to import. You can use this field to import your opt-in forms or settings. " , 'yikes-inc-easy-mailchimp-extender' ); ?>
+			<?php _e( "Select the Easy Forms for MailChimp export file you would like to import. You can use this field to import your opt-in forms or settings. ", 'yikes-inc-easy-mailchimp-extender' ); ?>
 		</p>
 		<label>
 			<input type="file" name="csv" id="forms_to_import">
 		</label>
 		<!-- check if any of our transients contain data -->
-		<p><input type="submit" class="button-primary" value="<?php _e( 'Import' , 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
+		<p><input type="submit" class="button-primary" value="<?php _e( 'Import', 'yikes-inc-easy-mailchimp-extender' ); ?>" /></p>
 	</form>
 	
 </div> <!-- .inside -->

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

Spacing +3 added lines, -3 removed lines

@@ -64,13 +64,13 @@ 
 		$checkbox_options = get_option( 'optin-checkbox-init', array() );
 
 		// Only display the field if a list is set.
-		if ( isset( $checkbox_options[ $this->type ] ) && isset( $checkbox_options[ $this->type ]['associated-list'] ) && '-' !== $checkbox_options[ $this->type ]['associated-list'] ) {
+		if ( isset( $checkbox_options[ $this->type ] ) && isset( $checkbox_options[ $this->type ][ 'associated-list' ] ) && '-' !== $checkbox_options[ $this->type ][ 'associated-list' ] ) {
 
 			if ( $this->is_user_already_subscribed( $this->type ) ) {
 				return $fields;
 			}
 
-			$precheck = isset( $checkbox_options[ $this->type ]['precheck'] ) && 'true' === $checkbox_options[ $this->type ]['precheck'] ? '1' : '0';
+			$precheck = isset( $checkbox_options[ $this->type ][ 'precheck' ] ) && 'true' === $checkbox_options[ $this->type ][ 'precheck' ] ? '1' : '0';
 
 			/**
 			* Filter where the checkbox goes.
@@ -85,7 +85,7 @@ 
 				'id'      => 'yikes_mailchimp_checkbox_' . $this->type,
 				'type'    => 'checkbox',
 				'class'   => apply_filters( 'yikes-mailchimp-wooco-integration-checkbox-classes', array( 'form-row-wide' ) ),
-				'label'   => $checkbox_options[ $this->type ]['label'],
+				'label'   => $checkbox_options[ $this->type ][ 'label' ],
 				'default' => $precheck,
 			);
 

Indentation +13 added lines, -13 removed lines

@@ -72,12 +72,12 @@ 
 			$precheck = isset( $checkbox_options[ $this->type ]['precheck'] ) && 'true' === $checkbox_options[ $this->type ]['precheck'] ? '1' : '0';
 
 			/**
-			* Filter where the checkbox goes.
-			*
-			* See this WooCo article for possible values: https://docs.woocommerce.com/document/tutorial-customising-checkout-fields-using-actions-and-filters/
-			*
-			* @param string | Which set of fields the checkbox should go into
-			*/
+			 * Filter where the checkbox goes.
+			 *
+			 * See this WooCo article for possible values: https://docs.woocommerce.com/document/tutorial-customising-checkout-fields-using-actions-and-filters/
+			 *
+			 * @param string | Which set of fields the checkbox should go into
+			 */
 			$field_placement = apply_filters( 'yikes-mailchimp-wooco-integration-checkbox-placement', 'billing' );
 
 			$yikes_checkbox = array(
@@ -89,13 +89,13 @@ 
 			);
 
 			/**
-			* Filter the checkbox data.
-			*
-			* See this WooCo article for possible values: https://docs.woocommerce.com/document/tutorial-customising-checkout-fields-using-actions-and-filters/
-			*
-			* @param  array $yikes_checkbox The checkbox's fields.
-			* @return array $yikes_checkbox The checkbox's fields.
-			*/
+			 * Filter the checkbox data.
+			 *
+			 * See this WooCo article for possible values: https://docs.woocommerce.com/document/tutorial-customising-checkout-fields-using-actions-and-filters/
+			 *
+			 * @param  array $yikes_checkbox The checkbox's fields.
+			 * @return array $yikes_checkbox The checkbox's fields.
+			 */
 			$yikes_checkbox = apply_filters( 'yikes_mailchimp_wooco_integration_checkbox_field', $yikes_checkbox, $checkbox_options[ $this->type ] );
 
 			$fields[ $field_placement ][ 'yikes_mailchimp_checkbox_' . $this->type ] = $yikes_checkbox;

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' ];
 		}
 
 		// Subscribe the user.

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

Spacing +3 added lines, -3 removed lines

@@ -75,12 +75,12 @@
 
 		// 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' ],
 		);
 
 		// Subscribe the user.
-		$this->subscribe_user_integration( $comment_data['comment_author_email'], $this->type, $merge_vars );
+		$this->subscribe_user_integration( $comment_data[ 'comment_author_email' ], $this->type, $merge_vars );
 	}
 }
 $yikes_easy_mc_comment_checkbox_class = new Yikes_Easy_MC_Comment_Checkbox_Class();

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 );
 			$this->subscribe_user_integration( $email, $this->type, apply_filters( 'yikes-mailchimp-contact-form-7', $fields, $data ) );
 		}

blocks/api/api.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 			wp_send_json_error( '1' );
 		}
 
-		$form_id = isset( $_POST['form_id'] ) ? filter_var( wp_unslash( $_POST['form_id'] ), FILTER_SANITIZE_NUMBER_INT ) : '';
+		$form_id = isset( $_POST[ 'form_id' ] ) ? filter_var( wp_unslash( $_POST[ 'form_id' ] ), FILTER_SANITIZE_NUMBER_INT ) : '';
 
 		if ( empty( $form_id ) ) {
 			wp_send_json_error( '1' );
@@ -75,12 +75,12 @@ 
 
 			$locale   = get_locale();
 			$locale_a = explode( '_', $locale );
-			$locale   = isset( $locale_a[0] ) ? $locale_a[0] : $locale;
+			$locale   = isset( $locale_a[ 0 ] ) ? $locale_a[ 0 ] : $locale;
 			$return   = apply_filters( 'yikes_mailchimp_recaptcha_data', array(
 				'site_key'   => $site_key,
 				'secret_key' => $secret_key,
 				'locale'     => $locale,
-			));
+			) );
 
 			wp_send_json_success( $return );
 		}

blocks/blocks.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	public function register_blocks() {
 		register_block_type( static::BLOCK_NAMESPACE . static::BLOCK, array(
 			'render_callback' => array( $this, 'render_block' ),
-		));
+		) );
 	}
 
 	/**

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;

 		}

 

 		/**

Braces +28 added lines, -28 removed lines

@@ -9,7 +9,7 @@ 
 /**

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

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

 

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

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

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

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

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

 	 * @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 );

 	}

 }