WordImpress / Give

includes/class-give-html-elements.php

Spacing +128 added lines, -128 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -33,7 +33,7 @@ 
 	 *
 	 * @return string $output Give forms dropdown
 	 */
-	public function forms_dropdown( $args = array() ) {
+	public function forms_dropdown($args = array()) {
 
 		$defaults = array(
 			'name'        => 'forms',
@@ -43,43 +43,43 @@ 
 			'selected'    => 0,
 			'chosen'      => false,
 			'number'      => 30,
-			'placeholder' => sprintf( __( 'Select a %s', 'give' ), give_get_forms_label_singular() )
+			'placeholder' => sprintf(__('Select a %s', 'give'), give_get_forms_label_singular())
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$forms = get_posts( array(
+		$forms = get_posts(array(
 			'post_type'      => 'give_forms',
 			'orderby'        => 'title',
 			'order'          => 'ASC',
 			'posts_per_page' => $args['number']
-		) );
+		));
 
 		$options = array();
 
-		if ( $forms ) {
-			$options[0] = sprintf( __( 'Select a %s', 'give' ), give_get_forms_label_singular() );
-			foreach ( $forms as $form ) {
-				$options[ absint( $form->ID ) ] = esc_html( $form->post_title );
+		if ($forms) {
+			$options[0] = sprintf(__('Select a %s', 'give'), give_get_forms_label_singular());
+			foreach ($forms as $form) {
+				$options[absint($form->ID)] = esc_html($form->post_title);
 			}
 		} else {
-			$options[0] = __( 'No Give Forms Found', 'give' );
+			$options[0] = __('No Give Forms Found', 'give');
 		}
 
 		// This ensures that any selected forms are included in the drop down
-		if ( is_array( $args['selected'] ) ) {
-			foreach ( $args['selected'] as $item ) {
-				if ( ! in_array( $item, $options ) ) {
-					$options[ $item ] = get_the_title( $item );
+		if (is_array($args['selected'])) {
+			foreach ($args['selected'] as $item) {
+				if ( ! in_array($item, $options)) {
+					$options[$item] = get_the_title($item);
 				}
 			}
-		} elseif ( is_numeric( $args['selected'] ) && $args['selected'] !== 0 ) {
-			if ( ! in_array( $args['selected'], $options ) ) {
-				$options[ $args['selected'] ] = get_the_title( $args['selected'] );
+		} elseif (is_numeric($args['selected']) && $args['selected'] !== 0) {
+			if ( ! in_array($args['selected'], $options)) {
+				$options[$args['selected']] = get_the_title($args['selected']);
 			}
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $args['name'],
 			'selected'         => $args['selected'],
 			'id'               => $args['id'],
@@ -90,7 +90,7 @@ 
 			'placeholder'      => $args['placeholder'],
 			'show_option_all'  => false,
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -105,7 +105,7 @@ 
 	 *
 	 * @return string $output Donor dropdown
 	 */
-	public function donor_dropdown( $args = array() ) {
+	public function donor_dropdown($args = array()) {
 
 		$defaults = array(
 			'name'        => 'customers',
@@ -114,38 +114,38 @@ 
 			'multiple'    => false,
 			'selected'    => 0,
 			'chosen'      => true,
-			'placeholder' => __( 'Select a Donor', 'give' ),
+			'placeholder' => __('Select a Donor', 'give'),
 			'number'      => 30
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$customers = Give()->customers->get_customers( array(
+		$customers = Give()->customers->get_customers(array(
 			'number' => $args['number']
-		) );
+		));
 
 		$options = array();
 
-		if ( $customers ) {
-			$options[0] = __( 'No donor attached', 'give' );
-			foreach ( $customers as $customer ) {
-				$options[ absint( $customer->id ) ] = esc_html( $customer->name . ' (' . $customer->email . ')' );
+		if ($customers) {
+			$options[0] = __('No donor attached', 'give');
+			foreach ($customers as $customer) {
+				$options[absint($customer->id)] = esc_html($customer->name.' ('.$customer->email.')');
 			}
 		} else {
-			$options[0] = __( 'No donors found', 'give' );
+			$options[0] = __('No donors found', 'give');
 		}
 
-		if ( ! empty( $args['selected'] ) ) {
+		if ( ! empty($args['selected'])) {
 
 			// If a selected customer has been specified, we need to ensure it's in the initial list of customers displayed
 
-			if ( ! array_key_exists( $args['selected'], $options ) ) {
+			if ( ! array_key_exists($args['selected'], $options)) {
 
-				$customer = new Give_Customer( $args['selected'] );
+				$customer = new Give_Customer($args['selected']);
 
-				if ( $customer ) {
+				if ($customer) {
 
-					$options[ absint( $args['selected'] ) ] = esc_html( $customer->name . ' (' . $customer->email . ')' );
+					$options[absint($args['selected'])] = esc_html($customer->name.' ('.$customer->email.')');
 
 				}
 
@@ -153,17 +153,17 @@ 
 
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $args['name'],
 			'selected'         => $args['selected'],
 			'id'               => $args['id'],
-			'class'            => $args['class'] . ' give-customer-select',
+			'class'            => $args['class'].' give-customer-select',
 			'options'          => $options,
 			'multiple'         => $args['multiple'],
 			'chosen'           => $args['chosen'],
 			'show_option_all'  => false,
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -180,21 +180,21 @@ 
 	 *
 	 * @return string $output Category dropdown
 	 */
-	public function category_dropdown( $name = 'give_forms_categories', $selected = 0 ) {
-		$categories = get_terms( 'give_forms_category', apply_filters( 'give_forms_category_dropdown', array() ) );
+	public function category_dropdown($name = 'give_forms_categories', $selected = 0) {
+		$categories = get_terms('give_forms_category', apply_filters('give_forms_category_dropdown', array()));
 		$options    = array();
 
-		foreach ( $categories as $category ) {
-			$options[ absint( $category->term_id ) ] = esc_html( $category->name );
+		foreach ($categories as $category) {
+			$options[absint($category->term_id)] = esc_html($category->name);
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $name,
 			'selected'         => $selected,
 			'options'          => $options,
-			'show_option_all'  => __( 'All Categories', 'give' ),
+			'show_option_all'  => __('All Categories', 'give'),
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -212,25 +212,25 @@ 
 	 *
 	 * @return string $output Year dropdown
 	 */
-	public function year_dropdown( $name = 'year', $selected = 0, $years_before = 5, $years_after = 0 ) {
-		$current    = date( 'Y' );
-		$start_year = $current - absint( $years_before );
-		$end_year   = $current + absint( $years_after );
-		$selected   = empty( $selected ) ? date( 'Y' ) : $selected;
+	public function year_dropdown($name = 'year', $selected = 0, $years_before = 5, $years_after = 0) {
+		$current    = date('Y');
+		$start_year = $current - absint($years_before);
+		$end_year   = $current + absint($years_after);
+		$selected   = empty($selected) ? date('Y') : $selected;
 		$options    = array();
 
-		while ( $start_year <= $end_year ) {
-			$options[ absint( $start_year ) ] = $start_year;
-			$start_year ++;
+		while ($start_year <= $end_year) {
+			$options[absint($start_year)] = $start_year;
+			$start_year++;
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $name,
 			'selected'         => $selected,
 			'options'          => $options,
 			'show_option_all'  => false,
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -247,23 +247,23 @@ 
 	 *
 	 * @return string $output Month dropdown
 	 */
-	public function month_dropdown( $name = 'month', $selected = 0 ) {
+	public function month_dropdown($name = 'month', $selected = 0) {
 		$month    = 1;
 		$options  = array();
-		$selected = empty( $selected ) ? date( 'n' ) : $selected;
+		$selected = empty($selected) ? date('n') : $selected;
 
-		while ( $month <= 12 ) {
-			$options[ absint( $month ) ] = give_month_num_to_name( $month );
-			$month ++;
+		while ($month <= 12) {
+			$options[absint($month)] = give_month_num_to_name($month);
+			$month++;
 		}
 
-		$output = $this->select( array(
+		$output = $this->select(array(
 			'name'             => $name,
 			'selected'         => $selected,
 			'options'          => $options,
 			'show_option_all'  => false,
 			'show_option_none' => false
-		) );
+		));
 
 		return $output;
 	}
@@ -277,7 +277,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function select( $args = array() ) {
+	public function select($args = array()) {
 		$defaults = array(
 			'options'          => array(),
 			'name'             => null,
@@ -287,60 +287,60 @@ 
 			'chosen'           => false,
 			'placeholder'      => null,
 			'multiple'         => false,
-			'show_option_all'  => _x( 'All', 'dropdown items', 'give' ),
-			'show_option_none' => _x( 'None', 'dropdown items', 'give' )
+			'show_option_all'  => _x('All', 'dropdown items', 'give'),
+			'show_option_none' => _x('None', 'dropdown items', 'give')
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 
-		if ( $args['multiple'] ) {
+		if ($args['multiple']) {
 			$multiple = ' MULTIPLE';
 		} else {
 			$multiple = '';
 		}
 
-		if ( $args['chosen'] ) {
+		if ($args['chosen']) {
 			$args['class'] .= ' give-select-chosen';
 		}
 
-		if ( $args['placeholder'] ) {
+		if ($args['placeholder']) {
 			$placeholder = $args['placeholder'];
 		} else {
 			$placeholder = '';
 		}
 
-		$output = '<select name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( sanitize_key( str_replace( '-', '_', $args['id'] ) ) ) . '" class="give-select ' . esc_attr( $args['class'] ) . '"' . $multiple . ' data-placeholder="' . $placeholder . '">';
+		$output = '<select name="'.esc_attr($args['name']).'" id="'.esc_attr(sanitize_key(str_replace('-', '_', $args['id']))).'" class="give-select '.esc_attr($args['class']).'"'.$multiple.' data-placeholder="'.$placeholder.'">';
 
-		if ( $args['show_option_all'] ) {
-			if ( $args['multiple'] ) {
-				$selected = selected( true, in_array( 0, $args['selected'] ), false );
+		if ($args['show_option_all']) {
+			if ($args['multiple']) {
+				$selected = selected(true, in_array(0, $args['selected']), false);
 			} else {
-				$selected = selected( $args['selected'], 0, false );
+				$selected = selected($args['selected'], 0, false);
 			}
-			$output .= '<option value="all"' . $selected . '>' . esc_html( $args['show_option_all'] ) . '</option>';
+			$output .= '<option value="all"'.$selected.'>'.esc_html($args['show_option_all']).'</option>';
 		}
 
-		if ( ! empty( $args['options'] ) ) {
+		if ( ! empty($args['options'])) {
 
-			if ( $args['show_option_none'] ) {
-				if ( $args['multiple'] ) {
-					$selected = selected( true, in_array( - 1, $args['selected'] ), false );
+			if ($args['show_option_none']) {
+				if ($args['multiple']) {
+					$selected = selected(true, in_array( -1, $args['selected'] ), false);
 				} else {
-					$selected = selected( $args['selected'], - 1, false );
+					$selected = selected($args['selected'], - 1, false);
 				}
-				$output .= '<option value="-1"' . $selected . '>' . esc_html( $args['show_option_none'] ) . '</option>';
+				$output .= '<option value="-1"'.$selected.'>'.esc_html($args['show_option_none']).'</option>';
 			}
 
-			foreach ( $args['options'] as $key => $option ) {
+			foreach ($args['options'] as $key => $option) {
 
-				if ( $args['multiple'] && is_array( $args['selected'] ) ) {
-					$selected = selected( true, in_array( $key, $args['selected'] ), false );
+				if ($args['multiple'] && is_array($args['selected'])) {
+					$selected = selected(true, in_array($key, $args['selected']), false);
 				} else {
-					$selected = selected( $args['selected'], $key, false );
+					$selected = selected($args['selected'], $key, false);
 				}
 
-				$output .= '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option ) . '</option>';
+				$output .= '<option value="'.esc_attr($key).'"'.$selected.'>'.esc_html($option).'</option>';
 			}
 		}
 
@@ -358,7 +358,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function checkbox( $args = array() ) {
+	public function checkbox($args = array()) {
 		$defaults = array(
 			'name'    => null,
 			'current' => null,
@@ -369,16 +369,16 @@ 
 			)
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$options = '';
-		if ( ! empty( $args['options']['disabled'] ) ) {
+		if ( ! empty($args['options']['disabled'])) {
 			$options .= ' disabled="disabled"';
-		} elseif ( ! empty( $args['options']['readonly'] ) ) {
+		} elseif ( ! empty($args['options']['readonly'])) {
 			$options .= ' readonly';
 		}
 
-		$output = '<input type="checkbox"' . $options . ' name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" class="' . $args['class'] . ' ' . esc_attr( $args['name'] ) . '" ' . checked( 1, $args['current'], false ) . ' />';
+		$output = '<input type="checkbox"'.$options.' name="'.esc_attr($args['name']).'" id="'.esc_attr($args['name']).'" class="'.$args['class'].' '.esc_attr($args['name']).'" '.checked(1, $args['current'], false).' />';
 
 		return $output;
 	}
@@ -392,22 +392,22 @@ 
 	 *
 	 * @return string Text field
 	 */
-	public function text( $args = array() ) {
+	public function text($args = array()) {
 		// Backwards compatabliity
-		if ( func_num_args() > 1 ) {
+		if (func_num_args() > 1) {
 			$args = func_get_args();
 
 			$name  = $args[0];
-			$value = isset( $args[1] ) ? $args[1] : '';
-			$label = isset( $args[2] ) ? $args[2] : '';
-			$desc  = isset( $args[3] ) ? $args[3] : '';
+			$value = isset($args[1]) ? $args[1] : '';
+			$label = isset($args[2]) ? $args[2] : '';
+			$desc  = isset($args[3]) ? $args[3] : '';
 		}
 
 		$defaults = array(
-			'name'         => isset( $name ) ? $name : 'text',
-			'value'        => isset( $value ) ? $value : null,
-			'label'        => isset( $label ) ? $label : null,
-			'desc'         => isset( $desc ) ? $desc : null,
+			'name'         => isset($name) ? $name : 'text',
+			'value'        => isset($value) ? $value : null,
+			'label'        => isset($label) ? $label : null,
+			'desc'         => isset($desc) ? $desc : null,
 			'placeholder'  => '',
 			'class'        => 'regular-text',
 			'disabled'     => false,
@@ -415,29 +415,29 @@ 
 			'data'         => false
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$disabled = '';
-		if ( $args['disabled'] ) {
+		if ($args['disabled']) {
 			$disabled = ' disabled="disabled"';
 		}
 
 		$data = '';
-		if ( ! empty( $args['data'] ) ) {
-			foreach ( $args['data'] as $key => $value ) {
-				$data .= 'data-' . $key . '="' . $value . '" ';
+		if ( ! empty($args['data'])) {
+			foreach ($args['data'] as $key => $value) {
+				$data .= 'data-'.$key.'="'.$value.'" ';
 			}
 		}
 
-		$output = '<span id="give-' . sanitize_key( $args['name'] ) . '-wrap">';
+		$output = '<span id="give-'.sanitize_key($args['name']).'-wrap">';
 
-		$output .= '<label class="give-label" for="give-' . sanitize_key( $args['name'] ) . '">' . esc_html( $args['label'] ) . '</label>';
+		$output .= '<label class="give-label" for="give-'.sanitize_key($args['name']).'">'.esc_html($args['label']).'</label>';
 
-		if ( ! empty( $args['desc'] ) ) {
-			$output .= '<span class="give-description">' . esc_html( $args['desc'] ) . '</span>';
+		if ( ! empty($args['desc'])) {
+			$output .= '<span class="give-description">'.esc_html($args['desc']).'</span>';
 		}
 
-		$output .= '<input type="text" name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" autocomplete="' . esc_attr( $args['autocomplete'] ) . '" value="' . esc_attr( $args['value'] ) . '" placeholder="' . esc_attr( $args['placeholder'] ) . '" class="' . $args['class'] . '" ' . $data . '' . $disabled . '/>';
+		$output .= '<input type="text" name="'.esc_attr($args['name']).'" id="'.esc_attr($args['name']).'" autocomplete="'.esc_attr($args['autocomplete']).'" value="'.esc_attr($args['value']).'" placeholder="'.esc_attr($args['placeholder']).'" class="'.$args['class'].'" '.$data.''.$disabled.'/>';
 
 		$output .= '</span>';
 
@@ -453,15 +453,15 @@ 
 	 *
 	 * @return string Datepicker field
 	 */
-	public function date_field( $args = array() ) {
+	public function date_field($args = array()) {
 
-		if ( empty( $args['class'] ) ) {
+		if (empty($args['class'])) {
 			$args['class'] = 'give_datepicker';
-		} elseif ( ! strpos( $args['class'], 'give_datepicker' ) ) {
+		} elseif ( ! strpos($args['class'], 'give_datepicker')) {
 			$args['class'] .= ' give_datepicker';
 		}
 
-		return $this->text( $args );
+		return $this->text($args);
 	}
 
 
@@ -474,7 +474,7 @@ 
 	 *
 	 * @return string textarea
 	 */
-	public function textarea( $args = array() ) {
+	public function textarea($args = array()) {
 		$defaults = array(
 			'name'     => 'textarea',
 			'value'    => null,
@@ -484,21 +484,21 @@ 
 			'disabled' => false
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$disabled = '';
-		if ( $args['disabled'] ) {
+		if ($args['disabled']) {
 			$disabled = ' disabled="disabled"';
 		}
 
-		$output = '<span id="give-' . sanitize_key( $args['name'] ) . '-wrap">';
+		$output = '<span id="give-'.sanitize_key($args['name']).'-wrap">';
 
-		$output .= '<label class="give-label" for="give-' . sanitize_key( $args['name'] ) . '">' . esc_html( $args['label'] ) . '</label>';
+		$output .= '<label class="give-label" for="give-'.sanitize_key($args['name']).'">'.esc_html($args['label']).'</label>';
 
-		$output .= '<textarea name="' . esc_attr( $args['name'] ) . '" id="' . esc_attr( $args['name'] ) . '" class="' . $args['class'] . '"' . $disabled . '>' . esc_attr( $args['value'] ) . '</textarea>';
+		$output .= '<textarea name="'.esc_attr($args['name']).'" id="'.esc_attr($args['name']).'" class="'.$args['class'].'"'.$disabled.'>'.esc_attr($args['value']).'</textarea>';
 
-		if ( ! empty( $args['desc'] ) ) {
-			$output .= '<span class="give-description">' . esc_html( $args['desc'] ) . '</span>';
+		if ( ! empty($args['desc'])) {
+			$output .= '<span class="give-description">'.esc_html($args['desc']).'</span>';
 		}
 
 		$output .= '</span>';
@@ -515,12 +515,12 @@ 
 	 *
 	 * @return string text field with ajax search
 	 */
-	public function ajax_user_search( $args = array() ) {
+	public function ajax_user_search($args = array()) {
 
 		$defaults = array(
 			'name'         => 'user_id',
 			'value'        => null,
-			'placeholder'  => __( 'Enter username', 'give' ),
+			'placeholder'  => __('Enter username', 'give'),
 			'label'        => null,
 			'desc'         => null,
 			'class'        => '',
@@ -529,13 +529,13 @@ 
 			'data'         => false
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$args['class'] = 'give-ajax-user-search ' . $args['class'];
+		$args['class'] = 'give-ajax-user-search '.$args['class'];
 
 		$output = '<span class="give_user_search_wrap">';
-		$output .= $this->text( $args );
-		$output .= '<span class="give_user_search_results hidden"><a class="give-ajax-user-cancel" title="' . __( 'Cancel', 'give' ) . '" aria-label="' . __( 'Cancel', 'give' ) . '" href="#">x</a><span></span></span>';
+		$output .= $this->text($args);
+		$output .= '<span class="give_user_search_results hidden"><a class="give-ajax-user-cancel" title="'.__('Cancel', 'give').'" aria-label="'.__('Cancel', 'give').'" href="#">x</a><span></span></span>';
 		$output .= '</span>';
 
 		return $output;

includes/gateways/offline-donations.php

Spacing +122 added lines, -122 removed lines

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

includes/admin/payments/view-order-details.php

Spacing +126 added lines, -126 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,27 +20,27 @@ 
  * @since 1.0
  * @return void
  */
-if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-	wp_die( __( 'Donation ID not supplied. Please try again', 'give' ), __( 'Error', 'give' ) );
+if ( ! isset($_GET['id']) || ! is_numeric($_GET['id'])) {
+	wp_die(__('Donation ID not supplied. Please try again', 'give'), __('Error', 'give'));
 }
 
 // Setup the variables
-$payment_id = absint( $_GET['id'] );
-$payment    = new Give_Payment( $payment_id );
+$payment_id = absint($_GET['id']);
+$payment    = new Give_Payment($payment_id);
 
 // Sanity check... fail if purchase ID is invalid
 $payment_exists = $payment->ID;
-if ( empty( $payment_exists ) ) {
-	wp_die( __( 'The specified ID does not belong to a payment. Please try again', 'give' ), __( 'Error', 'give' ) );
+if (empty($payment_exists)) {
+	wp_die(__('The specified ID does not belong to a payment. Please try again', 'give'), __('Error', 'give'));
 }
 
 $number         = $payment->number;
 $payment_meta   = $payment->get_meta();
-$transaction_id = esc_attr( $payment->transaction_id );
+$transaction_id = esc_attr($payment->transaction_id);
 $user_id        = $payment->user_id;
 $customer_id    = $payment->customer_id;
-$payment_date   = strtotime( $payment->date );
-$user_info      = give_get_payment_meta_user_info( $payment_id );
+$payment_date   = strtotime($payment->date);
+$user_info      = give_get_payment_meta_user_info($payment_id);
 $address        = $payment->address;
 $gateway        = $payment->gateway;
 $currency_code  = $payment->currency;
@@ -49,72 +49,72 @@ 
 $payment_mode   = $payment->mode;
 ?>
 <div class="wrap give-wrap">
-	<h1 id="transaction-details-heading"><?php printf( __( 'Payment %s', 'give' ), $number ); ?><?php if ( $payment_mode == 'test' ) {
-			echo '<span id="test-payment-label" class="give-item-label give-item-label-orange" data-tooltip="' . __( 'This payment was made in Test Mode', 'give' ) . '" data-tooltip-my-position="center left" data-tooltip-target-position="center right">' . __( 'Test Payment', 'give' ) . '</span>';
+	<h1 id="transaction-details-heading"><?php printf(__('Payment %s', 'give'), $number); ?><?php if ($payment_mode == 'test') {
+			echo '<span id="test-payment-label" class="give-item-label give-item-label-orange" data-tooltip="'.__('This payment was made in Test Mode', 'give').'" data-tooltip-my-position="center left" data-tooltip-target-position="center right">'.__('Test Payment', 'give').'</span>';
 		} ?></h1>
 
-	<?php do_action( 'give_view_order_details_before', $payment_id ); ?>
+	<?php do_action('give_view_order_details_before', $payment_id); ?>
 	<form id="give-edit-order-form" method="post">
-		<?php do_action( 'give_view_order_details_form_top', $payment_id ); ?>
+		<?php do_action('give_view_order_details_form_top', $payment_id); ?>
 		<div id="poststuff">
 			<div id="give-dashboard-widgets-wrap">
 				<div id="post-body" class="metabox-holder columns-2">
 					<div id="postbox-container-1" class="postbox-container">
 						<div id="side-sortables" class="meta-box-sortables ui-sortable">
 
-							<?php do_action( 'give_view_order_details_sidebar_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_sidebar_before', $payment_id); ?>
 
 
 							<div id="give-order-update" class="postbox give-order-data">
 
 								<h3 class="hndle">
-									<span><?php _e( 'Update Payment', 'give' ); ?></span>
+									<span><?php _e('Update Payment', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
 									<div class="give-admin-box">
 
-										<?php do_action( 'give_view_order_details_totals_before', $payment_id ); ?>
+										<?php do_action('give_view_order_details_totals_before', $payment_id); ?>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Status:', 'give' ); ?></span>&nbsp;
+												<span class="label"><?php _e('Status:', 'give'); ?></span>&nbsp;
 												<select name="give-payment-status" class="medium-text">
-													<?php foreach ( give_get_payment_statuses() as $key => $status ) : ?>
-														<option value="<?php echo esc_attr( $key ); ?>"<?php selected( $payment->status, $key, true ); ?>><?php echo esc_html( $status ); ?></option>
+													<?php foreach (give_get_payment_statuses() as $key => $status) : ?>
+														<option value="<?php echo esc_attr($key); ?>"<?php selected($payment->status, $key, true); ?>><?php echo esc_html($status); ?></option>
 													<?php endforeach; ?>
 												</select>
-												<span class="give-donation-status status-<?php echo sanitize_title( $payment->status ); ?>"><span class="give-donation-status-icon"></span></span>
+												<span class="give-donation-status status-<?php echo sanitize_title($payment->status); ?>"><span class="give-donation-status-icon"></span></span>
 											</p>
 										</div>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Date:', 'give' ); ?></span>&nbsp;
-												<input type="text" name="give-payment-date" value="<?php echo esc_attr( date( 'm/d/Y', $payment_date ) ); ?>" class="medium-text give_datepicker"/>
+												<span class="label"><?php _e('Date:', 'give'); ?></span>&nbsp;
+												<input type="text" name="give-payment-date" value="<?php echo esc_attr(date('m/d/Y', $payment_date)); ?>" class="medium-text give_datepicker"/>
 											</p>
 										</div>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Time:', 'give' ); ?></span>&nbsp;
-												<input type="number" step="1" max="24" name="give-payment-time-hour" value="<?php echo esc_attr( date_i18n( 'H', $payment_date ) ); ?>" class="small-text give-payment-time-hour"/>&nbsp;:&nbsp;
-												<input type="number" step="1" max="59" name="give-payment-time-min" value="<?php echo esc_attr( date( 'i', $payment_date ) ); ?>" class="small-text give-payment-time-min"/>
+												<span class="label"><?php _e('Time:', 'give'); ?></span>&nbsp;
+												<input type="number" step="1" max="24" name="give-payment-time-hour" value="<?php echo esc_attr(date_i18n('H', $payment_date)); ?>" class="small-text give-payment-time-hour"/>&nbsp;:&nbsp;
+												<input type="number" step="1" max="59" name="give-payment-time-min" value="<?php echo esc_attr(date('i', $payment_date)); ?>" class="small-text give-payment-time-min"/>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_update_inner', $payment_id ); ?>
+										<?php do_action('give_view_order_details_update_inner', $payment_id); ?>
 
 										<?php
 										//@TODO: Fees
-										$fees = give_get_payment_fees( $payment_id );
-										if ( ! empty( $fees ) ) : ?>
+										$fees = give_get_payment_fees($payment_id);
+										if ( ! empty($fees)) : ?>
 											<div class="give-order-fees give-admin-box-inside">
-												<p class="strong"><?php _e( 'Fees', 'give' ); ?>:</p>
+												<p class="strong"><?php _e('Fees', 'give'); ?>:</p>
 												<ul class="give-payment-fees">
-													<?php foreach ( $fees as $fee ) : ?>
+													<?php foreach ($fees as $fee) : ?>
 														<li>
-															<span class="fee-label"><?php echo $fee['label'] . ':</span> ' . '<span class="fee-amount" data-fee="' . esc_attr( $fee['amount'] ) . '">' . give_currency_filter( $fee['amount'], $currency_code ); ?></span>
+															<span class="fee-label"><?php echo $fee['label'].':</span> '.'<span class="fee-amount" data-fee="'.esc_attr($fee['amount']).'">'.give_currency_filter($fee['amount'], $currency_code); ?></span>
 														</li>
 													<?php endforeach; ?>
 												</ul>
@@ -124,12 +124,12 @@ 
 
 										<div class="give-order-payment give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Total Donation', 'give' ); ?>:</span>&nbsp;
-												<?php echo give_currency_symbol( $payment->currency ); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr( give_format_amount( give_get_payment_amount( $payment_id ) ) ); ?>"/>
+												<span class="label"><?php _e('Total Donation', 'give'); ?>:</span>&nbsp;
+												<?php echo give_currency_symbol($payment->currency); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr(give_format_amount(give_get_payment_amount($payment_id))); ?>"/>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_totals_after', $payment_id ); ?>
+										<?php do_action('give_view_order_details_totals_after', $payment_id); ?>
 
 									</div>
 									<!-- /.give-admin-box -->
@@ -138,20 +138,20 @@ 
 								<!-- /.inside -->
 
 								<div class="give-order-update-box give-admin-box">
-									<?php do_action( 'give_view_order_details_update_before', $payment_id ); ?>
+									<?php do_action('give_view_order_details_update_before', $payment_id); ?>
 									<div id="major-publishing-actions">
 										<div id="publishing-action">
-											<input type="submit" class="button button-primary right" value="<?php esc_attr_e( 'Save Payment', 'give' ); ?>"/>
-											<?php if ( give_is_payment_complete( $payment_id ) ) : ?>
-												<a href="<?php echo esc_url( add_query_arg( array(
+											<input type="submit" class="button button-primary right" value="<?php esc_attr_e('Save Payment', 'give'); ?>"/>
+											<?php if (give_is_payment_complete($payment_id)) : ?>
+												<a href="<?php echo esc_url(add_query_arg(array(
 													'give-action' => 'email_links',
 													'purchase_id' => $payment_id
-												) ) ); ?>" id="give-resend-receipt" class="button-secondary right"><?php _e( 'Resend Receipt', 'give' ); ?></a>
+												))); ?>" id="give-resend-receipt" class="button-secondary right"><?php _e('Resend Receipt', 'give'); ?></a>
 											<?php endif; ?>
 										</div>
 										<div class="clear"></div>
 									</div>
-									<?php do_action( 'give_view_order_details_update_after', $payment_id ); ?>
+									<?php do_action('give_view_order_details_update_after', $payment_id); ?>
 								</div>
 								<!-- /.give-order-update-box -->
 
@@ -161,55 +161,55 @@ 
 							<div id="give-order-details" class="postbox give-order-data">
 
 								<h3 class="hndle">
-									<span><?php _e( 'Payment Meta', 'give' ); ?></span>
+									<span><?php _e('Payment Meta', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
 									<div class="give-admin-box">
 
-										<?php do_action( 'give_view_order_details_payment_meta_before', $payment_id ); ?>
+										<?php do_action('give_view_order_details_payment_meta_before', $payment_id); ?>
 
 										<?php
-										$gateway = give_get_payment_gateway( $payment_id );
-										if ( $gateway ) : ?>
+										$gateway = give_get_payment_gateway($payment_id);
+										if ($gateway) : ?>
 											<div class="give-order-gateway give-admin-box-inside">
 												<p>
-													<span class="label"><?php _e( 'Gateway:', 'give' ); ?></span>&nbsp;
-													<?php echo give_get_gateway_admin_label( $gateway ); ?>
+													<span class="label"><?php _e('Gateway:', 'give'); ?></span>&nbsp;
+													<?php echo give_get_gateway_admin_label($gateway); ?>
 												</p>
 											</div>
 										<?php endif; ?>
 
 										<div class="give-order-payment-key give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Key:', 'give' ); ?></span>&nbsp;
-												<span><?php echo give_get_payment_key( $payment_id ); ?></span>
+												<span class="label"><?php _e('Key:', 'give'); ?></span>&nbsp;
+												<span><?php echo give_get_payment_key($payment_id); ?></span>
 											</p>
 										</div>
 
 										<div class="give-order-ip give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'IP:', 'give' ); ?></span>&nbsp;
-												<span><?php echo esc_html( give_get_payment_user_ip( $payment_id ) ); ?></span>
+												<span class="label"><?php _e('IP:', 'give'); ?></span>&nbsp;
+												<span><?php echo esc_html(give_get_payment_user_ip($payment_id)); ?></span>
 											</p>
 										</div>
 
-										<?php if ( $transaction_id ) : ?>
+										<?php if ($transaction_id) : ?>
 											<div class="give-order-tx-id give-admin-box-inside">
 												<p>
-													<span class="label"><?php _e( 'Transaction ID:', 'give' ); ?></span>&nbsp;
-													<span><?php echo apply_filters( 'give_payment_details_transaction_id-' . $gateway, $transaction_id, $payment_id ); ?></span>
+													<span class="label"><?php _e('Transaction ID:', 'give'); ?></span>&nbsp;
+													<span><?php echo apply_filters('give_payment_details_transaction_id-'.$gateway, $transaction_id, $payment_id); ?></span>
 												</p>
 											</div>
 										<?php endif; ?>
 
 										<div class="give-admin-box-inside">
-											<p><?php $purchase_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . esc_attr( give_get_payment_user_email( $payment_id ) ) ); ?>
-												<a href="<?php echo $purchase_url; ?>"><?php _e( 'View all donations for this donor', 'give' ); ?> &raquo;</a>
+											<p><?php $purchase_url = admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.esc_attr(give_get_payment_user_email($payment_id))); ?>
+												<a href="<?php echo $purchase_url; ?>"><?php _e('View all donations for this donor', 'give'); ?> &raquo;</a>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_payment_meta_after', $payment_id ); ?>
+										<?php do_action('give_view_order_details_payment_meta_after', $payment_id); ?>
 
 									</div>
 									<!-- /.column-container -->
@@ -220,7 +220,7 @@ 
 							</div>
 							<!-- /#give-order-data -->
 
-							<?php do_action( 'give_view_order_details_sidebar_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_sidebar_after', $payment_id); ?>
 
 						</div>
 						<!-- /#side-sortables -->
@@ -231,12 +231,12 @@ 
 
 						<div id="normal-sortables" class="meta-box-sortables ui-sortable">
 
-							<?php do_action( 'give_view_order_details_main_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_main_before', $payment_id); ?>
 
 							<?php $column_count = 'columns-3'; ?>
 							<div id="give-donation-overview" class="postbox <?php echo $column_count; ?>">
 								<h3 class="hndle">
-									<span><?php _e( 'Donation Information', 'give' ); ?></span>
+									<span><?php _e('Donation Information', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
@@ -244,29 +244,29 @@ 
 									<table style="width:100%;text-align:left;">
 										<thead>
 										<tr>
-											<?php do_action( 'give_donation_details_thead_before', $payment_id ); ?>
-											<th><?php _e( 'Donation Form ID', 'give' ) ?></th>
-											<th><?php _e( 'Donation Form Title', 'give' ) ?></th>
-											<th><?php _e( 'Donation Level', 'give' ) ?></th>
-											<th><?php _e( 'Donation Date', 'give' ) ?></th>
-											<th><?php _e( 'Total Donation', 'give' ) ?></th>
-											<?php do_action( 'give_donation_details_thead_after', $payment_id ); ?>
+											<?php do_action('give_donation_details_thead_before', $payment_id); ?>
+											<th><?php _e('Donation Form ID', 'give') ?></th>
+											<th><?php _e('Donation Form Title', 'give') ?></th>
+											<th><?php _e('Donation Level', 'give') ?></th>
+											<th><?php _e('Donation Date', 'give') ?></th>
+											<th><?php _e('Total Donation', 'give') ?></th>
+											<?php do_action('give_donation_details_thead_after', $payment_id); ?>
 										</tr>
 										</thead>
 										<tr>
-											<?php do_action( 'give_donation_details_tbody_before', $payment_id ); ?>
+											<?php do_action('give_donation_details_tbody_before', $payment_id); ?>
 											<td>
 												<?php echo $payment_meta['form_id']; ?>
 											</td>
 											<td>
-												<a href="<?php echo get_permalink( $payment_meta['form_id'] ); ?>"><?php echo $payment_meta['form_title']; ?></a>
+												<a href="<?php echo get_permalink($payment_meta['form_id']); ?>"><?php echo $payment_meta['form_title']; ?></a>
 											</td>
 											<td>
 												<?php
 												//Level ID
-												$level_title = give_get_payment_form_title( $payment_meta, true );
-												if ( empty( $level_title ) ) {
-													echo __( 'n/a', 'give' );
+												$level_title = give_get_payment_form_title($payment_meta, true);
+												if (empty($level_title)) {
+													echo __('n/a', 'give');
 												} else {
 													echo $level_title;
 												} ?>
@@ -274,13 +274,13 @@ 
 											<td>
 												<?php
 												//Transaction Date
-												$date_format = get_option( 'date_format' );
-												echo date_i18n( $date_format, strtotime( $payment_date ) );
+												$date_format = get_option('date_format');
+												echo date_i18n($date_format, strtotime($payment_date));
 												?>
 											</td>
 											<td>
-												<?php echo esc_html( give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) ) ); ?></td>
-											<?php do_action( 'give_donation_details_tbody_after', $payment_id ); ?>
+												<?php echo esc_html(give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)))); ?></td>
+											<?php do_action('give_donation_details_tbody_after', $payment_id); ?>
 
 										</tr>
 									</table>
@@ -292,64 +292,64 @@ 
 							</div>
 							<!-- /#give-donation-overview -->
 
-							<?php do_action( 'give_view_order_details_files_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_files_after', $payment_id); ?>
 
-							<?php do_action( 'give_view_order_details_billing_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_billing_before', $payment_id); ?>
 
 
 							<div id="give-customer-details" class="postbox">
 								<h3 class="hndle">
-									<span><?php _e( 'Donor Details', 'give' ); ?></span>
+									<span><?php _e('Donor Details', 'give'); ?></span>
 								</h3>
 
 								<div class="inside give-clearfix">
 
-									<?php $customer = new Give_Customer( $customer_id ); ?>
+									<?php $customer = new Give_Customer($customer_id); ?>
 
 									<div class="column-container customer-info">
 										<div class="column">
-											<?php echo Give()->html->donor_dropdown( array(
+											<?php echo Give()->html->donor_dropdown(array(
 												'selected' => $customer->id,
 												'name'     => 'customer-id'
-											) ); ?>
+											)); ?>
 										</div>
 										<div class="column">
 											<input type="hidden" name="give-current-customer" value="<?php echo $customer->id; ?>"/>
 										</div>
 										<div class="column">
-											<?php if ( ! empty( $customer->id ) ) : ?>
-												<?php $customer_url = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ); ?>
-												<a href="<?php echo $customer_url; ?>" title="<?php _e( 'View Donor Details', 'give' ); ?>"><?php _e( 'View Donor Details', 'give' ); ?></a>
+											<?php if ( ! empty($customer->id)) : ?>
+												<?php $customer_url = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id); ?>
+												<a href="<?php echo $customer_url; ?>" title="<?php _e('View Donor Details', 'give'); ?>"><?php _e('View Donor Details', 'give'); ?></a>
 												&nbsp;|&nbsp;
 											<?php endif; ?>
-											<a href="#new" class="give-payment-new-customer" title="<?php _e( 'New Donor', 'give' ); ?>"><?php _e( 'New Donor', 'give' ); ?></a>
+											<a href="#new" class="give-payment-new-customer" title="<?php _e('New Donor', 'give'); ?>"><?php _e('New Donor', 'give'); ?></a>
 										</div>
 									</div>
 
 									<div class="column-container new-customer" style="display: none">
 										<div class="column">
-											<strong><?php _e( 'Name:', 'give' ); ?></strong>&nbsp;
+											<strong><?php _e('Name:', 'give'); ?></strong>&nbsp;
 											<input type="text" name="give-new-customer-name" value="" class="medium-text"/>
 										</div>
 										<div class="column">
-											<strong><?php _e( 'Email:', 'give' ); ?></strong>&nbsp;
+											<strong><?php _e('Email:', 'give'); ?></strong>&nbsp;
 											<input type="email" name="give-new-customer-email" value="" class="medium-text"/>
 										</div>
 										<div class="column">
 											<input type="hidden" id="give-new-customer" name="give-new-customer" value="0"/>
-											<a href="#cancel" class="give-payment-new-customer-cancel give-delete"><?php _e( 'Cancel', 'give' ); ?></a>
+											<a href="#cancel" class="give-payment-new-customer-cancel give-delete"><?php _e('Cancel', 'give'); ?></a>
 										</div>
 										<div class="column">
 											<small>
-												<em>*<?php _e( 'Click "Save Payment" to create new donor', 'give' ); ?></em>
+												<em>*<?php _e('Click "Save Payment" to create new donor', 'give'); ?></em>
 											</small>
 										</div>
 									</div>
 
 									<?php
 									// The give_payment_personal_details_list hook is left here for backwards compatibility
-									do_action( 'give_payment_personal_details_list', $payment_meta, $user_info );
-									do_action( 'give_payment_view_details', $payment_id );
+									do_action('give_payment_personal_details_list', $payment_meta, $user_info);
+									do_action('give_payment_view_details', $payment_id);
 									?>
 
 								</div>
@@ -360,7 +360,7 @@ 
 
 							<div id="give-billing-details" class="postbox">
 								<h3 class="hndle">
-									<span><?php _e( 'Billing Address', 'give' ); ?></span>
+									<span><?php _e('Billing Address', 'give'); ?></span>
 								</h3>
 
 								<div class="inside give-clearfix">
@@ -371,62 +371,62 @@ 
 											<div class="data column-container">
 												<div class="column">
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'Street Address Line 1:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][line1]" value="<?php echo esc_attr( $address['line1'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('Street Address Line 1:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][line1]" value="<?php echo esc_attr($address['line1']); ?>" class="medium-text"/>
 													</p>
 
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'Street Address Line 2:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][line2]" value="<?php echo esc_attr( $address['line2'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('Street Address Line 2:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][line2]" value="<?php echo esc_attr($address['line2']); ?>" class="medium-text"/>
 													</p>
 
 												</div>
 												<div class="column">
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'City:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][city]" value="<?php echo esc_attr( $address['city'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('City:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][city]" value="<?php echo esc_attr($address['city']); ?>" class="medium-text"/>
 
 													</p>
 
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'Zip / Postal Code:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][zip]" value="<?php echo esc_attr( $address['zip'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('Zip / Postal Code:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][zip]" value="<?php echo esc_attr($address['zip']); ?>" class="medium-text"/>
 
 													</p>
 												</div>
 												<div class="column">
 													<p id="give-order-address-country-wrap">
-														<strong class="order-data-address-line"><?php _e( 'Country:', 'give' ); ?></strong><br/>
+														<strong class="order-data-address-line"><?php _e('Country:', 'give'); ?></strong><br/>
 														<?php
-														echo Give()->html->select( array(
+														echo Give()->html->select(array(
 															'options'          => give_get_country_list(),
 															'name'             => 'give-payment-address[0][country]',
 															'selected'         => $address['country'],
 															'show_option_all'  => false,
 															'show_option_none' => false,
 															'chosen'           => true,
-															'placeholder'      => __( 'Select a country', 'give' )
-														) );
+															'placeholder'      => __('Select a country', 'give')
+														));
 														?>
 													</p>
 
 													<p id="give-order-address-state-wrap">
-														<strong class="order-data-address-line"><?php _e( 'State / Province:', 'give' ); ?></strong><br/>
+														<strong class="order-data-address-line"><?php _e('State / Province:', 'give'); ?></strong><br/>
 														<?php
-														$states = give_get_states( $address['country'] );
-														if ( ! empty( $states ) ) {
-															echo Give()->html->select( array(
+														$states = give_get_states($address['country']);
+														if ( ! empty($states)) {
+															echo Give()->html->select(array(
 																'options'          => $states,
 																'name'             => 'give-payment-address[0][state]',
 																'selected'         => $address['state'],
 																'show_option_all'  => false,
 																'show_option_none' => false,
 																'chosen'           => true,
-																'placeholder'      => __( 'Select a state', 'give' )
-															) );
+																'placeholder'      => __('Select a state', 'give')
+															));
 														} else {
 															?>
-															<input type="text" name="give-payment-address[0][state]" value="<?php echo esc_attr( $address['state'] ); ?>" class="medium-text"/>
+															<input type="text" name="give-payment-address[0][state]" value="<?php echo esc_attr($address['state']); ?>" class="medium-text"/>
 															<?php
 														} ?>
 													</p>
@@ -436,39 +436,39 @@ 
 									</div>
 									<!-- /#give-order-address -->
 
-									<?php do_action( 'give_payment_billing_details', $payment_id ); ?>
+									<?php do_action('give_payment_billing_details', $payment_id); ?>
 
 								</div>
 								<!-- /.inside -->
 							</div>
 							<!-- /#give-billing-details -->
 
-							<?php do_action( 'give_view_order_details_billing_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_billing_after', $payment_id); ?>
 
 							<div id="give-payment-notes" class="postbox">
-								<h3 class="hndle"><span><?php _e( 'Payment Notes', 'give' ); ?></span></h3>
+								<h3 class="hndle"><span><?php _e('Payment Notes', 'give'); ?></span></h3>
 
 								<div class="inside">
 									<div id="give-payment-notes-inner">
 										<?php
-										$notes = give_get_payment_notes( $payment_id );
-										if ( ! empty( $notes ) ) :
+										$notes = give_get_payment_notes($payment_id);
+										if ( ! empty($notes)) :
 											$no_notes_display = ' style="display:none;"';
-											foreach ( $notes as $note ) :
+											foreach ($notes as $note) :
 
-												echo give_get_payment_note_html( $note, $payment_id );
+												echo give_get_payment_note_html($note, $payment_id);
 
 											endforeach;
 										else :
 											$no_notes_display = '';
 										endif;
-										echo '<p class="give-no-payment-notes"' . $no_notes_display . '>' . __( 'No payment notes', 'give' ) . '</p>';
+										echo '<p class="give-no-payment-notes"'.$no_notes_display.'>'.__('No payment notes', 'give').'</p>';
 										?>
 									</div>
 									<textarea name="give-payment-note" id="give-payment-note" class="large-text"></textarea>
 
 									<p class="give-clearfix">
-										<button id="give-add-payment-note" class="button button-secondary button-small" data-payment-id="<?php echo absint( $payment_id ); ?>"><?php _e( 'Add Note', 'give' ); ?></button>
+										<button id="give-add-payment-note" class="button button-secondary button-small" data-payment-id="<?php echo absint($payment_id); ?>"><?php _e('Add Note', 'give'); ?></button>
 									</p>
 
 									<div class="clear"></div>
@@ -477,7 +477,7 @@ 
 							</div>
 							<!-- /#give-payment-notes -->
 
-							<?php do_action( 'give_view_order_details_main_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_main_after', $payment_id); ?>
 						</div>
 						<!-- /#normal-sortables -->
 					</div>
@@ -488,10 +488,10 @@ 
 			<!-- #give-dashboard-widgets-wrap -->
 		</div>
 		<!-- /#post-stuff -->
-		<?php do_action( 'give_view_order_details_form_bottom', $payment_id ); ?>
-		<?php wp_nonce_field( 'give_update_payment_details_nonce' ); ?>
-		<input type="hidden" name="give_payment_id" value="<?php echo esc_attr( $payment_id ); ?>"/>
+		<?php do_action('give_view_order_details_form_bottom', $payment_id); ?>
+		<?php wp_nonce_field('give_update_payment_details_nonce'); ?>
+		<input type="hidden" name="give_payment_id" value="<?php echo esc_attr($payment_id); ?>"/>
 		<input type="hidden" name="give_action" value="update_payment_details"/>
 	</form>
-	<?php do_action( 'give_view_order_details_after', $payment_id ); ?>
+	<?php do_action('give_view_order_details_after', $payment_id); ?>
 </div><!-- /.wrap -->

includes/admin/reporting/reports.php

Spacing +107 added lines, -107 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,36 +29,36 @@ 
  * @return void
  */
 function give_reports_page() {
-	$current_page = admin_url( 'edit.php?post_type=give_forms&page=give-reports' );
-	$active_tab   = isset( $_GET['tab'] ) ? $_GET['tab'] : 'reports';
+	$current_page = admin_url('edit.php?post_type=give_forms&page=give-reports');
+	$active_tab   = isset($_GET['tab']) ? $_GET['tab'] : 'reports';
 	?>
 	<div class="wrap">
 		<h1 class="nav-tab-wrapper">
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'reports',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Reports', 'give' ); ?></a>
-			<?php if ( current_user_can( 'export_give_reports' ) ) { ?>
-				<a href="<?php echo esc_url( add_query_arg( array(
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e('Reports', 'give'); ?></a>
+			<?php if (current_user_can('export_give_reports')) { ?>
+				<a href="<?php echo esc_url(add_query_arg(array(
 					'tab'              => 'export',
 					'settings-updated' => false
-				), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'give' ); ?></a>
+				), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'give'); ?></a>
 			<?php } ?>
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'logs',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Logs', 'give' ); ?></a>
-			<a href="<?php echo esc_url( add_query_arg( array(
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php _e('Logs', 'give'); ?></a>
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'tools',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'tools' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Tools', 'give' ); ?></a>
-			<?php do_action( 'give_reports_tabs' ); ?>
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'tools' ? 'nav-tab-active' : ''; ?>"><?php _e('Tools', 'give'); ?></a>
+			<?php do_action('give_reports_tabs'); ?>
 		</h1>
 
 		<?php
-		do_action( 'give_reports_page_top' );
-		do_action( 'give_reports_tab_' . $active_tab );
-		do_action( 'give_reports_page_bottom' );
+		do_action('give_reports_page_top');
+		do_action('give_reports_tab_'.$active_tab);
+		do_action('give_reports_page_bottom');
 		?>
 	</div><!-- .wrap -->
 	<?php
@@ -72,13 +72,13 @@ 
  */
 function give_reports_default_views() {
 	$views = array(
-		'earnings' => __( 'Income', 'give' ),
+		'earnings' => __('Income', 'give'),
 		'forms'    => give_get_forms_label_plural(),
-		'donors'   => __( 'Donors', 'give' ),
-		'gateways' => __( 'Payment Methods', 'give' )
+		'donors'   => __('Donors', 'give'),
+		'gateways' => __('Payment Methods', 'give')
 	);
 
-	$views = apply_filters( 'give_report_views', $views );
+	$views = apply_filters('give_report_views', $views);
 
 	return $views;
 }
@@ -94,15 +94,15 @@ 
  * @return string $view Report View
  *
  */
-function give_get_reporting_view( $default = 'earnings' ) {
+function give_get_reporting_view($default = 'earnings') {
 
-	if ( ! isset( $_GET['view'] ) || ! in_array( $_GET['view'], array_keys( give_reports_default_views() ) ) ) {
+	if ( ! isset($_GET['view']) || ! in_array($_GET['view'], array_keys(give_reports_default_views()))) {
 		$view = $default;
 	} else {
 		$view = $_GET['view'];
 	}
 
-	return apply_filters( 'give_get_reporting_view', $view );
+	return apply_filters('give_get_reporting_view', $view);
 }
 
 /**
@@ -115,14 +115,14 @@ 
 	$current_view = 'earnings';
 	$views        = give_reports_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $views)) {
 		$current_view = $_GET['view'];
 	}
 
-	do_action( 'give_reports_view_' . $current_view );
+	do_action('give_reports_view_'.$current_view);
 }
 
-add_action( 'give_reports_tab_reports', 'give_reports_tab_reports' );
+add_action('give_reports_tab_reports', 'give_reports_tab_reports');
 
 /**
  * Renders the Reports Page Views Drop Downs
@@ -132,25 +132,25 @@ 
  */
 function give_report_views() {
 	$views        = give_reports_default_views();
-	$current_view = isset( $_GET['view'] ) ? $_GET['view'] : 'earnings';
-	do_action( 'give_report_view_actions_before' );
+	$current_view = isset($_GET['view']) ? $_GET['view'] : 'earnings';
+	do_action('give_report_view_actions_before');
 	?>
 	<form id="give-reports-filter" method="get">
 		<select id="give-reports-view" name="view">
-			<option value="-1"><?php _e( 'Report Type', 'give' ); ?></option>
-			<?php foreach ( $views as $view_id => $label ) : ?>
-				<option value="<?php echo esc_attr( $view_id ); ?>" <?php selected( $view_id, $current_view ); ?>><?php echo $label; ?></option>
+			<option value="-1"><?php _e('Report Type', 'give'); ?></option>
+			<?php foreach ($views as $view_id => $label) : ?>
+				<option value="<?php echo esc_attr($view_id); ?>" <?php selected($view_id, $current_view); ?>><?php echo $label; ?></option>
 			<?php endforeach; ?>
 		</select>
 
-		<?php do_action( 'give_report_view_actions' ); ?>
+		<?php do_action('give_report_view_actions'); ?>
 
 		<input type="hidden" name="post_type" value="give_forms"/>
 		<input type="hidden" name="page" value="give-reports"/>
-		<?php submit_button( __( 'Show', 'give' ), 'secondary', 'submit', false ); ?>
+		<?php submit_button(__('Show', 'give'), 'secondary', 'submit', false); ?>
 	</form>
 	<?php
-	do_action( 'give_report_view_actions_after' );
+	do_action('give_report_view_actions_after');
 }
 
 /**
@@ -163,18 +163,18 @@ 
  */
 function give_reports_forms_table() {
 
-	if ( isset( $_GET['form-id'] ) ) {
+	if (isset($_GET['form-id'])) {
 		return;
 	}
 
-	include( dirname( __FILE__ ) . '/class-form-reports-table.php' );
+	include(dirname(__FILE__).'/class-form-reports-table.php');
 
 	$give_table = new Give_Form_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_forms_table' );
+add_action('give_reports_view_forms', 'give_reports_forms_table');
 
 /**
  * Renders the detailed report for a specific give form
@@ -183,7 +183,7 @@ 
  * @return void
  */
 function give_reports_form_details() {
-	if ( ! isset( $_GET['form-id'] ) ) {
+	if ( ! isset($_GET['form-id'])) {
 		return;
 	}
 	?>
@@ -191,14 +191,14 @@ 
 		<div class="actions bulkactions">
 			<?php give_report_views(); ?>
 			&nbsp;
-			<button onclick="history.go(-1);" class="button-secondary"><?php _e( 'Go Back', 'give' ); ?></button>
+			<button onclick="history.go(-1);" class="button-secondary"><?php _e('Go Back', 'give'); ?></button>
 		</div>
 	</div>
 	<?php
-	give_reports_graph_of_form( absint( $_GET['form-id'] ) );
+	give_reports_graph_of_form(absint($_GET['form-id']));
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_form_details' );
+add_action('give_reports_view_forms', 'give_reports_form_details');
 
 /**
  * Renders the Reports Donors Table
@@ -209,28 +209,28 @@ 
  * @return void
  */
 function give_reports_donors_table() {
-	include( dirname( __FILE__ ) . '/class-donor-reports-table.php' );
+	include(dirname(__FILE__).'/class-donor-reports-table.php');
 
 	$give_table = new Give_Donor_Reports_Table();
 	$give_table->prepare_items();
 	?>
 	<div class="wrap give-reports-donors-wrap">
-		<?php do_action( 'give_logs_donors_table_top' ); ?>
-		<form id="give-donors-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=donors' ); ?>">
+		<?php do_action('give_logs_donors_table_top'); ?>
+		<form id="give-donors-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-reports&view=donors'); ?>">
 			<?php
-			$give_table->search_box( __( 'Search', 'give' ), 'give-donors' );
+			$give_table->search_box(__('Search', 'give'), 'give-donors');
 			$give_table->display();
 			?>
 			<input type="hidden" name="post_type" value="give_forms"/>
 			<input type="hidden" name="page" value="give-reports"/>
 			<input type="hidden" name="view" value="donors"/>
 		</form>
-		<?php do_action( 'give_logs_donors_table_bottom' ); ?>
+		<?php do_action('give_logs_donors_table_bottom'); ?>
 	</div>
 	<?php
 }
 
-add_action( 'give_reports_view_donors', 'give_reports_donors_table' );
+add_action('give_reports_view_donors', 'give_reports_donors_table');
 
 
 /**
@@ -242,14 +242,14 @@ 
  * @return void
  */
 function give_reports_gateways_table() {
-	include( dirname( __FILE__ ) . '/class-gateways-reports-table.php' );
+	include(dirname(__FILE__).'/class-gateways-reports-table.php');
 
 	$give_table = new Give_Gateawy_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_gateways', 'give_reports_gateways_table' );
+add_action('give_reports_view_gateways', 'give_reports_gateways_table');
 
 
 /**
@@ -261,7 +261,7 @@ 
 function give_reports_earnings() {
 	?>
 	<div class="tablenav top reports-table-nav">
-		<h3 class="alignleft reports-earnings-title"><span><?php _e( 'Income Over Time', 'give' ); ?></span></h3>
+		<h3 class="alignleft reports-earnings-title"><span><?php _e('Income Over Time', 'give'); ?></span></h3>
 
 		<div class="alignright actions reports-views-wrap"><?php give_report_views(); ?></div>
 	</div>
@@ -269,7 +269,7 @@ 
 	give_reports_graph();
 }
 
-add_action( 'give_reports_view_earnings', 'give_reports_earnings' );
+add_action('give_reports_view_earnings', 'give_reports_earnings');
 
 
 /**
@@ -284,52 +284,52 @@ 
 		<div id="post-body">
 			<div id="post-body-content">
 
-				<?php do_action( 'give_reports_tab_export_content_top' ); ?>
+				<?php do_action('give_reports_tab_export_content_top'); ?>
 
 				<table class="widefat export-options-table give-table">
 					<thead>
 					<tr>
-						<th class="row-title"><?php _e( 'Export Type', 'give' ); ?></th>
-						<th><?php _e( 'Export Options', 'give' ); ?></th>
+						<th class="row-title"><?php _e('Export Type', 'give'); ?></th>
+						<th><?php _e('Export Options', 'give'); ?></th>
 					</tr>
 					</thead>
 					<tbody>
-					<?php do_action( 'give_reports_tab_export_table_top' ); ?>
+					<?php do_action('give_reports_tab_export_table_top'); ?>
 					<tr class="give-export-pdf-sales-earnings">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export PDF of Donations and Income', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export PDF of Donations and Income', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a PDF of Donations and Income reports for all forms for the current year.', 'give' ); ?></p>
+							<p><?php _e('Download a PDF of Donations and Income reports for all forms for the current year.', 'give'); ?></p>
 						</td>
 						<td>
-							<a class="button" href="<?php echo wp_nonce_url( add_query_arg( array( 'give-action' => 'generate_pdf' ) ), 'give_generate_pdf' ); ?>"><?php _e( 'Generate PDF', 'give' ); ?></a>
+							<a class="button" href="<?php echo wp_nonce_url(add_query_arg(array('give-action' => 'generate_pdf')), 'give_generate_pdf'); ?>"><?php _e('Generate PDF', 'give'); ?></a>
 						</td>
 					</tr>
 					<tr class="alternate give-export-sales-earnings">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Income and Donation Stats', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Income and Donation Stats', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of income and donations over time.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of income and donations over time.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post">
 								<?php
 									printf(
-										__( '%1$s to %2$s', 'give' ),
-										Give()->html->year_dropdown( 'start_year' ) . ' ' . Give()->html->month_dropdown( 'start_month' ),
-										Give()->html->year_dropdown( 'end_year' )   . ' ' . Give()->html->month_dropdown( 'end_month' )
+										__('%1$s to %2$s', 'give'),
+										Give()->html->year_dropdown('start_year').' '.Give()->html->month_dropdown('start_month'),
+										Give()->html->year_dropdown('end_year').' '.Give()->html->month_dropdown('end_month')
 									);
 								?>
 								<input type="hidden" name="give-action" value="earnings_export"/>
-								<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+								<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 							</form>
 						</td>
 					</tr>
 					<tr class="give-export-payment-history">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Donation History', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Donation History', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of all donations recorded.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of all donations recorded.', 'give'); ?></p>
 						</td>
 						<td>
 							<form id="give-export-payments" class="give-export-form" method="post">
@@ -337,29 +337,29 @@ 
 								$args = array(
 									'id'          => 'give-payment-export-start',
 									'name'        => 'start',
-									'placeholder' => __( 'Start date', 'give' )
+									'placeholder' => __('Start date', 'give')
 								);
-								echo Give()->html->date_field( $args ); ?>
+								echo Give()->html->date_field($args); ?>
 								<?php
 								$args = array(
 									'id'          => 'give-payment-export-end',
 									'name'        => 'end',
-									'placeholder' => __( 'End date', 'give' )
+									'placeholder' => __('End date', 'give')
 								);
-								echo Give()->html->date_field( $args ); ?>
+								echo Give()->html->date_field($args); ?>
 								<select name="status">
-									<option value="any"><?php _e( 'All Statuses', 'give' ); ?></option>
+									<option value="any"><?php _e('All Statuses', 'give'); ?></option>
 									<?php
 									$statuses = give_get_payment_statuses();
-									foreach ( $statuses as $status => $label ) {
-										echo '<option value="' . $status . '">' . $label . '</option>';
+									foreach ($statuses as $status => $label) {
+										echo '<option value="'.$status.'">'.$label.'</option>';
 									}
 									?>
 								</select>
-								<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+								<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 								<input type="hidden" name="give-export-class" value="Give_Batch_Payments_Export"/>
 								<span>
-									<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+									<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 									<span class="spinner"></span>
 								</span>
 							</form>
@@ -368,9 +368,9 @@ 
 					</tr>
 					<tr class="alternate give-export-donors">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Donors in CSV', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Donors in CSV', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download an export of donors for all donation forms or only those who have given to a particular form.', 'give' ); ?></p>
+							<p><?php _e('Download an export of donors for all donation forms or only those who have given to a particular form.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post" id="give_donor_export" class="give-export-form">
@@ -381,54 +381,54 @@ 
 										'id'     => 'give_customer_export_form',
 										'chosen' => true
 									);
-									echo Give()->html->forms_dropdown( $args ); ?>
+									echo Give()->html->forms_dropdown($args); ?>
 								
-								<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+								<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 
 								<div id="export-donor-options-wrap" class="give-clearfix">
-									<p><?php _e( 'Export Columns', 'give' ); ?>:</p>
+									<p><?php _e('Export Columns', 'give'); ?>:</p>
 									<ul id="give-export-option-ul">
 										<li>
-											<label for="give-export-fullname"><input type="checkbox" checked name="give_export_option[full_name]" id="give-export-fullname"><?php _e( 'Name', 'give' ); ?>
+											<label for="give-export-fullname"><input type="checkbox" checked name="give_export_option[full_name]" id="give-export-fullname"><?php _e('Name', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-email"><input type="checkbox" checked name="give_export_option[email]" id="give-export-email"><?php _e( 'Email', 'give' ); ?>
+											<label for="give-export-email"><input type="checkbox" checked name="give_export_option[email]" id="give-export-email"><?php _e('Email', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-address"><input type="checkbox" checked name="give_export_option[address]" id="give-export-address"><?php _e( 'Address', 'give' ); ?>
+											<label for="give-export-address"><input type="checkbox" checked name="give_export_option[address]" id="give-export-address"><?php _e('Address', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-userid"><input type="checkbox" checked name="give_export_option[userid]" id="give-export-userid"><?php _e( 'User ID', 'give' ); ?>
+											<label for="give-export-userid"><input type="checkbox" checked name="give_export_option[userid]" id="give-export-userid"><?php _e('User ID', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-first-donation-date"><input type="checkbox" checked name="give_export_option[date_first_donated]" id="give-export-first-donation-date"><?php _e( 'First Donation Date', 'give' ); ?>
+											<label for="give-export-first-donation-date"><input type="checkbox" checked name="give_export_option[date_first_donated]" id="give-export-first-donation-date"><?php _e('First Donation Date', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-donation-number"><input type="checkbox" checked name="give_export_option[donations]" id="give-export-donation-number"><?php _e( 'Number of Donations', 'give' ); ?>
+											<label for="give-export-donation-number"><input type="checkbox" checked name="give_export_option[donations]" id="give-export-donation-number"><?php _e('Number of Donations', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-donation-sum"><input type="checkbox" checked name="give_export_option[donation_sum]" id="give-export-donation-sum"><?php _e( 'Total Donated', 'give' ); ?>
+											<label for="give-export-donation-sum"><input type="checkbox" checked name="give_export_option[donation_sum]" id="give-export-donation-sum"><?php _e('Total Donated', 'give'); ?>
 											</label>
 										</li>
 									</ul>
 								</div>
-								<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+								<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 								<input type="hidden" name="give-export-class" value="Give_Batch_Customers_Export"/>
 								<input type="hidden" name="give-action" value="email_export"/>
 							</form>
 						</td>
 					</tr>
-					<?php do_action( 'give_reports_tab_export_table_bottom' ); ?>
+					<?php do_action('give_reports_tab_export_table_bottom'); ?>
 					</tbody>
 				</table>
 
-				<?php do_action( 'give_reports_tab_export_content_bottom' ); ?>
+				<?php do_action('give_reports_tab_export_content_bottom'); ?>
 
 			</div>
 			<!-- .post-body-content -->
@@ -438,7 +438,7 @@ 
 	<?php
 }
 
-add_action( 'give_reports_tab_export', 'give_reports_tab_export' );
+add_action('give_reports_tab_export', 'give_reports_tab_export');
 
 /**
  * Renders the Reports page
@@ -448,19 +448,19 @@ 
  */
 function give_reports_tab_logs() {
 
-	require( GIVE_PLUGIN_DIR . 'includes/admin/reporting/logs.php' );
+	require(GIVE_PLUGIN_DIR.'includes/admin/reporting/logs.php');
 
 	$current_view = 'sales';
 	$log_views    = give_log_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $log_views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $log_views)) {
 		$current_view = $_GET['view'];
 	}
 
-	do_action( 'give_logs_view_' . $current_view );
+	do_action('give_logs_view_'.$current_view);
 }
 
-add_action( 'give_reports_tab_logs', 'give_reports_tab_logs' );
+add_action('give_reports_tab_logs', 'give_reports_tab_logs');
 
 /**
  * Retrieves estimated monthly earnings and sales
@@ -470,9 +470,9 @@ 
  */
 function give_estimated_monthly_stats() {
 
-	$estimated = get_transient( 'give_estimated_monthly_stats' );
+	$estimated = get_transient('give_estimated_monthly_stats');
 
-	if ( false === $estimated ) {
+	if (false === $estimated) {
 
 		$estimated = array(
 			'earnings' => 0,
@@ -481,20 +481,20 @@ 
 
 		$stats = new Give_Payment_Stats;
 
-		$to_date_earnings = $stats->get_earnings( 0, 'this_month' );
-		$to_date_sales    = $stats->get_sales( 0, 'this_month' );
+		$to_date_earnings = $stats->get_earnings(0, 'this_month');
+		$to_date_sales    = $stats->get_sales(0, 'this_month');
 
-		$current_day   = date( 'd', current_time( 'timestamp' ) );
-		$current_month = date( 'n', current_time( 'timestamp' ) );
-		$current_year  = date( 'Y', current_time( 'timestamp' ) );
-		$days_in_month = cal_days_in_month( CAL_GREGORIAN, $current_month, $current_year );
+		$current_day   = date('d', current_time('timestamp'));
+		$current_month = date('n', current_time('timestamp'));
+		$current_year  = date('Y', current_time('timestamp'));
+		$days_in_month = cal_days_in_month(CAL_GREGORIAN, $current_month, $current_year);
 
-		$estimated['earnings'] = ( $to_date_earnings / $current_day ) * $days_in_month;
-		$estimated['sales']    = ( $to_date_sales / $current_day ) * $days_in_month;
+		$estimated['earnings'] = ($to_date_earnings / $current_day) * $days_in_month;
+		$estimated['sales']    = ($to_date_sales / $current_day) * $days_in_month;
 
 		// Cache for one day
-		set_transient( 'give_estimated_monthly_stats', $estimated, 86400 );
+		set_transient('give_estimated_monthly_stats', $estimated, 86400);
 	}
 
-	return maybe_unserialize( $estimated );
+	return maybe_unserialize($estimated);
 }

includes/admin/class-give-settings.php

Spacing +311 added lines, -311 removed lines

@@ -49,26 +49,26 @@ 
 	 */

 	public function __construct() {

 

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

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

 

 		//Customize CMB2 URL

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

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

 

 		//Custom CMB2 Settings Fields

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

 		// Include CMB CSS in the head to avoid FOUC

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

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

 

-		add_filter( 'cmb2_get_metabox_form_format', array( $this, 'give_modify_cmb2_form_output' ), 10, 3 );

+		add_filter('cmb2_get_metabox_form_format', array($this, 'give_modify_cmb2_form_output'), 10, 3);

 

 	}

 

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

 	 */

 	public function init() {

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

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

 

 	}

 

@@ -92,9 +92,9 @@ 
 	 *

 	 * @return mixed

 	 */

-	public function give_update_cmb_meta_box_url( $url ) {

+	public function give_update_cmb_meta_box_url($url) {

 		//Path to Give's CMB

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

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

 	}

 

 

@@ -106,27 +106,27 @@ 
 	 */

 	public function give_get_settings_tabs() {

 

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

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

 

 		$tabs             = array();

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

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

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

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

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

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

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

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

 

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

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

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

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

 		}

 

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

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

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

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

 		}

 

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

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

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

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

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

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

 

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

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

 	}

 

 

@@ -136,7 +136,7 @@ 
 	 */

 	public function admin_page_display() {

 

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

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

 

 		?>

 

@@ -144,20 +144,20 @@ 
 

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

 				<?php

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

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

 

 					//Support legacy tab creation conditions based off $_GET parameter

 					//We pass the $_GET['tab'] to conditions executed later

 					$_GET['tab'] = $tab_id;

 

-					$tab_url = esc_url( add_query_arg( array(

+					$tab_url = esc_url(add_query_arg(array(

 						'settings-updated' => false,

 						'tab'              => $tab_id

-					) ) );

+					)));

 

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

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

 

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

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

 

 				}

 				?>

@@ -165,20 +165,20 @@ 
 

 			<?php

 			//Loop through and output settings

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

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

 

 				//Support legacy tab creation conditions based off $_GET parameter

 				//We 'trick' the conditions into thinking this is the tab

 				$_GET['tab'] = $tab_id;

 

-				$tab_settings = $this->give_settings( $tab_id );

+				$tab_settings = $this->give_settings($tab_id);

 

 				//Pass active tab within $tab_settings so we can hide with CSS via PHP

-				if ( $active_tab == $tab_id ) {

+				if ($active_tab == $tab_id) {

 					$tab_settings['active_tab'] = true;

 				}

 

-				cmb2_metabox_form( $tab_settings, $this->key );

+				cmb2_metabox_form($tab_settings, $this->key);

 

 			} ?>

 

@@ -196,34 +196,34 @@ 
 	 * @since 1.5 Modified to CSS hide non-active tabs

 	 * @since 1.0

 	 */

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

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

 

 

-		$pagenow = isset( $_GET['page'] ) ? $_GET['page'] : '';

+		$pagenow = isset($_GET['page']) ? $_GET['page'] : '';

 

 		//only modify the give settings form

-		if ( 'give_settings' == $object_id && $pagenow == 'give-settings' ) {

+		if ('give_settings' == $object_id && $pagenow == 'give-settings') {

 

 			$style = '';

-			if ( ! isset( $cmb->meta_box['active_tab'] ) ) {

+			if ( ! isset($cmb->meta_box['active_tab'])) {

 				$style = 'style="display:none;"';

 			}

 

 			//Set ID based off tab name - protects backwards compatibility

-			$tab_id = isset( $_GET['tab'] ) ? $_GET['tab'] : $cmb->meta_box['id'];

+			$tab_id = isset($_GET['tab']) ? $_GET['tab'] : $cmb->meta_box['id'];

 

-			$save_button = apply_filters( 'give_save_button_markup', '<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="' . __( 'Save Settings', 'give' ) . '" class="button-primary"></div>' );

+			$save_button = apply_filters('give_save_button_markup', '<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="'.__('Save Settings', 'give').'" class="button-primary"></div>');

 

 			//Filter so some tabs won't have save settings

-			$no_save_button = apply_filters( 'give_settings_no_save_output', array(

+			$no_save_button = apply_filters('give_settings_no_save_output', array(

 				'system_info'

-			) );

+			));

 

-			if ( in_array( $tab_id, $no_save_button ) ) {

+			if (in_array($tab_id, $no_save_button)) {

 				$save_button = '';

 			}

 

-			$form_format = '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data" ' . $style . ' data-tab="' . $tab_id . '"><input type="hidden" name="give_settings_saved" value="true"><input type="hidden" name="object_id" value="%2$s">%3$s' . $save_button . '</form>';

+			$form_format = '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data" '.$style.' data-tab="'.$tab_id.'"><input type="hidden" name="give_settings_saved" value="true"><input type="hidden" name="object_id" value="%2$s">%3$s'.$save_button.'</form>';

 

 		}

 

@@ -240,7 +240,7 @@ 
 	 *

 	 * @return array

 	 */

-	public function give_settings( $active_tab ) {

+	public function give_settings($active_tab) {

 

 		$give_settings = array(

 			/**

@@ -248,60 +248,60 @@ 
 			 */

 			'general'     => array(

 				'id'         => 'general_settings',

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

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

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

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

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

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

 						array(

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

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

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_1'

 						),

 						array(

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

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

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

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

 							'id'      => 'success_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

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

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

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

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

 							'id'      => 'failure_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

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

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

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

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

 							'id'      => 'history_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

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

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

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

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

 							'id'      => 'base_country',

 							'type'    => 'select',

 							'options' => give_get_country_list(),

 						),

 						array(

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

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

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_2'

 						),

 						array(

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

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

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

 							'id'      => 'currency',

 							'type'    => 'select',

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

 						),

 						array(

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

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

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

 							'id'      => 'currency_position',

 							'type'    => 'select',

 							'options' => array(

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

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

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

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

 							),

 							'default' => 'before',

 						),

 						array(

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

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

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

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

 							'id'      => 'thousands_separator',

 							'type'    => 'text_small',

 							'default' => ',',

 						),

 						array(

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

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

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

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

 							'id'      => 'decimal_separator',

 							'type'    => 'text_small',

 							'default' => '.',

@@ -341,83 +341,83 @@ 
 			 */

 			'gateways'    => array(

 				'id'         => 'payment_gateways',

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

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

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

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

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

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

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_gateway_settings_1',

 							'type' => 'give_title'

 						),

 						array(

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

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

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

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

 							'id'   => 'test_mode',

 							'type' => 'checkbox'

 						),

 						array(

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

-							'desc' => __( 'Choose the payment gateways you would like enabled. You can drag-and-drop payment gateways to reorder them.', 'give' ),

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

+							'desc' => __('Choose the payment gateways you would like enabled. You can drag-and-drop payment gateways to reorder them.', 'give'),

 							'id'   => 'gateways',

 							'type' => 'enabled_gateways'

 						),

 						array(

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

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

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

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

 							'id'   => 'default_gateway',

 							'type' => 'default_gateway'

 						),

 						array(

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

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

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_2',

 						),

 						array(

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

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

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

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

 							'id'   => 'paypal_email',

 							'type' => 'text_email',

 						),

 						array(

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

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

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

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

 							'id'   => 'paypal_page_style',

 							'type' => 'text',

 						),

 						array(

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

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

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

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

 							'id'      => 'paypal_button_type',

 							'type'    => 'radio_inline',

 							'options' => array(

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

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

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

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

 							),

 							'default' => 'donation',

 						),

 						array(

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

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

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

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

 							'id'   => 'disable_paypal_verification',

 							'type' => 'checkbox'

 						),

 						array(

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

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

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_3',

 						),

 						array(

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

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

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

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

 							'id'   => 'give_offline_donation_enable_billing_fields',

 							'type' => 'checkbox'

 						),

 						array(

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

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

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

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

 							'id'      => 'global_offline_donation_content',

 							'default' => give_get_default_offline_donation_content(),

 							'type'    => 'wysiwyg',

@@ -426,15 +426,15 @@ 
 							)

 						),

 						array(

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

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

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

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

 							'id'      => 'offline_donation_subject',

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

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

 							'type'    => 'text'

 						),

 						array(

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

-							'desc'    => __( 'Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ),

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

+							'desc'    => __('Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give'),

 							'id'      => 'global_offline_donation_email',

 							'default' => give_get_default_offline_donation_email_content(),

 							'type'    => 'wysiwyg',

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

 			'display'     => array(

 				'id'         => 'display_settings',

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

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

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

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

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

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

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_display_settings_1',

 							'type' => 'give_title'

 						),

 						array(

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

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

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

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

 							'id'   => 'disable_css',

 							'type' => 'checkbox'

 						),

 						array(

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

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

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

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

 							'id'   => 'enable_floatlabels',

 							'type' => 'checkbox'

 						),

 						array(

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

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

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

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

 							'id'   => 'disable_welcome',

 							'type' => 'checkbox'

 						),

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_display_settings_2',

 							'type' => 'give_title'

 						),

 						array(

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

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

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

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

 							'id'   => 'disable_forms_singular',

 							'type' => 'checkbox'

 						),

 						array(

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

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

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

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

 							'id'   => 'disable_forms_archives',

 							'type' => 'checkbox'

 						),

 						array(

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

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

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

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

 							'id'   => 'disable_forms_excerpt',

 							'type' => 'checkbox'

 						),

 

 						array(

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

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

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

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

 							'id'      => 'featured_image_size',

 							'type'    => 'select',

 							'default' => 'large',

 							'options' => give_get_featured_image_sizes()

 						),

 						array(

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

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

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

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

 							'id'   => 'disable_form_featured_img',

 							'type' => 'checkbox'

 						),

 						array(

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

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

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

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

 							'id'   => 'disable_form_sidebar',

 							'type' => 'checkbox'

 						),

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_display_settings_3',

 							'type' => 'give_title'

 						),

 						array(

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

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

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

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

 							'id'   => 'enable_categories',

 							'type' => 'checkbox'

 						),

 						array(

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

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

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

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

 							'id'   => 'enable_tags',

 							'type' => 'checkbox'

 						),

@@ -547,93 +547,93 @@ 
 			 */

 			'emails'      => array(

 				'id'         => 'email_settings',

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

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

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

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

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

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

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_email_settings_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'email_template',

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

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

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

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

 							'type'    => 'select',

 							'options' => give_get_email_templates()

 						),

 						array(

 							'id'   => 'email_logo',

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

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

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

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

 							'type' => 'file'

 						),

 						array(

 							'id'      => 'from_name',

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

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

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

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

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

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

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'from_email',

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

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

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

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

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

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

 							'type'    => 'text'

 						),

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_email_settings_2',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_subject',

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

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

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

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

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

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

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'donation_receipt',

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

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

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

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

 							'type'    => 'wysiwyg',

 							'default' => give_get_default_donation_receipt_email()

 						),

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_email_settings_3',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_notification_subject',

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

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

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

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

 							'type'    => 'text',

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

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

 						),

 						array(

 							'id'      => 'donation_notification',

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

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

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

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

 							'type'    => 'wysiwyg',

 							'default' => give_get_default_donation_notification_email()

 						),

 						array(

 							'id'      => 'admin_notice_emails',

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

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

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

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

 							'type'    => 'textarea',

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

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

 						),

 						array(

 							'id'   => 'disable_admin_notices',

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

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

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

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

 							'type' => 'checkbox'

 						)

 					)

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

 			'addons'      => array(

 				'id'         => 'addons',

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

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

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

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

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

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

 				)

 			),

 			/** Licenses Settings */

 			'licenses'    => array(

 				'id'         => 'licenses',

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

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

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

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

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

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

 				)

 			),

 			/** Advanced Options */

 			'advanced'    => array(

 				'id'         => 'advanced_options',

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

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

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

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

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

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

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_session_control_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'session_lifetime',

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

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

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

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

 							'type'    => 'select',

 							'options' => array(

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

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

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

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

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

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

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

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

 							)

 						),

 						array(

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

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

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

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

 							'id'   => 'email_access',

 							'type' => 'checkbox',

 						),

 						array(

 							'id'      => 'recaptcha_key',

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

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

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

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

 							'default' => '',

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'recaptcha_secret',

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

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

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

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

 							'default' => '',

 							'type'    => 'text'

 						),

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_data_control_2',

 							'type' => 'give_title'

 						),

 						array(

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

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

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

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

 							'id'   => 'uninstall_on_delete',

 							'type' => 'checkbox'

 						),

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_filter_control',

 							'type' => 'give_title'

 						),

 						array(

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

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

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

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

 							'id'   => 'disable_the_content_filter',

 							'type' => 'checkbox'

 						),

 						array(

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

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

 							'desc' => '',

 							'id'   => 'give_title_script_control',

 							'type' => 'give_title'

 						),

 						array(

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

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

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

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

 							'id'   => 'scripts_footer',

 							'type' => 'checkbox'

 						)

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

 			'api'         => array(

 				'id'         => 'api',

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

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

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

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

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

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

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

 						array(

 							'id'   => 'api',

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

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

 							'type' => 'api'

 						)

 					)

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

 			'system_info' => array(

 				'id'         => 'system_info',

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

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

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

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

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

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

 						array(

 							'id'   => 'system_info',

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

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

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

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

 							'type' => 'system_info'

 						)

 					)

@@ -771,15 +771,15 @@ 
 		);

 

 		//Return all settings array if no active tab

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

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

 

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

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

 			

 		}

 

 

 		// Add other tabs and settings fields as needed

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

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

 

 	}

 

@@ -788,11 +788,11 @@ 
 	 */

 	public function settings_notices() {

 

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

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

 			return;

 		}

 

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

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

 

 	}

 

@@ -806,17 +806,17 @@ 
 	 *

 	 * @return mixed          Field value or exception is thrown

 	 */

-	public function __get( $field ) {

+	public function __get($field) {

 

 		// Allowed fields to retrieve

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

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

 			return $this->{$field};

 		}

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

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

 			return $this->option_metabox();

 		}

 

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

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

 	}

 

 

@@ -833,12 +833,12 @@ 
  *

  * @return mixed        Option value

  */

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

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

 	global $give_options;

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

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

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

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

 

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

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

 }

 

 

@@ -856,33 +856,33 @@ 
  *

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

  */

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

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

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

-	if ( empty( $value ) ) {

-		$remove_option = give_delete_option( $key );

+	if (empty($value)) {

+		$remove_option = give_delete_option($key);

 

 		return $remove_option;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

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

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

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

 

 	// Next let's try to update the value

-	$options[ $key ] = $value;

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

+	$options[$key] = $value;

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

 

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

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

-		$give_options[ $key ] = $value;

+		$give_options[$key] = $value;

 	}

 

 	return $did_update;

@@ -899,27 +899,27 @@ 
  *

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

  */

-function give_delete_option( $key = '' ) {

+function give_delete_option($key = '') {

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

 	// Next let's try to update the value

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

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

 

-		unset( $options[ $key ] );

+		unset($options[$key]);

 

 	}

 

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

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

 

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

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

 		$give_options = $options;

 	}

@@ -938,9 +938,9 @@ 
  */

 function give_get_settings() {

 

-	$settings = get_option( 'give_settings' );

+	$settings = get_option('give_settings');

 

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

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

 

 }

 

@@ -958,25 +958,25 @@ 
  *

  * @return array

  */

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

-	if ( is_int( $position ) ) {

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

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

+	if (is_int($position)) {

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

 	} else {

 

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

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

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

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

 				$pos = $index;

 			}

 		}

 

-		if ( ! isset( $pos ) ) {

+		if ( ! isset($pos)) {

 			return $array;

 		}

 

 		$array = array_merge(

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

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

 			$insert,

-			array_slice( $array, $pos )

+			array_slice($array, $pos)

 		);

 	}

 

@@ -999,31 +999,31 @@ 
  *

  * @return void

  */

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

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

 

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

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

-	$gateways          = give_get_ordered_payment_gateways( give_get_payment_gateways() );

+	$gateways          = give_get_ordered_payment_gateways(give_get_payment_gateways());

 

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

 

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

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

 

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

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

 			$enabled = '1';

 		} else {

 			$enabled = null;

 		}

 

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

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

+		echo '<li><span class="give-drag-handle"><span class="dashicons dashicons-menu"></span></span><input name="'.$id.'['.$key.']" id="'.$id.'['.$key.']" type="checkbox" value="1" '.checked('1', $enabled, false).'/>&nbsp;';

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

 

 	endforeach;

 

 	echo '</ul>';

 

-	if ( $field_description ) {

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

+	if ($field_description) {

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

 	}

 

 }

@@ -1039,31 +1039,31 @@ 
  *

  * @return void

  */

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

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

 

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

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

 	$gateways          = give_get_enabled_payment_gateways();

 

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

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

 

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

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

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

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

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

 	}

 

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

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

 

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

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

 

 

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

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

 

 	endforeach;

 

 	echo '</select>';

 

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

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

 

 }

 

@@ -1078,13 +1078,13 @@ 
  *

  * @return void

  */

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

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

 

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

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

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

 

-	echo '<hr>' . $field_description;

+	echo '<hr>'.$field_description;

 

 }

 

@@ -1099,7 +1099,7 @@ 
  *

  * @return void

  */

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

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

 

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

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

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

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

  */

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

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

 

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

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

 

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

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

 		return $post_options;

 	}

 

-	$args = wp_parse_args( $query_args, array(

+	$args = wp_parse_args($query_args, array(

 		'post_type'   => 'page',

 		'numberposts' => 10,

-	) );

+	));

 

-	$posts = get_posts( $args );

+	$posts = get_posts($args);

 

-	if ( $posts ) {

-		foreach ( $posts as $post ) {

+	if ($posts) {

+		foreach ($posts as $post) {

 

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

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

 

 		}

 	}

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

 	$sizes = array();

 

-	foreach ( get_intermediate_image_sizes() as $_size ) {

+	foreach (get_intermediate_image_sizes() as $_size) {

 

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

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

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

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

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

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

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

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

 		}

 

 	}

 

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

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

 }

 

 

@@ -1181,34 +1181,34 @@ 
  *

  * @return void

  */

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

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

 

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

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

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

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

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

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

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

 

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

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

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

 	}

 

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

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

 		'class' => $field_classes,

 		'type'  => $type

-	) );

+	));

 

 	//License is active so show deactivate button

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

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

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

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

 	} else {

 		//This license is not valid so delete it

-		give_delete_option( $id );

+		give_delete_option($id);

 	}

 

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

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

 

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

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

 

 	echo $html;

 }

@@ -1222,13 +1222,13 @@ 
  */

 function give_api_callback() {

 

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

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

 		return;

 	}

 

-	do_action( 'give_tools_api_keys_before' );

+	do_action('give_tools_api_keys_before');

 

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

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

 

 	$api_keys_table = new Give_API_Keys_Table();

 	$api_keys_table->prepare_items();

@@ -1236,17 +1236,17 @@ 
 	?>

 	<span class="cmb2-metabox-description api-description">

 		<?php echo sprintf(

-			__( 'You can create API keys for individual users within their profile edit screen. API keys allow users to use the <a href="%1$s" target="_blank">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%2$s" target="_blank">Zapier</a>.', 'give' ),

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

-			esc_url( 'https://givewp.com/addons/zapier/' )

+			__('You can create API keys for individual users within their profile edit screen. API keys allow users to use the <a href="%1$s" target="_blank">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%2$s" target="_blank">Zapier</a>.', 'give'),

+			esc_url('https://givewp.com/documentation/give-api-reference/'),

+			esc_url('https://givewp.com/addons/zapier/')

 		); ?>

 	</span>

 	<?php

 

-	do_action( 'give_tools_api_keys_after' );

+	do_action('give_tools_api_keys_after');

 }

 

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

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

 

 /**

  * Hook Callback

@@ -1259,8 +1259,8 @@ 
  *

  * @return void

  */

-function give_hook_callback( $args ) {

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

+function give_hook_callback($args) {

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

 }

 

 /**

@@ -1270,10 +1270,10 @@ 
  *

  */

 

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

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

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

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

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

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

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

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

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

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

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

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

 }
\ No newline at end of file

includes/login-register.php

Spacing +59 added lines, -59 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,10 +25,10 @@ 
  *
  * @return string Login form
  */
-function give_login_form( $redirect = '' ) {
+function give_login_form($redirect = '') {
 	global $give_login_redirect;
 
-	if ( empty( $redirect ) ) {
+	if (empty($redirect)) {
 		$redirect = add_query_arg('give-login-success', 'true', give_get_current_page_url());
 	}
 
@@ -36,9 +36,9 @@ 
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'login' );
+	give_get_template_part('shortcode', 'login');
 
-	return apply_filters( 'give_login_form', ob_get_clean() );
+	return apply_filters('give_login_form', ob_get_clean());
 }
 
 /**
@@ -52,10 +52,10 @@ 
  *
  * @return string Register form
  */
-function give_register_form( $redirect = '' ) {
+function give_register_form($redirect = '') {
 	global $give_options, $give_register_redirect;
 
-	if ( empty( $redirect ) ) {
+	if (empty($redirect)) {
 		$redirect = give_get_current_page_url();
 	}
 
@@ -63,11 +63,11 @@ 
 
 	ob_start();
 
-	if ( ! is_user_logged_in() ) {
-		give_get_template_part( 'shortcode', 'register' );
+	if ( ! is_user_logged_in()) {
+		give_get_template_part('shortcode', 'register');
 	}
 
-	return apply_filters( 'give_register_form', ob_get_clean() );
+	return apply_filters('give_register_form', ob_get_clean());
 }
 
 /**
@@ -79,34 +79,34 @@ 
  *
  * @return void
  */
-function give_process_login_form( $data ) {
-	if ( wp_verify_nonce( $data['give_login_nonce'], 'give-login-nonce' ) ) {
-		$user_data = get_user_by( 'login', $data['give_user_login'] );
-		if ( ! $user_data ) {
-			$user_data = get_user_by( 'email', $data['give_user_login'] );
+function give_process_login_form($data) {
+	if (wp_verify_nonce($data['give_login_nonce'], 'give-login-nonce')) {
+		$user_data = get_user_by('login', $data['give_user_login']);
+		if ( ! $user_data) {
+			$user_data = get_user_by('email', $data['give_user_login']);
 		}
-		if ( $user_data ) {
+		if ($user_data) {
 			$user_ID    = $user_data->ID;
 			$user_email = $user_data->user_email;
-			if ( wp_check_password( $data['give_user_pass'], $user_data->user_pass, $user_data->ID ) ) {
-				give_log_user_in( $user_data->ID, $data['give_user_login'], $data['give_user_pass'] );
+			if (wp_check_password($data['give_user_pass'], $user_data->user_pass, $user_data->ID)) {
+				give_log_user_in($user_data->ID, $data['give_user_login'], $data['give_user_pass']);
 			} else {
-				give_set_error( 'password_incorrect', __( 'The password you entered is incorrect', 'give' ) );
+				give_set_error('password_incorrect', __('The password you entered is incorrect', 'give'));
 			}
 		} else {
-			give_set_error( 'username_incorrect', __( 'The username you entered does not exist', 'give' ) );
+			give_set_error('username_incorrect', __('The username you entered does not exist', 'give'));
 		}
 		// Check for errors and redirect if none present
 		$errors = give_get_errors();
-		if ( ! $errors ) {
-			$redirect = apply_filters( 'give_login_redirect', $data['give_redirect'], $user_ID );
-			wp_redirect( $redirect );
+		if ( ! $errors) {
+			$redirect = apply_filters('give_login_redirect', $data['give_redirect'], $user_ID);
+			wp_redirect($redirect);
 			give_die();
 		}
 	}
 }
 
-add_action( 'give_user_login', 'give_process_login_form' );
+add_action('give_user_login', 'give_process_login_form');
 
 /**
  * Log User In
@@ -119,15 +119,15 @@ 
  *
  * @return void
  */
-function give_log_user_in( $user_id, $user_login, $user_pass ) {
-	if ( $user_id < 1 ) {
+function give_log_user_in($user_id, $user_login, $user_pass) {
+	if ($user_id < 1) {
 		return;
 	}
 
-	wp_set_auth_cookie( $user_id );
-	wp_set_current_user( $user_id, $user_login );
-	do_action( 'wp_login', $user_login, get_userdata( $user_id ) );
-	do_action( 'give_log_user_in', $user_id, $user_login, $user_pass );
+	wp_set_auth_cookie($user_id);
+	wp_set_current_user($user_id, $user_login);
+	do_action('wp_login', $user_login, get_userdata($user_id));
+	do_action('give_log_user_in', $user_id, $user_login, $user_pass);
 }
 
 
@@ -140,70 +140,70 @@ 
  *
  * @return void
  */
-function give_process_register_form( $data ) {
+function give_process_register_form($data) {
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		return;
 	}
 
-	if ( empty( $_POST['give_register_submit'] ) ) {
+	if (empty($_POST['give_register_submit'])) {
 		return;
 	}
 
-	do_action( 'give_pre_process_register_form' );
+	do_action('give_pre_process_register_form');
 
-	if ( empty( $data['give_user_login'] ) ) {
-		give_set_error( 'empty_username', __( 'Invalid username', 'give' ) );
+	if (empty($data['give_user_login'])) {
+		give_set_error('empty_username', __('Invalid username', 'give'));
 	}
 
-	if ( username_exists( $data['give_user_login'] ) ) {
-		give_set_error( 'username_unavailable', __( 'Username already taken', 'give' ) );
+	if (username_exists($data['give_user_login'])) {
+		give_set_error('username_unavailable', __('Username already taken', 'give'));
 	}
 
-	if ( ! validate_username( $data['give_user_login'] ) ) {
-		give_set_error( 'username_invalid', __( 'Invalid username', 'give' ) );
+	if ( ! validate_username($data['give_user_login'])) {
+		give_set_error('username_invalid', __('Invalid username', 'give'));
 	}
 
-	if ( email_exists( $data['give_user_email'] ) ) {
-		give_set_error( 'email_unavailable', __( 'Email address already taken', 'give' ) );
+	if (email_exists($data['give_user_email'])) {
+		give_set_error('email_unavailable', __('Email address already taken', 'give'));
 	}
 
-	if ( empty( $data['give_user_email'] ) || ! is_email( $data['give_user_email'] ) ) {
-		give_set_error( 'email_invalid', __( 'Invalid email', 'give' ) );
+	if (empty($data['give_user_email']) || ! is_email($data['give_user_email'])) {
+		give_set_error('email_invalid', __('Invalid email', 'give'));
 	}
 
-	if ( ! empty( $data['give_payment_email'] ) && $data['give_payment_email'] != $data['give_user_email'] && ! is_email( $data['give_payment_email'] ) ) {
-		give_set_error( 'payment_email_invalid', __( 'Invalid payment email', 'give' ) );
+	if ( ! empty($data['give_payment_email']) && $data['give_payment_email'] != $data['give_user_email'] && ! is_email($data['give_payment_email'])) {
+		give_set_error('payment_email_invalid', __('Invalid payment email', 'give'));
 	}
 
-	if ( empty( $_POST['give_user_pass'] ) ) {
-		give_set_error( 'empty_password', __( 'Please enter a password', 'give' ) );
+	if (empty($_POST['give_user_pass'])) {
+		give_set_error('empty_password', __('Please enter a password', 'give'));
 	}
 
-	if ( ( ! empty( $_POST['give_user_pass'] ) && empty( $_POST['give_user_pass2'] ) ) || ( $_POST['give_user_pass'] !== $_POST['give_user_pass2'] ) ) {
-		give_set_error( 'password_mismatch', __( 'Passwords don\'t match', 'give' ) );
+	if (( ! empty($_POST['give_user_pass']) && empty($_POST['give_user_pass2'])) || ($_POST['give_user_pass'] !== $_POST['give_user_pass2'])) {
+		give_set_error('password_mismatch', __('Passwords don\'t match', 'give'));
 	}
 
-	do_action( 'give_process_register_form' );
+	do_action('give_process_register_form');
 
 	// Check for errors and redirect if none present
 	$errors = give_get_errors();
 
-	if ( empty( $errors ) ) {
+	if (empty($errors)) {
 
-		$redirect = apply_filters( 'give_register_redirect', $data['give_redirect'] );
+		$redirect = apply_filters('give_register_redirect', $data['give_redirect']);
 
-		give_register_and_login_new_user( array(
+		give_register_and_login_new_user(array(
 			'user_login'      => $data['give_user_login'],
 			'user_pass'       => $data['give_user_pass'],
 			'user_email'      => $data['give_user_email'],
-			'user_registered' => date( 'Y-m-d H:i:s' ),
-			'role'            => get_option( 'default_role' )
-		) );
+			'user_registered' => date('Y-m-d H:i:s'),
+			'role'            => get_option('default_role')
+		));
 
-		wp_redirect( $redirect );
+		wp_redirect($redirect);
 		give_die();
 	}
 }
 
-add_action( 'give_user_register', 'give_process_register_form' );
\ No newline at end of file
+add_action('give_user_register', 'give_process_register_form');
\ No newline at end of file

includes/process-purchase.php

Spacing +235 added lines, -235 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,27 +25,27 @@ 
  */
 function give_process_purchase_form() {
 
-	do_action( 'give_pre_process_purchase' );
+	do_action('give_pre_process_purchase');
 
 	// Validate the form $_POST data
 	$valid_data = give_purchase_form_validate_fields();
 
 	// Allow themes and plugins to hook to errors
-	do_action( 'give_checkout_error_checks', $valid_data, $_POST );
+	do_action('give_checkout_error_checks', $valid_data, $_POST);
 
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	// Process the login form
-	if ( isset( $_POST['give_login_submit'] ) ) {
+	if (isset($_POST['give_login_submit'])) {
 		give_process_form_login();
 	}
 
 	// Validate the user
-	$user = give_get_purchase_form_user( $valid_data );
+	$user = give_get_purchase_form_user($valid_data);
 
-	if ( false === $valid_data || give_get_errors() || ! $user ) {
-		if ( $is_ajax ) {
-			do_action( 'give_ajax_checkout_errors' );
+	if (false === $valid_data || give_get_errors() || ! $user) {
+		if ($is_ajax) {
+			do_action('give_ajax_checkout_errors');
 			give_die();
 		} else {
 			return false;
@@ -53,17 +53,17 @@ 
 	}
 
 	//If AJAX send back success to proceed with form submission
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		echo 'success';
 		give_die();
 	}
 
 	//After AJAX: Setup session if not using php_sessions
-	if ( ! Give()->session->use_php_sessions() ) {
+	if ( ! Give()->session->use_php_sessions()) {
 		//Double-check that set_cookie is publicly accessible;
 		// we're using a slightly modified class-wp-sessions.php
-		$session_reflection = new ReflectionMethod( 'WP_Session', 'set_cookie' );
-		if ( $session_reflection->isPublic() ) {
+		$session_reflection = new ReflectionMethod('WP_Session', 'set_cookie');
+		if ($session_reflection->isPublic()) {
 			// Manually set the cookie.
 			Give()->session->init()->set_cookie();
 		}
@@ -78,18 +78,18 @@ 
 		'address'    => $user['address']
 	);
 
-	$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
+	$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
 
-	$price        = isset( $_POST['give-amount'] ) ? (float) apply_filters( 'give_donation_total', give_sanitize_amount( give_format_amount( $_POST['give-amount'] ) ) ) : '0.00';
-	$purchase_key = strtolower( md5( $user['user_email'] . date( 'Y-m-d H:i:s' ) . $auth_key . uniqid( 'give', true ) ) );
+	$price        = isset($_POST['give-amount']) ? (float) apply_filters('give_donation_total', give_sanitize_amount(give_format_amount($_POST['give-amount']))) : '0.00';
+	$purchase_key = strtolower(md5($user['user_email'].date('Y-m-d H:i:s').$auth_key.uniqid('give', true)));
 
 	// Setup purchase information
 	$purchase_data = array(
 		'price'        => $price,
 		'purchase_key' => $purchase_key,
 		'user_email'   => $user['user_email'],
-		'date'         => date( 'Y-m-d H:i:s', current_time( 'timestamp' ) ),
-		'user_info'    => stripslashes_deep( $user_info ),
+		'date'         => date('Y-m-d H:i:s', current_time('timestamp')),
+		'user_info'    => stripslashes_deep($user_info),
 		'post_data'    => $_POST,
 		'gateway'      => $valid_data['gateway'],
 		'card_info'    => $valid_data['cc_info']
@@ -99,37 +99,37 @@ 
 	$valid_data['user'] = $user;
 
 	// Allow themes and plugins to hook before the gateway
-	do_action( 'give_checkout_before_gateway', $_POST, $user_info, $valid_data );
+	do_action('give_checkout_before_gateway', $_POST, $user_info, $valid_data);
 
 	//Sanity check for price
-	if ( ! $purchase_data['price'] ) {
+	if ( ! $purchase_data['price']) {
 		// Revert to manual
 		$purchase_data['gateway'] = 'manual';
 		$_POST['give-gateway']    = 'manual';
 	}
 
 	// Allow the purchase data to be modified before it is sent to the gateway
-	$purchase_data = apply_filters( 'give_purchase_data_before_gateway', $purchase_data, $valid_data );
+	$purchase_data = apply_filters('give_purchase_data_before_gateway', $purchase_data, $valid_data);
 
 	// Setup the data we're storing in the purchase session
 	$session_data = $purchase_data;
 
 	// Make sure credit card numbers are never stored in sessions
-	unset( $session_data['card_info']['card_number'] );
-	unset( $session_data['post_data']['card_number'] );
+	unset($session_data['card_info']['card_number']);
+	unset($session_data['post_data']['card_number']);
 
 	// Used for showing data to non logged-in users after purchase, and for other plugins needing purchase data.
-	give_set_purchase_session( $session_data );
+	give_set_purchase_session($session_data);
 
 	// Send info to the gateway for payment processing
-	give_send_to_gateway( $purchase_data['gateway'], $purchase_data );
+	give_send_to_gateway($purchase_data['gateway'], $purchase_data);
 	give_die();
 
 }
 
-add_action( 'give_purchase', 'give_process_purchase_form' );
-add_action( 'wp_ajax_give_process_checkout', 'give_process_purchase_form' );
-add_action( 'wp_ajax_nopriv_give_process_checkout', 'give_process_purchase_form' );
+add_action('give_purchase', 'give_process_purchase_form');
+add_action('wp_ajax_give_process_checkout', 'give_process_purchase_form');
+add_action('wp_ajax_nopriv_give_process_checkout', 'give_process_purchase_form');
 
 /**
  * Process the checkout login form
@@ -140,32 +140,32 @@ 
  */
 function give_process_form_login() {
 
-	$is_ajax = isset( $_POST['give_ajax'] );
+	$is_ajax = isset($_POST['give_ajax']);
 
 	$user_data = give_purchase_form_validate_user_login();
 
-	if ( give_get_errors() || $user_data['user_id'] < 1 ) {
-		if ( $is_ajax ) {
-			do_action( 'give_ajax_checkout_errors' );
+	if (give_get_errors() || $user_data['user_id'] < 1) {
+		if ($is_ajax) {
+			do_action('give_ajax_checkout_errors');
 			give_die();
 		} else {
-			wp_redirect( $_SERVER['HTTP_REFERER'] );
+			wp_redirect($_SERVER['HTTP_REFERER']);
 			exit;
 		}
 	}
 
-	give_log_user_in( $user_data['user_id'], $user_data['user_login'], $user_data['user_pass'] );
+	give_log_user_in($user_data['user_id'], $user_data['user_login'], $user_data['user_pass']);
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		echo 'success';
 		give_die();
 	} else {
-		wp_redirect( $_SERVER['HTTP_REFERER'] );
+		wp_redirect($_SERVER['HTTP_REFERER']);
 	}
 }
 
-add_action( 'wp_ajax_give_process_checkout_login', 'give_process_form_login' );
-add_action( 'wp_ajax_nopriv_give_process_checkout_login', 'give_process_form_login' );
+add_action('wp_ajax_give_process_checkout_login', 'give_process_form_login');
+add_action('wp_ajax_nopriv_give_process_checkout_login', 'give_process_form_login');
 
 /**
  * Purchase Form Validate Fields
@@ -177,45 +177,45 @@ 
 function give_purchase_form_validate_fields() {
 
 	// Check if there is $_POST
-	if ( empty( $_POST ) ) {
+	if (empty($_POST)) {
 		return false;
 	}
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an array to collect valid data
 	$valid_data = array(
 		'gateway'          => give_purchase_form_validate_gateway(), // Gateway fallback (amount is validated here)
-		'need_new_user'    => false,     // New user flag
-		'need_user_login'  => false,     // Login user flag
-		'logged_user_data' => array(),   // Logged user collected data
-		'new_user_data'    => array(),   // New user collected data
-		'login_user_data'  => array(),   // Login user collected data
-		'guest_user_data'  => array(),   // Guest user collected data
+		'need_new_user'    => false, // New user flag
+		'need_user_login'  => false, // Login user flag
+		'logged_user_data' => array(), // Logged user collected data
+		'new_user_data'    => array(), // New user collected data
+		'login_user_data'  => array(), // Login user collected data
+		'guest_user_data'  => array(), // Guest user collected data
 		'cc_info'          => give_purchase_form_validate_cc()    // Credit card info
 	);
 
 	//Validate Honeypot First
-	if ( ! empty( $_POST['give-honeypot'] ) ) {
-		give_set_error( 'invalid_honeypot', __( 'Honeypot field detected. Go away bad bot!', 'give' ) );
+	if ( ! empty($_POST['give-honeypot'])) {
+		give_set_error('invalid_honeypot', __('Honeypot field detected. Go away bad bot!', 'give'));
 	}
 
 	// Validate agree to terms
-	$terms_option = get_post_meta( $form_id, '_give_terms_option', true );
-	if ( isset( $terms_option ) && $terms_option === 'yes' ) {
+	$terms_option = get_post_meta($form_id, '_give_terms_option', true);
+	if (isset($terms_option) && $terms_option === 'yes') {
 		give_purchase_form_validate_agree_to_terms();
 	}
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		// Collect logged in user data
 		$valid_data['logged_in_user'] = give_purchase_form_validate_logged_in_user();
-	} else if ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-register' ) {
+	} else if (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-register') {
 		// Set new user registration as required
 		$valid_data['need_new_user'] = true;
 		// Validate new user data
 		$valid_data['new_user_data'] = give_purchase_form_validate_new_user();
 		// Check if login validation is needed
-	} else if ( isset( $_POST['give-purchase-var'] ) && $_POST['give-purchase-var'] == 'needs-to-login' ) {
+	} else if (isset($_POST['give-purchase-var']) && $_POST['give-purchase-var'] == 'needs-to-login') {
 		// Set user login as required
 		$valid_data['need_user_login'] = true;
 		// Validate users login info
@@ -240,37 +240,37 @@ 
  */
 function give_purchase_form_validate_gateway() {
 
-	$form_id = isset( $_REQUEST['give-form-id'] ) ? $_REQUEST['give-form-id'] : 0;
-	$amount  = isset( $_REQUEST['give-amount'] ) ? give_sanitize_amount( $_REQUEST['give-amount'] ) : 0;
-	$gateway = give_get_default_gateway( $form_id );
+	$form_id = isset($_REQUEST['give-form-id']) ? $_REQUEST['give-form-id'] : 0;
+	$amount  = isset($_REQUEST['give-amount']) ? give_sanitize_amount($_REQUEST['give-amount']) : 0;
+	$gateway = give_get_default_gateway($form_id);
 
 	// Check if a gateway value is present
-	if ( ! empty( $_REQUEST['give-gateway'] ) ) {
+	if ( ! empty($_REQUEST['give-gateway'])) {
 
-		$gateway = sanitize_text_field( $_REQUEST['give-gateway'] );
+		$gateway = sanitize_text_field($_REQUEST['give-gateway']);
 
 		//Is amount being donated in LIVE mode 0.00? If so, error:
-		if ( $amount == 0 && ! give_is_test_mode() ) {
+		if ($amount == 0 && ! give_is_test_mode()) {
 
-			give_set_error( 'invalid_donation_amount', __( 'Please insert a valid donation amount.', 'give' ) );
+			give_set_error('invalid_donation_amount', __('Please insert a valid donation amount.', 'give'));
 
 		} //Check for a minimum custom amount
-		elseif ( ! give_verify_minimum_price() ) {
+		elseif ( ! give_verify_minimum_price()) {
 
-			$minimum       = give_currency_filter( give_format_amount( give_get_form_minimum_price( $form_id ) ) );
-			$error_message = __( 'This form has a minimum donation amount of %s', 'give' );
+			$minimum       = give_currency_filter(give_format_amount(give_get_form_minimum_price($form_id)));
+			$error_message = __('This form has a minimum donation amount of %s', 'give');
 
-			give_set_error( 'invalid_donation_minimum', sprintf( $error_message, $minimum ) );
+			give_set_error('invalid_donation_minimum', sprintf($error_message, $minimum));
 
 		} //Is this test mode zero donation? Let it through but set to manual gateway
-		elseif ( $amount == 0 && give_is_test_mode() ) {
+		elseif ($amount == 0 && give_is_test_mode()) {
 
 			$gateway = 'manual';
 
 		} //Check if this gateway is active
-		elseif ( ! give_is_gateway_active( $gateway ) ) {
+		elseif ( ! give_is_gateway_active($gateway)) {
 
-			give_set_error( 'invalid_gateway', __( 'The selected payment gateway is not enabled', 'give' ) );
+			give_set_error('invalid_gateway', __('The selected payment gateway is not enabled', 'give'));
 
 		}
 
@@ -289,23 +289,23 @@ 
  */
 function give_verify_minimum_price() {
 
-	$amount          = give_sanitize_amount( $_REQUEST['give-amount'] );
-	$form_id         = isset( $_REQUEST['give-form-id'] ) ? $_REQUEST['give-form-id'] : 0;
-	$price_id        = isset( $_REQUEST['give-price-id'] ) ? $_REQUEST['give-price-id'] : 0;
-	$variable_prices = give_has_variable_prices( $form_id );
+	$amount          = give_sanitize_amount($_REQUEST['give-amount']);
+	$form_id         = isset($_REQUEST['give-form-id']) ? $_REQUEST['give-form-id'] : 0;
+	$price_id        = isset($_REQUEST['give-price-id']) ? $_REQUEST['give-price-id'] : 0;
+	$variable_prices = give_has_variable_prices($form_id);
 
-	if ( $variable_prices && ! empty( $price_id ) ) {
+	if ($variable_prices && ! empty($price_id)) {
 
-		$price_level_amount = give_get_price_option_amount( $form_id, $price_id );
+		$price_level_amount = give_get_price_option_amount($form_id, $price_id);
 
-		if ( $price_level_amount == $amount ) {
+		if ($price_level_amount == $amount) {
 			return true;
 		}
 	}
 
-	$minimum = give_get_form_minimum_price( $form_id );
+	$minimum = give_get_form_minimum_price($form_id);
 
-	if ( $minimum > $amount ) {
+	if ($minimum > $amount) {
 		return false;
 	}
 
@@ -321,9 +321,9 @@ 
  */
 function give_purchase_form_validate_agree_to_terms() {
 	// Validate agree to terms
-	if ( ! isset( $_POST['give_agree_to_terms'] ) || $_POST['give_agree_to_terms'] != 1 ) {
+	if ( ! isset($_POST['give_agree_to_terms']) || $_POST['give_agree_to_terms'] != 1) {
 		// User did not agree
-		give_set_error( 'agree_to_terms', apply_filters( 'give_agree_to_terms_text', __( 'You must agree to the terms of use', 'give' ) ) );
+		give_set_error('agree_to_terms', apply_filters('give_agree_to_terms_text', __('You must agree to the terms of use', 'give')));
 	}
 }
 
@@ -337,47 +337,47 @@ 
  *
  * @return      array
  */
-function give_purchase_form_required_fields( $form_id ) {
+function give_purchase_form_required_fields($form_id) {
 
-	$payment_mode = give_get_chosen_gateway( $form_id );
+	$payment_mode = give_get_chosen_gateway($form_id);
 
 	$required_fields = array(
 		'give_email' => array(
 			'error_id'      => 'invalid_email',
-			'error_message' => __( 'Please enter a valid email address.', 'give' )
+			'error_message' => __('Please enter a valid email address.', 'give')
 		),
 		'give_first' => array(
 			'error_id'      => 'invalid_first_name',
-			'error_message' => __( 'Please enter your first name.', 'give' )
+			'error_message' => __('Please enter your first name.', 'give')
 		)
 	);
 
-	$require_address = give_require_billing_address( $payment_mode );
+	$require_address = give_require_billing_address($payment_mode);
 
-	if ( $require_address ) {
-		$required_fields['card_address']    = array(
+	if ($require_address) {
+		$required_fields['card_address'] = array(
 			'error_id'      => 'invalid_card_address',
-			'error_message' => __( 'Please enter your primary billing address.', 'give' )
+			'error_message' => __('Please enter your primary billing address.', 'give')
 		);
-		$required_fields['card_zip']        = array(
+		$required_fields['card_zip'] = array(
 			'error_id'      => 'invalid_zip_code',
-			'error_message' => __( 'Please enter your zip / postal code.', 'give' )
+			'error_message' => __('Please enter your zip / postal code.', 'give')
 		);
-		$required_fields['card_city']       = array(
+		$required_fields['card_city'] = array(
 			'error_id'      => 'invalid_city',
-			'error_message' => __( 'Please enter your billing city.', 'give' )
+			'error_message' => __('Please enter your billing city.', 'give')
 		);
 		$required_fields['billing_country'] = array(
 			'error_id'      => 'invalid_country',
-			'error_message' => __( 'Please select your billing country.', 'give' )
+			'error_message' => __('Please select your billing country.', 'give')
 		);
-		$required_fields['card_state']      = array(
+		$required_fields['card_state'] = array(
 			'error_id'      => 'invalid_state',
-			'error_message' => __( 'Please enter billing state / province.', 'give' )
+			'error_message' => __('Please enter billing state / province.', 'give')
 		);
 	}
 
-	return apply_filters( 'give_purchase_form_required_fields', $required_fields, $form_id );
+	return apply_filters('give_purchase_form_required_fields', $required_fields, $form_id);
 
 }
 
@@ -390,16 +390,16 @@ 
  *
  * @return mixed|void
  */
-function give_require_billing_address( $payment_mode ) {
+function give_require_billing_address($payment_mode) {
 
 	$return = false;
 
-	if ( isset( $_POST['billing_country'] ) || did_action( "give_{$payment_mode}_cc_form" ) || did_action( 'give_cc_form' ) ) {
+	if (isset($_POST['billing_country']) || did_action("give_{$payment_mode}_cc_form") || did_action('give_cc_form')) {
 		$return = true;
 	}
 
 	// Let payment gateways and other extensions determine if address fields should be required
-	return apply_filters( 'give_require_billing_address', $return );
+	return apply_filters('give_require_billing_address', $return);
 
 }
 
@@ -413,43 +413,43 @@ 
 function give_purchase_form_validate_logged_in_user() {
 	global $user_ID;
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start empty array to collect valid user data
 	$valid_user_data = array(
 		// Assume there will be errors
-		'user_id' => - 1
+		'user_id' => -1
 	);
 
 	// Verify there is a user_ID
-	if ( $user_ID > 0 ) {
+	if ($user_ID > 0) {
 		// Get the logged in user data
-		$user_data = get_userdata( $user_ID );
+		$user_data = get_userdata($user_ID);
 
 		// Loop through required fields and show error messages
-		foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-			if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-				give_set_error( $value['error_id'], $value['error_message'] );
+		foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+			if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+				give_set_error($value['error_id'], $value['error_message']);
 			}
 		}
 
 		// Verify data
-		if ( $user_data ) {
+		if ($user_data) {
 			// Collected logged in user data
 			$valid_user_data = array(
 				'user_id'    => $user_ID,
-				'user_email' => isset( $_POST['give_email'] ) ? sanitize_email( $_POST['give_email'] ) : $user_data->user_email,
-				'user_first' => isset( $_POST['give_first'] ) && ! empty( $_POST['give_first'] ) ? sanitize_text_field( $_POST['give_first'] ) : $user_data->first_name,
-				'user_last'  => isset( $_POST['give_last'] ) && ! empty( $_POST['give_last'] ) ? sanitize_text_field( $_POST['give_last'] ) : $user_data->last_name,
+				'user_email' => isset($_POST['give_email']) ? sanitize_email($_POST['give_email']) : $user_data->user_email,
+				'user_first' => isset($_POST['give_first']) && ! empty($_POST['give_first']) ? sanitize_text_field($_POST['give_first']) : $user_data->first_name,
+				'user_last'  => isset($_POST['give_last']) && ! empty($_POST['give_last']) ? sanitize_text_field($_POST['give_last']) : $user_data->last_name,
 			);
 
-			if ( ! is_email( $valid_user_data['user_email'] ) ) {
-				give_set_error( 'email_invalid', __( 'Invalid email', 'give' ) );
+			if ( ! is_email($valid_user_data['user_email'])) {
+				give_set_error('email_invalid', __('Invalid email', 'give'));
 			}
 
 		} else {
 			// Set invalid user error
-			give_set_error( 'invalid_user', __( 'The user information is invalid', 'give' ) );
+			give_set_error('invalid_user', __('The user information is invalid', 'give'));
 		}
 	}
 
@@ -467,90 +467,90 @@ 
 function give_purchase_form_validate_new_user() {
 
 	$registering_new_user = false;
-	$form_id              = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id              = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an empty array to collect valid user data
 	$valid_user_data = array(
 		// Assume there will be errors
-		'user_id'    => - 1,
+		'user_id'    => -1,
 		// Get first name
-		'user_first' => isset( $_POST['give_first'] ) ? sanitize_text_field( $_POST['give_first'] ) : '',
+		'user_first' => isset($_POST['give_first']) ? sanitize_text_field($_POST['give_first']) : '',
 		// Get last name
-		'user_last'  => isset( $_POST['give_last'] ) ? sanitize_text_field( $_POST['give_last'] ) : '',
+		'user_last'  => isset($_POST['give_last']) ? sanitize_text_field($_POST['give_last']) : '',
 	);
 
 	// Check the new user's credentials against existing ones
-	$user_login   = isset( $_POST['give_user_login'] ) ? trim( $_POST['give_user_login'] ) : false;
-	$user_email   = isset( $_POST['give_email'] ) ? trim( $_POST['give_email'] ) : false;
-	$user_pass    = isset( $_POST['give_user_pass'] ) ? trim( $_POST['give_user_pass'] ) : false;
-	$pass_confirm = isset( $_POST['give_user_pass_confirm'] ) ? trim( $_POST['give_user_pass_confirm'] ) : false;
+	$user_login   = isset($_POST['give_user_login']) ? trim($_POST['give_user_login']) : false;
+	$user_email   = isset($_POST['give_email']) ? trim($_POST['give_email']) : false;
+	$user_pass    = isset($_POST['give_user_pass']) ? trim($_POST['give_user_pass']) : false;
+	$pass_confirm = isset($_POST['give_user_pass_confirm']) ? trim($_POST['give_user_pass_confirm']) : false;
 
 	// Loop through required fields and show error messages
-	foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+			give_set_error($value['error_id'], $value['error_message']);
 		}
 	}
 
 	// Check if we have an username to register
-	if ( $user_login && strlen( $user_login ) > 0 ) {
+	if ($user_login && strlen($user_login) > 0) {
 		$registering_new_user = true;
 
 		// We have an user name, check if it already exists
-		if ( username_exists( $user_login ) ) {
+		if (username_exists($user_login)) {
 			// Username already registered
-			give_set_error( 'username_unavailable', __( 'Username already taken', 'give' ) );
+			give_set_error('username_unavailable', __('Username already taken', 'give'));
 			// Check if it's valid
-		} else if ( ! give_validate_username( $user_login ) ) {
+		} else if ( ! give_validate_username($user_login)) {
 			// Invalid username
-			if ( is_multisite() ) {
-				give_set_error( 'username_invalid', __( 'Invalid username. Only lowercase letters (a-z) and numbers are allowed', 'give' ) );
+			if (is_multisite()) {
+				give_set_error('username_invalid', __('Invalid username. Only lowercase letters (a-z) and numbers are allowed', 'give'));
 			} else {
-				give_set_error( 'username_invalid', __( 'Invalid username', 'give' ) );
+				give_set_error('username_invalid', __('Invalid username', 'give'));
 			}
 		} else {
 			// All the checks have run and it's good to go
 			$valid_user_data['user_login'] = $user_login;
 		}
-	} elseif ( give_logged_in_only( $form_id ) ) {
-		give_set_error( 'registration_required', esc_html__( 'You must register or login to complete your donation', 'give' ) );
+	} elseif (give_logged_in_only($form_id)) {
+		give_set_error('registration_required', esc_html__('You must register or login to complete your donation', 'give'));
 	}
 
 	// Check if we have an email to verify
-	if ( $user_email && strlen( $user_email ) > 0 ) {
+	if ($user_email && strlen($user_email) > 0) {
 		// Validate email
-		if ( ! is_email( $user_email ) ) {
-			give_set_error( 'email_invalid', __( 'Sorry, that email is invalid', 'give' ) );
+		if ( ! is_email($user_email)) {
+			give_set_error('email_invalid', __('Sorry, that email is invalid', 'give'));
 			// Check if email exists
-		} else if ( email_exists( $user_email ) && $registering_new_user ) {
-			give_set_error( 'email_used', __( 'Sorry, that email already active for another user', 'give' ) );
+		} else if (email_exists($user_email) && $registering_new_user) {
+			give_set_error('email_used', __('Sorry, that email already active for another user', 'give'));
 		} else {
 			// All the checks have run and it's good to go
 			$valid_user_data['user_email'] = $user_email;
 		}
 	} else {
 		// No email
-		give_set_error( 'email_empty', __( 'Enter an email', 'give' ) );
+		give_set_error('email_empty', __('Enter an email', 'give'));
 	}
 
 	// Check password
-	if ( $user_pass && $pass_confirm ) {
+	if ($user_pass && $pass_confirm) {
 		// Verify confirmation matches
-		if ( $user_pass != $pass_confirm ) {
+		if ($user_pass != $pass_confirm) {
 			// Passwords do not match
-			give_set_error( 'password_mismatch', __( 'Passwords don\'t match', 'give' ) );
+			give_set_error('password_mismatch', __('Passwords don\'t match', 'give'));
 		} else {
 			// All is good to go
 			$valid_user_data['user_pass'] = $user_pass;
 		}
 	} else {
 		// Password or confirmation missing
-		if ( ! $user_pass && $registering_new_user ) {
+		if ( ! $user_pass && $registering_new_user) {
 			// The password is invalid
-			give_set_error( 'password_empty', __( 'Enter a password', 'give' ) );
-		} else if ( ! $pass_confirm && $registering_new_user ) {
+			give_set_error('password_empty', __('Enter a password', 'give'));
+		} else if ( ! $pass_confirm && $registering_new_user) {
 			// Confirmation password is invalid
-			give_set_error( 'confirmation_empty', __( 'Enter the password confirmation', 'give' ) );
+			give_set_error('confirmation_empty', __('Enter the password confirmation', 'give'));
 		}
 	}
 
@@ -569,36 +569,36 @@ 
 	// Start an array to collect valid user data
 	$valid_user_data = array(
 		// Assume there will be errors
-		'user_id' => - 1
+		'user_id' => -1
 	);
 
 	// Username
-	if ( ! isset( $_POST['give_user_login'] ) || $_POST['give_user_login'] == '' ) {
-		give_set_error( 'must_log_in', __( 'You must login or register to complete your donation', 'give' ) );
+	if ( ! isset($_POST['give_user_login']) || $_POST['give_user_login'] == '') {
+		give_set_error('must_log_in', __('You must login or register to complete your donation', 'give'));
 
 		return $valid_user_data;
 	}
 
 	// Get the user by login
-	$user_data = get_user_by( 'login', strip_tags( $_POST['give_user_login'] ) );
+	$user_data = get_user_by('login', strip_tags($_POST['give_user_login']));
 
 	// Check if user exists
-	if ( $user_data ) {
+	if ($user_data) {
 		// Get password
-		$user_pass = isset( $_POST['give_user_pass'] ) ? $_POST['give_user_pass'] : false;
+		$user_pass = isset($_POST['give_user_pass']) ? $_POST['give_user_pass'] : false;
 
 		// Check user_pass
-		if ( $user_pass ) {
+		if ($user_pass) {
 			// Check if password is valid
-			if ( ! wp_check_password( $user_pass, $user_data->user_pass, $user_data->ID ) ) {
+			if ( ! wp_check_password($user_pass, $user_data->user_pass, $user_data->ID)) {
 				// Incorrect password
 				give_set_error(
 					'password_incorrect',
 					sprintf(
 						'%1$s <a href="%2$s">%3$s</a>',
-						__( 'The password you entered is incorrect.', 'give' ),
-						wp_lostpassword_url( "http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]" ),
-						__( 'Reset Password', 'give' )
+						__('The password you entered is incorrect.', 'give'),
+						wp_lostpassword_url("http://$_SERVER[HTTP_HOST]$_SERVER[REQUEST_URI]"),
+						__('Reset Password', 'give')
 					)
 				);
 				// All is correct
@@ -615,11 +615,11 @@ 
 			}
 		} else {
 			// Empty password
-			give_set_error( 'password_empty', __( 'Enter a password', 'give' ) );
+			give_set_error('password_empty', __('Enter a password', 'give'));
 		}
 	} else {
 		// no username
-		give_set_error( 'username_incorrect', __( 'The username you entered does not exist', 'give' ) );
+		give_set_error('username_incorrect', __('The username you entered does not exist', 'give'));
 	}
 
 	return $valid_user_data;
@@ -634,7 +634,7 @@ 
  */
 function give_purchase_form_validate_guest_user() {
 
-	$form_id = isset( $_POST['give-form-id'] ) ? $_POST['give-form-id'] : '';
+	$form_id = isset($_POST['give-form-id']) ? $_POST['give-form-id'] : '';
 
 	// Start an array to collect valid user data
 	$valid_user_data = array(
@@ -643,32 +643,32 @@ 
 	);
 
 	// Show error message if user must be logged in
-	if ( give_logged_in_only( $form_id ) ) {
-		give_set_error( 'logged_in_only', __( 'You must be logged into to donate', 'give' ) );
+	if (give_logged_in_only($form_id)) {
+		give_set_error('logged_in_only', __('You must be logged into to donate', 'give'));
 	}
 
 	// Get the guest email
-	$guest_email = isset( $_POST['give_email'] ) ? $_POST['give_email'] : false;
+	$guest_email = isset($_POST['give_email']) ? $_POST['give_email'] : false;
 
 	// Check email
-	if ( $guest_email && strlen( $guest_email ) > 0 ) {
+	if ($guest_email && strlen($guest_email) > 0) {
 		// Validate email
-		if ( ! is_email( $guest_email ) ) {
+		if ( ! is_email($guest_email)) {
 			// Invalid email
-			give_set_error( 'email_invalid', __( 'Invalid email', 'give' ) );
+			give_set_error('email_invalid', __('Invalid email', 'give'));
 		} else {
 			// All is good to go
 			$valid_user_data['user_email'] = $guest_email;
 		}
 	} else {
 		// No email
-		give_set_error( 'email_empty', __( 'Enter an email', 'give' ) );
+		give_set_error('email_empty', __('Enter an email', 'give'));
 	}
 
 	// Loop through required fields and show error messages
-	foreach ( give_purchase_form_required_fields( $form_id ) as $field_name => $value ) {
-		if ( in_array( $value, give_purchase_form_required_fields( $form_id ) ) && empty( $_POST[ $field_name ] ) ) {
-			give_set_error( $value['error_id'], $value['error_message'] );
+	foreach (give_purchase_form_required_fields($form_id) as $field_name => $value) {
+		if (in_array($value, give_purchase_form_required_fields($form_id)) && empty($_POST[$field_name])) {
+			give_set_error($value['error_id'], $value['error_message']);
 		}
 	}
 
@@ -684,42 +684,42 @@ 
  * @since   1.0
  * @return  integer
  */
-function give_register_and_login_new_user( $user_data = array() ) {
+function give_register_and_login_new_user($user_data = array()) {
 	// Verify the array
-	if ( empty( $user_data ) ) {
-		return - 1;
+	if (empty($user_data)) {
+		return -1;
 	}
 
-	if ( give_get_errors() ) {
-		return - 1;
+	if (give_get_errors()) {
+		return -1;
 	}
 
-	$user_args = apply_filters( 'give_insert_user_args', array(
-		'user_login'      => isset( $user_data['user_login'] ) ? $user_data['user_login'] : '',
-		'user_pass'       => isset( $user_data['user_pass'] ) ? $user_data['user_pass'] : '',
-		'user_email'      => isset( $user_data['user_email'] ) ? $user_data['user_email'] : '',
-		'first_name'      => isset( $user_data['user_first'] ) ? $user_data['user_first'] : '',
-		'last_name'       => isset( $user_data['user_last'] ) ? $user_data['user_last'] : '',
-		'user_registered' => date( 'Y-m-d H:i:s' ),
-		'role'            => get_option( 'default_role' )
-	), $user_data );
+	$user_args = apply_filters('give_insert_user_args', array(
+		'user_login'      => isset($user_data['user_login']) ? $user_data['user_login'] : '',
+		'user_pass'       => isset($user_data['user_pass']) ? $user_data['user_pass'] : '',
+		'user_email'      => isset($user_data['user_email']) ? $user_data['user_email'] : '',
+		'first_name'      => isset($user_data['user_first']) ? $user_data['user_first'] : '',
+		'last_name'       => isset($user_data['user_last']) ? $user_data['user_last'] : '',
+		'user_registered' => date('Y-m-d H:i:s'),
+		'role'            => get_option('default_role')
+	), $user_data);
 
 	// Insert new user
-	$user_id = wp_insert_user( $user_args );
+	$user_id = wp_insert_user($user_args);
 
 	// Validate inserted user
-	if ( is_wp_error( $user_id ) ) {
-		return - 1;
+	if (is_wp_error($user_id)) {
+		return -1;
 	}
 
 	// Allow themes and plugins to filter the user data
-	$user_data = apply_filters( 'give_insert_user_data', $user_data, $user_args );
+	$user_data = apply_filters('give_insert_user_data', $user_data, $user_args);
 
 	// Allow themes and plugins to hook
-	do_action( 'give_insert_user', $user_id, $user_data );
+	do_action('give_insert_user', $user_id, $user_data);
 
 	// Login new user
-	give_log_user_in( $user_id, $user_data['user_login'], $user_data['user_pass'] );
+	give_log_user_in($user_id, $user_data['user_login'], $user_data['user_pass']);
 
 	// Return user id
 	return $user_id;
@@ -734,27 +734,27 @@ 
  * @since   1.0
  * @return  array
  */
-function give_get_purchase_form_user( $valid_data = array() ) {
+function give_get_purchase_form_user($valid_data = array()) {
 
 	// Initialize user
 	$user    = false;
-	$is_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
+	$is_ajax = defined('DOING_AJAX') && DOING_AJAX;
 
-	if ( $is_ajax ) {
+	if ($is_ajax) {
 		// Do not create or login the user during the ajax submission (check for errors only)
 		return true;
-	} else if ( is_user_logged_in() ) {
+	} else if (is_user_logged_in()) {
 		// Set the valid user as the logged in collected data
 		$user = $valid_data['logged_in_user'];
-	} else if ( $valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true ) {
+	} else if ($valid_data['need_new_user'] === true || $valid_data['need_user_login'] === true) {
 		// New user registration
-		if ( $valid_data['need_new_user'] === true ) {
+		if ($valid_data['need_new_user'] === true) {
 			// Set user
 			$user = $valid_data['new_user_data'];
 			// Register and login new user
-			$user['user_id'] = give_register_and_login_new_user( $user );
+			$user['user_id'] = give_register_and_login_new_user($user);
 			// User login
-		} else if ( $valid_data['need_user_login'] === true && ! $is_ajax ) {
+		} else if ($valid_data['need_user_login'] === true && ! $is_ajax) {
 
 			/*
 			 * The login form is now processed in the give_process_purchase_login() function.
@@ -769,48 +769,48 @@ 
 			// Set user
 			$user = $valid_data['login_user_data'];
 			// Login user
-			give_log_user_in( $user['user_id'], $user['user_login'], $user['user_pass'] );
+			give_log_user_in($user['user_id'], $user['user_login'], $user['user_pass']);
 		}
 	}
 
 	// Check guest checkout
-	if ( false === $user && false === give_logged_in_only( $_POST['give-form-id'] ) ) {
+	if (false === $user && false === give_logged_in_only($_POST['give-form-id'])) {
 		// Set user
 		$user = $valid_data['guest_user_data'];
 	}
 
 	// Verify we have an user
-	if ( false === $user || empty( $user ) ) {
+	if (false === $user || empty($user)) {
 		// Return false
 		return false;
 	}
 
 	// Get user first name
-	if ( ! isset( $user['user_first'] ) || strlen( trim( $user['user_first'] ) ) < 1 ) {
-		$user['user_first'] = isset( $_POST['give_first'] ) ? strip_tags( trim( $_POST['give_first'] ) ) : '';
+	if ( ! isset($user['user_first']) || strlen(trim($user['user_first'])) < 1) {
+		$user['user_first'] = isset($_POST['give_first']) ? strip_tags(trim($_POST['give_first'])) : '';
 	}
 
 	// Get user last name
-	if ( ! isset( $user['user_last'] ) || strlen( trim( $user['user_last'] ) ) < 1 ) {
-		$user['user_last'] = isset( $_POST['give_last'] ) ? strip_tags( trim( $_POST['give_last'] ) ) : '';
+	if ( ! isset($user['user_last']) || strlen(trim($user['user_last'])) < 1) {
+		$user['user_last'] = isset($_POST['give_last']) ? strip_tags(trim($_POST['give_last'])) : '';
 	}
 
 	// Get the user's billing address details
 	$user['address']            = array();
-	$user['address']['line1']   = ! empty( $_POST['card_address'] ) ? sanitize_text_field( $_POST['card_address'] ) : false;
-	$user['address']['line2']   = ! empty( $_POST['card_address_2'] ) ? sanitize_text_field( $_POST['card_address_2'] ) : false;
-	$user['address']['city']    = ! empty( $_POST['card_city'] ) ? sanitize_text_field( $_POST['card_city'] ) : false;
-	$user['address']['state']   = ! empty( $_POST['card_state'] ) ? sanitize_text_field( $_POST['card_state'] ) : false;
-	$user['address']['country'] = ! empty( $_POST['billing_country'] ) ? sanitize_text_field( $_POST['billing_country'] ) : false;
-	$user['address']['zip']     = ! empty( $_POST['card_zip'] ) ? sanitize_text_field( $_POST['card_zip'] ) : false;
-
-	if ( empty( $user['address']['country'] ) ) {
+	$user['address']['line1']   = ! empty($_POST['card_address']) ? sanitize_text_field($_POST['card_address']) : false;
+	$user['address']['line2']   = ! empty($_POST['card_address_2']) ? sanitize_text_field($_POST['card_address_2']) : false;
+	$user['address']['city']    = ! empty($_POST['card_city']) ? sanitize_text_field($_POST['card_city']) : false;
+	$user['address']['state']   = ! empty($_POST['card_state']) ? sanitize_text_field($_POST['card_state']) : false;
+	$user['address']['country'] = ! empty($_POST['billing_country']) ? sanitize_text_field($_POST['billing_country']) : false;
+	$user['address']['zip']     = ! empty($_POST['card_zip']) ? sanitize_text_field($_POST['card_zip']) : false;
+
+	if (empty($user['address']['country'])) {
 		$user['address'] = false;
 	} // Country will always be set if address fields are present
 
-	if ( ! empty( $user['user_id'] ) && $user['user_id'] > 0 && ! empty( $user['address'] ) ) {
+	if ( ! empty($user['user_id']) && $user['user_id'] > 0 && ! empty($user['address'])) {
 		// Store the address in the user's meta so the donation form can be pre-populated with it on return purchases
-		update_user_meta( $user['user_id'], '_give_user_address', $user['address'] );
+		update_user_meta($user['user_id'], '_give_user_address', $user['address']);
 	}
 
 	// Return valid user
@@ -829,16 +829,16 @@ 
 	$card_data = give_get_purchase_cc_info();
 
 	// Validate the card zip
-	if ( ! empty( $card_data['card_zip'] ) ) {
-		if ( ! give_purchase_form_validate_cc_zip( $card_data['card_zip'], $card_data['card_country'] ) ) {
-			give_set_error( 'invalid_cc_zip', __( 'The zip / postal code you entered for your billing address is invalid', 'give' ) );
+	if ( ! empty($card_data['card_zip'])) {
+		if ( ! give_purchase_form_validate_cc_zip($card_data['card_zip'], $card_data['card_country'])) {
+			give_set_error('invalid_cc_zip', __('The zip / postal code you entered for your billing address is invalid', 'give'));
 		}
 	}
 
 	//Ensure no spaces
-	if ( ! empty( $card_data['card_number'] ) ) {
-		$card_data['card_number'] = str_replace( '+', '', $card_data['card_number'] ); //no "+" signs
-		$card_data['card_number'] = str_replace( ' ', '', $card_data['card_number'] ); // No spaces
+	if ( ! empty($card_data['card_number'])) {
+		$card_data['card_number'] = str_replace('+', '', $card_data['card_number']); //no "+" signs
+		$card_data['card_number'] = str_replace(' ', '', $card_data['card_number']); // No spaces
 	}
 
 	// This should validate card numbers at some point too
@@ -854,17 +854,17 @@ 
  */
 function give_get_purchase_cc_info() {
 	$cc_info                   = array();
-	$cc_info['card_name']      = isset( $_POST['card_name'] ) ? sanitize_text_field( $_POST['card_name'] ) : '';
-	$cc_info['card_number']    = isset( $_POST['card_number'] ) ? sanitize_text_field( $_POST['card_number'] ) : '';
-	$cc_info['card_cvc']       = isset( $_POST['card_cvc'] ) ? sanitize_text_field( $_POST['card_cvc'] ) : '';
-	$cc_info['card_exp_month'] = isset( $_POST['card_exp_month'] ) ? sanitize_text_field( $_POST['card_exp_month'] ) : '';
-	$cc_info['card_exp_year']  = isset( $_POST['card_exp_year'] ) ? sanitize_text_field( $_POST['card_exp_year'] ) : '';
-	$cc_info['card_address']   = isset( $_POST['card_address'] ) ? sanitize_text_field( $_POST['card_address'] ) : '';
-	$cc_info['card_address_2'] = isset( $_POST['card_address_2'] ) ? sanitize_text_field( $_POST['card_address_2'] ) : '';
-	$cc_info['card_city']      = isset( $_POST['card_city'] ) ? sanitize_text_field( $_POST['card_city'] ) : '';
-	$cc_info['card_state']     = isset( $_POST['card_state'] ) ? sanitize_text_field( $_POST['card_state'] ) : '';
-	$cc_info['card_country']   = isset( $_POST['billing_country'] ) ? sanitize_text_field( $_POST['billing_country'] ) : '';
-	$cc_info['card_zip']       = isset( $_POST['card_zip'] ) ? sanitize_text_field( $_POST['card_zip'] ) : '';
+	$cc_info['card_name']      = isset($_POST['card_name']) ? sanitize_text_field($_POST['card_name']) : '';
+	$cc_info['card_number']    = isset($_POST['card_number']) ? sanitize_text_field($_POST['card_number']) : '';
+	$cc_info['card_cvc']       = isset($_POST['card_cvc']) ? sanitize_text_field($_POST['card_cvc']) : '';
+	$cc_info['card_exp_month'] = isset($_POST['card_exp_month']) ? sanitize_text_field($_POST['card_exp_month']) : '';
+	$cc_info['card_exp_year']  = isset($_POST['card_exp_year']) ? sanitize_text_field($_POST['card_exp_year']) : '';
+	$cc_info['card_address']   = isset($_POST['card_address']) ? sanitize_text_field($_POST['card_address']) : '';
+	$cc_info['card_address_2'] = isset($_POST['card_address_2']) ? sanitize_text_field($_POST['card_address_2']) : '';
+	$cc_info['card_city']      = isset($_POST['card_city']) ? sanitize_text_field($_POST['card_city']) : '';
+	$cc_info['card_state']     = isset($_POST['card_state']) ? sanitize_text_field($_POST['card_state']) : '';
+	$cc_info['card_country']   = isset($_POST['billing_country']) ? sanitize_text_field($_POST['billing_country']) : '';
+	$cc_info['card_zip']       = isset($_POST['card_zip']) ? sanitize_text_field($_POST['card_zip']) : '';
 
 	// Return cc info
 	return $cc_info;
@@ -880,14 +880,14 @@ 
  *
  * @return bool|mixed|void
  */
-function give_purchase_form_validate_cc_zip( $zip = 0, $country_code = '' ) {
+function give_purchase_form_validate_cc_zip($zip = 0, $country_code = '') {
 	$ret = false;
 
-	if ( empty( $zip ) || empty( $country_code ) ) {
+	if (empty($zip) || empty($country_code)) {
 		return $ret;
 	}
 
-	$country_code = strtoupper( $country_code );
+	$country_code = strtoupper($country_code);
 
 	$zip_regex = array(
 		"AD" => "AD\d{3}",
@@ -1047,9 +1047,9 @@ 
 		"ZM" => "\d{5}"
 	);
 
-	if ( ! isset ( $zip_regex[ $country_code ] ) || preg_match( "/" . $zip_regex[ $country_code ] . "/i", $zip ) ) {
+	if ( ! isset ($zip_regex[$country_code]) || preg_match("/".$zip_regex[$country_code]."/i", $zip)) {
 		$ret = true;
 	}
 
-	return apply_filters( 'give_is_zip_valid', $ret, $zip, $country_code );
+	return apply_filters('give_is_zip_valid', $ret, $zip, $country_code);
 }
\ No newline at end of file