yikesinc / yikes-inc-easy-mailchimp-extender

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

Spacing +25 added lines, -25 removed lines

@@ -54,23 +54,23 @@ 
 

 	// Easy Digital Downloads.

 	if ( class_exists( 'Easy_Digital_Downloads' ) ) {

-		$active_plugins['easy_digital_downloads_checkout_form'] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'easy_digital_downloads_checkout_form' ] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// WooCommerce.

 	if ( class_exists( 'WooCommerce' ) ) {

-		$active_plugins['woocommerce_checkout_form'] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'woocommerce_checkout_form' ] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// BuddyPress.

 	if ( class_exists( 'BuddyPress' ) ) {

-		$active_plugins['buddypress_form'] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'buddypress_form' ] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// bbPress.

 	if ( class_exists( 'bbPress' ) ) {

-		$active_plugins['bbpress_forms'] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'bbpress_forms' ] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// Contact Form 7.

 	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {

-		$active_plugins['contact_form_7'] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );

+		$active_plugins[ 'contact_form_7' ] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );

 	}

 

 	// store our checkbox options.

@@ -87,7 +87,7 @@ 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 			$error_logging->maybe_write_to_log(

 				$list_data->get_error_code(),

-				__( "Get Account Lists" , 'yikes-inc-easy-mailchimp-extender' ),

+				__( "Get Account Lists", 'yikes-inc-easy-mailchimp-extender' ),

 				"Integration Settings Page"

 			);

 		}

