yikesinc / yikes-inc-easy-mailchimp-extender

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

Spacing +4 added lines, -4 removed lines

@@ -174,7 +174,7 @@ 
 		$email_field = apply_filters( 'yikes-easy-mailchimp-email-address-field', $email_field, $list_id );
 
 		array_unshift( $merge_fields, $email_field );
-		$merge_object['merge_fields'] = $merge_fields;
+		$merge_object[ 'merge_fields' ] = $merge_fields;
 		set_transient( "yikes_eme_merge_variables_{$list_id}", $merge_object, HOUR_IN_SECONDS );
 
 		return $merge_object;
@@ -195,8 +195,8 @@ 
 	* @return array | WP_Error
 	*/
 	public function update_merge_field( $list_id, $field_id, $field_data, $clear_transient = true ) {
-		$path	= "{$this->base_path}/{$list_id}/merge-fields/{$field_id}";
-		$field	= $this->patch_to_api( $path, $field_data );
+		$path = "{$this->base_path}/{$list_id}/merge-fields/{$field_id}";
+		$field = $this->patch_to_api( $path, $field_data );
 
 		if ( is_wp_error( $field ) ) {
 			return $field;
@@ -244,7 +244,7 @@ 
 				return $interests;
 			}
 
-			$category['items'] = $interests;
+			$category[ 'items' ] = $interests;
 		}
 
 		set_transient( "yikes_eme_interest_categories_{$list_id}", $categories, HOUR_IN_SECONDS );

includes/error_log/class-yikes-inc-easy-mailchimp-error-logging.php

Spacing +8 added lines, -8 removed lines

@@ -122,10 +122,10 @@ 
 	*	@returned_error 

 	*	@error_type - what was running when the error occured ie (new user subscription, remove user etc)

 	*/

