WordImpress / Give

templates/shortcode-profile-editor.php

Spacing +67 added lines, -67 removed lines

@@ -7,22 +7,22 @@ 
  * @copyright    Copyright (c) 2016, WordImpress
  * @license      https://opensource.org/licenses/gpl-license GNU Public License
  */
-$current_user     = wp_get_current_user();
+$current_user = wp_get_current_user();
 
-if ( is_user_logged_in() ):
+if (is_user_logged_in()):
 	$user_id = get_current_user_id();
-	$first_name   = get_user_meta( $user_id, 'first_name', true );
-	$last_name    = get_user_meta( $user_id, 'last_name', true );
+	$first_name   = get_user_meta($user_id, 'first_name', true);
+	$last_name    = get_user_meta($user_id, 'last_name', true);
 	$display_name = $current_user->display_name;
-	$address      = give_get_donor_address( $user_id );
+	$address      = give_get_donor_address($user_id);
 
-	if ( isset( $_GET['updated'] ) && $_GET['updated'] == true && ! give_get_errors() ): ?>
+	if (isset($_GET['updated']) && $_GET['updated'] == true && ! give_get_errors()): ?>
 		<p class="give_success">
-			<strong><?php esc_html_e( 'Success:', 'give' ); ?></strong> <?php esc_html_e( 'Your profile has been updated.', 'give' ); ?>
+			<strong><?php esc_html_e('Success:', 'give'); ?></strong> <?php esc_html_e('Your profile has been updated.', 'give'); ?>
 		</p>
 	<?php endif; ?>
 
-	<?php Give()->notices->render_frontend_notices( 0 ); ?>
+	<?php Give()->notices->render_frontend_notices(0); ?>
 
 	<?php
 	/**
@@ -32,39 +32,39 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_profile_editor_before' );
+	do_action('give_profile_editor_before');
 	?>
 
 	<form id="give_profile_editor_form" class="give-form" action="<?php echo give_get_current_page_url(); ?>" method="post">
 
 		<fieldset>
-			<legend id="give_profile_name_label"><?php _e( 'Profile', 'give' ); ?></legend>
+			<legend id="give_profile_name_label"><?php _e('Profile', 'give'); ?></legend>
 
-			<h3 id="give_personal_information_label" class="give-section-break"><?php _e( 'Change your Name', 'give' ); ?></h3>
+			<h3 id="give_personal_information_label" class="give-section-break"><?php _e('Change your Name', 'give'); ?></h3>
 
 			<p id="give_profile_first_name_wrap" class="form-row form-row-first form-row-responsive">
-				<label for="give_first_name"><?php _e( 'First Name', 'give' ); ?></label>
-				<input name="give_first_name" id="give_first_name" class="text give-input" type="text" value="<?php echo esc_attr( $first_name ); ?>"/>
+				<label for="give_first_name"><?php _e('First Name', 'give'); ?></label>
+				<input name="give_first_name" id="give_first_name" class="text give-input" type="text" value="<?php echo esc_attr($first_name); ?>"/>
 			</p>
 
 			<p id="give_profile_last_name_wrap" class="form-row form-row-last form-row-responsive">
-				<label for="give_last_name"><?php _e( 'Last Name', 'give' ); ?></label>
-				<input name="give_last_name" id="give_last_name" class="text give-input" type="text" value="<?php echo esc_attr( $last_name ); ?>"/>
+				<label for="give_last_name"><?php _e('Last Name', 'give'); ?></label>
+				<input name="give_last_name" id="give_last_name" class="text give-input" type="text" value="<?php echo esc_attr($last_name); ?>"/>
 			</p>
 
 			<p id="give_profile_display_name_wrap" class="form-row form-row-first form-row-responsive">
-				<label for="give_display_name"><?php _e( 'Display Name', 'give' ); ?></label>
+				<label for="give_display_name"><?php _e('Display Name', 'give'); ?></label>
 				<select name="give_display_name" id="give_display_name" class="select give-select">
-					<?php if ( ! empty( $current_user->first_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->first_name ); ?> value="<?php echo esc_attr( $current_user->first_name ); ?>"><?php echo esc_html( $current_user->first_name ); ?></option>
+					<?php if ( ! empty($current_user->first_name)): ?>
+						<option <?php selected($display_name, $current_user->first_name); ?> value="<?php echo esc_attr($current_user->first_name); ?>"><?php echo esc_html($current_user->first_name); ?></option>
 					<?php endif; ?>
-					<option <?php selected( $display_name, $current_user->user_nicename ); ?> value="<?php echo esc_attr( $current_user->user_nicename ); ?>"><?php echo esc_html( $current_user->user_nicename ); ?></option>
-					<?php if ( ! empty( $current_user->last_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->last_name ); ?> value="<?php echo esc_attr( $current_user->last_name ); ?>"><?php echo esc_html( $current_user->last_name ); ?></option>
+					<option <?php selected($display_name, $current_user->user_nicename); ?> value="<?php echo esc_attr($current_user->user_nicename); ?>"><?php echo esc_html($current_user->user_nicename); ?></option>
+					<?php if ( ! empty($current_user->last_name)): ?>
+						<option <?php selected($display_name, $current_user->last_name); ?> value="<?php echo esc_attr($current_user->last_name); ?>"><?php echo esc_html($current_user->last_name); ?></option>
 					<?php endif; ?>
-					<?php if ( ! empty( $current_user->first_name ) && ! empty( $current_user->last_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->first_name . ' ' . $current_user->last_name ); ?> value="<?php echo esc_attr( $current_user->first_name . ' ' . $current_user->last_name ); ?>"><?php echo esc_html( $current_user->first_name . ' ' . $current_user->last_name ); ?></option>
-						<option <?php selected( $display_name, $current_user->last_name . ' ' . $current_user->first_name ); ?> value="<?php echo esc_attr( $current_user->last_name . ' ' . $current_user->first_name ); ?>"><?php echo esc_html( $current_user->last_name . ' ' . $current_user->first_name ); ?></option>
+					<?php if ( ! empty($current_user->first_name) && ! empty($current_user->last_name)): ?>
+						<option <?php selected($display_name, $current_user->first_name.' '.$current_user->last_name); ?> value="<?php echo esc_attr($current_user->first_name.' '.$current_user->last_name); ?>"><?php echo esc_html($current_user->first_name.' '.$current_user->last_name); ?></option>
+						<option <?php selected($display_name, $current_user->last_name.' '.$current_user->first_name); ?> value="<?php echo esc_attr($current_user->last_name.' '.$current_user->first_name); ?>"><?php echo esc_html($current_user->last_name.' '.$current_user->first_name); ?></option>
 					<?php endif; ?>
 				</select>
 				<?php
@@ -75,7 +75,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_name' );
+				do_action('give_profile_editor_name');
 				?>
 			</p>
 
@@ -87,12 +87,12 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_name' );
+			do_action('give_profile_editor_after_name');
 			?>
 
 			<p class="form-row form-row-last form-row-responsive">
-				<label for="give_email"><?php _e( 'Email Address', 'give' ); ?></label>
-				<input name="give_email" id="give_email" class="text give-input required" type="email" value="<?php echo esc_attr( $current_user->user_email ); ?>" required aria-required="true"/>
+				<label for="give_email"><?php _e('Email Address', 'give'); ?></label>
+				<input name="give_email" id="give_email" class="text give-input required" type="email" value="<?php echo esc_attr($current_user->user_email); ?>" required aria-required="true"/>
 				<?php
 				/**
 				 * Fires in the profile editor shortcode, to the email section.
@@ -101,7 +101,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_email' );
+				do_action('give_profile_editor_email');
 				?>
 			</p>
 
@@ -113,33 +113,33 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_email' );
+			do_action('give_profile_editor_after_email');
 			?>
 
-			<h3 id="give_profile_billing_address_label" class="give-section-break"><?php _e( 'Change your Billing Address', 'give' ); ?></h3>
+			<h3 id="give_profile_billing_address_label" class="give-section-break"><?php _e('Change your Billing Address', 'give'); ?></h3>
 
 			<div id="give_profile_billing_address_wrap">
 				<?php
 				// Get selected country from address.
-				$selected_country = ( ! empty( $address['country'] ) ? $address['country'] : '' );
+				$selected_country = ( ! empty($address['country']) ? $address['country'] : '');
 
 				$selected_state = '';
-				if ( $selected_country === give_get_country() ) {
+				if ($selected_country === give_get_country()) {
 					// Get default selected state by admin.
 					$selected_state = give_get_state();
 				}
 
 				// Get selected state from address.
-				$selected_state = ! empty( $address['state'] ) ? $address['state'] : $selected_state;
+				$selected_state = ! empty($address['state']) ? $address['state'] : $selected_state;
 
-				$label        = __( 'State', 'give' );
+				$label        = __('State', 'give');
 				$states_label = give_get_states_label();
 				// Check if $country code exists in the array key for states label.
-				if ( array_key_exists( $selected_country, $states_label ) ) {
-					$label = $states_label[ $selected_country ];
+				if (array_key_exists($selected_country, $states_label)) {
+					$label = $states_label[$selected_country];
 				}
 
-				$states = give_get_states( $selected_country );
+				$states = give_get_states($selected_country);
 
 				// Get the country list that do not have any states init.
 				$no_states_country = give_no_states_country_list();
@@ -149,39 +149,39 @@ 
 				?>
 
 				<p id="give-card-country-wrap" class="form-row form-row-wide">
-					<label for="give_address_country"><?php _e( 'Country', 'give' ); ?></label>
+					<label for="give_address_country"><?php _e('Country', 'give'); ?></label>
 					<select name="give_address_country" id="give_address_country" class="select give-select">
-						<?php foreach ( give_get_country_list() as $key => $country ) : ?>
-							<option value="<?php echo $key; ?>"<?php selected( $selected_country, $key ); ?>><?php echo esc_html( $country ); ?></option>
+						<?php foreach (give_get_country_list() as $key => $country) : ?>
+							<option value="<?php echo $key; ?>"<?php selected($selected_country, $key); ?>><?php echo esc_html($country); ?></option>
 						<?php endforeach; ?>
 					</select>
 				</p>
 
 				<p id="give-card-address-wrap" class="form-row form-row-wide">
-					<label for="give_address_line1"><?php _e( 'Address 1', 'give' ); ?></label>
+					<label for="give_address_line1"><?php _e('Address 1', 'give'); ?></label>
 					<input name="give_address_line1" id="give_address_line1" class="text give-input" type="text"
-					       value="<?php echo esc_attr( $address['line1'] ); ?>"/>
+					       value="<?php echo esc_attr($address['line1']); ?>"/>
 				</p>
 
 				<p id="give-card-address-2-wrap" class="form-row form-row-wide">
-					<label for="give_address_line2"><?php _e( 'Address 2', 'give' ); ?></label>
+					<label for="give_address_line2"><?php _e('Address 2', 'give'); ?></label>
 					<input name="give_address_line2" id="give_address_line2" class="text give-input" type="text"
-					       value="<?php echo esc_attr( $address['line2'] ); ?>"/>
+					       value="<?php echo esc_attr($address['line2']); ?>"/>
 				</p>
 
 
 				<p id="give-card-state-wrap"
-				   class="form-row form-row-wide <?php echo ( ! empty( $selected_country ) && array_key_exists( $selected_country, $no_states_country ) ) ? 'give-hidden' : ''; ?>">
-					<label for="give_address_state"><?php _e( 'State / Province / County', 'give' ); ?></label>
+				   class="form-row form-row-wide <?php echo ( ! empty($selected_country) && array_key_exists($selected_country, $no_states_country)) ? 'give-hidden' : ''; ?>">
+					<label for="give_address_state"><?php _e('State / Province / County', 'give'); ?></label>
 					<?php
-					if ( ! empty( $states ) ) : ?>
+					if ( ! empty($states)) : ?>
 						<select
 								name="give_address_state"
 								id="give_address_state"
 								class="give_address_state"
 						<?php
-						foreach ( $states as $state_code => $state ) {
-							echo '<option value="' . $state_code . '"' . selected( $state_code, $selected_state, false ) . '>' . $state . '</option>';
+						foreach ($states as $state_code => $state) {
+							echo '<option value="'.$state_code.'"'.selected($state_code, $selected_state, false).'>'.$state.'</option>';
 						}
 						?>
 						</select>
@@ -194,15 +194,15 @@ 
 				</p>
 
 				<p id="give-card-city-wrap" class="form-row form-row-first form-row-responsive">
-					<label for="give_address_city"><?php _e( 'City', 'give' ); ?></label>
+					<label for="give_address_city"><?php _e('City', 'give'); ?></label>
 					<input name="give_address_city" id="give_address_city" class="text give-input" type="text"
-					       value="<?php echo esc_attr( $address['city'] ); ?>"/>
+					       value="<?php echo esc_attr($address['city']); ?>"/>
 				</p>
 
 				<p id="give-card-zip-wrap" class="form-row form-row-last form-row-responsive">
-					<label for="give_address_zip"><?php _e( 'Zip / Postal Code', 'give' ); ?></label>
+					<label for="give_address_zip"><?php _e('Zip / Postal Code', 'give'); ?></label>
 					<input name="give_address_zip" id="give_address_zip" class="text give-input" type="text"
-					       value="<?php echo esc_attr( $address['zip'] ); ?>"/>
+					       value="<?php echo esc_attr($address['zip']); ?>"/>
 				</p>
 
 				<?php
@@ -213,7 +213,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_address' );
+				do_action('give_profile_editor_address');
 				?>
 
 			</div>
@@ -226,19 +226,19 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_address' );
+			do_action('give_profile_editor_after_address');
 			?>
 
-			<h3 id="give_profile_password_label" class="give-section-break"><?php _e( 'Change your Password', 'give' ); ?></h3>
+			<h3 id="give_profile_password_label" class="give-section-break"><?php _e('Change your Password', 'give'); ?></h3>
 
 			<div id="give_profile_password_wrap" class="give-clearfix">
 				<p id="give_profile_password_wrap_1" class="form-row form-row-first form-row-responsive">
-					<label for="give_new_user_pass1"><?php _e( 'New Password', 'give' ); ?></label>
+					<label for="give_new_user_pass1"><?php _e('New Password', 'give'); ?></label>
 					<input name="give_new_user_pass1" id="give_new_user_pass1" class="password give-input" type="password"/>
 				</p>
 
 				<p id="give_profile_password_wrap_2" class="form-row form-row-last form-row-responsive">
-					<label for="give_new_user_pass2"><?php _e( 'Re-enter Password', 'give' ); ?></label>
+					<label for="give_new_user_pass2"><?php _e('Re-enter Password', 'give'); ?></label>
 					<input name="give_new_user_pass2" id="give_new_user_pass2" class="password give-input" type="password"/>
 					<?php
 					/**
@@ -248,12 +248,12 @@ 
 					 *
 					 * @since 1.0
 					 */
-					do_action( 'give_profile_editor_password' );
+					do_action('give_profile_editor_password');
 					?>
 				</p>
 			</div>
 
-			<p class="give_password_change_notice"><?php _e( 'Please note after changing your password, you must log back in.', 'give' ); ?></p>
+			<p class="give_password_change_notice"><?php _e('Please note after changing your password, you must log back in.', 'give'); ?></p>
 
 			<?php
 			/**
@@ -263,14 +263,14 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_password' );
+			do_action('give_profile_editor_after_password');
 			?>
 
 			<p id="give_profile_submit_wrap">
-				<input type="hidden" name="give_profile_editor_nonce" value="<?php echo wp_create_nonce( 'give-profile-editor-nonce' ); ?>"/>
+				<input type="hidden" name="give_profile_editor_nonce" value="<?php echo wp_create_nonce('give-profile-editor-nonce'); ?>"/>
 				<input type="hidden" name="give_action" value="edit_user_profile"/>
-				<input type="hidden" name="give_redirect" value="<?php echo esc_url( give_get_current_page_url() ); ?>"/>
-				<input name="give_profile_editor_submit" id="give_profile_editor_submit" type="submit" class="give_submit" value="<?php _e( 'Save Changes', 'give' ); ?>"/>
+				<input type="hidden" name="give_redirect" value="<?php echo esc_url(give_get_current_page_url()); ?>"/>
+				<input name="give_profile_editor_submit" id="give_profile_editor_submit" type="submit" class="give_submit" value="<?php _e('Save Changes', 'give'); ?>"/>
 			</p>
 
 		</fieldset>
@@ -285,11 +285,11 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_profile_editor_after' );
+	do_action('give_profile_editor_after');
 	?>
 
 	<?php
 else:
-	_e( 'You need to login to edit your profile.', 'give' );
+	_e('You need to login to edit your profile.', 'give');
 	echo give_login_form();
 endif;

Braces +8 added lines, -3 removed lines

@@ -185,10 +185,13 @@ 
 						}
 						?>
 						</select>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input type="text" size="6" name="give_address_state" id="give_address_state"
 						       class="give_address_state give-input"
-						       placeholder="<?php echo $label; ?>" value="<?php echo $selected_state; ?>"/>
+						       placeholder="<?php echo $label;
+}
+?>" value="<?php echo $selected_state; ?>"/>
 					<?php endif;
 					?>
 				</p>
@@ -289,7 +292,9 @@ 
 	?>
 
 	<?php
-else:
+else {
+	:
 	_e( 'You need to login to edit your profile.', 'give' );
+}
 	echo give_login_form();
 endif;

includes/shortcodes.php

Spacing +103 added lines, -103 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,15 +26,15 @@ 
 function give_donation_history() {
 
 	// If payment_key query arg exists, return receipt instead of donation history.
-	if ( isset( $_GET['payment_key'] ) ) {
+	if (isset($_GET['payment_key'])) {
 		ob_start();
-		echo give_receipt_shortcode( array() );
-		echo '<a href="' . esc_url( give_get_history_page_uri() ) . '">&laquo; ' . __( 'Return to All Donations', 'give' ) . '</a>';
+		echo give_receipt_shortcode(array());
+		echo '<a href="'.esc_url(give_get_history_page_uri()).'">&laquo; '.__('Return to All Donations', 'give').'</a>';
 
 		return ob_get_clean();
 	}
 
-	$email_access = give_get_option( 'email_access' );
+	$email_access = give_get_option('email_access');
 
 	/**
 	 * Determine access
@@ -44,30 +44,30 @@ 
 	 */
 	if (
 		is_user_logged_in() || false !== Give()->session->get_session_expiration()
-		|| ( give_is_setting_enabled( $email_access ) && Give()->email_access->token_exists )
+		|| (give_is_setting_enabled($email_access) && Give()->email_access->token_exists)
 	) {
 		ob_start();
-		give_get_template_part( 'history', 'donations' );
+		give_get_template_part('history', 'donations');
 
 		return ob_get_clean();
 
-	} elseif ( give_is_setting_enabled( $email_access ) ) {
+	} elseif (give_is_setting_enabled($email_access)) {
 		// Is Email-based access enabled?
 		ob_start();
-		give_get_template_part( 'email', 'login-form' );
+		give_get_template_part('email', 'login-form');
 
 		return ob_get_clean();
 
 	} else {
 
-		$output = apply_filters( 'give_donation_history_nonuser_message', Give()->notices->print_frontend_notice( __( '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' ), false ) );
-		$output .= do_shortcode( '[give_login]' );
+		$output = apply_filters('give_donation_history_nonuser_message', Give()->notices->print_frontend_notice(__('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'), false));
+		$output .= do_shortcode('[give_login]');
 
 		return $output;
 	}
 }
 
-add_shortcode( 'donation_history', 'give_donation_history' );
+add_shortcode('donation_history', 'give_donation_history');
 
 /**
  * Donation Form Shortcode
@@ -80,8 +80,8 @@ 
  *
  * @return string
  */
-function give_form_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_form_shortcode($atts) {
+	$atts = shortcode_atts(array(
 		'id'                    => '',
 		'show_title'            => true,
 		'show_goal'             => true,
@@ -89,21 +89,21 @@ 
 		'float_labels'          => '',
 		'display_style'         => '',
 		'continue_button_title' => '',
-	), $atts, 'give_form' );
+	), $atts, 'give_form');
 
 	// Convert string to bool.
