WordImpress / Give

includes/shortcodes.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
 		//validate display_style and float_labels value
 		if ( ( $key == 'display_style' && ! in_array( $value, array( 'onpage', 'reveal', 'modal' ) ) )
-		     || ( $key == 'float_labels' && ! in_array( $value, array( 'enabled', 'disabled' ) ) )
+			 || ( $key == 'float_labels' && ! in_array( $value, array( 'enabled', 'disabled' ) ) )
 		) {
 
 			$atts[ $key ] = '';

Spacing +108 added lines, -108 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,28 +25,28 @@ 
  */
 function give_donation_history() {
 
-	$email_access = give_get_option( 'email_access' );
+	$email_access = give_get_option('email_access');
 
 	//Is user logged in? Does an email-access token exist?
-	if ( is_user_logged_in() || ( $email_access == 'on' && Give()->email_access->token_exists ) ) {
+	if (is_user_logged_in() || ($email_access == 'on' && Give()->email_access->token_exists)) {
 		ob_start();
-		give_get_template_part( 'history', 'donations' );
+		give_get_template_part('history', 'donations');
 
 		return ob_get_clean();
 	} //Is Email-based access enabled?
-	elseif ( $email_access == 'on' ) {
+	elseif ($email_access == 'on') {
 
 		ob_start();
-		give_get_template_part( 'email', 'login-form' );
+		give_get_template_part('email', 'login-form');
 
 		return ob_get_clean();
 	} else {
-		$message = __( 'You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give' );
-		echo apply_filters( 'give_donation_history_nonuser_message', give_output_error( $message, false ), $message );
+		$message = __('You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give');
+		echo apply_filters('give_donation_history_nonuser_message', give_output_error($message, false), $message);
 	}
 }
 
-add_shortcode( 'donation_history', 'give_donation_history' );
+add_shortcode('donation_history', 'give_donation_history');
 
 /**
  * Donation Form Shortcode
@@ -60,53 +60,53 @@ 
  *
  * @return string
  */
-function give_form_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_form_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'id'            => '',
 		'show_title'    => true,
 		'show_goal'     => true,
 		'show_content'  => '',
 		'float_labels'  => '',
 		'display_style' => '',
-	), $atts, 'give_form' );
+	), $atts, 'give_form');
 
-	foreach ( $atts as $key => $value ) {
+	foreach ($atts as $key => $value) {
 		//convert shortcode_atts values to booleans
-		if ( $key == 'show_title' ) {
-			$atts[ $key ] = filter_var( $atts[ $key ], FILTER_VALIDATE_BOOLEAN );
-		} elseif ( $key == 'show_goal' ) {
-			$atts[ $key ] = filter_var( $atts[ $key ], FILTER_VALIDATE_BOOLEAN );
+		if ($key == 'show_title') {
+			$atts[$key] = filter_var($atts[$key], FILTER_VALIDATE_BOOLEAN);
+		} elseif ($key == 'show_goal') {
+			$atts[$key] = filter_var($atts[$key], FILTER_VALIDATE_BOOLEAN);
 		}
 
 		//validate show_content value
-		if ( $key == 'show_content' ) {
-			if ( ! in_array( $value, array( 'none', 'above', 'below' ) ) ) {
-				$atts[ $key ] = '';
-			} else if ( $value == 'above' ) {
-				$atts[ $key ] = 'give_pre_form';
-			} else if ( $value == 'below' ) {
-				$atts[ $key ] = 'give_post_form';
+		if ($key == 'show_content') {
+			if ( ! in_array($value, array('none', 'above', 'below'))) {
+				$atts[$key] = '';
+			} else if ($value == 'above') {
+				$atts[$key] = 'give_pre_form';
+			} else if ($value == 'below') {
+				$atts[$key] = 'give_post_form';
 			}
 		}
 
 		//validate display_style and float_labels value
-		if ( ( $key == 'display_style' && ! in_array( $value, array( 'onpage', 'reveal', 'modal' ) ) )
-		     || ( $key == 'float_labels' && ! in_array( $value, array( 'enabled', 'disabled' ) ) )
+		if (($key == 'display_style' && ! in_array($value, array('onpage', 'reveal', 'modal')))
+		     || ($key == 'float_labels' && ! in_array($value, array('enabled', 'disabled')))
 		) {
 
-			$atts[ $key ] = '';
+			$atts[$key] = '';
 		}
 	}
 
 	//get the Give Form
 	ob_start();
-	give_get_donation_form( $atts );
+	give_get_donation_form($atts);
 	$final_output = ob_get_clean();
 
-	return apply_filters( 'give_donate_form', $final_output, $atts );
+	return apply_filters('give_donate_form', $final_output, $atts);
 }
 
-add_shortcode( 'give_form', 'give_form_shortcode' );
+add_shortcode('give_form', 'give_form_shortcode');
 
 /**
  * Donation Form Goal Shortcode
@@ -120,37 +120,37 @@ 
  *
  * @return string
  */
-function give_goal_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_goal_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'id'        => '',
 		'show_text' => true,
 		'show_bar'  => true,
-	), $atts, 'give_goal' );
+	), $atts, 'give_goal');
 
 
 	//get the Give Form
 	ob_start();
 
 	//Sanity check 1: ensure there is an ID Provided
-	if ( empty( $atts['id'] ) ) {
-		give_output_error( __( 'Error: No Donation form ID for the shortcode provided.', 'give' ), true );
+	if (empty($atts['id'])) {
+		give_output_error(__('Error: No Donation form ID for the shortcode provided.', 'give'), true);
 	}
 
 	//Sanity check 2: Check that this form even has Goals enabled
-	$goal_option = get_post_meta( $atts['id'], '_give_goal_option', true );
-	if ( empty( $goal_option ) || $goal_option !== 'yes' ) {
-		give_output_error( __( 'Error: This form does not have Goals enabled.', 'give' ), true );
+	$goal_option = get_post_meta($atts['id'], '_give_goal_option', true);
+	if (empty($goal_option) || $goal_option !== 'yes') {
+		give_output_error(__('Error: This form does not have Goals enabled.', 'give'), true);
 	} else {
 		//Passed all sanity checks: output Goal
-		give_show_goal_progress( $atts['id'], $atts );
+		give_show_goal_progress($atts['id'], $atts);
 	}
 
 	$final_output = ob_get_clean();
 
-	return apply_filters( 'give_goal_shortcode_output', $final_output, $atts );
+	return apply_filters('give_goal_shortcode_output', $final_output, $atts);
 }
 
-add_shortcode( 'give_goal', 'give_goal_shortcode' );
+add_shortcode('give_goal', 'give_goal_shortcode');
 
 
 /**
@@ -167,15 +167,15 @@ 
  * @uses  give_login_form()
  * @return string
  */
-function give_login_form_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_login_form_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'redirect' => '',
-	), $atts, 'give_login' );
+	), $atts, 'give_login');
 
-	return give_login_form( $atts['redirect'] );
+	return give_login_form($atts['redirect']);
 }
 
-add_shortcode( 'give_login', 'give_login_form_shortcode' );
+add_shortcode('give_login', 'give_login_form_shortcode');
 
 /**
  * Register Shortcode
@@ -190,15 +190,15 @@ 
  * @uses  give_register_form()
  * @return string
  */
-function give_register_form_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_register_form_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'redirect' => '',
-	), $atts, 'give_register' );
+	), $atts, 'give_register');
 
-	return give_register_form( $atts['redirect'] );
+	return give_register_form($atts['redirect']);
 }
 
-add_shortcode( 'give_register', 'give_register_form_shortcode' );
+add_shortcode('give_register', 'give_register_form_shortcode');
 
 
 /**
@@ -213,61 +213,61 @@ 
  *
  * @return string
  */
