WordImpress / Give

includes/error-tracking.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
  *
  * @since 1.0
  * @uses  Give_Session::get()
- * @return mixed array if errors are present, false if none found
+ * @return string array if errors are present, false if none found
  */
 function give_get_errors() {
 	return Give()->session->get( 'give_errors' );

Spacing +30 added lines, -30 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,33 +29,33 @@ 
  *
  * @return void
  */
-function give_print_errors( $form_id ) {
+function give_print_errors($form_id) {
 
 	$errors = give_get_errors();
 
-	$request_form_id = isset( $_REQUEST['form-id'] ) ? intval( $_REQUEST['form-id'] ) : 0;
+	$request_form_id = isset($_REQUEST['form-id']) ? intval($_REQUEST['form-id']) : 0;
 
 	//Sanity checks first: Ensure that gateway returned errors display on the appropriate form
-	if ( ! isset( $_POST['give_ajax'] ) && $request_form_id !== $form_id ) {
+	if ( ! isset($_POST['give_ajax']) && $request_form_id !== $form_id) {
 		return;
 	}
 
-	if ( $errors ) {
-		$classes = apply_filters( 'give_error_class', array(
+	if ($errors) {
+		$classes = apply_filters('give_error_class', array(
 			'give_errors'
-		) );
-		echo '<div class="' . implode( ' ', $classes ) . '">';
+		));
+		echo '<div class="'.implode(' ', $classes).'">';
 		// Loop error codes and display errors
-		foreach ( $errors as $error_id => $error ) {
-			echo '<div class="give_error" id="give_error_' . $error_id . '"><p><strong>' . esc_html__( 'Error', 'give' ) . '</strong>: ' . $error . '</p></div>';
+		foreach ($errors as $error_id => $error) {
+			echo '<div class="give_error" id="give_error_'.$error_id.'"><p><strong>'.esc_html__('Error', 'give').'</strong>: '.$error.'</p></div>';
 		}
 		echo '</div>';
 		give_clear_errors();
 	}
 }
 
-add_action( 'give_donation_form_before_personal_info', 'give_print_errors' );
-add_action( 'give_ajax_checkout_errors', 'give_print_errors' );
+add_action('give_donation_form_before_personal_info', 'give_print_errors');
+add_action('give_ajax_checkout_errors', 'give_print_errors');
 
 /**
  * Get Errors
@@ -68,7 +68,7 @@ 
  * @return mixed array if errors are present, false if none found
  */
 function give_get_errors() {
-	return Give()->session->get( 'give_errors' );
+	return Give()->session->get('give_errors');
 }
 
 /**
@@ -84,13 +84,13 @@ 
  *
  * @return void
  */
-function give_set_error( $error_id, $error_message ) {
+function give_set_error($error_id, $error_message) {
 	$errors = give_get_errors();
-	if ( ! $errors ) {
+	if ( ! $errors) {
 		$errors = array();
 	}
-	$errors[ $error_id ] = $error_message;
-	Give()->session->set( 'give_errors', $errors );
+	$errors[$error_id] = $error_message;
+	Give()->session->set('give_errors', $errors);
 }
 
 /**
@@ -101,7 +101,7 @@ 
  * @return void
  */
 function give_clear_errors() {
-	Give()->session->set( 'give_errors', null );
+	Give()->session->set('give_errors', null);
 }
 
 /**
@@ -114,11 +114,11 @@ 
  *
  * @return string
  */
-function give_unset_error( $error_id ) {
+function give_unset_error($error_id) {
 	$errors = give_get_errors();
-	if ( $errors ) {
-		unset( $errors[ $error_id ] );
-		Give()->session->set( 'give_errors', $errors );
+	if ($errors) {
+		unset($errors[$error_id]);
+		Give()->session->set('give_errors', $errors);
 	}
 }
 
@@ -129,7 +129,7 @@ 
  * @return string/void
  */
 function _give_die_handler() {
-	if ( defined( 'GIVE_UNIT_TESTS' ) ) {
+	if (defined('GIVE_UNIT_TESTS')) {
 		return '_give_die_handler';
 	} else {
 		die();
@@ -149,10 +149,10 @@ 
  * 
  * @return void
  */
-function give_die( $message = '', $title = '', $status = 400 ) {
-	add_filter( 'wp_die_ajax_handler', '_give_die_handler', 10, 3 );
-	add_filter( 'wp_die_handler', '_give_die_handler', 10, 3 );
-	wp_die( $message, $title, array( 'response' => $status ) );
+function give_die($message = '', $title = '', $status = 400) {
+	add_filter('wp_die_ajax_handler', '_give_die_handler', 10, 3);
+	add_filter('wp_die_handler', '_give_die_handler', 10, 3);
+	wp_die($message, $title, array('response' => $status));
 }
 
 /**
@@ -167,10 +167,10 @@ 
  *
  * @return   string  $error
  */
-function give_output_error( $message, $echo = true, $error_id = 'warning' ) {
-	$error = '<div class="give_errors" id="give_error_' . $error_id . '"><p class="give_error  give_' . $error_id . '">' . $message . '</p></div>';
+function give_output_error($message, $echo = true, $error_id = 'warning') {
+	$error = '<div class="give_errors" id="give_error_'.$error_id.'"><p class="give_error  give_'.$error_id.'">'.$message.'</p></div>';
 
-	if ( $echo ) {
+	if ($echo) {
 		echo $error;
 	} else {
 		return $error;

includes/shortcodes.php

Indentation +5 added lines, -5 removed lines

@@ -91,7 +91,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 ] = '';
@@ -169,15 +169,15 @@ 
  */
 function give_login_form_shortcode( $atts, $content = null ) {
 	$atts = shortcode_atts( array(
-        // Add backward compatibility for redirect attribute.
-        'redirect'          => '',
+		// Add backward compatibility for redirect attribute.
+		'redirect'          => '',
 
 		'login-redirect'    => '',
 		'logout-redirect'   => '',
 	), $atts, 'give_login' );
 
-    // Check login-redirect attribute first, if it empty or not found then check for redirect attribute and add value of this to login-redirect attribute.
-    $atts['login-redirect'] = ! empty( $atts['login-redirect'] ) ? $atts['login-redirect'] : ( ! empty( $atts['redirect' ] ) ? $atts['redirect'] : '' );
+	// Check login-redirect attribute first, if it empty or not found then check for redirect attribute and add value of this to login-redirect attribute.
+	$atts['login-redirect'] = ! empty( $atts['login-redirect'] ) ? $atts['login-redirect'] : ( ! empty( $atts['redirect' ] ) ? $atts['redirect'] : '' );
 
 	return give_login_form( $atts['login-redirect'], $atts['logout-redirect'] );
 }

Spacing +109 added lines, -109 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 a session exist? Does an email-access token exist?
-	if ( is_user_logged_in() || Give()->session->get_session_expiration() !== false || ( $email_access == 'on' && Give()->email_access->token_exists ) ) {
+	if (is_user_logged_in() || Give()->session->get_session_expiration() !== false || ($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 = esc_html__( '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 = esc_html__('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( esc_html__( 'The shortcode is missing Donation Form ID attribute.', 'give' ), true );
+	if (empty($atts['id'])) {
+		give_output_error(esc_html__('The shortcode is missing Donation Form ID attribute.', 'give'), true);
 	}
 
 	//Sanity check 2: Check the 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( esc_html__( 'The 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(esc_html__('The 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,22 +167,22 @@ 
  * @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(
         // Add backward compatibility for redirect attribute.
         'redirect'          => '',
 
 		'login-redirect'    => '',
 		'logout-redirect'   => '',
-	), $atts, 'give_login' );
+	), $atts, 'give_login');
 
     // Check login-redirect attribute first, if it empty or not found then check for redirect attribute and add value of this to login-redirect attribute.
-    $atts['login-redirect'] = ! empty( $atts['login-redirect'] ) ? $atts['login-redirect'] : ( ! empty( $atts['redirect' ] ) ? $atts['redirect'] : '' );
+    $atts['login-redirect'] = ! empty($atts['login-redirect']) ? $atts['login-redirect'] : ( ! empty($atts['redirect']) ? $atts['redirect'] : '');
 
-	return give_login_form( $atts['login-redirect'], $atts['logout-redirect'] );
+	return give_login_form($atts['login-redirect'], $atts['logout-redirect']);
 }
 
-add_shortcode( 'give_login', 'give_login_form_shortcode' );
+add_shortcode('give_login', 'give_login_form_shortcode');
 
 /**
  * Register Shortcode.
@@ -197,15 +197,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');
 
 
 /**
@@ -220,62 +220,62 @@ 
  *
  * @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__( 'You are missing the payment key to view this donation receipt.', 'give' ),
+	$give_receipt_args = shortcode_atts(array(
+		'error'          => esc_html__('You are missing the payment key to view this donation receipt.', 'give'),
 		'price'          => true,
 		'donor'          => 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;
 
@@ -283,9 +283,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 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 receipt.', 'give')));
 
-		give_get_template_part( 'shortcode', 'login' );
+		give_get_template_part('shortcode', 'login');
 
 		$login_form = ob_get_clean();
 
@@ -300,13 +300,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();
 
@@ -315,7 +315,7 @@ 
 
 }
 
-add_shortcode( 'give_receipt', 'give_receipt_shortcode' );
+add_shortcode('give_receipt', 'give_receipt_shortcode');
 
 /**
  * Profile Editor Shortcode.
@@ -335,18 +335,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.
@@ -359,30 +359,30 @@ 
  *
  * @return bool
  */
-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,
@@ -410,38 +410,38 @@ 
 	 * @param int   $user_id  The ID of the user.
 	 * @param array $userdata User info, including ID, first name, last name, display name and email.
 	 */
-	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', esc_html__( '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', esc_html__('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', esc_html__( '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', esc_html__('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 ) {
+	if ($updated) {
 
 		/**
 		 * Fires after updating user profile.
@@ -451,13 +451,13 @@ 
 		 * @param int   $user_id  The ID of the user.
 		 * @param array $userdata User info, including ID, first name, last name, display name and email.
 		 */
-		do_action( 'give_user_profile_updated', $user_id, $userdata );
-		wp_redirect( add_query_arg( 'updated', 'true', $data['give_redirect'] ) );
+		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/price-functions.php

Spacing +18 added lines, -18 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,13 +23,13 @@ 
  *
  * @return bool true if has variable prices, false otherwise
  */
-function give_has_variable_prices( $form_id = 0 ) {
+function give_has_variable_prices($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
 	return $form->has_variable_prices();
 }
@@ -44,13 +44,13 @@ 
  *
  * @return array Variable prices
  */
-function give_get_variable_prices( $form_id = 0 ) {
+function give_get_variable_prices($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
 	return $form->prices;
 
@@ -67,13 +67,13 @@ 
  *
  * @return string $default_price
  */
-function give_get_default_multilevel_amount( $form_id ) {
+function give_get_default_multilevel_amount($form_id) {
 	$default_price = '1.00';
-	$prices        = apply_filters( 'give_form_variable_prices', give_get_variable_prices( $form_id ), $form_id );
+	$prices        = apply_filters('give_form_variable_prices', give_get_variable_prices($form_id), $form_id);
 
-	foreach ( $prices as $price ) {
+	foreach ($prices as $price) {
 
-		if ( isset( $price['_give_default'] ) && $price['_give_default'] === 'default' ) {
+		if (isset($price['_give_default']) && $price['_give_default'] === 'default') {
 			$default_price = $price['_give_amount'];
 		}
 
@@ -94,15 +94,15 @@ 
  * @return string $default_price
  * @since      1.0
  */
-function give_get_default_form_amount( $form_id ) {
+function give_get_default_form_amount($form_id) {
 
-	if ( give_has_variable_prices( $form_id ) ) {
+	if (give_has_variable_prices($form_id)) {
 
-		$default_amount = give_get_default_multilevel_amount( $form_id );
+		$default_amount = give_get_default_multilevel_amount($form_id);
 
 	} else {
 
-		$default_amount = get_post_meta( $form_id, '_give_set_price', true );
+		$default_amount = get_post_meta($form_id, '_give_set_price', true);
 
 	}
 
@@ -123,13 +123,13 @@ 
  * 
  * @return bool
  */
-function give_is_custom_price_mode( $form_id = 0 ) {
+function give_is_custom_price_mode($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
 	return $form->is_custom_price_mode();
 }
\ No newline at end of file

includes/class-give-email-access.php

Indentation +2 added lines, -2 removed lines

@@ -23,7 +23,7 @@ 
 	public $error = '';
 
 	private $verify_throttle;
-    private $token_expiration;
+	private $token_expiration;
 
 	/**
 	 * Give_Email_Access constructor.
@@ -243,7 +243,7 @@ 
 	 * @return bool
 	 */
 	function is_valid_verify_key( $token ) {
-        /* @var WPDB $wpdb */
+		/* @var WPDB $wpdb */
 		global $wpdb;
 
 		// See if the verify_key exists

Spacing +62 added lines, -62 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -98,7 +98,7 @@ 
 	public function __construct() {
 
 		// get it started
-		add_action( 'init', array( $this, 'init' ) );
+		add_action('init', array($this, 'init'));
 	}
 
 	/**
@@ -113,30 +113,30 @@ 
 	 */
 	public 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_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_users_purchases_args', array($this, 'users_purchases_args'));
 		}
 	}
 
@@ -150,25 +150,25 @@ 
 	 *
 	 * @return bool
 	 */
-	public function can_send_email( $customer_id ) {
+	public function can_send_email($customer_id) {
 		/* @var WPDB $wpdb */
 		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', esc_html__( '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', esc_html__('Please wait a few minutes before requesting a new email access link.', 'give'));
 
 				return false;
 			}
@@ -188,34 +188,34 @@ 
 	 *
 	 * @return void
 	 */
-	public function send_email( $customer_id, $email ) {
+	public 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( esc_html__( 'Your Access Link to %s', 'give' ), get_bloginfo( 'name' ) ) );
+		$subject = apply_filters('give_email_access_token_subject', sprintf(esc_html__('Your Access Link to %s', 'give'), get_bloginfo('name')));
 
-		$message  = esc_html__( '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">' . esc_html__( 'Access My Donation Details &raquo;', 'give' ) . '</a>' . "\n\n";
+		$message  = esc_html__('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">'.esc_html__('Access My Donation Details &raquo;', 'give').'</a>'."\n\n";
 		$message .= "\n\n";
-		$message .= esc_html__( 'Sincerely,', 'give' ) . "\n";
-		$message .= get_bloginfo( 'name' ) . "\n";
+		$message .= esc_html__('Sincerely,', 'give')."\n";
+		$message .= 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', esc_html__( 'Your Access Link', 'give' ) ) );
-		Give()->emails->send( $email, $subject, $message );
+		Give()->emails->__set('heading', apply_filters('give_email_access_token_heading', esc_html__('Your Access Link', 'give')));
+		Give()->emails->send($email, $subject, $message);
 
 	}
 
@@ -229,24 +229,24 @@ 
 	 */
 	public 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
-			$lifetime = current_time( 'timestamp' ) + Give()->session->set_expiration_time();
-			@setcookie( 'give_nl', $token, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false );
+			$lifetime = current_time('timestamp') + Give()->session->set_expiration_time();
+			@setcookie('give_nl', $token, $lifetime, COOKIEPATH, COOKIE_DOMAIN, false);
 		}
 	}
 
@@ -260,18 +260,18 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_valid_token( $token ) {
+	public 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;
 
@@ -279,8 +279,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', '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', 'Your access token has expired. Please request a new one below:', 'give'));
 		}
 
 
@@ -300,25 +300,25 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_verify_key( $customer_id, $email, $verify_key ) {
+	public 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)
 			);
 		}
 	}
@@ -333,21 +333,21 @@ 
 	 *
 	 * @return bool
 	 */
-	public function is_valid_verify_key( $token ) {
+	public function is_valid_verify_key($token) {
         /* @var WPDB $wpdb */
 		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;
@@ -371,7 +371,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function users_purchases_args( $args ) {
+	public function users_purchases_args($args) {
 		$args['user'] = $this->token_email;
 
 		return $args;
@@ -392,11 +392,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);
 		}
 
 	}

includes/admin/upgrades/upgrades.php

Braces +5 added lines, -2 removed lines

@@ -64,11 +64,14 @@
 				}, 250 );
 			</script>
 
-		<?php else : ?>
+		<?php else {
+	: ?>
 
 			<div id="give-upgrade-status">
 				<p style="font-size: 20px;max-width: 900px;">
-					<?php esc_html_e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
+					<?php esc_html_e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' );
+}
+?>
 					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
 				</p>
 			</div>

Spacing +17 added lines, -17 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,12 +21,12 @@ 
  * @return void
  */
 function give_upgrades_screen() {
-	$action = isset( $_GET['give-upgrade'] ) ? sanitize_text_field( $_GET['give-upgrade'] ) : '';
-	$step   = isset( $_GET['step'] ) ? absint( $_GET['step'] ) : 1;
-	$total  = isset( $_GET['total'] ) ? absint( $_GET['total'] ) : false;
-	$custom = isset( $_GET['custom'] ) ? absint( $_GET['custom'] ) : 0;
-	$number = isset( $_GET['number'] ) ? absint( $_GET['number'] ) : 100;
-	$steps  = round( ( $total / $number ), 0 );
+	$action = isset($_GET['give-upgrade']) ? sanitize_text_field($_GET['give-upgrade']) : '';
+	$step   = isset($_GET['step']) ? absint($_GET['step']) : 1;
+	$total  = isset($_GET['total']) ? absint($_GET['total']) : false;
+	$custom = isset($_GET['custom']) ? absint($_GET['custom']) : 0;
+	$number = isset($_GET['number']) ? absint($_GET['number']) : 100;
+	$steps  = round(($total / $number), 0);
 
 	$doing_upgrade_args = array(
 		'page'         => 'give-upgrades',
@@ -36,25 +36,25 @@ 
 		'custom'       => $custom,
 		'steps'        => $steps
 	);
-	update_option( 'give_doing_upgrade', $doing_upgrade_args );
-	if ( $step > $steps ) {
+	update_option('give_doing_upgrade', $doing_upgrade_args);
+	if ($step > $steps) {
 		// Prevent a weird case where the estimate was off. Usually only a couple.
 		$steps = $step;
 	}
 	?>
 	<div class="wrap">
-		<h1><?php esc_html_e( 'Give - Upgrades', 'give' ); ?></h1>
+		<h1><?php esc_html_e('Give - Upgrades', 'give'); ?></h1>
 
-		<?php if ( ! empty( $action ) ) : ?>
+		<?php if ( ! empty($action)) : ?>
 
 			<div id="give-upgrade-status">
-				<p style="font-size: 20px;max-width: 900px;"><?php esc_html_e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
+				<p style="font-size: 20px;max-width: 900px;"><?php esc_html_e('The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give'); ?>
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
 				</p>
 
-				<?php if ( ! empty( $total ) ) : ?>
+				<?php if ( ! empty($total)) : ?>
 					<p>
-						<strong><?php printf( esc_html__( 'Step %d of approximately %d running', 'give' ), $step, $steps ); ?></strong>
+						<strong><?php printf(esc_html__('Step %d of approximately %d running', 'give'), $step, $steps); ?></strong>
 					</p>
 				<?php endif; ?>
 			</div>
@@ -68,8 +68,8 @@ 
 
 			<div id="give-upgrade-status">
 				<p style="font-size: 20px;max-width: 900px;">
-					<?php esc_html_e( 'The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give' ); ?>
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
+					<?php esc_html_e('The upgrade process has started, please be patient and do not close this window or navigate away from this page. This could take several minutes depending on the upgrade and the size of your website. You will be automatically redirected when the upgrade is finished.', 'give'); ?>
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/spinner.gif'; ?>" id="give-upgrade-loader" style="  position: relative; top: 3px; left: 6px;" />
 				</p>
 			</div>
 			<script type="text/javascript">

includes/admin/reporting/export/export-functions.php

Spacing +32 added lines, -32 removed lines

@@ -11,12 +11,12 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-export.php';
-require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/export-actions.php';
+require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/class-export.php';
+require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/export-actions.php';
 
 /**
  * Process batch exports via ajax
@@ -26,79 +26,79 @@ 
  */
 function give_do_ajax_export() {
 
-	require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export.php';
+	require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export.php';
 
-	parse_str( $_POST['form'], $form );
+	parse_str($_POST['form'], $form);
 
 	$_REQUEST = $form = (array) $form;
 
-	if ( ! wp_verify_nonce( $_REQUEST['give_ajax_export'], 'give_ajax_export' ) ) {
-		die( '-2' );
+	if ( ! wp_verify_nonce($_REQUEST['give_ajax_export'], 'give_ajax_export')) {
+		die('-2');
 	}
 
-	do_action( 'give_batch_export_class_include', $form['give-export-class'] );
+	do_action('give_batch_export_class_include', $form['give-export-class']);
 
-	$step   = absint( $_POST['step'] );
-	$class  = sanitize_text_field( $form['give-export-class'] );
+	$step   = absint($_POST['step']);
+	$class  = sanitize_text_field($form['give-export-class']);
 
-	$export = new $class( $step );
+	$export = new $class($step);
 
-	if ( ! $export->can_export() ) {
-		die( '-1' );
+	if ( ! $export->can_export()) {
+		die('-1');
 	}
 
-	if ( ! $export->is_writable ) {
+	if ( ! $export->is_writable) {
 		$json_args = array(
 			'error'   => true,
-			'message' => esc_html__( 'Export location or file not writable.', 'give' )
+			'message' => esc_html__('Export location or file not writable.', 'give')
 		);
 		echo json_encode($json_args);
 		exit;
 	}
 
-	$export->set_properties( $_REQUEST );
+	$export->set_properties($_REQUEST);
 
 	$export->pre_fetch();
 
-	$ret = $export->process_step( $step );
+	$ret = $export->process_step($step);
 
 	$percentage = $export->get_percentage_complete();
 
-	if ( $ret ) {
+	if ($ret) {
 
 		$step += 1;
-		echo json_encode( array( 'step' => $step, 'percentage' => $percentage ) );
+		echo json_encode(array('step' => $step, 'percentage' => $percentage));
 		exit;
 
-	} elseif ( true === $export->is_empty ) {
+	} elseif (true === $export->is_empty) {
 
-		echo json_encode( array(
+		echo json_encode(array(
 			'error'   => true,
-			'message' => esc_html__( 'No data found for export parameters.', 'give' )
-		) );
+			'message' => esc_html__('No data found for export parameters.', 'give')
+		));
 		exit;
 
-	} elseif ( true === $export->done && true === $export->is_void ) {
+	} elseif (true === $export->done && true === $export->is_void) {
 
-		$message = ! empty( $export->message ) ? $export->message : esc_html__( 'Batch Processing Complete', 'give' );
-		echo json_encode( array( 'success' => true, 'message' => $message ) );
+		$message = ! empty($export->message) ? $export->message : esc_html__('Batch Processing Complete', 'give');
+		echo json_encode(array('success' => true, 'message' => $message));
 		exit;
 
 	} else {
 		
-		$args = array_merge( $_REQUEST, array(
+		$args = array_merge($_REQUEST, array(
 			'step'        => $step,
 			'class'       => $class,
-			'nonce'       => wp_create_nonce( 'give-batch-export' ),
+			'nonce'       => wp_create_nonce('give-batch-export'),
 			'give_action' => 'form_batch_export',
-		) );
+		));
 
-		$download_url = add_query_arg( $args, admin_url() );
+		$download_url = add_query_arg($args, admin_url());
 
-		echo json_encode( array( 'step' => 'done', 'url' => $download_url ) );
+		echo json_encode(array('step' => 'done', 'url' => $download_url));
 		exit;
 
 	}
 }
 
-add_action( 'wp_ajax_give_do_ajax_export', 'give_do_ajax_export' );
+add_action('wp_ajax_give_do_ajax_export', 'give_do_ajax_export');

includes/admin/admin-pages.php

Spacing +65 added lines, -65 removed lines

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

includes/country-functions.php

Spacing +333 added lines, -333 removed lines

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

includes/admin/shortcodes/shortcode-give-login.php

Indentation +10 added lines, -10 removed lines

@@ -42,16 +42,16 @@
 				'minWidth' => 320,
 				'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after login.', 'give' ),
 			),
-            array(
-                'type' => 'container',
-                'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Logout Redirect URL (optional):', 'give' ) ),
-            ),
-            array(
-                'type'     => 'textbox',
-                'name'     => 'logout-redirect',
-                'minWidth' => 320,
-                'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after logout.', 'give' ),
-            ),
+			array(
+				'type' => 'container',
+				'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Logout Redirect URL (optional):', 'give' ) ),
+			),
+			array(
+				'type'     => 'textbox',
+				'name'     => 'logout-redirect',
+				'minWidth' => 320,
+				'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after logout.', 'give' ),
+			),
 		);
 	}
 }

Spacing +8 added lines, -8 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,10 +21,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['title'] = esc_html__( 'Login', 'give' );
-		$this->shortcode['label'] = esc_html__( 'Login', 'give' );
+		$this->shortcode['title'] = esc_html__('Login', 'give');
+		$this->shortcode['label'] = esc_html__('Login', 'give');
 
-		parent::__construct( 'give_login' );
+		parent::__construct('give_login');
 	}
 
 	/**
@@ -37,23 +37,23 @@ 
 		return array(
 			array(
 				'type' => 'container',
-				'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Login Redirect URL (optional):', 'give' ) ),
+				'html' => sprintf('<p class="no-margin">%s</p>', esc_html__('Login Redirect URL (optional):', 'give')),
 			),
 			array(
 				'type'     => 'textbox',
 				'name'     => 'login-redirect',
 				'minWidth' => 320,
-				'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after login.', 'give' ),
+				'tooltip'  => esc_attr__('Enter an URL here to redirect to after login.', 'give'),
 			),
             array(
                 'type' => 'container',
-                'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Logout Redirect URL (optional):', 'give' ) ),
+                'html' => sprintf('<p class="no-margin">%s</p>', esc_html__('Logout Redirect URL (optional):', 'give')),
             ),
             array(
                 'type'     => 'textbox',
                 'name'     => 'logout-redirect',
                 'minWidth' => 320,
-                'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after logout.', 'give' ),
+                'tooltip'  => esc_attr__('Enter an URL here to redirect to after logout.', 'give'),
             ),
 		);
 	}