WordImpress / Give

includes/admin/reporting/graphing.php

Spacing +243 added lines, -243 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
@@ -190,12 +190,12 @@ 
 			<div class="postbox">
 				<div class="inside">
 					<?php
-					$graph = new Give_Graph( $data );
-					$graph->set( 'x_mode', 'time' );
-					$graph->set( 'multiple_y_axes', true );
+					$graph = new Give_Graph($data);
+					$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 ) ); ?></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)); ?></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'] ) ); ?></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'])); ?></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 Over Time for %s', 'give' ),
-			get_the_title( $form_id )
+			esc_html__('Income Over Time for %s', 'give'),
+			get_the_title($form_id)
 		);
 	?></span></h3>
 
@@ -440,9 +440,9 @@ 
 		<div class="postbox">
 			<div class="inside">
 				<?php
-				$graph = new Give_Graph( $data );
-				$graph->set( 'x_mode', 'time' );
-				$graph->set( 'multiple_y_axes', true );
+				$graph = new Give_Graph($data);
+				$graph->set('x_mode', 'time');
+				$graph->set('multiple_y_axes', true);
 				$graph->display();
 				?>
 			</div>
@@ -451,20 +451,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 ) ); ?></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)); ?></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 ) ) ); ?></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))); ?></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>
@@ -481,26 +481,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' ? '' : 'style="display:none;"';
 	$view    = give_get_reporting_view();
 
-	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'));
 	}
 
 	/**
@@ -508,7 +508,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" class="alignright">
 		<div class="tablenav top alignright">
@@ -516,53 +516,53 @@ 
 
 				<input type="hidden" name="post_type" value="give_forms" />
 				<input type="hidden" name="page" value="give-reports" />
-				<input type="hidden" name="view" value="<?php echo esc_attr( $view ); ?>" />
+				<input type="hidden" name="view" value="<?php echo esc_attr($view); ?>" />
 
-				<?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" class="alignright">
 					<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>
 
-					<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>
 
 				<div id="give-date-range-options" <?php echo $display; ?>>
-					<span><?php esc_html_e( 'From', 'give' ); ?>&nbsp;</span>
+					<span><?php esc_html_e('From', 'give'); ?>&nbsp;</span>
 					<select id="give-graphs-month-start" name="m_start">
-						<?php for ( $i = 1; $i <= 12; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['m_start'] ); ?>><?php echo give_month_num_to_name( $i ); ?></option>
+						<?php for ($i = 1; $i <= 12; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['m_start']); ?>><?php echo give_month_num_to_name($i); ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-day-start" name="day">
-						<?php for ( $i = 1; $i <= 31; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['day'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 1; $i <= 31; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['day']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-year-start" name="year">
-						<?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['year'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 2007; $i <= date('Y'); $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['year']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
-					<span><?php esc_html_e( 'To', 'give' ); ?>&nbsp;</span>
+					<span><?php esc_html_e('To', 'give'); ?>&nbsp;</span>
 					<select id="give-graphs-month-end" name="m_end">
-						<?php for ( $i = 1; $i <= 12; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['m_end'] ); ?>><?php echo give_month_num_to_name( $i ); ?></option>
+						<?php for ($i = 1; $i <= 12; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['m_end']); ?>><?php echo give_month_num_to_name($i); ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-day-end" name="day_end">
-						<?php for ( $i = 1; $i <= 31; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['day_end'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 1; $i <= 31; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['day_end']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-year-end" name="year_end">
-						<?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['year_end'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 2007; $i <= date('Y'); $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['year_end']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
 				</div>
@@ -577,7 +577,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_report_graph_controls_after' );
+	do_action('give_report_graph_controls_after');
 }
 
 /**
@@ -592,65 +592,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 {
 
@@ -666,91 +666,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;
@@ -758,19 +758,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);
 }
 
 /**
@@ -780,17 +780,17 @@ 
  *
  * @param $data
  */
-function give_parse_report_dates( $data ) {
+function give_parse_report_dates($data) {
 	$dates = give_get_report_dates();
 
 	$view = give_get_reporting_view();
-	$id   = isset( $_GET['form-id'] ) ? $_GET['form-id'] : null;
+	$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&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&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');
 
 
 /**
@@ -802,16 +802,16 @@ 
  */
 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="' . $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-refresh-reports-button give-tooltip">' . esc_html__( 'Refresh Reports', 'give' ) . '</a>';
+	echo '<a href="'.$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-refresh-reports-button give-tooltip">'.esc_html__('Refresh Reports', '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
@@ -822,18 +822,18 @@ 
  *
  * @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;
 	}
 
 	//Delete transients
-	delete_transient( 'give_estimated_monthly_stats' );
-	delete_transient( 'give_earnings_total' );
-	delete_transient( md5( 'give_earnings_this_monththis_month' ) );
-	delete_transient( md5( 'give_earnings_todaytoday' ) );
+	delete_transient('give_estimated_monthly_stats');
+	delete_transient('give_earnings_total');
+	delete_transient(md5('give_earnings_this_monththis_month'));
+	delete_transient(md5('give_earnings_todaytoday'));
 
 }
 
-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/reporting/pdf-reports.php

Spacing +146 added lines, -146 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,82 +25,82 @@ 
  *
  * @uses   give_pdf
  */