-function give_receipt_shortcode( $atts, $content = null ) {
+function give_receipt_shortcode($atts, $content = null) {
 
 	global $give_receipt_args, $payment;
 
-	$give_receipt_args = shortcode_atts( array(
-		'error'          => esc_html__( 'Sorry, you are missing the payment key to view this donation receipt.', 'give' ),
+	$give_receipt_args = shortcode_atts(array(
+		'error'          => esc_html__('Sorry, you are missing the payment key to view this donation receipt.', 'give'),
 		'price'          => true,
 		'date'           => true,
 		'payment_key'    => false,
 		'payment_method' => true,
 		'payment_id'     => true
-	), $atts, 'give_receipt' );
+	), $atts, 'give_receipt');
 
 	//set $session var
 	$session = give_get_purchase_session();
 
 	//set payment key var
-	if ( isset( $_GET['payment_key'] ) ) {
-		$payment_key = urldecode( $_GET['payment_key'] );
-	} elseif ( $session ) {
+	if (isset($_GET['payment_key'])) {
+		$payment_key = urldecode($_GET['payment_key']);
+	} elseif ($session) {
 		$payment_key = $session['purchase_key'];
-	} elseif ( $give_receipt_args['payment_key'] ) {
+	} elseif ($give_receipt_args['payment_key']) {
 		$payment_key = $give_receipt_args['payment_key'];
 	}
 
-	$email_access = give_get_option( 'email_access' );
+	$email_access = give_get_option('email_access');
 
 	// No payment_key found & Email Access is Turned on:
-	if ( ! isset( $payment_key ) && $email_access == 'on' && ! Give()->email_access->token_exists ) {
+	if ( ! isset($payment_key) && $email_access == 'on' && ! Give()->email_access->token_exists) {
 
 		ob_start();
 
-		give_get_template_part( 'email-login-form' );
+		give_get_template_part('email-login-form');
 
 		return ob_get_clean();
 
-	} elseif ( ! isset( $payment_key ) ) {
+	} elseif ( ! isset($payment_key)) {
 
-		return give_output_error( $give_receipt_args['error'], false, 'error' );
+		return give_output_error($give_receipt_args['error'], false, 'error');
 
 	}
 
-	$payment_id    = give_get_purchase_id_by_key( $payment_key );
-	$user_can_view = give_can_view_receipt( $payment_key );
+	$payment_id    = give_get_purchase_id_by_key($payment_key);
+	$user_can_view = give_can_view_receipt($payment_key);
 
 	// Key was provided, but user is logged out. Offer them the ability to login and view the receipt
-	if ( ! $user_can_view && $email_access == 'on' && ! Give()->email_access->token_exists ) {
+	if ( ! $user_can_view && $email_access == 'on' && ! Give()->email_access->token_exists) {
 
 		ob_start();
 
-		give_get_template_part( 'email-login-form' );
+		give_get_template_part('email-login-form');
 
 		return ob_get_clean();
 
-	} elseif ( ! $user_can_view ) {
+	} elseif ( ! $user_can_view) {
 
 		global $give_login_redirect;
 
@@ -275,9 +275,9 @@ 
 
 		ob_start();
 
-		give_output_error( apply_filters( 'give_must_be_logged_in_error_message', esc_html__( 'You must be logged in to view this donation payment receipt.', 'give' ) ) );
+		give_output_error(apply_filters('give_must_be_logged_in_error_message', esc_html__('You must be logged in to view this donation payment receipt.', 'give')));
 
-		give_get_template_part( 'shortcode', 'login' );
+		give_get_template_part('shortcode', 'login');
 
 		$login_form = ob_get_clean();
 
@@ -294,13 +294,13 @@ 
 	 * Or if user is logged in and the user can view sensitive shop data
 	 *
 	 */
-	if ( ! apply_filters( 'give_user_can_view_receipt', $user_can_view, $give_receipt_args ) ) {
-		return give_output_error( $give_receipt_args['error'], false, 'error' );
+	if ( ! apply_filters('give_user_can_view_receipt', $user_can_view, $give_receipt_args)) {
+		return give_output_error($give_receipt_args['error'], false, 'error');
 	}
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'receipt' );
+	give_get_template_part('shortcode', 'receipt');
 
 	$display = ob_get_clean();
 
@@ -309,7 +309,7 @@ 
 
 }
 
-add_shortcode( 'give_receipt', 'give_receipt_shortcode' );
+add_shortcode('give_receipt', 'give_receipt_shortcode');
 
 /**
  * Profile Editor Shortcode
@@ -329,18 +329,18 @@ 
  *
  * @return string Output generated from the profile editor
  */
-function give_profile_editor_shortcode( $atts, $content = null ) {
+function give_profile_editor_shortcode($atts, $content = null) {
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'profile-editor' );
+	give_get_template_part('shortcode', 'profile-editor');
 
 	$display = ob_get_clean();
 
 	return $display;
 }
 
-add_shortcode( 'give_profile_editor', 'give_profile_editor_shortcode' );
+add_shortcode('give_profile_editor', 'give_profile_editor_shortcode');
 
 /**
  * Process Profile Updater Form
@@ -353,30 +353,30 @@ 
  *
  * @return false
  */
-function give_process_profile_editor_updates( $data ) {
+function give_process_profile_editor_updates($data) {
 	// Profile field change request
-	if ( empty( $_POST['give_profile_editor_submit'] ) && ! is_user_logged_in() ) {
+	if (empty($_POST['give_profile_editor_submit']) && ! is_user_logged_in()) {
 		return false;
 	}
 
 	// Nonce security
-	if ( ! wp_verify_nonce( $data['give_profile_editor_nonce'], 'give-profile-editor-nonce' ) ) {
+	if ( ! wp_verify_nonce($data['give_profile_editor_nonce'], 'give-profile-editor-nonce')) {
 		return false;
 	}
 
 	$user_id       = get_current_user_id();
-	$old_user_data = get_userdata( $user_id );
-
-	$display_name = isset( $data['give_display_name'] ) ? sanitize_text_field( $data['give_display_name'] ) : $old_user_data->display_name;
-	$first_name   = isset( $data['give_first_name'] ) ? sanitize_text_field( $data['give_first_name'] ) : $old_user_data->first_name;
-	$last_name    = isset( $data['give_last_name'] ) ? sanitize_text_field( $data['give_last_name'] ) : $old_user_data->last_name;
-	$email        = isset( $data['give_email'] ) ? sanitize_email( $data['give_email'] ) : $old_user_data->user_email;
-	$line1        = ( isset( $data['give_address_line1'] ) ? sanitize_text_field( $data['give_address_line1'] ) : '' );
-	$line2        = ( isset( $data['give_address_line2'] ) ? sanitize_text_field( $data['give_address_line2'] ) : '' );
-	$city         = ( isset( $data['give_address_city'] ) ? sanitize_text_field( $data['give_address_city'] ) : '' );
-	$state        = ( isset( $data['give_address_state'] ) ? sanitize_text_field( $data['give_address_state'] ) : '' );
-	$zip          = ( isset( $data['give_address_zip'] ) ? sanitize_text_field( $data['give_address_zip'] ) : '' );
-	$country      = ( isset( $data['give_address_country'] ) ? sanitize_text_field( $data['give_address_country'] ) : '' );
+	$old_user_data = get_userdata($user_id);
+
+	$display_name = isset($data['give_display_name']) ? sanitize_text_field($data['give_display_name']) : $old_user_data->display_name;
+	$first_name   = isset($data['give_first_name']) ? sanitize_text_field($data['give_first_name']) : $old_user_data->first_name;
+	$last_name    = isset($data['give_last_name']) ? sanitize_text_field($data['give_last_name']) : $old_user_data->last_name;
+	$email        = isset($data['give_email']) ? sanitize_email($data['give_email']) : $old_user_data->user_email;
+	$line1        = (isset($data['give_address_line1']) ? sanitize_text_field($data['give_address_line1']) : '');
+	$line2        = (isset($data['give_address_line2']) ? sanitize_text_field($data['give_address_line2']) : '');
+	$city         = (isset($data['give_address_city']) ? sanitize_text_field($data['give_address_city']) : '');
+	$state        = (isset($data['give_address_state']) ? sanitize_text_field($data['give_address_state']) : '');
+	$zip          = (isset($data['give_address_zip']) ? sanitize_text_field($data['give_address_zip']) : '');
+	$country      = (isset($data['give_address_country']) ? sanitize_text_field($data['give_address_country']) : '');
 
 	$userdata = array(
 		'ID'           => $user_id,
@@ -396,45 +396,45 @@ 
 		'country' => $country
 	);
 
-	do_action( 'give_pre_update_user_profile', $user_id, $userdata );
+	do_action('give_pre_update_user_profile', $user_id, $userdata);
 
 	// New password
-	if ( ! empty( $data['give_new_user_pass1'] ) ) {
-		if ( $data['give_new_user_pass1'] !== $data['give_new_user_pass2'] ) {
-			give_set_error( 'password_mismatch', __( 'The passwords you entered do not match. Please try again.', 'give' ) );
+	if ( ! empty($data['give_new_user_pass1'])) {
+		if ($data['give_new_user_pass1'] !== $data['give_new_user_pass2']) {
+			give_set_error('password_mismatch', __('The passwords you entered do not match. Please try again.', 'give'));
 		} else {
 			$userdata['user_pass'] = $data['give_new_user_pass1'];
 		}
 	}
 
 	// Make sure the new email doesn't belong to another user
-	if ( $email != $old_user_data->user_email ) {
-		if ( email_exists( $email ) ) {
-			give_set_error( 'email_exists', __( 'The email you entered belongs to another user. Please use another.', 'give' ) );
+	if ($email != $old_user_data->user_email) {
+		if (email_exists($email)) {
+			give_set_error('email_exists', __('The email you entered belongs to another user. Please use another.', 'give'));
 		}
 	}
 
 	// Check for errors
 	$errors = give_get_errors();
 
-	if ( $errors ) {
+	if ($errors) {
 		// Send back to the profile editor if there are errors
-		wp_redirect( $data['give_redirect'] );
+		wp_redirect($data['give_redirect']);
 		give_die();
 	}
 
 	// Update the user
-	$meta    = update_user_meta( $user_id, '_give_user_address', $address );
-	$updated = wp_update_user( $userdata );
+	$meta    = update_user_meta($user_id, '_give_user_address', $address);
+	$updated = wp_update_user($userdata);
 
-	if ( $updated ) {
-		do_action( 'give_user_profile_updated', $user_id, $userdata );
-		wp_redirect( add_query_arg( 'updated', 'true', $data['give_redirect'] ) );
+	if ($updated) {
+		do_action('give_user_profile_updated', $user_id, $userdata);
+		wp_redirect(add_query_arg('updated', 'true', $data['give_redirect']));
 		give_die();
 	}
 
 	return false;
 }
 
-add_action( 'give_edit_user_profile', 'give_process_profile_editor_updates' );
+add_action('give_edit_user_profile', 'give_process_profile_editor_updates');
 

includes/template-functions.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Template Functions
- *
- * @package     Give
- * @subpackage  Functions/Templates
- * @copyright   Copyright (c) 2015, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+	 * Template Functions
+	 *
+	 * @package     Give
+	 * @subpackage  Functions/Templates
+	 * @copyright   Copyright (c) 2015, WordImpress
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.0
+	 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {

Spacing +63 added lines, -63 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,7 +21,7 @@ 
  * @return string
  */
 function give_get_templates_dir() {
-	return GIVE_PLUGIN_DIR . 'templates';
+	return GIVE_PLUGIN_DIR.'templates';
 }
 
 /**
@@ -31,7 +31,7 @@ 
  * @return string
  */
 function give_get_templates_url() {
-	return GIVE_PLUGIN_URL . 'templates';
+	return GIVE_PLUGIN_URL.'templates';
 }
 
 /**
@@ -51,23 +51,23 @@ 
  * @uses  load_template()
  * @uses  get_template_part()
  */
-function give_get_template_part( $slug, $name = null, $load = true ) {
+function give_get_template_part($slug, $name = null, $load = true) {
 
 	// Execute code for this part
-	do_action( 'get_template_part_' . $slug, $slug, $name );
+	do_action('get_template_part_'.$slug, $slug, $name);
 
 	// Setup possible parts
 	$templates = array();
-	if ( isset( $name ) ) {
-		$templates[] = $slug . '-' . $name . '.php';
+	if (isset($name)) {
+		$templates[] = $slug.'-'.$name.'.php';
 	}
-	$templates[] = $slug . '.php';
+	$templates[] = $slug.'.php';
 
 	// Allow template parts to be filtered
-	$templates = apply_filters( 'give_get_template_part', $templates, $slug, $name );
+	$templates = apply_filters('give_get_template_part', $templates, $slug, $name);
 
 	// Return the part that is found
-	return give_locate_template( $templates, $load, false );
+	return give_locate_template($templates, $load, false);
 }
 
 /**
@@ -88,37 +88,37 @@ 
  *
  * @return string The template filename if one is located.
  */
-function give_locate_template( $template_names, $load = false, $require_once = true ) {
+function give_locate_template($template_names, $load = false, $require_once = true) {
 	// No file found yet
 	$located = false;
 
 	// Try to find a template file
-	foreach ( (array) $template_names as $template_name ) {
+	foreach ((array) $template_names as $template_name) {
 
 		// Continue if template is empty
-		if ( empty( $template_name ) ) {
+		if (empty($template_name)) {
 			continue;
 		}
 
 		// Trim off any slashes from the template name
-		$template_name = ltrim( $template_name, '/' );
+		$template_name = ltrim($template_name, '/');
 
 		// try locating this template file by looping through the template paths
-		foreach ( give_get_theme_template_paths() as $template_path ) {
+		foreach (give_get_theme_template_paths() as $template_path) {
 
-			if ( file_exists( $template_path . $template_name ) ) {
-				$located = $template_path . $template_name;
+			if (file_exists($template_path.$template_name)) {
+				$located = $template_path.$template_name;
 				break;
 			}
 		}
 
-		if ( $located ) {
+		if ($located) {
 			break;
 		}
 	}
 
-	if ( ( true == $load ) && ! empty( $located ) ) {
-		load_template( $located, $require_once );
+	if ((true == $load) && ! empty($located)) {
+		load_template($located, $require_once);
 	}
 
 	return $located;
@@ -135,17 +135,17 @@ 
 	$template_dir = give_get_theme_template_dir_name();
 
 	$file_paths = array(
-		1   => trailingslashit( get_stylesheet_directory() ) . $template_dir,
-		10  => trailingslashit( get_template_directory() ) . $template_dir,
+		1   => trailingslashit(get_stylesheet_directory()).$template_dir,
+		10  => trailingslashit(get_template_directory()).$template_dir,
 		100 => give_get_templates_dir()
 	);
 
-	$file_paths = apply_filters( 'give_template_paths', $file_paths );
+	$file_paths = apply_filters('give_template_paths', $file_paths);
 
 	// sort the file paths based on priority
-	ksort( $file_paths, SORT_NUMERIC );
+	ksort($file_paths, SORT_NUMERIC);
 
-	return array_map( 'trailingslashit', $file_paths );
+	return array_map('trailingslashit', $file_paths);
 }
 
 /**
@@ -157,7 +157,7 @@ 
  * @return string
  */
 function give_get_theme_template_dir_name() {
-	return trailingslashit( apply_filters( 'give_templates_dir', 'give' ) );
+	return trailingslashit(apply_filters('give_templates_dir', 'give'));
 }
 
 /**
@@ -167,10 +167,10 @@ 
  * @return void
  */
 function give_version_in_header() {
-	echo '<meta name="generator" content="Give v' . GIVE_VERSION . '" />' . "\n";
+	echo '<meta name="generator" content="Give v'.GIVE_VERSION.'" />'."\n";
 }
 
-add_action( 'wp_head', 'give_version_in_header' );
+add_action('wp_head', 'give_version_in_header');
 
 /**
  * Determines if we're currently on the Donations History page.
@@ -180,9 +180,9 @@ 
  */
 function give_is_donation_history_page() {
 
-	$ret = is_page( give_get_option( 'history_page' ) );
+	$ret = is_page(give_get_option('history_page'));
 
-	return apply_filters( 'give_is_donation_history_page', $ret );
+	return apply_filters('give_is_donation_history_page', $ret);
 }
 
 /**
@@ -194,25 +194,25 @@ 
  *
  * @return array Modified array of classes
  */
-function give_add_body_classes( $class ) {
+function give_add_body_classes($class) {
 	$classes = (array) $class;
 
-	if ( give_is_success_page() ) {
+	if (give_is_success_page()) {
 		$classes[] = 'give-success';
 		$classes[] = 'give-page';
 	}
 
-	if ( give_is_failed_transaction_page() ) {
+	if (give_is_failed_transaction_page()) {
 		$classes[] = 'give-failed-transaction';
 		$classes[] = 'give-page';
 	}
 
-	if ( give_is_donation_history_page() ) {
+	if (give_is_donation_history_page()) {
 		$classes[] = 'give-donation-history';
 		$classes[] = 'give-page';
 	}
 
-	if ( give_is_test_mode() ) {
+	if (give_is_test_mode()) {
 		$classes[] = 'give-test-mode';
 		$classes[] = 'give-page';
 	}
@@ -220,7 +220,7 @@ 
 	//Theme-specific Classes used to prevent conflicts via CSS
 	$current_theme = wp_get_theme();
 
-	switch ( $current_theme->template ) {
+	switch ($current_theme->template) {
 
 		case 'Divi':
 			$classes[] = 'give-divi';
@@ -234,10 +234,10 @@ 
 
 	}
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
 
-add_filter( 'body_class', 'give_add_body_classes' );
+add_filter('body_class', 'give_add_body_classes');
 
 
 /**
@@ -253,22 +253,22 @@ 
  *
  * @return array
  */
-function give_add_post_class( $classes, $class = '', $post_id = '' ) {
-	if ( ! $post_id || 'give_forms' !== get_post_type( $post_id ) ) {
+function give_add_post_class($classes, $class = '', $post_id = '') {
+	if ( ! $post_id || 'give_forms' !== get_post_type($post_id)) {
 		return $classes;
 	}
 
 	//@TODO: Add classes for custom taxonomy and form configurations (multi vs single donations, etc).
 
-	if ( false !== ( $key = array_search( 'hentry', $classes ) ) ) {
-		unset( $classes[ $key ] );
+	if (false !== ($key = array_search('hentry', $classes))) {
+		unset($classes[$key]);
 	}
 
 	return $classes;
 }
 
 
-add_filter( 'post_class', 'give_add_post_class', 20, 3 );
+add_filter('post_class', 'give_add_post_class', 20, 3);
 
 /**
  * Get the placeholder image URL for forms etc
@@ -278,84 +278,84 @@ 
  */
 function give_get_placeholder_img_src() {
 
-	$placeholder_url = 'http://placehold.it/600x600&text=' . urlencode( esc_attr__( 'Give Placeholder Image', 'give' ) );
+	$placeholder_url = 'http://placehold.it/600x600&text='.urlencode(esc_attr__('Give Placeholder Image', 'give'));
 
-	return apply_filters( 'give_placeholder_img_src', $placeholder_url );
+	return apply_filters('give_placeholder_img_src', $placeholder_url);
 }
 
 
 /**
  * Global
  */
-if ( ! function_exists( 'give_output_content_wrapper' ) ) {
+if ( ! function_exists('give_output_content_wrapper')) {
 
 	/**
 	 * Output the start of the page wrapper.
 	 */
 	function give_output_content_wrapper() {
-		give_get_template_part( 'global/wrapper-start' );
+		give_get_template_part('global/wrapper-start');
 	}
 }
-if ( ! function_exists( 'give_output_content_wrapper_end' ) ) {
+if ( ! function_exists('give_output_content_wrapper_end')) {
 
 	/**
 	 * Output the end of the page wrapper.
 	 */
 	function give_output_content_wrapper_end() {
-		give_get_template_part( 'global/wrapper-end' );
+		give_get_template_part('global/wrapper-end');
 	}
 }
 
 /**
  * Single Give Form
  */
-if ( ! function_exists( 'give_left_sidebar_pre_wrap' ) ) {
+if ( ! function_exists('give_left_sidebar_pre_wrap')) {
 	function give_left_sidebar_pre_wrap() {
-		echo apply_filters( 'give_left_sidebar_pre_wrap', '<div id="give-sidebar-left" class="give-sidebar give-single-form-sidebar-left">' );
+		echo apply_filters('give_left_sidebar_pre_wrap', '<div id="give-sidebar-left" class="give-sidebar give-single-form-sidebar-left">');
 	}
 }
 
-if ( ! function_exists( 'give_left_sidebar_post_wrap' ) ) {
+if ( ! function_exists('give_left_sidebar_post_wrap')) {
 	function give_left_sidebar_post_wrap() {
-		echo apply_filters( 'give_left_sidebar_post_wrap', '</div>' );
+		echo apply_filters('give_left_sidebar_post_wrap', '</div>');
 	}
 }
 
-if ( ! function_exists( 'give_get_forms_sidebar' ) ) {
+if ( ! function_exists('give_get_forms_sidebar')) {
 	function give_get_forms_sidebar() {
-		give_get_template_part( 'single-give-form/sidebar' );
+		give_get_template_part('single-give-form/sidebar');
 	}
 }
 
-if ( ! function_exists( 'give_show_form_images' ) ) {
+if ( ! function_exists('give_show_form_images')) {
 
 	/**
 	 * Output the product image before the single product summary.
 	 */
 	function give_show_form_images() {
-		$featured_image_option = give_get_option( 'disable_form_featured_img' );
-		if ( $featured_image_option !== 'on' ) {
-			give_get_template_part( 'single-give-form/featured-image' );
+		$featured_image_option = give_get_option('disable_form_featured_img');
+		if ($featured_image_option !== 'on') {
+			give_get_template_part('single-give-form/featured-image');
 		}
 	}
 }
 
-if ( ! function_exists( 'give_template_single_title' ) ) {
+if ( ! function_exists('give_template_single_title')) {
 
 	/**
 	 * Output the product title.
 	 */
 	function give_template_single_title() {
-		give_get_template_part( 'single-give-form/title' );
+		give_get_template_part('single-give-form/title');
 	}
 }
 
-if ( ! function_exists( 'give_show_avatars' ) ) {
+if ( ! function_exists('give_show_avatars')) {
 
 	/**
 	 * Output the product title.
 	 */
 	function give_show_avatars() {
-		echo do_shortcode( '[give_donators_gravatars]' );
+		echo do_shortcode('[give_donators_gravatars]');
 	}
 }
\ No newline at end of file

includes/admin/register-settings.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 	 *

 	 * @param $url

 	 *

-	 * @return mixed

+	 * @return string

 	 */

 	public function give_update_cmb_meta_box_url( $url ) {

 		//Path to Give's CMB

@@ -767,7 +767,7 @@ 
  * @since 1.0

  *

  * @param string $key The Key to update

- * @param string|bool|int $value The value to set the key to

+ * @param integer $value The value to set the key to

  *

  * @return boolean True if updated, false if not.

  */

Spacing +299 added lines, -299 removed lines

@@ -43,24 +43,24 @@ 
 	 */

 	public function __construct() {

 

-		add_action( 'admin_init', array( $this, 'init' ) );

+		add_action('admin_init', array($this, 'init'));

 

 		//Customize CMB2 URL

-		add_filter( 'cmb2_meta_box_url', array( $this, 'give_update_cmb_meta_box_url' ) );

+		add_filter('cmb2_meta_box_url', array($this, 'give_update_cmb_meta_box_url'));

 

 		//Custom CMB2 Settings Fields

-		add_action( 'cmb2_render_give_title', 'give_title_callback', 10, 5 );

-		add_action( 'cmb2_render_give_description', 'give_description_callback', 10, 5 );

-		add_action( 'cmb2_render_enabled_gateways', 'give_enabled_gateways_callback', 10, 5 );

-		add_action( 'cmb2_render_default_gateway', 'give_default_gateway_callback', 10, 5 );

-		add_action( 'cmb2_render_email_preview_buttons', 'give_email_preview_buttons_callback', 10, 5 );

-		add_action( 'cmb2_render_system_info', 'give_system_info_callback', 10, 5 );

-		add_action( 'cmb2_render_api', 'give_api_callback', 10, 5 );

-		add_action( 'cmb2_render_license_key', 'give_license_key_callback', 10, 5 );

-		add_action( 'admin_notices', array( $this, 'settings_notices' ) );

+		add_action('cmb2_render_give_title', 'give_title_callback', 10, 5);

+		add_action('cmb2_render_give_description', 'give_description_callback', 10, 5);

+		add_action('cmb2_render_enabled_gateways', 'give_enabled_gateways_callback', 10, 5);

+		add_action('cmb2_render_default_gateway', 'give_default_gateway_callback', 10, 5);

+		add_action('cmb2_render_email_preview_buttons', 'give_email_preview_buttons_callback', 10, 5);

+		add_action('cmb2_render_system_info', 'give_system_info_callback', 10, 5);

+		add_action('cmb2_render_api', 'give_api_callback', 10, 5);

+		add_action('cmb2_render_license_key', 'give_license_key_callback', 10, 5);

+		add_action('admin_notices', array($this, 'settings_notices'));

 

 		// Include CMB CSS in the head to avoid FOUC

-		add_action( "admin_print_styles-give_forms_page_give-settings", array( 'CMB2_hookup', 'enqueue_cmb_css' ) );

+		add_action("admin_print_styles-give_forms_page_give-settings", array('CMB2_hookup', 'enqueue_cmb_css'));

 

 	}

 

@@ -69,7 +69,7 @@ 
 	 * @since  1.0

 	 */

 	public function init() {

-		register_setting( $this->key, $this->key );

+		register_setting($this->key, $this->key);

 

 	}

 

@@ -83,9 +83,9 @@ 
 	 *

 	 * @return mixed

 	 */

-	public function give_update_cmb_meta_box_url( $url ) {

+	public function give_update_cmb_meta_box_url($url) {

 		//Path to Give's CMB

-		return GIVE_PLUGIN_URL . '/includes/libraries/cmb2';

+		return GIVE_PLUGIN_URL.'/includes/libraries/cmb2';

 	}

 

 

@@ -97,27 +97,27 @@ 
 	 */

 	public function give_get_settings_tabs() {

 

-		$settings = $this->give_settings( null );

+		$settings = $this->give_settings(null);

 

 		$tabs             = array();

-		$tabs['general']  = __( 'General', 'give' );

-		$tabs['gateways'] = __( 'Payment Gateways', 'give' );

-		$tabs['display']  = __( 'Display Options', 'give' );

-		$tabs['emails']   = __( 'Emails', 'give' );

+		$tabs['general']  = __('General', 'give');

+		$tabs['gateways'] = __('Payment Gateways', 'give');

+		$tabs['display']  = __('Display Options', 'give');

+		$tabs['emails']   = __('Emails', 'give');

 

-		if ( ! empty( $settings['addons']['fields'] ) ) {

-			$tabs['addons'] = __( 'Add-ons', 'give' );

+		if ( ! empty($settings['addons']['fields'])) {

+			$tabs['addons'] = __('Add-ons', 'give');

 		}

 

-		if ( ! empty( $settings['licenses']['fields'] ) ) {

-			$tabs['licenses'] = __( 'Licenses', 'give' );

+		if ( ! empty($settings['licenses']['fields'])) {

+			$tabs['licenses'] = __('Licenses', 'give');

 		}

 

-		$tabs['advanced']    = __( 'Advanced', 'give' );

-		$tabs['api']         = __( 'API', 'give' );

-		$tabs['system_info'] = __( 'System Info', 'give' );

+		$tabs['advanced']    = __('Advanced', 'give');

+		$tabs['api']         = __('API', 'give');

+		$tabs['system_info'] = __('System Info', 'give');

 

-		return apply_filters( 'give_settings_tabs', $tabs );

+		return apply_filters('give_settings_tabs', $tabs);

 	}

 

 

@@ -127,31 +127,31 @@ 
 	 */

 	public function admin_page_display() {

 

-		$active_tab = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $this->give_get_settings_tabs() ) ? $_GET['tab'] : 'general';

+		$active_tab = isset($_GET['tab']) && array_key_exists($_GET['tab'], $this->give_get_settings_tabs()) ? $_GET['tab'] : 'general';

 

 		?>

 

 		<div class="wrap give_settings_page cmb2_options_page <?php echo $this->key; ?>">

 			<h1 class="nav-tab-wrapper">

 				<?php

-				foreach ( $this->give_get_settings_tabs() as $tab_id => $tab_name ) {

+				foreach ($this->give_get_settings_tabs() as $tab_id => $tab_name) {

 

-					$tab_url = esc_url( add_query_arg( array(

+					$tab_url = esc_url(add_query_arg(array(

 						'settings-updated' => false,

 						'tab'              => $tab_id

-					) ) );

+					)));

 

 					$active = $active_tab == $tab_id ? ' nav-tab-active' : '';

 

-					echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '">';

-					echo esc_html( $tab_name );

+					echo '<a href="'.esc_url($tab_url).'" title="'.esc_attr($tab_name).'" class="nav-tab'.$active.'">';

+					echo esc_html($tab_name);

 

 					echo '</a>';

 				}

 				?>

 			</h1>

 

-			<?php cmb2_metabox_form( $this->give_settings( $active_tab ), $this->key ); ?>

+			<?php cmb2_metabox_form($this->give_settings($active_tab), $this->key); ?>

 

 		</div><!-- .wrap -->

 

@@ -167,7 +167,7 @@ 
 	 *

 	 * @return array

 	 */

-	public function give_settings( $active_tab ) {

+	public function give_settings($active_tab) {

 

 		$give_settings = array(

 			/**

@@ -175,60 +175,60 @@ 
 			 */

 			'general'     => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'General Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_general', array(

+				'give_title' => __('General Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_general', array(

 						array(

-							'name' => __( 'General Settings', 'give' ),

+							'name' => __('General Settings', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_1'

 						),

 						array(

-							'name'    => __( 'Success Page', 'give' ),

-							'desc'    => sprintf( __( 'This is the page donors are sent to after completing their donations. The %1$s[give_receipt]%2$s shortcode should be on this page.', 'give' ), '<code>', '</code>' ),

+							'name'    => __('Success Page', 'give'),

+							'desc'    => sprintf(__('This is the page donors are sent to after completing their donations. The %1$s[give_receipt]%2$s shortcode should be on this page.', 'give'), '<code>', '</code>'),

 							'id'      => 'success_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Failed Transaction Page', 'give' ),

-							'desc'    => __( 'This is the page donors are sent to if their transaction is cancelled or fails.', 'give' ),

+							'name'    => __('Failed Transaction Page', 'give'),

+							'desc'    => __('This is the page donors are sent to if their transaction is cancelled or fails.', 'give'),

 							'id'      => 'failure_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Donation History Page', 'give' ),

-							'desc'    => sprintf( __( 'This page shows a complete donation history for the current user. The %1$s[donation_history]%2$s shortcode should be on this page.', 'give' ), '<code>', '</code>' ),

+							'name'    => __('Donation History Page', 'give'),

+							'desc'    => sprintf(__('This page shows a complete donation history for the current user. The %1$s[donation_history]%2$s shortcode should be on this page.', 'give'), '<code>', '</code>'),

 							'id'      => 'history_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Base Country', 'give' ),

-							'desc'    => __( 'Where does your site operate from?', 'give' ),

+							'name'    => __('Base Country', 'give'),

+							'desc'    => __('Where does your site operate from?', 'give'),

 							'id'      => 'base_country',

 							'type'    => 'select',

 							'options' => give_get_country_list(),

 						),

 						array(

-							'name' => __( 'Currency Settings', 'give' ),

+							'name' => __('Currency Settings', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_2'

 						),

 						array(

-							'name'    => __( 'Currency', 'give' ),

+							'name'    => __('Currency', 'give'),

 							'desc'    => 'Choose your currency. Note that some payment gateways have currency restrictions.',

 							'id'      => 'currency',

 							'type'    => 'select',

@@ -236,26 +236,26 @@ 
 							'default' => 'USD',

 						),

 						array(

-							'name'    => __( 'Currency Position', 'give' ),

+							'name'    => __('Currency Position', 'give'),

 							'desc'    => 'Choose the position of the currency sign.',

 							'id'      => 'currency_position',

 							'type'    => 'select',

 							'options' => array(

-								'before' => sprintf( __( 'Before - %1$s10', 'give' ), give_currency_symbol( give_get_currency() ) ),

-								'after'  => sprintf( __( 'After - 10%1$s', 'give' ), give_currency_symbol( give_get_currency() ) )

+								'before' => sprintf(__('Before - %1$s10', 'give'), give_currency_symbol(give_get_currency())),

+								'after'  => sprintf(__('After - 10%1$s', 'give'), give_currency_symbol(give_get_currency()))

 							),

 							'default' => 'before',

 						),

 						array(

-							'name'    => __( 'Thousands Separator', 'give' ),

-							'desc'    => __( 'The symbol (typically , or .) to separate thousands', 'give' ),

+							'name'    => __('Thousands Separator', 'give'),

+							'desc'    => __('The symbol (typically , or .) to separate thousands', 'give'),

 							'id'      => 'thousands_separator',

 							'type'    => 'text_small',

 							'default' => ',',

 						),

 						array(

-							'name'    => __( 'Decimal Separator', 'give' ),

-							'desc'    => __( 'The symbol (usually , or .) to separate decimal points', 'give' ),

+							'name'    => __('Decimal Separator', 'give'),

+							'desc'    => __('The symbol (usually , or .) to separate decimal points', 'give'),

 							'id'      => 'decimal_separator',

 							'type'    => 'text_small',

 							'default' => '.',

@@ -268,83 +268,83 @@ 
 			 */

 			'gateways'    => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Payment Gateways', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_gateways', array(

+				'give_title' => __('Payment Gateways', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_gateways', array(

 						array(

-							'name' => __( 'Gateways Settings', 'give' ),

+							'name' => __('Gateways Settings', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_gateway_settings_1',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Test Mode', 'give' ),

-							'desc' => __( 'While in test mode no live transactions are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give' ),

+							'name' => __('Test Mode', 'give'),

+							'desc' => __('While in test mode no live transactions are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give'),

 							'id'   => 'test_mode',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enabled Gateways', 'give' ),

-							'desc' => __( 'Choose the payment gateways you would like enabled.', 'give' ),

+							'name' => __('Enabled Gateways', 'give'),

+							'desc' => __('Choose the payment gateways you would like enabled.', 'give'),

 							'id'   => 'gateways',

 							'type' => 'enabled_gateways'

 						),

 						array(

-							'name' => __( 'Default Gateway', 'give' ),

-							'desc' => __( 'This is the gateway that will be selected by default.', 'give' ),

+							'name' => __('Default Gateway', 'give'),

+							'desc' => __('This is the gateway that will be selected by default.', 'give'),

 							'id'   => 'default_gateway',

 							'type' => 'default_gateway'

 						),

 						array(

-							'name' => __( 'PayPal Standard', 'give' ),

+							'name' => __('PayPal Standard', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_2',

 						),

 						array(

-							'name' => __( 'PayPal Email', 'give' ),

-							'desc' => __( 'Enter your PayPal account\'s email', 'give' ),

+							'name' => __('PayPal Email', 'give'),

+							'desc' => __('Enter your PayPal account\'s email', 'give'),

 							'id'   => 'paypal_email',

 							'type' => 'text_email',

 						),

 						array(

-							'name' => __( 'PayPal Page Style', 'give' ),

-							'desc' => __( 'Enter the name of the page style to use, or leave blank to use the default', 'give' ),

+							'name' => __('PayPal Page Style', 'give'),

+							'desc' => __('Enter the name of the page style to use, or leave blank to use the default', 'give'),

 							'id'   => 'paypal_page_style',

 							'type' => 'text',

 						),

 						array(

-							'name'    => __( 'PayPal Transaction Type', 'give' ),

-							'desc'    => __( 'Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give' ),

+							'name'    => __('PayPal Transaction Type', 'give'),

+							'desc'    => __('Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give'),

 							'id'      => 'paypal_button_type',

 							'type'    => 'radio_inline',

 							'options' => array(

-								'donation' => __( 'Donation', 'give' ),

-								'standard' => __( 'Standard Transaction', 'give' )

+								'donation' => __('Donation', 'give'),

+								'standard' => __('Standard Transaction', 'give')

 							),

 							'default' => 'donation',

 						),

 						array(

-							'name' => __( 'Disable PayPal IPN Verification', 'give' ),

-							'desc' => __( 'If donations are not getting marked as complete, then check this box. This forces the site to use a slightly less secure method of verifying donations.', 'give' ),

+							'name' => __('Disable PayPal IPN Verification', 'give'),

+							'desc' => __('If donations are not getting marked as complete, then check this box. This forces the site to use a slightly less secure method of verifying donations.', 'give'),

 							'id'   => 'disable_paypal_verification',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Offline Donations', 'give' ),

+							'name' => __('Offline Donations', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_3',

 						),

 						array(

-							'name' => __( 'Collect Billing Details', 'give' ),

-							'desc' => __( 'This option will enable the billing details section for offline donations. The fieldset will appear above the offline donation instructions. Note: You may customize this option per form as needed.', 'give' ),

+							'name' => __('Collect Billing Details', 'give'),

+							'desc' => __('This option will enable the billing details section for offline donations. The fieldset will appear above the offline donation instructions. Note: You may customize this option per form as needed.', 'give'),

 							'id'   => 'give_offline_donation_enable_billing_fields',

 							'type' => 'checkbox'

 						),

 						array(

-							'name'    => __( 'Offline Donation Instructions', 'give' ),

-							'desc'    => __( 'The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give' ),

+							'name'    => __('Offline Donation Instructions', 'give'),

+							'desc'    => __('The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give'),

 							'id'      => 'global_offline_donation_content',

 							'default' => give_get_default_offline_donation_content(),

 							'type'    => 'wysiwyg',

@@ -353,15 +353,15 @@ 
 							)

 						),

 						array(

-							'name'    => __( 'Offline Donation Email Instructions Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation receipt email.', 'give' ),

+							'name'    => __('Offline Donation Email Instructions Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation receipt email.', 'give'),

 							'id'      => 'offline_donation_subject',

-							'default' => __( '{donation} - Offline Donation Instructions', 'give' ),

+							'default' => __('{donation} - Offline Donation Instructions', 'give'),

 							'type'    => 'text'

 						),

 						array(

-							'name'    => __( 'Offline Donation Email Instructions', 'give' ),

-							'desc'    => __( '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' ),

+							'name'    => __('Offline Donation Email Instructions', 'give'),

+							'desc'    => __('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'      => 'global_offline_donation_email',

 							'default' => give_get_default_offline_donation_email_content(),

 							'type'    => 'wysiwyg',

@@ -375,93 +375,93 @@ 
 			/** Display Settings */

 			'display'     => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Display Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_display', array(

+				'give_title' => __('Display Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_display', array(

 						array(

-							'name' => __( 'Display Settings', 'give' ),

+							'name' => __('Display Settings', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_display_settings_1',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable CSS', 'give' ),

-							'desc' => __( 'Enable this option if you would like to disable all of Give\'s included CSS stylesheets.', 'give' ),

+							'name' => __('Disable CSS', 'give'),

+							'desc' => __('Enable this option if you would like to disable all of Give\'s included CSS stylesheets.', 'give'),

 							'id'   => 'disable_css',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enable Floating Labels', 'give' ),

-							'desc' => sprintf( esc_html__( 'Enable this option if you would like to enable %1$sfloating labels%2$s in Give\'s donation forms. %3$sBe aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give' ), '<a href="' . esc_url( "http://bradfrost.com/blog/post/float-label-pattern/" ) . '" target="_blank">', '</a>', '<br />' ),

+							'name' => __('Enable Floating Labels', 'give'),

+							'desc' => sprintf(esc_html__('Enable this option if you would like to enable %1$sfloating labels%2$s in Give\'s donation forms. %3$sBe aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give'), '<a href="'.esc_url("http://bradfrost.com/blog/post/float-label-pattern/").'" target="_blank">', '</a>', '<br />'),

 							'id'   => 'enable_floatlabels',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Welcome Screen', 'give' ),

-							'desc' => sprintf( esc_html__( 'Enable this option if you would like to disable the Give Welcome screen every time Give is activated and/or updated. You can always access the Welcome Screen %1$shere%2$s if you want in the future.', 'give' ), '<a href="' . esc_url( admin_url( 'index.php?page=give-about' ) ) . '">', '</a>' ),

+							'name' => __('Disable Welcome Screen', 'give'),

+							'desc' => sprintf(esc_html__('Enable this option if you would like to disable the Give Welcome screen every time Give is activated and/or updated. You can always access the Welcome Screen %1$shere%2$s if you want in the future.', 'give'), '<a href="'.esc_url(admin_url('index.php?page=give-about')).'">', '</a>'),

 							'id'   => 'disable_welcome',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Post Types', 'give' ),

+							'name' => __('Post Types', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_display_settings_2',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable Form Single Views', 'give' ),

-							'desc' => __( 'By default, all forms have single views enabled which create a specific URL on your website for that form. This option disables the singular and archive views from being publicly viewable. Note: you will need to embed forms using a shortcode or widget if enabled.', 'give' ),

+							'name' => __('Disable Form Single Views', 'give'),

+							'desc' => __('By default, all forms have single views enabled which create a specific URL on your website for that form. This option disables the singular and archive views from being publicly viewable. Note: you will need to embed forms using a shortcode or widget if enabled.', 'give'),

 							'id'   => 'disable_forms_singular',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Archives', 'give' ),

-							'desc' => __( 'Archives pages list all the forms you have created. This option will disable only the form\'s archive page(s). The single form\'s view will remain in place. Note: you will need to refresh your permalinks after this option has been enabled.', 'give' ),

+							'name' => __('Disable Form Archives', 'give'),

+							'desc' => __('Archives pages list all the forms you have created. This option will disable only the form\'s archive page(s). The single form\'s view will remain in place. Note: you will need to refresh your permalinks after this option has been enabled.', 'give'),

 							'id'   => 'disable_forms_archives',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Excerpts', 'give' ),

-							'desc' => __( 'The excerpt is an optional summary or description of a donation form; in short, a summary as to why the user should give.', 'give' ),

+							'name' => __('Disable Form Excerpts', 'give'),

+							'desc' => __('The excerpt is an optional summary or description of a donation form; in short, a summary as to why the user should give.', 'give'),

 							'id'   => 'disable_forms_excerpt',

 							'type' => 'checkbox'

 						),

 

 						array(

-							'name'    => __( 'Featured Image Size', 'give' ),

-							'desc'    => __( 'The Featured Image is an image that is chosen as the representative image for a donation form. Some themes may have custom featured image sizes. Please select the size you would like to display for your single donation forms\' featured image.', 'give' ),

+							'name'    => __('Featured Image Size', 'give'),

+							'desc'    => __('The Featured Image is an image that is chosen as the representative image for a donation form. Some themes may have custom featured image sizes. Please select the size you would like to display for your single donation forms\' featured image.', 'give'),

 							'id'      => 'featured_image_size',

 							'type'    => 'select',

 							'default' => 'large',

 							'options' => give_get_featured_image_sizes()

 						),

 						array(

-							'name' => __( 'Disable Form Featured Image', 'give' ),

-							'desc' => __( 'If you do not wish to use the featured image functionality you can disable it using this option and it will not be displayed for single donation forms.', 'give' ),

+							'name' => __('Disable Form Featured Image', 'give'),

+							'desc' => __('If you do not wish to use the featured image functionality you can disable it using this option and it will not be displayed for single donation forms.', 'give'),

 							'id'   => 'disable_form_featured_img',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Single Form Sidebar', 'give' ),

-							'desc' => __( 'The sidebar allows you to add additional widget to the Give single form view. If you don\'t plan on using the sidebar you may disable it with this option.', 'give' ),

+							'name' => __('Disable Single Form Sidebar', 'give'),

+							'desc' => __('The sidebar allows you to add additional widget to the Give single form view. If you don\'t plan on using the sidebar you may disable it with this option.', 'give'),

 							'id'   => 'disable_form_sidebar',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Taxonomies', 'give' ),

+							'name' => __('Taxonomies', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_display_settings_3',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Enable Form Categories', 'give' ),

-							'desc' => __( 'Check this option if you would like to categorize your donation forms. This option enables the form\'s category taxonomy.', 'give' ),

+							'name' => __('Enable Form Categories', 'give'),

+							'desc' => __('Check this option if you would like to categorize your donation forms. This option enables the form\'s category taxonomy.', 'give'),

 							'id'   => 'enable_categories',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enable Form Tags', 'give' ),

-							'desc' => __( 'Check this option if you would like to tag your donation forms. This option enables the form\'s tag taxonomy.', 'give' ),

+							'name' => __('Enable Form Tags', 'give'),

+							'desc' => __('Check this option if you would like to tag your donation forms. This option enables the form\'s tag taxonomy.', 'give'),

 							'id'   => 'enable_tags',

 							'type' => 'checkbox'

 						),

@@ -474,93 +474,93 @@ 
 			 */

 			'emails'      => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Give Email Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_emails', array(

+				'give_title' => __('Give Email Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_emails', array(

 						array(

-							'name' => __( 'Email Settings', 'give' ),

+							'name' => __('Email Settings', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_email_settings_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'email_template',

-							'name'    => __( 'Email Template', 'give' ),

-							'desc'    => __( 'Choose a template. Click "Save Changes" then "Preview Donation Receipt" to see the new template.', 'give' ),

+							'name'    => __('Email Template', 'give'),

+							'desc'    => __('Choose a template. Click "Save Changes" then "Preview Donation Receipt" to see the new template.', 'give'),

 							'type'    => 'select',

 							'options' => give_get_email_templates()

 						),

 						array(

 							'id'   => 'email_logo',

-							'name' => __( 'Logo', 'give' ),

-							'desc' => __( 'Upload or choose a logo to be displayed at the top of the donation receipt emails. Displayed on HTML emails only.', 'give' ),

+							'name' => __('Logo', 'give'),

+							'desc' => __('Upload or choose a logo to be displayed at the top of the donation receipt emails. Displayed on HTML emails only.', 'give'),

 							'type' => 'file'

 						),

 						array(

 							'id'      => 'from_name',

-							'name'    => __( 'From Name', 'give' ),

-							'desc'    => __( 'The name donation receipts are said to come from. This should probably be your site or shop name.', 'give' ),

-							'default' => get_bloginfo( 'name' ),

+							'name'    => __('From Name', 'give'),

+							'desc'    => __('The name donation receipts are said to come from. This should probably be your site or shop name.', 'give'),

+							'default' => get_bloginfo('name'),

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'from_email',

-							'name'    => __( 'From Email', 'give' ),

-							'desc'    => __( 'Email to send donation receipts from. This will act as the "from" and "reply-to" address.', 'give' ),

-							'default' => get_bloginfo( 'admin_email' ),

+							'name'    => __('From Email', 'give'),

+							'desc'    => __('Email to send donation receipts from. This will act as the "from" and "reply-to" address.', 'give'),

+							'default' => get_bloginfo('admin_email'),

 							'type'    => 'text'

 						),

 						array(

-							'name' => __( 'Donation Receipt', 'give' ),

+							'name' => __('Donation Receipt', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_email_settings_2',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_subject',

-							'name'    => __( 'Donation Email Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation receipt email', 'give' ),

-							'default' => __( 'Donation Receipt', 'give' ),

+							'name'    => __('Donation Email Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation receipt email', 'give'),

+							'default' => __('Donation Receipt', 'give'),

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'donation_receipt',

-							'name'    => __( 'Donation Receipt', 'give' ),

-							'desc'    => __( 'Enter the email that is sent to users after completing a successful donation. HTML is accepted. Available template tags:', 'give' ) . '<br/>' . give_get_emails_tags_list(),

+							'name'    => __('Donation Receipt', 'give'),

+							'desc'    => __('Enter the email that is sent to users after completing a successful donation. HTML is accepted. Available template tags:', 'give').'<br/>'.give_get_emails_tags_list(),

 							'type'    => 'wysiwyg',

 							'default' => give_get_default_donation_receipt_email()

 						),

 						array(

-							'name' => __( 'New Donation Notification', 'give' ),

+							'name' => __('New Donation Notification', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_email_settings_3',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_notification_subject',

-							'name'    => __( 'Donation Notification Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation notification email', 'give' ),

+							'name'    => __('Donation Notification Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation notification email', 'give'),

 							'type'    => 'text',

-							'default' => __( 'New Donation - #{payment_id}', 'give' )

+							'default' => __('New Donation - #{payment_id}', 'give')

 						),

 						array(

 							'id'      => 'donation_notification',

-							'name'    => __( 'Donation Notification', 'give' ),

-							'desc'    => __( 'Enter the email that is sent to donation notification emails after completion of a donation. HTML is accepted. Available template tags:', 'give' ) . '<br/>' . give_get_emails_tags_list(),

+							'name'    => __('Donation Notification', 'give'),

+							'desc'    => __('Enter the email that is sent to donation notification emails after completion of a donation. HTML is accepted. Available template tags:', 'give').'<br/>'.give_get_emails_tags_list(),

 							'type'    => 'wysiwyg',

 							'default' => give_get_default_donation_notification_email()

 						),

 						array(

 							'id'      => 'admin_notice_emails',

-							'name'    => __( 'Donation Notification Emails', 'give' ),

-							'desc'    => sprintf( __( 'Enter the email address(es) that should receive a notification anytime a donation is made, please only enter %1$sone email address per line%2$s and not separated by commas.', 'give' ), '<span class="give-underline">', '</span>' ),

+							'name'    => __('Donation Notification Emails', 'give'),

+							'desc'    => sprintf(__('Enter the email address(es) that should receive a notification anytime a donation is made, please only enter %1$sone email address per line%2$s and not separated by commas.', 'give'), '<span class="give-underline">', '</span>'),

 							'type'    => 'textarea',

-							'default' => get_bloginfo( 'admin_email' )

+							'default' => get_bloginfo('admin_email')

 						),

 						array(

 							'id'   => 'disable_admin_notices',

-							'name' => __( 'Disable Admin Notifications', 'give' ),

-							'desc' => __( 'Check this box if you do not want to receive emails when new donations are made.', 'give' ),

+							'name' => __('Disable Admin Notifications', 'give'),

+							'desc' => __('Check this box if you do not want to receive emails when new donations are made.', 'give'),

 							'type' => 'checkbox'

 						)

 					)

@@ -569,96 +569,96 @@ 
 			/** Extension Settings */

 			'addons'      => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Give Add-ons Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_addons', array()

+				'give_title' => __('Give Add-ons Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_addons', array()

 				)

 			),

 			/** Licenses Settings */

 			'licenses'    => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Give Licenses', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_licenses', array()

+				'give_title' => __('Give Licenses', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_licenses', array()

 				)

 			),

 			/** Advanced Options */

 			'advanced'    => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'Advanced Options', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_advanced', array(

+				'give_title' => __('Advanced Options', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_advanced', array(

 						array(

-							'name' => __( 'Access Control', 'give' ),

+							'name' => __('Access Control', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_session_control_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'session_lifetime',

-							'name'    => __( 'Session Lifetime', 'give' ),

-							'desc'    => __( 'Give will start a new session per user once they have donated. This option controls the lifetime a user\'s session is kept alive. An active session allows users to view donation receipts on your site without having to be logged in as long as they are using the same browser they used when donating.', 'give' ),

+							'name'    => __('Session Lifetime', 'give'),

+							'desc'    => __('Give will start a new session per user once they have donated. This option controls the lifetime a user\'s session is kept alive. An active session allows users to view donation receipts on your site without having to be logged in as long as they are using the same browser they used when donating.', 'give'),

 							'type'    => 'select',

 							'options' => array(

-								'86400'  => __( '24 Hours', 'give' ),

-								'172800' => __( '48 Hours', 'give' ),

-								'259200' => __( '72 Hours', 'give' ),

-								'604800' => __( '1 Week', 'give' ),

+								'86400'  => __('24 Hours', 'give'),

+								'172800' => __('48 Hours', 'give'),

+								'259200' => __('72 Hours', 'give'),

+								'604800' => __('1 Week', 'give'),

 							)

 						),

 						array(

-							'name' => __( 'Email-based Account Access', 'give' ),

-							'desc' => __( 'Would you like your donors to be able to access their donation history using only email? Donors whose sessions have expired and do not have an account may still access their donation history via a temporary email access link.', 'give' ),

+							'name' => __('Email-based Account Access', 'give'),

+							'desc' => __('Would you like your donors to be able to access their donation history using only email? Donors whose sessions have expired and do not have an account may still access their donation history via a temporary email access link.', 'give'),

 							'id'   => 'email_access',

 							'type' => 'checkbox',

 						),

 						array(

 							'id'      => 'recaptcha_key',

-							'name'    => __( 'reCAPTCHA Site Key', 'give' ),

-							'desc'    => sprintf( __( 'If you would like to prevent spam on the email access form navigate to %1$sthe reCAPTCHA website%2$s and sign up for an API key. The reCAPTCHA uses Google\'s user-friendly single click verification method.', 'give' ), '<a href="https://www.google.com/recaptcha/" target="_blank">', '</a>' ),

+							'name'    => __('reCAPTCHA Site Key', 'give'),

+							'desc'    => sprintf(__('If you would like to prevent spam on the email access form navigate to %1$sthe reCAPTCHA website%2$s and sign up for an API key. The reCAPTCHA uses Google\'s user-friendly single click verification method.', 'give'), '<a href="https://www.google.com/recaptcha/" target="_blank">', '</a>'),

 							'default' => '',

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'recaptcha_secret',

-							'name'    => __( 'reCAPTCHA Secret Key', 'give' ),

-							'desc'    => __( 'Please paste the reCAPTCHA secret key here from your manage reCAPTCHA API Keys panel.', 'give' ),

+							'name'    => __('reCAPTCHA Secret Key', 'give'),

+							'desc'    => __('Please paste the reCAPTCHA secret key here from your manage reCAPTCHA API Keys panel.', 'give'),

 							'default' => '',

 							'type'    => 'text'

 						),

 						array(

-							'name' => __( 'Data Control', 'give' ),

+							'name' => __('Data Control', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_data_control_2',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Remove All Data on Uninstall?', 'give' ),

-							'desc' => __( 'Check this box if you would like Give to completely remove all of its data when the plugin is deleted.', 'give' ),

+							'name' => __('Remove All Data on Uninstall?', 'give'),

+							'desc' => __('Check this box if you would like Give to completely remove all of its data when the plugin is deleted.', 'give'),

 							'id'   => 'uninstall_on_delete',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Filter Control', 'give' ),

+							'name' => __('Filter Control', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_filter_control',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable <code>the_content</code> filter', 'give' ),

-							'desc' => sprintf( __( 'If you are seeing extra social buttons, related posts, or other unwanted elements appearing within your forms then you can disable WordPress\' content filter. <a href="%s" target="_blank">Learn more</a> about the_content filter.', 'give' ), esc_url( 'https://codex.wordpress.org/Plugin_API/Filter_Reference/the_content' ) ),

+							'name' => __('Disable <code>the_content</code> filter', 'give'),

+							'desc' => sprintf(__('If you are seeing extra social buttons, related posts, or other unwanted elements appearing within your forms then you can disable WordPress\' content filter. <a href="%s" target="_blank">Learn more</a> about the_content filter.', 'give'), esc_url('https://codex.wordpress.org/Plugin_API/Filter_Reference/the_content')),

 							'id'   => 'disable_the_content_filter',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Script Loading', 'give' ),

+							'name' => __('Script Loading', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_script_control',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Load Scripts in Footer?', 'give' ),

-							'desc' => __( 'Check this box if you would like Give to load all frontend JavaScript files in the footer.', 'give' ),

+							'name' => __('Load Scripts in Footer?', 'give'),

+							'desc' => __('Check this box if you would like Give to load all frontend JavaScript files in the footer.', 'give'),

 							'id'   => 'scripts_footer',

 							'type' => 'checkbox'

 						)

@@ -668,13 +668,13 @@ 
 			/** API Settings */

 			'api'         => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'API', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

+				'give_title' => __('API', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

 				'show_names' => false, // Hide field names on the left

-				'fields'     => apply_filters( 'give_settings_system', array(

+				'fields'     => apply_filters('give_settings_system', array(

 						array(

 							'id'   => 'api',

-							'name' => __( 'API', 'give' ),

+							'name' => __('API', 'give'),

 							'type' => 'api'

 						)

 					)

@@ -683,13 +683,13 @@ 
 			/** Licenses Settings */

 			'system_info' => array(

 				'id'         => 'options_page',

-				'give_title' => __( 'System Info', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_system', array(

+				'give_title' => __('System Info', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_system', array(

 						array(

 							'id'   => 'system_info',

-							'name' => __( 'System Info', 'give' ),

-							'desc' => __( 'Please copy and paste this information in your ticket when contacting support.', 'give' ),

+							'name' => __('System Info', 'give'),

+							'desc' => __('Please copy and paste this information in your ticket when contacting support.', 'give'),

 							'type' => 'system_info'

 						)

 					)

@@ -698,12 +698,12 @@ 
 		);

 

 		//Return all settings array if necessary

-		if ( $active_tab === null || ! isset( $give_settings[ $active_tab ] ) ) {

-			return apply_filters( 'give_registered_settings', $give_settings );

+		if ($active_tab === null || ! isset($give_settings[$active_tab])) {

+			return apply_filters('give_registered_settings', $give_settings);

 		}

 

 		// Add other tabs and settings fields as needed

-		return apply_filters( 'give_registered_settings', $give_settings[ $active_tab ] );

+		return apply_filters('give_registered_settings', $give_settings[$active_tab]);

 

 	}

 

@@ -712,11 +712,11 @@ 
 	 */

 	public function settings_notices() {

 

-		if ( ! isset( $_POST['give_settings_saved'] ) ) {

+		if ( ! isset($_POST['give_settings_saved'])) {

 			return;

 		}

 

-		add_settings_error( 'give-notices', 'global-settings-updated', __( 'Settings updated.', 'give' ), 'updated' );

+		add_settings_error('give-notices', 'global-settings-updated', __('Settings updated.', 'give'), 'updated');

 

 	}

 

@@ -730,17 +730,17 @@ 
 	 *

 	 * @return mixed          Field value or exception is thrown

 	 */

-	public function __get( $field ) {

+	public function __get($field) {

 

 		// Allowed fields to retrieve

-		if ( in_array( $field, array( 'key', 'fields', 'give_title', 'options_page' ), true ) ) {

+		if (in_array($field, array('key', 'fields', 'give_title', 'options_page'), true)) {

 			return $this->{$field};

 		}

-		if ( 'option_metabox' === $field ) {

+		if ('option_metabox' === $field) {

 			return $this->option_metabox();

 		}

 

-		throw new Exception( 'Invalid property: ' . $field );

+		throw new Exception('Invalid property: '.$field);

 	}

 

 

@@ -757,12 +757,12 @@ 
  *

  * @return mixed        Option value

  */

-function give_get_option( $key = '', $default = false ) {

+function give_get_option($key = '', $default = false) {

 	global $give_options;

-	$value = ! empty( $give_options[ $key ] ) ? $give_options[ $key ] : $default;

-	$value = apply_filters( 'give_get_option', $value, $key, $default );

+	$value = ! empty($give_options[$key]) ? $give_options[$key] : $default;

+	$value = apply_filters('give_get_option', $value, $key, $default);

 

-	return apply_filters( 'give_get_option_' . $key, $value, $key, $default );

+	return apply_filters('give_get_option_'.$key, $value, $key, $default);

 }

 

 

@@ -780,33 +780,33 @@ 
  *

  * @return boolean True if updated, false if not.

  */

-function give_update_option( $key = '', $value = false ) {

+function give_update_option($key = '', $value = false) {

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

-	if ( empty( $value ) ) {

-		$remove_option = give_delete_option( $key );

+	if (empty($value)) {

+		$remove_option = give_delete_option($key);

 

 		return $remove_option;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

 	// Let's let devs alter that value coming in

-	$value = apply_filters( 'give_update_option', $value, $key );

+	$value = apply_filters('give_update_option', $value, $key);

 

 	// Next let's try to update the value

-	$options[ $key ] = $value;

-	$did_update      = update_option( 'give_settings', $options );

+	$options[$key] = $value;

+	$did_update      = update_option('give_settings', $options);

 

 	// If it updated, let's update the global variable

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

-		$give_options[ $key ] = $value;

+		$give_options[$key] = $value;

 	}

 

 	return $did_update;

@@ -823,27 +823,27 @@ 
  *

  * @return boolean True if updated, false if not.

  */

-function give_delete_option( $key = '' ) {

+function give_delete_option($key = '') {

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

 	// Next let's try to update the value

-	if ( isset( $options[ $key ] ) ) {

+	if (isset($options[$key])) {

 

-		unset( $options[ $key ] );

+		unset($options[$key]);

 

 	}

 

-	$did_update = update_option( 'give_settings', $options );

+	$did_update = update_option('give_settings', $options);

 

 	// If it updated, let's update the global variable

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

 		$give_options = $options;

 	}

@@ -862,9 +862,9 @@ 
  */

 function give_get_settings() {

 

-	$settings = get_option( 'give_settings' );

+	$settings = get_option('give_settings');

 

-	return (array) apply_filters( 'give_get_settings', $settings );

+	return (array) apply_filters('give_get_settings', $settings);

 

 }

 

@@ -882,25 +882,25 @@ 
  *

  * @return array

  */

-function give_settings_array_insert( $array, $position, $insert ) {

-	if ( is_int( $position ) ) {

-		array_splice( $array, $position, 0, $insert );

+function give_settings_array_insert($array, $position, $insert) {

+	if (is_int($position)) {

+		array_splice($array, $position, 0, $insert);

 	} else {

 

-		foreach ( $array as $index => $subarray ) {

-			if ( isset( $subarray['id'] ) && $subarray['id'] == $position ) {

+		foreach ($array as $index => $subarray) {

+			if (isset($subarray['id']) && $subarray['id'] == $position) {

 				$pos = $index;

 			}

 		}

 

-		if ( ! isset( $pos ) ) {

+		if ( ! isset($pos)) {

 			return $array;

 		}

 

 		$array = array_merge(

-			array_slice( $array, 0, $pos ),

+			array_slice($array, 0, $pos),

 			$insert,

-			array_slice( $array, $pos )

+			array_slice($array, $pos)

 		);

 	}

 

@@ -923,7 +923,7 @@ 
  *

  * @return void

  */

-function give_enabled_gateways_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_enabled_gateways_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$field_description = $field_type_object->field->args['desc'];

@@ -931,21 +931,21 @@ 
 

 	echo '<ul class="cmb2-checkbox-list cmb2-list">';

 

-	foreach ( $gateways as $key => $option ) :

+	foreach ($gateways as $key => $option) :

 

-		if ( is_array( $escaped_value ) && array_key_exists( $key, $escaped_value ) ) {

+		if (is_array($escaped_value) && array_key_exists($key, $escaped_value)) {

 			$enabled = '1';

 		} else {

 			$enabled = null;

 		}

 

-		echo '<li><input name="' . $id . '[' . $key . ']" id="' . $id . '[' . $key . ']" type="checkbox" value="1" ' . checked( '1', $enabled, false ) . '/>&nbsp;';

-		echo '<label for="' . $id . '[' . $key . ']">' . $option['admin_label'] . '</label></li>';

+		echo '<li><input name="'.$id.'['.$key.']" id="'.$id.'['.$key.']" type="checkbox" value="1" '.checked('1', $enabled, false).'/>&nbsp;';

+		echo '<label for="'.$id.'['.$key.']">'.$option['admin_label'].'</label></li>';

 

 	endforeach;

 

-	if ( $field_description ) {

-		echo '<p class="cmb2-metabox-description">' . $field_description . '</p>';

+	if ($field_description) {

+		echo '<p class="cmb2-metabox-description">'.$field_description.'</p>';

 	}

 

 	echo '</ul>';

@@ -964,31 +964,31 @@ 
  *

  * @return void

  */

-function give_default_gateway_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_default_gateway_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$field_description = $field_type_object->field->args['desc'];

 	$gateways          = give_get_enabled_payment_gateways();

 

-	echo '<select class="cmb2_select" name="' . $id . '" id="' . $id . '">';

+	echo '<select class="cmb2_select" name="'.$id.'" id="'.$id.'">';

 

 	//Add a field to the Give Form admin single post view of this field

-	if ( $field_type_object->field->object_type === 'post' ) {

-		echo '<option value="global">' . __( 'Global Default', 'give' ) . '</option>';

+	if ($field_type_object->field->object_type === 'post') {

+		echo '<option value="global">'.__('Global Default', 'give').'</option>';

 	}

 

-	foreach ( $gateways as $key => $option ) :

+	foreach ($gateways as $key => $option) :

 

-		$selected = isset( $escaped_value ) ? selected( $key, $escaped_value, false ) : '';

+		$selected = isset($escaped_value) ? selected($key, $escaped_value, false) : '';

 

 

-		echo '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';

+		echo '<option value="'.esc_attr($key).'"'.$selected.'>'.esc_html($option['admin_label']).'</option>';

 

 	endforeach;

 

 	echo '</select>';

 

-	echo '<p class="cmb2-metabox-description">' . $field_description . '</p>';

+	echo '<p class="cmb2-metabox-description">'.$field_description.'</p>';

 

 }

 

@@ -1003,13 +1003,13 @@ 
  *

  * @return void

  */

-function give_title_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_title_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$title             = $field_type_object->field->args['name'];

 	$field_description = $field_type_object->field->args['desc'];

 

-	echo '<hr>' . $field_description;

+	echo '<hr>'.$field_description;

 

 }

 

@@ -1024,7 +1024,7 @@ 
  *

  * @return void

  */

-function give_description_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_description_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$title             = $field_type_object->field->args['name'];

@@ -1044,25 +1044,25 @@ 
  * @see: https://github.com/WebDevStudios/CMB2/wiki/Adding-your-own-field-types

  * @return array An array of options that matches the CMB2 options array

  */

-function give_cmb2_get_post_options( $query_args, $force = false ) {

+function give_cmb2_get_post_options($query_args, $force = false) {

 

-	$post_options = array( '' => '' ); // Blank option

+	$post_options = array('' => ''); // Blank option

 

-	if ( ( ! isset( $_GET['page'] ) || 'give-settings' != $_GET['page'] ) && ! $force ) {

+	if (( ! isset($_GET['page']) || 'give-settings' != $_GET['page']) && ! $force) {

 		return $post_options;

 	}

 

-	$args = wp_parse_args( $query_args, array(

+	$args = wp_parse_args($query_args, array(

 		'post_type'   => 'page',

 		'numberposts' => 10,

-	) );

+	));

 

-	$posts = get_posts( $args );

+	$posts = get_posts($args);

 

-	if ( $posts ) {

-		foreach ( $posts as $post ) {

+	if ($posts) {

+		foreach ($posts as $post) {

 

-			$post_options[ $post->ID ] = $post->post_title;

+			$post_options[$post->ID] = $post->post_title;

 

 		}

 	}

@@ -1079,14 +1079,14 @@ 
  * @since 1.0

  */

 

-add_filter( 'cmb2_get_metabox_form_format', 'give_modify_cmb2_form_output', 10, 3 );

+add_filter('cmb2_get_metabox_form_format', 'give_modify_cmb2_form_output', 10, 3);

 

-function give_modify_cmb2_form_output( $form_format, $object_id, $cmb ) {

+function give_modify_cmb2_form_output($form_format, $object_id, $cmb) {

 

 	//only modify the give settings form

-	if ( 'give_settings' == $object_id && 'options_page' == $cmb->cmb_id ) {

+	if ('give_settings' == $object_id && 'options_page' == $cmb->cmb_id) {

 

-		return '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="give_settings_saved" value="true"><input type="hidden" name="object_id" value="%2$s">%3$s<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="' . __( 'Save Settings', 'give' ) . '" class="button-primary"></div></form>';

+		return '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data"><input type="hidden" name="give_settings_saved" value="true"><input type="hidden" name="object_id" value="%2$s">%3$s<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="'.__('Save Settings', 'give').'" class="button-primary"></div></form>';

 	}

 

 	return $form_format;

@@ -1104,17 +1104,17 @@ 
 	global $_wp_additional_image_sizes;

 	$sizes = array();

 

-	foreach ( get_intermediate_image_sizes() as $_size ) {

+	foreach (get_intermediate_image_sizes() as $_size) {

 		

-		if ( in_array( $_size, array( 'thumbnail', 'medium', 'medium_large', 'large' ) ) ) {

-			$sizes[ $_size ] = $_size . ' - ' . get_option( "{$_size}_size_w" ) . 'x' . get_option( "{$_size}_size_h" );

-		} elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {

-			$sizes[ $_size ] = $_size . ' - ' . $_wp_additional_image_sizes[ $_size ]['width'] . 'x' . $_wp_additional_image_sizes[ $_size ]['height'];

+		if (in_array($_size, array('thumbnail', 'medium', 'medium_large', 'large'))) {

+			$sizes[$_size] = $_size.' - '.get_option("{$_size}_size_w").'x'.get_option("{$_size}_size_h");

+		} elseif (isset($_wp_additional_image_sizes[$_size])) {

+			$sizes[$_size] = $_size.' - '.$_wp_additional_image_sizes[$_size]['width'].'x'.$_wp_additional_image_sizes[$_size]['height'];

 		}

 

 	}

 

-	return apply_filters( 'give_get_featured_image_sizes', $sizes );

+	return apply_filters('give_get_featured_image_sizes', $sizes);

 }

 

 

@@ -1128,35 +1128,35 @@ 
  *

  * @return void

  */

-if ( ! function_exists( 'give_license_key_callback' ) ) {

-	function give_license_key_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+if ( ! function_exists('give_license_key_callback')) {

+	function give_license_key_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 		$id                = $field_type_object->field->args['id'];

 		$field_description = $field_type_object->field->args['desc'];

-		$license_status    = get_option( $field_type_object->field->args['options']['is_valid_license_option'] );

+		$license_status    = get_option($field_type_object->field->args['options']['is_valid_license_option']);

 		$field_classes     = 'regular-text give-license-field';

-		$type              = empty( $escaped_value ) ? 'text' : 'password';

+		$type              = empty($escaped_value) ? 'text' : 'password';

 

-		if ( $license_status === 'valid' ) {

+		if ($license_status === 'valid') {

 			$field_classes .= ' give-license-active';

 		}

 

-		$html = $field_type_object->input( array(

+		$html = $field_type_object->input(array(

 			'class' => $field_classes,

 			'type'  => $type

-		) );

+		));

 

 		//License is active so show deactivate button

-		if ( $license_status === 'valid' ) {

-			$html .= '<input type="submit" class="button-secondary give-license-deactivate" name="' . $id . '_deactivate" value="' . __( 'Deactivate License', 'give' ) . '"/>';

+		if ($license_status === 'valid') {

+			$html .= '<input type="submit" class="button-secondary give-license-deactivate" name="'.$id.'_deactivate" value="'.__('Deactivate License', 'give').'"/>';

 		} else {

 			//This license is not valid so delete it

-			give_delete_option( $id );

+			give_delete_option($id);

 		}

 

-		$html .= '<label for="give_settings[' . $id . ']"> ' . $field_description . '</label>';

+		$html .= '<label for="give_settings['.$id.']"> '.$field_description.'</label>';

 

-		wp_nonce_field( $id . '-nonce', $id . '-nonce' );

+		wp_nonce_field($id.'-nonce', $id.'-nonce');

 

 		echo $html;

 	}

@@ -1171,13 +1171,13 @@ 
  */

 function give_api_callback() {

 

-	if ( ! current_user_can( 'manage_give_settings' ) ) {

+	if ( ! current_user_can('manage_give_settings')) {

 		return;

 	}

 

-	do_action( 'give_tools_api_keys_before' );

+	do_action('give_tools_api_keys_before');

 

-	require_once GIVE_PLUGIN_DIR . 'includes/admin/class-api-keys-table.php';

+	require_once GIVE_PLUGIN_DIR.'includes/admin/class-api-keys-table.php';

 

 	$api_keys_table = new Give_API_Keys_Table();

 	$api_keys_table->prepare_items();

@@ -1185,7 +1185,7 @@ 
 	?>

 	<p>

 		<?php printf(

-			__( 'API keys allow users to use the <a href="%s">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%s">Zapier</a>.', 'give' ),

+			__('API keys allow users to use the <a href="%s">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%s">Zapier</a>.', 'give'),

 			'https://givewp.com/documentation/give-api-reference/',

 			'https://givewp.com/addons/zapier/'

 		); ?>

@@ -1198,10 +1198,10 @@ 
 	</style>

 	<?php

 

-	do_action( 'give_tools_api_keys_after' );

+	do_action('give_tools_api_keys_after');

 }

 

-add_action( 'give_settings_tab_api_keys', 'give_api_callback' );

+add_action('give_settings_tab_api_keys', 'give_api_callback');

 

 /**

  * Hook Callback

@@ -1214,8 +1214,8 @@ 
  *

  * @return void

  */

-function give_hook_callback( $args ) {

-	do_action( 'give_' . $args['id'] );

+function give_hook_callback($args) {

+	do_action('give_'.$args['id']);

 }

 

 /**

@@ -1225,10 +1225,10 @@ 
  *

  */

 

-if ( file_exists( WP_PLUGIN_DIR . '/cmb2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once WP_PLUGIN_DIR . '/cmb2/init.php';

-} elseif ( file_exists( GIVE_PLUGIN_DIR . '/includes/libraries/cmb2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/cmb2/init.php';

-} elseif ( file_exists( GIVE_PLUGIN_DIR . '/includes/libraries/CMB2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/CMB2/init.php';

+if (file_exists(WP_PLUGIN_DIR.'/cmb2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once WP_PLUGIN_DIR.'/cmb2/init.php';

+} elseif (file_exists(GIVE_PLUGIN_DIR.'/includes/libraries/cmb2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/cmb2/init.php';

+} elseif (file_exists(GIVE_PLUGIN_DIR.'/includes/libraries/CMB2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/CMB2/init.php';

 }
\ No newline at end of file

includes/user-functions.php

Spacing +95 added lines, -95 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -30,36 +30,36 @@ 
  *
  * @return bool|object List of all user purchases
  */
-function give_get_users_purchases( $user = 0, $number = 20, $pagination = false, $status = 'complete' ) {
+function give_get_users_purchases($user = 0, $number = 20, $pagination = false, $status = 'complete') {
 
-	if ( empty( $user ) ) {
+	if (empty($user)) {
 		$user = get_current_user_id();
 	}
 
-	if ( 0 === $user && !Give()->email_access->token_exists ) {
+	if (0 === $user && ! Give()->email_access->token_exists) {
 		return false;
 	}
 
 	$status = $status === 'complete' ? 'publish' : $status;
 
-	if ( $pagination ) {
-		if ( get_query_var( 'paged' ) ) {
-			$paged = get_query_var( 'paged' );
-		} else if ( get_query_var( 'page' ) ) {
-			$paged = get_query_var( 'page' );
+	if ($pagination) {
+		if (get_query_var('paged')) {
+			$paged = get_query_var('paged');
+		} else if (get_query_var('page')) {
+			$paged = get_query_var('page');
 		} else {
 			$paged = 1;
 		}
 	}
 
-	$args = apply_filters( 'give_get_users_purchases_args', array(
+	$args = apply_filters('give_get_users_purchases_args', array(
 		'user'    => $user,
 		'number'  => $number,
 		'status'  => $status,
 		'orderby' => 'date'
-	) );
+	));
 
-	if ( $pagination ) {
+	if ($pagination) {
 
 		$args['page'] = $paged;
 
@@ -69,20 +69,20 @@ 
 
 	}
 
-	$by_user_id = is_numeric( $user ) ? true : false;
-	$customer   = new Give_Customer( $user, $by_user_id );
+	$by_user_id = is_numeric($user) ? true : false;
+	$customer   = new Give_Customer($user, $by_user_id);
 
-	if ( ! empty( $customer->payment_ids ) ) {
+	if ( ! empty($customer->payment_ids)) {
 
-		unset( $args['user'] );
-		$args['post__in'] = array_map( 'absint', explode( ',', $customer->payment_ids ) );
+		unset($args['user']);
+		$args['post__in'] = array_map('absint', explode(',', $customer->payment_ids));
 
 	}
 
-	$purchases = give_get_payments( apply_filters( 'give_get_users_purchases_args', $args ) );
+	$purchases = give_get_payments(apply_filters('give_get_users_purchases_args', $args));
 
 	// No purchases
-	if ( ! $purchases ) {
+	if ( ! $purchases) {
 		return false;
 	}
 
@@ -101,64 +101,64 @@ 
  *
  * @return bool|object List of unique forms purchased by user
  */
-function give_get_users_completed_donations( $user = 0, $status = 'complete' ) {
-	if ( empty( $user ) ) {
+function give_get_users_completed_donations($user = 0, $status = 'complete') {
+	if (empty($user)) {
 		$user = get_current_user_id();
 	}
 
-	if ( empty( $user ) ) {
+	if (empty($user)) {
 		return false;
 	}
 
-	$by_user_id = is_numeric( $user ) ? true : false;
+	$by_user_id = is_numeric($user) ? true : false;
 
-	$customer = new Give_Customer( $user, $by_user_id );
+	$customer = new Give_Customer($user, $by_user_id);
 
-	if ( empty( $customer->payment_ids ) ) {
+	if (empty($customer->payment_ids)) {
 		return false;
 	}
 
 	// Get all the items purchased
-	$payment_ids    = array_reverse( explode( ',', $customer->payment_ids ) );
-	$limit_payments = apply_filters( 'give_users_completed_donations_payments', 50 );
-	if ( ! empty( $limit_payments ) ) {
-		$payment_ids = array_slice( $payment_ids, 0, $limit_payments );
+	$payment_ids    = array_reverse(explode(',', $customer->payment_ids));
+	$limit_payments = apply_filters('give_users_completed_donations_payments', 50);
+	if ( ! empty($limit_payments)) {
+		$payment_ids = array_slice($payment_ids, 0, $limit_payments);
 	}
 	$donation_data = array();
-	foreach ( $payment_ids as $payment_id ) {
-		$donation_data[] = give_get_payment_meta( $payment_id );
+	foreach ($payment_ids as $payment_id) {
+		$donation_data[] = give_get_payment_meta($payment_id);
 	}
 
-	if ( empty( $donation_data ) ) {
+	if (empty($donation_data)) {
 		return false;
 	}
 
 	// Grab only the post ids "form_id" of the forms purchased on this order
 	$completed_donations_ids = array();
-	foreach ( $donation_data as $purchase_meta ) {
+	foreach ($donation_data as $purchase_meta) {
 		$completed_donations_ids[] = $purchase_meta['form_id'];
 	}
-	if ( empty( $completed_donations_ids ) ) {
+	if (empty($completed_donations_ids)) {
 		return false;
 	}
 
 	// Only include each product purchased once
-	$form_ids = array_unique( $completed_donations_ids );
+	$form_ids = array_unique($completed_donations_ids);
 
 	// Make sure we still have some products and a first item
-	if ( empty ( $form_ids ) || ! isset( $form_ids[0] ) ) {
+	if (empty ($form_ids) || ! isset($form_ids[0])) {
 		return false;
 	}
 
-	$post_type = get_post_type( $form_ids[0] );
+	$post_type = get_post_type($form_ids[0]);
 
-	$args = apply_filters( 'give_get_users_completed_donations_args', array(
+	$args = apply_filters('give_get_users_completed_donations_args', array(
 		'include'        => $form_ids,
 		'post_type'      => $post_type,
-		'posts_per_page' => - 1
-	) );
+		'posts_per_page' => -1
+	));
 
-	return apply_filters( 'give_users_completed_donations_list', get_posts( $args ) );
+	return apply_filters('give_users_completed_donations_list', get_posts($args));
 }
 
 
@@ -174,12 +174,12 @@ 
  *
  * @return      bool - true if has purchased, false other wise.
  */
-function give_has_purchases( $user_id = null ) {
-	if ( empty( $user_id ) ) {
+function give_has_purchases($user_id = null) {
+	if (empty($user_id)) {
 		$user_id = get_current_user_id();
 	}
 
-	if ( give_get_users_purchases( $user_id, 1 ) ) {
+	if (give_get_users_purchases($user_id, 1)) {
 		return true; // User has at least one purchase
 	}
 
@@ -199,32 +199,32 @@ 
  *
  * @return      array
  */
-function give_get_purchase_stats_by_user( $user = '' ) {
+function give_get_purchase_stats_by_user($user = '') {
 
-	if ( is_email( $user ) ) {
+	if (is_email($user)) {
 
 		$field = 'email';
 
-	} elseif ( is_numeric( $user ) ) {
+	} elseif (is_numeric($user)) {
 
 		$field = 'user_id';
 
 	}
 
 	$stats    = array();
-	$customer = Give()->customers->get_customer_by( $field, $user );
+	$customer = Give()->customers->get_customer_by($field, $user);
 
-	if ( $customer ) {
+	if ($customer) {
 
-		$customer = new Give_Customer( $customer->id );
+		$customer = new Give_Customer($customer->id);
 
-		$stats['purchases']   = absint( $customer->purchase_count );
-		$stats['total_spent'] = give_sanitize_amount( $customer->purchase_value );
+		$stats['purchases']   = absint($customer->purchase_count);
+		$stats['total_spent'] = give_sanitize_amount($customer->purchase_value);
 
 	}
 
 
-	return (array) apply_filters( 'give_purchase_stats_by_user', $stats, $user );
+	return (array) apply_filters('give_purchase_stats_by_user', $stats, $user);
 }
 
 
@@ -240,14 +240,14 @@ 
  *
  * @return      int - the total number of purchases
  */
-function give_count_purchases_of_customer( $user = null ) {
-	if ( empty( $user ) ) {
+function give_count_purchases_of_customer($user = null) {
+	if (empty($user)) {
 		$user = get_current_user_id();
 	}
 
-	$stats = ! empty( $user ) ? give_get_purchase_stats_by_user( $user ) : false;
+	$stats = ! empty($user) ? give_get_purchase_stats_by_user($user) : false;
 
-	return isset( $stats['purchases'] ) ? $stats['purchases'] : 0;
+	return isset($stats['purchases']) ? $stats['purchases'] : 0;
 }
 
 /**
@@ -260,9 +260,9 @@ 
  *
  * @return      float - the total amount the user has spent
  */
-function give_purchase_total_of_user( $user = null ) {
+function give_purchase_total_of_user($user = null) {
 
-	$stats = give_get_purchase_stats_by_user( $user );
+	$stats = give_get_purchase_stats_by_user($user);
 
 	return $stats['total_spent'];
 }
@@ -278,11 +278,11 @@ 
  *
  * @return      bool
  */
-function give_validate_username( $username ) {
-	$sanitized = sanitize_user( $username, false );
-	$valid     = ( $sanitized == $username );
+function give_validate_username($username) {
+	$sanitized = sanitize_user($username, false);
+	$valid     = ($sanitized == $username);
 
-	return (bool) apply_filters( 'give_validate_username', $valid, $username );
+	return (bool) apply_filters('give_validate_username', $valid, $username);
 }
 
 
@@ -299,32 +299,32 @@ 
  *
  * @return      void
  */
-function give_add_past_purchases_to_new_user( $user_id ) {
+function give_add_past_purchases_to_new_user($user_id) {
 
-	$email = get_the_author_meta( 'user_email', $user_id );
+	$email = get_the_author_meta('user_email', $user_id);
 
-	$payments = give_get_payments( array( 's' => $email ) );
+	$payments = give_get_payments(array('s' => $email));
 
-	if ( $payments ) {
-		foreach ( $payments as $payment ) {
-			if ( intval( give_get_payment_user_id( $payment->ID ) ) > 0 ) {
+	if ($payments) {
+		foreach ($payments as $payment) {
+			if (intval(give_get_payment_user_id($payment->ID)) > 0) {
 				continue;
 			} // This payment already associated with an account
 
-			$meta                    = give_get_payment_meta( $payment->ID );
-			$meta['user_info']       = maybe_unserialize( $meta['user_info'] );
+			$meta                    = give_get_payment_meta($payment->ID);
+			$meta['user_info']       = maybe_unserialize($meta['user_info']);
 			$meta['user_info']['id'] = $user_id;
 			$meta['user_info']       = $meta['user_info'];
 
 			// Store the updated user ID in the payment meta
-			give_update_payment_meta( $payment->ID, '_give_payment_meta', $meta );
-			give_update_payment_meta( $payment->ID, '_give_payment_user_id', $user_id );
+			give_update_payment_meta($payment->ID, '_give_payment_meta', $meta);
+			give_update_payment_meta($payment->ID, '_give_payment_user_id', $user_id);
 		}
 	}
 
 }
 
-add_action( 'user_register', 'give_add_past_purchases_to_new_user' );
+add_action('user_register', 'give_add_past_purchases_to_new_user');
 
 
 /**
@@ -346,34 +346,34 @@ 
  * @since         1.0
  * @return        array - The donor's address, if any
  */
-function give_get_donor_address( $user_id = 0 ) {
-	if ( empty( $user_id ) ) {
+function give_get_donor_address($user_id = 0) {
+	if (empty($user_id)) {
 		$user_id = get_current_user_id();
 	}
 
-	$address = get_user_meta( $user_id, '_give_user_address', true );
+	$address = get_user_meta($user_id, '_give_user_address', true);
 
-	if ( ! isset( $address['line1'] ) ) {
+	if ( ! isset($address['line1'])) {
 		$address['line1'] = '';
 	}
 
-	if ( ! isset( $address['line2'] ) ) {
+	if ( ! isset($address['line2'])) {
 		$address['line2'] = '';
 	}
 
-	if ( ! isset( $address['city'] ) ) {
+	if ( ! isset($address['city'])) {
 		$address['city'] = '';
 	}
 
-	if ( ! isset( $address['zip'] ) ) {
+	if ( ! isset($address['zip'])) {
 		$address['zip'] = '';
 	}
 
-	if ( ! isset( $address['country'] ) ) {
+	if ( ! isset($address['country'])) {
 		$address['country'] = '';
 	}
 
-	if ( ! isset( $address['state'] ) ) {
+	if ( ! isset($address['state'])) {
 		$address['state'] = '';
 	}
 
@@ -393,25 +393,25 @@ 
  *
  * @return        void
  */
-function give_new_user_notification( $user_id = 0, $user_data = array() ) {
+function give_new_user_notification($user_id = 0, $user_data = array()) {
 
-	if ( empty( $user_id ) || empty( $user_data ) ) {
+	if (empty($user_id) || empty($user_data)) {
 		return;
 	}
-	$blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-	$message  = sprintf( esc_attr__( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
-	$message .= sprintf( esc_attr__( 'Username: %s' ), $user_data['user_login'] ) . "\r\n\r\n";
-	$message .= sprintf( esc_attr__( 'E-mail: %s' ), $user_data['user_email'] ) . "\r\n";
+	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+	$message  = sprintf(esc_attr__('New user registration on your site %s:'), $blogname)."\r\n\r\n";
+	$message .= sprintf(esc_attr__('Username: %s'), $user_data['user_login'])."\r\n\r\n";
+	$message .= sprintf(esc_attr__('E-mail: %s'), $user_data['user_email'])."\r\n";
 
-	@wp_mail( get_option( 'admin_email' ), sprintf( esc_attr__( '[%s] New User Registration' ), $blogname ), $message );
+	@wp_mail(get_option('admin_email'), sprintf(esc_attr__('[%s] New User Registration'), $blogname), $message);
 
-	$message = sprintf( esc_attr__( 'Username: %s' ), $user_data['user_login'] ) . "\r\n";
-	$message .= sprintf( esc_attr__( 'Password: %s' ), esc_attr__( '[Password entered during donation]', 'give' ) ) . "\r\n";
+	$message = sprintf(esc_attr__('Username: %s'), $user_data['user_login'])."\r\n";
+	$message .= sprintf(esc_attr__('Password: %s'), esc_attr__('[Password entered during donation]', 'give'))."\r\n";
 
-	$message .= '<a href="' . wp_login_url() . '"> ' . esc_attr__( 'Click Here to Login', 'give' ) . ' &raquo;</a>' . "\r\n";
+	$message .= '<a href="'.wp_login_url().'"> '.esc_attr__('Click Here to Login', 'give').' &raquo;</a>'."\r\n";
 
-	wp_mail( $user_data['user_email'], sprintf( esc_attr__( '[%s] Your username and password' ), $blogname ), $message );
+	wp_mail($user_data['user_email'], sprintf(esc_attr__('[%s] Your username and password'), $blogname), $message);
 
 }
 
-add_action( 'give_insert_user', 'give_new_user_notification', 10, 2 );
+add_action('give_insert_user', 'give_new_user_notification', 10, 2);

includes/process-purchase.php

Spacing +238 added lines, -238 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,34 +25,34 @@ 
  */
 function give_process_purchase_form() {
 
-	do_action( 'give_pre_process_purchase' );
+	do_action('give_pre_process_purchase');
 
 	// Validate the form $_POST data
 	$valid_data = give_purchase_form_validate_fields();
 
 	// Allow themes and plugins to hook to errors
-	do_action( 'give_checkout_error_checks', $valid_data, $_POST );
+	do_action('give_checkout_error_checks', $valid_data, $_POST);
 
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	// Process the login form
-	if ( isset( $_POST['give_login_submit'] ) ) {
+	if (isset($_POST['give_login_submit'])) {
 		give_process_form_login();
 	}
 
 	// Validate the user
-	$user = give_get_purchase_form_user( $valid_data );
+	$user = give_get_purchase_form_user($valid_data);
 
-	if ( give_get_errors() || ! $user ) {
-		if ( $is_ajax ) {
-			do_action( 'give_ajax_checkout_errors' );
+	if (give_get_errors() || ! $user) {
+		if ($is_ajax) {
+			do_action('give_ajax_checkout_errors');
 			give_die();
 		} else {
 			return false;
 		}
 	}
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		echo 'success';
 		give_die();
 	}
@@ -66,15 +66,15 @@ 
 		'address'    => $user['address']
 	);
 
-	$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
+	$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
 
 	// Setup purchase information
 	$purchase_data = array(
-		'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))),
 		'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']
@@ -84,36 +84,36 @@ 
 	$valid_data['user'] = $user;
 
 	// Allow themes and plugins to hook before the gateway
-	do_action( 'give_checkout_before_gateway', $_POST, $user_info, $valid_data );
+	do_action('give_checkout_before_gateway', $_POST, $user_info, $valid_data);
 
 	//Sanity check for price
-	if ( ! $purchase_data['price'] ) {
+	if ( ! $purchase_data['price']) {
 		// Revert to manual
 		$purchase_data['gateway'] = 'manual';
 		$_POST['give-gateway']    = 'manual';
 	}
 
 	// Allow the purchase data to be modified before it is sent to the gateway
-	$purchase_data = apply_filters( 'give_purchase_data_before_gateway', $purchase_data, $valid_data );
+	$purchase_data = apply_filters('give_purchase_data_before_gateway', $purchase_data, $valid_data);
 
 	// Setup the data we're storing in the purchase session
 	$session_data = $purchase_data;
 
 	// Make sure credit card numbers are never stored in sessions
-	unset( $session_data['card_info']['card_number'] );
+	unset($session_data['card_info']['card_number']);
 
 	// Used for showing data to non logged-in users after purchase, and for other plugins needing purchase data.
-	give_set_purchase_session( $session_data );
+	give_set_purchase_session($session_data);
 
 	// Send info to the gateway for payment processing
-	give_send_to_gateway( $purchase_data['gateway'], $purchase_data );
+	give_send_to_gateway($purchase_data['gateway'], $purchase_data);
 	give_die();
 
 }
 
-add_action( 'give_purchase', 'give_process_purchase_form' );
-add_action( 'wp_ajax_give_process_checkout', 'give_process_purchase_form' );
-add_action( 'wp_ajax_nopriv_give_process_checkout', 'give_process_purchase_form' );
+add_action('give_purchase', 'give_process_purchase_form');
+add_action('wp_ajax_give_process_checkout', 'give_process_purchase_form');
+add_action('wp_ajax_nopriv_give_process_checkout', 'give_process_purchase_form');
 
 /**
  * Process the checkout login form
@@ -124,32 +124,32 @@ 
  */
 function give_process_form_login() {
 
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	$user_data = give_purchase_form_validate_user_login();
 
-	if ( give_get_errors() || $user_data['user_id'] < 1 ) {
-		if ( $is_ajax ) {
-			do_action( 'give_ajax_checkout_errors' );
+	if (give_get_errors() || $user_data['user_id'] < 1) {
+		if ($is_ajax) {
+			do_action('give_ajax_checkout_errors');
 			give_die();
 		} else {
-			wp_redirect( $_SERVER['HTTP_REFERER'] );
+			wp_redirect($_SERVER['HTTP_REFERER']);
 			exit;
 		}
 	}
 
-	give_log_user_in( $user_data['user_id'], $user_data['user_login'], $user_data['user_pass'] );
+	give_log_user_in($user_data['user_id'], $user_data['user_login'], $user_data['user_pass']);
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		echo 'success';
 		give_die();
 	} else {
-		wp_redirect( $_SERVER['HTTP_REFERER'] );
+		wp_redirect($_SERVER['HTTP_REFERER']);
 	}
 }
 
-add_action( 'wp_ajax_give_process_checkout_login', 'give_process_form_login' );
-add_action( 'wp_ajax_nopriv_give_process_checkout_login', 'give_process_form_login' );
+add_action('wp_ajax_give_process_checkout_login', 'give_process_form_login');
+add_action('wp_ajax_nopriv_give_process_checkout_login', 'give_process_form_login');
 
 /**
  * Purchase Form Validate Fields
@@ -161,40 +161,40 @@ 
 function give_purchase_form_validate_fields() {
 
 	// Check if there is $_POST
-	if ( empty( $_POST ) ) {
+	if (empty($_POST)) {
 		return false;
 	}
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an array to collect valid data
 	$valid_data = array(
 		'gateway'          => give_purchase_form_validate_gateway(), // Gateway fallback (amount is validated here)
-		'need_new_user'    => false,     // New user flag
-		'need_user_login'  => false,     // Login user flag
-		'logged_user_data' => array(),   // Logged user collected data
-		'new_user_data'    => array(),   // New user collected data
-		'login_user_data'  => array(),   // Login user collected data
-		'guest_user_data'  => array(),   // Guest user collected data
+		'need_new_user'    => false, // New user flag
+		'need_user_login'  => false, // Login user flag
+		'logged_user_data' => array(), // Logged user collected data
+		'new_user_data'    => array(), // New user collected data
+		'login_user_data'  => array(), // Login user collected data
+		'guest_user_data'  => array(), // Guest user collected data
 		'cc_info'          => give_purchase_form_validate_cc()    // Credit card info
 	);
 
 	// Validate agree to terms
-	$terms_option = get_post_meta( $form_id, '_give_terms_option', true );
-	if ( isset( $terms_option ) && $terms_option === 'yes' ) {
+	$terms_option = get_post_meta($form_id, '_give_terms_option', true);
+	if (isset($terms_option) && $terms_option === 'yes') {
 		give_purchase_form_validate_agree_to_terms();
 	}
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		// Collect logged in user data
 		$valid_data['logged_in_user'] = give_purchase_form_validate_logged_in_user();
-	} else if ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-register' ) {
+	} else if (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-register') {
 		// Set new user registration as required
 		$valid_data['need_new_user'] = true;
 		// Validate new user data
 		$valid_data['new_user_data'] = give_purchase_form_validate_new_user();
 		// Check if login validation is needed
-	} else if ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-login' ) {
+	} else if (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-login') {
 		// Set user login as required
 		$valid_data['need_user_login'] = true;
 		// Validate users login info
@@ -217,35 +217,35 @@ 
  */
 function give_purchase_form_validate_gateway() {
 
-	$gateway = give_get_default_gateway( $_REQUEST['give-form-id'] );
+	$gateway = give_get_default_gateway($_REQUEST['give-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 above 0.00?
-		if ( '0.00' == $_REQUEST['give-amount'] && ! give_is_test_mode() ) {
+		if ('0.00' == $_REQUEST['give-amount'] && ! give_is_test_mode()) {
 
-			give_set_error( 'invalid_donation_amount', __( 'Please insert a valid donation amount.', 'give' ) );
+			give_set_error('invalid_donation_amount', __('Please insert a valid donation amount.', 'give'));
 
 		} //Check for a minimum custom amount
-		elseif ( ! give_verify_minimum_price() ) {
+		elseif ( ! give_verify_minimum_price()) {
 
-			$minimum       = give_currency_filter( give_format_amount( give_get_form_minimum_price( $_REQUEST['give-form-id'] ) ) );
-			$error_message = __( 'This form has a minimum donation amount of %s', 'give' );
+			$minimum       = give_currency_filter(give_format_amount(give_get_form_minimum_price($_REQUEST['give-form-id'])));
+			$error_message = __('This form has a minimum donation amount of %s', 'give');
 
-			give_set_error( 'invalid_donation_minimum', sprintf( $error_message, $minimum ) );
+			give_set_error('invalid_donation_minimum', sprintf($error_message, $minimum));
 
 		} //Is this test mode zero donation? Let it through but set to manual gateway
-		elseif ( '0.00' == $_REQUEST['give-amount'] && give_is_test_mode() ) {
+		elseif ('0.00' == $_REQUEST['give-amount'] && give_is_test_mode()) {
 
 			$gateway = 'manual';
 
 		} //Check if this gateway is active
-		elseif ( ! give_is_gateway_active( $gateway ) ) {
+		elseif ( ! give_is_gateway_active($gateway)) {
 
-			give_set_error( 'invalid_gateway', __( 'The selected payment gateway is not enabled', 'give' ) );
+			give_set_error('invalid_gateway', __('The selected payment gateway is not enabled', 'give'));
 
 		}
 
@@ -264,23 +264,23 @@ 
  */
 function give_verify_minimum_price() {
 
-	$amount          = give_sanitize_amount( $_REQUEST['give-amount'] );
+	$amount          = give_sanitize_amount($_REQUEST['give-amount']);
 	$form_id         = $_REQUEST['give-form-id'];
-	$price_id        = isset( $_REQUEST['give-price-id'] ) ? $_REQUEST['give-price-id'] : 0;
-	$variable_prices = give_has_variable_prices( $form_id );
+	$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;
 	}
 
@@ -296,9 +296,9 @@ 
  */
 function give_purchase_form_validate_agree_to_terms() {
 	// Validate agree to terms
-	if ( ! isset( $_POST['give_agree_to_terms'] ) || $_POST['give_agree_to_terms'] != 1 ) {
+	if ( ! isset($_POST['give_agree_to_terms']) || $_POST['give_agree_to_terms'] != 1) {
 		// User did not agree
-		give_set_error( 'agree_to_terms', apply_filters( 'give_agree_to_terms_text', __( 'You must agree to the terms of use', 'give' ) ) );
+		give_set_error('agree_to_terms', apply_filters('give_agree_to_terms_text', __('You must agree to the terms of use', 'give')));
 	}
 }
 
@@ -312,47 +312,47 @@ 
  *
  * @return      array
  */
-function give_purchase_form_required_fields( $form_id ) {
+function give_purchase_form_required_fields($form_id) {
 
-	$payment_mode = give_get_chosen_gateway( $form_id );
+	$payment_mode = give_get_chosen_gateway($form_id);
 
 	$required_fields = array(
 		'give_email' => array(
 			'error_id'      => 'invalid_email',
-			'error_message' => __( 'Please enter a valid email address', 'give' )
+			'error_message' => __('Please enter a valid email address', 'give')
 		),
 		'give_first' => array(
 			'error_id'      => 'invalid_first_name',
-			'error_message' => __( 'Please enter your first name', 'give' )
+			'error_message' => __('Please enter your first name', 'give')
 		)
 	);
 
-	$require_address = give_require_billing_address( $payment_mode );
+	$require_address = give_require_billing_address($payment_mode);
 
-	if ( $require_address ) {
-		$required_fields['card_address']    = array(
+	if ($require_address) {
+		$required_fields['card_address'] = array(
 			'error_id'      => 'invalid_card_address',
-			'error_message' => __( 'Please enter your primary billing address', 'give' )
+			'error_message' => __('Please enter your primary billing address', 'give')
 		);
-		$required_fields['card_zip']        = array(
+		$required_fields['card_zip'] = array(
 			'error_id'      => 'invalid_zip_code',
-			'error_message' => __( 'Please enter your zip / postal code', 'give' )
+			'error_message' => __('Please enter your zip / postal code', 'give')
 		);
-		$required_fields['card_city']       = array(
+		$required_fields['card_city'] = array(
 			'error_id'      => 'invalid_city',
-			'error_message' => __( 'Please enter your billing city', 'give' )
+			'error_message' => __('Please enter your billing city', 'give')
 		);
 		$required_fields['billing_country'] = array(
 			'error_id'      => 'invalid_country',
-			'error_message' => __( 'Please select your billing country', 'give' )
+			'error_message' => __('Please select your billing country', 'give')
 		);
-		$required_fields['card_state']      = array(
+		$required_fields['card_state'] = array(
 			'error_id'      => 'invalid_state',
-			'error_message' => __( 'Please enter billing state / province', 'give' )
+			'error_message' => __('Please enter billing state / province', 'give')
 		);
 	}
 
-	return apply_filters( 'give_purchase_form_required_fields', $required_fields, $form_id );
+	return apply_filters('give_purchase_form_required_fields', $required_fields, $form_id);
 
 }
 
@@ -365,16 +365,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);
 
 }
 
@@ -388,43 +388,43 @@ 
 function give_purchase_form_validate_logged_in_user() {
 	global $user_ID;
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start empty array to collect valid user data
 	$valid_user_data = array(
 		// Assume there will be errors
-		'user_id' => - 1
+		'user_id' => -1
 	);
 
 	// Verify there is a user_ID
-	if ( $user_ID > 0 ) {
+	if ($user_ID > 0) {
 		// Get the logged in user data
-		$user_data = get_userdata( $user_ID );
+		$user_data = get_userdata($user_ID);
 
 		// Loop through required fields and show error messages
-		foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-			if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-				give_set_error( $value['error_id'], $value['error_message'] );
+		foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+			if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+				give_set_error($value['error_id'], $value['error_message']);
 			}
 		}
 
 		// Verify data
-		if ( $user_data ) {
+		if ($user_data) {
 			// Collected logged in user data
 			$valid_user_data = array(
 				'user_id'    => $user_ID,
-				'user_email' => isset( $_POST['give_email'] ) ? sanitize_email( $_POST['give_email'] ) : $user_data->user_email,
-				'user_first' => isset( $_POST['give_first'] ) && ! empty( $_POST['give_first'] ) ? sanitize_text_field( $_POST['give_first'] ) : $user_data->first_name,
-				'user_last'  => isset( $_POST['give_last'] ) && ! empty( $_POST['give_last'] ) ? sanitize_text_field( $_POST['give_last'] ) : $user_data->last_name,
+				'user_email' => isset($_POST['give_email']) ? sanitize_email($_POST['give_email']) : $user_data->user_email,
+				'user_first' => isset($_POST['give_first']) && ! empty($_POST['give_first']) ? sanitize_text_field($_POST['give_first']) : $user_data->first_name,
+				'user_last'  => isset($_POST['give_last']) && ! empty($_POST['give_last']) ? sanitize_text_field($_POST['give_last']) : $user_data->last_name,
 			);
 
-			if ( ! is_email( $valid_user_data['user_email'] ) ) {
-				give_set_error( 'email_invalid', __( 'Invalid email', 'give' ) );
+			if ( ! is_email($valid_user_data['user_email'])) {
+				give_set_error('email_invalid', __('Invalid email', 'give'));
 			}
 
 		} else {
 			// Set invalid user error
-			give_set_error( 'invalid_user', __( 'The user information is invalid', 'give' ) );
+			give_set_error('invalid_user', __('The user information is invalid', 'give'));
 		}
 	}
 
@@ -442,92 +442,92 @@ 
 function give_purchase_form_validate_new_user() {
 
 	$registering_new_user = false;
-	$form_id              = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id              = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an empty array to collect valid user data
 	$valid_user_data = array(
 		// Assume there will be errors
-		'user_id'    => - 1,
+		'user_id'    => -1,
 		// Get first name
-		'user_first' => isset( $_POST['give_first'] ) ? sanitize_text_field( $_POST['give_first'] ) : '',
+		'user_first' => isset($_POST['give_first']) ? sanitize_text_field($_POST['give_first']) : '',
 		// Get last name
-		'user_last'  => isset( $_POST['give_last'] ) ? sanitize_text_field( $_POST['give_last'] ) : '',
+		'user_last'  => isset($_POST['give_last']) ? sanitize_text_field($_POST['give_last']) : '',
 	);
 
 	// Check the new user's credentials against existing ones
-	$user_login   = isset( $_POST['give_user_login'] ) ? trim( $_POST['give_user_login'] ) : false;
-	$user_email   = isset( $_POST['give_email'] ) ? trim( $_POST['give_email'] ) : false;
-	$user_pass    = isset( $_POST['give_user_pass'] ) ? trim( $_POST['give_user_pass'] ) : false;
-	$pass_confirm = isset( $_POST['give_user_pass_confirm'] ) ? trim( $_POST['give_user_pass_confirm'] ) : false;
+	$user_login   = isset($_POST['give_user_login']) ? trim($_POST['give_user_login']) : false;
+	$user_email   = isset($_POST['give_email']) ? trim($_POST['give_email']) : false;
+	$user_pass    = isset($_POST['give_user_pass']) ? trim($_POST['give_user_pass']) : false;
+	$pass_confirm = isset($_POST['give_user_pass_confirm']) ? trim($_POST['give_user_pass_confirm']) : false;
 
 	// Loop through required fields and show error messages
-	foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+			give_set_error($value['error_id'], $value['error_message']);
 		}
 	}
 
 	// Check if we have an username to register
-	if ( $user_login && strlen( $user_login ) > 0 ) {
+	if ($user_login && strlen($user_login) > 0) {
 		$registering_new_user = true;
 
 		// We have an user name, check if it already exists
-		if ( username_exists( $user_login ) ) {
+		if (username_exists($user_login)) {
 			// Username already registered
-			give_set_error( 'username_unavailable', __( 'Username already taken', 'give' ) );
+			give_set_error('username_unavailable', __('Username already taken', 'give'));
 			// Check if it's valid
-		} else if ( ! give_validate_username( $user_login ) ) {
+		} else if ( ! give_validate_username($user_login)) {
 			// Invalid username
-			if ( is_multisite() ) {
-				give_set_error( 'username_invalid', __( 'Invalid username. Only lowercase letters (a-z) and numbers are allowed', 'give' ) );
+			if (is_multisite()) {
+				give_set_error('username_invalid', __('Invalid username. Only lowercase letters (a-z) and numbers are allowed', 'give'));
 			} else {
-				give_set_error( 'username_invalid', __( 'Invalid username', 'give' ) );
+				give_set_error('username_invalid', __('Invalid username', 'give'));
 			}
 		} else {
 			// All the checks have run and it's good to go
 			$valid_user_data['user_login'] = $user_login;
 		}
 	} else {
-		if ( give_no_guest_checkout( $form_id ) ) {
-			give_set_error( 'registration_required', esc_html__( 'You must register or login to complete your donation', 'give' ) );
+		if (give_no_guest_checkout($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', __( 'Invalid email', 'give' ) );
+		if ( ! is_email($user_email)) {
+			give_set_error('email_invalid', __('Invalid email', 'give'));
 			// Check if email exists
-		} else if ( email_exists( $user_email ) && $registering_new_user ) {
-			give_set_error( 'email_used', __( 'Email already used', 'give' ) );
+		} else if (email_exists($user_email) && $registering_new_user) {
+			give_set_error('email_used', __('Email already used', 'give'));
 		} else {
 			// All the checks have run and it's good to go
 			$valid_user_data['user_email'] = $user_email;
 		}
 	} else {
 		// No email
-		give_set_error( 'email_empty', __( 'Enter an email', 'give' ) );
+		give_set_error('email_empty', __('Enter an email', 'give'));
 	}
 
 	// Check password
-	if ( $user_pass && $pass_confirm ) {
+	if ($user_pass && $pass_confirm) {
 		// Verify confirmation matches
-		if ( $user_pass != $pass_confirm ) {
+		if ($user_pass != $pass_confirm) {
 			// Passwords do not match
-			give_set_error( 'password_mismatch', __( 'Passwords don\'t match', 'give' ) );
+			give_set_error('password_mismatch', __('Passwords don\'t match', 'give'));
 		} else {
 			// All is good to go
 			$valid_user_data['user_pass'] = $user_pass;
 		}
 	} else {
 		// Password or confirmation missing
-		if ( ! $user_pass && $registering_new_user ) {
+		if ( ! $user_pass && $registering_new_user) {
 			// The password is invalid
-			give_set_error( 'password_empty', __( 'Enter a password', 'give' ) );
-		} else if ( ! $pass_confirm && $registering_new_user ) {
+			give_set_error('password_empty', __('Enter a password', 'give'));
+		} else if ( ! $pass_confirm && $registering_new_user) {
 			// Confirmation password is invalid
-			give_set_error( 'confirmation_empty', __( 'Enter the password confirmation', 'give' ) );
+			give_set_error('confirmation_empty', __('Enter the password confirmation', 'give'));
 		}
 	}
 
@@ -546,34 +546,34 @@ 
 	// Start an array to collect valid user data
 	$valid_user_data = array(
 		// Assume there will be errors
-		'user_id' => - 1
+		'user_id' => -1
 	);
 
 	// Username
-	if ( ! isset( $_POST['give_user_login'] ) || $_POST['give_user_login'] == '' ) {
-		give_set_error( 'must_log_in', __( 'You must login or register to complete your donation', 'give' ) );
+	if ( ! isset($_POST['give_user_login']) || $_POST['give_user_login'] == '') {
+		give_set_error('must_log_in', __('You must login or register to complete your donation', 'give'));
 
 		return $valid_user_data;
 	}
 
 	// Get the user by login
-	$user_data = get_user_by( 'login', strip_tags( $_POST['give_user_login'] ) );
+	$user_data = get_user_by('login', strip_tags($_POST['give_user_login']));
 
 	// Check if user exists
-	if ( $user_data ) {
+	if ($user_data) {
 		// Get password
-		$user_pass = isset( $_POST['give_user_pass'] ) ? $_POST['give_user_pass'] : false;
+		$user_pass = isset($_POST['give_user_pass']) ? $_POST['give_user_pass'] : false;
 
 		// Check user_pass
-		if ( $user_pass ) {
+		if ($user_pass) {
 			// Check if password is valid
-			if ( ! wp_check_password( $user_pass, $user_data->user_pass, $user_data->ID ) ) {
+			if ( ! wp_check_password($user_pass, $user_data->user_pass, $user_data->ID)) {
 				// Incorrect password
 				give_set_error(
 					'password_incorrect',
 					sprintf(
-						__( 'The password you entered is incorrect. %sReset Password%s', 'give' ),
-						'<a href="' . wp_lostpassword_url( "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]" ) . '" title="' . __( 'Lost Password', 'give' ) . '">',
+						__('The password you entered is incorrect. %sReset Password%s', 'give'),
+						'<a href="'.wp_lostpassword_url("http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]").'" title="'.__('Lost Password', 'give').'">',
 						'</a>'
 					)
 				);
@@ -591,11 +591,11 @@ 
 			}
 		} else {
 			// Empty password
-			give_set_error( 'password_empty', __( 'Enter a password', 'give' ) );
+			give_set_error('password_empty', __('Enter a password', 'give'));
 		}
 	} else {
 		// no username
-		give_set_error( 'username_incorrect', __( 'The username you entered does not exist', 'give' ) );
+		give_set_error('username_incorrect', __('The username you entered does not exist', 'give'));
 	}
 
 	return $valid_user_data;
@@ -610,7 +610,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(
@@ -619,32 +619,32 @@ 
 	);
 
 	// Show error message if user must be logged in
-	if ( give_logged_in_only() ) {
-		give_set_error( 'logged_in_only', __( 'You must be logged into to donate', 'give' ) );
+	if (give_logged_in_only()) {
+		give_set_error('logged_in_only', __('You must be logged into to donate', 'give'));
 	}
 
 	// Get the guest email
-	$guest_email = isset( $_POST['give_email'] ) ? $_POST['give_email'] : false;
+	$guest_email = isset($_POST['give_email']) ? $_POST['give_email'] : false;
 
 	// Check email
-	if ( $guest_email && strlen( $guest_email ) > 0 ) {
+	if ($guest_email && strlen($guest_email) > 0) {
 		// Validate email
-		if ( ! is_email( $guest_email ) ) {
+		if ( ! is_email($guest_email)) {
 			// Invalid email
-			give_set_error( 'email_invalid', __( 'Invalid email', 'give' ) );
+			give_set_error('email_invalid', __('Invalid email', 'give'));
 		} else {
 			// All is good to go
 			$valid_user_data['user_email'] = $guest_email;
 		}
 	} else {
 		// No email
-		give_set_error( 'email_empty', __( 'Enter an email', 'give' ) );
+		give_set_error('email_empty', __('Enter an email', 'give'));
 	}
 
 	// Loop through required fields and show error messages
-	foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+			give_set_error($value['error_id'], $value['error_message']);
 		}
 	}
 
@@ -660,42 +660,42 @@ 
  * @since   1.0
  * @return  integer
  */
-function give_register_and_login_new_user( $user_data = array() ) {
+function give_register_and_login_new_user($user_data = array()) {
 	// Verify the array
-	if ( empty( $user_data ) ) {
-		return - 1;
+	if (empty($user_data)) {
+		return -1;
 	}
 
-	if ( give_get_errors() ) {
-		return - 1;
+	if (give_get_errors()) {
+		return -1;
 	}
 
-	$user_args = apply_filters( 'give_insert_user_args', array(
-		'user_login'      => isset( $user_data['user_login'] ) ? $user_data['user_login'] : '',
-		'user_pass'       => isset( $user_data['user_pass'] ) ? $user_data['user_pass'] : '',
-		'user_email'      => isset( $user_data['user_email'] ) ? $user_data['user_email'] : '',
-		'first_name'      => isset( $user_data['user_first'] ) ? $user_data['user_first'] : '',
-		'last_name'       => isset( $user_data['user_last'] ) ? $user_data['user_last'] : '',
-		'user_registered' => date( 'Y-m-d H:i:s' ),
-		'role'            => get_option( 'default_role' )
-	), $user_data );
+	$user_args = apply_filters('give_insert_user_args', array(
+		'user_login'      => isset($user_data['user_login']) ? $user_data['user_login'] : '',
+		'user_pass'       => isset($user_data['user_pass']) ? $user_data['user_pass'] : '',
+		'user_email'      => isset($user_data['user_email']) ? $user_data['user_email'] : '',
+		'first_name'      => isset($user_data['user_first']) ? $user_data['user_first'] : '',
+		'last_name'       => isset($user_data['user_last']) ? $user_data['user_last'] : '',
+		'user_registered' => date('Y-m-d H:i:s'),
+		'role'            => get_option('default_role')
+	), $user_data);
 
 	// Insert new user
-	$user_id = wp_insert_user( $user_args );
+	$user_id = wp_insert_user($user_args);
 
 	// Validate inserted user
-	if ( is_wp_error( $user_id ) ) {
-		return - 1;
+	if (is_wp_error($user_id)) {
+		return -1;
 	}
 
 	// Allow themes and plugins to filter the user data
-	$user_data = apply_filters( 'give_insert_user_data', $user_data, $user_args );
+	$user_data = apply_filters('give_insert_user_data', $user_data, $user_args);
 
 	// Allow themes and plugins to hook
-	do_action( 'give_insert_user', $user_id, $user_data );
+	do_action('give_insert_user', $user_id, $user_data);
 
 	// Login new user
-	give_log_user_in( $user_id, $user_data['user_login'], $user_data['user_pass'] );
+	give_log_user_in($user_id, $user_data['user_login'], $user_data['user_pass']);
 
 	// Return user id
 	return $user_id;
@@ -710,26 +710,26 @@ 
  * @since   1.0
  * @return  array
  */
-function give_get_purchase_form_user( $valid_data = array() ) {
+function give_get_purchase_form_user($valid_data = array()) {
 	// Initialize user
 	$user    = false;
-	$is_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+	$is_ajax = defined('DOING_AJAX') && DOING_AJAX;
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		// Do not create or login the user during the ajax submission (check for errors only)
 		return true;
-	} else if ( is_user_logged_in() ) {
+	} else if (is_user_logged_in()) {
 		// Set the valid user as the logged in collected data
 		$user = $valid_data['logged_in_user'];
-	} else if ( $valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true ) {
+	} else if ($valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true) {
 		// New user registration
-		if ( $valid_data['need_new_user'] === true ) {
+		if ($valid_data['need_new_user'] === true) {
 			// Set user
 			$user = $valid_data['new_user_data'];
 			// Register and login new user
-			$user['user_id'] = give_register_and_login_new_user( $user );
+			$user['user_id'] = give_register_and_login_new_user($user);
 			// User login
-		} else if ( $valid_data['need_user_login'] === true && ! $is_ajax ) {
+		} else if ($valid_data['need_user_login'] === true && ! $is_ajax) {
 
 			/*
 			 * The login form is now processed in the give_process_purchase_login() function.
@@ -744,48 +744,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_no_guest_checkout( $_POST['give-form-id'] ) ) {
+	if (false === $user && false === give_no_guest_checkout($_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 cart 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
@@ -804,16 +804,16 @@ 
 	$card_data = give_get_purchase_cc_info();
 
 	// Validate the card zip
-	if ( ! empty( $card_data['card_zip'] ) ) {
-		if ( ! give_purchase_form_validate_cc_zip( $card_data['card_zip'], $card_data['card_country'] ) ) {
-			give_set_error( 'invalid_cc_zip', __( 'The zip / postal code you entered for your billing address is invalid', 'give' ) );
+	if ( ! empty($card_data['card_zip'])) {
+		if ( ! give_purchase_form_validate_cc_zip($card_data['card_zip'], $card_data['card_country'])) {
+			give_set_error('invalid_cc_zip', __('The zip / postal code you entered for your billing address is invalid', 'give'));
 		}
 	}
 
 	//Ensure no spaces
-	if ( ! empty( $card_data['card_number'] ) ) {
-		$card_data['card_number'] = str_replace( '+', '', $card_data['card_number'] ); //no "+" signs
-		$card_data['card_number'] = str_replace( ' ', '', $card_data['card_number'] ); // No spaces
+	if ( ! empty($card_data['card_number'])) {
+		$card_data['card_number'] = str_replace('+', '', $card_data['card_number']); //no "+" signs
+		$card_data['card_number'] = str_replace(' ', '', $card_data['card_number']); // No spaces
 	}
 
 	// This should validate card numbers at some point too
@@ -829,17 +829,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;
@@ -855,14 +855,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}",
@@ -1022,11 +1022,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);
 }
 
 
@@ -1036,48 +1036,48 @@ 
  * @since       1.0
  * @return      void
  */
-function give_check_purchase_email( $valid_data, $posted ) {
+function give_check_purchase_email($valid_data, $posted) {
 	$is_banned = false;
 	$banned    = give_get_banned_emails();
 
-	if ( empty( $banned ) ) {
+	if (empty($banned)) {
 		return;
 	}
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 
 		// The user is logged in, check that their account email is not banned
-		$user_data = get_userdata( get_current_user_id() );
-		if ( give_is_email_banned( $user_data->user_email ) ) {
+		$user_data = get_userdata(get_current_user_id());
+		if (give_is_email_banned($user_data->user_email)) {
 
 			$is_banned = true;
 		}
 
-		if ( give_is_email_banned( $posted['give_email'] ) ) {
+		if (give_is_email_banned($posted['give_email'])) {
 			$is_banned = true;
 		}
 
-	} elseif ( isset( $posted['give-purchase-var'] ) && $posted['give-purchase-var'] == 'needs-to-login' ) {
+	} elseif (isset($posted['give-purchase-var']) && $posted['give-purchase-var'] == 'needs-to-login') {
 
 		// The user is logging in, check that their email is not banned
-		$user_data = get_user_by( 'login', $posted['give_user_login'] );
-		if ( $user_data && give_is_email_banned( $user_data->user_email ) ) {
+		$user_data = get_user_by('login', $posted['give_user_login']);
+		if ($user_data && give_is_email_banned($user_data->user_email)) {
 			$is_banned = true;
 		}
 
 	} else {
 
 		// Guest purchase, check that the email is not banned
-		if ( give_is_email_banned( $posted['give_email'] ) ) {
+		if (give_is_email_banned($posted['give_email'])) {
 			$is_banned = true;
 		}
 
 	}
 
-	if ( $is_banned ) {
+	if ($is_banned) {
 		// Set an error and give the donor a general error (don't alert them that they were banned)
-		give_set_error( 'email_banned', __( 'An internal error has occurred, please try again or contact support.', 'give' ) );
+		give_set_error('email_banned', __('An internal error has occurred, please try again or contact support.', 'give'));
 	}
 }
 
-add_action( 'give_checkout_error_checks', 'give_check_purchase_email', 10, 2 );
+add_action('give_checkout_error_checks', 'give_check_purchase_email', 10, 2);

includes/class-give-email-access.php

Spacing +65 added lines, -65 removed lines

@@ -10,7 +10,7 @@ 
  * @since       1.4
  */
 
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 /**
  * Class Give_Email_Access
@@ -32,7 +32,7 @@ 
 	function __construct() {
 
 		// get it started
-		add_action( 'init', array( $this, 'init' ) );
+		add_action('init', array($this, 'init'));
 	}
 
 
@@ -41,31 +41,31 @@ 
 	 */
 	function init() {
 
-		$is_enabled = give_get_option( 'email_access' );
+		$is_enabled = give_get_option('email_access');
 
 		//Non-logged in users only
-		if ( is_user_logged_in() || $is_enabled !== 'on' || is_admin() ) {
+		if (is_user_logged_in() || $is_enabled !== 'on' || is_admin()) {
 			return;
 		}
 
 		//Are db columns setup?
-		$is_setup = give_get_option( 'email_access_installed' );
-		if ( empty( $is_setup ) ) {
+		$is_setup = give_get_option('email_access_installed');
+		if (empty($is_setup)) {
 			$this->create_columns();
 		}
 
 		// Timeouts
-		$this->verify_throttle  = apply_filters( 'give_nl_verify_throttle', 300 );
-		$this->token_expiration = apply_filters( 'give_nl_token_expiration', 7200 );
+		$this->verify_throttle  = apply_filters('give_nl_verify_throttle', 300);
+		$this->token_expiration = apply_filters('give_nl_token_expiration', 7200);
 
 		// Setup login
 		$this->check_for_token();
 
-		if ( $this->token_exists ) {
-			add_filter( 'give_can_view_receipt', '__return_true' );
-			add_filter( 'give_user_pending_verification', '__return_false' );
-			add_filter( 'give_get_success_page_uri', array( $this, 'give_success_page_uri' ) );
-			add_filter( 'give_get_users_purchases_args', array( $this, 'users_purchases_args' ) );
+		if ($this->token_exists) {
+			add_filter('give_can_view_receipt', '__return_true');
+			add_filter('give_user_pending_verification', '__return_false');
+			add_filter('give_get_success_page_uri', array($this, 'give_success_page_uri'));
+			add_filter('give_get_users_purchases_args', array($this, 'users_purchases_args'));
 		}
 	}
 
@@ -76,24 +76,24 @@ 
 	 *
 	 * @return bool
 	 */
-	function can_send_email( $customer_id ) {
+	function can_send_email($customer_id) {
 		global $wpdb;
 
 		// Prevent multiple emails within X minutes
-		$throttle = date( 'Y-m-d H:i:s', time() - $this->verify_throttle );
+		$throttle = date('Y-m-d H:i:s', time() - $this->verify_throttle);
 
 		// Does a user row exist?
 		$exists = (int) $wpdb->get_var(
-			$wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->prefix}give_customers WHERE id = %d", $customer_id )
+			$wpdb->prepare("SELECT COUNT(*) FROM {$wpdb->prefix}give_customers WHERE id = %d", $customer_id)
 		);
 
-		if ( 0 < $exists ) {
+		if (0 < $exists) {
 			$row_id = (int) $wpdb->get_var(
-				$wpdb->prepare( "SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d AND (verify_throttle < %s OR verify_key = '') LIMIT 1", $customer_id, $throttle )
+				$wpdb->prepare("SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d AND (verify_throttle < %s OR verify_key = '') LIMIT 1", $customer_id, $throttle)
 			);
 
-			if ( $row_id < 1 ) {
-				give_set_error( 'give_email_access_attempts_exhausted', __( 'Please wait a few minutes before requesting a new email access link.', 'give' ) );
+			if ($row_id < 1) {
+				give_set_error('give_email_access_attempts_exhausted', __('Please wait a few minutes before requesting a new email access link.', 'give'));
 
 				return false;
 			}
@@ -109,38 +109,38 @@ 
 	 * @param $customer_id
 	 * @param $email
 	 */
-	function send_email( $customer_id, $email ) {
+	function send_email($customer_id, $email) {
 
-		$verify_key = wp_generate_password( 20, false );
+		$verify_key = wp_generate_password(20, false);
 
 		// Generate a new verify key
-		$this->set_verify_key( $customer_id, $email, $verify_key );
+		$this->set_verify_key($customer_id, $email, $verify_key);
 
 		// Get the purchase history URL
-		$page_id = give_get_option( 'history_page' );
+		$page_id = give_get_option('history_page');
 
-		$access_url = add_query_arg( array(
+		$access_url = add_query_arg(array(
 			'give_nl' => $verify_key,
-		), get_permalink( $page_id ) );
+		), get_permalink($page_id));
 
 		//Nice subject and message
-		$subject = apply_filters( 'give_email_access_token_subject', sprintf( __( 'Your Access Link to %1$s', 'give' ), get_bloginfo( 'name' ) ) );
+		$subject = apply_filters('give_email_access_token_subject', sprintf(__('Your Access Link to %1$s', 'give'), get_bloginfo('name')));
 
-		$message = __( 'You or someone in your organization requested an access link be sent to this email address. This is a temporary access link for you to view your donation information. Click on the link below to view:', 'give' ) . "\n\n";
+		$message = __('You or someone in your organization requested an access link be sent to this email address. This is a temporary access link for you to view your donation information. Click on the link below to view:', 'give')."\n\n";
 
-		$message .= '<a href="' . esc_url( $access_url ) . '" target="_blank">' . __( 'Access My Donation Details', 'give' ) . ' &raquo;</a>';
+		$message .= '<a href="'.esc_url($access_url).'" target="_blank">'.__('Access My Donation Details', 'give').' &raquo;</a>';
 
 		$message .= "\n\n";
 		$message .= "\n\n";
-		$message .= __( 'Sincerely,', 'give' );
-		$message .= "\n" . get_bloginfo( 'name' ) . "\n";
+		$message .= __('Sincerely,', 'give');
+		$message .= "\n".get_bloginfo('name')."\n";
 
-		$message = apply_filters( 'give_email_access_token_message', $message );
+		$message = apply_filters('give_email_access_token_message', $message);
 
 
 		// Send the email
-		Give()->emails->__set( 'heading', apply_filters( 'give_email_access_token_heading', __( 'Your Access Link', 'give' ) ) );
-		Give()->emails->send( $email, $subject, $message );
+		Give()->emails->__set('heading', apply_filters('give_email_access_token_heading', __('Your Access Link', 'give')));
+		Give()->emails->send($email, $subject, $message);
 
 	}
 
@@ -150,23 +150,23 @@ 
 	 */
 	function check_for_token() {
 
-		$token = isset( $_GET['give_nl'] ) ? $_GET['give_nl'] : '';
+		$token = isset($_GET['give_nl']) ? $_GET['give_nl'] : '';
 
 		// Check for cookie
-		if ( empty( $token ) ) {
-			$token = isset( $_COOKIE['give_nl'] ) ? $_COOKIE['give_nl'] : '';
+		if (empty($token)) {
+			$token = isset($_COOKIE['give_nl']) ? $_COOKIE['give_nl'] : '';
 		}
 
-		if ( ! empty( $token ) ) {
-			if ( ! $this->is_valid_token( $token ) ) {
-				if ( ! $this->is_valid_verify_key( $token ) ) {
+		if ( ! empty($token)) {
+			if ( ! $this->is_valid_token($token)) {
+				if ( ! $this->is_valid_verify_key($token)) {
 					return;
 				}
 			}
 
 			$this->token_exists = true;
 			// Set cookie
-			setcookie( 'give_nl', $token );
+			setcookie('give_nl', $token);
 		}
 	}
 
@@ -177,18 +177,18 @@ 
 	 *
 	 * @return bool
 	 */
-	function is_valid_token( $token ) {
+	function is_valid_token($token) {
 
 		global $wpdb;
 
 		// Make sure token isn't expired
-		$expires = date( 'Y-m-d H:i:s', time() - $this->token_expiration );
+		$expires = date('Y-m-d H:i:s', time() - $this->token_expiration);
 
 		$email = $wpdb->get_var(
-			$wpdb->prepare( "SELECT email FROM {$wpdb->prefix}give_customers WHERE token = %s AND verify_throttle >= %s LIMIT 1", $token, $expires )
+			$wpdb->prepare("SELECT email FROM {$wpdb->prefix}give_customers WHERE token = %s AND verify_throttle >= %s LIMIT 1", $token, $expires)
 		);
 
-		if ( ! empty( $email ) ) {
+		if ( ! empty($email)) {
 			$this->token_email = $email;
 			$this->token       = $token;
 
@@ -196,8 +196,8 @@ 
 		}
 
 		//Set error only if email access form isn't being submitted
-		if ( ! isset( $_POST['give_email'] ) && ! isset( $_POST['_wpnonce'] ) ) {
-			give_set_error( 'give_email_token_expired', apply_filters( 'give_email_token_expired_message', 'Sorry, your access token has expired. Please request a new one below:', 'give' ) );
+		if ( ! isset($_POST['give_email']) && ! isset($_POST['_wpnonce'])) {
+			give_set_error('give_email_token_expired', apply_filters('give_email_token_expired_message', 'Sorry, your access token has expired. Please request a new one below:', 'give'));
 		}
 
 
@@ -212,25 +212,25 @@ 
 	 * @param $email
 	 * @param $verify_key
 	 */
-	function set_verify_key( $customer_id, $email, $verify_key ) {
+	function set_verify_key($customer_id, $email, $verify_key) {
 		global $wpdb;
 
-		$now = date( 'Y-m-d H:i:s' );
+		$now = date('Y-m-d H:i:s');
 
 		// Insert or update?
 		$row_id = (int) $wpdb->get_var(
-			$wpdb->prepare( "SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d LIMIT 1", $customer_id )
+			$wpdb->prepare("SELECT id FROM {$wpdb->prefix}give_customers WHERE id = %d LIMIT 1", $customer_id)
 		);
 
 		// Update
-		if ( ! empty( $row_id ) ) {
+		if ( ! empty($row_id)) {
 			$wpdb->query(
-				$wpdb->prepare( "UPDATE {$wpdb->prefix}give_customers SET verify_key = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $verify_key, $now, $row_id )
+				$wpdb->prepare("UPDATE {$wpdb->prefix}give_customers SET verify_key = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $verify_key, $now, $row_id)
 			);
 		} // Insert
 		else {
 			$wpdb->query(
-				$wpdb->prepare( "INSERT INTO {$wpdb->prefix}give_customers ( verify_key, verify_throttle) VALUES (%s, %s)", $verify_key, $now )
+				$wpdb->prepare("INSERT INTO {$wpdb->prefix}give_customers ( verify_key, verify_throttle) VALUES (%s, %s)", $verify_key, $now)
 			);
 		}
 	}
@@ -238,20 +238,20 @@ 
 	/**
 	 * Is this a valid verify key?
 	 */
-	function is_valid_verify_key( $token ) {
+	function is_valid_verify_key($token) {
 		global $wpdb;
 
 		// See if the verify_key exists
 		$row = $wpdb->get_row(
-			$wpdb->prepare( "SELECT id, email FROM {$wpdb->prefix}give_customers WHERE verify_key = %s LIMIT 1", $token )
+			$wpdb->prepare("SELECT id, email FROM {$wpdb->prefix}give_customers WHERE verify_key = %s LIMIT 1", $token)
 		);
 
-		$now = date( 'Y-m-d H:i:s' );
+		$now = date('Y-m-d H:i:s');
 
 		// Set token
-		if ( ! empty( $row ) ) {
+		if ( ! empty($row)) {
 			$wpdb->query(
-				$wpdb->prepare( "UPDATE {$wpdb->prefix}give_customers SET verify_key = '', token = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $token, $now, $row->id )
+				$wpdb->prepare("UPDATE {$wpdb->prefix}give_customers SET verify_key = '', token = %s, verify_throttle = %s WHERE id = %d LIMIT 1", $token, $now, $row->id)
 			);
 
 			$this->token_email = $row->email;
@@ -271,9 +271,9 @@ 
 	 *
 	 * @return string
 	 */
-	function give_success_page_uri( $uri ) {
-		if ( $this->token_exists ) {
-			return add_query_arg( array( 'give_nl' => $this->token ), $uri );
+	function give_success_page_uri($uri) {
+		if ($this->token_exists) {
+			return add_query_arg(array('give_nl' => $this->token), $uri);
 		}
 	}
 
@@ -285,7 +285,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	function users_purchases_args( $args ) {
+	function users_purchases_args($args) {
 		$args['user'] = $this->token_email;
 
 		return $args;
@@ -302,11 +302,11 @@ 
 		global $wpdb;
 
 		//Create columns in customers table
-		$query = $wpdb->query( "ALTER TABLE {$wpdb->prefix}give_customers ADD `token` VARCHAR(255) CHARACTER SET utf8 NOT NULL, ADD `verify_key` VARCHAR(255) CHARACTER SET utf8 NOT NULL AFTER `token`, ADD `verify_throttle` DATETIME NOT NULL AFTER `verify_key`" );
+		$query = $wpdb->query("ALTER TABLE {$wpdb->prefix}give_customers ADD `token` VARCHAR(255) CHARACTER SET utf8 NOT NULL, ADD `verify_key` VARCHAR(255) CHARACTER SET utf8 NOT NULL AFTER `token`, ADD `verify_throttle` DATETIME NOT NULL AFTER `verify_key`");
 
 		//Columns added properly
-		if ( $query ) {
-			give_update_option( 'email_access_installed', 1 );
+		if ($query) {
+			give_update_option('email_access_installed', 1);
 		}
 
 	}

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Class for allowing donors access to their donation w/o logging in;
- *
- * Based on the work from Matt Gibbs - https://github.com/FacetWP/edd-no-logins
- *
- * @package     Give
- * @copyright   Copyright (c) 2016, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.4
- */
+	 * Class for allowing donors access to their donation w/o logging in;
+	 *
+	 * Based on the work from Matt Gibbs - https://github.com/FacetWP/edd-no-logins
+	 *
+	 * @package     Give
+	 * @copyright   Copyright (c) 2016, WordImpress
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.4
+	 */
 
 defined( 'ABSPATH' ) or exit;
 

includes/emails/class-give-email-tags.php

Spacing +89 added lines, -89 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -51,9 +51,9 @@ 
 	 * @param string $tag Email tag to be replace in email
 	 * @param callable $func Hook to run when email tag is found
 	 */
-	public function add( $tag, $description, $func ) {
-		if ( is_callable( $func ) ) {
-			$this->tags[ $tag ] = array(
+	public function add($tag, $description, $func) {
+		if (is_callable($func)) {
+			$this->tags[$tag] = array(
 				'tag'         => $tag,
 				'description' => $description,
 				'func'        => $func
@@ -68,8 +68,8 @@ 
 	 *
 	 * @param string $tag Email tag to remove hook from
 	 */
-	public function remove( $tag ) {
-		unset( $this->tags[ $tag ] );
+	public function remove($tag) {
+		unset($this->tags[$tag]);
 	}
 
 	/**
@@ -81,8 +81,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function email_tag_exists( $tag ) {
-		return array_key_exists( $tag, $this->tags );
+	public function email_tag_exists($tag) {
+		return array_key_exists($tag, $this->tags);
 	}
 
 	/**
@@ -106,16 +106,16 @@ 
 	 *
 	 * @return string Content with email tags filtered out.
 	 */
-	public function do_tags( $content, $payment_id ) {
+	public function do_tags($content, $payment_id) {
 
 		// Check if there is atleast one tag added
-		if ( empty( $this->tags ) || ! is_array( $this->tags ) ) {
+		if (empty($this->tags) || ! is_array($this->tags)) {
 			return $content;
 		}
 
 		$this->payment_id = $payment_id;
 
-		$new_content = preg_replace_callback( "/{([A-z0-9\-\_]+)}/s", array( $this, 'do_tag' ), $content );
+		$new_content = preg_replace_callback("/{([A-z0-9\-\_]+)}/s", array($this, 'do_tag'), $content);
 
 		$this->payment_id = null;
 
@@ -131,17 +131,17 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function do_tag( $m ) {
+	public function do_tag($m) {
 
 		// Get tag
 		$tag = $m[1];
 
 		// Return tag if tag not set
-		if ( ! $this->email_tag_exists( $tag ) ) {
+		if ( ! $this->email_tag_exists($tag)) {
 			return $m[0];
 		}
 
-		return call_user_func( $this->tags[ $tag ]['func'], $this->payment_id, $tag );
+		return call_user_func($this->tags[$tag]['func'], $this->payment_id, $tag);
 	}
 
 }
@@ -155,8 +155,8 @@ 
  * @param string $description Description of the email tag added
  * @param callable $func Hook to run when email tag is found
  */
-function give_add_email_tag( $tag, $description, $func ) {
-	Give()->email_tags->add( $tag, $description, $func );
+function give_add_email_tag($tag, $description, $func) {
+	Give()->email_tags->add($tag, $description, $func);
 }
 
 /**
@@ -166,8 +166,8 @@ 
  *
  * @param string $tag Email tag to remove hook from
  */
-function give_remove_email_tag( $tag ) {
-	Give()->email_tags->remove( $tag );
+function give_remove_email_tag($tag) {
+	Give()->email_tags->remove($tag);
 }
 
 /**
@@ -179,8 +179,8 @@ 
  *
  * @return bool
  */
-function give_email_tag_exists( $tag ) {
-	return Give()->email_tags->email_tag_exists( $tag );
+function give_email_tag_exists($tag) {
+	return Give()->email_tags->email_tag_exists($tag);
 }
 
 /**
@@ -209,13 +209,13 @@ 
 	$email_tags = give_get_email_tags();
 
 	// Check
-	if ( count( $email_tags ) > 0 ) {
+	if (count($email_tags) > 0) {
 
 		// Loop
-		foreach ( $email_tags as $email_tag ) {
+		foreach ($email_tags as $email_tag) {
 
 			// Add email tag to list
-			$list .= '<code>{' . $email_tag['tag'] . '}</code> - ' . $email_tag['description'] . '<br/>';
+			$list .= '<code>{'.$email_tag['tag'].'}</code> - '.$email_tag['description'].'<br/>';
 
 		}
 
@@ -235,13 +235,13 @@ 
  *
  * @return string Content with email tags filtered out.
  */
-function give_do_email_tags( $content, $payment_id ) {
+function give_do_email_tags($content, $payment_id) {
 
 	// Replace all tags
-	$content = Give()->email_tags->do_tags( $content, $payment_id );
+	$content = Give()->email_tags->do_tags($content, $payment_id);
 
 	// Maintaining backwards compatibility
-	$content = apply_filters( 'give_email_template_tags', $content, give_get_payment_meta( $payment_id ), $payment_id );
+	$content = apply_filters('give_email_template_tags', $content, give_get_payment_meta($payment_id), $payment_id);
 
 	// Return content
 	return $content;
@@ -253,10 +253,10 @@ 
  * @since 1.0
  */
 function give_load_email_tags() {
-	do_action( 'give_add_email_tags' );
+	do_action('give_add_email_tags');
 }
 
-add_action( 'init', 'give_load_email_tags', - 999 );
+add_action('init', 'give_load_email_tags', - 999);
 
 /**
  * Add default Give email template tags
@@ -269,82 +269,82 @@ 
 	$email_tags = array(
 		array(
 			'tag'         => 'donation',
-			'description' => __( 'The name of completed donation form', 'give' ),
+			'description' => __('The name of completed donation form', 'give'),
 			'function'    => 'give_email_tag_donation'
 		),
 		array(
 			'tag'         => 'name',
-			'description' => __( 'The donor\'s first name', 'give' ),
+			'description' => __('The donor\'s first name', 'give'),
 			'function'    => 'give_email_tag_first_name'
 		),
 		array(
 			'tag'         => 'fullname',
-			'description' => __( 'The donor\'s full name, first and last', 'give' ),
+			'description' => __('The donor\'s full name, first and last', 'give'),
 			'function'    => 'give_email_tag_fullname'
 		),
 		array(
 			'tag'         => 'username',
-			'description' => __( 'The donor\'s user name on the site, if they registered an account', 'give' ),
+			'description' => __('The donor\'s user name on the site, if they registered an account', 'give'),
 			'function'    => 'give_email_tag_username'
 		),
 		array(
 			'tag'         => 'user_email',
-			'description' => __( 'The donor\'s email address', 'give' ),
+			'description' => __('The donor\'s email address', 'give'),
 			'function'    => 'give_email_tag_user_email'
 		),
 		array(
 			'tag'         => 'billing_address',
-			'description' => __( 'The donor\'s billing address', 'give' ),
+			'description' => __('The donor\'s billing address', 'give'),
 			'function'    => 'give_email_tag_billing_address'
 		),
 		array(
 			'tag'         => 'date',
-			'description' => __( 'The date of the donation', 'give' ),
+			'description' => __('The date of the donation', 'give'),
 			'function'    => 'give_email_tag_date'
 		),
 		array(
 			'tag'         => 'price',
-			'description' => __( 'The total price of the donation', 'give' ),
+			'description' => __('The total price of the donation', 'give'),
 			'function'    => 'give_email_tag_price'
 		),
 		array(
 			'tag'         => 'payment_id',
-			'description' => __( 'The unique ID number for this donation', 'give' ),
+			'description' => __('The unique ID number for this donation', 'give'),
 			'function'    => 'give_email_tag_payment_id'
 		),
 		array(
 			'tag'         => 'receipt_id',
-			'description' => __( 'The unique ID number for this donation receipt', 'give' ),
+			'description' => __('The unique ID number for this donation receipt', 'give'),
 			'function'    => 'give_email_tag_receipt_id'
 		),
 		array(
 			'tag'         => 'payment_method',
-			'description' => __( 'The method of payment used for this donation', 'give' ),
+			'description' => __('The method of payment used for this donation', 'give'),
 			'function'    => 'give_email_tag_payment_method'
 		),
 		array(
 			'tag'         => 'sitename',
-			'description' => __( 'Your site name', 'give' ),
+			'description' => __('Your site name', 'give'),
 			'function'    => 'give_email_tag_sitename'
 		),
 		array(
 			'tag'         => 'receipt_link',
-			'description' => __( 'Adds a link so users can view their receipt directly on your website if they are unable to view it in the browser correctly.', 'give' ),
+			'description' => __('Adds a link so users can view their receipt directly on your website if they are unable to view it in the browser correctly.', 'give'),
 			'function'    => 'give_email_tag_receipt_link'
 		),
 	);
 
 	// Apply give_email_tags filter
-	$email_tags = apply_filters( 'give_email_tags', $email_tags );
+	$email_tags = apply_filters('give_email_tags', $email_tags);
 
 	// Add email tags
-	foreach ( $email_tags as $email_tag ) {
-		give_add_email_tag( $email_tag['tag'], $email_tag['description'], $email_tag['function'] );
+	foreach ($email_tags as $email_tag) {
+		give_add_email_tag($email_tag['tag'], $email_tag['description'], $email_tag['function']);
 	}
 
 }
 
-add_action( 'give_add_email_tags', 'give_setup_email_tags' );
+add_action('give_add_email_tags', 'give_setup_email_tags');
 
 
 /**
@@ -355,12 +355,12 @@ 
  *
  * @return string name
  */
-function give_email_tag_first_name( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_first_name($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['name'];
 }
@@ -373,12 +373,12 @@ 
  *
  * @return string fullname
  */
-function give_email_tag_fullname( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_fullname($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['fullname'];
 }
@@ -391,12 +391,12 @@ 
  *
  * @return string username
  */
-function give_email_tag_username( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_username($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['username'];
 }
@@ -409,8 +409,8 @@ 
  *
  * @return string user_email
  */
-function give_email_tag_user_email( $payment_id ) {
-	return give_get_payment_user_email( $payment_id );
+function give_email_tag_user_email($payment_id) {
+	return give_get_payment_user_email($payment_id);
 }
 
 /**
@@ -421,10 +421,10 @@ 
  *
  * @return string billing_address
  */
-function give_email_tag_billing_address( $payment_id ) {
+function give_email_tag_billing_address($payment_id) {
 
-	$user_info    = give_get_payment_meta_user_info( $payment_id );
-	$user_address = ! empty( $user_info['address'] ) ? $user_info['address'] : array(
+	$user_info    = give_get_payment_meta_user_info($payment_id);
+	$user_address = ! empty($user_info['address']) ? $user_info['address'] : array(
 		'line1'   => '',
 		'line2'   => '',
 		'city'    => '',
@@ -433,11 +433,11 @@ 
 		'zip'     => ''
 	);
 
-	$return = $user_address['line1'] . "\n";
-	if ( ! empty( $user_address['line2'] ) ) {
-		$return .= $user_address['line2'] . "\n";
+	$return = $user_address['line1']."\n";
+	if ( ! empty($user_address['line2'])) {
+		$return .= $user_address['line2']."\n";
 	}
-	$return .= $user_address['city'] . ' ' . $user_address['zip'] . ' ' . $user_address['state'] . "\n";
+	$return .= $user_address['city'].' '.$user_address['zip'].' '.$user_address['state']."\n";
 	$return .= $user_address['country'];
 
 	return $return;
@@ -451,10 +451,10 @@ 
  *
  * @return string date
  */
-function give_email_tag_date( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
+function give_email_tag_date($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
 
-	return date_i18n( get_option( 'date_format' ), strtotime( $payment_data['date'] ) );
+	return date_i18n(get_option('date_format'), strtotime($payment_data['date']));
 }
 
 /**
@@ -465,10 +465,10 @@ 
  *
  * @return string price
  */
-function give_email_tag_price( $payment_id ) {
-	$price = give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ), give_get_payment_currency_code( $payment_id ) );
+function give_email_tag_price($payment_id) {
+	$price = give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)), give_get_payment_currency_code($payment_id));
 
-	return html_entity_decode( $price, ENT_COMPAT, 'UTF-8' );
+	return html_entity_decode($price, ENT_COMPAT, 'UTF-8');
 }
 
 /**
@@ -479,8 +479,8 @@ 
  *
  * @return int payment_id
  */
-function give_email_tag_payment_id( $payment_id ) {
-	return give_get_payment_number( $payment_id );
+function give_email_tag_payment_id($payment_id) {
+	return give_get_payment_number($payment_id);
 }
 
 /**
@@ -491,8 +491,8 @@ 
  *
  * @return string receipt_id
  */
-function give_email_tag_receipt_id( $payment_id ) {
-	return give_get_payment_key( $payment_id );
+function give_email_tag_receipt_id($payment_id) {
+	return give_get_payment_key($payment_id);
 }
 
 /**
@@ -503,9 +503,9 @@ 
  *
  * @return string $form_title
  */
-function give_email_tag_donation( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	$form_title   = ( ! empty( $payment_data['form_title'] ) ? $payment_data['form_title'] : __( 'There was an error retrieving this donation title', 'give' ) );
+function give_email_tag_donation($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	$form_title   = ( ! empty($payment_data['form_title']) ? $payment_data['form_title'] : __('There was an error retrieving this donation title', 'give'));
 
 	return $form_title;
 }
@@ -518,8 +518,8 @@ 
  *
  * @return string gateway
  */
-function give_email_tag_payment_method( $payment_id ) {
-	return give_get_gateway_checkout_label( give_get_payment_gateway( $payment_id ) );
+function give_email_tag_payment_method($payment_id) {
+	return give_get_gateway_checkout_label(give_get_payment_gateway($payment_id));
 }
 
 /**
@@ -530,8 +530,8 @@ 
  *
  * @return string sitename
  */
-function give_email_tag_sitename( $payment_id ) {
-	return wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+function give_email_tag_sitename($payment_id) {
+	return wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES);
 }
 
 /**
@@ -543,15 +543,15 @@ 
  *
  * @return string receipt_link
  */
-function give_email_tag_receipt_link( $payment_id ) {
+function give_email_tag_receipt_link($payment_id) {
 
-	$receipt_url = esc_url( add_query_arg( array(
-		'payment_key' => give_get_payment_key( $payment_id ),
+	$receipt_url = esc_url(add_query_arg(array(
+		'payment_key' => give_get_payment_key($payment_id),
 		'give_action' => 'view_receipt'
-	), home_url() ) );
-	$formatted   = sprintf( __( '%1$sView it in your browser %2$s', 'give' ), '<a href="' . $receipt_url . '">', '&raquo;</a>' );
+	), home_url()));
+	$formatted = sprintf(__('%1$sView it in your browser %2$s', 'give'), '<a href="'.$receipt_url.'">', '&raquo;</a>');
 
-	if ( give_get_option( 'email_template' ) !== 'none' ) {
+	if (give_get_option('email_template') !== 'none') {
 		return $formatted;
 	} else {
 		return $receipt_url;

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * Give API for creating Email template tags
- *
- * Email tags are wrapped in { }
- *
- * A few examples:
- *
- * {name}
- * {sitename}
- *
- *
- * To replace tags in content, use: give_do_email_tags( $content, payment_id );
- *
- * To add tags, use: give_add_email_tag( $tag, $description, $func ). Be sure to wrap give_add_email_tag()
- * in a function hooked to the 'give_email_tags' action
- *
- * @package     Give
- * @subpackage  Emails
- * @copyright   Copyright (c) 2016, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+	 * Give API for creating Email template tags
+	 *
+	 * Email tags are wrapped in { }
+	 *
+	 * A few examples:
+	 *
+	 * {name}
+	 * {sitename}
+	 *
+	 *
+	 * To replace tags in content, use: give_do_email_tags( $content, payment_id );
+	 *
+	 * To add tags, use: give_add_email_tag( $tag, $description, $func ). Be sure to wrap give_add_email_tag()
+	 * in a function hooked to the 'give_email_tags' action
+	 *
+	 * @package     Give
+	 * @subpackage  Emails
+	 * @copyright   Copyright (c) 2016, WordImpress
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.0
+	 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {

includes/emails/template.php

Spacing +69 added lines, -69 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -41,8 +41,8 @@ 
  *
  * @return string $message Fully formatted message
  */
-function give_email_template_tags( $message, $payment_data, $payment_id, $admin_notice = false ) {
-	return give_do_email_tags( $message, $payment_id );
+function give_email_template_tags($message, $payment_data, $payment_id, $admin_notice = false) {
+	return give_do_email_tags($message, $payment_id);
 }
 
 /**
@@ -55,38 +55,38 @@ 
  *
  * @return string $message Fully formatted message
  */
-function give_email_preview_template_tags( $message ) {
+function give_email_preview_template_tags($message) {
 	global $give_options;
 
-	$price = give_currency_filter( give_format_amount( 10.50 ) );
+	$price = give_currency_filter(give_format_amount(10.50));
 
 	$gateway = 'PayPal';
 
-	$receipt_id = strtolower( md5( uniqid() ) );
+	$receipt_id = strtolower(md5(uniqid()));
 
-	$notes = __( 'These are some sample notes added to a donation.', 'give' );
+	$notes = __('These are some sample notes added to a donation.', 'give');
 
-	$payment_id = rand( 1, 100 );
+	$payment_id = rand(1, 100);
 
 	$user = wp_get_current_user();
 
-	$message = str_replace( '{name}', $user->display_name, $message );
-	$message = str_replace( '{fullname}', $user->display_name, $message );
-	$message = str_replace( '{username}', $user->user_login, $message );
-	$message = str_replace( '{date}', date( get_option( 'date_format' ), current_time( 'timestamp' ) ), $message );
-	$message = str_replace( '{price}', $price, $message );
-	$message = str_replace( '{donation}', 'Sample Donation Form Title', $message );
-	$message = str_replace( '{receipt_id}', $receipt_id, $message );
-	$message = str_replace( '{payment_method}', $gateway, $message );
-	$message = str_replace( '{sitename}', get_bloginfo( 'name' ), $message );
-	$message = str_replace( '{product_notes}', $notes, $message );
-	$message = str_replace( '{payment_id}', $payment_id, $message );
-	$message = str_replace( '{receipt_link}', sprintf( __( '%1$sView the receipt in your browser %2$s', 'give' ), '<a href="' . esc_url( add_query_arg( array(
+	$message = str_replace('{name}', $user->display_name, $message);
+	$message = str_replace('{fullname}', $user->display_name, $message);
+	$message = str_replace('{username}', $user->user_login, $message);
+	$message = str_replace('{date}', date(get_option('date_format'), current_time('timestamp')), $message);
+	$message = str_replace('{price}', $price, $message);
+	$message = str_replace('{donation}', 'Sample Donation Form Title', $message);
+	$message = str_replace('{receipt_id}', $receipt_id, $message);
+	$message = str_replace('{payment_method}', $gateway, $message);
+	$message = str_replace('{sitename}', get_bloginfo('name'), $message);
+	$message = str_replace('{product_notes}', $notes, $message);
+	$message = str_replace('{payment_id}', $payment_id, $message);
+	$message = str_replace('{receipt_link}', sprintf(__('%1$sView the receipt in your browser %2$s', 'give'), '<a href="'.esc_url(add_query_arg(array(
 			'payment_key' => $receipt_id,
 			'give_action' => 'view_receipt'
-		), home_url() ) ) . '">', '&raquo;</a>' ), $message );
+		), home_url())).'">', '&raquo;</a>'), $message);
 
-	return wpautop( apply_filters( 'give_email_preview_template_tags', $message ) );
+	return wpautop(apply_filters('give_email_preview_template_tags', $message));
 }
 
 /**
@@ -99,20 +99,20 @@ 
  * @since  1.0
  * @return array|bool
  */
-add_filter( 'give_settings_emails', 'give_email_template_preview' );
+add_filter('give_settings_emails', 'give_email_template_preview');
 
-function give_email_template_preview( $array ) {
+function give_email_template_preview($array) {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return false;
 	}
 	$custom_field = array(
-		'name' => __( 'Preview Email', 'give' ),
-		'desc' => __( 'Click the buttons to preview emails.', 'give' ),
+		'name' => __('Preview Email', 'give'),
+		'desc' => __('Click the buttons to preview emails.', 'give'),
 		'id'   => 'give_email_preview_buttons',
 		'type' => 'email_preview_buttons'
 	);
-	array_splice( $array, 5, 0, array( $custom_field ) );
+	array_splice($array, 5, 0, array($custom_field));
 
 	return $array; // splice in at position 3;
 }
@@ -128,11 +128,11 @@ 
 function give_email_preview_buttons_callback() {
 	ob_start();
 	?>
-	<a href="<?php echo esc_url( add_query_arg( array( 'give_action' => 'preview_email' ), home_url() ) ); ?>" class="button-secondary" target="_blank" title="<?php _e( 'Donation Receipt Preview', 'give' ); ?> "><?php _e( 'Preview Donation Receipt', 'give' ); ?></a>
-	<a href="<?php echo wp_nonce_url( add_query_arg( array(
+	<a href="<?php echo esc_url(add_query_arg(array('give_action' => 'preview_email'), home_url())); ?>" class="button-secondary" target="_blank" title="<?php _e('Donation Receipt Preview', 'give'); ?> "><?php _e('Preview Donation Receipt', 'give'); ?></a>
+	<a href="<?php echo wp_nonce_url(add_query_arg(array(
 		'give_action'  => 'send_test_email',
 		'give-message' => 'sent-test-email'
-	) ), 'give-test-email' ); ?>" title="<?php _e( 'This will send a demo donation receipt to the emails listed below.', 'give' ); ?>" class="button-secondary"><?php _e( 'Send Test Email', 'give' ); ?></a>
+	)), 'give-test-email'); ?>" title="<?php _e('This will send a demo donation receipt to the emails listed below.', 'give'); ?>" class="button-secondary"><?php _e('Send Test Email', 'give'); ?></a>
 	<?php
 	echo ob_get_clean();
 }
@@ -145,27 +145,27 @@ 
  */
 function give_display_email_template_preview() {
 
-	if ( empty( $_GET['give_action'] ) ) {
+	if (empty($_GET['give_action'])) {
 		return;
 	}
 
-	if ( 'preview_email' !== $_GET['give_action'] ) {
+	if ('preview_email' !== $_GET['give_action']) {
 		return;
 	}
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 
-	Give()->emails->heading = __( 'Donation Receipt', 'give' );
+	Give()->emails->heading = __('Donation Receipt', 'give');
 
-	echo Give()->emails->build_email( give_email_preview_template_tags( give_get_email_body_content( 0, array() ) ) );
+	echo Give()->emails->build_email(give_email_preview_template_tags(give_get_email_body_content(0, array())));
 
 	exit;
 
 }
 
-add_action( 'template_redirect', 'give_display_email_template_preview' );
+add_action('template_redirect', 'give_display_email_template_preview');
 
 /**
  * Email Template Body
@@ -177,19 +177,19 @@ 
  *
  * @return string $email_body Body of the email
  */
-function give_get_email_body_content( $payment_id = 0, $payment_data = array() ) {
+function give_get_email_body_content($payment_id = 0, $payment_data = array()) {
 
 	global $give_options;
 
 	$default_email_body = give_get_default_donation_receipt_email();
 
-	$email = isset( $give_options['donation_receipt'] ) ? stripslashes( $give_options['donation_receipt'] ) : $default_email_body;
+	$email = isset($give_options['donation_receipt']) ? stripslashes($give_options['donation_receipt']) : $default_email_body;
 
-	$email_body = wpautop( $email );
+	$email_body = wpautop($email);
 
-	$email_body = apply_filters( 'give_donation_receipt_' . Give()->emails->get_template(), $email_body, $payment_id, $payment_data );
+	$email_body = apply_filters('give_donation_receipt_'.Give()->emails->get_template(), $email_body, $payment_id, $payment_data);
 
-	return apply_filters( 'give_donation_receipt', $email_body, $payment_id, $payment_data );
+	return apply_filters('give_donation_receipt', $email_body, $payment_id, $payment_data);
 }
 
 
@@ -205,37 +205,37 @@ 
  *
  * @return string $email_body Body of the email
  */
-function give_get_donation_notification_body_content( $payment_id = 0, $payment_data = array() ) {
+function give_get_donation_notification_body_content($payment_id = 0, $payment_data = array()) {
 	global $give_options;
 
-	$user_info = maybe_unserialize( $payment_data['user_info'] );
-	$email     = give_get_payment_user_email( $payment_id );
+	$user_info = maybe_unserialize($payment_data['user_info']);
+	$email     = give_get_payment_user_email($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 = $email;
 	}
 
-	$gateway = give_get_gateway_admin_label( get_post_meta( $payment_id, '_give_payment_gateway', true ) );
+	$gateway = give_get_gateway_admin_label(get_post_meta($payment_id, '_give_payment_gateway', true));
 
-	$default_email_body = __( 'Hello', 'give' ) . "\n\n" . __( 'A donation has been made', 'give' ) . ".\n\n";
-	$default_email_body .= sprintf( __( '%s sold:', 'give' ), give_get_forms_label_plural() ) . "\n\n";
+	$default_email_body = __('Hello', 'give')."\n\n".__('A donation has been made', 'give').".\n\n";
+	$default_email_body .= sprintf(__('%s sold:', 'give'), give_get_forms_label_plural())."\n\n";
 
-	$default_email_body .= __( 'Donor: ', 'give' ) . " " . html_entity_decode( $name, ENT_COMPAT, 'UTF-8' ) . "\n";
-	$default_email_body .= __( 'Amount: ', 'give' ) . " " . html_entity_decode( give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) ), ENT_COMPAT, 'UTF-8' ) . "\n";
-	$default_email_body .= __( 'Payment Method: ', 'give' ) . " " . $gateway . "\n\n";
+	$default_email_body .= __('Donor: ', 'give')." ".html_entity_decode($name, ENT_COMPAT, 'UTF-8')."\n";
+	$default_email_body .= __('Amount: ', 'give')." ".html_entity_decode(give_currency_filter(give_format_amount(give_get_payment_amount($payment_id))), ENT_COMPAT, 'UTF-8')."\n";
+	$default_email_body .= __('Payment Method: ', 'give')." ".$gateway."\n\n";
 
-	$default_email_body .= __( 'Thank you', 'give' );
+	$default_email_body .= __('Thank you', 'give');
 
-	$email = isset( $give_options['donation_notification'] ) ? stripslashes( $give_options['donation_notification'] ) : $default_email_body;
+	$email = isset($give_options['donation_notification']) ? stripslashes($give_options['donation_notification']) : $default_email_body;
 
-	$email_body = give_do_email_tags( $email, $payment_id );
+	$email_body = give_do_email_tags($email, $payment_id);
 
-	return apply_filters( 'give_donation_notification', wpautop( $email_body ), $payment_id, $payment_data );
+	return apply_filters('give_donation_notification', wpautop($email_body), $payment_id, $payment_data);
 }
 
 /**
@@ -248,15 +248,15 @@ 
  * @since  1.0
  */
 function give_render_receipt_in_browser() {
-	if ( ! isset( $_GET['payment_key'] ) ) {
-		wp_die( __( 'Missing donation payment key.', 'give' ), __( 'Error', 'give' ) );
+	if ( ! isset($_GET['payment_key'])) {
+		wp_die(__('Missing donation payment key.', 'give'), __('Error', 'give'));
 	}
 
-	$key = urlencode( $_GET['payment_key'] );
+	$key = urlencode($_GET['payment_key']);
 
 	ob_start();
 	//Disallows caching of the page
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 	header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
 	header("Cache-Control: post-check=0, pre-check=0", false);
 	header("Pragma: no-cache"); // HTTP/1.0
@@ -265,7 +265,7 @@ 
 	<!DOCTYPE html>
 	<html lang="en">
 		<head>
-			<title><?php _e( 'Donation Receipt', 'give' ); ?></title>
+			<title><?php _e('Donation Receipt', 'give'); ?></title>
 			<meta charset="utf-8" />
 
 			<!-- Further disallowing of caching of this page -->
@@ -279,12 +279,12 @@ 
 
 			<?php wp_head(); ?>
 		</head>
-		<body class="<?php echo apply_filters( 'give_receipt_page_body_class', 'give_receipt_page' ); ?>">
+		<body class="<?php echo apply_filters('give_receipt_page_body_class', 'give_receipt_page'); ?>">
 
 			<div id="give_receipt_wrapper">
-				<?php do_action( 'give_render_receipt_in_browser_before' ); ?>
-				<?php echo do_shortcode( '[give_receipt payment_key=' . $key . ']' ); ?>
-				<?php do_action( 'give_render_receipt_in_browser_after' ); ?>
+				<?php do_action('give_render_receipt_in_browser_before'); ?>
+				<?php echo do_shortcode('[give_receipt payment_key='.$key.']'); ?>
+				<?php do_action('give_render_receipt_in_browser_after'); ?>
 			</div>
 
 			<?php wp_footer(); ?>
@@ -295,4 +295,4 @@ 
 	die();
 }
 
-add_action( 'give_view_receipt', 'give_render_receipt_in_browser' );
+add_action('give_view_receipt', 'give_render_receipt_in_browser');

includes/emails/functions.php

Spacing +93 added lines, -93 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,39 +24,39 @@ 
  *
  * @return void
  */
-function give_email_donation_receipt( $payment_id, $admin_notice = true ) {
+function give_email_donation_receipt($payment_id, $admin_notice = true) {
 
-	$payment_data = give_get_payment_meta( $payment_id );
+	$payment_data = give_get_payment_meta($payment_id);
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_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( 'donation_subject', __( 'Donation Receipt', 'give' ) );
-	$subject = apply_filters( 'give_donation_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = give_get_option('donation_subject', __('Donation Receipt', 'give'));
+	$subject = apply_filters('give_donation_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$attachments = apply_filters( 'give_receipt_attachments', array(), $payment_id, $payment_data );
-	$message     = give_do_email_tags( give_get_email_body_content( $payment_id, $payment_data ), $payment_id );
+	$attachments = apply_filters('give_receipt_attachments', array(), $payment_id, $payment_data);
+	$message     = give_do_email_tags(give_get_email_body_content($payment_id, $payment_data), $payment_id);
 
 	$emails = Give()->emails;
 
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', __( 'Donation Receipt', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', __('Donation Receipt', '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);
 
-	if ( $admin_notice && ! give_admin_notices_disabled( $payment_id ) ) {
-		do_action( 'give_admin_sale_notice', $payment_id, $payment_data );
+	if ($admin_notice && ! give_admin_notices_disabled($payment_id)) {
+		do_action('give_admin_sale_notice', $payment_id, $payment_data);
 	}
 }
 
@@ -69,29 +69,29 @@ 
  */
 function give_email_test_donation_receipt() {
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, 0, array() );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, 0, array());
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, 0, array() );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_from_address', $from_email, 0, array());
 
-	$subject = give_get_option( 'donation_subject', __( 'Donation Receipt', 'give' ) );
-	$subject = apply_filters( 'give_donation_subject', wp_strip_all_tags( $subject ), 0 );
-	$subject = give_do_email_tags( $subject, 0 );
+	$subject = give_get_option('donation_subject', __('Donation Receipt', 'give'));
+	$subject = apply_filters('give_donation_subject', wp_strip_all_tags($subject), 0);
+	$subject = give_do_email_tags($subject, 0);
 
-	$attachments = apply_filters( 'give_receipt_attachments', array(), 0, array() );
+	$attachments = apply_filters('give_receipt_attachments', array(), 0, array());
 
-	$message = give_email_preview_template_tags( give_get_email_body_content( 0, array() ), 0 );
+	$message = give_email_preview_template_tags(give_get_email_body_content(0, array()), 0);
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', __( 'Donation Receipt', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', __('Donation Receipt', 'give'));
 
-	$headers = apply_filters( 'give_receipt_headers', $emails->get_headers(), 0, array() );
-	$emails->__set( 'headers', $headers );
+	$headers = apply_filters('give_receipt_headers', $emails->get_headers(), 0, array());
+	$emails->__set('headers', $headers);
 
-	$emails->send( give_get_admin_notice_emails(), $subject, $message, $attachments );
+	$emails->send(give_get_admin_notice_emails(), $subject, $message, $attachments);
 
 }
 
@@ -105,49 +105,49 @@ 
  *
  * @return void
  */
-function give_admin_email_notice( $payment_id = 0, $payment_data = array() ) {
+function give_admin_email_notice($payment_id = 0, $payment_data = array()) {
 
-	$payment_id = absint( $payment_id );
+	$payment_id = absint($payment_id);
 
-	if ( empty( $payment_id ) ) {
+	if (empty($payment_id)) {
 		return;
 	}
 
-	if ( ! give_get_payment_by( 'id', $payment_id ) ) {
+	if ( ! give_get_payment_by('id', $payment_id)) {
 		return;
 	}
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_from_address', $from_email, $payment_id, $payment_data);
 
-	$subject = give_get_option( 'donation_notification_subject', sprintf( __( 'New Donation - Payment #%1$s', 'give' ), $payment_id ) );
-	$subject = apply_filters( 'give_admin_donation_notification_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = give_get_option('donation_notification_subject', sprintf(__('New Donation - Payment #%1$s', 'give'), $payment_id));
+	$subject = apply_filters('give_admin_donation_notification_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$headers = "From: " . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
-	$headers .= "Reply-To: " . $from_email . "\r\n";
+	$headers = "From: ".stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8'))." <$from_email>\r\n";
+	$headers .= "Reply-To: ".$from_email."\r\n";
 	//$headers  .= "MIME-Version: 1.0\r\n";
 	$headers .= "Content-Type: text/html; charset=utf-8\r\n";
-	$headers = apply_filters( 'give_admin_donation_notification_headers', $headers, $payment_id, $payment_data );
+	$headers = apply_filters('give_admin_donation_notification_headers', $headers, $payment_id, $payment_data);
 
-	$attachments = apply_filters( 'give_admin_donation_notification_attachments', array(), $payment_id, $payment_data );
+	$attachments = apply_filters('give_admin_donation_notification_attachments', array(), $payment_id, $payment_data);
 
-	$message = give_get_donation_notification_body_content( $payment_id, $payment_data );
+	$message = give_get_donation_notification_body_content($payment_id, $payment_data);
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'headers', $headers );
-	$emails->__set( 'heading', __( 'New Donation!', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('headers', $headers);
+	$emails->__set('heading', __('New Donation!', 'give'));
 
-	$emails->send( give_get_admin_notice_emails(), $subject, $message, $attachments );
+	$emails->send(give_get_admin_notice_emails(), $subject, $message, $attachments);
 
 }
 
-add_action( 'give_admin_sale_notice', 'give_admin_email_notice', 10, 2 );
+add_action('give_admin_sale_notice', 'give_admin_email_notice', 10, 2);
 
 /**
  * Retrieves the emails for which admin notifications are sent to (these can be
@@ -160,10 +160,10 @@ 
 function give_get_admin_notice_emails() {
 	global $give_options;
 
-	$emails = isset( $give_options['admin_notice_emails'] ) && strlen( trim( $give_options['admin_notice_emails'] ) ) > 0 ? $give_options['admin_notice_emails'] : get_bloginfo( 'admin_email' );
-	$emails = array_map( 'trim', explode( "\n", $emails ) );
+	$emails = isset($give_options['admin_notice_emails']) && strlen(trim($give_options['admin_notice_emails'])) > 0 ? $give_options['admin_notice_emails'] : get_bloginfo('admin_email');
+	$emails = array_map('trim', explode("\n", $emails));
 
-	return apply_filters( 'give_admin_notice_emails', $emails );
+	return apply_filters('give_admin_notice_emails', $emails);
 }
 
 /**
@@ -175,11 +175,11 @@ 
  *
  * @return mixed
  */
-function give_admin_notices_disabled( $payment_id = 0 ) {
+function give_admin_notices_disabled($payment_id = 0) {
 	global $give_options;
-	$retval = isset( $give_options['disable_admin_notices'] );
+	$retval = isset($give_options['disable_admin_notices']);
 
-	return apply_filters( 'give_admin_notices_disabled', $retval, $payment_id );
+	return apply_filters('give_admin_notices_disabled', $retval, $payment_id);
 }
 
 /**
@@ -193,16 +193,16 @@ 
 function give_get_default_donation_notification_email() {
 	global $give_options;
 
-	$default_email_body = __( 'Hi there,', 'give' ) . "\n\n" . __( 'This email is to inform you that a new donation has been made on your website: ', 'give' ) . '<a href="' . get_bloginfo( 'url' ) . '" target="_blank">' . get_bloginfo( 'url' ) . '</a>' . ".\n\n";
-	$default_email_body .= '<strong>' . __( 'Donor: ', 'give' ) . '</strong> ' . ' {name}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation: ', 'give' ) . '</strong> ' . ' {donation}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Amount: ', 'give' ) . '</strong> ' . ' {price}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment Method: ', 'give' ) . '</strong> ' . ' {payment_method}' . "\n\n";
-	$default_email_body .= __( 'Thank you,', 'give' ) . "\n\n" . '{sitename}';
+	$default_email_body = __('Hi there,', 'give')."\n\n".__('This email is to inform you that a new donation has been made on your website: ', 'give').'<a href="'.get_bloginfo('url').'" target="_blank">'.get_bloginfo('url').'</a>'.".\n\n";
+	$default_email_body .= '<strong>'.__('Donor: ', 'give').'</strong> '.' {name}'."\n";
+	$default_email_body .= '<strong>'.__('Donation: ', 'give').'</strong> '.' {donation}'."\n";
+	$default_email_body .= '<strong>'.__('Amount: ', 'give').'</strong> '.' {price}'."\n";
+	$default_email_body .= '<strong>'.__('Payment Method: ', 'give').'</strong> '.' {payment_method}'."\n\n";
+	$default_email_body .= __('Thank you,', 'give')."\n\n".'{sitename}';
 
-	$message = ( isset( $give_options['donation_notification'] ) && ! empty( $give_options['donation_notification'] ) ) ? $give_options['donation_notification'] : $default_email_body;
+	$message = (isset($give_options['donation_notification']) && ! empty($give_options['donation_notification'])) ? $give_options['donation_notification'] : $default_email_body;
 
-	return apply_filters( 'give_default_donation_notification_email', $message );
+	return apply_filters('give_default_donation_notification_email', $message);
 }
 
 
@@ -217,24 +217,24 @@ 
 function give_get_default_donation_receipt_email() {
 	global $give_options;
 
-	$default_email_body = __( 'Dear', 'give' ) . " {name},\n\n";
-	$default_email_body .= __( 'Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give' ) . "\n\n";
-	$default_email_body .= '<strong>' . __( 'Donor', 'give' ) . ':</strong> ' . '{fullname}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation', 'give' ) . ':</strong> ' . '{donation}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation Date', 'give' ) . ':</strong> ' . '{date}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Amount', 'give' ) . ':</strong> ' . '{price}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment Method', 'give' ) . ':</strong> ' . '{payment_method}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment ID', 'give' ) . ':</strong> ' . '{payment_id}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Receipt ID', 'give' ) . ':</strong> ' . '{receipt_id}' . "\n\n";
-	$default_email_body .= '{receipt_link}' . "\n\n";
+	$default_email_body = __('Dear', 'give')." {name},\n\n";
+	$default_email_body .= __('Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give')."\n\n";
+	$default_email_body .= '<strong>'.__('Donor', 'give').':</strong> '.'{fullname}'."\n";
+	$default_email_body .= '<strong>'.__('Donation', 'give').':</strong> '.'{donation}'."\n";
+	$default_email_body .= '<strong>'.__('Donation Date', 'give').':</strong> '.'{date}'."\n";
+	$default_email_body .= '<strong>'.__('Amount', 'give').':</strong> '.'{price}'."\n";
+	$default_email_body .= '<strong>'.__('Payment Method', 'give').':</strong> '.'{payment_method}'."\n";
+	$default_email_body .= '<strong>'.__('Payment ID', 'give').':</strong> '.'{payment_id}'."\n";
+	$default_email_body .= '<strong>'.__('Receipt ID', 'give').':</strong> '.'{receipt_id}'."\n\n";
+	$default_email_body .= '{receipt_link}'."\n\n";
 
 	$default_email_body .= "\n\n";
-	$default_email_body .= __( 'Sincerely,', 'give' );
-	$default_email_body .= "\n" . '{sitename}' . "\n";
+	$default_email_body .= __('Sincerely,', 'give');
+	$default_email_body .= "\n".'{sitename}'."\n";
 
-	$message = ( isset( $give_options['donation_receipt'] ) && ! empty( $give_options['donation_receipt'] ) ) ? $give_options['donation_receipt'] : $default_email_body;
+	$message = (isset($give_options['donation_receipt']) && ! empty($give_options['donation_receipt'])) ? $give_options['donation_receipt'] : $default_email_body;
 
-	return apply_filters( 'give_default_donation_receipt_email', $message );
+	return apply_filters('give_default_donation_receipt_email', $message);
 }
 
 /**
@@ -246,19 +246,19 @@ 
  *
  * @return array $email_names
  */
-function give_get_email_names( $user_info ) {
+function give_get_email_names($user_info) {
 	$email_names = array();
-	$user_info   = maybe_unserialize( $user_info );
+	$user_info   = maybe_unserialize($user_info);
 
 	$email_names['fullname'] = '';
-	if ( isset( $user_info['id'] ) && $user_info['id'] > 0 && isset( $user_info['first_name'] ) ) {
-		$user_data               = get_userdata( $user_info['id'] );
+	if (isset($user_info['id']) && $user_info['id'] > 0 && isset($user_info['first_name'])) {
+		$user_data               = get_userdata($user_info['id']);
 		$email_names['name']     = $user_info['first_name'];
-		$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+		$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 		$email_names['username'] = $user_data->user_login;
-	} elseif ( isset( $user_info['first_name'] ) ) {
+	} elseif (isset($user_info['first_name'])) {
 		$email_names['name']     = $user_info['first_name'];
-		$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+		$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 		$email_names['username'] = $user_info['first_name'];
 	} else {
 		$email_names['name']     = $user_info['email'];