-	$atts['show_title'] = filter_var( $atts['show_title'], FILTER_VALIDATE_BOOLEAN );
-	$atts['show_goal']  = filter_var( $atts['show_goal'], FILTER_VALIDATE_BOOLEAN );
+	$atts['show_title'] = filter_var($atts['show_title'], FILTER_VALIDATE_BOOLEAN);
+	$atts['show_goal']  = filter_var($atts['show_goal'], FILTER_VALIDATE_BOOLEAN);
 
 	//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.
@@ -116,37 +116,37 @@ 
  *
  * @return string
  */
-function give_goal_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_goal_shortcode($atts) {
+	$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()->notices->print_frontend_notice( __( 'The shortcode is missing Donation Form ID attribute.', 'give' ), true );
+	if (empty($atts['id'])) {
+		Give()->notices->print_frontend_notice(__('The shortcode is missing Donation Form ID attribute.', 'give'), true);
 	}
 
 	//Sanity check 2: Check the form even has Goals enabled.
-	if ( ! give_is_setting_enabled( give_get_meta( $atts['id'], '_give_goal_option', true ) ) ) {
+	if ( ! give_is_setting_enabled(give_get_meta($atts['id'], '_give_goal_option', true))) {
 
-		Give()->notices->print_frontend_notice( __( 'The form does not have Goals enabled.', 'give' ), true );
+		Give()->notices->print_frontend_notice(__('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');
 
 
 /**
@@ -163,22 +163,22 @@ 
  *
  * @return string
  */
-function give_login_form_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_login_form_shortcode($atts) {
+	$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.
@@ -193,15 +193,15 @@ 
  *
  * @return string
  */
-function give_register_form_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_register_form_shortcode($atts) {
+	$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');
 
 /**
  * Receipt Shortcode.
@@ -214,12 +214,12 @@ 
  *
  * @return string
  */
-function give_receipt_shortcode( $atts ) {
+function give_receipt_shortcode($atts) {
 
 	global $give_receipt_args, $payment;
 
-	$give_receipt_args = shortcode_atts( array(
-		'error'          => __( 'You are missing the payment key to view this donation receipt.', 'give' ),
+	$give_receipt_args = shortcode_atts(array(
+		'error'          => __('You are missing the payment key to view this donation receipt.', 'give'),
 		'price'          => true,
 		'donor'          => true,
 		'date'           => true,
@@ -228,50 +228,50 @@ 
 		'payment_id'     => true,
 		'payment_status' => false,
 		'status_notice'  => 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 ) && give_is_setting_enabled( $email_access ) && ! Give()->email_access->token_exists ) {
+	if ( ! isset($payment_key) && give_is_setting_enabled($email_access) && ! 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()->notices->print_frontend_notice( $give_receipt_args['error'], false, 'error' );
+		return Give()->notices->print_frontend_notice($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 && give_is_setting_enabled( $email_access ) && ! Give()->email_access->token_exists ) {
+	if ( ! $user_can_view && give_is_setting_enabled($email_access) && ! 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;
 
@@ -279,9 +279,9 @@ 
 
 		ob_start();
 
-		Give()->notices->print_frontend_notice( apply_filters( 'give_must_be_logged_in_error_message', __( 'You must be logged in to view this donation receipt.', 'give' ) ) );
+		Give()->notices->print_frontend_notice(apply_filters('give_must_be_logged_in_error_message', __('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();
 
@@ -295,20 +295,20 @@ 
 	 * or if user is logged out and donation was made as a guest, the donation session is checked for
 	 * 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()->notices->print_frontend_notice( $give_receipt_args['error'], false, 'error' );
+	if ( ! apply_filters('give_user_can_view_receipt', $user_can_view, $give_receipt_args)) {
+		return Give()->notices->print_frontend_notice($give_receipt_args['error'], false, 'error');
 	}
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'receipt' );
+	give_get_template_part('shortcode', 'receipt');
 
 	$display = ob_get_clean();
 
 	return $display;
 }
 
-add_shortcode( 'give_receipt', 'give_receipt_shortcode' );
+add_shortcode('give_receipt', 'give_receipt_shortcode');
 
 /**
  * Profile Editor Shortcode.
@@ -327,25 +327,25 @@ 
  *
  * @return string Output generated from the profile editor
  */
-function give_profile_editor_shortcode( $atts ) {
+function give_profile_editor_shortcode($atts) {
 
 	ob_start();
 
 	// Restrict access to donor profile, if donor and user are disconnected.
-	$is_donor_disconnected = get_user_meta( get_current_user_id(), '_give_is_donor_disconnected', true );
-	if( is_user_logged_in() && $is_donor_disconnected ) {
-		Give()->notices->print_frontend_notice( __( 'Your Donor and User profile are no longer connected. Please contact the site administrator.', 'give' ), true, 'error' );
+	$is_donor_disconnected = get_user_meta(get_current_user_id(), '_give_is_donor_disconnected', true);
+	if (is_user_logged_in() && $is_donor_disconnected) {
+		Give()->notices->print_frontend_notice(__('Your Donor and User profile are no longer connected. Please contact the site administrator.', 'give'), true, 'error');
 		return false;
 	}
 
-	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.
@@ -358,30 +358,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,
@@ -409,40 +409,40 @@ 
 	 * @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);
 
 	// Make sure to validate passwords for existing Donors
-	give_validate_user_password( $data['give_new_user_pass1'], $data['give_new_user_pass2'] );
+	give_validate_user_password($data['give_new_user_pass1'], $data['give_new_user_pass2']);
 
-	if ( empty( $email ) ) {
+	if (empty($email)) {
 		// Make sure email should not be empty.
-		give_set_error( 'email_empty', __( 'The email you entered is empty.', 'give' ) );
+		give_set_error('email_empty', __('The email you entered is empty.', 'give'));
 
-	} else if ( ! is_email( $email ) ) {
+	} else if ( ! is_email($email)) {
 		// Make sure email should be valid.
-		give_set_error( 'email_not_valid', __( 'The email you entered is not valid. Please use another', 'give' ) );
+		give_set_error('email_not_valid', __('The email you entered is not valid. Please use another', 'give'));
 
-	} else if ( $email != $old_user_data->user_email ) {
+	} else if ($email != $old_user_data->user_email) {
 		// Make sure the new email doesn't belong to another user
-		if ( email_exists( $email ) ) {
-			give_set_error( 'email_exists', __( 'The email you entered belongs to another user. Please use another.', 'give' ) );
+		if (email_exists($email)) {
+			give_set_error('email_exists', __('The email you entered belongs to another user. Please use another.', 'give'));
 		}
 	}
 
 	// Check for errors
 	$errors = give_get_errors();
 
-	if ( $errors ) {
+	if ($errors) {
 		// Send back to the profile editor if there are errors
-		wp_redirect( $data['give_redirect'] );
+		wp_redirect($data['give_redirect']);
 		give_die();
 	}
 
 	// Update the user
-	$meta    = update_user_meta( $user_id, '_give_user_address', $address );
-	$updated = wp_update_user( $userdata );
+	$meta    = update_user_meta($user_id, '_give_user_address', $address);
+	$updated = wp_update_user($userdata);
 
-	if ( $updated ) {
+	if ($updated) {
 
 		/**
 		 * Fires after updating user profile.
@@ -452,12 +452,12 @@ 
 		 * @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/class-notices.php

Spacing +95 added lines, -95 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -53,21 +53,21 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_notices', array( $this, 'render_admin_notices' ), 999 );
-		add_action( 'give_dismiss_notices', array( $this, 'dismiss_notices' ) );
+		add_action('admin_notices', array($this, 'render_admin_notices'), 999);
+		add_action('give_dismiss_notices', array($this, 'dismiss_notices'));
 
-		add_action( 'give_frontend_notices', array( $this, 'render_frontend_notices' ), 999 );
-		add_action( 'give_donation_form_before_personal_info', array( $this, 'render_frontend_notices' ) );
-		add_action( 'give_ajax_donation_errors', array( $this, 'render_frontend_notices' ) );
+		add_action('give_frontend_notices', array($this, 'render_frontend_notices'), 999);
+		add_action('give_donation_form_before_personal_info', array($this, 'render_frontend_notices'));
+		add_action('give_ajax_donation_errors', array($this, 'render_frontend_notices'));
 
 		/**
 		 * Backward compatibility for deprecated params.
 		 *
 		 * @since 1.8.14
 		 */
-		add_filter( 'give_register_notice_args', array( $this, 'bc_deprecated_params' ) );
-		add_filter( 'give_frontend_errors_args', array( $this, 'bc_deprecated_params' ) );
-		add_filter( 'give_frontend_notice_args', array( $this, 'bc_deprecated_params' ) );
+		add_filter('give_register_notice_args', array($this, 'bc_deprecated_params'));
+		add_filter('give_frontend_errors_args', array($this, 'bc_deprecated_params'));
+		add_filter('give_frontend_notice_args', array($this, 'bc_deprecated_params'));
 	}
 
 	/**
@@ -80,19 +80,19 @@ 
 	 *
 	 * @return array
 	 */
-	public function bc_deprecated_params( $args ) {
+	public function bc_deprecated_params($args) {
 		/**
 		 *  Param: auto_dismissible
 		 *  deprecated in 1.8.14
 		 *
 		 *  Check if auto_dismissible is set and it true then unset and change dismissible parameter value to auto
 		 */
-		if ( isset( $args['auto_dismissible'] ) ) {
-			if ( ! empty( $args['auto_dismissible'] ) ) {
+		if (isset($args['auto_dismissible'])) {
+			if ( ! empty($args['auto_dismissible'])) {
 				$args['dismissible'] = 'auto';
 			}
 			// unset auto_dismissible as it has been deprecated.
-			unset( $args['auto_dismissible'] );
+			unset($args['auto_dismissible']);
 		}
 
 		return $args;
@@ -108,9 +108,9 @@ 
 	 *
 	 * @return bool
 	 */
-	public function register_notice( $notice_args ) {
+	public function register_notice($notice_args) {
 		// Bailout.
-		if ( empty( $notice_args['id'] ) || array_key_exists( $notice_args['id'], self::$notices ) ) {
+		if (empty($notice_args['id']) || array_key_exists($notice_args['id'], self::$notices)) {
 			return false;
 		}
 
@@ -148,39 +148,39 @@ 
 		 *
 		 * @since 1.8.14
 		 */
-		$notice_args = apply_filters( 'give_register_notice_args', $notice_args );
+		$notice_args = apply_filters('give_register_notice_args', $notice_args);
 
 		// Set extra dismiss links if any.
-		if ( false !== strpos( $notice_args['description'], 'data-dismiss-interval' ) ) {
+		if (false !== strpos($notice_args['description'], 'data-dismiss-interval')) {
 
-			preg_match_all( "/data-([^\"]*)=\"([^\"]*)\"/", $notice_args['description'], $extra_notice_dismiss_link );
+			preg_match_all("/data-([^\"]*)=\"([^\"]*)\"/", $notice_args['description'], $extra_notice_dismiss_link);
 
-			if ( ! empty( $extra_notice_dismiss_link ) ) {
-				$extra_notice_dismiss_links = array_chunk( current( $extra_notice_dismiss_link ), 3 );
-				foreach ( $extra_notice_dismiss_links as $extra_notice_dismiss_link ) {
+			if ( ! empty($extra_notice_dismiss_link)) {
+				$extra_notice_dismiss_links = array_chunk(current($extra_notice_dismiss_link), 3);
+				foreach ($extra_notice_dismiss_links as $extra_notice_dismiss_link) {
 					// Create array og key ==> value by parsing query string created after renaming data attributes.
-					$data_attribute_query_str = str_replace( array( 'data-', '-', '"' ), array(
+					$data_attribute_query_str = str_replace(array('data-', '-', '"'), array(
 						'',
 						'_',
 						'',
-					), implode( '&', $extra_notice_dismiss_link ) );
+					), implode('&', $extra_notice_dismiss_link));
 
-					$notice_args['extra_links'][] = wp_parse_args( $data_attribute_query_str );
+					$notice_args['extra_links'][] = wp_parse_args($data_attribute_query_str);
 				}
 			}
 		}
 
 
-		self::$notices[ $notice_args['id'] ] = $notice_args;
+		self::$notices[$notice_args['id']] = $notice_args;
 
 		// Auto set show param if not already set.
-		if ( ! isset( self::$notices[ $notice_args['id'] ]['show'] ) ) {
-			self::$notices[ $notice_args['id'] ]['show'] = $this->is_notice_dismissed( $notice_args ) ? false : true;
+		if ( ! isset(self::$notices[$notice_args['id']]['show'])) {
+			self::$notices[$notice_args['id']]['show'] = $this->is_notice_dismissed($notice_args) ? false : true;
 		}
 
 		// Auto set time interval for shortly.
-		if ( 'shortly' === self::$notices[ $notice_args['id'] ]['dismiss_interval'] ) {
-			self::$notices[ $notice_args['id'] ]['dismiss_interval_time'] = DAY_IN_SECONDS;
+		if ('shortly' === self::$notices[$notice_args['id']]['dismiss_interval']) {
+			self::$notices[$notice_args['id']]['dismiss_interval_time'] = DAY_IN_SECONDS;
 		}
 
 		return true;
@@ -194,44 +194,44 @@ 
 	 */
 	public function render_admin_notices() {
 		// Bailout.
-		if ( empty( self::$notices ) ) {
+		if (empty(self::$notices)) {
 			return;
 		}
 
 		$output = '';
 
-		foreach ( self::$notices as $notice_id => $notice ) {
+		foreach (self::$notices as $notice_id => $notice) {
 			// Check flag set to true to show notice.
-			if ( ! $notice['show'] ) {
+			if ( ! $notice['show']) {
 				continue;
 			}
 
 			// Check if notice dismissible or not.
-			if ( ! self::$has_auto_dismissible_notice ) {
-				self::$has_auto_dismissible_notice = ( 'auto' === $notice['dismissible'] );
+			if ( ! self::$has_auto_dismissible_notice) {
+				self::$has_auto_dismissible_notice = ('auto' === $notice['dismissible']);
 			}
 
 			// Check if notice dismissible or not.
-			if ( ! self::$has_dismiss_interval_notice ) {
+			if ( ! self::$has_dismiss_interval_notice) {
 				self::$has_dismiss_interval_notice = $notice['dismiss_interval'];
 			}
 
-			$css_id = ( false === strpos( $notice['id'], 'give' ) ? "give-{$notice['id']}" : $notice['id'] );
+			$css_id = (false === strpos($notice['id'], 'give') ? "give-{$notice['id']}" : $notice['id']);
 
-			$css_class = 'give-notice notice ' . ( empty( $notice['dismissible'] ) ? 'non' : 'is' ) . "-dismissible {$notice['type']} notice-{$notice['type']}";
-			$output    .= sprintf(
-				'<div id="%1$s" class="%2$s" data-dismissible="%3$s" data-dismissible-type="%4$s" data-dismiss-interval="%5$s" data-notice-id="%6$s" data-security="%7$s" data-dismiss-interval-time="%8$s">' . " \n",
+			$css_class = 'give-notice notice '.(empty($notice['dismissible']) ? 'non' : 'is')."-dismissible {$notice['type']} notice-{$notice['type']}";
+			$output .= sprintf(
+				'<div id="%1$s" class="%2$s" data-dismissible="%3$s" data-dismissible-type="%4$s" data-dismiss-interval="%5$s" data-notice-id="%6$s" data-security="%7$s" data-dismiss-interval-time="%8$s">'." \n",
 				$css_id,
 				$css_class,
-				give_clean( $notice['dismissible'] ),
+				give_clean($notice['dismissible']),
 				$notice['dismissible_type'],
 				$notice['dismiss_interval'],
 				$notice['id'],
-				empty( $notice['dismissible_type'] ) ? '' : wp_create_nonce( "give_edit_{$notice_id}_notice" ),
+				empty($notice['dismissible_type']) ? '' : wp_create_nonce("give_edit_{$notice_id}_notice"),
 				$notice['dismiss_interval_time']
 			);
 
-			$output .= ( 0 === strpos( $notice['description'], '<div' ) || 0 === strpos( $notice['description'], '<p' ) ? $notice['description'] : "<p>{$notice['description']}</p>" );
+			$output .= (0 === strpos($notice['description'], '<div') || 0 === strpos($notice['description'], '<p') ? $notice['description'] : "<p>{$notice['description']}</p>");
 			$output .= "</div> \n";
 		}
 
@@ -249,18 +249,18 @@ 
 	 *
 	 * @param int $form_id
 	 */
-	public function render_frontend_notices( $form_id = 0 ) {
+	public function render_frontend_notices($form_id = 0) {
 		$errors = give_get_errors();
 
-		$request_form_id = isset( $_REQUEST['form-id'] ) ? absint( $_REQUEST['form-id'] ) : 0;
+		$request_form_id = isset($_REQUEST['form-id']) ? absint($_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 ) {
-			self::print_frontend_errors( $errors );
+		if ($errors) {
+			self::print_frontend_errors($errors);
 
 			give_clear_errors();
 		}
@@ -273,7 +273,7 @@ 
 	 * @access private
 	 */
 	private function print_js() {
-		if ( self::$has_auto_dismissible_notice ) :
+		if (self::$has_auto_dismissible_notice) :
 			?>
 			<script>
 				jQuery(document).ready(function () {
@@ -289,7 +289,7 @@ 
 			<?php
 		endif;
 
-		if ( self::$has_dismiss_interval_notice ) :
+		if (self::$has_dismiss_interval_notice) :
 			?>
 			<script>
 				jQuery(document).ready(function () {
@@ -355,29 +355,29 @@ 
 	 * @access public
 	 */
 	public function dismiss_notices() {
-		$_post     = give_clean( $_POST );
-		$notice_id = esc_attr( $_post['notice_id'] );
+		$_post     = give_clean($_POST);
+		$notice_id = esc_attr($_post['notice_id']);
 
 		// Bailout.
 		if (
-			empty( $notice_id ) ||
-			empty( $_post['dismissible_type'] ) ||
-			empty( $_post['dismiss_interval'] ) ||
-			! check_ajax_referer( "give_edit_{$notice_id}_notice", '_wpnonce' )
+			empty($notice_id) ||
+			empty($_post['dismissible_type']) ||
+			empty($_post['dismiss_interval']) ||
+			! check_ajax_referer("give_edit_{$notice_id}_notice", '_wpnonce')
 		) {
 			wp_send_json_error();
 		}
 
-		$notice_key = Give()->notices->get_notice_key( $notice_id, $_post['dismiss_interval'] );
-		if ( 'user' === $_post['dismissible_type'] ) {
+		$notice_key = Give()->notices->get_notice_key($notice_id, $_post['dismiss_interval']);
+		if ('user' === $_post['dismissible_type']) {
 			$current_user = wp_get_current_user();
-			$notice_key   = Give()->notices->get_notice_key( $notice_id, $_post['dismiss_interval'], $current_user->ID );
+			$notice_key   = Give()->notices->get_notice_key($notice_id, $_post['dismiss_interval'], $current_user->ID);
 		}
 
-		$notice_dismiss_time = ! empty( $_post['dismiss_interval_time'] ) ? $_post['dismiss_interval_time'] : null;
+		$notice_dismiss_time = ! empty($_post['dismiss_interval_time']) ? $_post['dismiss_interval_time'] : null;
 
 		// Save option to hide notice.
-		Give_Cache::set( $notice_key, true, $notice_dismiss_time, true );
+		Give_Cache::set($notice_key, true, $notice_dismiss_time, true);
 
 		wp_send_json_success();
 	}
@@ -395,18 +395,18 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_notice_key( $notice_id, $dismiss_interval = null, $user_id = 0 ) {
+	public function get_notice_key($notice_id, $dismiss_interval = null, $user_id = 0) {
 		$notice_key = "_give_notice_{$notice_id}";
 
-		if ( ! empty( $dismiss_interval ) ) {
+		if ( ! empty($dismiss_interval)) {
 			$notice_key .= "_{$dismiss_interval}";
 		}
 
-		if ( $user_id ) {
+		if ($user_id) {
 			$notice_key .= "_{$user_id}";
 		}
 
-		$notice_key = sanitize_key( $notice_key );
+		$notice_key = sanitize_key($notice_key);
 
 		return $notice_key;
 	}
@@ -419,11 +419,11 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_dismiss_link( $notice_args ) {
+	public function get_dismiss_link($notice_args) {
 		$notice_args = wp_parse_args(
 			$notice_args,
 			array(
-				'title'                 => __( 'Click here', 'give' ),
+				'title'                 => __('Click here', 'give'),
 				'dismissible_type'      => '',
 				'dismiss_interval'      => '',
 				'dismiss_interval_time' => null,
@@ -450,31 +450,31 @@ 
 	 *
 	 * @return bool|null
 	 */
-	public function is_notice_dismissed( $notice ) {
-		$notice_key          = $this->get_notice_key( $notice['id'], $notice['dismiss_interval'] );
+	public function is_notice_dismissed($notice) {
+		$notice_key          = $this->get_notice_key($notice['id'], $notice['dismiss_interval']);
 		$is_notice_dismissed = false;
 
-		if ( 'user' === $notice['dismissible_type'] ) {
+		if ('user' === $notice['dismissible_type']) {
 			$current_user = wp_get_current_user();
-			$notice_key   = Give()->notices->get_notice_key( $notice['id'], $notice['dismiss_interval'], $current_user->ID );
+			$notice_key   = Give()->notices->get_notice_key($notice['id'], $notice['dismiss_interval'], $current_user->ID);
 		}
 
-		$notice_data = Give_Cache::get( $notice_key, true );
+		$notice_data = Give_Cache::get($notice_key, true);
 
 		// Find notice dismiss link status if notice has extra dismissible links.
-		if ( ( empty( $notice_data ) || is_wp_error( $notice_data ) ) && ! empty( $notice['extra_links'] ) ) {
+		if ((empty($notice_data) || is_wp_error($notice_data)) && ! empty($notice['extra_links'])) {
 
-			foreach ( $notice['extra_links'] as $extra_link ) {
-				$new_notice_data = wp_parse_args( $extra_link, $notice );
-				unset( $new_notice_data['extra_links'] );
+			foreach ($notice['extra_links'] as $extra_link) {
+				$new_notice_data = wp_parse_args($extra_link, $notice);
+				unset($new_notice_data['extra_links']);
 
-				if ( $is_notice_dismissed = $this->is_notice_dismissed( $new_notice_data ) ) {
+				if ($is_notice_dismissed = $this->is_notice_dismissed($new_notice_data)) {
 					return $is_notice_dismissed;
 				}
 			}
 		}
 
-		$is_notice_dismissed = ! empty( $notice_data ) && ! is_wp_error( $notice_data );
+		$is_notice_dismissed = ! empty($notice_data) && ! is_wp_error($notice_data);
 
 		return $is_notice_dismissed;
 	}
@@ -488,9 +488,9 @@ 
 	 *
 	 * @param array $errors
 	 */
-	public static function print_frontend_errors( $errors ) {
+	public static function print_frontend_errors($errors) {
 		// Bailout.
-		if ( ! $errors ) {
+		if ( ! $errors) {
 			return;
 		}
 
@@ -505,37 +505,37 @@ 
 		);
 
 		// Note: we will remove give_errors class in future.
-		$classes = apply_filters( 'give_error_class', array( 'give_notices', 'give_errors' ) );
+		$classes = apply_filters('give_error_class', array('give_notices', 'give_errors'));
 
-		echo sprintf( '<div class="%s">', implode( ' ', $classes ) );
+		echo sprintf('<div class="%s">', implode(' ', $classes));
 
 		// Loop error codes and display errors.
-		foreach ( $errors as $error_id => $error ) {
+		foreach ($errors as $error_id => $error) {
 			// Backward compatibility v<1.8.11
-			if ( is_string( $error ) ) {
+			if (is_string($error)) {
 				$error = array(
 					'message'     => $error,
 					'notice_args' => array(),
 				);
 			}
 
-			$notice_args = wp_parse_args( $error['notice_args'], $default_notice_args );
+			$notice_args = wp_parse_args($error['notice_args'], $default_notice_args);
 
 			/**
 			 * Filter to modify Frontend Errors args before errors is display.
 			 *
 			 * @since 1.8.14
 			 */
-			$notice_args = apply_filters( 'give_frontend_errors_args', $notice_args );
+			$notice_args = apply_filters('give_frontend_errors_args', $notice_args);
 
 			echo sprintf(
 				'<div class="give_error give_notice" id="give_error_%1$s" data-dismissible="%2$s" data-dismiss-interval="%3$d">
 						<p><strong>%4$s</strong>: %5$s</p>
 					</div>',
 				$error_id,
-				give_clean( $notice_args['dismissible'] ),
-				absint( $notice_args['dismiss_interval'] ),
-				esc_html__( 'Error', 'give' ),
+				give_clean($notice_args['dismissible']),
+				absint($notice_args['dismiss_interval']),
+				esc_html__('Error', 'give'),
 				$error['message']
 			);
 		}
@@ -557,8 +557,8 @@ 
 	 *
 	 * @return  string
 	 */
-	public static function print_frontend_notice( $message, $echo = true, $notice_type = 'warning', $notice_args = array() ) {
-		if ( empty( $message ) ) {
+	public static function print_frontend_notice($message, $echo = true, $notice_type = 'warning', $notice_args = array()) {
+		if (empty($message)) {
 			return '';
 		}
 
@@ -572,14 +572,14 @@ 
 			'dismiss_interval' => 5000,
 		);
 
-		$notice_args = wp_parse_args( $notice_args, $default_notice_args );
+		$notice_args = wp_parse_args($notice_args, $default_notice_args);
 
 		/**
 		 * Filter to modify Frontend notice args before notices is display.
 		 *
 		 * @since 1.8.14
 		 */
-		$notice_args = apply_filters( 'give_frontend_notice_args', $notice_args );
+		$notice_args = apply_filters('give_frontend_notice_args', $notice_args);
 
 		// Note: we will remove give_errors class in future.
 		$error = sprintf(
@@ -589,12 +589,12 @@ 
 				</p>
 			</div>',
 			$notice_type,
-			give_clean( $notice_args['dismissible'] ),
-			absint( $notice_args['dismiss_interval'] ),
+			give_clean($notice_args['dismissible']),
+			absint($notice_args['dismiss_interval']),
 			$message
 		);
 
-		if ( ! $echo ) {
+		if ( ! $echo) {
 			return $error;
 		}
 

includes/donors/class-give-donors-query.php

Spacing +46 added lines, -47 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -85,7 +85,7 @@ 
 	 *
 	 * @param  $args array The array of arguments that can be passed in and used for setting up this payment query.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		$defaults = array(
 			'number'     => 20,
 			'offset'     => 0,
@@ -103,7 +103,7 @@ 
 			// 'form'       => array(),
 		);
 
-		$this->args = wp_parse_args( $args, $defaults );
+		$this->args = wp_parse_args($args, $defaults);
 
 		$this->table_name      = Give()->donors->table_name;
 		$this->meta_table_name = Give()->donor_meta->table_name;
@@ -146,12 +146,12 @@ 
 		 *
 		 * @param Give_Donors_Query $this Donors query object.
 		 */
-		do_action( 'give_pre_get_donors', $this );
+		do_action('give_pre_get_donors', $this);
 
-		if ( empty( $this->args['count'] ) ) {
-			$this->donors = $wpdb->get_results( $this->get_sql() );
+		if (empty($this->args['count'])) {
+			$this->donors = $wpdb->get_results($this->get_sql());
 		} else {
-			$this->donors = $wpdb->get_var( $this->get_sql() );
+			$this->donors = $wpdb->get_var($this->get_sql());
 		}
 
 		/**
@@ -161,7 +161,7 @@ 
 		 *
 		 * @param Give_Donors_Query $this Donors query object.
 		 */
-		do_action( 'give_post_get_donors', $this );
+		do_action('give_post_get_donors', $this);
 
 		return $this->donors;
 	}
@@ -178,7 +178,7 @@ 
 	public function get_sql() {
 		global $wpdb;
 
-		if ( $this->args['number'] < 1 ) {
+		if ($this->args['number'] < 1) {
 			$this->args['number'] = 999999999999;
 		}
 
@@ -186,22 +186,22 @@ 
 
 
 		// Set offset.
-		if ( empty( $this->args['offset'] ) && ( 0 < $this->args['paged'] ) ) {
-			$this->args['offset'] = $this->args['number'] * ( $this->args['paged'] - 1 );
+		if (empty($this->args['offset']) && (0 < $this->args['paged'])) {
+			$this->args['offset'] = $this->args['number'] * ($this->args['paged'] - 1);
 		}
 
 		// Set fields.
 		$fields = "{$this->table_name}.*";
-		if ( ! empty( $this->args['fields'] ) && 'all' !== $this->args['fields'] ) {
-			if ( is_string( $this->args['fields'] ) ) {
+		if ( ! empty($this->args['fields']) && 'all' !== $this->args['fields']) {
+			if (is_string($this->args['fields'])) {
 				$fields = "{$this->table_name}.{$this->args['fields']}";
-			} else if ( is_array( $this->args['fields'] ) ) {
-				$fields = "{$this->table_name}." . implode( " , {$this->table_name}.", $this->args['fields'] );
+			} else if (is_array($this->args['fields'])) {
+				$fields = "{$this->table_name}.".implode(" , {$this->table_name}.", $this->args['fields']);
 			}
 		}
 
 		// Set count.
-		if ( ! empty( $this->args['count'] ) ) {
+		if ( ! empty($this->args['count'])) {
 			$fields = "COUNT({$this->table_name}.id)";
 		}
 
@@ -209,8 +209,8 @@ 
 
 		return $wpdb->prepare(
 			"SELECT {$fields} FROM {$this->table_name} {$where} {$orderby} {$this->args['order']} LIMIT %d,%d;",
-			absint( $this->args['offset'] ),
-			absint( $this->args['number'] )
+			absint($this->args['offset']),
+			absint($this->args['number'])
 		);
 	}
 
@@ -227,14 +227,14 @@ 
 		$where = '';
 
 		// Get sql query for meta.
-		if ( ! empty( $this->args['meta_query'] ) ) {
-			$meta_query_object = new WP_Meta_Query( $this->args['meta_query'] );
+		if ( ! empty($this->args['meta_query'])) {
+			$meta_query_object = new WP_Meta_Query($this->args['meta_query']);
 			$meta_query        = $meta_query_object->get_sql(
 				$this->meta_type,
 				$this->table_name,
 				'id'
 			);
-			$where             = implode( '', $meta_query );
+			$where = implode('', $meta_query);
 		}
 
 		$where .= 'WHERE 1=1';
@@ -261,17 +261,17 @@ 
 
 		$where = '';
 
-		if ( ! empty( $this->args['email'] ) ) {
+		if ( ! empty($this->args['email'])) {
 
-			if ( is_array( $this->args['email'] ) ) {
+			if (is_array($this->args['email'])) {
 
-				$emails_count       = count( $this->args['email'] );
-				$emails_placeholder = array_fill( 0, $emails_count, '%s' );
-				$emails             = implode( ', ', $emails_placeholder );
+				$emails_count       = count($this->args['email']);
+				$emails_placeholder = array_fill(0, $emails_count, '%s');
+				$emails             = implode(', ', $emails_placeholder);
 
-				$where .= $wpdb->prepare( " AND {$this->table_name}.email IN( $emails ) ", $this->args['email'] );
+				$where .= $wpdb->prepare(" AND {$this->table_name}.email IN( $emails ) ", $this->args['email']);
 			} else {
-				$where .= $wpdb->prepare( " AND {$this->table_name}.email = %s ", $this->args['email'] );
+				$where .= $wpdb->prepare(" AND {$this->table_name}.email = %s ", $this->args['email']);
 			}
 		}
 
@@ -291,11 +291,11 @@ 
 		$where = '';
 
 		// Specific donors.
-		if ( ! empty( $this->args['donor'] ) ) {
-			if ( ! is_array( $this->args['donor'] ) ) {
-				$this->args['donor'] = explode( ',', $this->args['donor'] );
+		if ( ! empty($this->args['donor'])) {
+			if ( ! is_array($this->args['donor'])) {
+				$this->args['donor'] = explode(',', $this->args['donor']);
 			}
-			$log_ids = implode( ',', array_map( 'intval', $this->args['donor'] ) );
+			$log_ids = implode(',', array_map('intval', $this->args['donor']));
 
 			$where .= " AND {$this->table_name}.id IN( {$log_ids} ) ";
 		}
@@ -316,7 +316,7 @@ 
 		$where = '';
 
 		// Donors created for a specific date or in a date range
-		if ( ! empty( $this->args['date_query'] ) ) {
+		if ( ! empty($this->args['date_query'])) {
 			$date_query_object = new WP_Date_Query(
 				$this->args['date_query'],
 				"{$this->table_name}.date_created"
@@ -341,11 +341,11 @@ 
 		$where = '';
 
 		// Donors created for a specific date or in a date range
-		if ( ! empty( $this->args['s'] ) && false !== strpos( $this->args['s'], ':' ) ) {
-			$search_parts = explode( ':', $this->args['s'] );
+		if ( ! empty($this->args['s']) && false !== strpos($this->args['s'], ':')) {
+			$search_parts = explode(':', $this->args['s']);
 
-			if ( ! empty( $search_parts[0] ) ) {
-				switch ( $search_parts[0] ) {
+			if ( ! empty($search_parts[0])) {
+				switch ($search_parts[0]) {
 					case 'name':
 						$where = " AND {$this->table_name}.name LIKE '%{$search_parts[1]}%' ";
 						break;
@@ -373,11 +373,11 @@ 
 		$where = '';
 
 		// Donors create for specific wp user.
-		if ( ! empty( $this->args['user'] ) ) {
-			if ( ! is_array( $this->args['user'] ) ) {
-				$this->args['user'] = explode( ',', $this->args['user'] );
+		if ( ! empty($this->args['user'])) {
+			if ( ! is_array($this->args['user'])) {
+				$this->args['user'] = explode(',', $this->args['user']);
 			}
-			$user_ids = implode( ',', array_map( 'intval', $this->args['user'] ) );
+			$user_ids = implode(',', array_map('intval', $this->args['user']));
 
 			$where .= " AND {$this->table_name}.user_id IN( {$user_ids} ) ";
 		}
@@ -396,14 +396,13 @@ 
 	private function get_order_query() {
 		$table_columns = Give()->donors->get_columns();
 
-		$this->args['orderby'] = ! array_key_exists( $this->args['orderby'], $table_columns ) ?
-			'id' :
-			$this->args['orderby'];
+		$this->args['orderby'] = ! array_key_exists($this->args['orderby'], $table_columns) ?
+			'id' : $this->args['orderby'];
 
-		$this->args['orderby'] = esc_sql( $this->args['orderby'] );
-		$this->args['order']   = esc_sql( $this->args['order'] );
+		$this->args['orderby'] = esc_sql($this->args['orderby']);
+		$this->args['order']   = esc_sql($this->args['order']);
 
-		switch ( $table_columns[ $this->args['orderby'] ] ) {
+		switch ($table_columns[$this->args['orderby']]) {
 			case '%d':
 			case '%f':
 				$query = "ORDER BY {$this->table_name}.{$this->args['orderby']}+0";

includes/emails/functions.php

Spacing +130 added lines, -130 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,11 +26,11 @@ 
  *
  * @return void
  */
-function give_email_donation_receipt( $payment_id, $admin_notice = true ) {
+function give_email_donation_receipt($payment_id, $admin_notice = true) {
 
-	$payment_data = give_get_payment_meta( $payment_id );
+	$payment_data = give_get_payment_meta($payment_id);
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
 
 	/**
 	 * Filters the from name.
@@ -40,9 +40,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	$from_name = apply_filters( 'give_donation_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = apply_filters('give_donation_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
 
 	/**
 	 * Filters the from email.
@@ -52,19 +52,19 @@ 
 	 *
 	 * @since 1.0
 	 */
-	$from_email = apply_filters( 'give_donation_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = apply_filters('give_donation_from_address', $from_email, $payment_id, $payment_data);
 
-	$to_email = give_get_payment_user_email( $payment_id );
+	$to_email = give_get_payment_user_email($payment_id);
 
-	$subject = give_get_option( 'donation_subject', __( 'Donation Receipt', 'give' ) );
+	$subject = give_get_option('donation_subject', __('Donation Receipt', 'give'));
 
 	/**
 	 * Filters the donation email receipt subject.
 	 *
 	 * @since 1.0
 	 */
-	$subject = apply_filters( 'give_donation_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = apply_filters('give_donation_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
 	/**
 	 * Filters the donation email receipt attachments. By default, there is no attachment but plugins can hook in to provide one more multiple for the donor. Examples would be a printable ticket or PDF receipt.
@@ -74,14 +74,14 @@ 
 	 *
 	 * @since 1.0
 	 */
-	$attachments = apply_filters( 'give_receipt_attachments', array(), $payment_id, $payment_data );
-	$message     = give_do_email_tags( give_get_email_body_content( $payment_id, $payment_data ), $payment_id );
+	$attachments = apply_filters('give_receipt_attachments', array(), $payment_id, $payment_data);
+	$message     = give_do_email_tags(give_get_email_body_content($payment_id, $payment_data), $payment_id);
 
 	$emails = Give()->emails;
 
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', __( 'Donation Receipt', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', __('Donation Receipt', 'give'));
 
 	/**
 	 * Filters the donation receipt's email headers.
@@ -91,14 +91,14 @@ 
 	 *
 	 * @since 1.0
 	 */
-	$headers = apply_filters( 'give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data );
-	$emails->__set( 'headers', $headers );
+	$headers = apply_filters('give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data);
+	$emails->__set('headers', $headers);
 
 	//Send the donation receipt.
-	$emails->send( $to_email, $subject, $message, $attachments );
+	$emails->send($to_email, $subject, $message, $attachments);
 
 	//If admin notifications are on, send the admin notice.
-	if ( $admin_notice && ! give_admin_notices_disabled( $payment_id ) ) {
+	if ($admin_notice && ! give_admin_notices_disabled($payment_id)) {
 		/**
 		 * Fires in the donation email receipt.
 		 *
@@ -109,7 +109,7 @@ 
 		 * @param int   $payment_id   Payment id.
 		 * @param mixed $payment_data Payment meta data.
 		 */
-		do_action( 'give_admin_donation_email', $payment_id, $payment_data );
+		do_action('give_admin_donation_email', $payment_id, $payment_data);
 	}
 }
 
@@ -122,41 +122,41 @@ 
  */
 function give_email_test_donation_receipt() {
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
 
 	/**
 	 * Filters the from name.
 	 *
 	 * @since 1.7
 	 */
-	$from_name = apply_filters( 'give_donation_from_name', $from_name, 0, array() );
+	$from_name = apply_filters('give_donation_from_name', $from_name, 0, array());
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
 
 	/**
 	 * Filters the from email.
 	 *
 	 * @since 1.7
 	 */
-	$from_email = apply_filters( 'give_donation_from_address', $from_email, 0, array() );
+	$from_email = apply_filters('give_donation_from_address', $from_email, 0, array());
 
-	$subject = give_get_option( 'donation_subject', __( 'Donation Receipt', 'give' ) );
-	$subject = apply_filters( 'give_donation_subject', wp_strip_all_tags( $subject ), 0 );
-	$subject = give_do_email_tags( $subject, 0 );
+	$subject = give_get_option('donation_subject', __('Donation Receipt', 'give'));
+	$subject = apply_filters('give_donation_subject', wp_strip_all_tags($subject), 0);
+	$subject = give_do_email_tags($subject, 0);
 
-	$attachments = apply_filters( 'give_receipt_attachments', array(), 0, array() );
+	$attachments = apply_filters('give_receipt_attachments', array(), 0, array());
 
-	$message = give_email_preview_template_tags( give_get_email_body_content( 0, array() ) );
+	$message = give_email_preview_template_tags(give_get_email_body_content(0, array()));
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', __( 'Donation Receipt', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', __('Donation Receipt', 'give'));
 
-	$headers = apply_filters( 'give_receipt_headers', $emails->get_headers(), 0, array() );
-	$emails->__set( 'headers', $headers );
+	$headers = apply_filters('give_receipt_headers', $emails->get_headers(), 0, array());
+	$emails->__set('headers', $headers);
 
-	$emails->send( give_get_admin_notice_emails(), $subject, $message, $attachments );
+	$emails->send(give_get_admin_notice_emails(), $subject, $message, $attachments);
 
 }
 
@@ -170,49 +170,49 @@ 
  *
  * @return void
  */
-function give_admin_email_notice( $payment_id = 0, $payment_data = array() ) {
+function give_admin_email_notice($payment_id = 0, $payment_data = array()) {
 
-	$payment_id = absint( $payment_id );
+	$payment_id = absint($payment_id);
 
-	if ( empty( $payment_id ) ) {
+	if (empty($payment_id)) {
 		return;
 	}
 
-	if ( ! give_get_payment_by( 'id', $payment_id ) ) {
+	if ( ! give_get_payment_by('id', $payment_id)) {
 		return;
 	}
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
 
 	/**
 	 * Filters the from name.
 	 *
 	 * @since 1.0
 	 */
-	$from_name = apply_filters( 'give_donation_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = apply_filters('give_donation_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
 
 	/**
 	 * Filters the from email.
 	 *
 	 * @since 1.0
 	 */
-	$from_email = apply_filters( 'give_donation_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = apply_filters('give_donation_from_address', $from_email, $payment_id, $payment_data);
 
 	/* translators: %s: payment id */
-	$subject = give_get_option( 'donation_notification_subject', sprintf( esc_html__( 'New Donation - Payment #%s', 'give' ), $payment_id ) );
+	$subject = give_get_option('donation_notification_subject', sprintf(esc_html__('New Donation - Payment #%s', 'give'), $payment_id));
 
 	/**
 	 * Filters the donation notification subject.
 	 *
 	 * @since 1.0
 	 */
-	$subject = apply_filters( 'give_admin_donation_notification_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = apply_filters('give_admin_donation_notification_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$headers = "From: " . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
-	$headers .= "Reply-To: " . $from_email . "\r\n";
+	$headers = "From: ".stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8'))." <$from_email>\r\n";
+	$headers .= "Reply-To: ".$from_email."\r\n";
 	//$headers  .= "MIME-Version: 1.0\r\n";
 	$headers .= "Content-Type: text/html; charset=utf-8\r\n";
 
@@ -221,28 +221,28 @@ 
 	 *
 	 * @since 1.0
 	 */
-	$headers = apply_filters( 'give_admin_donation_notification_headers', $headers, $payment_id, $payment_data );
+	$headers = apply_filters('give_admin_donation_notification_headers', $headers, $payment_id, $payment_data);
 
 	/**
 	 * Filters the donation notification email attachments. By default, there is no attachment but plugins can hook in to provide one more multiple.
 	 *
 	 * @since 1.0
 	 */
-	$attachments = apply_filters( 'give_admin_donation_notification_attachments', array(), $payment_id, $payment_data );
+	$attachments = apply_filters('give_admin_donation_notification_attachments', array(), $payment_id, $payment_data);
 
-	$message = give_get_donation_notification_body_content( $payment_id, $payment_data );
+	$message = give_get_donation_notification_body_content($payment_id, $payment_data);
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'headers', $headers );
-	$emails->__set( 'heading', __( 'New Donation!', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('headers', $headers);
+	$emails->__set('heading', __('New Donation!', 'give'));
 
-	$emails->send( give_get_admin_notice_emails(), $subject, $message, $attachments );
+	$emails->send(give_get_admin_notice_emails(), $subject, $message, $attachments);
 
 }
 
-add_action( 'give_admin_donation_email', 'give_admin_email_notice', 10, 2 );
+add_action('give_admin_donation_email', 'give_admin_email_notice', 10, 2);
 
 /**
  * Retrieves the emails for which admin notifications are sent to (these can be changed in the Give Settings).
@@ -252,12 +252,12 @@ 
  */
 function give_get_admin_notice_emails() {
 
-	$email_option = give_get_option( 'admin_notice_emails' );
+	$email_option = give_get_option('admin_notice_emails');
 
-	$emails = ! empty( $email_option ) && strlen( trim( $email_option ) ) > 0 ? $email_option : get_bloginfo( 'admin_email' );
-	$emails = array_map( 'trim', explode( "\n", $emails ) );
+	$emails = ! empty($email_option) && strlen(trim($email_option)) > 0 ? $email_option : get_bloginfo('admin_email');
+	$emails = array_map('trim', explode("\n", $emails));
 
-	return apply_filters( 'give_admin_notice_emails', $emails );
+	return apply_filters('give_admin_notice_emails', $emails);
 }
 
 /**
@@ -269,11 +269,11 @@ 
  *
  * @return mixed
  */
-function give_admin_notices_disabled( $payment_id = 0 ) {
+function give_admin_notices_disabled($payment_id = 0) {
 
 	return apply_filters(
 		'give_admin_notices_disabled',
-		! give_is_setting_enabled( give_get_option( 'admin_notices' ) ),
+		! give_is_setting_enabled(give_get_option('admin_notices')),
 		$payment_id
 	);
 }
@@ -288,19 +288,19 @@ 
  */
 function give_get_default_donation_notification_email() {
 
-	$default_email_body = __( 'Hi there,', 'give' ) . "\n\n";
-	$default_email_body .= __( 'This email is to inform you that a new donation has been made on your website:', 'give' ) . ' <a href="' . get_bloginfo( 'url' ) . '" target="_blank">' . get_bloginfo( 'url' ) . '</a>' . ".\n\n";
-	$default_email_body .= '<strong>' . __( 'Donor:', 'give' ) . '</strong> {name}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation:', 'give' ) . '</strong> {donation}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Amount:', 'give' ) . '</strong> {amount}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment Method:', 'give' ) . '</strong> {payment_method}' . "\n\n";
-	$default_email_body .= __( 'Thank you,', 'give' ) . "\n\n";
-	$default_email_body .= '{sitename}' . "\n";
+	$default_email_body = __('Hi there,', 'give')."\n\n";
+	$default_email_body .= __('This email is to inform you that a new donation has been made on your website:', 'give').' <a href="'.get_bloginfo('url').'" target="_blank">'.get_bloginfo('url').'</a>'.".\n\n";
+	$default_email_body .= '<strong>'.__('Donor:', 'give').'</strong> {name}'."\n";
+	$default_email_body .= '<strong>'.__('Donation:', 'give').'</strong> {donation}'."\n";
+	$default_email_body .= '<strong>'.__('Amount:', 'give').'</strong> {amount}'."\n";
+	$default_email_body .= '<strong>'.__('Payment Method:', 'give').'</strong> {payment_method}'."\n\n";
+	$default_email_body .= __('Thank you,', 'give')."\n\n";
+	$default_email_body .= '{sitename}'."\n";
 
-	$custom_message = give_get_option( 'donation_notification' );
-	$message        = ! empty( $custom_message ) ? $custom_message : $default_email_body;
+	$custom_message = give_get_option('donation_notification');
+	$message        = ! empty($custom_message) ? $custom_message : $default_email_body;
 
-	return apply_filters( 'give_default_donation_notification_email', $message );
+	return apply_filters('give_default_donation_notification_email', $message);
 }
 
 
@@ -314,25 +314,25 @@ 
  */
 function give_get_default_donation_receipt_email() {
 
-	$default_email_body = __( 'Dear', 'give' ) . " {name},\n\n";
-	$default_email_body .= __( 'Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give' ) . "\n\n";
-	$default_email_body .= '<strong>' . __( 'Donor:', 'give' ) . '</strong> {fullname}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation:', 'give' ) . '</strong> {donation}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation Date:', 'give' ) . '</strong> {date}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Amount:', 'give' ) . '</strong> {amount}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment Method:', 'give' ) . '</strong> {payment_method}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment ID:', 'give' ) . '</strong> {payment_id}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Receipt ID:', 'give' ) . '</strong> {receipt_id}' . "\n\n";
-	$default_email_body .= '{receipt_link}' . "\n\n";
+	$default_email_body = __('Dear', 'give')." {name},\n\n";
+	$default_email_body .= __('Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give')."\n\n";
+	$default_email_body .= '<strong>'.__('Donor:', 'give').'</strong> {fullname}'."\n";
+	$default_email_body .= '<strong>'.__('Donation:', 'give').'</strong> {donation}'."\n";
+	$default_email_body .= '<strong>'.__('Donation Date:', 'give').'</strong> {date}'."\n";
+	$default_email_body .= '<strong>'.__('Amount:', 'give').'</strong> {amount}'."\n";
+	$default_email_body .= '<strong>'.__('Payment Method:', 'give').'</strong> {payment_method}'."\n";
+	$default_email_body .= '<strong>'.__('Payment ID:', 'give').'</strong> {payment_id}'."\n";
+	$default_email_body .= '<strong>'.__('Receipt ID:', 'give').'</strong> {receipt_id}'."\n\n";
+	$default_email_body .= '{receipt_link}'."\n\n";
 	$default_email_body .= "\n\n";
-	$default_email_body .= __( 'Sincerely,', 'give' ) . "\n";
-	$default_email_body .= '{sitename}' . "\n";
+	$default_email_body .= __('Sincerely,', 'give')."\n";
+	$default_email_body .= '{sitename}'."\n";
 
-	$custom_message = give_get_option( 'donation_receipt' );
+	$custom_message = give_get_option('donation_receipt');
 
-	$message = ! empty( $custom_message ) ? $custom_message : $default_email_body;
+	$message = ! empty($custom_message) ? $custom_message : $default_email_body;
 
-	return apply_filters( 'give_default_donation_receipt_email', $message );
+	return apply_filters('give_default_donation_receipt_email', $message);
 }
 
 /**
@@ -345,22 +345,22 @@ 
  *
  * @return array $email_names
  */
-function give_get_email_names( $user_info, $payment = false ) {
+function give_get_email_names($user_info, $payment = false) {
 	$email_names = array();
 
-	if ( is_a( $payment, 'Give_Payment' ) ) {
+	if (is_a($payment, 'Give_Payment')) {
 
-		if ( $payment->user_id > 0 ) {
+		if ($payment->user_id > 0) {
 
-			$user_data               = get_userdata( $payment->user_id );
+			$user_data               = get_userdata($payment->user_id);
 			$email_names['name']     = $payment->first_name;
-			$email_names['fullname'] = trim( $payment->first_name . ' ' . $payment->last_name );
+			$email_names['fullname'] = trim($payment->first_name.' '.$payment->last_name);
 			$email_names['username'] = $user_data->user_login;
 
-		} elseif ( ! empty( $payment->first_name ) ) {
+		} elseif ( ! empty($payment->first_name)) {
 
 			$email_names['name']     = $payment->first_name;
-			$email_names['fullname'] = trim( $payment->first_name . ' ' . $payment->last_name );
+			$email_names['fullname'] = trim($payment->first_name.' '.$payment->last_name);
 			$email_names['username'] = $payment->first_name;
 
 		} else {
@@ -373,30 +373,30 @@ 
 	} else {
 
 		// Support for old serialized data.
-		if ( is_serialized( $user_info ) ) {
+		if (is_serialized($user_info)) {
 
 			// Security check.
-			preg_match( '/[oO]\s*:\s*\d+\s*:\s*"\s*(?!(?i)(stdClass))/', $user_info, $matches );
-			if ( ! empty( $matches ) ) {
+			preg_match('/[oO]\s*:\s*\d+\s*:\s*"\s*(?!(?i)(stdClass))/', $user_info, $matches);
+			if ( ! empty($matches)) {
 				return array(
 					'name'     => '',
 					'fullname' => '',
 					'username' => '',
 				);
 			} else {
-				$user_info = maybe_unserialize( $user_info );
+				$user_info = maybe_unserialize($user_info);
 			}
 
 		}
 
-		if ( isset( $user_info['id'] ) && $user_info['id'] > 0 && isset( $user_info['first_name'] ) ) {
-			$user_data               = get_userdata( $user_info['id'] );
+		if (isset($user_info['id']) && $user_info['id'] > 0 && isset($user_info['first_name'])) {
+			$user_data               = get_userdata($user_info['id']);
 			$email_names['name']     = $user_info['first_name'];
-			$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+			$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 			$email_names['username'] = $user_data->user_login;
-		} elseif ( isset( $user_info['first_name'] ) ) {
+		} elseif (isset($user_info['first_name'])) {
 			$email_names['name']     = $user_info['first_name'];
-			$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+			$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 			$email_names['username'] = $user_info['first_name'];
 		} else {
 			$email_names['name']     = $user_info['email'];
@@ -416,37 +416,37 @@ 
  *
  * @since 1.8.14
  */
-function give_admin_email_user_donor_disconnection( $user_id, $donor_id ) {
+function give_admin_email_user_donor_disconnection($user_id, $donor_id) {
 
-	$user_id  = absint( $user_id );
-	$donor_id = absint( $donor_id );
+	$user_id  = absint($user_id);
+	$donor_id = absint($donor_id);
 
 	// Bail Out, if user id doesn't exists.
-	if ( empty( $user_id ) ) {
+	if (empty($user_id)) {
 		return;
 	}
 
 	// Bail Out, if donor id doesn't exists.
-	if ( empty( $donor_id ) ) {
+	if (empty($donor_id)) {
 		return;
 	}
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
 
 	/* translators: %s: payment id */
-	$subject = __( 'Attention: User tries to login whose Donor profile is disconnected!', 'give' );
+	$subject = __('Attention: User tries to login whose Donor profile is disconnected!', 'give');
 
 	/**
 	 * Filters the Donor-User Disconnection notification subject.
 	 *
 	 * @since 1.8.14
 	 */
-	$subject = apply_filters( 'give_admin_donor_user_disconnection_notification_subject', wp_strip_all_tags( $subject ) );
+	$subject = apply_filters('give_admin_donor_user_disconnection_notification_subject', wp_strip_all_tags($subject));
 
-	$headers = "From: " . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
-	$headers .= "Reply-To: " . $from_email . "\r\n";
+	$headers = "From: ".stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8'))." <$from_email>\r\n";
+	$headers .= "Reply-To: ".$from_email."\r\n";
 	$headers .= "Content-Type: text/html; charset=utf-8\r\n";
 
 	/**
@@ -454,25 +454,25 @@ 
 	 *
 	 * @since 1.8.14
 	 */
-	$headers = apply_filters( 'give_admin_donor_user_disconnection_notification_headers', $headers );
+	$headers = apply_filters('give_admin_donor_user_disconnection_notification_headers', $headers);
 
-	$message = __( 'Hi Admin,', 'give' ) . "\n\n";
-	$message .= __( 'This email is to inform you that a user has tried logging in. But, User was unable to login due to User-Donor profile disconnection.', 'give' ) . "\n\n";
-	$message .= __( 'Do you want to reconnect User and Donor profile again?', 'give' ) . "\n\n";
+	$message = __('Hi Admin,', 'give')."\n\n";
+	$message .= __('This email is to inform you that a user has tried logging in. But, User was unable to login due to User-Donor profile disconnection.', 'give')."\n\n";
+	$message .= __('Do you want to reconnect User and Donor profile again?', 'give')."\n\n";
 	$message .= sprintf(
 		'<a href="%1$s">%2$s</a>',
-		esc_url( admin_url() . 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor_id . '&user_id=' . $user_id . '&give-message=reconnect-user' ),
-		__( 'Reconnect User', 'give' ) . "\n\n"
+		esc_url(admin_url().'edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor_id.'&user_id='.$user_id.'&give-message=reconnect-user'),
+		__('Reconnect User', 'give')."\n\n"
 	);
-	$message .= __( 'Thank you,', 'give' ) . "\n\n";
-	$message .= '{sitename}' . "\n";
+	$message .= __('Thank you,', 'give')."\n\n";
+	$message .= '{sitename}'."\n";
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'headers', $headers );
-	$emails->__set( 'heading', __( 'User - Donor Profile Disconnection', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('headers', $headers);
+	$emails->__set('heading', __('User - Donor Profile Disconnection', 'give'));
 
-	$emails->send( give_get_admin_notice_emails(), $subject, give_do_email_tags( $message ) );
+	$emails->send(give_get_admin_notice_emails(), $subject, give_do_email_tags($message));
 
 }

includes/admin/donors/donors.php

Spacing +170 added lines, -170 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,9 +24,9 @@ 
  */
 function give_donors_page() {
 	$default_views  = give_donor_views();
-	$requested_view = isset( $_GET['view'] ) ? sanitize_text_field( $_GET['view'] ) : 'donors';
-	if ( array_key_exists( $requested_view, $default_views ) && function_exists( $default_views[ $requested_view ] ) ) {
-		give_render_donor_view( $requested_view, $default_views );
+	$requested_view = isset($_GET['view']) ? sanitize_text_field($_GET['view']) : 'donors';
+	if (array_key_exists($requested_view, $default_views) && function_exists($default_views[$requested_view])) {
+		give_render_donor_view($requested_view, $default_views);
 	} else {
 		give_donors_list();
 	}
@@ -42,7 +42,7 @@ 
 
 	$views = array();
 
-	return apply_filters( 'give_donor_views', $views );
+	return apply_filters('give_donor_views', $views);
 
 }
 
@@ -56,7 +56,7 @@ 
 
 	$tabs = array();
 
-	return apply_filters( 'give_donor_tabs', $tabs );
+	return apply_filters('give_donor_tabs', $tabs);
 
 }
 
@@ -67,7 +67,7 @@ 
  * @return void
  */
 function give_donors_list() {
-	include dirname( __FILE__ ) . '/class-donor-table.php';
+	include dirname(__FILE__).'/class-donor-table.php';
 
 	$donors_table = new Give_Donor_List_Table();
 	$donors_table->prepare_items();
@@ -80,14 +80,14 @@ 
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_donors_table_top' );
+		do_action('give_donors_table_top');
 		?>
 
 		<hr class="wp-header-end">
 
-		<form id="give-donors-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors' ); ?>">
+		<form id="give-donors-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors'); ?>">
 			<?php
-			$donors_table->search_box( __( 'Search Donors', 'give' ), 'give-donors' );
+			$donors_table->search_box(__('Search Donors', 'give'), 'give-donors');
 			$donors_table->display();
 			?>
 			<input type="hidden" name="post_type" value="give_forms" />
@@ -100,7 +100,7 @@ 
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_donors_table_bottom' );
+		do_action('give_donors_table_bottom');
 		?>
 	</div>
 	<?php
@@ -116,33 +116,33 @@ 
  *
  * @return void
  */
-function give_render_donor_view( $view, $callbacks ) {
+function give_render_donor_view($view, $callbacks) {
 
 	$render = true;
 
-	$donor_view_role = apply_filters( 'give_view_donors_role', 'view_give_reports' );
+	$donor_view_role = apply_filters('give_view_donors_role', 'view_give_reports');
 
-	if ( ! current_user_can( $donor_view_role ) ) {
-		give_set_error( 'give-no-access', __( 'You are not permitted to view this data.', 'give' ) );
+	if ( ! current_user_can($donor_view_role)) {
+		give_set_error('give-no-access', __('You are not permitted to view this data.', 'give'));
 		$render = false;
 	}
 
-	if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-		give_set_error( 'give-invalid_donor', __( 'Invalid Donor ID.', 'give' ) );
+	if ( ! isset($_GET['id']) || ! is_numeric($_GET['id'])) {
+		give_set_error('give-invalid_donor', __('Invalid Donor ID.', 'give'));
 		$render = false;
 	}
 
 	$donor_id          = (int) $_GET['id'];
-	$reconnect_user_id = ! empty( $_GET['user_id'] ) ? (int) $_GET['user_id'] : '';
-	$donor             = new Give_Donor( $donor_id );
+	$reconnect_user_id = ! empty($_GET['user_id']) ? (int) $_GET['user_id'] : '';
+	$donor             = new Give_Donor($donor_id);
 
 	// Reconnect User with Donor profile.
-	if( $reconnect_user_id ) {
-		give_connect_user_donor_profile( $donor, array( 'user_id' => $reconnect_user_id ), array() );
+	if ($reconnect_user_id) {
+		give_connect_user_donor_profile($donor, array('user_id' => $reconnect_user_id), array());
 	}
 
-	if ( empty( $donor->id ) ) {
-		give_set_error( 'give-invalid_donor', __( 'Invalid Donor ID.', 'give' ) );
+	if (empty($donor->id)) {
+		give_set_error('give-invalid_donor', __('Invalid Donor ID.', 'give'));
 		$render = false;
 	}
 
@@ -151,9 +151,9 @@ 
 
 	<div class='wrap'>
 
-		<?php if ( give_get_errors() ) : ?>
+		<?php if (give_get_errors()) : ?>
 			<div class="error settings-error">
-				<?php Give()->notices->render_frontend_notices( 0 ); ?>
+				<?php Give()->notices->render_frontend_notices(0); ?>
 			</div>
 		<?php endif; ?>
 
@@ -161,7 +161,7 @@ 
 			<?php
 			printf(
 			/* translators: %s: donor number */
-				esc_html__( 'Donor %s', 'give' ),
+				esc_html__('Donor %s', 'give'),
 				$donor_id
 			);
 			?>
@@ -169,26 +169,26 @@ 
 
 		<hr class="wp-header-end">
 		
-		<?php if ( $donor && $render ) : ?>
+		<?php if ($donor && $render) : ?>
 
 			<h2 class="nav-tab-wrapper">
 				<?php
-				foreach ( $donor_tabs as $key => $tab ) :
+				foreach ($donor_tabs as $key => $tab) :
 					$active = $key === $view ? true : false;
 					$class = $active ? 'nav-tab nav-tab-active' : 'nav-tab';
 					printf(
-						'<a href="%1$s" class="%2$s"><span class="dashicons %3$s"></span>%4$s</a>' . "\n",
-						esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=' . $key . '&id=' . $donor->id ) ),
-						esc_attr( $class ),
-						sanitize_html_class( $tab['dashicon'] ),
-						esc_html( $tab['title'] )
+						'<a href="%1$s" class="%2$s"><span class="dashicons %3$s"></span>%4$s</a>'."\n",
+						esc_url(admin_url('edit.php?post_type=give_forms&page=give-donors&view='.$key.'&id='.$donor->id)),
+						esc_attr($class),
+						sanitize_html_class($tab['dashicon']),
+						esc_html($tab['title'])
 					);
 				endforeach;
 				?>
 			</h2>
 
 			<div id="give-donor-card-wrapper">
-				<?php $callbacks[ $view ]( $donor ) ?>
+				<?php $callbacks[$view]($donor) ?>
 			</div>
 
 		<?php endif; ?>
@@ -208,9 +208,9 @@ 
  *
  * @return void
  */
-function give_donor_view( $donor ) {
+function give_donor_view($donor) {
 
-	$donor_edit_role   = apply_filters( 'give_edit_donors_role', 'edit_give_payments' );
+	$donor_edit_role = apply_filters('give_edit_donors_role', 'edit_give_payments');
 
 	/**
 	 * Fires in donor profile screen, above the donor card.
@@ -219,32 +219,32 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_card_top', $donor );
+	do_action('give_donor_card_top', $donor);
 	?>
 
 	<div id="donor-summary" class="info-wrapper donor-section postbox">
 
-		<form id="edit-donor-info" method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ); ?>">
+		<form id="edit-donor-info" method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id); ?>">
 
 			<div class="donor-info">
 
 				<div class="donor-bio-header clearfix">
 
 					<div class="avatar-wrap left" id="donor-avatar">
-						<?php echo get_avatar( $donor->email ); ?>
+						<?php echo get_avatar($donor->email); ?>
 					</div>
 
 					<div id="donor-name-wrap" class="left">
 						<span class="donor-id">#<?php echo $donor->id; ?></span>
-						<span class="donor-name info-item edit-item"><input size="15" data-key="name" name="customerinfo[name]" type="text" value="<?php echo esc_attr( $donor->name ); ?>" placeholder="<?php _e( 'Donor Name', 'give' ); ?>" /></span>
+						<span class="donor-name info-item edit-item"><input size="15" data-key="name" name="customerinfo[name]" type="text" value="<?php echo esc_attr($donor->name); ?>" placeholder="<?php _e('Donor Name', 'give'); ?>" /></span>
 						<span class="donor-name info-item editable"><span data-key="name"><?php echo $donor->name; ?></span></span>
 					</div>
 					<p class="donor-since info-item">
-						<?php _e( 'Donor since', 'give' ); ?>
-						<?php echo date_i18n( give_date_format(), strtotime( $donor->date_created ) ) ?>
+						<?php _e('Donor since', 'give'); ?>
+						<?php echo date_i18n(give_date_format(), strtotime($donor->date_created)) ?>
 					</p>
-					<?php if ( current_user_can( $donor_edit_role ) ) : ?>
-						<a href="#" id="edit-donor" class="button info-item editable donor-edit-link"><?php _e( 'Edit Donor', 'give' ); ?></a>
+					<?php if (current_user_can($donor_edit_role)) : ?>
+						<a href="#" id="edit-donor" class="button info-item editable donor-edit-link"><?php _e('Edit Donor', 'give'); ?></a>
 					<?php endif; ?>
 				</div>
 				<!-- /donor-bio-header -->
@@ -254,7 +254,7 @@ 
 					<table class="widefat">
 						<tbody>
 						<tr class="alternate">
-							<th scope="col"><label for="tablecell"><?php _e( 'User:', 'give' ); ?></label></th>
+							<th scope="col"><label for="tablecell"><?php _e('User:', 'give'); ?></label></th>
 							<td>
 								<span class="donor-user-id info-item edit-item">
 									<?php
@@ -271,48 +271,48 @@ 
 										'data'  => $data_atts,
 									);
 
-									if ( ! empty( $user_id ) ) {
-										$userdata           = get_userdata( $user_id );
+									if ( ! empty($user_id)) {
+										$userdata = get_userdata($user_id);
 										$user_args['selected'] = $user_id;
 									}
 
-									echo Give()->html->ajax_user_search( $user_args );
+									echo Give()->html->ajax_user_search($user_args);
 									?>
 								</span>
 
 								<span class="donor-user-id info-item editable">
-									<?php if ( ! empty( $userdata ) ) { ?>
-										<span data-key="user_id">#<?php echo $donor->user_id . ' - ' . $userdata->display_name; ?></span>
+									<?php if ( ! empty($userdata)) { ?>
+										<span data-key="user_id">#<?php echo $donor->user_id.' - '.$userdata->display_name; ?></span>
 									<?php } else { ?>
-										<span data-key="user_id"><?php _e( 'None', 'give' ); ?></span>
+										<span data-key="user_id"><?php _e('None', 'give'); ?></span>
 									<?php } ?>
-									<?php if ( current_user_can( $donor_edit_role ) && intval( $donor->user_id ) > 0 ) { ?>
+									<?php if (current_user_can($donor_edit_role) && intval($donor->user_id) > 0) { ?>
 										<span class="disconnect-user">
  											-
- 											<a id="disconnect-donor" href="#disconnect" aria-label="<?php _e( 'Disconnects the current user ID from this donor record.', 'give' ); ?>">
- 												<?php _e( 'Disconnect User', 'give' ); ?>
+ 											<a id="disconnect-donor" href="#disconnect" aria-label="<?php _e('Disconnects the current user ID from this donor record.', 'give'); ?>">
+ 												<?php _e('Disconnect User', 'give'); ?>
 											</a>
  										</span>
 										<span class="view-user-profile">
  											|
- 											<a id="view-user-profile" href="<?php echo 'user-edit.php?user_id=' . $donor->user_id; ?>" aria-label="<?php _e( 'View User Profile of current user ID.', 'give' ); ?>">
- 												<?php _e( 'View User Profile', 'give' ); ?>
+ 											<a id="view-user-profile" href="<?php echo 'user-edit.php?user_id='.$donor->user_id; ?>" aria-label="<?php _e('View User Profile of current user ID.', 'give'); ?>">
+ 												<?php _e('View User Profile', 'give'); ?>
 											</a>
  										</span>
 									<?php } ?>
 								</span>
 							</td>
 						</tr>
-						<?php if ( isset( $donor->user_id ) && $donor->user_id > 0 ) : ?>
+						<?php if (isset($donor->user_id) && $donor->user_id > 0) : ?>
 
 							<tr>
-								<th scope="col"><?php _e( 'Address:', 'give' ); ?></th>
+								<th scope="col"><?php _e('Address:', 'give'); ?></th>
 								<td class="row-title">
 
 									<div class="donor-address-wrapper">
 
 										<?php
-										$address  = get_user_meta( $donor->user_id, '_give_user_address', true );
+										$address  = get_user_meta($donor->user_id, '_give_user_address', true);
 										$defaults = array(
 											'line1'   => '',
 											'line2'   => '',
@@ -322,10 +322,10 @@ 
 											'zip'     => '',
 										);
 
-										$address = wp_parse_args( $address, $defaults );
+										$address = wp_parse_args($address, $defaults);
 										?>
 
-										<?php if ( ! empty( $address ) ) { ?>
+										<?php if ( ! empty($address)) { ?>
 											<span class="donor-address info-item editable">
 												<span class="info-item" data-key="line1"><?php echo $address['line1']; ?></span>
 												<span class="info-item" data-key="line2"><?php echo $address['line2']; ?></span>
@@ -342,8 +342,8 @@ 
 
 										// For State.
 										$selected_state = give_get_state();
-										$states         = give_get_states( $selected_country );
-										$selected_state = ( isset( $address['state'] ) ? $address['state'] : $selected_state );
+										$states         = give_get_states($selected_country);
+										$selected_state = (isset($address['state']) ? $address['state'] : $selected_state);
 
 										// Get the country list that does not have any states init.
 										$no_states_country = give_no_states_country_list();
@@ -351,32 +351,32 @@ 
 										<span class="donor-address info-item edit-item">
 											<select data-key="country" name="customerinfo[country]" id="billing_country" class="billing_country give-select edit-item">
 												<?php
-												foreach ( $countries as $country_code => $country ) {
-													echo '<option value="' . esc_attr( $country_code ) . '"' . selected( $country_code, $selected_country, false ) . '>' . $country . '</option>';
+												foreach ($countries as $country_code => $country) {
+													echo '<option value="'.esc_attr($country_code).'"'.selected($country_code, $selected_country, false).'>'.$country.'</option>';
 												}
 												?>
 											</select>
-											<input class="info-item" type="text" data-key="line1" name="customerinfo[line1]" placeholder="<?php _e( 'Address 1', 'give' ); ?>" value="<?php echo $address['line1']; ?>" />
-											<input class="info-item" type="text" data-key="line2" name="customerinfo[line2]" placeholder="<?php _e( 'Address 2', 'give' ); ?>" value="<?php echo $address['line2']; ?>" />
+											<input class="info-item" type="text" data-key="line1" name="customerinfo[line1]" placeholder="<?php _e('Address 1', 'give'); ?>" value="<?php echo $address['line1']; ?>" />
+											<input class="info-item" type="text" data-key="line2" name="customerinfo[line2]" placeholder="<?php _e('Address 2', 'give'); ?>" value="<?php echo $address['line2']; ?>" />
 											<?php
-											if ( ! empty( $states ) ) {
+											if ( ! empty($states)) {
 												?>
 												<select data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-select info-item">
 													<?php
-													foreach ( $states as $state_code => $state ) {
-														echo '<option value="' . $state_code . '"' . selected( $state_code, $selected_state, false ) . '>' . $state . '</option>';
+													foreach ($states as $state_code => $state) {
+														echo '<option value="'.$state_code.'"'.selected($state_code, $selected_state, false).'>'.$state.'</option>';
 													}
 													?>
 												</select>
 												<?php
 											} else {
 												?>
-												<input type="text" size="6" data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-input info-item <?php echo ( ! empty( $selected_country ) && array_key_exists( $selected_country, $no_states_country ) ? 'give-hidden' : '' ); ?>" placeholder="<?php _e( 'State / Province / County', 'give' ); ?>" />
+												<input type="text" size="6" data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-input info-item <?php echo ( ! empty($selected_country) && array_key_exists($selected_country, $no_states_country) ? 'give-hidden' : ''); ?>" placeholder="<?php _e('State / Province / County', 'give'); ?>" />
 												<?php
 											}
 											?>
-											<input class="info-item" type="text" data-key="city" name="customerinfo[city]" placeholder="<?php _e( 'City', 'give' ); ?>" value="<?php echo $address['city']; ?>" />
-											<input class="info-item" type="text" data-key="zip" name="customerinfo[zip]" placeholder="<?php _e( 'Zip / Postal Code', 'give' ); ?>" value="<?php echo $address['zip']; ?>" />
+											<input class="info-item" type="text" data-key="city" name="customerinfo[city]" placeholder="<?php _e('City', 'give'); ?>" value="<?php echo $address['city']; ?>" />
+											<input class="info-item" type="text" data-key="zip" name="customerinfo[zip]" placeholder="<?php _e('Zip / Postal Code', 'give'); ?>" value="<?php echo $address['zip']; ?>" />
 										</span>
 
 									</div>
@@ -392,10 +392,10 @@ 
 
 			<span id="donor-edit-actions" class="edit-item">
 				<input type="hidden" data-key="id" name="customerinfo[id]" value="<?php echo $donor->id; ?>" />
-				<?php wp_nonce_field( 'edit-donor', '_wpnonce', false, true ); ?>
+				<?php wp_nonce_field('edit-donor', '_wpnonce', false, true); ?>
 				<input type="hidden" name="give_action" value="edit-donor" />
-				<input type="submit" id="give-edit-donor-save" class="button-secondary" value="<?php _e( 'Update Donor', 'give' ); ?>" />
-				<a id="give-edit-donor-cancel" href="" class="delete"><?php _e( 'Cancel', 'give' ); ?></a>
+				<input type="submit" id="give-edit-donor-save" class="button-secondary" value="<?php _e('Update Donor', 'give'); ?>" />
+				<a id="give-edit-donor-cancel" href="" class="delete"><?php _e('Cancel', 'give'); ?></a>
 			</span>
 
 		</form>
@@ -410,24 +410,24 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_before_stats', $donor );
+	do_action('give_donor_before_stats', $donor);
 	?>
 
 	<div id="donor-stats-wrapper" class="donor-section postbox clear">
 		<ul>
 			<li>
-				<a href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&donor=' . absint( $donor->id ) ); ?>">
+				<a href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history&donor='.absint($donor->id)); ?>">
 					<span class="dashicons dashicons-heart"></span>
 					<?php
 					// Completed Donations.
-					$completed_donations_text = sprintf( _n( '%d Completed Donation', '%d Completed Donations', $donor->purchase_count, 'give' ), $donor->purchase_count );
-					echo apply_filters( 'give_donor_completed_donations', $completed_donations_text, $donor );
+					$completed_donations_text = sprintf(_n('%d Completed Donation', '%d Completed Donations', $donor->purchase_count, 'give'), $donor->purchase_count);
+					echo apply_filters('give_donor_completed_donations', $completed_donations_text, $donor);
 					?>
 				</a>
 			</li>
 			<li>
 				<span class="dashicons dashicons-chart-area"></span>
-				<?php echo give_currency_filter( give_format_amount( $donor->purchase_value, array( 'sanitize' => false ) ) ); ?> <?php _e( 'Lifetime Donations', 'give' ); ?>
+				<?php echo give_currency_filter(give_format_amount($donor->purchase_value, array('sanitize' => false))); ?> <?php _e('Lifetime Donations', 'give'); ?>
 			</li>
 			<?php
 			/**
@@ -439,7 +439,7 @@ 
 			 *
 			 * @param object $donor The donor object being displayed.
 			 */
-			do_action( 'give_donor_stats_list', $donor );
+			do_action('give_donor_stats_list', $donor);
 			?>
 		</ul>
 	</div>
@@ -452,7 +452,7 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_before_tables_wrapper', $donor );
+	do_action('give_donor_before_tables_wrapper', $donor);
 	?>
 
 	<div id="donor-tables-wrapper" class="donor-section">
@@ -465,46 +465,46 @@ 
 		 *
 		 * @param object $donor The donor object being displayed.
 		 */
-		do_action( 'give_donor_before_tables', $donor );
+		do_action('give_donor_before_tables', $donor);
 		?>
 
-		<h3><?php _e( 'Donor Emails', 'give' ); ?></h3>
+		<h3><?php _e('Donor Emails', 'give'); ?></h3>
 
 		<table class="wp-list-table widefat striped emails">
 			<thead>
 			<tr>
-				<th><?php _e( 'Email', 'give' ); ?></th>
-				<th><?php _e( 'Actions', 'give' ); ?></th>
+				<th><?php _e('Email', 'give'); ?></th>
+				<th><?php _e('Actions', 'give'); ?></th>
 			</tr>
 			</thead>
 
 			<tbody>
-			<?php if ( ! empty( $donor->emails ) ) { ?>
+			<?php if ( ! empty($donor->emails)) { ?>
 
-				<?php foreach ( $donor->emails as $key => $email ) : ?>
+				<?php foreach ($donor->emails as $key => $email) : ?>
 					<tr data-key="<?php echo $key; ?>">
 						<td>
 							<?php echo $email; ?>
-							<?php if ( 'primary' === $key ) : ?>
+							<?php if ('primary' === $key) : ?>
 								<span class="dashicons dashicons-star-filled primary-email-icon"></span>
 							<?php endif; ?>
 						</td>
 						<td>
-							<?php if ( 'primary' !== $key ) : ?>
+							<?php if ('primary' !== $key) : ?>
 								<?php
-								$base_url    = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id );
-								$promote_url = wp_nonce_url( add_query_arg( array(
-									'email' => rawurlencode( $email ),
+								$base_url    = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id);
+								$promote_url = wp_nonce_url(add_query_arg(array(
+									'email' => rawurlencode($email),
 									'give_action' => 'set_donor_primary_email',
-								), $base_url ), 'give-set-donor-primary-email' );
-								$remove_url  = wp_nonce_url( add_query_arg( array(
-									'email' => rawurlencode( $email ),
+								), $base_url), 'give-set-donor-primary-email');
+								$remove_url = wp_nonce_url(add_query_arg(array(
+									'email' => rawurlencode($email),
 									'give_action' => 'remove_donor_email',
-								), $base_url ), 'give-remove-donor-email' );
+								), $base_url), 'give-remove-donor-email');
 								?>
-								<a href="<?php echo $promote_url; ?>"><?php _e( 'Make Primary', 'give' ); ?></a>
+								<a href="<?php echo $promote_url; ?>"><?php _e('Make Primary', 'give'); ?></a>
 								&nbsp;|&nbsp;
-								<a href="<?php echo $remove_url; ?>" class="delete"><?php _e( 'Remove', 'give' ); ?></a>
+								<a href="<?php echo $remove_url; ?>" class="delete"><?php _e('Remove', 'give'); ?></a>
 							<?php endif; ?>
 						</td>
 					</tr>
@@ -514,59 +514,59 @@ 
 					<td colspan="2" class="add-donor-email-td">
 						<div class="add-donor-email-wrapper">
 							<input type="hidden" name="donor-id" value="<?php echo $donor->id; ?>" />
-							<?php wp_nonce_field( 'give_add_donor_email', 'add_email_nonce', false, true ); ?>
-							<input type="email" name="additional-email" value="" placeholder="<?php _e( 'Email Address', 'give' ); ?>" />&nbsp;
-							<input type="checkbox" name="make-additional-primary" value="1" id="make-additional-primary" />&nbsp;<label for="make-additional-primary"><?php _e( 'Make Primary', 'give' ); ?></label>
-							<button class="button-secondary give-add-donor-email" id="add-donor-email"><?php _e( 'Add Email', 'give' ); ?></button>
+							<?php wp_nonce_field('give_add_donor_email', 'add_email_nonce', false, true); ?>
+							<input type="email" name="additional-email" value="" placeholder="<?php _e('Email Address', 'give'); ?>" />&nbsp;
+							<input type="checkbox" name="make-additional-primary" value="1" id="make-additional-primary" />&nbsp;<label for="make-additional-primary"><?php _e('Make Primary', 'give'); ?></label>
+							<button class="button-secondary give-add-donor-email" id="add-donor-email"><?php _e('Add Email', 'give'); ?></button>
 							<span class="spinner"></span>
 						</div>
 						<div class="notice-wrap"></div>
 					</td>
 				</tr>
 			<?php } else { ?>
-				<tr><td colspan="2"><?php _e( 'No Emails Found', 'give' ); ?></td></tr>
+				<tr><td colspan="2"><?php _e('No Emails Found', 'give'); ?></td></tr>
 			<?php }// End if().
 			?>
 			</tbody>
 		</table>
 
-		<h3><?php _e( 'Recent Donations', 'give' ); ?></h3>
+		<h3><?php _e('Recent Donations', 'give'); ?></h3>
 		<?php
-		$payment_ids = explode( ',', $donor->payment_ids );
-		$payments    = give_get_payments( array(
+		$payment_ids = explode(',', $donor->payment_ids);
+		$payments    = give_get_payments(array(
 			'post__in' => $payment_ids,
-		) );
-		$payments    = array_slice( $payments, 0, 10 );
+		));
+		$payments    = array_slice($payments, 0, 10);
 		?>
 		<table class="wp-list-table widefat striped payments">
 			<thead>
 			<tr>
-				<th scope="col"><?php _e( 'ID', 'give' ); ?></th>
-				<th scope="col"><?php _e( 'Amount', 'give' ); ?></th>
-				<th scope="col"><?php _e( 'Date', 'give' ); ?></th>
-				<th scope="col"><?php _e( 'Status', 'give' ); ?></th>
-				<th scope="col"><?php _e( 'Actions', 'give' ); ?></th>
+				<th scope="col"><?php _e('ID', 'give'); ?></th>
+				<th scope="col"><?php _e('Amount', 'give'); ?></th>
+				<th scope="col"><?php _e('Date', 'give'); ?></th>
+				<th scope="col"><?php _e('Status', 'give'); ?></th>
+				<th scope="col"><?php _e('Actions', 'give'); ?></th>
 			</tr>
 			</thead>
 			<tbody>
-			<?php if ( ! empty( $payments ) ) { ?>
-				<?php foreach ( $payments as $payment ) : ?>
+			<?php if ( ! empty($payments)) { ?>
+				<?php foreach ($payments as $payment) : ?>
 					<tr>
 						<td><?php echo $payment->ID; ?></td>
-						<td><?php echo give_payment_amount( $payment->ID ); ?></td>
-						<td><?php echo date_i18n( give_date_format(), strtotime( $payment->post_date ) ); ?></td>
-						<td><?php echo give_get_payment_status( $payment, true ); ?></td>
+						<td><?php echo give_payment_amount($payment->ID); ?></td>
+						<td><?php echo date_i18n(give_date_format(), strtotime($payment->post_date)); ?></td>
+						<td><?php echo give_get_payment_status($payment, true); ?></td>
 						<td>
 							<?php
 							printf(
 								'<a href="%1$s" aria-label="%2$s">%3$s</a>',
-								admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id=' . $payment->ID ),
+								admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id='.$payment->ID),
 								sprintf(
 								/* translators: %s: Donation ID */
-									esc_attr__( 'View Donation %s.', 'give' ),
+									esc_attr__('View Donation %s.', 'give'),
 									$payment->ID
 								),
-								__( 'View Donation', 'give' )
+								__('View Donation', 'give')
 							);
 							?>
 
@@ -581,47 +581,47 @@ 
 							 * @param object $donor The donor object being displayed.
 							 * @param object $payment  The payment object being displayed.
 							 */
-							do_action( 'give_donor_recent_purchases_actions', $donor, $payment );
+							do_action('give_donor_recent_purchases_actions', $donor, $payment);
 							?>
 						</td>
 					</tr>
 				<?php endforeach; ?>
 			<?php } else { ?>
 				<tr>
-					<td colspan="5"><?php _e( 'No donations found.', 'give' ); ?></td>
+					<td colspan="5"><?php _e('No donations found.', 'give'); ?></td>
 				</tr>
 			<?php }// End if().
 			?>
 			</tbody>
 		</table>
 
-		<h3><?php _e( 'Completed Forms', 'give' ); ?></h3>
+		<h3><?php _e('Completed Forms', 'give'); ?></h3>
 		<?php
-		$donations = give_get_users_completed_donations( $donor->email );
+		$donations = give_get_users_completed_donations($donor->email);
 		?>
 		<table class="wp-list-table widefat striped donations">
 			<thead>
 			<tr>
-				<th scope="col"><?php _e( 'Form', 'give' ); ?></th>
-				<th scope="col" width="120px"><?php _e( 'Actions', 'give' ); ?></th>
+				<th scope="col"><?php _e('Form', 'give'); ?></th>
+				<th scope="col" width="120px"><?php _e('Actions', 'give'); ?></th>
 			</tr>
 			</thead>
 			<tbody>
-			<?php if ( ! empty( $donations ) ) { ?>
-				<?php foreach ( $donations as $donation ) : ?>
+			<?php if ( ! empty($donations)) { ?>
+				<?php foreach ($donations as $donation) : ?>
 					<tr>
 						<td><?php echo $donation->post_title; ?></td>
 						<td>
 							<?php
 							printf(
 								'<a href="%1$s" aria-label="%2$s">%3$s</a>',
-								esc_url( admin_url( 'post.php?action=edit&post=' . $donation->ID ) ),
+								esc_url(admin_url('post.php?action=edit&post='.$donation->ID)),
 								sprintf(
 								/* translators: %s: form name */
-									esc_attr__( 'View Form %s.', 'give' ),
+									esc_attr__('View Form %s.', 'give'),
 									$donation->post_title
 								),
-								__( 'View Form', 'give' )
+								__('View Form', 'give')
 							);
 							?>
 						</td>
@@ -629,7 +629,7 @@ 
 				<?php endforeach; ?>
 			<?php } else { ?>
 				<tr>
-					<td colspan="2"><?php _e( 'No completed donations found.', 'give' ); ?></td>
+					<td colspan="2"><?php _e('No completed donations found.', 'give'); ?></td>
 				</tr>
 			<?php } ?>
 			</tbody>
@@ -643,7 +643,7 @@ 
 		 *
 		 * @param object $donor The donor object being displayed.
 		 */
-		do_action( 'give_donor_after_tables', $donor );
+		do_action('give_donor_after_tables', $donor);
 		?>
 
 	</div>
@@ -656,7 +656,7 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_card_bottom', $donor );
+	do_action('give_donor_card_bottom', $donor);
 
 }
 
@@ -669,30 +669,30 @@ 
  *
  * @return void
  */
-function give_donor_notes_view( $donor ) {
+function give_donor_notes_view($donor) {
 
-	$paged          = isset( $_GET['paged'] ) && is_numeric( $_GET['paged'] ) ? $_GET['paged'] : 1;
-	$paged          = absint( $paged );
+	$paged          = isset($_GET['paged']) && is_numeric($_GET['paged']) ? $_GET['paged'] : 1;
+	$paged          = absint($paged);
 	$note_count     = $donor->get_notes_count();
-	$per_page       = apply_filters( 'give_donor_notes_per_page', 20 );
-	$total_pages    = ceil( $note_count / $per_page );
-	$donor_notes = $donor->get_notes( $per_page, $paged );
+	$per_page       = apply_filters('give_donor_notes_per_page', 20);
+	$total_pages    = ceil($note_count / $per_page);
+	$donor_notes = $donor->get_notes($per_page, $paged);
 	?>
 
 	<div id="donor-notes-wrapper">
 		<div class="donor-notes-header">
-			<?php echo get_avatar( $donor->email, 30 ); ?> <span><?php echo $donor->name; ?></span>
+			<?php echo get_avatar($donor->email, 30); ?> <span><?php echo $donor->name; ?></span>
 		</div>
-		<h3><?php _e( 'Notes', 'give' ); ?></h3>
+		<h3><?php _e('Notes', 'give'); ?></h3>
 
-		<?php if ( 1 == $paged ) : ?>
+		<?php if (1 == $paged) : ?>
 			<div style="display: block; margin-bottom: 55px;">
-				<form id="give-add-donor-note" method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=notes&id=' . $donor->id ); ?>">
+				<form id="give-add-donor-note" method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=notes&id='.$donor->id); ?>">
 					<textarea id="donor-note" name="donor_note" class="donor-note-input" rows="10"></textarea>
 					<br />
 					<input type="hidden" id="donor-id" name="customer_id" value="<?php echo $donor->id; ?>" />
 					<input type="hidden" name="give_action" value="add-donor-note" />
-					<?php wp_nonce_field( 'add-donor-note', 'add_donor_note_nonce', true, true ); ?>
+					<?php wp_nonce_field('add-donor-note', 'add_donor_note_nonce', true, true); ?>
 					<input id="add-donor-note" class="right button-primary" type="submit" value="Add Note" />
 				</form>
 			</div>
@@ -707,26 +707,26 @@ 
 			'show_all' => true,
 		);
 
-		echo paginate_links( $pagination_args );
+		echo paginate_links($pagination_args);
 		?>
 
 		<div id="give-donor-notes" class="postbox">
-			<?php if ( count( $donor_notes ) > 0 ) { ?>
-				<?php foreach ( $donor_notes as $key => $note ) : ?>
+			<?php if (count($donor_notes) > 0) { ?>
+				<?php foreach ($donor_notes as $key => $note) : ?>
 					<div class="donor-note-wrapper dashboard-comment-wrap comment-item">
 					<span class="note-content-wrap">
-						<?php echo stripslashes( $note ); ?>
+						<?php echo stripslashes($note); ?>
 					</span>
 					</div>
 				<?php endforeach; ?>
 			<?php } else { ?>
 				<div class="give-no-donor-notes">
-					<?php _e( 'No donor notes found.', 'give' ); ?>
+					<?php _e('No donor notes found.', 'give'); ?>
 				</div>
 			<?php } ?>
 		</div>
 
-		<?php echo paginate_links( $pagination_args ); ?>
+		<?php echo paginate_links($pagination_args); ?>
 
 	</div>
 
@@ -742,9 +742,9 @@ 
  *
  * @return void
  */
-function give_donor_delete_view( $donor ) {
+function give_donor_delete_view($donor) {
 
-	$donor_edit_role = apply_filters( 'give_edit_donors_role', 'edit_give_payments' );
+	$donor_edit_role = apply_filters('give_edit_donors_role', 'edit_give_payments');
 
 	/**
 	 * Fires in donor delete screen, above the content.
@@ -753,15 +753,15 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_delete_top', $donor );
+	do_action('give_donor_delete_top', $donor);
 	?>
 
 	<div class="info-wrapper donor-section">
 
-		<form id="delete-donor" method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $donor->id ); ?>">
+		<form id="delete-donor" method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$donor->id); ?>">
 
 			<div class="donor-notes-header">
-				<?php echo get_avatar( $donor->email, 30 ); ?> <span><?php echo $donor->name; ?></span>
+				<?php echo get_avatar($donor->email, 30); ?> <span><?php echo $donor->name; ?></span>
 			</div>
 
 
@@ -769,20 +769,20 @@ 
 
 				<span class="delete-donor-options">
 					<p>
-						<?php echo Give()->html->checkbox( array(
+						<?php echo Give()->html->checkbox(array(
 							'name' => 'give-donor-delete-confirm',
-						) ); ?>
-						<label for="give-donor-delete-confirm"><?php _e( 'Are you sure you want to delete this donor?', 'give' ); ?></label>
+						)); ?>
+						<label for="give-donor-delete-confirm"><?php _e('Are you sure you want to delete this donor?', 'give'); ?></label>
 					</p>
 
 					<p>
-						<?php echo Give()->html->checkbox( array(
+						<?php echo Give()->html->checkbox(array(
 							'name'    => 'give-donor-delete-records',
 							'options' => array(
 								'disabled' => true,
 							),
-						) ); ?>
-						<label for="give-donor-delete-records"><?php _e( 'Delete all associated donations and records?', 'give' ); ?></label>
+						)); ?>
+						<label for="give-donor-delete-records"><?php _e('Delete all associated donations and records?', 'give'); ?></label>
 					</p>
 
 					<?php
@@ -795,16 +795,16 @@ 
 					 *
 					 * @param object $donor The donor object being displayed.
 					 */
-					do_action( 'give_donor_delete_inputs', $donor );
+					do_action('give_donor_delete_inputs', $donor);
 					?>
 				</span>
 
 				<span id="donor-edit-actions">
 					<input type="hidden" name="customer_id" value="<?php echo $donor->id; ?>" />
-					<?php wp_nonce_field( 'delete-donor', '_wpnonce', false, true ); ?>
+					<?php wp_nonce_field('delete-donor', '_wpnonce', false, true); ?>
 					<input type="hidden" name="give_action" value="delete-donor" />
-					<input type="submit" disabled="disabled" id="give-delete-donor" class="button-primary" value="<?php _e( 'Delete Donor', 'give' ); ?>" />
-					<a id="give-delete-donor-cancel" href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ); ?>" class="delete"><?php _e( 'Cancel', 'give' ); ?></a>
+					<input type="submit" disabled="disabled" id="give-delete-donor" class="button-primary" value="<?php _e('Delete Donor', 'give'); ?>" />
+					<a id="give-delete-donor-cancel" href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id); ?>" class="delete"><?php _e('Cancel', 'give'); ?></a>
 				</span>
 
 			</div>
@@ -820,5 +820,5 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_delete_bottom', $donor );
+	do_action('give_donor_delete_bottom', $donor);
 }

includes/admin/donors/donor-functions.php

Spacing +28 added lines, -28 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,7 +23,7 @@ 
  *
  * @return array        The altered list of views.
  */
-function give_register_default_donor_views( $views ) {
+function give_register_default_donor_views($views) {
 
 	$default_views = array(
 		'overview' => 'give_donor_view',
@@ -31,11 +31,11 @@ 
 		'notes'    => 'give_donor_notes_view',
 	);
 
-	return array_merge( $views, $default_views );
+	return array_merge($views, $default_views);
 
 }
 
-add_filter( 'give_donor_views', 'give_register_default_donor_views', 1, 1 );
+add_filter('give_donor_views', 'give_register_default_donor_views', 1, 1);
 
 /**
  * Register a tab for the single donor view.
@@ -46,23 +46,23 @@ 
  *
  * @return array       The altered list of tabs
  */
-function give_register_default_donor_tabs( $tabs ) {
+function give_register_default_donor_tabs($tabs) {
 
 	$default_tabs = array(
 		'overview' => array(
 			'dashicon' => 'dashicons-admin-users',
-			'title' => __( 'Donor Profile', 'give' ),
+			'title' => __('Donor Profile', 'give'),
 		),
 		'notes'    => array(
 			'dashicon' => 'dashicons-admin-comments',
-			'title' => __( 'Donor Notes', 'give' ),
+			'title' => __('Donor Notes', 'give'),
 		),
 	);
 
-	return array_merge( $tabs, $default_tabs );
+	return array_merge($tabs, $default_tabs);
 }
 
-add_filter( 'give_donor_tabs', 'give_register_default_donor_tabs', 1, 1 );
+add_filter('give_donor_tabs', 'give_register_default_donor_tabs', 1, 1);
 
 /**
  * Register the Delete icon as late as possible so it's at the bottom.
@@ -73,17 +73,17 @@ 
  *
  * @return array       The altered list of tabs, with 'delete' at the bottom.
  */
-function give_register_delete_donor_tab( $tabs ) {
+function give_register_delete_donor_tab($tabs) {
 
 	$tabs['delete'] = array(
 		'dashicon' => 'dashicons-trash',
-		'title'    => __( 'Delete Donor', 'give' ),
+		'title'    => __('Delete Donor', 'give'),
 	);
 
 	return $tabs;
 }
 
-add_filter( 'give_donor_tabs', 'give_register_delete_donor_tab', PHP_INT_MAX, 1 );
+add_filter('give_donor_tabs', 'give_register_delete_donor_tab', PHP_INT_MAX, 1);
 
 /**
  * Connect and Reconnect Donor with User profile.
@@ -96,7 +96,7 @@ 
  *
  * @return array
  */
-function give_connect_user_donor_profile( $donor, $donor_data, $address ) {
+function give_connect_user_donor_profile($donor, $donor_data, $address) {
 
 	$donor_id         = $donor->id;
 	$previous_user_id = $donor->user_id;
@@ -110,40 +110,40 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_pre_edit_donor', $donor_id, $donor_data, $address );
+	do_action('give_pre_edit_donor', $donor_id, $donor_data, $address);
 
 	$output = array();
 
-	if ( $donor->update( $donor_data ) ) {
+	if ($donor->update($donor_data)) {
 
-		if ( ! empty( $donor->user_id ) && $donor->user_id > 0 ) {
-			update_user_meta( $donor->user_id, '_give_user_address', $address );
+		if ( ! empty($donor->user_id) && $donor->user_id > 0) {
+			update_user_meta($donor->user_id, '_give_user_address', $address);
 		}
 
 		// Update some donation meta if we need to.
-		$payments_array = explode( ',', $donor->payment_ids );
+		$payments_array = explode(',', $donor->payment_ids);
 
-		if ( $donor->user_id !== $previous_user_id ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, '_give_payment_user_id', $donor->user_id );
+		if ($donor->user_id !== $previous_user_id) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, '_give_payment_user_id', $donor->user_id);
 			}
 		}
 
 		// Fetch disconnected user id, if exists.
-		$disconnected_user_id = $donor->get_meta( '_give_disconnected_user_id', true );
+		$disconnected_user_id = $donor->get_meta('_give_disconnected_user_id', true);
 
 		// Flag User and Donor Disconnection.
-		delete_user_meta( $disconnected_user_id, '_give_is_donor_disconnected' );
+		delete_user_meta($disconnected_user_id, '_give_is_donor_disconnected');
 
 		// Check whether the disconnected user id and the reconnected user id are same or not.
 		// If both are same then delete user id store in donor meta.
-		if( $donor_data['user_id'] === $disconnected_user_id ) {
-			delete_user_meta( $disconnected_user_id, '_give_disconnected_donor_id' );
-			$donor->delete_meta( '_give_disconnected_user_id' );
+		if ($donor_data['user_id'] === $disconnected_user_id) {
+			delete_user_meta($disconnected_user_id, '_give_disconnected_donor_id');
+			$donor->delete_meta('_give_disconnected_user_id');
 		}
 
 		$output['success']       = true;
-		$donor_data              = array_merge( $donor_data, $address );
+		$donor_data              = array_merge($donor_data, $address);
 		$output['customer_info'] = $donor_data;
 
 	} else {
@@ -160,7 +160,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_post_edit_donor', $donor_id, $donor_data );
+	do_action('give_post_edit_donor', $donor_id, $donor_data);
 
 
 	return $output;

includes/admin/class-admin-settings.php

Indentation +5 added lines, -5 removed lines

@@ -93,8 +93,8 @@ 
 
 			// Show error message if Akismet not configured and Admin try to save 'enabled' option.
 			if ( isset( $_POST['akismet_spam_protection'] )
-			     && give_is_setting_enabled( $_POST['akismet_spam_protection'] )
-			     && ! give_check_akismet_key()
+				 && give_is_setting_enabled( $_POST['akismet_spam_protection'] )
+				 && ! give_check_akismet_key()
 			) {
 				self::add_error( 'give-akismet-protection', __( 'Please properly configure Akismet to enable SPAM protection.', 'give' ) );
 
@@ -763,9 +763,9 @@ 
                         <td class="give-docs-link" colspan="2">
 							<?php
 							echo '<p class="give-docs-link"><a href="' . esc_url( $value['url'] )
-							     . '" target="_blank">'
-							     . sprintf( esc_html__( 'Need Help? See docs on "%s"', 'give' ), $value['title'] )
-							     . '<span class="dashicons dashicons-editor-help"></span></a></p>';
+								 . '" target="_blank">'
+								 . sprintf( esc_html__( 'Need Help? See docs on "%s"', 'give' ), $value['title'] )
+								 . '<span class="dashicons dashicons-editor-help"></span></a></p>';
 							?>
                         </td>
                         </tr><?php

Spacing +218 added lines, -218 removed lines

@@ -9,11 +9,11 @@ 
  * @since       1.8
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'Give_Admin_Settings' ) ) :
+if ( ! class_exists('Give_Admin_Settings')) :
 
 	/**
 	 * Give_Admin_Settings Class.
@@ -72,7 +72,7 @@ 
 			 *
 			 * @param array $settings Array of settings class object.
 			 */
-			self::$settings = apply_filters( self::$setting_filter_prefix . '_get_settings_pages', array() );
+			self::$settings = apply_filters(self::$setting_filter_prefix.'_get_settings_pages', array());
 
 			return self::$settings;
 		}
@@ -86,17 +86,17 @@ 
 		public static function save() {
 			$current_tab = give_get_current_setting_tab();
 
-			if ( empty( $_REQUEST['_give-save-settings'] ) || ! wp_verify_nonce( $_REQUEST['_give-save-settings'], 'give-save-settings' ) ) {
-				echo '<div class="notice error"><p>' . __( 'Action failed. Please refresh the page and retry.', 'give' ) . '</p></div>';
+			if (empty($_REQUEST['_give-save-settings']) || ! wp_verify_nonce($_REQUEST['_give-save-settings'], 'give-save-settings')) {
+				echo '<div class="notice error"><p>'.__('Action failed. Please refresh the page and retry.', 'give').'</p></div>';
 				die();
 			}
 
 			// Show error message if Akismet not configured and Admin try to save 'enabled' option.
-			if ( isset( $_POST['akismet_spam_protection'] )
-			     && give_is_setting_enabled( $_POST['akismet_spam_protection'] )
+			if (isset($_POST['akismet_spam_protection'])
+			     && give_is_setting_enabled($_POST['akismet_spam_protection'])
 			     && ! give_check_akismet_key()
 			) {
-				self::add_error( 'give-akismet-protection', __( 'Please properly configure Akismet to enable SPAM protection.', 'give' ) );
+				self::add_error('give-akismet-protection', __('Please properly configure Akismet to enable SPAM protection.', 'give'));
 
 				return;
 			}
@@ -110,9 +110,9 @@ 
 			 *
 			 * @since 1.8
 			 */
-			do_action( self::$setting_filter_prefix . '_save_' . $current_tab );
+			do_action(self::$setting_filter_prefix.'_save_'.$current_tab);
 
-			self::add_message( 'give-setting-updated', __( 'Your settings have been saved.', 'give' ) );
+			self::add_message('give-setting-updated', __('Your settings have been saved.', 'give'));
 
 			/**
 			 * Trigger Action.
@@ -123,7 +123,7 @@ 
 			 *
 			 * @since 1.8
 			 */
-			do_action( self::$setting_filter_prefix . '_saved' );
+			do_action(self::$setting_filter_prefix.'_saved');
 		}
 
 		/**
@@ -136,8 +136,8 @@ 
 		 *
 		 * @return void
 		 */
-		public static function add_message( $code, $message ) {
-			self::$messages[ $code ] = $message;
+		public static function add_message($code, $message) {
+			self::$messages[$code] = $message;
 		}
 
 		/**
@@ -150,8 +150,8 @@ 
 		 *
 		 * @return void
 		 */
-		public static function add_error( $code, $message ) {
-			self::$errors[ $code ] = $message;
+		public static function add_error($code, $message) {
+			self::$errors[$code] = $message;
 		}
 
 		/**
@@ -164,18 +164,18 @@ 
 			$notice_html = '';
 			$classes     = 'give-notice settings-error notice is-dismissible';
 
-			self::$errors   = apply_filters( self::$setting_filter_prefix . '_error_notices', self::$errors );
-			self::$messages = apply_filters( self::$setting_filter_prefix . '_update_notices', self::$messages );
+			self::$errors   = apply_filters(self::$setting_filter_prefix.'_error_notices', self::$errors);
+			self::$messages = apply_filters(self::$setting_filter_prefix.'_update_notices', self::$messages);
 
-			if ( 0 < count( self::$errors ) ) {
-				foreach ( self::$errors as $code => $message ) {
-					$notice_html .= '<div id="setting-error-' . $code . '" class="' . $classes . ' error"><p><strong>' . $message . '</strong></p></div>';
+			if (0 < count(self::$errors)) {
+				foreach (self::$errors as $code => $message) {
+					$notice_html .= '<div id="setting-error-'.$code.'" class="'.$classes.' error"><p><strong>'.$message.'</strong></p></div>';
 				}
 			}
 
-			if ( 0 < count( self::$messages ) ) {
-				foreach ( self::$messages as $code => $message ) {
-					$notice_html .= '<div id="setting-error-' . $code . '" class="' . $classes . ' updated"><p><strong>' . $message . '</strong></p></div>';
+			if (0 < count(self::$messages)) {
+				foreach (self::$messages as $code => $message) {
+					$notice_html .= '<div id="setting-error-'.$code.'" class="'.$classes.' updated"><p><strong>'.$message.'</strong></p></div>';
 				}
 			}
 
@@ -195,7 +195,7 @@ 
 			self::$setting_filter_prefix = give_get_current_setting_page();
 
 			// Bailout: Exit if setting page is not defined.
-			if ( empty( self::$setting_filter_prefix ) ) {
+			if (empty(self::$setting_filter_prefix)) {
 				return false;
 			}
 
@@ -208,7 +208,7 @@ 
 			 *
 			 * @since 1.8
 			 */
-			do_action( self::$setting_filter_prefix . '_start' );
+			do_action(self::$setting_filter_prefix.'_start');
 
 			$current_tab = give_get_current_setting_tab();
 
@@ -216,7 +216,7 @@ 
 			self::get_settings_pages();
 
 			// Save settings if data has been posted.
-			if ( ! empty( $_POST ) ) {
+			if ( ! empty($_POST)) {
 				self::save();
 			}
 
@@ -229,7 +229,7 @@ 
 			 *
 			 * @since 1.8
 			 */
-			$tabs = apply_filters( self::$setting_filter_prefix . '_tabs_array', array() );
+			$tabs = apply_filters(self::$setting_filter_prefix.'_tabs_array', array());
 
 			include 'views/html-admin-settings.php';
 
@@ -247,25 +247,25 @@ 
 		 *
 		 * @return string|bool
 		 */
-		public static function get_option( $option_name = '', $field_id = '', $default = false ) {
+		public static function get_option($option_name = '', $field_id = '', $default = false) {
 			// Bailout.
-			if ( empty( $option_name ) && empty( $field_id ) ) {
+			if (empty($option_name) && empty($field_id)) {
 				return false;
 			}
 
-			if ( ! empty( $field_id ) && ! empty( $option_name ) ) {
+			if ( ! empty($field_id) && ! empty($option_name)) {
 				// Get field value if any.
-				$option_value = get_option( $option_name );
+				$option_value = get_option($option_name);
 
-				$option_value = ( is_array( $option_value ) && array_key_exists( $field_id, $option_value ) )
-					? $option_value[ $field_id ]
+				$option_value = (is_array($option_value) && array_key_exists($field_id, $option_value))
+					? $option_value[$field_id]
 					: $default;
 			} else {
 				// If option name is empty but not field name then this means, setting is direct store to option table under there field name.
 				$option_name = ! $option_name ? $field_id : $option_name;
 
 				// Get option value if any.
-				$option_value = get_option( $option_name, $default );
+				$option_value = get_option($option_name, $default);
 			}
 
 			return $option_value;
@@ -283,7 +283,7 @@ 
 		 *
 		 * @return void
 		 */
-		public static function output_fields( $options, $option_name = '' ) {
+		public static function output_fields($options, $option_name = '') {
 			$current_tab = give_get_current_setting_tab();
 
 			// Field Default values.
@@ -296,52 +296,52 @@ 
 				'table_html' => true,
 			);
 
-			foreach ( $options as $value ) {
-				if ( ! isset( $value['type'] ) ) {
+			foreach ($options as $value) {
+				if ( ! isset($value['type'])) {
 					continue;
 				}
 
 				// Set title.
-				$defaults['title'] = isset( $value['name'] ) ? $value['name'] : '';
+				$defaults['title'] = isset($value['name']) ? $value['name'] : '';
 
 				// Set default setting.
-				$value = wp_parse_args( $value, $defaults );
+				$value = wp_parse_args($value, $defaults);
 
 				// Colorpicker field.
-				$value['class'] = ( 'colorpicker' === $value['type'] ? trim( $value['class'] ) . ' give-colorpicker' : $value['class'] );
-				$value['type']  = ( 'colorpicker' === $value['type'] ? 'text' : $value['type'] );
+				$value['class'] = ('colorpicker' === $value['type'] ? trim($value['class']).' give-colorpicker' : $value['class']);
+				$value['type']  = ('colorpicker' === $value['type'] ? 'text' : $value['type']);
 
 
 				// Custom attribute handling.
 				$custom_attributes = array();
 
-				if ( ! empty( $value['attributes'] ) && is_array( $value['attributes'] ) ) {
-					foreach ( $value['attributes'] as $attribute => $attribute_value ) {
-						$custom_attributes[] = esc_attr( $attribute ) . '="' . esc_attr( $attribute_value ) . '"';
+				if ( ! empty($value['attributes']) && is_array($value['attributes'])) {
+					foreach ($value['attributes'] as $attribute => $attribute_value) {
+						$custom_attributes[] = esc_attr($attribute).'="'.esc_attr($attribute_value).'"';
 					}
 				}
 
 				// Description handling.
-				$description          = self::get_field_description( $value );
+				$description = self::get_field_description($value);
 
 				// Switch based on type.
-				switch ( $value['type'] ) {
+				switch ($value['type']) {
 
 					// Section Titles
 					case 'title':
-						if ( ! empty( $value['title'] ) ) {
-							echo '<div class="give-setting-tab-header give-setting-tab-header-' . $current_tab . '"><h2>' . self::get_field_title( $value ) . '</h2><hr></div>';
+						if ( ! empty($value['title'])) {
+							echo '<div class="give-setting-tab-header give-setting-tab-header-'.$current_tab.'"><h2>'.self::get_field_title($value).'</h2><hr></div>';
 						}
 
-						if ( ! empty( $value['desc'] ) ) {
-							echo wpautop( wptexturize( wp_kses_post( $value['desc'] ) ) );
+						if ( ! empty($value['desc'])) {
+							echo wpautop(wptexturize(wp_kses_post($value['desc'])));
 						}
 
-						if ( $value['table_html'] ) {
-							echo '<table class="form-table give-setting-tab-body give-setting-tab-body-' . $current_tab . '">' . "\n\n";
+						if ($value['table_html']) {
+							echo '<table class="form-table give-setting-tab-body give-setting-tab-body-'.$current_tab.'">'."\n\n";
 						}
 
-						if ( ! empty( $value['id'] ) ) {
+						if ( ! empty($value['id'])) {
 
 							/**
 							 * Trigger Action.
@@ -350,14 +350,14 @@ 
 							 *
 							 * @since 1.8
 							 */
-							do_action( 'give_settings_' . sanitize_title( $value['id'] ) );
+							do_action('give_settings_'.sanitize_title($value['id']));
 						}
 
 						break;
 
 					// Section Ends.
 					case 'sectionend':
-						if ( ! empty( $value['id'] ) ) {
+						if ( ! empty($value['id'])) {
 
 							/**
 							 * Trigger Action.
@@ -366,14 +366,14 @@ 
 							 *
 							 * @since 1.8
 							 */
-							do_action( 'give_settings_' . sanitize_title( $value['id'] ) . '_end' );
+							do_action('give_settings_'.sanitize_title($value['id']).'_end');
 						}
 
-						if ( $value['table_html'] ) {
+						if ($value['table_html']) {
 							echo '</table>';
 						}
 
-						if ( ! empty( $value['id'] ) ) {
+						if ( ! empty($value['id'])) {
 
 							/**
 							 * Trigger Action.
@@ -382,7 +382,7 @@ 
 							 *
 							 * @since 1.8
 							 */
-							do_action( 'give_settings_' . sanitize_title( $value['id'] ) . '_after' );
+							do_action('give_settings_'.sanitize_title($value['id']).'_after');
 						}
 
 						break;
@@ -390,27 +390,27 @@ 
 					// Standard text inputs and subtypes like 'number'.
 					case 'colorpicker':
 					case 'hidden' :
-						$value['wrapper_class'] = empty( $value['wrapper_class'] ) ? 'give-hidden' : trim( $value['wrapper_class'] ) . ' give-hidden';
+						$value['wrapper_class'] = empty($value['wrapper_class']) ? 'give-hidden' : trim($value['wrapper_class']).' give-hidden';
 					case 'text':
 					case 'email':
 					case 'number':
 					case 'password' :
 						$type = $value['type'];
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
 						?>
-						<tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+						<tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
 							<th scope="row" class="titledesc">
-								<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+								<label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
 							</th>
-							<td class="give-forminp give-forminp-<?php echo sanitize_title( $value['type'] ) ?>">
+							<td class="give-forminp give-forminp-<?php echo sanitize_title($value['type']) ?>">
 								<input
-										name="<?php echo esc_attr( $value['id'] ); ?>"
-										id="<?php echo esc_attr( $value['id'] ); ?>"
-										type="<?php echo esc_attr( $type ); ?>"
-										style="<?php echo esc_attr( $value['css'] ); ?>"
-										value="<?php echo esc_attr( $option_value ); ?>"
-										class="give-input-field<?php echo( empty( $value['class'] ) ? '' : ' ' . esc_attr( $value['class'] ) ); ?>"
-									<?php echo implode( ' ', $custom_attributes ); ?>
+										name="<?php echo esc_attr($value['id']); ?>"
+										id="<?php echo esc_attr($value['id']); ?>"
+										type="<?php echo esc_attr($type); ?>"
+										style="<?php echo esc_attr($value['css']); ?>"
+										value="<?php echo esc_attr($option_value); ?>"
+										class="give-input-field<?php echo(empty($value['class']) ? '' : ' '.esc_attr($value['class'])); ?>"
+									<?php echo implode(' ', $custom_attributes); ?>
 								/> <?php echo $description; ?>
 							</td>
 						</tr>
@@ -420,23 +420,23 @@ 
 					// Textarea.
 					case 'textarea':
 
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
 
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <th scope="row" class="titledesc">
-                            <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                            <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                         </th>
-                        <td class="give-forminp give-forminp-<?php echo sanitize_title( $value['type'] ) ?>">
+                        <td class="give-forminp give-forminp-<?php echo sanitize_title($value['type']) ?>">
 								<textarea
-                                        name="<?php echo esc_attr( $value['id'] ); ?>"
-                                        id="<?php echo esc_attr( $value['id'] ); ?>"
-                                        style="<?php echo esc_attr( $value['css'] ); ?>"
-                                        class="<?php echo esc_attr( $value['class'] ); ?>"
+                                        name="<?php echo esc_attr($value['id']); ?>"
+                                        id="<?php echo esc_attr($value['id']); ?>"
+                                        style="<?php echo esc_attr($value['css']); ?>"
+                                        class="<?php echo esc_attr($value['class']); ?>"
                                         rows="10"
                                         cols="60"
-									<?php echo implode( ' ', $custom_attributes ); ?>
-                                ><?php echo esc_textarea( $option_value ); ?></textarea>
+									<?php echo implode(' ', $custom_attributes); ?>
+                                ><?php echo esc_textarea($option_value); ?></textarea>
 							<?php echo $description; ?>
                         </td>
                         </tr><?php
@@ -446,35 +446,35 @@ 
 					case 'select' :
 					case 'multiselect' :
 
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
 
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <th scope="row" class="titledesc">
-                            <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                            <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                         </th>
-                        <td class="give-forminp give-forminp-<?php echo sanitize_title( $value['type'] ) ?>">
+                        <td class="give-forminp give-forminp-<?php echo sanitize_title($value['type']) ?>">
                             <select
-                                    name="<?php echo esc_attr( $value['id'] ); ?><?php if ( $value['type'] == 'multiselect' ) {
+                                    name="<?php echo esc_attr($value['id']); ?><?php if ($value['type'] == 'multiselect') {
 										echo '[]';
 									} ?>"
-                                    id="<?php echo esc_attr( $value['id'] ); ?>"
-                                    style="<?php echo esc_attr( $value['css'] ); ?>"
-                                    class="<?php echo esc_attr( $value['class'] ); ?>"
-								<?php echo implode( ' ', $custom_attributes ); ?>
-								<?php echo ( 'multiselect' == $value['type'] ) ? 'multiple="multiple"' : ''; ?>
+                                    id="<?php echo esc_attr($value['id']); ?>"
+                                    style="<?php echo esc_attr($value['css']); ?>"
+                                    class="<?php echo esc_attr($value['class']); ?>"
+								<?php echo implode(' ', $custom_attributes); ?>
+								<?php echo ('multiselect' == $value['type']) ? 'multiple="multiple"' : ''; ?>
                             >
 
 								<?php
-								if ( ! empty( $value['options'] ) ) {
-									foreach ( $value['options'] as $key => $val ) {
+								if ( ! empty($value['options'])) {
+									foreach ($value['options'] as $key => $val) {
 										?>
-                                        <option value="<?php echo esc_attr( $key ); ?>" <?php
+                                        <option value="<?php echo esc_attr($key); ?>" <?php
 
-										if ( is_array( $option_value ) ) {
-											selected( in_array( $key, $option_value ), true );
+										if (is_array($option_value)) {
+											selected(in_array($key, $option_value), true);
 										} else {
-											selected( $option_value, $key );
+											selected($option_value, $key);
 										}
 
 										?>><?php echo $val ?></option>
@@ -490,28 +490,28 @@ 
 
 					// Radio inputs.
 					case 'radio_inline' :
-						$value['class'] = empty( $value['class'] ) ? 'give-radio-inline' : $value['class'] . ' give-radio-inline';
+						$value['class'] = empty($value['class']) ? 'give-radio-inline' : $value['class'].' give-radio-inline';
 					case 'radio' :
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <th scope="row" class="titledesc">
-                            <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                            <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                         </th>
-                        <td class="give-forminp give-forminp-<?php echo sanitize_title( $value['type'] ) ?> <?php echo( ! empty( $value['class'] ) ? $value['class'] : '' ); ?>">
+                        <td class="give-forminp give-forminp-<?php echo sanitize_title($value['type']) ?> <?php echo( ! empty($value['class']) ? $value['class'] : ''); ?>">
                             <fieldset>
                                 <ul>
 									<?php
-									foreach ( $value['options'] as $key => $val ) {
+									foreach ($value['options'] as $key => $val) {
 										?>
                                         <li>
                                             <label><input
-                                                        name="<?php echo esc_attr( $value['id'] ); ?>"
+                                                        name="<?php echo esc_attr($value['id']); ?>"
                                                         value="<?php echo $key; ?>"
                                                         type="radio"
-                                                        style="<?php echo esc_attr( $value['css'] ); ?>"
-													<?php echo implode( ' ', $custom_attributes ); ?>
-													<?php checked( $key, $option_value ); ?>
+                                                        style="<?php echo esc_attr($value['css']); ?>"
+													<?php echo implode(' ', $custom_attributes); ?>
+													<?php checked($key, $option_value); ?>
                                                 /> <?php echo $val ?></label>
                                         </li>
 										<?php
@@ -525,21 +525,21 @@ 
 
 					// Checkbox input.
 					case 'checkbox' :
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
 						?>
-                        <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                        <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                             <th scope="row" class="titledesc">
-                                <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                                <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                             </th>
                             <td class="give-forminp">
                                 <input
-                                        name="<?php echo esc_attr( $value['id'] ); ?>"
-                                        id="<?php echo esc_attr( $value['id'] ); ?>"
+                                        name="<?php echo esc_attr($value['id']); ?>"
+                                        id="<?php echo esc_attr($value['id']); ?>"
                                         type="checkbox"
-                                        class="<?php echo esc_attr( isset( $value['class'] ) ? $value['class'] : '' ); ?>"
+                                        class="<?php echo esc_attr(isset($value['class']) ? $value['class'] : ''); ?>"
                                         value="1"
-									<?php checked( $option_value, 'on' ); ?>
-									<?php echo implode( ' ', $custom_attributes ); ?>
+									<?php checked($option_value, 'on'); ?>
+									<?php echo implode(' ', $custom_attributes); ?>
                                 />
 								<?php echo $description; ?>
                             </td>
@@ -549,28 +549,28 @@ 
 
 					// Multi Checkbox input.
 					case 'multicheck' :
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
-						$option_value = is_array( $option_value ) ? $option_value : array();
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
+						$option_value = is_array($option_value) ? $option_value : array();
 						?>
-                        <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                        <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                             <th scope="row" class="titledesc">
-                                <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                                <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                             </th>
-                            <td class="give-forminp give-forminp-<?php echo sanitize_title( $value['type'] ) ?> <?php echo( ! empty( $value['class'] ) ? $value['class'] : '' ); ?>">
+                            <td class="give-forminp give-forminp-<?php echo sanitize_title($value['type']) ?> <?php echo( ! empty($value['class']) ? $value['class'] : ''); ?>">
                                 <fieldset>
                                     <ul>
 										<?php
-										foreach ( $value['options'] as $key => $val ) {
+										foreach ($value['options'] as $key => $val) {
 											?>
                                             <li>
                                                 <label>
                                                     <input
-                                                            name="<?php echo esc_attr( $value['id'] ); ?>[]"
+                                                            name="<?php echo esc_attr($value['id']); ?>[]"
                                                             value="<?php echo $key; ?>"
                                                             type="checkbox"
-                                                            style="<?php echo esc_attr( $value['css'] ); ?>"
-														<?php echo implode( ' ', $custom_attributes ); ?>
-														<?php if ( in_array( $key, $option_value ) ) {
+                                                            style="<?php echo esc_attr($value['css']); ?>"
+														<?php echo implode(' ', $custom_attributes); ?>
+														<?php if (in_array($key, $option_value)) {
 															echo 'checked="checked"';
 														} ?>
                                                     /> <?php echo $val ?>
@@ -589,35 +589,35 @@ 
 					// File input field.
 					case 'file' :
 					case 'media' :
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
-						$button_label = esc_html__( sprintf( 'Add or Upload %s', ( 'file' === $value['type'] ? 'File' : 'Image' ) ), 'give' );
-						$fvalue       = empty( $value['fvalue'] ) ? 'url' : $value['fvalue'];
-
-						$allow_media_preview_tags = array( 'jpg', 'jpeg', 'png', 'gif', 'ico' );
-						$preview_image_src        = $option_value ? ( 'id' === $fvalue ? wp_get_attachment_url( $option_value ) : $option_value ) : '#';
-						$preview_image_extension  = $preview_image_src ? pathinfo( $preview_image_src, PATHINFO_EXTENSION ) : '';
-						$is_show_preview = in_array( $preview_image_extension, $allow_media_preview_tags );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
+						$button_label = esc_html__(sprintf('Add or Upload %s', ('file' === $value['type'] ? 'File' : 'Image')), 'give');
+						$fvalue       = empty($value['fvalue']) ? 'url' : $value['fvalue'];
+
+						$allow_media_preview_tags = array('jpg', 'jpeg', 'png', 'gif', 'ico');
+						$preview_image_src        = $option_value ? ('id' === $fvalue ? wp_get_attachment_url($option_value) : $option_value) : '#';
+						$preview_image_extension  = $preview_image_src ? pathinfo($preview_image_src, PATHINFO_EXTENSION) : '';
+						$is_show_preview = in_array($preview_image_extension, $allow_media_preview_tags);
 						?>
-						<tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+						<tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
 							<th scope="row" class="titledesc">
-								<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+								<label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
 							</th>
 							<td class="give-forminp">
 								<div class="give-field-wrap">
 									<label for="<?php echo $value['id'] ?>">
 										<input
-												name="<?php echo esc_attr( $value['id'] ); ?>"
-												id="<?php echo esc_attr( $value['id'] ); ?>"
+												name="<?php echo esc_attr($value['id']); ?>"
+												id="<?php echo esc_attr($value['id']); ?>"
 												type="text"
-												class="give-input-field<?php echo esc_attr( isset( $value['class'] ) ? ' ' . $value['class'] : '' ); ?>"
+												class="give-input-field<?php echo esc_attr(isset($value['class']) ? ' '.$value['class'] : ''); ?>"
 												value="<?php echo $option_value; ?>"
-												style="<?php echo esc_attr( $value['css'] ); ?>"
-											<?php echo implode( ' ', $custom_attributes ); ?>
+												style="<?php echo esc_attr($value['css']); ?>"
+											<?php echo implode(' ', $custom_attributes); ?>
 										/>&nbsp;&nbsp;&nbsp;&nbsp;<input class="give-upload-button button" type="button" data-fvalue="<?php echo $fvalue; ?>" data-field-type="<?php echo $value['type']; ?>" value="<?php echo $button_label; ?>">
 										<?php echo $description ?>
 										<div class="give-image-thumb<?php echo ! $option_value || ! $is_show_preview ? ' give-hidden' : ''; ?>">
 											<span class="give-delete-image-thumb dashicons dashicons-no-alt"></span>
-											<img src="<?php echo $preview_image_src ; ?>" alt="">
+											<img src="<?php echo $preview_image_src; ?>" alt="">
 										</div>
 									</label>
 								</div>
@@ -629,17 +629,17 @@ 
 					// WordPress Editor.
 					case 'wysiwyg' :
 						// Get option value.
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
 
 						// Get editor settings.
-						$editor_settings = ! empty( $value['options'] ) ? $value['options'] : array();
+						$editor_settings = ! empty($value['options']) ? $value['options'] : array();
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <th scope="row" class="titledesc">
-                            <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                            <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                         </th>
                         <td class="give-forminp">
-							<?php wp_editor( $option_value, $value['id'], $editor_settings ); ?>
+							<?php wp_editor($option_value, $value['id'], $editor_settings); ?>
 							<?php echo $description; ?>
                         </td>
                         </tr><?php
@@ -648,9 +648,9 @@ 
 					// Custom: System setting field.
 					case 'system_info' :
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <th scope="row" class="titledesc">
-                            <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                            <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                         </th>
                         <td class="give-forminp">
 							<?php give_system_info_callback(); ?>
@@ -661,14 +661,14 @@ 
 
 					// Custom: Default gateways setting field.
 					case 'default_gateway' :
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <th scope="row" class="titledesc">
-                            <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                            <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                         </th>
                         <td class="give-forminp">
-							<?php give_default_gateway_callback( $value, $option_value ); ?>
+							<?php give_default_gateway_callback($value, $option_value); ?>
 							<?php echo $description; ?>
                         </td>
                         </tr><?php
@@ -676,14 +676,14 @@ 
 
 					// Custom: Enable gateways setting field.
 					case 'enabled_gateways' :
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <th scope="row" class="titledesc">
-                            <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                            <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                         </th>
                         <td class="give-forminp">
-							<?php give_enabled_gateways_callback( $value, $option_value ); ?>
+							<?php give_enabled_gateways_callback($value, $option_value); ?>
 							<?php echo $description; ?>
                         </td>
                         </tr><?php
@@ -692,9 +692,9 @@ 
 					// Custom: Email preview buttons field.
 					case 'email_preview_buttons' :
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <th scope="row" class="titledesc">
-                            <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                            <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                         </th>
                         <td class="give-forminp">
 							<?php give_email_preview_buttons_callback(); ?>
@@ -711,22 +711,22 @@ 
 
 					// Custom: Gateway API key.
 					case 'api_key' :
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
-						$type         = ! empty( $option_value ) ? 'password' : 'text';
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
+						$type         = ! empty($option_value) ? 'password' : 'text';
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <th scope="row" class="titledesc">
-                            <label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo self::get_field_title( $value ); ?></label>
+                            <label for="<?php echo esc_attr($value['id']); ?>"><?php echo self::get_field_title($value); ?></label>
                         </th>
-                        <td class="give-forminp give-forminp-<?php echo sanitize_title( $value['type'] ) ?>">
+                        <td class="give-forminp give-forminp-<?php echo sanitize_title($value['type']) ?>">
                             <input
-                                    name="<?php echo esc_attr( $value['id'] ); ?>"
-                                    id="<?php echo esc_attr( $value['id'] ); ?>"
-                                    type="<?php echo esc_attr( $type ); ?>"
-                                    style="<?php echo esc_attr( $value['css'] ); ?>"
-                                    value="<?php echo esc_attr( trim( $option_value ) ); ?>"
-                                    class="give-input-field<?php echo( empty( $value['class'] ) ? '' : ' ' . esc_attr( $value['class'] ) ); ?>"
-								<?php echo implode( ' ', $custom_attributes ); ?>
+                                    name="<?php echo esc_attr($value['id']); ?>"
+                                    id="<?php echo esc_attr($value['id']); ?>"
+                                    type="<?php echo esc_attr($type); ?>"
+                                    style="<?php echo esc_attr($value['css']); ?>"
+                                    value="<?php echo esc_attr(trim($option_value)); ?>"
+                                    class="give-input-field<?php echo(empty($value['class']) ? '' : ' '.esc_attr($value['class'])); ?>"
+								<?php echo implode(' ', $custom_attributes); ?>
                             /> <?php echo $description; ?>
                         </td>
                         </tr><?php
@@ -743,7 +743,7 @@ 
 						 *
 						 * @since 1.0
 						 */
-						do_action( "give_logs_view_{$current_section}" );
+						do_action("give_logs_view_{$current_section}");
 
 						echo $description;
 						break;
@@ -751,7 +751,7 @@ 
 					// Custom: Data field.
 					case 'data' :
 
-						include  GIVE_PLUGIN_DIR . 'includes/admin/tools/views/html-admin-page-data.php';
+						include  GIVE_PLUGIN_DIR.'includes/admin/tools/views/html-admin-page-data.php';
 
 						echo $description;
 						break;
@@ -759,12 +759,12 @@ 
 					// Custom: Give Docs Link field type.
 					case 'give_docs_link' :
 						?>
-                    <tr valign="top" <?php echo ! empty( $value['wrapper_class'] ) ? 'class="' . $value['wrapper_class'] . '"' : '' ?>>
+                    <tr valign="top" <?php echo ! empty($value['wrapper_class']) ? 'class="'.$value['wrapper_class'].'"' : '' ?>>
                         <td class="give-docs-link" colspan="2">
 							<?php
-							echo '<p class="give-docs-link"><a href="' . esc_url( $value['url'] )
+							echo '<p class="give-docs-link"><a href="'.esc_url($value['url'])
 							     . '" target="_blank">'
-							     . sprintf( esc_html__( 'Need Help? See docs on "%s"', 'give' ), $value['title'] )
+							     . sprintf(esc_html__('Need Help? See docs on "%s"', 'give'), $value['title'])
 							     . '<span class="dashicons dashicons-editor-help"></span></a></p>';
 							?>
                         </td>
@@ -775,8 +775,8 @@ 
 					// You can add or handle your custom field action.
 					default:
 						// Get option value.
-						$option_value = self::get_option( $option_name, $value['id'], $value['default'] );
-						do_action( 'give_admin_field_' . $value['type'], $value, $option_value );
+						$option_value = self::get_option($option_name, $value['id'], $value['default']);
+						do_action('give_admin_field_'.$value['type'], $value, $option_value);
 						break;
 				}
 			}
@@ -792,15 +792,15 @@ 
 		 *
 		 * @return string The HTML description of the field.
 		 */
-		public static function get_field_description( $value ) {
+		public static function get_field_description($value) {
 			$description = '';
 
 			// Support for both 'description' and 'desc' args.
-			$description_key = isset( $value['description'] ) ? 'description' : 'desc';
-			$value           = ( isset( $value[ $description_key ] ) && ! empty( $value[ $description_key ] ) ) ? $value[ $description_key ] : '';
+			$description_key = isset($value['description']) ? 'description' : 'desc';
+			$value           = (isset($value[$description_key]) && ! empty($value[$description_key])) ? $value[$description_key] : '';
 
-			if ( ! empty( $value ) ) {
-				$description = '<p class="give-field-description">' . wp_kses_post( $value ) . '</p>';
+			if ( ! empty($value)) {
+				$description = '<p class="give-field-description">'.wp_kses_post($value).'</p>';
 			}
 
 			return $description;
@@ -817,11 +817,11 @@ 
 		 *
 		 * @return array The description and tip as a 2 element array
 		 */
-		public static function get_field_title( $value ) {
-			$title = esc_html( $value['title'] );
+		public static function get_field_title($value) {
+			$title = esc_html($value['title']);
 
 			// If html tag detected then allow them to print.
-			if ( strip_tags( $title ) ) {
+			if (strip_tags($title)) {
 				$title = $value['title'];
 			}
 
@@ -840,8 +840,8 @@ 
 		 *
 		 * @return bool
 		 */
-		public static function save_fields( $options, $option_name = '' ) {
-			if ( empty( $_POST ) ) {
+		public static function save_fields($options, $option_name = '') {
+			if (empty($_POST)) {
 				return false;
 			}
 
@@ -849,37 +849,37 @@ 
 			$update_options = array();
 
 			// Loop options and get values to save.
-			foreach ( $options as $option ) {
-				if ( ! isset( $option['id'] ) || ! isset( $option['type'] ) ) {
+			foreach ($options as $option) {
+				if ( ! isset($option['id']) || ! isset($option['type'])) {
 					continue;
 				}
 
 				// Get posted value.
-				if ( strstr( $option['id'], '[' ) ) {
-					parse_str( $option['id'], $option_name_array );
-					$field_option_name = current( array_keys( $option_name_array ) );
-					$setting_name      = key( $option_name_array[ $field_option_name ] );
-					$raw_value         = isset( $_POST[ $field_option_name ][ $setting_name ] ) ? wp_unslash( $_POST[ $field_option_name ][ $setting_name ] ) : null;
+				if (strstr($option['id'], '[')) {
+					parse_str($option['id'], $option_name_array);
+					$field_option_name = current(array_keys($option_name_array));
+					$setting_name      = key($option_name_array[$field_option_name]);
+					$raw_value         = isset($_POST[$field_option_name][$setting_name]) ? wp_unslash($_POST[$field_option_name][$setting_name]) : null;
 				} else {
 					$field_option_name = $option['id'];
 					$setting_name      = '';
-					$raw_value         = isset( $_POST[ $option['id'] ] ) ? wp_unslash( $_POST[ $option['id'] ] ) : null;
+					$raw_value         = isset($_POST[$option['id']]) ? wp_unslash($_POST[$option['id']]) : null;
 				}
 
 				// Format the value based on option type.
-				switch ( $option['type'] ) {
+				switch ($option['type']) {
 					case 'checkbox' :
-						$value = is_null( $raw_value ) ? '' : 'on';
+						$value = is_null($raw_value) ? '' : 'on';
 						break;
 					case 'wysiwyg'  :
 					case 'textarea' :
-						$value = wp_kses_post( trim( $raw_value ) );
+						$value = wp_kses_post(trim($raw_value));
 						break;
 					case 'multiselect' :
-						$value = array_filter( array_map( 'give_clean', (array) $raw_value ) );
+						$value = array_filter(array_map('give_clean', (array) $raw_value));
 						break;
 					default :
-						$value = give_clean( $raw_value );
+						$value = give_clean($raw_value);
 						break;
 				}
 
@@ -888,37 +888,37 @@ 
 				 *
 				 * @since 1.8
 				 */
-				$value = apply_filters( 'give_admin_settings_sanitize_option', $value, $option, $raw_value );
+				$value = apply_filters('give_admin_settings_sanitize_option', $value, $option, $raw_value);
 
 				/**
 				 * Sanitize the value of an option by option name.
 				 *
 				 * @since 1.8
 				 */
-				$value = apply_filters( "give_admin_settings_sanitize_option_{$field_option_name}", $value, $option, $raw_value );
+				$value = apply_filters("give_admin_settings_sanitize_option_{$field_option_name}", $value, $option, $raw_value);
 
-				if ( is_null( $value ) ) {
+				if (is_null($value)) {
 					continue;
 				}
 
 				// Check if option is an array and handle that differently to single values.
-				if ( $field_option_name && $setting_name ) {
-					if ( ! isset( $update_options[ $field_option_name ] ) ) {
-						$update_options[ $field_option_name ] = get_option( $field_option_name, array() );
+				if ($field_option_name && $setting_name) {
+					if ( ! isset($update_options[$field_option_name])) {
+						$update_options[$field_option_name] = get_option($field_option_name, array());
 					}
-					if ( ! is_array( $update_options[ $field_option_name ] ) ) {
-						$update_options[ $field_option_name ] = array();
+					if ( ! is_array($update_options[$field_option_name])) {
+						$update_options[$field_option_name] = array();
 					}
-					$update_options[ $field_option_name ][ $setting_name ] = $value;
+					$update_options[$field_option_name][$setting_name] = $value;
 				} else {
-					$update_options[ $field_option_name ] = $value;
+					$update_options[$field_option_name] = $value;
 				}
 			}
 
 			// Save all options in our array or there own option name i.e. option id.
-			if ( empty( $option_name ) ) {
-				foreach ( $update_options as $name => $value ) {
-					update_option( $name, $value );
+			if (empty($option_name)) {
+				foreach ($update_options as $name => $value) {
+					update_option($name, $value);
 
 					/**
 					 * Trigger action.
@@ -927,13 +927,13 @@ 
 					 *
 					 * @since 1.8
 					 */
-					do_action( "give_save_option_{$name}", $value, $name );
+					do_action("give_save_option_{$name}", $value, $name);
 				}
 			} else {
-				$old_options    = ( $old_options = get_option( $option_name ) ) ? $old_options : array();
-				$update_options = array_merge( $old_options, $update_options );
+				$old_options    = ($old_options = get_option($option_name)) ? $old_options : array();
+				$update_options = array_merge($old_options, $update_options);
 
-				update_option( $option_name, $update_options );
+				update_option($option_name, $update_options);
 
 				/**
 				 * Trigger action.
@@ -942,7 +942,7 @@ 
 				 *
 				 * @since 1.8
 				 */
-				do_action( "give_save_settings_{$option_name}", $update_options, $option_name );
+				do_action("give_save_settings_{$option_name}", $update_options, $option_name);
 			}
 
 			return true;

includes/admin/upgrades/views/upgrades-complete.php

Spacing +3 added lines, -3 removed lines

@@ -10,17 +10,17 @@
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 ?>
 <div class="wrap" id="poststuff">
 	<div id="give-updates">
-		<h1 id="give-updates-h1"><?php esc_html_e( 'Give - Updates Complete', 'give' ); ?></h1>
+		<h1 id="give-updates-h1"><?php esc_html_e('Give - Updates Complete', 'give'); ?></h1>
 		<hr class="wp-header-end">
 
 		<div class="give-update-panel-content">
-			<p><?php esc_html_e( 'Congratulations! You are running the latest versions of Give and it\'s add-ons.', 'give' ); ?></p>
+			<p><?php esc_html_e('Congratulations! You are running the latest versions of Give and it\'s add-ons.', 'give'); ?></p>
 		</div>
 
 	</div>