@@ -118,26 +118,26 @@ 
 		<?php

 			if ( ! empty( $active_plugins ) ) {

 

-				foreach( $active_plugins as $class => $value ) {

+				foreach ( $active_plugins as $class => $value ) {

 

-					$checked              = isset( $options[$class]['value'] ) ? 'checked="checked"' : '';

-					$hidden               = ! isset( $options[$class]['value'] ) ? 'yikes-easy-mc-hidden' : '';

-					$checkbox_label       = isset( $options[$class]['label'] ) ? esc_attr( $options[$class]['label'] ) : '';

-					$precheck_checkbox    = isset( $options[$class]['precheck'] ) ? $options[$class]['precheck'] : '';

-					$selected_list        = isset( $options[$class]['associated-list'] ) ? $options[$class]['associated-list'] : '-';

-					$list_interest_groups = isset( $options[$class]['interest-groups'] ) ? $options[$class]['interest-groups'] : false;

+					$checked              = isset( $options[ $class ][ 'value' ] ) ? 'checked="checked"' : '';

+					$hidden               = ! isset( $options[ $class ][ 'value' ] ) ? 'yikes-easy-mc-hidden' : '';

+					$checkbox_label       = isset( $options[ $class ][ 'label' ] ) ? esc_attr( $options[ $class ][ 'label' ] ) : '';

+					$precheck_checkbox    = isset( $options[ $class ][ 'precheck' ] ) ? $options[ $class ][ 'precheck' ] : '';

+					$selected_list        = isset( $options[ $class ][ 'associated-list' ] ) ? $options[ $class ][ 'associated-list' ] : '-';

+					$list_interest_groups = isset( $options[ $class ][ 'interest-groups' ] ) ? $options[ $class ][ 'interest-groups' ] : false;

 

 					// Force the selected list to be an array (@since 6.4).

 					$selected_list        = is_array( $selected_list ) ? $selected_list : array( $selected_list );

 					?>

 						<li class="yikes-mailchimp-checkbox-integration-item">

 							<label>

-								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[$class]; ?></div>

+								<input type="checkbox" name="optin-checkbox-init[<?php echo $class; ?>][value]" value="on" <?php echo $checked; ?> onclick="jQuery(this).parents('li').next().stop().slideToggle();"><?php echo ucwords( $value ); ?><span class="dashicons dashicons-editor-help"></span><div class="tooltiptext qtip-bootstrap" style="display:none;"><?php echo $class_descriptions[ $class ]; ?></div>

 							</label>

 						</li>

 						<!-- checkbox settings, text - associated list etc. -->

 						<li class="optin-checkbox-init[<?php echo $class; ?>]-settings <?php echo $hidden; ?>">

-							<?php if( $class == 'contact_form_7' ) { ?>

+							<?php if ( $class == 'contact_form_7' ) { ?>

 								<p style="margin-top:0;"><small class="contact-form-7-notice"><?php printf( __( 'Use %s in Contact Form 7 to display the checkbox.', 'yikes-inc-easy-mailchimp-extender' ), '<code>[yikes_mailchimp_checkbox]</code>' ); ?></small></p>

 							<?php } ?>

 							<p style="margin-top:0;padding-top:0;margin-bottom:0;padding-bottom:0;">

@@ -147,24 +147,24 @@ 
 									<?php

 									if ( count( $list_data ) > 0 ) {

 									?>

-										<?php foreach( $list_data as $list ) { ?>

+										<?php foreach ( $list_data as $list ) { ?>

 

 											<?php

-												$list_interest_groups = isset( $list_interest_groups[ $list['id'] ] ) ? $list_interest_groups[ $list['id'] ] : $list_interest_groups;

+												$list_interest_groups = isset( $list_interest_groups[ $list[ 'id' ] ] ) ? $list_interest_groups[ $list[ 'id' ] ] : $list_interest_groups;

 											?>

 

-											<label class="yikes-mailchimp-checkbox-integration-list" for="list-<?php echo $class ?>-<?php echo $list['id']; ?>">

+											<label class="yikes-mailchimp-checkbox-integration-list" for="list-<?php echo $class ?>-<?php echo $list[ 'id' ]; ?>">

 												<input type="checkbox" class="checkbox-settings-list-item" data-integration="<?php echo $class; ?>" 

 													name="optin-checkbox-init[<?php echo $class; ?>][associated-list][]"

-													value="<?php echo $list['id']; ?>" <?php echo in_array( $list['id'], $selected_list ) ? 'checked="checked"' : ''; ?> 

-													id="list-<?php echo $class ?>-<?php echo $list['id']; ?>">

-												<?php echo $list['name']; ?>

+													value="<?php echo $list[ 'id' ]; ?>" <?php echo in_array( $list[ 'id' ], $selected_list ) ? 'checked="checked"' : ''; ?> 

+													id="list-<?php echo $class ?>-<?php echo $list[ 'id' ]; ?>">

+												<?php echo $list[ 'name' ]; ?>

 											</label>

 

 											<!-- If interest groups have been selected already, load them here -->

 											<?php

-											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {

-												YIKES_Inc_Easy_Mailchimp_Process_Ajax::check_list_for_interest_groups( $list['id'], $class, true );

+											if ( in_array( $list[ 'id' ], $selected_list ) && $list_interest_groups ) {

+												YIKES_Inc_Easy_Mailchimp_Process_Ajax::check_list_for_interest_groups( $list[ 'id' ], $class, true );

 											}

 											?>

 

@@ -185,8 +185,8 @@ 
 								<label class="optin-checkbox-label">

 									<strong><?php _e( 'Precheck Checkbox?', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

 									<select id="optin-checkbox-init[<?php echo $class; ?>][precheck]" name="optin-checkbox-init[<?php echo $class; ?>][precheck]" class="optin-checkbox-init[<?php echo $class; ?>][precheck] checkbox-settings-list-dropdown">

-										<option value="true" <?php selected( $precheck_checkbox , 'true' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></option>

-										<option value="false" <?php selected( $precheck_checkbox , 'false' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></option>

+										<option value="true" <?php selected( $precheck_checkbox, 'true' ); ?>><?php _e( 'Yes', 'yikes-inc-easy-mailchimp-extender' ); ?></option>

+										<option value="false" <?php selected( $precheck_checkbox, 'false' ); ?>><?php _e( 'No', 'yikes-inc-easy-mailchimp-extender' ); ?></option>

 									</select>

 								</label>

 							</p>

Braces +14 added lines, -14 removed lines

@@ -53,23 +53,23 @@ 
 	);

 

 	// Easy Digital Downloads.

-	if ( class_exists( 'Easy_Digital_Downloads' ) ) {

+	if ( class_exists( 'Easy_Digital_Downloads' ) ) {
 		$active_plugins['easy_digital_downloads_checkout_form'] = __( 'Easy Digital Downloads Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// WooCommerce.

-	if ( class_exists( 'WooCommerce' ) ) {

+	if ( class_exists( 'WooCommerce' ) ) {
 		$active_plugins['woocommerce_checkout_form'] = __( 'WooCommerce Checkout', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// BuddyPress.

-	if ( class_exists( 'BuddyPress' ) ) {

+	if ( class_exists( 'BuddyPress' ) ) {
 		$active_plugins['buddypress_form'] = __( 'BuddyPress Registration', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// bbPress.

-	if ( class_exists( 'bbPress' ) ) {

+	if ( class_exists( 'bbPress' ) ) {
 		$active_plugins['bbpress_forms'] = __( 'bbPress', 'yikes-inc-easy-mailchimp-extender' );

 	}

 	// Contact Form 7.

-	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {

+	if ( is_plugin_active( 'contact-form-7/wp-contact-form-7.php' ) ) {
 		$active_plugins['contact_form_7'] = __( 'Contact Form 7', 'yikes-inc-easy-mailchimp-extender' );

 	}

 

@@ -81,9 +81,9 @@ 
 

 	<?php

 	// lets confirm the user has a valid API key stored.

-	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {

+	if ( $this->is_user_mc_api_valid_form( false ) == 'valid' ) {
 		$list_data = yikes_get_mc_api_manager()->get_list_handler()->get_lists();

-		if ( is_wp_error( $list_data ) ) {

+		if ( is_wp_error( $list_data ) ) {
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();

 			$error_logging->maybe_write_to_log(

 				$list_data->get_error_code(),

@@ -91,7 +91,7 @@ 
 				"Integration Settings Page"

 			);

 		}

-	} else {

+	} else {
 		?>

 		<div class="inside">

 			<?php

@@ -116,9 +116,9 @@ 
 

 	<ul>

 		<?php

-			if ( ! empty( $active_plugins ) ) {

+			if ( ! empty( $active_plugins ) ) {
 

-				foreach( $active_plugins as $class => $value ) {

+				foreach( $active_plugins as $class => $value ) {
 

 					$checked              = isset( $options[$class]['value'] ) ? 'checked="checked"' : '';

 					$hidden               = ! isset( $options[$class]['value'] ) ? 'yikes-easy-mc-hidden' : '';

@@ -145,7 +145,7 @@ 
 								<!-- Associated Lists -->

 								<div class="checkbox-lists"><strong><?php _e( 'Choose Lists: ', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

 									<?php

-									if ( count( $list_data ) > 0 ) {

+									if ( count( $list_data ) > 0 ) {
 									?>

 										<?php foreach( $list_data as $list ) { ?>

 

@@ -163,14 +163,14 @@ 
 

 											<!-- If interest groups have been selected already, load them here -->

 											<?php

-											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {

+											if ( in_array( $list['id'], $selected_list ) && $list_interest_groups ) {
 												YIKES_Inc_Easy_Mailchimp_Process_Ajax::check_list_for_interest_groups( $list['id'], $class, true );

 											}

 											?>

 

 										<?php } ?>

 									<?php

-								} else {

+								} else {
 									echo '<p class="description no-lists-setup-notice"><strong>' . __( 'You have not setup any lists. Head over to Mailchimp and setup your first list.', 'yikes-inc-easy-mailchimp-extender' ) . '</strong></p>';

 								}

 								?>

@@ -193,7 +193,7 @@ 
 						</li>

 					<?php

 			}

-		} else {

+		} else {
 			?>

 				<li>

 					<?php _e( 'Nothing is active.', 'yikes-inc-easy-mailchimp-extender' ); ?>

includes/class-yikes-inc-easy-mailchimp-extender.php

Braces +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
  * @subpackage Yikes_Inc_Easy_Mailchimp_Extender/includes

  * @author     YIKES Inc. <plugins@yikesinc.com>

  */

-class Yikes_Inc_Easy_Mailchimp_Extender {

+class Yikes_Inc_Easy_Mailchimp_Extender {
 	/**

 	 * The loader that's responsible for maintaining and registering all hooks that power

 	 * the plugin.

@@ -70,7 +70,7 @@ 
 	 *

 	 * @param Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface

 	 */

-	public function __construct( Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface ) {

+	public function __construct( Yikes_Inc_Easy_Mailchimp_Extender_Form_Interface $form_interface ) {
 		$this->version = YIKES_MC_VERSION;

 		$this->form_interface = $form_interface;

 		$this->load_dependencies();

@@ -93,7 +93,7 @@ 
 	 * @since    1.0.0

 	 * @access   private

 	 */

-	private function load_dependencies() {

+	private function load_dependencies() {
 		/**

 		 * The class responsible for orchestrating the actions and filters of the

 		 * core plugin.

@@ -121,7 +121,7 @@ 
 	 * @since    1.0.0

 	 * @access   private

 	 */

-	private function define_admin_hooks() {

+	private function define_admin_hooks() {
 		$plugin_admin = new Yikes_Inc_Easy_Mailchimp_Forms_Admin( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version(), $this->form_interface );

 		$plugin_admin->hooks();

 		$this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );

@@ -134,7 +134,7 @@ 
 	 * @since    1.0.0

 	 * @access   private

 	 */

-	private function define_public_hooks() {

+	private function define_public_hooks() {
 		$plugin_public = new Yikes_Inc_Easy_Mailchimp_Extender_Public( $this->get_yikes_inc_easy_mailchimp_extender(), $this->get_version() );

 	}

 	/**

@@ -142,7 +142,7 @@ 
 	 *

 	 * @since    1.0.0

 	 */

-	public function run() {

+	public function run() {
 		$this->loader->run();

 	}

 	/**

@@ -152,7 +152,7 @@ 
 	 * @since     1.0.0

 	 * @return    string    The name of the plugin.

 	 */

-	public function get_yikes_inc_easy_mailchimp_extender() {

+	public function get_yikes_inc_easy_mailchimp_extender() {
 		return $this->yikes_inc_easy_mailchimp_extender;

 	}

 	/**

@@ -161,7 +161,7 @@ 
 	 * @since     1.0.0

 	 * @return    Yikes_Inc_Easy_Mailchimp_Extender_Loader    Orchestrates the hooks of the plugin.

 	 */

-	public function get_loader() {

+	public function get_loader() {
 		return $this->loader;

 	}

 	/**

@@ -170,7 +170,7 @@ 
 	 * @since     1.0.0

 	 * @return    string    The version number of the plugin.

 	 */

-	public function get_version() {

+	public function get_version() {
 		return $this->version;

 	}

 }

includes/api/class-yikes-inc-easy-mailchimp-api-manager.php

Spacing +5 added lines, -5 removed lines

@@ -72,8 +72,8 @@ 
 
 		$this->api_key = $api_key;
 		$parts         = $this->get_api_key_parts();
-		$this->key     = $parts['key'];
-		$this->dc      = $parts['dc'];
+		$this->key     = $parts[ 'key' ];
+		$this->dc      = $parts[ 'dc' ];
 	}
 
 	/**
@@ -98,8 +98,8 @@ 
 		$parts = explode( '-', $this->api_key );
 
 		return array(
-			'key' => $parts[0],
-			'dc'  => isset( $parts[1] ) ? $parts[1] : '',
+			'key' => $parts[ 0 ],
+			'dc'  => isset( $parts[ 1 ] ) ? $parts[ 1 ] : '',
 		);
 	}
 
@@ -143,7 +143,7 @@ 
 	 * @return Yikes_Inc_Easy_Mailchimp_API
 	 */
 	public function get_api( $version = '' ) {
-		$version = $version ?: $this->get_default_api_version();
+		$version = $version ? : $this->get_default_api_version();
 
 		if ( ! array_key_exists( $version, $this->api ) || null === $this->api[ $version ] ) {
 			$this->api[ $version ] = new Yikes_Inc_Easy_Mailchimp_API( $this->get_datacenter(), $this->get_api_key(), $version );

includes/third-party-integrations/third-party-init.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 		// required..*
 		include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
 		/* Visual Composer */
-		if( is_plugin_active( 'js_composer/js_composer.php' ) ) {
+		if ( is_plugin_active( 'js_composer/js_composer.php' ) ) {
 			new YIKES_Mailchimp_Visual_Composer_Extension();
 		}
 	}

public/partials/ajax/class.public_ajax.php

Spacing +34 added lines, -34 removed lines

@@ -11,16 +11,16 @@ 
 	 */
 	public function __construct() {
 		// ajax process form submission
-		add_action( 'wp_ajax_nopriv_process_form_submission', array( $this , 'process_form_submission' ), 10 );
-		add_action( 'wp_ajax_process_form_submission', array( $this , 'process_form_submission' ), 10 );
+		add_action( 'wp_ajax_nopriv_process_form_submission', array( $this, 'process_form_submission' ), 10 );
+		add_action( 'wp_ajax_process_form_submission', array( $this, 'process_form_submission' ), 10 );
 
 		// ajax send update emails
-		add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
-		add_action( 'wp_ajax_easy_forms_send_email', array( $this , 'sendUpdateProfileEmail' ), 10 );
+		add_action( 'wp_ajax_nopriv_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
+		add_action( 'wp_ajax_easy_forms_send_email', array( $this, 'sendUpdateProfileEmail' ), 10 );
 
 		// increase submission count for a given form on successful submit
-		add_action( 'wp_ajax_nopriv_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
-		add_action( 'wp_ajax_increase_submission_count' , array( $this , 'increase_submission_count' ), 10 );
+		add_action( 'wp_ajax_nopriv_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
+		add_action( 'wp_ajax_increase_submission_count', array( $this, 'increase_submission_count' ), 10 );
 	}
 
 	/*
@@ -37,7 +37,7 @@ 
 	 * Increase the submission count for a given form.
 	 */
 	public function increase_submission_count() {
-		$form_id   = intval( $_POST['form_id'] );
+		$form_id   = intval( $_POST[ 'form_id' ] );
 		$interface = yikes_easy_mailchimp_extender_get_form_interface();
 		$form      = $interface->get_form( $form_id );
 
@@ -47,7 +47,7 @@ 
 		}
 
 		// Update the form.
-		$submission_count = isset( $form['submissions'] ) ? $form['submissions'] + 1 : 1;
+		$submission_count = isset( $form[ 'submissions' ] ) ? $form[ 'submissions' ] + 1 : 1;
 		$interface->update_form_field( $form_id, 'submissions', $submission_count );
 
 		exit();
@@ -58,11 +58,11 @@ 
 		@since v6.0.4.1
 	*/
 	public function sendUpdateProfileEmail() {
-		$user_email    = filter_var( $_POST['user_email'], FILTER_SANITIZE_STRING );
+		$user_email    = filter_var( $_POST[ 'user_email' ], FILTER_SANITIZE_STRING );
 		$user_id       = md5( $user_email );
-		$list_id       = filter_var( $_POST['list_id'], FILTER_SANITIZE_STRING );
-		$form_id       = filter_var( $_POST['form_id'], FILTER_SANITIZE_NUMBER_INT );
-		$page_id       = filter_var( $_POST['page_id'], FILTER_SANITIZE_NUMBER_INT );
+		$list_id       = filter_var( $_POST[ 'list_id' ], FILTER_SANITIZE_STRING );
+		$form_id       = filter_var( $_POST[ 'form_id' ], FILTER_SANITIZE_NUMBER_INT );
+		$page_id       = filter_var( $_POST[ 'page_id' ], FILTER_SANITIZE_NUMBER_INT );
 		$full_site_url = get_bloginfo( 'url' );
 		$manager       = yikes_get_mc_api_manager();
 
@@ -79,7 +79,7 @@ 
 				'class.public_ajax.php'
 			);
 			$is_error = true;
-			$errors[] = $list_details->get_error_message();
+			$errors[ ] = $list_details->get_error_message();
 		}
 
 		// Subscriber details API call.
@@ -88,7 +88,7 @@ 
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging();
 			$error_logging->maybe_write_to_log( $subscriber_account_details->get_error_code(), __( 'Send Update Profile Email - Get Member Info.', 'yikes-inc-easy-mailchimp-extender' ), 'class.public_ajax.php' );
 			$is_error = true;
-			$errors[] = $subscriber_account_details->get_error_message();
+			$errors[ ] = $subscriber_account_details->get_error_message();
 		}
 
 		// Form details API call.
@@ -96,22 +96,22 @@ 
 		if ( ! empty( $interface ) && method_exists( $interface, 'get_form' ) && ! empty( $form_id ) ) {
 			$form_data = $interface->get_form( $form_id );
 			if ( ! empty( $form_data ) ) {
-				if ( isset( $form_data['error_messages'] ) ) {
+				if ( isset( $form_data[ 'error_messages' ] ) ) {
 
-					if ( isset( $form_data['error_messages']['email-body'] ) && ! empty( $form_data['error_messages']['email-body'] ) ) {
-						$email_body = apply_filters( 'the_content', $form_data['error_messages']['email-body'] );
+					if ( isset( $form_data[ 'error_messages' ][ 'email-body' ] ) && ! empty( $form_data[ 'error_messages' ][ 'email-body' ] ) ) {
+						$email_body = apply_filters( 'the_content', $form_data[ 'error_messages' ][ 'email-body' ] );
 					}
 
-					if ( isset( $form_data['error_messages']['email-subject'] ) && ! empty( $form_data['error_messages']['email-subject'] ) ) {
-						$email_subject = $form_data['error_messages']['email-subject'];
+					if ( isset( $form_data[ 'error_messages' ][ 'email-subject' ] ) && ! empty( $form_data[ 'error_messages' ][ 'email-subject' ] ) ) {
+						$email_subject = $form_data[ 'error_messages' ][ 'email-subject' ];
 					}
 
-					if ( isset( $form_data['error_messages']['update-email-success'] ) && ! empty( $form_data['error_messages']['update-email-success'] ) ) {
-						$update_email_success_message = $form_data['error_messages']['update-email-success'];
+					if ( isset( $form_data[ 'error_messages' ][ 'update-email-success' ] ) && ! empty( $form_data[ 'error_messages' ][ 'update-email-success' ] ) ) {
+						$update_email_success_message = $form_data[ 'error_messages' ][ 'update-email-success' ];
 					}
 
-					if ( isset( $form_data['error_messages']['update-email-failure'] ) && ! empty( $form_data['error_messages']['update-email-failure'] ) ) {
-						$update_email_failed_message = $form_data['error_messages']['update-email-failure'];
+					if ( isset( $form_data[ 'error_messages' ][ 'update-email-failure' ] ) && ! empty( $form_data[ 'error_messages' ][ 'update-email-failure' ] ) ) {
+						$update_email_failed_message = $form_data[ 'error_messages' ][ 'update-email-failure' ];
 					}
 				}
 			}
@@ -132,11 +132,11 @@ 
 		}
 
 		// Construct the headers & email message content.
-		$subscriber_id    = $subscriber_account_details['unique_email_id'];
-		$update_link_href = str_replace( '/subscribe', '/profile', $list_details['subscribe_url_long'] );
+		$subscriber_id    = $subscriber_account_details[ 'unique_email_id' ];
+		$update_link_href = str_replace( '/subscribe', '/profile', $list_details[ 'subscribe_url_long' ] );
 		$update_link_href = add_query_arg( 'e', $subscriber_id, $update_link_href );
 		$update_link_tag  = '<a href="' . $update_link_href . '">';
-		$headers          = 'From: ' . $list_details['campaign_defaults']['from_name'] . ' <' . $list_details['campaign_defaults']['from_email'] . '>' . "\r\n";
+		$headers          = 'From: ' . $list_details[ 'campaign_defaults' ][ 'from_name' ] . ' <' . $list_details[ 'campaign_defaults' ][ 'from_email' ] . '>' . "\r\n";
 		$headers         .= 'Content-type: text/html';
 
 		if ( ! isset( $email_subject ) ) {
@@ -178,26 +178,26 @@ 
 		$email_body = str_replace( array( '[subscriber_id]', '[SUBSCRIBER_ID]' ), $subscriber_id, $email_body );
 
 		// We let the user use [form_name] for the form's name so replace [form_name] with the form's name.
-		$email_body = str_replace( array( '[form_name]', '[FORM_NAME]' ), $form_data['form_name'], $email_body );
+		$email_body = str_replace( array( '[form_name]', '[FORM_NAME]' ), $form_data[ 'form_name' ], $email_body );
 
 		// We let the user use [fname] and [lname] so replace those.
-		$email_body = str_replace( array( '[fname]', '[FNAME]' ), isset( $subscriber_account_details['merge_fields']['FNAME'] ) ? $subscriber_account_details['merge_fields']['FNAME'] : '', $email_body );
-		$email_body = str_replace( array( '[lname]', '[LNAME]' ), isset( $subscriber_account_details['merge_fields']['LNAME'] ) ? $subscriber_account_details['merge_fields']['LNAME'] : '', $email_body );
+		$email_body = str_replace( array( '[fname]', '[FNAME]' ), isset( $subscriber_account_details[ 'merge_fields' ][ 'FNAME' ] ) ? $subscriber_account_details[ 'merge_fields' ][ 'FNAME' ] : '', $email_body );
+		$email_body = str_replace( array( '[lname]', '[LNAME]' ), isset( $subscriber_account_details[ 'merge_fields' ][ 'LNAME' ] ) ? $subscriber_account_details[ 'merge_fields' ][ 'LNAME' ] : '', $email_body );
 
 		/* Confirm that the email was sent */
 		if ( wp_mail( $user_email, apply_filters( 'yikes-mailchimp-update-email-subject', $email_subject ), apply_filters( 'yikes-mailchimp-update-email-content', $email_body, $update_link_href ), $headers ) ) {
 
 			$update_email_success_message = apply_filters( 'yikes-mailchimp-update-email-success-message', $update_email_success_message, $form_id, $user_email );
-			$submission_settings          = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null;
+			$submission_settings          = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null;
 			$redirect_settings            = Yikes_Inc_Easy_Mailchimp_Extender_Process_Submission_Handler::handle_submission_response_success_redirect( $form_id, $submission_settings, $page_id );
 
 			wp_send_json_success(
 				array(
 					'response_text'  => '<div class="yikes-easy-mc-success-message">' . $update_email_success_message . '</div>',
-					'redirection'    => $redirect_settings['redirection'],
-					'redirect'       => $redirect_settings['redirect'],
-					'redirect_timer' => $redirect_settings['redirect_timer'],
-					'new_window'     => $redirect_settings['new_window'],
+					'redirection'    => $redirect_settings[ 'redirection' ],
+					'redirect'       => $redirect_settings[ 'redirect' ],
+					'redirect_timer' => $redirect_settings[ 'redirect_timer' ],
+					'new_window'     => $redirect_settings[ 'new_window' ],
 				)
 			);
 		} else {

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;

 		}

 

 		/**

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

@@ -145,11 +145,11 @@ 
 	 * @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 @@ 
 

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

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

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

 	}

 }

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