WordImpress / Give

includes/admin/reports/graphing.php

Spacing +246 added lines, -246 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,7 +25,7 @@ 
 	$dates = give_get_report_dates();
 
 	// Determine graph options
-	switch ( $dates['range'] ) :
+	switch ($dates['range']) :
 		case 'today' :
 		case 'yesterday' :
 			$day_by_day = true;
@@ -37,7 +37,7 @@ 
 			$day_by_day = false;
 			break;
 		case 'other' :
-			if ( $dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] && ( $dates['m_start'] != '12' && $dates['m_end'] != '1' ) ) {
+			if ($dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] && ($dates['m_start'] != '12' && $dates['m_end'] != '1')) {
 				$day_by_day = false;
 			} else {
 				$day_by_day = true;
@@ -49,61 +49,61 @@ 
 	endswitch;
 
 	$earnings_totals = 0.00; // Total earnings for time period shown
-	$sales_totals    = 0;            // Total sales for time period shown
+	$sales_totals    = 0; // Total sales for time period shown
 
 	$earnings_data = array();
 	$sales_data    = array();
 
-	if ( $dates['range'] == 'today' || $dates['range'] == 'yesterday' ) {
+	if ($dates['range'] == 'today' || $dates['range'] == 'yesterday') {
 		// Hour by hour
 		$hour  = 1;
-		$month = date( 'n', current_time( 'timestamp' ) );
-		while ( $hour <= 23 ) :
+		$month = date('n', current_time('timestamp'));
+		while ($hour <= 23) :
 
-			$sales    = give_get_sales_by_date( $dates['day'], $month, $dates['year'], $hour );
-			$earnings = give_get_earnings_by_date( $dates['day'], $month, $dates['year'], $hour );
+			$sales    = give_get_sales_by_date($dates['day'], $month, $dates['year'], $hour);
+			$earnings = give_get_earnings_by_date($dates['day'], $month, $dates['year'], $hour);
 
 			$sales_totals += $sales;
 			$earnings_totals += $earnings;
 
-			$date            = mktime( $hour, 0, 0, $month, $dates['day'], $dates['year'] ) * 1000;
-			$sales_data[]    = array( $date, $sales );
-			$earnings_data[] = array( $date, $earnings );
+			$date            = mktime($hour, 0, 0, $month, $dates['day'], $dates['year']) * 1000;
+			$sales_data[]    = array($date, $sales);
+			$earnings_data[] = array($date, $earnings);
 
-			$hour ++;
+			$hour++;
 		endwhile;
 
-	} elseif ( $dates['range'] == 'this_week' || $dates['range'] == 'last_week' ) {
+	} elseif ($dates['range'] == 'this_week' || $dates['range'] == 'last_week') {
 
 		// Day by day
 		$day     = $dates['day'];
 		$day_end = $dates['day_end'];
 		$month   = $dates['m_start'];
-		while ( $day <= $day_end ) :
-			$sales = give_get_sales_by_date( $day, $month, $dates['year'] );
+		while ($day <= $day_end) :
+			$sales = give_get_sales_by_date($day, $month, $dates['year']);
 			$sales_totals += $sales;
 
-			$earnings = give_get_earnings_by_date( $day, $month, $dates['year'] );
+			$earnings = give_get_earnings_by_date($day, $month, $dates['year']);
 			$earnings_totals += $earnings;
 
-			$date            = mktime( 0, 0, 0, $month, $day, $dates['year'] ) * 1000;
-			$sales_data[]    = array( $date, $sales );
-			$earnings_data[] = array( $date, $earnings );
-			$day ++;
+			$date            = mktime(0, 0, 0, $month, $day, $dates['year']) * 1000;
+			$sales_data[]    = array($date, $sales);
+			$earnings_data[] = array($date, $earnings);
+			$day++;
 		endwhile;
 
 	} else {
 
 		$y = $dates['year'];
-		while ( $y <= $dates['year_end'] ) :
+		while ($y <= $dates['year_end']) :
 
-			if ( $dates['year'] == $dates['year_end'] ) {
+			if ($dates['year'] == $dates['year_end']) {
 				$month_start = $dates['m_start'];
 				$month_end   = $dates['m_end'];
-			} elseif ( $y == $dates['year'] ) {
+			} elseif ($y == $dates['year']) {
 				$month_start = $dates['m_start'];
 				$month_end   = 12;
-			} elseif ( $y == $dates['year_end'] ) {
+			} elseif ($y == $dates['year_end']) {
 				$month_start = 1;
 				$month_end   = $dates['m_end'];
 			} else {
@@ -112,48 +112,48 @@ 
 			}
 
 			$i = $month_start;
-			while ( $i <= $month_end ) :
+			while ($i <= $month_end) :
 
-				if ( $day_by_day ) {
+				if ($day_by_day) {
 
-					if ( $i == $month_end ) {
+					if ($i == $month_end) {
 
 						$num_of_days = $dates['day_end'];
 
 					} else {
 
-						$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+						$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
 					}
 
 					$d = $dates['day'];
 
-					while ( $d <= $num_of_days ) :
+					while ($d <= $num_of_days) :
 
-						$sales = give_get_sales_by_date( $d, $i, $y );
+						$sales = give_get_sales_by_date($d, $i, $y);
 						$sales_totals += $sales;
 
-						$earnings = give_get_earnings_by_date( $d, $i, $y );
+						$earnings = give_get_earnings_by_date($d, $i, $y);
 						$earnings_totals += $earnings;
 
-						$date            = mktime( 0, 0, 0, $i, $d, $y ) * 1000;
-						$sales_data[]    = array( $date, $sales );
-						$earnings_data[] = array( $date, $earnings );
-						$d ++;
+						$date            = mktime(0, 0, 0, $i, $d, $y) * 1000;
+						$sales_data[]    = array($date, $sales);
+						$earnings_data[] = array($date, $earnings);
+						$d++;
 
 					endwhile;
 
 				} else {
 
-					$sales = give_get_sales_by_date( null, $i, $y );
+					$sales = give_get_sales_by_date(null, $i, $y);
 					$sales_totals += $sales;
 
-					$earnings = give_get_earnings_by_date( null, $i, $y );
+					$earnings = give_get_earnings_by_date(null, $i, $y);
 					$earnings_totals += $earnings;
 
-					if ( $i == $month_end ) {
+					if ($i == $month_end) {
 
-						$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+						$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
 					} else {
 
@@ -161,24 +161,24 @@ 
 
 					}
 
-					$date            = mktime( 0, 0, 0, $i, $num_of_days, $y ) * 1000;
-					$sales_data[]    = array( $date, $sales );
-					$earnings_data[] = array( $date, $earnings );
+					$date            = mktime(0, 0, 0, $i, $num_of_days, $y) * 1000;
+					$sales_data[]    = array($date, $sales);
+					$earnings_data[] = array($date, $earnings);
 
 				}
 
-				$i ++;
+				$i++;
 
 			endwhile;
 
-			$y ++;
+			$y++;
 		endwhile;
 
 	}
 
 	$data = array(
-		esc_html__( 'Income', 'give' )    => $earnings_data,
-		esc_html__( 'Donations', 'give' ) => $sales_data
+		esc_html__('Income', 'give')    => $earnings_data,
+		esc_html__('Donations', 'give') => $sales_data
 	);
 
 	// start our own output buffer
@@ -191,12 +191,12 @@ 
 				<div class="inside">
 					<?php give_reports_graph_controls(); ?>
 					<?php
-					$graph = new Give_Graph( $data, array( 'dataType' => array( 'amount', 'count' ) ) );
-					$graph->set( 'x_mode', 'time' );
-					$graph->set( 'multiple_y_axes', true );
+					$graph = new Give_Graph($data, array('dataType' => array('amount', 'count')));
+					$graph->set('x_mode', 'time');
+					$graph->set('multiple_y_axes', true);
 					$graph->display();
 
-					if ( 'this_month' == $dates['range'] ) {
+					if ('this_month' == $dates['range']) {
 						$estimated = give_estimated_monthly_stats();
 					}
 					?>
@@ -205,21 +205,21 @@ 
 			<table class="widefat reports-table alignleft" style="max-width:450px">
 				<tbody>
 				<tr>
-					<th scope="row"><strong><?php esc_html_e( 'Total income for period:', 'give' ); ?></strong></th>
-					<td><?php echo give_currency_filter( give_format_amount( $earnings_totals, array( 'sanitize' => false ) ) ); ?></td>
+					<th scope="row"><strong><?php esc_html_e('Total income for period:', 'give'); ?></strong></th>
+					<td><?php echo give_currency_filter(give_format_amount($earnings_totals, array('sanitize' => false))); ?></td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><strong><?php esc_html_e( 'Total donations for period:', 'give' ); ?><strong></th>
+					<th scope="row"><strong><?php esc_html_e('Total donations for period:', 'give'); ?><strong></th>
 					<td><?php echo $sales_totals; ?></td>
 				</tr>
-				<?php if ( 'this_month' == $dates['range'] ) : ?>
+				<?php if ('this_month' == $dates['range']) : ?>
 					<tr>
-						<th scope="row"><strong><?php esc_html_e( 'Estimated monthly income:', 'give' ); ?></strong></th>
-						<td><?php echo give_currency_filter( give_format_amount( $estimated['earnings'], array( 'sanitize' => false ) ) ); ?></td>
+						<th scope="row"><strong><?php esc_html_e('Estimated monthly income:', 'give'); ?></strong></th>
+						<td><?php echo give_currency_filter(give_format_amount($estimated['earnings'], array('sanitize' => false))); ?></td>
 					</tr>
 					<tr class="alternate">
-						<th scope="row"><strong><?php esc_html_e( 'Estimated monthly donations:', 'give' ); ?></strong></th>
-						<td><?php echo floor( $estimated['sales'] ); ?></td>
+						<th scope="row"><strong><?php esc_html_e('Estimated monthly donations:', 'give'); ?></strong></th>
+						<td><?php echo floor($estimated['sales']); ?></td>
 					</tr>
 				<?php endif; ?>
 			</table>
@@ -232,7 +232,7 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_reports_graph_additional_stats' );
+			do_action('give_reports_graph_additional_stats');
 			?>
 
 		</div>
@@ -251,12 +251,12 @@ 
  * @since 1.0
  * @return void
  */
-function give_reports_graph_of_form( $form_id = 0 ) {
+function give_reports_graph_of_form($form_id = 0) {
 	// Retrieve the queried dates
 	$dates = give_get_report_dates();
 
 	// Determine graph options
-	switch ( $dates['range'] ) :
+	switch ($dates['range']) :
 		case 'today' :
 		case 'yesterday' :
 			$day_by_day = true;
@@ -274,7 +274,7 @@ 
 			$day_by_day = false;
 			break;
 		case 'other' :
-			if ( $dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] ) {
+			if ($dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year']) {
 				$day_by_day = false;
 			} else {
 				$day_by_day = true;
@@ -286,75 +286,75 @@ 
 	endswitch;
 
 	$earnings_totals = (float) 0.00; // Total earnings for time period shown
-	$sales_totals    = 0;            // Total sales for time period shown
+	$sales_totals    = 0; // Total sales for time period shown
 
 	$earnings_data = array();
 	$sales_data    = array();
 	$stats         = new Give_Payment_Stats;
 
-	if ( $dates['range'] == 'today' || $dates['range'] == 'yesterday' ) {
+	if ($dates['range'] == 'today' || $dates['range'] == 'yesterday') {
 
 		// Hour by hour
 		$month  = $dates['m_start'];
 		$hour   = 1;
 		$minute = 0;
 		$second = 0;
-		while ( $hour <= 23 ) :
+		while ($hour <= 23) :
 
-			if ( $hour == 23 ) {
+			if ($hour == 23) {
 				$minute = $second = 59;
 			}
 
-			$date     = mktime( $hour, $minute, $second, $month, $dates['day'], $dates['year'] );
-			$date_end = mktime( $hour + 1, $minute, $second, $month, $dates['day'], $dates['year'] );
+			$date     = mktime($hour, $minute, $second, $month, $dates['day'], $dates['year']);
+			$date_end = mktime($hour + 1, $minute, $second, $month, $dates['day'], $dates['year']);
 
-			$sales = $stats->get_sales( $form_id, $date, $date_end );
+			$sales = $stats->get_sales($form_id, $date, $date_end);
 			$sales_totals += $sales;
 
-			$earnings = $stats->get_earnings( $form_id, $date, $date_end );
+			$earnings = $stats->get_earnings($form_id, $date, $date_end);
 			$earnings_totals += $earnings;
 
-			$sales_data[]    = array( $date * 1000, $sales );
-			$earnings_data[] = array( $date * 1000, $earnings );
+			$sales_data[]    = array($date * 1000, $sales);
+			$earnings_data[] = array($date * 1000, $earnings);
 
-			$hour ++;
+			$hour++;
 		endwhile;
 
-	} elseif ( $dates['range'] == 'this_week' || $dates['range'] == 'last_week' ) {
+	} elseif ($dates['range'] == 'this_week' || $dates['range'] == 'last_week') {
 
 		//Day by day
 		$day     = $dates['day'];
 		$day_end = $dates['day_end'];
 		$month   = $dates['m_start'];
-		while ( $day <= $day_end ) :
+		while ($day <= $day_end) :
 
-			$date     = mktime( 0, 0, 0, $month, $day, $dates['year'] );
-			$date_end = mktime( 0, 0, 0, $month, $day + 1, $dates['year'] );
-			$sales    = $stats->get_sales( $form_id, $date, $date_end );
+			$date     = mktime(0, 0, 0, $month, $day, $dates['year']);
+			$date_end = mktime(0, 0, 0, $month, $day + 1, $dates['year']);
+			$sales    = $stats->get_sales($form_id, $date, $date_end);
 			$sales_totals += $sales;
 
-			$earnings = $stats->get_earnings( $form_id, $date, $date_end );
+			$earnings = $stats->get_earnings($form_id, $date, $date_end);
 			$earnings_totals += $earnings;
 
-			$sales_data[]    = array( $date * 1000, $sales );
-			$earnings_data[] = array( $date * 1000, $earnings );
+			$sales_data[]    = array($date * 1000, $sales);
+			$earnings_data[] = array($date * 1000, $earnings);
 
-			$day ++;
+			$day++;
 		endwhile;
 
 	} else {
 
 		$y = $dates['year'];
 
-		while ( $y <= $dates['year_end'] ) :
+		while ($y <= $dates['year_end']) :
 
 			$last_year = false;
 
-			if ( $dates['year'] == $dates['year_end'] ) {
+			if ($dates['year'] == $dates['year_end']) {
 				$month_start = $dates['m_start'];
 				$month_end   = $dates['m_end'];
 				$last_year   = true;
-			} elseif ( $y == $dates['year'] ) {
+			} elseif ($y == $dates['year']) {
 				$month_start = $dates['m_start'];
 				$month_end   = 12;
 			} else {
@@ -363,76 +363,76 @@ 
 			}
 
 			$i = $month_start;
-			while ( $i <= $month_end ) :
+			while ($i <= $month_end) :
 
-				if ( $day_by_day ) {
+				if ($day_by_day) {
 
-					if ( $i == $month_end && $last_year ) {
+					if ($i == $month_end && $last_year) {
 
 						$num_of_days = $dates['day_end'];
 
 					} else {
 
-						$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+						$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
 					}
 
 					$d = $dates['day'];
-					while ( $d <= $num_of_days ) :
+					while ($d <= $num_of_days) :
 
-						$date     = mktime( 0, 0, 0, $i, $d, $y );
-						$end_date = mktime( 23, 59, 59, $i, $d, $y );
+						$date     = mktime(0, 0, 0, $i, $d, $y);
+						$end_date = mktime(23, 59, 59, $i, $d, $y);
 
-						$sales = $stats->get_sales( $form_id, $date, $end_date );
+						$sales = $stats->get_sales($form_id, $date, $end_date);
 						$sales_totals += $sales;
 
-						$earnings = $stats->get_earnings( $form_id, $date, $end_date );
+						$earnings = $stats->get_earnings($form_id, $date, $end_date);
 						$earnings_totals += $earnings;
 
-						$sales_data[]    = array( $date * 1000, $sales );
-						$earnings_data[] = array( $date * 1000, $earnings );
-						$d ++;
+						$sales_data[]    = array($date * 1000, $sales);
+						$earnings_data[] = array($date * 1000, $earnings);
+						$d++;
 
 					endwhile;
 
 				} else {
 
-					$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+					$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
-					$date     = mktime( 0, 0, 0, $i, 1, $y );
-					$end_date = mktime( 23, 59, 59, $i, $num_of_days, $y );
+					$date     = mktime(0, 0, 0, $i, 1, $y);
+					$end_date = mktime(23, 59, 59, $i, $num_of_days, $y);
 
-					$sales = $stats->get_sales( $form_id, $date, $end_date );
+					$sales = $stats->get_sales($form_id, $date, $end_date);
 					$sales_totals += $sales;
 
-					$earnings = $stats->get_earnings( $form_id, $date, $end_date );
+					$earnings = $stats->get_earnings($form_id, $date, $end_date);
 					$earnings_totals += $earnings;
 
-					$sales_data[]    = array( $date * 1000, $sales );
-					$earnings_data[] = array( $date * 1000, $earnings );
+					$sales_data[]    = array($date * 1000, $sales);
+					$earnings_data[] = array($date * 1000, $earnings);
 
 				}
 
-				$i ++;
+				$i++;
 
 			endwhile;
 
-			$y ++;
+			$y++;
 		endwhile;
 
 	}
 
 	$data = array(
-		esc_html__( 'Income', 'give' )    => $earnings_data,
-		esc_html__( 'Donations', 'give' ) => $sales_data
+		esc_html__('Income', 'give')    => $earnings_data,
+		esc_html__('Donations', 'give') => $sales_data
 	);
 
 	?>
 	<h3><span><?php
 		printf(
 			/* translators: %s: form title */
-			esc_html__( 'Income Report for %s', 'give' ),
-			get_the_title( $form_id )
+			esc_html__('Income Report for %s', 'give'),
+			get_the_title($form_id)
 		);
 	?></span></h3>
 	<div id="give-dashboard-widgets-wrap">
@@ -441,9 +441,9 @@ 
 				<div class="inside">
 					<?php give_reports_graph_controls(); ?>
 					<?php
-					$graph = new Give_Graph( $data, array( 'dataType' => array( 'amount', 'count' ) ) );
-					$graph->set( 'x_mode', 'time' );
-					$graph->set( 'multiple_y_axes', true );
+					$graph = new Give_Graph($data, array('dataType' => array('amount', 'count')));
+					$graph->set('x_mode', 'time');
+					$graph->set('multiple_y_axes', true);
 					$graph->display();
 					?>
 				</div>
@@ -452,20 +452,20 @@ 
 			<table class="widefat reports-table alignleft" style="max-width:450px">
 				<tbody>
 				<tr>
-					<th scope="row"><strong><?php esc_html_e( 'Total income for period:', 'give' ); ?></strong></th>
-					<td><?php echo give_currency_filter( give_format_amount( $earnings_totals, array( 'sanitize' => false ) ) ); ?></td>
+					<th scope="row"><strong><?php esc_html_e('Total income for period:', 'give'); ?></strong></th>
+					<td><?php echo give_currency_filter(give_format_amount($earnings_totals, array('sanitize' => false))); ?></td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><strong><?php esc_html_e( 'Total donations for period:', 'give' ); ?></strong></th>
+					<th scope="row"><strong><?php esc_html_e('Total donations for period:', 'give'); ?></strong></th>
 					<td><?php echo $sales_totals; ?></td>
 				</tr>
 				<tr>
-					<th scope="row"><strong><?php esc_html_e( 'Average monthly income:', 'give' ); ?></strong></th>
-					<td><?php echo give_currency_filter( give_format_amount( give_get_average_monthly_form_earnings( $form_id ), array( 'sanitize' => false ) ) ); ?></td>
+					<th scope="row"><strong><?php esc_html_e('Average monthly income:', 'give'); ?></strong></th>
+					<td><?php echo give_currency_filter(give_format_amount(give_get_average_monthly_form_earnings($form_id), array('sanitize' => false))); ?></td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><strong><?php esc_html_e( 'Average monthly donations:', 'give' ); ?></strong></th>
-					<td><?php echo number_format( give_get_average_monthly_form_sales( $form_id ), 0 ); ?></td>
+					<th scope="row"><strong><?php esc_html_e('Average monthly donations:', 'give'); ?></strong></th>
+					<td><?php echo number_format(give_get_average_monthly_form_sales($form_id), 0); ?></td>
 				</tr>
 				</tbody>
 			</table>
@@ -484,26 +484,26 @@ 
  * @return void
  */
 function give_reports_graph_controls() {
-	$date_options = apply_filters( 'give_report_date_options', array(
-		'today'        => esc_html__( 'Today', 'give' ),
-		'yesterday'    => esc_html__( 'Yesterday', 'give' ),
-		'this_week'    => esc_html__( 'This Week', 'give' ),
-		'last_week'    => esc_html__( 'Last Week', 'give' ),
-		'this_month'   => esc_html__( 'This Month', 'give' ),
-		'last_month'   => esc_html__( 'Last Month', 'give' ),
-		'this_quarter' => esc_html__( 'This Quarter', 'give' ),
-		'last_quarter' => esc_html__( 'Last Quarter', 'give' ),
-		'this_year'    => esc_html__( 'This Year', 'give' ),
-		'last_year'    => esc_html__( 'Last Year', 'give' ),
-		'other'        => esc_html__( 'Custom', 'give' )
-	) );
+	$date_options = apply_filters('give_report_date_options', array(
+		'today'        => esc_html__('Today', 'give'),
+		'yesterday'    => esc_html__('Yesterday', 'give'),
+		'this_week'    => esc_html__('This Week', 'give'),
+		'last_week'    => esc_html__('Last Week', 'give'),
+		'this_month'   => esc_html__('This Month', 'give'),
+		'last_month'   => esc_html__('Last Month', 'give'),
+		'this_quarter' => esc_html__('This Quarter', 'give'),
+		'last_quarter' => esc_html__('Last Quarter', 'give'),
+		'this_year'    => esc_html__('This Year', 'give'),
+		'last_year'    => esc_html__('Last Year', 'give'),
+		'other'        => esc_html__('Custom', 'give')
+	));
 
 	$dates   = give_get_report_dates();
 	$display = $dates['range'] == 'other' ? '' : 'display: none;';
-	$tab     = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'earnings';
+	$tab     = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'earnings';
 
-	if ( empty( $dates['day_end'] ) ) {
-		$dates['day_end'] = cal_days_in_month( CAL_GREGORIAN, date( 'n' ), date( 'Y' ) );
+	if (empty($dates['day_end'])) {
+		$dates['day_end'] = cal_days_in_month(CAL_GREGORIAN, date('n'), date('Y'));
 	}
 
 	/**
@@ -511,7 +511,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_report_graph_controls_before' );
+	do_action('give_report_graph_controls_before');
 	?>
 	<form id="give-graphs-filter" method="get">
 		<div class="tablenav top">
@@ -519,56 +519,56 @@ 
 
 				<input type="hidden" name="post_type" value="give_forms" />
 				<input type="hidden" name="page" value="give-reports" />
-				<input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
+				<input type="hidden" name="tab" value="<?php echo esc_attr($tab); ?>" />
 
-				<?php if ( isset( $_GET['form-id'] ) ) : ?>
-					<input type="hidden" name="form-id" value="<?php echo absint( $_GET['form-id'] ); ?>" />
+				<?php if (isset($_GET['form-id'])) : ?>
+					<input type="hidden" name="form-id" value="<?php echo absint($_GET['form-id']); ?>" />
 				<?php endif; ?>
 
 				<div id="give-graphs-date-options-wrap">
 					<select id="give-graphs-date-options" name="range">
-						<?php foreach ( $date_options as $key => $option ) : ?>
-							<option value="<?php echo esc_attr( $key ); ?>"<?php selected( $key, $dates['range'] ); ?>><?php echo esc_html( $option ); ?></option>
+						<?php foreach ($date_options as $key => $option) : ?>
+							<option value="<?php echo esc_attr($key); ?>"<?php selected($key, $dates['range']); ?>><?php echo esc_html($option); ?></option>
 						<?php endforeach; ?>
 					</select>
 
-					<div id="give-date-range-options" style="<?php echo esc_attr( $display ); ?>">
-						<span class="screen-reader-text"><?php esc_html_e( 'From', 'give' ); ?>&nbsp;</span>
+					<div id="give-date-range-options" style="<?php echo esc_attr($display); ?>">
+						<span class="screen-reader-text"><?php esc_html_e('From', 'give'); ?>&nbsp;</span>
 						<select id="give-graphs-month-start" name="m_start" aria-label="Start Month">
-							<?php for ( $i = 1; $i <= 12; $i ++ ) : ?>
-								<option value="<?php echo absint( $i ); ?>" <?php echo esc_attr( selected( $i, $dates['m_start'] ) ); ?>><?php echo esc_html( give_month_num_to_name( $i ) ); ?></option>
+							<?php for ($i = 1; $i <= 12; $i++) : ?>
+								<option value="<?php echo absint($i); ?>" <?php echo esc_attr(selected($i, $dates['m_start'])); ?>><?php echo esc_html(give_month_num_to_name($i)); ?></option>
 							<?php endfor; ?>
 						</select>
 						<select id="give-graphs-day-start" name="day" aria-label="Start Day">
-							<?php for ( $i = 1; $i <= 31; $i ++ ) : ?>
-								<option value="<?php echo absint( $i ); ?>" <?php echo esc_attr( selected( $i, $dates['day'] ) ); ?>><?php echo esc_html( $i ); ?></option>
+							<?php for ($i = 1; $i <= 31; $i++) : ?>
+								<option value="<?php echo absint($i); ?>" <?php echo esc_attr(selected($i, $dates['day'])); ?>><?php echo esc_html($i); ?></option>
 							<?php endfor; ?>
 						</select>
 						<select id="give-graphs-year-start" name="year" aria-label="Start Year">
-							<?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?>
-								<option value="<?php echo absint( $i ); ?>" <?php echo esc_attr( selected( $i, $dates['year'] ) ); ?>><?php echo esc_html( $i ); ?></option>
+							<?php for ($i = 2007; $i <= date('Y'); $i++) : ?>
+								<option value="<?php echo absint($i); ?>" <?php echo esc_attr(selected($i, $dates['year'])); ?>><?php echo esc_html($i); ?></option>
 							<?php endfor; ?>
 						</select>
-						<span class="screen-reader-text"><?php esc_html_e( 'To', 'give' ); ?>&nbsp;</span>
+						<span class="screen-reader-text"><?php esc_html_e('To', 'give'); ?>&nbsp;</span>
 						<span>&ndash;</span>
 						<select id="give-graphs-month-end" name="m_end" aria-label="End Month">
-							<?php for ( $i = 1; $i <= 12; $i ++ ) : ?>
-								<option value="<?php echo absint( $i ); ?>" <?php echo esc_attr( selected( $i, $dates['m_end'] ) ); ?>><?php echo esc_html( give_month_num_to_name( $i ) ); ?></option>
+							<?php for ($i = 1; $i <= 12; $i++) : ?>
+								<option value="<?php echo absint($i); ?>" <?php echo esc_attr(selected($i, $dates['m_end'])); ?>><?php echo esc_html(give_month_num_to_name($i)); ?></option>
 							<?php endfor; ?>
 						</select>
 						<select id="give-graphs-day-end" name="day_end" aria-label="End Day">
-							<?php for ( $i = 1; $i <= 31; $i ++ ) : ?>
-								<option value="<?php echo absint( $i ); ?>" <?php echo esc_attr( selected( $i, $dates['day_end'] ) ); ?>><?php echo esc_html( $i ); ?></option>
+							<?php for ($i = 1; $i <= 31; $i++) : ?>
+								<option value="<?php echo absint($i); ?>" <?php echo esc_attr(selected($i, $dates['day_end'])); ?>><?php echo esc_html($i); ?></option>
 							<?php endfor; ?>
 						</select>
 						<select id="give-graphs-year-end" name="year_end" aria-label="End Year">
-							<?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?>
-								<option value="<?php echo absint( $i ); ?>" <?php echo esc_attr( selected( $i, $dates['year_end'] ) ); ?>><?php echo esc_html( $i ); ?></option>
+							<?php for ($i = 2007; $i <= date('Y'); $i++) : ?>
+								<option value="<?php echo absint($i); ?>" <?php echo esc_attr(selected($i, $dates['year_end'])); ?>><?php echo esc_html($i); ?></option>
 							<?php endfor; ?>
 						</select>
 					</div>
 
-					<input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Filter', 'give' ); ?>" />
+					<input type="submit" class="button-secondary" value="<?php esc_attr_e('Filter', 'give'); ?>" />
 				</div>
 
 				<input type="hidden" name="give_action" value="filter_reports" />
@@ -581,7 +581,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_report_graph_controls_after' );
+	do_action('give_report_graph_controls_after');
 }
 
 /**
@@ -596,65 +596,65 @@ 
 function give_get_report_dates() {
 	$dates = array();
 
-	$current_time = current_time( 'timestamp' );
+	$current_time = current_time('timestamp');
 
-	$dates['range']    = isset( $_GET['range'] ) ? $_GET['range'] : 'this_month';
-	$dates['year']     = isset( $_GET['year'] ) ? $_GET['year'] : date( 'Y' );
-	$dates['year_end'] = isset( $_GET['year_end'] ) ? $_GET['year_end'] : date( 'Y' );
-	$dates['m_start']  = isset( $_GET['m_start'] ) ? $_GET['m_start'] : 1;
-	$dates['m_end']    = isset( $_GET['m_end'] ) ? $_GET['m_end'] : 12;
-	$dates['day']      = isset( $_GET['day'] ) ? $_GET['day'] : 1;
-	$dates['day_end']  = isset( $_GET['day_end'] ) ? $_GET['day_end'] : cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] );
+	$dates['range']    = isset($_GET['range']) ? $_GET['range'] : 'this_month';
+	$dates['year']     = isset($_GET['year']) ? $_GET['year'] : date('Y');
+	$dates['year_end'] = isset($_GET['year_end']) ? $_GET['year_end'] : date('Y');
+	$dates['m_start']  = isset($_GET['m_start']) ? $_GET['m_start'] : 1;
+	$dates['m_end']    = isset($_GET['m_end']) ? $_GET['m_end'] : 12;
+	$dates['day']      = isset($_GET['day']) ? $_GET['day'] : 1;
+	$dates['day_end']  = isset($_GET['day_end']) ? $_GET['day_end'] : cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']);
 
 	// Modify dates based on predefined ranges
-	switch ( $dates['range'] ) :
+	switch ($dates['range']) :
 
 		case 'this_month' :
-			$dates['m_start']  = date( 'n', $current_time );
-			$dates['m_end']    = date( 'n', $current_time );
+			$dates['m_start']  = date('n', $current_time);
+			$dates['m_end']    = date('n', $current_time);
 			$dates['day']      = 1;
-			$dates['day_end']  = cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] );
-			$dates['year']     = date( 'Y' );
-			$dates['year_end'] = date( 'Y' );
+			$dates['day_end']  = cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']);
+			$dates['year']     = date('Y');
+			$dates['year_end'] = date('Y');
 			break;
 
 		case 'last_month' :
-			if ( date( 'n' ) == 1 ) {
+			if (date('n') == 1) {
 				$dates['m_start']  = 12;
 				$dates['m_end']    = 12;
-				$dates['year']     = date( 'Y', $current_time ) - 1;
-				$dates['year_end'] = date( 'Y', $current_time ) - 1;
+				$dates['year']     = date('Y', $current_time) - 1;
+				$dates['year_end'] = date('Y', $current_time) - 1;
 			} else {
-				$dates['m_start']  = date( 'n' ) - 1;
-				$dates['m_end']    = date( 'n' ) - 1;
+				$dates['m_start']  = date('n') - 1;
+				$dates['m_end']    = date('n') - 1;
 				$dates['year_end'] = $dates['year'];
 			}
-			$dates['day_end'] = cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] );
+			$dates['day_end'] = cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']);
 			break;
 
 		case 'today' :
-			$dates['day']     = date( 'd', $current_time );
-			$dates['m_start'] = date( 'n', $current_time );
-			$dates['m_end']   = date( 'n', $current_time );
-			$dates['year']    = date( 'Y', $current_time );
+			$dates['day']     = date('d', $current_time);
+			$dates['m_start'] = date('n', $current_time);
+			$dates['m_end']   = date('n', $current_time);
+			$dates['year']    = date('Y', $current_time);
 			break;
 
 		case 'yesterday' :
 
-			$year  = date( 'Y', $current_time );
-			$month = date( 'n', $current_time );
-			$day   = date( 'd', $current_time );
+			$year  = date('Y', $current_time);
+			$month = date('n', $current_time);
+			$day   = date('d', $current_time);
 
-			if ( $month == 1 && $day == 1 ) {
+			if ($month == 1 && $day == 1) {
 
 				$year -= 1;
 				$month = 12;
-				$day   = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+				$day   = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
-			} elseif ( $month > 1 && $day == 1 ) {
+			} elseif ($month > 1 && $day == 1) {
 
 				$month -= 1;
-				$day = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+				$day = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
 			} else {
 
@@ -670,91 +670,91 @@ 
 			break;
 
 		case 'this_week' :
-			$dates['day'] = date( 'd', $current_time - ( date( 'w', $current_time ) - 1 ) * 60 * 60 * 24 ) - 1;
-			$dates['day'] += get_option( 'start_of_week' );
+			$dates['day'] = date('d', $current_time - (date('w', $current_time) - 1) * 60 * 60 * 24) - 1;
+			$dates['day'] += get_option('start_of_week');
 			$dates['day_end'] = $dates['day'] + 6;
-			$dates['m_start'] = date( 'n', $current_time );
-			$dates['m_end']   = date( 'n', $current_time );
-			$dates['year']    = date( 'Y', $current_time );
+			$dates['m_start'] = date('n', $current_time);
+			$dates['m_end']   = date('n', $current_time);
+			$dates['year']    = date('Y', $current_time);
 			break;
 
 		case 'last_week' :
-			$dates['day'] = date( 'd', $current_time - ( date( 'w' ) - 1 ) * 60 * 60 * 24 ) - 8;
-			$dates['day'] += get_option( 'start_of_week' );
+			$dates['day'] = date('d', $current_time - (date('w') - 1) * 60 * 60 * 24) - 8;
+			$dates['day'] += get_option('start_of_week');
 			$dates['day_end'] = $dates['day'] + 6;
-			$dates['year']    = date( 'Y' );
-
-			if ( date( 'j', $current_time ) <= 7 ) {
-				$dates['m_start'] = date( 'n', $current_time ) - 1;
-				$dates['m_end']   = date( 'n', $current_time ) - 1;
-				if ( $dates['m_start'] <= 1 ) {
-					$dates['year']     = date( 'Y', $current_time ) - 1;
-					$dates['year_end'] = date( 'Y', $current_time ) - 1;
+			$dates['year']    = date('Y');
+
+			if (date('j', $current_time) <= 7) {
+				$dates['m_start'] = date('n', $current_time) - 1;
+				$dates['m_end']   = date('n', $current_time) - 1;
+				if ($dates['m_start'] <= 1) {
+					$dates['year']     = date('Y', $current_time) - 1;
+					$dates['year_end'] = date('Y', $current_time) - 1;
 				}
 			} else {
-				$dates['m_start'] = date( 'n', $current_time );
-				$dates['m_end']   = date( 'n', $current_time );
+				$dates['m_start'] = date('n', $current_time);
+				$dates['m_end']   = date('n', $current_time);
 			}
 			break;
 
 		case 'this_quarter' :
-			$month_now = date( 'n', $current_time );
+			$month_now = date('n', $current_time);
 
-			if ( $month_now <= 3 ) {
+			if ($month_now <= 3) {
 
 				$dates['m_start'] = 1;
 				$dates['m_end']   = 4;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
-			} else if ( $month_now <= 6 ) {
+			} else if ($month_now <= 6) {
 
 				$dates['m_start'] = 4;
 				$dates['m_end']   = 7;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
-			} else if ( $month_now <= 9 ) {
+			} else if ($month_now <= 9) {
 
 				$dates['m_start'] = 7;
 				$dates['m_end']   = 10;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
 			} else {
 
 				$dates['m_start']  = 10;
 				$dates['m_end']    = 1;
-				$dates['year']     = date( 'Y', $current_time );
-				$dates['year_end'] = date( 'Y', $current_time ) + 1;
+				$dates['year']     = date('Y', $current_time);
+				$dates['year_end'] = date('Y', $current_time) + 1;
 
 			}
 			break;
 
 		case 'last_quarter' :
-			$month_now = date( 'n' );
+			$month_now = date('n');
 
-			if ( $month_now <= 3 ) {
+			if ($month_now <= 3) {
 
 				$dates['m_start']  = 10;
 				$dates['m_end']    = 12;
-				$dates['year']     = date( 'Y', $current_time ) - 1; // Previous year
-				$dates['year_end'] = date( 'Y', $current_time ) - 1; // Previous year
+				$dates['year']     = date('Y', $current_time) - 1; // Previous year
+				$dates['year_end'] = date('Y', $current_time) - 1; // Previous year
 
-			} else if ( $month_now <= 6 ) {
+			} else if ($month_now <= 6) {
 
 				$dates['m_start'] = 1;
 				$dates['m_end']   = 3;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
-			} else if ( $month_now <= 9 ) {
+			} else if ($month_now <= 9) {
 
 				$dates['m_start'] = 4;
 				$dates['m_end']   = 6;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
 			} else {
 
 				$dates['m_start'] = 7;
 				$dates['m_end']   = 9;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
 			}
 			break;
@@ -762,19 +762,19 @@ 
 		case 'this_year' :
 			$dates['m_start'] = 1;
 			$dates['m_end']   = 12;
-			$dates['year']    = date( 'Y', $current_time );
+			$dates['year']    = date('Y', $current_time);
 			break;
 
 		case 'last_year' :
 			$dates['m_start']  = 1;
 			$dates['m_end']    = 12;
-			$dates['year']     = date( 'Y', $current_time ) - 1;
-			$dates['year_end'] = date( 'Y', $current_time ) - 1;
+			$dates['year']     = date('Y', $current_time) - 1;
+			$dates['year_end'] = date('Y', $current_time) - 1;
 			break;
 
 	endswitch;
 
-	return apply_filters( 'give_report_dates', $dates );
+	return apply_filters('give_report_dates', $dates);
 }
 
 /**
@@ -785,18 +785,18 @@ 
  *
  * @param $data
  */
-function give_parse_report_dates( $data ) {
+function give_parse_report_dates($data) {
 	$dates = give_get_report_dates();
 
 	$view = give_get_reporting_view();
-	$tab  = isset( $_GET['tab'] ) ? sanitize_text_field( $_GET['tab'] ) : 'earnings';
-	$id   = isset( $_GET['form-id'] ) ? $_GET['form-id'] : null;
+	$tab  = isset($_GET['tab']) ? sanitize_text_field($_GET['tab']) : 'earnings';
+	$id   = isset($_GET['form-id']) ? $_GET['form-id'] : null;
 
-	wp_redirect( add_query_arg( $dates, admin_url( 'edit.php?post_type=give_forms&page=give-reports&tab=' . esc_attr( $tab ) . '&view=' . esc_attr( $view ) . '&form-id=' . absint( $id ) ) ) );
+	wp_redirect(add_query_arg($dates, admin_url('edit.php?post_type=give_forms&page=give-reports&tab='.esc_attr($tab).'&view='.esc_attr($view).'&form-id='.absint($id))));
 	give_die();
 }
 
-add_action( 'give_filter_reports', 'give_parse_report_dates' );
+add_action('give_filter_reports', 'give_parse_report_dates');
 
 
 /**
@@ -808,22 +808,22 @@ 
  */
 function give_reports_refresh_button() {
 
-	$url = wp_nonce_url( add_query_arg( array(
+	$url = wp_nonce_url(add_query_arg(array(
 		'give_action'  => 'refresh_reports_transients',
 		'give-message' => 'refreshed-reports'
-	) ), 'give-refresh-reports' );
+	)), 'give-refresh-reports');
 
 	echo '<a href="'
-	     . esc_url_raw( $url )
-	     . '" data-tooltip="'. esc_attr__( 'Clicking this will clear the reports cache.', 'give' )
+	     . esc_url_raw($url)
+	     . '" data-tooltip="'.esc_attr__('Clicking this will clear the reports cache.', 'give')
 	     . '" data-tooltip-my-position="right center"  data-tooltip-target-position="left center" class="button alignright give-admin-button give-tooltip">'
 	     . '<span class="give-admin-button-icon give-admin-button-icon-update"></span>'
-	     . esc_html__( 'Refresh Report Data', 'give' )
+	     . esc_html__('Refresh Report Data', 'give')
 	     . '</a>';
 
 }
 
-add_action( 'give_reports_graph_additional_stats', 'give_reports_refresh_button' );
+add_action('give_reports_graph_additional_stats', 'give_reports_refresh_button');
 
 /**
  * Trigger the refresh of reports transients
@@ -834,20 +834,20 @@ 
  *
  * @return void
  */
-function give_run_refresh_reports_transients( $data ) {
+function give_run_refresh_reports_transients($data) {
 
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give-refresh-reports' ) ) {
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give-refresh-reports')) {
 		return;
 	}
 
 	// Monthly stats.
-	Give_Cache::delete( Give_Cache::get_key( 'give_estimated_monthly_stats' ) );
+	Give_Cache::delete(Give_Cache::get_key('give_estimated_monthly_stats'));
 
 	// Total earning.
-	delete_option( 'give_earnings_total' );
+	delete_option('give_earnings_total');
 
 	// @todo: Refresh only range related stat cache
 	give_delete_donation_stats();
 }
 
-add_action( 'give_refresh_reports_transients', 'give_run_refresh_reports_transients' );
\ No newline at end of file
+add_action('give_refresh_reports_transients', 'give_run_refresh_reports_transients');
\ No newline at end of file

includes/admin/reports/class-form-reports-table.php

Spacing +58 added lines, -58 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -56,13 +56,13 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records.
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records.
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records.
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records.
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
-		add_action( 'give_report_view_actions', array( $this, 'category_filter' ) );
+		add_action('give_report_view_actions', array($this, 'category_filter'));
 		$this->query();
 
 	}
@@ -78,32 +78,32 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 			case 'title':
-				$title = empty( $item['title'] ) ? sprintf( __( 'Untitled (#%s)', 'give' ), $item['ID'] ) : $item['title'];
+				$title = empty($item['title']) ? sprintf(__('Untitled (#%s)', 'give'), $item['ID']) : $item['title'];
 
 				return sprintf(
 					'<a href="%s">%s</a>',
-					get_edit_post_link( $item['ID'] ),
+					get_edit_post_link($item['ID']),
 					$title
 				);
 			case 'sales':
 				return sprintf(
 					'<a href="%s">%s</a>',
-					admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&form_id=' . urlencode( $item['ID'] ) ),
+					admin_url('edit.php?post_type=give_forms&page=give-payment-history&form_id='.urlencode($item['ID'])),
 					$item['sales']
 				);
 			case 'earnings' :
-				return give_currency_filter( give_format_amount( $item[ $column_name ], array( 'sanitize' => false ) ) );
+				return give_currency_filter(give_format_amount($item[$column_name], array('sanitize' => false)));
 			case 'average_sales' :
-				return round( $item[ $column_name ] );
+				return round($item[$column_name]);
 			case 'average_earnings' :
-				return give_currency_filter( give_format_amount( $item[ $column_name ], array( 'sanitize' => false ) ) );
+				return give_currency_filter(give_format_amount($item[$column_name], array('sanitize' => false)));
 			case 'details' :
-				return '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-reports&tab=forms&form-id=' . $item['ID'] ) . '">' . esc_html__( 'View Detailed Report', 'give' ) . '</a>';
+				return '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-reports&tab=forms&form-id='.$item['ID']).'">'.esc_html__('View Detailed Report', 'give').'</a>';
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -117,12 +117,12 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'title'            => esc_html__( 'Form', 'give' ),
-			'sales'            => esc_html__( 'Donations', 'give' ),
-			'earnings'         => esc_html__( 'Income', 'give' ),
-			'average_sales'    => esc_html__( 'Monthly Average Donations', 'give' ),
-			'average_earnings' => esc_html__( 'Monthly Average Income', 'give' ),
-			'details'          => esc_html__( 'Detailed Report', 'give' )
+			'title'            => esc_html__('Form', 'give'),
+			'sales'            => esc_html__('Donations', 'give'),
+			'earnings'         => esc_html__('Income', 'give'),
+			'average_sales'    => esc_html__('Monthly Average Donations', 'give'),
+			'average_earnings' => esc_html__('Monthly Average Income', 'give'),
+			'details'          => esc_html__('Detailed Report', 'give')
 		);
 
 		return $columns;
@@ -138,9 +138,9 @@ 
 	 */
 	public function get_sortable_columns() {
 		return array(
-			'title'    => array( 'title', true ),
-			'sales'    => array( 'sales', false ),
-			'earnings' => array( 'earnings', false ),
+			'title'    => array('title', true),
+			'sales'    => array('sales', false),
+			'earnings' => array('earnings', false),
 		);
 	}
 
@@ -153,7 +153,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 * @return int Category ID
 	 */
 	public function get_category() {
-		return isset( $_GET['category'] ) ? absint( $_GET['category'] ) : 0;
+		return isset($_GET['category']) ? absint($_GET['category']) : 0;
 	}
 
 	/**
@@ -176,7 +176,7 @@ 
 	 *
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 
 	}
 
@@ -188,27 +188,27 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav give-clearfix <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav give-clearfix <?php echo esc_attr($which); ?>">
 
-			<?php if ( 'top' === $which ) { ?>
+			<?php if ('top' === $which) { ?>
 				<h3 class="alignleft reports-earnings-title">
-					<span><?php esc_html_e( 'Donation Forms Report', 'give' ); ?></span>
+					<span><?php esc_html_e('Donation Forms Report', 'give'); ?></span>
 				</h3>
 			<?php } ?>
 
 			<div class="alignright tablenav-right">
 				<div class="actions bulkactions">
-					<?php $this->bulk_actions( $which ); ?>
+					<?php $this->bulk_actions($which); ?>
 				</div>
 				<?php
-				$this->extra_tablenav( $which );
-				$this->pagination( $which );
+				$this->extra_tablenav($which);
+				$this->pagination($which);
 				?>
 			</div>
 
@@ -228,9 +228,9 @@ 
 	 */
 	public function category_filter() {
 
-		$categories = get_terms( 'form_category' );
-		if ( $categories && ! is_wp_error( $categories ) ) {
-			echo Give()->html->category_dropdown( 'category', $this->get_category() );
+		$categories = get_terms('form_category');
+		if ($categories && ! is_wp_error($categories)) {
+			echo Give()->html->category_dropdown('category', $this->get_category());
 		}
 	}
 
@@ -244,8 +244,8 @@ 
 	 */
 	public function query() {
 
-		$orderby  = isset( $_GET['orderby'] ) ? $_GET['orderby'] : 'title';
-		$order    = isset( $_GET['order'] ) ? $_GET['order'] : 'DESC';
+		$orderby  = isset($_GET['orderby']) ? $_GET['orderby'] : 'title';
+		$order    = isset($_GET['order']) ? $_GET['order'] : 'DESC';
 		$category = $this->get_category();
 
 		$args = array(
@@ -258,7 +258,7 @@ 
 			'suppress_filters' => true
 		);
 
-		if ( ! empty( $category ) ) {
+		if ( ! empty($category)) {
 			$args['tax_query'] = array(
 				array(
 					'taxonomy' => 'form_category',
@@ -267,7 +267,7 @@ 
 			);
 		}
 
-		switch ( $orderby ) :
+		switch ($orderby) :
 			case 'title' :
 				$args['orderby'] = 'title';
 				break;
@@ -283,9 +283,9 @@ 
 				break;
 		endswitch;
 
-		$args = apply_filters( 'give_form_reports_prepare_items_args', $args, $this );
+		$args = apply_filters('give_form_reports_prepare_items_args', $args, $this);
 
-		$this->donation_forms = new WP_Query( $args );
+		$this->donation_forms = new WP_Query($args);
 
 		// Store total number of donation forms count.
 		$this->count = $this->donation_forms->found_posts;
@@ -305,15 +305,15 @@ 
 
 		$give_forms = $this->donation_forms->posts;
 
-		if ( $give_forms ) {
-			foreach ( $give_forms as $form ) {
+		if ($give_forms) {
+			foreach ($give_forms as $form) {
 				$reports_data[] = array(
 					'ID'               => $form,
-					'title'            => get_the_title( $form ),
-					'sales'            => give_get_form_sales_stats( $form ),
-					'earnings'         => give_get_form_earnings_stats( $form ),
-					'average_sales'    => give_get_average_monthly_form_sales( $form ),
-					'average_earnings' => give_get_average_monthly_form_earnings( $form )
+					'title'            => get_the_title($form),
+					'sales'            => give_get_form_sales_stats($form),
+					'earnings'         => give_get_form_earnings_stats($form),
+					'average_sales'    => give_get_average_monthly_form_sales($form),
+					'average_earnings' => give_get_average_monthly_form_earnings($form)
 				);
 			}
 		}
@@ -338,14 +338,14 @@ 
 		$columns = $this->get_columns();
 		$hidden = array(); // No hidden columns
 		$sortable = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items = $this->reports_data();
 		$total_items = $this->count;
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $total_items / $this->per_page )
+				'total_pages' => ceil($total_items / $this->per_page)
 			)
 		);
 	}

includes/admin/tools/logs/class-sales-logs-list-table.php

Spacing +83 added lines, -83 removed lines

@@ -9,13 +9,13 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded.
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -44,13 +44,13 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
-			'ajax'     => false,// Does this table support ajax?
-		) );
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
+			'ajax'     => false, // Does this table support ajax?
+		));
 
-		add_action( 'give_log_view_actions', array( $this, 'give_forms_filter' ) );
+		add_action('give_log_view_actions', array($this, 'give_forms_filter'));
 	}
 
 	/**
@@ -64,39 +64,39 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 
-		$payment = give_get_payment_by( 'id', $item['payment_id'] );
+		$payment = give_get_payment_by('id', $item['payment_id']);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'form' :
-				$form_title = get_the_title( $item[ $column_name ] );
-				$form_title = empty( $form_title ) ? sprintf( __( 'Untitled (#%s)', 'give' ), $item[ $column_name ] ) : $form_title;
-				return '<a href="' . esc_url( add_query_arg( 'form', $item[ $column_name ] ) ) . '" >' . $form_title . '</a>';
+				$form_title = get_the_title($item[$column_name]);
+				$form_title = empty($form_title) ? sprintf(__('Untitled (#%s)', 'give'), $item[$column_name]) : $form_title;
+				return '<a href="'.esc_url(add_query_arg('form', $item[$column_name])).'" >'.$form_title.'</a>';
 
 			case 'user_id' :
-				return '<a href="' .
-					   admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . ( ! empty( $item['user_id'] ) ? urlencode( $item['user_id'] ) : give_get_payment_user_email( $item['payment_id'] ) ) ) .
-					   '">' . $item['user_name'] . '</a>';
+				return '<a href="'.
+					   admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.( ! empty($item['user_id']) ? urlencode($item['user_id']) : give_get_payment_user_email($item['payment_id']))).
+					   '">'.$item['user_name'].'</a>';
 
 			case 'amount' :
-				return give_currency_filter( give_format_amount( $item['amount'], array( 'sanitize' => false ) ) );
+				return give_currency_filter(give_format_amount($item['amount'], array('sanitize' => false)));
 
 			case 'status' :
 
-				$value = '<div class="give-donation-status status-' . sanitize_title( give_get_payment_status( $payment, true ) ) . '"><span class="give-donation-status-icon"></span> ' . give_get_payment_status( $payment, true ) . '</div>';
+				$value = '<div class="give-donation-status status-'.sanitize_title(give_get_payment_status($payment, true)).'"><span class="give-donation-status-icon"></span> '.give_get_payment_status($payment, true).'</div>';
 
-				if ( $payment->mode == 'test' ) {
-					$value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="' . esc_attr__( 'This donation was made in test mode.', 'give' ) . '">' . __( 'Test', 'give' ) . '</span>';
+				if ($payment->mode == 'test') {
+					$value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="'.esc_attr__('This donation was made in test mode.', 'give').'">'.__('Test', 'give').'</span>';
 				}
 
 				return $value;
 
 			case 'payment_id' :
-				return '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id=' . $item['payment_id'] ) . '">' . give_get_payment_number( $item['payment_id'] ) . '</a>';
+				return '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id='.$item['payment_id']).'">'.give_get_payment_number($item['payment_id']).'</a>';
 
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -109,13 +109,13 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'ID'         => __( 'Log ID', 'give' ),
-			'user_id'    => __( 'Donor', 'give' ),
-			'form'       => __( 'Form', 'give' ),
-			'amount'     => __( 'Donation Amount', 'give' ),
-			'status'     => __( 'Status', 'give' ),
-			'payment_id' => __( 'Donation ID', 'give' ),
-			'date'       => __( 'Date', 'give' ),
+			'ID'         => __('Log ID', 'give'),
+			'user_id'    => __('Donor', 'give'),
+			'form'       => __('Form', 'give'),
+			'amount'     => __('Donation Amount', 'give'),
+			'status'     => __('Status', 'give'),
+			'payment_id' => __('Donation ID', 'give'),
+			'date'       => __('Date', 'give'),
 		);
 
 		return $columns;
@@ -129,7 +129,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 * @return mixed int If User ID, string If Email/Login
 	 */
 	public function get_filtered_user() {
-		return isset( $_GET['user'] ) ? absint( $_GET['user'] ) : false;
+		return isset($_GET['user']) ? absint($_GET['user']) : false;
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 * @return int Download ID
 	 */
 	public function get_filtered_give_form() {
-		return ! empty( $_GET['form'] ) ? absint( $_GET['form'] ) : false;
+		return ! empty($_GET['form']) ? absint($_GET['form']) : false;
 	}
 
 	/**
@@ -162,7 +162,7 @@ 
 	 * @return string|bool string If search is present, false otherwise
 	 */
 	public function get_search() {
-		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;
+		return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false;
 	}
 
 
@@ -178,20 +178,20 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav <?php echo esc_attr($which); ?>">
 
 			<div class="alignleft actions bulkactions">
-				<?php $this->bulk_actions( $which ); ?>
+				<?php $this->bulk_actions($which); ?>
 			</div>
 			<?php
-			$this->extra_tablenav( $which );
-			$this->pagination( $which );
+			$this->extra_tablenav($which);
+			$this->pagination($which);
 			?>
 
 			<br class="clear"/>
@@ -215,7 +215,7 @@ 
 
 		$meta_query = array();
 
-		if ( $user ) {
+		if ($user) {
 			// Show only logs from a specific user.
 			$meta_query[] = array(
 				'key'   => '_give_log_user_id',
@@ -224,8 +224,8 @@ 
 		}
 
 		$search = $this->get_search();
-		if ( $search ) {
-			if ( is_email( $search ) ) {
+		if ($search) {
+			if (is_email($search)) {
 				// This is an email search. We use this to ensure it works for guest users and logged-in users.
 				$key     = '_give_log_user_info';
 				$compare = 'LIKE';
@@ -234,32 +234,32 @@ 
 				$key     = '_give_log_user_id';
 				$compare = 'LIKE';
 
-				if ( ! is_numeric( $search ) ) {
+				if ( ! is_numeric($search)) {
 					// Searching for user by username
-					$user = get_user_by( 'login', $search );
+					$user = get_user_by('login', $search);
 
-					if ( $user ) {
+					if ($user) {
 						// Found one, set meta value to user's ID.
 						$search = $user->ID;
 					} else {
 						// No user found so let's do a real search query.
-						$users = new WP_User_Query( array(
+						$users = new WP_User_Query(array(
 							'search'         => $search,
-							'search_columns' => array( 'user_url', 'user_nicename' ),
+							'search_columns' => array('user_url', 'user_nicename'),
 							'number'         => 1,
 							'fields'         => 'ids',
-						) );
+						));
 
 						$found_user = $users->get_results();
 
-						if ( $found_user ) {
+						if ($found_user) {
 							$search = $found_user[0];
 						}
 					}
 				}
 			}
 
-			if ( ! $this->file_search ) {
+			if ( ! $this->file_search) {
 				// Meta query only works for non file name search.
 				$meta_query[] = array(
 					'key'     => $key,
@@ -280,7 +280,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	function bulk_actions( $which = '' ) {
+	function bulk_actions($which = '') {
 		give_log_views();
 	}
 
@@ -292,24 +292,24 @@ 
 	 * @return void
 	 */
 	public function give_forms_filter() {
-		$give_forms = get_posts( array(
+		$give_forms = get_posts(array(
 			'post_type'              => 'give_forms',
 			'post_status'            => 'any',
-			'posts_per_page'         => - 1,
+			'posts_per_page'         => -1,
 			'orderby'                => 'title',
 			'order'                  => 'ASC',
 			'fields'                 => 'ids',
 			'update_post_meta_cache' => false,
 			'update_post_term_cache' => false,
-		) );
+		));
 
-		if ( $give_forms ) {
+		if ($give_forms) {
 			echo '<select name="form" id="give-log-form-filter">';
-			echo '<option value="0">' . __( 'All', 'give' ) . '</option>';
-			foreach ( $give_forms as $form ) {
-				$form_title = get_the_title( $form );
-				$form_title = empty( $form_title ) ? sprintf( __( 'Untitled (#%s)', 'give' ), $form ) : $form_title;
-				echo '<option value="' . $form . '"' . selected( $form, $this->get_filtered_give_form() ) . '>' . esc_html( $form_title ) . '</option>';
+			echo '<option value="0">'.__('All', 'give').'</option>';
+			foreach ($give_forms as $form) {
+				$form_title = get_the_title($form);
+				$form_title = empty($form_title) ? sprintf(__('Untitled (#%s)', 'give'), $form) : $form_title;
+				echo '<option value="'.$form.'"'.selected($form, $this->get_filtered_give_form()).'>'.esc_html($form_title).'</option>';
 			}
 			echo '</select>';
 		}
@@ -329,7 +329,7 @@ 
 
 		$logs_data = array();
 		$paged     = $this->get_paged();
-		$give_form = empty( $_GET['s'] ) ? $this->get_filtered_give_form() : null;
+		$give_form = empty($_GET['s']) ? $this->get_filtered_give_form() : null;
 		$user      = $this->get_filtered_user();
 
 		$log_query = array(
@@ -340,38 +340,38 @@ 
 			'posts_per_page' => $this->per_page,
 		);
 
-		$cache_key = Give_Cache::get_key( 'get_logs', $log_query );
+		$cache_key = Give_Cache::get_key('get_logs', $log_query);
 
 		// Return result from cache if exist.
-		if ( ! ( $logs_data = Give_Cache::get( $cache_key ) ) ) {
-			$logs = $give_logs->get_connected_logs( $log_query );
+		if ( ! ($logs_data = Give_Cache::get($cache_key))) {
+			$logs = $give_logs->get_connected_logs($log_query);
 
-			if ( $logs ) {
-				foreach ( $logs as $log ) {
-					$payment_id = give_get_meta( $log->ID, '_give_log_payment_id', true );
+			if ($logs) {
+				foreach ($logs as $log) {
+					$payment_id = give_get_meta($log->ID, '_give_log_payment_id', true);
 
 					// Make sure this payment hasn't been deleted.
-					if ( get_post( $payment_id ) ) :
-						$user_info      = give_get_payment_meta_user_info( $payment_id );
-						$payment_meta   = give_get_payment_meta( $payment_id );
-						$payment_amount = give_get_payment_amount( $payment_id );
+					if (get_post($payment_id)) :
+						$user_info      = give_get_payment_meta_user_info($payment_id);
+						$payment_meta   = give_get_payment_meta($payment_id);
+						$payment_amount = give_get_payment_amount($payment_id);
 
 						$logs_data[] = array(
-							'ID'         => '<span class="give-item-label give-item-label-gray">' . $log->ID . '</span>',
+							'ID'         => '<span class="give-item-label give-item-label-gray">'.$log->ID.'</span>',
 							'payment_id' => $payment_id,
 							'form'       => $log->post_parent,
 							'amount'     => $payment_amount,
 							'user_id'    => $user_info['id'],
-							'user_name'  => $user_info['first_name'] . ' ' . $user_info['last_name'],
-							'date'       => get_post_field( 'post_date', $payment_id ),
+							'user_name'  => $user_info['first_name'].' '.$user_info['last_name'],
+							'date'       => get_post_field('post_date', $payment_id),
 						);
 
 					endif;
 				}
 
 				// Cache results.
-				if ( ! empty( $logs_data ) ) {
-					Give_Cache::set( $cache_key, $logs_data );
+				if ( ! empty($logs_data)) {
+					Give_Cache::set($cache_key, $logs_data);
 				}
 			}
 		}
@@ -399,15 +399,15 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array();
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$current_page          = $this->get_pagenum();
 		$this->items           = $this->get_logs();
-		$total_items           = $give_logs->get_log_count( $this->get_filtered_give_form(), 'sale', $this->get_meta_query() );
+		$total_items           = $give_logs->get_log_count($this->get_filtered_give_form(), 'sale', $this->get_meta_query());
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $total_items / $this->per_page ),
+				'total_pages' => ceil($total_items / $this->per_page),
 			)
 		);
 	}

includes/admin/tools/data/tools-actions.php

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,10 +20,10 @@ 
  * @since  1.5
  */
 function give_register_batch_recount_export_classes() {
-	add_action( 'give_batch_export_class_include', 'give_include_batch_export_class', 10, 1 );
+	add_action('give_batch_export_class_include', 'give_include_batch_export_class', 10, 1);
 }
 
-add_action( 'give_register_batch_exporter', 'give_register_batch_recount_export_classes', 10 );
+add_action('give_register_batch_exporter', 'give_register_batch_recount_export_classes', 10);
 
 
 /**
@@ -35,35 +35,35 @@ 
  *
  * @return void
  */
-function give_include_batch_export_class( $class ) {
-	switch ( $class ) {
+function give_include_batch_export_class($class) {
+	switch ($class) {
 
 		case 'Give_Tools_Delete_Donors':
-			require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/data/class-give-tools-delete-test-donors.php';
+			require_once GIVE_PLUGIN_DIR.'includes/admin/tools/data/class-give-tools-delete-test-donors.php';
 			break;
 
 		case 'Give_Tools_Delete_Test_Transactions':
-			require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/data/class-give-tools-delete-test-transactions.php';
+			require_once GIVE_PLUGIN_DIR.'includes/admin/tools/data/class-give-tools-delete-test-transactions.php';
 			break;
 
 		case 'Give_Tools_Recount_Donor_Stats':
-			require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/data/class-give-tools-recount-donor-stats.php';
+			require_once GIVE_PLUGIN_DIR.'includes/admin/tools/data/class-give-tools-recount-donor-stats.php';
 			break;
 
 		case 'Give_Tools_Reset_Stats':
-			require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/data/class-give-tools-reset-stats.php';
+			require_once GIVE_PLUGIN_DIR.'includes/admin/tools/data/class-give-tools-reset-stats.php';
 			break;
 
 		case 'Give_Tools_Recount_All_Stats':
-			require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/data/class-give-tools-recount-all-stats.php';
+			require_once GIVE_PLUGIN_DIR.'includes/admin/tools/data/class-give-tools-recount-all-stats.php';
 			break;
 
 		case 'Give_Tools_Recount_Form_Stats':
-			require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/data/class-give-tools-recount-form-stats.php';
+			require_once GIVE_PLUGIN_DIR.'includes/admin/tools/data/class-give-tools-recount-form-stats.php';
 			break;
 
 		case 'Give_Tools_Recount_Income':
-			require_once GIVE_PLUGIN_DIR . 'includes/admin/tools/data/class-give-tools-recount-income.php';
+			require_once GIVE_PLUGIN_DIR.'includes/admin/tools/data/class-give-tools-recount-income.php';
 			break;
 	}
 }

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

Spacing +51 added lines, -51 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -59,58 +59,58 @@ 
 	 * @return bool
 	 */
 	public function get_data() {
-		$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(
 			'give_forms' => $this->form_id,
 			'number'     => $this->per_step,
 			'status'     => $accepted_statuses,
 			'paged'      => $this->step,
 			'fields'     => 'ids',
-		) );
+		));
 
-		$payments = new Give_Payments_Query( $args );
+		$payments = new Give_Payments_Query($args);
 		$payments = $payments->get_payments();
 
-		if ( $payments ) {
-			foreach ( $payments as $payment ) {
+		if ($payments) {
+			foreach ($payments as $payment) {
 				//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;
 				}
 
-				$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;
 		}
 
 
-		give_update_meta( $this->form_id, '_give_form_sales', $totals['sales'] );
-		give_update_meta( $this->form_id, '_give_form_earnings', give_sanitize_amount_for_db( $totals['earnings'] ) );
+		give_update_meta($this->form_id, '_give_form_sales', $totals['sales']);
+		give_update_meta($this->form_id, '_give_form_earnings', give_sanitize_amount_for_db($totals['earnings']));
 
 		return false;
 	}
@@ -122,35 +122,35 @@ 
 	 * @return int
 	 */
 	public function get_percentage_complete() {
-		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(
 				'give_forms' => $this->form_id,
-				'number'     => - 1,
+				'number'     => -1,
 				'status'     => $accepted_statuses,
 				'fields'     => 'ids',
-			) );
+			));
 
-			$payments = new Give_Payments_Query( $args );
-			$total    = count( $payments->get_payments() );
-			$this->store_data( 'give_recount_total_' . $this->form_id, $total );
+			$payments = new Give_Payments_Query($args);
+			$total    = count($payments->get_payments());
+			$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;
 		}
 
@@ -164,8 +164,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;
 	}
 
 	/**
@@ -176,31 +176,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);
 		}
 	}
 
@@ -228,11 +228,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);
 	}
 
 	/**
@@ -245,10 +245,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,
@@ -262,7 +262,7 @@ 
 			'%s',
 		);
 
-		$wpdb->replace( $wpdb->options, $data, $formats );
+		$wpdb->replace($wpdb->options, $data, $formats);
 	}
 
 	/**
@@ -274,9 +274,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));
 	}
 
 }
\ No newline at end of file

includes/admin/tools/data/class-give-tools-recount-all-stats.php

Spacing +94 added lines, -96 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if (! defined('ABSPATH') ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -80,104 +80,102 @@ 
 	 */
 	public function get_data() {
 
-		$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');
 
-		$payments = $this->get_stored_data( 'give_temp_all_payments_data' );
+		$payments = $this->get_stored_data('give_temp_all_payments_data');
 
-		if( false === $payments ) {
-			$args = apply_filters( 'give_recount_form_stats_args', array(
+		if (false === $payments) {
+			$args = apply_filters('give_recount_form_stats_args', array(
 				'post_parent__in' => $all_forms,
 				'number'          => $this->per_step,
 				'status'          => 'publish',
 				'paged'           => $this->step,
 				'output'          => 'payments',
-			) );
+			));
 
-			$payments_query = new Give_Payments_Query( $args );
+			$payments_query = new Give_Payments_Query($args);
 			$payments       = $payments_query->get_payments();
 		}
 
-		if ( $payments ) {
+		if ($payments) {
 
 			//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;
 				}
 
 				// Set Sales count
-				$totals[ $form_id ]['sales'] = isset( $totals[ $form_id ]['sales'] ) ?
-					++ $totals[ $form_id ]['sales'] :
-					1;
+				$totals[$form_id]['sales'] = isset($totals[$form_id]['sales']) ?
+					++$totals[$form_id]['sales'] : 1;
 
 				// Set Total Earnings
-				$totals[ $form_id ]['earnings'] = isset( $totals[ $form_id ]['earnings'] ) ?
-					( $totals[ $form_id ]['earnings'] + $payment_item['price'] ) :
-					$payment_item['price'];
+				$totals[$form_id]['earnings'] = isset($totals[$form_id]['earnings']) ?
+					($totals[$form_id]['earnings'] + $payment_item['price']) : $payment_item['price'];
 
 				$processed_payments[] = $payment->ID;
 			}
 
 			// Get the list of form ids which does not contain any payment record.
-			$remaining_form_ids = array_diff( $all_forms, array_keys($totals) );
-			foreach( $remaining_form_ids as $form_id) {
+			$remaining_form_ids = array_diff($all_forms, array_keys($totals));
+			foreach ($remaining_form_ids as $form_id) {
 				//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,
 					);
 				}
 			}
 
-			$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 ) {
-			give_update_meta( $key, '_give_form_sales', $stats['sales'] );
-			give_update_meta( $key, '_give_form_earnings', give_sanitize_amount_for_db( $stats['earnings'] ) );
+		foreach ($totals as $key => $stats) {
+			give_update_meta($key, '_give_form_sales', $stats['sales']);
+			give_update_meta($key, '_give_form_earnings', give_sanitize_amount_for_db($stats['earnings']));
 		}
 
 		return false;
@@ -192,20 +190,20 @@ 
 	 */
 	public function get_percentage_complete() {
 
-		$total = $this->get_stored_data( 'give_recount_all_total' );
+		$total = $this->get_stored_data('give_recount_all_total');
 
-		if ( false === $total ) {
+		if (false === $total) {
 			$this->pre_fetch();
-			$total = $this->get_stored_data( 'give_recount_all_total' );
+			$total = $this->get_stored_data('give_recount_all_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;
 		}
 
@@ -219,8 +217,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;
 	}
 
 	/**
@@ -231,35 +229,35 @@ 
 	 */
 	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_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_total_'.$this->form_id);
+			$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);
 		}
 	}
 
@@ -286,69 +284,69 @@ 
 	 */
 	public function pre_fetch() {
 
-		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' );
-			$this->delete_data( 'give_temp_all_payments_data' );
+		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');
+			$this->delete_data('give_temp_all_payments_data');
 		}
 
-		$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);
 			}
 
 			$args = array(
 				'post_status'    => 'publish',
 				'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,
 				'number'            => $this->per_step,
 				'status'            => 'publish',
 				'page'              => $this->step,
 				'output'            => 'payments',
-			) );
+			));
 
-			$payments_query = new Give_Payments_Query( $args );
+			$payments_query = new Give_Payments_Query($args);
 			$payments       = $payments_query->get_payments();
-			$total          = wp_count_posts( 'give_payment' )->publish;
+			$total          = wp_count_posts('give_payment')->publish;
 
-			$this->store_data( 'give_temp_all_payments_data', $payments );
+			$this->store_data('give_temp_all_payments_data', $payments);
 
-			if ( $payments ) {
+			if ($payments) {
 
-				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
@@ -359,8 +357,8 @@ 
 
 			}
 
-			$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);
 		}
 
 	}
@@ -374,11 +372,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);
 	}
 
 	/**
@@ -391,10 +389,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,
@@ -408,7 +406,7 @@ 
 			'%s',
 		);
 
-		$wpdb->replace( $wpdb->options, $data, $formats );
+		$wpdb->replace($wpdb->options, $data, $formats);
 	}
 
 	/**
@@ -420,9 +418,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/tools/data/class-give-tools-recount-single-donor-stats.php

Spacing +71 added lines, -71 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -53,40 +53,40 @@ 
 	 */
 	public function get_data() {
 
-		$donor    = new Give_Donor( $this->customer_id );
-		$payments = $this->get_stored_data( 'give_recount_donor_payments_' . $donor->id );
+		$donor    = new Give_Donor($this->customer_id);
+		$payments = $this->get_stored_data('give_recount_donor_payments_'.$donor->id);
 
-		$offset     = ( $this->step - 1 ) * $this->per_step;
-		$step_items = array_slice( $payments, $offset, $this->per_step );
+		$offset     = ($this->step - 1) * $this->per_step;
+		$step_items = array_slice($payments, $offset, $this->per_step);
 
-		if ( count( $step_items ) > 0 ) {
-			$pending_total = (float) $this->get_stored_data( 'give_stats_donor_pending_total' . $donor->id );
+		if (count($step_items) > 0) {
+			$pending_total = (float) $this->get_stored_data('give_stats_donor_pending_total'.$donor->id);
 			$step_total    = 0;
 
-			$found_payment_ids = $this->get_stored_data( 'give_stats_found_payments_' . $donor->id );
+			$found_payment_ids = $this->get_stored_data('give_stats_found_payments_'.$donor->id);
 
-			foreach ( $step_items as $payment ) {
-				$payment = get_post( $payment->ID );
+			foreach ($step_items as $payment) {
+				$payment = get_post($payment->ID);
 
-				if ( is_null( $payment ) || is_wp_error( $payment ) || 'give_payment' !== $payment->post_type ) {
+				if (is_null($payment) || is_wp_error($payment) || 'give_payment' !== $payment->post_type) {
 
-					$missing_payments   = $this->get_stored_data( 'give_stats_missing_payments' . $donor->id );
+					$missing_payments   = $this->get_stored_data('give_stats_missing_payments'.$donor->id);
 					$missing_payments[] = $payment->ID;
-					$this->store_data( 'give_stats_missing_payments' . $donor->id, $missing_payments );
+					$this->store_data('give_stats_missing_payments'.$donor->id, $missing_payments);
 
 					continue;
 				}
 
 				$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) {
 
 					$found_payment_ids[] = $payment->ID;
 
-					if ( apply_filters( 'give_donor_recount_should_increase_value', true, $payment ) ) {
-						$payment_amount = give_get_payment_amount( $payment->ID );
-						$step_total     += $payment_amount;
+					if (apply_filters('give_donor_recount_should_increase_value', true, $payment)) {
+						$payment_amount = give_get_payment_amount($payment->ID);
+						$step_total += $payment_amount;
 					}
 
 				}
@@ -94,8 +94,8 @@ 
 			}
 
 			$updated_total = $pending_total + $step_total;
-			$this->store_data( 'give_stats_donor_pending_total' . $donor->id, $updated_total );
-			$this->store_data( 'give_stats_found_payments_' . $donor->id, $found_payment_ids );
+			$this->store_data('give_stats_donor_pending_total'.$donor->id, $updated_total);
+			$this->store_data('give_stats_found_payments_'.$donor->id, $found_payment_ids);
 
 			return true;
 		}
@@ -112,16 +112,16 @@ 
 	 */
 	public function get_percentage_complete() {
 
-		$payments = $this->get_stored_data( 'give_recount_donor_payments_' . $this->customer_id );
-		$total    = count( $payments );
+		$payments = $this->get_stored_data('give_recount_donor_payments_'.$this->customer_id);
+		$total    = count($payments);
 
 		$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;
 		}
 
@@ -135,8 +135,8 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
-		$this->customer_id = isset( $request['customer_id'] ) ? sanitize_text_field( $request['customer_id'] ) : false;
+	public function set_properties($request) {
+		$this->customer_id = isset($request['customer_id']) ? sanitize_text_field($request['customer_id']) : false;
 	}
 
 	/**
@@ -147,63 +147,63 @@ 
 	 */
 	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 {
-			$donor       = new Give_Donor( $this->customer_id );
-			$payment_ids = get_option( 'give_stats_found_payments_' . $donor->id, array() );
-			$this->delete_data( 'give_stats_found_payments_' . $donor->id );
+			$donor       = new Give_Donor($this->customer_id);
+			$payment_ids = get_option('give_stats_found_payments_'.$donor->id, array());
+			$this->delete_data('give_stats_found_payments_'.$donor->id);
 
-			$removed_payments = array_unique( get_option( 'give_stats_missing_payments' . $donor->id, array() ) );
+			$removed_payments = array_unique(get_option('give_stats_missing_payments'.$donor->id, array()));
 
 			// Find non-existing payments (deleted) and total up the donation count
 			$purchase_count = 0;
-			foreach ( $payment_ids as $key => $payment_id ) {
-				if ( in_array( $payment_id, $removed_payments ) ) {
-					unset( $payment_ids[ $key ] );
+			foreach ($payment_ids as $key => $payment_id) {
+				if (in_array($payment_id, $removed_payments)) {
+					unset($payment_ids[$key]);
 					continue;
 				}
 
-				$payment = get_post( $payment_id );
-				if ( apply_filters( 'give_donor_recount_should_increase_count', true, $payment ) ) {
-					$purchase_count ++;
+				$payment = get_post($payment_id);
+				if (apply_filters('give_donor_recount_should_increase_count', true, $payment)) {
+					$purchase_count++;
 				}
 			}
 
-			$this->delete_data( 'give_stats_missing_payments' . $donor->id );
+			$this->delete_data('give_stats_missing_payments'.$donor->id);
 
-			$pending_total = $this->get_stored_data( 'give_stats_donor_pending_total' . $donor->id );
-			$this->delete_data( 'give_stats_donor_pending_total' . $donor->id );
-			$this->delete_data( 'give_recount_donor_stats_' . $donor->id );
-			$this->delete_data( 'give_recount_donor_payments_' . $this->customer_id );
+			$pending_total = $this->get_stored_data('give_stats_donor_pending_total'.$donor->id);
+			$this->delete_data('give_stats_donor_pending_total'.$donor->id);
+			$this->delete_data('give_recount_donor_stats_'.$donor->id);
+			$this->delete_data('give_recount_donor_payments_'.$this->customer_id);
 
-			$payment_ids = implode( ',', $payment_ids );
-			$donor->update( array(
+			$payment_ids = implode(',', $payment_ids);
+			$donor->update(array(
 				'payment_ids'    => $payment_ids,
 				'purchase_count' => $purchase_count,
 				'purchase_value' => $pending_total,
-			) );
+			));
 
 			$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;
 		}
 	}
 
 	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);
 		}
 	}
 
@@ -230,26 +230,26 @@ 
 	 * @return void
 	 */
 	public function pre_fetch() {
-		if ( $this->step === 1 ) {
-			$allowed_payment_status = apply_filters( 'give_recount_donors_donation_statuses', give_get_payment_status_keys() );
+		if ($this->step === 1) {
+			$allowed_payment_status = apply_filters('give_recount_donors_donation_statuses', give_get_payment_status_keys());
 
 			// Before we start, let's zero out the customer's data
-			$donor = new Give_Donor( $this->customer_id );
-			$donor->update( array( 'purchase_value' => give_format_amount( 0, array( 'sanitize' => false ) ), 'purchase_count' => 0 ) );
+			$donor = new Give_Donor($this->customer_id);
+			$donor->update(array('purchase_value' => give_format_amount(0, array('sanitize' => false)), 'purchase_count' => 0));
 
-			$attached_payment_ids = explode( ',', $donor->payment_ids );
+			$attached_payment_ids = explode(',', $donor->payment_ids);
 
 			$attached_args = array(
 				'post__in' => $attached_payment_ids,
-				'number'   => - 1,
+				'number'   => -1,
 				'status'   => $allowed_payment_status,
 			);
 
-			$attached_payments = give_get_payments( $attached_args );
+			$attached_payments = 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(
@@ -259,11 +259,11 @@ 
 				),
 			);
 
-			$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);
 
-			$this->store_data( 'give_recount_donor_payments_' . $donor->id, $payments );
+			$this->store_data('give_recount_donor_payments_'.$donor->id, $payments);
 		}
 	}
 
@@ -276,11 +276,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);
 	}
 
 	/**
@@ -293,10 +293,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,
@@ -310,7 +310,7 @@ 
 			'%s',
 		);
 
-		$wpdb->replace( $wpdb->options, $data, $formats );
+		$wpdb->replace($wpdb->options, $data, $formats);
 	}
 
 	/**
@@ -322,9 +322,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/tools/export/class-batch-export-donors.php

Spacing +102 added lines, -104 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -70,23 +70,23 @@ 
 	 *
 	 * @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'];
 
 		// Setup donor ids cache.
-		if ( ! empty( $this->form ) ) {
+		if ( ! empty($this->form)) {
 			// Cache donor ids to output unique list of donor.
-			$this->query_id = give_clean( $_REQUEST['give_export_option']['query_id'] );
+			$this->query_id = give_clean($_REQUEST['give_export_option']['query_id']);
 			$this->cache_donor_ids();
 		}
 
-		$this->price_id = ! empty( $request['give_price_option'] ) && 'all' !== $request['give_price_option'] ? absint( $request['give_price_option'] ) : null;
+		$this->price_id = ! empty($request['give_price_option']) && 'all' !== $request['give_price_option'] ? absint($request['give_price_option']) : null;
 
 	}
 
@@ -101,12 +101,12 @@ 
 		// Fetch already cached donor ids.
 		$donor_ids = $this->donor_ids;
 
-		if ( $cached_donor_ids = Give_Cache::get( $this->query_id, true ) ) {
-			$donor_ids = array_unique( array_merge( $cached_donor_ids, $this->donor_ids ) );
+		if ($cached_donor_ids = Give_Cache::get($this->query_id, true)) {
+			$donor_ids = array_unique(array_merge($cached_donor_ids, $this->donor_ids));
 		}
 
-		$donor_ids = array_values( $donor_ids );
-		Give_Cache::set( $this->query_id, $donor_ids, HOUR_IN_SECONDS, true );
+		$donor_ids = array_values($donor_ids);
+		Give_Cache::set($this->query_id, $donor_ids, HOUR_IN_SECONDS, true);
 	}
 
 	/**
@@ -118,14 +118,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;
 	}
@@ -137,41 +137,41 @@ 
 	 *
 	 * @return array
 	 */
-	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 'donation_form' :
-					$cols['donation_form'] = esc_html__( 'Donation Form', 'give' );
+					$cols['donation_form'] = esc_html__('Donation Form', '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;
 			}
 		}
@@ -192,29 +192,29 @@ 
 		$i = 0;
 
 		$data             = array();
-		$cached_donor_ids = Give_Cache::get( $this->query_id, true );
+		$cached_donor_ids = Give_Cache::get($this->query_id, true);
 
-		if ( ! empty( $this->form ) ) {
+		if ( ! empty($this->form)) {
 
 			// Export donors for a specific donation form and also within specified timeframe
 			$args = array(
 				'output'     => 'payments', // Use 'posts' to get standard post objects
-				'post_type'  => array( 'give_payment' ),
+				'post_type'  => array('give_payment'),
 				'number'     => 30,
 				'paged'      => $this->step,
 				'status'     => 'publish',
 				'meta_key'   => '_give_payment_form_id',
-				'meta_value' => absint( $this->form ),
+				'meta_value' => absint($this->form),
 			);
 
 			// Check for date option filter
-			if ( ! empty( $this->data['donor_export_start_date'] ) || ! empty( $this->data['donor_export_end_date'] ) ) {
-				$args['start_date'] = ! empty( $this->data['donor_export_start_date'] ) ? date( 'Y-n-d 00:00:00', strtotime( $this->data['donor_export_start_date'] ) ) : date( 'Y-n-d 23:59:59', '1970-1-01 00:00:00' );
-				$args['end_date']   = ! empty( $this->data['donor_export_end_date'] ) ? date( 'Y-n-d 23:59:59', strtotime( $this->data['donor_export_end_date'] ) ) : date( 'Y-n-d 23:59:59', current_time( 'timestamp' ) );
+			if ( ! empty($this->data['donor_export_start_date']) || ! empty($this->data['donor_export_end_date'])) {
+				$args['start_date'] = ! empty($this->data['donor_export_start_date']) ? date('Y-n-d 00:00:00', strtotime($this->data['donor_export_start_date'])) : date('Y-n-d 23:59:59', '1970-1-01 00:00:00');
+				$args['end_date']   = ! empty($this->data['donor_export_end_date']) ? date('Y-n-d 23:59:59', strtotime($this->data['donor_export_end_date'])) : date('Y-n-d 23:59:59', current_time('timestamp'));
 			}
 
 			// Check for price option.
-			if ( null !== $this->price_id ) {
+			if (null !== $this->price_id) {
 				$args['meta_query'] = array(
 					array(
 						'key'   => '_give_payment_price_id',
@@ -223,45 +223,43 @@ 
 				);
 			}
 
-			$payments_query = new Give_Payments_Query( $args );
+			$payments_query = new Give_Payments_Query($args);
 			$payments       = $payments_query->get_payments();
 
-			if ( $payments ) {
+			if ($payments) {
 				/* @var Give_Payment $payment */
-				foreach ( $payments as $payment ) {
+				foreach ($payments as $payment) {
 					// Set donation sum.
-					$this->payment_stats[ $payment->customer_id ]['donation_sum'] = isset( $this->payment_stats[ $payment->customer_id ]['donation_sum'] ) ?
-						$this->payment_stats[ $payment->customer_id ]['donation_sum'] :
-						0;
-					$this->payment_stats[ $payment->customer_id ]['donation_sum'] += $payment->total;
+					$this->payment_stats[$payment->customer_id]['donation_sum'] = isset($this->payment_stats[$payment->customer_id]['donation_sum']) ?
+						$this->payment_stats[$payment->customer_id]['donation_sum'] : 0;
+					$this->payment_stats[$payment->customer_id]['donation_sum'] += $payment->total;
 
 					// Set donation count.
-					$this->payment_stats[ $payment->customer_id ]['donations'] = isset( $this->payment_stats[ $payment->customer_id ]['donations'] ) ?
-						++ $this->payment_stats[ $payment->customer_id ]['donations'] :
-						1;
+					$this->payment_stats[$payment->customer_id]['donations'] = isset($this->payment_stats[$payment->customer_id]['donations']) ?
+						++$this->payment_stats[$payment->customer_id]['donations'] : 1;
 
 					// Set donation form name.
-					$this->payment_stats[ $payment->customer_id ]['form_title'] = $payment->form_title;
+					$this->payment_stats[$payment->customer_id]['form_title'] = $payment->form_title;
 
 					// Continue if donor already included.
-					if ( empty( $payment->customer_id ) ||
-					     in_array( $payment->customer_id, $cached_donor_ids )
+					if (empty($payment->customer_id) ||
+					     in_array($payment->customer_id, $cached_donor_ids)
 					) {
 						continue;
 					}
 
 					$this->donor_ids[] = $cached_donor_ids[] = $payment->customer_id;
 
-					$i ++;
+					$i++;
 				}
 
-				if ( ! empty( $this->donor_ids ) ) {
-					foreach ( $this->donor_ids as $donor_id ) {
-						$donor                      = Give()->donors->get_donor_by( 'id', $donor_id );
-						$donor->donation_form_title = $this->payment_stats[ $donor_id ]['form_title'];
-						$donor->purchase_count      = $this->payment_stats[ $donor_id ]['donations'];
-						$donor->purchase_value      = $this->payment_stats[ $donor_id ]['donation_sum'];
-						$data[]                     = $this->set_donor_data( $i, $data, $donor );
+				if ( ! empty($this->donor_ids)) {
+					foreach ($this->donor_ids as $donor_id) {
+						$donor                      = Give()->donors->get_donor_by('id', $donor_id);
+						$donor->donation_form_title = $this->payment_stats[$donor_id]['form_title'];
+						$donor->purchase_count      = $this->payment_stats[$donor_id]['donations'];
+						$donor->purchase_value      = $this->payment_stats[$donor_id]['donation_sum'];
+						$data[]                     = $this->set_donor_data($i, $data, $donor);
 					}
 
 					// Cache donor ids only if admin export donor for specific form.
@@ -271,7 +269,7 @@ 
 		} else {
 
 			// Export all donors.
-			$offset = 30 * ( $this->step - 1 );
+			$offset = 30 * ($this->step - 1);
 
 			$args = array(
 				'number' => 30,
@@ -279,31 +277,31 @@ 
 			);
 
 			// Check for date option filter
-			if ( ! empty( $this->data['donor_export_start_date'] ) || ! empty( $this->data['donor_export_end_date'] ) ) {
+			if ( ! empty($this->data['donor_export_start_date']) || ! empty($this->data['donor_export_end_date'])) {
 				$args['date'] = array(
-					'start' => ! empty( $this->data['donor_export_start_date'] ) ? date( 'Y-n-d 00:00:00', strtotime( $this->data['donor_export_start_date'] ) ) : date( 'Y-n-d 23:59:59', '1970-1-01 00:00:00' ),
-					'end'   => ! empty( $this->data['donor_export_end_date'] ) ? date( 'Y-n-d 23:59:59', strtotime( $this->data['donor_export_end_date'] ) ) : date( 'Y-n-d 23:59:59', current_time( 'timestamp' ) ),
+					'start' => ! empty($this->data['donor_export_start_date']) ? date('Y-n-d 00:00:00', strtotime($this->data['donor_export_start_date'])) : date('Y-n-d 23:59:59', '1970-1-01 00:00:00'),
+					'end'   => ! empty($this->data['donor_export_end_date']) ? date('Y-n-d 23:59:59', strtotime($this->data['donor_export_end_date'])) : date('Y-n-d 23:59:59', current_time('timestamp')),
 				);
 			}
 
-			$donors = Give()->donors->get_donors( $args );
+			$donors = Give()->donors->get_donors($args);
 
-			foreach ( $donors as $donor ) {
+			foreach ($donors as $donor) {
 
 				// Continue if donor already included.
-				if ( empty( $donor->id ) || empty( $donor->payment_ids ) ) {
+				if (empty($donor->id) || empty($donor->payment_ids)) {
 					continue;
 				}
 
-				$payment                    = new Give_Payment( $donor->payment_ids );
+				$payment                    = new Give_Payment($donor->payment_ids);
 				$donor->donation_form_title = $payment->form_title;
-				$data[]                     = $this->set_donor_data( $i, $data, $donor );
-				$i ++;
+				$data[]                     = $this->set_donor_data($i, $data, $donor);
+				$i++;
 			}
 		}// End if().
 
-		$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;
 	}
@@ -319,18 +317,18 @@ 
 		$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()->donors->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;
 		}
 
@@ -346,49 +344,49 @@ 
 	 *
 	 * @return mixed
 	 */
-	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['donation_form'] ) ) {
-			$data[ $i ]['donation_form'] = ! empty( $donor->donation_form_title ) ? $donor->donation_form_title : '';
+		if ( ! empty($columns['donation_form'])) {
+			$data[$i]['donation_form'] = ! empty($donor->donation_form_title) ? $donor->donation_form_title : '';
 		}
-		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, array( 'sanitize' => false ) );
+		if ( ! empty($columns['donation_sum'])) {
+			$data[$i]['donation_sum'] = give_format_amount($donor->purchase_value, array('sanitize' => false));
 		}
 
-		return $data[ $i ];
+		return $data[$i];
 
 	}
 
@@ -398,9 +396,9 @@ 
 	 * @param array             $request
 	 * @param Give_Batch_Export $export
 	 */
-	public function unset_properties( $request, $export ) {
-		if ( $export->done ) {
-			Give_Cache::delete( "give_cache_{$this->query_id}" );
+	public function unset_properties($request, $export) {
+		if ($export->done) {
+			Give_Cache::delete("give_cache_{$this->query_id}");
 		}
 	}
 }
\ No newline at end of file

includes/admin/tools/export/class-export-earnings.php

Spacing +28 added lines, -28 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,16 +38,16 @@ 
 	 * @return void
 	 */
 	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);
 		}
 
 		nocache_headers();
-		header( 'Content-Type: text/csv; charset=utf-8' );
-		header( 'Content-Disposition: attachment; filename=' . apply_filters( 'give_earnings_export_filename', 'give-export-' . $this->export_type . '-' . date( 'n' ) . '-' . date( 'Y' ) ) . '.csv' );
-		header( "Expires: 0" );
+		header('Content-Type: text/csv; charset=utf-8');
+		header('Content-Disposition: attachment; filename='.apply_filters('give_earnings_export_filename', 'give-export-'.$this->export_type.'-'.date('n').'-'.date('Y')).'.csv');
+		header("Expires: 0");
 
 	}
 
@@ -61,10 +61,10 @@ 
 	public function csv_cols() {
 
 		$cols = array(
-			'date'      => __( 'Date', 'give' ),
-			'donations' => __( 'Donations', 'give' ),
+			'date'      => __('Date', 'give'),
+			'donations' => __('Donations', 'give'),
 			/* translators: %s: currency */
-			'earnings'  => sprintf( __( 'Income (%s)', 'give' ), give_currency_symbol('', true) )
+			'earnings'  => sprintf(__('Income (%s)', 'give'), give_currency_symbol('', true))
 		);
 
 		return $cols;
@@ -79,28 +79,28 @@ 
 	 */
 	public function get_data() {
 
-		$start_year  = isset( $_POST['start_year'] ) ? absint( $_POST['start_year'] ) : date( 'Y' );
-		$end_year    = isset( $_POST['end_year'] ) ? absint( $_POST['end_year'] ) : date( 'Y' );
-		$start_month = isset( $_POST['start_month'] ) ? absint( $_POST['start_month'] ) : date( 'n' );
-		$end_month   = isset( $_POST['end_month'] ) ? absint( $_POST['end_month'] ) : date( 'n' );
+		$start_year  = isset($_POST['start_year']) ? absint($_POST['start_year']) : date('Y');
+		$end_year    = isset($_POST['end_year']) ? absint($_POST['end_year']) : date('Y');
+		$start_month = isset($_POST['start_month']) ? absint($_POST['start_month']) : date('n');
+		$end_month   = isset($_POST['end_month']) ? absint($_POST['end_month']) : date('n');
 
 		$data  = array();
 		$year  = $start_year;
 		$stats = new Give_Payment_Stats;
 
-		while ( $year <= $end_year ) {
+		while ($year <= $end_year) {
 
-			if ( $year == $start_year && $year == $end_year ) {
+			if ($year == $start_year && $year == $end_year) {
 
 				$m1 = $start_month;
 				$m2 = $end_month;
 
-			} elseif ( $year == $start_year ) {
+			} elseif ($year == $start_year) {
 
 				$m1 = $start_month;
 				$m2 = 12;
 
-			} elseif ( $year == $end_year ) {
+			} elseif ($year == $end_year) {
 
 				$m1 = 1;
 				$m2 = $end_month;
@@ -112,28 +112,28 @@ 
 
 			}
 
-			while ( $m1 <= $m2 ) {
+			while ($m1 <= $m2) {
 
-				$date1 = mktime( 0, 0, 0, $m1, 1, $year );
-				$date2 = mktime( 0, 0, 0, $m1, cal_days_in_month( CAL_GREGORIAN, $m1, $year ), $year );
+				$date1 = mktime(0, 0, 0, $m1, 1, $year);
+				$date2 = mktime(0, 0, 0, $m1, cal_days_in_month(CAL_GREGORIAN, $m1, $year), $year);
 
 				$data[] = array(
-					'date'      => date_i18n( 'F Y', $date1 ),
-					'donations' => $stats->get_sales( 0, $date1, $date2 ),
-					'earnings'  => give_format_amount( $stats->get_earnings( 0, $date1, $date2 ), array( 'sanitize' => false ) ),
+					'date'      => date_i18n('F Y', $date1),
+					'donations' => $stats->get_sales(0, $date1, $date2),
+					'earnings'  => give_format_amount($stats->get_earnings(0, $date1, $date2), array('sanitize' => false)),
 				);
 
-				$m1 ++;
+				$m1++;
 
 			}
 
 
-			$year ++;
+			$year++;
 
 		}
 
-		$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;
 	}