-	public function yikes_easy_mailchimp_write_to_error_log( $returned_error , $error_type , $page='' ) {

+	public function yikes_easy_mailchimp_write_to_error_log( $returned_error, $error_type, $page = '' ) {

 		

 		// confirm error logging is toggled on, else lets exit

-		if( get_option( 'yikes-mailchimp-debug-status' , '' )  != '1' ) {

+		if ( get_option( 'yikes-mailchimp-debug-status', '' ) != '1' ) {

 			return;

 		}

 		

@@ -171,12 +171,12 @@ 
 	public function yikes_easy_mailchimp_generate_error_log_table() {		

 

 		// ensure file_get_contents exists

-		if( function_exists( 'file_get_contents' ) ) {	

+		if ( function_exists( 'file_get_contents' ) ) {	

 			// confirm that our file exists

-			if( file_exists( $this->error_log_file_path ) ) {

+			if ( file_exists( $this->error_log_file_path ) ) {

 				$error_log_contents = file_get_contents( $this->error_log_file_path, true );							

-				if( $error_log_contents === FALSE ) {

-					return _e( 'File get contents not available' , 'yikes-inc-easy-mailchimp-extender' );

+				if ( $error_log_contents === FALSE ) {

+					return _e( 'File get contents not available', 'yikes-inc-easy-mailchimp-extender' );

 				}

 				if ( $error_log_contents != '' ) {

 					// return $error_log_contents;

@@ -187,7 +187,7 @@ 
 						<tr class="error-log-tr">

 							<td class="row-title colspanchange" colspan="2">

 								<strong><span class='dashicons dashicons-no-alt'></span> <?php _e( 'No errors logged.', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>

-								<?php if( get_option( 'yikes-mailchimp-debug-status' , '' ) == '' ) { ?>

+								<?php if ( get_option( 'yikes-mailchimp-debug-status', '' ) == '' ) { ?>

 									<br />

 									<p class="to-start-logging-errors-notice"><em><?php _e( "To start logging errors toggle on the 'Enable Debugging' option above.", 'yikes-inc-easy-mailchimp-extender' ); ?></em></p>

 								<?php } ?>

@@ -215,7 +215,7 @@ 
 									);

 									?>

 									<form id="create-error-log" method="POST" action="<?php echo $url; ?>">

-										<?php submit_button( __( 'Attempt to Create Error Log' , 'yikes-inc-easy-mailchimp-extender' ) , 'secondary' , '' , '' , array() ); ?>

+										<?php submit_button( __( 'Attempt to Create Error Log', 'yikes-inc-easy-mailchimp-extender' ), 'secondary', '', '', array() ); ?>

 									</form>

 									

 								</p>

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>

admin/partials/menu/options-sections/templates/integration-interest-groups.php

Spacing +8 added lines, -8 removed lines

@@ -27,13 +27,13 @@ 
 		*/
 		foreach ( $interest_groupings as $id => $interest_group ) {
 
-			$interest_group_type      = isset( $interest_group['type'] ) ? $interest_group['type'] : '';
-			$interest_groups_fields   = isset( $interest_group['items'] ) ? $interest_group['items'] : array();
-			$selected_interest_groups = isset( $integration_options[ $integration_type ]['interest-groups'] ) ? $integration_options[ $integration_type ]['interest-groups'] : array();
-			$selected_interest_groups = isset( $selected_interest_groups[$list_id] ) ? $selected_interest_groups[$list_id] : $selected_interest_groups;
+			$interest_group_type      = isset( $interest_group[ 'type' ] ) ? $interest_group[ 'type' ] : '';
+			$interest_groups_fields   = isset( $interest_group[ 'items' ] ) ? $interest_group[ 'items' ] : array();
+			$selected_interest_groups = isset( $integration_options[ $integration_type ][ 'interest-groups' ] ) ? $integration_options[ $integration_type ][ 'interest-groups' ] : array();
+			$selected_interest_groups = isset( $selected_interest_groups[ $list_id ] ) ? $selected_interest_groups[ $list_id ] : $selected_interest_groups;
 			?>
 			<section class="interest-group-section">
-				<strong class="interest-group-section-title"><?php echo ucwords( $interest_group['title'] ); ?></strong>
+				<strong class="interest-group-section-title"><?php echo ucwords( $interest_group[ 'title' ] ); ?></strong>
 			<?php
 
 			/*
@@ -55,7 +55,7 @@ 
 							<input type="checkbox"
 								name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $list_id; ?>][<?php echo $id; ?>][]"
 								value="<?php echo $field_id; ?>" <?php echo $checked; ?>>
-							<?php echo $field['name']; ?>
+							<?php echo $field[ 'name' ]; ?>
 						</label>
 						<?php
 					}
@@ -71,7 +71,7 @@ 
 							<input type="radio"
 								name="optin-checkbox-init[<?php echo $integration_type; ?>][interest-groups][<?php echo $list_id; ?>][<?php echo $id; ?>][]"
 								value="<?php echo $field_id; ?>" <?php echo $checked; ?>>
-							<?php echo $field['name']; ?>
+							<?php echo $field[ 'name' ]; ?>
 						</label>
 						<?php
 					}
@@ -89,7 +89,7 @@ 
 							}
 						?>
 							<option value="<?php echo $field_id; ?>" <?php echo $selected; ?>>
-								<?php echo $field['name']; ?>
+								<?php echo $field[ 'name' ]; ?>
 							</option>
 						<?php
 						}

public/partials/shortcodes/unsubscribe/process-unsubscribe.php

Spacing +3 added lines, -3 removed lines

@@ -22,13 +22,13 @@
 		}
 
 		// Verify Honeypot
-		if ( ! empty( $_POST['hp'] ) ) {
+		if ( ! empty( $_POST[ 'hp' ] ) ) {
 			wp_send_json_error( '2' );
 		}
 
 		// Get email, list ID
-		$email   = isset( $_POST['email'] ) ? $_POST['email'] : '';
-		$list_id = isset( $_POST['list_id'] ) ? $_POST['list_id'] : '';
+		$email   = isset( $_POST[ 'email' ] ) ? $_POST[ 'email' ] : '';
+		$list_id = isset( $_POST[ 'list_id' ] ) ? $_POST[ 'list_id' ] : '';
 
 		if ( empty( $email ) || empty( $list_id ) ) {
 			wp_send_json_error( '3' );

public/partials/shortcodes/unsubscribe/shortcode-unsubscribe.php

Spacing +12 added lines, -12 removed lines

@@ -14,20 +14,20 @@ 
 
 	$values = is_array( $args ) ? array_merge( $defaults, $args ) : $defaults;
 
-	if ( empty( $values['list'] ) && empty( $values['form'] ) ) {
+	if ( empty( $values[ 'list' ] ) && empty( $values[ 'form' ] ) ) {
 		return '<!-- YIKES Easy Forms Error: no list ID / form ID -->';
 	}
 
-	if ( ! empty( $values['form'] ) ) {
+	if ( ! empty( $values[ 'form' ] ) ) {
 
 		// Get the list ID from the form ID
 		$interface = yikes_easy_mailchimp_extender_get_form_interface();
-		$form_data = $interface->get_form( $values['form'] );
-		$list_id   = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null;
+		$form_data = $interface->get_form( $values[ 'form' ] );
+		$list_id   = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null;
 
-	} else if ( ! empty( $values['list'] ) ) {
+	} else if ( ! empty( $values[ 'list' ] ) ) {
 
-		$list_id = $values['list'];
+		$list_id = $values[ 'list' ];
 	}
 
 	if ( empty( $list_id ) ) {
@@ -45,7 +45,7 @@ 
 			'loader'   => apply_filters( 'yikes-mailchimp-unsubscribe-loader', YIKES_MC_URL . 'includes/images/ripple.svg' ),
 		) 
 	);
-	wp_enqueue_script ( 'yikes-mailchimp-unsubscribe-script' );
+	wp_enqueue_script( 'yikes-mailchimp-unsubscribe-script' );
 
 	// Include our styles
 	wp_enqueue_style( 'yikes-mailchimp-unsubscribe-styles', plugin_dir_url( __FILE__ ) . '/unsubscribe.css', array(), YIKES_MC_VERSION, 'all' );
@@ -55,11 +55,11 @@ 
 		<section id="yikes-mailchimp-unsubscribe-container-<?php echo $list_id; ?>" class="yikes-mailchimp-unsubscribe-container">
 
 			<div id="yikes-mailchimp-unsubscribe-title-<?php echo $list_id; ?>" class="yikes-mailchimp-unsubscribe-title">
-				<h2><?php echo apply_filters( 'yikes-mailchimp-unsubscribe-title', $values['title'] ); ?></h2>
+				<h2><?php echo apply_filters( 'yikes-mailchimp-unsubscribe-title', $values[ 'title' ] ); ?></h2>
 			</div>
 
 			<div id="yikes-mailchimp-unsubscribe-description-<?php echo $list_id; ?>" class="yikes-mailchimp-unsubscribe-description">
-				<?php echo apply_filters( 'yikes-mailchimp-unsubscribe-description', $values['description'] ); ?>
+				<?php echo apply_filters( 'yikes-mailchimp-unsubscribe-description', $values[ 'description' ] ); ?>
 			</div>
 
 			<?php do_action( 'yikes-mailchimp-unsubscribe-before-form' ); ?>
@@ -71,8 +71,8 @@ 
 				<!-- Email -->
 				<?php do_action( 'yikes-mailchimp-unsubscribe-before-email' ); ?>
 				<label for="yikes-mailchimp-unsubscribe-email" class="EMAIL-label">
-					<span class="EMAIL-label"><?php echo $values['email_label']; ?></span>
-					<input name="EMAIL" placeholder="<?php echo $values['email_placeholder']; ?>" class="yikes-mailchimp-unsubscribe-email" id="yikes-mailchimp-unsubscribe-email" required="required" type="email" value="<?php echo esc_attr( apply_filters( 'yikes-mailchimp-unsubscribe-email-default', '' ) ); ?>">
+					<span class="EMAIL-label"><?php echo $values[ 'email_label' ]; ?></span>
+					<input name="EMAIL" placeholder="<?php echo $values[ 'email_placeholder' ]; ?>" class="yikes-mailchimp-unsubscribe-email" id="yikes-mailchimp-unsubscribe-email" required="required" type="email" value="<?php echo esc_attr( apply_filters( 'yikes-mailchimp-unsubscribe-email-default', '' ) ); ?>">
 				</label>
 				<?php do_action( 'yikes-mailchimp-unsubscribe-after-email' ); ?>
 
@@ -84,7 +84,7 @@ 
 
 				<!-- Submit Button -->
 				<button type="submit" class="yikes-mailchimp-unsubscribe-submit-button">
-					<span class="yikes-mailchimp-submit-button-span-text"><?php echo $values['submit_label']; ?></span>
+					<span class="yikes-mailchimp-submit-button-span-text"><?php echo $values[ 'submit_label' ]; ?></span>
 				</button>
 
 				<input type="hidden" class="yikes-mailchimp-unsubscribe-nonce" name="yikes-mailchimp-unsubscribe-nonce" value="<?php echo wp_create_nonce( 'yikes-mailchimp-unsubscribe' ); ?>">

public/partials/shortcodes/process/process_form_submission.php

Spacing +40 added lines, -40 removed lines

@@ -14,7 +14,7 @@ 
 $data = $_POST;
 
 // Confirm we have a form id to work with
-$form_id = ( isset( $data['yikes-mailchimp-submitted-form'] ) ) ? absint( $data['yikes-mailchimp-submitted-form'] ) : false;
+$form_id = ( isset( $data[ 'yikes-mailchimp-submitted-form' ] ) ) ? absint( $data[ 'yikes-mailchimp-submitted-form' ] ) : false;
 
 // Set the form id in our class
 $submission_handler->set_form_id( $form_id );
@@ -28,7 +28,7 @@ 
 }
 
 // Check our nonce
-if ( $submission_handler->handle_nonce( $_POST['yikes_easy_mc_new_subscriber'], 'yikes_easy_mc_form_submit' ) === false ) {
+if ( $submission_handler->handle_nonce( $_POST[ 'yikes_easy_mc_new_subscriber' ], 'yikes_easy_mc_form_submit' ) === false ) {
 	$process_submission_response = $submission_handler->wrap_form_submission_response( $submission_handler->handle_nonce_message, $is_success = false );
 	return;
 }
@@ -44,10 +44,10 @@ 
 }
 
 // Set up some variables from the form data -- these are required
-$list_id             = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null;
-$submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null;
-$optin_settings      = isset( $form_data['optin_settings'] ) ? $form_data['optin_settings'] : null;
-$form_fields         = isset( $form_data['fields'] ) ? $form_data['fields'] : null;
+$list_id             = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null;
+$submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null;
+$optin_settings      = isset( $form_data[ 'optin_settings' ] ) ? $form_data[ 'optin_settings' ] : null;
+$form_fields         = isset( $form_data[ 'fields' ] ) ? $form_data[ 'fields' ] : null;
 
 // Send an error if for some reason we can't find the required form data
 if ( $submission_handler->handle_empty_fields_generic( array( $list_id, $submission_settings, $optin_settings, $form_fields ) ) === false ) {
@@ -70,8 +70,8 @@ 
 $submission_handler->set_list_id( $list_id );
 
 // Set up some variables from the form data -- these are not required
-$error_messages      = isset( $form_data['error_messages'] ) ? $form_data['error_messages'] : array();
-$notifications       = isset( $form_data['custom_notifications'] ) ? $form_data['custom_notifications'] : array(); // Do we need this?
+$error_messages      = isset( $form_data[ 'error_messages' ] ) ? $form_data[ 'error_messages' ] : array();
+$notifications       = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array(); // Do we need this?
 
 // Set the error messages in our class
 $submission_handler->set_error_messages( $error_messages );
@@ -87,7 +87,7 @@ 
 }
 
 // Get, sanitize, and lowercasify the email
-$submitted_email = isset( $data['EMAIL'] ) ? $data['EMAIL'] : '';
+$submitted_email = isset( $data[ 'EMAIL' ] ) ? $data[ 'EMAIL' ] : '';
 $sanitized_email = $submission_handler->get_sanitized_email( $submitted_email ); 
 $submission_handler->set_email( $sanitized_email );
 
@@ -98,7 +98,7 @@ 
 }
 
 // Check for Honeypot filled
-$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && '' !== $data['yikes-mailchimp-honeypot'] ) ? true : false;
+$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && '' !== $data[ 'yikes-mailchimp-honeypot' ] ) ? true : false;
 
 // Send an error if honey pot is not empty
 if ( $submission_handler->handle_non_empty_honeypot( $honey_pot_filled ) === false ) {
@@ -107,11 +107,11 @@ 
 }
 
 // Check if reCAPTCHA Response was submitted with the form data, and handle it if needed
-if ( isset( $data['g-recaptcha-response'] ) ) {
-	$recaptcha_response = $data['g-recaptcha-response'];
+if ( isset( $data[ 'g-recaptcha-response' ] ) ) {
+	$recaptcha_response = $data[ 'g-recaptcha-response' ];
 	$recaptcha_handle = $submission_handler->handle_recaptcha( $recaptcha_response );
-	if ( isset( $recaptcha_handle['success'] ) && $recaptcha_handle['success'] === false ) {
-		$process_submission_response = $submission_handler->wrap_form_submission_response( $recaptcha_handle['message'], $is_success = false );
+	if ( isset( $recaptcha_handle[ 'success' ] ) && $recaptcha_handle[ 'success' ] === false ) {
+		$process_submission_response = $submission_handler->wrap_form_submission_response( $recaptcha_handle[ 'message' ], $is_success = false );
 		return;
 	}
 }
@@ -120,7 +120,7 @@ 
 $merge_variables = $submission_handler->get_submitted_merge_values( $data, $form_fields );
 
 // Submission Setting: Replace interest groups or update interest groups
-$replace_interests = isset( $submission_settings['replace_interests'] ) ? (bool) $submission_settings['replace_interests'] : true;
+$replace_interests = isset( $submission_settings[ 'replace_interests' ] ) ? (bool) $submission_settings[ 'replace_interests' ] : true;
 
 // Get the default groups
 $groups = $submission_handler->get_default_interest_groups( $replace_interests, $list_handler );
@@ -135,17 +135,17 @@ 
  *
  * @param $merge_variables array Array of merge variable to use
  */
-do_action( 'yikes-mailchimp-before-submission',            $merge_variables );
+do_action( 'yikes-mailchimp-before-submission', $merge_variables );
 do_action( "yikes-mailchimp-before-submission-{$form_id}", $merge_variables );
 
 // Allow users to check for form values (using the `yikes-mailchimp-filter-before-submission` filter hook in function `get_submitted_merge_values`) 
 // and pass back an error and message to the user
 // If error is set and no message, default to our class variable's default error message
-if ( isset( $merge_variables['error'] ) ) {
-	$merge_error_message = isset( $merge_variables['message'] ) ? $merge_variables['message'] : $submission_handler->default_error_response_message;
-	$merge_vars_error_array = $submission_handler->handle_merge_variables_error( $merge_variables['error'], $merge_error_message );
-	if ( $merge_vars_error_array['success'] === false ) {
-		$process_submission_response = $submission_handler->wrap_form_submission_response( $merge_vars_error_array['message'], $is_success = false );
+if ( isset( $merge_variables[ 'error' ] ) ) {
+	$merge_error_message = isset( $merge_variables[ 'message' ] ) ? $merge_variables[ 'message' ] : $submission_handler->default_error_response_message;
+	$merge_vars_error_array = $submission_handler->handle_merge_variables_error( $merge_variables[ 'error' ], $merge_error_message );
+	if ( $merge_vars_error_array[ 'success' ] === false ) {
+		$process_submission_response = $submission_handler->wrap_form_submission_response( $merge_vars_error_array[ 'message' ], $is_success = false );
 		return;
 	}
 }
@@ -159,7 +159,7 @@ 
 
 // Only add groups if they exist
 if ( ! empty( $groups ) ) {
-	$member_data['interests'] = $groups;
+	$member_data[ 'interests' ] = $groups;
 }
 
 // Check if this member already exists
@@ -169,30 +169,30 @@ 
 // Likewise, if this member exists but their status is 'pending' it means we're dealing with a double opt-in list and they never confirmed
 // Or, if this member but their status is 'unsubscribed' it means we're dealing with someone who unsubscribed and they need to re-subscribe
 // Continue as if they're a new member to force another double opt-in email
-$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists['status'] ) && ( $member_exists['status'] === 'pending' || $member_exists['status'] === 'unsubscribed' );
+$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && ( $member_exists[ 'status' ] === 'pending' || $member_exists[ 'status' ] === 'unsubscribed' );
 
 if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) {
 	$new_subscriber = true;
 
 	// Check the opt-in value - is it double or single?
 	// Double opt-in means 'status_if_new' => 'pending'
-	$double_optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0;
+	$double_optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0;
 
 	// If the user was unsubscribed and is re-subscribing, we set the status to 'pending', which
 	// causes Mailchimp to send them a confirmation email.  This is the only way Mailchimp will
 	// allow us to re-subscribe the user.
-	$was_unsubscribed = is_array( $member_exists ) && isset( $member_exists['status'] ) && $member_exists['status'] === 'unsubscribed';
+	$was_unsubscribed = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && $member_exists[ 'status' ] === 'unsubscribed';
 
 	if ( $double_optin === 1 || $was_unsubscribed === true ) {
 
 		// Double opt-in
-		$member_data['status_if_new'] = 'pending';
-		$member_data['status']        = 'pending';
+		$member_data[ 'status_if_new' ] = 'pending';
+		$member_data[ 'status' ]        = 'pending';
 	} else {
 
 		// Single opt-in
-		$member_data['status_if_new'] = 'subscribed';
-		$member_data['status']        = 'subscribed';
+		$member_data[ 'status_if_new' ] = 'subscribed';
+		$member_data[ 'status' ]        = 'subscribed';
 	}
 
 } else {
@@ -201,28 +201,28 @@ 
 
 	// But first let's set our flag, and set the MailChimp status flag
 	$new_subscriber = false;
-	$member_data['status'] = 'subscribed';
+	$member_data[ 'status' ] = 'subscribed';
 
 	// Check our update_existing_user optin setting
-	$update_existing_user = ( $optin_settings['update_existing_user'] === '1' ) ? true : false;
+	$update_existing_user = ( $optin_settings[ 'update_existing_user' ] === '1' ) ? true : false;
 
 	// If update_existing_user is false (not allowed) then simply fail and return a response message
 	if ( $update_existing_user === false ) {
 		$disallow_update_array = $submission_handler->handle_disallowed_existing_user_update();
-		if ( $disallow_update_array['success'] === false ) {
-			$process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array['message'], $is_success = false );
+		if ( $disallow_update_array[ 'success' ] === false ) {
+			$process_submission_response = $submission_handler->wrap_form_submission_response( $disallow_update_array[ 'message' ], $is_success = false );
 			return;
 		}
 	}
 
 	// If update_existing_user is true, we need to check our 'send_update_email' option
-	$send_update_email = ( $optin_settings['send_update_email'] === '1' ) ? true : false;
+	$send_update_email = ( $optin_settings[ 'send_update_email' ] === '1' ) ? true : false;
 
 	// If $send_update_email is true (we send the email) then we need to fire off the 'send update email' logic
 	if ( $send_update_email === true ) {
 		$update_existing_user_array = $submission_handler->handle_updating_existing_user();
-		if ( $update_existing_user_array['success'] === false ) {
-			$process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array['message'], $is_success = false );
+		if ( $update_existing_user_array[ 'success' ] === false ) {
+			$process_submission_response = $submission_handler->wrap_form_submission_response( $update_existing_user_array[ 'message' ], $is_success = false );
 			return;
 		}
 	}
@@ -254,9 +254,9 @@ 
 }
 
 // Handle errors in the response
-if ( isset( $success_array ) && isset( $success_array['success'] ) && $success_array['success'] === false ) {
-	$process_submission_response = isset( $success_array['message'] ) ? $success_array['message'] : '';
-	$process_submission_response = $submission_handler->wrap_form_submission_response( $success_array['message'], $is_success = false );
+if ( isset( $success_array ) && isset( $success_array[ 'success' ] ) && $success_array[ 'success' ] === false ) {
+	$process_submission_response = isset( $success_array[ 'message' ] ) ? $success_array[ 'message' ] : '';
+	$process_submission_response = $submission_handler->wrap_form_submission_response( $success_array[ 'message' ], $is_success = false );
 	return;
 }
 
@@ -266,7 +266,7 @@ 
 // For non-AJAX submissions, if we have a new subscriber we need to increment our submissions count by 1
 // For AJAX, this is an AJAX call that gets fired off after form submission
 if ( $new_subscriber === true ) {
-	$submissions = (int) $form_settings['submissions'] + 1;	
+	$submissions = (int) $form_settings[ 'submissions' ] + 1;	
 	$interface->update_form_field( $form_id, 'submissions', $submissions );
 }
 

public/partials/shortcodes/process/process_form_submission_ajax.php

Spacing +31 added lines, -31 removed lines

@@ -8,10 +8,10 @@ 
 $submission_handler = new Yikes_Inc_Easy_MailChimp_Extender_Process_Submission_Handler( $is_ajax = true );
 
 // parse our form data
-parse_str( $_POST['form_data'], $data );
+parse_str( $_POST[ 'form_data' ], $data );
 
 // Get the form_id
-$form_id   = absint( $_POST['form_id'] );
+$form_id = absint( $_POST[ 'form_id' ] );
 
 // Send an error if for some reason we can't find the $form_id
 $submission_handler->handle_empty_form_id( $form_id );
@@ -20,7 +20,7 @@ 
 $submission_handler->set_form_id( $form_id ); 
 
 // Check our nonce
-$submission_handler->handle_nonce( $_POST['ajax_security_nonce'], 'yikes_mc_form_submission_security_nonce' );
+$submission_handler->handle_nonce( $_POST[ 'ajax_security_nonce' ], 'yikes_mc_form_submission_security_nonce' );
 
 // Get the form data
 $interface = yikes_easy_mailchimp_extender_get_form_interface();
@@ -30,10 +30,10 @@ 
 $submission_handler->handle_empty_form( $form_data ); 
 
 // Set up some variables from the form data -- these are required
-$list_id             = isset( $form_data['list_id'] ) ? $form_data['list_id'] : null;
-$submission_settings = isset( $form_data['submission_settings'] ) ? $form_data['submission_settings'] : null;
-$optin_settings      = isset( $form_data['optin_settings'] ) ? $form_data['optin_settings'] : null;
-$form_fields         = isset( $form_data['fields'] ) ? $form_data['fields'] : null;
+$list_id             = isset( $form_data[ 'list_id' ] ) ? $form_data[ 'list_id' ] : null;
+$submission_settings = isset( $form_data[ 'submission_settings' ] ) ? $form_data[ 'submission_settings' ] : null;
+$optin_settings      = isset( $form_data[ 'optin_settings' ] ) ? $form_data[ 'optin_settings' ] : null;
+$form_fields         = isset( $form_data[ 'fields' ] ) ? $form_data[ 'fields' ] : null;
 
 // Send an error if for some reason we can't find the required form data
 $submission_handler->handle_empty_fields_generic( array( $list_id, $submission_settings, $optin_settings, $form_fields ) );
@@ -47,14 +47,14 @@ 
 $submission_handler->check_for_required_interest_groups( $data, $form_fields );
 
 // Set up some variables from the form data -- these are not required
-$error_messages      = isset( $form_data['error_messages'] ) ? $form_data['error_messages'] : array();
-$notifications       = isset( $form_data['custom_notifications'] ) ? $form_data['custom_notifications'] : array();
+$error_messages      = isset( $form_data[ 'error_messages' ] ) ? $form_data[ 'error_messages' ] : array();
+$notifications       = isset( $form_data[ 'custom_notifications' ] ) ? $form_data[ 'custom_notifications' ] : array();
 
 // Set the error messages in our class
 $submission_handler->set_error_messages( $error_messages );
 
 // Some other variables we'll need.
-$page_data       = isset( $_POST['page_data'] ) ? $_POST['page_data'] : '';
+$page_data       = isset( $_POST[ 'page_data' ] ) ? $_POST[ 'page_data' ] : '';
 $merge_variables = array();
 $error           = 0;
 $list_handler    = yikes_get_mc_api_manager()->get_list_handler();
@@ -62,13 +62,13 @@ 
 // As of 6.4 we no longer pass the post object, only the ID.
 // For any users relying on the $post object for their `yikes-mailchimp-redirect-url` filter we'll grab the post object here.
 // Eventually we should just pass the $post_id into the filter instead of the whole object.
-$page_data       = ! empty( $page_data ) ? get_post( $page_data ) : '';
+$page_data = ! empty( $page_data ) ? get_post( $page_data ) : '';
 
 // Send an error if for some reason we can't find the list_handler
 $submission_handler->handle_empty_list_handler( $list_handler ); 
 
 // Get, sanitize and lowercasify the email
-$submitted_email = isset( $data['EMAIL'] ) ? $data['EMAIL'] : '';
+$submitted_email = isset( $data[ 'EMAIL' ] ) ? $data[ 'EMAIL' ] : '';
 $sanitized_email = $submission_handler->get_sanitized_email( $submitted_email ); 
 $submission_handler->set_email( $sanitized_email );
 
@@ -76,14 +76,14 @@ 
 $submission_handler->handle_empty_email( $sanitized_email );
 
 // Check for Honeypot filled
-$honey_pot_filled = ( isset( $data['yikes-mailchimp-honeypot'] ) && '' !== $data['yikes-mailchimp-honeypot'] ) ? true : false;
+$honey_pot_filled = ( isset( $data[ 'yikes-mailchimp-honeypot' ] ) && '' !== $data[ 'yikes-mailchimp-honeypot' ] ) ? true : false;
 
 // Send an error if honey pot is not empty
 $submission_handler->handle_non_empty_honeypot( $honey_pot_filled ); 
 
 // Check if reCAPTCHA Response was submitted with the form data, and handle it if needed
-if ( isset( $data['g-recaptcha-response'] ) ) {
-	$recaptcha_response = $data['g-recaptcha-response'];
+if ( isset( $data[ 'g-recaptcha-response' ] ) ) {
+	$recaptcha_response = $data[ 'g-recaptcha-response' ];
 	$submission_handler->handle_recaptcha( $recaptcha_response );
 }
 
@@ -91,7 +91,7 @@ 
 $merge_variables = $submission_handler->get_submitted_merge_values( $data, $form_fields );
 
 // Submission Setting: Replace interest groups or update interest groups
-$replace_interests = isset( $submission_settings['replace_interests'] ) ? (bool) $submission_settings['replace_interests'] : true;
+$replace_interests = isset( $submission_settings[ 'replace_interests' ] ) ? (bool) $submission_settings[ 'replace_interests' ] : true;
 
 // Get the default groups
 $groups = $submission_handler->get_default_interest_groups( $replace_interests, $list_handler );
@@ -106,15 +106,15 @@ 
  *
  * @param $merge_variables array Array of merge variable to use
  */
-do_action( 'yikes-mailchimp-before-submission',            $merge_variables );
+do_action( 'yikes-mailchimp-before-submission', $merge_variables );
 do_action( "yikes-mailchimp-before-submission-{$form_id}", $merge_variables );
 
 // Allow users to check for form values (using the `yikes-mailchimp-filter-before-submission` filter hook in function `get_submitted_merge_values`) 
 // and pass back an error and message to the user
 // If error is set and no message, default to our class variable's default error message
-if ( isset( $merge_variables['error'] ) ) {
-	$merge_error_message = isset( $merge_variables['message'] ) ? $merge_variables['message'] : $submission_handler->default_error_response_message;
-	$submission_handler->handle_merge_variables_error( $merge_variables['error'], $merge_error_message );
+if ( isset( $merge_variables[ 'error' ] ) ) {
+	$merge_error_message = isset( $merge_variables[ 'message' ] ) ? $merge_variables[ 'message' ] : $submission_handler->default_error_response_message;
+	$submission_handler->handle_merge_variables_error( $merge_variables[ 'error' ], $merge_error_message );
 }
 
 // This is the array we're going to pass through to the MailChimp API
@@ -126,7 +126,7 @@ 
 
 // Only add groups if they exist
 if ( ! empty( $groups ) ) {
-	$member_data['interests'] = $groups;
+	$member_data[ 'interests' ] = $groups;
 }
 
 // Check if this member already exists
@@ -136,7 +136,7 @@ 
 // Likewise, if this member exists but their status is 'pending' it means we're dealing with a double opt-in list and they never confirmed
 // Or, if this member but their status is 'unsubscribed' it means we're dealing with someone who unsubscribed and they need to re-subscribe
 // Continue as if they're a new member to force another double opt-in email
-$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists['status'] ) && ( $member_exists['status'] === 'pending' || $member_exists['status'] === 'unsubscribed' );
+$double_optin_resubscribe = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && ( $member_exists[ 'status' ] === 'pending' || $member_exists[ 'status' ] === 'unsubscribed' );
 
 if ( is_wp_error( $member_exists ) || $double_optin_resubscribe === true ) {
 
@@ -144,23 +144,23 @@ 
 
 	// Check the opt-in value - is it double or single?
 	// Double opt-in means 'status_if_new' => 'pending'
-	$double_optin = isset( $optin_settings['optin'] ) ? (int) $optin_settings['optin'] : 0;
+	$double_optin = isset( $optin_settings[ 'optin' ] ) ? (int) $optin_settings[ 'optin' ] : 0;
 
 	// If the user was unsubscribed and is re-subscribing, we set the status to 'pending', which
 	// causes Mailchimp to send them a confirmation email.  This is the only way Mailchimp will
 	// allow us to re-subscribe the user.
-	$was_unsubscribed = is_array( $member_exists ) && isset( $member_exists['status'] ) && $member_exists['status'] === 'unsubscribed';
+	$was_unsubscribed = is_array( $member_exists ) && isset( $member_exists[ 'status' ] ) && $member_exists[ 'status' ] === 'unsubscribed';
 
 	if ( $double_optin === 1 || $was_unsubscribed === true ) {
 
 		// Double opt-in
-		$member_data['status_if_new'] = 'pending';
-		$member_data['status']        = 'pending';
+		$member_data[ 'status_if_new' ] = 'pending';
+		$member_data[ 'status' ]        = 'pending';
 	} else {
 
 		// Single opt-in
-		$member_data['status_if_new'] = 'subscribed';
-		$member_data['status']        = 'subscribed';
+		$member_data[ 'status_if_new' ] = 'subscribed';
+		$member_data[ 'status' ]        = 'subscribed';
 	}
 	
 } else {
@@ -169,10 +169,10 @@ 
 
 	// But first let's set our flag, and set the MailChimp status flag
 	$new_subscriber = false;
-	$member_data['status'] = 'subscribed';
+	$member_data[ 'status' ] = 'subscribed';
 
 	// Check our update_existing_user optin setting
-	$update_existing_user = ( $optin_settings['update_existing_user'] === '1' ) ? true : false;
+	$update_existing_user = ( $optin_settings[ 'update_existing_user' ] === '1' ) ? true : false;
 
 	// If update_existing_user is false (not allowed) then simply fail and return a response message
 	if ( $update_existing_user === false ) {
@@ -180,7 +180,7 @@ 
 	}
 
 	// If update_existing_user is true, we need to check our 'send_update_email' option
-	$send_update_email = ( $optin_settings['send_update_email'] === '1' ) ? true : false;
+	$send_update_email = ( $optin_settings[ 'send_update_email' ] === '1' ) ? true : false;
 
 	// If $send_update_email is true (we send the email) then we need to fire off the 'send update email' logic
 	if ( $send_update_email === true ) {

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

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		<?php settings_fields( 'yikes_inc_easy_mc_recaptcha_settings_page' ); ?>
 
 			<label for="yikes-mc-recaptcha-setting">
-				<input type="checkbox" id="yikes-mc-recaptcha-setting" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ) , '1' ); ?>>
+				<input type="checkbox" id="yikes-mc-recaptcha-setting" name="yikes-mc-recaptcha-status" class="recaptcha-setting-checkbox" value="1" <?php checked( get_option( 'yikes-mc-recaptcha-status', '' ), '1' ); ?>>
 				<strong><?php _e( 'Enable reCAPTCHA Protection', 'yikes-inc-easy-mailchimp-extender' ); ?></strong>
 			</label>