WordImpress / Give

includes/process-purchase.php

Doc Comments +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  *
  * @access      private
  * @since       1.0
- * @return      void
+ * @return      false|null
  */
 function give_process_purchase_form() {
 
@@ -326,7 +326,7 @@ 
  *
  * @since  1.0.1
  *
- * @param $payment_mode
+ * @param string $payment_mode
  *
  * @return mixed|void
  */

Spacing +234 added lines, -234 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,27 +25,27 @@ 
  */
 function give_process_purchase_form() {
 
-	do_action( 'give_pre_process_purchase' );
+	do_action('give_pre_process_purchase');
 
 	// Validate the form $_POST data
 	$valid_data = give_purchase_form_validate_fields();
 
 	// Allow themes and plugins to hook to errors
-	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_purchase_form_user( $valid_data );
+	$user = give_get_purchase_form_user($valid_data);
 
-	if ( false === $valid_data || give_get_errors() || ! $user ) {
-		if ( $is_ajax ) {
-			do_action( 'give_ajax_checkout_errors' );
+	if (false === $valid_data || give_get_errors() || ! $user) {
+		if ($is_ajax) {
+			do_action('give_ajax_checkout_errors');
 			give_die();
 		} else {
 			return false;
@@ -53,17 +53,17 @@ 
 	}
 
 	//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();
 		}
@@ -78,18 +78,18 @@ 
 		'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_sanitize_amount( give_format_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_sanitize_amount(give_format_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 purchase information
 	$purchase_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']
@@ -99,37 +99,37 @@ 
 	$valid_data['user'] = $user;
 
 	// Allow themes and plugins to hook before the gateway
-	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 ( ! $purchase_data['price'] ) {
+	if ( ! $purchase_data['price']) {
 		// Revert to manual
 		$purchase_data['gateway'] = 'manual';
 		$_POST['give-gateway']    = 'manual';
 	}
 
 	// Allow the purchase data to be modified before it is sent to the gateway
-	$purchase_data = apply_filters( 'give_purchase_data_before_gateway', $purchase_data, $valid_data );
+	$purchase_data = apply_filters('give_purchase_data_before_gateway', $purchase_data, $valid_data);
 
 	// Setup the data we're storing in the purchase session
 	$session_data = $purchase_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 purchase, and for other plugins needing purchase 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( $purchase_data['gateway'], $purchase_data );
+	give_send_to_gateway($purchase_data['gateway'], $purchase_data);
 	give_die();
 
 }
 
-add_action( 'give_purchase', 'give_process_purchase_form' );
-add_action( 'wp_ajax_give_process_checkout', 'give_process_purchase_form' );
-add_action( 'wp_ajax_nopriv_give_process_checkout', 'give_process_purchase_form' );
+add_action('give_purchase', 'give_process_purchase_form');
+add_action('wp_ajax_give_process_checkout', 'give_process_purchase_form');
+add_action('wp_ajax_nopriv_give_process_checkout', 'give_process_purchase_form');
 
 /**
  * Process the checkout login form
@@ -140,32 +140,32 @@ 
  */
 function give_process_form_login() {
 
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	$user_data = give_purchase_form_validate_user_login();
 
-	if ( give_get_errors() || $user_data['user_id'] < 1 ) {
-		if ( $is_ajax ) {
-			do_action( 'give_ajax_checkout_errors' );
+	if (give_get_errors() || $user_data['user_id'] < 1) {
+		if ($is_ajax) {
+			do_action('give_ajax_checkout_errors');
 			give_die();
 		} 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) {
 		echo 'success';
 		give_die();
 	} else {
-		wp_redirect( $_SERVER['HTTP_REFERER'] );
+		wp_redirect($_SERVER['HTTP_REFERER']);
 	}
 }
 
-add_action( 'wp_ajax_give_process_checkout_login', 'give_process_form_login' );
-add_action( 'wp_ajax_nopriv_give_process_checkout_login', 'give_process_form_login' );
+add_action('wp_ajax_give_process_checkout_login', 'give_process_form_login');
+add_action('wp_ajax_nopriv_give_process_checkout_login', 'give_process_form_login');
 
 /**
  * Purchase Form Validate Fields
@@ -177,45 +177,45 @@ 
 function give_purchase_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_purchase_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
+		'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_purchase_form_validate_cc()    // Credit card info
 	);
 
 	//Validate Honeypot First
-	if ( ! empty( $_POST['give-honeypot'] ) ) {
-		give_set_error( 'invalid_honeypot', __( 'Honeypot field detected. Go away bad bot!', 'give' ) );
+	if ( ! empty($_POST['give-honeypot'])) {
+		give_set_error('invalid_honeypot', __('Honeypot field detected. Go away bad bot!', 'give'));
 	}
 
 	// Validate agree to terms
-	$terms_option = get_post_meta( $form_id, '_give_terms_option', true );
-	if ( isset( $terms_option ) && $terms_option === 'yes' ) {
+	$terms_option = get_post_meta($form_id, '_give_terms_option', true);
+	if (isset($terms_option) && $terms_option === 'yes') {
 		give_purchase_form_validate_agree_to_terms();
 	}
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		// Collect logged in user data
 		$valid_data['logged_in_user'] = give_purchase_form_validate_logged_in_user();
-	} else if ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-register' ) {
+	} else if (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_purchase_form_validate_new_user();
 		// Check if login validation is needed
-	} else if ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-login' ) {
+	} else if (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
@@ -240,41 +240,41 @@ 
  */
 function give_purchase_form_validate_gateway() {
 
-	$form_id = isset( $_REQUEST['give-form-id'] ) ? $_REQUEST['give-form-id'] : 0;
-	$amount  = isset( $_REQUEST['give-amount'] ) ? give_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_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'));
 
 		} //Check for a minimum custom amount
-		elseif ( ! give_verify_minimum_price() ) {
+		elseif ( ! give_verify_minimum_price()) {
 
 			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 ) ) )
+					__('This form has a minimum donation amount of %s.', 'give'),
+					give_currency_filter(give_format_amount(give_get_form_minimum_price($form_id)))
 				)
 			);
 
 		} //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'));
 
 		}
 
@@ -293,23 +293,23 @@ 
  */
 function give_verify_minimum_price() {
 
-	$amount          = give_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'] : 0;
-	$variable_prices = give_has_variable_prices( $form_id );
+	$amount          = give_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'] : 0;
+	$variable_prices = give_has_variable_prices($form_id);
 
-	if ( $variable_prices && ! empty( $price_id ) ) {
+	if ($variable_prices && ! empty($price_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;
 		}
 	}
 
-	$minimum = give_get_form_minimum_price( $form_id );
+	$minimum = give_get_form_minimum_price($form_id);
 
-	if ( $minimum > $amount ) {
+	if ($minimum > $amount) {
 		return false;
 	}
 
@@ -325,9 +325,9 @@ 
  */
 function give_purchase_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 of use.', 'give' ) ) );
+		give_set_error('agree_to_terms', apply_filters('give_agree_to_terms_text', __('You must agree to the terms of use.', 'give')));
 	}
 }
 
@@ -341,47 +341,47 @@ 
  *
  * @return      array
  */
-function give_purchase_form_required_fields( $form_id ) {
+function give_purchase_form_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.', 'give' )
+			'error_message' => __('Please enter billing state / province.', 'give')
 		);
 	}
 
-	return apply_filters( 'give_purchase_form_required_fields', $required_fields, $form_id );
+	return apply_filters('give_purchase_form_required_fields', $required_fields, $form_id);
 
 }
 
@@ -394,16 +394,16 @@ 
  *
  * @return mixed|void
  */
-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);
 
 }
 
@@ -417,43 +417,43 @@ 
 function give_purchase_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_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-			if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-				give_set_error( $value['error_id'], $value['error_message'] );
+		foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+			if (in_array($value, give_purchase_form_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', __( 'Invalid email', 'give' ) );
+			if ( ! is_email($valid_user_data['user_email'])) {
+				give_set_error('email_invalid', __('Invalid email', 'give'));
 			}
 
 		} else {
 			// Set invalid user error
-			give_set_error( 'invalid_user', __( 'The user information is invalid.', 'give' ) );
+			give_set_error('invalid_user', __('The user information is invalid.', 'give'));
 		}
 	}
 
@@ -471,90 +471,90 @@ 
 function give_purchase_form_validate_new_user() {
 
 	$registering_new_user = 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 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' => isset( $_POST['give_first'] ) ? sanitize_text_field( $_POST['give_first'] ) : '',
+		'user_first' => isset($_POST['give_first']) ? sanitize_text_field($_POST['give_first']) : '',
 		// Get last name
-		'user_last'  => isset( $_POST['give_last'] ) ? sanitize_text_field( $_POST['give_last'] ) : '',
+		'user_last'  => isset($_POST['give_last']) ? sanitize_text_field($_POST['give_last']) : '',
 	);
 
 	// Check the new user's credentials against existing ones
-	$user_login   = isset( $_POST['give_user_login'] ) ? trim( $_POST['give_user_login'] ) : false;
-	$user_email   = isset( $_POST['give_email'] ) ? trim( $_POST['give_email'] ) : false;
-	$user_pass    = isset( $_POST['give_user_pass'] ) ? trim( $_POST['give_user_pass'] ) : false;
-	$pass_confirm = isset( $_POST['give_user_pass_confirm'] ) ? trim( $_POST['give_user_pass_confirm'] ) : false;
+	$user_login   = isset($_POST['give_user_login']) ? trim($_POST['give_user_login']) : false;
+	$user_email   = isset($_POST['give_email']) ? trim($_POST['give_email']) : false;
+	$user_pass    = isset($_POST['give_user_pass']) ? trim($_POST['give_user_pass']) : false;
+	$pass_confirm = isset($_POST['give_user_pass_confirm']) ? trim($_POST['give_user_pass_confirm']) : false;
 
 	// Loop through required fields and show error messages
