WordImpress / Give

includes/admin/reporting/graphing.php

Doc Comments +1 added lines, -1 removed lines

@@ -576,7 +576,7 @@
  * selected date-range (if any)
  *
  * @since 1.0
- * @return array
+ * @return integer|null
  */
 function give_get_report_dates() {
 	$dates = array();

Indentation +6 added lines, -6 removed lines

@@ -814,12 +814,12 @@
 	) ), 'give-refresh-reports' );
 
 	echo '<a href="'
-	     . 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' )
-	     . '</a>';
+		 . 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' )
+		 . '</a>';
 
 }
 

Spacing +248 added lines, -248 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 );
-					$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 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 );
-					$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>
@@ -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 ) ); ?></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>
@@ -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,18 +834,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/plugin-compatibility.php

Spacing +2 added lines, -2 removed lines

@@ -19,6 +19,6 @@
  * @return void
  */
 function give_disable_mandrill_nl2br() {
-	add_filter( 'mandrill_nl2br', '__return_false' );
+	add_filter('mandrill_nl2br', '__return_false');
 }
-add_action( 'give_email_send_before', 'give_disable_mandrill_nl2br');
+add_action('give_email_send_before', 'give_disable_mandrill_nl2br');

includes/admin/system-info.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
  *
  * @since: 1.4
  *
