Inspection of "Issues/1971" - WordImpress/Give - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Pull Request — master (#1972)

by Ravinder

created 2017-08-09 07:20 UTC

Status

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -6,16 +6,16 @@  discard block
 block discarded – undo
  * @version     1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 } // Exit if accessed directly.
 
 // For gmail compatibility, including CSS styles in head/body are stripped out therefore styles need to be inline. These variables contain rules which are added to the template inline. !important; is a gmail hack to prevent styles being stripped if it doesn't like something.
-$body               = "
+$body = "
 	background-color: #f6f6f6;
 	font-family: 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
 ";
-$wrapper            = "
+$wrapper = "
 	width:100%;
 	-webkit-text-size-adjust:none !important;
 	margin:0;
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 	text-align: center;
 	vertical-align:middle;
 ";
-$body_content       = "
+$body_content = "
 	border-radius:3px !important;
 	font-family: 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
 ";
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
 	line-height:150%;
 	text-align:left;
 ";
-$header_content_h1  = "
+$header_content_h1 = "
 	color: #000000;
 	margin:0;
 	padding: 28px 24px;
@@ -63,13 +63,13 @@  discard block
 block discarded – undo
 	font-weight: 500;
 	line-height: 1.2;
 ";
-$header_img         = give_get_option( 'email_logo', '' );
+$header_img = give_get_option('email_logo', '');
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title><?php echo get_bloginfo( 'name' ); ?></title>
+	<title><?php echo get_bloginfo('name'); ?></title>
 </head>
 <body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0" style="<?php echo $body; ?>">
 <div style="<?php echo $wrapper; ?>">
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
 		<tr>
 			<td align="center" valign="top">
 				<?php
-				if ( ! empty( $header_img ) ) : ?>
+				if ( ! empty($header_img)) : ?>
 					<div id="template_header_image">
-						<?php echo '<p style="margin-top:0;"><img style="' . $template_image . '" src="' . esc_url( $header_img ) . '" alt="' . get_bloginfo( 'name' ) . '" /></p>'; ?>
+						<?php echo '<p style="margin-top:0;"><img style="'.$template_image.'" src="'.esc_url($header_img).'" alt="'.get_bloginfo('name').'" /></p>'; ?>
 					</div>
 				<?php endif; ?>
 				<table border="0" cellpadding="0" cellspacing="0" width="600" id="template_container" style="<?php echo $template_container; ?>">

Please login to merge, or discard this patch.

templates/emails/body.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@
 block discarded – undo
  * @version     1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly.
+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly.
 
 // {email} is replaced by the content entered in Donations > Settings > Emails
 

Please login to merge, or discard this patch.

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

@@ -6,7 +6,10 @@
 block discarded – undo
  * @version     1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly.
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+// Exit if accessed directly.
 
 // {email} is replaced by the content entered in Donations > Settings > Emails
 

Please login to merge, or discard this patch.

includes/user-functions.php 1 patch

Spacing +143 added lines, -143 removed lines patch added patch discarded remove patch

@@ -12,7 +12,7 @@  discard block
 block discarded – undo
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -30,54 +30,54 @@  discard block
 block discarded – undo
  *
  * @return bool|array List of all user donations.
  */
