WordImpress / Give

includes/class-give-gravatars.php

Spacing +96 added lines, -96 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -50,50 +50,50 @@ 
 	 */
 
 	// https://gist.github.com/justinph/5197810
-	function validate_gravatar( $id_or_email ) {
+	function validate_gravatar($id_or_email) {
 		//id or email code borrowed from wp-includes/pluggable.php
 		$email = '';
-		if ( is_numeric( $id_or_email ) ) {
+		if (is_numeric($id_or_email)) {
 			$id   = (int) $id_or_email;
-			$user = get_userdata( $id );
-			if ( $user ) {
+			$user = get_userdata($id);
+			if ($user) {
 				$email = $user->user_email;
 			}
-		} elseif ( is_object( $id_or_email ) ) {
+		} elseif (is_object($id_or_email)) {
 			// No avatar for pingbacks or trackbacks
-			$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-			if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+			$allowed_comment_types = apply_filters('get_avatar_comment_types', array('comment'));
+			if ( ! empty($id_or_email->comment_type) && ! in_array($id_or_email->comment_type, (array) $allowed_comment_types)) {
 				return false;
 			}
 
-			if ( ! empty( $id_or_email->user_id ) ) {
+			if ( ! empty($id_or_email->user_id)) {
 				$id   = (int) $id_or_email->user_id;
-				$user = get_userdata( $id );
-				if ( $user ) {
+				$user = get_userdata($id);
+				if ($user) {
 					$email = $user->user_email;
 				}
-			} elseif ( ! empty( $id_or_email->comment_author_email ) ) {
+			} elseif ( ! empty($id_or_email->comment_author_email)) {
 				$email = $id_or_email->comment_author_email;
 			}
 		} else {
 			$email = $id_or_email;
 		}
 
-		$hashkey = md5( strtolower( trim( $email ) ) );
-		$uri     = 'http://www.gravatar.com/avatar/' . $hashkey . '?d=404';
+		$hashkey = md5(strtolower(trim($email)));
+		$uri     = 'http://www.gravatar.com/avatar/'.$hashkey.'?d=404';
 
-		$data = wp_cache_get( $hashkey );
-		if ( false === $data ) {
-			$response = wp_remote_head( $uri );
-			if ( is_wp_error( $response ) ) {
+		$data = wp_cache_get($hashkey);
+		if (false === $data) {
+			$response = wp_remote_head($uri);
+			if (is_wp_error($response)) {
 				$data = 'not200';
 			} else {
 				$data = $response['response']['code'];
 			}
-			wp_cache_set( $hashkey, $data, $group = '', $expire = 60 * 5 );
+			wp_cache_set($hashkey, $data, $group = '', $expire = 60 * 5);
 
 		}
-		if ( $data == '200' ) {
+		if ($data == '200') {
 			return true;
 		} else {
 			return false;
@@ -108,17 +108,17 @@ 
 	 *
 	 * @param int $form_id
 	 */
-	function get_log_ids( $form_id = '' ) {
+	function get_log_ids($form_id = '') {
 
 		// get Give_Logging class
 		global $give_logs;
 
 		// get log for this form
-		$logs = $give_logs->get_logs( $form_id );
+		$logs = $give_logs->get_logs($form_id);
 
-		if ( $logs ) {
+		if ($logs) {
 			// make an array with all the donor IDs
-			foreach ( $logs as $log ) {
+			foreach ($logs as $log) {
 				$log_ids[] = $log->ID;
 			}
 
@@ -135,49 +135,49 @@ 
 	 *
 	 * @since 1.0
 	 */
-	function get_payment_ids( $form_id = '' ) {
+	function get_payment_ids($form_id = '') {
 
 		global $give_options;
 
-		$log_ids = $this->get_log_ids( $form_id );
+		$log_ids = $this->get_log_ids($form_id);
 
-		if ( $log_ids ) {
+		if ($log_ids) {
 
 			$payment_ids = array();
 
-			foreach ( $log_ids as $id ) {
+			foreach ($log_ids as $id) {
 				// get the payment ID for each corresponding log ID
-				$payment_ids[] = get_post_meta( $id, '_give_log_payment_id', true );
+				$payment_ids[] = get_post_meta($id, '_give_log_payment_id', true);
 			}
 
 			// remove donors who have purchased more than once so we can have unique avatars
 			$unique_emails = array();
 
-			foreach ( $payment_ids as $key => $id ) {
+			foreach ($payment_ids as $key => $id) {
 
-				$email = get_post_meta( $id, '_give_payment_user_email', true );
+				$email = get_post_meta($id, '_give_payment_user_email', true);
 
-				if ( isset ( $give_options['give_donators_gravatars_has_gravatar_account'] ) ) {
-					if ( ! $this->validate_gravatar( $email ) ) {
+				if (isset ($give_options['give_donators_gravatars_has_gravatar_account'])) {
+					if ( ! $this->validate_gravatar($email)) {
 						continue;
 					}
 				}
 
-				$unique_emails[ $id ] = get_post_meta( $id, '_give_payment_user_email', true );
+				$unique_emails[$id] = get_post_meta($id, '_give_payment_user_email', true);
 
 			}
 
 			// strip duplicate emails
-			$unique_emails = array_unique( $unique_emails );
+			$unique_emails = array_unique($unique_emails);
 
 			// convert the unique IDs back into simple array
-			foreach ( $unique_emails as $id => $email ) {
+			foreach ($unique_emails as $id => $email) {
 				$unique_ids[] = $id;
 			}
 
 			// randomize the payment IDs if enabled
-			if ( isset( $give_options['give_donators_gravatars_random_gravatars'] ) ) {
-				shuffle( $unique_ids );
+			if (isset($give_options['give_donators_gravatars_random_gravatars'])) {
+				shuffle($unique_ids);
 			}
 
 			// return our unique IDs
@@ -193,22 +193,22 @@ 
 	 *
 	 * @since 1.0
 	 */
-	function gravatars( $form_id = false, $title = '' ) {
+	function gravatars($form_id = false, $title = '') {
 
 		// unique $payment_ids 
-		$payment_ids = $this->get_payment_ids( $form_id );
+		$payment_ids = $this->get_payment_ids($form_id);
 
 		global $give_options;
 
 		// return if no ID
-		if ( ! $form_id ) {
+		if ( ! $form_id) {
 			return;
 		}
 
 		// minimum amount of purchases before showing gravatars
 		// if the number of items in array is not greater or equal to the number specified, then exit
-		if ( isset( $give_options['give_donators_gravatars_min_purchases_required'] ) && '' != $give_options['give_donators_gravatars_min_purchases_required'] ) {
-			if ( ! ( count( $payment_ids ) >= $give_options['give_donators_gravatars_min_purchases_required'] ) ) {
+		if (isset($give_options['give_donators_gravatars_min_purchases_required']) && '' != $give_options['give_donators_gravatars_min_purchases_required']) {
+			if ( ! (count($payment_ids) >= $give_options['give_donators_gravatars_min_purchases_required'])) {
 				return;
 			}
 		}
@@ -219,51 +219,51 @@ 
 		echo '<div id="give-purchase-gravatars">';
 
 
-		if ( isset ( $title ) ) {
+		if (isset ($title)) {
 
-			if ( $title ) {
-				echo apply_filters( 'give_donators_gravatars_title', '<h3 class="give-gravatars-title">' . esc_html( $title ) . '</h3>' );
-			} elseif ( isset( $give_options['give_donators_gravatars_heading'] ) ) {
-				echo apply_filters( 'give_donators_gravatars_title', '<h3 class="give-gravatars-title">' . esc_html( $give_options['give_donators_gravatars_heading'] ) . '</h2>' );
+			if ($title) {
+				echo apply_filters('give_donators_gravatars_title', '<h3 class="give-gravatars-title">'.esc_html($title).'</h3>');
+			} elseif (isset($give_options['give_donators_gravatars_heading'])) {
+				echo apply_filters('give_donators_gravatars_title', '<h3 class="give-gravatars-title">'.esc_html($give_options['give_donators_gravatars_heading']).'</h2>');
 			}
 
 		}
 		echo '<ul class="give-purchase-gravatars-list">';
 		$i = 0;
 
-		if ( $payment_ids ) {
-			foreach ( $payment_ids as $id ) {
+		if ($payment_ids) {
+			foreach ($payment_ids as $id) {
 
 				// Give saves a blank option even when the control is turned off, hence the extra check
-				if ( isset( $give_options['give_donators_gravatars_maximum_number'] ) && '' != $give_options['give_donators_gravatars_maximum_number'] && $i == $give_options['give_donators_gravatars_maximum_number'] ) {
+				if (isset($give_options['give_donators_gravatars_maximum_number']) && '' != $give_options['give_donators_gravatars_maximum_number'] && $i == $give_options['give_donators_gravatars_maximum_number']) {
 					continue;
 				}
 
 				// get the payment meta
-				$payment_meta = get_post_meta( $id, '_give_payment_meta', true );
+				$payment_meta = get_post_meta($id, '_give_payment_meta', true);
 
 				// unserialize the payment meta
-				$user_info = maybe_unserialize( $payment_meta['user_info'] );
+				$user_info = maybe_unserialize($payment_meta['user_info']);
 
 				// get donor's first name
 				$name = $user_info['first_name'];
 
 				// get donor's email
-				$email = get_post_meta( $id, '_give_payment_user_email', true );
+				$email = get_post_meta($id, '_give_payment_user_email', true);
 
 				// set gravatar size and provide filter
-				$size = isset( $give_options['give_donators_gravatars_gravatar_size'] ) ? apply_filters( 'give_donators_gravatars_gravatar_size', $give_options['give_donators_gravatars_gravatar_size'] ) : '';
+				$size = isset($give_options['give_donators_gravatars_gravatar_size']) ? apply_filters('give_donators_gravatars_gravatar_size', $give_options['give_donators_gravatars_gravatar_size']) : '';
 
 				// default image
-				$default_image = apply_filters( 'give_donators_gravatars_gravatar_default_image', false );
+				$default_image = apply_filters('give_donators_gravatars_gravatar_default_image', false);
 
 				// assemble output
 				$output .= '<li>';
 
-				$output .= get_avatar( $email, $size, $default_image, $name );
+				$output .= get_avatar($email, $size, $default_image, $name);
 				$output .= '</li>';
 
-				$i ++;
+				$i++;
 
 			} // end foreach
 		}
@@ -272,7 +272,7 @@ 
 		echo '</ul>';
 		echo '</div>';
 
-		return apply_filters( 'give_donators_gravatars', ob_get_clean() );
+		return apply_filters('give_donators_gravatars', ob_get_clean());
 	}
 
 	/**
@@ -281,7 +281,7 @@ 
 	 * @since 1.0
 	 */
 	function register_widget() {
-		register_widget( 'Give_Donators_Gravatars_Widget' );
+		register_widget('Give_Donators_Gravatars_Widget');
 	}
 
 	/**
@@ -290,19 +290,19 @@ 
 	 * @since 1.0
 	 * @todo  set the ID to get_the_ID() if ID parameter is not passed through. Otherwise it will incorrectly get other gravatars
 	 */
-	function shortcode( $atts, $content = null ) {
+	function shortcode($atts, $content = null) {
 
-		$atts = shortcode_atts( array(
+		$atts = shortcode_atts(array(
 			'id'    => '',
 			'title' => ''
-		), $atts, 'give_donators_gravatars' );
+		), $atts, 'give_donators_gravatars');
 
 		// if no ID is passed on single give_forms pages, get the correct ID
-		if ( is_singular( 'give_forms' ) ) {
+		if (is_singular('give_forms')) {
 			$id = get_the_ID();
 		}
 
-		$content = $this->gravatars( $atts['id'], $atts['title'] );
+		$content = $this->gravatars($atts['id'], $atts['title']);
 
 		return $content;
 
@@ -313,57 +313,57 @@ 
 	 *
 	 * @since 1.0
 	 */
-	function settings( $settings ) {
+	function settings($settings) {
 
 		$give_gravatar_settings = array(
 			array(
-				'name' => esc_html( 'Donator Gravatars', 'give' ),
+				'name' => esc_html('Donator Gravatars', 'give'),
 				'desc' => '<hr>',
 				'id'   => 'give_title',
 				'type' => 'give_title'
 			),
 			array(
-				'name' => esc_html( 'Heading', 'give' ),
-				'desc' => esc_html( 'The heading to display above the Gravatars', 'give' ),
+				'name' => esc_html('Heading', 'give'),
+				'desc' => esc_html('The heading to display above the Gravatars', 'give'),
 				'type' => 'text',
 				'id'   => 'give_donators_gravatars_heading'
 			),
 			array(
-				'name'    => esc_html( 'Gravatar Size', 'give' ),
-				'desc'    => esc_html( 'The size of each Gravatar in pixels (512px maximum)', 'give' ),
+				'name'    => esc_html('Gravatar Size', 'give'),
+				'desc'    => esc_html('The size of each Gravatar in pixels (512px maximum)', 'give'),
 				'type'    => 'text_small',
 				'id'      => 'give_donators_gravatars_gravatar_size',
 				'default' => '64'
 			),
 			array(
-				'name' => esc_html( 'Minimum Unique Purchases Required', 'give' ),
+				'name' => esc_html('Minimum Unique Purchases Required', 'give'),
 				/* translators: %s: form singular label */
-				'desc' => sprintf( esc_html( 'The minimum number of unique purchases a %s must have before the Gravatars are shown. Leave blank for no minimum.', 'give' ), strtolower( give_get_forms_label_singular() ) ),
+				'desc' => sprintf(esc_html('The minimum number of unique purchases a %s must have before the Gravatars are shown. Leave blank for no minimum.', 'give'), strtolower(give_get_forms_label_singular())),
 				'type' => 'text_small',
 				'id'   => 'give_donators_gravatars_min_purchases_required',
 			),
 			array(
-				'name'    => esc_html( 'Maximum Gravatars To Show', 'give' ),
-				'desc'    => esc_html( 'The maximum number of gravatars to show. Leave blank for no limit.', 'give' ),
+				'name'    => esc_html('Maximum Gravatars To Show', 'give'),
+				'desc'    => esc_html('The maximum number of gravatars to show. Leave blank for no limit.', 'give'),
 				'type'    => 'text',
 				'id'      => 'give_donators_gravatars_maximum_number',
 				'default' => '20',
 			),
 			array(
-				'name' => esc_html( 'Gravatar Visibility', 'give' ),
-				'desc' => esc_html( 'Only show donators with a Gravatar account', 'give' ),
+				'name' => esc_html('Gravatar Visibility', 'give'),
+				'desc' => esc_html('Only show donators with a Gravatar account', 'give'),
 				'id'   => 'give_donators_gravatars_has_gravatar_account',
 				'type' => 'checkbox',
 			),
 			array(
-				'name' => esc_html( 'Randomize Gravatars', 'give' ),
-				'desc' => esc_html( 'Randomize the Gravatars', 'give' ),
+				'name' => esc_html('Randomize Gravatars', 'give'),
+				'desc' => esc_html('Randomize the Gravatars', 'give'),
 				'id'   => 'give_donators_gravatars_random_gravatars',
 				'type' => 'checkbox',
 			),
 		);
 
-		return array_merge( $settings, $give_gravatar_settings );
+		return array_merge($settings, $give_gravatar_settings);
 	}
 
 }
@@ -381,13 +381,13 @@ 
 	 */
 	public function __construct() {
 
-		$give_label_singular = function_exists( 'give_get_forms_label_singular' ) ? strtolower( give_get_forms_label_singular() ) : null;
+		$give_label_singular = function_exists('give_get_forms_label_singular') ? strtolower(give_get_forms_label_singular()) : null;
 
 		// widget settings
 		$widget_ops = array(
 			'classname'   => 'give-donators-gravatars',
 			/* translators: 1: form singular label 2: form singular label */
-			'description' => sprintf( esc_html( 'Displays gravatars of people who have donated using your your %1$s. Will only show on the single %2$s page.', 'give' ), $give_label_singular, $give_label_singular )
+			'description' => sprintf(esc_html('Displays gravatars of people who have donated using your your %1$s. Will only show on the single %2$s page.', 'give'), $give_label_singular, $give_label_singular)
 		);
 
 		// widget control settings
@@ -400,7 +400,7 @@ 
 		// create the widget
 		parent::__construct(
 			'give_donators_gravatars_widget',
-			esc_html( 'Give Donators Gravatars', 'give' ),
+			esc_html('Give Donators Gravatars', 'give'),
 			$widget_ops,
 			$control_ops
 		);
@@ -411,30 +411,30 @@ 
 	/*
 	 * Outputs the content of the widget
 	 */
-	function widget( $args, $instance ) {
+	function widget($args, $instance) {
 		global $give_options;
 
 		//@TODO: Don't extract it!!!
-		extract( $args );
+		extract($args);
 
-		if ( ! is_singular( 'give_forms' ) ) {
+		if ( ! is_singular('give_forms')) {
 			return;
 		}
 
 		// Variables from widget settings
-		$title = apply_filters( 'widget_title', $instance['title'] );
+		$title = apply_filters('widget_title', $instance['title']);
 
 		// Used by themes. Opens the widget
 		echo $before_widget;
 
 		// Display the widget title
-		if ( $title ) {
-			echo $before_title . $title . $after_title;
+		if ($title) {
+			echo $before_title.$title.$after_title;
 		}
 
 		$gravatars = new Give_Donators_Gravatars();
 
-		echo $gravatars->gravatars( get_the_ID(), null ); // remove title
+		echo $gravatars->gravatars(get_the_ID(), null); // remove title
 
 		// Used by themes. Closes the widget
 		echo $after_widget;
@@ -444,11 +444,11 @@ 
 	/*
 	 * Update function. Processes widget options to be saved
 	 */
-	function update( $new_instance, $old_instance ) {
+	function update($new_instance, $old_instance) {
 
 		$instance = $old_instance;
 
-		$instance['title'] = strip_tags( $new_instance['title'] );
+		$instance['title'] = strip_tags($new_instance['title']);
 
 		return $instance;
 
@@ -457,19 +457,19 @@ 
 	/*
 	 * Form function. Displays the actual form on the widget page
 	 */
-	function form( $instance ) {
+	function form($instance) {
 
 		// Set up some default widget settings.
 		$defaults = array(
 			'title' => '',
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults ); ?>
+		$instance = wp_parse_args((array) $instance, $defaults); ?>
 
 		<!-- Title -->
 		<p>
-			<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php esc_html_e( 'Title:', 'give' ) ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $instance['title']; ?>" />
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php esc_html_e('Title:', 'give') ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $instance['title']; ?>" />
 		</p>
 
 

includes/admin/plugins.php

Spacing +16 added lines, -16 removed lines

@@ -11,7 +11,7 @@ 
 
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,16 +26,16 @@ 
  *
  * @return array $links
  */
-function give_plugin_action_links( $links, $file ) {
-	$settings_link = '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-settings' ) . '">' . esc_html( 'Settings', 'give' ) . '</a>';
-	if ( $file == 'give/give.php' ) {
-		array_unshift( $links, $settings_link );
+function give_plugin_action_links($links, $file) {
+	$settings_link = '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-settings').'">'.esc_html('Settings', 'give').'</a>';
+	if ($file == 'give/give.php') {
+		array_unshift($links, $settings_link);
 	}
 
 	return $links;
 }
 
-add_filter( 'plugin_action_links', 'give_plugin_action_links', 10, 2 );
+add_filter('plugin_action_links', 'give_plugin_action_links', 10, 2);
 
 
 /**
@@ -48,33 +48,33 @@ 
  *
  * @return array $input
  */
-function give_plugin_row_meta( $input, $file ) {
-	if ( $file != 'give/give.php' ) {
+function give_plugin_row_meta($input, $file) {
+	if ($file != 'give/give.php') {
 		return $input;
 	}
 
-	$give_addons_link = esc_url( add_query_arg( array(
+	$give_addons_link = esc_url(add_query_arg(array(
 			'utm_source'   => 'plugins-page',
 			'utm_medium'   => 'plugin-row',
 			'utm_campaign' => 'admin',
-		), 'https://givewp.com/addons/' )
+		), 'https://givewp.com/addons/')
 	);
 
-	$give_docs_link = esc_url( add_query_arg( array(
+	$give_docs_link = esc_url(add_query_arg(array(
 			'utm_source'   => 'plugins-page',
 			'utm_medium'   => 'plugin-row',
 			'utm_campaign' => 'admin',
-		), 'https://givewp.com/documentation/' )
+		), 'https://givewp.com/documentation/')
 	);
 
 	$links = array(
-		'<a href="' . $give_docs_link . '" target="_blank">' . esc_html( 'Documentation', 'give' ) . '</a>',
-		'<a href="' . $give_addons_link . '" target="_blank">' . esc_html( 'Add-ons', 'give' ) . '</a>',
+		'<a href="'.$give_docs_link.'" target="_blank">'.esc_html('Documentation', 'give').'</a>',
+		'<a href="'.$give_addons_link.'" target="_blank">'.esc_html('Add-ons', 'give').'</a>',
 	);
 
-	$input = array_merge( $input, $links );
+	$input = array_merge($input, $links);
 
 	return $input;
 }
 
-add_filter( 'plugin_row_meta', 'give_plugin_row_meta', 10, 2 );
+add_filter('plugin_row_meta', 'give_plugin_row_meta', 10, 2);

includes/admin/admin-footer.php

Spacing +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,15 +24,15 @@ 
  *
  * @return      string
  */
-function give_admin_rate_us( $footer_text ) {
+function give_admin_rate_us($footer_text) {
 	global $typenow;
 
-	if ( $typenow == 'give_forms' ) {
+	if ($typenow == 'give_forms') {
 		$rate_text = sprintf(
 			/* translators: 1: plugin name - "Give". 2: Link to 5 star rating */
-			esc_html( 'If you like %1$s please leave us a %2$s rating. It takes a minute and helps a lot. Thanks in advance!', 'give' ),
-			sprintf( '<strong>%s</strong>', esc_html( 'Give', 'give' ) ),
-			'<a href="https://wordpress.org/support/view/plugin-reviews/give?filter=5#postform" target="_blank" class="give-rating-link" data-rated="' . esc_attr( 'Thanks :)', 'give' ) . '">&#9733;&#9733;&#9733;&#9733;&#9733;</a>'
+			esc_html('If you like %1$s please leave us a %2$s rating. It takes a minute and helps a lot. Thanks in advance!', 'give'),
+			sprintf('<strong>%s</strong>', esc_html('Give', 'give')),
+			'<a href="https://wordpress.org/support/view/plugin-reviews/give?filter=5#postform" target="_blank" class="give-rating-link" data-rated="'.esc_attr('Thanks :)', 'give').'">&#9733;&#9733;&#9733;&#9733;&#9733;</a>'
 		);
 
 		return $rate_text;
@@ -41,4 +41,4 @@ 
 	}
 }
 
-add_filter( 'admin_footer_text', 'give_admin_rate_us' );
+add_filter('admin_footer_text', 'give_admin_rate_us');

includes/admin/customers/customers.php

Braces +25 added lines, -10 removed lines

@@ -259,8 +259,11 @@ 
 								<span class="customer-user-id info-item editable">
 									<?php if ( intval( $customer->user_id ) > 0 ) : ?>
 										<span data-key="user_id"><?php echo $customer->user_id; ?></span>
-									<?php else : ?>
-										<span data-key="user_id"><?php esc_html_e( 'None', 'give' ); ?></span>
+									<?php else {
+	: ?>
+										<span data-key="user_id"><?php esc_html_e( 'None', 'give' );
+}
+?></span>
 									<?php endif; ?>
 									<?php if ( current_user_can( $customer_edit_role ) && intval( $customer->user_id ) > 0 ) : ?>
 										<span class="disconnect-user"> - <a id="disconnect-customer" href="#disconnect" title="<?php esc_attr_e( 'Disconnects the current user ID from this customer record', 'give' ); ?>"><?php esc_html_e( 'Disconnect User', 'give' ); ?></a></span>
@@ -329,8 +332,11 @@ 
 													}
 													?>
 												</select>
-											<?php else : ?>
-												<input type="text" size="6" data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-input info-item" placeholder="<?php esc_attr_e( 'State / Province', 'give' ); ?>" />
+											<?php else {
+	: ?>
+												<input type="text" size="6" data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-input info-item" placeholder="<?php esc_attr_e( 'State / Province', 'give' );
+}
+?>" />
 											<?php endif; ?>
 											<input class="info-item" type="text" data-key="zip" name="customerinfo[zip]" placeholder="<?php esc_attr_e( 'Postal', 'give' ); ?>" value="<?php echo $address['zip']; ?>" />
 													</span>
@@ -420,9 +426,12 @@ 
 						</td>
 					</tr>
 				<?php endforeach; ?>
-			<?php else: ?>
+			<?php else {
+	: ?>
 				<tr>
-					<td colspan="5"><?php esc_html_e( 'No Donations Found', 'give' ); ?></td>
+					<td colspan="5"><?php esc_html_e( 'No Donations Found', 'give' );
+}
+?></td>
 				</tr>
 			<?php endif; ?>
 			</tbody>
@@ -463,9 +472,12 @@ 
 						</td>
 					</tr>
 				<?php endforeach; ?>
-			<?php else: ?>
+			<?php else {
+	: ?>
 				<tr>
-					<td colspan="2"><?php esc_html_e( 'No Completed Donations Found', 'give' ); ?></td>
+					<td colspan="2"><?php esc_html_e( 'No Completed Donations Found', 'give' );
+}
+?></td>
 				</tr>
 			<?php endif; ?>
 			</tbody>
@@ -539,9 +551,12 @@ 
 					</span>
 					</div>
 				<?php endforeach; ?>
-			<?php else: ?>
+			<?php else {
+	: ?>
 				<div class="give-no-customer-notes">
-					<?php esc_html_e( 'No Donor Notes', 'give' ); ?>
+					<?php esc_html_e( 'No Donor Notes', 'give' );
+}
+?>
 				</div>
 			<?php endif; ?>
 		</div>

Spacing +142 added lines, -142 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,9 +24,9 @@ 
  */
 function give_customers_page() {
 	$default_views  = give_customer_views();
-	$requested_view = isset( $_GET['view'] ) ? sanitize_text_field( $_GET['view'] ) : 'customers';
-	if ( array_key_exists( $requested_view, $default_views ) && function_exists( $default_views[ $requested_view ] ) ) {
-		give_render_customer_view( $requested_view, $default_views );
+	$requested_view = isset($_GET['view']) ? sanitize_text_field($_GET['view']) : 'customers';
+	if (array_key_exists($requested_view, $default_views) && function_exists($default_views[$requested_view])) {
+		give_render_customer_view($requested_view, $default_views);
 	} else {
 		give_customers_list();
 	}
@@ -42,7 +42,7 @@ 
 
 	$views = array();
 
-	return apply_filters( 'give_customer_views', $views );
+	return apply_filters('give_customer_views', $views);
 
 }
 
@@ -56,7 +56,7 @@ 
 
 	$tabs = array();
 
-	return apply_filters( 'give_customer_tabs', $tabs );
+	return apply_filters('give_customer_tabs', $tabs);
 
 }
 
@@ -67,24 +67,24 @@ 
  * @return void
  */
 function give_customers_list() {
-	include( dirname( __FILE__ ) . '/class-customer-table.php' );
+	include(dirname(__FILE__).'/class-customer-table.php');
 
 	$customers_table = new Give_Customer_Reports_Table();
 	$customers_table->prepare_items();
 	?>
 	<div class="wrap">
-		<h2><?php esc_html_e( 'Donors', 'give' ); ?></h2>
-		<?php do_action( 'give_donors_table_top' ); ?>
-		<form id="give-donors-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors' ); ?>">
+		<h2><?php esc_html_e('Donors', 'give'); ?></h2>
+		<?php do_action('give_donors_table_top'); ?>
+		<form id="give-donors-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors'); ?>">
 			<?php
-			$customers_table->search_box( esc_html( 'Search Donors', 'give' ), 'give-donors' );
+			$customers_table->search_box(esc_html('Search Donors', 'give'), 'give-donors');
 			$customers_table->display();
 			?>
 			<input type="hidden" name="post_type" value="give_forms" />
 			<input type="hidden" name="page" value="give-donors" />
 			<input type="hidden" name="view" value="customers" />
 		</form>
-		<?php do_action( 'give_donors_table_bottom' ); ?>
+		<?php do_action('give_donors_table_bottom'); ?>
 	</div>
 	<?php
 }
@@ -99,27 +99,27 @@ 
  *
  * @return void
  */
-function give_render_customer_view( $view, $callbacks ) {
+function give_render_customer_view($view, $callbacks) {
 
 	$render = true;
 
-	$customer_view_role = apply_filters( 'give_view_customers_role', 'view_give_reports' );
+	$customer_view_role = apply_filters('give_view_customers_role', 'view_give_reports');
 
-	if ( ! current_user_can( $customer_view_role ) ) {
-		give_set_error( 'give-no-access', esc_html( 'You are not permitted to view this data.', 'give' ) );
+	if ( ! current_user_can($customer_view_role)) {
+		give_set_error('give-no-access', esc_html('You are not permitted to view this data.', 'give'));
 		$render = false;
 	}
  
-	if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-		give_set_error( 'give-invalid_customer', esc_html( 'Invalid Donor ID Provided.', 'give' ) );
+	if ( ! isset($_GET['id']) || ! is_numeric($_GET['id'])) {
+		give_set_error('give-invalid_customer', esc_html('Invalid Donor ID Provided.', 'give'));
 		$render = false;
 	}
 
 	$customer_id = (int) $_GET['id'];
-	$customer    = new Give_Customer( $customer_id );
+	$customer    = new Give_Customer($customer_id);
 
-	if ( empty( $customer->id ) ) {
-		give_set_error( 'give-invalid_customer', esc_html( 'Invalid Donor ID Provided.', 'give' ) );
+	if (empty($customer->id)) {
+		give_set_error('give-invalid_customer', esc_html('Invalid Donor ID Provided.', 'give'));
 		$render = false;
 	}
 
@@ -128,27 +128,27 @@ 
 
 	<div class='wrap'>
 
-		<?php if ( give_get_errors() ) : ?>
+		<?php if (give_get_errors()) : ?>
 			<div class="error settings-error">
-				<?php give_print_errors( 0 ); ?>
+				<?php give_print_errors(0); ?>
 			</div>
 		<?php endif; ?>
 
-		<?php if ( $customer && $render ) : ?>
+		<?php if ($customer && $render) : ?>
 
 			<div id="customer-tab-wrapper">
 				<ul id="customer-tab-wrapper-list" class="nav-tab-wrapper">
-					<?php foreach ( $customer_tabs as $key => $tab ) : ?>
+					<?php foreach ($customer_tabs as $key => $tab) : ?>
 						<?php $active = $key === $view ? true : false; ?>
 						<?php $class = $active ? 'active' : 'inactive'; ?>
 
-						<li class="<?php echo sanitize_html_class( $class ); ?>">
-							<?php if ( ! $active ) : ?>
-							<a title="<?php esc_attr_e( $tab['title'] ); ?>" aria-label="<?php esc_attr_e( $tab['title'] ); ?>" href="<?php echo esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=' . $key . '&id=' . $customer->id ) ); ?>">
+						<li class="<?php echo sanitize_html_class($class); ?>">
+							<?php if ( ! $active) : ?>
+							<a title="<?php esc_attr_e($tab['title']); ?>" aria-label="<?php esc_attr_e($tab['title']); ?>" href="<?php echo esc_url(admin_url('edit.php?post_type=give_forms&page=give-donors&view='.$key.'&id='.$customer->id)); ?>">
 								<?php endif; ?>
 
-								<span class="dashicons <?php echo sanitize_html_class( $tab['dashicon'] ); ?>"></span> <?php esc_html_e( $tab['title'] ); ?>
-								<?php if ( ! $active ) : ?>
+								<span class="dashicons <?php echo sanitize_html_class($tab['dashicon']); ?>"></span> <?php esc_html_e($tab['title']); ?>
+								<?php if ( ! $active) : ?>
 							</a>
 						<?php endif; ?>
 
@@ -160,7 +160,7 @@ 
 			</div>
 
 			<div id="give-customer-card-wrapper">
-				<?php $callbacks[ $view ]( $customer ) ?>
+				<?php $callbacks[$view]($customer) ?>
 			</div>
 
 		<?php endif; ?>
@@ -180,17 +180,17 @@ 
  *
  * @return void
  */
-function give_customers_view( $customer ) {
+function give_customers_view($customer) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
 	?>
 
-	<?php do_action( 'give_donor_card_top', $customer ); ?>
+	<?php do_action('give_donor_card_top', $customer); ?>
 
 	<div id="donor-summary" class="info-wrapper customer-section postbox">
 
-		<form id="edit-customer-info" method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ); ?>">
+		<form id="edit-customer-info" method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id); ?>">
 
 			<div class="customer-info">
 
@@ -198,22 +198,22 @@ 
 				<div class="donor-bio-header clearfix">
 
 					<div class="avatar-wrap left" id="customer-avatar">
-						<?php echo get_avatar( $customer->email ); ?>
+						<?php echo get_avatar($customer->email); ?>
 					</div>
 
 					<div class="customer-id" class="left">
 						#<?php echo $customer->id; ?>
 					</div>
 					<div id="customer-name-wrap" class="left">
-						<span class="customer-name info-item edit-item"><input size="15" data-key="name" name="customerinfo[name]" type="text" value="<?php esc_attr_e( $customer->name ); ?>" placeholder="<?php esc_attr_e( 'Donor Name', 'give' ); ?>" /></span>
+						<span class="customer-name info-item edit-item"><input size="15" data-key="name" name="customerinfo[name]" type="text" value="<?php esc_attr_e($customer->name); ?>" placeholder="<?php esc_attr_e('Donor Name', 'give'); ?>" /></span>
 						<span class="customer-name info-item editable"><span data-key="name"><?php echo $customer->name; ?></span></span>
 					</div>
 					<p class="customer-since info-item">
-						<?php esc_html_e( 'Donor since', 'give' ); ?>
-						<?php echo date_i18n( get_option( 'date_format' ), strtotime( $customer->date_created ) ) ?>
+						<?php esc_html_e('Donor since', 'give'); ?>
+						<?php echo date_i18n(get_option('date_format'), strtotime($customer->date_created)) ?>
 					</p>
-					<?php if ( current_user_can( $customer_edit_role ) ): ?>
-						<a title="<?php esc_attr_e( 'Edit Donor', 'give' ); ?>" href="#" id="edit-customer" class="button info-item editable customer-edit-link"><?php esc_html_e( 'Edit Donor', 'give' ); ?></a>
+					<?php if (current_user_can($customer_edit_role)): ?>
+						<a title="<?php esc_attr_e('Edit Donor', 'give'); ?>" href="#" id="edit-customer" class="button info-item editable customer-edit-link"><?php esc_html_e('Edit Donor', 'give'); ?></a>
 					<?php endif; ?>
 				</div>
 				<!-- /donor-bio-header -->
@@ -223,14 +223,14 @@ 
 					<table class="widefat">
 						<tbody>
 						<tr>
-							<td><label for="tablecell"><?php esc_html_e( 'Email', 'give' ); ?></label>:</td>
+							<td><label for="tablecell"><?php esc_html_e('Email', 'give'); ?></label>:</td>
 							<td class="row-title">
-								<span class="customer-name info-item edit-item"><input size="20" data-key="email" name="customerinfo[email]" type="text" value="<?php echo $customer->email; ?>" placeholder="<?php esc_attr_e( 'Donor Email', 'give' ); ?>" /></span>
+								<span class="customer-name info-item edit-item"><input size="20" data-key="email" name="customerinfo[email]" type="text" value="<?php echo $customer->email; ?>" placeholder="<?php esc_attr_e('Donor Email', 'give'); ?>" /></span>
 								<span class="customer-email info-item editable" data-key="email"><?php echo $customer->email; ?></span>
 							</td>
 						</tr>
 						<tr class="alternate">
-							<td><label for="tablecell"><?php esc_html_e( 'User ID', 'give' ); ?></label>:</td>
+							<td><label for="tablecell"><?php esc_html_e('User ID', 'give'); ?></label>:</td>
 							<td class="row-title">
 								<span class="customer-user-id info-item edit-item">
 									<?php
@@ -246,38 +246,38 @@ 
 										'data'  => $data_atts,
 									);
 
-									if ( ! empty( $user_id ) ) {
-										$userdata           = get_userdata( $user_id );
+									if ( ! empty($user_id)) {
+										$userdata           = get_userdata($user_id);
 										$user_args['value'] = $userdata->user_login;
 									}
 
-									echo Give()->html->ajax_user_search( $user_args );
+									echo Give()->html->ajax_user_search($user_args);
 									?>
 									<input type="hidden" name="customerinfo[user_id]" data-key="user_id" value="<?php echo $customer->user_id; ?>" />
 								</span>
 			
 								<span class="customer-user-id info-item editable">
-									<?php if ( intval( $customer->user_id ) > 0 ) : ?>
+									<?php if (intval($customer->user_id) > 0) : ?>
 										<span data-key="user_id"><?php echo $customer->user_id; ?></span>
 									<?php else : ?>
-										<span data-key="user_id"><?php esc_html_e( 'None', 'give' ); ?></span>
+										<span data-key="user_id"><?php esc_html_e('None', 'give'); ?></span>
 									<?php endif; ?>
-									<?php if ( current_user_can( $customer_edit_role ) && intval( $customer->user_id ) > 0 ) : ?>
-										<span class="disconnect-user"> - <a id="disconnect-customer" href="#disconnect" title="<?php esc_attr_e( 'Disconnects the current user ID from this customer record', 'give' ); ?>"><?php esc_html_e( 'Disconnect User', 'give' ); ?></a></span>
+									<?php if (current_user_can($customer_edit_role) && intval($customer->user_id) > 0) : ?>
+										<span class="disconnect-user"> - <a id="disconnect-customer" href="#disconnect" title="<?php esc_attr_e('Disconnects the current user ID from this customer record', 'give'); ?>"><?php esc_html_e('Disconnect User', 'give'); ?></a></span>
 									<?php endif; ?>
 								</span>
 							</td>
 						</tr>
-						<?php if ( isset( $customer->user_id ) && $customer->user_id > 0 ) : ?>
+						<?php if (isset($customer->user_id) && $customer->user_id > 0) : ?>
 
 							<tr>
-								<td><?php esc_html_e( 'Address', 'give' ); ?>:</td>
+								<td><?php esc_html_e('Address', 'give'); ?>:</td>
 								<td class="row-title">
 
 									<div class="customer-address-wrapper">
 
 										<?php
-										$address  = get_user_meta( $customer->user_id, '_give_user_address', true );
+										$address  = get_user_meta($customer->user_id, '_give_user_address', true);
 										$defaults = array(
 											'line1'   => '',
 											'line2'   => '',
@@ -287,10 +287,10 @@ 
 											'zip'     => ''
 										);
 
-										$address = wp_parse_args( $address, $defaults );
+										$address = wp_parse_args($address, $defaults);
 										?>
 
-										<?php if ( ! empty( $address ) ) { ?>
+										<?php if ( ! empty($address)) { ?>
 											<span class="customer-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>
@@ -301,38 +301,38 @@ 
 											</span>
 										<?php } ?>
 										<span class="customer-address info-item edit-item">
-											<input class="info-item" type="text" data-key="line1" name="customerinfo[line1]" placeholder="<?php esc_attr_e( 'Address 1', 'give' ); ?>" value="<?php echo $address['line1']; ?>" />
-											<input class="info-item" type="text" data-key="line2" name="customerinfo[line2]" placeholder="<?php esc_attr_e( 'Address 2', 'give' ); ?>" value="<?php echo $address['line2']; ?>" />
-											<input class="info-item" type="text" data-key="city" name="customerinfo[city]" placeholder="<?php esc_attr_e( 'City', 'give' ); ?>" value="<?php echo $address['city']; ?>" />
+											<input class="info-item" type="text" data-key="line1" name="customerinfo[line1]" placeholder="<?php esc_attr_e('Address 1', 'give'); ?>" value="<?php echo $address['line1']; ?>" />
+											<input class="info-item" type="text" data-key="line2" name="customerinfo[line2]" placeholder="<?php esc_attr_e('Address 2', 'give'); ?>" value="<?php echo $address['line2']; ?>" />
+											<input class="info-item" type="text" data-key="city" name="customerinfo[city]" placeholder="<?php esc_attr_e('City', 'give'); ?>" value="<?php echo $address['city']; ?>" />
 											<select data-key="country" name="customerinfo[country]" id="billing_country" class="billing_country give-select edit-item">
 												<?php
 
 												$selected_country = $address['country'];
 
 												$countries = give_get_country_list();
-												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>
 											<?php
 											$selected_state = give_get_state();
-											$states         = give_get_states( $selected_country );
+											$states         = give_get_states($selected_country);
 
-											$selected_state = isset( $address['state'] ) ? $address['state'] : $selected_state;
+											$selected_state = isset($address['state']) ? $address['state'] : $selected_state;
 
-											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" placeholder="<?php esc_attr_e( 'State / Province', 'give' ); ?>" />
+												<input type="text" size="6" data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-input info-item" placeholder="<?php esc_attr_e('State / Province', 'give'); ?>" />
 											<?php endif; ?>
-											<input class="info-item" type="text" data-key="zip" name="customerinfo[zip]" placeholder="<?php esc_attr_e( 'Postal', 'give' ); ?>" value="<?php echo $address['zip']; ?>" />
+											<input class="info-item" type="text" data-key="zip" name="customerinfo[zip]" placeholder="<?php esc_attr_e('Postal', 'give'); ?>" value="<?php echo $address['zip']; ?>" />
 													</span>
 
 									</div>
@@ -350,112 +350,112 @@ 
 
 			<span id="customer-edit-actions" class="edit-item">
 				<input type="hidden" data-key="id" name="customerinfo[id]" value="<?php echo $customer->id; ?>" />
-				<?php wp_nonce_field( 'edit-customer', '_wpnonce', false, true ); ?>
+				<?php wp_nonce_field('edit-customer', '_wpnonce', false, true); ?>
 				<input type="hidden" name="give_action" value="edit-customer" />
-				<input type="submit" id="give-edit-customer-save" class="button-secondary" value="<?php esc_attr_e( 'Update Donor', 'give' ); ?>" />
-				<a id="give-edit-customer-cancel" href="" class="delete"><?php esc_html_e( 'Cancel', 'give' ); ?></a>
+				<input type="submit" id="give-edit-customer-save" class="button-secondary" value="<?php esc_attr_e('Update Donor', 'give'); ?>" />
+				<a id="give-edit-customer-cancel" href="" class="delete"><?php esc_html_e('Cancel', 'give'); ?></a>
 			</span>
 
 		</form>
 	</div>
 
-	<?php do_action( 'give_donor_before_stats', $customer ); ?>
+	<?php do_action('give_donor_before_stats', $customer); ?>
 
 	<div id="customer-stats-wrapper" class="customer-section postbox clear">
 		<ul>
 			<li>
-				<a title="<?php esc_attr_e( 'View All Donations', 'give' ); ?>" href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $customer->email ) ); ?>">
+				<a title="<?php esc_attr_e('View All Donations', 'give'); ?>" href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.urlencode($customer->email)); ?>">
 					<span class="dashicons dashicons-heart"></span>
 					<?php
 					//Completed Donations
-					$completed_donations_text = sprintf( _n( '%d Completed Donation', '%d Completed Donations', $customer->purchase_count, 'give' ), $customer->purchase_count );
-					echo apply_filters( 'give_donor_completed_donations', $completed_donations_text, $customer );
+					$completed_donations_text = sprintf(_n('%d Completed Donation', '%d Completed Donations', $customer->purchase_count, 'give'), $customer->purchase_count);
+					echo apply_filters('give_donor_completed_donations', $completed_donations_text, $customer);
 					?>
 				</a>
 			</li>
 			<li>
 				<span class="dashicons dashicons-chart-area"></span>
-				<?php echo give_currency_filter( give_format_amount( $customer->purchase_value ) ); ?> <?php esc_html_e( 'Lifetime Donations', 'give' ); ?>
+				<?php echo give_currency_filter(give_format_amount($customer->purchase_value)); ?> <?php esc_html_e('Lifetime Donations', 'give'); ?>
 			</li>
-			<?php do_action( 'give_donor_stats_list', $customer ); ?>
+			<?php do_action('give_donor_stats_list', $customer); ?>
 		</ul>
 	</div>
 
-	<?php do_action( 'give_donor_before_tables_wrapper', $customer ); ?>
+	<?php do_action('give_donor_before_tables_wrapper', $customer); ?>
 
 	<div id="customer-tables-wrapper" class="customer-section">
 
-		<?php do_action( 'give_donor_before_tables', $customer ); ?>
+		<?php do_action('give_donor_before_tables', $customer); ?>
 
-		<h3><?php esc_html_e( 'Recent Donations', 'give' ); ?></h3>
+		<h3><?php esc_html_e('Recent Donations', 'give'); ?></h3>
 		<?php
-		$payment_ids = explode( ',', $customer->payment_ids );
-		$payments    = give_get_payments( array( 'post__in' => $payment_ids ) );
-		$payments    = array_slice( $payments, 0, 10 );
+		$payment_ids = explode(',', $customer->payment_ids);
+		$payments    = give_get_payments(array('post__in' => $payment_ids));
+		$payments    = array_slice($payments, 0, 10);
 		?>
 		<table class="wp-list-table widefat striped payments">
 			<thead>
 			<tr>
-				<th><?php esc_html_e( 'ID', 'give' ); ?></th>
-				<th><?php esc_html_e( 'Amount', 'give' ); ?></th>
-				<th><?php esc_html_e( 'Date', 'give' ); ?></th>
-				<th><?php esc_html_e( 'Status', 'give' ); ?></th>
-				<th><?php esc_html_e( 'Actions', 'give' ); ?></th>
+				<th><?php esc_html_e('ID', 'give'); ?></th>
+				<th><?php esc_html_e('Amount', 'give'); ?></th>
+				<th><?php esc_html_e('Date', 'give'); ?></th>
+				<th><?php esc_html_e('Status', 'give'); ?></th>
+				<th><?php esc_html_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( get_option( '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(get_option('date_format'), strtotime($payment->post_date)); ?></td>
+						<td><?php echo give_get_payment_status($payment, true); ?></td>
 						<td>
-							<a title="<?php esc_attr_e( 'View Details for Donation', 'give' );
-							echo ' ' . $payment->ID; ?>" href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id=' . $payment->ID ); ?>">
-								<?php esc_html_e( 'View Details', 'give' ); ?>
+							<a title="<?php esc_attr_e('View Details for Donation', 'give');
+							echo ' '.$payment->ID; ?>" href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id='.$payment->ID); ?>">
+								<?php esc_html_e('View Details', 'give'); ?>
 							</a>
-							<?php do_action( 'give_donor_recent_purchases_actions', $customer, $payment ); ?>
+							<?php do_action('give_donor_recent_purchases_actions', $customer, $payment); ?>
 						</td>
 					</tr>
 				<?php endforeach; ?>
 			<?php else: ?>
 				<tr>
-					<td colspan="5"><?php esc_html_e( 'No Donations Found', 'give' ); ?></td>
+					<td colspan="5"><?php esc_html_e('No Donations Found', 'give'); ?></td>
 				</tr>
 			<?php endif; ?>
 			</tbody>
 		</table>
 
-		<h3><?php esc_html_e( 'Completed Donations', 'give' ); ?></h3>
+		<h3><?php esc_html_e('Completed Donations', 'give'); ?></h3>
 		<?php
-		$donations = give_get_users_completed_donations( $customer->email );
+		$donations = give_get_users_completed_donations($customer->email);
 		?>
 		<table class="wp-list-table widefat striped donations">
 			<thead>
 			<tr>
 				<th><?php echo give_get_forms_label_singular(); ?></th>
-				<th width="120px"><?php esc_html_e( 'Actions', 'give' ); ?></th>
+				<th width="120px"><?php esc_html_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>
 							<a title="<?php
 								printf(
 									/* translators: %s: post title */
-									esc_attr( 'View %s', 'give' ),
+									esc_attr('View %s', 'give'),
 									$donation->post_title
-								); ?>" href="<?php echo esc_url( admin_url( 'post.php?action=edit&post=' . $donation->ID ) );
+								); ?>" href="<?php echo esc_url(admin_url('post.php?action=edit&post='.$donation->ID));
 							?>">
 								<?php
 									printf(
 										/* translators: %s: forms singular label */
-										esc_html( 'View %s', 'give' ),
+										esc_html('View %s', 'give'),
 										give_get_forms_label_singular()
 									);
 								?>
@@ -465,17 +465,17 @@ 
 				<?php endforeach; ?>
 			<?php else: ?>
 				<tr>
-					<td colspan="2"><?php esc_html_e( 'No Completed Donations Found', 'give' ); ?></td>
+					<td colspan="2"><?php esc_html_e('No Completed Donations Found', 'give'); ?></td>
 				</tr>
 			<?php endif; ?>
 			</tbody>
 		</table>
 
-		<?php do_action( 'give_donor_after_tables', $customer ); ?>
+		<?php do_action('give_donor_after_tables', $customer); ?>
 
 	</div>
 
-	<?php do_action( 'give_donor_card_bottom', $customer ); ?>
+	<?php do_action('give_donor_card_bottom', $customer); ?>
 
 	<?php
 }
@@ -489,30 +489,30 @@ 
  *
  * @return void
  */
-function give_customer_notes_view( $customer ) {
+function give_customer_notes_view($customer) {
 
-	$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     = $customer->get_notes_count();
-	$per_page       = apply_filters( 'give_customer_notes_per_page', 20 );
-	$total_pages    = ceil( $note_count / $per_page );
-	$customer_notes = $customer->get_notes( $per_page, $paged );
+	$per_page       = apply_filters('give_customer_notes_per_page', 20);
+	$total_pages    = ceil($note_count / $per_page);
+	$customer_notes = $customer->get_notes($per_page, $paged);
 	?>
 
 	<div id="customer-notes-wrapper">
 		<div class="customer-notes-header">
-			<?php echo get_avatar( $customer->email, 30 ); ?> <span><?php echo $customer->name; ?></span>
+			<?php echo get_avatar($customer->email, 30); ?> <span><?php echo $customer->name; ?></span>
 		</div>
-		<h3><?php esc_html_e( 'Notes', 'give' ); ?></h3>
+		<h3><?php esc_html_e('Notes', 'give'); ?></h3>
 
-		<?php if ( 1 == $paged ) : ?>
+		<?php if (1 == $paged) : ?>
 			<div style="display: block; margin-bottom: 55px;">
-				<form id="give-add-customer-note" method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=notes&id=' . $customer->id ); ?>">
+				<form id="give-add-customer-note" method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=notes&id='.$customer->id); ?>">
 					<textarea id="customer-note" name="customer_note" class="customer-note-input" rows="10"></textarea>
 					<br />
 					<input type="hidden" id="customer-id" name="customer_id" value="<?php echo $customer->id; ?>" />
 					<input type="hidden" name="give_action" value="add-customer-note" />
-					<?php wp_nonce_field( 'add-customer-note', 'add_customer_note_nonce', true, true ); ?>
+					<?php wp_nonce_field('add-customer-note', 'add_customer_note_nonce', true, true); ?>
 					<input id="add-customer-note" class="right button-primary" type="submit" value="Add Note" />
 				</form>
 			</div>
@@ -527,46 +527,46 @@ 
 			'show_all' => true
 		);
 
-		echo paginate_links( $pagination_args );
+		echo paginate_links($pagination_args);
 		?>
 
 		<div id="give-customer-notes" class="postbox">
-			<?php if ( count( $customer_notes ) > 0 ) : ?>
-				<?php foreach ( $customer_notes as $key => $note ) : ?>
+			<?php if (count($customer_notes) > 0) : ?>
+				<?php foreach ($customer_notes as $key => $note) : ?>
 					<div class="customer-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-customer-notes">
-					<?php esc_html_e( 'No Donor Notes', 'give' ); ?>
+					<?php esc_html_e('No Donor Notes', 'give'); ?>
 				</div>
 			<?php endif; ?>
 		</div>
 
-		<?php echo paginate_links( $pagination_args ); ?>
+		<?php echo paginate_links($pagination_args); ?>
 
 	</div>
 
 	<?php
 }
 
-function give_customers_delete_view( $customer ) {
+function give_customers_delete_view($customer) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
 	?>
 
-	<?php do_action( 'give_customer_delete_top', $customer ); ?>
+	<?php do_action('give_customer_delete_top', $customer); ?>
 
 	<div class="info-wrapper customer-section">
 
-		<form id="delete-customer" method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $customer->id ); ?>">
+		<form id="delete-customer" method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$customer->id); ?>">
 
 			<div class="customer-notes-header">
-				<?php echo get_avatar( $customer->email, 30 ); ?> <span><?php echo $customer->name; ?></span>
+				<?php echo get_avatar($customer->email, 30); ?> <span><?php echo $customer->name; ?></span>
 			</div>
 
 
@@ -574,27 +574,27 @@ 
 
 				<span class="delete-customer-options">
 					<p>
-						<?php echo Give()->html->checkbox( array( 'name' => 'give-customer-delete-confirm' ) ); ?>
-						<label for="give-customer-delete-confirm"><?php esc_html_e( 'Are you sure you want to delete this donor?', 'give' ); ?></label>
+						<?php echo Give()->html->checkbox(array('name' => 'give-customer-delete-confirm')); ?>
+						<label for="give-customer-delete-confirm"><?php esc_html_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-customer-delete-records',
-							'options' => array( 'disabled' => true )
-						) ); ?>
-						<label for="give-customer-delete-records"><?php esc_html_e( 'Delete all associated payments and records?', 'give' ); ?></label>
+							'options' => array('disabled' => true)
+						)); ?>
+						<label for="give-customer-delete-records"><?php esc_html_e('Delete all associated payments and records?', 'give'); ?></label>
 					</p>
 
-					<?php do_action( 'give_customer_delete_inputs', $customer ); ?>
+					<?php do_action('give_customer_delete_inputs', $customer); ?>
 				</span>
 
 				<span id="customer-edit-actions">
 					<input type="hidden" name="customer_id" value="<?php echo $customer->id; ?>" />
-					<?php wp_nonce_field( 'delete-customer', '_wpnonce', false, true ); ?>
+					<?php wp_nonce_field('delete-customer', '_wpnonce', false, true); ?>
 					<input type="hidden" name="give_action" value="delete-customer" />
-					<input type="submit" disabled="disabled" id="give-delete-customer" class="button-primary" value="<?php esc_attr_e( 'Delete Donor', 'give' ); ?>" />
-					<a id="give-delete-customer-cancel" href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ); ?>" class="delete"><?php esc_html_e( 'Cancel', 'give' ); ?></a>
+					<input type="submit" disabled="disabled" id="give-delete-customer" class="button-primary" value="<?php esc_attr_e('Delete Donor', 'give'); ?>" />
+					<a id="give-delete-customer-cancel" href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id); ?>" class="delete"><?php esc_html_e('Cancel', 'give'); ?></a>
 				</span>
 
 			</div>
@@ -604,5 +604,5 @@ 
 
 	<?php
 
-	do_action( 'give_customer_delete_bottom', $customer );
+	do_action('give_customer_delete_bottom', $customer);
 }

includes/admin/customers/customer-actions.php

Spacing +128 added lines, -128 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,15 +23,15 @@ 
  *
  * @return array $output Response messages
  */
-function give_edit_customer( $args ) {
+function give_edit_customer($args) {
 	
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( esc_html( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(esc_html('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
@@ -39,12 +39,12 @@ 
 	$customer_id   = (int) $args['customerinfo']['id'];
 	$nonce         = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-customer' ) ) {
-		wp_die( esc_html( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(esc_html('Cheatin\' eh?!', 'give'));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
@@ -54,23 +54,23 @@ 
 		'user_id' => 0
 	);
 
-	$customer_info = wp_parse_args( $customer_info, $defaults );
+	$customer_info = wp_parse_args($customer_info, $defaults);
 
-	if ( ! is_email( $customer_info['email'] ) ) {
-		give_set_error( 'give-invalid-email', esc_html( 'Please enter a valid email address.', 'give' ) );
+	if ( ! is_email($customer_info['email'])) {
+		give_set_error('give-invalid-email', esc_html('Please enter a valid email address.', 'give'));
 	}
 
-	if ( (int) $customer_info['user_id'] != (int) $customer->user_id ) {
+	if ((int) $customer_info['user_id'] != (int) $customer->user_id) {
 
 		// Make sure we don't already have this user attached to a customer
-		if ( ! empty( $customer_info['user_id'] ) && false !== Give()->customers->get_customer_by( 'user_id', $customer_info['user_id'] ) ) {
-			give_set_error( 'give-invalid-customer-user_id', sprintf( esc_html( 'The User ID %d is already associated with a different donor.', 'give' ), $customer_info['user_id'] ) );
+		if ( ! empty($customer_info['user_id']) && false !== Give()->customers->get_customer_by('user_id', $customer_info['user_id'])) {
+			give_set_error('give-invalid-customer-user_id', sprintf(esc_html('The User ID %d is already associated with a different donor.', 'give'), $customer_info['user_id']));
 		}
 
 		// Make sure it's actually a user
-		$user = get_user_by( 'id', $customer_info['user_id'] );
-		if ( ! empty( $customer_info['user_id'] ) && false === $user ) {
-			give_set_error( 'give-invalid-user_id', sprintf( esc_html( 'The User ID %d does not exist. Please assign an existing user.', 'give' ), $customer_info['user_id'] ) );
+		$user = get_user_by('id', $customer_info['user_id']);
+		if ( ! empty($customer_info['user_id']) && false === $user) {
+			give_set_error('give-invalid-user_id', sprintf(esc_html('The User ID %d does not exist. Please assign an existing user.', 'give'), $customer_info['user_id']));
 		}
 
 	}
@@ -78,82 +78,82 @@ 
 	// Record this for later
 	$previous_user_id = $customer->user_id;
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return;
 	}
 
 	// Setup the customer address, if present
 	$address = array();
-	if ( intval( $customer_info['user_id'] ) > 0 ) {
+	if (intval($customer_info['user_id']) > 0) {
 
-		$current_address = get_user_meta( $customer_info['user_id'], '_give_user_address', true );
+		$current_address = get_user_meta($customer_info['user_id'], '_give_user_address', true);
 
-		if ( false === $current_address ) {
-			$address['line1']   = isset( $customer_info['line1'] ) ? $customer_info['line1'] : '';
-			$address['line2']   = isset( $customer_info['line2'] ) ? $customer_info['line2'] : '';
-			$address['city']    = isset( $customer_info['city'] ) ? $customer_info['city'] : '';
-			$address['country'] = isset( $customer_info['country'] ) ? $customer_info['country'] : '';
-			$address['zip']     = isset( $customer_info['zip'] ) ? $customer_info['zip'] : '';
-			$address['state']   = isset( $customer_info['state'] ) ? $customer_info['state'] : '';
+		if (false === $current_address) {
+			$address['line1']   = isset($customer_info['line1']) ? $customer_info['line1'] : '';
+			$address['line2']   = isset($customer_info['line2']) ? $customer_info['line2'] : '';
+			$address['city']    = isset($customer_info['city']) ? $customer_info['city'] : '';
+			$address['country'] = isset($customer_info['country']) ? $customer_info['country'] : '';
+			$address['zip']     = isset($customer_info['zip']) ? $customer_info['zip'] : '';
+			$address['state']   = isset($customer_info['state']) ? $customer_info['state'] : '';
 		} else {
-			$current_address    = wp_parse_args( $current_address, array(
+			$current_address    = wp_parse_args($current_address, array(
 				'line1',
 				'line2',
 				'city',
 				'zip',
 				'state',
 				'country'
-			) );
-			$address['line1']   = isset( $customer_info['line1'] ) ? $customer_info['line1'] : $current_address['line1'];
-			$address['line2']   = isset( $customer_info['line2'] ) ? $customer_info['line2'] : $current_address['line2'];
-			$address['city']    = isset( $customer_info['city'] ) ? $customer_info['city'] : $current_address['city'];
-			$address['country'] = isset( $customer_info['country'] ) ? $customer_info['country'] : $current_address['country'];
-			$address['zip']     = isset( $customer_info['zip'] ) ? $customer_info['zip'] : $current_address['zip'];
-			$address['state']   = isset( $customer_info['state'] ) ? $customer_info['state'] : $current_address['state'];
+			));
+			$address['line1']   = isset($customer_info['line1']) ? $customer_info['line1'] : $current_address['line1'];
+			$address['line2']   = isset($customer_info['line2']) ? $customer_info['line2'] : $current_address['line2'];
+			$address['city']    = isset($customer_info['city']) ? $customer_info['city'] : $current_address['city'];
+			$address['country'] = isset($customer_info['country']) ? $customer_info['country'] : $current_address['country'];
+			$address['zip']     = isset($customer_info['zip']) ? $customer_info['zip'] : $current_address['zip'];
+			$address['state']   = isset($customer_info['state']) ? $customer_info['state'] : $current_address['state'];
 		}
 
 	}
 
 	// Sanitize the inputs
 	$customer_data            = array();
-	$customer_data['name']    = strip_tags( stripslashes( $customer_info['name'] ) );
+	$customer_data['name']    = strip_tags(stripslashes($customer_info['name']));
 	$customer_data['email']   = $customer_info['email'];
 	$customer_data['user_id'] = $customer_info['user_id'];
 
-	$customer_data = apply_filters( 'give_edit_customer_info', $customer_data, $customer_id );
-	$address       = apply_filters( 'give_edit_customer_address', $address, $customer_id );
+	$customer_data = apply_filters('give_edit_customer_info', $customer_data, $customer_id);
+	$address       = apply_filters('give_edit_customer_address', $address, $customer_id);
 
-	$customer_data = array_map( 'sanitize_text_field', $customer_data );
-	$address       = array_map( 'sanitize_text_field', $address );
+	$customer_data = array_map('sanitize_text_field', $customer_data);
+	$address       = array_map('sanitize_text_field', $address);
 
-	do_action( 'give_pre_edit_customer', $customer_id, $customer_data, $address );
+	do_action('give_pre_edit_customer', $customer_id, $customer_data, $address);
 
 	$output         = array();
 	$previous_email = $customer->email;
 
-	if ( $customer->update( $customer_data ) ) {
+	if ($customer->update($customer_data)) {
 
-		if ( ! empty( $customer->user_id ) && $customer->user_id > 0 ) {
-			update_user_meta( $customer->user_id, '_give_user_address', $address );
+		if ( ! empty($customer->user_id) && $customer->user_id > 0) {
+			update_user_meta($customer->user_id, '_give_user_address', $address);
 		}
 
 		// Update some payment meta if we need to
-		$payments_array = explode( ',', $customer->payment_ids );
+		$payments_array = explode(',', $customer->payment_ids);
 
-		if ( $customer->email != $previous_email ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, 'email', $customer->email );
+		if ($customer->email != $previous_email) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, 'email', $customer->email);
 			}
 		}
 
-		if ( $customer->user_id != $previous_user_id ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, '_give_payment_user_id', $customer->user_id );
+		if ($customer->user_id != $previous_user_id) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, '_give_payment_user_id', $customer->user_id);
 			}
 		}
 
 		$output['success']       = true;
-		$customer_data           = array_merge( $customer_data, $address );
+		$customer_data           = array_merge($customer_data, $address);
 		$output['customer_info'] = $customer_data;
 
 	} else {
@@ -162,11 +162,11 @@ 
 
 	}
 
-	do_action( 'give_post_edit_customer', $customer_id, $customer_data );
+	do_action('give_post_edit_customer', $customer_id, $customer_data);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -174,7 +174,7 @@ 
 
 }
 
-add_action( 'give_edit-customer', 'give_edit_customer', 10, 1 );
+add_action('give_edit-customer', 'give_edit_customer', 10, 1);
 
 /**
  * Save a customer note being added
@@ -185,53 +185,53 @@ 
  *
  * @return int         The Note ID that was saved, or 0 if nothing was saved
  */
-function give_customer_save_note( $args ) {
+function give_customer_save_note($args) {
 
-	$customer_view_role = apply_filters( 'give_view_customers_role', 'view_give_reports' );
+	$customer_view_role = apply_filters('give_view_customers_role', 'view_give_reports');
 
-	if ( ! is_admin() || ! current_user_can( $customer_view_role ) ) {
-		wp_die( esc_html( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_view_role)) {
+		wp_die(esc_html('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
-	$customer_note = trim( sanitize_text_field( $args['customer_note'] ) );
+	$customer_note = trim(sanitize_text_field($args['customer_note']));
 	$customer_id   = (int) $args['customer_id'];
 	$nonce         = $args['add_customer_note_nonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'add-customer-note' ) ) {
-		wp_die( esc_html( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'add-customer-note')) {
+		wp_die(esc_html('Cheatin\' eh?!', 'give'));
 	}
 
-	if ( empty( $customer_note ) ) {
-		give_set_error( 'empty-customer-note', esc_html( 'A note is required.', 'give' ) );
+	if (empty($customer_note)) {
+		give_set_error('empty-customer-note', esc_html('A note is required.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return;
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	$new_note = $customer->add_note( $customer_note );
+	$customer = new Give_Customer($customer_id);
+	$new_note = $customer->add_note($customer_note);
 
-	do_action( 'give_pre_insert_customer_note', $customer_id, $new_note );
+	do_action('give_pre_insert_customer_note', $customer_id, $new_note);
 
-	if ( ! empty( $new_note ) && ! empty( $customer->id ) ) {
+	if ( ! empty($new_note) && ! empty($customer->id)) {
 
 		ob_start();
 		?>
 		<div class="customer-note-wrapper dashboard-comment-wrap comment-item">
 			<span class="note-content-wrap">
-				<?php echo stripslashes( $new_note ); ?>
+				<?php echo stripslashes($new_note); ?>
 			</span>
 		</div>
 		<?php
 		$output = ob_get_contents();
 		ob_end_clean();
 
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			echo $output;
 			exit;
 		}
@@ -244,7 +244,7 @@ 
 
 }
 
-add_action( 'give_add-customer-note', 'give_customer_save_note', 10, 1 );
+add_action('give_add-customer-note', 'give_customer_save_note', 10, 1);
 
 /**
  * Delete a customer
@@ -255,87 +255,87 @@ 
  *
  * @return int Whether it was a successful deletion
  */
-function give_customer_delete( $args ) {
+function give_customer_delete($args) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( esc_html( 'You do not have permission to delete donors.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(esc_html('You do not have permission to delete donors.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
 	$customer_id = (int) $args['customer_id'];
-	$confirm     = ! empty( $args['give-customer-delete-confirm'] ) ? true : false;
-	$remove_data = ! empty( $args['give-customer-delete-records'] ) ? true : false;
+	$confirm     = ! empty($args['give-customer-delete-confirm']) ? true : false;
+	$remove_data = ! empty($args['give-customer-delete-records']) ? true : false;
 	$nonce       = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'delete-customer' ) ) {
-		wp_die( esc_html( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'delete-customer')) {
+		wp_die(esc_html('Cheatin\' eh?!', 'give'));
 	}
 
-	if ( ! $confirm ) {
-		give_set_error( 'customer-delete-no-confirm', esc_html( 'Please confirm you want to delete this donor.', 'give' ) );
+	if ( ! $confirm) {
+		give_set_error('customer-delete-no-confirm', esc_html('Please confirm you want to delete this donor.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
-		wp_redirect( admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer_id ) );
+	if (give_get_errors()) {
+		wp_redirect(admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer_id));
 		exit;
 	}
 
-	$customer = new Give_Customer( $customer_id );
+	$customer = new Give_Customer($customer_id);
 
-	do_action( 'give_pre_delete_customer', $customer_id, $confirm, $remove_data );
+	do_action('give_pre_delete_customer', $customer_id, $confirm, $remove_data);
 
 	$success = false;
 
-	if ( $customer->id > 0 ) {
+	if ($customer->id > 0) {
 
-		$payments_array = explode( ',', $customer->payment_ids );
-		$success        = Give()->customers->delete( $customer->id );
+		$payments_array = explode(',', $customer->payment_ids);
+		$success        = Give()->customers->delete($customer->id);
 
-		if ( $success ) {
+		if ($success) {
 
-			if ( $remove_data ) {
+			if ($remove_data) {
 
 				// Remove all payments, logs, etc
-				foreach ( $payments_array as $payment_id ) {
-					give_delete_purchase( $payment_id );
+				foreach ($payments_array as $payment_id) {
+					give_delete_purchase($payment_id);
 				}
 
 			} else {
 
 				// Just set the payments to customer_id of 0
-				foreach ( $payments_array as $payment_id ) {
-					give_update_payment_meta( $payment_id, '_give_payment_customer_id', 0 );
+				foreach ($payments_array as $payment_id) {
+					give_update_payment_meta($payment_id, '_give_payment_customer_id', 0);
 				}
 
 			}
 
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&give-message=customer-deleted' );
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&give-message=customer-deleted');
 
 		} else {
 
-			give_set_error( 'give-donor-delete-failed', esc_html( 'Error deleting donor.', 'give' ) );
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $customer_id );
+			give_set_error('give-donor-delete-failed', esc_html('Error deleting donor.', 'give'));
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$customer_id);
 
 		}
 
 	} else {
 
-		give_set_error( 'give-customer-delete-invalid-id', esc_html( 'Invalid Donor ID.', 'give' ) );
-		$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors' );
+		give_set_error('give-customer-delete-invalid-id', esc_html('Invalid Donor ID.', 'give'));
+		$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors');
 
 	}
 
-	wp_redirect( $redirect );
+	wp_redirect($redirect);
 	exit;
 
 }
 
-add_action( 'give_delete-customer', 'give_customer_delete', 10, 1 );
+add_action('give_delete-customer', 'give_customer_delete', 10, 1);
 
 /**
  * Disconnect a user ID from a donor
@@ -346,39 +346,39 @@ 
  *
  * @return bool        If the disconnect was successful
  */
-function give_disconnect_customer_user_id( $args ) {
+function give_disconnect_customer_user_id($args) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( esc_html( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(esc_html('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
 	$customer_id = (int) $args['customer_id'];
 	$nonce       = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-customer' ) ) {
-		wp_die( esc_html( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(esc_html('Cheatin\' eh?!', 'give'));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
-	do_action( 'give_pre_customer_disconnect_user_id', $customer_id, $customer->user_id );
+	do_action('give_pre_customer_disconnect_user_id', $customer_id, $customer->user_id);
 
-	$customer_args = array( 'user_id' => 0 );
+	$customer_args = array('user_id' => 0);
 
-	if ( $customer->update( $customer_args ) ) {
+	if ($customer->update($customer_args)) {
 		global $wpdb;
 
-		if ( ! empty( $customer->payment_ids ) ) {
-			$wpdb->query( "UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $customer->payment_ids )" );
+		if ( ! empty($customer->payment_ids)) {
+			$wpdb->query("UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $customer->payment_ids )");
 		}
 
 		$output['success'] = true;
@@ -386,14 +386,14 @@ 
 	} else {
 
 		$output['success'] = false;
-		give_set_error( 'give-disconnect-user-fail', esc_html( 'Failed to disconnect user from donor.', 'give' ) );
+		give_set_error('give-disconnect-user-fail', esc_html('Failed to disconnect user from donor.', 'give'));
 	}
 
-	do_action( 'give_post_customer_disconnect_user_id', $customer_id );
+	do_action('give_post_customer_disconnect_user_id', $customer_id);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -401,4 +401,4 @@ 
 
 }
 
-add_action( 'give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1 );
+add_action('give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1);

includes/admin/forms/metabox.php

Spacing +190 added lines, -190 removed lines

@@ -10,11 +10,11 @@ 
  */

 

 // Exit if accessed directly

-if ( ! defined( 'ABSPATH' ) ) {

+if ( ! defined('ABSPATH')) {

 	exit;

 }

 

-add_filter( 'cmb2_meta_boxes', 'give_single_forms_cmb2_metaboxes' );

+add_filter('cmb2_meta_boxes', 'give_single_forms_cmb2_metaboxes');

 

 /**

  * Define the metabox and field configurations.

@@ -23,23 +23,23 @@ 
  *

  * @return array

  */

-function give_single_forms_cmb2_metaboxes( array $meta_boxes ) {

+function give_single_forms_cmb2_metaboxes(array $meta_boxes) {

 

 	$post_id               = give_get_admin_post_id();

-	$price                 = give_get_form_price( $post_id );

-	$custom_amount_minimum = give_get_form_minimum_price( $post_id );

-	$goal                  = give_get_form_goal( $post_id );

-	$variable_pricing      = give_has_variable_prices( $post_id );

-	$prices                = give_get_variable_prices( $post_id );

+	$price                 = give_get_form_price($post_id);

+	$custom_amount_minimum = give_get_form_minimum_price($post_id);

+	$goal                  = give_get_form_goal($post_id);

+	$variable_pricing      = give_has_variable_prices($post_id);

+	$prices                = give_get_variable_prices($post_id);

 

 	//No empty prices - min. 1.00 for new forms

-	if ( empty( $price ) && is_null( $post_id ) ) {

-		$price = esc_attr( give_format_amount( '1.00' ) );

+	if (empty($price) && is_null($post_id)) {

+		$price = esc_attr(give_format_amount('1.00'));

 	}

 

 	//Min. $1.00 for new forms

-	if ( empty( $custom_amount_minimum ) ) {

-		$custom_amount_minimum = esc_attr( give_format_amount( '1.00' ) );

+	if (empty($custom_amount_minimum)) {

+		$custom_amount_minimum = esc_attr(give_format_amount('1.00'));

 	}

 

 	// Start with an underscore to hide fields from custom fields list

@@ -48,326 +48,326 @@ 
 	/**

 	 * Repeatable Field Groups

 	 */

-	$meta_boxes['form_field_options'] = apply_filters( 'give_forms_field_options', array(

+	$meta_boxes['form_field_options'] = apply_filters('give_forms_field_options', array(

 		'id'           => 'form_field_options',

-		'title'        => esc_html( 'Donation Options', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => esc_html('Donation Options', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

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

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

 				//Donation Option

 				array(

-					'name'        => esc_html( 'Donation Option', 'give' ),

-					'description' => esc_html( 'Would you like this form to have one set donation price or multiple levels (for example, $10, $20, $50)?', 'give' ),

-					'id'          => $prefix . 'price_option',

+					'name'        => esc_html('Donation Option', 'give'),

+					'description' => esc_html('Would you like this form to have one set donation price or multiple levels (for example, $10, $20, $50)?', 'give'),

+					'id'          => $prefix.'price_option',

 					'type'        => 'radio_inline',

 					'default'     => 'set',

-					'options'     => apply_filters( 'give_forms_price_options', array(

-						'set'   => esc_html( 'Set Donation', 'give' ),

-						'multi' => esc_html( 'Multi-level Donation', 'give' ),

-					) ),

+					'options'     => apply_filters('give_forms_price_options', array(

+						'set'   => esc_html('Set Donation', 'give'),

+						'multi' => esc_html('Multi-level Donation', 'give'),

+					)),

 				),

 				array(

-					'name'         => esc_html( 'Set Donation', 'give' ),

-					'description'  => esc_html( 'This is the set donation amount for this form. If you have a "Custom Amount Minimum" set, make sure it is less than this amount.', 'give' ),

-					'id'           => $prefix . 'set_price',

+					'name'         => esc_html('Set Donation', 'give'),

+					'description'  => esc_html('This is the set donation amount for this form. If you have a "Custom Amount Minimum" set, make sure it is less than this amount.', 'give'),

+					'id'           => $prefix.'set_price',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '1.00' ),

-						'value'       => give_format_amount( $price ),

+						'placeholder' => give_format_amount('1.00'),

+						'value'       => give_format_amount($price),

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 				//Donation levels: Header

 				array(

-					'id'   => $prefix . 'levels_header',

+					'id'   => $prefix.'levels_header',

 					'type' => 'levels_repeater_header',

 				),

 				//Donation Levels: Repeatable CMB2 Group

 				array(

-					'id'          => $prefix . 'donation_levels',

+					'id'          => $prefix.'donation_levels',

 					'type'        => 'group',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'add_button'    => esc_html( 'Add Level', 'give' ),

+						'add_button'    => esc_html('Add Level', 'give'),

 						'remove_button' => '<span class="dashicons dashicons-no"></span>',

 						'sortable'      => true, // beta

 					),

 					// Fields array works the same, except id's only need to be unique for this group. Prefix is not needed.

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

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

 						array(

-							'name' => esc_html( 'ID', 'give' ),

-							'id'   => $prefix . 'id',

+							'name' => esc_html('ID', 'give'),

+							'id'   => $prefix.'id',

 							'type' => 'levels_id',

 						),

 						array(

-							'name'         => esc_html( 'Amount', 'give' ),

-							'id'           => $prefix . 'amount',

+							'name'         => esc_html('Amount', 'give'),

+							'id'           => $prefix.'amount',

 							'type'         => 'text_small',

-							'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol  give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-							'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol  give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+							'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol  give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+							'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol  give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 							'attributes'   => array(

-								'placeholder' => give_format_amount( '1.00' ),

+								'placeholder' => give_format_amount('1.00'),

 								'class'       => 'cmb-type-text-small give-money-field',

 							),

 							'before'       => 'give_format_admin_multilevel_amount',

 						),

 						array(

-							'name'       => esc_html( 'Text', 'give' ),

-							'id'         => $prefix . 'text',

+							'name'       => esc_html('Text', 'give'),

+							'id'         => $prefix.'text',

 							'type'       => 'text',

 							'attributes' => array(

-								'placeholder' => esc_attr( 'Donation Level', 'give' ),

+								'placeholder' => esc_attr('Donation Level', 'give'),

 								'class'       => 'give-multilevel-text-field',

 							),

 						),

 						array(

-							'name' => esc_html( 'Default', 'give' ),

-							'id'   => $prefix . 'default',

+							'name' => esc_html('Default', 'give'),

+							'id'   => $prefix.'default',

 							'type' => 'give_default_radio_inline'

 						),

-					) ),

+					)),

 				),

 				//Display Style

 				array(

-					'name'        => esc_html( 'Display Style', 'give' ),

-					'description' => esc_html( 'Set how the donations levels will display on the form.', 'give' ),

-					'id'          => $prefix . 'display_style',

+					'name'        => esc_html('Display Style', 'give'),

+					'description' => esc_html('Set how the donations levels will display on the form.', 'give'),

+					'id'          => $prefix.'display_style',

 					'type'        => 'radio_inline',

 					'default'     => 'buttons',

 					'options'     => array(

-						'buttons'  => esc_html( 'Buttons', 'give' ),

-						'radios'   => esc_html( 'Radios', 'give' ),

-						'dropdown' => esc_html( 'Dropdown', 'give' ),

+						'buttons'  => esc_html('Buttons', 'give'),

+						'radios'   => esc_html('Radios', 'give'),

+						'dropdown' => esc_html('Dropdown', 'give'),

 					),

 				),

 				//Custom Amount

 				array(

-					'name'        => esc_html( 'Custom Amount', 'give' ),

-					'description' => esc_html( 'Do you want the user to be able to input their own donation amount?', 'give' ),

-					'id'          => $prefix . 'custom_amount',

+					'name'        => esc_html('Custom Amount', 'give'),

+					'description' => esc_html('Do you want the user to be able to input their own donation amount?', 'give'),

+					'id'          => $prefix.'custom_amount',

 					'type'        => 'radio_inline',

 					'default'     => 'no',

 					'options'     => array(

-						'yes' => esc_html( 'Yes', 'give' ),

-						'no'  => esc_html( 'No', 'give' ),

+						'yes' => esc_html('Yes', 'give'),

+						'no'  => esc_html('No', 'give'),

 					),

 				),

 				array(

-					'name'         => esc_html( 'Custom Amount Minimum', 'give' ),

-					'description'  => esc_html( 'If you would like to set a minimum custom donation amount please enter it here.', 'give' ),

-					'id'           => $prefix . 'custom_amount_minimum',

+					'name'         => esc_html('Custom Amount Minimum', 'give'),

+					'description'  => esc_html('If you would like to set a minimum custom donation amount please enter it here.', 'give'),

+					'id'           => $prefix.'custom_amount_minimum',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '1.00' ),

-						'value'       => give_format_amount( $custom_amount_minimum ),

+						'placeholder' => give_format_amount('1.00'),

+						'value'       => give_format_amount($custom_amount_minimum),

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 				array(

-					'name'        => esc_html( 'Custom Amount Text', 'give' ),

-					'description' => esc_html( 'This text appears as a label below the custom amount field for set donation forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option).', 'give' ),

-					'id'          => $prefix . 'custom_amount_text',

+					'name'        => esc_html('Custom Amount Text', 'give'),

+					'description' => esc_html('This text appears as a label below the custom amount field for set donation forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option).', 'give'),

+					'id'          => $prefix.'custom_amount_text',

 					'type'        => 'text',

 					'row_classes' => 'give-subfield',

 					'attributes'  => array(

 						'rows'        => 3,

-						'placeholder' => esc_attr( 'Give a Custom Amount', 'give' ),

+						'placeholder' => esc_attr('Give a Custom Amount', 'give'),

 					),

 				),

 				//Goals

 				array(

-					'name'        => esc_html( 'Goal', 'give' ),

-					'description' => esc_html( 'Do you want to set a donation goal for this form?', 'give' ),

-					'id'          => $prefix . 'goal_option',

+					'name'        => esc_html('Goal', 'give'),

+					'description' => esc_html('Do you want to set a donation goal for this form?', 'give'),

+					'id'          => $prefix.'goal_option',

 					'type'        => 'radio_inline',

 					'default'     => 'no',

 					'options'     => array(

-						'yes' => esc_html( 'Yes', 'give' ),

-						'no'  => esc_html( 'No', 'give' ),

+						'yes' => esc_html('Yes', 'give'),

+						'no'  => esc_html('No', 'give'),

 					),

 				),

 				array(

-					'name'         => esc_html( 'Goal Amount', 'give' ),

-					'description'  => esc_html( 'This is the monetary goal amount you want to reach for this donation form.', 'give' ),

-					'id'           => $prefix . 'set_goal',

+					'name'         => esc_html('Goal Amount', 'give'),

+					'description'  => esc_html('This is the monetary goal amount you want to reach for this donation form.', 'give'),

+					'id'           => $prefix.'set_goal',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '0.00' ),

-						'value'       => isset( $goal ) ? esc_attr( give_format_amount( $goal ) ) : '',

+						'placeholder' => give_format_amount('0.00'),

+						'value'       => isset($goal) ? esc_attr(give_format_amount($goal)) : '',

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 

 				array(

-					'name'        => esc_html( 'Goal Format', 'give' ),

-					'description' => esc_html( 'Would you like to display the total amount raised based on your monetary goal or a percentage? For instance, "$500 of $1,000 raised" or "50% funded".', 'give' ),

-					'id'          => $prefix . 'goal_format',

+					'name'        => esc_html('Goal Format', 'give'),

+					'description' => esc_html('Would you like to display the total amount raised based on your monetary goal or a percentage? For instance, "$500 of $1,000 raised" or "50% funded".', 'give'),

+					'id'          => $prefix.'goal_format',

 					'type'        => 'radio_inline',

 					'default'     => 'amount',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'amount'     => esc_html( 'Amount ', 'give' ),

-						'percentage' => esc_html( 'Percentage', 'give' ),

+						'amount'     => esc_html('Amount ', 'give'),

+						'percentage' => esc_html('Percentage', 'give'),

 					),

 				),

 				array(

-					'name'        => esc_html( 'Goal Progress Bar Color', 'give' ),

-					'id'          => $prefix . 'goal_color',

+					'name'        => esc_html('Goal Progress Bar Color', 'give'),

+					'id'          => $prefix.'goal_color',

 					'type'        => 'colorpicker',

 					'row_classes' => 'give-subfield',

 					'default'     => '#2bc253',

 				),

 

 				array(

-					'name'        => esc_html( 'Close Form when Goal Achieved', 'give' ),

-					'desc'        => esc_html( 'Would you like to close the donation forms and stop accepting donations once this goal has been met?', 'give' ),

-					'id'          => $prefix . 'close_form_when_goal_achieved',

+					'name'        => esc_html('Close Form when Goal Achieved', 'give'),

+					'desc'        => esc_html('Would you like to close the donation forms and stop accepting donations once this goal has been met?', 'give'),

+					'id'          => $prefix.'close_form_when_goal_achieved',

 					'type'        => 'radio_inline',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'yes' => esc_html( 'Yes', 'give' ),

-						'no'  => esc_html( 'No', 'give' ),

+						'yes' => esc_html('Yes', 'give'),

+						'no'  => esc_html('No', 'give'),

 					),

 					'default'     => 'no',

 				),

 				array(

-					'name'        => esc_html( 'Goal Achieved Message', 'give' ),

-					'desc'        => esc_html( 'Would you like to display a custom message when the goal is closed? If none is provided the default message will be displayed', 'give' ),

-					'id'          => $prefix . 'form_goal_achieved_message',

+					'name'        => esc_html('Goal Achieved Message', 'give'),

+					'desc'        => esc_html('Would you like to display a custom message when the goal is closed? If none is provided the default message will be displayed', 'give'),

+					'id'          => $prefix.'form_goal_achieved_message',

 					'type'        => 'textarea',

 					'row_classes' => 'give-subfield',

 					'attributes'  => array(

-						'placeholder' => esc_attr( 'Thank you to all our donors, we have met our fundraising goal.', 'give' ),

+						'placeholder' => esc_attr('Thank you to all our donors, we have met our fundraising goal.', 'give'),

 					),

 				)

 			)

 		)

-	) );

+	));

 

 

 	/**

 	 * Content Field

 	 */

-	$meta_boxes['form_content_options'] = apply_filters( 'give_forms_content_options', array(

+	$meta_boxes['form_content_options'] = apply_filters('give_forms_content_options', array(

 		'id'           => 'form_content_options',

-		'title'        => esc_html( 'Form Content', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => esc_html('Form Content', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

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

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

 				//Donation Option

 				array(

-					'name'        => esc_html( 'Display Content', 'give' ),

-					'description' => esc_html( 'Do you want to display content? If you select "Yes" a WYSIWYG editor will appear which you will be able to enter content to display above or below the form.', 'give' ),

-					'id'          => $prefix . 'content_option',

+					'name'        => esc_html('Display Content', 'give'),

+					'description' => esc_html('Do you want to display content? If you select "Yes" a WYSIWYG editor will appear which you will be able to enter content to display above or below the form.', 'give'),

+					'id'          => $prefix.'content_option',

 					'type'        => 'select',

-					'options'     => apply_filters( 'give_forms_content_options_select', array(

-							'none'           => esc_html( 'No content', 'give' ),

-							'give_pre_form'  => esc_html( 'Yes, display content ABOVE the form fields', 'give' ),

-							'give_post_form' => esc_html( 'Yes, display content BELOW the form fields', 'give' ),

+					'options'     => apply_filters('give_forms_content_options_select', array(

+							'none'           => esc_html('No content', 'give'),

+							'give_pre_form'  => esc_html('Yes, display content ABOVE the form fields', 'give'),

+							'give_post_form' => esc_html('Yes, display content BELOW the form fields', 'give'),

 						)

 					),

 					'default'     => 'none',

 				),

 				array(

-					'name'        => esc_html( 'Content', 'give' ),

-					'description' => esc_html( 'This content will display on the single give form page.', 'give' ),

-					'id'          => $prefix . 'form_content',

+					'name'        => esc_html('Content', 'give'),

+					'description' => esc_html('This content will display on the single give form page.', 'give'),

+					'id'          => $prefix.'form_content',

 					'row_classes' => 'give-subfield',

 					'type'        => 'wysiwyg'

 				),

 			)

 		)

-	) );

+	));

 

 

 	/**

 	 * Display Options

 	 */

-	$meta_boxes['form_display_options'] = apply_filters( 'give_form_display_options', array(

+	$meta_boxes['form_display_options'] = apply_filters('give_form_display_options', array(

 			'id'           => 'form_display_options',

-			'title'        => esc_html( 'Form Display Options', 'give' ),

-			'object_types' => array( 'give_forms' ),

+			'title'        => esc_html('Form Display Options', 'give'),

+			'object_types' => array('give_forms'),

 			'context'      => 'normal', //  'normal', 'advanced', or 'side'

 			'priority'     => 'high', //Show above Content WYSIWYG

 			'show_names'   => true, // Show field names on the left

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

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

 					array(

-						'name'    => esc_html( 'Payment Fields', 'give' ),

-						'desc'    => esc_html( 'How would you like to display payment information for this form? The "Show on Page" option will display the entire form when the page loads. "Reveal Upon Click" places a button below the donation fields and upon click slides into view the rest of the fields. "Modal Window Upon Click" is a similar option, rather than sliding into view the fields they will open in a shadow box or "modal" window.', 'give' ),

-						'id'      => $prefix . 'payment_display',

+						'name'    => esc_html('Payment Fields', 'give'),

+						'desc'    => esc_html('How would you like to display payment information for this form? The "Show on Page" option will display the entire form when the page loads. "Reveal Upon Click" places a button below the donation fields and upon click slides into view the rest of the fields. "Modal Window Upon Click" is a similar option, rather than sliding into view the fields they will open in a shadow box or "modal" window.', 'give'),

+						'id'      => $prefix.'payment_display',

 						'type'    => 'select',

 						'options' => array(

-							'onpage' => esc_html( 'Show on Page', 'give' ),

-							'reveal' => esc_html( 'Reveal Upon Click', 'give' ),

-							'modal'  => esc_html( 'Modal Window Upon Click', 'give' ),

+							'onpage' => esc_html('Show on Page', 'give'),

+							'reveal' => esc_html('Reveal Upon Click', 'give'),

+							'modal'  => esc_html('Modal Window Upon Click', 'give'),

 						),

 						'default' => 'onpage',

 					),

 					array(

-						'id'          => $prefix . 'reveal_label',

-						'name'        => esc_html( 'Reveal / Modal Open Text', 'give' ),

-						'desc'        => esc_html( 'The button label for completing the donation.', 'give' ),

+						'id'          => $prefix.'reveal_label',

+						'name'        => esc_html('Reveal / Modal Open Text', 'give'),

+						'desc'        => esc_html('The button label for completing the donation.', 'give'),

 						'type'        => 'text_small',

 						'row_classes' => 'give-subfield',

 						'attributes'  => array(

-							'placeholder' => esc_attr( 'Donate Now', 'give' ),

+							'placeholder' => esc_attr('Donate Now', 'give'),

 						),

 					),

 					array(

-						'id'         => $prefix . 'checkout_label',

-						'name'       => esc_html( 'Complete Donation Text', 'give' ),

-						'desc'       => esc_html( 'The button label for completing a donation.', 'give' ),

+						'id'         => $prefix.'checkout_label',

+						'name'       => esc_html('Complete Donation Text', 'give'),

+						'desc'       => esc_html('The button label for completing a donation.', 'give'),

 						'type'       => 'text_small',

 						'attributes' => array(

-							'placeholder' => esc_attr( 'Donate Now', 'give' ),

+							'placeholder' => esc_attr('Donate Now', 'give'),

 						),

 					),

 					array(

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

-						'desc' => esc_html( 'By default, the gateway for this form will inherit the global default gateway (set under Give > Settings > Payment Gateways). This option allows you to customize the default gateway for this form only.', 'give' ),

-						'id'   => $prefix . 'default_gateway',

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

+						'desc' => esc_html('By default, the gateway for this form will inherit the global default gateway (set under Give > Settings > Payment Gateways). This option allows you to customize the default gateway for this form only.', 'give'),

+						'id'   => $prefix.'default_gateway',

 						'type' => 'default_gateway'

 					),

 					array(

-						'name' => esc_html( 'Disable Guest Donations', 'give' ),

-						'desc' => esc_html( 'Do you want to require users be logged-in to make donations?', 'give' ),

-						'id'   => $prefix . 'logged_in_only',

+						'name' => esc_html('Disable Guest Donations', 'give'),

+						'desc' => esc_html('Do you want to require users be logged-in to make donations?', 'give'),

+						'id'   => $prefix.'logged_in_only',

 						'type' => 'checkbox'

 					),

 					array(

-						'name'    => esc_html( 'Register / Login Form', 'give' ),

-						'desc'    => esc_html( 'Display the registration and login forms in the payment section for non-logged-in users.', 'give' ),

-						'id'      => $prefix . 'show_register_form',

+						'name'    => esc_html('Register / Login Form', 'give'),

+						'desc'    => esc_html('Display the registration and login forms in the payment section for non-logged-in users.', 'give'),

+						'id'      => $prefix.'show_register_form',

 						'type'    => 'select',

 						'options' => array(

-							'both'         => esc_html( 'Registration and Login Forms', 'give' ),

-							'registration' => esc_html( 'Registration Form Only', 'give' ),

-							'login'        => esc_html( 'Login Form Only', 'give' ),

-							'none'         => esc_html( 'None', 'give' ),

+							'both'         => esc_html('Registration and Login Forms', 'give'),

+							'registration' => esc_html('Registration Form Only', 'give'),

+							'login'        => esc_html('Login Form Only', 'give'),

+							'none'         => esc_html('None', 'give'),

 						),

 						'default' => 'none',

 					),

 					array(

-						'name'    => esc_html( 'Floating Labels', 'give' ),

+						'name'    => esc_html('Floating Labels', 'give'),

 						/* translators: %s: forms http://bradfrost.com/blog/post/float-label-pattern/ */

-						'desc'    => sprintf( __( 'Select the <a href="%s" target="_blank">floating labels</a> setting for this Give form.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give' ), esc_url( "http://bradfrost.com/blog/post/float-label-pattern/" ) ),

-						'id'      => $prefix . 'form_floating_labels',

+						'desc'    => sprintf(__('Select the <a href="%s" target="_blank">floating labels</a> setting for this Give form.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give'), esc_url("http://bradfrost.com/blog/post/float-label-pattern/")),

+						'id'      => $prefix.'form_floating_labels',

 						'type'    => 'select',

 						'options' => array(

-							''         => esc_html( 'Use the global setting', 'give' ),

-							'enabled'  => esc_html( 'Enabled', 'give' ),

-							'disabled' => esc_html( 'Disabled', 'give' ),

+							''         => esc_html('Use the global setting', 'give'),

+							'enabled'  => esc_html('Enabled', 'give'),

+							'disabled' => esc_html('Disabled', 'give'),

 						),

 						'default' => 'none',

 					)

@@ -379,47 +379,47 @@ 
 	/**

 	 * Terms & Conditions

 	 */

-	$meta_boxes['form_terms_options'] = apply_filters( 'give_forms_terms_options', array(

+	$meta_boxes['form_terms_options'] = apply_filters('give_forms_terms_options', array(

 		'id'           => 'form_terms_options',

-		'title'        => esc_html( 'Terms and Conditions', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => esc_html('Terms and Conditions', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

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

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

 				//Donation Option

 				array(

-					'name'        => esc_html( 'Terms and Conditions', 'give' ),

-					'description' => esc_html( 'Do you want to require the user to agree to terms and conditions prior to being able to complete their donation?', 'give' ),

-					'id'          => $prefix . 'terms_option',

+					'name'        => esc_html('Terms and Conditions', 'give'),

+					'description' => esc_html('Do you want to require the user to agree to terms and conditions prior to being able to complete their donation?', 'give'),

+					'id'          => $prefix.'terms_option',

 					'type'        => 'select',

-					'options'     => apply_filters( 'give_forms_content_options_select', array(

-							'none' => esc_html( 'No', 'give' ),

-							'yes'  => esc_html( 'Yes', 'give' ),

+					'options'     => apply_filters('give_forms_content_options_select', array(

+							'none' => esc_html('No', 'give'),

+							'yes'  => esc_html('Yes', 'give'),

 						)

 					),

 					'default'     => 'none',

 				),

 				array(

-					'id'          => $prefix . 'agree_label',

-					'name'        => esc_html( 'Agree to Terms Label', 'give' ),

-					'desc'        => esc_html( 'The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder.', 'give' ),

+					'id'          => $prefix.'agree_label',

+					'name'        => esc_html('Agree to Terms Label', 'give'),

+					'desc'        => esc_html('The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder.', 'give'),

 					'type'        => 'text',

 					'row_classes' => 'give-subfield',

 					'size'        => 'regular',

 					'attributes'  => array(

-						'placeholder' => esc_attr( 'Agree to Terms?', 'give' ),

+						'placeholder' => esc_attr('Agree to Terms?', 'give'),

 					),

 				),

 				array(

-					'id'          => $prefix . 'agree_text',

+					'id'          => $prefix.'agree_text',

 					'row_classes' => 'give-subfield',

-					'name'        => esc_html( 'Agreement Text', 'give' ),

-					'desc'        => esc_html( 'This is the actual text which the user will have to agree to in order to make a donation.', 'give' ),

+					'name'        => esc_html('Agreement Text', 'give'),

+					'desc'        => esc_html('This is the actual text which the user will have to agree to in order to make a donation.', 'give'),

 					'type'        => 'wysiwyg'

 				),

 			)

 		)

-	) );

+	));

 

 	return $meta_boxes;

 

@@ -433,11 +433,11 @@ 
 

 	<div class="table-container">

 		<div class="table-row">

-			<div class="table-cell col-amount"><?php esc_html_e( 'Amount', 'give' ); ?></div>

-			<div class="table-cell col-text"><?php esc_html_e( 'Text', 'give' ); ?></div>

-			<div class="table-cell col-default"><?php esc_html_e( 'Default', 'give' ); ?></div>

-			<?php do_action( 'give_donation_levels_table_head' ); ?>

-			<div class="table-cell col-sort"><?php esc_html_e( 'Sort', 'give' ); ?></div>

+			<div class="table-cell col-amount"><?php esc_html_e('Amount', 'give'); ?></div>

+			<div class="table-cell col-text"><?php esc_html_e('Text', 'give'); ?></div>

+			<div class="table-cell col-default"><?php esc_html_e('Default', 'give'); ?></div>

+			<?php do_action('give_donation_levels_table_head'); ?>

+			<div class="table-cell col-sort"><?php esc_html_e('Sort', 'give'); ?></div>

 

 		</div>

 	</div>

@@ -445,7 +445,7 @@ 
 	<?php

 }

 

-add_action( 'cmb2_render_levels_repeater_header', 'give_cmb_render_levels_repeater_header', 10 );

+add_action('cmb2_render_levels_repeater_header', 'give_cmb_render_levels_repeater_header', 10);

 

 

 /**

@@ -462,25 +462,25 @@ 
  * @param $object_type

  * @param $field_type_object

  */

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

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

 

-	$escaped_value = ( isset( $escaped_value['level_id'] ) ? $escaped_value['level_id'] : '' );

+	$escaped_value = (isset($escaped_value['level_id']) ? $escaped_value['level_id'] : '');

 

 	$field_options_array = array(

 		'class' => 'give-hidden give-level-id-input',

-		'name'  => $field_type_object->_name( '[level_id]' ),

-		'id'    => $field_type_object->_id( '_level_id' ),

+		'name'  => $field_type_object->_name('[level_id]'),

+		'id'    => $field_type_object->_id('_level_id'),

 		'value' => $escaped_value,

 		'type'  => 'number',

 		'desc'  => '',

 	);

 

-	echo '<p class="give-level-id">' . $escaped_value . '</p>';

-	echo $field_type_object->input( $field_options_array );

+	echo '<p class="give-level-id">'.$escaped_value.'</p>';

+	echo $field_type_object->input($field_options_array);

 

 }

 

-add_action( 'cmb2_render_levels_id', 'give_cmb_render_levels_id', 10, 5 );

+add_action('cmb2_render_levels_id', 'give_cmb_render_levels_id', 10, 5);

 

 

 /**

@@ -492,13 +492,13 @@ 
  * @param $object_type

  * @param $field_type_object

  */

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

-	echo '<input type="radio" class="cmb2-option donation-level-radio" name="' . $field_object->args['_name'] . '" id="' . $field_object->args['id'] . '" value="default" ' . checked( 'default', $escaped_value, false ) . '>';

-	echo '<label for="' . $field_object->args['id'] . '">Default</label>';

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

+	echo '<input type="radio" class="cmb2-option donation-level-radio" name="'.$field_object->args['_name'].'" id="'.$field_object->args['id'].'" value="default" '.checked('default', $escaped_value, false).'>';

+	echo '<label for="'.$field_object->args['id'].'">Default</label>';

 

 }

 

-add_action( 'cmb2_render_give_default_radio_inline', 'give_cmb_give_default_radio_inline', 10, 5 );

+add_action('cmb2_render_give_default_radio_inline', 'give_cmb_give_default_radio_inline', 10, 5);

 

 

 /**

@@ -508,20 +508,20 @@ 
  */

 function give_add_shortcode_to_publish_metabox() {

 

-	if ( 'give_forms' !== get_post_type() ) {

+	if ('give_forms' !== get_post_type()) {

 		return false;

 	}

 

 	global $post;

 

 	//Only enqueue scripts for CPT on post type screen

-	if ( 'give_forms' === $post->post_type ) {

+	if ('give_forms' === $post->post_type) {

 		//Shortcode column with select all input

-		$shortcode = htmlentities( '[give_form id="' . $post->ID . '"]' );

-		echo '<div class="shortcode-wrap box-sizing"><label>' . esc_html( 'Give Form Shortcode:', 'give' ) . '</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="' . $shortcode . '"></div>';

+		$shortcode = htmlentities('[give_form id="'.$post->ID.'"]');

+		echo '<div class="shortcode-wrap box-sizing"><label>'.esc_html('Give Form Shortcode:', 'give').'</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="'.$shortcode.'"></div>';

 

 	}

 

 }

 

-add_action( 'post_submitbox_misc_actions', 'give_add_shortcode_to_publish_metabox' );

+add_action('post_submitbox_misc_actions', 'give_add_shortcode_to_publish_metabox');

includes/admin/upgrades/upgrade-functions.php

Spacing +68 added lines, -68 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,18 +25,18 @@ 
  */
 function give_show_upgrade_notices() {
 
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-upgrades' ) {
+	if (isset($_GET['page']) && $_GET['page'] == 'give-upgrades') {
 		return;
 	} // Don't show notices on the upgrades page
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
 	}
 
-	$give_version = preg_replace( '/[^0-9.].*/', '', $give_version );
+	$give_version = preg_replace('/[^0-9.].*/', '', $give_version);
 
 	/*
 	 *  NOTICE:
@@ -47,20 +47,20 @@ 
 	 */
 
 	//v1.3.2 Upgrades
-	if ( version_compare( $give_version, '1.3.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) {
+	if (version_compare($give_version, '1.3.2', '<') || ! give_has_upgrade_completed('upgrade_give_payment_customer_id')) {
 		printf(
 			/* translators: %s: upgrade URL */
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id'))
 		);
 	}
 
 	//v1.3.4 Upgrades //ensure the user has gone through 1.3.4
-	if ( version_compare( $give_version, '1.3.4', '<' ) || ( ! give_has_upgrade_completed( 'upgrade_give_offline_status' ) && give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) ) {
+	if (version_compare($give_version, '1.3.4', '<') || ( ! give_has_upgrade_completed('upgrade_give_offline_status') && give_has_upgrade_completed('upgrade_give_payment_customer_id'))) {
 		printf(
 			/* translators: %s: upgrade URL */
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status'))
 		);
 	}
 
@@ -70,7 +70,7 @@ 
 
 }
 
-add_action( 'admin_notices', 'give_show_upgrade_notices' );
+add_action('admin_notices', 'give_show_upgrade_notices');
 
 /**
  * Triggers all upgrade functions
@@ -82,26 +82,26 @@ 
  */
 function give_trigger_upgrades() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html( 'You do not have permission to do Give upgrades.', 'give' ), esc_html( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html('You do not have permission to do Give upgrades.', 'give'), esc_html('Error', 'give'), array('response' => 403));
 	}
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
-		add_option( 'give_version', $give_version );
+		add_option('give_version', $give_version);
 	}
 
-	update_option( 'give_version', GIVE_VERSION );
+	update_option('give_version', GIVE_VERSION);
 
-	if ( DOING_AJAX ) {
-		die( 'complete' );
+	if (DOING_AJAX) {
+		die('complete');
 	} // Let AJAX know that the upgrade is complete
 }
 
-add_action( 'wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades' );
+add_action('wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades');
 
 /**
  * Check if the upgrade routine has been run for a specific action
@@ -112,15 +112,15 @@ 
  *
  * @return bool                   If the action has been added to the completed actions array
  */
-function give_has_upgrade_completed( $upgrade_action = '' ) {
+function give_has_upgrade_completed($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
 	$completed_upgrades = give_get_completed_upgrades();
 
-	return in_array( $upgrade_action, $completed_upgrades );
+	return in_array($upgrade_action, $completed_upgrades);
 
 }
 
@@ -133,9 +133,9 @@ 
  *
  * @return bool                   If the function was successfully added
  */
-function give_set_upgrade_complete( $upgrade_action = '' ) {
+function give_set_upgrade_complete($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
@@ -143,9 +143,9 @@ 
 	$completed_upgrades[] = $upgrade_action;
 
 	// Remove any blanks, and only show uniques
-	$completed_upgrades = array_unique( array_values( $completed_upgrades ) );
+	$completed_upgrades = array_unique(array_values($completed_upgrades));
 
-	return update_option( 'give_completed_upgrades', $completed_upgrades );
+	return update_option('give_completed_upgrades', $completed_upgrades);
 }
 
 /**
@@ -156,9 +156,9 @@ 
  */
 function give_get_completed_upgrades() {
 
-	$completed_upgrades = get_option( 'give_completed_upgrades' );
+	$completed_upgrades = get_option('give_completed_upgrades');
 
-	if ( false === $completed_upgrades ) {
+	if (false === $completed_upgrades) {
 		$completed_upgrades = array();
 	}
 
@@ -177,30 +177,30 @@ 
  */
 function give_v132_upgrade_give_payment_customer_id() {
 	global $wpdb;
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html( 'You do not have permission to do Give upgrades.', 'give' ), esc_html( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html('You do not have permission to do Give upgrades.', 'give'), esc_html('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	//UPDATE DB METAKEYS
 	$sql   = "UPDATE $wpdb->postmeta SET meta_key = '_give_payment_customer_id' WHERE meta_key = '_give_payment_donor_id'";
-	$query = $wpdb->query( $sql );
+	$query = $wpdb->query($sql);
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_payment_customer_id' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_payment_customer_id');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id' );
+add_action('give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id');
 
 /**
  * Upgrades the Offline Status
@@ -214,14 +214,14 @@ 
 
 	global $wpdb;
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html( 'You do not have permission to do Give upgrades.', 'give' ), esc_html( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html('You do not have permission to do Give upgrades.', 'give'), esc_html('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	// Get abandoned offline payments
@@ -231,35 +231,35 @@ 
 	$where .= "AND ( p.post_status = 'abandoned' )";
 	$where .= "AND ( m.meta_key = '_give_payment_gateway' AND m.meta_value = 'offline' )";
 
-	$sql            = $select . $join . $where;
-	$found_payments = $wpdb->get_col( $sql );
+	$sql            = $select.$join.$where;
+	$found_payments = $wpdb->get_col($sql);
 
 
-	foreach ( $found_payments as $payment ) {
+	foreach ($found_payments as $payment) {
 
 		//Only change ones marked abandoned since our release last week
 		//because the admin may have marked some abandoned themselves
-		$modified_time = get_post_modified_time( 'U', false, $payment );
+		$modified_time = get_post_modified_time('U', false, $payment);
 
 		//1450124863 =  12/10/2015 20:42:25
-		if ( $modified_time >= 1450124863 ) {
+		if ($modified_time >= 1450124863) {
 
-			give_update_payment_status( $payment, 'pending' );
+			give_update_payment_status($payment, 'pending');
 
 		}
 
 	}
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_offline_status' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_offline_status');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status' );
+add_action('give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status');
 
 
 /**
@@ -271,17 +271,17 @@ 
  */
 function give_v152_cleanup_users() {
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
 	}
 
-	$give_version = preg_replace( '/[^0-9.].*/', '', $give_version );
+	$give_version = preg_replace('/[^0-9.].*/', '', $give_version);
 
 	//v1.5.2 Upgrades
-	if ( version_compare( $give_version, '1.5.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_user_caps_cleanup' ) ) {
+	if (version_compare($give_version, '1.5.2', '<') || ! give_has_upgrade_completed('upgrade_give_user_caps_cleanup')) {
 
 		//Delete all caps with "ss"
 		//Also delete all unused "campaign" roles
@@ -328,9 +328,9 @@ 
 		);
 	
 		global $wp_roles;
-		foreach ( $delete_caps as $cap ) {
-			foreach ( array_keys( $wp_roles->roles ) as $role ) {
-				$wp_roles->remove_cap( $role, $cap );
+		foreach ($delete_caps as $cap) {
+			foreach (array_keys($wp_roles->roles) as $role) {
+				$wp_roles->remove_cap($role, $cap);
 			}
 		}
 	
@@ -340,12 +340,12 @@ 
 		$roles->add_caps();
 		
 		//The Update Ran
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-		give_set_upgrade_complete( 'upgrade_give_user_caps_cleanup' );
-		delete_option( 'give_doing_upgrade' );
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+		give_set_upgrade_complete('upgrade_give_user_caps_cleanup');
+		delete_option('give_doing_upgrade');
 
 	}
 
 }
 
-add_action( 'admin_init', 'give_v152_cleanup_users' );
\ No newline at end of file
+add_action('admin_init', 'give_v152_cleanup_users');
\ No newline at end of file

includes/admin/upgrades/upgrades.php

Spacing +17 added lines, -17 removed lines

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

Braces +5 added lines, -2 removed lines

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

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

Spacing +6 added lines, -6 removed lines

@@ -9,7 +9,7 @@ 
  * @since       1.3.0
  */
 
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 class Give_Shortcode_Register extends Give_Shortcode_Generator {
 
@@ -18,10 +18,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['title'] = esc_html( 'Register', 'give' );
-		$this->shortcode['label'] = esc_html( 'Register', 'give' );
+		$this->shortcode['title'] = esc_html('Register', 'give');
+		$this->shortcode['label'] = esc_html('Register', 'give');
 
-		parent::__construct( 'give_register' );
+		parent::__construct('give_register');
 	}
 
 	/**
@@ -34,13 +34,13 @@ 
 		return array(
 			array(
 				'type' => 'container',
-				'html' => sprintf( '<p class="no-margin">%s</p>', esc_html( 'Redirect URL (optional):', 'give' ) ),
+				'html' => sprintf('<p class="no-margin">%s</p>', esc_html('Redirect URL (optional):', 'give')),
 			),
 			array(
 				'type'     => 'textbox',
 				'name'     => 'redirect',
 				'minWidth' => 320,
-				'tooltip'  => esc_attr( 'Enter an URL here to redirect to after registering.', 'give' ),
+				'tooltip'  => esc_attr('Enter an URL here to redirect to after registering.', 'give'),
 			),
 		);
 	}