- * @return bool
+ * @return boolean|null
  */
 function give_allow_sessions_for_sysinfo() {
 	if ( is_admin() && ( isset( $_GET['page'] ) && isset( $_GET['tab'] ) ) && ( $_GET['tab'] == 'system_info' && $_GET['page'] == 'give-settings' ) ) {

Spacing +146 added lines, -146 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,14 +24,14 @@ 
  */
 function give_system_info_callback() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 	?>
-	<textarea readonly="readonly" onclick="this.focus(); this.select()" id="system-info-textarea" name="give-sysinfo" aria-label="<?php esc_attr_e( 'To copy the system info, click below then press Ctrl + C (PC) or Cmd + C (Mac).', 'give' ); ?>"><?php echo give_tools_sysinfo_get(); ?></textarea>
+	<textarea readonly="readonly" onclick="this.focus(); this.select()" id="system-info-textarea" name="give-sysinfo" aria-label="<?php esc_attr_e('To copy the system info, click below then press Ctrl + C (PC) or Cmd + C (Mac).', 'give'); ?>"><?php echo give_tools_sysinfo_get(); ?></textarea>
 	<p class="submit">
 		<input type="hidden" name="give-action" value="download_sysinfo"/>
-		<?php submit_button( esc_html__( 'Download System Info File', 'give' ), 'secondary', 'give-download-sysinfo', false ); ?>
+		<?php submit_button(esc_html__('Download System Info File', 'give'), 'secondary', 'give-download-sysinfo', false); ?>
 	</p>
 	<?php
 }
@@ -47,12 +47,12 @@ 
  * @return bool
  */
 function give_allow_sessions_for_sysinfo() {
-	if ( is_admin() && ( isset( $_GET['page'] ) && isset( $_GET['tab'] ) ) && ( $_GET['tab'] == 'system_info' && $_GET['page'] == 'give-settings' ) ) {
+	if (is_admin() && (isset($_GET['page']) && isset($_GET['tab'])) && ($_GET['tab'] == 'system_info' && $_GET['page'] == 'give-settings')) {
 		return true;
 	}
 }
 
-add_filter( 'give_start_session', 'give_allow_sessions_for_sysinfo' );
+add_filter('give_start_session', 'give_allow_sessions_for_sysinfo');
 
 
 /**
@@ -70,63 +70,63 @@ 
 
 	$give_options = give_get_settings();
 
-	if ( ! class_exists( 'Browser' ) ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/libraries/browser.php';
+	if ( ! class_exists('Browser')) {
+		require_once GIVE_PLUGIN_DIR.'includes/libraries/browser.php';
 	}
 
 	$browser = new Browser();
 
 	// Get theme info
-	if ( get_bloginfo( 'version' ) < '3.4' ) {
-		$theme_data = wp_get_theme( get_stylesheet_directory() . '/style.css' );
-		$theme      = $theme_data['Name'] . ' ' . $theme_data['Version'];
+	if (get_bloginfo('version') < '3.4') {
+		$theme_data = wp_get_theme(get_stylesheet_directory().'/style.css');
+		$theme      = $theme_data['Name'].' '.$theme_data['Version'];
 	} else {
 		$theme_data = wp_get_theme();
-		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
+		$theme      = $theme_data->Name.' '.$theme_data->Version;
 	}
 
 	// Try to identify the hosting provider
 	$host = give_get_host();
 
-	$return = '### Begin System Info ###' . "\n\n";
+	$return = '### Begin System Info ###'."\n\n";
 
 	// Start with the basics...
-	$return .= '-- Site Info' . "\n\n";
-	$return .= 'Site URL:                 ' . site_url() . "\n";
-	$return .= 'Home URL:                 ' . home_url() . "\n";
-	$return .= 'Multisite:                ' . ( is_multisite() ? 'Yes' : 'No' ) . "\n";
+	$return .= '-- Site Info'."\n\n";
+	$return .= 'Site URL:                 '.site_url()."\n";
+	$return .= 'Home URL:                 '.home_url()."\n";
+	$return .= 'Multisite:                '.(is_multisite() ? 'Yes' : 'No')."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_site_info', $return );
+	$return = apply_filters('give_sysinfo_after_site_info', $return);
 
 	// Can we determine the site's host?
-	if ( $host ) {
-		$return .= "\n" . '-- Hosting Provider' . "\n\n";
-		$return .= 'Host:                     ' . $host . "\n";
+	if ($host) {
+		$return .= "\n".'-- Hosting Provider'."\n\n";
+		$return .= 'Host:                     '.$host."\n";
 
-		$return = apply_filters( 'give_sysinfo_after_host_info', $return );
+		$return = apply_filters('give_sysinfo_after_host_info', $return);
 	}
 
 	// The local users' browser information, handled by the Browser class
-	$return .= "\n" . '-- User Browser' . "\n\n";
+	$return .= "\n".'-- User Browser'."\n\n";
 	$return .= $browser;
 
-	$return = apply_filters( 'give_sysinfo_after_user_browser', $return );
+	$return = apply_filters('give_sysinfo_after_user_browser', $return);
 
 	// WordPress configuration
-	$return .= "\n" . '-- WordPress Configuration' . "\n\n";
-	$return .= 'Version:                  ' . get_bloginfo( 'version' ) . "\n";
-	$return .= 'Language:                 ' . ( defined( 'WPLANG' ) && WPLANG ? WPLANG : 'en_US' ) . "\n";
-	$return .= 'Permalink Structure:      ' . ( get_option( 'permalink_structure' ) ? get_option( 'permalink_structure' ) : 'Default' ) . "\n";
-	$return .= 'Active Theme:             ' . $theme . "\n";
-	$return .= 'Show On Front:            ' . get_option( 'show_on_front' ) . "\n";
+	$return .= "\n".'-- WordPress Configuration'."\n\n";
+	$return .= 'Version:                  '.get_bloginfo('version')."\n";
+	$return .= 'Language:                 '.(defined('WPLANG') && WPLANG ? WPLANG : 'en_US')."\n";
+	$return .= 'Permalink Structure:      '.(get_option('permalink_structure') ? get_option('permalink_structure') : 'Default')."\n";
+	$return .= 'Active Theme:             '.$theme."\n";
+	$return .= 'Show On Front:            '.get_option('show_on_front')."\n";
 
 	// Only show page specs if frontpage is set to 'page'
-	if ( get_option( 'show_on_front' ) == 'page' ) {
-		$front_page_id = get_option( 'page_on_front' );
-		$blog_page_id  = get_option( 'page_for_posts' );
+	if (get_option('show_on_front') == 'page') {
+		$front_page_id = get_option('page_on_front');
+		$blog_page_id  = get_option('page_for_posts');
 
-		$return .= 'Page On Front:            ' . ( $front_page_id != 0 ? get_the_title( $front_page_id ) . ' (#' . $front_page_id . ')' : 'Unset' ) . "\n";
-		$return .= 'Page For Posts:           ' . ( $blog_page_id != 0 ? get_the_title( $blog_page_id ) . ' (#' . $blog_page_id . ')' : 'Unset' ) . "\n";
+		$return .= 'Page On Front:            '.($front_page_id != 0 ? get_the_title($front_page_id).' (#'.$front_page_id.')' : 'Unset')."\n";
+		$return .= 'Page For Posts:           '.($blog_page_id != 0 ? get_the_title($blog_page_id).' (#'.$blog_page_id.')' : 'Unset')."\n";
 	}
 
 	// Make sure wp_remote_post() is working
@@ -136,205 +136,205 @@ 
 	$params = array(
 		'sslverify'  => false,
 		'timeout'    => 60,
-		'user-agent' => 'Give/' . GIVE_VERSION,
+		'user-agent' => 'Give/'.GIVE_VERSION,
 		'body'       => $request
 	);
 
-	$response = wp_remote_post( 'https://www.paypal.com/cgi-bin/webscr', $params );
+	$response = wp_remote_post('https://www.paypal.com/cgi-bin/webscr', $params);
 
-	if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+	if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 		$WP_REMOTE_POST = 'wp_remote_post() works';
 	} else {
 		$WP_REMOTE_POST = 'wp_remote_post() does not work';
 	}
 
-	$return .= 'Remote Post:              ' . $WP_REMOTE_POST . "\n";
-	$return .= 'Table Prefix:             ' . 'Length: ' . strlen( $wpdb->prefix ) . '   Status: ' . ( strlen( $wpdb->prefix ) > 16 ? 'ERROR: Too long' : 'Acceptable' ) . "\n";
-	$return .= 'Admin AJAX:               ' . ( give_test_ajax_works() ? 'Accessible' : 'Inaccessible' ) . "\n";
-	$return .= 'WP_DEBUG:                 ' . ( defined( 'WP_DEBUG' ) ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set' ) . "\n";
-	$return .= 'Memory Limit:             ' . WP_MEMORY_LIMIT . "\n";
-	$return .= 'Registered Post Stati:    ' . implode( ', ', get_post_stati() ) . "\n";
+	$return .= 'Remote Post:              '.$WP_REMOTE_POST."\n";
+	$return .= 'Table Prefix:             '.'Length: '.strlen($wpdb->prefix).'   Status: '.(strlen($wpdb->prefix) > 16 ? 'ERROR: Too long' : 'Acceptable')."\n";
+	$return .= 'Admin AJAX:               '.(give_test_ajax_works() ? 'Accessible' : 'Inaccessible')."\n";
+	$return .= 'WP_DEBUG:                 '.(defined('WP_DEBUG') ? WP_DEBUG ? 'Enabled' : 'Disabled' : 'Not set')."\n";
+	$return .= 'Memory Limit:             '.WP_MEMORY_LIMIT."\n";
+	$return .= 'Registered Post Stati:    '.implode(', ', get_post_stati())."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_wordpress_config', $return );
+	$return = apply_filters('give_sysinfo_after_wordpress_config', $return);
 
 	// GIVE configuration
-	$return .= "\n" . '-- Give Configuration' . "\n\n";
-	$return .= 'Version:                  ' . GIVE_VERSION . "\n";
-	$return .= 'Upgraded From:            ' . get_option( 'give_version_upgraded_from', 'None' ) . "\n";
-	$return .= 'Test Mode:                ' . ( give_is_test_mode() ? "Enabled\n" : "Disabled\n" );
-	$return .= 'Currency Code:            ' . give_get_currency() . "\n";
-	$return .= 'Currency Position:        ' . give_get_option( 'currency_position', 'before' ) . "\n";
-	$return .= 'Decimal Separator:        ' . give_get_option( 'decimal_separator', '.' ) . "\n";
-	$return .= 'Thousands Separator:      ' . give_get_option( 'thousands_separator', ',' ) . "\n";
+	$return .= "\n".'-- Give Configuration'."\n\n";
+	$return .= 'Version:                  '.GIVE_VERSION."\n";
+	$return .= 'Upgraded From:            '.get_option('give_version_upgraded_from', 'None')."\n";
+	$return .= 'Test Mode:                '.(give_is_test_mode() ? "Enabled\n" : "Disabled\n");
+	$return .= 'Currency Code:            '.give_get_currency()."\n";
+	$return .= 'Currency Position:        '.give_get_option('currency_position', 'before')."\n";
+	$return .= 'Decimal Separator:        '.give_get_option('decimal_separator', '.')."\n";
+	$return .= 'Thousands Separator:      '.give_get_option('thousands_separator', ',')."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_give_config', $return );
+	$return = apply_filters('give_sysinfo_after_give_config', $return);
 
 	// GIVE pages
-	$return .= "\n" . '-- Give Page Configuration' . "\n\n";
-	$return .= 'Success Page:             ' . ( ! empty( $give_options['success_page'] ) ? get_permalink( $give_options['success_page'] ) . "\n" : "Unset\n" );
-	$return .= 'Failure Page:             ' . ( ! empty( $give_options['failure_page'] ) ? get_permalink( $give_options['failure_page'] ) . "\n" : "Unset\n" );
-	$return .= 'Give Forms Slug:           ' . ( defined( 'GIVE_SLUG' ) ? '/' . GIVE_SLUG . "\n" : "/donations\n" );
+	$return .= "\n".'-- Give Page Configuration'."\n\n";
+	$return .= 'Success Page:             '.( ! empty($give_options['success_page']) ? get_permalink($give_options['success_page'])."\n" : "Unset\n");
+	$return .= 'Failure Page:             '.( ! empty($give_options['failure_page']) ? get_permalink($give_options['failure_page'])."\n" : "Unset\n");
+	$return .= 'Give Forms Slug:           '.(defined('GIVE_SLUG') ? '/'.GIVE_SLUG."\n" : "/donations\n");
 
-	$return = apply_filters( 'give_sysinfo_after_give_pages', $return );
+	$return = apply_filters('give_sysinfo_after_give_pages', $return);
 
 	// GIVE gateways
-	$return .= "\n" . '-- Give Gateway Configuration' . "\n\n";
+	$return .= "\n".'-- Give Gateway Configuration'."\n\n";
 
 	$active_gateways = give_get_enabled_payment_gateways();
-	if ( $active_gateways ) {
-		$default_gateway_is_active = give_is_gateway_active( give_get_default_gateway( null ) );
-		if ( $default_gateway_is_active ) {
-			$default_gateway = give_get_default_gateway( null );
-			$default_gateway = $active_gateways[ $default_gateway ]['admin_label'];
+	if ($active_gateways) {
+		$default_gateway_is_active = give_is_gateway_active(give_get_default_gateway(null));
+		if ($default_gateway_is_active) {
+			$default_gateway = give_get_default_gateway(null);
+			$default_gateway = $active_gateways[$default_gateway]['admin_label'];
 		} else {
 			$default_gateway = 'Test Donation';
 		}
 
 		$gateways = array();
-		foreach ( $active_gateways as $gateway ) {
+		foreach ($active_gateways as $gateway) {
 			$gateways[] = $gateway['admin_label'];
 		}
 
-		$return .= 'Enabled Gateways:         ' . implode( ', ', $gateways ) . "\n";
-		$return .= 'Default Gateway:          ' . $default_gateway . "\n";
+		$return .= 'Enabled Gateways:         '.implode(', ', $gateways)."\n";
+		$return .= 'Default Gateway:          '.$default_gateway."\n";
 	} else {
-		$return .= 'Enabled Gateways:         None' . "\n";
+		$return .= 'Enabled Gateways:         None'."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_give_gateways', $return );
+	$return = apply_filters('give_sysinfo_after_give_gateways', $return);
 
 	// GIVE Templates
-	$dir = get_stylesheet_directory() . '/give_templates/*';
-	if ( is_dir( $dir ) && ( count( glob( "$dir/*" ) ) !== 0 ) ) {
-		$return .= "\n" . '-- Give Template Overrides' . "\n\n";
+	$dir = get_stylesheet_directory().'/give_templates/*';
+	if (is_dir($dir) && (count(glob("$dir/*")) !== 0)) {
+		$return .= "\n".'-- Give Template Overrides'."\n\n";
 
-		foreach ( glob( $dir ) as $file ) {
-			$return .= 'Filename:                 ' . basename( $file ) . "\n";
+		foreach (glob($dir) as $file) {
+			$return .= 'Filename:                 '.basename($file)."\n";
 		}
 
-		$return = apply_filters( 'give_sysinfo_after_give_templates', $return );
+		$return = apply_filters('give_sysinfo_after_give_templates', $return);
 	}
 
 	// Must-use plugins
 	$muplugins = get_mu_plugins();
-	if ( count( $muplugins > 0 ) ) {
-		$return .= "\n" . '-- Must-Use Plugins' . "\n\n";
+	if (count($muplugins > 0)) {
+		$return .= "\n".'-- Must-Use Plugins'."\n\n";
 
-		foreach ( $muplugins as $plugin => $plugin_data ) {
-			$return .= $plugin_data['Name'] . ': ' . $plugin_data['Version'] . "\n";
+		foreach ($muplugins as $plugin => $plugin_data) {
+			$return .= $plugin_data['Name'].': '.$plugin_data['Version']."\n";
 		}
 
-		$return = apply_filters( 'give_sysinfo_after_wordpress_mu_plugins', $return );
+		$return = apply_filters('give_sysinfo_after_wordpress_mu_plugins', $return);
 	}
 
 	// WordPress active plugins
-	$return .= "\n" . '-- WordPress Active Plugins' . "\n\n";
+	$return .= "\n".'-- WordPress Active Plugins'."\n\n";
 
 	$plugins        = get_plugins();
-	$active_plugins = get_option( 'active_plugins', array() );
+	$active_plugins = get_option('active_plugins', array());
 
-	foreach ( $plugins as $plugin_path => $plugin ) {
-		if ( ! in_array( $plugin_path, $active_plugins ) ) {
+	foreach ($plugins as $plugin_path => $plugin) {
+		if ( ! in_array($plugin_path, $active_plugins)) {
 			continue;
 		}
 
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_wordpress_plugins', $return );
+	$return = apply_filters('give_sysinfo_after_wordpress_plugins', $return);
 
 	// WordPress inactive plugins
-	$return .= "\n" . '-- WordPress Inactive Plugins' . "\n\n";
+	$return .= "\n".'-- WordPress Inactive Plugins'."\n\n";
 
-	foreach ( $plugins as $plugin_path => $plugin ) {
-		if ( in_array( $plugin_path, $active_plugins ) ) {
+	foreach ($plugins as $plugin_path => $plugin) {
+		if (in_array($plugin_path, $active_plugins)) {
 			continue;
 		}
 
-		$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+		$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_wordpress_plugins_inactive', $return );
+	$return = apply_filters('give_sysinfo_after_wordpress_plugins_inactive', $return);
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		// WordPress Multisite active plugins
-		$return .= "\n" . '-- Network Active Plugins' . "\n\n";
+		$return .= "\n".'-- Network Active Plugins'."\n\n";
 
 		$plugins        = wp_get_active_network_plugins();
-		$active_plugins = get_site_option( 'active_sitewide_plugins', array() );
+		$active_plugins = get_site_option('active_sitewide_plugins', array());
 
-		foreach ( $plugins as $plugin_path ) {
-			$plugin_base = plugin_basename( $plugin_path );
+		foreach ($plugins as $plugin_path) {
+			$plugin_base = plugin_basename($plugin_path);
 
-			if ( ! array_key_exists( $plugin_base, $active_plugins ) ) {
+			if ( ! array_key_exists($plugin_base, $active_plugins)) {
 				continue;
 			}
 
-			$plugin = get_plugin_data( $plugin_path );
-			$return .= $plugin['Name'] . ': ' . $plugin['Version'] . "\n";
+			$plugin = get_plugin_data($plugin_path);
+			$return .= $plugin['Name'].': '.$plugin['Version']."\n";
 		}
 
-		$return = apply_filters( 'give_sysinfo_after_wordpress_ms_plugins', $return );
+		$return = apply_filters('give_sysinfo_after_wordpress_ms_plugins', $return);
 	}
 
 	// Server configuration (really just versioning)
-	$return .= "\n" . '-- Webserver Configuration' . "\n\n";
-	$return .= 'PHP Version:              ' . PHP_VERSION . "\n";
-	$return .= 'MySQL Version:            ' . $wpdb->db_version() . "\n";
-	$return .= 'Webserver Info:           ' . $_SERVER['SERVER_SOFTWARE'] . "\n";
+	$return .= "\n".'-- Webserver Configuration'."\n\n";
+	$return .= 'PHP Version:              '.PHP_VERSION."\n";
+	$return .= 'MySQL Version:            '.$wpdb->db_version()."\n";
+	$return .= 'Webserver Info:           '.$_SERVER['SERVER_SOFTWARE']."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_webserver_config', $return );
+	$return = apply_filters('give_sysinfo_after_webserver_config', $return);
 
 	// PHP configs... now we're getting to the important stuff
-	$return .= "\n" . '-- PHP Configuration' . "\n\n";
-	$return .= 'Safe Mode:                ' . ( ini_get( 'safe_mode' ) ? 'Enabled' : 'Disabled' . "\n" );
-	$return .= 'Memory Limit:             ' . ini_get( 'memory_limit' ) . "\n";
-	$return .= 'Upload Max Size:          ' . ini_get( 'upload_max_filesize' ) . "\n";
-	$return .= 'Post Max Size:            ' . ini_get( 'post_max_size' ) . "\n";
-	$return .= 'Upload Max Filesize:      ' . ini_get( 'upload_max_filesize' ) . "\n";
-	$return .= 'Time Limit:               ' . ini_get( 'max_execution_time' ) . "\n";
-	$return .= 'Max Input Vars:           ' . ini_get( 'max_input_vars' ) . "\n";
-	$return .= 'URL-aware fopen:          ' . ( ini_get( 'allow_url_fopen' ) ? 'On (' . ini_get( 'allow_url_fopen' ) . ')' : 'N/A' ) . "\n";
-	$return .= 'Display Errors:           ' . ( ini_get( 'display_errors' ) ? 'On (' . ini_get( 'display_errors' ) . ')' : 'N/A' ) . "\n";
-
-	$return = apply_filters( 'give_sysinfo_after_php_config', $return );
+	$return .= "\n".'-- PHP Configuration'."\n\n";
+	$return .= 'Safe Mode:                '.(ini_get('safe_mode') ? 'Enabled' : 'Disabled'."\n");
+	$return .= 'Memory Limit:             '.ini_get('memory_limit')."\n";
+	$return .= 'Upload Max Size:          '.ini_get('upload_max_filesize')."\n";
+	$return .= 'Post Max Size:            '.ini_get('post_max_size')."\n";
+	$return .= 'Upload Max Filesize:      '.ini_get('upload_max_filesize')."\n";
+	$return .= 'Time Limit:               '.ini_get('max_execution_time')."\n";
+	$return .= 'Max Input Vars:           '.ini_get('max_input_vars')."\n";
+	$return .= 'URL-aware fopen:          '.(ini_get('allow_url_fopen') ? 'On ('.ini_get('allow_url_fopen').')' : 'N/A')."\n";
+	$return .= 'Display Errors:           '.(ini_get('display_errors') ? 'On ('.ini_get('display_errors').')' : 'N/A')."\n";
+
+	$return = apply_filters('give_sysinfo_after_php_config', $return);
 
 	// PHP extensions and such
-	$return .= "\n" . '-- PHP Extensions' . "\n\n";
-	$return .= 'cURL:                     ' . ( function_exists( 'curl_init' ) ? 'Supported' : 'Not Supported' ) . "\n";
+	$return .= "\n".'-- PHP Extensions'."\n\n";
+	$return .= 'cURL:                     '.(function_exists('curl_init') ? 'Supported' : 'Not Supported')."\n";
 
 	//cURL version
-	if ( function_exists( 'curl_init' ) && function_exists( 'curl_version' ) ) {
+	if (function_exists('curl_init') && function_exists('curl_version')) {
 		$curl_values = curl_version();
-		$return .= 'cURL Version:             ' . $curl_values["version"] . "\n";
+		$return .= 'cURL Version:             '.$curl_values["version"]."\n";
 	}
-	$return .= 'zlib:                     ' . ( function_exists( 'gzcompress' ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'GD:                       ' . ( ( extension_loaded( 'gd' ) && function_exists( 'gd_info' ) ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'fsockopen:                ' . ( function_exists( 'fsockopen' ) ? 'Supported' : 'Not Supported' ) . "\n";
-	$return .= 'SOAP Client:              ' . ( class_exists( 'SoapClient' ) ? 'Installed' : 'Not Installed' ) . "\n";
-	$return .= 'Suhosin:                  ' . ( extension_loaded( 'suhosin' ) ? 'Installed' : 'Not Installed' ) . "\n";
-	$return .= 'DOM:                      ' . ( extension_loaded( 'dom' ) ? 'Installed' : 'Not Installed' ) . "\n";
-	$return .= 'MBString:                 ' . ( extension_loaded( 'mbstring' ) ? 'Installed' : 'Not Installed' ) . "\n";
+	$return .= 'zlib:                     '.(function_exists('gzcompress') ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'GD:                       '.((extension_loaded('gd') && function_exists('gd_info')) ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'fsockopen:                '.(function_exists('fsockopen') ? 'Supported' : 'Not Supported')."\n";
+	$return .= 'SOAP Client:              '.(class_exists('SoapClient') ? 'Installed' : 'Not Installed')."\n";
+	$return .= 'Suhosin:                  '.(extension_loaded('suhosin') ? 'Installed' : 'Not Installed')."\n";
+	$return .= 'DOM:                      '.(extension_loaded('dom') ? 'Installed' : 'Not Installed')."\n";
+	$return .= 'MBString:                 '.(extension_loaded('mbstring') ? 'Installed' : 'Not Installed')."\n";
 
-	$return = apply_filters( 'give_sysinfo_after_php_ext', $return );
+	$return = apply_filters('give_sysinfo_after_php_ext', $return);
 
 	// Session stuff
-	$return .= "\n" . '-- Session Configuration' . "\n\n";
-	$return .= 'Give Use Sessions:        ' . ( defined( 'GIVE_USE_PHP_SESSIONS' ) && GIVE_USE_PHP_SESSIONS ? 'Enforced' : ( Give()->session->use_php_sessions() ? 'Enabled' : 'Disabled' ) ) . "\n";
-	$return .= 'Session:                  ' . ( isset( $_SESSION ) ? 'Enabled' : 'Disabled' ) . "\n";
+	$return .= "\n".'-- Session Configuration'."\n\n";
+	$return .= 'Give Use Sessions:        '.(defined('GIVE_USE_PHP_SESSIONS') && GIVE_USE_PHP_SESSIONS ? 'Enforced' : (Give()->session->use_php_sessions() ? 'Enabled' : 'Disabled'))."\n";
+	$return .= 'Session:                  '.(isset($_SESSION) ? 'Enabled' : 'Disabled')."\n";
 
 	// The rest of this is only relevant is session is enabled
-	if ( isset( $_SESSION ) ) {
-		$return .= 'Session Name:             ' . esc_html( ini_get( 'session.name' ) ) . "\n";
-		$return .= 'Cookie Path:              ' . esc_html( ini_get( 'session.cookie_path' ) ) . "\n";
-		$return .= 'Save Path:                ' . esc_html( ini_get( 'session.save_path' ) ) . "\n";
-		$return .= 'Use Cookies:              ' . ( ini_get( 'session.use_cookies' ) ? 'On' : 'Off' ) . "\n";
-		$return .= 'Use Only Cookies:         ' . ( ini_get( 'session.use_only_cookies' ) ? 'On' : 'Off' ) . "\n";
+	if (isset($_SESSION)) {
+		$return .= 'Session Name:             '.esc_html(ini_get('session.name'))."\n";
+		$return .= 'Cookie Path:              '.esc_html(ini_get('session.cookie_path'))."\n";
+		$return .= 'Save Path:                '.esc_html(ini_get('session.save_path'))."\n";
+		$return .= 'Use Cookies:              '.(ini_get('session.use_cookies') ? 'On' : 'Off')."\n";
+		$return .= 'Use Only Cookies:         '.(ini_get('session.use_only_cookies') ? 'On' : 'Off')."\n";
 	}
 
-	$return = apply_filters( 'give_sysinfo_after_session_config', $return );
+	$return = apply_filters('give_sysinfo_after_session_config', $return);
 
-	$return .= "\n" . '### End System Info ###';
+	$return .= "\n".'### End System Info ###';
 
 	return $return;
 }
@@ -348,17 +348,17 @@ 
  */
 function give_tools_sysinfo_download() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 
 	nocache_headers();
 
-	header( 'Content-Type: text/plain' );
-	header( 'Content-Disposition: attachment; filename="give-system-info.txt"' );
+	header('Content-Type: text/plain');
+	header('Content-Disposition: attachment; filename="give-system-info.txt"');
 
-	echo wp_strip_all_tags( $_POST['give-sysinfo'] );
+	echo wp_strip_all_tags($_POST['give-sysinfo']);
 	give_die();
 }
 
-add_action( 'give_download_sysinfo', 'give_tools_sysinfo_download' );
\ No newline at end of file
+add_action('give_download_sysinfo', 'give_tools_sysinfo_download');
\ No newline at end of file

includes/admin/reporting/tools/class-give-tools-delete-test-transactions.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +53 added lines, -53 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -55,22 +55,22 @@ 
 	public function get_data() {
 		global $wpdb;
 
-		$items = $this->get_stored_data( 'give_temp_reset_ids' );
+		$items = $this->get_stored_data('give_temp_reset_ids');
 
-		if ( ! is_array( $items ) ) {
+		if ( ! is_array($items)) {
 			return false;
 		}
 
-		$offset     = ( $this->step - 1 ) * $this->per_step;
-		$step_items = array_slice( $items, $offset, $this->per_step );
+		$offset     = ($this->step - 1) * $this->per_step;
+		$step_items = array_slice($items, $offset, $this->per_step);
 
-		if ( $step_items ) {
+		if ($step_items) {
 
 			$step_ids = array(
 				'other' => array(),
 			);
 
-			foreach ( $step_items as $item ) {
+			foreach ($step_items as $item) {
 
 				$step_ids['other'][] = $item['id'];
 
@@ -78,15 +78,15 @@ 
 
 			$sql = array();
 
-			foreach ( $step_ids as $type => $ids ) {
+			foreach ($step_ids as $type => $ids) {
 
-				if ( empty( $ids ) ) {
+				if (empty($ids)) {
 					continue;
 				}
 
-				$ids = implode( ',', $ids );
+				$ids = implode(',', $ids);
 
-				switch ( $type ) {
+				switch ($type) {
 					case 'other':
 						$sql[] = "DELETE FROM $wpdb->posts WHERE id IN ($ids)";
 						$sql[] = "DELETE FROM $wpdb->postmeta WHERE post_id IN ($ids)";
@@ -97,9 +97,9 @@ 
 
 			}
 
-			if ( ! empty( $sql ) ) {
-				foreach ( $sql as $query ) {
-					$wpdb->query( $query );
+			if ( ! empty($sql)) {
+				foreach ($sql as $query) {
+					$wpdb->query($query);
 				}
 			}
 
@@ -119,16 +119,16 @@ 
 	 */
 	public function get_percentage_complete() {
 
-		$items = $this->get_stored_data( 'give_temp_reset_ids', false );
-		$total = count( $items );
+		$items = $this->get_stored_data('give_temp_reset_ids', false);
+		$total = count($items);
 
 		$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;
 		}
 
@@ -142,7 +142,7 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
+	public function set_properties($request) {
 	}
 
 	/**
@@ -153,30 +153,30 @@ 
 	 */
 	public function process_step() {
 
-		if ( ! $this->can_export() ) {
-			wp_die( esc_html__( 'You do not have permission to delete test transactions.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ( ! $this->can_export()) {
+			wp_die(esc_html__('You do not have permission to delete test transactions.', '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 {
-			update_option( 'give_earnings_total', 0 );
-			delete_transient( 'give_earnings_total' );
-			delete_transient( 'give_estimated_monthly_stats' . true );
-			delete_transient( 'give_estimated_monthly_stats' . false );
-			$this->delete_data( 'give_temp_reset_ids' );
+			update_option('give_earnings_total', 0);
+			delete_transient('give_earnings_total');
+			delete_transient('give_estimated_monthly_stats'.true);
+			delete_transient('give_estimated_monthly_stats'.false);
+			$this->delete_data('give_temp_reset_ids');
 
 			// Reset the sequential order numbers
-			if ( give_get_option( 'enable_sequential' ) ) {
-				delete_option( 'give_last_payment_number' );
+			if (give_get_option('enable_sequential')) {
+				delete_option('give_last_payment_number');
 			}
 
 			$this->done    = true;
-			$this->message = esc_html__( 'Test transactions successfully deleted.', 'give' );
+			$this->message = esc_html__('Test transactions successfully deleted.', 'give');
 
 			return false;
 		}
@@ -186,10 +186,10 @@ 
 	 * Headers
 	 */
 	public function headers() {
-		ignore_user_abort( true );
+		ignore_user_abort(true);
 
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
+		if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+			set_time_limit(0);
 		}
 	}
 
@@ -213,26 +213,26 @@ 
 	 */
 	public function pre_fetch() {
 
-		if ( $this->step == 1 ) {
-			$this->delete_data( 'give_temp_reset_ids' );
+		if ($this->step == 1) {
+			$this->delete_data('give_temp_reset_ids');
 		}
 
-		$items = get_option( 'give_temp_reset_ids', false );
+		$items = get_option('give_temp_reset_ids', false);
 
-		if ( false === $items ) {
+		if (false === $items) {
 			$items = array();
 
-			$args = apply_filters( 'give_tools_reset_stats_total_args', array(
+			$args = apply_filters('give_tools_reset_stats_total_args', array(
 				'post_type'      => 'give_payment',
 				'post_status'    => 'any',
-				'posts_per_page' => - 1,
+				'posts_per_page' => -1,
 				//ONLY TEST MODE TRANSACTIONS!!!
 				'meta_key'   => '_give_payment_mode',
 				'meta_value' => 'test'
-			) );
+			));
 
-			$posts = get_posts( $args );
-			foreach ( $posts as $post ) {
+			$posts = get_posts($args);
+			foreach ($posts as $post) {
 				$items[] = array(
 					'id'   => (int) $post->ID,
 					'type' => $post->post_type,
@@ -241,9 +241,9 @@ 
 
 			// Allow filtering of items to remove with an unassociative array for each item.
 			// The array contains the unique ID of the item, and a 'type' for you to use in the execution of the get_data method.
-			$items = apply_filters( 'give_reset_items', $items );
+			$items = apply_filters('give_reset_items', $items);
 
-			$this->store_data( 'give_temp_reset_ids', $items );
+			$this->store_data('give_temp_reset_ids', $items);
 		}
 
 	}
@@ -257,11 +257,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);
 	}
 
 	/**
@@ -274,10 +274,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,
@@ -291,7 +291,7 @@ 
 			'%s',
 		);
 
-		$wpdb->replace( $wpdb->options, $data, $formats );
+		$wpdb->replace($wpdb->options, $data, $formats);
 	}
 
 	/**
@@ -303,9 +303,9 @@ 
 	 *
 	 * @return void
 	 */
-	private function delete_data( $key ) {
+	private function delete_data($key) {
 		global $wpdb;
-		$wpdb->delete( $wpdb->options, array( 'option_name' => $key ) );
+		$wpdb->delete($wpdb->options, array('option_name' => $key));
 	}
 
 }

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

Doc Comments +1 added lines, -1 removed lines

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

Spacing +99 added lines, -99 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -55,26 +55,26 @@ 
 	public function get_data() {
 		global $give_logs, $wpdb;
 
-		$totals             = $this->get_stored_data( 'give_temp_recount_all_stats' );
-		$payment_items      = $this->get_stored_data( 'give_temp_payment_items' );
-		$processed_payments = $this->get_stored_data( 'give_temp_processed_payments' );
-		$accepted_statuses  = apply_filters( 'give_recount_accepted_statuses', array( 'publish' ) );
+		$totals             = $this->get_stored_data('give_temp_recount_all_stats');
+		$payment_items      = $this->get_stored_data('give_temp_payment_items');
+		$processed_payments = $this->get_stored_data('give_temp_processed_payments');
+		$accepted_statuses  = apply_filters('give_recount_accepted_statuses', array('publish'));
 
-		if ( false === $totals ) {
+		if (false === $totals) {
 			$totals = array();
 		}
 
-		if ( false === $payment_items ) {
+		if (false === $payment_items) {
 			$payment_items = array();
 		}
 
-		if ( false === $processed_payments ) {
+		if (false === $processed_payments) {
 			$processed_payments = array();
 		}
 
-		$all_forms = $this->get_stored_data( 'give_temp_form_ids' );
+		$all_forms = $this->get_stored_data('give_temp_form_ids');
 
-		$args = apply_filters( 'give_recount_form_stats_args', array(
+		$args = apply_filters('give_recount_form_stats_args', array(
 			'post_parent__in' => $all_forms,
 			'post_type'       => 'give_log',
 			'posts_per_page'  => $this->per_step,
@@ -82,73 +82,73 @@ 
 			'paged'           => $this->step,
 			'log_type'        => 'sale',
 			'fields'          => 'ids',
-		) );
+		));
 
-		$log_ids = $give_logs->get_connected_logs( $args, 'sale' );
+		$log_ids = $give_logs->get_connected_logs($args, 'sale');
 
-		if ( $log_ids ) {
-			$log_ids = implode( ',', $log_ids );
+		if ($log_ids) {
+			$log_ids = implode(',', $log_ids);
 
-			$payment_ids = $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids)" );
-			unset( $log_ids );
+			$payment_ids = $wpdb->get_col("SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids)");
+			unset($log_ids);
 
-			$payment_ids = implode( ',', $payment_ids );
-			$payments    = $wpdb->get_results( "SELECT ID, post_status FROM $wpdb->posts WHERE ID IN (" . $payment_ids . ")" );
-			unset( $payment_ids );
+			$payment_ids = implode(',', $payment_ids);
+			$payments    = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts WHERE ID IN (".$payment_ids.")");
+			unset($payment_ids);
 
 			//Loop through payments
-			foreach ( $payments as $payment ) {
+			foreach ($payments as $payment) {
 
 				// Prevent payments that have all ready been retrieved from a previous sales log from counting again.
-				if ( in_array( $payment->ID, $processed_payments ) ) {
+				if (in_array($payment->ID, $processed_payments)) {
 					continue;
 				}
 
 				//Verify accepted status'
-				if ( ! in_array( $payment->post_status, $accepted_statuses ) ) {
+				if ( ! in_array($payment->post_status, $accepted_statuses)) {
 					$processed_payments[] = $payment->ID;
 					continue;
 				}
 
-				$payment_item = $payment_items[ $payment->ID ];
+				$payment_item = $payment_items[$payment->ID];
 
 
-				$form_id = isset( $payment_item['id'] ) ? $payment_item['id'] : '';
+				$form_id = isset($payment_item['id']) ? $payment_item['id'] : '';
 
 				//Must have a form ID
-				if ( empty( $form_id ) ) {
+				if (empty($form_id)) {
 					continue;
 				}
 
 				//Form ID must be within $all_forms array to be validated
-				if ( ! in_array( $form_id, $all_forms ) ) {
+				if ( ! in_array($form_id, $all_forms)) {
 					continue;
 				}
 
 				//If array key doesn't exist, create it
-				if ( ! array_key_exists( $form_id, $totals ) ) {
-					$totals[ $form_id ] = array(
+				if ( ! array_key_exists($form_id, $totals)) {
+					$totals[$form_id] = array(
 						'sales'    => (int) 0,
 						'earnings' => (float) 0,
 					);
 				}
 
-				$totals[ $form_id ]['sales'] ++;
-				$totals[ $form_id ]['earnings'] += $payment_item['price'];
+				$totals[$form_id]['sales']++;
+				$totals[$form_id]['earnings'] += $payment_item['price'];
 
 				$processed_payments[] = $payment->ID;
 
 			}
 
-			$this->store_data( 'give_temp_processed_payments', $processed_payments );
-			$this->store_data( 'give_temp_recount_all_stats', $totals );
+			$this->store_data('give_temp_processed_payments', $processed_payments);
+			$this->store_data('give_temp_recount_all_stats', $totals);
 
 			return true;
 		}
 
-		foreach ( $totals as $key => $stats ) {
-			update_post_meta( $key, '_give_form_sales', $stats['sales'] );
-			update_post_meta( $key, '_give_form_earnings', $stats['earnings'] );
+		foreach ($totals as $key => $stats) {
+			update_post_meta($key, '_give_form_sales', $stats['sales']);
+			update_post_meta($key, '_give_form_earnings', $stats['earnings']);
 		}
 
 		return false;
@@ -163,20 +163,20 @@ 
 	 */
 	public function get_percentage_complete() {
 
-		$total = $this->get_stored_data( 'give_recount_all_total', false );
+		$total = $this->get_stored_data('give_recount_all_total', false);
 
-		if ( false === $total ) {
+		if (false === $total) {
 			$this->pre_fetch();
-			$total = $this->get_stored_data( 'give_recount_all_total', 0 );
+			$total = $this->get_stored_data('give_recount_all_total', 0);
 		}
 
 		$percentage = 100;
 
-		if ( $total > 0 ) {
-			$percentage = ( ( $this->per_step * $this->step ) / $total ) * 100;
+		if ($total > 0) {
+			$percentage = (($this->per_step * $this->step) / $total) * 100;
 		}
 
-		if ( $percentage > 100 ) {
+		if ($percentage > 100) {
 			$percentage = 100;
 		}
 
@@ -190,8 +190,8 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
-		$this->form_id = isset( $request['form_id'] ) ? sanitize_text_field( $request['form_id'] ) : false;
+	public function set_properties($request) {
+		$this->form_id = isset($request['form_id']) ? sanitize_text_field($request['form_id']) : false;
 	}
 
 	/**
@@ -202,34 +202,34 @@ 
 	 */
 	public function process_step() {
 
-		if ( ! $this->can_export() ) {
-			wp_die( esc_html__( 'You do not have permission to recount stats.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ( ! $this->can_export()) {
+			wp_die(esc_html__('You do not have permission to recount stats.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 		}
 
 		$had_data = $this->get_data();
 
-		if ( $had_data ) {
+		if ($had_data) {
 			$this->done = false;
 
 			return true;
 		} else {
-			$this->delete_data( 'give_recount_all_total' );
-			$this->delete_data( 'give_temp_recount_all_stats' );
-			$this->delete_data( 'give_temp_payment_items' );
-			$this->delete_data( 'give_temp_form_ids' );
-			$this->delete_data( 'give_temp_processed_payments' );
+			$this->delete_data('give_recount_all_total');
+			$this->delete_data('give_temp_recount_all_stats');
+			$this->delete_data('give_temp_payment_items');
+			$this->delete_data('give_temp_form_ids');
+			$this->delete_data('give_temp_processed_payments');
 			$this->done    = true;
-			$this->message = esc_html__( 'Donation form income amounts and donation counts stats successfully recounted.', 'give' );
+			$this->message = esc_html__('Donation form income amounts and donation counts stats successfully recounted.', 'give');
 
 			return false;
 		}
 	}
 
 	public function headers() {
-		ignore_user_abort( true );
+		ignore_user_abort(true);
 
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
+		if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+			set_time_limit(0);
 		}
 	}
 
@@ -258,76 +258,76 @@ 
 
 		global $give_logs, $wpdb;
 
-		if ( $this->step == 1 ) {
-			$this->delete_data( 'give_temp_recount_all_total' );
-			$this->delete_data( 'give_temp_recount_all_stats' );
-			$this->delete_data( 'give_temp_payment_items' );
-			$this->delete_data( 'give_temp_processed_payments' );
+		if ($this->step == 1) {
+			$this->delete_data('give_temp_recount_all_total');
+			$this->delete_data('give_temp_recount_all_stats');
+			$this->delete_data('give_temp_payment_items');
+			$this->delete_data('give_temp_processed_payments');
 		}
 
-		$accepted_statuses = apply_filters( 'give_recount_accepted_statuses', array( 'publish' ) );
-		$total             = $this->get_stored_data( 'give_temp_recount_all_total' );
+		$accepted_statuses = apply_filters('give_recount_accepted_statuses', array('publish'));
+		$total             = $this->get_stored_data('give_temp_recount_all_total');
 
-		if ( false === $total ) {
+		if (false === $total) {
 			$total         = 0;
-			$payment_items = $this->get_stored_data( 'give_temp_payment_items' );
+			$payment_items = $this->get_stored_data('give_temp_payment_items');
 
-			if ( false === $payment_items ) {
+			if (false === $payment_items) {
 				$payment_items = array();
-				$this->store_data( 'give_temp_payment_items', $payment_items );
+				$this->store_data('give_temp_payment_items', $payment_items);
 			}
 
-			$all_forms = $this->get_stored_data( 'give_temp_form_ids' );
+			$all_forms = $this->get_stored_data('give_temp_form_ids');
 
-			if ( false === $all_forms ) {
+			if (false === $all_forms) {
 				$args = array(
 					'post_status'    => 'any',
 					'post_type'      => 'give_forms',
-					'posts_per_page' => - 1,
+					'posts_per_page' => -1,
 					'fields'         => 'ids',
 				);
 
-				$all_forms = get_posts( $args );
-				$this->store_data( 'give_temp_form_ids', $all_forms );
+				$all_forms = get_posts($args);
+				$this->store_data('give_temp_form_ids', $all_forms);
 			}
 
-			$args = apply_filters( 'give_recount_form_stats_total_args', array(
+			$args = apply_filters('give_recount_form_stats_total_args', array(
 				'post_parent__in' => $all_forms,
 				'post_type'       => 'give_log',
 				'post_status'     => 'publish',
 				'log_type'        => 'sale',
 				'fields'          => 'ids',
 				'nopaging'        => true,
-			) );
+			));
 
-			$all_logs = $give_logs->get_connected_logs( $args, 'sale' );
+			$all_logs = $give_logs->get_connected_logs($args, 'sale');
 
-			if ( $all_logs ) {
-				$log_ids     = implode( ',', $all_logs );
-				$payment_ids = $wpdb->get_col( "SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids)" );
-				unset( $log_ids );
+			if ($all_logs) {
+				$log_ids     = implode(',', $all_logs);
+				$payment_ids = $wpdb->get_col("SELECT meta_value FROM $wpdb->postmeta WHERE meta_key='_give_log_payment_id' AND post_id IN ($log_ids)");
+				unset($log_ids);
 
-				$payment_ids = implode( ',', $payment_ids );
-				$payments    = $wpdb->get_results( "SELECT ID, post_status FROM $wpdb->posts WHERE ID IN (" . $payment_ids . ")" );
-				unset( $payment_ids );
+				$payment_ids = implode(',', $payment_ids);
+				$payments    = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts WHERE ID IN (".$payment_ids.")");
+				unset($payment_ids);
 
-				foreach ( $payments as $payment ) {
+				foreach ($payments as $payment) {
 
-					$payment = new Give_Payment( $payment->ID );
+					$payment = new Give_Payment($payment->ID);
 					$form_id = $payment->form_id;
 
 					//If for some reason somehow the form_ID isn't set check payment meta
-					if ( empty( $payment->form_id ) ) {
+					if (empty($payment->form_id)) {
 						$payment_meta = $payment->get_meta();
-						$form_id = isset( $payment_meta['form_id'] ) ? $payment_meta['form_id'] : 0;
+						$form_id = isset($payment_meta['form_id']) ? $payment_meta['form_id'] : 0;
 					}
 
-					if ( ! in_array( $payment->post_status, $accepted_statuses ) ) {
+					if ( ! in_array($payment->post_status, $accepted_statuses)) {
 						continue;
 					}
 
-					if ( ! array_key_exists( $payment->ID, $payment_items ) ) {
-						$payment_items[ $payment->ID ] = array(
+					if ( ! array_key_exists($payment->ID, $payment_items)) {
+						$payment_items[$payment->ID] = array(
 							'id'         => $form_id,
 							'payment_id' => $payment->ID,
 							'price'      => $payment->total
@@ -336,11 +336,11 @@ 
 
 				}
 
-				$total = count( $all_logs );
+				$total = count($all_logs);
 			}
 
-			$this->store_data( 'give_temp_payment_items', $payment_items );
-			$this->store_data( 'give_recount_all_total', $total );
+			$this->store_data('give_temp_payment_items', $payment_items);
+			$this->store_data('give_recount_all_total', $total);
 		}
 
 	}
@@ -354,11 +354,11 @@ 
 	 *
 	 * @return mixed       Returns the data from the database
 	 */
-	private function get_stored_data( $key ) {
+	private function get_stored_data($key) {
 		global $wpdb;
-		$value = $wpdb->get_var( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key ) );
+		$value = $wpdb->get_var($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = '%s'", $key));
 
-		return empty( $value ) ? false : maybe_unserialize( $value );
+		return empty($value) ? false : maybe_unserialize($value);
 	}
 
 	/**
@@ -371,10 +371,10 @@ 
 	 *
 	 * @return void
 	 */
-	private function store_data( $key, $value ) {
+	private function store_data($key, $value) {
 		global $wpdb;
 
-		$value = maybe_serialize( $value );
+		$value = maybe_serialize($value);
 
 		$data = array(
 			'option_name'  => $key,
@@ -388,7 +388,7 @@ 
 			'%s',
 		);
 
-		$wpdb->replace( $wpdb->options, $data, $formats );
+		$wpdb->replace($wpdb->options, $data, $formats);
 	}
 
 	/**
@@ -400,9 +400,9 @@ 
 	 *
 	 * @return void
 	 */
-	private function delete_data( $key ) {
+	private function delete_data($key) {
 		global $wpdb;
-		$wpdb->delete( $wpdb->options, array( 'option_name' => $key ) );
+		$wpdb->delete($wpdb->options, array('option_name' => $key));
 	}
 
 }

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

Indentation +2 added lines, -2 removed lines

@@ -188,8 +188,8 @@
 
 			$payment_ids = implode( ',', $payment_ids );
 			$customer->update( array( 'payment_ids'    => $payment_ids,
-			                          'purchase_count' => $purchase_count,
-			                          'purchase_value' => $pending_total
+									  'purchase_count' => $purchase_count,
+									  'purchase_value' => $pending_total
 			) );
 
 			$this->done    = true;

Spacing +70 added lines, -70 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,39 +54,39 @@ 
 	 */
 	public function get_data() {
 
-		$customer = new Give_Customer( $this->customer_id );
-		$payments = $this->get_stored_data( 'give_recount_customer_payments_' . $customer->id, array() );
+		$customer = new Give_Customer($this->customer_id);
+		$payments = $this->get_stored_data('give_recount_customer_payments_'.$customer->id, array());
 
-		$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_customer_pending_total' . $customer->id, 0 );
+		if (count($step_items) > 0) {
+			$pending_total = (float) $this->get_stored_data('give_stats_customer_pending_total'.$customer->id, 0);
 			$step_total    = 0;
 
-			$found_payment_ids = $this->get_stored_data( 'give_stats_found_payments_' . $customer->id, array() );
+			$found_payment_ids = $this->get_stored_data('give_stats_found_payments_'.$customer->id, array());
 
-			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' . $customer->id, array() );
+					$missing_payments   = $this->get_stored_data('give_stats_missing_payments'.$customer->id, array());
 					$missing_payments[] = $payment->ID;
-					$this->store_data( 'give_stats_missing_payments' . $customer->id, $missing_payments );
+					$this->store_data('give_stats_missing_payments'.$customer->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_customer_recount_sholud_increase_value', true, $payment ) ) {
-						$payment_amount = give_get_payment_amount( $payment->ID );
+					if (apply_filters('give_customer_recount_sholud_increase_value', true, $payment)) {
+						$payment_amount = give_get_payment_amount($payment->ID);
 						$step_total += $payment_amount;
 					}
 
@@ -95,8 +95,8 @@ 
 			}
 
 			$updated_total = $pending_total + $step_total;
-			$this->store_data( 'give_stats_customer_pending_total' . $customer->id, $updated_total );
-			$this->store_data( 'give_stats_found_payments_' . $customer->id, $found_payment_ids );
+			$this->store_data('give_stats_customer_pending_total'.$customer->id, $updated_total);
+			$this->store_data('give_stats_found_payments_'.$customer->id, $found_payment_ids);
 
 			return true;
 		}
@@ -113,16 +113,16 @@ 
 	 */
 	public function get_percentage_complete() {
 
-		$payments = $this->get_stored_data( 'give_recount_customer_payments_' . $this->customer_id );
-		$total    = count( $payments );
+		$payments = $this->get_stored_data('give_recount_customer_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;
 		}
 
@@ -136,8 +136,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;
 	}
 
 	/**
@@ -148,62 +148,62 @@ 
 	 */
 	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 {
-			$customer    = new Give_Customer( $this->customer_id );
-			$payment_ids = get_option( 'give_stats_found_payments_' . $customer->id, array() );
-			$this->delete_data( 'give_stats_found_payments_' . $customer->id );
+			$customer    = new Give_Customer($this->customer_id);
+			$payment_ids = get_option('give_stats_found_payments_'.$customer->id, array());
+			$this->delete_data('give_stats_found_payments_'.$customer->id);
 
-			$removed_payments = array_unique( get_option( 'give_stats_missing_payments' . $customer->id, array() ) );
+			$removed_payments = array_unique(get_option('give_stats_missing_payments'.$customer->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_customer_recount_should_increase_count', true, $payment ) ) {
-					$purchase_count ++;
+				$payment = get_post($payment_id);
+				if (apply_filters('give_customer_recount_should_increase_count', true, $payment)) {
+					$purchase_count++;
 				}
 			}
 
-			$this->delete_data( 'give_stats_missing_payments' . $customer->id );
+			$this->delete_data('give_stats_missing_payments'.$customer->id);
 
-			$pending_total = $this->get_stored_data( 'give_stats_customer_pending_total' . $customer->id, 0 );
-			$this->delete_data( 'give_stats_customer_pending_total' . $customer->id );
-			$this->delete_data( 'give_recount_customer_stats_' . $customer->id );
-			$this->delete_data( 'give_recount_customer_payments_' . $this->customer_id );
+			$pending_total = $this->get_stored_data('give_stats_customer_pending_total'.$customer->id, 0);
+			$this->delete_data('give_stats_customer_pending_total'.$customer->id);
+			$this->delete_data('give_recount_customer_stats_'.$customer->id);
+			$this->delete_data('give_recount_customer_payments_'.$this->customer_id);
 
-			$payment_ids = implode( ',', $payment_ids );
-			$customer->update( array( 'payment_ids'    => $payment_ids,
+			$payment_ids = implode(',', $payment_ids);
+			$customer->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
-			$customer = new Give_Customer( $this->customer_id );
-			$customer->update( array( 'purchase_value' => give_format_amount( 0 ), 'purchase_count' => 0 ) );
+			$customer = new Give_Customer($this->customer_id);
+			$customer->update(array('purchase_value' => give_format_amount(0), 'purchase_count' => 0));
 
-			$attached_payment_ids = explode( ',', $customer->payment_ids );
+			$attached_payment_ids = explode(',', $customer->payment_ids);
 
 			$attached_args = array(
 				'post__in' => $attached_payment_ids,
-				'number'   => - 1,
+				'number'   => -1,
 				'status'   => $allowed_payment_status,
 			);
 
-			$attached_payments = 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_customer_payments_' . $customer->id, $payments );
+			$this->store_data('give_recount_customer_payments_'.$customer->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));
 	}
 
 }

Doc Comments +1 added lines, -1 removed lines

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

includes/error-tracking.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +30 added lines, -30 removed lines

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

includes/admin/upgrades/upgrades.php

Braces +5 added lines, -2 removed lines

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

Spacing +17 added lines, -17 removed lines

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

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

Indentation +10 added lines, -10 removed lines

@@ -42,16 +42,16 @@
 				'minWidth' => 320,
 				'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after login.', 'give' ),
 			),
-            array(
-                'type' => 'container',
-                'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Logout Redirect URL (optional):', 'give' ) ),
-            ),
-            array(
-                'type'     => 'textbox',
-                'name'     => 'logout-redirect',
-                'minWidth' => 320,
-                'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after logout.', 'give' ),
-            ),
+			array(
+				'type' => 'container',
+				'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Logout Redirect URL (optional):', 'give' ) ),
+			),
+			array(
+				'type'     => 'textbox',
+				'name'     => 'logout-redirect',
+				'minWidth' => 320,
+				'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after logout.', 'give' ),
+			),
 		);
 	}
 }

Spacing +8 added lines, -8 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__( 'Login', 'give' );
-		$this->shortcode['label'] = esc_html__( 'Login', 'give' );
+		$this->shortcode['title'] = esc_html__('Login', 'give');
+		$this->shortcode['label'] = esc_html__('Login', 'give');
 
-		parent::__construct( 'give_login' );
+		parent::__construct('give_login');
 	}
 
 	/**
@@ -37,23 +37,23 @@ 
 		return array(
 			array(
 				'type' => 'container',
-				'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Login Redirect URL (optional):', 'give' ) ),
+				'html' => sprintf('<p class="no-margin">%s</p>', esc_html__('Login Redirect URL (optional):', 'give')),
 			),
 			array(
 				'type'     => 'textbox',
 				'name'     => 'login-redirect',
 				'minWidth' => 320,
-				'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after login.', 'give' ),
+				'tooltip'  => esc_attr__('Enter an URL here to redirect to after login.', 'give'),
 			),
             array(
                 'type' => 'container',
-                'html' => sprintf( '<p class="no-margin">%s</p>', esc_html__( 'Logout Redirect URL (optional):', 'give' ) ),
+                'html' => sprintf('<p class="no-margin">%s</p>', esc_html__('Logout Redirect URL (optional):', 'give')),
             ),
             array(
                 'type'     => 'textbox',
                 'name'     => 'logout-redirect',
                 'minWidth' => 320,
-                'tooltip'  => esc_attr__( 'Enter an URL here to redirect to after logout.', 'give' ),
+                'tooltip'  => esc_attr__('Enter an URL here to redirect to after logout.', 'give'),
             ),
 		);
 	}