-	foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_purchase_form_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 ( $user_login && strlen( $user_login ) > 0 ) {
+	if ($user_login && strlen($user_login) > 0) {
 		$registering_new_user = true;
 
 		// We have an user name, check if it already exists
-		if ( username_exists( $user_login ) ) {
+		if (username_exists($user_login)) {
 			// Username already registered
-			give_set_error( 'username_unavailable', __( 'Username already taken.', 'give' ) );
+			give_set_error('username_unavailable', __('Username already taken.', 'give'));
 			// Check if it's valid
-		} else if ( ! give_validate_username( $user_login ) ) {
+		} else if ( ! give_validate_username($user_login)) {
 			// 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'));
 			} else {
-				give_set_error( 'username_invalid', __( 'Invalid username.', 'give' ) );
+				give_set_error('username_invalid', __('Invalid username.', 'give'));
 			}
 		} else {
 			// All the checks have run and it's good to go
 			$valid_user_data['user_login'] = $user_login;
 		}
-	} elseif ( give_logged_in_only( $form_id ) ) {
-		give_set_error( 'registration_required', esc_html__( 'You must register or login to complete your donation.', 'give' ) );
+	} elseif (give_logged_in_only($form_id)) {
+		give_set_error('registration_required', esc_html__('You must register or login to complete your donation.', 'give'));
 	}
 
 	// Check if we have an email to verify
-	if ( $user_email && strlen( $user_email ) > 0 ) {
+	if ($user_email && strlen($user_email) > 0) {
 		// Validate email
-		if ( ! is_email( $user_email ) ) {
-			give_set_error( 'email_invalid', __( 'Sorry, that email is invalid.', 'give' ) );
+		if ( ! is_email($user_email)) {
+			give_set_error('email_invalid', __('Sorry, that email is invalid.', 'give'));
 			// Check if email exists
-		} else if ( email_exists( $user_email ) && $registering_new_user ) {
-			give_set_error( 'email_used', __( 'Sorry, that email already active for another user.', 'give' ) );
+		} else if (email_exists($user_email) && $registering_new_user) {
+			give_set_error('email_used', __('Sorry, that email already active for another user.', 'give'));
 		} else {
 			// All the checks have run and it's good to go
 			$valid_user_data['user_email'] = $user_email;
 		}
 	} else {
 		// No email
-		give_set_error( 'email_empty', __( 'Enter an email.', 'give' ) );
+		give_set_error('email_empty', __('Enter an email.', 'give'));
 	}
 
 	// Check password
-	if ( $user_pass && $pass_confirm ) {
+	if ($user_pass && $pass_confirm) {
 		// Verify confirmation matches
-		if ( $user_pass != $pass_confirm ) {
+		if ($user_pass != $pass_confirm) {
 			// Passwords do not match
-			give_set_error( 'password_mismatch', __( 'Passwords don\'t match.', 'give' ) );
+			give_set_error('password_mismatch', __('Passwords don\'t match.', 'give'));
 		} else {
 			// All is good to go
 			$valid_user_data['user_pass'] = $user_pass;
 		}
 	} else {
 		// Password or confirmation missing
-		if ( ! $user_pass && $registering_new_user ) {
+		if ( ! $user_pass && $registering_new_user) {
 			// The password is invalid
-			give_set_error( 'password_empty', __( 'Enter a password.', 'give' ) );
-		} else if ( ! $pass_confirm && $registering_new_user ) {
+			give_set_error('password_empty', __('Enter a password.', 'give'));
+		} else if ( ! $pass_confirm && $registering_new_user) {
 			// Confirmation password is invalid
-			give_set_error( 'confirmation_empty', __( 'Enter the password confirmation.', 'give' ) );
+			give_set_error('confirmation_empty', __('Enter the password confirmation.', 'give'));
 		}
 	}
 
@@ -573,36 +573,36 @@ 
 	// 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 login or register to complete your donation.', 'give' ) );
+	if ( ! isset($_POST['give_user_login']) || $_POST['give_user_login'] == '') {
+		give_set_error('must_log_in', __('You must login or register 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
@@ -619,11 +619,11 @@ 
 			}
 		} 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'));
 	}
 
 	return $valid_user_data;
@@ -638,7 +638,7 @@ 
  */
 function give_purchase_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(
@@ -647,32 +647,32 @@ 
 	);
 
 	// 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 into to donate.', 'give' ) );
+	if (give_logged_in_only($form_id)) {
+		give_set_error('logged_in_only', __('You must be logged into 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;
 		}
 	} 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_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+			give_set_error($value['error_id'], $value['error_message']);
 		}
 	}
 
@@ -688,42 +688,42 @@ 
  * @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);
 
 	// Allow themes and plugins to hook
-	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;
@@ -738,27 +738,27 @@ 
  * @since   1.0
  * @return  array
  */
-function give_get_purchase_form_user( $valid_data = array() ) {
+function give_get_purchase_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;
-	} else if ( is_user_logged_in() ) {
+	} else if (is_user_logged_in()) {
 		// Set the valid user as the logged in collected data
 		$user = $valid_data['logged_in_user'];
-	} else if ( $valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true ) {
+	} else if ($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
-		} else if ( $valid_data['need_user_login'] === true && ! $is_ajax ) {
+		} else if ($valid_data['need_user_login'] === true && ! $is_ajax) {
 
 			/*
 			 * The login form is now processed in the give_process_purchase_login() function.
@@ -773,48 +773,48 @@ 
 			// 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;
 	} // Country will always be set if address fields are present
 
-	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 purchases
-		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
@@ -833,16 +833,16 @@ 
 	$card_data = give_get_purchase_cc_info();
 
 	// Validate the card zip
-	if ( ! empty( $card_data['card_zip'] ) ) {
-		if ( ! give_purchase_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_purchase_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
@@ -858,17 +858,17 @@ 
  */
 function give_get_purchase_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;
@@ -884,14 +884,14 @@ 
  *
  * @return bool|mixed|void
  */
-function give_purchase_form_validate_cc_zip( $zip = 0, $country_code = '' ) {
+function give_purchase_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}",
@@ -1051,9 +1051,9 @@ 
 		"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);
 }
\ No newline at end of file

includes/user-functions.php

Doc Comments +1 added lines, -1 removed lines

@@ -270,7 +270,7 @@
  * @access      public
  * @since       1.0
  *
- * @param       $username string - the username to validate
+ * @param       string $username string - the username to validate
  *
  * @return      bool
  */

Spacing +97 added lines, -97 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -30,36 +30,36 @@ 
  *
  * @return bool|object List of all user purchases
  */
-function give_get_users_purchases( $user = 0, $number = 20, $pagination = false, $status = 'complete' ) {
+function give_get_users_purchases($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;
 
-	if ( $pagination ) {
-		if ( get_query_var( 'paged' ) ) {
-			$paged = get_query_var( 'paged' );
-		} else if ( get_query_var( 'page' ) ) {
-			$paged = get_query_var( 'page' );
+	if ($pagination) {
+		if (get_query_var('paged')) {
+			$paged = get_query_var('paged');
+		} else if (get_query_var('page')) {
+			$paged = get_query_var('page');
 		} else {
 			$paged = 1;
 		}
 	}
 
-	$args = apply_filters( 'give_get_users_purchases_args', array(
+	$args = apply_filters('give_get_users_purchases_args', array(
 		'user'    => $user,
 		'number'  => $number,
 		'status'  => $status,
 		'orderby' => 'date'
-	) );
+	));
 
-	if ( $pagination ) {
+	if ($pagination) {
 
 		$args['page'] = $paged;
 
@@ -69,20 +69,20 @@ 
 
 	}
 
-	$by_user_id = is_numeric( $user ) ? true : false;
-	$customer   = new Give_Customer( $user, $by_user_id );
+	$by_user_id = is_numeric($user) ? true : false;
+	$customer   = new Give_Customer($user, $by_user_id);
 
-	if ( ! empty( $customer->payment_ids ) ) {
+	if ( ! empty($customer->payment_ids)) {
 
-		unset( $args['user'] );
-		$args['post__in'] = array_map( 'absint', explode( ',', $customer->payment_ids ) );
+		unset($args['user']);
+		$args['post__in'] = array_map('absint', explode(',', $customer->payment_ids));
 
 	}
 
-	$purchases = give_get_payments( apply_filters( 'give_get_users_purchases_args', $args ) );
+	$purchases = give_get_payments(apply_filters('give_get_users_purchases_args', $args));
 
 	// No purchases
-	if ( ! $purchases ) {
+	if ( ! $purchases) {
 		return false;
 	}
 
@@ -101,65 +101,65 @@ 
  *
  * @return bool|object List of unique forms purchased 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;
 
-	$customer = new Give_Customer( $user, $by_user_id );
+	$customer = new Give_Customer($user, $by_user_id);
 
-	if ( empty( $customer->payment_ids ) ) {
+	if (empty($customer->payment_ids)) {
 		return false;
 	}
 
 	// Get all the items purchased
-	$payment_ids    = array_reverse( explode( ',', $customer->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(',', $customer->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 purchased on this order
 	$completed_donations_ids = array();
-	foreach ( $donation_data as $purchase_meta ) {
+	foreach ($donation_data as $purchase_meta) {
 		$completed_donations_ids[] = isset($purchase_meta['form_id']) ? $purchase_meta['form_id'] : '';
 	}
 
-	if ( empty( $completed_donations_ids ) ) {
+	if (empty($completed_donations_ids)) {
 		return false;
 	}
 
 	// Only include each product purchased 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));
 }
 
 
@@ -175,12 +175,12 @@ 
  *
  * @return      bool - true if has purchased, false other wise.
  */
-function give_has_purchases( $user_id = null ) {
-	if ( empty( $user_id ) ) {
+function give_has_purchases($user_id = null) {
+	if (empty($user_id)) {
 		$user_id = get_current_user_id();
 	}
 
-	if ( give_get_users_purchases( $user_id, 1 ) ) {
+	if (give_get_users_purchases($user_id, 1)) {
 		return true; // User has at least one purchase
 	}
 
@@ -200,32 +200,32 @@ 
  *
  * @return      array
  */
-function give_get_purchase_stats_by_user( $user = '' ) {
+function give_get_purchase_stats_by_user($user = '') {
 
-	if ( is_email( $user ) ) {
+	if (is_email($user)) {
 
 		$field = 'email';
 
-	} elseif ( is_numeric( $user ) ) {
+	} elseif (is_numeric($user)) {
 
 		$field = 'user_id';
 
 	}
 
 	$stats    = array();
-	$customer = Give()->customers->get_customer_by( $field, $user );
+	$customer = Give()->customers->get_customer_by($field, $user);
 
-	if ( $customer ) {
+	if ($customer) {
 
-		$customer = new Give_Customer( $customer->id );
+		$customer = new Give_Customer($customer->id);
 
-		$stats['purchases']   = absint( $customer->purchase_count );
-		$stats['total_spent'] = give_sanitize_amount( $customer->purchase_value );
+		$stats['purchases']   = absint($customer->purchase_count);
+		$stats['total_spent'] = give_sanitize_amount($customer->purchase_value);
 
 	}
 
 
-	return (array) apply_filters( 'give_purchase_stats_by_user', $stats, $user );
+	return (array) apply_filters('give_purchase_stats_by_user', $stats, $user);
 }
 
 
@@ -241,22 +241,22 @@ 
  *
  * @return      int - the total number of purchases
  */
-function give_count_purchases_of_customer( $user = null ) {
+function give_count_purchases_of_customer($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_purchase_stats_by_user( $user ) : false;
+	$stats = ! empty($user) ? give_get_purchase_stats_by_user($user) : false;
 
-	return isset( $stats['purchases'] ) ? $stats['purchases'] : 0;
+	return isset($stats['purchases']) ? $stats['purchases'] : 0;
 }
 
 /**
@@ -269,9 +269,9 @@ 
  *
  * @return      float - the total amount the user has spent
  */
-function give_purchase_total_of_user( $user = null ) {
+function give_purchase_total_of_user($user = null) {
 
-	$stats = give_get_purchase_stats_by_user( $user );
+	$stats = give_get_purchase_stats_by_user($user);
 
 	return $stats['total_spent'];
 }
@@ -287,11 +287,11 @@ 
  *
  * @return      bool
  */
-function give_validate_username( $username ) {
-	$sanitized = sanitize_user( $username, false );
-	$valid     = ( $sanitized == $username );
+function give_validate_username($username) {
+	$sanitized = sanitize_user($username, false);
+	$valid     = ($sanitized == $username);
 
-	return (bool) apply_filters( 'give_validate_username', $valid, $username );
+	return (bool) apply_filters('give_validate_username', $valid, $username);
 }
 
 
@@ -308,32 +308,32 @@ 
  *
  * @return      void
  */
-function give_add_past_purchases_to_new_user( $user_id ) {
+function give_add_past_purchases_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( 's' => $email ) );
+	$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;
 			} // This payment already associated with an account
 
-			$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;
 			$meta['user_info']       = $meta['user_info'];
 
 			// 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_purchases_to_new_user' );
+add_action('user_register', 'give_add_past_purchases_to_new_user');
 
 
 /**
@@ -355,34 +355,34 @@ 
  * @since         1.0
  * @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'] = '';
 	}
 
@@ -402,42 +402,42 @@ 
  *
  * @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);
 
 	/* translators: %s: site name */
-	$message  = sprintf( esc_attr__( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
+	$message  = sprintf(esc_attr__('New user registration on your site %s:'), $blogname)."\r\n\r\n";
 	/* translators: %s: user login */
-	$message .= sprintf( esc_attr__( 'Username: %s' ), $user_data['user_login'] ) . "\r\n\r\n";
+	$message .= sprintf(esc_attr__('Username: %s'), $user_data['user_login'])."\r\n\r\n";
 	/* translators: %s: user email */
-	$message .= sprintf( esc_attr__( 'E-mail: %s' ), $user_data['user_email'] ) . "\r\n";
+	$message .= sprintf(esc_attr__('E-mail: %s'), $user_data['user_email'])."\r\n";
 
 	@wp_mail(
-		get_option( 'admin_email' ),
+		get_option('admin_email'),
 		sprintf(
 			/* translators: %s: site name */
-			esc_attr__( '[%s] New User Registration' ),
+			esc_attr__('[%s] New User Registration'),
 			$blogname
 		),
 		$message
 	);
 
 	/* translators: %s: user login */
-	$message  = sprintf( esc_attr__( 'Username: %s' ), $user_data['user_login'] ) . "\r\n";
+	$message  = sprintf(esc_attr__('Username: %s'), $user_data['user_login'])."\r\n";
 	/* translators: %s: paswword */
-	$message .= sprintf( esc_attr__( 'Password: %s' ), esc_attr__( '[Password entered during donation]', 'give' ) ) . "\r\n";
+	$message .= sprintf(esc_attr__('Password: %s'), esc_attr__('[Password entered during donation]', 'give'))."\r\n";
 
-	$message .= '<a href="' . wp_login_url() . '"> ' . esc_attr__( 'Click Here to Login', 'give' ) . ' &raquo;</a>' . "\r\n";
+	$message .= '<a href="'.wp_login_url().'"> '.esc_attr__('Click Here to Login', 'give').' &raquo;</a>'."\r\n";
 
 	wp_mail(
 		$user_data['user_email'],
 		sprintf(
 			/* translators: %s: site name */
-			esc_attr__( '[%s] Your username and password' ),
+			esc_attr__('[%s] Your username and password'),
 			$blogname
 		),
 		$message
@@ -445,4 +445,4 @@ 
 
 }
 
-add_action( 'give_insert_user', 'give_new_user_notification', 10, 2 );
+add_action('give_insert_user', 'give_new_user_notification', 10, 2);

includes/actions.php

Spacing +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,12 +23,12 @@ 
  * @return void
  */
 function give_get_actions() {
-	if ( isset( $_GET['give_action'] ) ) {
-		do_action( 'give_' . $_GET['give_action'], $_GET );
+	if (isset($_GET['give_action'])) {
+		do_action('give_'.$_GET['give_action'], $_GET);
 	}
 }
 
-add_action( 'init', 'give_get_actions' );
+add_action('init', 'give_get_actions');
 
 /**
  * Hooks Give actions, when present in the $_POST superglobal. Every give_action
@@ -39,9 +39,9 @@ 
  * @return void
  */
 function give_post_actions() {
-	if ( isset( $_POST['give_action'] ) ) {
-		do_action( 'give_' . $_POST['give_action'], $_POST );
+	if (isset($_POST['give_action'])) {
+		do_action('give_'.$_POST['give_action'], $_POST);
 	}
 }
 
-add_action( 'init', 'give_post_actions' );
\ No newline at end of file
+add_action('init', 'give_post_actions');
\ No newline at end of file

includes/admin/admin-actions.php

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -22,13 +22,13 @@ 
  * @return void
  */
 function give_process_actions() {
-	if ( isset( $_POST['give-action'] ) ) {
-		do_action( 'give_' . $_POST['give-action'], $_POST );
+	if (isset($_POST['give-action'])) {
+		do_action('give_'.$_POST['give-action'], $_POST);
 	}
 
-	if ( isset( $_GET['give-action'] ) ) {
-		do_action( 'give_' . $_GET['give-action'], $_GET );
+	if (isset($_GET['give-action'])) {
+		do_action('give_'.$_GET['give-action'], $_GET);
 	}
 }
 
-add_action( 'admin_init', 'give_process_actions' );
\ No newline at end of file
+add_action('admin_init', 'give_process_actions');
\ No newline at end of file

includes/admin/admin-pages.php

Spacing +65 added lines, -65 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -34,31 +34,31 @@ 
 	//	$give_campaigns_page = add_submenu_page( 'edit.php?post_type=give_forms', $give_campaigns->labels->menu_name, $give_campaigns->labels->add_new, 'edit_' . $give_campaigns->capability_type . 's', 'post-new.php?post_type=give_campaigns', null );
 
 	//Payments
-	$give_payment       = get_post_type_object( 'give_payment' );
-	$give_payments_page = add_submenu_page( 'edit.php?post_type=give_forms', $give_payment->labels->name, $give_payment->labels->menu_name, 'edit_give_payments', 'give-payment-history', 'give_payment_history_page' );
+	$give_payment       = get_post_type_object('give_payment');
+	$give_payments_page = add_submenu_page('edit.php?post_type=give_forms', $give_payment->labels->name, $give_payment->labels->menu_name, 'edit_give_payments', 'give-payment-history', 'give_payment_history_page');
 
 	//Donors
-	$give_donors_page = add_submenu_page( 'edit.php?post_type=give_forms', __( 'Donors', 'give' ), __( 'Donors', 'give' ), 'view_give_reports', 'give-donors', 'give_customers_page' );
+	$give_donors_page = add_submenu_page('edit.php?post_type=give_forms', __('Donors', 'give'), __('Donors', 'give'), 'view_give_reports', 'give-donors', 'give_customers_page');
 
 	//Reports
-	$give_reports_page = add_submenu_page( 'edit.php?post_type=give_forms', __( 'Donation Reports', 'give' ), __( 'Reports', 'give' ), 'view_give_reports', 'give-reports', 'give_reports_page' );
+	$give_reports_page = add_submenu_page('edit.php?post_type=give_forms', __('Donation Reports', 'give'), __('Reports', 'give'), 'view_give_reports', 'give-reports', 'give_reports_page');
 
 	//Settings
-	$give_settings_page = add_submenu_page( 'edit.php?post_type=give_forms', __( 'Give Settings', 'give' ), __( 'Settings', 'give' ), 'manage_give_settings', 'give-settings', array(
+	$give_settings_page = add_submenu_page('edit.php?post_type=give_forms', __('Give Settings', 'give'), __('Settings', 'give'), 'manage_give_settings', 'give-settings', array(
 		Give()->give_settings,
 		'admin_page_display'
-	) );
+	));
 
 	//Add-ons
-	$give_add_ons_page = add_submenu_page( 'edit.php?post_type=give_forms', __( 'Give Add-ons', 'give' ), __( 'Add-ons', 'give' ), 'install_plugins', 'give-addons', 'give_add_ons_page' );
+	$give_add_ons_page = add_submenu_page('edit.php?post_type=give_forms', __('Give Add-ons', 'give'), __('Add-ons', 'give'), 'install_plugins', 'give-addons', 'give_add_ons_page');
 
 	//Upgrades
-	$give_upgrades_screen = add_submenu_page( null, __( 'Give Upgrades', 'give' ), __( 'Give Upgrades', 'give' ), 'manage_give_settings', 'give-upgrades', 'give_upgrades_screen' );
+	$give_upgrades_screen = add_submenu_page(null, __('Give Upgrades', 'give'), __('Give Upgrades', 'give'), 'manage_give_settings', 'give-upgrades', 'give_upgrades_screen');
 
 
 }
 
-add_action( 'admin_menu', 'give_add_options_links', 10 );
+add_action('admin_menu', 'give_add_options_links', 10);
 
 /**
  *  Determines whether the current admin page is a Give admin page.
@@ -73,224 +73,224 @@ 
  *
  * @return bool True if Give admin page.
  */
-function give_is_admin_page( $passed_page = '', $passed_view = '' ) {
+function give_is_admin_page($passed_page = '', $passed_view = '') {
 
 	global $pagenow, $typenow;
 
 	$found     = false;
-	$post_type = isset( $_GET['post_type'] ) ? strtolower( $_GET['post_type'] ) : false;
-	$action    = isset( $_GET['action'] ) ? strtolower( $_GET['action'] ) : false;
-	$taxonomy  = isset( $_GET['taxonomy'] ) ? strtolower( $_GET['taxonomy'] ) : false;
-	$page      = isset( $_GET['page'] ) ? strtolower( $_GET['page'] ) : false;
-	$view      = isset( $_GET['view'] ) ? strtolower( $_GET['view'] ) : false;
-	$tab       = isset( $_GET['tab'] ) ? strtolower( $_GET['tab'] ) : false;
+	$post_type = isset($_GET['post_type']) ? strtolower($_GET['post_type']) : false;
+	$action    = isset($_GET['action']) ? strtolower($_GET['action']) : false;
+	$taxonomy  = isset($_GET['taxonomy']) ? strtolower($_GET['taxonomy']) : false;
+	$page      = isset($_GET['page']) ? strtolower($_GET['page']) : false;
+	$view      = isset($_GET['view']) ? strtolower($_GET['view']) : false;
+	$tab       = isset($_GET['tab']) ? strtolower($_GET['tab']) : false;
 
-	switch ( $passed_page ) {
+	switch ($passed_page) {
 		case 'give_forms':
-			switch ( $passed_view ) {
+			switch ($passed_view) {
 				case 'list-table':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php') {
 						$found = true;
 					}
 					break;
 				case 'edit':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'post.php' ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'post.php') {
 						$found = true;
 					}
 					break;
 				case 'new':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'post-new.php' ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'post-new.php') {
 						$found = true;
 					}
 					break;
 				default:
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) || 'give_forms' === $post_type || ( 'post-new.php' == $pagenow && 'give_forms' === $post_type ) ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) || 'give_forms' === $post_type || ('post-new.php' == $pagenow && 'give_forms' === $post_type)) {
 						$found = true;
 					}
 					break;
 			}
 			break;
 		case 'categories':
-			switch ( $passed_view ) {
+			switch ($passed_view) {
 				case 'list-table':
 				case 'new':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit-tags.php' && 'edit' !== $action && 'give_forms_category' === $taxonomy ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit-tags.php' && 'edit' !== $action && 'give_forms_category' === $taxonomy) {
 						$found = true;
 					}
 					break;
 				case 'edit':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit-tags.php' && 'edit' === $action && 'give_forms_category' === $taxonomy ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit-tags.php' && 'edit' === $action && 'give_forms_category' === $taxonomy) {
 						$found = true;
 					}
 					break;
 				default:
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit-tags.php' && 'give_forms_category' === $taxonomy ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit-tags.php' && 'give_forms_category' === $taxonomy) {
 						$found = true;
 					}
 					break;
 			}
 			break;
 		case 'tags':
-			switch ( $passed_view ) {
+			switch ($passed_view) {
 				case 'list-table':
 				case 'new':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit-tags.php' && 'edit' !== $action && 'give_forms_tag' === $taxonomy ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit-tags.php' && 'edit' !== $action && 'give_forms_tag' === $taxonomy) {
 						$found = true;
 					}
 					break;
 				case 'edit':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit-tags.php' && 'edit' === $action && 'give_forms_tag' === $taxonomy ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit-tags.php' && 'edit' === $action && 'give_forms_tag' === $taxonomy) {
 						$found = true;
 					}
 					break;
 				default:
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit-tags.php' && 'give_forms_tag' === $taxonomy ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit-tags.php' && 'give_forms_tag' === $taxonomy) {
 						$found = true;
 					}
 					break;
 			}
 			break;
 		case 'payments':
-			switch ( $passed_view ) {
+			switch ($passed_view) {
 				case 'list-table':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-payment-history' === $page && false === $view ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-payment-history' === $page && false === $view) {
 						$found = true;
 					}
 					break;
 				case 'edit':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-payment-history' === $page && 'view-order-details' === $view ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-payment-history' === $page && 'view-order-details' === $view) {
 						$found = true;
 					}
 					break;
 				default:
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-payment-history' === $page ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-payment-history' === $page) {
 						$found = true;
 					}
 					break;
 			}
 			break;
 		case 'reports':
-			switch ( $passed_view ) {
+			switch ($passed_view) {
 				// If you want to do something like enqueue a script on a particular report's duration, look at $_GET[ 'range' ]
 				case 'earnings':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-reports' === $page && ( 'earnings' === $view || '-1' === $view || false === $view ) ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-reports' === $page && ('earnings' === $view || '-1' === $view || false === $view)) {
 						$found = true;
 					}
 					break;
 				case 'donors':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-reports' === $page && 'customers' === $view ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-reports' === $page && 'customers' === $view) {
 						$found = true;
 					}
 					break;
 				case 'gateways':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-reports' === $page && 'gateways' === $view ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-reports' === $page && 'gateways' === $view) {
 						$found = true;
 					}
 					break;
 				case 'export':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-reports' === $page && 'export' === $view ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-reports' === $page && 'export' === $view) {
 						$found = true;
 					}
 					break;
 				case 'logs':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-reports' === $page && 'logs' === $view ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-reports' === $page && 'logs' === $view) {
 						$found = true;
 					}
 					break;
 				default:
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-reports' === $page ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-reports' === $page) {
 						$found = true;
 					}
 					break;
 			}
 			break;
 		case 'settings':
-			switch ( $passed_view ) {
+			switch ($passed_view) {
 				case 'general':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-settings' === $page && ( 'general' === $tab || false === $tab ) ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-settings' === $page && ('general' === $tab || false === $tab)) {
 						$found = true;
 					}
 					break;
 				case 'gateways':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-settings' === $page && 'gateways' === $tab ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-settings' === $page && 'gateways' === $tab) {
 						$found = true;
 					}
 					break;
 				case 'emails':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-settings' === $page && 'emails' === $tab ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-settings' === $page && 'emails' === $tab) {
 						$found = true;
 					}
 					break;
 				case 'display':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-settings' === $page && 'display' === $tab ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-settings' === $page && 'display' === $tab) {
 						$found = true;
 					}
 					break;
 				case 'licenses':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-settings' === $page && 'licenses' === $tab ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-settings' === $page && 'licenses' === $tab) {
 						$found = true;
 					}
 					break;
 				case 'api':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-settings' === $page && 'api' === $tab ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-settings' === $page && 'api' === $tab) {
 						$found = true;
 					}
 					break;
 				case 'advanced':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-settings' === $page && 'advanced' === $tab ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-settings' === $page && 'advanced' === $tab) {
 						$found = true;
 					}
 					break;
 				case 'system_info':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-settings' === $page && 'system_info' === $tab ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-settings' === $page && 'system_info' === $tab) {
 						$found = true;
 					}
 					break;
 				default:
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-settings' === $page ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-settings' === $page) {
 						$found = true;
 					}
 					break;
 			}
 			break;
 		case 'addons':
-			if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-addons' === $page ) {
+			if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-addons' === $page) {
 				$found = true;
 			}
 			break;
 		case 'donors':
-			switch ( $passed_view ) {
+			switch ($passed_view) {
 				case 'list-table':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-donors' === $page && false === $view ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-donors' === $page && false === $view) {
 						$found = true;
 					}
 					break;
 				case 'overview':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-donors' === $page && 'overview' === $view ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-donors' === $page && 'overview' === $view) {
 						$found = true;
 					}
 					break;
 				case 'notes':
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-donors' === $page && 'notes' === $view ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-donors' === $page && 'notes' === $view) {
 						$found = true;
 					}
 					break;
 				default:
-					if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-donors' === $page ) {
+					if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-donors' === $page) {
 						$found = true;
 					}
 					break;
 			}
 			break;
 		case 'reports':
-			if ( ( 'give_forms' == $typenow || 'give_forms' === $post_type ) && $pagenow == 'edit.php' && 'give-reports' === $page ) {
+			if (('give_forms' == $typenow || 'give_forms' === $post_type) && $pagenow == 'edit.php' && 'give-reports' === $page) {
 				$found = true;
 			}
 			break;
 		default:
 			global $give_payments_page, $give_settings_page, $give_reports_page, $give_system_info_page, $give_add_ons_page, $give_settings_export, $give_upgrades_screen, $give_customers_page;
 
-			$admin_pages = apply_filters( 'give_admin_pages', array(
+			$admin_pages = apply_filters('give_admin_pages', array(
 				$give_payments_page,
 				$give_settings_page,
 				$give_reports_page,
@@ -299,18 +299,18 @@ 
 				$give_upgrades_screen,
 				$give_settings_export,
 				$give_customers_page
-			) );
-			if ( 'give_forms' == $typenow || 'index.php' == $pagenow || 'post-new.php' == $pagenow || 'post.php' == $pagenow ) {
+			));
+			if ('give_forms' == $typenow || 'index.php' == $pagenow || 'post-new.php' == $pagenow || 'post.php' == $pagenow) {
 				$found = true;
-				if ( 'give-upgrades' === $page ) {
+				if ('give-upgrades' === $page) {
 					$found = false;
 				}
-			} elseif ( in_array( $pagenow, $admin_pages ) ) {
+			} elseif (in_array($pagenow, $admin_pages)) {
 				$found = true;
 			}
 			break;
 	}
 
-	return (bool) apply_filters( 'give_is_admin_page', $found, $page, $view, $passed_page, $passed_view );
+	return (bool) apply_filters('give_is_admin_page', $found, $page, $view, $passed_page, $passed_view);
 
 }
\ No newline at end of file

includes/admin/customers/customer-functions.php

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,7 +23,7 @@ 
  *
  * @return array        The altered list of views
  */
-function give_register_default_customer_views( $views ) {
+function give_register_default_customer_views($views) {
 
 	$default_views = array(
 		'overview' => 'give_customers_view',
@@ -31,11 +31,11 @@ 
 		'notes'    => 'give_customer_notes_view'
 	);
 
-	return array_merge( $views, $default_views );
+	return array_merge($views, $default_views);
 
 }
 
-add_filter( 'give_customer_views', 'give_register_default_customer_views', 1, 1 );
+add_filter('give_customer_views', 'give_register_default_customer_views', 1, 1);
 
 /**
  * Register a tab for the single customer view
@@ -46,17 +46,17 @@ 
  *
  * @return array       The altered list of tabs
  */
-function give_register_default_customer_tabs( $tabs ) {
+function give_register_default_customer_tabs($tabs) {
 
 	$default_tabs = array(
-		'overview' => array( 'dashicon' => 'dashicons-admin-users', 'title' => __( 'Donor Profile', 'give' ) ),
-		'notes'    => array( 'dashicon' => 'dashicons-admin-comments', 'title' => __( 'Donor Notes', 'give' ) )
+		'overview' => array('dashicon' => 'dashicons-admin-users', 'title' => __('Donor Profile', 'give')),
+		'notes'    => array('dashicon' => 'dashicons-admin-comments', 'title' => __('Donor Notes', 'give'))
 	);
 
-	return array_merge( $tabs, $default_tabs );
+	return array_merge($tabs, $default_tabs);
 }
 
-add_filter( 'give_customer_tabs', 'give_register_default_customer_tabs', 1, 1 );
+add_filter('give_customer_tabs', 'give_register_default_customer_tabs', 1, 1);
 
 /**
  * Register the Delete icon as late as possible so it's at the bottom
@@ -67,11 +67,11 @@ 
  *
  * @return array       The altered list of tabs, with 'delete' at the bottom
  */
-function give_register_delete_customer_tab( $tabs ) {
+function give_register_delete_customer_tab($tabs) {
 
-	$tabs['delete'] = array( 'dashicon' => 'dashicons-trash', 'title' => __( 'Delete Donor', 'give' ) );
+	$tabs['delete'] = array('dashicon' => 'dashicons-trash', 'title' => __('Delete Donor', 'give'));
 
 	return $tabs;
 }
 
-add_filter( 'give_customer_tabs', 'give_register_delete_customer_tab', PHP_INT_MAX, 1 );
+add_filter('give_customer_tabs', 'give_register_delete_customer_tab', PHP_INT_MAX, 1);

includes/admin/payments/payments-history.php

Spacing +21 added lines, -21 removed lines

@@ -10,7 +10,7 @@ 
 */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Payment History Page
@@ -24,19 +24,19 @@ 
 function give_payment_history_page() {
 	global $give_options;
 
-	$give_payment = get_post_type_object( 'give_payment' );
+	$give_payment = get_post_type_object('give_payment');
 
-	if ( isset( $_GET['view'] ) && 'view-order-details' == $_GET['view'] ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/payments/view-order-details.php';
+	if (isset($_GET['view']) && 'view-order-details' == $_GET['view']) {
+		require_once GIVE_PLUGIN_DIR.'includes/admin/payments/view-order-details.php';
 	} else {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/payments/class-payments-table.php';
+		require_once GIVE_PLUGIN_DIR.'includes/admin/payments/class-payments-table.php';
 		$payments_table = new Give_Payment_History_Table();
 		$payments_table->prepare_items();
 	?>
 	<div class="wrap">
 		<h2><?php echo $give_payment->labels->menu_name ?></h2>
-		<?php do_action( 'give_payments_page_top' ); ?>
-		<form id="give-payments-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history' ); ?>">
+		<?php do_action('give_payments_page_top'); ?>
+		<form id="give-payments-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history'); ?>">
 			<input type="hidden" name="post_type" value="give_forms" />
 			<input type="hidden" name="page" value="give-payment-history" />
 
@@ -46,7 +46,7 @@ 
 			
 			<?php $payments_table->display() ?>
 		</form>
-		<?php do_action( 'give_payments_page_bottom' ); ?>
+		<?php do_action('give_payments_page_bottom'); ?>
 	</div>
 <?php
 	}
@@ -61,21 +61,21 @@ 
  * @param $title
  * @return string
  */
-function give_view_order_details_title( $admin_title, $title ) {
+function give_view_order_details_title($admin_title, $title) {
 
-	if ( 'give_forms_page_give-payment-history' != get_current_screen()->base )
+	if ('give_forms_page_give-payment-history' != get_current_screen()->base)
 		return $admin_title;
 
-	if( ! isset( $_GET['give-action'] ) )
+	if ( ! isset($_GET['give-action']))
 		return $admin_title;
 
-	switch( $_GET['give-action'] ) :
+	switch ($_GET['give-action']) :
 
 		case 'view-order-details' :
-			$title = __( 'View Donation Details', 'give' ) . ' - ' . $admin_title;
+			$title = __('View Donation Details', 'give').' - '.$admin_title;
 			break;
 		case 'edit-payment' :
-			$title = __( 'Edit Payment', 'give' ) . ' - ' . $admin_title;
+			$title = __('Edit Payment', 'give').' - '.$admin_title;
 			break;
 		default:
 			$title = $admin_title;
@@ -84,7 +84,7 @@ 
 
 	return $title;
 }
-add_filter( 'admin_title', 'give_view_order_details_title', 10, 2 );
+add_filter('admin_title', 'give_view_order_details_title', 10, 2);
 
 /**
  * Intercept default Edit post links for Give payments and rewrite them to the View Order Details screen
@@ -96,17 +96,17 @@ 
  * @param $context
  * @return string
  */
-function give_override_edit_post_for_payment_link( $url, $post_id = 0, $context ) {
+function give_override_edit_post_for_payment_link($url, $post_id = 0, $context) {
 
-	$post = get_post( $post_id );
-	if( ! $post )
+	$post = get_post($post_id);
+	if ( ! $post)
 		return $url;
 
-	if( 'give_payment' != $post->post_type )
+	if ('give_payment' != $post->post_type)
 		return $url;
 
-	$url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id=' . $post_id );
+	$url = admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id='.$post_id);
 
 	return $url;
 }
-add_filter( 'get_edit_post_link', 'give_override_edit_post_for_payment_link', 10, 3 );
+add_filter('get_edit_post_link', 'give_override_edit_post_for_payment_link', 10, 3);

Braces +15 added lines, -9 removed lines

@@ -10,7 +10,9 @@ 
 */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Payment History Page
@@ -63,11 +65,13 @@ 
  */
 function give_view_order_details_title( $admin_title, $title ) {
 
-	if ( 'give_forms_page_give-payment-history' != get_current_screen()->base )
-		return $admin_title;
+	if ( 'give_forms_page_give-payment-history' != get_current_screen()->base ) {
+			return $admin_title;
+	}
 
-	if( ! isset( $_GET['give-action'] ) )
-		return $admin_title;
+	if( ! isset( $_GET['give-action'] ) ) {
+			return $admin_title;
+	}
 
 	switch( $_GET['give-action'] ) :
 
@@ -99,11 +103,13 @@ 
 function give_override_edit_post_for_payment_link( $url, $post_id = 0, $context ) {
 
 	$post = get_post( $post_id );
-	if( ! $post )
-		return $url;
+	if( ! $post ) {
+			return $url;
+	}
 
-	if( 'give_payment' != $post->post_type )
-		return $url;
+	if( 'give_payment' != $post->post_type ) {
+			return $url;
+	}
 
 	$url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id=' . $post_id );
 

includes/admin/payments/view-order-details.php

Braces +3 added lines, -1 removed lines

@@ -440,8 +440,10 @@
 												echo give_get_payment_note_html( $note, $payment_id );
 
 											endforeach;
-										else :
+										else {
+											:
 											$no_notes_display = '';
+										}
 										endif;
 										echo '<p class="give-no-payment-notes"' . $no_notes_display . '>' . __( 'No payment notes', 'give' ) . '</p>';
 										?>

Spacing +128 added lines, -128 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,27 +20,27 @@ 
  * @since 1.0
  * @return void
  */
-if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-	wp_die( __( 'Donation ID not supplied. Please try again', 'give' ), __( 'Error', 'give' ) );
+if ( ! isset($_GET['id']) || ! is_numeric($_GET['id'])) {
+	wp_die(__('Donation ID not supplied. Please try again', 'give'), __('Error', 'give'));
 }
 
 // Setup the variables
-$payment_id = absint( $_GET['id'] );
-$payment    = new Give_Payment( $payment_id );
+$payment_id = absint($_GET['id']);
+$payment    = new Give_Payment($payment_id);
 
 // Sanity check... fail if purchase ID is invalid
 $payment_exists = $payment->ID;
-if ( empty( $payment_exists ) ) {
-	wp_die( __( 'The specified ID does not belong to a payment. Please try again', 'give' ), __( 'Error', 'give' ) );
+if (empty($payment_exists)) {
+	wp_die(__('The specified ID does not belong to a payment. Please try again', 'give'), __('Error', 'give'));
 }
 
 $number         = $payment->number;
 $payment_meta   = $payment->get_meta();
-$transaction_id = esc_attr( $payment->transaction_id );
+$transaction_id = esc_attr($payment->transaction_id);
 $user_id        = $payment->user_id;
 $customer_id    = $payment->customer_id;
-$payment_date   = strtotime( $payment->date );
-$user_info      = give_get_payment_meta_user_info( $payment_id );
+$payment_date   = strtotime($payment->date);
+$user_info      = give_get_payment_meta_user_info($payment_id);
 $address        = $payment->address;
 $gateway        = $payment->gateway;
 $currency_code  = $payment->currency;
@@ -52,76 +52,76 @@ 
 	<h1 id="transaction-details-heading"><?php
 		printf(
 		/* translators: %s: payment number */
-			__( 'Payment %s', 'give' ),
+			__('Payment %s', 'give'),
 			$number
 		);
-		if ( $payment_mode == 'test' ) {
-			echo '<span id="test-payment-label" class="give-item-label give-item-label-orange" data-tooltip="' . __( 'This payment was made in Test Mode', 'give' ) . '" data-tooltip-my-position="center left" data-tooltip-target-position="center right">' . __( 'Test Payment', 'give' ) . '</span>';
+		if ($payment_mode == 'test') {
+			echo '<span id="test-payment-label" class="give-item-label give-item-label-orange" data-tooltip="'.__('This payment was made in Test Mode', 'give').'" data-tooltip-my-position="center left" data-tooltip-target-position="center right">'.__('Test Payment', 'give').'</span>';
 		}
 		?></h1>
 
-	<?php do_action( 'give_view_order_details_before', $payment_id ); ?>
+	<?php do_action('give_view_order_details_before', $payment_id); ?>
 	<form id="give-edit-order-form" method="post">
-		<?php do_action( 'give_view_order_details_form_top', $payment_id ); ?>
+		<?php do_action('give_view_order_details_form_top', $payment_id); ?>
 		<div id="poststuff">
 			<div id="give-dashboard-widgets-wrap">
 				<div id="post-body" class="metabox-holder columns-2">
 					<div id="postbox-container-1" class="postbox-container">
 						<div id="side-sortables" class="meta-box-sortables ui-sortable">
 
-							<?php do_action( 'give_view_order_details_sidebar_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_sidebar_before', $payment_id); ?>
 
 
 							<div id="give-order-update" class="postbox give-order-data">
 
 								<h3 class="hndle">
-									<span><?php _e( 'Update Payment', 'give' ); ?></span>
+									<span><?php _e('Update Payment', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
 									<div class="give-admin-box">
 
-										<?php do_action( 'give_view_order_details_totals_before', $payment_id ); ?>
+										<?php do_action('give_view_order_details_totals_before', $payment_id); ?>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Status:', 'give' ); ?></span>&nbsp;
+												<span class="label"><?php _e('Status:', 'give'); ?></span>&nbsp;
 												<select name="give-payment-status" class="medium-text">
-													<?php foreach ( give_get_payment_statuses() as $key => $status ) : ?>
-														<option value="<?php echo esc_attr( $key ); ?>"<?php selected( $payment->status, $key, true ); ?>><?php echo esc_html( $status ); ?></option>
+													<?php foreach (give_get_payment_statuses() as $key => $status) : ?>
+														<option value="<?php echo esc_attr($key); ?>"<?php selected($payment->status, $key, true); ?>><?php echo esc_html($status); ?></option>
 													<?php endforeach; ?>
 												</select>
-												<span class="give-donation-status status-<?php echo sanitize_title( $payment->status ); ?>"><span class="give-donation-status-icon"></span></span>
+												<span class="give-donation-status status-<?php echo sanitize_title($payment->status); ?>"><span class="give-donation-status-icon"></span></span>
 											</p>
 										</div>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Date:', 'give' ); ?></span>&nbsp;
-												<input type="text" name="give-payment-date" value="<?php echo esc_attr( date( 'm/d/Y', $payment_date ) ); ?>" class="medium-text give_datepicker"/>
+												<span class="label"><?php _e('Date:', 'give'); ?></span>&nbsp;
+												<input type="text" name="give-payment-date" value="<?php echo esc_attr(date('m/d/Y', $payment_date)); ?>" class="medium-text give_datepicker"/>
 											</p>
 										</div>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Time:', 'give' ); ?></span>&nbsp;
-												<input type="number" step="1" max="24" name="give-payment-time-hour" value="<?php echo esc_attr( date_i18n( 'H', $payment_date ) ); ?>" class="small-text give-payment-time-hour"/>&nbsp;:&nbsp;
-												<input type="number" step="1" max="59" name="give-payment-time-min" value="<?php echo esc_attr( date( 'i', $payment_date ) ); ?>" class="small-text give-payment-time-min"/>
+												<span class="label"><?php _e('Time:', 'give'); ?></span>&nbsp;
+												<input type="number" step="1" max="24" name="give-payment-time-hour" value="<?php echo esc_attr(date_i18n('H', $payment_date)); ?>" class="small-text give-payment-time-hour"/>&nbsp;:&nbsp;
+												<input type="number" step="1" max="59" name="give-payment-time-min" value="<?php echo esc_attr(date('i', $payment_date)); ?>" class="small-text give-payment-time-min"/>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_update_inner', $payment_id ); ?>
+										<?php do_action('give_view_order_details_update_inner', $payment_id); ?>
 
 										<?php
 										//@TODO: Fees
-										$fees = give_get_payment_fees( $payment_id );
-										if ( ! empty( $fees ) ) : ?>
+										$fees = give_get_payment_fees($payment_id);
+										if ( ! empty($fees)) : ?>
 											<div class="give-order-fees give-admin-box-inside">
-												<p class="strong"><?php _e( 'Fees', 'give' ); ?>:</p>
+												<p class="strong"><?php _e('Fees', 'give'); ?>:</p>
 												<ul class="give-payment-fees">
-													<?php foreach ( $fees as $fee ) : ?>
+													<?php foreach ($fees as $fee) : ?>
 														<li>
-															<span class="fee-label"><?php echo $fee['label'] . ':</span> ' . '<span class="fee-amount" data-fee="' . esc_attr( $fee['amount'] ) . '">' . give_currency_filter( $fee['amount'], $currency_code ); ?></span>
+															<span class="fee-label"><?php echo $fee['label'].':</span> '.'<span class="fee-amount" data-fee="'.esc_attr($fee['amount']).'">'.give_currency_filter($fee['amount'], $currency_code); ?></span>
 														</li>
 													<?php endforeach; ?>
 												</ul>
@@ -131,12 +131,12 @@ 
 
 										<div class="give-order-payment give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Total Donation', 'give' ); ?>:</span>&nbsp;
-												<?php echo give_currency_symbol( $payment->currency ); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr( give_format_decimal( give_get_payment_amount( $payment_id ) ) ); ?>"/>
+												<span class="label"><?php _e('Total Donation', 'give'); ?>:</span>&nbsp;
+												<?php echo give_currency_symbol($payment->currency); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr(give_format_decimal(give_get_payment_amount($payment_id))); ?>"/>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_totals_after', $payment_id ); ?>
+										<?php do_action('give_view_order_details_totals_after', $payment_id); ?>
 
 									</div>
 									<!-- /.give-admin-box -->
@@ -145,20 +145,20 @@ 
 								<!-- /.inside -->
 
 								<div class="give-order-update-box give-admin-box">
-									<?php do_action( 'give_view_order_details_update_before', $payment_id ); ?>
+									<?php do_action('give_view_order_details_update_before', $payment_id); ?>
 									<div id="major-publishing-actions">
 										<div id="publishing-action">
-											<input type="submit" class="button button-primary right" value="<?php esc_attr_e( 'Save Payment', 'give' ); ?>"/>
-											<?php if ( give_is_payment_complete( $payment_id ) ) : ?>
-												<a href="<?php echo esc_url( add_query_arg( array(
+											<input type="submit" class="button button-primary right" value="<?php esc_attr_e('Save Payment', 'give'); ?>"/>
+											<?php if (give_is_payment_complete($payment_id)) : ?>
+												<a href="<?php echo esc_url(add_query_arg(array(
 													'give-action' => 'email_links',
 													'purchase_id' => $payment_id
-												) ) ); ?>" id="give-resend-receipt" class="button-secondary right"><?php _e( 'Resend Receipt', 'give' ); ?></a>
+												))); ?>" id="give-resend-receipt" class="button-secondary right"><?php _e('Resend Receipt', 'give'); ?></a>
 											<?php endif; ?>
 										</div>
 										<div class="clear"></div>
 									</div>
-									<?php do_action( 'give_view_order_details_update_after', $payment_id ); ?>
+									<?php do_action('give_view_order_details_update_after', $payment_id); ?>
 								</div>
 								<!-- /.give-order-update-box -->
 
@@ -168,55 +168,55 @@ 
 							<div id="give-order-details" class="postbox give-order-data">
 
 								<h3 class="hndle">
-									<span><?php _e( 'Payment Meta', 'give' ); ?></span>
+									<span><?php _e('Payment Meta', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
 									<div class="give-admin-box">
 
-										<?php do_action( 'give_view_order_details_payment_meta_before', $payment_id ); ?>
+										<?php do_action('give_view_order_details_payment_meta_before', $payment_id); ?>
 
 										<?php
-										$gateway = give_get_payment_gateway( $payment_id );
-										if ( $gateway ) : ?>
+										$gateway = give_get_payment_gateway($payment_id);
+										if ($gateway) : ?>
 											<div class="give-order-gateway give-admin-box-inside">
 												<p>
-													<span class="label"><?php _e( 'Gateway:', 'give' ); ?></span>&nbsp;
-													<?php echo give_get_gateway_admin_label( $gateway ); ?>
+													<span class="label"><?php _e('Gateway:', 'give'); ?></span>&nbsp;
+													<?php echo give_get_gateway_admin_label($gateway); ?>
 												</p>
 											</div>
 										<?php endif; ?>
 
 										<div class="give-order-payment-key give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Key:', 'give' ); ?></span>&nbsp;
-												<span><?php echo give_get_payment_key( $payment_id ); ?></span>
+												<span class="label"><?php _e('Key:', 'give'); ?></span>&nbsp;
+												<span><?php echo give_get_payment_key($payment_id); ?></span>
 											</p>
 										</div>
 
 										<div class="give-order-ip give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'IP:', 'give' ); ?></span>&nbsp;
-												<span><?php echo esc_html( give_get_payment_user_ip( $payment_id ) ); ?></span>
+												<span class="label"><?php _e('IP:', 'give'); ?></span>&nbsp;
+												<span><?php echo esc_html(give_get_payment_user_ip($payment_id)); ?></span>
 											</p>
 										</div>
 
-										<?php if ( $transaction_id ) : ?>
+										<?php if ($transaction_id) : ?>
 											<div class="give-order-tx-id give-admin-box-inside">
 												<p>
-													<span class="label"><?php _e( 'Transaction ID:', 'give' ); ?></span>&nbsp;
-													<span><?php echo apply_filters( 'give_payment_details_transaction_id-' . $gateway, $transaction_id, $payment_id ); ?></span>
+													<span class="label"><?php _e('Transaction ID:', 'give'); ?></span>&nbsp;
+													<span><?php echo apply_filters('give_payment_details_transaction_id-'.$gateway, $transaction_id, $payment_id); ?></span>
 												</p>
 											</div>
 										<?php endif; ?>
 
 										<div class="give-admin-box-inside">
-											<p><?php $purchase_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( esc_attr( give_get_payment_user_email( $payment_id ) ) ) ); ?>
-												<a href="<?php echo $purchase_url; ?>"><?php _e( 'View all donations for this donor', 'give' ); ?> &raquo;</a>
+											<p><?php $purchase_url = admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.urlencode(esc_attr(give_get_payment_user_email($payment_id)))); ?>
+												<a href="<?php echo $purchase_url; ?>"><?php _e('View all donations for this donor', 'give'); ?> &raquo;</a>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_payment_meta_after', $payment_id ); ?>
+										<?php do_action('give_view_order_details_payment_meta_after', $payment_id); ?>
 
 									</div>
 									<!-- /.column-container -->
@@ -227,7 +227,7 @@ 
 							</div>
 							<!-- /#give-order-data -->
 
-							<?php do_action( 'give_view_order_details_sidebar_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_sidebar_after', $payment_id); ?>
 
 						</div>
 						<!-- /#side-sortables -->
@@ -238,12 +238,12 @@ 
 
 						<div id="normal-sortables" class="meta-box-sortables ui-sortable">
 
-							<?php do_action( 'give_view_order_details_main_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_main_before', $payment_id); ?>
 
 							<?php $column_count = 'columns-3'; ?>
 							<div id="give-donation-overview" class="postbox <?php echo $column_count; ?>">
 								<h3 class="hndle">
-									<span><?php _e( 'Donation Information', 'give' ); ?></span>
+									<span><?php _e('Donation Information', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
@@ -251,31 +251,31 @@ 
 									<table style="width:100%;text-align:left;">
 										<thead>
 										<tr>
-											<?php do_action( 'give_donation_details_thead_before', $payment_id ); ?>
-											<th><?php _e( 'Donation Form ID', 'give' ) ?></th>
-											<th><?php _e( 'Donation Form Title', 'give' ) ?></th>
-											<th><?php _e( 'Donation Level', 'give' ) ?></th>
-											<th><?php _e( 'Donation Date', 'give' ) ?></th>
-											<th><?php _e( 'Total Donation', 'give' ) ?></th>
-											<?php do_action( 'give_donation_details_thead_after', $payment_id ); ?>
+											<?php do_action('give_donation_details_thead_before', $payment_id); ?>
+											<th><?php _e('Donation Form ID', 'give') ?></th>
+											<th><?php _e('Donation Form Title', 'give') ?></th>
+											<th><?php _e('Donation Level', 'give') ?></th>
+											<th><?php _e('Donation Date', 'give') ?></th>
+											<th><?php _e('Total Donation', 'give') ?></th>
+											<?php do_action('give_donation_details_thead_after', $payment_id); ?>
 										</tr>
 										</thead>
 										<tr>
-											<?php do_action( 'give_donation_details_tbody_before', $payment_id ); ?>
+											<?php do_action('give_donation_details_tbody_before', $payment_id); ?>
 											<td>
 												<?php echo $payment_meta['form_id']; ?>
 											</td>
 											<td>
-												<?php give_get_form_dropdown( array(
+												<?php give_get_form_dropdown(array(
 													'id'       => $payment_meta['form_id'],
 													'selected' => $payment_meta['form_id'],
 													'chosen'   => true
-												), true ); ?>
+												), true); ?>
 											</td>
 											<td>
 												<?php
-												if ( empty( give_has_variable_prices( $payment_meta['form_id'] ) ) ) {
-													echo __( 'n/a', 'give' );
+												if (empty(give_has_variable_prices($payment_meta['form_id']))) {
+													echo __('n/a', 'give');
 												} else {
 													// Variable price dropdown options.
 													$variable_price_dropdown_option = array(
@@ -287,20 +287,20 @@ 
 													);
 
 													// Render variable prices select tag html.
-													give_get_form_variable_price_dropdown( $variable_price_dropdown_option, true );
+													give_get_form_variable_price_dropdown($variable_price_dropdown_option, true);
 												}
 												?>
 											</td>
 											<td>
 												<?php
 												//Transaction Date
-												$date_format = get_option( 'date_format' );
-												echo date_i18n( $date_format, strtotime( $payment_date ) );
+												$date_format = get_option('date_format');
+												echo date_i18n($date_format, strtotime($payment_date));
 												?>
 											</td>
 											<td>
-												<?php echo esc_html( give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) ) ); ?></td>
-											<?php do_action( 'give_donation_details_tbody_after', $payment_id ); ?>
+												<?php echo esc_html(give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)))); ?></td>
+											<?php do_action('give_donation_details_tbody_after', $payment_id); ?>
 
 										</tr>
 									</table>
@@ -312,64 +312,64 @@ 
 							</div>
 							<!-- /#give-donation-overview -->
 
-							<?php do_action( 'give_view_order_details_files_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_files_after', $payment_id); ?>
 
-							<?php do_action( 'give_view_order_details_billing_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_billing_before', $payment_id); ?>
 
 
 							<div id="give-customer-details" class="postbox">
 								<h3 class="hndle">
-									<span><?php _e( 'Donor Details', 'give' ); ?></span>
+									<span><?php _e('Donor Details', 'give'); ?></span>
 								</h3>
 
 								<div class="inside give-clearfix">
 
-									<?php $customer = new Give_Customer( $customer_id ); ?>
+									<?php $customer = new Give_Customer($customer_id); ?>
 
 									<div class="column-container customer-info">
 										<div class="column">
-											<?php echo Give()->html->donor_dropdown( array(
+											<?php echo Give()->html->donor_dropdown(array(
 												'selected' => $customer->id,
 												'name'     => 'customer-id'
-											) ); ?>
+											)); ?>
 										</div>
 										<div class="column">
 											<input type="hidden" name="give-current-customer" value="<?php echo $customer->id; ?>"/>
 										</div>
 										<div class="column">
-											<?php if ( ! empty( $customer->id ) ) : ?>
-												<?php $customer_url = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ); ?>
-												<a href="<?php echo $customer_url; ?>" title="<?php _e( 'View Donor Details', 'give' ); ?>"><?php _e( 'View Donor Details', 'give' ); ?></a>
+											<?php if ( ! empty($customer->id)) : ?>
+												<?php $customer_url = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id); ?>
+												<a href="<?php echo $customer_url; ?>" title="<?php _e('View Donor Details', 'give'); ?>"><?php _e('View Donor Details', 'give'); ?></a>
 												&nbsp;|&nbsp;
 											<?php endif; ?>
-											<a href="#new" class="give-payment-new-customer" title="<?php _e( 'New Donor', 'give' ); ?>"><?php _e( 'New Donor', 'give' ); ?></a>
+											<a href="#new" class="give-payment-new-customer" title="<?php _e('New Donor', 'give'); ?>"><?php _e('New Donor', 'give'); ?></a>
 										</div>
 									</div>
 
 									<div class="column-container new-customer" style="display: none">
 										<div class="column">
-											<label for="give-new-customer-name"><?php _e( 'Name:', 'give' ); ?></label>&nbsp;
+											<label for="give-new-customer-name"><?php _e('Name:', 'give'); ?></label>&nbsp;
 											<input id="give-new-customer-name" type="text" name="give-new-customer-name" value="" class="medium-text"/>
 										</div>
 										<div class="column">
-											<label for="give-new-customer-email"><?php _e( 'Email:', 'give' ); ?></label>&nbsp;
+											<label for="give-new-customer-email"><?php _e('Email:', 'give'); ?></label>&nbsp;
 											<input id="give-new-customer-email" type="email" name="give-new-customer-email" value="" class="medium-text"/>
 										</div>
 										<div class="column">
 											<input type="hidden" id="give-new-customer" name="give-new-customer" value="0"/>
-											<a href="#cancel" class="give-payment-new-customer-cancel give-delete"><?php _e( 'Cancel', 'give' ); ?></a>
+											<a href="#cancel" class="give-payment-new-customer-cancel give-delete"><?php _e('Cancel', 'give'); ?></a>
 										</div>
 										<div class="column">
 											<small>
-												<em>*<?php _e( 'Click "Save Payment" to create new donor', 'give' ); ?></em>
+												<em>*<?php _e('Click "Save Payment" to create new donor', 'give'); ?></em>
 											</small>
 										</div>
 									</div>
 
 									<?php
 									// The give_payment_personal_details_list hook is left here for backwards compatibility
-									do_action( 'give_payment_personal_details_list', $payment_meta, $user_info );
-									do_action( 'give_payment_view_details', $payment_id );
+									do_action('give_payment_personal_details_list', $payment_meta, $user_info);
+									do_action('give_payment_view_details', $payment_id);
 									?>
 
 								</div>
@@ -380,7 +380,7 @@ 
 
 							<div id="give-billing-details" class="postbox">
 								<h3 class="hndle">
-									<span><?php _e( 'Billing Address', 'give' ); ?></span>
+									<span><?php _e('Billing Address', 'give'); ?></span>
 								</h3>
 
 								<div class="inside give-clearfix">
@@ -391,62 +391,62 @@ 
 											<div class="data column-container">
 												<div class="column">
 													<div class="give-wrap-address-line1">
-														<label for="give-payment-address-line1" class="order-data-address"><?php _e( 'Street Address Line 1:', 'give' ); ?></label>
-														<input id="give-payment-address-line1" type="text" name="give-payment-address[0][line1]" value="<?php echo esc_attr( $address['line1'] ); ?>" class="medium-text"/>
+														<label for="give-payment-address-line1" class="order-data-address"><?php _e('Street Address Line 1:', 'give'); ?></label>
+														<input id="give-payment-address-line1" type="text" name="give-payment-address[0][line1]" value="<?php echo esc_attr($address['line1']); ?>" class="medium-text"/>
 													</div>
 
 													<div class="give-wrap-address-line2">
-														<label for="give-payment-address-line2" class="order-data-address-line"><?php _e( 'Street Address Line 2:', 'give' ); ?></label>
-														<input id="give-payment-address-line2" type="text" name="give-payment-address[0][line2]" value="<?php echo esc_attr( $address['line2'] ); ?>" class="medium-text"/>
+														<label for="give-payment-address-line2" class="order-data-address-line"><?php _e('Street Address Line 2:', 'give'); ?></label>
+														<input id="give-payment-address-line2" type="text" name="give-payment-address[0][line2]" value="<?php echo esc_attr($address['line2']); ?>" class="medium-text"/>
 													</div>
 
 												</div>
 												<div class="column">
 													<div class="give-wrap-address-city">
-														<label for="give-payment-address-city" class="order-data-address-line"><?php _e( 'City:', 'give' ); ?></label>
-														<input id="give-payment-address-city" type="text" name="give-payment-address[0][city]" value="<?php echo esc_attr( $address['city'] ); ?>" class="medium-text"/>
+														<label for="give-payment-address-city" class="order-data-address-line"><?php _e('City:', 'give'); ?></label>
+														<input id="give-payment-address-city" type="text" name="give-payment-address[0][city]" value="<?php echo esc_attr($address['city']); ?>" class="medium-text"/>
 
 													</div>
 
 													<div class="give-wrap-address-zip">
-														<label for="give-payment-address-zip" class="order-data-address-line"><?php _e( 'Zip / Postal Code:', 'give' ); ?></label>
-														<input id="give-payment-address-zip" type="text" name="give-payment-address[0][zip]" value="<?php echo esc_attr( $address['zip'] ); ?>" class="medium-text"/>
+														<label for="give-payment-address-zip" class="order-data-address-line"><?php _e('Zip / Postal Code:', 'give'); ?></label>
+														<input id="give-payment-address-zip" type="text" name="give-payment-address[0][zip]" value="<?php echo esc_attr($address['zip']); ?>" class="medium-text"/>
 
 													</div>
 												</div>
 												<div class="column">
 													<div id="give-order-address-country-wrap">
-														<label class="order-data-address-line"><?php _e( 'Country:', 'give' ); ?></label>
+														<label class="order-data-address-line"><?php _e('Country:', 'give'); ?></label>
 														<?php
-														echo Give()->html->select( array(
+														echo Give()->html->select(array(
 															'options'          => give_get_country_list(),
 															'name'             => 'give-payment-address[0][country]',
 															'selected'         => $address['country'],
 															'show_option_all'  => false,
 															'show_option_none' => false,
 															'chosen'           => true,
-															'placeholder'      => __( 'Select a country', 'give' )
-														) );
+															'placeholder'      => __('Select a country', 'give')
+														));
 														?>
 													</div>
 
 													<div id="give-order-address-state-wrap">
-														<label for="give-payment-address-state" class="order-data-address-line"><?php _e( 'State / Province:', 'give' ); ?></label>
+														<label for="give-payment-address-state" class="order-data-address-line"><?php _e('State / Province:', 'give'); ?></label>
 														<?php
-														$states = give_get_states( $address['country'] );
-														if ( ! empty( $states ) ) {
-															echo Give()->html->select( array(
+														$states = give_get_states($address['country']);
+														if ( ! empty($states)) {
+															echo Give()->html->select(array(
 																'options'          => $states,
 																'name'             => 'give-payment-address[0][state]',
 																'selected'         => $address['state'],
 																'show_option_all'  => false,
 																'show_option_none' => false,
 																'chosen'           => true,
-																'placeholder'      => __( 'Select a state', 'give' )
-															) );
+																'placeholder'      => __('Select a state', 'give')
+															));
 														} else {
 															?>
-															<input id="give-payment-address-state" type="text" name="give-payment-address[0][state]" value="<?php echo esc_attr( $address['state'] ); ?>" class="medium-text"/>
+															<input id="give-payment-address-state" type="text" name="give-payment-address[0][state]" value="<?php echo esc_attr($address['state']); ?>" class="medium-text"/>
 															<?php
 														} ?>
 													</div>
@@ -456,38 +456,38 @@ 
 									</div>
 									<!-- /#give-order-address -->
 
-									<?php do_action( 'give_payment_billing_details', $payment_id ); ?>
+									<?php do_action('give_payment_billing_details', $payment_id); ?>
 
 								</div>
 								<!-- /.inside -->
 							</div>
 							<!-- /#give-billing-details -->
 
-							<?php do_action( 'give_view_order_details_billing_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_billing_after', $payment_id); ?>
 
 							<div id="give-payment-notes" class="postbox">
-								<h3 class="hndle"><span><?php _e( 'Payment Notes', 'give' ); ?></span></h3>
+								<h3 class="hndle"><span><?php _e('Payment Notes', 'give'); ?></span></h3>
 
 								<div class="inside">
 									<div id="give-payment-notes-inner">
 										<?php
-										$notes = give_get_payment_notes( $payment_id );
-										if ( ! empty( $notes ) ) :
+										$notes = give_get_payment_notes($payment_id);
+										if ( ! empty($notes)) :
 											$no_notes_display = ' style="display:none;"';
-											foreach ( $notes as $note ) :
+											foreach ($notes as $note) :
 
-												echo give_get_payment_note_html( $note, $payment_id );
+												echo give_get_payment_note_html($note, $payment_id);
 
 											endforeach;
 										else :
 											$no_notes_display = '';
 										endif;
-										echo '<p class="give-no-payment-notes"' . $no_notes_display . '>' . __( 'No payment notes', 'give' ) . '</p>'; ?>
+										echo '<p class="give-no-payment-notes"'.$no_notes_display.'>'.__('No payment notes', 'give').'</p>'; ?>
 									</div>
 									<textarea name="give-payment-note" id="give-payment-note" class="large-text"></textarea>
 
 									<div class="give-clearfix">
-										<button id="give-add-payment-note" class="button button-secondary button-small" data-payment-id="<?php echo absint( $payment_id ); ?>"><?php _e( 'Add Note', 'give' ); ?></button>
+										<button id="give-add-payment-note" class="button button-secondary button-small" data-payment-id="<?php echo absint($payment_id); ?>"><?php _e('Add Note', 'give'); ?></button>
 									</div>
 
 								</div>
@@ -495,7 +495,7 @@ 
 							</div>
 							<!-- /#give-payment-notes -->
 
-							<?php do_action( 'give_view_order_details_main_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_main_after', $payment_id); ?>
 						</div>
 						<!-- /#normal-sortables -->
 					</div>
@@ -506,10 +506,10 @@ 
 			<!-- #give-dashboard-widgets-wrap -->
 		</div>
 		<!-- /#post-stuff -->
-		<?php do_action( 'give_view_order_details_form_bottom', $payment_id ); ?>
-		<?php wp_nonce_field( 'give_update_payment_details_nonce' ); ?>
-		<input type="hidden" name="give_payment_id" value="<?php echo esc_attr( $payment_id ); ?>"/>
+		<?php do_action('give_view_order_details_form_bottom', $payment_id); ?>
+		<?php wp_nonce_field('give_update_payment_details_nonce'); ?>
+		<input type="hidden" name="give_payment_id" value="<?php echo esc_attr($payment_id); ?>"/>
 		<input type="hidden" name="give_action" value="update_payment_details"/>
 	</form>
-	<?php do_action( 'give_view_order_details_after', $payment_id ); ?>
+	<?php do_action('give_view_order_details_after', $payment_id); ?>
 </div><!-- /.wrap -->

includes/admin/reporting/class-donor-reports-table.php

Spacing +60 added lines, -60 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -62,11 +62,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => __( 'Donor', 'give' ),     // Singular name of the listed records
-			'plural'   => __( 'Donors', 'give' ),    // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => __('Donor', 'give'), // Singular name of the listed records
+			'plural'   => __('Donors', 'give'), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
 	}
 
@@ -83,7 +83,7 @@ 
 	 *
 	 * @return false
 	 */
-	public function search_box( $text, $input_id ) {
+	public function search_box($text, $input_id) {
 		return;
 	}
 
@@ -98,20 +98,20 @@ 
 	 *
 	 * @return void
 	 */
-	public function give_search_box( $text, $input_id ) {
-		$input_id = $input_id . '-search-input';
+	public function give_search_box($text, $input_id) {
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
 		}
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if ( ! empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
 		}
 		?>
 		<p class="search-box donor-search">
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-			<?php submit_button( $text, 'button', false, false, array( 'ID' => 'search-submit' ) ); ?>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?>
 		</p>
 	<?php
 	}
@@ -124,29 +124,29 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' == $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' == $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav give-clearfix <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav give-clearfix <?php echo esc_attr($which); ?>">
 
-			<h3 class="alignleft reports-earnings-title"><span><?php _e( 'Donors Report', 'give' ); ?></span></h3>
+			<h3 class="alignleft reports-earnings-title"><span><?php _e('Donors Report', 'give'); ?></span></h3>
 
 			<div class="alignright tablenav-right">
 				<div class="actions bulkactions">
 					<?php
-					if ( 'top' == $which ) {
-						$this->give_search_box( __( 'Search Donors', 'give' ), 'give-donors-report-search' );
+					if ('top' == $which) {
+						$this->give_search_box(__('Search Donors', 'give'), 'give-donors-report-search');
 					}
 
-					$this->bulk_actions( $which ); ?>
+					$this->bulk_actions($which); ?>
 
 				</div>
 				<?php
-				$this->extra_tablenav( $which );
-				$this->pagination( $which );
+				$this->extra_tablenav($which);
+				$this->pagination($which);
 				?>
 			</div>
 
@@ -168,25 +168,25 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 
 			case 'num_purchases' :
-				$value = '<a href="' .
-				         admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
-				         ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
+				$value = '<a href="'.
+				         admin_url('/edit.php?post_type=give_forms&page=give-payment-history&user='.urlencode($item['email'])
+				         ).'">'.esc_html($item['num_purchases']).'</a>';
 				break;
 
 			case 'amount_spent' :
-				$value = give_currency_filter( give_format_amount( $item[ $column_name ] ) );
+				$value = give_currency_filter(give_format_amount($item[$column_name]));
 				break;
 
 			default:
-				$value = isset( $item[ $column_name ] ) ? $item[ $column_name ] : null;
+				$value = isset($item[$column_name]) ? $item[$column_name] : null;
 				break;
 		}
 
-		return apply_filters( 'give_report_column_' . $column_name, $value, $item['id'] );
+		return apply_filters('give_report_column_'.$column_name, $value, $item['id']);
 	}
 
 	/**
@@ -198,14 +198,14 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'name'          => __( 'Name', 'give' ),
-			'id'            => __( 'ID', 'give' ),
-			'email'         => __( 'Email', 'give' ),
-			'num_purchases' => __( 'Purchases', 'give' ),
-			'amount_spent'  => __( 'Total Spent', 'give' )
+			'name'          => __('Name', 'give'),
+			'id'            => __('ID', 'give'),
+			'email'         => __('Email', 'give'),
+			'num_purchases' => __('Purchases', 'give'),
+			'amount_spent'  => __('Total Spent', 'give')
 		);
 
-		return apply_filters( 'give_report_donor_columns', $columns );
+		return apply_filters('give_report_donor_columns', $columns);
 
 	}
 
@@ -218,10 +218,10 @@ 
 	 */
 	public function get_sortable_columns() {
 		return array(
-			'id'            => array( 'id', true ),
-			'name'          => array( 'name', true ),
-			'num_purchases' => array( 'purchase_count', false ),
-			'amount_spent'  => array( 'purchase_value', false ),
+			'id'            => array('id', true),
+			'name'          => array('name', true),
+			'num_purchases' => array('purchase_count', false),
+			'amount_spent'  => array('purchase_value', false),
 		);
 	}
 
@@ -232,7 +232,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		// These aren't really bulk actions but this outputs the markup in the right place
 		give_report_views();
 	}
@@ -245,7 +245,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -256,7 +256,7 @@ 
 	 * @return mixed string If search is present, false otherwise
 	 */
 	public function get_search() {
-		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;
+		return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false;
 	}
 
 	/**
@@ -273,10 +273,10 @@ 
 
 		$data    = array();
 		$paged   = $this->get_paged();
-		$offset  = $this->per_page * ( $paged - 1 );
+		$offset  = $this->per_page * ($paged - 1);
 		$search  = $this->get_search();
-		$order   = isset( $_GET['order'] ) ? sanitize_text_field( $_GET['order'] ) : 'DESC';
-		$orderby = isset( $_GET['orderby'] ) ? sanitize_text_field( $_GET['orderby'] ) : 'id';
+		$order   = isset($_GET['order']) ? sanitize_text_field($_GET['order']) : 'DESC';
+		$orderby = isset($_GET['orderby']) ? sanitize_text_field($_GET['orderby']) : 'id';
 
 		$args = array(
 			'number'  => $this->per_page,
@@ -285,21 +285,21 @@ 
 			'orderby' => $orderby
 		);
 
-		if ( is_email( $search ) ) {
+		if (is_email($search)) {
 			$args['email'] = $search;
-		} elseif ( is_numeric( $search ) ) {
+		} elseif (is_numeric($search)) {
 			$args['id'] = $search;
 		}
 
-		$donors = Give()->customers->get_customers( $args );
+		$donors = Give()->customers->get_customers($args);
 
-		if ( $donors ) {
+		if ($donors) {
 
-			$this->count = count( $donors );
+			$this->count = count($donors);
 
-			foreach ( $donors as $donor ) {
+			foreach ($donors as $donor) {
 
-				$user_id = ! empty( $donor->user_id ) ? absint( $donor->user_id ) : 0;
+				$user_id = ! empty($donor->user_id) ? absint($donor->user_id) : 0;
 
 				$data[] = array(
 					'id'            => $donor->id,
@@ -332,16 +332,16 @@ 
 		$hidden   = array(); // No hidden columns
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$this->items = $this->reports_data();
 
 		$this->total = give_count_total_customers();
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $this->total,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $this->total / $this->per_page )
-		) );
+			'total_pages' => ceil($this->total / $this->per_page)
+		));
 	}
 }
\ No newline at end of file

Indentation +2 added lines, -2 removed lines

@@ -115,8 +115,8 @@
 
 			case 'num_purchases' :
 				$value = '<a href="' .
-				         admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
-				         ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
+						 admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
+						 ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
 				break;
 
 			case 'amount_spent' :