WordImpress / Give

includes/admin/reporting/tools/class-give-tools-recount-form-stats.php

Doc Comments +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 * @since 1.5
 	 * @global object $wpdb Used to query the database using the WordPress
 	 *   Database API
-	 * @return array $data The data for the CSV file
+	 * @return boolean $data The data for the CSV file
 	 */
 	public function get_data() {
 		global $wpdb;

Spacing +66 added lines, -66 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -62,23 +62,23 @@ 
 	public function get_data() {
 		global $give_logs, $wpdb;
 
-		$accepted_statuses = apply_filters( 'give_recount_accepted_statuses', array( 'publish' ) );
+		$accepted_statuses = apply_filters('give_recount_accepted_statuses', array('publish'));
 
-		if ( $this->step == 1 ) {
-			$this->delete_data( 'give_temp_recount_form_stats' );
+		if ($this->step == 1) {
+			$this->delete_data('give_temp_recount_form_stats');
 		}
 
-		$totals = $this->get_stored_data( 'give_temp_recount_form_stats' );
+		$totals = $this->get_stored_data('give_temp_recount_form_stats');
 
-		if ( false === $totals ) {
+		if (false === $totals) {
 			$totals = array(
 				'earnings' => (float) 0,
 				'sales'    => 0,
 			);
-			$this->store_data( 'give_temp_recount_form_stats', $totals );
+			$this->store_data('give_temp_recount_form_stats', $totals);
 		}
 
-		$args = apply_filters( 'give_recount_form_stats_args', array(
+		$args = apply_filters('give_recount_form_stats_args', array(
 			'post_parent'    => $this->form_id,
 			'post_type'      => 'give_log',
 			'posts_per_page' => $this->per_step,
@@ -86,49 +86,49 @@ 
 			'paged'          => $this->step,
 			'log_type'       => 'sale',
 			'fields'         => 'ids',
-		) );
+		));
 
-		$log_ids              = $give_logs->get_connected_logs( $args, 'sale' );
+		$log_ids              = $give_logs->get_connected_logs($args, 'sale');
 		$this->_log_ids_debug = array();
 
-		if ( $log_ids ) {
-			$log_ids     = implode( ',', $log_ids );
-			$payment_ids = $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids)" );
-			unset( $log_ids );
+		if ($log_ids) {
+			$log_ids     = implode(',', $log_ids);
+			$payment_ids = $wpdb->get_col("SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids)");
+			unset($log_ids);
 
-			$payment_ids = implode( ',', $payment_ids );
-			$payments    = $wpdb->get_results( "SELECT ID, post_status FROM $wpdb->posts WHERE ID IN (" . $payment_ids . ")" );
-			unset( $payment_ids );
+			$payment_ids = implode(',', $payment_ids);
+			$payments    = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts WHERE ID IN (".$payment_ids.")");
+			unset($payment_ids);
 
-			foreach ( $payments as $payment ) {
+			foreach ($payments as $payment) {
 
-				$payment = new Give_Payment( $payment->ID );
+				$payment = new Give_Payment($payment->ID);
 
 				//Ensure acceptible status only
-				if ( ! in_array( $payment->post_status, $accepted_statuses ) ) {
+				if ( ! in_array($payment->post_status, $accepted_statuses)) {
 					continue;
 				}
 
 				//Ensure only payments for this form are counted
-				if ( $payment->form_id != $this->form_id ) {
+				if ($payment->form_id != $this->form_id) {
 					continue;
 				}
 
 				$this->_log_ids_debug[] = $payment->ID;
 
-				$totals['sales'] ++;
+				$totals['sales']++;
 				$totals['earnings'] += $payment->total;
 
 			}
 
-			$this->store_data( 'give_temp_recount_form_stats', $totals );
+			$this->store_data('give_temp_recount_form_stats', $totals);
 
 			return true;
 		}
 
 
-		update_post_meta( $this->form_id, '_give_form_sales', $totals['sales'] );
-		update_post_meta( $this->form_id, '_give_form_earnings', $totals['earnings'] );
+		update_post_meta($this->form_id, '_give_form_sales', $totals['sales']);
+		update_post_meta($this->form_id, '_give_form_earnings', $totals['earnings']);
 
 		return false;
 
@@ -143,54 +143,54 @@ 
 	public function get_percentage_complete() {
 		global $give_logs, $wpdb;
 
-		if ( $this->step == 1 ) {
-			$this->delete_data( 'give_recount_total_' . $this->form_id );
+		if ($this->step == 1) {
+			$this->delete_data('give_recount_total_'.$this->form_id);
 		}
 
-		$accepted_statuses = apply_filters( 'give_recount_accepted_statuses', array( 'publish' ) );
-		$total             = $this->get_stored_data( 'give_recount_total_' . $this->form_id );
+		$accepted_statuses = apply_filters('give_recount_accepted_statuses', array('publish'));
+		$total             = $this->get_stored_data('give_recount_total_'.$this->form_id);
 
-		if ( false === $total ) {
+		if (false === $total) {
 			$total = 0;
-			$args  = apply_filters( 'give_recount_form_stats_total_args', array(
+			$args  = apply_filters('give_recount_form_stats_total_args', array(
 				'post_parent' => $this->form_id,
 				'post_type'   => 'give_log',
 				'post_status' => 'publish',
 				'log_type'    => 'sale',
 				'fields'      => 'ids',
 				'nopaging'    => true,
-			) );
+			));
 
-			$log_ids = $give_logs->get_connected_logs( $args, 'sale' );
+			$log_ids = $give_logs->get_connected_logs($args, 'sale');
 
-			if ( $log_ids ) {
-				$log_ids     = implode( ',', $log_ids );
-				$payment_ids = $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids)" );
-				unset( $log_ids );
+			if ($log_ids) {
+				$log_ids     = implode(',', $log_ids);
+				$payment_ids = $wpdb->get_col("SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids)");
+				unset($log_ids);
 
-				$payment_ids = implode( ',', $payment_ids );
-				$payments    = $wpdb->get_results( "SELECT ID, post_status FROM $wpdb->posts WHERE ID IN (" . $payment_ids . ")" );
-				unset( $payment_ids );
+				$payment_ids = implode(',', $payment_ids);
+				$payments    = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts WHERE ID IN (".$payment_ids.")");
+				unset($payment_ids);
 
-				foreach ( $payments as $payment ) {
-					if ( in_array( $payment->post_status, $accepted_statuses ) ) {
+				foreach ($payments as $payment) {
+					if (in_array($payment->post_status, $accepted_statuses)) {
 						continue;
 					}
 
-					$total ++;
+					$total++;
 				}
 			}
 
-			$this->store_data( 'give_recount_total_' . $this->form_id, $total );
+			$this->store_data('give_recount_total_'.$this->form_id, $total);
 		}
 
 		$percentage = 100;
 
-		if ( $total > 0 ) {
-			$percentage = ( ( $this->per_step * $this->step ) / $total ) * 100;
+		if ($total > 0) {
+			$percentage = (($this->per_step * $this->step) / $total) * 100;
 		}
 
-		if ( $percentage > 100 ) {
+		if ($percentage > 100) {
 			$percentage = 100;
 		}
 
@@ -204,8 +204,8 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
-		$this->form_id = isset( $request['form_id'] ) ? sanitize_text_field( $request['form_id'] ) : false;
+	public function set_properties($request) {
+		$this->form_id = isset($request['form_id']) ? sanitize_text_field($request['form_id']) : false;
 	}
 
 	/**
@@ -216,31 +216,31 @@ 
 	 */
 	public function process_step() {
 
-		if ( ! $this->can_export() ) {
-			wp_die( esc_html__( 'You do not have permission to recount stats.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ( ! $this->can_export()) {
+			wp_die(esc_html__('You do not have permission to recount stats.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 		}
 
 		$had_data = $this->get_data();
 
-		if ( $had_data ) {
+		if ($had_data) {
 			$this->done = false;
 
 			return true;
 		} else {
-			$this->delete_data( 'give_recount_total_' . $this->form_id );
-			$this->delete_data( 'give_temp_recount_form_stats' );
+			$this->delete_data('give_recount_total_'.$this->form_id);
+			$this->delete_data('give_temp_recount_form_stats');
 			$this->done    = true;
-			$this->message = sprintf( esc_html__( 'Donation counts and income amount statistics successfully recounted for "%s".', 'give' ), get_the_title( $this->form_id ) );
+			$this->message = sprintf(esc_html__('Donation counts and income amount statistics successfully recounted for "%s".', 'give'), get_the_title($this->form_id));
 
 			return false;
 		}
 	}
 
 	public function headers() {
-		ignore_user_abort( true );
+		ignore_user_abort(true);
 
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
+		if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+			set_time_limit(0);
 		}
 	}
 
@@ -268,11 +268,11 @@ 
 	 *
 	 * @return mixed       Returns the data from the database
 	 */
-	private function get_stored_data( $key ) {
+	private function get_stored_data($key) {
 		global $wpdb;
-		$value = $wpdb->get_var( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key ) );
+		$value = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key));
 
-		return empty( $value ) ? false : maybe_unserialize( $value );
+		return empty($value) ? false : maybe_unserialize($value);
 	}
 
 	/**
@@ -285,10 +285,10 @@ 
 	 *
 	 * @return void
 	 */
-	private function store_data( $key, $value ) {
+	private function store_data($key, $value) {
 		global $wpdb;
 
-		$value = maybe_serialize( $value );
+		$value = maybe_serialize($value);
 
 		$data = array(
 			'option_name'  => $key,
@@ -302,7 +302,7 @@ 
 			'%s',
 		);
 
-		$wpdb->replace( $wpdb->options, $data, $formats );
+		$wpdb->replace($wpdb->options, $data, $formats);
 	}
 
 	/**
@@ -314,9 +314,9 @@ 
 	 *
 	 * @return void
 	 */
-	private function delete_data( $key ) {
+	private function delete_data($key) {
 		global $wpdb;
-		$wpdb->delete( $wpdb->options, array( 'option_name' => $key ) );
+		$wpdb->delete($wpdb->options, array('option_name' => $key));
 	}
 
 }

includes/admin/reporting/tools/class-give-tools-recount-income.php

Doc Comments +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 	 * @since 1.5
 	 * @global object $wpdb Used to query the database using the WordPress
 	 *   Database API
-	 * @return array $data The data for the CSV file
+	 * @return boolean $data The data for the CSV file
 	 */
 	public function get_data() {
 		global $wpdb;

Spacing +46 added lines, -46 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,50 +54,50 @@ 
 	 */
 	public function get_data() {
 
-		if ( $this->step == 1 ) {
-			$this->delete_data( 'give_temp_recount_income' );
+		if ($this->step == 1) {
+			$this->delete_data('give_temp_recount_income');
 		}
 
-		$total = get_option( 'give_temp_recount_income', false );
+		$total = get_option('give_temp_recount_income', false);
 
-		if ( false === $total ) {
+		if (false === $total) {
 			$total = (float) 0;
-			$this->store_data( 'give_temp_recount_income', $total );
+			$this->store_data('give_temp_recount_income', $total);
 		}
 
-		$accepted_statuses = apply_filters( 'give_recount_accepted_statuses', array( 'publish' ) );
+		$accepted_statuses = apply_filters('give_recount_accepted_statuses', array('publish'));
 
-		$args = apply_filters( 'give_recount_income_args', array(
+		$args = apply_filters('give_recount_income_args', array(
 			'number' => $this->per_step,
 			'page'   => $this->step,
 			'status' => $accepted_statuses,
 			'fields' => 'ids'
-		) );
+		));
 
-		$payments = give_get_payments( $args );
+		$payments = give_get_payments($args);
 
-		if ( ! empty( $payments ) ) {
+		if ( ! empty($payments)) {
 
-			foreach ( $payments as $payment ) {
+			foreach ($payments as $payment) {
 
-				$total += give_get_payment_amount( $payment );
+				$total += give_get_payment_amount($payment);
 
 			}
 
-			if ( $total < 0 ) {
+			if ($total < 0) {
 				$totals = 0;
 			}
 
-			$total = round( $total, give_currency_decimal_filter() );
+			$total = round($total, give_currency_decimal_filter());
 
-			$this->store_data( 'give_temp_recount_income', $total );
+			$this->store_data('give_temp_recount_income', $total);
 
 			return true;
 
 		}
 
-		update_option( 'give_income_total', $total );
-		set_transient( 'give_income_total', $total, 86400 );
+		update_option('give_income_total', $total);
+		set_transient('give_income_total', $total, 86400);
 
 		return false;
 
@@ -111,25 +111,25 @@ 
 	 */
 	public function get_percentage_complete() {
 
-		$total = $this->get_stored_data( 'give_recount_income_total' );
+		$total = $this->get_stored_data('give_recount_income_total');
 
-		if ( false === $total ) {
-			$args = apply_filters( 'give_recount_income_total_args', array() );
+		if (false === $total) {
+			$args = apply_filters('give_recount_income_total_args', array());
 
-			$counts = give_count_payments( $args );
-			$total  = absint( $counts->publish );
-			$total  = apply_filters( 'give_recount_store_income_total', $total );
+			$counts = give_count_payments($args);
+			$total  = absint($counts->publish);
+			$total  = apply_filters('give_recount_store_income_total', $total);
 
-			$this->store_data( 'give_recount_income_total', $total );
+			$this->store_data('give_recount_income_total', $total);
 		}
 
 		$percentage = 100;
 
-		if ( $total > 0 ) {
-			$percentage = ( ( $this->per_step * $this->step ) / $total ) * 100;
+		if ($total > 0) {
+			$percentage = (($this->per_step * $this->step) / $total) * 100;
 		}
 
-		if ( $percentage > 100 ) {
+		if ($percentage > 100) {
 			$percentage = 100;
 		}
 
@@ -143,7 +143,7 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
+	public function set_properties($request) {
 	}
 
 	/**
@@ -154,31 +154,31 @@ 
 	 */
 	public function process_step() {
 
-		if ( ! $this->can_export() ) {
-			wp_die( esc_html__( 'You do not have permission to recount stats.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ( ! $this->can_export()) {
+			wp_die(esc_html__('You do not have permission to recount stats.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 		}
 
 		$had_data = $this->get_data();
 
-		if ( $had_data ) {
+		if ($had_data) {
 			$this->done = false;
 
 			return true;
 		} else {
-			$this->delete_data( 'give_recount_income_total' );
-			$this->delete_data( 'give_temp_recount_income' );
+			$this->delete_data('give_recount_income_total');
+			$this->delete_data('give_temp_recount_income');
 			$this->done    = true;
-			$this->message = esc_html__( 'Give income successfully recounted.', 'give' );
+			$this->message = esc_html__('Give income successfully recounted.', 'give');
 
 			return false;
 		}
 	}
 
 	public function headers() {
-		ignore_user_abort( true );
+		ignore_user_abort(true);
 
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
+		if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+			set_time_limit(0);
 		}
 	}
 
@@ -206,11 +206,11 @@ 
 	 *
 	 * @return mixed       Returns the data from the database
 	 */
-	private function get_stored_data( $key ) {
+	private function get_stored_data($key) {
 		global $wpdb;
-		$value = $wpdb->get_var( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key ) );
+		$value = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key));
 
-		return empty( $value ) ? false : maybe_unserialize( $value );
+		return empty($value) ? false : maybe_unserialize($value);
 	}
 
 	/**
@@ -223,10 +223,10 @@ 
 	 *
 	 * @return void
 	 */
-	private function store_data( $key, $value ) {
+	private function store_data($key, $value) {
 		global $wpdb;
 
-		$value = maybe_serialize( $value );
+		$value = maybe_serialize($value);
 
 		$data = array(
 			'option_name'  => $key,
@@ -240,7 +240,7 @@ 
 			'%s',
 		);
 
-		$wpdb->replace( $wpdb->options, $data, $formats );
+		$wpdb->replace($wpdb->options, $data, $formats);
 	}
 
 	/**
@@ -252,9 +252,9 @@ 
 	 *
 	 * @return void
 	 */
-	private function delete_data( $key ) {
+	private function delete_data($key) {
 		global $wpdb;
-		$wpdb->delete( $wpdb->options, array( 'option_name' => $key ) );
+		$wpdb->delete($wpdb->options, array('option_name' => $key));
 	}
 
 }

includes/admin/reporting/export/class-batch-export-customers.php

Doc Comments +1 added lines

@@ -206,6 +206,7 @@
 	 * Set Donor Data
 	 *
 	 * @param $donor
+	 * @param integer $i
 	 */
 	private function set_donor_data( $i, $data, $donor ) {
 

Spacing +69 added lines, -69 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -46,16 +46,16 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
+	public function set_properties($request) {
 
 		//Set data from form submission
-		if ( isset( $_POST['form'] ) ) {
-			parse_str( $_POST['form'], $this->data );
+		if (isset($_POST['form'])) {
+			parse_str($_POST['form'], $this->data);
 		}
 
 		$this->form = $this->data['forms'];
 
-		$this->price_id = ! empty( $request['give_price_option'] ) && 0 !== $request['give_price_option'] ? absint( $request['give_price_option'] ) : null;
+		$this->price_id = ! empty($request['give_price_option']) && 0 !== $request['give_price_option'] ? absint($request['give_price_option']) : null;
 
 	}
 
@@ -69,14 +69,14 @@ 
 	public function csv_cols() {
 
 
-		$columns = isset( $this->data['give_export_option'] ) ? $this->data['give_export_option'] : array();
+		$columns = isset($this->data['give_export_option']) ? $this->data['give_export_option'] : array();
 
 		//We need columns.
-		if ( empty( $columns ) ) {
+		if (empty($columns)) {
 			return false;
 		}
 
-		$cols = $this->get_cols( $columns );
+		$cols = $this->get_cols($columns);
 
 		return $cols;
 	}
@@ -84,38 +84,38 @@ 
 	/**
 	 * @param $column
 	 */
-	private function get_cols( $columns ) {
+	private function get_cols($columns) {
 
 		$cols = array();
 
-		foreach ( $columns as $key => $value ) {
+		foreach ($columns as $key => $value) {
 
-			switch ( $key ) {
+			switch ($key) {
 				case 'full_name' :
-					$cols['full_name'] = esc_html__( 'Full Name', 'give' );
+					$cols['full_name'] = esc_html__('Full Name', 'give');
 					break;
 				case 'email' :
-					$cols['email'] = esc_html__( 'Email Address', 'give' );
+					$cols['email'] = esc_html__('Email Address', 'give');
 					break;
 				case 'address' :
-					$cols['address_line1']   = esc_html__( 'Address', 'give' );
-					$cols['address_line2']   = esc_html__( 'Address 2', 'give' );
-					$cols['address_city']    = esc_html__( 'City', 'give' );
-					$cols['address_state']   = esc_html__( 'State', 'give' );
-					$cols['address_zip']     = esc_html__( 'Zip', 'give' );
-					$cols['address_country'] = esc_html__( 'Country', 'give' );
+					$cols['address_line1']   = esc_html__('Address', 'give');
+					$cols['address_line2']   = esc_html__('Address 2', 'give');
+					$cols['address_city']    = esc_html__('City', 'give');
+					$cols['address_state']   = esc_html__('State', 'give');
+					$cols['address_zip']     = esc_html__('Zip', 'give');
+					$cols['address_country'] = esc_html__('Country', 'give');
 					break;
 				case 'userid' :
-					$cols['userid'] = esc_html__( 'User ID', 'give' );
+					$cols['userid'] = esc_html__('User ID', 'give');
 					break;
 				case 'date_first_donated' :
-					$cols['date_first_donated'] = esc_html__( 'First Donation Date', 'give' );
+					$cols['date_first_donated'] = esc_html__('First Donation Date', 'give');
 					break;
 				case 'donations' :
-					$cols['donations'] = esc_html__( 'Number of Donations', 'give' );
+					$cols['donations'] = esc_html__('Number of Donations', 'give');
 					break;
 				case 'donation_sum' :
-					$cols['donation_sum'] = esc_html__( 'Sum of Donations', 'give' );
+					$cols['donation_sum'] = esc_html__('Sum of Donations', 'give');
 					break;
 			}
 		}
@@ -138,20 +138,20 @@ 
 
 		$i = 0;
 
-		if ( ! empty( $this->form ) ) {
+		if ( ! empty($this->form)) {
 
 			// Export donors of a specific product
 			global $give_logs;
 
 			$args = array(
-				'post_parent'    => absint( $this->form ),
+				'post_parent'    => absint($this->form),
 				'log_type'       => 'sale',
 				'posts_per_page' => 30,
 				'paged'          => $this->step
 			);
 
 			//Check for price option
-			if ( null !== $this->price_id ) {
+			if (null !== $this->price_id) {
 				$args['meta_query'] = array(
 					array(
 						'key'   => '_give_log_price_id',
@@ -160,33 +160,33 @@ 
 				);
 			}
 
-			$logs = $give_logs->get_connected_logs( $args );
+			$logs = $give_logs->get_connected_logs($args);
 
-			if ( $logs ) {
-				foreach ( $logs as $log ) {
-					$payment_id = get_post_meta( $log->ID, '_give_log_payment_id', true );
-					$payment    = new Give_Payment( $payment_id );
-					$donor      = Give()->customers->get_customer_by( 'id', $payment->customer_id );
-					$data[]     = $this->set_donor_data( $i, $data, $donor );
-					$i ++;
+			if ($logs) {
+				foreach ($logs as $log) {
+					$payment_id = get_post_meta($log->ID, '_give_log_payment_id', true);
+					$payment    = new Give_Payment($payment_id);
+					$donor      = Give()->customers->get_customer_by('id', $payment->customer_id);
+					$data[]     = $this->set_donor_data($i, $data, $donor);
+					$i++;
 				}
 			}
 
 		} else {
 
 			// Export all customers
-			$offset = 30 * ( $this->step - 1 );
-			$donors = Give()->customers->get_customers( array( 'number' => 30, 'offset' => $offset ) );
+			$offset = 30 * ($this->step - 1);
+			$donors = Give()->customers->get_customers(array('number' => 30, 'offset' => $offset));
 
-			foreach ( $donors as $donor ) {
+			foreach ($donors as $donor) {
 
-				$data[] = $this->set_donor_data( $i, $data, $donor );
-				$i ++;
+				$data[] = $this->set_donor_data($i, $data, $donor);
+				$i++;
 			}
 		}
 
-		$data = apply_filters( 'give_export_get_data', $data );
-		$data = apply_filters( 'give_export_get_data_' . $this->export_type, $data );
+		$data = apply_filters('give_export_get_data', $data);
+		$data = apply_filters('give_export_get_data_'.$this->export_type, $data);
 
 		return $data;
 	}
@@ -202,19 +202,19 @@ 
 		$percentage = 0;
 
 		// We can't count the number when getting them for a specific form
-		if ( empty( $this->form ) ) {
+		if (empty($this->form)) {
 
 			$total = Give()->customers->count();
 
-			if ( $total > 0 ) {
+			if ($total > 0) {
 
-				$percentage = ( ( 30 * $this->step ) / $total ) * 100;
+				$percentage = ((30 * $this->step) / $total) * 100;
 
 			}
 
 		}
 
-		if ( $percentage > 100 ) {
+		if ($percentage > 100) {
 			$percentage = 100;
 		}
 
@@ -226,46 +226,46 @@ 
 	 *
 	 * @param $donor
 	 */
-	private function set_donor_data( $i, $data, $donor ) {
+	private function set_donor_data($i, $data, $donor) {
 
 		$columns = $this->csv_cols();
 
 		//Set address variable
 		$address = '';
-		if ( isset( $donor->user_id ) && $donor->user_id > 0 ) {
-			$address = give_get_donor_address( $donor->user_id );
+		if (isset($donor->user_id) && $donor->user_id > 0) {
+			$address = give_get_donor_address($donor->user_id);
 		}
 
 		//Set columns
-		if ( ! empty( $columns['full_name'] ) ) {
-			$data[ $i ]['full_name'] = $donor->name;
+		if ( ! empty($columns['full_name'])) {
+			$data[$i]['full_name'] = $donor->name;
 		}
-		if ( ! empty( $columns['email'] ) ) {
-			$data[ $i ]['email'] = $donor->email;
+		if ( ! empty($columns['email'])) {
+			$data[$i]['email'] = $donor->email;
 		}
-		if ( ! empty( $columns['address_line1'] ) ) {
-
-			$data[ $i ]['address_line1']   = isset( $address['line1'] ) ? $address['line1'] : '';
-			$data[ $i ]['address_line2']   = isset( $address['line2'] ) ? $address['line2'] : '';
-			$data[ $i ]['address_city']    = isset( $address['city'] ) ? $address['city'] : '';
-			$data[ $i ]['address_state']   = isset( $address['state'] ) ? $address['state'] : '';
-			$data[ $i ]['address_zip']     = isset( $address['zip'] ) ? $address['zip'] : '';
-			$data[ $i ]['address_country'] = isset( $address['country'] ) ? $address['country'] : '';
+		if ( ! empty($columns['address_line1'])) {
+
+			$data[$i]['address_line1']   = isset($address['line1']) ? $address['line1'] : '';
+			$data[$i]['address_line2']   = isset($address['line2']) ? $address['line2'] : '';
+			$data[$i]['address_city']    = isset($address['city']) ? $address['city'] : '';
+			$data[$i]['address_state']   = isset($address['state']) ? $address['state'] : '';
+			$data[$i]['address_zip']     = isset($address['zip']) ? $address['zip'] : '';
+			$data[$i]['address_country'] = isset($address['country']) ? $address['country'] : '';
 		}
-		if ( ! empty( $columns['userid'] ) ) {
-			$data[ $i ]['userid'] = ! empty( $donor->user_id ) ? $donor->user_id : '';
+		if ( ! empty($columns['userid'])) {
+			$data[$i]['userid'] = ! empty($donor->user_id) ? $donor->user_id : '';
 		}
-		if ( ! empty( $columns['date_first_donated'] ) ) {
-			$data[ $i ]['date_first_donated'] = date_i18n( get_option( 'date_format' ), strtotime( $donor->date_created ) );
+		if ( ! empty($columns['date_first_donated'])) {
+			$data[$i]['date_first_donated'] = date_i18n(get_option('date_format'), strtotime($donor->date_created));
 		}
-		if ( ! empty( $columns['donations'] ) ) {
-			$data[ $i ]['donations'] = $donor->purchase_count;
+		if ( ! empty($columns['donations'])) {
+			$data[$i]['donations'] = $donor->purchase_count;
 		}
-		if ( ! empty( $columns['donation_sum'] ) ) {
-			$data[ $i ]['donation_sum'] = give_format_amount( $donor->purchase_value );
+		if ( ! empty($columns['donation_sum'])) {
+			$data[$i]['donation_sum'] = give_format_amount($donor->purchase_value);
 		}
 
-		return $data[ $i ];
+		return $data[$i];
 
 	}
 

includes/error-tracking.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +30 added lines, -30 removed lines

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

includes/login-register.php

Indentation +24 added lines, -24 removed lines

@@ -33,20 +33,20 @@ 
 		$login_redirect = add_query_arg('give-login-success', 'true', give_get_current_page_url());
 	}
 
-    if ( empty( $logout_redirect ) ) {
-        $logout_redirect = add_query_arg( 'give-logout-success', 'true', give_get_current_page_url() );
-    }
+	if ( empty( $logout_redirect ) ) {
+		$logout_redirect = add_query_arg( 'give-logout-success', 'true', give_get_current_page_url() );
+	}
 
 
-    // Add user_logout action to logout url.
-    $logout_redirect = add_query_arg(
-        array(
-            'give_action'       => 'user_logout',
-            'give_logout_nonce' => wp_create_nonce( 'give-logout-nonce' ),
-            'give_logout_redirect' => urlencode( $logout_redirect )
-        ),
-        home_url('/')
-    );
+	// Add user_logout action to logout url.
+	$logout_redirect = add_query_arg(
+		array(
+			'give_action'       => 'user_logout',
+			'give_logout_nonce' => wp_create_nonce( 'give-logout-nonce' ),
+			'give_logout_redirect' => urlencode( $logout_redirect )
+		),
+		home_url('/')
+	);
 
 	$give_login_redirect = $login_redirect;
 	$give_logout_redirect = $logout_redirect;
@@ -136,23 +136,23 @@ 
  * @return void
  */
 function give_process_user_logout( $data ) {
-    if ( wp_verify_nonce( $data['give_logout_nonce'], 'give-logout-nonce' ) && is_user_logged_in() ) {
+	if ( wp_verify_nonce( $data['give_logout_nonce'], 'give-logout-nonce' ) && is_user_logged_in() ) {
 
-        // Prevent occurring of any custom action on wp_logout.
-        remove_all_actions( 'wp_logout' );
+		// Prevent occurring of any custom action on wp_logout.
+		remove_all_actions( 'wp_logout' );
 
-        // Before logout give action.
-        do_action( 'give_before_user_logout' );
+		// Before logout give action.
+		do_action( 'give_before_user_logout' );
 
-        // Logout user.
-        wp_logout();
+		// Logout user.
+		wp_logout();
 
-        // After logout give action.
-        do_action( 'give_after_user_logout' );
+		// After logout give action.
+		do_action( 'give_after_user_logout' );
 
-        wp_redirect( $data['give_logout_redirect'] );
-        give_die();
-    }
+		wp_redirect( $data['give_logout_redirect'] );
+		give_die();
+	}
 }
 
 add_action( 'give_user_logout', 'give_process_user_logout' );

Spacing +71 added lines, -71 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,15 +26,15 @@ 
  *
  * @return string Login form
  */
-function give_login_form( $login_redirect = '', $logout_redirect = '' ) {
-	global $give_login_redirect, $give_logout_redirect;;
+function give_login_form($login_redirect = '', $logout_redirect = '') {
+	global $give_login_redirect, $give_logout_redirect; ;
 
-	if ( empty( $login_redirect ) ) {
+	if (empty($login_redirect)) {
 		$login_redirect = add_query_arg('give-login-success', 'true', give_get_current_page_url());
 	}
 
-    if ( empty( $logout_redirect ) ) {
-        $logout_redirect = add_query_arg( 'give-logout-success', 'true', give_get_current_page_url() );
+    if (empty($logout_redirect)) {
+        $logout_redirect = add_query_arg('give-logout-success', 'true', give_get_current_page_url());
     }
 
 
@@ -42,8 +42,8 @@ 
     $logout_redirect = add_query_arg(
         array(
             'give_action'       => 'user_logout',
-            'give_logout_nonce' => wp_create_nonce( 'give-logout-nonce' ),
-            'give_logout_redirect' => urlencode( $logout_redirect )
+            'give_logout_nonce' => wp_create_nonce('give-logout-nonce'),
+            'give_logout_redirect' => urlencode($logout_redirect)
         ),
         home_url('/')
     );
@@ -53,9 +53,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());
 }
 
 /**
@@ -69,10 +69,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();
 	}
 
@@ -80,11 +80,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());
 }
 
 /**
@@ -96,34 +96,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', esc_html__( 'The password you entered is incorrect.', 'give' ) );
+				give_set_error('password_incorrect', esc_html__('The password you entered is incorrect.', 'give'));
 			}
 		} else {
-			give_set_error( 'username_incorrect', esc_html__( 'The username you entered does not exist.', 'give' ) );
+			give_set_error('username_incorrect', esc_html__('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_login_redirect'], $user_ID );
-			wp_redirect( $redirect );
+		if ( ! $errors) {
+			$redirect = apply_filters('give_login_redirect', $data['give_login_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');
 
 
 /**
@@ -135,27 +135,27 @@ 
  *
  * @return void
  */
-function give_process_user_logout( $data ) {
-    if ( wp_verify_nonce( $data['give_logout_nonce'], 'give-logout-nonce' ) && is_user_logged_in() ) {
+function give_process_user_logout($data) {
+    if (wp_verify_nonce($data['give_logout_nonce'], 'give-logout-nonce') && is_user_logged_in()) {
 
         // Prevent occurring of any custom action on wp_logout.
-        remove_all_actions( 'wp_logout' );
+        remove_all_actions('wp_logout');
 
         // Before logout give action.
-        do_action( 'give_before_user_logout' );
+        do_action('give_before_user_logout');
 
         // Logout user.
         wp_logout();
 
         // After logout give action.
-        do_action( 'give_after_user_logout' );
+        do_action('give_after_user_logout');
 
-        wp_redirect( $data['give_logout_redirect'] );
+        wp_redirect($data['give_logout_redirect']);
         give_die();
     }
 }
 
-add_action( 'give_user_logout', 'give_process_user_logout' );
+add_action('give_user_logout', 'give_process_user_logout');
 
 /**
  * Log User In
@@ -168,15 +168,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);
 }
 
 
@@ -189,70 +189,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', esc_html__( 'Invalid username.', 'give' ) );
+	if (empty($data['give_user_login'])) {
+		give_set_error('empty_username', esc_html__('Invalid username.', 'give'));
 	}
 
-	if ( username_exists( $data['give_user_login'] ) ) {
-		give_set_error( 'username_unavailable', esc_html__( 'Username already taken.', 'give' ) );
+	if (username_exists($data['give_user_login'])) {
+		give_set_error('username_unavailable', esc_html__('Username already taken.', 'give'));
 	}
 
-	if ( ! validate_username( $data['give_user_login'] ) ) {
-		give_set_error( 'username_invalid', esc_html__( 'Invalid username.', 'give' ) );
+	if ( ! validate_username($data['give_user_login'])) {
+		give_set_error('username_invalid', esc_html__('Invalid username.', 'give'));
 	}
 
-	if ( email_exists( $data['give_user_email'] ) ) {
-		give_set_error( 'email_unavailable', esc_html__( 'Email address already taken.', 'give' ) );
+	if (email_exists($data['give_user_email'])) {
+		give_set_error('email_unavailable', esc_html__('Email address already taken.', 'give'));
 	}
 
-	if ( empty( $data['give_user_email'] ) || ! is_email( $data['give_user_email'] ) ) {
-		give_set_error( 'email_invalid', esc_html__( 'Invalid email.', 'give' ) );
+	if (empty($data['give_user_email']) || ! is_email($data['give_user_email'])) {
+		give_set_error('email_invalid', esc_html__('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', esc_html__( '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', esc_html__('Invalid payment email.', 'give'));
 	}
 
-	if ( empty( $_POST['give_user_pass'] ) ) {
-		give_set_error( 'empty_password', esc_html__( 'Please enter a password.', 'give' ) );
+	if (empty($_POST['give_user_pass'])) {
+		give_set_error('empty_password', esc_html__('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', esc_html__( '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', esc_html__('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/shortcodes.php

Indentation +5 added lines, -5 removed lines

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

Spacing +113 added lines, -113 removed lines

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

Braces +2 added lines, -2 removed lines

@@ -425,11 +425,11 @@
 		// Make sure email should not be empty.
 		give_set_error( 'email_empty', esc_html__( 'The email you entered is empty.', 'give' ) );
 
-	}else if ( ! is_email( $email ) ){
+	} else if ( ! is_email( $email ) ){
 		// Make sure email should be valid.
 		give_set_error( 'email_not_valid', esc_html__( 'The email you entered is not valid. Please use another', 'give' ) );
 
-	}else if ( $email != $old_user_data->user_email ) {
+	} else if ( $email != $old_user_data->user_email ) {
 		// Make sure the new email doesn't belong to another user
 		if ( email_exists( $email ) ) {
 			give_set_error( 'email_exists', esc_html__( 'The email you entered belongs to another user. Please use another.', 'give' ) );

includes/price-functions.php

Spacing +18 added lines, -18 removed lines

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

includes/class-give-customer.php

Braces +1 added lines, -1 removed lines

@@ -544,7 +544,7 @@
 
         if( $payment_total_diff > 0 ) {
             $this->increase_value( $payment_total_diff );
-        }else{
+        } else{
             // Pass payment total difference as +ve value to decrease amount from user lifetime stat.
             $this->decrease_value( -$payment_total_diff );
         }

Indentation +32 added lines, -32 removed lines

@@ -565,12 +565,12 @@ 
 
 	/**
 	 * Decrease/Increase a customer's lifetime value.
-     *
-     * This function will update donation stat on basis of current amount and new amount donation difference.
-     * Difference value can positive or negative. Negative value will decrease user donation stat while positive value increase donation stat.
-     *
+	 *
+	 * This function will update donation stat on basis of current amount and new amount donation difference.
+	 * Difference value can positive or negative. Negative value will decrease user donation stat while positive value increase donation stat.
+	 *
 	 * @since  1.0
-     * @access public
+	 * @access public
 	 *
 	 * @param  float $curr_amount Current Donation amount.
 	 * @param  float $new_amount  New (changed) Donation amount.
@@ -578,35 +578,35 @@ 
 	 * @return mixed              If successful, the new donation stat value, otherwise false.
 	 */
 	public function update_donation_value( $curr_amount, $new_amount ) {
-        /**
-         * Payment total difference value can be:
-         *  zero   (in case amount not change)
-         *  or -ve (in case amount decrease)
-         *  or +ve (in case amount increase)
-         */
-        $payment_total_diff = $new_amount - $curr_amount;
-
-        // We do not need to update donation stat if donation did not change.
-        if( ! $payment_total_diff ) {
-            return false;
-        }
-
-
-        if( $payment_total_diff > 0 ) {
-            $this->increase_value( $payment_total_diff );
-        }else{
-            // Pass payment total difference as +ve value to decrease amount from user lifetime stat.
-            $this->decrease_value( -$payment_total_diff );
-        }
-
-        return $this->purchase_value;
+		/**
+		 * Payment total difference value can be:
+		 *  zero   (in case amount not change)
+		 *  or -ve (in case amount decrease)
+		 *  or +ve (in case amount increase)
+		 */
+		$payment_total_diff = $new_amount - $curr_amount;
+
+		// We do not need to update donation stat if donation did not change.
+		if( ! $payment_total_diff ) {
+			return false;
+		}
+
+
+		if( $payment_total_diff > 0 ) {
+			$this->increase_value( $payment_total_diff );
+		}else{
+			// Pass payment total difference as +ve value to decrease amount from user lifetime stat.
+			$this->decrease_value( -$payment_total_diff );
+		}
+
+		return $this->purchase_value;
 	}
 
 	/**
 	 * Get the parsed notes for a customer as an array.
 	 *
 	 * @since  1.0
-     * @access public
+	 * @access public
 	 *
 	 * @param  integer $length The number of notes to get.
 	 * @param  integer $paged  What note to start at.
@@ -631,7 +631,7 @@ 
 	 * Get the total number of notes we have after parsing.
 	 *
 	 * @since  1.0
-     * @access public
+	 * @access public
 	 *
 	 * @return int The number of notes for the customer.
 	 */
@@ -648,7 +648,7 @@ 
 	 * Add a note for the customer.
 	 *
 	 * @since  1.0
-     * @access public
+	 * @access public
 	 *
 	 * @param  string $note   The note to add. Default is empty.
 	 *
@@ -690,7 +690,7 @@ 
 	 * Get the notes column for the customer
 	 *
 	 * @since  1.0
-     * @access private
+	 * @access private
 	 *
 	 * @return string The Notes for the customer, non-parsed.
 	 */
@@ -768,7 +768,7 @@ 
 	 * Sanitize the data for update/create
 	 *
 	 * @since  1.0
-     * @access private
+	 * @access private
 	 *
 	 * @param  array $data The data to sanitize.
 	 *

Spacing +141 added lines, -141 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -134,29 +134,29 @@ 
 	 * @param  bool $_id_or_email 
 	 * @param  bool $by_user_id
 	 */
-	public function __construct( $_id_or_email = false, $by_user_id = false ) {
+	public function __construct($_id_or_email = false, $by_user_id = false) {
 
 		$this->db = new Give_DB_Customers;
 
-		if ( false === $_id_or_email || ( is_numeric( $_id_or_email ) && (int) $_id_or_email !== absint( $_id_or_email ) ) ) {
+		if (false === $_id_or_email || (is_numeric($_id_or_email) && (int) $_id_or_email !== absint($_id_or_email))) {
 			return false;
 		}
 
-		$by_user_id = is_bool( $by_user_id ) ? $by_user_id : false;
+		$by_user_id = is_bool($by_user_id) ? $by_user_id : false;
 
-		if ( is_numeric( $_id_or_email ) ) {
+		if (is_numeric($_id_or_email)) {
 			$field = $by_user_id ? 'user_id' : 'id';
 		} else {
 			$field = 'email';
 		}
 
-		$customer = $this->db->get_customer_by( $field, $_id_or_email );
+		$customer = $this->db->get_customer_by($field, $_id_or_email);
 
-		if ( empty( $customer ) || ! is_object( $customer ) ) {
+		if (empty($customer) || ! is_object($customer)) {
 			return false;
 		}
 
-		$this->setup_customer( $customer );
+		$this->setup_customer($customer);
 
 	}
 
@@ -172,15 +172,15 @@ 
 	 *
 	 * @return bool             If the setup was successful or not.
 	 */
-	private function setup_customer( $customer ) {
+	private function setup_customer($customer) {
 
-		if ( ! is_object( $customer ) ) {
+		if ( ! is_object($customer)) {
 			return false;
 		}
 
-		foreach ( $customer as $key => $value ) {
+		foreach ($customer as $key => $value) {
 
-			switch ( $key ) {
+			switch ($key) {
 
 				case 'notes':
 					$this->$key = $this->get_notes();
@@ -195,7 +195,7 @@ 
 		}
 
 		// Customer ID and email are the only things that are necessary, make sure they exist
-		if ( ! empty( $this->id ) && ! empty( $this->email ) ) {
+		if ( ! empty($this->id) && ! empty($this->email)) {
 			return true;
 		}
 
@@ -209,16 +209,16 @@ 
 	 * @since  1.0
 	 * @access public
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if ( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_'.$key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_'.$key));
 
 		} else {
 
 			/* translators: %s: property key */
-			return new WP_Error( 'give-customer-invalid-property', sprintf( esc_html__( 'Can\'t get property %s.', 'give' ), $key ) );
+			return new WP_Error('give-customer-invalid-property', sprintf(esc_html__('Can\'t get property %s.', 'give'), $key));
 
 		}
 
@@ -234,9 +234,9 @@ 
 	 *
 	 * @return mixed       False if not a valid creation, Customer ID if user is found or valid creation.
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
-		if ( $this->id != 0 || empty( $data ) ) {
+		if ($this->id != 0 || empty($data)) {
 			return false;
 		}
 
@@ -244,34 +244,34 @@ 
 			'payment_ids' => ''
 		);
 
-		$args = wp_parse_args( $data, $defaults );
-		$args = $this->sanitize_columns( $args );
+		$args = wp_parse_args($data, $defaults);
+		$args = $this->sanitize_columns($args);
 
-		if ( empty( $args['email'] ) || ! is_email( $args['email'] ) ) {
+		if (empty($args['email']) || ! is_email($args['email'])) {
 			return false;
 		}
 
-		if ( ! empty( $args['payment_ids'] ) && is_array( $args['payment_ids'] ) ) {
-			$args['payment_ids'] = implode( ',', array_unique( array_values( $args['payment_ids'] ) ) );
+		if ( ! empty($args['payment_ids']) && is_array($args['payment_ids'])) {
+			$args['payment_ids'] = implode(',', array_unique(array_values($args['payment_ids'])));
 		}
 
-		do_action( 'give_customer_pre_create', $args );
+		do_action('give_customer_pre_create', $args);
 
 		$created = false;
 
 		// The DB class 'add' implies an update if the customer being asked to be created already exists
-		if ( $this->db->add( $data ) ) {
+		if ($this->db->add($data)) {
 
 			// We've successfully added/updated the customer, reset the class vars with the new data
-			$customer = $this->db->get_customer_by( 'email', $args['email'] );
+			$customer = $this->db->get_customer_by('email', $args['email']);
 
 			// Setup the customer data with the values from DB
-			$this->setup_customer( $customer );
+			$this->setup_customer($customer);
 
 			$created = $this->id;
 		}
 
-		do_action( 'give_customer_post_create', $created, $args );
+		do_action('give_customer_post_create', $created, $args);
 
 		return $created;
 
@@ -287,27 +287,27 @@ 
 	 *
 	 * @return bool        If the update was successful or not.
 	 */
-	public function update( $data = array() ) {
+	public function update($data = array()) {
 
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			return false;
 		}
 
-		$data = $this->sanitize_columns( $data );
+		$data = $this->sanitize_columns($data);
 
-		do_action( 'give_customer_pre_update', $this->id, $data );
+		do_action('give_customer_pre_update', $this->id, $data);
 
 		$updated = false;
 
-		if ( $this->db->update( $this->id, $data ) ) {
+		if ($this->db->update($this->id, $data)) {
 
-			$customer = $this->db->get_customer_by( 'id', $this->id );
-			$this->setup_customer( $customer );
+			$customer = $this->db->get_customer_by('id', $this->id);
+			$this->setup_customer($customer);
 
 			$updated = true;
 		}
 
-		do_action( 'give_customer_post_update', $updated, $this->id, $data );
+		do_action('give_customer_post_update', $updated, $this->id, $data);
 
 		return $updated;
 	}
@@ -325,44 +325,44 @@ 
 	 *
 	 * @return bool            If the attachment was successfuly.
 	 */
-	public function attach_payment( $payment_id = 0, $update_stats = true ) {
+	public function attach_payment($payment_id = 0, $update_stats = true) {
 
-		if ( empty( $payment_id ) ) {
+		if (empty($payment_id)) {
 			return false;
 		}
 
-		if ( empty( $this->payment_ids ) ) {
+		if (empty($this->payment_ids)) {
 
 			$new_payment_ids = $payment_id;
 
 		} else {
 
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
 
-			if ( in_array( $payment_id, $payment_ids ) ) {
+			if (in_array($payment_id, $payment_ids)) {
 				$update_stats = false;
 			}
 
 			$payment_ids[] = $payment_id;
 
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 		}
 
-		do_action( 'give_customer_pre_attach_payment', $payment_id, $this->id );
+		do_action('give_customer_pre_attach_payment', $payment_id, $this->id);
 
-		$payment_added = $this->update( array( 'payment_ids' => $new_payment_ids ) );
+		$payment_added = $this->update(array('payment_ids' => $new_payment_ids));
 
-		if ( $payment_added ) {
+		if ($payment_added) {
 
 			$this->payment_ids = $new_payment_ids;
 
 			// We added this payment successfully, increment the stats
-			if ( $update_stats ) {
-				$payment_amount = give_get_payment_amount( $payment_id );
+			if ($update_stats) {
+				$payment_amount = give_get_payment_amount($payment_id);
 
-				if ( ! empty( $payment_amount ) ) {
-					$this->increase_value( $payment_amount );
+				if ( ! empty($payment_amount)) {
+					$this->increase_value($payment_amount);
 				}
 
 				$this->increase_purchase_count();
@@ -370,7 +370,7 @@ 
 
 		}
 
-		do_action( 'give_customer_post_attach_payment', $payment_added, $payment_id, $this->id );
+		do_action('give_customer_post_attach_payment', $payment_added, $payment_id, $this->id);
 
 		return $payment_added;
 	}
@@ -388,50 +388,50 @@ 
 	 *
 	 * @return boolean               If the removal was successful.
 	 */
-	public function remove_payment( $payment_id = 0, $update_stats = true ) {
+	public function remove_payment($payment_id = 0, $update_stats = true) {
 
-		if ( empty( $payment_id ) ) {
+		if (empty($payment_id)) {
 			return false;
 		}
 
-		$payment = new Give_Payment( $payment_id );
+		$payment = new Give_Payment($payment_id);
 
-		if ( 'publish' !== $payment->status && 'revoked' !== $payment->status ) {
+		if ('publish' !== $payment->status && 'revoked' !== $payment->status) {
 			$update_stats = false;
 		}
 
 		$new_payment_ids = '';
 
-		if ( ! empty( $this->payment_ids ) ) {
+		if ( ! empty($this->payment_ids)) {
 
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
 
-			$pos = array_search( $payment_id, $payment_ids );
-			if ( false === $pos ) {
+			$pos = array_search($payment_id, $payment_ids);
+			if (false === $pos) {
 				return false;
 			}
 
-			unset( $payment_ids[ $pos ] );
-			$payment_ids = array_filter( $payment_ids );
+			unset($payment_ids[$pos]);
+			$payment_ids = array_filter($payment_ids);
 
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 		}
 
-		do_action( 'give_customer_pre_remove_payment', $payment_id, $this->id );
+		do_action('give_customer_pre_remove_payment', $payment_id, $this->id);
 
-		$payment_removed = $this->update( array( 'payment_ids' => $new_payment_ids ) );
+		$payment_removed = $this->update(array('payment_ids' => $new_payment_ids));
 
-		if ( $payment_removed ) {
+		if ($payment_removed) {
 
 			$this->payment_ids = $new_payment_ids;
 
-			if ( $update_stats ) {
+			if ($update_stats) {
 				// We removed this payment successfully, decrement the stats
-				$payment_amount = give_get_payment_amount( $payment_id );
+				$payment_amount = give_get_payment_amount($payment_id);
 
-				if ( ! empty( $payment_amount ) ) {
-					$this->decrease_value( $payment_amount );
+				if ( ! empty($payment_amount)) {
+					$this->decrease_value($payment_amount);
 				}
 
 				$this->decrease_purchase_count();
@@ -439,7 +439,7 @@ 
 
 		}
 
-		do_action( 'give_customer_post_remove_payment', $payment_removed, $payment_id, $this->id );
+		do_action('give_customer_post_remove_payment', $payment_removed, $payment_id, $this->id);
 
 		return $payment_removed;
 
@@ -455,22 +455,22 @@ 
 	 *
 	 * @return int            The purchase count.
 	 */
-	public function increase_purchase_count( $count = 1 ) {
+	public function increase_purchase_count($count = 1) {
 
 		// Make sure it's numeric and not negative.
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
+		if ( ! is_numeric($count) || $count != absint($count)) {
 			return false;
 		}
 
 		$new_total = (int) $this->purchase_count + (int) $count;
 
-		do_action( 'give_customer_pre_increase_purchase_count', $count, $this->id );
+		do_action('give_customer_pre_increase_purchase_count', $count, $this->id);
 
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
+		if ($this->update(array('purchase_count' => $new_total))) {
 			$this->purchase_count = $new_total;
 		}
 
-		do_action( 'give_customer_post_increase_purchase_count', $this->purchase_count, $count, $this->id );
+		do_action('give_customer_post_increase_purchase_count', $this->purchase_count, $count, $this->id);
 
 		return $this->purchase_count;
 	}
@@ -485,26 +485,26 @@ 
 	 *
 	 * @return mixed          If successful, the new count, otherwise false.
 	 */
-	public function decrease_purchase_count( $count = 1 ) {
+	public function decrease_purchase_count($count = 1) {
 
 		// Make sure it's numeric and not negative
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
+		if ( ! is_numeric($count) || $count != absint($count)) {
 			return false;
 		}
 
 		$new_total = (int) $this->purchase_count - (int) $count;
 
-		if ( $new_total < 0 ) {
+		if ($new_total < 0) {
 			$new_total = 0;
 		}
 
-		do_action( 'give_customer_pre_decrease_purchase_count', $count, $this->id );
+		do_action('give_customer_pre_decrease_purchase_count', $count, $this->id);
 
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
+		if ($this->update(array('purchase_count' => $new_total))) {
 			$this->purchase_count = $new_total;
 		}
 
-		do_action( 'give_customer_post_decrease_purchase_count', $this->purchase_count, $count, $this->id );
+		do_action('give_customer_post_decrease_purchase_count', $this->purchase_count, $count, $this->id);
 
 		return $this->purchase_count;
 	}
@@ -519,17 +519,17 @@ 
 	 *
 	 * @return mixed        If successful, the new value, otherwise false.
 	 */
-	public function increase_value( $value = 0.00 ) {
+	public function increase_value($value = 0.00) {
 
-		$new_value = floatval( $this->purchase_value ) + $value;
+		$new_value = floatval($this->purchase_value) + $value;
 
-		do_action( 'give_customer_pre_increase_value', $value, $this->id );
+		do_action('give_customer_pre_increase_value', $value, $this->id);
 
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
+		if ($this->update(array('purchase_value' => $new_value))) {
 			$this->purchase_value = $new_value;
 		}
 
-		do_action( 'give_customer_post_increase_value', $this->purchase_value, $value, $this->id );
+		do_action('give_customer_post_increase_value', $this->purchase_value, $value, $this->id);
 
 		return $this->purchase_value;
 	}
@@ -544,21 +544,21 @@ 
 	 *
 	 * @return mixed        If successful, the new value, otherwise false.
 	 */
-	public function decrease_value( $value = 0.00 ) {
+	public function decrease_value($value = 0.00) {
 
-		$new_value = floatval( $this->purchase_value ) - $value;
+		$new_value = floatval($this->purchase_value) - $value;
 
-		if ( $new_value < 0 ) {
+		if ($new_value < 0) {
 			$new_value = 0.00;
 		}
 
-		do_action( 'give_customer_pre_decrease_value', $value, $this->id );
+		do_action('give_customer_pre_decrease_value', $value, $this->id);
 
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
+		if ($this->update(array('purchase_value' => $new_value))) {
 			$this->purchase_value = $new_value;
 		}
 
-		do_action( 'give_customer_post_decrease_value', $this->purchase_value, $value, $this->id );
+		do_action('give_customer_post_decrease_value', $this->purchase_value, $value, $this->id);
 
 		return $this->purchase_value;
 	}
@@ -577,7 +577,7 @@ 
 	 *
 	 * @return mixed              If successful, the new donation stat value, otherwise false.
 	 */
-	public function update_donation_value( $curr_amount, $new_amount ) {
+	public function update_donation_value($curr_amount, $new_amount) {
         /**
          * Payment total difference value can be:
          *  zero   (in case amount not change)
@@ -587,14 +587,14 @@ 
         $payment_total_diff = $new_amount - $curr_amount;
 
         // We do not need to update donation stat if donation did not change.
-        if( ! $payment_total_diff ) {
+        if ( ! $payment_total_diff) {
             return false;
         }
 
 
-        if( $payment_total_diff > 0 ) {
-            $this->increase_value( $payment_total_diff );
-        }else{
+        if ($payment_total_diff > 0) {
+            $this->increase_value($payment_total_diff);
+        } else {
             // Pass payment total difference as +ve value to decrease amount from user lifetime stat.
             $this->decrease_value( -$payment_total_diff );
         }
@@ -613,15 +613,15 @@ 
 	 *
 	 * @return array           The notes requested.
 	 */
-	public function get_notes( $length = 20, $paged = 1 ) {
+	public function get_notes($length = 20, $paged = 1) {
 
-		$length = is_numeric( $length ) ? $length : 20;
-		$offset = is_numeric( $paged ) && $paged != 1 ? ( ( absint( $paged ) - 1 ) * $length ) : 0;
+		$length = is_numeric($length) ? $length : 20;
+		$offset = is_numeric($paged) && $paged != 1 ? ((absint($paged) - 1) * $length) : 0;
 
 		$all_notes   = $this->get_raw_notes();
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
 
-		$desired_notes = array_slice( $notes_array, $offset, $length );
+		$desired_notes = array_slice($notes_array, $offset, $length);
 
 		return $desired_notes;
 
@@ -638,9 +638,9 @@ 
 	public function get_notes_count() {
 
 		$all_notes   = $this->get_raw_notes();
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
 
-		return count( $notes_array );
+		return count($notes_array);
 
 	}
 
@@ -654,32 +654,32 @@ 
 	 *
 	 * @return string|boolean The new note if added successfully, false otherwise.
 	 */
-	public function add_note( $note = '' ) {
+	public function add_note($note = '') {
 
-		$note = trim( $note );
-		if ( empty( $note ) ) {
+		$note = trim($note);
+		if (empty($note)) {
 			return false;
 		}
 
 		$notes = $this->get_raw_notes();
 
-		if ( empty( $notes ) ) {
+		if (empty($notes)) {
 			$notes = '';
 		}
 
-		$note_string = date_i18n( 'F j, Y H:i:s', current_time( 'timestamp' ) ) . ' - ' . $note;
-		$new_note    = apply_filters( 'give_customer_add_note_string', $note_string );
-		$notes .= "\n\n" . $new_note;
+		$note_string = date_i18n('F j, Y H:i:s', current_time('timestamp')).' - '.$note;
+		$new_note    = apply_filters('give_customer_add_note_string', $note_string);
+		$notes .= "\n\n".$new_note;
 
-		do_action( 'give_customer_pre_add_note', $new_note, $this->id );
+		do_action('give_customer_pre_add_note', $new_note, $this->id);
 
-		$updated = $this->update( array( 'notes' => $notes ) );
+		$updated = $this->update(array('notes' => $notes));
 
-		if ( $updated ) {
+		if ($updated) {
 			$this->notes = $this->get_notes();
 		}
 
-		do_action( 'give_customer_post_add_note', $this->notes, $new_note, $this->id );
+		do_action('give_customer_post_add_note', $this->notes, $new_note, $this->id);
 
 		// Return the formatted note, so we can test, as well as update any displays
 		return $new_note;
@@ -696,7 +696,7 @@ 
 	 */
 	private function get_raw_notes() {
 
-		$all_notes = $this->db->get_column( 'notes', $this->id );
+		$all_notes = $this->db->get_column('notes', $this->id);
 
 		return $all_notes;
 
@@ -713,8 +713,8 @@ 
 	 *
 	 * @return mixed            Will be an array if $single is false. Will be value of meta data field if $single is true.
 	 */
-	public function get_meta( $meta_key = '', $single = true ) {
-		return Give()->customer_meta->get_meta( $this->id, $meta_key, $single );
+	public function get_meta($meta_key = '', $single = true) {
+		return Give()->customer_meta->get_meta($this->id, $meta_key, $single);
 	}
 
 	/**
@@ -729,8 +729,8 @@ 
 	 *
 	 * @return bool               False for failure. True for success.
 	 */
-	public function add_meta( $meta_key = '', $meta_value, $unique = false ) {
-		return Give()->customer_meta->add_meta( $this->id, $meta_key, $meta_value, $unique );
+	public function add_meta($meta_key = '', $meta_value, $unique = false) {
+		return Give()->customer_meta->add_meta($this->id, $meta_key, $meta_value, $unique);
 	}
 
 	/**
@@ -745,8 +745,8 @@ 
 	 *
 	 * @return bool               False on failure, true if success.
 	 */
-	public function update_meta( $meta_key = '', $meta_value, $prev_value = '' ) {
-		return Give()->customer_meta->update_meta( $this->id, $meta_key, $meta_value, $prev_value );
+	public function update_meta($meta_key = '', $meta_value, $prev_value = '') {
+		return Give()->customer_meta->update_meta($this->id, $meta_key, $meta_value, $prev_value);
 	}
 
 	/**
@@ -760,8 +760,8 @@ 
 	 *
 	 * @return bool               False for failure. True for success.
 	 */
-	public function delete_meta( $meta_key = '', $meta_value = '' ) {
-		return Give()->customer_meta->delete_meta( $this->id, $meta_key, $meta_value );
+	public function delete_meta($meta_key = '', $meta_value = '') {
+		return Give()->customer_meta->delete_meta($this->id, $meta_key, $meta_value);
 	}
 
 	/**
@@ -774,51 +774,51 @@ 
 	 *
 	 * @return array       The sanitized data, based off column defaults.
 	 */
-	private function sanitize_columns( $data ) {
+	private function sanitize_columns($data) {
 
 		$columns        = $this->db->get_columns();
 		$default_values = $this->db->get_column_defaults();
 
-		foreach ( $columns as $key => $type ) {
+		foreach ($columns as $key => $type) {
 
 			// Only sanitize data that we were provided
-			if ( ! array_key_exists( $key, $data ) ) {
+			if ( ! array_key_exists($key, $data)) {
 				continue;
 			}
 
-			switch ( $type ) {
+			switch ($type) {
 
 				case '%s':
-					if ( 'email' == $key ) {
-						$data[ $key ] = sanitize_email( $data[ $key ] );
-					} elseif ( 'notes' == $key ) {
-						$data[ $key ] = strip_tags( $data[ $key ] );
+					if ('email' == $key) {
+						$data[$key] = sanitize_email($data[$key]);
+					} elseif ('notes' == $key) {
+						$data[$key] = strip_tags($data[$key]);
 					} else {
-						$data[ $key ] = sanitize_text_field( $data[ $key ] );
+						$data[$key] = sanitize_text_field($data[$key]);
 					}
 					break;
 
 				case '%d':
-					if ( ! is_numeric( $data[ $key ] ) || (int) $data[ $key ] !== absint( $data[ $key ] ) ) {
-						$data[ $key ] = $default_values[ $key ];
+					if ( ! is_numeric($data[$key]) || (int) $data[$key] !== absint($data[$key])) {
+						$data[$key] = $default_values[$key];
 					} else {
-						$data[ $key ] = absint( $data[ $key ] );
+						$data[$key] = absint($data[$key]);
 					}
 					break;
 
 				case '%f':
 					// Convert what was given to a float
-					$value = floatval( $data[ $key ] );
+					$value = floatval($data[$key]);
 
-					if ( ! is_float( $value ) ) {
-						$data[ $key ] = $default_values[ $key ];
+					if ( ! is_float($value)) {
+						$data[$key] = $default_values[$key];
 					} else {
-						$data[ $key ] = $value;
+						$data[$key] = $value;
 					}
 					break;
 
 				default:
-					$data[ $key ] = sanitize_text_field( $data[ $key ] );
+					$data[$key] = sanitize_text_field($data[$key]);
 					break;
 
 			}

includes/class-give-email-access.php

Indentation +2 added lines, -2 removed lines

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

Spacing +62 added lines, -62 removed lines

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