WordImpress / Give

includes/admin/class-addon-activation-banner.php

Spacing +22 added lines, -22 removed lines

@@ -8,7 +8,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,13 +25,13 @@ 
 	 *
 	 * @param $_banner_details
 	 */
-	function __construct( $_banner_details ) {
+	function __construct($_banner_details) {
 
 		$current_user = wp_get_current_user();
 
 		$this->banner_details = $_banner_details;
-		$this->test_mode      = ( $this->banner_details['testing'] == 'true' ) ? true : false;
-		$this->nag_meta_key   = 'give_addon_activation_ignore_' . sanitize_title( $this->banner_details['name'] );
+		$this->test_mode      = ($this->banner_details['testing'] == 'true') ? true : false;
+		$this->nag_meta_key   = 'give_addon_activation_ignore_'.sanitize_title($this->banner_details['name']);
 
 		//Get current user
 		$this->user_id = $current_user->ID;
@@ -51,13 +51,13 @@ 
 	public function init() {
 
 		//Testing?
-		if ( $this->test_mode ) {
-			delete_user_meta( $this->user_id, $this->nag_meta_key );
+		if ($this->test_mode) {
+			delete_user_meta($this->user_id, $this->nag_meta_key);
 		}
 
 		//Get the current page to add the notice to
-		add_action( 'current_screen', array( $this, 'give_addon_notice_ignore' ) );
-		add_action( 'admin_notices', array( $this, 'give_addon_activation_admin_notice' ) );
+		add_action('current_screen', array($this, 'give_addon_notice_ignore'));
+		add_action('admin_notices', array($this, 'give_addon_activation_admin_notice'));
 
 	}
 
@@ -71,12 +71,12 @@ 
 		$screen = get_current_screen();
 
 		//Make sure we're on the plugins page.
-		if ( $screen->parent_file !== 'plugins.php' ) {
+		if ($screen->parent_file !== 'plugins.php') {
 			return false;
 		}
 
 		// If the user hasn't already dismissed the alert, output activation banner.
-		if ( ! get_user_meta( $this->user_id, $this->nag_meta_key ) ) {
+		if ( ! get_user_meta($this->user_id, $this->nag_meta_key)) {
 
 			// Output inline styles here because there's no reason
 			// to enqueued them after the alert is dismissed.
@@ -158,43 +158,43 @@ 
 					<h3><?php
 						printf(
 						/* translators: %s: Add-on name */
-							esc_html__( "Thank you for installing Give's %s Add-on!", 'give' ),
-							'<span>' . $this->banner_details['name'] . '</span>'
+							esc_html__("Thank you for installing Give's %s Add-on!", 'give'),
+							'<span>'.$this->banner_details['name'].'</span>'
 						);
 						?></h3>
 
 					<a href="<?php
 					//The Dismiss Button.
-					$nag_admin_dismiss_url = 'plugins.php?' . $this->nag_meta_key . '=0';
-					echo admin_url( $nag_admin_dismiss_url ); ?>" class="dismiss"><span
+					$nag_admin_dismiss_url = 'plugins.php?'.$this->nag_meta_key.'=0';
+					echo admin_url($nag_admin_dismiss_url); ?>" class="dismiss"><span
 							class="dashicons dashicons-dismiss"></span></a>
 
 					<div class="alert-actions">
 
 						<?php //Point them to your settings page.
-						if ( isset( $this->banner_details['settings_url'] ) ) { ?>
+						if (isset($this->banner_details['settings_url'])) { ?>
 							<a href="<?php echo $this->banner_details['settings_url']; ?>">
-								<span class="dashicons dashicons-admin-settings"></span><?php esc_html_e( 'Go to Settings', 'give' ); ?></a>
+								<span class="dashicons dashicons-admin-settings"></span><?php esc_html_e('Go to Settings', 'give'); ?></a>
 						<?php } ?>
 
 						<?php
 						// Show them how to configure the Addon.
-						if ( isset( $this->banner_details['documentation_url'] ) ) { ?>
+						if (isset($this->banner_details['documentation_url'])) { ?>
 							<a href="<?php echo $this->banner_details['documentation_url'] ?>" target="_blank">
 								<span class="dashicons dashicons-media-text"></span><?php
 								printf(
 								/* translators: %s: Add-on name */
-									esc_html__( 'Documentation: %s Add-on', 'give' ),
+									esc_html__('Documentation: %s Add-on', 'give'),
 									$this->banner_details['name']
 								);
 								?></a>
 						<?php } ?>
 						<?php
 						//Let them signup for plugin updates
-						if ( isset( $this->banner_details['support_url'] ) ) { ?>
+						if (isset($this->banner_details['support_url'])) { ?>
 
 							<a href="<?php echo $this->banner_details['support_url'] ?>" target="_blank">
-								<span class="dashicons dashicons-sos"></span><?php esc_html_e( 'Get Support', 'give' ); ?>
+								<span class="dashicons dashicons-sos"></span><?php esc_html_e('Get Support', 'give'); ?>
 							</a>
 
 						<?php } ?>
@@ -221,13 +221,13 @@ 
 		 * If user clicks to ignore the notice, add that to their user meta the banner then checks whether this tag exists already or not.
 		 * See here: http://codex.wordpress.org/Function_Reference/add_user_meta
 		 */
-		if ( isset( $_GET[ $this->nag_meta_key ] ) && '0' == $_GET[ $this->nag_meta_key ] ) {
+		if (isset($_GET[$this->nag_meta_key]) && '0' == $_GET[$this->nag_meta_key]) {
 
 			//Get the global user
 			$current_user = wp_get_current_user();
 			$user_id = $current_user->ID;
 
-			add_user_meta( $user_id, $this->nag_meta_key, 'true', true );
+			add_user_meta($user_id, $this->nag_meta_key, 'true', true);
 		}
 	}
 

includes/process-purchase.php

Spacing +259 added lines, -259 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -30,7 +30,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_pre_process_donation' );
+	do_action('give_pre_process_donation');
 
 	// Validate the form $_POST data
 	$valid_data = give_purchase_form_validate_fields();
@@ -45,26 +45,26 @@ 
 	 * @param bool|array $valid_data Validate fields.
 	 * @param array      $_POST      Array of variables passed via the HTTP POST.
 	 */
-	do_action( 'give_checkout_error_checks', $valid_data, $_POST );
+	do_action('give_checkout_error_checks', $valid_data, $_POST);
 
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	// Process the login form
-	if ( isset( $_POST['give_login_submit'] ) ) {
+	if (isset($_POST['give_login_submit'])) {
 		give_process_form_login();
 	}
 
 	// Validate the user
-	$user = give_get_purchase_form_user( $valid_data );
+	$user = give_get_purchase_form_user($valid_data);
 
-	if ( false === $valid_data || give_get_errors() || ! $user ) {
-		if ( $is_ajax ) {
+	if (false === $valid_data || give_get_errors() || ! $user) {
+		if ($is_ajax) {
 			/**
 			 * Fires when AJAX sends back errors from the donation form.
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_ajax_donation_errors' );
+			do_action('give_ajax_donation_errors');
 			give_die();
 		} else {
 			return false;
@@ -72,17 +72,17 @@ 
 	}
 
 	// If AJAX send back success to proceed with form submission
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		echo 'success';
 		give_die();
 	}
 
 	// After AJAX: Setup session if not using php_sessions
-	if ( ! Give()->session->use_php_sessions() ) {
+	if ( ! Give()->session->use_php_sessions()) {
 		// Double-check that set_cookie is publicly accessible;
 		// we're using a slightly modified class-wp-sessions.php
-		$session_reflection = new ReflectionMethod( 'WP_Session', 'set_cookie' );
-		if ( $session_reflection->isPublic() ) {
+		$session_reflection = new ReflectionMethod('WP_Session', 'set_cookie');
+		if ($session_reflection->isPublic()) {
 			// Manually set the cookie.
 			Give()->session->init()->set_cookie();
 		}
@@ -97,18 +97,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 donation 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'],
@@ -128,10 +128,10 @@ 
 	 * @param array      $user_info  Array containing basic user information.
 	 * @param bool|array $valid_data Validate fields.
 	 */
-	do_action( 'give_checkout_before_gateway', $_POST, $user_info, $valid_data );
+	do_action('give_checkout_before_gateway', $_POST, $user_info, $valid_data);
 
 	// Sanity check for price
-	if ( ! $purchase_data['price'] ) {
+	if ( ! $purchase_data['price']) {
 		// Revert to manual
 		$purchase_data['gateway'] = 'manual';
 		$_POST['give-gateway']    = 'manual';
@@ -142,27 +142,27 @@ 
 	 *
 	 * @since 1.7
 	 */
-	$purchase_data = apply_filters( 'give_donation_data_before_gateway', $purchase_data, $valid_data );
+	$purchase_data = apply_filters('give_donation_data_before_gateway', $purchase_data, $valid_data);
 
 	// Setup the data we're storing in the donation 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 donation, and for other plugins needing donation data.
-	give_set_purchase_session( $session_data );
+	give_set_purchase_session($session_data);
 
 	// Send info to the gateway for payment processing
-	give_send_to_gateway( $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');
 
 
 /**
@@ -175,26 +175,26 @@ 
  *
  * @return void
  */
-function give_checkout_check_existing_email( $valid_data, $post ) {
+function give_checkout_check_existing_email($valid_data, $post) {
 
 	// Verify that the email address belongs to this customer
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 
 		$email    = $valid_data['logged_in_user']['user_email'];
-		$customer = new Give_Customer( get_current_user_id(), true );
+		$customer = new Give_Customer(get_current_user_id(), true);
 
 		// If this email address is not registered with this customer, see if it belongs to any other customer
-		if ( $email !== $customer->email && ( is_array( $customer->emails ) && ! in_array( $email, $customer->emails ) ) ) {
-			$found_customer = new Give_Customer( $email );
+		if ($email !== $customer->email && (is_array($customer->emails) && ! in_array($email, $customer->emails))) {
+			$found_customer = new Give_Customer($email);
 
-			if ( $found_customer->id > 0 ) {
-				give_set_error( 'give-customer-email-exists', sprintf( esc_html__( 'The email address %s is already in use.', 'give' ), $email ) );
+			if ($found_customer->id > 0) {
+				give_set_error('give-customer-email-exists', sprintf(esc_html__('The email address %s is already in use.', 'give'), $email));
 			}
 		}
 	}
 }
 
-add_action( 'give_checkout_error_checks', 'give_checkout_check_existing_email', 10, 2 );
+add_action('give_checkout_error_checks', 'give_checkout_check_existing_email', 10, 2);
 
 /**
  * Process the checkout login form
@@ -205,37 +205,37 @@ 
  */
 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 ) {
+	if (give_get_errors() || $user_data['user_id'] < 1) {
+		if ($is_ajax) {
 			/**
 			 * Fires when AJAX sends back errors from the donation form.
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_ajax_donation_errors' );
+			do_action('give_ajax_donation_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');
 
 /**
  * Donation Form Validate Fields
@@ -247,45 +247,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
-		'cc_info'          => give_purchase_form_validate_cc(),// Credit card info
+		'need_new_user'    => false, // New user flag
+		'need_user_login'  => false, // Login user flag
+		'logged_user_data' => array(), // Logged user collected data
+		'new_user_data'    => array(), // New user collected data
+		'login_user_data'  => array(), // Login user collected data
+		'guest_user_data'  => array(), // Guest user collected data
+		'cc_info'          => give_purchase_form_validate_cc(), // Credit card info
 	);
 
 	// Validate Honeypot First
-	if ( ! empty( $_POST['give-honeypot'] ) ) {
-		give_set_error( 'invalid_honeypot', esc_html__( 'Honeypot field detected. Go away bad bot!', 'give' ) );
+	if ( ! empty($_POST['give-honeypot'])) {
+		give_set_error('invalid_honeypot', esc_html__('Honeypot field detected. Go away bad bot!', 'give'));
 	}
 
 	// Validate agree to terms
-	$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();
-	} elseif ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-register' ) {
+	} elseif (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-register') {
 		// Set new user registration as required
 		$valid_data['need_new_user'] = true;
 		// Validate new user data
 		$valid_data['new_user_data'] = give_purchase_form_validate_new_user();
 		// Check if login validation is needed
-	} elseif ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-login' ) {
+	} elseif (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-login') {
 		// Set user login as required
 		$valid_data['need_user_login'] = true;
 		// Validate users login info
@@ -310,40 +310,40 @@ 
  */
 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', esc_html__( 'Please insert a valid donation amount.', 'give' ) );
+			give_set_error('invalid_donation_amount', esc_html__('Please insert a valid donation amount.', 'give'));
 
 		} //Check for a minimum custom amount
-		elseif ( ! give_verify_minimum_price() ) {
+		elseif ( ! give_verify_minimum_price()) {
 			// translators: %s: minimum donation amount.
 			give_set_error(
 				'invalid_donation_minimum',
 				sprintf(
-					esc_html__( 'This form has a minimum donation amount of %s.', 'give' ),
-					give_currency_filter( give_format_amount( give_get_form_minimum_price( $form_id ) ) )
+					esc_html__('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', esc_html__( 'The selected payment gateway is not enabled.', 'give' ) );
+			give_set_error('invalid_gateway', esc_html__('The selected payment gateway is not enabled.', 'give'));
 
 		}
 	}
@@ -361,23 +361,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;
 	}
 
@@ -393,9 +393,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', esc_html__( 'You must agree to the terms of use.', 'give' ) ) );
+		give_set_error('agree_to_terms', apply_filters('give_agree_to_terms_text', esc_html__('You must agree to the terms of use.', 'give')));
 	}
 }
 
@@ -409,43 +409,43 @@ 
  *
  * @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' => esc_html__( 'Please enter a valid email address.', 'give' ),
+			'error_message' => esc_html__('Please enter a valid email address.', 'give'),
 		),
 		'give_first' => array(
 			'error_id'      => 'invalid_first_name',
-			'error_message' => esc_html__( 'Please enter your first name.', 'give' ),
+			'error_message' => esc_html__('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' => esc_html__( 'Please enter your primary billing address.', 'give' ),
+			'error_message' => esc_html__('Please enter your primary billing address.', 'give'),
 		);
-		$required_fields['card_zip']        = array(
+		$required_fields['card_zip'] = array(
 			'error_id'      => 'invalid_zip_code',
-			'error_message' => esc_html__( 'Please enter your zip / postal code.', 'give' ),
+			'error_message' => esc_html__('Please enter your zip / postal code.', 'give'),
 		);
-		$required_fields['card_city']       = array(
+		$required_fields['card_city'] = array(
 			'error_id'      => 'invalid_city',
-			'error_message' => esc_html__( 'Please enter your billing city.', 'give' ),
+			'error_message' => esc_html__('Please enter your billing city.', 'give'),
 		);
 		$required_fields['billing_country'] = array(
 			'error_id'      => 'invalid_country',
-			'error_message' => esc_html__( 'Please select your billing country.', 'give' ),
+			'error_message' => esc_html__('Please select your billing country.', 'give'),
 		);
-		$required_fields['card_state']      = array(
+		$required_fields['card_state'] = array(
 			'error_id'      => 'invalid_state',
-			'error_message' => esc_html__( 'Please enter billing state / province.', 'give' ),
+			'error_message' => esc_html__('Please enter billing state / province.', 'give'),
 		);
 	}
 
@@ -454,7 +454,7 @@ 
 	 *
 	 * @since 1.7
 	 */
-	$required_fields = apply_filters( 'give_donation_form_required_fields', $required_fields, $form_id );
+	$required_fields = apply_filters('give_donation_form_required_fields', $required_fields, $form_id);
 
 	return $required_fields;
 
@@ -469,16 +469,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);
 
 }
 
@@ -492,42 +492,42 @@ 
 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', esc_html__( 'Invalid email.', 'give' ) );
+			if ( ! is_email($valid_user_data['user_email'])) {
+				give_set_error('email_invalid', esc_html__('Invalid email.', 'give'));
 			}
 		} else {
 			// Set invalid user error.
-			give_set_error( 'invalid_user', esc_html__( 'The user information is invalid.', 'give' ) );
+			give_set_error('invalid_user', esc_html__('The user information is invalid.', 'give'));
 		}
 	}
 
@@ -545,90 +545,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', esc_html__( 'Username already taken.', 'give' ) );
+			give_set_error('username_unavailable', esc_html__('Username already taken.', 'give'));
 			// Check if it's valid.
-		} elseif ( ! give_validate_username( $user_login ) ) {
+		} elseif ( ! give_validate_username($user_login)) {
 			// Invalid username.
-			if ( is_multisite() ) {
-				give_set_error( 'username_invalid', esc_html__( 'Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give' ) );
+			if (is_multisite()) {
+				give_set_error('username_invalid', esc_html__('Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give'));
 			} else {
-				give_set_error( 'username_invalid', esc_html__( 'Invalid username.', 'give' ) );
+				give_set_error('username_invalid', esc_html__('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', esc_html__( 'Invalid email.', 'give' ) );
+		if ( ! is_email($user_email)) {
+			give_set_error('email_invalid', esc_html__('Invalid email.', 'give'));
 			// Check if email exists.
-		} elseif ( email_exists( $user_email ) && $registering_new_user ) {
-			give_set_error( 'email_used', esc_html__( 'The email already active for another user.', 'give' ) );
+		} elseif (email_exists($user_email) && $registering_new_user) {
+			give_set_error('email_used', esc_html__('The 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', esc_html__( 'Enter an email.', 'give' ) );
+		give_set_error('email_empty', esc_html__('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', esc_html__( 'Passwords don\'t match.', 'give' ) );
+			give_set_error('password_mismatch', esc_html__('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', esc_html__( 'Enter a password.', 'give' ) );
-		} elseif ( ! $pass_confirm && $registering_new_user ) {
+			give_set_error('password_empty', esc_html__('Enter a password.', 'give'));
+		} elseif ( ! $pass_confirm && $registering_new_user) {
 			// Confirmation password is invalid.
-			give_set_error( 'confirmation_empty', esc_html__( 'Enter the password confirmation.', 'give' ) );
+			give_set_error('confirmation_empty', esc_html__('Enter the password confirmation.', 'give'));
 		}
 	}
 
@@ -647,36 +647,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', esc_html__( 'You must register or login to complete your donation.', 'give' ) );
+	if ( ! isset($_POST['give_user_login']) || $_POST['give_user_login'] == '') {
+		give_set_error('must_log_in', esc_html__('You must register or login to complete your donation.', 'give'));
 
 		return $valid_user_data;
 	}
 
 	// Get the user by login.
-	$user_data = get_user_by( 'login', strip_tags( $_POST['give_user_login'] ) );
+	$user_data = get_user_by('login', strip_tags($_POST['give_user_login']));
 
 	// Check if user exists.
-	if ( $user_data ) {
+	if ($user_data) {
 		// Get password.
-		$user_pass = isset( $_POST['give_user_pass'] ) ? $_POST['give_user_pass'] : false;
+		$user_pass = isset($_POST['give_user_pass']) ? $_POST['give_user_pass'] : false;
 
 		// Check user_pass.
-		if ( $user_pass ) {
+		if ($user_pass) {
 			// Check if password is valid.
-			if ( ! wp_check_password( $user_pass, $user_data->user_pass, $user_data->ID ) ) {
+			if ( ! wp_check_password($user_pass, $user_data->user_pass, $user_data->ID)) {
 				// Incorrect password.
 				give_set_error(
 					'password_incorrect',
 					sprintf(
 						'%1$s <a href="%2$s">%3$s</a>',
-						esc_html__( 'The password you entered is incorrect.', 'give' ),
-						wp_lostpassword_url( "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]" ),
-						esc_html__( 'Reset Password', 'give' )
+						esc_html__('The password you entered is incorrect.', 'give'),
+						wp_lostpassword_url("http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"),
+						esc_html__('Reset Password', 'give')
 					)
 				);
 				// All is correct.
@@ -693,11 +693,11 @@ 
 			}
 		} else {
 			// Empty password.
-			give_set_error( 'password_empty', esc_html__( 'Enter a password.', 'give' ) );
+			give_set_error('password_empty', esc_html__('Enter a password.', 'give'));
 		}
 	} else {
 		// No username.
-		give_set_error( 'username_incorrect', esc_html__( 'The username you entered does not exist.', 'give' ) );
+		give_set_error('username_incorrect', esc_html__('The username you entered does not exist.', 'give'));
 	}
 
 	return $valid_user_data;
@@ -712,7 +712,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(
@@ -721,38 +721,38 @@ 
 	);
 
 	// Show error message if user must be logged in.
-	if ( give_logged_in_only( $form_id ) ) {
-		give_set_error( 'logged_in_only', esc_html__( 'You must be logged in to donate.', 'give' ) );
+	if (give_logged_in_only($form_id)) {
+		give_set_error('logged_in_only', esc_html__('You must be logged in to donate.', 'give'));
 	}
 
 	// Get the guest email.
-	$guest_email = isset( $_POST['give_email'] ) ? $_POST['give_email'] : false;
+	$guest_email = isset($_POST['give_email']) ? $_POST['give_email'] : false;
 
 	// Check email.
-	if ( $guest_email && strlen( $guest_email ) > 0 ) {
+	if ($guest_email && strlen($guest_email) > 0) {
 		// Validate email.
-		if ( ! is_email( $guest_email ) ) {
+		if ( ! is_email($guest_email)) {
 			// Invalid email.
-			give_set_error( 'email_invalid', esc_html__( 'Invalid email.', 'give' ) );
+			give_set_error('email_invalid', esc_html__('Invalid email.', 'give'));
 		} else {
 			// All is good to go.
 			$valid_user_data['user_email'] = $guest_email;
 
 			// Get user_id from donor if exist.
-			$donor = new Give_Customer( $guest_email );
-			if ( $donor->id && $donor->user_id ) {
+			$donor = new Give_Customer($guest_email);
+			if ($donor->id && $donor->user_id) {
 				$valid_user_data['user_id'] = $donor->user_id;
 			}
 		}
 	} else {
 		// No email.
-		give_set_error( 'email_empty', esc_html__( 'Enter an email.', 'give' ) );
+		give_set_error('email_empty', esc_html__('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']);
 		}
 	}
 
@@ -768,36 +768,36 @@ 
  * @since   1.0
  * @return  integer
  */
-function give_register_and_login_new_user( $user_data = array() ) {
+function give_register_and_login_new_user($user_data = array()) {
 	// Verify the array.
-	if ( empty( $user_data ) ) {
-		return - 1;
+	if (empty($user_data)) {
+		return -1;
 	}
 
-	if ( give_get_errors() ) {
-		return - 1;
+	if (give_get_errors()) {
+		return -1;
 	}
 
-	$user_args = apply_filters( 'give_insert_user_args', array(
-		'user_login'      => isset( $user_data['user_login'] ) ? $user_data['user_login'] : '',
-		'user_pass'       => isset( $user_data['user_pass'] ) ? $user_data['user_pass'] : '',
-		'user_email'      => isset( $user_data['user_email'] ) ? $user_data['user_email'] : '',
-		'first_name'      => isset( $user_data['user_first'] ) ? $user_data['user_first'] : '',
-		'last_name'       => isset( $user_data['user_last'] ) ? $user_data['user_last'] : '',
-		'user_registered' => date( 'Y-m-d H:i:s' ),
-		'role'            => get_option( 'default_role' ),
-	), $user_data );
+	$user_args = apply_filters('give_insert_user_args', array(
+		'user_login'      => isset($user_data['user_login']) ? $user_data['user_login'] : '',
+		'user_pass'       => isset($user_data['user_pass']) ? $user_data['user_pass'] : '',
+		'user_email'      => isset($user_data['user_email']) ? $user_data['user_email'] : '',
+		'first_name'      => isset($user_data['user_first']) ? $user_data['user_first'] : '',
+		'last_name'       => isset($user_data['user_last']) ? $user_data['user_last'] : '',
+		'user_registered' => date('Y-m-d H:i:s'),
+		'role'            => get_option('default_role'),
+	), $user_data);
 
 	// Insert new user.
-	$user_id = wp_insert_user( $user_args );
+	$user_id = wp_insert_user($user_args);
 
 	// Validate inserted user.
-	if ( is_wp_error( $user_id ) ) {
-		return - 1;
+	if (is_wp_error($user_id)) {
+		return -1;
 	}
 
 	// Allow themes and plugins to filter the user data.
-	$user_data = apply_filters( 'give_insert_user_data', $user_data, $user_args );
+	$user_data = apply_filters('give_insert_user_data', $user_data, $user_args);
 
 	/**
 	 * Fires after inserting user.
@@ -807,10 +807,10 @@ 
 	 * @param int   $user_id   User id.
 	 * @param array $user_data Array containing user data.
 	 */
-	do_action( 'give_insert_user', $user_id, $user_data );
+	do_action('give_insert_user', $user_id, $user_data);
 
 	// Login new user.
-	give_log_user_in( $user_id, $user_data['user_login'], $user_data['user_pass'] );
+	give_log_user_in($user_id, $user_data['user_login'], $user_data['user_pass']);
 
 	// Return user id.
 	return $user_id;
@@ -825,27 +825,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;
-	} elseif ( is_user_logged_in() ) {
+	} elseif (is_user_logged_in()) {
 		// Set the valid user as the logged in collected data.
 		$user = $valid_data['logged_in_user'];
-	} elseif ( $valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true ) {
+	} elseif ($valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true) {
 		// New user registration.
-		if ( $valid_data['need_new_user'] === true ) {
+		if ($valid_data['need_new_user'] === true) {
 			// Set user.
 			$user = $valid_data['new_user_data'];
 			// Register and login new user.
-			$user['user_id'] = give_register_and_login_new_user( $user );
+			$user['user_id'] = give_register_and_login_new_user($user);
 			// User login
-		} elseif ( $valid_data['need_user_login'] === true && ! $is_ajax ) {
+		} elseif ($valid_data['need_user_login'] === true && ! $is_ajax) {
 
 			/*
 			 * The login form is now processed in the give_process_purchase_login() function.
@@ -858,48 +858,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.
@@ -918,16 +918,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', esc_html__( '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', esc_html__('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.
@@ -943,17 +943,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;
@@ -969,14 +969,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}',
@@ -1136,11 +1136,11 @@ 
 		'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);
 }
 
 
@@ -1154,36 +1154,36 @@ 
  *
  * @return bool
  */
-function give_validate_multi_donation_form_level( $valid_data, $data ) {
+function give_validate_multi_donation_form_level($valid_data, $data) {
 	/* @var Give_Donate_Form $form */
-	$form = new Give_Donate_Form( $data['give-form-id'] );
+	$form = new Give_Donate_Form($data['give-form-id']);
 
 	$donation_level_matched = false;
 
-	if ( $form->is_multi_type_donation_form() ) {
+	if ($form->is_multi_type_donation_form()) {
 
 		// Bailout.
-		if ( ! ( $variable_prices = $form->get_prices() ) ) {
+		if ( ! ($variable_prices = $form->get_prices())) {
 			return false;
 		}
 
 		// Sanitize donation amount.
-		$data['give-amount'] = give_sanitize_amount( $data['give-amount'] );
+		$data['give-amount'] = give_sanitize_amount($data['give-amount']);
 
 		// Get number of decimals.
 		$default_decimals = give_get_price_decimals();
 
-		if ( $data['give-amount'] === give_sanitize_amount( give_get_price_option_amount( $data['give-form-id'], $data['give-price-id'] ), $default_decimals ) ) {
+		if ($data['give-amount'] === give_sanitize_amount(give_get_price_option_amount($data['give-form-id'], $data['give-price-id']), $default_decimals)) {
 			return true;
 		}
 
 		// Find correct donation level from all donation levels.
-		foreach ( $variable_prices as $variable_price ) {
+		foreach ($variable_prices as $variable_price) {
 			// Sanitize level amount.
-			$variable_price['_give_amount'] = give_sanitize_amount( $variable_price['_give_amount'], $default_decimals );
+			$variable_price['_give_amount'] = give_sanitize_amount($variable_price['_give_amount'], $default_decimals);
 
 			// Set first match donation level ID.
-			if ( $data['give-amount'] === $variable_price['_give_amount'] ) {
+			if ($data['give-amount'] === $variable_price['_give_amount']) {
 				$_POST['give-price-id'] = $variable_price['_give_id']['level_id'];
 				$donation_level_matched = true;
 				break;
@@ -1194,19 +1194,19 @@ 
 		// If yes then set price id to custom if amount is greater then custom minimum amount (if any).
 		if (
 			! $donation_level_matched
-			&& ( 'yes' === get_post_meta( $data['give-form-id'], '_give_custom_amount', true ) )
+			&& ('yes' === get_post_meta($data['give-form-id'], '_give_custom_amount', true))
 		) {
 			// Sanitize custom minimum amount.
-			$custom_minimum_amount = give_sanitize_amount( get_post_meta( $data['give-form-id'], '_give_custom_amount_minimum', true ), $default_decimals );
+			$custom_minimum_amount = give_sanitize_amount(get_post_meta($data['give-form-id'], '_give_custom_amount_minimum', true), $default_decimals);
 
-			if ( $data['give-amount'] >= $custom_minimum_amount ) {
+			if ($data['give-amount'] >= $custom_minimum_amount) {
 				$_POST['give-price-id'] = 'custom';
 				$donation_level_matched = true;
 			}
 		}
 	}
 
-	return ( $donation_level_matched ? true : false );
+	return ($donation_level_matched ? true : false);
 }
 
-add_action( 'give_checkout_error_checks', 'give_validate_multi_donation_form_level', 10, 2 );
+add_action('give_checkout_error_checks', 'give_validate_multi_donation_form_level', 10, 2);

includes/gateways/paypal-standard.php

Spacing +168 added lines, -168 removed lines

@@ -9,7 +9,7 @@ 
  * @since       1.0
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,7 +21,7 @@ 
  * @access private
  * @since  1.0
  */
-add_action( 'give_paypal_cc_form', '__return_false' );
+add_action('give_paypal_cc_form', '__return_false');
 
 /**
  * Process PayPal Purchase.
@@ -32,14 +32,14 @@ 
  *
  * @return void
  */
-function give_process_paypal_purchase( $purchase_data ) {
+function give_process_paypal_purchase($purchase_data) {
 
-	if ( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'give-gateway' ) ) {
-		wp_die( esc_html__( 'Nonce verification has failed.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($purchase_data['gateway_nonce'], 'give-gateway')) {
+		wp_die(esc_html__('Nonce verification has failed.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	$form_id  = intval( $purchase_data['post_data']['give-form-id'] );
-	$price_id = isset( $purchase_data['post_data']['give-price-id'] ) ? $purchase_data['post_data']['give-price-id'] : '';
+	$form_id  = intval($purchase_data['post_data']['give-form-id']);
+	$price_id = isset($purchase_data['post_data']['give-price-id']) ? $purchase_data['post_data']['give-price-id'] : '';
 
 	// Collect payment data.
 	$payment_data = array(
@@ -57,101 +57,101 @@ 
 	);
 
 	// Record the pending payment.
-	$payment_id = give_insert_payment( $payment_data );
+	$payment_id = give_insert_payment($payment_data);
 
 	// Check payment.
-	if ( ! $payment_id ) {
+	if ( ! $payment_id) {
 		// Record the error.
 		give_record_gateway_error(
-			esc_html__( 'Payment Error', 'give' ),
+			esc_html__('Payment Error', 'give'),
 			sprintf(
 			/* translators: %s: payment data */
-				esc_html__( 'Payment creation failed before sending donor to PayPal. Payment data: %s', 'give' ),
-				json_encode( $payment_data )
+				esc_html__('Payment creation failed before sending donor to PayPal. Payment data: %s', 'give'),
+				json_encode($payment_data)
 			),
 			$payment_id
 		);
 		// Problems? Send back.
-		give_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['give-gateway'] );
+		give_send_back_to_checkout('?payment-mode='.$purchase_data['post_data']['give-gateway']);
 
 	} else {
 
 		// Only send to PayPal if the pending payment is created successfully.
-		$listener_url = add_query_arg( 'give-listener', 'IPN', home_url( 'index.php' ) );
+		$listener_url = add_query_arg('give-listener', 'IPN', home_url('index.php'));
 
 		// Get the success url.
-		$return_url = add_query_arg( array(
+		$return_url = add_query_arg(array(
 			'payment-confirmation' => 'paypal',
 			'payment-id'           => $payment_id
 
-		), get_permalink( give_get_option( 'success_page' ) ) );
+		), get_permalink(give_get_option('success_page')));
 
 		// Get the PayPal redirect uri.
-		$paypal_redirect = trailingslashit( give_get_paypal_redirect() ) . '?';
+		$paypal_redirect = trailingslashit(give_get_paypal_redirect()).'?';
 
 		//Item name - pass level name if variable priced.
 		$item_name = $purchase_data['post_data']['give-form-title'];
 
 		//Verify has variable prices.
-		if ( give_has_variable_prices( $form_id ) && isset( $purchase_data['post_data']['give-price-id'] ) ) {
+		if (give_has_variable_prices($form_id) && isset($purchase_data['post_data']['give-price-id'])) {
 
-			$item_price_level_text = give_get_price_option_name( $form_id, $purchase_data['post_data']['give-price-id'] );
+			$item_price_level_text = give_get_price_option_name($form_id, $purchase_data['post_data']['give-price-id']);
 
-			$price_level_amount = give_get_price_option_amount( $form_id, $purchase_data['post_data']['give-price-id'] );
+			$price_level_amount = give_get_price_option_amount($form_id, $purchase_data['post_data']['give-price-id']);
 
 			//Donation given doesn't match selected level (must be a custom amount).
-			if ( $price_level_amount != give_sanitize_amount( $purchase_data['price'] ) ) {
-				$custom_amount_text = get_post_meta( $form_id, '_give_custom_amount_text', true );
+			if ($price_level_amount != give_sanitize_amount($purchase_data['price'])) {
+				$custom_amount_text = get_post_meta($form_id, '_give_custom_amount_text', true);
 				//user custom amount text if any, fallback to default if not.
-				$item_name .= ' - ' . ( ! empty( $custom_amount_text ) ? $custom_amount_text : esc_html__( 'Custom Amount', 'give' ) );
+				$item_name .= ' - '.( ! empty($custom_amount_text) ? $custom_amount_text : esc_html__('Custom Amount', 'give'));
 
 			} //Is there any donation level text?
-			elseif ( ! empty( $item_price_level_text ) ) {
-				$item_name .= ' - ' . $item_price_level_text;
+			elseif ( ! empty($item_price_level_text)) {
+				$item_name .= ' - '.$item_price_level_text;
 			}
 
 		} //Single donation: Custom Amount.
-		elseif ( give_get_form_price( $form_id ) !== give_sanitize_amount( $purchase_data['price'] ) ) {
-			$custom_amount_text = get_post_meta( $form_id, '_give_custom_amount_text', true );
+		elseif (give_get_form_price($form_id) !== give_sanitize_amount($purchase_data['price'])) {
+			$custom_amount_text = get_post_meta($form_id, '_give_custom_amount_text', true);
 			//user custom amount text if any, fallback to default if not.
-			$item_name .= ' - ' . ( ! empty( $custom_amount_text ) ? $custom_amount_text : esc_html__( 'Custom Amount', 'give' ) );
+			$item_name .= ' - '.( ! empty($custom_amount_text) ? $custom_amount_text : esc_html__('Custom Amount', 'give'));
 		}
 
 		// Setup PayPal API params.
 		$paypal_args = array(
-			'business'      => give_get_option( 'paypal_email', false ),
+			'business'      => give_get_option('paypal_email', false),
 			'first_name'    => $purchase_data['user_info']['first_name'],
 			'last_name'     => $purchase_data['user_info']['last_name'],
 			'email'         => $purchase_data['user_email'],
 			'invoice'       => $purchase_data['purchase_key'],
 			'amount'        => $purchase_data['price'],
-			'item_name'     => stripslashes( $item_name ),
+			'item_name'     => stripslashes($item_name),
 			'no_shipping'   => '1',
 			'shipping'      => '0',
 			'no_note'       => '1',
 			'currency_code' => give_get_currency(),
-			'charset'       => get_bloginfo( 'charset' ),
+			'charset'       => get_bloginfo('charset'),
 			'custom'        => $payment_id,
 			'rm'            => '2',
 			'return'        => $return_url,
-			'cancel_return' => give_get_failed_transaction_uri( '?payment-id=' . $payment_id ),
+			'cancel_return' => give_get_failed_transaction_uri('?payment-id='.$payment_id),
 			'notify_url'    => $listener_url,
 			'page_style'    => give_get_paypal_page_style(),
-			'cbt'           => get_bloginfo( 'name' ),
+			'cbt'           => get_bloginfo('name'),
 			'bn'            => 'givewp_SP'
 		);
 
 		//Add user address if present.
-		if ( ! empty( $purchase_data['user_info']['address'] ) ) {
-			$paypal_args['address1'] = isset( $purchase_data['user_info']['address']['line1'] ) ? $purchase_data['user_info']['address']['line1'] : '';
-			$paypal_args['address2'] = isset( $purchase_data['user_info']['address']['line2'] ) ? $purchase_data['user_info']['address']['line2'] : '';
-			$paypal_args['city']     = isset( $purchase_data['user_info']['address']['city'] ) ? $purchase_data['user_info']['address']['city'] : '';
-			$paypal_args['state']    = isset( $purchase_data['user_info']['address']['state'] ) ? $purchase_data['user_info']['address']['state'] : '';
-			$paypal_args['country']  = isset( $purchase_data['user_info']['address']['country'] ) ? $purchase_data['user_info']['address']['country'] : '';
+		if ( ! empty($purchase_data['user_info']['address'])) {
+			$paypal_args['address1'] = isset($purchase_data['user_info']['address']['line1']) ? $purchase_data['user_info']['address']['line1'] : '';
+			$paypal_args['address2'] = isset($purchase_data['user_info']['address']['line2']) ? $purchase_data['user_info']['address']['line2'] : '';
+			$paypal_args['city']     = isset($purchase_data['user_info']['address']['city']) ? $purchase_data['user_info']['address']['city'] : '';
+			$paypal_args['state']    = isset($purchase_data['user_info']['address']['state']) ? $purchase_data['user_info']['address']['state'] : '';
+			$paypal_args['country']  = isset($purchase_data['user_info']['address']['country']) ? $purchase_data['user_info']['address']['country'] : '';
 		}
 
 		//Donations or regular transactions?
-		if ( give_get_option( 'paypal_button_type' ) === 'standard' ) {
+		if (give_get_option('paypal_button_type') === 'standard') {
 			$paypal_extra_args = array(
 				'cmd' => '_xclick',
 			);
@@ -161,23 +161,23 @@ 
 			);
 		}
 
-		$paypal_args = array_merge( $paypal_extra_args, $paypal_args );
-		$paypal_args = apply_filters( 'give_paypal_redirect_args', $paypal_args, $purchase_data );
+		$paypal_args = array_merge($paypal_extra_args, $paypal_args);
+		$paypal_args = apply_filters('give_paypal_redirect_args', $paypal_args, $purchase_data);
 
 		// Build query.
-		$paypal_redirect .= http_build_query( $paypal_args );
+		$paypal_redirect .= http_build_query($paypal_args);
 
 		// Fix for some sites that encode the entities.
-		$paypal_redirect = str_replace( '&', '&', $paypal_redirect );
+		$paypal_redirect = str_replace('&', '&', $paypal_redirect);
 
 		// Redirect to PayPal.
-		wp_redirect( $paypal_redirect );
+		wp_redirect($paypal_redirect);
 		exit;
 	}
 
 }
 
-add_action( 'give_gateway_paypal', 'give_process_paypal_purchase' );
+add_action('give_gateway_paypal', 'give_process_paypal_purchase');
 
 /**
  * Listens for a PayPal IPN requests and then sends to the processing function
@@ -187,17 +187,17 @@ 
  */
 function give_listen_for_paypal_ipn() {
 	// Regular PayPal IPN
-	if ( isset( $_GET['give-listener'] ) && $_GET['give-listener'] == 'IPN' ) {
+	if (isset($_GET['give-listener']) && $_GET['give-listener'] == 'IPN') {
 		/**
 		 * Fires while verifying PayPal IPN
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_verify_paypal_ipn' );
+		do_action('give_verify_paypal_ipn');
 	}
 }
 
-add_action( 'init', 'give_listen_for_paypal_ipn' );
+add_action('init', 'give_listen_for_paypal_ipn');
 
 /**
  * Process PayPal IPN
@@ -208,7 +208,7 @@ 
 function give_process_paypal_ipn() {
 
 	// Check the request method is POST
-	if ( isset( $_SERVER['REQUEST_METHOD'] ) && $_SERVER['REQUEST_METHOD'] != 'POST' ) {
+	if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] != 'POST') {
 		return;
 	}
 
@@ -216,11 +216,11 @@ 
 	$post_data = '';
 
 	// Fallback just in case post_max_size is lower than needed
-	if ( ini_get( 'allow_url_fopen' ) ) {
-		$post_data = file_get_contents( 'php://input' );
+	if (ini_get('allow_url_fopen')) {
+		$post_data = file_get_contents('php://input');
 	} else {
 		// If allow_url_fopen is not enabled, then make sure that post_max_size is large enough
-		ini_set( 'post_max_size', '12M' );
+		ini_set('post_max_size', '12M');
 	}
 	// Start the encoded data collection with notification command
 	$encoded_data = 'cmd=_notify-validate';
@@ -229,40 +229,40 @@ 
 	$arg_separator = give_get_php_arg_separator_output();
 
 	// Verify there is a post_data
-	if ( $post_data || strlen( $post_data ) > 0 ) {
+	if ($post_data || strlen($post_data) > 0) {
 		// Append the data
-		$encoded_data .= $arg_separator . $post_data;
+		$encoded_data .= $arg_separator.$post_data;
 	} else {
 		// Check if POST is empty
-		if ( empty( $_POST ) ) {
+		if (empty($_POST)) {
 			// Nothing to do
 			return;
 		} else {
 			// Loop through each POST
-			foreach ( $_POST as $key => $value ) {
+			foreach ($_POST as $key => $value) {
 				// Encode the value and append the data.
-				$encoded_data .= $arg_separator . "$key=" . urlencode( $value );
+				$encoded_data .= $arg_separator."$key=".urlencode($value);
 			}
 		}
 	}
 
 	// Convert collected post data to an array.
-	parse_str( $encoded_data, $encoded_data_array );
+	parse_str($encoded_data, $encoded_data_array);
 
-	foreach ( $encoded_data_array as $key => $value ) {
+	foreach ($encoded_data_array as $key => $value) {
 
-		if ( false !== strpos( $key, 'amp;' ) ) {
-			$new_key = str_replace( '&', '&', $key );
-			$new_key = str_replace( 'amp;', '&', $new_key );
+		if (false !== strpos($key, 'amp;')) {
+			$new_key = str_replace('&', '&', $key);
+			$new_key = str_replace('amp;', '&', $new_key);
 
-			unset( $encoded_data_array[ $key ] );
-			$encoded_data_array[ $new_key ] = $value;
+			unset($encoded_data_array[$key]);
+			$encoded_data_array[$new_key] = $value;
 		}
 
 	}
 
 	//Validate IPN request w/ PayPal if user hasn't disabled this security measure.
-	if ( ! give_get_option( 'disable_paypal_verification' ) ) {
+	if ( ! give_get_option('disable_paypal_verification')) {
 
 		$remote_post_vars = array(
 			'method'      => 'POST',
@@ -282,28 +282,28 @@ 
 		);
 
 		// Validate the IPN.
-		$api_response = wp_remote_post( give_get_paypal_redirect(), $remote_post_vars );
+		$api_response = wp_remote_post(give_get_paypal_redirect(), $remote_post_vars);
 
-		if ( is_wp_error( $api_response ) ) {
+		if (is_wp_error($api_response)) {
 			give_record_gateway_error(
-				esc_html__( 'IPN Error', 'give' ),
+				esc_html__('IPN Error', 'give'),
 				sprintf(
 				/* translators: %s: Paypal IPN response */
-					esc_html__( 'Invalid IPN verification response. IPN data: %s', 'give' ),
-					json_encode( $api_response )
+					esc_html__('Invalid IPN verification response. IPN data: %s', 'give'),
+					json_encode($api_response)
 				)
 			);
 
 			return; // Something went wrong
 		}
 
-		if ( $api_response['body'] !== 'VERIFIED' && give_get_option( 'disable_paypal_verification', false ) ) {
+		if ($api_response['body'] !== 'VERIFIED' && give_get_option('disable_paypal_verification', false)) {
 			give_record_gateway_error(
-				esc_html__( 'IPN Error', 'give' ),
+				esc_html__('IPN Error', 'give'),
 				sprintf(
 				/* translators: %s: Paypal IPN response */
-					esc_html__( 'Invalid IPN verification response. IPN data: %s', 'give' ),
-					json_encode( $api_response )
+					esc_html__('Invalid IPN verification response. IPN data: %s', 'give'),
+					json_encode($api_response)
 				)
 			);
 
@@ -313,7 +313,7 @@ 
 	}
 
 	// Check if $post_data_array has been populated
-	if ( ! is_array( $encoded_data_array ) && ! empty( $encoded_data_array ) ) {
+	if ( ! is_array($encoded_data_array) && ! empty($encoded_data_array)) {
 		return;
 	}
 
@@ -322,12 +322,12 @@ 
 		'payment_status' => ''
 	);
 
-	$encoded_data_array = wp_parse_args( $encoded_data_array, $defaults );
+	$encoded_data_array = wp_parse_args($encoded_data_array, $defaults);
 
-	$payment_id = isset( $encoded_data_array['custom'] ) ? absint( $encoded_data_array['custom'] ) : 0;
+	$payment_id = isset($encoded_data_array['custom']) ? absint($encoded_data_array['custom']) : 0;
 	$txn_type = $encoded_data_array['txn_type'];
 
-	if ( has_action( 'give_paypal_' . $txn_type ) ) {
+	if (has_action('give_paypal_'.$txn_type)) {
 		/**
 		 * Fires while processing PayPal IPN $txn_type.
 		 *
@@ -338,7 +338,7 @@ 
 		 * @param array $encoded_data_array Encoded data.
 		 * @param int   $payment_id         Payment id.
 		 */
-		do_action( "give_paypal_{$txn_type}", $encoded_data_array, $payment_id );
+		do_action("give_paypal_{$txn_type}", $encoded_data_array, $payment_id);
 	} else {
 		/**
 		 * Fires while process PayPal IPN.
@@ -350,12 +350,12 @@ 
 		 * @param array $encoded_data_array Encoded data.
 		 * @param int   $payment_id         Payment id.
 		 */
-		do_action( 'give_paypal_web_accept', $encoded_data_array, $payment_id );
+		do_action('give_paypal_web_accept', $encoded_data_array, $payment_id);
 	}
 	exit;
 }
 
-add_action( 'give_verify_paypal_ipn', 'give_process_paypal_ipn' );
+add_action('give_verify_paypal_ipn', 'give_process_paypal_ipn');
 
 /**
  * Process web accept (one time) payment IPNs.
@@ -367,127 +367,127 @@ 
  *
  * @return void
  */
-function give_process_paypal_web_accept_and_cart( $data, $payment_id ) {
+function give_process_paypal_web_accept_and_cart($data, $payment_id) {
 
 	//Only allow through these transaction types.
-	if ( $data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && strtolower( $data['payment_status'] ) != 'refunded' ) {
+	if ($data['txn_type'] != 'web_accept' && $data['txn_type'] != 'cart' && strtolower($data['payment_status']) != 'refunded') {
 		return;
 	}
 
 	//Need $payment_id to continue.
-	if ( empty( $payment_id ) ) {
+	if (empty($payment_id)) {
 		return;
 	}
 
 	// Collect donation payment details.
 	$paypal_amount  = $data['mc_gross'];
-	$payment_status = strtolower( $data['payment_status'] );
-	$currency_code  = strtolower( $data['mc_currency'] );
-	$business_email = isset( $data['business'] ) && is_email( $data['business'] ) ? trim( $data['business'] ) : trim( $data['receiver_email'] );
-	$payment_meta   = give_get_payment_meta( $payment_id );
+	$payment_status = strtolower($data['payment_status']);
+	$currency_code  = strtolower($data['mc_currency']);
+	$business_email = isset($data['business']) && is_email($data['business']) ? trim($data['business']) : trim($data['receiver_email']);
+	$payment_meta   = give_get_payment_meta($payment_id);
 
 	// Must be a PayPal standard IPN.
-	if ( give_get_payment_gateway( $payment_id ) != 'paypal' ) {
+	if (give_get_payment_gateway($payment_id) != 'paypal') {
 		return;
 	}
 
 	// Verify payment recipient
-	if ( strcasecmp( $business_email, trim( give_get_option( 'paypal_email' ) ) ) != 0 ) {
+	if (strcasecmp($business_email, trim(give_get_option('paypal_email'))) != 0) {
 
 		give_record_gateway_error(
-			esc_html__( 'IPN Error', 'give' ),
+			esc_html__('IPN Error', 'give'),
 			sprintf(
 			/* translators: %s: Paypal IPN response */
-				esc_html__( 'Invalid business email in IPN response. IPN data: %s', 'give' ),
-				json_encode( $data )
+				esc_html__('Invalid business email in IPN response. IPN data: %s', 'give'),
+				json_encode($data)
 			),
 			$payment_id
 		);
-		give_update_payment_status( $payment_id, 'failed' );
-		give_insert_payment_note( $payment_id, esc_html__( 'Payment failed due to invalid PayPal business email.', 'give' ) );
+		give_update_payment_status($payment_id, 'failed');
+		give_insert_payment_note($payment_id, esc_html__('Payment failed due to invalid PayPal business email.', 'give'));
 
 		return;
 	}
 
 	// Verify payment currency.
-	if ( $currency_code != strtolower( $payment_meta['currency'] ) ) {
+	if ($currency_code != strtolower($payment_meta['currency'])) {
 
 		give_record_gateway_error(
-			esc_html__( 'IPN Error', 'give' ),
+			esc_html__('IPN Error', 'give'),
 			sprintf(
 			/* translators: %s: Paypal IPN response */
-				esc_html__( 'Invalid currency in IPN response. IPN data: %s', 'give' ),
-				json_encode( $data )
+				esc_html__('Invalid currency in IPN response. IPN data: %s', 'give'),
+				json_encode($data)
 			),
 			$payment_id
 		);
-		give_update_payment_status( $payment_id, 'failed' );
-		give_insert_payment_note( $payment_id, esc_html__( 'Payment failed due to invalid currency in PayPal IPN.', 'give' ) );
+		give_update_payment_status($payment_id, 'failed');
+		give_insert_payment_note($payment_id, esc_html__('Payment failed due to invalid currency in PayPal IPN.', 'give'));
 
 		return;
 	}
 
 	//Process refunds & reversed.
-	if ( $payment_status == 'refunded' || $payment_status == 'reversed' ) {
-		give_process_paypal_refund( $data, $payment_id );
+	if ($payment_status == 'refunded' || $payment_status == 'reversed') {
+		give_process_paypal_refund($data, $payment_id);
 		return;
 	}
 
 	// Only complete payments once.
-	if ( get_post_status( $payment_id ) == 'publish' ) {
+	if (get_post_status($payment_id) == 'publish') {
 		return;
 	}
 
 	// Retrieve the total donation amount (before PayPal).
-	$payment_amount = give_get_payment_amount( $payment_id );
+	$payment_amount = give_get_payment_amount($payment_id);
 
 	//Check that the donation PP and local db amounts match.
-	if ( number_format( (float) $paypal_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+	if (number_format((float) $paypal_amount, 2) < number_format((float) $payment_amount, 2)) {
 		// The prices don't match
 		give_record_gateway_error(
-			esc_html__( 'IPN Error', 'give' ),
+			esc_html__('IPN Error', 'give'),
 			sprintf(
 			/* translators: %s: Paypal IPN response */
-				esc_html__( 'Invalid payment amount in IPN response. IPN data: %s', 'give' ),
-				json_encode( $data )
+				esc_html__('Invalid payment amount in IPN response. IPN data: %s', 'give'),
+				json_encode($data)
 			),
 			$payment_id
 		);
-		give_update_payment_status( $payment_id, 'failed' );
-		give_insert_payment_note( $payment_id, esc_html__( 'Payment failed due to invalid amount in PayPal IPN.', 'give' ) );
+		give_update_payment_status($payment_id, 'failed');
+		give_insert_payment_note($payment_id, esc_html__('Payment failed due to invalid amount in PayPal IPN.', 'give'));
 
 		return;
 	}
 
 	//Process completed donations.
-	if ( $payment_status == 'completed' || give_is_test_mode() ) {
+	if ($payment_status == 'completed' || give_is_test_mode()) {
 
 		give_insert_payment_note(
 			$payment_id,
 			sprintf(
 			/* translators: %s: Paypal transaction ID */
-				esc_html__( 'PayPal Transaction ID: %s', 'give' ),
+				esc_html__('PayPal Transaction ID: %s', 'give'),
 				$data['txn_id']
 			)
 		);
-		give_set_payment_transaction_id( $payment_id, $data['txn_id'] );
-		give_update_payment_status( $payment_id, 'publish' );
+		give_set_payment_transaction_id($payment_id, $data['txn_id']);
+		give_update_payment_status($payment_id, 'publish');
 
-	} elseif ( 'pending' == $payment_status && isset( $data['pending_reason'] ) ) {
+	} elseif ('pending' == $payment_status && isset($data['pending_reason'])) {
 
 		// Look for possible pending reasons, such as an echeck.
-		$note = give_paypal_get_pending_donation_note( strtolower( $data['pending_reason'] ) );
+		$note = give_paypal_get_pending_donation_note(strtolower($data['pending_reason']));
 
-		if ( ! empty( $note ) ) {
+		if ( ! empty($note)) {
 
-			give_insert_payment_note( $payment_id, $note );
+			give_insert_payment_note($payment_id, $note);
 
 		}
 	}
 
 }
 
-add_action( 'give_paypal_web_accept', 'give_process_paypal_web_accept_and_cart', 10, 2 );
+add_action('give_paypal_web_accept', 'give_process_paypal_web_accept_and_cart', 10, 2);
 
 /**
  * Process PayPal IPN Refunds
@@ -499,28 +499,28 @@ 
  *
  * @return void
  */
-function give_process_paypal_refund( $data, $payment_id = 0 ) {
+function give_process_paypal_refund($data, $payment_id = 0) {
 
 	// Collect payment details
 
-	if ( empty( $payment_id ) ) {
+	if (empty($payment_id)) {
 		return;
 	}
 
-	if ( get_post_status( $payment_id ) == 'refunded' ) {
+	if (get_post_status($payment_id) == 'refunded') {
 		return; // Only refund payments once
 	}
 
-	$payment_amount = give_get_payment_amount( $payment_id );
+	$payment_amount = give_get_payment_amount($payment_id);
 	$refund_amount  = $data['payment_gross'] * - 1;
 
-	if ( number_format( (float) $refund_amount, 2 ) < number_format( (float) $payment_amount, 2 ) ) {
+	if (number_format((float) $refund_amount, 2) < number_format((float) $payment_amount, 2)) {
 
 		give_insert_payment_note(
 			$payment_id,
 			sprintf(
 			/* translators: %s: Paypal parent transaction ID */
-				esc_html__( 'Partial PayPal refund processed: %s', 'give' ),
+				esc_html__('Partial PayPal refund processed: %s', 'give'),
 				$data['parent_txn_id']
 			)
 		);
@@ -533,7 +533,7 @@ 
 		$payment_id,
 		sprintf(
 			/* translators: 1: Paypal parent transaction ID 2. Paypal reason code */
-			esc_html__( 'PayPal Payment #%1$s Refunded for reason: %2$s', 'give' ),
+			esc_html__('PayPal Payment #%1$s Refunded for reason: %2$s', 'give'),
 			$data['parent_txn_id'],
 			$data['reason_code']
 		)
@@ -542,11 +542,11 @@ 
 		$payment_id,
 		sprintf(
 		/* translators: %s: Paypal transaction ID */
-			esc_html__( 'PayPal Refund Transaction ID: %s', 'give' ),
+			esc_html__('PayPal Refund Transaction ID: %s', 'give'),
 			$data['txn_id']
 		)
 	);
-	give_update_payment_status( $payment_id, 'refunded' );
+	give_update_payment_status($payment_id, 'refunded');
 }
 
 /**
@@ -558,24 +558,24 @@ 
  *
  * @return string
  */
-function give_get_paypal_redirect( $ssl_check = false ) {
+function give_get_paypal_redirect($ssl_check = false) {
 
-	if ( is_ssl() || ! $ssl_check ) {
+	if (is_ssl() || ! $ssl_check) {
 		$protocal = 'https://';
 	} else {
 		$protocal = 'http://';
 	}
 
 	// Check the current payment mode
-	if ( give_is_test_mode() ) {
+	if (give_is_test_mode()) {
 		// Test mode
-		$paypal_uri = $protocal . 'www.sandbox.paypal.com/cgi-bin/webscr';
+		$paypal_uri = $protocal.'www.sandbox.paypal.com/cgi-bin/webscr';
 	} else {
 		// Live mode
-		$paypal_uri = $protocal . 'www.paypal.com/cgi-bin/webscr';
+		$paypal_uri = $protocal.'www.paypal.com/cgi-bin/webscr';
 	}
 
-	return apply_filters( 'give_paypal_uri', $paypal_uri );
+	return apply_filters('give_paypal_uri', $paypal_uri);
 }
 
 /**
@@ -585,9 +585,9 @@ 
  * @return string
  */
 function give_get_paypal_page_style() {
-	$page_style = trim( give_get_option( 'paypal_page_style', 'PayPal' ) );
+	$page_style = trim(give_get_option('paypal_page_style', 'PayPal'));
 
-	return apply_filters( 'give_paypal_page_style', $page_style );
+	return apply_filters('give_paypal_page_style', $page_style);
 }
 
 /**
@@ -602,26 +602,26 @@ 
  * @return string
  *
  */
-function give_paypal_success_page_content( $content ) {
+function give_paypal_success_page_content($content) {
 
-	if ( ! isset( $_GET['payment-id'] ) && ! give_get_purchase_session() ) {
+	if ( ! isset($_GET['payment-id']) && ! give_get_purchase_session()) {
 		return $content;
 	}
 
-	$payment_id = isset( $_GET['payment-id'] ) ? absint( $_GET['payment-id'] ) : false;
+	$payment_id = isset($_GET['payment-id']) ? absint($_GET['payment-id']) : false;
 
-	if ( ! $payment_id ) {
+	if ( ! $payment_id) {
 		$session    = give_get_purchase_session();
-		$payment_id = give_get_purchase_id_by_key( $session['purchase_key'] );
+		$payment_id = give_get_purchase_id_by_key($session['purchase_key']);
 	}
 
-	$payment = get_post( $payment_id );
-	if ( $payment && 'pending' == $payment->post_status ) {
+	$payment = get_post($payment_id);
+	if ($payment && 'pending' == $payment->post_status) {
 
 		// Payment is still pending so show processing indicator to fix the race condition.
 		ob_start();
 
-		give_get_template_part( 'payment', 'processing' );
+		give_get_template_part('payment', 'processing');
 
 		$content = ob_get_clean();
 
@@ -631,7 +631,7 @@ 
 
 }
 
-add_filter( 'give_payment_confirm_paypal', 'give_paypal_success_page_content' );
+add_filter('give_payment_confirm_paypal', 'give_paypal_success_page_content');
 
 /**
  * Given a Payment ID, extract the transaction ID
@@ -642,22 +642,22 @@ 
  *
  * @return string                   Transaction ID
  */
-function give_paypal_get_payment_transaction_id( $payment_id ) {
+function give_paypal_get_payment_transaction_id($payment_id) {
 
 	$transaction_id = '';
-	$notes          = give_get_payment_notes( $payment_id );
+	$notes          = give_get_payment_notes($payment_id);
 
-	foreach ( $notes as $note ) {
-		if ( preg_match( '/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match ) ) {
+	foreach ($notes as $note) {
+		if (preg_match('/^PayPal Transaction ID: ([^\s]+)/', $note->comment_content, $match)) {
 			$transaction_id = $match[1];
 			continue;
 		}
 	}
 
-	return apply_filters( 'give_paypal_set_payment_transaction_id', $transaction_id, $payment_id );
+	return apply_filters('give_paypal_set_payment_transaction_id', $transaction_id, $payment_id);
 }
 
-add_filter( 'give_get_payment_transaction_id-paypal', 'give_paypal_get_payment_transaction_id', 10, 1 );
+add_filter('give_get_payment_transaction_id-paypal', 'give_paypal_get_payment_transaction_id', 10, 1);
 
 /**
  * Given a transaction ID, generate a link to the PayPal transaction ID details
@@ -669,16 +669,16 @@ 
  *
  * @return string                 A link to the PayPal transaction details
  */
-function give_paypal_link_transaction_id( $transaction_id, $payment_id ) {
+function give_paypal_link_transaction_id($transaction_id, $payment_id) {
 
 	$paypal_base_url = 'https://history.paypal.com/cgi-bin/webscr?cmd=_history-details-from-hub&id=';
-	$transaction_url = '<a href="' . esc_url( $paypal_base_url . $transaction_id ) . '" target="_blank">' . $transaction_id . '</a>';
+	$transaction_url = '<a href="'.esc_url($paypal_base_url.$transaction_id).'" target="_blank">'.$transaction_id.'</a>';
 
-	return apply_filters( 'give_paypal_link_payment_details_transaction_id', $transaction_url );
+	return apply_filters('give_paypal_link_payment_details_transaction_id', $transaction_url);
 
 }
 
-add_filter( 'give_payment_details_transaction_id-paypal', 'give_paypal_link_transaction_id', 10, 2 );
+add_filter('give_payment_details_transaction_id-paypal', 'give_paypal_link_transaction_id', 10, 2);
 
 
 /**
@@ -690,64 +690,64 @@ 
  *
  * @return string
  */
-function give_paypal_get_pending_donation_note( $pending_reason ) {
+function give_paypal_get_pending_donation_note($pending_reason) {
 
 	$note = '';
 
-	switch ( $pending_reason ) {
+	switch ($pending_reason) {
 
 		case 'echeck' :
 
-			$note = esc_html__( 'Payment made via eCheck and will clear automatically in 5-8 days.', 'give' );
+			$note = esc_html__('Payment made via eCheck and will clear automatically in 5-8 days.', 'give');
 
 			break;
 
 		case 'address' :
 
-			$note = esc_html__( 'Payment requires a confirmed donor address and must be accepted manually through PayPal.', 'give' );
+			$note = esc_html__('Payment requires a confirmed donor address and must be accepted manually through PayPal.', 'give');
 
 			break;
 
 		case 'intl' :
 
-			$note = esc_html__( 'Payment must be accepted manually through PayPal due to international account regulations.', 'give' );
+			$note = esc_html__('Payment must be accepted manually through PayPal due to international account regulations.', 'give');
 
 			break;
 
 		case 'multi-currency' :
 
-			$note = esc_html__( 'Payment received in non-shop currency and must be accepted manually through PayPal.', 'give' );
+			$note = esc_html__('Payment received in non-shop currency and must be accepted manually through PayPal.', 'give');
 
 			break;
 
 		case 'paymentreview' :
 		case 'regulatory_review' :
 
-			$note = esc_html__( 'Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations.', 'give' );
+			$note = esc_html__('Payment is being reviewed by PayPal staff as high-risk or in possible violation of government regulations.', 'give');
 
 			break;
 
 		case 'unilateral' :
 
-			$note = esc_html__( 'Payment was sent to non-confirmed or non-registered email address.', 'give' );
+			$note = esc_html__('Payment was sent to non-confirmed or non-registered email address.', 'give');
 
 			break;
 
 		case 'upgrade' :
 
-			$note = esc_html__( 'PayPal account must be upgraded before this payment can be accepted.', 'give' );
+			$note = esc_html__('PayPal account must be upgraded before this payment can be accepted.', 'give');
 
 			break;
 
 		case 'verify' :
 
-			$note = esc_html__( 'PayPal account is not verified. Verify account in order to accept this donation.', 'give' );
+			$note = esc_html__('PayPal account is not verified. Verify account in order to accept this donation.', 'give');
 
 			break;
 
 		case 'other' :
 
-			$note = esc_html__( 'Payment is pending for unknown reasons. Contact PayPal support for assistance.', 'give' );
+			$note = esc_html__('Payment is pending for unknown reasons. Contact PayPal support for assistance.', 'give');
 
 			break;
 

includes/gateways/functions.php

Spacing +67 added lines, -67 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,16 +24,16 @@ 
 	// Default, built-in gateways
 	$gateways = array(
 		'paypal' => array(
-			'admin_label'    => esc_html__( 'PayPal Standard', 'give' ),
-			'checkout_label' => esc_html__( 'PayPal', 'give' ),
+			'admin_label'    => esc_html__('PayPal Standard', 'give'),
+			'checkout_label' => esc_html__('PayPal', 'give'),
 		),
 		'manual' => array(
-			'admin_label'    => esc_html__( 'Test Donation', 'give' ),
-			'checkout_label' => esc_html__( 'Test Donation', 'give' )
+			'admin_label'    => esc_html__('Test Donation', 'give'),
+			'checkout_label' => esc_html__('Test Donation', 'give')
 		),
 	);
 
-	return apply_filters( 'give_payment_gateways', $gateways );
+	return apply_filters('give_payment_gateways', $gateways);
 
 }
 
@@ -47,20 +47,20 @@ 
 
 	$gateways = give_get_payment_gateways();
 
-	$enabled = isset( $_POST['gateways'] ) ? $_POST['gateways'] : give_get_option( 'gateways' );
+	$enabled = isset($_POST['gateways']) ? $_POST['gateways'] : give_get_option('gateways');
 
 	$gateway_list = array();
 
-	foreach ( $gateways as $key => $gateway ) {
-		if ( isset( $enabled[ $key ] ) && $enabled[ $key ] == 1 ) {
-			$gateway_list[ $key ] = $gateway;
+	foreach ($gateways as $key => $gateway) {
+		if (isset($enabled[$key]) && $enabled[$key] == 1) {
+			$gateway_list[$key] = $gateway;
 		}
 	}
 
 	// Set order of payment gateway in list.
-	$gateway_list = give_get_ordered_payment_gateways( $gateway_list );
+	$gateway_list = give_get_ordered_payment_gateways($gateway_list);
 
-	return apply_filters( 'give_enabled_payment_gateways', $gateway_list );
+	return apply_filters('give_enabled_payment_gateways', $gateway_list);
 }
 
 /**
@@ -72,12 +72,12 @@ 
  *
  * @return boolean true if enabled, false otherwise
  */
-function give_is_gateway_active( $gateway ) {
+function give_is_gateway_active($gateway) {
 	$gateways = give_get_enabled_payment_gateways();
 
-	$ret = array_key_exists( $gateway, $gateways );
+	$ret = array_key_exists($gateway, $gateways);
 
-	return apply_filters( 'give_is_gateway_active', $ret, $gateway, $gateways );
+	return apply_filters('give_is_gateway_active', $ret, $gateway, $gateways);
 }
 
 /**
@@ -89,23 +89,23 @@ 
  *
  * @return string Gateway ID
  */
-function give_get_default_gateway( $form_id ) {
+function give_get_default_gateway($form_id) {
 
 	$give_options = give_get_settings();
-	$default      = isset( $give_options['default_gateway'] ) && give_is_gateway_active( $give_options['default_gateway'] ) ? $give_options['default_gateway'] : 'paypal';
-	$form_default = get_post_meta( $form_id, '_give_default_gateway', true );
+	$default      = isset($give_options['default_gateway']) && give_is_gateway_active($give_options['default_gateway']) ? $give_options['default_gateway'] : 'paypal';
+	$form_default = get_post_meta($form_id, '_give_default_gateway', true);
 
 	//Single Form settings varies compared to the Global default settings.
-	if ( ! empty( $form_default ) &&
+	if ( ! empty($form_default) &&
 	     $form_id !== null &&
 	     $default !== $form_default &&
 	     $form_default !== 'global' &&
-	     give_is_gateway_active( $form_default )
+	     give_is_gateway_active($form_default)
 	) {
 		$default = $form_default;
 	}
 
-	return apply_filters( 'give_default_gateway', $default );
+	return apply_filters('give_default_gateway', $default);
 }
 
 /**
@@ -117,18 +117,18 @@ 
  *
  * @return string Gateway admin label
  */
-function give_get_gateway_admin_label( $gateway ) {
+function give_get_gateway_admin_label($gateway) {
 	$gateways = give_get_enabled_payment_gateways();
-	$label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['admin_label'] : $gateway;
-	$payment  = isset( $_GET['id'] ) ? absint( $_GET['id'] ) : false;
+	$label    = isset($gateways[$gateway]) ? $gateways[$gateway]['admin_label'] : $gateway;
+	$payment  = isset($_GET['id']) ? absint($_GET['id']) : false;
 
-	if ( $gateway == 'manual' && $payment ) {
-		if ( give_get_payment_amount( $payment ) == 0 ) {
-			$label = esc_html__( 'Test Donation', 'give' );
+	if ($gateway == 'manual' && $payment) {
+		if (give_get_payment_amount($payment) == 0) {
+			$label = esc_html__('Test Donation', 'give');
 		}
 	}
 
-	return apply_filters( 'give_gateway_admin_label', $label, $gateway );
+	return apply_filters('give_gateway_admin_label', $label, $gateway);
 }
 
 /**
@@ -140,15 +140,15 @@ 
  *
  * @return string Checkout label for the gateway
  */
-function give_get_gateway_checkout_label( $gateway ) {
+function give_get_gateway_checkout_label($gateway) {
 	$gateways = give_get_enabled_payment_gateways();
-	$label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['checkout_label'] : $gateway;
+	$label    = isset($gateways[$gateway]) ? $gateways[$gateway]['checkout_label'] : $gateway;
 
-	if ( $gateway == 'manual' ) {
-		$label = esc_html__( 'Test Donation', 'give' );
+	if ($gateway == 'manual') {
+		$label = esc_html__('Test Donation', 'give');
 	}
 
-	return apply_filters( 'give_gateway_checkout_label', $label, $gateway );
+	return apply_filters('give_gateway_checkout_label', $label, $gateway);
 }
 
 /**
@@ -160,11 +160,11 @@ 
  *
  * @return array Options the gateway supports
  */
-function give_get_gateway_supports( $gateway ) {
+function give_get_gateway_supports($gateway) {
 	$gateways = give_get_enabled_payment_gateways();
-	$supports = isset( $gateways[ $gateway ]['supports'] ) ? $gateways[ $gateway ]['supports'] : array();
+	$supports = isset($gateways[$gateway]['supports']) ? $gateways[$gateway]['supports'] : array();
 
-	return apply_filters( 'give_gateway_supports', $supports, $gateway );
+	return apply_filters('give_gateway_supports', $supports, $gateway);
 }
 
 /**
@@ -177,9 +177,9 @@ 
  *
  * @return void
  */
-function give_send_to_gateway( $gateway, $payment_data ) {
+function give_send_to_gateway($gateway, $payment_data) {
 
-	$payment_data['gateway_nonce'] = wp_create_nonce( 'give-gateway' );
+	$payment_data['gateway_nonce'] = wp_create_nonce('give-gateway');
 
 	/**
 	 * Fires while loading payment gateway via AJAX.
@@ -190,7 +190,7 @@ 
 	 *
 	 * @param array $payment_data All the payment data to be sent to the gateway.
 	 */
-	do_action( "give_gateway_{$gateway}", $payment_data );
+	do_action("give_gateway_{$gateway}", $payment_data);
 }
 
 
@@ -207,32 +207,32 @@ 
  *
  * @return string $enabled_gateway The slug of the gateway
  */
-function give_get_chosen_gateway( $form_id ) {
+function give_get_chosen_gateway($form_id) {
 	$gateways        = give_get_enabled_payment_gateways();
-	$request_form_id = isset( $_REQUEST['give_form_id'] ) ? $_REQUEST['give_form_id'] : 0;
-	if ( empty( $request_form_id ) ) {
-		$request_form_id = isset( $_REQUEST['form-id'] ) ? $_REQUEST['form-id'] : 0;
+	$request_form_id = isset($_REQUEST['give_form_id']) ? $_REQUEST['give_form_id'] : 0;
+	if (empty($request_form_id)) {
+		$request_form_id = isset($_REQUEST['form-id']) ? $_REQUEST['form-id'] : 0;
 	}
-	$chosen          = give_get_default_gateway( $form_id );
+	$chosen          = give_get_default_gateway($form_id);
 	$enabled_gateway = '';
 
 	//Take into account request Form ID args
-	if ( ! empty( $request_form_id ) && $form_id == $request_form_id ) {
-		$chosen = isset( $_REQUEST['payment-mode'] ) ? $_REQUEST['payment-mode'] : '';
+	if ( ! empty($request_form_id) && $form_id == $request_form_id) {
+		$chosen = isset($_REQUEST['payment-mode']) ? $_REQUEST['payment-mode'] : '';
 	}
 
-	if ( $chosen ) {
-		$enabled_gateway = urldecode( $chosen );
-	} else if ( count( $gateways ) >= 1 && ! $chosen ) {
-		foreach ( $gateways as $gateway_id => $gateway ):
+	if ($chosen) {
+		$enabled_gateway = urldecode($chosen);
+	} else if (count($gateways) >= 1 && ! $chosen) {
+		foreach ($gateways as $gateway_id => $gateway):
 			$enabled_gateway = $gateway_id;
 		endforeach;
 	} else {
-		$enabled_gateway = give_get_default_gateway( $form_id );
+		$enabled_gateway = give_get_default_gateway($form_id);
 	}
 
 
-	return apply_filters( 'give_chosen_gateway', $enabled_gateway );
+	return apply_filters('give_chosen_gateway', $enabled_gateway);
 }
 
 /**
@@ -249,8 +249,8 @@ 
  *
  * @return int ID of the new log entry
  */
-function give_record_gateway_error( $title = '', $message = '', $parent = 0 ) {
-	return give_record_log( $title, $message, $parent, 'gateway_error' );
+function give_record_gateway_error($title = '', $message = '', $parent = 0) {
+	return give_record_log($title, $message, $parent, 'gateway_error');
 }
 
 /**
@@ -263,7 +263,7 @@ 
  *
  * @return int
  */
-function give_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) {
+function give_count_sales_by_gateway($gateway_id = 'paypal', $status = 'publish') {
 
 	$ret  = 0;
 	$args = array(
@@ -275,9 +275,9 @@ 
 		'fields'      => 'ids'
 	);
 
-	$payments = new WP_Query( $args );
+	$payments = new WP_Query($args);
 
-	if ( $payments ) {
+	if ($payments) {
 		$ret = $payments->post_count;
 	}
 
@@ -294,27 +294,27 @@ 
  *
  * @return array $gateways All the available gateways
  */
-function give_get_ordered_payment_gateways( $gateways ) {
+function give_get_ordered_payment_gateways($gateways) {
 
 	//  Get gateways setting.
-	$gateways_setting = isset( $_POST['gateways'] ) ? $_POST['gateways'] : give_get_option( 'gateways' );
+	$gateways_setting = isset($_POST['gateways']) ? $_POST['gateways'] : give_get_option('gateways');
 
 	// Return from here if we do not have gateways setting.
-	if ( empty( $gateways_setting ) ) {
+	if (empty($gateways_setting)) {
 		return $gateways;
 	}
 
 	// Reverse array to order payment gateways.
-	$gateways_setting = array_reverse( $gateways_setting );
+	$gateways_setting = array_reverse($gateways_setting);
 
 	// Reorder gateways array
-	foreach ( $gateways_setting as $gateway_key => $value ) {
+	foreach ($gateways_setting as $gateway_key => $value) {
 
-		$new_gateway_value = isset( $gateways[ $gateway_key ] ) ? $gateways[ $gateway_key ] : '';
-		unset( $gateways[ $gateway_key ] );
+		$new_gateway_value = isset($gateways[$gateway_key]) ? $gateways[$gateway_key] : '';
+		unset($gateways[$gateway_key]);
 
-		if ( ! empty( $new_gateway_value ) ) {
-			$gateways = array_merge( array( $gateway_key => $new_gateway_value ), $gateways );
+		if ( ! empty($new_gateway_value)) {
+			$gateways = array_merge(array($gateway_key => $new_gateway_value), $gateways);
 		}
 	}
 
@@ -325,5 +325,5 @@ 
 	 *
 	 * @param array $gateways All the available gateways
 	 */
-	return apply_filters( 'give_payment_gateways_order', $gateways );
+	return apply_filters('give_payment_gateways_order', $gateways);
 }

includes/gateways/offline-donations.php

Spacing +123 added lines, -123 removed lines

@@ -18,17 +18,17 @@ 
  *
  * @return array
  */
-function give_offline_register_gateway( $gateways ) {
+function give_offline_register_gateway($gateways) {
 	// Format: ID => Name
 	$gateways['offline'] = array(
-		'admin_label'    => esc_attr__( 'Offline Donation', 'give' ),
-		'checkout_label' => esc_attr__( 'Offline Donation', 'give' )
+		'admin_label'    => esc_attr__('Offline Donation', 'give'),
+		'checkout_label' => esc_attr__('Offline Donation', 'give')
 	);
 
 	return $gateways;
 }
 
-add_filter( 'give_payment_gateways', 'give_offline_register_gateway', 1 );
+add_filter('give_payment_gateways', 'give_offline_register_gateway', 1);
 
 
 /**
@@ -40,14 +40,14 @@ 
  *
  * @return void
  */
-function give_offline_payment_cc_form( $form_id ) {
+function give_offline_payment_cc_form($form_id) {
 
-	$post_offline_customization_option = get_post_meta( $form_id, '_give_customize_offline_donations', true );
-	$post_offline_instructions         = get_post_meta( $form_id, '_give_offline_checkout_notes', true );
-	$global_offline_instruction        = give_get_option( 'global_offline_donation_content' );
+	$post_offline_customization_option = get_post_meta($form_id, '_give_customize_offline_donations', true);
+	$post_offline_instructions         = get_post_meta($form_id, '_give_offline_checkout_notes', true);
+	$global_offline_instruction        = give_get_option('global_offline_donation_content');
 	$offline_instructions              = $global_offline_instruction;
 
-	if ( $post_offline_customization_option == 'yes' ) {
+	if ($post_offline_customization_option == 'yes') {
 		$offline_instructions = $post_offline_instructions;
 	}
 
@@ -60,14 +60,14 @@ 
 	 *
 	 * @param int $form_id Give form id.
 	 */
-	do_action( 'give_before_offline_info_fields', $form_id );
+	do_action('give_before_offline_info_fields', $form_id);
 	?>
 	<fieldset id="give_offline_payment_info">
 		<?php
-		$settings_url         = admin_url( 'post.php?post=' . $form_id . '&action=edit&message=1' );
+		$settings_url         = admin_url('post.php?post='.$form_id.'&action=edit&message=1');
 		/* translators: %s: form settings url */
-		$offline_instructions = ! empty( $offline_instructions ) ? $offline_instructions : sprintf( __( 'Please enter offline donation instructions in <a href="%s">this form\'s settings</a>.', 'give' ), $settings_url );
-		echo wpautop( stripslashes( $offline_instructions ) );
+		$offline_instructions = ! empty($offline_instructions) ? $offline_instructions : sprintf(__('Please enter offline donation instructions in <a href="%s">this form\'s settings</a>.', 'give'), $settings_url);
+		echo wpautop(stripslashes($offline_instructions));
 		?>
 	</fieldset>
 	<?php
@@ -78,34 +78,34 @@ 
 	 *
 	 * @param int $form_id Give form id.
 	 */
-	do_action( 'give_after_offline_info_fields', $form_id );
+	do_action('give_after_offline_info_fields', $form_id);
 
 	echo ob_get_clean();
 }
 
-add_action( 'give_offline_cc_form', 'give_offline_payment_cc_form' );
+add_action('give_offline_cc_form', 'give_offline_payment_cc_form');
 
 /**
  * Give Offline Billing Field
  *
  * @param $form_id
  */
-function give_offline_billing_fields( $form_id ) {
+function give_offline_billing_fields($form_id) {
 	//Enable Default CC fields (billing info)
-	$post_offline_cc_fields        = get_post_meta( $form_id, '_give_offline_donation_enable_billing_fields_single', true );
-	$post_offline_customize_option = get_post_meta( $form_id, '_give_customize_offline_donations', true );
+	$post_offline_cc_fields        = get_post_meta($form_id, '_give_offline_donation_enable_billing_fields_single', true);
+	$post_offline_customize_option = get_post_meta($form_id, '_give_customize_offline_donations', true);
 
-	$global_offline_cc_fields      = give_get_option( 'give_offline_donation_enable_billing_fields' );
+	$global_offline_cc_fields      = give_get_option('give_offline_donation_enable_billing_fields');
 
 	//Output CC Address fields if global option is on and user hasn't elected to customize this form's offline donation options
-	if ( $global_offline_cc_fields == 'on' && $post_offline_customize_option !== 'yes' ) {
-		give_default_cc_address_fields( $form_id );
-	} elseif($post_offline_customize_option == 'yes' && $post_offline_cc_fields == 'on') {
-		give_default_cc_address_fields( $form_id );
+	if ($global_offline_cc_fields == 'on' && $post_offline_customize_option !== 'yes') {
+		give_default_cc_address_fields($form_id);
+	} elseif ($post_offline_customize_option == 'yes' && $post_offline_cc_fields == 'on') {
+		give_default_cc_address_fields($form_id);
 	}
 }
 
-add_action( 'give_before_offline_info_fields', 'give_offline_billing_fields', 10, 1 );
+add_action('give_before_offline_info_fields', 'give_offline_billing_fields', 10, 1);
 
 /**
  * Process the payment
@@ -116,16 +116,16 @@ 
  *
  * @return void
  */
-function give_offline_process_payment( $purchase_data ) {
+function give_offline_process_payment($purchase_data) {
 
-	$purchase_summary = give_get_purchase_summary( $purchase_data );
+	$purchase_summary = give_get_purchase_summary($purchase_data);
 
 	// setup the payment details
 	$payment_data = array(
 		'price'           => $purchase_data['price'],
 		'give_form_title' => $purchase_data['post_data']['give-form-title'],
-		'give_form_id'    => intval( $purchase_data['post_data']['give-form-id'] ),
-		'give_price_id'   => isset( $purchase_data['post_data']['give-price-id'] ) ? $purchase_data['post_data']['give-price-id'] : '',
+		'give_form_id'    => intval($purchase_data['post_data']['give-form-id']),
+		'give_price_id'   => isset($purchase_data['post_data']['give-price-id']) ? $purchase_data['post_data']['give-price-id'] : '',
 		'date'            => $purchase_data['date'],
 		'user_email'      => $purchase_data['user_email'],
 		'purchase_key'    => $purchase_data['purchase_key'],
@@ -137,20 +137,20 @@ 
 
 
 	// record the pending payment
-	$payment = give_insert_payment( $payment_data );
+	$payment = give_insert_payment($payment_data);
 
-	if ( $payment ) {
-		give_offline_send_admin_notice( $payment );
-		give_offline_send_donor_instructions( $payment );
+	if ($payment) {
+		give_offline_send_admin_notice($payment);
+		give_offline_send_donor_instructions($payment);
 		give_send_to_success_page();
 	} else {
 		// if errors are present, send the user back to the donation form so they can be corrected
-		give_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['give-gateway'] );
+		give_send_back_to_checkout('?payment-mode='.$purchase_data['post_data']['give-gateway']);
 	}
 
 }
 
-add_action( 'give_gateway_offline', 'give_offline_process_payment' );
+add_action('give_gateway_offline', 'give_offline_process_payment');
 
 
 /**
@@ -163,59 +163,59 @@ 
  * @since       1.0
  * @return void
  */
-function give_offline_send_donor_instructions( $payment_id = 0 ) {
+function give_offline_send_donor_instructions($payment_id = 0) {
 
-	$payment_data                      = give_get_payment_meta( $payment_id );
-	$post_offline_customization_option = get_post_meta( $payment_data['form_id'], '_give_customize_offline_donations', true );
+	$payment_data                      = give_get_payment_meta($payment_id);
+	$post_offline_customization_option = get_post_meta($payment_data['form_id'], '_give_customize_offline_donations', true);
 
 	//Customize email content depending on whether the single form has been customized
-	$email_content = give_get_option( 'global_offline_donation_email' );
+	$email_content = give_get_option('global_offline_donation_email');
 
-	if ( $post_offline_customization_option === 'yes' ) {
-		$email_content = get_post_meta( $payment_data['form_id'], '_give_offline_donation_email', true );
+	if ($post_offline_customization_option === 'yes') {
+		$email_content = get_post_meta($payment_data['form_id'], '_give_offline_donation_email', true);
 	}
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
 
 	/**
 	 * Filters the from name.
 	 *
 	 * @since 1.7
 	 */
-	$from_name = apply_filters( 'give_donation_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = apply_filters('give_donation_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
 
 	/**
 	 * Filters the from email.
 	 *
 	 * @since 1.7
 	 */
-	$from_email = apply_filters( 'give_donation_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = apply_filters('give_donation_from_address', $from_email, $payment_id, $payment_data);
 
-	$to_email = give_get_payment_user_email( $payment_id );
+	$to_email = give_get_payment_user_email($payment_id);
 
-	$subject = give_get_option( 'offline_donation_subject', esc_html__( 'Offline Donation Instructions', 'give' ) );
-	if ( $post_offline_customization_option === 'yes' ) {
-		$subject = get_post_meta( $payment_data['form_id'], '_give_offline_donation_subject', true );
+	$subject = give_get_option('offline_donation_subject', esc_html__('Offline Donation Instructions', 'give'));
+	if ($post_offline_customization_option === 'yes') {
+		$subject = get_post_meta($payment_data['form_id'], '_give_offline_donation_subject', true);
 	}
 
-	$subject = apply_filters( 'give_offline_donation_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = apply_filters('give_offline_donation_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$attachments = apply_filters( 'give_offline_donation_attachments', array(), $payment_id, $payment_data );
-	$message     = give_do_email_tags( $email_content, $payment_id );
+	$attachments = apply_filters('give_offline_donation_attachments', array(), $payment_id, $payment_data);
+	$message     = give_do_email_tags($email_content, $payment_id);
 
 	$emails = Give()->emails;
 
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', esc_html__( 'Offline Donation Instructions', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', esc_html__('Offline Donation Instructions', 'give'));
 
-	$headers = apply_filters( 'give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data );
-	$emails->__set( 'headers', $headers );
+	$headers = apply_filters('give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data);
+	$emails->__set('headers', $headers);
 
-	$emails->send( $to_email, $subject, $message, $attachments );
+	$emails->send($to_email, $subject, $message, $attachments);
 
 }
 
@@ -232,52 +232,52 @@ 
  * @return void
  *
  */
-function give_offline_send_admin_notice( $payment_id = 0 ) {
+function give_offline_send_admin_notice($payment_id = 0) {
 
 	/* Send an email notification to the admin */
 	$admin_email = give_get_admin_notice_emails();
-	$user_info   = give_get_payment_meta_user_info( $payment_id );
+	$user_info   = give_get_payment_meta_user_info($payment_id);
 
-	if ( isset( $user_info['id'] ) && $user_info['id'] > 0 ) {
-		$user_data = get_userdata( $user_info['id'] );
+	if (isset($user_info['id']) && $user_info['id'] > 0) {
+		$user_data = get_userdata($user_info['id']);
 		$name      = $user_data->display_name;
-	} elseif ( isset( $user_info['first_name'] ) && isset( $user_info['last_name'] ) ) {
-		$name = $user_info['first_name'] . ' ' . $user_info['last_name'];
+	} elseif (isset($user_info['first_name']) && isset($user_info['last_name'])) {
+		$name = $user_info['first_name'].' '.$user_info['last_name'];
 	} else {
 		$name = $user_info['email'];
 	}
 
-	$amount = give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) );
+	$amount = give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)));
 
-	$admin_subject = apply_filters( 'give_offline_admin_donation_notification_subject', esc_attr__( 'New Pending Donation', 'give' ), $payment_id );
+	$admin_subject = apply_filters('give_offline_admin_donation_notification_subject', esc_attr__('New Pending Donation', 'give'), $payment_id);
 
-	$admin_message = esc_attr__( 'Dear Admin,', 'give' ) . "\n\n";
-	$admin_message .= esc_attr__( 'An offline donation has been made on your website:', 'give' ) . ' ' . get_bloginfo( 'name' ) . ' ';
-	$admin_message .= esc_attr__( 'Hooray! The donation is in a pending status and is awaiting payment. Donation instructions have been emailed to the donor. Once you receive payment, be sure to mark the donation as complete using the link below.', 'give' ) . "\n\n";
+	$admin_message = esc_attr__('Dear Admin,', 'give')."\n\n";
+	$admin_message .= esc_attr__('An offline donation has been made on your website:', 'give').' '.get_bloginfo('name').' ';
+	$admin_message .= esc_attr__('Hooray! The donation is in a pending status and is awaiting payment. Donation instructions have been emailed to the donor. Once you receive payment, be sure to mark the donation as complete using the link below.', 'give')."\n\n";
 
 
-	$admin_message .= '<strong>' . esc_attr__( 'Donor:', 'give' ) . '</strong> {fullname}' . "\n";
-	$admin_message .= '<strong>' . esc_attr__( 'Amount:', 'give' ) . '</strong> {price}' . "\n\n";
+	$admin_message .= '<strong>'.esc_attr__('Donor:', 'give').'</strong> {fullname}'."\n";
+	$admin_message .= '<strong>'.esc_attr__('Amount:', 'give').'</strong> {price}'."\n\n";
 
 	$admin_message .= sprintf(
 		'<a href="%1$s">%2$s</a>',
-		admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id=' . $payment_id ),
-		esc_html__( 'Click Here to View and/or Update Donation Details', 'give' )
-	) . "\n\n";
+		admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id='.$payment_id),
+		esc_html__('Click Here to View and/or Update Donation Details', 'give')
+	)."\n\n";
 
-	$admin_message = apply_filters( 'give_offline_admin_donation_notification', $admin_message, $payment_id );
-	$admin_message = give_do_email_tags( $admin_message, $payment_id );
+	$admin_message = apply_filters('give_offline_admin_donation_notification', $admin_message, $payment_id);
+	$admin_message = give_do_email_tags($admin_message, $payment_id);
 
-	$attachments   = apply_filters( 'give_offline_admin_donation_notification_attachments', array(), $payment_id );
-	$admin_headers = apply_filters( 'give_offline_admin_donation_notification_headers', array(), $payment_id );
+	$attachments   = apply_filters('give_offline_admin_donation_notification_attachments', array(), $payment_id);
+	$admin_headers = apply_filters('give_offline_admin_donation_notification_headers', array(), $payment_id);
 
 	//Send Email
 	$emails = Give()->emails;
-	if ( ! empty( $admin_headers ) ) {
-		$emails->__set( 'headers', $admin_headers );
+	if ( ! empty($admin_headers)) {
+		$emails->__set('headers', $admin_headers);
 	}
 
-	$emails->send( $admin_email, $admin_subject, $admin_message, $attachments );
+	$emails->send($admin_email, $admin_subject, $admin_message, $attachments);
 
 }
 
@@ -288,15 +288,15 @@ 
  * @since  1.0
  * @return array
  */
-function give_offline_add_settings( $settings ) {
+function give_offline_add_settings($settings) {
 
 	//Vars
 	$prefix = '_give_';
 
-	$is_gateway_active = give_is_gateway_active( 'offline' );
+	$is_gateway_active = give_is_gateway_active('offline');
 
 	//this gateway isn't active
-	if ( ! $is_gateway_active ) {
+	if ( ! $is_gateway_active) {
 		//return settings and bounce
 		return $settings;
 	}
@@ -305,27 +305,27 @@ 
 	$check_settings = array(
 
 		array(
-			'name'    => esc_attr__( 'Customize Offline Donations', 'give' ),
-			'desc'    => esc_attr__( 'If you would like to customize the donation instructions for this specific forms check this option.', 'give' ),
-			'id'      => $prefix . 'customize_offline_donations',
+			'name'    => esc_attr__('Customize Offline Donations', 'give'),
+			'desc'    => esc_attr__('If you would like to customize the donation instructions for this specific forms check this option.', 'give'),
+			'id'      => $prefix.'customize_offline_donations',
 			'type'    => 'radio_inline',
 			'default' => 'no',
 			'options' => array(
-				'yes' => esc_attr__( 'Yes', 'give' ),
-				'no'  => esc_attr__( 'No', 'give' ),
+				'yes' => esc_attr__('Yes', 'give'),
+				'no'  => esc_attr__('No', 'give'),
 			),
 		),
 		array(
-			'name'        => esc_attr__( 'Request Billing Information', 'give' ),
-			'desc'        => esc_attr__( 'This option will enable the billing details section for this form\'s offline donation payment gateway. The fieldset will appear above the offline donation instructions.', 'give' ),
-			'id'          => $prefix . 'offline_donation_enable_billing_fields_single',
+			'name'        => esc_attr__('Request Billing Information', 'give'),
+			'desc'        => esc_attr__('This option will enable the billing details section for this form\'s offline donation payment gateway. The fieldset will appear above the offline donation instructions.', 'give'),
+			'id'          => $prefix.'offline_donation_enable_billing_fields_single',
 			'row_classes' => 'give-subfield',
 			'type'        => 'checkbox'
 		),
 		array(
-			'id'          => $prefix . 'offline_checkout_notes',
-			'name'        => esc_attr__( 'Offline Donation Instructions', 'give' ),
-			'desc'        => esc_attr__( 'Enter the instructions you want to display to the donor during the donation process. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ),
+			'id'          => $prefix.'offline_checkout_notes',
+			'name'        => esc_attr__('Offline Donation Instructions', 'give'),
+			'desc'        => esc_attr__('Enter the instructions you want to display to the donor during the donation process. Most likely this would include important information like mailing address and who to make the check out to.', 'give'),
 			'default'     => give_get_default_offline_donation_content(),
 			'type'        => 'wysiwyg',
 			'row_classes' => 'give-subfield',
@@ -334,17 +334,17 @@ 
 			)
 		),
 		array(
-			'id'          => $prefix . 'offline_donation_subject',
-			'name'        => esc_attr__( 'Offline Donation Email Instructions Subject', 'give' ),
-			'desc'        => esc_attr__( 'Enter the subject line for the donation receipt email.', 'give' ),
-			'default'     => esc_attr__( '{donation} - Offline Donation Instructions', 'give' ),
+			'id'          => $prefix.'offline_donation_subject',
+			'name'        => esc_attr__('Offline Donation Email Instructions Subject', 'give'),
+			'desc'        => esc_attr__('Enter the subject line for the donation receipt email.', 'give'),
+			'default'     => esc_attr__('{donation} - Offline Donation Instructions', 'give'),
 			'row_classes' => 'give-subfield',
 			'type'        => 'text'
 		),
 		array(
-			'id'          => $prefix . 'offline_donation_email',
-			'name'        => esc_attr__( 'Offline Donation Email Instructions', 'give' ),
-			'desc'        => esc_attr__( 'Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ),
+			'id'          => $prefix.'offline_donation_email',
+			'name'        => esc_attr__('Offline Donation Email Instructions', 'give'),
+			'desc'        => esc_attr__('Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give'),
 			'default'     => give_get_default_offline_donation_email_content(),
 			'type'        => 'wysiwyg',
 			'row_classes' => 'give-subfield',
@@ -354,10 +354,10 @@ 
 		)
 	);
 
-	return array_merge( $settings, $check_settings );
+	return array_merge($settings, $check_settings);
 }
 
-add_filter( 'give_forms_display_options_metabox_fields', 'give_offline_add_settings' );
+add_filter('give_forms_display_options_metabox_fields', 'give_offline_add_settings');
 
 
 /**
@@ -369,32 +369,32 @@ 
  */
 function give_get_default_offline_donation_content() {
 
-	$sitename = get_bloginfo( 'sitename' );
+	$sitename = get_bloginfo('sitename');
 
-	$default_text = '<p>' . esc_attr__( 'In order to make an offline donation we ask that you please follow these instructions', 'give' ) . ': </p>';
+	$default_text = '<p>'.esc_attr__('In order to make an offline donation we ask that you please follow these instructions', 'give').': </p>';
 	$default_text .= '<ol>';
 	$default_text .= '<li>';
 	$default_text .= sprintf(
 		/* translators: %s: site name */
-		esc_html__( 'Make a check payable to "%s"', 'give' ),
+		esc_html__('Make a check payable to "%s"', 'give'),
 		$sitename
 	);
 	$default_text .= '</li>';
 	$default_text .= '<li>';
 	$default_text .= sprintf(
 		/* translators: %s: site name */
-		esc_html__( 'On the memo line of the check, please indicate that the donation is for "%s"', 'give' ),
+		esc_html__('On the memo line of the check, please indicate that the donation is for "%s"', 'give'),
 		$sitename
 	);
 	$default_text .= '</li>';
-	$default_text .= '<li>' . esc_html__( 'Please mail your check to:', 'give' ) . '</li>';
+	$default_text .= '<li>'.esc_html__('Please mail your check to:', 'give').'</li>';
 	$default_text .= '</ol>';
-	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>' . $sitename . '</em><br>';
+	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>'.$sitename.'</em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>123 G Street </em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>San Diego, CA 92101 </em><br>';
-	$default_text .= '<p>' . esc_attr__( 'All contributions will be gratefully acknowledged and are tax deductible.', 'give' ) . '</p>';
+	$default_text .= '<p>'.esc_attr__('All contributions will be gratefully acknowledged and are tax deductible.', 'give').'</p>';
 
-	return apply_filters( 'give_default_offline_donation_content', $default_text );
+	return apply_filters('give_default_offline_donation_content', $default_text);
 
 }
 
@@ -407,33 +407,33 @@ 
  */
 function give_get_default_offline_donation_email_content() {
 
-	$sitename      = get_bloginfo( 'sitename' );
-	$default_text  = '<p>' . esc_html__( 'Dear {name},', 'give' ) . '</p>';
-	$default_text .= '<p>' . esc_html__( 'Thank you for your offline donation request! Your generosity is greatly appreciated. In order to make an offline donation we ask that you please follow these instructions:', 'give' ) . '</p>';
+	$sitename      = get_bloginfo('sitename');
+	$default_text  = '<p>'.esc_html__('Dear {name},', 'give').'</p>';
+	$default_text .= '<p>'.esc_html__('Thank you for your offline donation request! Your generosity is greatly appreciated. In order to make an offline donation we ask that you please follow these instructions:', 'give').'</p>';
 	$default_text .= '<ol>';
 	$default_text .= '<li>';
 	$default_text .= sprintf(
 		/* translators: %s: site name */
-		esc_html__( 'Make a check payable to "%s"', 'give' ),
+		esc_html__('Make a check payable to "%s"', 'give'),
 		$sitename
 	);
 	$default_text .= '</li>';
 	$default_text .= '<li>';
 	$default_text .= sprintf(
 		/* translators: %s: site name */
-		esc_html__( 'On the memo line of the check, please indicate that the donation is for "%s"', 'give' ),
+		esc_html__('On the memo line of the check, please indicate that the donation is for "%s"', 'give'),
 		$sitename
 	);
 	$default_text .= '</li>';
-	$default_text .= '<li>' . esc_html__( 'Please mail your check to:', 'give' ) . '</li>';
+	$default_text .= '<li>'.esc_html__('Please mail your check to:', 'give').'</li>';
 	$default_text .= '</ol>';
-	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>' . $sitename . '</em><br>';
+	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>'.$sitename.'</em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>123 G Street </em><br>';
 	$default_text .= '&nbsp;&nbsp;&nbsp;&nbsp;<em>San Diego, CA 92101 </em><br>';
-	$default_text .= '<p>' . esc_html__( 'Once your donation has been received we will mark it as complete and you will receive an email receipt for your records. Please contact us with any questions you may have!', 'give' ) . '</p>';
-	$default_text .= '<p>' . esc_html__( 'Sincerely,', 'give' ) . '</p>';
-	$default_text .= '<p>' . $sitename . '</p>';
+	$default_text .= '<p>'.esc_html__('Once your donation has been received we will mark it as complete and you will receive an email receipt for your records. Please contact us with any questions you may have!', 'give').'</p>';
+	$default_text .= '<p>'.esc_html__('Sincerely,', 'give').'</p>';
+	$default_text .= '<p>'.$sitename.'</p>';
 
-	return apply_filters( 'give_default_offline_donation_content', $default_text );
+	return apply_filters('give_default_offline_donation_content', $default_text);
 
 }

includes/country-functions.php

Spacing +333 added lines, -333 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,9 +23,9 @@ 
  */
 function give_get_country() {
 	$give_options = give_get_settings();
-	$country = isset( $give_options['base_country'] ) ? $give_options['base_country'] : 'US';
+	$country = isset($give_options['base_country']) ? $give_options['base_country'] : 'US';
 
-	return apply_filters( 'give_give_country', $country );
+	return apply_filters('give_give_country', $country);
 }
 
 /**
@@ -36,9 +36,9 @@ 
  */
 function give_get_state() {
 	$give_options = give_get_settings();
-	$state = isset( $give_options['base_state'] ) ? $give_options['base_state'] : false;
+	$state = isset($give_options['base_state']) ? $give_options['base_state'] : false;
 
-	return apply_filters( 'give_give_state', $state );
+	return apply_filters('give_give_state', $state);
 }
 
 /**
@@ -50,13 +50,13 @@ 
  *
  * @return mixed|void  A list of states for the shop's base country
  */
-function give_get_states( $country = null ) {
+function give_get_states($country = null) {
 
-	if ( empty( $country ) ) {
+	if (empty($country)) {
 		$country = give_get_country();
 	}
 
-	switch ( $country ) :
+	switch ($country) :
 
 		case 'US' :
 			$states = give_get_states_list();
@@ -106,7 +106,7 @@ 
 
 	endswitch;
 
-	return apply_filters( 'give_give_states', $states );
+	return apply_filters('give_give_states', $states);
 }
 
 
@@ -119,253 +119,253 @@ 
 function give_get_country_list() {
 	$countries = array(
 		''   => '',
-		'US' => esc_html__( 'United States', 'give' ),
-		'CA' => esc_html__( 'Canada', 'give' ),
-		'GB' => esc_html__( 'United Kingdom', 'give' ),
-		'AF' => esc_html__( 'Afghanistan', 'give' ),
-		'AL' => esc_html__( 'Albania', 'give' ),
-		'DZ' => esc_html__( 'Algeria', 'give' ),
-		'AS' => esc_html__( 'American Samoa', 'give' ),
-		'AD' => esc_html__( 'Andorra', 'give' ),
-		'AO' => esc_html__( 'Angola', 'give' ),
-		'AI' => esc_html__( 'Anguilla', 'give' ),
-		'AQ' => esc_html__( 'Antarctica', 'give' ),
-		'AG' => esc_html__( 'Antigua and Barbuda', 'give' ),
-		'AR' => esc_html__( 'Argentina', 'give' ),
-		'AM' => esc_html__( 'Armenia', 'give' ),
-		'AW' => esc_html__( 'Aruba', 'give' ),
-		'AU' => esc_html__( 'Australia', 'give' ),
-		'AT' => esc_html__( 'Austria', 'give' ),
-		'AZ' => esc_html__( 'Azerbaijan', 'give' ),
-		'BS' => esc_html__( 'Bahamas', 'give'),
-		'BH' => esc_html__( 'Bahrain', 'give' ),
-		'BD' => esc_html__( 'Bangladesh', 'give' ),
-		'BB' => esc_html__( 'Barbados', 'give' ),
-		'BY' => esc_html__( 'Belarus', 'give' ),
-		'BE' => esc_html__( 'Belgium', 'give' ),
-		'BZ' => esc_html__( 'Belize', 'give' ),
-		'BJ' => esc_html__( 'Benin', 'give' ),
-		'BM' => esc_html__( 'Bermuda', 'give' ),
-		'BT' => esc_html__( 'Bhutan', 'give' ),
-		'BO' => esc_html__( 'Bolivia', 'give' ),
-		'BA' => esc_html__( 'Bosnia and Herzegovina', 'give' ),
-		'BW' => esc_html__( 'Botswana', 'give' ),
-		'BV' => esc_html__( 'Bouvet Island', 'give' ),
-		'BR' => esc_html__( 'Brazil', 'give' ),
-		'IO' => esc_html__( 'British Indian Ocean Territory', 'give' ),
-		'BN' => esc_html__( 'Brunei Darrussalam', 'give' ),
-		'BG' => esc_html__( 'Bulgaria', 'give' ),
-		'BF' => esc_html__( 'Burkina Faso', 'give' ),
-		'BI' => esc_html__( 'Burundi', 'give' ),
-		'KH' => esc_html__( 'Cambodia', 'give' ),
-		'CM' => esc_html__( 'Cameroon', 'give' ),
-		'CV' => esc_html__( 'Cape Verde', 'give' ),
-		'KY' => esc_html__( 'Cayman Islands', 'give' ),
-		'CF' => esc_html__( 'Central African Republic', 'give' ),
-		'TD' => esc_html__( 'Chad', 'give' ),
-		'CL' => esc_html__( 'Chile', 'give' ),
-		'CN' => esc_html__( 'China', 'give' ),
-		'CX' => esc_html__( 'Christmas Island', 'give' ),
-		'CC' => esc_html__( 'Cocos Islands', 'give' ),
-		'CO' => esc_html__( 'Colombia', 'give' ),
-		'KM' => esc_html__( 'Comoros', 'give' ),
-		'CD' => esc_html__( 'Congo, Democratic People\'s Republic', 'give' ),
-		'CG' => esc_html__( 'Congo, Republic of', 'give' ),
-		'CK' => esc_html__( 'Cook Islands', 'give' ),
-		'CR' => esc_html__( 'Costa Rica', 'give' ),
-		'CI' => esc_html__( 'Cote d\'Ivoire', 'give' ),
-		'HR' => esc_html__( 'Croatia/Hrvatska', 'give' ),
-		'CU' => esc_html__( 'Cuba', 'give' ),
-		'CY' => esc_html__( 'Cyprus Island', 'give' ),
-		'CZ' => esc_html__( 'Czech Republic', 'give' ),
-		'DK' => esc_html__( 'Denmark', 'give' ),
-		'DJ' => esc_html__( 'Djibouti', 'give' ),
-		'DM' => esc_html__( 'Dominica', 'give' ),
-		'DO' => esc_html__( 'Dominican Republic', 'give' ),
-		'TP' => esc_html__( 'East Timor', 'give' ),
-		'EC' => esc_html__( 'Ecuador', 'give' ),
-		'EG' => esc_html__( 'Egypt', 'give' ),
-		'GQ' => esc_html__( 'Equatorial Guinea', 'give' ),
-		'SV' => esc_html__( 'El Salvador', 'give' ),
-		'ER' => esc_html__( 'Eritrea', 'give' ),
-		'EE' => esc_html__( 'Estonia', 'give' ),
-		'ET' => esc_html__( 'Ethiopia', 'give' ),
-		'FK' => esc_html__( 'Falkland Islands', 'give' ),
-		'FO' => esc_html__( 'Faroe Islands', 'give' ),
-		'FJ' => esc_html__( 'Fiji', 'give' ),
-		'FI' => esc_html__( 'Finland', 'give' ),
-		'FR' => esc_html__( 'France', 'give' ),
-		'GF' => esc_html__( 'French Guiana', 'give' ),
-		'PF' => esc_html__( 'French Polynesia', 'give' ),
-		'TF' => esc_html__( 'French Southern Territories', 'give' ),
-		'GA' => esc_html__( 'Gabon', 'give' ),
-		'GM' => esc_html__( 'Gambia', 'give' ),
-		'GE' => esc_html__( 'Georgia', 'give' ),
-		'DE' => esc_html__( 'Germany', 'give' ),
-		'GR' => esc_html__( 'Greece', 'give' ),
-		'GH' => esc_html__( 'Ghana', 'give' ),
-		'GI' => esc_html__( 'Gibraltar', 'give' ),
-		'GL' => esc_html__( 'Greenland', 'give' ),
-		'GD' => esc_html__( 'Grenada', 'give' ),
-		'GP' => esc_html__( 'Guadeloupe', 'give' ),
-		'GU' => esc_html__( 'Guam', 'give' ),
-		'GT' => esc_html__( 'Guatemala', 'give' ),
-		'GG' => esc_html__( 'Guernsey', 'give' ),
-		'GN' => esc_html__( 'Guinea', 'give' ),
-		'GW' => esc_html__( 'Guinea-Bissau', 'give' ),
-		'GY' => esc_html__( 'Guyana', 'give' ),
-		'HT' => esc_html__( 'Haiti', 'give' ),
-		'HM' => esc_html__( 'Heard and McDonald Islands', 'give' ),
-		'VA' => esc_html__( 'Holy See (City Vatican State)', 'give' ),
-		'HN' => esc_html__( 'Honduras', 'give' ),
-		'HK' => esc_html__( 'Hong Kong', 'give' ),
-		'HU' => esc_html__( 'Hungary', 'give' ),
-		'IS' => esc_html__( 'Iceland', 'give' ),
-		'IN' => esc_html__( 'India', 'give' ),
-		'ID' => esc_html__( 'Indonesia', 'give' ),
-		'IR' => esc_html__( 'Iran', 'give' ),
-		'IQ' => esc_html__( 'Iraq', 'give' ),
-		'IE' => esc_html__( 'Ireland', 'give' ),
-		'IM' => esc_html__( 'Isle of Man', 'give' ),
-		'IL' => esc_html__( 'Israel', 'give' ),
-		'IT' => esc_html__( 'Italy', 'give' ),
-		'JM' => esc_html__( 'Jamaica', 'give' ),
-		'JP' => esc_html__( 'Japan', 'give' ),
-		'JE' => esc_html__( 'Jersey', 'give' ),
-		'JO' => esc_html__( 'Jordan', 'give' ),
-		'KZ' => esc_html__( 'Kazakhstan', 'give' ),
-		'KE' => esc_html__( 'Kenya', 'give' ),
-		'KI' => esc_html__( 'Kiribati', 'give' ),
-		'KW' => esc_html__( 'Kuwait', 'give' ),
-		'KG' => esc_html__( 'Kyrgyzstan', 'give' ),
-		'LA' => esc_html__( 'Lao People\'s Democratic Republic', 'give' ),
-		'LV' => esc_html__( 'Latvia', 'give' ),
-		'LB' => esc_html__( 'Lebanon', 'give' ),
-		'LS' => esc_html__( 'Lesotho', 'give' ),
-		'LR' => esc_html__( 'Liberia', 'give' ),
-		'LY' => esc_html__( 'Libyan Arab Jamahiriya', 'give' ),
-		'LI' => esc_html__( 'Liechtenstein', 'give' ),
-		'LT' => esc_html__( 'Lithuania', 'give' ),
-		'LU' => esc_html__( 'Luxembourg', 'give' ),
-		'MO' => esc_html__( 'Macau', 'give' ),
-		'MK' => esc_html__( 'Macedonia', 'give' ),
-		'MG' => esc_html__( 'Madagascar', 'give' ),
-		'MW' => esc_html__( 'Malawi', 'give' ),
-		'MY' => esc_html__( 'Malaysia', 'give' ),
-		'MV' => esc_html__( 'Maldives', 'give' ),
-		'ML' => esc_html__( 'Mali', 'give' ),
-		'MT' => esc_html__( 'Malta', 'give' ),
-		'MH' => esc_html__( 'Marshall Islands', 'give' ),
-		'MQ' => esc_html__( 'Martinique', 'give' ),
-		'MR' => esc_html__( 'Mauritania', 'give' ),
-		'MU' => esc_html__( 'Mauritius', 'give' ),
-		'YT' => esc_html__( 'Mayotte', 'give' ),
-		'MX' => esc_html__( 'Mexico', 'give' ),
-		'FM' => esc_html__( 'Micronesia', 'give' ),
-		'MD' => esc_html__( 'Moldova, Republic of', 'give' ),
-		'MC' => esc_html__( 'Monaco', 'give' ),
-		'MN' => esc_html__( 'Mongolia', 'give' ),
-		'ME' => esc_html__( 'Montenegro', 'give' ),
-		'MS' => esc_html__( 'Montserrat', 'give' ),
-		'MA' => esc_html__( 'Morocco', 'give' ),
-		'MZ' => esc_html__( 'Mozambique', 'give' ),
-		'MM' => esc_html__( 'Myanmar', 'give' ),
-		'NA' => esc_html__( 'Namibia', 'give' ),
-		'NR' => esc_html__( 'Nauru', 'give' ),
-		'NP' => esc_html__( 'Nepal', 'give' ),
-		'NL' => esc_html__( 'Netherlands', 'give' ),
-		'AN' => esc_html__( 'Netherlands Antilles', 'give' ),
-		'NC' => esc_html__( 'New Caledonia', 'give' ),
-		'NZ' => esc_html__( 'New Zealand', 'give' ),
-		'NI' => esc_html__( 'Nicaragua', 'give' ),
-		'NE' => esc_html__( 'Niger', 'give' ),
-		'NG' => esc_html__( 'Nigeria', 'give' ),
-		'NU' => esc_html__( 'Niue', 'give' ),
-		'NF' => esc_html__( 'Norfolk Island', 'give' ),
-		'KP' => esc_html__( 'North Korea', 'give' ),
-		'MP' => esc_html__( 'Northern Mariana Islands', 'give' ),
-		'NO' => esc_html__( 'Norway', 'give' ),
-		'OM' => esc_html__( 'Oman', 'give' ),
-		'PK' => esc_html__( 'Pakistan', 'give' ),
-		'PW' => esc_html__( 'Palau', 'give' ),
-		'PS' => esc_html__( 'Palestinian Territories', 'give' ),
-		'PA' => esc_html__( 'Panama', 'give' ),
-		'PG' => esc_html__( 'Papua New Guinea', 'give' ),
-		'PY' => esc_html__( 'Paraguay', 'give' ),
-		'PE' => esc_html__( 'Peru', 'give' ),
-		'PH' => esc_html__( 'Phillipines', 'give' ),
-		'PN' => esc_html__( 'Pitcairn Island', 'give' ),
-		'PL' => esc_html__( 'Poland', 'give' ),
-		'PT' => esc_html__( 'Portugal', 'give' ),
-		'PR' => esc_html__( 'Puerto Rico', 'give' ),
-		'QA' => esc_html__( 'Qatar', 'give' ),
-		'RE' => esc_html__( 'Reunion Island', 'give' ),
-		'RO' => esc_html__( 'Romania', 'give' ),
-		'RU' => esc_html__( 'Russian Federation', 'give' ),
-		'RW' => esc_html__( 'Rwanda', 'give' ),
-		'SH' => esc_html__( 'Saint Helena', 'give' ),
-		'KN' => esc_html__( 'Saint Kitts and Nevis', 'give' ),
-		'LC' => esc_html__( 'Saint Lucia', 'give' ),
-		'PM' => esc_html__( 'Saint Pierre and Miquelon', 'give' ),
-		'VC' => esc_html__( 'Saint Vincent and the Grenadines', 'give' ),
-		'SM' => esc_html__( 'San Marino', 'give' ),
-		'ST' => esc_html__( 'Sao Tome and Principe', 'give' ),
-		'SA' => esc_html__( 'Saudi Arabia', 'give' ),
-		'SN' => esc_html__( 'Senegal', 'give' ),
-		'RS' => esc_html__( 'Serbia', 'give' ),
-		'SC' => esc_html__( 'Seychelles', 'give' ),
-		'SL' => esc_html__( 'Sierra Leone', 'give' ),
-		'SG' => esc_html__( 'Singapore', 'give' ),
-		'SK' => esc_html__( 'Slovak Republic', 'give' ),
-		'SI' => esc_html__( 'Slovenia', 'give' ),
-		'SB' => esc_html__( 'Solomon Islands', 'give' ),
-		'SO' => esc_html__( 'Somalia', 'give' ),
-		'ZA' => esc_html__( 'South Africa', 'give' ),
-		'GS' => esc_html__( 'South Georgia', 'give' ),
-		'KR' => esc_html__( 'South Korea', 'give' ),
-		'ES' => esc_html__( 'Spain', 'give' ),
-		'LK' => esc_html__( 'Sri Lanka', 'give' ),
-		'SD' => esc_html__( 'Sudan', 'give' ),
-		'SR' => esc_html__( 'Suriname', 'give' ),
-		'SJ' => esc_html__( 'Svalbard and Jan Mayen Islands', 'give' ),
-		'SZ' => esc_html__( 'Swaziland', 'give' ),
-		'SE' => esc_html__( 'Sweden', 'give' ),
-		'CH' => esc_html__( 'Switzerland', 'give' ),
-		'SY' => esc_html__( 'Syrian Arab Republic', 'give' ),
-		'TW' => esc_html__( 'Taiwan', 'give' ),
-		'TJ' => esc_html__( 'Tajikistan', 'give' ),
-		'TZ' => esc_html__( 'Tanzania', 'give' ),
-		'TG' => esc_html__( 'Togo', 'give' ),
-		'TK' => esc_html__( 'Tokelau', 'give' ),
-		'TO' => esc_html__( 'Tonga', 'give' ),
-		'TH' => esc_html__( 'Thailand', 'give' ),
-		'TT' => esc_html__( 'Trinidad and Tobago', 'give' ),
-		'TN' => esc_html__( 'Tunisia', 'give' ),
-		'TR' => esc_html__( 'Turkey', 'give' ),
-		'TM' => esc_html__( 'Turkmenistan', 'give' ),
-		'TC' => esc_html__( 'Turks and Caicos Islands', 'give' ),
-		'TV' => esc_html__( 'Tuvalu', 'give' ),
-		'UG' => esc_html__( 'Uganda', 'give' ),
-		'UA' => esc_html__( 'Ukraine', 'give' ),
-		'AE' => esc_html__( 'United Arab Emirates', 'give' ),
-		'UY' => esc_html__( 'Uruguay', 'give' ),
-		'UM' => esc_html__( 'US Minor Outlying Islands', 'give' ),
-		'UZ' => esc_html__( 'Uzbekistan', 'give' ),
-		'VU' => esc_html__( 'Vanuatu', 'give' ),
-		'VE' => esc_html__( 'Venezuela', 'give' ),
-		'VN' => esc_html__( 'Vietnam', 'give' ),
-		'VG' => esc_html__( 'Virgin Islands (British)', 'give' ),
-		'VI' => esc_html__( 'Virgin Islands (USA)', 'give' ),
-		'WF' => esc_html__( 'Wallis and Futuna Islands', 'give' ),
-		'EH' => esc_html__( 'Western Sahara', 'give' ),
-		'WS' => esc_html__( 'Western Samoa', 'give' ),
-		'YE' => esc_html__( 'Yemen', 'give' ),
-		'YU' => esc_html__( 'Yugoslavia', 'give' ),
-		'ZM' => esc_html__( 'Zambia', 'give' ),
-		'ZW' => esc_html__( 'Zimbabwe', 'give' )
+		'US' => esc_html__('United States', 'give'),
+		'CA' => esc_html__('Canada', 'give'),
+		'GB' => esc_html__('United Kingdom', 'give'),
+		'AF' => esc_html__('Afghanistan', 'give'),
+		'AL' => esc_html__('Albania', 'give'),
+		'DZ' => esc_html__('Algeria', 'give'),
+		'AS' => esc_html__('American Samoa', 'give'),
+		'AD' => esc_html__('Andorra', 'give'),
+		'AO' => esc_html__('Angola', 'give'),
+		'AI' => esc_html__('Anguilla', 'give'),
+		'AQ' => esc_html__('Antarctica', 'give'),
+		'AG' => esc_html__('Antigua and Barbuda', 'give'),
+		'AR' => esc_html__('Argentina', 'give'),
+		'AM' => esc_html__('Armenia', 'give'),
+		'AW' => esc_html__('Aruba', 'give'),
+		'AU' => esc_html__('Australia', 'give'),
+		'AT' => esc_html__('Austria', 'give'),
+		'AZ' => esc_html__('Azerbaijan', 'give'),
+		'BS' => esc_html__('Bahamas', 'give'),
+		'BH' => esc_html__('Bahrain', 'give'),
+		'BD' => esc_html__('Bangladesh', 'give'),
+		'BB' => esc_html__('Barbados', 'give'),
+		'BY' => esc_html__('Belarus', 'give'),
+		'BE' => esc_html__('Belgium', 'give'),
+		'BZ' => esc_html__('Belize', 'give'),
+		'BJ' => esc_html__('Benin', 'give'),
+		'BM' => esc_html__('Bermuda', 'give'),
+		'BT' => esc_html__('Bhutan', 'give'),
+		'BO' => esc_html__('Bolivia', 'give'),
+		'BA' => esc_html__('Bosnia and Herzegovina', 'give'),
+		'BW' => esc_html__('Botswana', 'give'),
+		'BV' => esc_html__('Bouvet Island', 'give'),
+		'BR' => esc_html__('Brazil', 'give'),
+		'IO' => esc_html__('British Indian Ocean Territory', 'give'),
+		'BN' => esc_html__('Brunei Darrussalam', 'give'),
+		'BG' => esc_html__('Bulgaria', 'give'),
+		'BF' => esc_html__('Burkina Faso', 'give'),
+		'BI' => esc_html__('Burundi', 'give'),
+		'KH' => esc_html__('Cambodia', 'give'),
+		'CM' => esc_html__('Cameroon', 'give'),
+		'CV' => esc_html__('Cape Verde', 'give'),
+		'KY' => esc_html__('Cayman Islands', 'give'),
+		'CF' => esc_html__('Central African Republic', 'give'),
+		'TD' => esc_html__('Chad', 'give'),
+		'CL' => esc_html__('Chile', 'give'),
+		'CN' => esc_html__('China', 'give'),
+		'CX' => esc_html__('Christmas Island', 'give'),
+		'CC' => esc_html__('Cocos Islands', 'give'),
+		'CO' => esc_html__('Colombia', 'give'),
+		'KM' => esc_html__('Comoros', 'give'),
+		'CD' => esc_html__('Congo, Democratic People\'s Republic', 'give'),
+		'CG' => esc_html__('Congo, Republic of', 'give'),
+		'CK' => esc_html__('Cook Islands', 'give'),
+		'CR' => esc_html__('Costa Rica', 'give'),
+		'CI' => esc_html__('Cote d\'Ivoire', 'give'),
+		'HR' => esc_html__('Croatia/Hrvatska', 'give'),
+		'CU' => esc_html__('Cuba', 'give'),
+		'CY' => esc_html__('Cyprus Island', 'give'),
+		'CZ' => esc_html__('Czech Republic', 'give'),
+		'DK' => esc_html__('Denmark', 'give'),
+		'DJ' => esc_html__('Djibouti', 'give'),
+		'DM' => esc_html__('Dominica', 'give'),
+		'DO' => esc_html__('Dominican Republic', 'give'),
+		'TP' => esc_html__('East Timor', 'give'),
+		'EC' => esc_html__('Ecuador', 'give'),
+		'EG' => esc_html__('Egypt', 'give'),
+		'GQ' => esc_html__('Equatorial Guinea', 'give'),
+		'SV' => esc_html__('El Salvador', 'give'),
+		'ER' => esc_html__('Eritrea', 'give'),
+		'EE' => esc_html__('Estonia', 'give'),
+		'ET' => esc_html__('Ethiopia', 'give'),
+		'FK' => esc_html__('Falkland Islands', 'give'),
+		'FO' => esc_html__('Faroe Islands', 'give'),
+		'FJ' => esc_html__('Fiji', 'give'),
+		'FI' => esc_html__('Finland', 'give'),
+		'FR' => esc_html__('France', 'give'),
+		'GF' => esc_html__('French Guiana', 'give'),
+		'PF' => esc_html__('French Polynesia', 'give'),
+		'TF' => esc_html__('French Southern Territories', 'give'),
+		'GA' => esc_html__('Gabon', 'give'),
+		'GM' => esc_html__('Gambia', 'give'),
+		'GE' => esc_html__('Georgia', 'give'),
+		'DE' => esc_html__('Germany', 'give'),
+		'GR' => esc_html__('Greece', 'give'),
+		'GH' => esc_html__('Ghana', 'give'),
+		'GI' => esc_html__('Gibraltar', 'give'),
+		'GL' => esc_html__('Greenland', 'give'),
+		'GD' => esc_html__('Grenada', 'give'),
+		'GP' => esc_html__('Guadeloupe', 'give'),
+		'GU' => esc_html__('Guam', 'give'),
+		'GT' => esc_html__('Guatemala', 'give'),
+		'GG' => esc_html__('Guernsey', 'give'),
+		'GN' => esc_html__('Guinea', 'give'),
+		'GW' => esc_html__('Guinea-Bissau', 'give'),
+		'GY' => esc_html__('Guyana', 'give'),
+		'HT' => esc_html__('Haiti', 'give'),
+		'HM' => esc_html__('Heard and McDonald Islands', 'give'),
+		'VA' => esc_html__('Holy See (City Vatican State)', 'give'),
+		'HN' => esc_html__('Honduras', 'give'),
+		'HK' => esc_html__('Hong Kong', 'give'),
+		'HU' => esc_html__('Hungary', 'give'),
+		'IS' => esc_html__('Iceland', 'give'),
+		'IN' => esc_html__('India', 'give'),
+		'ID' => esc_html__('Indonesia', 'give'),
+		'IR' => esc_html__('Iran', 'give'),
+		'IQ' => esc_html__('Iraq', 'give'),
+		'IE' => esc_html__('Ireland', 'give'),
+		'IM' => esc_html__('Isle of Man', 'give'),
+		'IL' => esc_html__('Israel', 'give'),
+		'IT' => esc_html__('Italy', 'give'),
+		'JM' => esc_html__('Jamaica', 'give'),
+		'JP' => esc_html__('Japan', 'give'),
+		'JE' => esc_html__('Jersey', 'give'),
+		'JO' => esc_html__('Jordan', 'give'),
+		'KZ' => esc_html__('Kazakhstan', 'give'),
+		'KE' => esc_html__('Kenya', 'give'),
+		'KI' => esc_html__('Kiribati', 'give'),
+		'KW' => esc_html__('Kuwait', 'give'),
+		'KG' => esc_html__('Kyrgyzstan', 'give'),
+		'LA' => esc_html__('Lao People\'s Democratic Republic', 'give'),
+		'LV' => esc_html__('Latvia', 'give'),
+		'LB' => esc_html__('Lebanon', 'give'),
+		'LS' => esc_html__('Lesotho', 'give'),
+		'LR' => esc_html__('Liberia', 'give'),
+		'LY' => esc_html__('Libyan Arab Jamahiriya', 'give'),
+		'LI' => esc_html__('Liechtenstein', 'give'),
+		'LT' => esc_html__('Lithuania', 'give'),
+		'LU' => esc_html__('Luxembourg', 'give'),
+		'MO' => esc_html__('Macau', 'give'),
+		'MK' => esc_html__('Macedonia', 'give'),
+		'MG' => esc_html__('Madagascar', 'give'),
+		'MW' => esc_html__('Malawi', 'give'),
+		'MY' => esc_html__('Malaysia', 'give'),
+		'MV' => esc_html__('Maldives', 'give'),
+		'ML' => esc_html__('Mali', 'give'),
+		'MT' => esc_html__('Malta', 'give'),
+		'MH' => esc_html__('Marshall Islands', 'give'),
+		'MQ' => esc_html__('Martinique', 'give'),
+		'MR' => esc_html__('Mauritania', 'give'),
+		'MU' => esc_html__('Mauritius', 'give'),
+		'YT' => esc_html__('Mayotte', 'give'),
+		'MX' => esc_html__('Mexico', 'give'),
+		'FM' => esc_html__('Micronesia', 'give'),
+		'MD' => esc_html__('Moldova, Republic of', 'give'),
+		'MC' => esc_html__('Monaco', 'give'),
+		'MN' => esc_html__('Mongolia', 'give'),
+		'ME' => esc_html__('Montenegro', 'give'),
+		'MS' => esc_html__('Montserrat', 'give'),
+		'MA' => esc_html__('Morocco', 'give'),
+		'MZ' => esc_html__('Mozambique', 'give'),
+		'MM' => esc_html__('Myanmar', 'give'),
+		'NA' => esc_html__('Namibia', 'give'),
+		'NR' => esc_html__('Nauru', 'give'),
+		'NP' => esc_html__('Nepal', 'give'),
+		'NL' => esc_html__('Netherlands', 'give'),
+		'AN' => esc_html__('Netherlands Antilles', 'give'),
+		'NC' => esc_html__('New Caledonia', 'give'),
+		'NZ' => esc_html__('New Zealand', 'give'),
+		'NI' => esc_html__('Nicaragua', 'give'),
+		'NE' => esc_html__('Niger', 'give'),
+		'NG' => esc_html__('Nigeria', 'give'),
+		'NU' => esc_html__('Niue', 'give'),
+		'NF' => esc_html__('Norfolk Island', 'give'),
+		'KP' => esc_html__('North Korea', 'give'),
+		'MP' => esc_html__('Northern Mariana Islands', 'give'),
+		'NO' => esc_html__('Norway', 'give'),
+		'OM' => esc_html__('Oman', 'give'),
+		'PK' => esc_html__('Pakistan', 'give'),
+		'PW' => esc_html__('Palau', 'give'),
+		'PS' => esc_html__('Palestinian Territories', 'give'),
+		'PA' => esc_html__('Panama', 'give'),
+		'PG' => esc_html__('Papua New Guinea', 'give'),
+		'PY' => esc_html__('Paraguay', 'give'),
+		'PE' => esc_html__('Peru', 'give'),
+		'PH' => esc_html__('Phillipines', 'give'),
+		'PN' => esc_html__('Pitcairn Island', 'give'),
+		'PL' => esc_html__('Poland', 'give'),
+		'PT' => esc_html__('Portugal', 'give'),
+		'PR' => esc_html__('Puerto Rico', 'give'),
+		'QA' => esc_html__('Qatar', 'give'),
+		'RE' => esc_html__('Reunion Island', 'give'),
+		'RO' => esc_html__('Romania', 'give'),
+		'RU' => esc_html__('Russian Federation', 'give'),
+		'RW' => esc_html__('Rwanda', 'give'),
+		'SH' => esc_html__('Saint Helena', 'give'),
+		'KN' => esc_html__('Saint Kitts and Nevis', 'give'),
+		'LC' => esc_html__('Saint Lucia', 'give'),
+		'PM' => esc_html__('Saint Pierre and Miquelon', 'give'),
+		'VC' => esc_html__('Saint Vincent and the Grenadines', 'give'),
+		'SM' => esc_html__('San Marino', 'give'),
+		'ST' => esc_html__('Sao Tome and Principe', 'give'),
+		'SA' => esc_html__('Saudi Arabia', 'give'),
+		'SN' => esc_html__('Senegal', 'give'),
+		'RS' => esc_html__('Serbia', 'give'),
+		'SC' => esc_html__('Seychelles', 'give'),
+		'SL' => esc_html__('Sierra Leone', 'give'),
+		'SG' => esc_html__('Singapore', 'give'),
+		'SK' => esc_html__('Slovak Republic', 'give'),
+		'SI' => esc_html__('Slovenia', 'give'),
+		'SB' => esc_html__('Solomon Islands', 'give'),
+		'SO' => esc_html__('Somalia', 'give'),
+		'ZA' => esc_html__('South Africa', 'give'),
+		'GS' => esc_html__('South Georgia', 'give'),
+		'KR' => esc_html__('South Korea', 'give'),
+		'ES' => esc_html__('Spain', 'give'),
+		'LK' => esc_html__('Sri Lanka', 'give'),
+		'SD' => esc_html__('Sudan', 'give'),
+		'SR' => esc_html__('Suriname', 'give'),
+		'SJ' => esc_html__('Svalbard and Jan Mayen Islands', 'give'),
+		'SZ' => esc_html__('Swaziland', 'give'),
+		'SE' => esc_html__('Sweden', 'give'),
+		'CH' => esc_html__('Switzerland', 'give'),
+		'SY' => esc_html__('Syrian Arab Republic', 'give'),
+		'TW' => esc_html__('Taiwan', 'give'),
+		'TJ' => esc_html__('Tajikistan', 'give'),
+		'TZ' => esc_html__('Tanzania', 'give'),
+		'TG' => esc_html__('Togo', 'give'),
+		'TK' => esc_html__('Tokelau', 'give'),
+		'TO' => esc_html__('Tonga', 'give'),
+		'TH' => esc_html__('Thailand', 'give'),
+		'TT' => esc_html__('Trinidad and Tobago', 'give'),
+		'TN' => esc_html__('Tunisia', 'give'),
+		'TR' => esc_html__('Turkey', 'give'),
+		'TM' => esc_html__('Turkmenistan', 'give'),
+		'TC' => esc_html__('Turks and Caicos Islands', 'give'),
+		'TV' => esc_html__('Tuvalu', 'give'),
+		'UG' => esc_html__('Uganda', 'give'),
+		'UA' => esc_html__('Ukraine', 'give'),
+		'AE' => esc_html__('United Arab Emirates', 'give'),
+		'UY' => esc_html__('Uruguay', 'give'),
+		'UM' => esc_html__('US Minor Outlying Islands', 'give'),
+		'UZ' => esc_html__('Uzbekistan', 'give'),
+		'VU' => esc_html__('Vanuatu', 'give'),
+		'VE' => esc_html__('Venezuela', 'give'),
+		'VN' => esc_html__('Vietnam', 'give'),
+		'VG' => esc_html__('Virgin Islands (British)', 'give'),
+		'VI' => esc_html__('Virgin Islands (USA)', 'give'),
+		'WF' => esc_html__('Wallis and Futuna Islands', 'give'),
+		'EH' => esc_html__('Western Sahara', 'give'),
+		'WS' => esc_html__('Western Samoa', 'give'),
+		'YE' => esc_html__('Yemen', 'give'),
+		'YU' => esc_html__('Yugoslavia', 'give'),
+		'ZM' => esc_html__('Zambia', 'give'),
+		'ZW' => esc_html__('Zimbabwe', 'give')
 	);
 
-	return apply_filters( 'give_countries', $countries );
+	return apply_filters('give_countries', $countries);
 }
 
 /**
@@ -446,7 +446,7 @@ 
 		'AP' => 'Armed Forces - Pacific'
 	);
 
-	return apply_filters( 'give_us_states', $states );
+	return apply_filters('give_us_states', $states);
 }
 
 /**
@@ -459,22 +459,22 @@ 
 function give_get_provinces_list() {
 	$provinces = array(
 		''   => '',
-		'AB' => esc_html__('Alberta', 'give' ),
-		'BC' => esc_html__('British Columbia', 'give' ),
-		'MB' => esc_html__('Manitoba', 'give' ),
-		'NB' => esc_html__('New Brunswick', 'give' ),
-		'NL' => esc_html__('Newfoundland and Labrador', 'give' ),
-		'NS' => esc_html__('Nova Scotia', 'give' ),
-		'NT' => esc_html__('Northwest Territories', 'give' ),
-		'NU' => esc_html__('Nunavut', 'give' ),
-		'ON' => esc_html__('Ontario', 'give' ),
-		'PE' => esc_html__('Prince Edward Island', 'give' ),
-		'QC' => esc_html__('Quebec', 'give' ),
-		'SK' => esc_html__('Saskatchewan', 'give' ),
-		'YT' => esc_html__('Yukon', 'give' )
+		'AB' => esc_html__('Alberta', 'give'),
+		'BC' => esc_html__('British Columbia', 'give'),
+		'MB' => esc_html__('Manitoba', 'give'),
+		'NB' => esc_html__('New Brunswick', 'give'),
+		'NL' => esc_html__('Newfoundland and Labrador', 'give'),
+		'NS' => esc_html__('Nova Scotia', 'give'),
+		'NT' => esc_html__('Northwest Territories', 'give'),
+		'NU' => esc_html__('Nunavut', 'give'),
+		'ON' => esc_html__('Ontario', 'give'),
+		'PE' => esc_html__('Prince Edward Island', 'give'),
+		'QC' => esc_html__('Quebec', 'give'),
+		'SK' => esc_html__('Saskatchewan', 'give'),
+		'YT' => esc_html__('Yukon', 'give')
 	);
 
-	return apply_filters( 'give_canada_provinces', $provinces );
+	return apply_filters('give_canada_provinces', $provinces);
 }
 
 /**
@@ -496,7 +496,7 @@ 
 		'WA'  => 'Western Australia'
 	);
 
-	return apply_filters( 'give_australian_states', $states );
+	return apply_filters('give_australian_states', $states);
 }
 
 /**
@@ -537,7 +537,7 @@ 
 		'TO' => 'Tocantins'
 	);
 
-	return apply_filters( 'give_brazil_states', $states );
+	return apply_filters('give_brazil_states', $states);
 }
 
 /**
@@ -554,7 +554,7 @@ 
 		'NEW TERRITORIES' => 'New Territories'
 	);
 
-	return apply_filters( 'give_hong_kong_states', $states );
+	return apply_filters('give_hong_kong_states', $states);
 }
 
 /**
@@ -588,7 +588,7 @@ 
 		'ZA' => 'Zala'
 	);
 
-	return apply_filters( 'give_hungary_states', $states );
+	return apply_filters('give_hungary_states', $states);
 }
 
 /**
@@ -634,7 +634,7 @@ 
 		'CN32' => 'Xinjiang / 新疆'
 	);
 
-	return apply_filters( 'give_chinese_states', $states );
+	return apply_filters('give_chinese_states', $states);
 }
 
 /**
@@ -663,7 +663,7 @@ 
 		'WC' => 'West Coast'
 	);
 
-	return apply_filters( 'give_new_zealand_states', $states );
+	return apply_filters('give_new_zealand_states', $states);
 }
 
 /**
@@ -711,7 +711,7 @@ 
 		'PB' => 'Papua Barat'
 	);
 
-	return apply_filters( 'give_indonesia_states', $states );
+	return apply_filters('give_indonesia_states', $states);
 }
 
 /**
@@ -761,7 +761,7 @@ 
 		'PY' => 'Pondicherry (Puducherry)'
 	);
 
-	return apply_filters( 'give_indian_states', $states );
+	return apply_filters('give_indian_states', $states);
 }
 
 /**
@@ -791,7 +791,7 @@ 
 		'PJY' => 'W.P. Putrajaya'
 	);
 
-	return apply_filters( 'give_malaysian_states', $states );
+	return apply_filters('give_malaysian_states', $states);
 }
 
 /**
@@ -814,7 +814,7 @@ 
 		'WC'  => 'Western Cape'
 	);
 
-	return apply_filters( 'give_south_african_states', $states );
+	return apply_filters('give_south_african_states', $states);
 }
 
 /**
@@ -905,7 +905,7 @@ 
 		'TH-35' => 'Yasothon (ยโสธร)'
 	);
 
-	return apply_filters( 'give_thailand_states', $states );
+	return apply_filters('give_thailand_states', $states);
 }
 
 /**
@@ -917,59 +917,59 @@ 
 function give_get_spain_states_list() {
 	$states = array(
 		''   => '',
-		'C'  => esc_html__( 'A Coruña', 'give' ),
-		'VI' => esc_html__( 'Álava', 'give' ),
-		'AB' => esc_html__( 'Albacete', 'give' ),
-		'A'  => esc_html__( 'Alicante', 'give' ),
-		'AL' => esc_html__( 'Almería', 'give' ),
-		'O'  => esc_html__( 'Asturias', 'give' ),
-		'AV' => esc_html__( 'Ávila', 'give' ),
-		'BA' => esc_html__( 'Badajoz', 'give' ),
-		'PM' => esc_html__( 'Baleares', 'give' ),
-		'B'  => esc_html__( 'Barcelona', 'give' ),
-		'BU' => esc_html__( 'Burgos', 'give' ),
-		'CC' => esc_html__( 'Cáceres', 'give' ),
-		'CA' => esc_html__( 'Cádiz', 'give' ),
-		'S'  => esc_html__( 'Cantabria', 'give' ),
-		'CS' => esc_html__( 'Castellón', 'give' ),
-		'CE' => esc_html__( 'Ceuta', 'give' ),
-		'CR' => esc_html__( 'Ciudad Real', 'give' ),
-		'CO' => esc_html__( 'Córdoba', 'give' ),
-		'CU' => esc_html__( 'Cuenca', 'give' ),
-		'GI' => esc_html__( 'Girona', 'give' ),
-		'GR' => esc_html__( 'Granada', 'give' ),
-		'GU' => esc_html__( 'Guadalajara', 'give' ),
-		'SS' => esc_html__( 'Gipuzkoa', 'give' ),
-		'H'  => esc_html__( 'Huelva', 'give' ),
-		'HU' => esc_html__( 'Huesca', 'give' ),
-		'J'  => esc_html__( 'Jaén', 'give' ),
-		'LO' => esc_html__( 'La Rioja', 'give' ),
-		'GC' => esc_html__( 'Las Palmas', 'give' ),
-		'LE' => esc_html__( 'León', 'give' ),
-		'L'  => esc_html__( 'Lleida', 'give' ),
-		'LU' => esc_html__( 'Lugo', 'give' ),
-		'M'  => esc_html__( 'Madrid', 'give' ),
-		'MA' => esc_html__( 'Málaga', 'give' ),
-		'ML' => esc_html__( 'Melilla', 'give' ),
-		'MU' => esc_html__( 'Murcia', 'give' ),
-		'NA' => esc_html__( 'Navarra', 'give' ),
-		'OR' => esc_html__( 'Ourense', 'give' ),
-		'P'  => esc_html__( 'Palencia', 'give' ),
-		'PO' => esc_html__( 'Pontevedra', 'give' ),
-		'SA' => esc_html__( 'Salamanca', 'give' ),
-		'TF' => esc_html__( 'Santa Cruz de Tenerife', 'give' ),
-		'SG' => esc_html__( 'Segovia', 'give' ),
-		'SE' => esc_html__( 'Sevilla', 'give' ),
-		'SO' => esc_html__( 'Soria', 'give' ),
-		'T'  => esc_html__( 'Tarragona', 'give' ),
-		'TE' => esc_html__( 'Teruel', 'give' ),
-		'TO' => esc_html__( 'Toledo', 'give' ),
-		'V'  => esc_html__( 'Valencia', 'give' ),
-		'VA' => esc_html__( 'Valladolid', 'give' ),
-		'BI' => esc_html__( 'Bizkaia', 'give' ),
-		'ZA' => esc_html__( 'Zamora', 'give' ),
-		'Z'  => esc_html__( 'Zaragoza', 'give' )
+		'C'  => esc_html__('A Coruña', 'give'),
+		'VI' => esc_html__('Álava', 'give'),
+		'AB' => esc_html__('Albacete', 'give'),
+		'A'  => esc_html__('Alicante', 'give'),
+		'AL' => esc_html__('Almería', 'give'),
+		'O'  => esc_html__('Asturias', 'give'),
+		'AV' => esc_html__('Ávila', 'give'),
+		'BA' => esc_html__('Badajoz', 'give'),
+		'PM' => esc_html__('Baleares', 'give'),
+		'B'  => esc_html__('Barcelona', 'give'),
+		'BU' => esc_html__('Burgos', 'give'),
+		'CC' => esc_html__('Cáceres', 'give'),
+		'CA' => esc_html__('Cádiz', 'give'),
+		'S'  => esc_html__('Cantabria', 'give'),
+		'CS' => esc_html__('Castellón', 'give'),
+		'CE' => esc_html__('Ceuta', 'give'),
+		'CR' => esc_html__('Ciudad Real', 'give'),
+		'CO' => esc_html__('Córdoba', 'give'),
+		'CU' => esc_html__('Cuenca', 'give'),
+		'GI' => esc_html__('Girona', 'give'),
+		'GR' => esc_html__('Granada', 'give'),
+		'GU' => esc_html__('Guadalajara', 'give'),
+		'SS' => esc_html__('Gipuzkoa', 'give'),
+		'H'  => esc_html__('Huelva', 'give'),
+		'HU' => esc_html__('Huesca', 'give'),
+		'J'  => esc_html__('Jaén', 'give'),
+		'LO' => esc_html__('La Rioja', 'give'),
+		'GC' => esc_html__('Las Palmas', 'give'),
+		'LE' => esc_html__('León', 'give'),
+		'L'  => esc_html__('Lleida', 'give'),
+		'LU' => esc_html__('Lugo', 'give'),
+		'M'  => esc_html__('Madrid', 'give'),
+		'MA' => esc_html__('Málaga', 'give'),
+		'ML' => esc_html__('Melilla', 'give'),
+		'MU' => esc_html__('Murcia', 'give'),
+		'NA' => esc_html__('Navarra', 'give'),
+		'OR' => esc_html__('Ourense', 'give'),
+		'P'  => esc_html__('Palencia', 'give'),
+		'PO' => esc_html__('Pontevedra', 'give'),
+		'SA' => esc_html__('Salamanca', 'give'),
+		'TF' => esc_html__('Santa Cruz de Tenerife', 'give'),
+		'SG' => esc_html__('Segovia', 'give'),
+		'SE' => esc_html__('Sevilla', 'give'),
+		'SO' => esc_html__('Soria', 'give'),
+		'T'  => esc_html__('Tarragona', 'give'),
+		'TE' => esc_html__('Teruel', 'give'),
+		'TO' => esc_html__('Toledo', 'give'),
+		'V'  => esc_html__('Valencia', 'give'),
+		'VA' => esc_html__('Valladolid', 'give'),
+		'BI' => esc_html__('Bizkaia', 'give'),
+		'ZA' => esc_html__('Zamora', 'give'),
+		'Z'  => esc_html__('Zaragoza', 'give')
 	);
 
-	return apply_filters( 'give_spain_states', $states );
+	return apply_filters('give_spain_states', $states);
 }

includes/deprecated/deprecated-actions.php

Spacing +9 added lines, -9 removed lines

@@ -4,8 +4,8 @@ 
  */
 $give_map_deprecated_actions = give_deprecated_actions();
 
-foreach ( $give_map_deprecated_actions as $new => $old ) {
-	add_action( $new, 'give_deprecated_action_mapping', 10, 4 );
+foreach ($give_map_deprecated_actions as $new => $old) {
+	add_action($new, 'give_deprecated_action_mapping', 10, 4);
 }
 
 /**
@@ -59,20 +59,20 @@ 
  *
  * @return mixed|void
  */
-function give_deprecated_action_mapping( $data, $arg_1 = '', $arg_2 = '', $arg_3 = '' ) {
+function give_deprecated_action_mapping($data, $arg_1 = '', $arg_2 = '', $arg_3 = '') {
 	$give_map_deprecated_actions = give_deprecated_actions();
 	$action                      = current_filter();
 
-	if ( isset( $give_map_deprecated_actions[ $action ] ) ) {
-		if ( has_action( $give_map_deprecated_actions[ $action ] ) ) {
-			do_action( $give_map_deprecated_actions[ $action ], $data, $arg_1, $arg_2, $arg_3 );
+	if (isset($give_map_deprecated_actions[$action])) {
+		if (has_action($give_map_deprecated_actions[$action])) {
+			do_action($give_map_deprecated_actions[$action], $data, $arg_1, $arg_2, $arg_3);
 
-			if ( ! defined( 'DOING_AJAX' ) ) {
+			if ( ! defined('DOING_AJAX')) {
 				// translators: %s: action name.
 				_give_deprecated_function(
 					sprintf(
-						__( 'The %s action' ),
-						$give_map_deprecated_actions[ $action ]
+						__('The %s action'),
+						$give_map_deprecated_actions[$action]
 					),
 					'1.7',
 					$action

includes/deprecated/deprecated-filters.php

Spacing +11 added lines, -11 removed lines

@@ -4,8 +4,8 @@ 
  */
 $give_map_deprecated_filters = give_deprecated_filters();
 
-foreach ( $give_map_deprecated_filters as $new => $old ) {
-	add_filter( $new, 'give_deprecated_filter_mapping', 10, 4 );
+foreach ($give_map_deprecated_filters as $new => $old) {
+	add_filter($new, 'give_deprecated_filter_mapping', 10, 4);
 }
 
 /**
@@ -28,8 +28,8 @@ 
 	);
 
 	// Dynamic filters.
-	switch ( true ) {
-		case ( ! empty( $_GET['payment-confirmation'] ) ) :
+	switch (true) {
+		case ( ! empty($_GET['payment-confirmation'])) :
 			$give_deprecated_filters["give_donation_confirm_{$_GET['payment-confirmation']}"] = "give_payment_confirm_{$_GET['payment-confirmation']}";
 	}
 
@@ -46,20 +46,20 @@ 
  *
  * @return mixed|void
  */
-function give_deprecated_filter_mapping( $data, $arg_1 = '', $arg_2 = '', $arg_3 = '' ) {
+function give_deprecated_filter_mapping($data, $arg_1 = '', $arg_2 = '', $arg_3 = '') {
 	$give_map_deprecated_filters = give_deprecated_filters();
 	$filter = current_filter();
 
-	if ( isset( $give_map_deprecated_filters[ $filter ] ) ) {
-		if ( has_filter( $give_map_deprecated_filters[ $filter ] ) ) {
-			$data = apply_filters( $give_map_deprecated_filters[ $filter ], $data, $arg_1, $arg_2, $arg_3 );
+	if (isset($give_map_deprecated_filters[$filter])) {
+		if (has_filter($give_map_deprecated_filters[$filter])) {
+			$data = apply_filters($give_map_deprecated_filters[$filter], $data, $arg_1, $arg_2, $arg_3);
 
-			if ( ! defined( 'DOING_AJAX' ) ) {
+			if ( ! defined('DOING_AJAX')) {
 				_give_deprecated_function(
 					sprintf(
 						/* translators: %s: filter name */
-						__( 'The %s filter' ),
-						$give_map_deprecated_filters[ $filter ]
+						__('The %s filter'),
+						$give_map_deprecated_filters[$filter]
 					),
 					'1.7',
 					$filter

includes/class-give-session.php

Spacing +61 added lines, -61 removed lines

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