WordImpress / Give

includes/admin/reporting/tools/class-give-tools-recount-all-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 +99 added lines, -99 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -55,26 +55,26 @@ 
 	public function get_data() {
 		global $give_logs, $wpdb;
 
-		$totals             = $this->get_stored_data( 'give_temp_recount_all_stats' );
-		$payment_items      = $this->get_stored_data( 'give_temp_payment_items' );
-		$processed_payments = $this->get_stored_data( 'give_temp_processed_payments' );
-		$accepted_statuses  = apply_filters( 'give_recount_accepted_statuses', array( 'publish' ) );
+		$totals             = $this->get_stored_data('give_temp_recount_all_stats');
+		$payment_items      = $this->get_stored_data('give_temp_payment_items');
+		$processed_payments = $this->get_stored_data('give_temp_processed_payments');
+		$accepted_statuses  = apply_filters('give_recount_accepted_statuses', array('publish'));
 
-		if ( false === $totals ) {
+		if (false === $totals) {
 			$totals = array();
 		}
 
-		if ( false === $payment_items ) {
+		if (false === $payment_items) {
 			$payment_items = array();
 		}
 
-		if ( false === $processed_payments ) {
+		if (false === $processed_payments) {
 			$processed_payments = array();
 		}
 
-		$all_forms = $this->get_stored_data( 'give_temp_form_ids' );
+		$all_forms = $this->get_stored_data('give_temp_form_ids');
 
-		$args = apply_filters( 'give_recount_form_stats_args', array(
+		$args = apply_filters('give_recount_form_stats_args', array(
 			'post_parent__in' => $all_forms,
 			'post_type'       => 'give_log',
 			'posts_per_page'  => $this->per_step,
@@ -82,73 +82,73 @@ 
 			'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');
 
-		if ( $log_ids ) {
-			$log_ids = implode( ',', $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 = $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);
 
 			//Loop through payments
-			foreach ( $payments as $payment ) {
+			foreach ($payments as $payment) {
 
 				// Prevent payments that have all ready been retrieved from a previous sales log from counting again.
-				if ( in_array( $payment->ID, $processed_payments ) ) {
+				if (in_array($payment->ID, $processed_payments)) {
 					continue;
 				}
 
 				//Verify accepted status'
-				if ( ! in_array( $payment->post_status, $accepted_statuses ) ) {
+				if ( ! in_array($payment->post_status, $accepted_statuses)) {
 					$processed_payments[] = $payment->ID;
 					continue;
 				}
 
-				$payment_item = $payment_items[ $payment->ID ];
+				$payment_item = $payment_items[$payment->ID];
 
 
-				$form_id = isset( $payment_item['id'] ) ? $payment_item['id'] : '';
+				$form_id = isset($payment_item['id']) ? $payment_item['id'] : '';
 
 				//Must have a form ID
-				if ( empty( $form_id ) ) {
+				if (empty($form_id)) {
 					continue;
 				}
 
 				//Form ID must be within $all_forms array to be validated
-				if ( ! in_array( $form_id, $all_forms ) ) {
+				if ( ! in_array($form_id, $all_forms)) {
 					continue;
 				}
 
 				//If array key doesn't exist, create it
-				if ( ! array_key_exists( $form_id, $totals ) ) {
-					$totals[ $form_id ] = array(
+				if ( ! array_key_exists($form_id, $totals)) {
+					$totals[$form_id] = array(
 						'sales'    => (int) 0,
 						'earnings' => (float) 0,
 					);
 				}
 
-				$totals[ $form_id ]['sales'] ++;
-				$totals[ $form_id ]['earnings'] += $payment_item['price'];
+				$totals[$form_id]['sales']++;
+				$totals[$form_id]['earnings'] += $payment_item['price'];
 
 				$processed_payments[] = $payment->ID;
 
 			}
 
-			$this->store_data( 'give_temp_processed_payments', $processed_payments );
-			$this->store_data( 'give_temp_recount_all_stats', $totals );
+			$this->store_data('give_temp_processed_payments', $processed_payments);
+			$this->store_data('give_temp_recount_all_stats', $totals);
 
 			return true;
 		}
 
-		foreach ( $totals as $key => $stats ) {
-			update_post_meta( $key, '_give_form_sales', $stats['sales'] );
-			update_post_meta( $key, '_give_form_earnings', $stats['earnings'] );
+		foreach ($totals as $key => $stats) {
+			update_post_meta($key, '_give_form_sales', $stats['sales']);
+			update_post_meta($key, '_give_form_earnings', $stats['earnings']);
 		}
 
 		return false;
@@ -163,20 +163,20 @@ 
 	 */
 	public function get_percentage_complete() {
 
-		$total = $this->get_stored_data( 'give_recount_all_total', false );
+		$total = $this->get_stored_data('give_recount_all_total', false);
 
-		if ( false === $total ) {
+		if (false === $total) {
 			$this->pre_fetch();
-			$total = $this->get_stored_data( 'give_recount_all_total', 0 );
+			$total = $this->get_stored_data('give_recount_all_total', 0);
 		}
 
 		$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;
 		}
 
@@ -190,8 +190,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;
 	}
 
 	/**
@@ -202,34 +202,34 @@ 
 	 */
 	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_all_total' );
-			$this->delete_data( 'give_temp_recount_all_stats' );
-			$this->delete_data( 'give_temp_payment_items' );
-			$this->delete_data( 'give_temp_form_ids' );
-			$this->delete_data( 'give_temp_processed_payments' );
+			$this->delete_data('give_recount_all_total');
+			$this->delete_data('give_temp_recount_all_stats');
+			$this->delete_data('give_temp_payment_items');
+			$this->delete_data('give_temp_form_ids');
+			$this->delete_data('give_temp_processed_payments');
 			$this->done    = true;
-			$this->message = esc_html__( 'Donation form income amounts and donation counts stats successfully recounted.', 'give' );
+			$this->message = esc_html__('Donation form income amounts and donation counts stats 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);
 		}
 	}
 
@@ -258,76 +258,76 @@ 
 
 		global $give_logs, $wpdb;
 
-		if ( $this->step == 1 ) {
-			$this->delete_data( 'give_temp_recount_all_total' );
-			$this->delete_data( 'give_temp_recount_all_stats' );
-			$this->delete_data( 'give_temp_payment_items' );
-			$this->delete_data( 'give_temp_processed_payments' );
+		if ($this->step == 1) {
+			$this->delete_data('give_temp_recount_all_total');
+			$this->delete_data('give_temp_recount_all_stats');
+			$this->delete_data('give_temp_payment_items');
+			$this->delete_data('give_temp_processed_payments');
 		}
 
-		$accepted_statuses = apply_filters( 'give_recount_accepted_statuses', array( 'publish' ) );
-		$total             = $this->get_stored_data( 'give_temp_recount_all_total' );
+		$accepted_statuses = apply_filters('give_recount_accepted_statuses', array('publish'));
+		$total             = $this->get_stored_data('give_temp_recount_all_total');
 
-		if ( false === $total ) {
+		if (false === $total) {
 			$total         = 0;
-			$payment_items = $this->get_stored_data( 'give_temp_payment_items' );
+			$payment_items = $this->get_stored_data('give_temp_payment_items');
 
-			if ( false === $payment_items ) {
+			if (false === $payment_items) {
 				$payment_items = array();
-				$this->store_data( 'give_temp_payment_items', $payment_items );
+				$this->store_data('give_temp_payment_items', $payment_items);
 			}
 
-			$all_forms = $this->get_stored_data( 'give_temp_form_ids' );
+			$all_forms = $this->get_stored_data('give_temp_form_ids');
 
-			if ( false === $all_forms ) {
+			if (false === $all_forms) {
 				$args = array(
 					'post_status'    => 'any',
 					'post_type'      => 'give_forms',
-					'posts_per_page' => - 1,
+					'posts_per_page' => -1,
 					'fields'         => 'ids',
 				);
 
-				$all_forms = get_posts( $args );
-				$this->store_data( 'give_temp_form_ids', $all_forms );
+				$all_forms = get_posts($args);
+				$this->store_data('give_temp_form_ids', $all_forms);
 			}
 
-			$args = apply_filters( 'give_recount_form_stats_total_args', array(
+			$args = apply_filters('give_recount_form_stats_total_args', array(
 				'post_parent__in' => $all_forms,
 				'post_type'       => 'give_log',
 				'post_status'     => 'publish',
 				'log_type'        => 'sale',
 				'fields'          => 'ids',
 				'nopaging'        => true,
-			) );
+			));
 
-			$all_logs = $give_logs->get_connected_logs( $args, 'sale' );
+			$all_logs = $give_logs->get_connected_logs($args, 'sale');
 
-			if ( $all_logs ) {
-				$log_ids     = implode( ',', $all_logs );
-				$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 ($all_logs) {
+				$log_ids     = implode(',', $all_logs);
+				$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);
 					$form_id = $payment->form_id;
 
 					//If for some reason somehow the form_ID isn't set check payment meta
-					if ( empty( $payment->form_id ) ) {
+					if (empty($payment->form_id)) {
 						$payment_meta = $payment->get_meta();
-						$form_id = isset( $payment_meta['form_id'] ) ? $payment_meta['form_id'] : 0;
+						$form_id = isset($payment_meta['form_id']) ? $payment_meta['form_id'] : 0;
 					}
 
-					if ( ! in_array( $payment->post_status, $accepted_statuses ) ) {
+					if ( ! in_array($payment->post_status, $accepted_statuses)) {
 						continue;
 					}
 
-					if ( ! array_key_exists( $payment->ID, $payment_items ) ) {
-						$payment_items[ $payment->ID ] = array(
+					if ( ! array_key_exists($payment->ID, $payment_items)) {
+						$payment_items[$payment->ID] = array(
 							'id'         => $form_id,
 							'payment_id' => $payment->ID,
 							'price'      => $payment->total
@@ -336,11 +336,11 @@ 
 
 				}
 
-				$total = count( $all_logs );
+				$total = count($all_logs);
 			}
 
-			$this->store_data( 'give_temp_payment_items', $payment_items );
-			$this->store_data( 'give_recount_all_total', $total );
+			$this->store_data('give_temp_payment_items', $payment_items);
+			$this->store_data('give_recount_all_total', $total);
 		}
 
 	}
@@ -354,11 +354,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);
 	}
 
 	/**
@@ -371,10 +371,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,
@@ -388,7 +388,7 @@ 
 			'%s',
 		);
 
-		$wpdb->replace( $wpdb->options, $data, $formats );
+		$wpdb->replace($wpdb->options, $data, $formats);
 	}
 
 	/**
@@ -400,9 +400,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-customer-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 +37 added lines, -37 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -56,32 +56,32 @@ 
 
 		$args = array(
 			'number'  => $this->per_step,
-			'offset'  => $this->per_step * ( $this->step - 1 ),
+			'offset'  => $this->per_step * ($this->step - 1),
 			'orderby' => 'id',
 			'order'   => 'DESC',
 		);
 
-		$customers = Give()->customers->get_customers( $args );
+		$customers = Give()->customers->get_customers($args);
 
-		if ( $customers ) {
+		if ($customers) {
 
-			$allowed_payment_status = apply_filters( 'give_recount_donors_donation_statuses', give_get_payment_status_keys() );
+			$allowed_payment_status = apply_filters('give_recount_donors_donation_statuses', give_get_payment_status_keys());
 
-			foreach ( $customers as $customer ) {
+			foreach ($customers as $customer) {
 
-				$attached_payment_ids = explode( ',', $customer->payment_ids );
+				$attached_payment_ids = explode(',', $customer->payment_ids);
 
 				$attached_args = array(
 					'post__in' => $attached_payment_ids,
-					'number'   => - 1,
+					'number'   => -1,
 					'status'   => $allowed_payment_status,
 				);
 
-				$attached_payments = (array) give_get_payments( $attached_args );
+				$attached_payments = (array) give_get_payments($attached_args);
 
 				$unattached_args = array(
 					'post__not_in' => $attached_payment_ids,
-					'number'       => - 1,
+					'number'       => -1,
 					'status'       => $allowed_payment_status,
 					'meta_query'   => array(
 						array(
@@ -92,29 +92,29 @@ 
 					),
 				);
 
-				$unattached_payments = give_get_payments( $unattached_args );
+				$unattached_payments = give_get_payments($unattached_args);
 
-				$payments = array_merge( $attached_payments, $unattached_payments );
+				$payments = array_merge($attached_payments, $unattached_payments);
 
 				$purchase_value = 0.00;
 				$purchase_count = 0;
 				$payment_ids    = array();
 
-				if ( $payments ) {
+				if ($payments) {
 
-					foreach ( $payments as $payment ) {
+					foreach ($payments as $payment) {
 
 						$should_process_payment = 'publish' == $payment->post_status ? true : false;
-						$should_process_payment = apply_filters( 'give_donor_recount_should_process_donation', $should_process_payment, $payment );
+						$should_process_payment = apply_filters('give_donor_recount_should_process_donation', $should_process_payment, $payment);
 
-						if ( true === $should_process_payment ) {
+						if (true === $should_process_payment) {
 
-							if ( apply_filters( 'give_customer_recount_should_increase_value', true, $payment ) ) {
-								$purchase_value += give_get_payment_amount( $payment->ID );
+							if (apply_filters('give_customer_recount_should_increase_value', true, $payment)) {
+								$purchase_value += give_get_payment_amount($payment->ID);
 							}
 
-							if ( apply_filters( 'give_customer_recount_should_increase_count', true, $payment ) ) {
-								$purchase_count ++;
+							if (apply_filters('give_customer_recount_should_increase_count', true, $payment)) {
+								$purchase_count++;
 							}
 
 						}
@@ -124,7 +124,7 @@ 
 
 				}
 
-				$payment_ids = implode( ',', $payment_ids );
+				$payment_ids = implode(',', $payment_ids);
 
 				$customer_update_data = array(
 					'purchase_count' => $purchase_count,
@@ -132,8 +132,8 @@ 
 					'payment_ids'    => $payment_ids,
 				);
 
-				$customer_instance = new Give_Customer( $customer->id );
-				$customer_instance->update( $customer_update_data );
+				$customer_instance = new Give_Customer($customer->id);
+				$customer_instance->update($customer_update_data);
 
 			}
 
@@ -153,21 +153,21 @@ 
 	public function get_percentage_complete() {
 
 		$args = array(
-			'number'  => - 1,
+			'number'  => -1,
 			'orderby' => 'id',
 			'order'   => 'DESC',
 		);
 
-		$customers = Give()->customers->get_customers( $args );
-		$total     = count( $customers );
+		$customers = Give()->customers->get_customers($args);
+		$total     = count($customers);
 
 		$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;
 		}
 
@@ -181,7 +181,7 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
+	public function set_properties($request) {
 	}
 
 	/**
@@ -192,19 +192,19 @@ 
 	 */
 	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->done    = true;
-			$this->message = esc_html__( 'Donor stats have been successfully recounted.', 'give' );
+			$this->message = esc_html__('Donor stats have been successfully recounted.', 'give');
 
 			return false;
 		}
@@ -214,10 +214,10 @@ 
 	 * Headers
 	 */
 	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);
 		}
 	}
 

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__( 'Income stats have been successfully recounted.', 'give' );
+			$this->message = esc_html__('Income stats have been 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;
 
 	}
 
@@ -70,14 +70,14 @@ 
 
 		$cols = array();
 
-		$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;
 	}
@@ -85,38 +85,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;
 			}
 		}
@@ -139,20 +139,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',
@@ -161,33 +161,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;
 	}
@@ -203,19 +203,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;
 		}
 
@@ -227,46 +227,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( give_date_format(), strtotime( $donor->date_created ) );
+		if ( ! empty($columns['date_first_donated'])) {
+			$data[$i]['date_first_donated'] = date_i18n(give_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_donation_form_before_personal_info', 'give_print_errors' );
-add_action( 'give_ajax_donation_errors', 'give_print_errors' );
+add_action('give_donation_form_before_personal_info', 'give_print_errors');
+add_action('give_ajax_donation_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 void
  */
-function give_unset_error( $error_id ) {
+function give_unset_error($error_id) {
 	$errors = give_get_errors();
-	if ( $errors ) {
-		unset( $errors[ $error_id ] );
-		Give()->session->set( 'give_errors', $errors );
+	if ($errors) {
+		unset($errors[$error_id]);
+		Give()->session->set('give_errors', $errors);
 	}
 }
 
@@ -129,7 +129,7 @@ 
  * @return string|void
  */
 function _give_die_handler() {
-	if ( defined( 'GIVE_UNIT_TESTS' ) ) {
+	if (defined('GIVE_UNIT_TESTS')) {
 		return '_give_die_handler';
 	} else {
 		die();
@@ -149,10 +149,10 @@ 
  *
  * @return void
  */
-function give_die( $message = '', $title = '', $status = 400 ) {
-	add_filter( 'wp_die_ajax_handler', '_give_die_handler', 10, 3 );
-	add_filter( 'wp_die_handler', '_give_die_handler', 10, 3 );
-	wp_die( $message, $title, array( 'response' => $status ) );
+function give_die($message = '', $title = '', $status = 400) {
+	add_filter('wp_die_ajax_handler', '_give_die_handler', 10, 3);
+	add_filter('wp_die_handler', '_give_die_handler', 10, 3);
+	wp_die($message, $title, array('response' => $status));
 }
 
 /**
@@ -168,10 +168,10 @@ 
  *
  * @return   string  $error
  */
-function give_output_error( $message, $echo = true, $error_id = 'warning' ) {
-	$error = '<div class="give_errors" id="give_error_' . $error_id . '"><p class="give_error  give_' . $error_id . '">' . $message . '</p></div>';
+function give_output_error($message, $echo = true, $error_id = 'warning') {
+	$error = '<div class="give_errors" id="give_error_'.$error_id.'"><p class="give_error  give_'.$error_id.'">'.$message.'</p></div>';
 
-	if ( $echo ) {
+	if ($echo) {
 		echo $error;
 	} else {
 		return $error;

includes/shortcodes.php

Indentation +5 added lines, -5 removed lines

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

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' ) );

Spacing +116 added lines, -116 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,36 +26,36 @@ 
 function give_donation_history() {
 
 	// If payment_key query arg exists, return receipt instead of donation history.
-	if ( isset( $_GET['payment_key'] ) ) {
+	if (isset($_GET['payment_key'])) {
 		ob_start();
-		echo give_receipt_shortcode( array() );
-		echo '<a href="' . esc_url( give_get_history_page_uri() ) . '">&laquo; ' . esc_html__( 'Return to All Donations', 'give' ) . '</a>';
+		echo give_receipt_shortcode(array());
+		echo '<a href="'.esc_url(give_get_history_page_uri()).'">&laquo; '.esc_html__('Return to All Donations', 'give').'</a>';
 
 		return ob_get_clean();
 	}
 
-	$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
@@ -68,53 +68,53 @@ 
  *
  * @return string
  */
-function give_form_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_form_shortcode($atts) {
+	$atts = shortcode_atts(array(
 		'id'            => '',
 		'show_title'    => true,
 		'show_goal'     => true,
 		'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.
@@ -127,37 +127,37 @@ 
  *
  * @return string
  */
-function give_goal_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_goal_shortcode($atts) {
+	$atts = shortcode_atts(array(
 		'id'        => '',
 		'show_text' => true,
 		'show_bar'  => true,
-	), $atts, 'give_goal' );
+	), $atts, 'give_goal');
 
 
 	//get the Give Form.
 	ob_start();
 
 	//Sanity check 1: ensure there is an ID Provided.
-	if ( empty( $atts['id'] ) ) {
-		give_output_error( esc_html__( 'The shortcode is missing Donation Form ID attribute.', 'give' ), true );
+	if (empty($atts['id'])) {
+		give_output_error(esc_html__('The shortcode is missing Donation Form ID attribute.', 'give'), true);
 	}
 
 	//Sanity check 2: Check the form even has Goals enabled.
-	$goal_option = get_post_meta( $atts['id'], '_give_goal_option', true );
-	if ( empty( $goal_option ) || $goal_option !== 'yes' ) {
-		give_output_error( esc_html__( 'The form does not have Goals enabled.', 'give' ), true );
+	$goal_option = get_post_meta($atts['id'], '_give_goal_option', true);
+	if (empty($goal_option) || $goal_option !== 'yes') {
+		give_output_error(esc_html__('The form does not have Goals enabled.', 'give'), true);
 	} else {
 		//Passed all sanity checks: output Goal.
-		give_show_goal_progress( $atts['id'], $atts );
+		give_show_goal_progress($atts['id'], $atts);
 	}
 
 	$final_output = ob_get_clean();
 
-	return apply_filters( 'give_goal_shortcode_output', $final_output, $atts );
+	return apply_filters('give_goal_shortcode_output', $final_output, $atts);
 }
 
-add_shortcode( 'give_goal', 'give_goal_shortcode' );
+add_shortcode('give_goal', 'give_goal_shortcode');
 
 
 /**
@@ -174,22 +174,22 @@ 
  *
  * @return string
  */
-function give_login_form_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_login_form_shortcode($atts) {
+	$atts = shortcode_atts(array(
         // Add backward compatibility for redirect attribute.
         'redirect'          => '',
 
 		'login-redirect'    => '',
 		'logout-redirect'   => '',
-	), $atts, 'give_login' );
+	), $atts, 'give_login');
 
     // Check login-redirect attribute first, if it empty or not found then check for redirect attribute and add value of this to login-redirect attribute.
-    $atts['login-redirect'] = ! empty( $atts['login-redirect'] ) ? $atts['login-redirect'] : ( ! empty( $atts['redirect' ] ) ? $atts['redirect'] : '' );
+    $atts['login-redirect'] = ! empty($atts['login-redirect']) ? $atts['login-redirect'] : ( ! empty($atts['redirect']) ? $atts['redirect'] : '');
 
-	return give_login_form( $atts['login-redirect'], $atts['logout-redirect'] );
+	return give_login_form($atts['login-redirect'], $atts['logout-redirect']);
 }
 
-add_shortcode( 'give_login', 'give_login_form_shortcode' );
+add_shortcode('give_login', 'give_login_form_shortcode');
 
 /**
  * Register Shortcode.
@@ -204,15 +204,15 @@ 
  *
  * @return string
  */
-function give_register_form_shortcode( $atts ) {
-	$atts = shortcode_atts( array(
+function give_register_form_shortcode($atts) {
+	$atts = shortcode_atts(array(
 		'redirect' => '',
-	), $atts, 'give_register' );
+	), $atts, 'give_register');
 
-	return give_register_form( $atts['redirect'] );
+	return give_register_form($atts['redirect']);
 }
 
-add_shortcode( 'give_register', 'give_register_form_shortcode' );
+add_shortcode('give_register', 'give_register_form_shortcode');
 
 /**
  * Receipt Shortcode.
@@ -225,12 +225,12 @@ 
  *
  * @return string
  */
-function give_receipt_shortcode( $atts ) {
+function give_receipt_shortcode($atts) {
 
 	global $give_receipt_args, $payment;
 
-	$give_receipt_args = shortcode_atts( array(
-		'error'          => esc_html__( 'You are missing the payment key to view this donation receipt.', 'give' ),
+	$give_receipt_args = shortcode_atts(array(
+		'error'          => esc_html__('You are missing the payment key to view this donation receipt.', 'give'),
 		'price'          => true,
 		'donor'          => true,
 		'date'           => true,
@@ -239,50 +239,50 @@ 
 		'payment_id'     => true,
 		'payment_status' => false,
 		'status_notice'  => true,
-	), $atts, 'give_receipt' );
+	), $atts, 'give_receipt');
 
 	//set $session var
 	$session = give_get_purchase_session();
 
 	//set payment key var
-	if ( isset( $_GET['payment_key'] ) ) {
-		$payment_key = urldecode( $_GET['payment_key'] );
-	} elseif ( $session ) {
+	if (isset($_GET['payment_key'])) {
+		$payment_key = urldecode($_GET['payment_key']);
+	} elseif ($session) {
 		$payment_key = $session['purchase_key'];
-	} elseif ( $give_receipt_args['payment_key'] ) {
+	} elseif ($give_receipt_args['payment_key']) {
 		$payment_key = $give_receipt_args['payment_key'];
 	}
 
-	$email_access = give_get_option( 'email_access' );
+	$email_access = give_get_option('email_access');
 
 	// No payment_key found & Email Access is Turned on:
-	if ( ! isset( $payment_key ) && $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;
 
@@ -290,9 +290,9 @@ 
 
 		ob_start();
 
-		give_output_error( apply_filters( 'give_must_be_logged_in_error_message', esc_html__( 'You must be logged in to view this donation receipt.', 'give' ) ) );
+		give_output_error(apply_filters('give_must_be_logged_in_error_message', esc_html__('You must be logged in to view this donation receipt.', 'give')));
 
-		give_get_template_part( 'shortcode', 'login' );
+		give_get_template_part('shortcode', 'login');
 
 		$login_form = ob_get_clean();
 
@@ -307,20 +307,20 @@ 
 	 * 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();
 
 	return $display;
 }
 
-add_shortcode( 'give_receipt', 'give_receipt_shortcode' );
+add_shortcode('give_receipt', 'give_receipt_shortcode');
 
 /**
  * Profile Editor Shortcode.
@@ -339,18 +339,18 @@ 
  *
  * @return string Output generated from the profile editor
  */
-function give_profile_editor_shortcode( $atts ) {
+function give_profile_editor_shortcode($atts) {
 
 	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.
@@ -363,30 +363,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,
@@ -414,46 +414,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.
@@ -463,12 +463,12 @@ 
 		 * @param int   $user_id  The ID of the user.
 		 * @param array $userdata User info, including ID, first name, last name, display name and email.
 		 */
-		do_action( 'give_user_profile_updated', $user_id, $userdata );
-		wp_redirect( add_query_arg( 'updated', 'true', $data['give_redirect'] ) );
+		do_action('give_user_profile_updated', $user_id, $userdata);
+		wp_redirect(add_query_arg('updated', 'true', $data['give_redirect']));
 		give_die();
 	}
 
 	return false;
 }
 
-add_action( 'give_edit_user_profile', 'give_process_profile_editor_updates' );
+add_action('give_edit_user_profile', 'give_process_profile_editor_updates');

includes/admin/upgrades/upgrades.php

Braces +5 added lines, -2 removed lines

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

Spacing +17 added lines, -17 removed lines

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

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

Spacing +32 added lines, -32 removed lines

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