yikesinc / yikes-inc-easy-mailchimp-extender

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/manage-forms.php

Spacing +50 added lines, -50 removed lines

@@ -6,13 +6,13 @@ 
 $all_forms = $form_interface->get_all_forms();
 
 /* Store Data if User is Authorized */
-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 ) ) {
 		$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' ),
 			"Manage Forms Page"
 		);
 		$list_data = array();
@@ -23,24 +23,24 @@ 
 ?>
 <div class="wrap">
 	<!-- Freddie Logo -->
-	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot' , 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
+	<img src="<?php echo YIKES_MC_URL . 'includes/images/MailChimp_Assets/Freddie_60px.png'; ?>" alt="<?php _e( 'Freddie - MailChimp Mascot', 'yikes-inc-easy-mailchimp-extender' ); ?>" class="yikes-mc-freddie-logo" />
 
-	<h1>Easy Forms for MailChimp | <?php _e( 'Manage Forms' , 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
+	<h1>Easy Forms for MailChimp | <?php _e( 'Manage Forms', 'yikes-inc-easy-mailchimp-extender' ) ?></h1>
 
 	<!-- Settings Page Description -->
-	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your MailChimp forms.' , 'yikes-inc-easy-mailchimp-extender' ); ?></p>
+	<p class="yikes-easy-mc-about-text about-text"><?php _e( 'Create and manage your MailChimp forms.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
 
 	<!-- Action Notices -->
 	<?php
 
 	/* If the user hasn't authenticated yet, lets kill off */
-	if( get_option( 'yikes-mc-api-validation' , 'invalid_api_key' ) != 'valid_api_key' ) {
-		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to MailChimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.' , 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>' , 500 );
+	if ( get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) != 'valid_api_key' ) {
+		wp_die( '<div class="error"><p>' . sprintf( __( 'You need to connect to MailChimp before you can start creating forms. Head over to the <a href="%s" title="Settings Page">Settings Page</a> and enter your API key.', 'yikes-inc-easy-mailchimp-extender' ), esc_url_raw( admin_url( 'admin.php?page=yikes-inc-easy-mailchimp-settings' ) ) ) . '</p></div>', 500 );
 	}
 
 	/* Display our admin notices here */
 	// delete form success
-	if( isset( $_REQUEST['deleted-form'] ) && $_REQUEST['deleted-form'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'deleted-form' ] ) && $_REQUEST[ 'deleted-form' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'Opt-in form successfully deleted.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -48,7 +48,7 @@ 
 		<?php
 	}
 	// duplicate form success
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'MailChimp Form successfully cloned.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -56,7 +56,7 @@ 
 		<?php
 	}
 	// duplicate form error
