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>

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/class-yikes-inc-easy-mailchimp-extender-public.php

Spacing +22 added lines, -22 removed lines

@@ -57,9 +57,9 @@ 
 		new YIKES_Inc_Easy_Mailchimp_Public_Ajax();
 
 		// Include our error logging class
-		add_action( 'init' , array( $this , 'load_error_logging_class' ) , 1 );
+		add_action( 'init', array( $this, 'load_error_logging_class' ), 1 );
 		// load our checkbox classes
-		add_action( 'init' , array( $this , 'load_checkbox_integration_classes' ) , 1 );
+		add_action( 'init', array( $this, 'load_checkbox_integration_classes' ), 1 );
 		// custom front end filter
 		add_action( 'init', array( $this, 'yikes_custom_frontend_content_filter' ) );
 		// Process non-ajax forms in the header
@@ -94,15 +94,15 @@ 
 	**/
 	public function load_checkbox_integration_classes() {
 		// store our options
-		$integrations = get_option( 'optin-checkbox-init' , array() );
-		if( ! empty( $integrations ) && is_array( $integrations ) ) {
+		$integrations = get_option( 'optin-checkbox-init', array() );
+		if ( ! empty( $integrations ) && is_array( $integrations ) ) {
 			// load our mail integrations class
 			require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations.php';
 			// loop over selected classes and load them up!
-			foreach( $integrations as $integration => $value ) {
-				if( isset( $value['value'] ) && $value['value'] == 'on' ) {
+			foreach ( $integrations as $integration => $value ) {
+				if ( isset( $value[ 'value' ] ) && $value[ 'value' ] == 'on' ) {
 					// load our class extensions
-					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.'.$integration.'-checkbox.php';
+					require_once YIKES_MC_PATH . 'public/classes/checkbox-integrations/class.' . $integration . '-checkbox.php';
 				}
 			}
 		}
@@ -116,7 +116,7 @@ 
 	 * @since 6.0.0
 	 */
 	public function load_error_logging_class() {
-		if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '1' ) {
+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '1' ) {
 			// if error logging is enabled we should include our error logging class
 			require_once YIKES_MC_PATH . 'includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php';
 			$error_logging = new Yikes_Inc_Easy_Mailchimp_Error_Logging;
@@ -129,19 +129,19 @@ 
 	*	@since 6.0.3.4
 	*/
 	public function yikes_process_non_ajax_forms( $form_submitted ) {
-		global $wpdb,$post;
-		$form_id = ( ! empty( $_POST['yikes-mailchimp-submitted-form'] ) ) ? (int) $_POST['yikes-mailchimp-submitted-form'] : false; // store form id
-		if( $form_id ) {
+		global $wpdb, $post;
+		$form_id = ( ! empty( $_POST[ 'yikes-mailchimp-submitted-form' ] ) ) ? (int) $_POST[ 'yikes-mailchimp-submitted-form' ] : false; // store form id
+		if ( $form_id ) {
 			$form_settings = self::yikes_retrieve_form_settings( $form_id );
-			if( isset( $_POST ) && !empty( $_POST ) && isset( $form_id ) && $form_settings['submission_settings']['ajax'] == 0 ) {
-				if( $_POST['yikes-mailchimp-submitted-form'] == $form_id ) { // ensure we only process the form that was submitted
+			if ( isset( $_POST ) && ! empty( $_POST ) && isset( $form_id ) && $form_settings[ 'submission_settings' ][ 'ajax' ] == 0 ) {
+				if ( $_POST[ 'yikes-mailchimp-submitted-form' ] == $form_id ) { // ensure we only process the form that was submitted
 
 					// Lets include our form processing file
 					include_once( YIKES_MC_PATH . 'public/partials/shortcodes/process/process_form_submission.php' );
-					if( $form_settings['submission_settings']['redirect_on_submission'] == '1' ) {
-						if( $form_submitted == 1 ) {
+					if ( $form_settings[ 'submission_settings' ][ 'redirect_on_submission' ] == '1' ) {
+						if ( $form_submitted == 1 ) {
 							// decode our settings
-							$redirect_page = ( 'custom_url' != $form_settings['submission_settings']['redirect_page'] ) ? get_permalink( (int) $form_settings['submission_settings']['redirect_page'] ) : $form_settings['submission_settings']['custom_redirect_url'];
+							$redirect_page = ( 'custom_url' != $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) ? get_permalink( (int) $form_settings[ 'submission_settings' ][ 'redirect_page' ] ) : $form_settings[ 'submission_settings' ][ 'custom_redirect_url' ];
 							wp_redirect( apply_filters( 'yikes-mailchimp-redirect-url', esc_url( $redirect_page ), $form_id, $post ) );
 							exit;
 						}
@@ -169,7 +169,7 @@ 
 	 */
 	public static function yikes_retrieve_form_settings( $form_id ) {
 		// if no form id, abort
-		if( ! $form_id ) {
+		if ( ! $form_id ) {
 			return array();
 		}
 
@@ -198,13 +198,13 @@ 
 			return;
 		}
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['update-link'] ) && ! empty( $form_settings['error_messages']['update-link'] ) ) {
-			$response_text = $form_settings['error_messages']['update-link'];
+		if ( isset( $form_settings[ 'error_messages' ][ 'update-link' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'update-link' ] ) ) {
+			$response_text = $form_settings[ 'error_messages' ][ 'update-link' ];
 			// extract the link text
 			preg_match( '/\[link].*?\[\/link\]/', $response_text, $link_text );
 			if ( $link_text && ! empty( $link_text ) ) {
 				// Extract the custom link text ([link]*[/link])
-				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[0], $link ) ) );
+				$custom_link_text = str_replace( '[/link]', '', str_replace( '[link]', '', str_replace( 'click to send yourself an update link', $link_text[ 0 ], $link ) ) );
 				// Replace the link text, with our custom link text
 				$response_text = str_replace( $link_text, $custom_link_text, $response_text );
 			}
@@ -233,8 +233,8 @@ 
 		}
 
 		// trim trailing period
-		if ( isset( $form_settings['error_messages']['already-subscribed'] ) && ! empty( $form_settings['error_messages']['already-subscribed'] ) ) {
-			$response_text = str_replace( '[email]', $email, $form_settings['error_messages']['already-subscribed'] );
+		if ( isset( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) && ! empty( $form_settings[ 'error_messages' ][ 'already-subscribed' ] ) ) {
+			$response_text = str_replace( '[email]', $email, $form_settings[ 'error_messages' ][ 'already-subscribed' ] );
 		}
 		// Return our new string
 		return $response_text;

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

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

Spacing +5 added lines, -5 removed lines

@@ -3,7 +3,7 @@ 
 	- display installation stuff here
 	- php version, wp version, plugin version and debug log
 -->
-<h3><span><?php _e( 'Debug Settings' , 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
+<h3><span><?php _e( 'Debug Settings', 'yikes-inc-easy-mailchimp-extender' ); ?></span></h3>
 
 <div class="inside">
 
@@ -12,10 +12,10 @@ 
 	
 		<?php settings_fields( 'yikes_inc_easy_mc_debug_settings_page' ); ?>
 	
-		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging' , 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
-			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status' , '' ) , '1' ); ?>>
+		<label for="yikes-mailchimp-debug-status"><strong><?php _e( 'Enable Debugging', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
+			<input type="checkbox" name="yikes-mailchimp-debug-status" id="yikes-mailchimp-debug-status" value="1" <?php checked( get_option( 'yikes-mailchimp-debug-status', '' ), '1' ); ?>>
 		</label>
-		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for Mailchimp you can toggle on debugging to display advanced error messages and start logging errors." , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+		<p class="description"><?php _e( "If you encounter an issue with Easy Forms for Mailchimp you can toggle on debugging to display advanced error messages and start logging errors.", 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 		
 		<?php submit_button(); ?>
 									
@@ -34,7 +34,7 @@ 
 				)
 			);
 		?>
-		<h2><?php _e( "Debug Log" , 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
+		<h2><?php _e( "Debug Log", 'yikes-inc-easy-mailchimp-extender' ); ?> &nbsp; <a href="<?php echo $url; ?>" class="button-secondary"><?php _e( 'Clear Log', 'yikes-inc-easy-mailchimp-extender' ); ?></a></h2>
 		
 		<table class="widefat" id="yikes-mailchimp-error-log">
 			<!-- table header -->