-function give_generate_pdf( $data ) {
+function give_generate_pdf($data) {
 
-	if ( ! current_user_can( 'view_give_reports' ) ) {
-		wp_die( esc_html__( 'You do not have permission to generate PDF sales reports.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('view_give_reports')) {
+		wp_die(esc_html__('You do not have permission to generate PDF sales reports.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	if ( ! wp_verify_nonce( $_GET['_wpnonce'], 'give_generate_pdf' ) ) {
-		wp_die( esc_html__( 'Nonce verification failed.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($_GET['_wpnonce'], 'give_generate_pdf')) {
+		wp_die(esc_html__('Nonce verification failed.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/fpdf/fpdf.php';
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/fpdf/give_pdf.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/fpdf/fpdf.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/fpdf/give_pdf.php';
 
 	$daterange = utf8_decode(
 		sprintf(
 		/* translators: 1: start date 2: end date */
-			esc_html__( '%1$s to %2$s', 'give' ),
-			date_i18n( give_date_format(), mktime( 0, 0, 0, 1, 1, date( 'Y' ) ) ),
-			date_i18n( give_date_format() )
+			esc_html__('%1$s to %2$s', 'give'),
+			date_i18n(give_date_format(), mktime(0, 0, 0, 1, 1, date('Y'))),
+			date_i18n(give_date_format())
 		)
 	);
 
 	$pdf = new give_pdf();
-	$pdf->AddPage( 'L', 'A4' );
+	$pdf->AddPage('L', 'A4');
 
-	$pdf->SetTitle( utf8_decode( __( 'Donation report for the current year for all forms', 'give' ) ) );
-	$pdf->SetAuthor( utf8_decode( __( 'Give - Democratizing Generosity', 'give' ) ) );
-	$pdf->SetCreator( utf8_decode( __( 'Give - Democratizing Generosity', 'give' ) ) );
+	$pdf->SetTitle(utf8_decode(__('Donation report for the current year for all forms', 'give')));
+	$pdf->SetAuthor(utf8_decode(__('Give - Democratizing Generosity', 'give')));
+	$pdf->SetCreator(utf8_decode(__('Give - Democratizing Generosity', 'give')));
 
-	$pdf->Image( apply_filters( 'give_pdf_export_logo', GIVE_PLUGIN_URL . 'assets/images/give-logo-small.png' ), 247, 8 );
+	$pdf->Image(apply_filters('give_pdf_export_logo', GIVE_PLUGIN_URL.'assets/images/give-logo-small.png'), 247, 8);
 
-	$pdf->SetMargins( 8, 8, 8 );
-	$pdf->SetX( 8 );
+	$pdf->SetMargins(8, 8, 8);
+	$pdf->SetX(8);
 
-	$pdf->SetFont( 'Helvetica', '', 16 );
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->Cell( 0, 3, utf8_decode( __( 'Donation report for the current year for all forms', 'give' ) ), 0, 2, 'L', false );
+	$pdf->SetFont('Helvetica', '', 16);
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->Cell(0, 3, utf8_decode(__('Donation report for the current year for all forms', 'give')), 0, 2, 'L', false);
 
-	$pdf->SetFont( 'Helvetica', '', 13 );
+	$pdf->SetFont('Helvetica', '', 13);
 	$pdf->Ln();
-	$pdf->SetTextColor( 150, 150, 150 );
-	$pdf->Cell( 0, 6, utf8_decode( __( 'Date Range: ', 'give' ) ) . $daterange, 0, 2, 'L', false );
+	$pdf->SetTextColor(150, 150, 150);
+	$pdf->Cell(0, 6, utf8_decode(__('Date Range: ', 'give')).$daterange, 0, 2, 'L', false);
 	$pdf->Ln();
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->SetFont( 'Helvetica', '', 14 );
-	$pdf->Cell( 0, 10, utf8_decode( __( 'Table View', 'give' ) ), 0, 2, 'L', false );
-	$pdf->SetFont( 'Helvetica', '', 12 );
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->SetFont('Helvetica', '', 14);
+	$pdf->Cell(0, 10, utf8_decode(__('Table View', 'give')), 0, 2, 'L', false);
+	$pdf->SetFont('Helvetica', '', 12);
 
-	$pdf->SetFillColor( 238, 238, 238 );
-	$pdf->Cell( 70, 6, utf8_decode( __( 'Form Name', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 30, 6, utf8_decode( __( 'Price', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 50, 6, utf8_decode( __( 'Categories', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 50, 6, utf8_decode( __( 'Tags', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 45, 6, utf8_decode( __( 'Number of Donations', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 35, 6, utf8_decode( __( 'Income to Date', 'give' ) ), 1, 1, 'L', true );
+	$pdf->SetFillColor(238, 238, 238);
+	$pdf->Cell(70, 6, utf8_decode(__('Form Name', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(30, 6, utf8_decode(__('Price', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(50, 6, utf8_decode(__('Categories', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(50, 6, utf8_decode(__('Tags', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(45, 6, utf8_decode(__('Number of Donations', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(35, 6, utf8_decode(__('Income to Date', 'give')), 1, 1, 'L', true);
 
-	$year       = date( 'Y' );
-	$give_forms = get_posts( array( 'post_type' => 'give_forms', 'year' => $year, 'posts_per_page' => - 1 ) );
+	$year       = date('Y');
+	$give_forms = get_posts(array('post_type' => 'give_forms', 'year' => $year, 'posts_per_page' => -1));
 
-	if ( $give_forms ) {
-		$pdf->SetWidths( array( 70, 30, 50, 50, 45, 35 ) );
+	if ($give_forms) {
+		$pdf->SetWidths(array(70, 30, 50, 50, 45, 35));
 
-		foreach ( $give_forms as $form ):
-			$pdf->SetFillColor( 255, 255, 255 );
+		foreach ($give_forms as $form):
+			$pdf->SetFillColor(255, 255, 255);
 
 			$title = $form->post_title;
 
-			if ( give_has_variable_prices( $form->ID ) ) {
+			if (give_has_variable_prices($form->ID)) {
 
-				$prices = give_get_variable_prices( $form->ID );
+				$prices = give_get_variable_prices($form->ID);
 
 				$first = $prices[0]['_give_amount'];
-				$last  = array_pop( $prices );
+				$last  = array_pop($prices);
 				$last  = $last['_give_amount'];
 
-				if ( $first < $last ) {
+				if ($first < $last) {
 					$min = $first;
 					$max = $last;
 				} else {
@@ -108,51 +108,51 @@ 
 					$max = $first;
 				}
 
-				$price = html_entity_decode( give_currency_filter( give_format_amount( $min ) ) . ' - ' . give_currency_filter( give_format_amount( $max ) ) );
+				$price = html_entity_decode(give_currency_filter(give_format_amount($min)).' - '.give_currency_filter(give_format_amount($max)));
 			} else {
-				$price = html_entity_decode( give_currency_filter( give_get_form_price( $form->ID ) ) );
+				$price = html_entity_decode(give_currency_filter(give_get_form_price($form->ID)));
 			}
 
-			$categories = get_the_term_list( $form->ID, 'give_forms_category', '', ', ', '' );
-			$categories = ! is_wp_error( $categories ) ? strip_tags( $categories ) : '';
+			$categories = get_the_term_list($form->ID, 'give_forms_category', '', ', ', '');
+			$categories = ! is_wp_error($categories) ? strip_tags($categories) : '';
 
-			$tags = get_the_term_list( $form->ID, 'give_forms_tag', '', ', ', '' );
-			$tags = ! is_wp_error( $tags ) ? strip_tags( $tags ) : '';
+			$tags = get_the_term_list($form->ID, 'give_forms_tag', '', ', ', '');
+			$tags = ! is_wp_error($tags) ? strip_tags($tags) : '';
 
-			$sales    = give_get_form_sales_stats( $form->ID );
-			$link     = get_permalink( $form->ID );
-			$earnings = html_entity_decode( give_currency_filter( give_get_form_earnings_stats( $form->ID ) ) );
+			$sales    = give_get_form_sales_stats($form->ID);
+			$link     = get_permalink($form->ID);
+			$earnings = html_entity_decode(give_currency_filter(give_get_form_earnings_stats($form->ID)));
 
-			if ( function_exists( 'iconv' ) ) {
+			if (function_exists('iconv')) {
 				// Ensure characters like euro; are properly converted.
-				$price    = iconv( 'UTF-8', 'windows-1252', utf8_encode( $price ) );
-				$earnings = iconv( 'UTF-8', 'windows-1252', utf8_encode( $earnings ) );
+				$price    = iconv('UTF-8', 'windows-1252', utf8_encode($price));
+				$earnings = iconv('UTF-8', 'windows-1252', utf8_encode($earnings));
 			}
 
-			$pdf->Row( array( $title, $price, $categories, $tags, $sales, $earnings ) );
+			$pdf->Row(array($title, $price, $categories, $tags, $sales, $earnings));
 		endforeach;
 	} else {
-		$pdf->SetWidths( array( 280 ) );
-		$title = utf8_decode( esc_html__( 'No forms found.', 'give' ) );
-		$pdf->Row( array( $title ) );
+		$pdf->SetWidths(array(280));
+		$title = utf8_decode(esc_html__('No forms found.', 'give'));
+		$pdf->Row(array($title));
 	}
 
 	$pdf->Ln();
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->SetFont( 'Helvetica', '', 14 );
-	$pdf->Cell( 0, 10, utf8_decode( __( 'Graph View', 'give' ) ), 0, 2, 'L', false );
-	$pdf->SetFont( 'Helvetica', '', 12 );
-
-	$image = html_entity_decode( urldecode( give_draw_chart_image() ) );
-	$image = str_replace( ' ', '%20', $image );
-
-	$pdf->SetX( 25 );
-	$pdf->Image( $image . '&file=.png' );
-	$pdf->Ln( 7 );
-	$pdf->Output( apply_filters( 'give_sales_earnings_pdf_export_filename', 'give-report-' . date_i18n( 'Y-m-d' ) ) . '.pdf', 'D' );
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->SetFont('Helvetica', '', 14);
+	$pdf->Cell(0, 10, utf8_decode(__('Graph View', 'give')), 0, 2, 'L', false);
+	$pdf->SetFont('Helvetica', '', 12);
+
+	$image = html_entity_decode(urldecode(give_draw_chart_image()));
+	$image = str_replace(' ', '%20', $image);
+
+	$pdf->SetX(25);
+	$pdf->Image($image.'&file=.png');
+	$pdf->Ln(7);
+	$pdf->Output(apply_filters('give_sales_earnings_pdf_export_filename', 'give-report-'.date_i18n('Y-m-d')).'.pdf', 'D');
 }
 
-add_action( 'give_generate_pdf', 'give_generate_pdf' );
+add_action('give_generate_pdf', 'give_generate_pdf');
 
 /**
  * Draws Chart for PDF Report.
@@ -169,38 +169,38 @@ 
  * @return string $chart->getUrl() URL for the Google Chart
  */
 function give_draw_chart_image() {
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/googlechartlib/GoogleChart.php';
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/googlechartlib/markers/GoogleChartShapeMarker.php';
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/googlechartlib/markers/GoogleChartTextMarker.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/googlechartlib/GoogleChart.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/googlechartlib/markers/GoogleChartShapeMarker.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/googlechartlib/markers/GoogleChartTextMarker.php';
 
-	$chart = new GoogleChart( 'lc', 900, 330 );
+	$chart = new GoogleChart('lc', 900, 330);
 
 	$i        = 1;
 	$earnings = "";
 	$sales    = "";
 
-	while ( $i <= 12 ) :
-		$earnings .= give_get_earnings_by_date( null, $i, date( 'Y' ) ) . ",";
-		$sales .= give_get_sales_by_date( null, $i, date( 'Y' ) ) . ",";
-		$i ++;
+	while ($i <= 12) :
+		$earnings .= give_get_earnings_by_date(null, $i, date('Y')).",";
+		$sales .= give_get_sales_by_date(null, $i, date('Y')).",";
+		$i++;
 	endwhile;
 
-	$earnings_array = explode( ",", $earnings );
-	$sales_array    = explode( ",", $sales );
+	$earnings_array = explode(",", $earnings);
+	$sales_array    = explode(",", $sales);
 
 	$i = 0;
-	while ( $i <= 11 ) {
-		if ( empty( $sales_array[ $i ] ) ) {
-			$sales_array[ $i ] = 0;
+	while ($i <= 11) {
+		if (empty($sales_array[$i])) {
+			$sales_array[$i] = 0;
 		}
-		$i ++;
+		$i++;
 	}
 
 	$min_earnings   = 0;
-	$max_earnings   = max( $earnings_array );
-	$earnings_scale = round( $max_earnings, - 1 );
+	$max_earnings   = max($earnings_array);
+	$earnings_scale = round($max_earnings, - 1);
 
-	$data = new GoogleChartData( array(
+	$data = new GoogleChartData(array(
 		$earnings_array[0],
 		$earnings_array[1],
 		$earnings_array[2],
@@ -213,25 +213,25 @@ 
 		$earnings_array[9],
 		$earnings_array[10],
 		$earnings_array[11]
-	) );
+	));
 
-	$data->setLegend( esc_html__( 'Income', 'give' ) );
-	$data->setColor( '1b58a3' );
-	$chart->addData( $data );
+	$data->setLegend(esc_html__('Income', 'give'));
+	$data->setColor('1b58a3');
+	$chart->addData($data);
 
-	$shape_marker = new GoogleChartShapeMarker( GoogleChartShapeMarker::CIRCLE );
-	$shape_marker->setColor( '000000' );
-	$shape_marker->setSize( 7 );
-	$shape_marker->setBorder( 2 );
-	$shape_marker->setData( $data );
-	$chart->addMarker( $shape_marker );
+	$shape_marker = new GoogleChartShapeMarker(GoogleChartShapeMarker::CIRCLE);
+	$shape_marker->setColor('000000');
+	$shape_marker->setSize(7);
+	$shape_marker->setBorder(2);
+	$shape_marker->setData($data);
+	$chart->addMarker($shape_marker);
 
-	$value_marker = new GoogleChartTextMarker( GoogleChartTextMarker::VALUE );
-	$value_marker->setColor( '000000' );
-	$value_marker->setData( $data );
-	$chart->addMarker( $value_marker );
+	$value_marker = new GoogleChartTextMarker(GoogleChartTextMarker::VALUE);
+	$value_marker->setColor('000000');
+	$value_marker->setData($data);
+	$chart->addMarker($value_marker);
 
-	$data = new GoogleChartData( array(
+	$data = new GoogleChartData(array(
 		$sales_array[0],
 		$sales_array[1],
 		$sales_array[2],
@@ -244,46 +244,46 @@ 
 		$sales_array[9],
 		$sales_array[10],
 		$sales_array[11]
-	) );
-	$data->setLegend( esc_html__( 'Donations', 'give' ) );
-	$data->setColor( 'ff6c1c' );
-	$chart->addData( $data );
-
-	$chart->setTitle( esc_html__( 'Donations by Month for all Give Forms', 'give' ), '336699', 18 );
-
-	$chart->setScale( 0, $max_earnings );
-
-	$y_axis = new GoogleChartAxis( 'y' );
-	$y_axis->setDrawTickMarks( true )->setLabels( array( 0, $max_earnings ) );
-	$chart->addAxis( $y_axis );
-
-	$x_axis = new GoogleChartAxis( 'x' );
-	$x_axis->setTickMarks( 5 );
-	$x_axis->setLabels( array(
-		esc_html__( 'Jan', 'give' ),
-		esc_html__( 'Feb', 'give' ),
-		esc_html__( 'Mar', 'give' ),
-		esc_html__( 'Apr', 'give' ),
-		esc_html__( 'May', 'give' ),
-		esc_html__( 'June', 'give' ),
-		esc_html__( 'July', 'give' ),
-		esc_html__( 'Aug', 'give' ),
-		esc_html__( 'Sept', 'give' ),
-		esc_html__( 'Oct', 'give' ),
-		esc_html__( 'Nov', 'give' ),
-		esc_html__( 'Dec', 'give' )
-	) );
-	$chart->addAxis( $x_axis );
-
-	$shape_marker = new GoogleChartShapeMarker( GoogleChartShapeMarker::CIRCLE );
-	$shape_marker->setSize( 6 );
-	$shape_marker->setBorder( 2 );
-	$shape_marker->setData( $data );
-	$chart->addMarker( $shape_marker );
-
-	$value_marker = new GoogleChartTextMarker( GoogleChartTextMarker::VALUE );
-	$value_marker->setData( $data );
-	$chart->addMarker( $value_marker );
+	));
+	$data->setLegend(esc_html__('Donations', 'give'));
+	$data->setColor('ff6c1c');
+	$chart->addData($data);
+
+	$chart->setTitle(esc_html__('Donations by Month for all Give Forms', 'give'), '336699', 18);
+
+	$chart->setScale(0, $max_earnings);
+
+	$y_axis = new GoogleChartAxis('y');
+	$y_axis->setDrawTickMarks(true)->setLabels(array(0, $max_earnings));
+	$chart->addAxis($y_axis);
+
+	$x_axis = new GoogleChartAxis('x');
+	$x_axis->setTickMarks(5);
+	$x_axis->setLabels(array(
+		esc_html__('Jan', 'give'),
+		esc_html__('Feb', 'give'),
+		esc_html__('Mar', 'give'),
+		esc_html__('Apr', 'give'),
+		esc_html__('May', 'give'),
+		esc_html__('June', 'give'),
+		esc_html__('July', 'give'),
+		esc_html__('Aug', 'give'),
+		esc_html__('Sept', 'give'),
+		esc_html__('Oct', 'give'),
+		esc_html__('Nov', 'give'),
+		esc_html__('Dec', 'give')
+	));
+	$chart->addAxis($x_axis);
+
+	$shape_marker = new GoogleChartShapeMarker(GoogleChartShapeMarker::CIRCLE);
+	$shape_marker->setSize(6);
+	$shape_marker->setBorder(2);
+	$shape_marker->setData($data);
+	$chart->addMarker($shape_marker);
+
+	$value_marker = new GoogleChartTextMarker(GoogleChartTextMarker::VALUE);
+	$value_marker->setData($data);
+	$chart->addMarker($value_marker);
 
 	return $chart->getUrl();
 }

includes/admin/reporting/tools.php

Spacing +27 added lines, -27 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -22,7 +22,7 @@ 
  */
 function give_tools_recount_stats_display() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 
@@ -31,27 +31,27 @@ 
 	 *
 	 * @since 1.5
 	 */
-	do_action( 'give_tools_recount_stats_before' );
+	do_action('give_tools_recount_stats_before');
 	?>
 	<div id="poststuff">
 		<div class="postbox">
 
-			<h2 class="hndle ui-sortable-handle"><span><?php esc_html_e( 'Recount Stats', 'give' ); ?></span></h2>
+			<h2 class="hndle ui-sortable-handle"><span><?php esc_html_e('Recount Stats', 'give'); ?></span></h2>
 
 			<div class="inside recount-stats-controls">
-				<p><?php esc_html_e( 'Use these tools to recount stats, delete test transactions, or reset stats.', 'give' ); ?></p>
+				<p><?php esc_html_e('Use these tools to recount stats, delete test transactions, or reset stats.', 'give'); ?></p>
 				<form method="post" id="give-tools-recount-form" class="give-export-form">
 
-					<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+					<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 
 					<select name="give-export-class" id="recount-stats-type">
-						<option value="0" selected="selected" disabled="disabled"><?php esc_html_e( 'Please select an option', 'give' ); ?></option>
-						<option data-type="recount-stats" value="Give_Tools_Recount_Income"><?php esc_html_e( 'Recalculate Total Donation Income Amount', 'give' ); ?></option>
-						<option data-type="recount-form" value="Give_Tools_Recount_Form_Stats"><?php esc_html_e( 'Recalculate Income Amount and Donation Counts for a Form', 'give' ); ?></option>
-						<option data-type="recount-all" value="Give_Tools_Recount_All_Stats"><?php esc_html_e( 'Recalculate Income Amount and Donation Counts for All Forms', 'give' ); ?></option>
-						<option data-type="recount-customer-stats" value="Give_Tools_Recount_Customer_Stats"><?php esc_html_e( 'Recalculate Donor Statistics', 'give' ); ?></option>
-						<option data-type="delete-test-transactions" value="Give_Tools_Delete_Test_Transactions"><?php esc_html_e( 'Delete Test Transactions', 'give' ); ?></option>
-						<option data-type="reset-stats" value="Give_Tools_Reset_Stats"><?php esc_html_e( 'Delete All Data', 'give' ); ?></option>
+						<option value="0" selected="selected" disabled="disabled"><?php esc_html_e('Please select an option', 'give'); ?></option>
+						<option data-type="recount-stats" value="Give_Tools_Recount_Income"><?php esc_html_e('Recalculate Total Donation Income Amount', 'give'); ?></option>
+						<option data-type="recount-form" value="Give_Tools_Recount_Form_Stats"><?php esc_html_e('Recalculate Income Amount and Donation Counts for a Form', 'give'); ?></option>
+						<option data-type="recount-all" value="Give_Tools_Recount_All_Stats"><?php esc_html_e('Recalculate Income Amount and Donation Counts for All Forms', 'give'); ?></option>
+						<option data-type="recount-customer-stats" value="Give_Tools_Recount_Customer_Stats"><?php esc_html_e('Recalculate Donor Statistics', 'give'); ?></option>
+						<option data-type="delete-test-transactions" value="Give_Tools_Delete_Test_Transactions"><?php esc_html_e('Delete Test Transactions', 'give'); ?></option>
+						<option data-type="reset-stats" value="Give_Tools_Reset_Stats"><?php esc_html_e('Delete All Data', 'give'); ?></option>
 						<?php
 						/**
 						 * Fires in the recount stats selectbox.
@@ -60,7 +60,7 @@ 
 						 *
 						 * @since 1.5
 						 */
-						do_action( 'give_recount_tool_options' );
+						do_action('give_recount_tool_options');
 						?>
 					</select>
 
@@ -68,22 +68,22 @@ 
 						<?php
 						$args = array(
 							'name'   => 'form_id',
-							'number' => - 1,
+							'number' => -1,
 							'chosen' => true,
 						);
-						echo Give()->html->forms_dropdown( $args );
+						echo Give()->html->forms_dropdown($args);
 						?>
 					</span>
 
-					<input type="submit" id="recount-stats-submit" value="<?php esc_attr_e( 'Submit', 'give' ); ?>" class="button-secondary"/>
+					<input type="submit" id="recount-stats-submit" value="<?php esc_attr_e('Submit', 'give'); ?>" class="button-secondary"/>
 
 					<br/>
 
 					<span class="give-recount-stats-descriptions">
-						<span id="recount-stats"><?php esc_html_e( 'Recalculates the overall donation income amount.', 'give' ); ?></span>
-						<span id="recount-form"><?php esc_html_e( 'Recalculates the donation and income stats for a specific form.', 'give' ); ?></span>
-						<span id="recount-all"><?php esc_html_e( 'Recalculates the earnings and sales stats for all forms.', 'give' ); ?></span>
-						<span id="recount-customer-stats"><?php esc_html_e( 'Recalculates the lifetime value and donation counts for all donors.', 'give' ); ?></span>
+						<span id="recount-stats"><?php esc_html_e('Recalculates the overall donation income amount.', 'give'); ?></span>
+						<span id="recount-form"><?php esc_html_e('Recalculates the donation and income stats for a specific form.', 'give'); ?></span>
+						<span id="recount-all"><?php esc_html_e('Recalculates the earnings and sales stats for all forms.', 'give'); ?></span>
+						<span id="recount-customer-stats"><?php esc_html_e('Recalculates the lifetime value and donation counts for all donors.', 'give'); ?></span>
 						<?php
 						/**
 						 * Fires in the recount stats description area.
@@ -92,10 +92,10 @@ 
 						 *
 						 * @since 1.5
 						 */
-						do_action( 'give_recount_tool_descriptions' );
+						do_action('give_recount_tool_descriptions');
 						?>
-						<span id="delete-test-transactions"><?php _e( '<strong>Deletes</strong> all TEST donations, donors, and related log entries.', 'give' ); ?></span>
-						<span id="reset-stats"><?php _e( '<strong>Deletes</strong> ALL donations, donors, and related log entries regardless of test or live mode.', 'give' ); ?></span>
+						<span id="delete-test-transactions"><?php _e('<strong>Deletes</strong> all TEST donations, donors, and related log entries.', 'give'); ?></span>
+						<span id="reset-stats"><?php _e('<strong>Deletes</strong> ALL donations, donors, and related log entries regardless of test or live mode.', 'give'); ?></span>
 					</span>
 
 					<span class="spinner"></span>
@@ -109,7 +109,7 @@ 
 				 *
 				 * @since 1.5
 				 */
-				do_action( 'give_tools_recount_forms' );
+				do_action('give_tools_recount_forms');
 				?>
 			</div><!-- .inside -->
 		</div><!-- .postbox -->
@@ -120,7 +120,7 @@ 
 	 *
 	 * @since 1.5
 	 */
-	do_action( 'give_tools_recount_stats_after' );
+	do_action('give_tools_recount_stats_after');
 }
 
-add_action( 'give_reports_tab_tools', 'give_tools_recount_stats_display' );
+add_action('give_reports_tab_tools', 'give_tools_recount_stats_display');

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

Spacing +33 added lines, -33 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -106,14 +106,14 @@ 
 	 * @param $_step int The step to process
 	 * @since 1.5
 	 */
-	public function __construct( $_step = 1 ) {
+	public function __construct($_step = 1) {
 
 		$upload_dir       = wp_upload_dir();
 		$this->filetype   = '.csv';
-		$this->filename   = 'give-' . $this->export_type . $this->filetype;
-		$this->file       = trailingslashit( $upload_dir['basedir'] ) . $this->filename;
+		$this->filename   = 'give-'.$this->export_type.$this->filetype;
+		$this->file       = trailingslashit($upload_dir['basedir']).$this->filename;
 
-		if ( ! is_writeable( $upload_dir['basedir'] ) ) {
+		if ( ! is_writeable($upload_dir['basedir'])) {
 			$this->is_writable = false;
 		}
 
@@ -129,20 +129,20 @@ 
 	 */
 	public function process_step() {
 
-		if ( ! $this->can_export() ) {
-			wp_die( esc_html__( 'You do not have permission to export data.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ( ! $this->can_export()) {
+			wp_die(esc_html__('You do not have permission to export data.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 		}
 
-		if( $this->step < 2 ) {
+		if ($this->step < 2) {
 
 			// Make sure we start with a fresh file on step 1
-			@unlink( $this->file );
+			@unlink($this->file);
 			$this->print_csv_cols();
 		}
 
 		$rows = $this->print_csv_rows();
 
-		if( $rows ) {
+		if ($rows) {
 			return true;
 		} else {
 			return false;
@@ -162,14 +162,14 @@ 
 		$col_data = '';
 		$cols = $this->get_csv_cols();
 		$i = 1;
-		foreach( $cols as $col_id => $column ) {
-			$col_data .= '"' . addslashes( $column ) . '"';
-			$col_data .= $i == count( $cols ) ? '' : ',';
+		foreach ($cols as $col_id => $column) {
+			$col_data .= '"'.addslashes($column).'"';
+			$col_data .= $i == count($cols) ? '' : ',';
 			$i++;
 		}
 		$col_data .= "\r\n";
 
-		$this->stash_step_data( $col_data );
+		$this->stash_step_data($col_data);
 
 		return $col_data;
 
@@ -188,23 +188,23 @@ 
 		$data     = $this->get_data();
 		$cols     = $this->get_csv_cols();
 
-		if( $data ) {
+		if ($data) {
 
 			// Output each row
-			foreach ( $data as $row ) {
+			foreach ($data as $row) {
 				$i = 1;
-				foreach ( $row as $col_id => $column ) {
+				foreach ($row as $col_id => $column) {
 					// Make sure the column is valid
-					if ( array_key_exists( $col_id, $cols ) ) {
-						$row_data .= '"' . addslashes( preg_replace( "/\"/","'", $column ) ) . '"';
-						$row_data .= $i == count( $cols ) ? '' : ',';
+					if (array_key_exists($col_id, $cols)) {
+						$row_data .= '"'.addslashes(preg_replace("/\"/", "'", $column)).'"';
+						$row_data .= $i == count($cols) ? '' : ',';
 						$i++;
 					}
 				}
 				$row_data .= "\r\n";
 			}
 
-			$this->stash_step_data( $row_data );
+			$this->stash_step_data($row_data);
 
 			return $row_data;
 		}
@@ -232,18 +232,18 @@ 
 
 		$file = '';
 
-		if ( @file_exists( $this->file ) ) {
+		if (@file_exists($this->file)) {
 
-			if ( ! is_writeable( $this->file ) ) {
+			if ( ! is_writeable($this->file)) {
 				$this->is_writable = false;
 			}
 
-			$file = @file_get_contents( $this->file );
+			$file = @file_get_contents($this->file);
 
 		} else {
 
-			@file_put_contents( $this->file, '' );
-			@chmod( $this->file, 0664 );
+			@file_put_contents($this->file, '');
+			@chmod($this->file, 0664);
 
 		}
 
@@ -257,18 +257,18 @@ 
 	 * @param $data string The data to add to the file
 	 * @return void
 	 */
-	protected function stash_step_data( $data = '' ) {
+	protected function stash_step_data($data = '') {
 
 		$file = $this->get_file();
 		$file .= $data;
-		@file_put_contents( $this->file, $file );
+		@file_put_contents($this->file, $file);
 
 		// If we have no rows after this step, mark it as an empty export
-		$file_rows    = file( $this->file, FILE_SKIP_EMPTY_LINES);
+		$file_rows    = file($this->file, FILE_SKIP_EMPTY_LINES);
 		$default_cols = $this->get_csv_cols();
-		$default_cols = empty( $default_cols ) ? 0 : 1;
+		$default_cols = empty($default_cols) ? 0 : 1;
 
-		$this->is_empty = count( $file_rows ) == $default_cols ? true : false;
+		$this->is_empty = count($file_rows) == $default_cols ? true : false;
 
 	}
 
@@ -286,7 +286,7 @@ 
 
 		$file = $this->get_file();
 
-		@unlink( $this->file );
+		@unlink($this->file);
 
 		echo $file;
 
@@ -299,7 +299,7 @@ 
 	 * @since 1.5
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {}
+	public function set_properties($request) {}
 
 	/**
 	 * Allow for prefetching of data for the remainder of the exporter

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

Spacing +69 added lines, -69 removed lines

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

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

Spacing +33 added lines, -33 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,10 +24,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['title']   = esc_html__( 'Donation Form', 'give' );
-		$this->shortcode['label']   = esc_html__( 'Donation Form', 'give' );
+		$this->shortcode['title']   = esc_html__('Donation Form', 'give');
+		$this->shortcode['label']   = esc_html__('Donation Form', 'give');
 
-		parent::__construct( 'give_form' );
+		parent::__construct('give_form');
 	}
 
 	/**
@@ -39,8 +39,8 @@ 
 
 		$create_form_link = sprintf(
 			/* translators: %s: create new form URL */
-			__( '<a href="%s">Create</a> a new Donation Form.', 'give' ),
-			admin_url( 'post-new.php?post_type=give_forms' )
+			__('<a href="%s">Create</a> a new Donation Form.', 'give'),
+			admin_url('post-new.php?post_type=give_forms')
 		);
 
 		return array(
@@ -50,68 +50,68 @@ 
 					'post_type' => 'give_forms',
 				),
 				'name'        => 'id',
-				'tooltip'     => esc_attr__( 'Select a Donation Form', 'give' ),
-				'placeholder' => esc_attr__( '- Select a Form -', 'give' ),
+				'tooltip'     => esc_attr__('Select a Donation Form', 'give'),
+				'placeholder' => esc_attr__('- Select a Form -', 'give'),
 				'required'    => array(
-					'alert' => esc_html__( 'You must first select a Form!', 'give' ),
-					'error' => sprintf( '<p class="strong">%s</p><p class="no-margin">%s</p>', esc_html__( 'No forms found.', 'give' ), $create_form_link ),
+					'alert' => esc_html__('You must first select a Form!', 'give'),
+					'error' => sprintf('<p class="strong">%s</p><p class="no-margin">%s</p>', esc_html__('No forms found.', 'give'), $create_form_link),
 				),
 			),
 			array(
 				'type' => 'container',
-				'html' => sprintf( '<p class="strong margin-top">%s</p>', esc_html__( 'Optional settings', 'give' ) ),
+				'html' => sprintf('<p class="strong margin-top">%s</p>', esc_html__('Optional settings', 'give')),
 			),
 			array(
 				'type'    => 'listbox',
 				'name'    => 'show_title',
-				'label'   => esc_attr__( 'Show Title:', 'give' ),
-				'tooltip' => esc_attr__( 'Do you want to display the form title?', 'give' ),
+				'label'   => esc_attr__('Show Title:', 'give'),
+				'tooltip' => esc_attr__('Do you want to display the form title?', 'give'),
 				'options' => array(
-					'true'  => esc_html__( 'Show', 'give' ),
-					'false' => esc_html__( 'Hide', 'give' ),
+					'true'  => esc_html__('Show', 'give'),
+					'false' => esc_html__('Hide', 'give'),
 				),
 			),
 			array(
 				'type'    => 'listbox',
 				'name'    => 'show_goal',
-				'label'   => esc_attr__( 'Show Goal:', 'give' ),
-				'tooltip' => esc_attr__( 'Do you want to display the donation goal?', 'give' ),
+				'label'   => esc_attr__('Show Goal:', 'give'),
+				'tooltip' => esc_attr__('Do you want to display the donation goal?', 'give'),
 				'options' => array(
-					'true'  => esc_html__( 'Show', 'give' ),
-					'false' => esc_html__( 'Hide', 'give' ),
+					'true'  => esc_html__('Show', 'give'),
+					'false' => esc_html__('Hide', 'give'),
 				),
 			),
 			array(
 				'type'    => 'listbox',
 				'name'    => 'show_content',
 				'minWidth' => 240,
-				'label'   => esc_attr__( 'Display Content:', 'give' ),
-				'tooltip' => esc_attr__( 'Do you want to display the form content?', 'give' ),
+				'label'   => esc_attr__('Display Content:', 'give'),
+				'tooltip' => esc_attr__('Do you want to display the form content?', 'give'),
 				'options' => array(
-					'none'  => esc_html__( 'No Content', 'give' ),
-					'above' => esc_html__( 'Display content ABOVE the fields', 'give' ),
-					'below' => esc_html__( 'Display content BELOW the fields', 'give' ),
+					'none'  => esc_html__('No Content', 'give'),
+					'above' => esc_html__('Display content ABOVE the fields', 'give'),
+					'below' => esc_html__('Display content BELOW the fields', 'give'),
 				),
 			),
 			array(
 				'type'    => 'listbox',
 				'name'    => 'display_style',
-				'label'   => esc_attr__( 'Donation Fields:', 'give' ),
-				'tooltip' => esc_attr__( 'How would you like to display donation information?', 'give' ),
+				'label'   => esc_attr__('Donation Fields:', 'give'),
+				'tooltip' => esc_attr__('How would you like to display donation information?', 'give'),
 				'options' => array(
-					'onpage' => esc_html__( 'Show on Page', 'give' ),
-					'reveal' => esc_html__( 'Reveal Upon Click', 'give' ),
-					'modal'  => esc_html__( 'Modal Window Upon Click', 'give' ),
+					'onpage' => esc_html__('Show on Page', 'give'),
+					'reveal' => esc_html__('Reveal Upon Click', 'give'),
+					'modal'  => esc_html__('Modal Window Upon Click', 'give'),
 				),
 			),
 			array(
 				'type'    => 'listbox',
 				'name'    => 'float_labels',
-				'label'   => esc_attr__( 'Floating Labels:', 'give' ),
-				'tooltip' => esc_attr__( 'Override the default floating labels setting for this form.', 'give' ),
+				'label'   => esc_attr__('Floating Labels:', 'give'),
+				'tooltip' => esc_attr__('Override the default floating labels setting for this form.', 'give'),
 				'options' => array(
-					'enabled'  => esc_html__( 'Enabled', 'give' ),
-					'disabled' => esc_html__( 'Disabled', 'give' ),
+					'enabled'  => esc_html__('Enabled', 'give'),
+					'disabled' => esc_html__('Disabled', 'give'),
 				),
 			),
 		);

includes/admin/shortcodes/abstract-shortcode-generator.php

Spacing +64 added lines, -64 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -62,12 +62,12 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __construct( $shortcode ) {
+	public function __construct($shortcode) {
 
 
 		$this->shortcode_tag = $shortcode;
 
-		add_action( 'admin_init', array( $this, 'init' ) );
+		add_action('admin_init', array($this, 'init'));
 
 	}
 
@@ -78,9 +78,9 @@ 
 	 */
 	public function init() {
 
-		if ( $this->shortcode_tag ) {
+		if ($this->shortcode_tag) {
 
-			$this->self = get_class( $this );
+			$this->self = get_class($this);
 
 			$this->errors   = array();
 			$this->required = array();
@@ -89,18 +89,18 @@ 
 			$fields = $this->get_fields();
 
 			$defaults = array(
-				'btn_close' => esc_html__( 'Close', 'give' ),
-				'btn_okay'  => esc_html__( 'Insert Shortcode', 'give' ),
+				'btn_close' => esc_html__('Close', 'give'),
+				'btn_okay'  => esc_html__('Insert Shortcode', 'give'),
 				'errors'    => $this->errors,
 				'fields'    => $fields,
-				'label'     => '[' . $this->shortcode_tag . ']',
+				'label'     => '['.$this->shortcode_tag.']',
 				'required'  => $this->required,
-				'title'     => esc_html__( 'Insert Shortcode', 'give' ),
+				'title'     => esc_html__('Insert Shortcode', 'give'),
 			);
 
-			if ( user_can_richedit() ) {
+			if (user_can_richedit()) {
 
-				Give_Shortcode_Button::$shortcodes[ $this->shortcode_tag ] = wp_parse_args( $this->shortcode, $defaults );
+				Give_Shortcode_Button::$shortcodes[$this->shortcode_tag] = wp_parse_args($this->shortcode, $defaults);
 
 			}
 		}
@@ -129,13 +129,13 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_fields( $defined_fields ) {
+	protected function generate_fields($defined_fields) {
 
 		$fields = array();
 
-		if ( is_array( $defined_fields ) ) {
+		if (is_array($defined_fields)) {
 
-			foreach ( $defined_fields as $field ) {
+			foreach ($defined_fields as $field) {
 
 				$defaults = array(
 					'label'       => false,
@@ -146,14 +146,14 @@ 
 					'type'        => '',
 				);
 
-				$field  = wp_parse_args( (array) $field, $defaults );
-				$method = 'generate_' . strtolower( $field['type'] );
+				$field  = wp_parse_args((array) $field, $defaults);
+				$method = 'generate_'.strtolower($field['type']);
 
-				if ( method_exists( $this, $method ) ) {
+				if (method_exists($this, $method)) {
 
-					$field = call_user_func( array( $this, $method ), $field );
+					$field = call_user_func(array($this, $method), $field);
 
-					if ( $field ) {
+					if ($field) {
 						$fields[] = $field;
 					}
 				}
@@ -173,22 +173,22 @@ 
 	protected function get_fields() {
 
 		$defined_fields   = $this->define_fields();
-		$generated_fields = $this->generate_fields( $defined_fields );
+		$generated_fields = $this->generate_fields($defined_fields);
 
 		$errors = array();
 
-		if ( ! empty( $this->errors ) ) {
-			foreach ( $this->required as $name => $alert ) {
-				if ( false === array_search( $name, array_column( $generated_fields, 'name' ) ) ) {
+		if ( ! empty($this->errors)) {
+			foreach ($this->required as $name => $alert) {
+				if (false === array_search($name, array_column($generated_fields, 'name'))) {
 
-					$errors[] = $this->errors[ $name ];
+					$errors[] = $this->errors[$name];
 				}
 			}
 
 			$this->errors = $errors;
 		}
 
-		if ( ! empty( $errors ) ) {
+		if ( ! empty($errors)) {
 
 			return $errors;
 		}
@@ -205,9 +205,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_container( $field ) {
+	protected function generate_container($field) {
 
-		if ( array_key_exists( 'html', $field ) ) {
+		if (array_key_exists('html', $field)) {
 
 			return array(
 				'type' => $field['type'],
@@ -227,36 +227,36 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_listbox( $field ) {
+	protected function generate_listbox($field) {
 
-		$listbox = shortcode_atts( array(
+		$listbox = shortcode_atts(array(
 			'label'    => '',
 			'minWidth' => '',
 			'name'     => false,
 			'tooltip'  => '',
 			'type'     => '',
 			'value'    => '',
-		), $field );
+		), $field);
 
-		if ( $this->validate( $field ) ) {
+		if ($this->validate($field)) {
 
 			$new_listbox = array();
 
-			foreach ( $listbox as $key => $value ) {
+			foreach ($listbox as $key => $value) {
 
-				if ( $key == 'value' && empty( $value ) ) {
-					$new_listbox[ $key ] = $listbox['name'];
-				} else if ( $value ) {
-					$new_listbox[ $key ] = $value;
+				if ($key == 'value' && empty($value)) {
+					$new_listbox[$key] = $listbox['name'];
+				} else if ($value) {
+					$new_listbox[$key] = $value;
 				}
 			}
 
 			// do not reindex array!
 			$field['options'] = array(
-				                    '' => ( $field['placeholder'] ? $field['placeholder'] : esc_attr__( '- Select -', 'give' ) ),
+				                    '' => ($field['placeholder'] ? $field['placeholder'] : esc_attr__('- Select -', 'give')),
 			                    ) + $field['options'];
 
-			foreach ( $field['options'] as $value => $text ) {
+			foreach ($field['options'] as $value => $text) {
 				$new_listbox['values'][] = array(
 					'text'  => $text,
 					'value' => $value,
@@ -278,7 +278,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_post( $field ) {
+	protected function generate_post($field) {
 
 		$args = array(
 			'post_type'      => 'post',
@@ -287,23 +287,23 @@ 
 			'posts_per_page' => 30,
 		);
 
-		$args    = wp_parse_args( (array) $field['query_args'], $args );
-		$posts   = get_posts( $args );
+		$args    = wp_parse_args((array) $field['query_args'], $args);
+		$posts   = get_posts($args);
 		$options = array();
 
-		if ( $posts ) {
-			foreach ( $posts as $post ) {
-				$options[ absint( $post->ID ) ] = $post->post_title;
+		if ($posts) {
+			foreach ($posts as $post) {
+				$options[absint($post->ID)] = $post->post_title;
 			}
 
 			$field['type']    = 'listbox';
 			$field['options'] = $options;
 
-			return $this->generate_listbox( $field );
+			return $this->generate_listbox($field);
 		}
 
 		// perform validation here before returning false
-		$this->validate( $field );
+		$this->validate($field);
 
 		return false;
 	}
@@ -317,9 +317,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_textbox( $field ) {
+	protected function generate_textbox($field) {
 
-		$textbox = shortcode_atts( array(
+		$textbox = shortcode_atts(array(
 			'label'     => '',
 			'maxLength' => '',
 			'minHeight' => '',
@@ -329,10 +329,10 @@ 
 			'tooltip'   => '',
 			'type'      => '',
 			'value'     => '',
-		), $field );
+		), $field);
 
-		if ( $this->validate( $field ) ) {
-			return array_filter( $textbox, array( $this, 'return_textbox_value' ) );
+		if ($this->validate($field)) {
+			return array_filter($textbox, array($this, 'return_textbox_value'));
 		}
 
 		return false;
@@ -345,7 +345,7 @@ 
 	 *
 	 * @return bool
 	 */
-	function return_textbox_value( $value ) {
+	function return_textbox_value($value) {
 		return $value !== '';
 	}
 
@@ -361,9 +361,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function validate( $field ) {
+	protected function validate($field) {
 
-		extract( shortcode_atts(
+		extract(shortcode_atts(
 				array(
 					'name'     => false,
 					'required' => false,
@@ -371,36 +371,36 @@ 
 				), $field )
 		);
 
-		if ( $name ) {
+		if ($name) {
 
-			if ( isset( $required['error'] ) ) {
+			if (isset($required['error'])) {
 
 				$error = array(
 					'type' => 'container',
 					'html' => $required['error'],
 				);
 
-				$this->errors[ $name ] = $this->generate_container( $error );
+				$this->errors[$name] = $this->generate_container($error);
 			}
 
-			if ( ! ! $required || is_array( $required ) ) {
+			if ( ! ! $required || is_array($required)) {
 
-				$alert = esc_html__( 'Some of the shortcode options are required.', 'give' );
+				$alert = esc_html__('Some of the shortcode options are required.', 'give');
 
-				if ( isset( $required['alert'] ) ) {
+				if (isset($required['alert'])) {
 
 					$alert = $required['alert'];
 
-				} else if ( ! empty( $label ) ) {
+				} else if ( ! empty($label)) {
 
 					$alert = sprintf(
 					/* translators: %s: option label */
-						esc_html__( 'The "%s" option is required.', 'give' ),
-						str_replace( ':', '', $label )
+						esc_html__('The "%s" option is required.', 'give'),
+						str_replace(':', '', $label)
 					);
 				}
 
-				$this->required[ $name ] = $alert;
+				$this->required[$name] = $alert;
 			}
 
 			return true;

includes/admin/shortcodes/shortcode-give-donation-history.php

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,9 +21,9 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['label'] = esc_html__( 'Donation History', 'give' );
+		$this->shortcode['label'] = esc_html__('Donation History', 'give');
 
-		parent::__construct( 'donation_history' );
+		parent::__construct('donation_history');
 	}
 }
 

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

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,10 +21,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['title'] = esc_html__( 'Register', 'give' );
-		$this->shortcode['label'] = esc_html__( 'Register', 'give' );
+		$this->shortcode['title'] = esc_html__('Register', 'give');
+		$this->shortcode['label'] = esc_html__('Register', 'give');
 
-		parent::__construct( 'give_register' );
+		parent::__construct('give_register');
 	}
 
 	/**
@@ -37,13 +37,13 @@ 
 		return array(
 			array(
 				'type' => 'container',
-				'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Redirect URL (optional):', 'give' ) ),
+				'html' => sprintf('<p class="no-margin">%s</p>', esc_html__('Redirect URL (optional):', 'give')),
 			),
 			array(
 				'type'     => 'textbox',
 				'name'     => 'redirect',
 				'minWidth' => 320,
-				'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after registering.', 'give' ),
+				'tooltip'  => esc_attr__('Enter an URL here to redirect to after registering.', 'give'),
 			),
 		);
 	}