-	if( isset( $_REQUEST['duplicated-form'] ) && $_REQUEST['duplicated-form'] == 'false' ) {
+	if ( isset( $_REQUEST[ 'duplicated-form' ] ) && $_REQUEST[ 'duplicated-form' ] == 'false' ) {
 		?>
 		<div class="error manage-form-admin-notice">
 			<p><?php _e( 'There was an error trying to clone your form. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -64,7 +64,7 @@ 
 		<?php
 	}
 	// reset form submission stats success
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'true' ) {
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'true' ) {
 		?>
 		<div class="updated manage-form-admin-notice">
 			<p><?php _e( 'Form submission stats/rates successfully reset.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -72,7 +72,7 @@ 
 		<?php
 	}
 	// reset form submission stats error
-	if( isset( $_REQUEST['reset-stats'] ) && $_REQUEST['reset-stats'] == 'false' ) {
+	if ( isset( $_REQUEST[ 'reset-stats' ] ) && $_REQUEST[ 'reset-stats' ] == 'false' ) {
 		?>
 		<div class="error manage-form-admin-notice">
 			<p><?php _e( 'There was an error trying to reset the form submission stats/rates. Please try again. If this error persists, please contact the YIKES Inc. support team.', 'yikes-inc-easy-mailchimp-extender' ); ?></p>
@@ -99,13 +99,13 @@ 
 								<thead>
 									<tr>
 										<th id="cb" class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col" ><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 									</tr>
 								</thead>
 								<!-- end header -->
@@ -114,13 +114,13 @@ 
 								<tfoot>
 									<tr>
 										<th class="manage-column column-cb check-column num" scope="col"><input type="checkbox" /></th>
-										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th class="manage-column column-columnname" scope="col"><?php _e( 'List' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
-										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num yikes-form-id-number" scope="col"><?php _e( 'ID', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Name', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname" scope="col"><?php _e( 'Form Description', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th class="manage-column column-columnname" scope="col"><?php _e( 'List', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
+										<th id="columnname" class="manage-column column-columnname num" scope="col"><?php _e( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ); ?></th>
 									</tr>
 								</tfoot>
 								<!-- end footer -->
@@ -130,40 +130,40 @@ 
 									<?php
 									if ( count( $all_forms ) > 0 ) {
 										$i = 1;
-										foreach( $all_forms as $id => $form ) {
+										foreach ( $all_forms as $id => $form ) {
 										?>
-										<tr class="<?php if( $i % 2 == 0 ) { echo 'alternate'; } ?>">
+										<tr class="<?php if ( $i % 2 == 0 ) { echo 'alternate'; } ?>">
 											<th class="check-column num" scope="row"><input type="checkbox" /></th>
 											<td class="column-columnname num"><span class="form-id-container"><?php echo intval( $id ); ?></span></td>
 											<td class="column-columnname">
 												<!-- row title/link -->
-												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
-													<?php echo stripslashes( $form['form_name'] ); ?>
+												<a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>" class="row-title">
+													<?php echo stripslashes( $form[ 'form_name' ] ); ?>
 												</a>
 												<div class="row-actions">
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ) , admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
-													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats' , 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode" , 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'id' => $id ), admin_url( 'admin.php?page=yikes-mailchimp-edit-form' ) ) ); ?>"><?php _e( "Edit", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-duplicate-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'duplicate-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Duplicate", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-reset-stats', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'reset-stats-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>"><?php _e( "Reset Stats", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
+													<span><a href="#" class="view-yikes-mc-form-shortcode" data-alt-text="<?php _e( 'Stats', 'yikes-inc-easy-mailchimp-extender' ); ?>"><?php _e( "Shortcode", 'yikes-inc-easy-mailchimp-extender' ); ?></a> |</span>
 													<?php
 														/*
 														*	Custom action to allow users to add additional action links
 														*	to each form. We use this in our add-ons.
 														*	- Delete should remain last
 														*/
-														do_action( 'yikes-mailchimp-custom-form-actions' , $id );
+														do_action( 'yikes-mailchimp-custom-form-actions', $id );
 													?>
-													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id , 'nonce' => wp_create_nonce( 'delete-mailchimp-form-'.$id ) ) , admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.' , 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form['form_name'] ) ); ?>');"><?php _e( "Delete" , 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
+													<span><a href="<?php echo esc_url_raw( add_query_arg( array( 'action' => 'yikes-easy-mc-delete-form', 'mailchimp-form' => $id, 'nonce' => wp_create_nonce( 'delete-mailchimp-form-' . $id ) ), admin_url( 'admin.php?page=yikes-inc-easy-mailchimp' ) ) ); ?>" class="yikes-delete-mailchimp-form" onclick="return confirm('<?php printf( __( 'Are you sure you want to delete the %s form? This cannot be undone.', 'yikes-inc-easy-mailchimp-extender' ), stripslashes( $form[ 'form_name' ] ) ); ?>');"><?php _e( "Delete", 'yikes-inc-easy-mailchimp-extender' ); ?></a></span>
 												</div>
 											</td>
 
-											<td class="column-columnname"><?php echo isset( $form['form_description'] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form['form_description'] ) : ''; ?></td>
+											<td class="column-columnname"><?php echo isset( $form[ 'form_description' ] ) ? str_replace( '[yikes-mailchimp-subscriber-count]', do_shortcode( '[yikes-mailchimp-subscriber-count form="' . $id . '"]' ), $form[ 'form_description' ] ) : ''; ?></td>
 											<td class="column-columnname">
 												<?php
 												if ( $list_data && count( $list_data ) > 0 ) {
 													$parsed = wp_list_pluck( $list_data, 'name', 'id' );
-													if ( isset( $parsed[ $form['list_id'] ] ) ) {
-														echo esc_textarea( $parsed[ $form['list_id'] ] );
+													if ( isset( $parsed[ $form[ 'list_id' ] ] ) ) {
+														echo esc_textarea( $parsed[ $form[ 'list_id' ] ] );
 													} else {
 														echo '<strong>' . __( 'List Not Found', 'yikes-inc-easy-mailchimp-extender' ) . '</strong>';
 													}
@@ -172,25 +172,25 @@ 
 
 											<td class="column-columnname num stat-container">
 												<?php
-													$impressions = number_format( $form['impressions'] );
-													echo '<span title="' . __( 'Impressions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
+													$impressions = number_format( $form[ 'impressions' ] );
+													echo '<span title="' . __( 'Impressions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $impressions . '</span>';
 												?>
 											</td>
 											<td class="column-columnname num stat-container">
 												<?php
-													$submissions = number_format( $form['submissions'] );
-													echo '<span title="' . __( 'Submissions' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
+													$submissions = number_format( $form[ 'submissions' ] );
+													echo '<span title="' . __( 'Submissions', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $submissions . '</span>';
 												?>
 											</td>
 											<td class="column-columnname num stat-container">
 												<?php
-													if( $impressions != 0 ) {
-														$conversion_rate = ( round( 100 * $form['submissions'] / $form['impressions'] , 3 ) );
-														if( $conversion_rate >= '15' ) {
+													if ( $impressions != 0 ) {
+														$conversion_rate = ( round( 100 * $form[ 'submissions' ] / $form[ 'impressions' ], 3 ) );
+														if ( $conversion_rate >= '15' ) {
 															$conversion_color = '#00cc00'; // green (unicorn!)
-														} else if( $conversion_rate < '15' && $conversion_rate >= '10' ) {
+														} else if ( $conversion_rate < '15' && $conversion_rate >= '10' ) {
 															$conversion_color = '#0080FF'; // light blue (good)
-														} else if( $conversion_rate < '10' && $conversion_rate >= '5' ) {
+														} else if ( $conversion_rate < '10' && $conversion_rate >= '5' ) {
 															$conversion_color = '#FFFF32'; // yellow (ok)
 														} else {
 															$conversion_color = '#FF0000'; // red (no bueno)
@@ -199,7 +199,7 @@ 
 														$conversion_rate = '0';
 														$conversion_color = '#333333';
 													}
-													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate' , 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>';
+													echo '<span style="color:' . esc_attr( $conversion_color ) . ';" title="' . esc_attr__( 'Conversion Rate', 'yikes-inc-easy-mailchimp-extender' ) . '">' . $conversion_rate . '%</span>';
 												?>
 											</td>
 											<!-- shortcode -->
@@ -212,7 +212,7 @@ 
 											}
 										} else { ?>
 										<tr class="no-items">
-											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No MailChimp forms found. Use the form to the right to create a new one.' , 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
+											<td class="colspanchange no-mailchimp-forms-found" colspan="8"><em><?php _e( 'No MailChimp forms found. Use the form to the right to create a new one.', 'yikes-inc-easy-mailchimp-extender' ); ?></em></td>
 										</tr>
 									<?php } ?>
 								</tbody>

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>
 

admin/partials/dashboard-widgets/class.list-activity-widget.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 	// Construction
 	public function __construct() {
 
-		if ( apply_filters( 'yikes-mailchimp-dashboard-widgets-enabled', true ) === true &&  yikes_get_mc_api_key() != '' && get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'valid_api_key' ) {
+		if ( apply_filters( 'yikes-mailchimp-dashboard-widgets-enabled', true ) === true && yikes_get_mc_api_key() != '' && get_option( 'yikes-mc-api-validation', 'invalid_api_key' ) == 'valid_api_key' ) {
 
 			// hook in and display our list stats dashboard widget
 			add_action( 'wp_dashboard_setup', array( $this, 'yks_mc_add_dashboard_widget' ), 10 );
@@ -54,8 +54,8 @@ 
 
 			/* List Stats Dashboard Widget */
 			wp_add_dashboard_widget(
-				'yikes_easy_mc_list_stats_widget',         // Widget slug.
-				__( 'MailChimp List Stats', 'yikes-inc-easy-mailchimp-extender' ),         // Title.
+				'yikes_easy_mc_list_stats_widget', // Widget slug.
+				__( 'MailChimp List Stats', 'yikes-inc-easy-mailchimp-extender' ), // Title.
 				array( $this, 'list_stats_dashboard_widget' ) // Display function.
 			);
 		}
@@ -87,7 +87,7 @@ 
 					<?php
 					foreach ( $list_data as $list ) {
 						?>
-						<option value="<?php echo $list['id']; ?>"><?php echo $list['name']; ?></option>
+						<option value="<?php echo $list[ 'id' ]; ?>"><?php echo $list[ 'name' ]; ?></option>
 						<?php
 					}
 					?>

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

Spacing +8 added lines, -8 removed lines

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

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

Spacing +17 added lines, -17 removed lines

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