-function give_get_users_donations( $user = 0, $number = 20, $pagination = false, $status = 'complete' ) {
+function give_get_users_donations($user = 0, $number = 20, $pagination = false, $status = 'complete') {
 
-	if ( empty( $user ) ) {
+	if (empty($user)) {
 		$user = get_current_user_id();
 	}
 
-	if ( 0 === $user && ! Give()->email_access->token_exists ) {
+	if (0 === $user && ! Give()->email_access->token_exists) {
 		return false;
 	}
 
 	$status = $status === 'complete' ? 'publish' : $status;
 	$paged = 1;
 
-	if ( $pagination ) {
-		if ( get_query_var( 'paged' ) ) {
-			$paged = get_query_var( 'paged' );
-		} elseif ( get_query_var( 'page' ) ) {
-			$paged = get_query_var( 'page' );
+	if ($pagination) {
+		if (get_query_var('paged')) {
+			$paged = get_query_var('paged');
+		} elseif (get_query_var('page')) {
+			$paged = get_query_var('page');
 		}
 	}
 
-	$args = apply_filters( 'give_get_users_donations_args', array(
+	$args = apply_filters('give_get_users_donations_args', array(
 		'user'    => $user,
 		'number'  => $number,
 		'status'  => $status,
 		'orderby' => 'date',
-	) );
+	));
 
-	if ( $pagination ) {
+	if ($pagination) {
 		$args['page'] = $paged;
 	} else {
 		$args['nopaging'] = true;
 	}
 
-	$by_user_id = is_numeric( $user ) ? true : false;
-	$donor   = new Give_Donor( $user, $by_user_id );
+	$by_user_id = is_numeric($user) ? true : false;
+	$donor = new Give_Donor($user, $by_user_id);
 
-	if ( ! empty( $donor->payment_ids ) ) {
+	if ( ! empty($donor->payment_ids)) {
 
-		unset( $args['user'] );
-		$args['post__in'] = array_map( 'absint', explode( ',', $donor->payment_ids ) );
+		unset($args['user']);
+		$args['post__in'] = array_map('absint', explode(',', $donor->payment_ids));
 
 	}
 
-	$donations = give_get_payments( apply_filters( 'give_get_users_donations_args', $args ) );
+	$donations = give_get_payments(apply_filters('give_get_users_donations_args', $args));
 
 	// No donations
-	if ( ! $donations ) {
+	if ( ! $donations) {
 		return false;
 	}
 
@@ -96,65 +96,65 @@  discard block
 block discarded – undo
  *
  * @return bool|object List of unique forms donated by user
  */
-function give_get_users_completed_donations( $user = 0, $status = 'complete' ) {
-	if ( empty( $user ) ) {
+function give_get_users_completed_donations($user = 0, $status = 'complete') {
+	if (empty($user)) {
 		$user = get_current_user_id();
 	}
 
-	if ( empty( $user ) ) {
+	if (empty($user)) {
 		return false;
 	}
 
-	$by_user_id = is_numeric( $user ) ? true : false;
+	$by_user_id = is_numeric($user) ? true : false;
 
-	$donor = new Give_Donor( $user, $by_user_id );
+	$donor = new Give_Donor($user, $by_user_id);
 
-	if ( empty( $donor->payment_ids ) ) {
+	if (empty($donor->payment_ids)) {
 		return false;
 	}
 
 	// Get all the items donated.
-	$payment_ids    = array_reverse( explode( ',', $donor->payment_ids ) );
-	$limit_payments = apply_filters( 'give_users_completed_donations_payments', 50 );
-	if ( ! empty( $limit_payments ) ) {
-		$payment_ids = array_slice( $payment_ids, 0, $limit_payments );
+	$payment_ids    = array_reverse(explode(',', $donor->payment_ids));
+	$limit_payments = apply_filters('give_users_completed_donations_payments', 50);
+	if ( ! empty($limit_payments)) {
+		$payment_ids = array_slice($payment_ids, 0, $limit_payments);
 	}
 	$donation_data = array();
-	foreach ( $payment_ids as $payment_id ) {
-		$donation_data[] = give_get_payment_meta( $payment_id );
+	foreach ($payment_ids as $payment_id) {
+		$donation_data[] = give_get_payment_meta($payment_id);
 	}
 
-	if ( empty( $donation_data ) ) {
+	if (empty($donation_data)) {
 		return false;
 	}
 
 	// Grab only the post ids "form_id" of the forms donated on this order
 	$completed_donations_ids = array();
-	foreach ( $donation_data as $donation_meta ) {
-		$completed_donations_ids[] = isset( $donation_meta['form_id'] ) ? $donation_meta['form_id'] : '';
+	foreach ($donation_data as $donation_meta) {
+		$completed_donations_ids[] = isset($donation_meta['form_id']) ? $donation_meta['form_id'] : '';
 	}
 
-	if ( empty( $completed_donations_ids ) ) {
+	if (empty($completed_donations_ids)) {
 		return false;
 	}
 
 	// Only include each donation once
-	$form_ids = array_unique( $completed_donations_ids );
+	$form_ids = array_unique($completed_donations_ids);
 
 	// Make sure we still have some products and a first item
-	if ( empty( $form_ids ) || ! isset( $form_ids[0] ) ) {
+	if (empty($form_ids) || ! isset($form_ids[0])) {
 		return false;
 	}
 
-	$post_type = get_post_type( $form_ids[0] );
+	$post_type = get_post_type($form_ids[0]);
 
-	$args = apply_filters( 'give_get_users_completed_donations_args', array(
+	$args = apply_filters('give_get_users_completed_donations_args', array(
 		'include'        => $form_ids,
 		'post_type'      => $post_type,
-		'posts_per_page' => - 1,
-	) );
+		'posts_per_page' => -1,
+	));
 
-	return apply_filters( 'give_users_completed_donations_list', get_posts( $args ) );
+	return apply_filters('give_users_completed_donations_list', get_posts($args));
 }
 
 
@@ -170,12 +170,12 @@  discard block
 block discarded – undo
  *
  * @return      bool True if has donated, false other wise.
  */
-function give_has_donations( $user_id = null ) {
-	if ( empty( $user_id ) ) {
+function give_has_donations($user_id = null) {
+	if (empty($user_id)) {
 		$user_id = get_current_user_id();
 	}
 
-	if ( give_get_users_donations( $user_id, 1 ) ) {
+	if (give_get_users_donations($user_id, 1)) {
 		return true; // User has at least one donation.
 	}
 
@@ -196,23 +196,23 @@  discard block
 block discarded – undo
  *
  * @return      array
  */
-function give_get_donation_stats_by_user( $user = '' ) {
+function give_get_donation_stats_by_user($user = '') {
 
 	$field = '';
 
-	if ( is_email( $user ) ) {
+	if (is_email($user)) {
 		$field = 'email';
-	} elseif ( is_numeric( $user ) ) {
+	} elseif (is_numeric($user)) {
 		$field = 'user_id';
 	}
 
-	$stats    = array();
-	$donor = Give()->donors->get_donor_by( $field, $user );
+	$stats = array();
+	$donor = Give()->donors->get_donor_by($field, $user);
 
-	if ( $donor ) {
-		$donor = new Give_Donor( $donor->id );
-		$stats['purchases']   = absint( $donor->purchase_count );
-		$stats['total_spent'] = give_maybe_sanitize_amount( $donor->purchase_value );
+	if ($donor) {
+		$donor = new Give_Donor($donor->id);
+		$stats['purchases']   = absint($donor->purchase_count);
+		$stats['total_spent'] = give_maybe_sanitize_amount($donor->purchase_value);
 	}
 
 	/**
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.7
 	 */
-	$stats = (array) apply_filters( 'give_donation_stats_by_user', $stats, $user );
+	$stats = (array) apply_filters('give_donation_stats_by_user', $stats, $user);
 
 	return $stats;
 }
@@ -238,21 +238,21 @@  discard block
 block discarded – undo
  *
  * @return      int The total number of donations.
  */
-function give_count_donations_of_donor( $user = null ) {
+function give_count_donations_of_donor($user = null) {
 
 	// Logged in?
-	if ( empty( $user ) ) {
+	if (empty($user)) {
 		$user = get_current_user_id();
 	}
 
 	// Email access?
-	if ( empty( $user ) && Give()->email_access->token_email ) {
+	if (empty($user) && Give()->email_access->token_email) {
 		$user = Give()->email_access->token_email;
 	}
 
-	$stats = ! empty( $user ) ? give_get_donation_stats_by_user( $user ) : false;
+	$stats = ! empty($user) ? give_get_donation_stats_by_user($user) : false;
 
-	return isset( $stats['purchases'] ) ? $stats['purchases'] : 0;
+	return isset($stats['purchases']) ? $stats['purchases'] : 0;
 }
 
 /**
@@ -265,9 +265,9 @@  discard block
 block discarded – undo
  *
  * @return      float The total amount the user has spent
  */
-function give_donation_total_of_user( $user = null ) {
+function give_donation_total_of_user($user = null) {
 
-	$stats = give_get_donation_stats_by_user( $user );
+	$stats = give_get_donation_stats_by_user($user);
 
 	return $stats['total_spent'];
 }
@@ -283,40 +283,40 @@  discard block
 block discarded – undo
  *
  * @return bool
  */
-function give_validate_username( $username, $form_id = 0 ) {
+function give_validate_username($username, $form_id = 0) {
 	$valid = true;
 
 	// Validate username.
-	if ( ! empty( $username ) ) {
+	if ( ! empty($username)) {
 
 		// Sanitize username.
-		$sanitized_user_name = sanitize_user( $username, false );
+		$sanitized_user_name = sanitize_user($username, false);
 
 		// We have an user name, check if it already exists.
-		if ( username_exists( $username ) ) {
+		if (username_exists($username)) {
 			// Username already registered.
-			give_set_error( 'username_unavailable', __( 'Username already taken.', 'give' ) );
+			give_set_error('username_unavailable', __('Username already taken.', 'give'));
 			$valid = false;
 
 			// Check if it's valid.
-		} elseif ( $sanitized_user_name !== $username ) {
+		} elseif ($sanitized_user_name !== $username) {
 			// Invalid username.
-			if ( is_multisite() ) {
-				give_set_error( 'username_invalid', __( 'Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give' ) );
+			if (is_multisite()) {
+				give_set_error('username_invalid', __('Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give'));
 				$valid = false;
 			} else {
-				give_set_error( 'username_invalid', __( 'Invalid username.', 'give' ) );
+				give_set_error('username_invalid', __('Invalid username.', 'give'));
 				$valid = false;
 			}
 		}
 	} else {
 		// Username is empty.
-		give_set_error( 'username_empty', __( 'Enter a username.', 'give' ) );
+		give_set_error('username_empty', __('Enter a username.', 'give'));
 		$valid = false;
 
 		// Check if guest checkout is disable for form.
-		if ( $form_id && give_logged_in_only( $form_id ) ) {
-			give_set_error( 'registration_required', __( 'You must register or login to complete your donation.', 'give' ) );
+		if ($form_id && give_logged_in_only($form_id)) {
+			give_set_error('registration_required', __('You must register or login to complete your donation.', 'give'));
 			$valid = false;
 		}
 	}
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
 	 * @param string $username
 	 * @param bool   $form_id
 	 */
-	$valid = (bool) apply_filters( 'give_validate_username', $valid, $username, $form_id );
+	$valid = (bool) apply_filters('give_validate_username', $valid, $username, $form_id);
 
 	return $valid;
 }
@@ -346,22 +346,22 @@  discard block
 block discarded – undo
  *
  * @return bool
  */
-function give_validate_user_email( $email, $registering_new_user = false ) {
+function give_validate_user_email($email, $registering_new_user = false) {
 	$valid = true;
 
-	if ( empty( $email ) ) {
+	if (empty($email)) {
 		// No email.
-		give_set_error( 'email_empty', __( 'Enter an email.', 'give' ) );
+		give_set_error('email_empty', __('Enter an email.', 'give'));
 		$valid = false;
 
-	} elseif ( ! is_email( $email ) ) {
+	} elseif ( ! is_email($email)) {
 		// Validate email.
-		give_set_error( 'email_invalid', __( 'Invalid email.', 'give' ) );
+		give_set_error('email_invalid', __('Invalid email.', 'give'));
 		$valid = false;
 
-	} elseif ( $registering_new_user && ( give_donor_email_exists( $email ) || email_exists( $email ) ) ) {
+	} elseif ($registering_new_user && (give_donor_email_exists($email) || email_exists($email))) {
 		// Check if email exists.
-		give_set_error( 'email_used', __( 'The email address provided is already active for another user.', 'give' ) );
+		give_set_error('email_used', __('The email address provided is already active for another user.', 'give'));
 		$valid = false;
 	}
 
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
 	 * @param string $email
 	 * @param bool   $registering_new_user
 	 */
-	$valid = (bool) apply_filters( 'give_validate_user_email', $valid, $email, $registering_new_user );
+	$valid = (bool) apply_filters('give_validate_user_email', $valid, $email, $registering_new_user);
 
 	return $valid;
 }
@@ -390,34 +390,34 @@  discard block
 block discarded – undo
  *
  * @return bool
  */
-function give_validate_user_password( $password = '', $confirm_password = '', $registering_new_user = false ) {
+function give_validate_user_password($password = '', $confirm_password = '', $registering_new_user = false) {
 	$valid = true;
 
 	// Passwords Validation For New Donors Only
-	if ( $registering_new_user ) {
+	if ($registering_new_user) {
 		// Password or confirmation missing.
-		if ( ! $password ) {
+		if ( ! $password) {
 			// The password is invalid.
-			give_set_error( 'password_empty', __( 'Enter a password.', 'give' ) );
+			give_set_error('password_empty', __('Enter a password.', 'give'));
 			$valid = false;
-		} elseif ( ! $confirm_password ) {
+		} elseif ( ! $confirm_password) {
 			// Confirmation password is invalid.
-			give_set_error( 'confirmation_empty', __( 'Enter the password confirmation.', 'give' ) );
+			give_set_error('confirmation_empty', __('Enter the password confirmation.', 'give'));
 			$valid = false;
 		}
 	}
 	// Passwords Validation For New Donors as well as Existing Donors
-	if( $password || $confirm_password ) {
-		if ( strlen( $password ) < 6 || strlen( $confirm_password ) < 6 ) {
+	if ($password || $confirm_password) {
+		if (strlen($password) < 6 || strlen($confirm_password) < 6) {
 			// Seems Weak Password
-			give_set_error( 'password_weak', __( 'Passwords should have at least 6 characters.', 'give' ) );
+			give_set_error('password_weak', __('Passwords should have at least 6 characters.', 'give'));
 			$valid = false;
 		}
-		if ( $password && $confirm_password ) {
+		if ($password && $confirm_password) {
 			// Verify confirmation matches.
-			if ( $password != $confirm_password ) {
+			if ($password != $confirm_password) {
 				// Passwords do not match
-				give_set_error( 'password_mismatch', __( 'Passwords you entered do not match. Please try again.', 'give' ) );
+				give_set_error('password_mismatch', __('Passwords you entered do not match. Please try again.', 'give'));
 				$valid = false;
 			}
 		}
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
 	 * @param string $confirm_password
 	 * @param bool   $registering_new_user
 	 */
-	$valid = (bool) apply_filters( 'give_validate_user_email', $valid, $password, $confirm_password, $registering_new_user );
+	$valid = (bool) apply_filters('give_validate_user_email', $valid, $password, $confirm_password, $registering_new_user);
 
 	return $valid;
 }
@@ -451,33 +451,33 @@  discard block
 block discarded – undo
  *
  * @return      void
  */
-function give_add_past_donations_to_new_user( $user_id ) {
+function give_add_past_donations_to_new_user($user_id) {
 
-	$email = get_the_author_meta( 'user_email', $user_id );
+	$email = get_the_author_meta('user_email', $user_id);
 
-	$payments = give_get_payments( array(
+	$payments = give_get_payments(array(
 		's' => $email,
-	) );
+	));
 
-	if ( $payments ) {
-		foreach ( $payments as $payment ) {
-			if ( intval( give_get_payment_user_id( $payment->ID ) ) > 0 ) {
+	if ($payments) {
+		foreach ($payments as $payment) {
+			if (intval(give_get_payment_user_id($payment->ID)) > 0) {
 				continue;
 			} // End if().
 
-			$meta                    = give_get_payment_meta( $payment->ID );
-			$meta['user_info']       = maybe_unserialize( $meta['user_info'] );
+			$meta                    = give_get_payment_meta($payment->ID);
+			$meta['user_info']       = maybe_unserialize($meta['user_info']);
 			$meta['user_info']['id'] = $user_id;
 
 			// Store the updated user ID in the payment meta.
-			give_update_payment_meta( $payment->ID, '_give_payment_meta', $meta );
-			give_update_payment_meta( $payment->ID, '_give_payment_user_id', $user_id );
+			give_update_payment_meta($payment->ID, '_give_payment_meta', $meta);
+			give_update_payment_meta($payment->ID, '_give_payment_user_id', $user_id);
 		}
 	}
 
 }
 
-add_action( 'user_register', 'give_add_past_donations_to_new_user' );
+add_action('user_register', 'give_add_past_donations_to_new_user');
 
 
 /**
@@ -503,34 +503,34 @@  discard block
 block discarded – undo
  *
  * @return        array The donor's address, if any
  */
-function give_get_donor_address( $user_id = 0 ) {
-	if ( empty( $user_id ) ) {
+function give_get_donor_address($user_id = 0) {
+	if (empty($user_id)) {
 		$user_id = get_current_user_id();
 	}
 
-	$address = get_user_meta( $user_id, '_give_user_address', true );
+	$address = get_user_meta($user_id, '_give_user_address', true);
 
-	if ( ! isset( $address['line1'] ) ) {
+	if ( ! isset($address['line1'])) {
 		$address['line1'] = '';
 	}
 
-	if ( ! isset( $address['line2'] ) ) {
+	if ( ! isset($address['line2'])) {
 		$address['line2'] = '';
 	}
 
-	if ( ! isset( $address['city'] ) ) {
+	if ( ! isset($address['city'])) {
 		$address['city'] = '';
 	}
 
-	if ( ! isset( $address['zip'] ) ) {
+	if ( ! isset($address['zip'])) {
 		$address['zip'] = '';
 	}
 
-	if ( ! isset( $address['country'] ) ) {
+	if ( ! isset($address['country'])) {
 		$address['country'] = '';
 	}
 
-	if ( ! isset( $address['state'] ) ) {
+	if ( ! isset($address['state'])) {
 		$address['state'] = '';
 	}
 
@@ -550,32 +550,32 @@  discard block
 block discarded – undo
  *
  * @return        void
  */
-function give_new_user_notification( $user_id = 0, $user_data = array() ) {
+function give_new_user_notification($user_id = 0, $user_data = array()) {
 
-	if ( empty( $user_id ) || empty( $user_data ) ) {
+	if (empty($user_id) || empty($user_data)) {
 		return;
 	}
-	$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
 
 	// New User Registration: Email sends to the site admin.
 	$emails = Give()->emails;
-	$emails->__set( 'heading', esc_html__( 'New User Registration', 'give' ) );
+	$emails->__set('heading', esc_html__('New User Registration', 'give'));
 
 	/* translators: %s: site name */
-	$message = sprintf( esc_attr__( 'A new user has registered on %s:', 'give' ), $blogname ) . "\r\n\r\n";
+	$message = sprintf(esc_attr__('A new user has registered on %s:', 'give'), $blogname)."\r\n\r\n";
 	/* translators: %s: user login */
-	$message .= '<strong>' . esc_attr__( 'Username:', 'give' ) . '</strong> ' . $user_data['user_login'] . "\r\n";
+	$message .= '<strong>'.esc_attr__('Username:', 'give').'</strong> '.$user_data['user_login']."\r\n";
 	/* translators: %s: user email */
-	$message .= '<strong>' . esc_attr__( 'E-mail:', 'give' ) . '</strong> ' . $user_data['user_email']  . "\r\n\r\n";
+	$message .= '<strong>'.esc_attr__('E-mail:', 'give').'</strong> '.$user_data['user_email']."\r\n\r\n";
 
-	$message .= '<a href="' . admin_url('user-edit.php?user_id=' . $user_id) . '" target="_blank"> ' . esc_attr__( 'Click here to view &raquo;', 'give' ) . '</a>' . "\r\n";
+	$message .= '<a href="'.admin_url('user-edit.php?user_id='.$user_id).'" target="_blank"> '.esc_attr__('Click here to view &raquo;', 'give').'</a>'."\r\n";
 
 	$emails->send(
-		get_option( 'admin_email' ),
+		get_option('admin_email'),
 		sprintf(
 			/* translators: %s: site name */
-			esc_attr__( '[%s] New User Registration', 'give' ),
+			esc_attr__('[%s] New User Registration', 'give'),
 			$blogname
 		),
 		$message
@@ -583,22 +583,22 @@  discard block
 block discarded – undo
 
 
 	// Account Information: Email sends to donor who registered.
-	$emails->__set( 'heading', esc_html__( 'Account Information', 'give' ) );
+	$emails->__set('heading', esc_html__('Account Information', 'give'));
 
-	$message = sprintf( esc_attr__( 'The following email contains your account information for %s:', 'give' ), $blogname ) . "\r\n\r\n";
+	$message = sprintf(esc_attr__('The following email contains your account information for %s:', 'give'), $blogname)."\r\n\r\n";
 
 	/* translators: %s: user login */
-	$message .=  '<strong>' . esc_attr__( 'Username:', 'give' ) . '</strong> ' .  $user_data['user_login'] . "\r\n";
+	$message .= '<strong>'.esc_attr__('Username:', 'give').'</strong> '.$user_data['user_login']."\r\n";
 	/* translators: %s: password */
-	$message .=  '<strong>' . esc_attr__( 'Password:', 'give' ) . '</strong> ' . esc_attr__( '[Password entered during donation]', 'give' ) . "\r\n\r\n";
+	$message .= '<strong>'.esc_attr__('Password:', 'give').'</strong> '.esc_attr__('[Password entered during donation]', 'give')."\r\n\r\n";
 
-	$message .= '<a href="' . wp_login_url() . '" target="_blank"> ' . esc_attr__( 'Click here to login &raquo;', 'give' ) . '</a>' . "\r\n";
+	$message .= '<a href="'.wp_login_url().'" target="_blank"> '.esc_attr__('Click here to login &raquo;', 'give').'</a>'."\r\n";
 
 	$emails->send(
 		$user_data['user_email'],
 		sprintf(
 			/* translators: %s: site name */
-			esc_attr__( '[%s] Your username and password', 'give' ),
+			esc_attr__('[%s] Your username and password', 'give'),
 			$blogname
 		),
 		$message
@@ -606,7 +606,7 @@  discard block
 block discarded – undo
 
 }
 
-add_action( 'give_insert_user', 'give_new_user_notification', 10, 2 );
+add_action('give_insert_user', 'give_new_user_notification', 10, 2);
 
 
 /**
@@ -622,34 +622,34 @@  discard block
 block discarded – undo
  *
  * @return      string
  */
-function give_get_donor_name_by( $id = 0, $from = 'donation' ) {
+function give_get_donor_name_by($id = 0, $from = 'donation') {
 
 	// ID shouldn't be empty
-	if ( empty( $id ) ) {
+	if (empty($id)) {
 		return;
 	}
 
 	$name = '';
 
-	switch ( $from ) {
+	switch ($from) {
 
 		case 'donation':
 
-			$user_info = give_get_payment_meta_user_info( $id );
-			$name = $user_info['first_name'] . ' ' . $user_info['last_name'];
+			$user_info = give_get_payment_meta_user_info($id);
+			$name = $user_info['first_name'].' '.$user_info['last_name'];
 
 		break;
 
 		case 'donor':
 
-			$donor = new Give_Donor( $id );
+			$donor = new Give_Donor($id);
 			$name = $donor->name;
 
 		break;
 
 	}
 
-	return trim( $name );
+	return trim($name);
 
 }
 
@@ -661,8 +661,8 @@  discard block
 block discarded – undo
  * @param  string   $email Donor Email.
  * @return boolean  The user's ID on success, and false on failure.
  */
-function give_donor_email_exists( $email ) {
-	if ( Give()->donors->get_donor_by( 'email', $email ) ) {
+function give_donor_email_exists($email) {
+	if (Give()->donors->get_donor_by('email', $email)) {
 		return true;
 	}
 	return false;

Please login to merge, or discard this patch.

includes/admin/admin-actions.php 1 patch

Spacing +107 added lines, -108 removed lines patch added patch discarded remove patch

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,19 +20,19 @@  discard block
 block discarded – undo
  * @since 1.8
  */
 function give_load_wp_editor() {
-	if ( ! isset( $_POST['wp_editor'] ) ) {
+	if ( ! isset($_POST['wp_editor'])) {
 		die();
 	}
 
-	$wp_editor                     = json_decode( base64_decode( $_POST['wp_editor'] ), true );
+	$wp_editor                     = json_decode(base64_decode($_POST['wp_editor']), true);
 	$wp_editor[2]['textarea_name'] = $_POST['textarea_name'];
 
-	wp_editor( $wp_editor[0], $_POST['wp_editor_id'], $wp_editor[2] );
+	wp_editor($wp_editor[0], $_POST['wp_editor_id'], $wp_editor[2]);
 
 	die();
 }
 
-add_action( 'wp_ajax_give_load_wp_editor', 'give_load_wp_editor' );
+add_action('wp_ajax_give_load_wp_editor', 'give_load_wp_editor');
 
 
 /**
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
 	);
 
 	// Get current page.
-	$current_page = isset( $_GET['page'] ) ? esc_attr( $_GET['page'] ) : '';
+	$current_page = isset($_GET['page']) ? esc_attr($_GET['page']) : '';
 
 	// Bailout.
 	if (
-		empty( $current_page )
-		|| empty( $_GET['_wp_http_referer'] )
-		|| ! in_array( $current_page, $give_pages )
+		empty($current_page)
+		|| empty($_GET['_wp_http_referer'])
+		|| ! in_array($current_page, $give_pages)
 	) {
 		return false;
 	}
@@ -68,21 +68,21 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.8
 	 */
-	$redirect = apply_filters( "give_validate_{$current_page}", true );
+	$redirect = apply_filters("give_validate_{$current_page}", true);
 
-	if ( $redirect ) {
+	if ($redirect) {
 		// Redirect.
 		wp_redirect(
 			remove_query_arg(
-				array( '_wp_http_referer', '_wpnonce' ),
-				wp_unslash( $_SERVER['REQUEST_URI'] )
+				array('_wp_http_referer', '_wpnonce'),
+				wp_unslash($_SERVER['REQUEST_URI'])
 			)
 		);
 		exit;
 	}
 }
 
-add_action( 'admin_init', 'give_redirect_to_clean_url_admin_pages' );
+add_action('admin_init', 'give_redirect_to_clean_url_admin_pages');
 
 
 /**
@@ -96,25 +96,25 @@  discard block
 block discarded – undo
  */
 function give_hide_outdated_php_notice() {
 
-	if ( ! isset( $_POST['_give_hide_outdated_php_notices_shortly'] ) ) {
+	if ( ! isset($_POST['_give_hide_outdated_php_notices_shortly'])) {
 		give_die();
 	}
 
 	// Transient key name.
 	$transient_key = "_give_hide_outdated_php_notices_shortly";
 
-	if ( Give_Cache::get( $transient_key, true ) ) {
+	if (Give_Cache::get($transient_key, true)) {
 		return;
 	}
 
 	// Hide notice for 24 hours.
-	Give_Cache::set( $transient_key, true, DAY_IN_SECONDS, true );
+	Give_Cache::set($transient_key, true, DAY_IN_SECONDS, true);
 
 	give_die();
 
 }
 
-add_action( 'wp_ajax_give_hide_outdated_php_notice', 'give_hide_outdated_php_notice' );
+add_action('wp_ajax_give_hide_outdated_php_notice', 'give_hide_outdated_php_notice');
 
 /**
  * Register admin notices.
@@ -123,23 +123,23 @@  discard block
 block discarded – undo
  */
 function _give_register_admin_notices() {
 	// Bailout.
-	if( ! is_admin() ) {
+	if ( ! is_admin()) {
 		return;
 	}
 
 	// Add payment bulk notice.
 	if (
-		current_user_can( 'edit_give_payments' )
-		&& isset( $_GET['action'] )
-		&& ! empty( $_GET['action'] )
-		&& isset( $_GET['payment'] )
-		&& ! empty( $_GET['payment'] )
+		current_user_can('edit_give_payments')
+		&& isset($_GET['action'])
+		&& ! empty($_GET['action'])
+		&& isset($_GET['payment'])
+		&& ! empty($_GET['payment'])
 	) {
-		$payment_count = isset( $_GET['payment'] ) ? count( $_GET['payment'] ) : 0;
+		$payment_count = isset($_GET['payment']) ? count($_GET['payment']) : 0;
 
-		switch ( $_GET['action'] ) {
+		switch ($_GET['action']) {
 			case 'delete':
-				Give()->notices->register_notice( array(
+				Give()->notices->register_notice(array(
 					'id'          => 'bulk_action_delete',
 					'type'        => 'updated',
 					'description' => sprintf(
@@ -151,12 +151,12 @@  discard block
 block discarded – undo
 						),
 						$payment_count ),
 					'show'        => true,
-				) );
+				));
 
 				break;
 
 			case 'resend-receipt':
-				Give()->notices->register_notice( array(
+				Give()->notices->register_notice(array(
 					'id'          => 'bulk_action_resend_receipt',
 					'type'        => 'updated',
 					'description' => sprintf(
@@ -169,196 +169,196 @@  discard block
 block discarded – undo
 						$payment_count
 					),
 					'show'        => true,
-				) );
+				));
 				break;
 		}
 	}
 
 	// Add give message notices.
-	if ( ! empty( $_GET['give-message'] ) ) {
+	if ( ! empty($_GET['give-message'])) {
 		// Donation reports errors.
-		if ( current_user_can( 'view_give_reports' ) ) {
-			switch ( $_GET['give-message'] ) {
+		if (current_user_can('view_give_reports')) {
+			switch ($_GET['give-message']) {
 				case 'donation_deleted' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-donation-deleted',
 						'type'        => 'updated',
-						'description' => __( 'The donation has been deleted.', 'give' ),
+						'description' => __('The donation has been deleted.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'email_sent' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-payment-sent',
 						'type'        => 'updated',
-						'description' => __( 'The donation receipt has been resent.', 'give' ),
+						'description' => __('The donation receipt has been resent.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'refreshed-reports' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-refreshed-reports',
 						'type'        => 'updated',
-						'description' => __( 'The reports cache has been cleared.', 'give' ),
+						'description' => __('The reports cache has been cleared.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'donation-note-deleted' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-donation-note-deleted',
 						'type'        => 'updated',
-						'description' => __( 'The donation note has been deleted.', 'give' ),
+						'description' => __('The donation note has been deleted.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 			}
 		}
 
 		// Give settings notices and errors.
-		if ( current_user_can( 'manage_give_settings' ) ) {
-			switch ( $_GET['give-message'] ) {
+		if (current_user_can('manage_give_settings')) {
+			switch ($_GET['give-message']) {
 				case 'settings-imported' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-settings-imported',
 						'type'        => 'updated',
-						'description' => __( 'The settings have been imported.', 'give' ),
+						'description' => __('The settings have been imported.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'api-key-generated' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-api-key-generated',
 						'type'        => 'updated',
-						'description' => __( 'API keys have been generated.', 'give' ),
+						'description' => __('API keys have been generated.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'api-key-exists' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-api-key-exists',
 						'type'        => 'updated',
-						'description' => __( 'The specified user already has API keys.', 'give' ),
+						'description' => __('The specified user already has API keys.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'api-key-regenerated' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-api-key-regenerated',
 						'type'        => 'updated',
-						'description' => __( 'API keys have been regenerated.', 'give' ),
+						'description' => __('API keys have been regenerated.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'api-key-revoked' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-api-key-revoked',
 						'type'        => 'updated',
-						'description' => __( 'API keys have been revoked.', 'give' ),
+						'description' => __('API keys have been revoked.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'sent-test-email' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-sent-test-email',
 						'type'        => 'updated',
-						'description' => __( 'The test email has been sent.', 'give' ),
+						'description' => __('The test email has been sent.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'matched-success-failure-page':
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-matched-success-failure-page',
 						'type'        => 'updated',
-						'description' => __( 'You cannot set the success and failed pages to the same page', 'give' ),
+						'description' => __('You cannot set the success and failed pages to the same page', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 			}
 		}
 		// Payments errors.
-		if ( current_user_can( 'edit_give_payments' ) ) {
-			switch ( $_GET['give-message'] ) {
+		if (current_user_can('edit_give_payments')) {
+			switch ($_GET['give-message']) {
 				case 'note-added' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-note-added',
 						'type'        => 'updated',
-						'description' => __( 'The donation note has been added.', 'give' ),
+						'description' => __('The donation note has been added.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 				case 'payment-updated' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-payment-updated',
 						'type'        => 'updated',
-						'description' => __( 'The donation has been updated.', 'give' ),
+						'description' => __('The donation has been updated.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 			}
 		}
 
 		// Donor Notices.
-		if ( current_user_can( 'edit_give_payments' ) ) {
-			switch ( $_GET['give-message'] ) {
+		if (current_user_can('edit_give_payments')) {
+			switch ($_GET['give-message']) {
 				case 'donor-deleted' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-donor-deleted',
 						'type'        => 'updated',
-						'description' => __( 'The donor has been deleted.', 'give' ),
+						'description' => __('The donor has been deleted.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 
 				case 'email-added' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-donor-email-added',
 						'type'        => 'updated',
-						'description' => __( 'Donor email added.', 'give' ),
+						'description' => __('Donor email added.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 
 				case 'email-removed' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-donor-email-removed',
 						'type'        => 'updated',
-						'description' => __( 'Donor email removed.', 'give' ),
+						'description' => __('Donor email removed.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 
 				case 'email-remove-failed' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-donor-email-remove-failed',
 						'type'        => 'updated',
-						'description' => __( 'Failed to remove donor email.', 'give' ),
+						'description' => __('Failed to remove donor email.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 
 				case 'primary-email-updated' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-donor-primary-email-updated',
 						'type'        => 'updated',
-						'description' => __( 'Primary email updated for donor.', 'give' ),
+						'description' => __('Primary email updated for donor.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 
 				case 'primary-email-failed' :
-					Give()->notices->register_notice( array(
+					Give()->notices->register_notice(array(
 						'id'          => 'give-donor-primary-email-failed',
 						'type'        => 'updated',
-						'description' => __( 'Failed to set primary email.', 'give' ),
+						'description' => __('Failed to set primary email.', 'give'),
 						'show'        => true,
-					) );
+					));
 					break;
 			}
 		}
 	}
 }
 
-add_action( 'admin_notices', '_give_register_admin_notices', - 1 );
+add_action('admin_notices', '_give_register_admin_notices', - 1);
 
 
 /**
@@ -368,27 +368,26 @@  discard block
 block discarded – undo
  *
  * @return bool
  */
-function _give_show_test_mode_notice_in_admin_bar( $wp_admin_bar ) {
-	$is_test_mode = ! empty( $_POST['test_mode'] ) ?
-		give_is_setting_enabled( $_POST['test_mode'] ) :
-		give_is_test_mode();
+function _give_show_test_mode_notice_in_admin_bar($wp_admin_bar) {
+	$is_test_mode = ! empty($_POST['test_mode']) ?
+		give_is_setting_enabled($_POST['test_mode']) : give_is_test_mode();
 
 	if (
-		! current_user_can( 'view_give_reports' ) ||
+		! current_user_can('view_give_reports') ||
 		! $is_test_mode
 	) {
 		return false;
 	}
 
 	// Add the main siteadmin menu item.
-	$wp_admin_bar->add_menu( array(
+	$wp_admin_bar->add_menu(array(
 		'id'     => 'give-test-notice',
-		'href'   => admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=gateways' ),
+		'href'   => admin_url('edit.php?post_type=give_forms&page=give-settings&tab=gateways'),
 		'parent' => 'top-secondary',
-		'title'  => esc_html__( 'Give Test Mode Active', 'give' ),
-		'meta'   => array( 'class' => 'give-test-mode-active' ),
-	) );
+		'title'  => esc_html__('Give Test Mode Active', 'give'),
+		'meta'   => array('class' => 'give-test-mode-active'),
+	));
 
 	return true;
 }
-add_action( 'admin_bar_menu', '_give_show_test_mode_notice_in_admin_bar', 1000, 1 );
\ No newline at end of file
+add_action('admin_bar_menu', '_give_show_test_mode_notice_in_admin_bar', 1000, 1);
\ No newline at end of file

Please login to merge, or discard this patch.

includes/class-give-session.php 1 patch

Spacing +62 added lines, -62 removed lines patch added patch discarded remove patch

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -74,57 +74,57 @@  discard block
 block discarded – undo
 	public function __construct() {
 
 		$this->use_php_sessions = $this->use_php_sessions();
-		$this->exp_option       = give_get_option( 'session_lifetime' );
+		$this->exp_option       = give_get_option('session_lifetime');
 
 		// PHP Sessions.
-		if ( $this->use_php_sessions ) {
+		if ($this->use_php_sessions) {
 
-			if ( is_multisite() ) {
+			if (is_multisite()) {
 
-				$this->prefix = '_' . get_current_blog_id();
+				$this->prefix = '_'.get_current_blog_id();
 
 			}
 
-			add_action( 'init', array( $this, 'maybe_start_session' ), - 2 );
+			add_action('init', array($this, 'maybe_start_session'), - 2);
 
 		} else {
 
-			if ( ! $this->should_start_session() ) {
+			if ( ! $this->should_start_session()) {
 				return;
 			}
 
 			// Use WP_Session.
-			if ( ! defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'give_wp_session' );
+			if ( ! defined('WP_SESSION_COOKIE')) {
+				define('WP_SESSION_COOKIE', 'give_wp_session');
 			}
 
-			if ( ! class_exists( 'Recursive_ArrayAccess' ) ) {
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/sessions/class-recursive-arrayaccess.php';
+			if ( ! class_exists('Recursive_ArrayAccess')) {
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/class-recursive-arrayaccess.php';
 			}
 
 			// Include utilities class
-			if ( ! class_exists( 'WP_Session_Utils' ) ) {
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/sessions/class-wp-session-utils.php';
+			if ( ! class_exists('WP_Session_Utils')) {
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/class-wp-session-utils.php';
 			}
-			if ( ! class_exists( 'WP_Session' ) ) {
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/sessions/class-wp-session.php';
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/sessions/wp-session.php';
+			if ( ! class_exists('WP_Session')) {
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/class-wp-session.php';
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/sessions/wp-session.php';
 			}
 
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+			add_filter('wp_session_expiration_variant', array($this, 'set_expiration_variant_time'), 99999);
+			add_filter('wp_session_expiration', array($this, 'set_expiration_time'), 99999);
 
 		}
 
 		// Init Session.
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
+		if (empty($this->session) && ! $this->use_php_sessions) {
 			$this->init();
 		} else {
-			add_action( 'init', array( $this, 'init' ), - 1 );
+			add_action('init', array($this, 'init'), - 1);
 		}
 
 		// Set cookie on Donation Completion page.
-		add_action( 'give_pre_process_donation', array( $this, 'set_session_cookies' ) );
+		add_action('give_pre_process_donation', array($this, 'set_session_cookies'));
 
 	}
 
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
 	 */
 	public function init() {
 
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION[ 'give' . $this->prefix ] ) && is_array( $_SESSION[ 'give' . $this->prefix ] ) ? $_SESSION[ 'give' . $this->prefix ] : array();
+		if ($this->use_php_sessions) {
+			$this->session = isset($_SESSION['give'.$this->prefix]) && is_array($_SESSION['give'.$this->prefix]) ? $_SESSION['give'.$this->prefix] : array();
 		} else {
 			$this->session = WP_Session::get_instance();
 		}
@@ -176,10 +176,10 @@  discard block
 block discarded – undo
 	 *
 	 * @return string|array      Session variable.
 	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
+	public function get($key) {
+		$key = sanitize_key($key);
 
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+		return isset($this->session[$key]) ? maybe_unserialize($this->session[$key]) : false;
 
 	}
 
@@ -196,21 +196,21 @@  discard block
 block discarded – undo
 	 *
 	 * @return string        Session variable.
 	 */
-	public function set( $key, $value ) {
+	public function set($key, $value) {
 
-		$key = sanitize_key( $key );
+		$key = sanitize_key($key);
 
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = serialize( $value );
+		if (is_array($value)) {
+			$this->session[$key] = serialize($value);
 		} else {
-			$this->session[ $key ] = $value;
+			$this->session[$key] = $value;
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION[ 'give' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['give'.$this->prefix] = $this->session;
 		}
 
-		return $this->session[ $key ];
+		return $this->session[$key];
 	}
 
 	/**
@@ -224,10 +224,10 @@  discard block
 block discarded – undo
 	 * @hook
 	 */
 	public function set_session_cookies() {
-		if ( ! headers_sent() ) {
-			$lifetime = current_time( 'timestamp' ) + $this->set_expiration_time();
-			@setcookie( session_name(), session_id(), $lifetime, COOKIEPATH, COOKIE_DOMAIN, false );
-			@setcookie( session_name() . '_expiration', $lifetime, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false );
+		if ( ! headers_sent()) {
+			$lifetime = current_time('timestamp') + $this->set_expiration_time();
+			@setcookie(session_name(), session_id(), $lifetime, COOKIEPATH, COOKIE_DOMAIN, false);
+			@setcookie(session_name().'_expiration', $lifetime, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false);
 		}
 	}
 
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
 	 */
 	public function set_expiration_variant_time() {
 
-		return ( ! empty( $this->exp_option ) ? ( intval( $this->exp_option ) - 3600 ) : 30 * 60 * 23 );
+		return ( ! empty($this->exp_option) ? (intval($this->exp_option) - 3600) : 30 * 60 * 23);
 	}
 
 	/**
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
 	 */
 	public function set_expiration_time() {
 
-		return ( ! empty( $this->exp_option ) ? intval( $this->exp_option ) : 30 * 60 * 24 );
+		return ( ! empty($this->exp_option) ? intval($this->exp_option) : 30 * 60 * 24);
 	}
 
 	/**
@@ -276,21 +276,21 @@  discard block
 block discarded – undo
 		$ret = false;
 
 		// If the database variable is already set, no need to run auto detection.
-		$give_use_php_sessions = (bool) get_option( 'give_use_php_sessions' );
+		$give_use_php_sessions = (bool) get_option('give_use_php_sessions');
 
-		if ( ! $give_use_php_sessions ) {
+		if ( ! $give_use_php_sessions) {
 
 			// Attempt to detect if the server supports PHP sessions.
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
+			if (function_exists('session_start') && ! ini_get('safe_mode')) {
 
-				$this->set( 'give_use_php_sessions', 1 );
+				$this->set('give_use_php_sessions', 1);
 
-				if ( $this->get( 'give_use_php_sessions' ) ) {
+				if ($this->get('give_use_php_sessions')) {
 
 					$ret = true;
 
 					// Set the database option.
-					update_option( 'give_use_php_sessions', true );
+					update_option('give_use_php_sessions', true);
 
 				}
 			}
@@ -300,13 +300,13 @@  discard block
 block discarded – undo
 		}
 
 		// Enable or disable PHP Sessions based on the GIVE_USE_PHP_SESSIONS constant.
-		if ( defined( 'GIVE_USE_PHP_SESSIONS' ) && GIVE_USE_PHP_SESSIONS ) {
+		if (defined('GIVE_USE_PHP_SESSIONS') && GIVE_USE_PHP_SESSIONS) {
 			$ret = true;
-		} elseif ( defined( 'GIVE_USE_PHP_SESSIONS' ) && ! GIVE_USE_PHP_SESSIONS ) {
+		} elseif (defined('GIVE_USE_PHP_SESSIONS') && ! GIVE_USE_PHP_SESSIONS) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'give_use_php_sessions', $ret );
+		return (bool) apply_filters('give_use_php_sessions', $ret);
 	}
 
 	/**
@@ -323,9 +323,9 @@  discard block
 block discarded – undo
 
 		$start_session = true;
 
-		if ( ! empty( $_SERVER['REQUEST_URI'] ) ) {
+		if ( ! empty($_SERVER['REQUEST_URI'])) {
 
-			$blacklist = apply_filters( 'give_session_start_uri_blacklist', array(
+			$blacklist = apply_filters('give_session_start_uri_blacklist', array(
 				'feed',
 				'feed',
 				'feed/rss',
@@ -333,21 +333,21 @@  discard block
 block discarded – undo
 				'feed/rdf',
 				'feed/atom',
 				'comments/feed/',
-			) );
-			$uri       = ltrim( $_SERVER['REQUEST_URI'], '/' );
-			$uri       = untrailingslashit( $uri );
-			if ( in_array( $uri, $blacklist ) ) {
+			));
+			$uri       = ltrim($_SERVER['REQUEST_URI'], '/');
+			$uri       = untrailingslashit($uri);
+			if (in_array($uri, $blacklist)) {
 				$start_session = false;
 			}
-			if ( false !== strpos( $uri, 'feed=' ) ) {
+			if (false !== strpos($uri, 'feed=')) {
 				$start_session = false;
 			}
-			if ( is_admin() ) {
+			if (is_admin()) {
 				$start_session = false;
 			}
 		}
 
-		return apply_filters( 'give_start_session', $start_session );
+		return apply_filters('give_start_session', $start_session);
 	}
 
 	/**
@@ -363,11 +363,11 @@  discard block
 block discarded – undo
 	 */
 	public function maybe_start_session() {
 
-		if ( ! $this->should_start_session() ) {
+		if ( ! $this->should_start_session()) {
 			return;
 		}
 
-		if ( ! session_id() && ! headers_sent() ) {
+		if ( ! session_id() && ! headers_sent()) {
 			session_start();
 		}
 
@@ -386,9 +386,9 @@  discard block
 block discarded – undo
 
 		$expiration = false;
 
-		if ( session_id() && isset( $_COOKIE[ session_name() . '_expiration' ] ) ) {
+		if (session_id() && isset($_COOKIE[session_name().'_expiration'])) {
 
-			$expiration = date( 'D, d M Y h:i:s', intval( $_COOKIE[ session_name() . '_expiration' ] ) );
+			$expiration = date('D, d M Y h:i:s', intval($_COOKIE[session_name().'_expiration']));
 
 		}
 

Please login to merge, or discard this patch.

includes/admin/tools/data/class-give-tools-delete-test-transactions.php 1 patch

Spacing +56 added lines, -56 removed lines patch added patch discarded remove patch

@@ -11,7 +11,7 @@  discard block
 block discarded – undo
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -55,22 +55,22 @@  discard block
 block discarded – undo
 	public function get_data() {
 		global $wpdb;
 
-		$items = $this->get_stored_data( 'give_temp_delete_test_ids' );
+		$items = $this->get_stored_data('give_temp_delete_test_ids');
 
-		if ( ! is_array( $items ) ) {
+		if ( ! is_array($items)) {
 			return false;
 		}
 
-		$offset     = ( $this->step - 1 ) * $this->per_step;
-		$step_items = array_slice( $items, $offset, $this->per_step );
+		$offset     = ($this->step - 1) * $this->per_step;
+		$step_items = array_slice($items, $offset, $this->per_step);
 
-		if ( $step_items ) {
+		if ($step_items) {
 
 			$step_ids = array(
 				'other' => array(),
 			);
 
-			foreach ( $step_items as $item ) {
+			foreach ($step_items as $item) {
 
 				$step_ids['other'][] = $item['id'];
 
@@ -78,31 +78,31 @@  discard block
 block discarded – undo
 
 			$sql = array();
 
-			foreach ( $step_ids as $type => $ids ) {
+			foreach ($step_ids as $type => $ids) {
 
-				if ( empty( $ids ) ) {
+				if (empty($ids)) {
 					continue;
 				}
 
 				$parent_query = '';
 
-				switch ( $type ) {
+				switch ($type) {
 					case 'other':
 
-						$temp_ids = implode( ',', $ids );
+						$temp_ids = implode(',', $ids);
 
 						// Get all the test logs of the donations ids.
 						$parent_query = "SELECT DISTINCT post_id as id FROM $wpdb->postmeta WHERE meta_key = '_give_log_payment_id' AND meta_value IN ( $temp_ids )";
-						$parent_ids = $wpdb->get_results( $parent_query, 'ARRAY_A' );
+						$parent_ids = $wpdb->get_results($parent_query, 'ARRAY_A');
 
 						// List of all test logs.
-						if ( $parent_ids ) {
-							foreach ( $parent_ids as $parent_id ) {
+						if ($parent_ids) {
+							foreach ($parent_ids as $parent_id) {
 								// Adding all the test log in post ids that are going to get deleted.
 								$ids[] = $parent_id['id'];
 							}
 						}
-						$ids = implode( ',', $ids );
+						$ids = implode(',', $ids);
 
 						$sql[] = "DELETE FROM $wpdb->posts WHERE id IN ($ids)";
 						$sql[] = "DELETE FROM $wpdb->postmeta WHERE post_id IN ($ids)";
@@ -113,11 +113,11 @@  discard block
 block discarded – undo
 
 			}
 
-			if ( ! empty( $sql ) ) {
-				foreach ( $sql as $query ) {
-					$wpdb->query( $query );
+			if ( ! empty($sql)) {
+				foreach ($sql as $query) {
+					$wpdb->query($query);
 				}
-				do_action( 'give_delete_log_cache' );
+				do_action('give_delete_log_cache');
 			}
 			return true;
 		}
@@ -132,16 +132,16 @@  discard block
 block discarded – undo
 	 */
 	public function get_percentage_complete() {
 
-		$items = $this->get_stored_data( 'give_temp_delete_test_ids', false );
-		$total = count( $items );
+		$items = $this->get_stored_data('give_temp_delete_test_ids', false);
+		$total = count($items);
 
 		$percentage = 100;
 
-		if ( $total > 0 ) {
-			$percentage = ( ( $this->per_step * $this->step ) / $total ) * 100;
+		if ($total > 0) {
+			$percentage = (($this->per_step * $this->step) / $total) * 100;
 		}
 
-		if ( $percentage > 100 ) {
+		if ($percentage > 100) {
 			$percentage = 100;
 		}
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
+	public function set_properties($request) {
 	}
 
 	/**
@@ -166,29 +166,29 @@  discard block
 block discarded – undo
 	 */
 	public function process_step() {
 
-		if ( ! $this->can_export() ) {
-			wp_die( __( 'You do not have permission to delete test transactions.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ( ! $this->can_export()) {
+			wp_die(__('You do not have permission to delete test transactions.', 'give'), __('Error', 'give'), array('response' => 403));
 		}
 
 		$had_data = $this->get_data();
 
-		if ( $had_data ) {
+		if ($had_data) {
 			$this->done = false;
 
 			return true;
 		} else {
-			update_option( 'give_earnings_total', give_get_total_earnings( true ) );
-			Give_Cache::delete( Give_Cache::get_key('give_estimated_monthly_stats' ) );
+			update_option('give_earnings_total', give_get_total_earnings(true));
+			Give_Cache::delete(Give_Cache::get_key('give_estimated_monthly_stats'));
 
-			$this->delete_data( 'give_temp_delete_test_ids' );
+			$this->delete_data('give_temp_delete_test_ids');
 
 			// Reset the sequential order numbers
-			if ( give_get_option( 'enable_sequential' ) ) {
-				delete_option( 'give_last_payment_number' );
+			if (give_get_option('enable_sequential')) {
+				delete_option('give_last_payment_number');
 			}
 
 			$this->done    = true;
-			$this->message = __( 'Test transactions successfully deleted.', 'give' );
+			$this->message = __('Test transactions successfully deleted.', 'give');
 
 			return false;
 		}
@@ -198,10 +198,10 @@  discard block
 block discarded – undo
 	 * Headers
 	 */
 	public function headers() {
-		ignore_user_abort( true );
+		ignore_user_abort(true);
 
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
+		if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+			set_time_limit(0);
 		}
 	}
 
@@ -225,26 +225,26 @@  discard block
 block discarded – undo
 	 */
 	public function pre_fetch() {
 
-		if ( $this->step == 1 ) {
-			$this->delete_data( 'give_temp_delete_test_ids' );
+		if ($this->step == 1) {
+			$this->delete_data('give_temp_delete_test_ids');
 		}
 
-		$items = get_option( 'give_temp_delete_test_ids', false );
+		$items = get_option('give_temp_delete_test_ids', false);
 
-		if ( false === $items ) {
+		if (false === $items) {
 			$items = array();
 
-			$args = apply_filters( 'give_tools_reset_stats_total_args', array(
+			$args = apply_filters('give_tools_reset_stats_total_args', array(
 				'post_type'      => 'give_payment',
 				'post_status'    => 'any',
-				'posts_per_page' => - 1,
+				'posts_per_page' => -1,
 				// ONLY TEST MODE TRANSACTIONS!!!
 				'meta_key'   => '_give_payment_mode',
 				'meta_value' => 'test'
-			) );
+			));
 
-			$posts = get_posts( $args );
-			foreach ( $posts as $post ) {
+			$posts = get_posts($args);
+			foreach ($posts as $post) {
 				$items[] = array(
 					'id'   => (int) $post->ID,
 					'type' => $post->post_type,
@@ -253,9 +253,9 @@  discard block
 block discarded – undo
 
 			// Allow filtering of items to remove with an unassociative array for each item.
 			// The array contains the unique ID of the item, and a 'type' for you to use in the execution of the get_data method.
-			$items = apply_filters( 'give_delete_test_items', $items );
+			$items = apply_filters('give_delete_test_items', $items);
 
-			$this->store_data( 'give_temp_delete_test_ids', $items );
+			$this->store_data('give_temp_delete_test_ids', $items);
 		}
 
 	}
@@ -269,11 +269,11 @@  discard block
 block discarded – undo
 	 *
 	 * @return mixed       Returns the data from the database
 	 */
-	private function get_stored_data( $key ) {
+	private function get_stored_data($key) {
 		global $wpdb;
-		$value = $wpdb->get_var( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key ) );
+		$value = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key));
 
-		return empty( $value ) ? false : maybe_unserialize( $value );
+		return empty($value) ? false : maybe_unserialize($value);
 	}
 
 	/**
@@ -286,10 +286,10 @@  discard block
 block discarded – undo
 	 *
 	 * @return void
 	 */
-	private function store_data( $key, $value ) {
+	private function store_data($key, $value) {
 		global $wpdb;
 
-		$value = maybe_serialize( $value );
+		$value = maybe_serialize($value);
 
 		$data = array(
 			'option_name'  => $key,
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
 			'%s',
 		);
 
-		$wpdb->replace( $wpdb->options, $data, $formats );
+		$wpdb->replace($wpdb->options, $data, $formats);
 	}
 
 	/**
@@ -315,9 +315,9 @@  discard block
 block discarded – undo
 	 *
 	 * @return void
 	 */
-	private function delete_data( $key ) {
+	private function delete_data($key) {
 		global $wpdb;
-		$wpdb->delete( $wpdb->options, array( 'option_name' => $key ) );
+		$wpdb->delete($wpdb->options, array('option_name' => $key));
 	}
 
 }

Please login to merge, or discard this patch.

includes/admin/tools/views/html-admin-page-data.php 1 patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

@@ -3,11 +3,11 @@  discard block
 block discarded – undo
  * Admin View: Exports
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! current_user_can( 'manage_give_settings' ) ) {
+if ( ! current_user_can('manage_give_settings')) {
 	return;
 }
 
@@ -16,28 +16,28 @@  discard block
 block discarded – undo
  *
  * @since 1.5
  */
-do_action( 'give_tools_recount_stats_before' );
+do_action('give_tools_recount_stats_before');
 ?>
 	<div id="poststuff">
 		<div class="postbox">
 
-			<h2 class="hndle ui-sortable-handle"><span><?php esc_html_e( 'Recount Stats', 'give' ); ?></span></h2>
+			<h2 class="hndle ui-sortable-handle"><span><?php esc_html_e('Recount Stats', 'give'); ?></span></h2>
 
 			<div class="inside recount-stats-controls">
-				<p><?php esc_html_e( 'Use these tools to recount stats, delete test transactions, or reset stats.', 'give' ); ?></p>
+				<p><?php esc_html_e('Use these tools to recount stats, delete test transactions, or reset stats.', 'give'); ?></p>
 				<form method="post" id="give-tools-recount-form" class="give-export-form">
 
-					<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+					<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 
 					<select name="give-export-class" id="recount-stats-type">
-						<option value="0" selected="selected" disabled="disabled"><?php esc_html_e( 'Please select an option', 'give' ); ?></option>
-						<option data-type="recount-stats" value="Give_Tools_Recount_Income"><?php esc_html_e( 'Recalculate Total Donation Income Amount', 'give' ); ?></option>
-						<option data-type="recount-form" value="Give_Tools_Recount_Form_Stats"><?php esc_html_e( 'Recalculate Income Amount and Donation Counts for a Form', 'give' ); ?></option>
-						<option data-type="recount-all" value="Give_Tools_Recount_All_Stats"><?php esc_html_e( 'Recalculate Income Amount and Donation Counts for All Forms', 'give' ); ?></option>
-						<option data-type="recount-donor-stats" value="Give_Tools_Recount_Donor_Stats"><?php esc_html_e( 'Recalculate Donor Statistics', 'give' ); ?></option>
-						<option data-type="delete-test-transactions" value="Give_Tools_Delete_Test_Transactions"><?php esc_html_e( 'Delete Test Payments', 'give' ); ?></option>
-						<option data-type="delete-test-donors"   value="Give_Tools_Delete_Donors"><?php esc_html_e( 'Delete Test Donors and Payments', 'give' ); ?></option>
-						<option data-type="reset-stats" value="Give_Tools_Reset_Stats"><?php esc_html_e( 'Delete All Data', 'give' ); ?></option>
+						<option value="0" selected="selected" disabled="disabled"><?php esc_html_e('Please select an option', 'give'); ?></option>
+						<option data-type="recount-stats" value="Give_Tools_Recount_Income"><?php esc_html_e('Recalculate Total Donation Income Amount', 'give'); ?></option>
+						<option data-type="recount-form" value="Give_Tools_Recount_Form_Stats"><?php esc_html_e('Recalculate Income Amount and Donation Counts for a Form', 'give'); ?></option>
+						<option data-type="recount-all" value="Give_Tools_Recount_All_Stats"><?php esc_html_e('Recalculate Income Amount and Donation Counts for All Forms', 'give'); ?></option>
+						<option data-type="recount-donor-stats" value="Give_Tools_Recount_Donor_Stats"><?php esc_html_e('Recalculate Donor Statistics', 'give'); ?></option>
+						<option data-type="delete-test-transactions" value="Give_Tools_Delete_Test_Transactions"><?php esc_html_e('Delete Test Payments', 'give'); ?></option>
+						<option data-type="delete-test-donors"   value="Give_Tools_Delete_Donors"><?php esc_html_e('Delete Test Donors and Payments', 'give'); ?></option>
+						<option data-type="reset-stats" value="Give_Tools_Reset_Stats"><?php esc_html_e('Delete All Data', 'give'); ?></option>
 						<?php
 						/**
 						 * Fires in the recount stats selectbox.
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
 						 *
 						 * @since 1.5
 						 */
-						do_action( 'give_recount_tool_options' );
+						do_action('give_recount_tool_options');
 						?>
 					</select>
 
@@ -54,22 +54,22 @@  discard block
 block discarded – undo
 						<?php
 						$args = array(
 							'name'   => 'form_id',
-							'number' => - 1,
+							'number' => -1,
 							'chosen' => true,
 						);
-						echo Give()->html->forms_dropdown( $args );
+						echo Give()->html->forms_dropdown($args);
 						?>
 					</span>
 
-					<input type="submit" id="recount-stats-submit" value="<?php esc_attr_e( 'Submit', 'give' ); ?>" class="button-secondary"/>
+					<input type="submit" id="recount-stats-submit" value="<?php esc_attr_e('Submit', 'give'); ?>" class="button-secondary"/>
 
 					<br/>
 
 					<span class="give-recount-stats-descriptions">
-						<span id="recount-stats"><?php esc_html_e( 'Recalculates the overall donation income amount.', 'give' ); ?></span>
-						<span id="recount-form"><?php esc_html_e( 'Recalculates the donation and income stats for a specific form.', 'give' ); ?></span>
-						<span id="recount-all"><?php esc_html_e( 'Recalculates the earnings and sales stats for all forms.', 'give' ); ?></span>
-						<span id="recount-customer-stats"><?php esc_html_e( 'Recalculates the lifetime value and donation counts for all donors.', 'give' ); ?></span>
+						<span id="recount-stats"><?php esc_html_e('Recalculates the overall donation income amount.', 'give'); ?></span>
+						<span id="recount-form"><?php esc_html_e('Recalculates the donation and income stats for a specific form.', 'give'); ?></span>
+						<span id="recount-all"><?php esc_html_e('Recalculates the earnings and sales stats for all forms.', 'give'); ?></span>
+						<span id="recount-customer-stats"><?php esc_html_e('Recalculates the lifetime value and donation counts for all donors.', 'give'); ?></span>
 						<?php
 						/**
 						 * Fires in the recount stats description area.
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
 						 *
 						 * @since 1.5
 						 */
-						do_action( 'give_recount_tool_descriptions' );
+						do_action('give_recount_tool_descriptions');
 						?>
-						<span id="delete-test-transactions"><?php _e( '<strong>Deletes</strong> all TEST donations, donors, and related log entries.', 'give' ); ?></span>
-						<span id="reset-stats"><?php _e( '<strong>Deletes</strong> ALL donations, donors, and related log entries regardless of test or live mode.', 'give' ); ?></span>
+						<span id="delete-test-transactions"><?php _e('<strong>Deletes</strong> all TEST donations, donors, and related log entries.', 'give'); ?></span>
+						<span id="reset-stats"><?php _e('<strong>Deletes</strong> ALL donations, donors, and related log entries regardless of test or live mode.', 'give'); ?></span>
 					</span>
 
 					<span class="spinner"></span>
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
 				 *
 				 * @since 1.5
 				 */
-				do_action( 'give_tools_recount_forms' );
+				do_action('give_tools_recount_forms');
 				?>
 			</div><!-- .inside -->
 		</div><!-- .postbox -->
@@ -106,4 +106,4 @@  discard block
 block discarded – undo
  *
  * @since 1.5
  */
-do_action( 'give_tools_recount_stats_after' );
+do_action('give_tools_recount_stats_after');

Please login to merge, or discard this patch.

includes/process-donation.php 1 patch

Spacing +248 added lines, -249 removed lines patch added patch discarded remove patch

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_pre_process_donation' );
+	do_action('give_pre_process_donation');
 
 	// Validate the form $_POST data
 	$valid_data = give_donation_form_validate_fields();
@@ -45,26 +45,26 @@  discard block
 block discarded – undo
 	 * @param bool|array $valid_data Validate fields.
 	 * @param array $_POST Array of variables passed via the HTTP POST.
 	 */
-	do_action( 'give_checkout_error_checks', $valid_data, $_POST );
+	do_action('give_checkout_error_checks', $valid_data, $_POST);
 
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	// Process the login form
-	if ( isset( $_POST['give_login_submit'] ) ) {
+	if (isset($_POST['give_login_submit'])) {
 		give_process_form_login();
 	}
 
 	// Validate the user
-	$user = give_get_donation_form_user( $valid_data );
+	$user = give_get_donation_form_user($valid_data);
 
-	if ( false === $valid_data || give_get_errors() || ! $user ) {
-		if ( $is_ajax ) {
+	if (false === $valid_data || give_get_errors() || ! $user) {
+		if ($is_ajax) {
 			/**
 			 * Fires when AJAX sends back errors from the donation form.
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_ajax_donation_errors' );
+			do_action('give_ajax_donation_errors');
 			give_die();
 		} else {
 			return false;
@@ -72,17 +72,17 @@  discard block
 block discarded – undo
 	}
 
 	// If AJAX send back success to proceed with form submission
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		echo 'success';
 		give_die();
 	}
 
 	// After AJAX: Setup session if not using php_sessions
-	if ( ! Give()->session->use_php_sessions() ) {
+	if ( ! Give()->session->use_php_sessions()) {
 		// Double-check that set_cookie is publicly accessible;
 		// we're using a slightly modified class-wp-sessions.php
-		$session_reflection = new ReflectionMethod( 'WP_Session', 'set_cookie' );
-		if ( $session_reflection->isPublic() ) {
+		$session_reflection = new ReflectionMethod('WP_Session', 'set_cookie');
+		if ($session_reflection->isPublic()) {
 			// Manually set the cookie.
 			Give()->session->init()->set_cookie();
 		}
@@ -97,20 +97,19 @@  discard block
 block discarded – undo
 		'address'    => $user['address'],
 	);
 
-	$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
+	$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
 
-	$price        = isset( $_POST['give-amount'] ) ?
-		(float) apply_filters( 'give_donation_total', give_maybe_sanitize_amount( $_POST['give-amount'] ) ) :
-		'0.00';
-	$purchase_key = strtolower( md5( $user['user_email'] . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'give', true ) ) );
+	$price        = isset($_POST['give-amount']) ?
+		(float) apply_filters('give_donation_total', give_maybe_sanitize_amount($_POST['give-amount'])) : '0.00';
+	$purchase_key = strtolower(md5($user['user_email'].date('Y-m-d H:i:s').$auth_key.uniqid('give', true)));
 
 	// Setup donation information
 	$donation_data = array(
 		'price'        => $price,
 		'purchase_key' => $purchase_key,
 		'user_email'   => $user['user_email'],
-		'date'         => date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ),
-		'user_info'    => stripslashes_deep( $user_info ),
+		'date'         => date('Y-m-d H:i:s', current_time('timestamp')),
+		'user_info'    => stripslashes_deep($user_info),
 		'post_data'    => $_POST,
 		'gateway'      => $valid_data['gateway'],
 		'card_info'    => $valid_data['cc_info'],
@@ -130,10 +129,10 @@  discard block
 block discarded – undo
 	 * @param array $user_info Array containing basic user information.
 	 * @param bool|array $valid_data Validate fields.
 	 */
-	do_action( 'give_checkout_before_gateway', $_POST, $user_info, $valid_data );
+	do_action('give_checkout_before_gateway', $_POST, $user_info, $valid_data);
 
 	// Sanity check for price
-	if ( ! $donation_data['price'] ) {
+	if ( ! $donation_data['price']) {
 		// Revert to manual
 		$donation_data['gateway'] = 'manual';
 		$_POST['give-gateway']    = 'manual';
@@ -144,27 +143,27 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.7
 	 */
-	$donation_data = apply_filters( 'give_donation_data_before_gateway', $donation_data, $valid_data );
+	$donation_data = apply_filters('give_donation_data_before_gateway', $donation_data, $valid_data);
 
 	// Setup the data we're storing in the donation session
 	$session_data = $donation_data;
 
 	// Make sure credit card numbers are never stored in sessions
-	unset( $session_data['card_info']['card_number'] );
-	unset( $session_data['post_data']['card_number'] );
+	unset($session_data['card_info']['card_number']);
+	unset($session_data['post_data']['card_number']);
 
 	// Used for showing data to non logged-in users after donation, and for other plugins needing donation data.
-	give_set_purchase_session( $session_data );
+	give_set_purchase_session($session_data);
 
 	// Send info to the gateway for payment processing
-	give_send_to_gateway( $donation_data['gateway'], $donation_data );
+	give_send_to_gateway($donation_data['gateway'], $donation_data);
 	give_die();
 
 }
 
-add_action( 'give_purchase', 'give_process_donation_form' );
-add_action( 'wp_ajax_give_process_donation', 'give_process_donation_form' );
-add_action( 'wp_ajax_nopriv_give_process_donation', 'give_process_donation_form' );
+add_action('give_purchase', 'give_process_donation_form');
+add_action('wp_ajax_give_process_donation', 'give_process_donation_form');
+add_action('wp_ajax_nopriv_give_process_donation', 'give_process_donation_form');
 
 
 /**
@@ -177,29 +176,29 @@  discard block
 block discarded – undo
  *
  * @return void
  */
-function give_check_logged_in_user_for_existing_email( $valid_data, $post ) {
+function give_check_logged_in_user_for_existing_email($valid_data, $post) {
 
 	// Verify that the email address belongs to this customer.
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 
-		$submitted_email    = $valid_data['logged_in_user']['user_email'];
-		$donor = new Give_Donor( get_current_user_id(), true );
+		$submitted_email = $valid_data['logged_in_user']['user_email'];
+		$donor = new Give_Donor(get_current_user_id(), true);
 
 		// If this email address is not registered with this customer, see if it belongs to any other customer
 		if (
 			$submitted_email !== $donor->email
-			&& ( is_array( $donor->emails ) && ! in_array( $submitted_email, $donor->emails ) )
+			&& (is_array($donor->emails) && ! in_array($submitted_email, $donor->emails))
 		) {
-			$found_donor = new Give_Donor( $submitted_email );
+			$found_donor = new Give_Donor($submitted_email);
 
-			if ( $found_donor->id > 0 ) {
-				give_set_error( 'give-customer-email-exists', sprintf( __( 'You are logged in as %1$s, and are submitting a donation as %2$s, which is an existing donor. To ensure that the email address is tied to the correct donor, please submit this donation from a logged-out browser, or choose another email address.' ,'give' ), $donor->email, $submitted_email ) );
+			if ($found_donor->id > 0) {
+				give_set_error('give-customer-email-exists', sprintf(__('You are logged in as %1$s, and are submitting a donation as %2$s, which is an existing donor. To ensure that the email address is tied to the correct donor, please submit this donation from a logged-out browser, or choose another email address.', 'give'), $donor->email, $submitted_email));
 			}
 		}
 	}
 }
 
-add_action( 'give_checkout_error_checks', 'give_check_logged_in_user_for_existing_email', 10, 2 );
+add_action('give_checkout_error_checks', 'give_check_logged_in_user_for_existing_email', 10, 2);
 
 /**
  * Process the checkout login form
@@ -209,49 +208,49 @@  discard block
 block discarded – undo
  * @return      void
  */
 function give_process_form_login() {
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	$user_data = give_donation_form_validate_user_login();
 
-	if ( give_get_errors() || $user_data['user_id'] < 1 ) {
-		if ( $is_ajax ) {
+	if (give_get_errors() || $user_data['user_id'] < 1) {
+		if ($is_ajax) {
 			/**
 			 * Fires when AJAX sends back errors from the donation form.
 			 *
 			 * @since 1.0
 			 */
 			ob_start();
-				do_action( 'give_ajax_donation_errors' );
+				do_action('give_ajax_donation_errors');
 				$message = ob_get_contents();
 			ob_end_clean();
-			wp_send_json_error( $message );
+			wp_send_json_error($message);
 		} else {
-			wp_redirect( $_SERVER['HTTP_REFERER'] );
+			wp_redirect($_SERVER['HTTP_REFERER']);
 			exit;
 		}
 	}
 
-	give_log_user_in( $user_data['user_id'], $user_data['user_login'], $user_data['user_pass'] );
+	give_log_user_in($user_data['user_id'], $user_data['user_login'], $user_data['user_pass']);
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		$message = Give()->notices->print_frontend_notice(
 			sprintf(
 				/* translators: %s: user first name */
-				esc_html__( 'Welcome %s! You have successfully logged into your account.', 'give' ),
-				( ! empty( $user_data['user_first'] ) ) ? $user_data['user_first'] : $user_data['user_login']
+				esc_html__('Welcome %s! You have successfully logged into your account.', 'give'),
+				( ! empty($user_data['user_first'])) ? $user_data['user_first'] : $user_data['user_login']
 			),
 			false,
 			'success'
 		);
 
-		wp_send_json_success( $message );
+		wp_send_json_success($message);
 	} else {
-		wp_redirect( $_SERVER['HTTP_REFERER'] );
+		wp_redirect($_SERVER['HTTP_REFERER']);
 	}
 }
 
-add_action( 'wp_ajax_give_process_donation_login', 'give_process_form_login' );
-add_action( 'wp_ajax_nopriv_give_process_donation_login', 'give_process_form_login' );
+add_action('wp_ajax_give_process_donation_login', 'give_process_form_login');
+add_action('wp_ajax_nopriv_give_process_donation_login', 'give_process_form_login');
 
 /**
  * Donation Form Validate Fields.
@@ -263,55 +262,55 @@  discard block
 block discarded – undo
 function give_donation_form_validate_fields() {
 
 	// Check if there is $_POST
-	if ( empty( $_POST ) ) {
+	if (empty($_POST)) {
 		return false;
 	}
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an array to collect valid data
 	$valid_data = array(
 		'gateway'          => give_donation_form_validate_gateway(), // Gateway fallback (amount is validated here)
-		'need_new_user'    => false,     // New user flag
-		'need_user_login'  => false,     // Login user flag
-		'logged_user_data' => array(),   // Logged user collected data
-		'new_user_data'    => array(),   // New user collected data
-		'login_user_data'  => array(),   // Login user collected data
-		'guest_user_data'  => array(),   // Guest user collected data
-		'cc_info'          => give_donation_form_validate_cc(),// Credit card info
+		'need_new_user'    => false, // New user flag
+		'need_user_login'  => false, // Login user flag
+		'logged_user_data' => array(), // Logged user collected data
+		'new_user_data'    => array(), // New user collected data
+		'login_user_data'  => array(), // Login user collected data
+		'guest_user_data'  => array(), // Guest user collected data
+		'cc_info'          => give_donation_form_validate_cc(), // Credit card info
 	);
 
 	// Validate Honeypot First
-	if ( ! empty( $_POST['give-honeypot'] ) ) {
-		give_set_error( 'invalid_honeypot', esc_html__( 'Honeypot field detected. Go away bad bot!', 'give' ) );
+	if ( ! empty($_POST['give-honeypot'])) {
+		give_set_error('invalid_honeypot', esc_html__('Honeypot field detected. Go away bad bot!', 'give'));
 	}
 
 	// Validate agree to terms
-	if ( give_is_terms_enabled( $form_id ) ) {
+	if (give_is_terms_enabled($form_id)) {
 		give_donation_form_validate_agree_to_terms();
 	}
 
 	// Stop processing donor registration, if donor registration is optional and donor can do guest checkout.
 	// If registration form username field is empty that means donor do not want to registration instead want guest checkout.
 	if (
-		! give_logged_in_only( $form_id )
-		&& isset( $_POST['give-purchase-var'] )
+		! give_logged_in_only($form_id)
+		&& isset($_POST['give-purchase-var'])
 		&& $_POST['give-purchase-var'] == 'needs-to-register'
-		&& empty( $_POST['give_user_login'] )
+		&& empty($_POST['give_user_login'])
 	) {
-		unset( $_POST['give-purchase-var'] );
+		unset($_POST['give-purchase-var']);
 	}
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		// Collect logged in user data.
 		$valid_data['logged_in_user'] = give_donation_form_validate_logged_in_user();
-	} elseif ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-register' ) {
+	} elseif (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-register') {
 		// Set new user registration as required.
 		$valid_data['need_new_user'] = true;
 		// Validate new user data.
 		$valid_data['new_user_data'] = give_donation_form_validate_new_user();
 		// Check if login validation is needed.
-	} elseif ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-login' ) {
+	} elseif (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-login') {
 		// Set user login as required.
 		$valid_data['need_user_login'] = true;
 		// Validate users login info.
@@ -336,41 +335,41 @@  discard block
 block discarded – undo
  */
 function give_donation_form_validate_gateway() {
 
-	$form_id = isset( $_REQUEST['give-form-id'] ) ? $_REQUEST['give-form-id'] : 0;
-	$amount  = isset( $_REQUEST['give-amount'] ) ? give_maybe_sanitize_amount( $_REQUEST['give-amount'] ) : 0;
-	$gateway = give_get_default_gateway( $form_id );
+	$form_id = isset($_REQUEST['give-form-id']) ? $_REQUEST['give-form-id'] : 0;
+	$amount  = isset($_REQUEST['give-amount']) ? give_maybe_sanitize_amount($_REQUEST['give-amount']) : 0;
+	$gateway = give_get_default_gateway($form_id);
 
 	// Check if a gateway value is present.
-	if ( ! empty( $_REQUEST['give-gateway'] ) ) {
+	if ( ! empty($_REQUEST['give-gateway'])) {
 
-		$gateway = sanitize_text_field( $_REQUEST['give-gateway'] );
+		$gateway = sanitize_text_field($_REQUEST['give-gateway']);
 
 		// Is amount being donated in LIVE mode 0.00? If so, error:
-		if ( $amount == 0 && ! give_is_test_mode() ) {
+		if ($amount == 0 && ! give_is_test_mode()) {
 
-			give_set_error( 'invalid_donation_amount', __( 'Please insert a valid donation amount.', 'give' ) );
+			give_set_error('invalid_donation_amount', __('Please insert a valid donation amount.', 'give'));
 
 		} // End if().
-		elseif ( ! give_verify_minimum_price() ) {
+		elseif ( ! give_verify_minimum_price()) {
 			// translators: %s: minimum donation amount.
 			give_set_error(
 				'invalid_donation_minimum',
 				sprintf(
 					/* translators: %s: minimum donation amount */
-					__( 'This form has a minimum donation amount of %s.', 'give' ),
-					give_currency_filter( give_format_amount( give_get_form_minimum_price( $form_id ), array( 'sanitize' => false ) ) )
+					__('This form has a minimum donation amount of %s.', 'give'),
+					give_currency_filter(give_format_amount(give_get_form_minimum_price($form_id), array('sanitize' => false)))
 				)
 			);
 
 		} //Is this test mode zero donation? Let it through but set to manual gateway.
-		elseif ( $amount == 0 && give_is_test_mode() ) {
+		elseif ($amount == 0 && give_is_test_mode()) {
 
 			$gateway = 'manual';
 
 		} //Check if this gateway is active.
-		elseif ( ! give_is_gateway_active( $gateway ) ) {
+		elseif ( ! give_is_gateway_active($gateway)) {
 
-			give_set_error( 'invalid_gateway', __( 'The selected payment gateway is not enabled.', 'give' ) );
+			give_set_error('invalid_gateway', __('The selected payment gateway is not enabled.', 'give'));
 
 		}
 	}
@@ -388,21 +387,21 @@  discard block
 block discarded – undo
  */
 function give_verify_minimum_price() {
 
-	$amount          = give_maybe_sanitize_amount( $_REQUEST['give-amount'] );
-	$form_id         = isset( $_REQUEST['give-form-id'] ) ? $_REQUEST['give-form-id'] : 0;
-	$price_id        = isset( $_REQUEST['give-price-id'] ) ? $_REQUEST['give-price-id'] : null;
-	$variable_prices = give_has_variable_prices( $form_id );
+	$amount          = give_maybe_sanitize_amount($_REQUEST['give-amount']);
+	$form_id         = isset($_REQUEST['give-form-id']) ? $_REQUEST['give-form-id'] : 0;
+	$price_id        = isset($_REQUEST['give-price-id']) ? $_REQUEST['give-price-id'] : null;
+	$variable_prices = give_has_variable_prices($form_id);
 
-	if ( $variable_prices && in_array( $price_id, give_get_variable_price_ids( $form_id ) ) ) {
+	if ($variable_prices && in_array($price_id, give_get_variable_price_ids($form_id))) {
 
-		$price_level_amount = give_get_price_option_amount( $form_id, $price_id );
+		$price_level_amount = give_get_price_option_amount($form_id, $price_id);
 
-		if ( $price_level_amount == $amount ) {
+		if ($price_level_amount == $amount) {
 			return true;
 		}
 	}
 
-	if ( give_get_form_minimum_price( $form_id ) > $amount ) {
+	if (give_get_form_minimum_price($form_id) > $amount) {
 		return false;
 	}
 
@@ -418,9 +417,9 @@  discard block
 block discarded – undo
  */
 function give_donation_form_validate_agree_to_terms() {
 	// Validate agree to terms.
-	if ( ! isset( $_POST['give_agree_to_terms'] ) || $_POST['give_agree_to_terms'] != 1 ) {
+	if ( ! isset($_POST['give_agree_to_terms']) || $_POST['give_agree_to_terms'] != 1) {
 		// User did not agree.
-		give_set_error( 'agree_to_terms', apply_filters( 'give_agree_to_terms_text', __( 'You must agree to the terms and conditions.', 'give' ) ) );
+		give_set_error('agree_to_terms', apply_filters('give_agree_to_terms_text', __('You must agree to the terms and conditions.', 'give')));
 	}
 }
 
@@ -434,59 +433,59 @@  discard block
 block discarded – undo
  *
  * @return      array
  */
-function give_get_required_fields( $form_id ) {
+function give_get_required_fields($form_id) {
 
-	$payment_mode = give_get_chosen_gateway( $form_id );
+	$payment_mode = give_get_chosen_gateway($form_id);
 
 	$required_fields = array(
 		'give_email' => array(
 			'error_id'      => 'invalid_email',
-			'error_message' => __( 'Please enter a valid email address.', 'give' ),
+			'error_message' => __('Please enter a valid email address.', 'give'),
 		),
 		'give_first' => array(
 			'error_id'      => 'invalid_first_name',
-			'error_message' => __( 'Please enter your first name.', 'give' ),
+			'error_message' => __('Please enter your first name.', 'give'),
 		),
 	);
 
-	$require_address = give_require_billing_address( $payment_mode );
+	$require_address = give_require_billing_address($payment_mode);
 
-	if ( $require_address ) {
-		$required_fields['card_address']    = array(
+	if ($require_address) {
+		$required_fields['card_address'] = array(
 			'error_id'      => 'invalid_card_address',
-			'error_message' => __( 'Please enter your primary billing address.', 'give' ),
+			'error_message' => __('Please enter your primary billing address.', 'give'),
 		);
-		$required_fields['card_zip']        = array(
+		$required_fields['card_zip'] = array(
 			'error_id'      => 'invalid_zip_code',
-			'error_message' => __( 'Please enter your zip / postal code.', 'give' ),
+			'error_message' => __('Please enter your zip / postal code.', 'give'),
 		);
-		$required_fields['card_city']       = array(
+		$required_fields['card_city'] = array(
 			'error_id'      => 'invalid_city',
-			'error_message' => __( 'Please enter your billing city.', 'give' ),
+			'error_message' => __('Please enter your billing city.', 'give'),
 		);
 		$required_fields['billing_country'] = array(
 			'error_id'      => 'invalid_country',
-			'error_message' => __( 'Please select your billing country.', 'give' ),
+			'error_message' => __('Please select your billing country.', 'give'),
 		);
 
 
-		$required_fields['card_state']      = array(
+		$required_fields['card_state'] = array(
 			'error_id'      => 'invalid_state',
-			'error_message' => __( 'Please enter billing state / province / County.', 'give' ),
+			'error_message' => __('Please enter billing state / province / County.', 'give'),
 		);
 
 		// Check if billing country alredy exists.
-		if ( ! empty( $_POST['billing_country'] ) ) {
+		if ( ! empty($_POST['billing_country'])) {
 			// Get the value from $_POST.
-			$country = sanitize_text_field( $_POST['billing_country'] );
+			$country = sanitize_text_field($_POST['billing_country']);
 
 			// Get the country list that does not required any states init.
 			$states_country = give_states_not_required_country_list();
 
 			// Check if states is empty or not.
-			if ( array_key_exists( $country, $states_country ) ) {
+			if (array_key_exists($country, $states_country)) {
 				// If states is empty remove the required feilds of state in billing cart.
-				unset( $required_fields['card_state'] );
+				unset($required_fields['card_state']);
 			}
 		}
 	}
@@ -496,7 +495,7 @@  discard block
 block discarded – undo
 	 *
 	 * @since 1.7
 	 */
-	$required_fields = apply_filters( 'give_donation_form_required_fields', $required_fields, $form_id );
+	$required_fields = apply_filters('give_donation_form_required_fields', $required_fields, $form_id);
 
 	return $required_fields;
 
@@ -511,16 +510,16 @@  discard block
 block discarded – undo
  *
  * @return bool
  */
-function give_require_billing_address( $payment_mode ) {
+function give_require_billing_address($payment_mode) {
 
 	$return = false;
 
-	if ( isset( $_POST['billing_country'] ) || did_action( "give_{$payment_mode}_cc_form" ) || did_action( 'give_cc_form' ) ) {
+	if (isset($_POST['billing_country']) || did_action("give_{$payment_mode}_cc_form") || did_action('give_cc_form')) {
 		$return = true;
 	}
 
 	// Let payment gateways and other extensions determine if address fields should be required.
-	return apply_filters( 'give_require_billing_address', $return );
+	return apply_filters('give_require_billing_address', $return);
 
 }
 
@@ -534,42 +533,42 @@  discard block
 block discarded – undo
 function give_donation_form_validate_logged_in_user() {
 	global $user_ID;
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start empty array to collect valid user data.
 	$valid_user_data = array(
 		// Assume there will be errors.
-		'user_id' => - 1,
+		'user_id' => -1,
 	);
 
 	// Verify there is a user_ID.
-	if ( $user_ID > 0 ) {
+	if ($user_ID > 0) {
 		// Get the logged in user data.
-		$user_data = get_userdata( $user_ID );
+		$user_data = get_userdata($user_ID);
 
 		// Loop through required fields and show error messages.
-		foreach ( give_get_required_fields( $form_id ) as $field_name => $value ) {
-			if ( in_array( $value, give_get_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-				give_set_error( $value['error_id'], $value['error_message'] );
+		foreach (give_get_required_fields($form_id) as $field_name => $value) {
+			if (in_array($value, give_get_required_fields($form_id)) && empty($_POST[$field_name])) {
+				give_set_error($value['error_id'], $value['error_message']);
 			}
 		}
 
 		// Verify data.
-		if ( $user_data ) {
+		if ($user_data) {
 			// Collected logged in user data.
 			$valid_user_data = array(
 				'user_id'    => $user_ID,
-				'user_email' => isset( $_POST['give_email'] ) ? sanitize_email( $_POST['give_email'] ) : $user_data->user_email,
-				'user_first' => isset( $_POST['give_first'] ) && ! empty( $_POST['give_first'] ) ? sanitize_text_field( $_POST['give_first'] ) : $user_data->first_name,
-				'user_last'  => isset( $_POST['give_last'] ) && ! empty( $_POST['give_last'] ) ? sanitize_text_field( $_POST['give_last'] ) : $user_data->last_name,
+				'user_email' => isset($_POST['give_email']) ? sanitize_email($_POST['give_email']) : $user_data->user_email,
+				'user_first' => isset($_POST['give_first']) && ! empty($_POST['give_first']) ? sanitize_text_field($_POST['give_first']) : $user_data->first_name,
+				'user_last'  => isset($_POST['give_last']) && ! empty($_POST['give_last']) ? sanitize_text_field($_POST['give_last']) : $user_data->last_name,
 			);
 
-			if ( ! is_email( $valid_user_data['user_email'] ) ) {
-				give_set_error( 'email_invalid', esc_html__( 'Invalid email.', 'give' ) );
+			if ( ! is_email($valid_user_data['user_email'])) {
+				give_set_error('email_invalid', esc_html__('Invalid email.', 'give'));
 			}
 		} else {
 			// Set invalid user error.
-			give_set_error( 'invalid_user', esc_html__( 'The user information is invalid.', 'give' ) );
+			give_set_error('invalid_user', esc_html__('The user information is invalid.', 'give'));
 		}
 	}
 
@@ -588,7 +587,7 @@  discard block
 block discarded – undo
 	// Default user data.
 	$default_user_data = array(
 		'give-form-id'           => '',
-		'user_id'                => - 1, // Assume there will be errors.
+		'user_id'                => -1, // Assume there will be errors.
 		'user_first'             => '',
 		'user_last'              => '',
 		'give_user_login'        => false,
@@ -598,14 +597,14 @@  discard block
 block discarded – undo
 	);
 
 	// Get user data.
-	$user_data            = wp_parse_args( array_map( 'trim', give_clean( $_POST ) ), $default_user_data );
+	$user_data            = wp_parse_args(array_map('trim', give_clean($_POST)), $default_user_data);
 	$registering_new_user = false;
-	$form_id              = absint( $user_data['give-form-id'] );
+	$form_id              = absint($user_data['give-form-id']);
 
 	// Start an empty array to collect valid user data.
 	$valid_user_data = array(
 		// Assume there will be errors.
-		'user_id'    => - 1,
+		'user_id'    => -1,
 
 		// Get first name.
 		'user_first' => $user_data['give_first'],
@@ -615,25 +614,25 @@  discard block
 block discarded – undo
 	);
 
 	// Loop through required fields and show error messages.
-	foreach ( give_get_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_get_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_get_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_get_required_fields($form_id)) && empty($_POST[$field_name])) {
+			give_set_error($value['error_id'], $value['error_message']);
 		}
 	}
 
 	// Check if we have an username to register.
-	if ( give_validate_username( $user_data['give_user_login'] ) ) {
+	if (give_validate_username($user_data['give_user_login'])) {
 		$registering_new_user          = true;
 		$valid_user_data['user_login'] = $user_data['give_user_login'];
 	}
 
 	// Check if we have an email to verify.
-	if ( give_validate_user_email( $user_data['give_email'], $registering_new_user ) ) {
+	if (give_validate_user_email($user_data['give_email'], $registering_new_user)) {
 		$valid_user_data['user_email'] = $user_data['give_email'];
 	}
 
 	// Check password.
-	if ( give_validate_user_password( $user_data['give_user_pass'], $user_data['give_user_pass_confirm'], $registering_new_user ) ) {
+	if (give_validate_user_password($user_data['give_user_pass'], $user_data['give_user_pass_confirm'], $registering_new_user)) {
 		// All is good to go.
 		$valid_user_data['user_pass'] = $user_data['give_user_pass'];
 	}
@@ -653,36 +652,36 @@  discard block
 block discarded – undo
 	// Start an array to collect valid user data.
 	$valid_user_data = array(
 		// Assume there will be errors.
-		'user_id' => - 1,
+		'user_id' => -1,
 	);
 
 	// Username.
-	if ( ! isset( $_POST['give_user_login'] ) || $_POST['give_user_login'] == '' ) {
-		give_set_error( 'must_log_in', __( 'You must register or login to complete your donation.', 'give' ) );
+	if ( ! isset($_POST['give_user_login']) || $_POST['give_user_login'] == '') {
+		give_set_error('must_log_in', __('You must register or login to complete your donation.', 'give'));
 
 		return $valid_user_data;
 	}
 
 	// Get the user by login.
-	$user_data = get_user_by( 'login', strip_tags( $_POST['give_user_login'] ) );
+	$user_data = get_user_by('login', strip_tags($_POST['give_user_login']));
 
 	// Check if user exists.
-	if ( $user_data ) {
+	if ($user_data) {
 		// Get password.
-		$user_pass = isset( $_POST['give_user_pass'] ) ? $_POST['give_user_pass'] : false;
+		$user_pass = isset($_POST['give_user_pass']) ? $_POST['give_user_pass'] : false;
 
 		// Check user_pass.
-		if ( $user_pass ) {
+		if ($user_pass) {
 			// Check if password is valid.
-			if ( ! wp_check_password( $user_pass, $user_data->user_pass, $user_data->ID ) ) {
+			if ( ! wp_check_password($user_pass, $user_data->user_pass, $user_data->ID)) {
 				// Incorrect password.
 				give_set_error(
 					'password_incorrect',
 					sprintf(
 						'%1$s <a href="%2$s">%3$s</a>',
-						__( 'The password you entered is incorrect.', 'give' ),
-						wp_lostpassword_url( "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]" ),
-						__( 'Reset Password', 'give' )
+						__('The password you entered is incorrect.', 'give'),
+						wp_lostpassword_url("http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"),
+						__('Reset Password', 'give')
 					)
 				);
 				// All is correct.
@@ -699,11 +698,11 @@  discard block
 block discarded – undo
 			}
 		} else {
 			// Empty password.
-			give_set_error( 'password_empty', __( 'Enter a password.', 'give' ) );
+			give_set_error('password_empty', __('Enter a password.', 'give'));
 		}
 	} else {
 		// No username.
-		give_set_error( 'username_incorrect', __( 'The username you entered does not exist.', 'give' ) );
+		give_set_error('username_incorrect', __('The username you entered does not exist.', 'give'));
 	}// End if().
 
 	return $valid_user_data;
@@ -718,7 +717,7 @@  discard block
 block discarded – undo
  */
 function give_donation_form_validate_guest_user() {
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an array to collect valid user data.
 	$valid_user_data = array(
@@ -727,38 +726,38 @@  discard block
 block discarded – undo
 	);
 
 	// Show error message if user must be logged in.
-	if ( give_logged_in_only( $form_id ) ) {
-		give_set_error( 'logged_in_only', __( 'You must be logged in to donate.', 'give' ) );
+	if (give_logged_in_only($form_id)) {
+		give_set_error('logged_in_only', __('You must be logged in to donate.', 'give'));
 	}
 
 	// Get the guest email.
-	$guest_email = isset( $_POST['give_email'] ) ? $_POST['give_email'] : false;
+	$guest_email = isset($_POST['give_email']) ? $_POST['give_email'] : false;
 
 	// Check email.
-	if ( $guest_email && strlen( $guest_email ) > 0 ) {
+	if ($guest_email && strlen($guest_email) > 0) {
 		// Validate email.
-		if ( ! is_email( $guest_email ) ) {
+		if ( ! is_email($guest_email)) {
 			// Invalid email.
-			give_set_error( 'email_invalid', __( 'Invalid email.', 'give' ) );
+			give_set_error('email_invalid', __('Invalid email.', 'give'));
 		} else {
 			// All is good to go.
 			$valid_user_data['user_email'] = $guest_email;
 
 			// Get user_id from donor if exist.
-			$donor = new Give_Donor( $guest_email );
-			if ( $donor->id && $donor->user_id ) {
+			$donor = new Give_Donor($guest_email);
+			if ($donor->id && $donor->user_id) {
 				$valid_user_data['user_id'] = $donor->user_id;
 			}
 		}
 	} else {
 		// No email.
-		give_set_error( 'email_empty', __( 'Enter an email.', 'give' ) );
+		give_set_error('email_empty', __('Enter an email.', 'give'));
 	}
 
 	// Loop through required fields and show error messages.
-	foreach ( give_get_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_get_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_get_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_get_required_fields($form_id)) && empty($_POST[$field_name])) {
+			give_set_error($value['error_id'], $value['error_message']);
 		}
 	}
 
@@ -774,36 +773,36 @@  discard block
 block discarded – undo
  * @since   1.0
  * @return  integer
  */
-function give_register_and_login_new_user( $user_data = array() ) {
+function give_register_and_login_new_user($user_data = array()) {
 	// Verify the array.
-	if ( empty( $user_data ) ) {
-		return - 1;
+	if (empty($user_data)) {
+		return -1;
 	}
 
-	if ( give_get_errors() ) {
-		return - 1;
+	if (give_get_errors()) {
+		return -1;
 	}
 
-	$user_args = apply_filters( 'give_insert_user_args', array(
-		'user_login'      => isset( $user_data['user_login'] ) ? $user_data['user_login'] : '',
-		'user_pass'       => isset( $user_data['user_pass'] ) ? $user_data['user_pass'] : '',
-		'user_email'      => isset( $user_data['user_email'] ) ? $user_data['user_email'] : '',
-		'first_name'      => isset( $user_data['user_first'] ) ? $user_data['user_first'] : '',
-		'last_name'       => isset( $user_data['user_last'] ) ? $user_data['user_last'] : '',
-		'user_registered' => date( 'Y-m-d H:i:s' ),
-		'role'            => get_option( 'default_role' ),
-	), $user_data );
+	$user_args = apply_filters('give_insert_user_args', array(
+		'user_login'      => isset($user_data['user_login']) ? $user_data['user_login'] : '',
+		'user_pass'       => isset($user_data['user_pass']) ? $user_data['user_pass'] : '',
+		'user_email'      => isset($user_data['user_email']) ? $user_data['user_email'] : '',
+		'first_name'      => isset($user_data['user_first']) ? $user_data['user_first'] : '',
+		'last_name'       => isset($user_data['user_last']) ? $user_data['user_last'] : '',
+		'user_registered' => date('Y-m-d H:i:s'),
+		'role'            => get_option('default_role'),
+	), $user_data);
 
 	// Insert new user.
-	$user_id = wp_insert_user( $user_args );
+	$user_id = wp_insert_user($user_args);
 
 	// Validate inserted user.
-	if ( is_wp_error( $user_id ) ) {
-		return - 1;
+	if (is_wp_error($user_id)) {
+		return -1;
 	}
 
 	// Allow themes and plugins to filter the user data.
-	$user_data = apply_filters( 'give_insert_user_data', $user_data, $user_args );
+	$user_data = apply_filters('give_insert_user_data', $user_data, $user_args);
 
 	/**
 	 * Fires after inserting user.
@@ -813,10 +812,10 @@  discard block
 block discarded – undo
 	 * @param int $user_id User id.
 	 * @param array $user_data Array containing user data.
 	 */
-	do_action( 'give_insert_user', $user_id, $user_data );
+	do_action('give_insert_user', $user_id, $user_data);
 
 	// Login new user.
-	give_log_user_in( $user_id, $user_data['user_login'], $user_data['user_pass'] );
+	give_log_user_in($user_id, $user_data['user_login'], $user_data['user_pass']);
 
 	// Return user id.
 	return $user_id;
@@ -831,27 +830,27 @@  discard block
 block discarded – undo
  * @since   1.0
  * @return  array|bool
  */
-function give_get_donation_form_user( $valid_data = array() ) {
+function give_get_donation_form_user($valid_data = array()) {
 
 	// Initialize user.
 	$user    = false;
-	$is_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+	$is_ajax = defined('DOING_AJAX') && DOING_AJAX;
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		// Do not create or login the user during the ajax submission (check for errors only).
 		return true;
-	} elseif ( is_user_logged_in() ) {
+	} elseif (is_user_logged_in()) {
 		// Set the valid user as the logged in collected data.
 		$user = $valid_data['logged_in_user'];
-	} elseif ( $valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true ) {
+	} elseif ($valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true) {
 		// New user registration.
-		if ( $valid_data['need_new_user'] === true ) {
+		if ($valid_data['need_new_user'] === true) {
 			// Set user.
 			$user = $valid_data['new_user_data'];
 			// Register and login new user.
-			$user['user_id'] = give_register_and_login_new_user( $user );
+			$user['user_id'] = give_register_and_login_new_user($user);
 			// User login
-		} elseif ( $valid_data['need_user_login'] === true && ! $is_ajax ) {
+		} elseif ($valid_data['need_user_login'] === true && ! $is_ajax) {
 
 			/**
 			 * The login form is now processed in the give_process_donation_login() function.
@@ -863,48 +862,48 @@  discard block
 block discarded – undo
 			// Set user.
 			$user = $valid_data['login_user_data'];
 			// Login user.
-			give_log_user_in( $user['user_id'], $user['user_login'], $user['user_pass'] );
+			give_log_user_in($user['user_id'], $user['user_login'], $user['user_pass']);
 		}
 	}
 
 	// Check guest checkout.
-	if ( false === $user && false === give_logged_in_only( $_POST['give-form-id'] ) ) {
+	if (false === $user && false === give_logged_in_only($_POST['give-form-id'])) {
 		// Set user
 		$user = $valid_data['guest_user_data'];
 	}
 
 	// Verify we have an user.
-	if ( false === $user || empty( $user ) ) {
+	if (false === $user || empty($user)) {
 		// Return false.
 		return false;
 	}
 
 	// Get user first name.
-	if ( ! isset( $user['user_first'] ) || strlen( trim( $user['user_first'] ) ) < 1 ) {
-		$user['user_first'] = isset( $_POST['give_first'] ) ? strip_tags( trim( $_POST['give_first'] ) ) : '';
+	if ( ! isset($user['user_first']) || strlen(trim($user['user_first'])) < 1) {
+		$user['user_first'] = isset($_POST['give_first']) ? strip_tags(trim($_POST['give_first'])) : '';
 	}
 
 	// Get user last name.
-	if ( ! isset( $user['user_last'] ) || strlen( trim( $user['user_last'] ) ) < 1 ) {
-		$user['user_last'] = isset( $_POST['give_last'] ) ? strip_tags( trim( $_POST['give_last'] ) ) : '';
+	if ( ! isset($user['user_last']) || strlen(trim($user['user_last'])) < 1) {
+		$user['user_last'] = isset($_POST['give_last']) ? strip_tags(trim($_POST['give_last'])) : '';
 	}
 
 	// Get the user's billing address details.
 	$user['address']            = array();
-	$user['address']['line1']   = ! empty( $_POST['card_address'] ) ? sanitize_text_field( $_POST['card_address'] ) : false;
-	$user['address']['line2']   = ! empty( $_POST['card_address_2'] ) ? sanitize_text_field( $_POST['card_address_2'] ) : false;
-	$user['address']['city']    = ! empty( $_POST['card_city'] ) ? sanitize_text_field( $_POST['card_city'] ) : false;
-	$user['address']['state']   = ! empty( $_POST['card_state'] ) ? sanitize_text_field( $_POST['card_state'] ) : false;
-	$user['address']['country'] = ! empty( $_POST['billing_country'] ) ? sanitize_text_field( $_POST['billing_country'] ) : false;
-	$user['address']['zip']     = ! empty( $_POST['card_zip'] ) ? sanitize_text_field( $_POST['card_zip'] ) : false;
-
-	if ( empty( $user['address']['country'] ) ) {
+	$user['address']['line1']   = ! empty($_POST['card_address']) ? sanitize_text_field($_POST['card_address']) : false;
+	$user['address']['line2']   = ! empty($_POST['card_address_2']) ? sanitize_text_field($_POST['card_address_2']) : false;
+	$user['address']['city']    = ! empty($_POST['card_city']) ? sanitize_text_field($_POST['card_city']) : false;
+	$user['address']['state']   = ! empty($_POST['card_state']) ? sanitize_text_field($_POST['card_state']) : false;
+	$user['address']['country'] = ! empty($_POST['billing_country']) ? sanitize_text_field($_POST['billing_country']) : false;
+	$user['address']['zip']     = ! empty($_POST['card_zip']) ? sanitize_text_field($_POST['card_zip']) : false;
+
+	if (empty($user['address']['country'])) {
 		$user['address'] = false;
 	} // End if().
 
-	if ( ! empty( $user['user_id'] ) && $user['user_id'] > 0 && ! empty( $user['address'] ) ) {
+	if ( ! empty($user['user_id']) && $user['user_id'] > 0 && ! empty($user['address'])) {
 		// Store the address in the user's meta so the donation form can be pre-populated with it on return donation.
-		update_user_meta( $user['user_id'], '_give_user_address', $user['address'] );
+		update_user_meta($user['user_id'], '_give_user_address', $user['address']);
 	}
 
 	// Return valid user.
@@ -923,16 +922,16 @@  discard block
 block discarded – undo
 	$card_data = give_get_donation_cc_info();
 
 	// Validate the card zip.
-	if ( ! empty( $card_data['card_zip'] ) ) {
-		if ( ! give_donation_form_validate_cc_zip( $card_data['card_zip'], $card_data['card_country'] ) ) {
-			give_set_error( 'invalid_cc_zip', __( 'The zip / postal code you entered for your billing address is invalid.', 'give' ) );
+	if ( ! empty($card_data['card_zip'])) {
+		if ( ! give_donation_form_validate_cc_zip($card_data['card_zip'], $card_data['card_country'])) {
+			give_set_error('invalid_cc_zip', __('The zip / postal code you entered for your billing address is invalid.', 'give'));
 		}
 	}
 
 	// Ensure no spaces.
-	if ( ! empty( $card_data['card_number'] ) ) {
-		$card_data['card_number'] = str_replace( '+', '', $card_data['card_number'] ); // no "+" signs
-		$card_data['card_number'] = str_replace( ' ', '', $card_data['card_number'] ); // No spaces
+	if ( ! empty($card_data['card_number'])) {
+		$card_data['card_number'] = str_replace('+', '', $card_data['card_number']); // no "+" signs
+		$card_data['card_number'] = str_replace(' ', '', $card_data['card_number']); // No spaces
 	}
 
 	// This should validate card numbers at some point too.
@@ -949,17 +948,17 @@  discard block
 block discarded – undo
 function give_get_donation_cc_info() {
 
 	$cc_info                   = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] ) ? sanitize_text_field( $_POST['card_name'] ) : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] ) ? sanitize_text_field( $_POST['card_number'] ) : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] ) ? sanitize_text_field( $_POST['card_cvc'] ) : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] ) ? sanitize_text_field( $_POST['card_exp_month'] ) : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] ) ? sanitize_text_field( $_POST['card_exp_year'] ) : '';
-	$cc_info['card_address']   = isset( $_POST['card_address'] ) ? sanitize_text_field( $_POST['card_address'] ) : '';
-	$cc_info['card_address_2'] = isset( $_POST['card_address_2'] ) ? sanitize_text_field( $_POST['card_address_2'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['card_city'] ) ? sanitize_text_field( $_POST['card_city'] ) : '';
-	$cc_info['card_state']     = isset( $_POST['card_state'] ) ? sanitize_text_field( $_POST['card_state'] ) : '';
-	$cc_info['card_country']   = isset( $_POST['billing_country'] ) ? sanitize_text_field( $_POST['billing_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['card_zip'] ) ? sanitize_text_field( $_POST['card_zip'] ) : '';
+	$cc_info['card_name']      = isset($_POST['card_name']) ? sanitize_text_field($_POST['card_name']) : '';
+	$cc_info['card_number']    = isset($_POST['card_number']) ? sanitize_text_field($_POST['card_number']) : '';
+	$cc_info['card_cvc']       = isset($_POST['card_cvc']) ? sanitize_text_field($_POST['card_cvc']) : '';
+	$cc_info['card_exp_month'] = isset($_POST['card_exp_month']) ? sanitize_text_field($_POST['card_exp_month']) : '';
+	$cc_info['card_exp_year']  = isset($_POST['card_exp_year']) ? sanitize_text_field($_POST['card_exp_year']) : '';
+	$cc_info['card_address']   = isset($_POST['card_address']) ? sanitize_text_field($_POST['card_address']) : '';
+	$cc_info['card_address_2'] = isset($_POST['card_address_2']) ? sanitize_text_field($_POST['card_address_2']) : '';
+	$cc_info['card_city']      = isset($_POST['card_city']) ? sanitize_text_field($_POST['card_city']) : '';
+	$cc_info['card_state']     = isset($_POST['card_state']) ? sanitize_text_field($_POST['card_state']) : '';
+	$cc_info['card_country']   = isset($_POST['billing_country']) ? sanitize_text_field($_POST['billing_country']) : '';
+	$cc_info['card_zip']       = isset($_POST['card_zip']) ? sanitize_text_field($_POST['card_zip']) : '';
 
 	// Return cc info.
 	return $cc_info;
@@ -975,14 +974,14 @@  discard block
 block discarded – undo
  *
  * @return bool|mixed
  */
-function give_donation_form_validate_cc_zip( $zip = 0, $country_code = '' ) {
+function give_donation_form_validate_cc_zip($zip = 0, $country_code = '') {
 	$ret = false;
 
-	if ( empty( $zip ) || empty( $country_code ) ) {
+	if (empty($zip) || empty($country_code)) {
 		return $ret;
 	}
 
-	$country_code = strtoupper( $country_code );
+	$country_code = strtoupper($country_code);
 
 	$zip_regex = array(
 		'AD' => 'AD\d{3}',
@@ -1142,11 +1141,11 @@  discard block
 block discarded – undo
 		'ZM' => '\d{5}',
 	);
 
-	if ( ! isset( $zip_regex[ $country_code ] ) || preg_match( '/' . $zip_regex[ $country_code ] . '/i', $zip ) ) {
+	if ( ! isset($zip_regex[$country_code]) || preg_match('/'.$zip_regex[$country_code].'/i', $zip)) {
 		$ret = true;
 	}
 
-	return apply_filters( 'give_is_zip_valid', $ret, $zip, $country_code );
+	return apply_filters('give_is_zip_valid', $ret, $zip, $country_code);
 }
 
 
@@ -1160,33 +1159,33 @@  discard block
 block discarded – undo
  *
  * @return bool
  */
-function give_validate_multi_donation_form_level( $valid_data, $data ) {
+function give_validate_multi_donation_form_level($valid_data, $data) {
 	/* @var Give_Donate_Form $form */
-	$form = new Give_Donate_Form( $data['give-form-id'] );
+	$form = new Give_Donate_Form($data['give-form-id']);
 
 	$donation_level_matched = false;
 
-	if ( $form->is_multi_type_donation_form() ) {
+	if ($form->is_multi_type_donation_form()) {
 
 		// Bailout.
-		if ( ! ( $variable_prices = $form->get_prices() ) ) {
+		if ( ! ($variable_prices = $form->get_prices())) {
 			return false;
 		}
 
 		// Sanitize donation amount.
-		$data['give-amount'] = give_maybe_sanitize_amount( $data['give-amount'] );
+		$data['give-amount'] = give_maybe_sanitize_amount($data['give-amount']);
 
-		if ( $data['give-amount'] === give_maybe_sanitize_amount( give_get_price_option_amount( $data['give-form-id'], $data['give-price-id'] ) ) ) {
+		if ($data['give-amount'] === give_maybe_sanitize_amount(give_get_price_option_amount($data['give-form-id'], $data['give-price-id']))) {
 			return true;
 		}
 
 		// Find correct donation level from all donation levels.
-		foreach ( $variable_prices as $variable_price ) {
+		foreach ($variable_prices as $variable_price) {
 			// Sanitize level amount.
-			$variable_price['_give_amount'] = give_maybe_sanitize_amount( $variable_price['_give_amount'] );
+			$variable_price['_give_amount'] = give_maybe_sanitize_amount($variable_price['_give_amount']);
 
 			// Set first match donation level ID.
-			if ( $data['give-amount'] === $variable_price['_give_amount'] ) {
+			if ($data['give-amount'] === $variable_price['_give_amount']) {
 				$_POST['give-price-id'] = $variable_price['_give_id']['level_id'];
 				$donation_level_matched = true;
 				break;
@@ -1197,19 +1196,19 @@  discard block
 block discarded – undo
 		// If yes then set price id to custom if amount is greater then custom minimum amount (if any).
 		if (
 			! $donation_level_matched
-			&& ( give_is_setting_enabled( give_get_meta( $data['give-form-id'], '_give_custom_amount', true ) ) )
+			&& (give_is_setting_enabled(give_get_meta($data['give-form-id'], '_give_custom_amount', true)))
 		) {
 			// Sanitize custom minimum amount.
-			$custom_minimum_amount = give_maybe_sanitize_amount( give_get_meta( $data['give-form-id'], '_give_custom_amount_minimum', true ) );
+			$custom_minimum_amount = give_maybe_sanitize_amount(give_get_meta($data['give-form-id'], '_give_custom_amount_minimum', true));
 
-			if ( $data['give-amount'] >= $custom_minimum_amount ) {
+			if ($data['give-amount'] >= $custom_minimum_amount) {
 				$_POST['give-price-id'] = 'custom';
 				$donation_level_matched = true;
 			}
 		}
 	}// End if().
 
-	return ( $donation_level_matched ? true : false );
+	return ($donation_level_matched ? true : false);
 }
 
-add_action( 'give_checkout_error_checks', 'give_validate_multi_donation_form_level', 10, 2 );
+add_action('give_checkout_error_checks', 'give_validate_multi_donation_form_level', 10, 2);

Please login to merge, or discard this patch.

		@@ -6,16 +6,16 @@ discard block
		block discarded – undo
6	6	* @version 1.0
7	7	*/
8	8
9		-if ( ! defined( 'ABSPATH' ) ) {
	9	+if ( ! defined('ABSPATH')) {
10	10	exit;
11	11	} // Exit if accessed directly.
12	12
13	13	// For gmail compatibility, including CSS styles in head/body are stripped out therefore styles need to be inline. These variables contain rules which are added to the template inline. !important; is a gmail hack to prevent styles being stripped if it doesn't like something.
14		-$body = "
	14	+$body = "
15	15	background-color: #f6f6f6;
16	16	font-family: 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
17	17	";
18		-$wrapper = "
	18	+$wrapper = "
19	19	width:100%;
20	20	-webkit-text-size-adjust:none !important;
21	21	margin:0;
		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42	text-align: center;
43	43	vertical-align:middle;
44	44	";
45		-$body_content = "
	45	+$body_content = "
46	46	border-radius:3px !important;
47	47	font-family: 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif;
48	48	";
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	line-height:150%;
54	54	text-align:left;
55	55	";
56		-$header_content_h1 = "
	56	+$header_content_h1 = "
57	57	color: #000000;
58	58	margin:0;
59	59	padding: 28px 24px;
		@@ -63,13 +63,13 @@ discard block
		block discarded – undo
63	63	font-weight: 500;
64	64	line-height: 1.2;
65	65	";
66		-$header_img = give_get_option( 'email_logo', '' );
	66	+$header_img = give_get_option('email_logo', '');
67	67	?>
68	68	<!DOCTYPE html>
69	69	<html>
70	70	<head>
71	71	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
72		- <title><?php echo get_bloginfo( 'name' ); ?></title>
	72	+ <title><?php echo get_bloginfo('name'); ?></title>
73	73	</head>
74	74	<body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0" style="<?php echo $body; ?>">
75	75	<div style="<?php echo $wrapper; ?>">
		@@ -77,9 +77,9 @@ discard block
		block discarded – undo
77	77	<tr>
78	78	<td align="center" valign="top">
79	79	<?php
80		- if ( ! empty( $header_img ) ) : ?>
	80	+ if ( ! empty($header_img)) : ?>
81	81	<div id="template_header_image">
82		- <?php echo '<p style="margin-top:0;"><img style="' . $template_image . '" src="' . esc_url( $header_img ) . '" alt="' . get_bloginfo( 'name' ) . '" /></p>'; ?>
	82	+ <?php echo '<p style="margin-top:0;"><img style="'.$template_image.'" src="'.esc_url($header_img).'" alt="'.get_bloginfo('name').'" /></p>'; ?>
83	83	</div>
84	84	<?php endif; ?>
85	85	<table border="0" cellpadding="0" cellspacing="0" width="600" id="template_container" style="<?php echo $template_container; ?>">

		@@ -6,7 +6,7 @@
		block discarded – undo
6	6	* @version 1.0
7	7	*/
8	8
9		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly.
	9	+if ( ! defined('ABSPATH')) exit; // Exit if accessed directly.
10	10
11	11	// {email} is replaced by the content entered in Donations > Settings > Emails
12	12

		@@ -6,7 +6,10 @@
		block discarded – undo
6	6	* @version 1.0
7	7	*/
8	8
9		-if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly.
	9	+if ( ! defined( 'ABSPATH' ) ) {
	10	+ exit;
	11	+}
	12	+// Exit if accessed directly.
10	13
11	14	// {email} is replaced by the content entered in Donations > Settings > Emails
12	15

		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10	*/
11	11
12	12	// Exit if accessed directly.
13		-if ( ! defined( 'ABSPATH' ) ) {
	13	+if ( ! defined('ABSPATH')) {
14	14	exit;
15	15	}
16	16
		@@ -20,19 +20,19 @@ discard block
		block discarded – undo
20	20	* @since 1.8
21	21	*/
22	22	function give_load_wp_editor() {
23		- if ( ! isset( $_POST['wp_editor'] ) ) {
	23	+ if ( ! isset($_POST['wp_editor'])) {
24	24	die();
25	25	}
26	26
27		- $wp_editor = json_decode( base64_decode( $_POST['wp_editor'] ), true );
	27	+ $wp_editor = json_decode(base64_decode($_POST['wp_editor']), true);
28	28	$wp_editor[2]['textarea_name'] = $_POST['textarea_name'];
29	29
30		- wp_editor( $wp_editor[0], $_POST['wp_editor_id'], $wp_editor[2] );
	30	+ wp_editor($wp_editor[0], $_POST['wp_editor_id'], $wp_editor[2]);
31	31
32	32	die();
33	33	}
34	34
35		-add_action( 'wp_ajax_give_load_wp_editor', 'give_load_wp_editor' );
	35	+add_action('wp_ajax_give_load_wp_editor', 'give_load_wp_editor');
36	36
37	37
38	38	/**
		@@ -52,13 +52,13 @@ discard block
		block discarded – undo
52	52	);
53	53
54	54	// Get current page.
55		- $current_page = isset( $_GET['page'] ) ? esc_attr( $_GET['page'] ) : '';
	55	+ $current_page = isset($_GET['page']) ? esc_attr($_GET['page']) : '';
56	56
57	57	// Bailout.
58	58	if (
59		- empty( $current_page )
60		- \|\| empty( $_GET['_wp_http_referer'] )
61		- \|\| ! in_array( $current_page, $give_pages )
	59	+ empty($current_page)
	60	+ \|\| empty($_GET['_wp_http_referer'])
	61	+ \|\| ! in_array($current_page, $give_pages)
62	62	) {
63	63	return false;
64	64	}
		@@ -68,21 +68,21 @@ discard block
		block discarded – undo
68	68	*
69	69	* @since 1.8
70	70	*/
71		- $redirect = apply_filters( "give_validate_{$current_page}", true );
	71	+ $redirect = apply_filters("give_validate_{$current_page}", true);
72	72
73		- if ( $redirect ) {
	73	+ if ($redirect) {
74	74	// Redirect.
75	75	wp_redirect(
76	76	remove_query_arg(
77		- array( '_wp_http_referer', '_wpnonce' ),
78		- wp_unslash( $_SERVER['REQUEST_URI'] )
	77	+ array('_wp_http_referer', '_wpnonce'),
	78	+ wp_unslash($_SERVER['REQUEST_URI'])
79	79	)
80	80	);
81	81	exit;
82	82	}
83	83	}
84	84
85		-add_action( 'admin_init', 'give_redirect_to_clean_url_admin_pages' );
	85	+add_action('admin_init', 'give_redirect_to_clean_url_admin_pages');
86	86
87	87
88	88	/**
		@@ -96,25 +96,25 @@ discard block
		block discarded – undo
96	96	*/
97	97	function give_hide_outdated_php_notice() {
98	98
99		- if ( ! isset( $_POST['_give_hide_outdated_php_notices_shortly'] ) ) {
	99	+ if ( ! isset($_POST['_give_hide_outdated_php_notices_shortly'])) {
100	100	give_die();
101	101	}
102	102
103	103	// Transient key name.
104	104	$transient_key = "_give_hide_outdated_php_notices_shortly";
105	105
106		- if ( Give_Cache::get( $transient_key, true ) ) {
	106	+ if (Give_Cache::get($transient_key, true)) {
107	107	return;
108	108	}
109	109
110	110	// Hide notice for 24 hours.
111		- Give_Cache::set( $transient_key, true, DAY_IN_SECONDS, true );
	111	+ Give_Cache::set($transient_key, true, DAY_IN_SECONDS, true);
112	112
113	113	give_die();
114	114
115	115	}
116	116
117		-add_action( 'wp_ajax_give_hide_outdated_php_notice', 'give_hide_outdated_php_notice' );
	117	+add_action('wp_ajax_give_hide_outdated_php_notice', 'give_hide_outdated_php_notice');
118	118
119	119	/**
120	120	* Register admin notices.
		@@ -123,23 +123,23 @@ discard block
		block discarded – undo
123	123	*/
124	124	function _give_register_admin_notices() {
125	125	// Bailout.
126		- if( ! is_admin() ) {
	126	+ if ( ! is_admin()) {
127	127	return;
128	128	}
129	129
130	130	// Add payment bulk notice.
131	131	if (
132		- current_user_can( 'edit_give_payments' )
133		- && isset( $_GET['action'] )
134		- && ! empty( $_GET['action'] )
135		- && isset( $_GET['payment'] )
136		- && ! empty( $_GET['payment'] )
	132	+ current_user_can('edit_give_payments')
	133	+ && isset($_GET['action'])
	134	+ && ! empty($_GET['action'])
	135	+ && isset($_GET['payment'])
	136	+ && ! empty($_GET['payment'])
137	137	) {
138		- $payment_count = isset( $_GET['payment'] ) ? count( $_GET['payment'] ) : 0;
	138	+ $payment_count = isset($_GET['payment']) ? count($_GET['payment']) : 0;
139	139
140		- switch ( $_GET['action'] ) {
	140	+ switch ($_GET['action']) {
141	141	case 'delete':
142		- Give()->notices->register_notice( array(
	142	+ Give()->notices->register_notice(array(
143	143	'id' => 'bulk_action_delete',
144	144	'type' => 'updated',
145	145	'description' => sprintf(
		@@ -151,12 +151,12 @@ discard block
		block discarded – undo
151	151	),
152	152	$payment_count ),
153	153	'show' => true,
154		- ) );
	154	+ ));
155	155
156	156	break;
157	157
158	158	case 'resend-receipt':
159		- Give()->notices->register_notice( array(
	159	+ Give()->notices->register_notice(array(
160	160	'id' => 'bulk_action_resend_receipt',
161	161	'type' => 'updated',
162	162	'description' => sprintf(
		@@ -169,196 +169,196 @@ discard block
		block discarded – undo
169	169	$payment_count
170	170	),
171	171	'show' => true,
172		- ) );
	172	+ ));
173	173	break;
174	174	}
175	175	}
176	176
177	177	// Add give message notices.
178		- if ( ! empty( $_GET['give-message'] ) ) {
	178	+ if ( ! empty($_GET['give-message'])) {
179	179	// Donation reports errors.
180		- if ( current_user_can( 'view_give_reports' ) ) {
181		- switch ( $_GET['give-message'] ) {
	180	+ if (current_user_can('view_give_reports')) {
	181	+ switch ($_GET['give-message']) {
182	182	case 'donation_deleted' :
183		- Give()->notices->register_notice( array(
	183	+ Give()->notices->register_notice(array(
184	184	'id' => 'give-donation-deleted',
185	185	'type' => 'updated',
186		- 'description' => __( 'The donation has been deleted.', 'give' ),
	186	+ 'description' => __('The donation has been deleted.', 'give'),
187	187	'show' => true,
188		- ) );
	188	+ ));
189	189	break;
190	190	case 'email_sent' :
191		- Give()->notices->register_notice( array(
	191	+ Give()->notices->register_notice(array(
192	192	'id' => 'give-payment-sent',
193	193	'type' => 'updated',
194		- 'description' => __( 'The donation receipt has been resent.', 'give' ),
	194	+ 'description' => __('The donation receipt has been resent.', 'give'),
195	195	'show' => true,
196		- ) );
	196	+ ));
197	197	break;
198	198	case 'refreshed-reports' :
199		- Give()->notices->register_notice( array(
	199	+ Give()->notices->register_notice(array(
200	200	'id' => 'give-refreshed-reports',
201	201	'type' => 'updated',
202		- 'description' => __( 'The reports cache has been cleared.', 'give' ),
	202	+ 'description' => __('The reports cache has been cleared.', 'give'),
203	203	'show' => true,
204		- ) );
	204	+ ));
205	205	break;
206	206	case 'donation-note-deleted' :
207		- Give()->notices->register_notice( array(
	207	+ Give()->notices->register_notice(array(
208	208	'id' => 'give-donation-note-deleted',
209	209	'type' => 'updated',
210		- 'description' => __( 'The donation note has been deleted.', 'give' ),
	210	+ 'description' => __('The donation note has been deleted.', 'give'),
211	211	'show' => true,
212		- ) );
	212	+ ));
213	213	break;
214	214	}
215	215	}
216	216
217	217	// Give settings notices and errors.
218		- if ( current_user_can( 'manage_give_settings' ) ) {
219		- switch ( $_GET['give-message'] ) {
	218	+ if (current_user_can('manage_give_settings')) {
	219	+ switch ($_GET['give-message']) {
220	220	case 'settings-imported' :
221		- Give()->notices->register_notice( array(
	221	+ Give()->notices->register_notice(array(
222	222	'id' => 'give-settings-imported',
223	223	'type' => 'updated',
224		- 'description' => __( 'The settings have been imported.', 'give' ),
	224	+ 'description' => __('The settings have been imported.', 'give'),
225	225	'show' => true,
226		- ) );
	226	+ ));
227	227	break;
228	228	case 'api-key-generated' :
229		- Give()->notices->register_notice( array(
	229	+ Give()->notices->register_notice(array(
230	230	'id' => 'give-api-key-generated',
231	231	'type' => 'updated',
232		- 'description' => __( 'API keys have been generated.', 'give' ),
	232	+ 'description' => __('API keys have been generated.', 'give'),
233	233	'show' => true,
234		- ) );
	234	+ ));
235	235	break;
236	236	case 'api-key-exists' :
237		- Give()->notices->register_notice( array(
	237	+ Give()->notices->register_notice(array(
238	238	'id' => 'give-api-key-exists',
239	239	'type' => 'updated',
240		- 'description' => __( 'The specified user already has API keys.', 'give' ),
	240	+ 'description' => __('The specified user already has API keys.', 'give'),
241	241	'show' => true,
242		- ) );
	242	+ ));
243	243	break;
244	244	case 'api-key-regenerated' :
245		- Give()->notices->register_notice( array(
	245	+ Give()->notices->register_notice(array(
246	246	'id' => 'give-api-key-regenerated',
247	247	'type' => 'updated',
248		- 'description' => __( 'API keys have been regenerated.', 'give' ),
	248	+ 'description' => __('API keys have been regenerated.', 'give'),
249	249	'show' => true,
250		- ) );
	250	+ ));
251	251	break;
252	252	case 'api-key-revoked' :
253		- Give()->notices->register_notice( array(
	253	+ Give()->notices->register_notice(array(
254	254	'id' => 'give-api-key-revoked',
255	255	'type' => 'updated',
256		- 'description' => __( 'API keys have been revoked.', 'give' ),
	256	+ 'description' => __('API keys have been revoked.', 'give'),
257	257	'show' => true,
258		- ) );
	258	+ ));
259	259	break;
260	260	case 'sent-test-email' :
261		- Give()->notices->register_notice( array(
	261	+ Give()->notices->register_notice(array(
262	262	'id' => 'give-sent-test-email',
263	263	'type' => 'updated',
264		- 'description' => __( 'The test email has been sent.', 'give' ),
	264	+ 'description' => __('The test email has been sent.', 'give'),
265	265	'show' => true,
266		- ) );
	266	+ ));
267	267	break;
268	268	case 'matched-success-failure-page':
269		- Give()->notices->register_notice( array(
	269	+ Give()->notices->register_notice(array(
270	270	'id' => 'give-matched-success-failure-page',
271	271	'type' => 'updated',
272		- 'description' => __( 'You cannot set the success and failed pages to the same page', 'give' ),
	272	+ 'description' => __('You cannot set the success and failed pages to the same page', 'give'),
273	273	'show' => true,
274		- ) );
	274	+ ));
275	275	break;
276	276	}
277	277	}
278	278	// Payments errors.
279		- if ( current_user_can( 'edit_give_payments' ) ) {
280		- switch ( $_GET['give-message'] ) {
	279	+ if (current_user_can('edit_give_payments')) {
	280	+ switch ($_GET['give-message']) {
281	281	case 'note-added' :
282		- Give()->notices->register_notice( array(
	282	+ Give()->notices->register_notice(array(
283	283	'id' => 'give-note-added',
284	284	'type' => 'updated',
285		- 'description' => __( 'The donation note has been added.', 'give' ),
	285	+ 'description' => __('The donation note has been added.', 'give'),
286	286	'show' => true,
287		- ) );
	287	+ ));
288	288	break;
289	289	case 'payment-updated' :
290		- Give()->notices->register_notice( array(
	290	+ Give()->notices->register_notice(array(
291	291	'id' => 'give-payment-updated',
292	292	'type' => 'updated',
293		- 'description' => __( 'The donation has been updated.', 'give' ),
	293	+ 'description' => __('The donation has been updated.', 'give'),
294	294	'show' => true,
295		- ) );
	295	+ ));
296	296	break;
297	297	}
298	298	}
299	299
300	300	// Donor Notices.
301		- if ( current_user_can( 'edit_give_payments' ) ) {
302		- switch ( $_GET['give-message'] ) {
	301	+ if (current_user_can('edit_give_payments')) {
	302	+ switch ($_GET['give-message']) {
303	303	case 'donor-deleted' :
304		- Give()->notices->register_notice( array(
	304	+ Give()->notices->register_notice(array(
305	305	'id' => 'give-donor-deleted',
306	306	'type' => 'updated',
307		- 'description' => __( 'The donor has been deleted.', 'give' ),
	307	+ 'description' => __('The donor has been deleted.', 'give'),
308	308	'show' => true,
309		- ) );
	309	+ ));
310	310	break;
311	311
312	312	case 'email-added' :
313		- Give()->notices->register_notice( array(
	313	+ Give()->notices->register_notice(array(
314	314	'id' => 'give-donor-email-added',
315	315	'type' => 'updated',
316		- 'description' => __( 'Donor email added.', 'give' ),
	316	+ 'description' => __('Donor email added.', 'give'),
317	317	'show' => true,
318		- ) );
	318	+ ));
319	319	break;
320	320
321	321	case 'email-removed' :
322		- Give()->notices->register_notice( array(
	322	+ Give()->notices->register_notice(array(
323	323	'id' => 'give-donor-email-removed',
324	324	'type' => 'updated',
325		- 'description' => __( 'Donor email removed.', 'give' ),
	325	+ 'description' => __('Donor email removed.', 'give'),
326	326	'show' => true,
327		- ) );
	327	+ ));
328	328	break;
329	329
330	330	case 'email-remove-failed' :
331		- Give()->notices->register_notice( array(
	331	+ Give()->notices->register_notice(array(
332	332	'id' => 'give-donor-email-remove-failed',
333	333	'type' => 'updated',
334		- 'description' => __( 'Failed to remove donor email.', 'give' ),
	334	+ 'description' => __('Failed to remove donor email.', 'give'),
335	335	'show' => true,
336		- ) );
	336	+ ));
337	337	break;
338	338
339	339	case 'primary-email-updated' :
340		- Give()->notices->register_notice( array(
	340	+ Give()->notices->register_notice(array(
341	341	'id' => 'give-donor-primary-email-updated',
342	342	'type' => 'updated',
343		- 'description' => __( 'Primary email updated for donor.', 'give' ),
	343	+ 'description' => __('Primary email updated for donor.', 'give'),
344	344	'show' => true,
345		- ) );
	345	+ ));
346	346	break;
347	347
348	348	case 'primary-email-failed' :
349		- Give()->notices->register_notice( array(
	349	+ Give()->notices->register_notice(array(
350	350	'id' => 'give-donor-primary-email-failed',
351	351	'type' => 'updated',
352		- 'description' => __( 'Failed to set primary email.', 'give' ),
	352	+ 'description' => __('Failed to set primary email.', 'give'),
353	353	'show' => true,
354		- ) );
	354	+ ));
355	355	break;
356	356	}
357	357	}
358	358	}
359	359	}
360	360
361		-add_action( 'admin_notices', '_give_register_admin_notices', - 1 );
	361	+add_action('admin_notices', '_give_register_admin_notices', - 1);
362	362
363	363
364	364	/**
		@@ -368,27 +368,26 @@ discard block
		block discarded – undo
368	368	*
369	369	* @return bool
370	370	*/
371		-function _give_show_test_mode_notice_in_admin_bar( $wp_admin_bar ) {
372		- $is_test_mode = ! empty( $_POST['test_mode'] ) ?
373		- give_is_setting_enabled( $_POST['test_mode'] ) :
374		- give_is_test_mode();
	371	+function _give_show_test_mode_notice_in_admin_bar($wp_admin_bar) {
	372	+ $is_test_mode = ! empty($_POST['test_mode']) ?
	373	+ give_is_setting_enabled($_POST['test_mode']) : give_is_test_mode();
375	374
376	375	if (
377		- ! current_user_can( 'view_give_reports' ) \|\|
	376	+ ! current_user_can('view_give_reports') \|\|
378	377	! $is_test_mode
379	378	) {
380	379	return false;
381	380	}
382	381
383	382	// Add the main siteadmin menu item.
384		- $wp_admin_bar->add_menu( array(
	383	+ $wp_admin_bar->add_menu(array(
385	384	'id' => 'give-test-notice',
386		- 'href' => admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=gateways' ),
	385	+ 'href' => admin_url('edit.php?post_type=give_forms&page=give-settings&tab=gateways'),
387	386	'parent' => 'top-secondary',
388		- 'title' => esc_html__( 'Give Test Mode Active', 'give' ),
389		- 'meta' => array( 'class' => 'give-test-mode-active' ),
390		- ) );
	387	+ 'title' => esc_html__('Give Test Mode Active', 'give'),
	388	+ 'meta' => array('class' => 'give-test-mode-active'),
	389	+ ));
391	390
392	391	return true;
393	392	}
394		-add_action( 'admin_bar_menu', '_give_show_test_mode_notice_in_admin_bar', 1000, 1 );
395	393	\ No newline at end of file
	394	+add_action('admin_bar_menu', '_give_show_test_mode_notice_in_admin_bar', 1000, 1);
396	395	\ No newline at end of file

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	*/
12	12
13	13	// Exit if accessed directly.
14		-if ( ! defined( 'ABSPATH' ) ) {
	14	+if ( ! defined('ABSPATH')) {
15	15	exit;
16	16	}
17	17
		@@ -55,22 +55,22 @@ discard block
		block discarded – undo
55	55	public function get_data() {
56	56	global $wpdb;
57	57
58		- $items = $this->get_stored_data( 'give_temp_delete_test_ids' );
	58	+ $items = $this->get_stored_data('give_temp_delete_test_ids');
59	59
60		- if ( ! is_array( $items ) ) {
	60	+ if ( ! is_array($items)) {
61	61	return false;
62	62	}
63	63
64		- $offset = ( $this->step - 1 ) * $this->per_step;
65		- $step_items = array_slice( $items, $offset, $this->per_step );
	64	+ $offset = ($this->step - 1) * $this->per_step;
	65	+ $step_items = array_slice($items, $offset, $this->per_step);
66	66
67		- if ( $step_items ) {
	67	+ if ($step_items) {
68	68
69	69	$step_ids = array(
70	70	'other' => array(),
71	71	);
72	72
73		- foreach ( $step_items as $item ) {
	73	+ foreach ($step_items as $item) {
74	74
75	75	$step_ids['other'][] = $item['id'];
76	76
		@@ -78,31 +78,31 @@ discard block
		block discarded – undo
78	78
79	79	$sql = array();
80	80
81		- foreach ( $step_ids as $type => $ids ) {
	81	+ foreach ($step_ids as $type => $ids) {
82	82
83		- if ( empty( $ids ) ) {
	83	+ if (empty($ids)) {
84	84	continue;
85	85	}
86	86
87	87	$parent_query = '';
88	88
89		- switch ( $type ) {
	89	+ switch ($type) {
90	90	case 'other':
91	91
92		- $temp_ids = implode( ',', $ids );
	92	+ $temp_ids = implode(',', $ids);
93	93
94	94	// Get all the test logs of the donations ids.
95	95	$parent_query = "SELECT DISTINCT post_id as id FROM $wpdb->postmeta WHERE meta_key = '_give_log_payment_id' AND meta_value IN ( $temp_ids )";
96		- $parent_ids = $wpdb->get_results( $parent_query, 'ARRAY_A' );
	96	+ $parent_ids = $wpdb->get_results($parent_query, 'ARRAY_A');
97	97
98	98	// List of all test logs.
99		- if ( $parent_ids ) {
100		- foreach ( $parent_ids as $parent_id ) {
	99	+ if ($parent_ids) {
	100	+ foreach ($parent_ids as $parent_id) {
101	101	// Adding all the test log in post ids that are going to get deleted.
102	102	$ids[] = $parent_id['id'];
103	103	}
104	104	}
105		- $ids = implode( ',', $ids );
	105	+ $ids = implode(',', $ids);
106	106
107	107	$sql[] = "DELETE FROM $wpdb->posts WHERE id IN ($ids)";
108	108	$sql[] = "DELETE FROM $wpdb->postmeta WHERE post_id IN ($ids)";
		@@ -113,11 +113,11 @@ discard block
		block discarded – undo
113	113
114	114	}
115	115
116		- if ( ! empty( $sql ) ) {
117		- foreach ( $sql as $query ) {
118		- $wpdb->query( $query );
	116	+ if ( ! empty($sql)) {
	117	+ foreach ($sql as $query) {
	118	+ $wpdb->query($query);
119	119	}
120		- do_action( 'give_delete_log_cache' );
	120	+ do_action('give_delete_log_cache');
121	121	}
122	122	return true;
123	123	}
		@@ -132,16 +132,16 @@ discard block
		block discarded – undo
132	132	*/
133	133	public function get_percentage_complete() {
134	134
135		- $items = $this->get_stored_data( 'give_temp_delete_test_ids', false );
136		- $total = count( $items );
	135	+ $items = $this->get_stored_data('give_temp_delete_test_ids', false);
	136	+ $total = count($items);
137	137
138	138	$percentage = 100;
139	139
140		- if ( $total > 0 ) {
141		- $percentage = ( ( $this->per_step * $this->step ) / $total ) * 100;
	140	+ if ($total > 0) {
	141	+ $percentage = (($this->per_step * $this->step) / $total) * 100;
142	142	}
143	143
144		- if ( $percentage > 100 ) {
	144	+ if ($percentage > 100) {
145	145	$percentage = 100;
146	146	}
147	147
		@@ -155,7 +155,7 @@ discard block
		block discarded – undo
155	155	*
156	156	* @param array $request The Form Data passed into the batch processing
157	157	*/
158		- public function set_properties( $request ) {
	158	+ public function set_properties($request) {
159	159	}
160	160
161	161	/**
		@@ -166,29 +166,29 @@ discard block
		block discarded – undo
166	166	*/
167	167	public function process_step() {
168	168
169		- if ( ! $this->can_export() ) {
170		- wp_die( __( 'You do not have permission to delete test transactions.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
	169	+ if ( ! $this->can_export()) {
	170	+ wp_die(__('You do not have permission to delete test transactions.', 'give'), __('Error', 'give'), array('response' => 403));
171	171	}
172	172
173	173	$had_data = $this->get_data();
174	174
175		- if ( $had_data ) {
	175	+ if ($had_data) {
176	176	$this->done = false;
177	177
178	178	return true;
179	179	} else {
180		- update_option( 'give_earnings_total', give_get_total_earnings( true ) );
181		- Give_Cache::delete( Give_Cache::get_key('give_estimated_monthly_stats' ) );
	180	+ update_option('give_earnings_total', give_get_total_earnings(true));
	181	+ Give_Cache::delete(Give_Cache::get_key('give_estimated_monthly_stats'));
182	182
183		- $this->delete_data( 'give_temp_delete_test_ids' );
	183	+ $this->delete_data('give_temp_delete_test_ids');
184	184
185	185	// Reset the sequential order numbers
186		- if ( give_get_option( 'enable_sequential' ) ) {
187		- delete_option( 'give_last_payment_number' );
	186	+ if (give_get_option('enable_sequential')) {
	187	+ delete_option('give_last_payment_number');
188	188	}
189	189
190	190	$this->done = true;
191		- $this->message = __( 'Test transactions successfully deleted.', 'give' );
	191	+ $this->message = __('Test transactions successfully deleted.', 'give');
192	192
193	193	return false;
194	194	}
		@@ -198,10 +198,10 @@ discard block
		block discarded – undo
198	198	* Headers
199	199	*/
200	200	public function headers() {
201		- ignore_user_abort( true );
	201	+ ignore_user_abort(true);
202	202
203		- if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
204		- set_time_limit( 0 );
	203	+ if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
	204	+ set_time_limit(0);
205	205	}
206	206	}
207	207
		@@ -225,26 +225,26 @@ discard block
		block discarded – undo
225	225	*/
226	226	public function pre_fetch() {
227	227
228		- if ( $this->step == 1 ) {
229		- $this->delete_data( 'give_temp_delete_test_ids' );
	228	+ if ($this->step == 1) {
	229	+ $this->delete_data('give_temp_delete_test_ids');
230	230	}
231	231
232		- $items = get_option( 'give_temp_delete_test_ids', false );
	232	+ $items = get_option('give_temp_delete_test_ids', false);
233	233
234		- if ( false === $items ) {
	234	+ if (false === $items) {
235	235	$items = array();
236	236
237		- $args = apply_filters( 'give_tools_reset_stats_total_args', array(
	237	+ $args = apply_filters('give_tools_reset_stats_total_args', array(
238	238	'post_type' => 'give_payment',
239	239	'post_status' => 'any',
240		- 'posts_per_page' => - 1,
	240	+ 'posts_per_page' => -1,
241	241	// ONLY TEST MODE TRANSACTIONS!!!
242	242	'meta_key' => '_give_payment_mode',
243	243	'meta_value' => 'test'
244		- ) );
	244	+ ));
245	245
246		- $posts = get_posts( $args );
247		- foreach ( $posts as $post ) {
	246	+ $posts = get_posts($args);
	247	+ foreach ($posts as $post) {
248	248	$items[] = array(
249	249	'id' => (int) $post->ID,
250	250	'type' => $post->post_type,
		@@ -253,9 +253,9 @@ discard block
		block discarded – undo
253	253
254	254	// Allow filtering of items to remove with an unassociative array for each item.
255	255	// The array contains the unique ID of the item, and a 'type' for you to use in the execution of the get_data method.
256		- $items = apply_filters( 'give_delete_test_items', $items );
	256	+ $items = apply_filters('give_delete_test_items', $items);
257	257
258		- $this->store_data( 'give_temp_delete_test_ids', $items );
	258	+ $this->store_data('give_temp_delete_test_ids', $items);
259	259	}
260	260
261	261	}
		@@ -269,11 +269,11 @@ discard block
		block discarded – undo
269	269	*
270	270	* @return mixed Returns the data from the database
271	271	*/
272		- private function get_stored_data( $key ) {
	272	+ private function get_stored_data($key) {
273	273	global $wpdb;
274		- $value = $wpdb->get_var( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key ) );
	274	+ $value = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key));
275	275
276		- return empty( $value ) ? false : maybe_unserialize( $value );
	276	+ return empty($value) ? false : maybe_unserialize($value);
277	277	}
278	278
279	279	/**
		@@ -286,10 +286,10 @@ discard block
		block discarded – undo
286	286	*
287	287	* @return void
288	288	*/
289		- private function store_data( $key, $value ) {
	289	+ private function store_data($key, $value) {
290	290	global $wpdb;
291	291
292		- $value = maybe_serialize( $value );
	292	+ $value = maybe_serialize($value);
293	293
294	294	$data = array(
295	295	'option_name' => $key,
		@@ -303,7 +303,7 @@ discard block
		block discarded – undo
303	303	'%s',
304	304	);
305	305
306		- $wpdb->replace( $wpdb->options, $data, $formats );
	306	+ $wpdb->replace($wpdb->options, $data, $formats);
307	307	}
308	308
309	309	/**
		@@ -315,9 +315,9 @@ discard block
		block discarded – undo
315	315	*
316	316	* @return void
317	317	*/
318		- private function delete_data( $key ) {
	318	+ private function delete_data($key) {
319	319	global $wpdb;
320		- $wpdb->delete( $wpdb->options, array( 'option_name' => $key ) );
	320	+ $wpdb->delete($wpdb->options, array('option_name' => $key));
321	321	}
322	322
323	323	}

		@@ -3,11 +3,11 @@ discard block
		block discarded – undo
3	3	* Admin View: Exports
4	4	*/
5	5
6		-if ( ! defined( 'ABSPATH' ) ) {
	6	+if ( ! defined('ABSPATH')) {
7	7	exit;
8	8	}
9	9
10		-if ( ! current_user_can( 'manage_give_settings' ) ) {
	10	+if ( ! current_user_can('manage_give_settings')) {
11	11	return;
12	12	}
13	13
		@@ -16,28 +16,28 @@ discard block
		block discarded – undo
16	16	*
17	17	* @since 1.5
18	18	*/
19		-do_action( 'give_tools_recount_stats_before' );
	19	+do_action('give_tools_recount_stats_before');
20	20	?>
21	21	<div id="poststuff">
22	22	<div class="postbox">
23	23
24		- <h2 class="hndle ui-sortable-handle"><span><?php esc_html_e( 'Recount Stats', 'give' ); ?></span></h2>
	24	+ <h2 class="hndle ui-sortable-handle"><span><?php esc_html_e('Recount Stats', 'give'); ?></span></h2>
25	25
26	26	<div class="inside recount-stats-controls">
27		- <p><?php esc_html_e( 'Use these tools to recount stats, delete test transactions, or reset stats.', 'give' ); ?></p>
	27	+ <p><?php esc_html_e('Use these tools to recount stats, delete test transactions, or reset stats.', 'give'); ?></p>
28	28	<form method="post" id="give-tools-recount-form" class="give-export-form">
29	29
30		- <?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
	30	+ <?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
31	31
32	32	<select name="give-export-class" id="recount-stats-type">
33		- <option value="0" selected="selected" disabled="disabled"><?php esc_html_e( 'Please select an option', 'give' ); ?></option>
34		- <option data-type="recount-stats" value="Give_Tools_Recount_Income"><?php esc_html_e( 'Recalculate Total Donation Income Amount', 'give' ); ?></option>
35		- <option data-type="recount-form" value="Give_Tools_Recount_Form_Stats"><?php esc_html_e( 'Recalculate Income Amount and Donation Counts for a Form', 'give' ); ?></option>
36		- <option data-type="recount-all" value="Give_Tools_Recount_All_Stats"><?php esc_html_e( 'Recalculate Income Amount and Donation Counts for All Forms', 'give' ); ?></option>
37		- <option data-type="recount-donor-stats" value="Give_Tools_Recount_Donor_Stats"><?php esc_html_e( 'Recalculate Donor Statistics', 'give' ); ?></option>
38		- <option data-type="delete-test-transactions" value="Give_Tools_Delete_Test_Transactions"><?php esc_html_e( 'Delete Test Payments', 'give' ); ?></option>
39		- <option data-type="delete-test-donors" value="Give_Tools_Delete_Donors"><?php esc_html_e( 'Delete Test Donors and Payments', 'give' ); ?></option>
40		- <option data-type="reset-stats" value="Give_Tools_Reset_Stats"><?php esc_html_e( 'Delete All Data', 'give' ); ?></option>
	33	+ <option value="0" selected="selected" disabled="disabled"><?php esc_html_e('Please select an option', 'give'); ?></option>
	34	+ <option data-type="recount-stats" value="Give_Tools_Recount_Income"><?php esc_html_e('Recalculate Total Donation Income Amount', 'give'); ?></option>
	35	+ <option data-type="recount-form" value="Give_Tools_Recount_Form_Stats"><?php esc_html_e('Recalculate Income Amount and Donation Counts for a Form', 'give'); ?></option>
	36	+ <option data-type="recount-all" value="Give_Tools_Recount_All_Stats"><?php esc_html_e('Recalculate Income Amount and Donation Counts for All Forms', 'give'); ?></option>
	37	+ <option data-type="recount-donor-stats" value="Give_Tools_Recount_Donor_Stats"><?php esc_html_e('Recalculate Donor Statistics', 'give'); ?></option>
	38	+ <option data-type="delete-test-transactions" value="Give_Tools_Delete_Test_Transactions"><?php esc_html_e('Delete Test Payments', 'give'); ?></option>
	39	+ <option data-type="delete-test-donors" value="Give_Tools_Delete_Donors"><?php esc_html_e('Delete Test Donors and Payments', 'give'); ?></option>
	40	+ <option data-type="reset-stats" value="Give_Tools_Reset_Stats"><?php esc_html_e('Delete All Data', 'give'); ?></option>
41	41	<?php
42	42	/**
43	43	* Fires in the recount stats selectbox.
		@@ -46,7 +46,7 @@ discard block
		block discarded – undo
46	46	*
47	47	* @since 1.5
48	48	*/
49		- do_action( 'give_recount_tool_options' );
	49	+ do_action('give_recount_tool_options');
50	50	?>
51	51	</select>
52	52
		@@ -54,22 +54,22 @@ discard block
		block discarded – undo
54	54	<?php
55	55	$args = array(
56	56	'name' => 'form_id',
57		- 'number' => - 1,
	57	+ 'number' => -1,
58	58	'chosen' => true,
59	59	);
60		- echo Give()->html->forms_dropdown( $args );
	60	+ echo Give()->html->forms_dropdown($args);
61	61	?>
62	62	</span>
63	63
64		- <input type="submit" id="recount-stats-submit" value="<?php esc_attr_e( 'Submit', 'give' ); ?>" class="button-secondary"/>
	64	+ <input type="submit" id="recount-stats-submit" value="<?php esc_attr_e('Submit', 'give'); ?>" class="button-secondary"/>
65	65
66	66	<br/>
67	67
68	68	<span class="give-recount-stats-descriptions">
69		- <span id="recount-stats"><?php esc_html_e( 'Recalculates the overall donation income amount.', 'give' ); ?></span>
70		- <span id="recount-form"><?php esc_html_e( 'Recalculates the donation and income stats for a specific form.', 'give' ); ?></span>
71		- <span id="recount-all"><?php esc_html_e( 'Recalculates the earnings and sales stats for all forms.', 'give' ); ?></span>
72		- <span id="recount-customer-stats"><?php esc_html_e( 'Recalculates the lifetime value and donation counts for all donors.', 'give' ); ?></span>
	69	+ <span id="recount-stats"><?php esc_html_e('Recalculates the overall donation income amount.', 'give'); ?></span>
	70	+ <span id="recount-form"><?php esc_html_e('Recalculates the donation and income stats for a specific form.', 'give'); ?></span>
	71	+ <span id="recount-all"><?php esc_html_e('Recalculates the earnings and sales stats for all forms.', 'give'); ?></span>
	72	+ <span id="recount-customer-stats"><?php esc_html_e('Recalculates the lifetime value and donation counts for all donors.', 'give'); ?></span>
73	73	<?php
74	74	/**
75	75	* Fires in the recount stats description area.
		@@ -78,10 +78,10 @@ discard block
		block discarded – undo
78	78	*
79	79	* @since 1.5
80	80	*/
81		- do_action( 'give_recount_tool_descriptions' );
	81	+ do_action('give_recount_tool_descriptions');
82	82	?>
83		- <span id="delete-test-transactions"><?php _e( '<strong>Deletes</strong> all TEST donations, donors, and related log entries.', 'give' ); ?></span>
84		- <span id="reset-stats"><?php _e( '<strong>Deletes</strong> ALL donations, donors, and related log entries regardless of test or live mode.', 'give' ); ?></span>
	83	+ <span id="delete-test-transactions"><?php _e('<strong>Deletes</strong> all TEST donations, donors, and related log entries.', 'give'); ?></span>
	84	+ <span id="reset-stats"><?php _e('<strong>Deletes</strong> ALL donations, donors, and related log entries regardless of test or live mode.', 'give'); ?></span>
85	85	</span>
86	86
87	87	<span class="spinner"></span>
		@@ -95,7 +95,7 @@ discard block
		block discarded – undo
95	95	*
96	96	* @since 1.5
97	97	*/
98		- do_action( 'give_tools_recount_forms' );
	98	+ do_action('give_tools_recount_forms');
99	99	?>
100	100	</div><!-- .inside -->
101	101	</div><!-- .postbox -->
		@@ -106,4 +106,4 @@ discard block
		block discarded – undo
106	106	*
107	107	* @since 1.5
108	108	*/
109		-do_action( 'give_tools_recount_stats_after' );
	109	+do_action('give_tools_recount_stats_after');

WordImpress / Give

Pull Request — master (#1972)

Status

Category

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +4 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +143 added lines, -143 removed lines patch added patch discarded remove patch

Spacing +107 added lines, -108 removed lines patch added patch discarded remove patch

Spacing +62 added lines, -62 removed lines patch added patch discarded remove patch

Spacing +56 added lines, -56 removed lines patch added patch discarded remove patch

Spacing +27 added lines, -27 removed lines patch added patch discarded remove patch

Spacing +248 added lines, -249 removed lines patch added patch discarded remove patch