WordImpress / Give

includes/admin/class-admin-notices.php

Doc Comments +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 	 *
 	 * Display admin bar when active
 	 *
-	 * @return bool
+	 * @return false|null
 	 */
 	public function give_admin_bar_menu() {
 		global $wp_admin_bar;

Spacing +67 added lines, -67 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -33,9 +33,9 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'give_dismiss_notices', array( $this, 'dismiss_notices' ) );
-		add_action( 'admin_bar_menu', array( $this, 'give_admin_bar_menu' ), 1000, 1 );
+		add_action('admin_notices', array($this, 'show_notices'));
+		add_action('give_dismiss_notices', array($this, 'dismiss_notices'));
+		add_action('admin_bar_menu', array($this, 'give_admin_bar_menu'), 1000, 1);
 
 		$this->notices = array(
 			'updated' => array(),
@@ -51,20 +51,20 @@ 
 	 *
 	 * @return bool
 	 */
-	public function give_admin_bar_menu( $wp_admin_bar ) {
+	public function give_admin_bar_menu($wp_admin_bar) {
 
-		if ( ! give_is_test_mode() || ! current_user_can( 'view_give_reports' ) ) {
+		if ( ! give_is_test_mode() || ! current_user_can('view_give_reports')) {
 			return false;
 		}
 
 		// Add the main siteadmin menu item.
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'id'     => 'give-test-notice',
-			'href'   => admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=gateways' ),
+			'href'   => admin_url('edit.php?post_type=give_forms&page=give-settings&tab=gateways'),
 			'parent' => 'top-secondary',
-			'title'  => esc_html__( 'Give Test Mode Active', 'give' ),
-			'meta'   => array( 'class' => 'give-test-mode-active' ),
-		) );
+			'title'  => esc_html__('Give Test Mode Active', 'give'),
+			'meta'   => array('class' => 'give-test-mode-active'),
+		));
 
 	}
 
@@ -75,100 +75,100 @@ 
 	 */
 	public function show_notices() {
 
-		if ( ! give_test_ajax_works() && ! get_user_meta( get_current_user_id(), '_give_admin_ajax_inaccessible_dismissed', true ) && current_user_can( 'manage_give_settings' ) ) {
+		if ( ! give_test_ajax_works() && ! get_user_meta(get_current_user_id(), '_give_admin_ajax_inaccessible_dismissed', true) && current_user_can('manage_give_settings')) {
 			echo '<div class="error">';
-			echo '<p>' . esc_html__( 'Your site appears to be blocking the WordPress ajax interface. This may cause issues with Give.', 'give' ) . '</p>';
+			echo '<p>'.esc_html__('Your site appears to be blocking the WordPress ajax interface. This may cause issues with Give.', 'give').'</p>';
 			/* translators: %s: https://givewp.com/documentation/core/troubleshooting/admin-ajax-blocked/ */
-			echo '<p>' . sprintf( __( 'Please see <a href="%s" target="_blank">this reference</a> for possible solutions.', 'give' ), esc_url( 'https://givewp.com/documentation/core/troubleshooting/admin-ajax-blocked/' ) ) . '</p>';
-			echo '<p><a href="' . add_query_arg( array(
+			echo '<p>'.sprintf(__('Please see <a href="%s" target="_blank">this reference</a> for possible solutions.', 'give'), esc_url('https://givewp.com/documentation/core/troubleshooting/admin-ajax-blocked/')).'</p>';
+			echo '<p><a href="'.add_query_arg(array(
 					'give_action' => 'dismiss_notices',
 					'give_notice' => 'admin_ajax_inaccessible',
-				) ) . '">' . esc_html__( 'Dismiss Notice', 'give' ) . '</a></p>';
+				)).'">'.esc_html__('Dismiss Notice', 'give').'</a></p>';
 			echo '</div>';
 		}
 
-		if ( isset( $_GET['give-message'] ) ) {
+		if (isset($_GET['give-message'])) {
 
 			// Donation reports errors.
-			if ( current_user_can( 'view_give_reports' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('view_give_reports')) {
+				switch ($_GET['give-message']) {
 					case 'donation_deleted' :
-						$this->notices['updated']['give-donation-deleted'] = esc_attr__( 'The donation has been deleted.', 'give' );
+						$this->notices['updated']['give-donation-deleted'] = esc_attr__('The donation has been deleted.', 'give');
 						break;
 					case 'email_sent' :
-						$this->notices['updated']['give-payment-sent'] = esc_attr__( 'The donation receipt has been resent.', 'give' );
+						$this->notices['updated']['give-payment-sent'] = esc_attr__('The donation receipt has been resent.', 'give');
 						break;
 					case 'refreshed-reports' :
-						$this->notices['updated']['give-refreshed-reports'] = esc_attr__( 'The reports cache has been cleared.', 'give' );
+						$this->notices['updated']['give-refreshed-reports'] = esc_attr__('The reports cache has been cleared.', 'give');
 						break;
 					case 'donation-note-deleted' :
-						$this->notices['updated']['give-donation-note-deleted'] = esc_attr__( 'The donation note has been deleted.', 'give' );
+						$this->notices['updated']['give-donation-note-deleted'] = esc_attr__('The donation note has been deleted.', 'give');
 						break;
 				}
 			}
 
 			// Give settings notices and errors.
-			if ( current_user_can( 'manage_give_settings' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('manage_give_settings')) {
+				switch ($_GET['give-message']) {
 					case 'settings-imported' :
-						$this->notices['updated']['give-settings-imported'] = esc_attr__( 'The settings have been imported.', 'give' );
+						$this->notices['updated']['give-settings-imported'] = esc_attr__('The settings have been imported.', 'give');
 						break;
 					case 'api-key-generated' :
-						$this->notices['updated']['give-api-key-generated'] = esc_attr__( 'API keys have been generated.', 'give' );
+						$this->notices['updated']['give-api-key-generated'] = esc_attr__('API keys have been generated.', 'give');
 						break;
 					case 'api-key-exists' :
-						$this->notices['error']['give-api-key-exists'] = esc_attr__( 'The specified user already has API keys.', 'give' );
+						$this->notices['error']['give-api-key-exists'] = esc_attr__('The specified user already has API keys.', 'give');
 						break;
 					case 'api-key-regenerated' :
-						$this->notices['updated']['give-api-key-regenerated'] = esc_attr__( 'API keys have been regenerated.', 'give' );
+						$this->notices['updated']['give-api-key-regenerated'] = esc_attr__('API keys have been regenerated.', 'give');
 						break;
 					case 'api-key-revoked' :
-						$this->notices['updated']['give-api-key-revoked'] = esc_attr__( 'API keys have been revoked.', 'give' );
+						$this->notices['updated']['give-api-key-revoked'] = esc_attr__('API keys have been revoked.', 'give');
 						break;
 					case 'sent-test-email' :
-						$this->notices['updated']['give-sent-test-email'] = esc_attr__( 'The test email has been sent.', 'give' );
+						$this->notices['updated']['give-sent-test-email'] = esc_attr__('The test email has been sent.', 'give');
 						break;
 					case 'matched-success-failure-page':
-						$this->notices['updated']['give-matched-success-failure-page'] = esc_html__( 'You cannot set the success and failed pages to the same page', 'give' );
+						$this->notices['updated']['give-matched-success-failure-page'] = esc_html__('You cannot set the success and failed pages to the same page', 'give');
 				}
 			}
 			// Payments errors.
-			if ( current_user_can( 'edit_give_payments' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('edit_give_payments')) {
+				switch ($_GET['give-message']) {
 					case 'note-added' :
-						$this->notices['updated']['give-note-added'] = esc_attr__( 'The donation note has been added.', 'give' );
+						$this->notices['updated']['give-note-added'] = esc_attr__('The donation note has been added.', 'give');
 						break;
 					case 'payment-updated' :
-						$this->notices['updated']['give-payment-updated'] = esc_attr__( 'The donation has been updated.', 'give' );
+						$this->notices['updated']['give-payment-updated'] = esc_attr__('The donation has been updated.', 'give');
 						break;
 				}
 			}
 
 			// Customer Notices.
-			if ( current_user_can( 'edit_give_payments' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('edit_give_payments')) {
+				switch ($_GET['give-message']) {
 					case 'customer-deleted' :
-						$this->notices['updated']['give-customer-deleted'] = esc_attr__( 'The donor has been deleted.', 'give' );
+						$this->notices['updated']['give-customer-deleted'] = esc_attr__('The donor has been deleted.', 'give');
 						break;
 
 					case 'email-added' :
-						$this->notices['updated']['give-customer-email-added'] = esc_attr__( 'Donor email added', 'give' );
+						$this->notices['updated']['give-customer-email-added'] = esc_attr__('Donor email added', 'give');
 						break;
 
 					case 'email-removed' :
-						$this->notices['updated']['give-customer-email-removed'] = esc_attr__( 'Donor email removed', 'give' );
+						$this->notices['updated']['give-customer-email-removed'] = esc_attr__('Donor email removed', 'give');
 						break;
 
 					case 'email-remove-failed' :
-						$this->notices['error']['give-customer-email-remove-failed'] = esc_attr__( 'Failed to remove donor email', 'give' );
+						$this->notices['error']['give-customer-email-remove-failed'] = esc_attr__('Failed to remove donor email', 'give');
 						break;
 
 					case 'primary-email-updated' :
-						$this->notices['updated']['give-customer-primary-email-updated'] = esc_attr__( 'Primary email updated for donors', 'give' );
+						$this->notices['updated']['give-customer-primary-email-updated'] = esc_attr__('Primary email updated for donors', 'give');
 						break;
 
 					case 'primary-email-failed' :
-						$this->notices['error']['give-customer-primary-email-failed'] = esc_attr__( 'Failed to set primary email', 'give' );
+						$this->notices['error']['give-customer-primary-email-failed'] = esc_attr__('Failed to set primary email', 'give');
 
 				}
 			}
@@ -176,19 +176,19 @@ 
 
 		$this->add_payment_bulk_action_notice();
 
-		if ( count( $this->notices['updated'] ) > 0 ) {
-			foreach ( $this->notices['updated'] as $notice => $message ) {
-				add_settings_error( 'give-notices', $notice, $message, 'updated' );
+		if (count($this->notices['updated']) > 0) {
+			foreach ($this->notices['updated'] as $notice => $message) {
+				add_settings_error('give-notices', $notice, $message, 'updated');
 			}
 		}
 
-		if ( count( $this->notices['error'] ) > 0 ) {
-			foreach ( $this->notices['error'] as $notice => $message ) {
-				add_settings_error( 'give-notices', $notice, $message, 'error' );
+		if (count($this->notices['error']) > 0) {
+			foreach ($this->notices['error'] as $notice => $message) {
+				add_settings_error('give-notices', $notice, $message, 'error');
 			}
 		}
 
-		settings_errors( 'give-notices' );
+		settings_errors('give-notices');
 
 	}
 
@@ -200,8 +200,8 @@ 
 	 * @return void
 	 */
 	function give_admin_addons_notices() {
-		add_settings_error( 'give-notices', 'give-addons-feed-error', esc_attr__( 'There seems to be an issue with the server. Please try again in a few minutes.', 'give' ), 'error' );
-		settings_errors( 'give-notices' );
+		add_settings_error('give-notices', 'give-addons-feed-error', esc_attr__('There seems to be an issue with the server. Please try again in a few minutes.', 'give'), 'error');
+		settings_errors('give-notices');
 	}
 
 
@@ -212,9 +212,9 @@ 
 	 * @return void
 	 */
 	function dismiss_notices() {
-		if ( isset( $_GET['give_notice'] ) ) {
-			update_user_meta( get_current_user_id(), '_give_' . $_GET['give_notice'] . '_dismissed', 1 );
-			wp_redirect( remove_query_arg( array( 'give_action', 'give_notice' ) ) );
+		if (isset($_GET['give_notice'])) {
+			update_user_meta(get_current_user_id(), '_give_'.$_GET['give_notice'].'_dismissed', 1);
+			wp_redirect(remove_query_arg(array('give_action', 'give_notice')));
 			exit;
 		}
 	}
@@ -229,24 +229,24 @@ 
 	 */
 	function add_payment_bulk_action_notice() {
 		if (
-			current_user_can( 'edit_give_payments' )
-			&& isset( $_GET['action'] )
-			&& ! empty( $_GET['action'] )
-			&& isset( $_GET['payment'] )
-			&& ! empty( $_GET['payment'] )
+			current_user_can('edit_give_payments')
+			&& isset($_GET['action'])
+			&& ! empty($_GET['action'])
+			&& isset($_GET['payment'])
+			&& ! empty($_GET['payment'])
 		) {
-			$payment_count = isset( $_GET['payment'] ) ? count( $_GET['payment'] ) : 0;
+			$payment_count = isset($_GET['payment']) ? count($_GET['payment']) : 0;
 
-			switch ( $_GET['action'] ) {
+			switch ($_GET['action']) {
 				case 'delete':
-					if ( $payment_count ) {
-						$this->notices['updated']['bulk_action_delete'] = sprintf( _n( 'Successfully deleted only one transaction.', 'Successfully deleted %d number of transactions.', $payment_count, 'give' ), $payment_count );
+					if ($payment_count) {
+						$this->notices['updated']['bulk_action_delete'] = sprintf(_n('Successfully deleted only one transaction.', 'Successfully deleted %d number of transactions.', $payment_count, 'give'), $payment_count);
 					}
 					break;
 
 				case 'resend-receipt':
-					if ( $payment_count ) {
-						$this->notices['updated']['bulk_action_resend_receipt'] = sprintf( _n( 'Successfully send email receipt to only one recipient.', 'Successfully send email receipts to %d recipients.', $payment_count, 'give' ), $payment_count );
+					if ($payment_count) {
+						$this->notices['updated']['bulk_action_resend_receipt'] = sprintf(_n('Successfully send email receipt to only one recipient.', 'Successfully send email receipts to %d recipients.', $payment_count, 'give'), $payment_count);
 					}
 					break;
 			}

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/emails/class-give-email-tags.php

Doc Comments +1 added lines, -1 removed lines

@@ -477,7 +477,7 @@
  *
  * @param int $payment_id
  *
- * @return int payment_id
+ * @return string payment_id
  */
 function give_email_tag_payment_id( $payment_id ) {
 	return give_get_payment_number( $payment_id );

Spacing +105 added lines, -105 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -55,9 +55,9 @@ 
 	 * @param string   $description Email tag description text
 	 * @param callable $func        Hook to run when email tag is found
 	 */
-	public function add( $tag, $description, $func ) {
-		if ( is_callable( $func ) ) {
-			$this->tags[ $tag ] = array(
+	public function add($tag, $description, $func) {
+		if (is_callable($func)) {
+			$this->tags[$tag] = array(
 				'tag'         => $tag,
 				'description' => $description,
 				'func'        => $func
@@ -72,8 +72,8 @@ 
 	 *
 	 * @param string $tag Email tag to remove hook from
 	 */
-	public function remove( $tag ) {
-		unset( $this->tags[ $tag ] );
+	public function remove($tag) {
+		unset($this->tags[$tag]);
 	}
 
 	/**
@@ -85,8 +85,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function email_tag_exists( $tag ) {
-		return array_key_exists( $tag, $this->tags );
+	public function email_tag_exists($tag) {
+		return array_key_exists($tag, $this->tags);
 	}
 
 	/**
@@ -110,16 +110,16 @@ 
 	 *
 	 * @return string Content with email tags filtered out.
 	 */
-	public function do_tags( $content, $payment_id ) {
+	public function do_tags($content, $payment_id) {
 
 		// Check if there is at least one tag added.
-		if ( empty( $this->tags ) || ! is_array( $this->tags ) ) {
+		if (empty($this->tags) || ! is_array($this->tags)) {
 			return $content;
 		}
 
 		$this->payment_id = $payment_id;
 
-		$new_content = preg_replace_callback( "/{([A-z0-9\-\_]+)}/s", array( $this, 'do_tag' ), $content );
+		$new_content = preg_replace_callback("/{([A-z0-9\-\_]+)}/s", array($this, 'do_tag'), $content);
 
 		$this->payment_id = null;
 
@@ -135,17 +135,17 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function do_tag( $m ) {
+	public function do_tag($m) {
 
 		// Get tag
 		$tag = $m[1];
 
 		// Return tag if tag not set
-		if ( ! $this->email_tag_exists( $tag ) ) {
+		if ( ! $this->email_tag_exists($tag)) {
 			return $m[0];
 		}
 
-		return call_user_func( $this->tags[ $tag ]['func'], $this->payment_id, $tag );
+		return call_user_func($this->tags[$tag]['func'], $this->payment_id, $tag);
 	}
 
 }
@@ -159,8 +159,8 @@ 
  * @param string   $description Description of the email tag added
  * @param callable $func        Hook to run when email tag is found
  */
-function give_add_email_tag( $tag, $description, $func ) {
-	Give()->email_tags->add( $tag, $description, $func );
+function give_add_email_tag($tag, $description, $func) {
+	Give()->email_tags->add($tag, $description, $func);
 }
 
 /**
@@ -170,8 +170,8 @@ 
  *
  * @param string $tag Email tag to remove hook from
  */
-function give_remove_email_tag( $tag ) {
-	Give()->email_tags->remove( $tag );
+function give_remove_email_tag($tag) {
+	Give()->email_tags->remove($tag);
 }
 
 /**
@@ -183,8 +183,8 @@ 
  *
  * @return bool
  */
-function give_email_tag_exists( $tag ) {
-	return Give()->email_tags->email_tag_exists( $tag );
+function give_email_tag_exists($tag) {
+	return Give()->email_tags->email_tag_exists($tag);
 }
 
 /**
@@ -211,9 +211,9 @@ 
 	$email_tags = give_get_email_tags();
 
 	ob_start();
-	if ( count( $email_tags ) > 0 ) : ?>
+	if (count($email_tags) > 0) : ?>
 		<div class="give-email-tags-wrap">
-			<?php foreach ( $email_tags as $email_tag ) : ?>
+			<?php foreach ($email_tags as $email_tag) : ?>
 				<span class="give_<?php echo $email_tag['tag']; ?>_tag">
 					<code>{<?php echo $email_tag['tag']; ?>}</code> - <?php echo $email_tag['description']; ?>
 				</span>
@@ -235,12 +235,12 @@ 
  *
  * @return string Content with email tags filtered out.
  */
-function give_do_email_tags( $content, $payment_id ) {
+function give_do_email_tags($content, $payment_id) {
 
 	// Replace all tags
-	$content = Give()->email_tags->do_tags( $content, $payment_id );
+	$content = Give()->email_tags->do_tags($content, $payment_id);
 
-	$content = apply_filters( 'give_email_template_tags', $content, give_get_payment_meta( $payment_id ), $payment_id );
+	$content = apply_filters('give_email_template_tags', $content, give_get_payment_meta($payment_id), $payment_id);
 
 	// Return content
 	return $content;
@@ -259,10 +259,10 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_add_email_tags' );
+	do_action('give_add_email_tags');
 }
 
-add_action( 'init', 'give_load_email_tags', - 999 );
+add_action('init', 'give_load_email_tags', - 999);
 
 /**
  * Add default Give email template tags.
@@ -275,97 +275,97 @@ 
 	$email_tags = array(
 		array(
 			'tag'         => 'donation',
-			'description' => esc_html__( 'The donation form name, and the donation level (if applicable).', 'give' ),
+			'description' => esc_html__('The donation form name, and the donation level (if applicable).', 'give'),
 			'function'    => 'give_email_tag_donation'
 		),
 		array(
 			'tag'         => 'form_title',
-			'description' => esc_html__( 'The donation form name.', 'give' ),
+			'description' => esc_html__('The donation form name.', 'give'),
 			'function'    => 'give_email_tag_form_title'
 		),
 		array(
 			'tag'         => 'amount',
-			'description' => esc_html__( 'The total donation amount with currency sign.', 'give' ),
+			'description' => esc_html__('The total donation amount with currency sign.', 'give'),
 			'function'    => 'give_email_tag_amount'
 		),
 		array(
 			'tag'         => 'price',
-			'description' => esc_html__( 'The total donation amount with currency sign.', 'give' ),
+			'description' => esc_html__('The total donation amount with currency sign.', 'give'),
 			'function'    => 'give_email_tag_price'
 		),
 		array(
 			'tag'         => 'name',
-			'description' => esc_html__( 'The donor\'s first name.', 'give' ),
+			'description' => esc_html__('The donor\'s first name.', 'give'),
 			'function'    => 'give_email_tag_first_name'
 		),
 		array(
 			'tag'         => 'fullname',
-			'description' => esc_html__( 'The donor\'s full name, first and last.', 'give' ),
+			'description' => esc_html__('The donor\'s full name, first and last.', 'give'),
 			'function'    => 'give_email_tag_fullname'
 		),
 		array(
 			'tag'         => 'username',
-			'description' => esc_html__( 'The donor\'s user name on the site, if they registered an account.', 'give' ),
+			'description' => esc_html__('The donor\'s user name on the site, if they registered an account.', 'give'),
 			'function'    => 'give_email_tag_username'
 		),
 		array(
 			'tag'         => 'user_email',
-			'description' => esc_html__( 'The donor\'s email address.', 'give' ),
+			'description' => esc_html__('The donor\'s email address.', 'give'),
 			'function'    => 'give_email_tag_user_email'
 		),
 		array(
 			'tag'         => 'billing_address',
-			'description' => esc_html__( 'The donor\'s billing address.', 'give' ),
+			'description' => esc_html__('The donor\'s billing address.', 'give'),
 			'function'    => 'give_email_tag_billing_address'
 		),
 		array(
 			'tag'         => 'date',
-			'description' => esc_html__( 'The date of the donation.', 'give' ),
+			'description' => esc_html__('The date of the donation.', 'give'),
 			'function'    => 'give_email_tag_date'
 		),
 		array(
 			'tag'         => 'payment_id',
-			'description' => esc_html__( 'The unique ID number for this donation.', 'give' ),
+			'description' => esc_html__('The unique ID number for this donation.', 'give'),
 			'function'    => 'give_email_tag_payment_id'
 		),
 		array(
 			'tag'         => 'receipt_id',
-			'description' => esc_html__( 'The unique ID number for this donation receipt.', 'give' ),
+			'description' => esc_html__('The unique ID number for this donation receipt.', 'give'),
 			'function'    => 'give_email_tag_receipt_id'
 		),
 		array(
 			'tag'         => 'payment_method',
-			'description' => esc_html__( 'The method of payment used for this donation.', 'give' ),
+			'description' => esc_html__('The method of payment used for this donation.', 'give'),
 			'function'    => 'give_email_tag_payment_method'
 		),
 		array(
 			'tag'         => 'sitename',
-			'description' => esc_html__( 'The name of your site.', 'give' ),
+			'description' => esc_html__('The name of your site.', 'give'),
 			'function'    => 'give_email_tag_sitename'
 		),
 		array(
 			'tag'         => 'receipt_link',
-			'description' => esc_html__( 'The donation receipt direct link, to view the receipt on the website.', 'give' ),
+			'description' => esc_html__('The donation receipt direct link, to view the receipt on the website.', 'give'),
 			'function'    => 'give_email_tag_receipt_link'
 		),
 		array(
 			'tag'         => 'receipt_link_url',
-			'description' => esc_html__( 'The donation receipt direct URL, to view the receipt on the website.', 'give' ),
+			'description' => esc_html__('The donation receipt direct URL, to view the receipt on the website.', 'give'),
 			'function'    => 'give_email_tag_receipt_link_url'
 		),
 	);
 
 	// Apply give_email_tags filter
-	$email_tags = apply_filters( 'give_email_tags', $email_tags );
+	$email_tags = apply_filters('give_email_tags', $email_tags);
 
 	// Add email tags
-	foreach ( $email_tags as $email_tag ) {
-		give_add_email_tag( $email_tag['tag'], $email_tag['description'], $email_tag['function'] );
+	foreach ($email_tags as $email_tag) {
+		give_add_email_tag($email_tag['tag'], $email_tag['description'], $email_tag['function']);
 	}
 
 }
 
-add_action( 'give_add_email_tags', 'give_setup_email_tags' );
+add_action('give_add_email_tags', 'give_setup_email_tags');
 
 
 /**
@@ -377,15 +377,15 @@ 
  *
  * @return string name
  */
-function give_email_tag_first_name( $payment_id ) {
-	$payment   = new Give_Payment( $payment_id );
+function give_email_tag_first_name($payment_id) {
+	$payment   = new Give_Payment($payment_id);
 	$user_info = $payment->user_info;
 
-	if ( empty( $user_info ) ) {
+	if (empty($user_info)) {
 		return '';
 	}
 
-	$email_name = give_get_email_names( $user_info );
+	$email_name = give_get_email_names($user_info);
 
 	return $email_name['name'];
 }
@@ -399,15 +399,15 @@ 
  *
  * @return string fullname
  */
-function give_email_tag_fullname( $payment_id ) {
-	$payment   = new Give_Payment( $payment_id );
+function give_email_tag_fullname($payment_id) {
+	$payment   = new Give_Payment($payment_id);
 	$user_info = $payment->user_info;
 
-	if ( empty( $user_info ) ) {
+	if (empty($user_info)) {
 		return '';
 	}
 
-	$email_name = give_get_email_names( $user_info );
+	$email_name = give_get_email_names($user_info);
 
 	return $email_name['fullname'];
 }
@@ -421,15 +421,15 @@ 
  *
  * @return string username.
  */
-function give_email_tag_username( $payment_id ) {
-	$payment   = new Give_Payment( $payment_id );
+function give_email_tag_username($payment_id) {
+	$payment   = new Give_Payment($payment_id);
 	$user_info = $payment->user_info;
 
-	if ( empty( $user_info ) ) {
+	if (empty($user_info)) {
 		return '';
 	}
 
-	$email_name = give_get_email_names( $user_info );
+	$email_name = give_get_email_names($user_info);
 
 	return $email_name['username'];
 }
@@ -443,8 +443,8 @@ 
  *
  * @return string user_email
  */
-function give_email_tag_user_email( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_user_email($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->email;
 }
@@ -458,9 +458,9 @@ 
  *
  * @return string billing_address
  */
-function give_email_tag_billing_address( $payment_id ) {
-	$user_info    = give_get_payment_meta_user_info( $payment_id );
-	$user_address = ! empty( $user_info['address'] ) ? $user_info['address'] : array(
+function give_email_tag_billing_address($payment_id) {
+	$user_info    = give_get_payment_meta_user_info($payment_id);
+	$user_address = ! empty($user_info['address']) ? $user_info['address'] : array(
 		'line1'   => '',
 		'line2'   => '',
 		'city'    => '',
@@ -469,11 +469,11 @@ 
 		'zip'     => ''
 	);
 
-	$return = $user_address['line1'] . "\n";
-	if ( ! empty( $user_address['line2'] ) ) {
-		$return .= $user_address['line2'] . "\n";
+	$return = $user_address['line1']."\n";
+	if ( ! empty($user_address['line2'])) {
+		$return .= $user_address['line2']."\n";
 	}
-	$return .= $user_address['city'] . ' ' . $user_address['zip'] . ' ' . $user_address['state'] . "\n";
+	$return .= $user_address['city'].' '.$user_address['zip'].' '.$user_address['state']."\n";
 	$return .= $user_address['country'];
 
 	return $return;
@@ -488,10 +488,10 @@ 
  *
  * @return string date
  */
-function give_email_tag_date( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_date($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
-	return date_i18n( give_date_format(), strtotime( $payment->date ) );
+	return date_i18n(give_date_format(), strtotime($payment->date));
 }
 
 /**
@@ -503,11 +503,11 @@ 
  *
  * @return string amount
  */
-function give_email_tag_amount( $payment_id ) {
-	$payment     = new Give_Payment( $payment_id );
-	$give_amount = give_currency_filter( give_format_amount( $payment->total ), $payment->currency );
+function give_email_tag_amount($payment_id) {
+	$payment     = new Give_Payment($payment_id);
+	$give_amount = give_currency_filter(give_format_amount($payment->total), $payment->currency);
 
-	return html_entity_decode( $give_amount, ENT_COMPAT, 'UTF-8' );
+	return html_entity_decode($give_amount, ENT_COMPAT, 'UTF-8');
 }
 
 /**
@@ -519,8 +519,8 @@ 
  *
  * @return string price
  */
-function give_email_tag_price( $payment_id ) {
-	return give_email_tag_amount( $payment_id );
+function give_email_tag_price($payment_id) {
+	return give_email_tag_amount($payment_id);
 }
 
 /**
@@ -532,8 +532,8 @@ 
  *
  * @return int payment_id
  */
-function give_email_tag_payment_id( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_payment_id($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->number;
 }
@@ -547,8 +547,8 @@ 
  *
  * @return string receipt_id
  */
-function give_email_tag_receipt_id( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_receipt_id($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->key;
 }
@@ -562,14 +562,14 @@ 
  *
  * @return string $form_title
  */
-function give_email_tag_donation( $payment_id ) {
-	$payment      = new Give_Payment( $payment_id );
+function give_email_tag_donation($payment_id) {
+	$payment      = new Give_Payment($payment_id);
 	$payment_meta = $payment->payment_meta;
-	$level_title  = give_has_variable_prices( $payment->form_id );
+	$level_title  = give_has_variable_prices($payment->form_id);
 	$separator    = $level_title ? '-' : '';
-	$form_title   = strip_tags( give_get_payment_form_title( $payment_meta, false, $separator ) );
+	$form_title   = strip_tags(give_get_payment_form_title($payment_meta, false, $separator));
 
-	return ! empty( $form_title ) ? $form_title : '';
+	return ! empty($form_title) ? $form_title : '';
 
 }
 
@@ -582,11 +582,11 @@ 
  *
  * @return string $form_title
  */
-function give_email_tag_form_title( $payment_id ) {
-	$payment      = new Give_Payment( $payment_id );
+function give_email_tag_form_title($payment_id) {
+	$payment      = new Give_Payment($payment_id);
 	$payment_meta = $payment->payment_meta;
 
-	return isset( $payment_meta['form_title'] ) ? strip_tags( $payment_meta['form_title'] ) : '';
+	return isset($payment_meta['form_title']) ? strip_tags($payment_meta['form_title']) : '';
 
 }
 
@@ -599,10 +599,10 @@ 
  *
  * @return string gateway
  */
-function give_email_tag_payment_method( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_payment_method($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
-	return give_get_gateway_checkout_label( $payment->gateway );
+	return give_get_gateway_checkout_label($payment->gateway);
 }
 
 /**
@@ -614,8 +614,8 @@ 
  *
  * @return string sitename
  */
-function give_email_tag_sitename( $payment_id ) {
-	return wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+function give_email_tag_sitename($payment_id) {
+	return wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES);
 }
 
 /**
@@ -627,19 +627,19 @@ 
  *
  * @return string receipt_link
  */
-function give_email_tag_receipt_link( $payment_id ) {
+function give_email_tag_receipt_link($payment_id) {
 
-	$receipt_url = esc_url( add_query_arg( array(
-		'payment_key' => give_get_payment_key( $payment_id ),
+	$receipt_url = esc_url(add_query_arg(array(
+		'payment_key' => give_get_payment_key($payment_id),
 		'give_action' => 'view_receipt'
-	), home_url() ) );
-	$formatted   = sprintf(
+	), home_url()));
+	$formatted = sprintf(
 		'<a href="%1$s">%2$s</a>',
 		$receipt_url,
-		esc_html__( 'View it in your browser', 'give' )
+		esc_html__('View it in your browser', 'give')
 	);
 
-	if ( give_get_option( 'email_template' ) !== 'none' ) {
+	if (give_get_option('email_template') !== 'none') {
 		return $formatted;
 	} else {
 		return $receipt_url;
@@ -658,12 +658,12 @@ 
  *
  * @return string receipt_url
  */
-function give_email_tag_receipt_link_url( $payment_id ) {
+function give_email_tag_receipt_link_url($payment_id) {
 
-	$receipt_url = esc_url( add_query_arg( array(
-		'payment_key' => give_get_payment_key( $payment_id ),
+	$receipt_url = esc_url(add_query_arg(array(
+		'payment_key' => give_get_payment_key($payment_id),
 		'give_action' => 'view_receipt'
-	), home_url() ) );
+	), home_url()));
 
 	return $receipt_url;
 

includes/admin/reporting/class-give-graph.php

Spacing +32 added lines, -32 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -78,15 +78,15 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __construct( $_data ) {
+	public function __construct($_data) {
 
 		$this->data = $_data;
 
 		// Generate unique ID
-		$this->id = md5( rand() );
+		$this->id = md5(rand());
 
 		// Setup default options;
-		$this->options = apply_filters( 'give_graph_args', array(
+		$this->options = apply_filters('give_graph_args', array(
 			'y_mode'          => null,
 			'x_mode'          => null,
 			'y_decimals'      => 0,
@@ -103,7 +103,7 @@ 
 			'bars'            => true,
 			'lines'           => false,
 			'points'          => true
-		) );
+		));
 
 	}
 
@@ -115,8 +115,8 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function set( $key, $value ) {
-		$this->options[ $key ] = $value;
+	public function set($key, $value) {
+		$this->options[$key] = $value;
 	}
 
 	/**
@@ -126,8 +126,8 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function get( $key ) {
-		return isset( $this->options[ $key ] ) ? $this->options[ $key ] : false;
+	public function get($key) {
+		return isset($this->options[$key]) ? $this->options[$key] : false;
 	}
 
 	/**
@@ -136,7 +136,7 @@ 
 	 * @since 1.0
 	 */
 	public function get_data() {
-		return apply_filters( 'give_get_graph_data', $this->data, $this );
+		return apply_filters('give_get_graph_data', $this->data, $this);
 	}
 
 	/**
@@ -146,19 +146,19 @@ 
 	 */
 	public function load_scripts() {
 		// Use minified libraries if SCRIPT_DEBUG is turned off
-		$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+		$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
-		wp_register_script( 'jquery-flot-orderbars', GIVE_PLUGIN_URL . 'assets/js/plugins/jquery.flot.orderBars' . $suffix . '.js', array('jquery-flot'), GIVE_VERSION );
-		wp_enqueue_script( 'jquery-flot-orderbars' );
+		wp_register_script('jquery-flot-orderbars', GIVE_PLUGIN_URL.'assets/js/plugins/jquery.flot.orderBars'.$suffix.'.js', array('jquery-flot'), GIVE_VERSION);
+		wp_enqueue_script('jquery-flot-orderbars');
 
-		wp_register_script( 'jquery-flot-time', GIVE_PLUGIN_URL . 'assets/js/plugins/jquery.flot.time' . $suffix . '.js', array('jquery-flot'), GIVE_VERSION );
-		wp_enqueue_script( 'jquery-flot-time' );
+		wp_register_script('jquery-flot-time', GIVE_PLUGIN_URL.'assets/js/plugins/jquery.flot.time'.$suffix.'.js', array('jquery-flot'), GIVE_VERSION);
+		wp_enqueue_script('jquery-flot-time');
 
-		wp_register_script( 'jquery-flot-resize', GIVE_PLUGIN_URL . 'assets/js/plugins/jquery.flot.resize' . $suffix . '.js', array('jquery-flot'), GIVE_VERSION );
-		wp_enqueue_script( 'jquery-flot-resize' );
+		wp_register_script('jquery-flot-resize', GIVE_PLUGIN_URL.'assets/js/plugins/jquery.flot.resize'.$suffix.'.js', array('jquery-flot'), GIVE_VERSION);
+		wp_enqueue_script('jquery-flot-resize');
 
-		wp_register_script( 'jquery-flot', GIVE_PLUGIN_URL . 'assets/js/plugins/jquery.flot' . $suffix . '.js', false, GIVE_VERSION );
-		wp_enqueue_script( 'jquery-flot' );
+		wp_register_script('jquery-flot', GIVE_PLUGIN_URL.'assets/js/plugins/jquery.flot'.$suffix.'.js', false, GIVE_VERSION);
+		wp_enqueue_script('jquery-flot');
 
 	}
 
@@ -185,13 +185,13 @@ 
 					[
 						<?php
 							$order = 0;
-							foreach( $this->get_data() as $label => $data ) :
+							foreach ($this->get_data() as $label => $data) :
 						?>
 						{
-							label : "<?php echo esc_attr( $label ); ?>",
-							id    : "<?php echo sanitize_key( $label ); ?>",
+							label : "<?php echo esc_attr($label); ?>",
+							id    : "<?php echo sanitize_key($label); ?>",
 							// data format is: [ point on x, value on y ]
-							data  : [<?php foreach( $data as $point ) { echo '[' . implode( ',', $point ) . '],'; } ?>],
+							data  : [<?php foreach ($data as $point) { echo '['.implode(',', $point).'],'; } ?>],
 							points: {
 								show: <?php echo $this->options['points'] ? 'true' : 'false'; ?>,
 							},
@@ -206,7 +206,7 @@ 
 								fill     : true,
 								fillColor: {colors: [{opacity: 0.4}, {opacity: 0.1}]}
 							},
-							<?php if( $this->options[ 'multiple_y_axes' ] ) : ?>
+							<?php if ($this->options['multiple_y_axes']) : ?>
 							yaxis : <?php echo $yaxis_count; ?>
 							<?php endif; ?>
 
@@ -220,10 +220,10 @@ 
 						grid: {
 							show           : true,
 							aboveData      : false,
-							color          : "<?php echo $this->options[ 'color' ]; ?>",
-							backgroundColor: "<?php echo $this->options[ 'bgcolor' ]; ?>",
-							borderColor    : "<?php echo $this->options[ 'bordercolor' ]; ?>",
-							borderWidth    : <?php echo absint( $this->options[ 'borderwidth' ] ); ?>,
+							color          : "<?php echo $this->options['color']; ?>",
+							backgroundColor: "<?php echo $this->options['bgcolor']; ?>",
+							borderColor    : "<?php echo $this->options['bordercolor']; ?>",
+							borderWidth    : <?php echo absint($this->options['borderwidth']); ?>,
 							clickable      : false,
 							hoverable      : true
 						},
@@ -234,7 +234,7 @@ 
 							mode        : "<?php echo $this->options['x_mode']; ?>",
 							timeFormat  : "<?php echo $this->options['x_mode'] == 'time' ? $this->options['time_format'] : ''; ?>",
 							tickSize    : "<?php echo $this->options['x_mode'] == 'time' ? '' : 1; ?>",
-							<?php if( $this->options['x_mode'] != 'time' ) : ?>
+							<?php if ($this->options['x_mode'] != 'time') : ?>
 							tickDecimals: <?php echo $this->options['x_decimals']; ?>
 							<?php endif; ?>
 						},
@@ -243,7 +243,7 @@ 
 							min         : 0,
 							mode        : "<?php echo $this->options['y_mode']; ?>",
 							timeFormat  : "<?php echo $this->options['y_mode'] == 'time' ? $this->options['time_format'] : ''; ?>",
-							<?php if( $this->options['y_mode'] != 'time' ) : ?>
+							<?php if ($this->options['y_mode'] != 'time') : ?>
 							tickDecimals: <?php echo $this->options['y_decimals']; ?>
 							<?php endif; ?>
 						}
@@ -303,9 +303,9 @@ 
 	 * @since 1.0
 	 */
 	public function display() {
-		do_action( 'give_before_graph', $this );
+		do_action('give_before_graph', $this);
 		echo $this->build_graph();
-		do_action( 'give_after_graph', $this );
+		do_action('give_after_graph', $this);
 	}
 
 }

includes/admin/shortcodes/class-shortcode-button.php

Indentation +2 added lines, -2 removed lines

@@ -117,8 +117,8 @@
 		$shortcode_button_pages = array( 'post.php', 'page.php', 'post-new.php', 'post-edit.php' );
 		// Only run in admin post/page creation and edit screens
 		if ( in_array( $pagenow, $shortcode_button_pages )
-		     && apply_filters( 'give_shortcode_button_condition', true )
-		     && ! empty( self::$shortcodes )
+			 && apply_filters( 'give_shortcode_button_condition', true )
+			 && ! empty( self::$shortcodes )
 		) {
 
 			$shortcodes = array();

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
 	/**
 	 * Adds the "Donation Form" button above the TinyMCE Editor on add/edit screens.
 	 *
-	 * @return string|bool
+	 * @return false|null
 	 *
 	 * @since 1.0
 	 */

Spacing +51 added lines, -51 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -33,16 +33,16 @@ 
 	 */
 	public function __construct() {
 
-		if ( is_admin() ) {
-			add_filter( 'mce_external_plugins', array( $this, 'mce_external_plugins' ), 15 );
+		if (is_admin()) {
+			add_filter('mce_external_plugins', array($this, 'mce_external_plugins'), 15);
 
-			add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_assets' ) );
-			add_action( 'admin_enqueue_scripts', array( $this, 'admin_localize_scripts' ), 13 );
-			add_action( 'media_buttons', array( $this, 'shortcode_button' ) );
+			add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_assets'));
+			add_action('admin_enqueue_scripts', array($this, 'admin_localize_scripts'), 13);
+			add_action('media_buttons', array($this, 'shortcode_button'));
 		}
 
-		add_action( "wp_ajax_give_shortcode", array( $this, 'shortcode_ajax' ) );
-		add_action( "wp_ajax_nopriv_give_shortcode", array( $this, 'shortcode_ajax' ) );
+		add_action("wp_ajax_give_shortcode", array($this, 'shortcode_ajax'));
+		add_action("wp_ajax_nopriv_give_shortcode", array($this, 'shortcode_ajax'));
 	}
 
 	/**
@@ -54,15 +54,15 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function mce_external_plugins( $plugin_array ) {
+	public function mce_external_plugins($plugin_array) {
 
-		if ( ! current_user_can( 'edit_posts' ) && ! current_user_can( 'edit_pages' ) ) {
+		if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages')) {
 			return false;
 		}
 
-		$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+		$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
-		$plugin_array['give_shortcode'] = GIVE_PLUGIN_URL . 'assets/js/admin/tinymce/mce-plugin' . $suffix . '.js';
+		$plugin_array['give_shortcode'] = GIVE_PLUGIN_URL.'assets/js/admin/tinymce/mce-plugin'.$suffix.'.js';
 
 		return $plugin_array;
 	}
@@ -76,12 +76,12 @@ 
 	 */
 	public function admin_enqueue_assets() {
 
-		$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+		$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 		wp_enqueue_script(
 			'give_shortcode',
-			GIVE_PLUGIN_URL . 'assets/js/admin/admin-shortcodes' . $suffix . '.js',
-			array( 'jquery' ),
+			GIVE_PLUGIN_URL.'assets/js/admin/admin-shortcodes'.$suffix.'.js',
+			array('jquery'),
 			GIVE_VERSION,
 			true
 		);
@@ -96,17 +96,17 @@ 
 	 */
 	public function admin_localize_scripts() {
 
-		if ( ! empty( self::$shortcodes ) ) {
+		if ( ! empty(self::$shortcodes)) {
 
 			$variables = array();
 
-			foreach ( self::$shortcodes as $shortcode => $values ) {
-				if ( ! empty( $values['required'] ) ) {
-					$variables[ $shortcode ] = $values['required'];
+			foreach (self::$shortcodes as $shortcode => $values) {
+				if ( ! empty($values['required'])) {
+					$variables[$shortcode] = $values['required'];
 				}
 			}
 
-			wp_localize_script( 'give_shortcode', 'scShortcodes', $variables );
+			wp_localize_script('give_shortcode', 'scShortcodes', $variables);
 		}
 	}
 
@@ -123,37 +123,37 @@ 
 
 		// If we load wp editor by ajax then $screen will be empty which generate notice if we treat $screen as WP_Screen object.
 		// For example we are loading wp editor by ajax in repeater field.
-		if ( ! ( $screen instanceof WP_Screen ) ) {
+		if ( ! ($screen instanceof WP_Screen)) {
 			return false;
 		}
 
-		$shortcode_button_pages = apply_filters( 'give_shortcode_button_pages', array(
+		$shortcode_button_pages = apply_filters('give_shortcode_button_pages', array(
 			'post.php',
 			'page.php',
 			'post-new.php',
 			'post-edit.php',
 			'edit.php',
 			'edit.php?post_type=page',
-		) );
+		));
 
 		// Only run in admin post/page creation and edit screens
-		if ( in_array( $screen->parent_file, $shortcode_button_pages )
-		     && apply_filters( 'give_shortcode_button_condition', true )
-		     && ! empty( self::$shortcodes )
+		if (in_array($screen->parent_file, $shortcode_button_pages)
+		     && apply_filters('give_shortcode_button_condition', true)
+		     && ! empty(self::$shortcodes)
 		) {
 
 			$shortcodes = array();
 
-			foreach ( self::$shortcodes as $shortcode => $values ) {
+			foreach (self::$shortcodes as $shortcode => $values) {
 
 				/**
 				 * Filters the condition for including the current shortcode
 				 *
 				 * @since 1.0
 				 */
-				if ( apply_filters( sanitize_title( $shortcode ) . '_condition', true ) ) {
+				if (apply_filters(sanitize_title($shortcode).'_condition', true)) {
 
-					$shortcodes[ $shortcode ] = sprintf(
+					$shortcodes[$shortcode] = sprintf(
 						'<div class="sc-shortcode mce-menu-item give-shortcode-item-%1$s" data-shortcode="%s">%s</div>',
 						$shortcode,
 						$values['label'],
@@ -162,37 +162,37 @@ 
 				}
 			}
 
-			if ( ! empty( $shortcodes ) ) {
+			if ( ! empty($shortcodes)) {
 
 				// check current WP version
-				$img = ( version_compare( get_bloginfo( 'version' ), '3.5', '<' ) )
-					? '<img src="' . GIVE_PLUGIN_URL . 'assets/images/give-media.png" />'
-					: '<span class="wp-media-buttons-icon" id="give-media-button" style="background-image: url(' . give_svg_icons( 'give_grey' ) . ');"></span>';
+				$img = (version_compare(get_bloginfo('version'), '3.5', '<'))
+					? '<img src="'.GIVE_PLUGIN_URL.'assets/images/give-media.png" />'
+					: '<span class="wp-media-buttons-icon" id="give-media-button" style="background-image: url('.give_svg_icons('give_grey').');"></span>';
 
-				reset( $shortcodes );
+				reset($shortcodes);
 
-				if ( count( $shortcodes ) == 1 ) {
+				if (count($shortcodes) == 1) {
 
-					$shortcode = key( $shortcodes );
+					$shortcode = key($shortcodes);
 
 					printf(
 						'<button class="button sc-shortcode" data-shortcode="%s">%s</button>',
 						$shortcode,
-						sprintf( '%s %s %s',
+						sprintf('%s %s %s',
 							$img,
-							esc_html__( 'Insert', 'give' ),
-							self::$shortcodes[ $shortcode ]['label']
+							esc_html__('Insert', 'give'),
+							self::$shortcodes[$shortcode]['label']
 						)
 					);
 				} else {
 					printf(
-						'<div class="sc-wrap">' .
-						'<button class="button sc-button">%s %s</button>' .
-						'<div class="sc-menu mce-menu">%s</div>' .
+						'<div class="sc-wrap">'.
+						'<button class="button sc-button">%s %s</button>'.
+						'<div class="sc-menu mce-menu">%s</div>'.
 						'</div>',
 						$img,
-						esc_html__( 'Give Shortcodes', 'give' ),
-						implode( '', array_values( $shortcodes ) )
+						esc_html__('Give Shortcodes', 'give'),
+						implode('', array_values($shortcodes))
 					);
 				}
 			}
@@ -208,15 +208,15 @@ 
 	 */
 	public function shortcode_ajax() {
 
-		$shortcode = isset( $_POST['shortcode'] ) ? $_POST['shortcode'] : false;
+		$shortcode = isset($_POST['shortcode']) ? $_POST['shortcode'] : false;
 		$response  = false;
 
-		if ( $shortcode && array_key_exists( $shortcode, self::$shortcodes ) ) {
+		if ($shortcode && array_key_exists($shortcode, self::$shortcodes)) {
 
-			$data = self::$shortcodes[ $shortcode ];
+			$data = self::$shortcodes[$shortcode];
 
-			if ( ! empty( $data['errors'] ) ) {
-				$data['btn_okay'] = array( esc_html__( 'Okay', 'give' ) );
+			if ( ! empty($data['errors'])) {
+				$data['btn_okay'] = array(esc_html__('Okay', 'give'));
 			}
 
 			$response = array(
@@ -228,10 +228,10 @@ 
 			);
 		} else {
 			// todo: handle error
-			error_log( print_r( 'AJAX error!', 1 ) );
+			error_log(print_r('AJAX error!', 1));
 		}
 
-		wp_send_json( $response );
+		wp_send_json($response);
 	}
 }
 

includes/misc-functions.php

Indentation +8 added lines, -8 removed lines

@@ -727,10 +727,10 @@ 
 		}
 
 		if ( ! is_int( $params[1] )
-		     && ! is_float( $params[1] )
-		     && ! is_string( $params[1] )
-		     && $params[1] !== null
-		     && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
+			 && ! is_float( $params[1] )
+			 && ! is_string( $params[1] )
+			 && $params[1] !== null
+			 && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
 		) {
 			trigger_error( 'array_column(): The column key should be either a string or an integer', E_USER_WARNING );
 
@@ -738,10 +738,10 @@ 
 		}
 
 		if ( isset( $params[2] )
-		     && ! is_int( $params[2] )
-		     && ! is_float( $params[2] )
-		     && ! is_string( $params[2] )
-		     && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
+			 && ! is_int( $params[2] )
+			 && ! is_float( $params[2] )
+			 && ! is_string( $params[2] )
+			 && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
 		) {
 			trigger_error( 'array_column(): The index key should be either a string or an integer', E_USER_WARNING );
 

Doc Comments +1 added lines, -1 removed lines

@@ -337,7 +337,7 @@
  *
  * @since 1.0
  * @uses  Give()->session->get()
- * @return mixed array | false
+ * @return string array | false
  */
 function give_get_purchase_session() {
 	return Give()->session->get( 'give_purchase' );

Spacing +200 added lines, -200 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,9 +23,9 @@ 
  */
 function give_is_test_mode() {
 
-	$ret = give_is_setting_enabled( give_get_option( 'test_mode' ) );
+	$ret = give_is_setting_enabled(give_get_option('test_mode'));
 
-	return (bool) apply_filters( 'give_is_test_mode', $ret );
+	return (bool) apply_filters('give_is_test_mode', $ret);
 
 }
 
@@ -37,9 +37,9 @@ 
  */
 function give_get_currency() {
 
-	$currency = give_get_option( 'currency', 'USD' );
+	$currency = give_get_option('currency', 'USD');
 
-	return apply_filters( 'give_currency', $currency );
+	return apply_filters('give_currency', $currency);
 }
 
 /**
@@ -51,9 +51,9 @@ 
  */
 function give_get_currency_position() {
 
-	$currency_pos = give_get_option( 'currency_position', 'before' );
+	$currency_pos = give_get_option('currency_position', 'before');
 
-	return apply_filters( 'give_currency_position', $currency_pos );
+	return apply_filters('give_currency_position', $currency_pos);
 }
 
 
@@ -66,39 +66,39 @@ 
 
 function give_get_currencies() {
 	$currencies = array(
-		'USD'  => esc_html__( 'US Dollars ($)', 'give' ),
-		'EUR'  => esc_html__( 'Euros (€)', 'give' ),
-		'GBP'  => esc_html__( 'Pounds Sterling (£)', 'give' ),
-		'AUD'  => esc_html__( 'Australian Dollars ($)', 'give' ),
-		'BRL'  => esc_html__( 'Brazilian Real (R$)', 'give' ),
-		'CAD'  => esc_html__( 'Canadian Dollars ($)', 'give' ),
-		'CZK'  => esc_html__( 'Czech Koruna (Kč)', 'give' ),
-		'DKK'  => esc_html__( 'Danish Krone (kr)', 'give' ),
-		'HKD'  => esc_html__( 'Hong Kong Dollar ($)', 'give' ),
-		'HUF'  => esc_html__( 'Hungarian Forint (Ft)', 'give' ),
-		'ILS'  => esc_html__( 'Israeli Shekel (₪)', 'give' ),
-		'JPY'  => esc_html__( 'Japanese Yen (¥)', 'give' ),
-		'MYR'  => esc_html__( 'Malaysian Ringgits (RM)', 'give' ),
-		'MXN'  => esc_html__( 'Mexican Peso ($)', 'give' ),
-		'MAD'  => esc_html__( 'Moroccan Dirham (.د.م)', 'give' ),
-		'NZD'  => esc_html__( 'New Zealand Dollar ($)', 'give' ),
-		'NOK'  => esc_html__( 'Norwegian Krone (Kr.)', 'give' ),
-		'PHP'  => esc_html__( 'Philippine Pesos (₱)', 'give' ),
-		'PLN'  => esc_html__( 'Polish Zloty (zł)', 'give' ),
-		'SGD'  => esc_html__( 'Singapore Dollar ($)', 'give' ),
-		'KRW'  => esc_html__( 'South Korean Won (₩)', 'give' ),
-		'ZAR'  => esc_html__( 'South African Rand (R)', 'give' ),
-		'SEK'  => esc_html__( 'Swedish Krona (kr)', 'give' ),
-		'CHF'  => esc_html__( 'Swiss Franc (CHF)', 'give' ),
-		'TWD'  => esc_html__( 'Taiwan New Dollars (NT$)', 'give' ),
-		'THB'  => esc_html__( 'Thai Baht (฿)', 'give' ),
-		'INR'  => esc_html__( 'Indian Rupee (₹)', 'give' ),
-		'TRY'  => esc_html__( 'Turkish Lira (₺)', 'give' ),
-		'RIAL' => esc_html__( 'Iranian Rial (﷼)', 'give' ),
-		'RUB'  => esc_html__( 'Russian Rubles (руб)', 'give' )
+		'USD'  => esc_html__('US Dollars ($)', 'give'),
+		'EUR'  => esc_html__('Euros (€)', 'give'),
+		'GBP'  => esc_html__('Pounds Sterling (£)', 'give'),
+		'AUD'  => esc_html__('Australian Dollars ($)', 'give'),
+		'BRL'  => esc_html__('Brazilian Real (R$)', 'give'),
+		'CAD'  => esc_html__('Canadian Dollars ($)', 'give'),
+		'CZK'  => esc_html__('Czech Koruna (Kč)', 'give'),
+		'DKK'  => esc_html__('Danish Krone (kr)', 'give'),
+		'HKD'  => esc_html__('Hong Kong Dollar ($)', 'give'),
+		'HUF'  => esc_html__('Hungarian Forint (Ft)', 'give'),
+		'ILS'  => esc_html__('Israeli Shekel (₪)', 'give'),
+		'JPY'  => esc_html__('Japanese Yen (¥)', 'give'),
+		'MYR'  => esc_html__('Malaysian Ringgits (RM)', 'give'),
+		'MXN'  => esc_html__('Mexican Peso ($)', 'give'),
+		'MAD'  => esc_html__('Moroccan Dirham (.د.م)', 'give'),
+		'NZD'  => esc_html__('New Zealand Dollar ($)', 'give'),
+		'NOK'  => esc_html__('Norwegian Krone (Kr.)', 'give'),
+		'PHP'  => esc_html__('Philippine Pesos (₱)', 'give'),
+		'PLN'  => esc_html__('Polish Zloty (zł)', 'give'),
+		'SGD'  => esc_html__('Singapore Dollar ($)', 'give'),
+		'KRW'  => esc_html__('South Korean Won (₩)', 'give'),
+		'ZAR'  => esc_html__('South African Rand (R)', 'give'),
+		'SEK'  => esc_html__('Swedish Krona (kr)', 'give'),
+		'CHF'  => esc_html__('Swiss Franc (CHF)', 'give'),
+		'TWD'  => esc_html__('Taiwan New Dollars (NT$)', 'give'),
+		'THB'  => esc_html__('Thai Baht (฿)', 'give'),
+		'INR'  => esc_html__('Indian Rupee (₹)', 'give'),
+		'TRY'  => esc_html__('Turkish Lira (₺)', 'give'),
+		'RIAL' => esc_html__('Iranian Rial (﷼)', 'give'),
+		'RUB'  => esc_html__('Russian Rubles (руб)', 'give')
 	);
 
-	return apply_filters( 'give_currencies', $currencies );
+	return apply_filters('give_currencies', $currencies);
 }
 
 
@@ -113,12 +113,12 @@ 
  *
  * @return string           The symbol to use for the currency
  */
-function give_currency_symbol( $currency = '' ) {
+function give_currency_symbol($currency = '') {
 
-	if ( empty( $currency ) ) {
+	if (empty($currency)) {
 		$currency = give_get_currency();
 	}
-	switch ( $currency ) :
+	switch ($currency) :
 		case 'GBP' :
 			$symbol = '£';
 			break;
@@ -197,7 +197,7 @@ 
 	endswitch;
 
 
-	return apply_filters( 'give_currency_symbol', $symbol, $currency );
+	return apply_filters('give_currency_symbol', $symbol, $currency);
 }
 
 
@@ -209,15 +209,15 @@ 
  */
 function give_get_current_page_url() {
 
-	if ( is_front_page() ) {
-		$current_url = home_url( '/' );
+	if (is_front_page()) {
+		$current_url = home_url('/');
 	} else {
-		$http_host = sanitize_text_field( $_SERVER['HTTP_HOST'] );
-		$request_uri = sanitize_text_field( $_SERVER['REQUEST_URI'] );
-		$current_url = set_url_scheme( 'http://' . $http_host . untrailingslashit( $request_uri ) );
+		$http_host = sanitize_text_field($_SERVER['HTTP_HOST']);
+		$request_uri = sanitize_text_field($_SERVER['REQUEST_URI']);
+		$current_url = set_url_scheme('http://'.$http_host.untrailingslashit($request_uri));
 	}
 
-	return apply_filters( 'give_get_current_page_url', $current_url );
+	return apply_filters('give_get_current_page_url', $current_url);
 }
 
 
@@ -238,15 +238,15 @@ 
 	 */
 	$gateways = give_get_enabled_payment_gateways();
 
-	if ( count( $gateways ) == 1 && ! isset( $gateways['paypal'] ) && ! isset( $gateways['manual'] ) ) {
+	if (count($gateways) == 1 && ! isset($gateways['paypal']) && ! isset($gateways['manual'])) {
 		$ret = true;
-	} else if ( count( $gateways ) == 1 ) {
+	} else if (count($gateways) == 1) {
 		$ret = false;
-	} else if ( count( $gateways ) == 2 && isset( $gateways['paypal'] ) && isset( $gateways['manual'] ) ) {
+	} else if (count($gateways) == 2 && isset($gateways['paypal']) && isset($gateways['manual'])) {
 		$ret = false;
 	}
 
-	return (bool) apply_filters( 'give_verify_credit_cards', $ret );
+	return (bool) apply_filters('give_verify_credit_cards', $ret);
 }
 
 /**
@@ -258,26 +258,26 @@ 
 function give_get_timezone_id() {
 
 	// if site timezone string exists, return it
-	if ( $timezone = get_option( 'timezone_string' ) ) {
+	if ($timezone = get_option('timezone_string')) {
 		return $timezone;
 	}
 
 	// get UTC offset, if it isn't set return UTC
-	if ( ! ( $utc_offset = 3600 * get_option( 'gmt_offset', 0 ) ) ) {
+	if ( ! ($utc_offset = 3600 * get_option('gmt_offset', 0))) {
 		return 'UTC';
 	}
 
 	// attempt to guess the timezone string from the UTC offset
-	$timezone = timezone_name_from_abbr( '', $utc_offset );
+	$timezone = timezone_name_from_abbr('', $utc_offset);
 
 	// last try, guess timezone string manually
-	if ( $timezone === false ) {
+	if ($timezone === false) {
 
-		$is_dst = date( 'I' );
+		$is_dst = date('I');
 
-		foreach ( timezone_abbreviations_list() as $abbr ) {
-			foreach ( $abbr as $city ) {
-				if ( $city['dst'] == $is_dst && $city['offset'] == $utc_offset ) {
+		foreach (timezone_abbreviations_list() as $abbr) {
+			foreach ($abbr as $city) {
+				if ($city['dst'] == $is_dst && $city['offset'] == $utc_offset) {
 					return $city['timezone_id'];
 				}
 			}
@@ -301,17 +301,17 @@ 
 
 	$ip = '127.0.0.1';
 
-	if ( ! empty( $_SERVER['HTTP_CLIENT_IP'] ) ) {
+	if ( ! empty($_SERVER['HTTP_CLIENT_IP'])) {
 		//check ip from share internet
 		$ip = $_SERVER['HTTP_CLIENT_IP'];
-	} elseif ( ! empty( $_SERVER['HTTP_X_FORWARDED_FOR'] ) ) {
+	} elseif ( ! empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
 		//to check ip is pass from proxy
 		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];
-	} elseif ( ! empty( $_SERVER['REMOTE_ADDR'] ) ) {
+	} elseif ( ! empty($_SERVER['REMOTE_ADDR'])) {
 		$ip = $_SERVER['REMOTE_ADDR'];
 	}
 
-	return apply_filters( 'give_get_ip', $ip );
+	return apply_filters('give_get_ip', $ip);
 }
 
 
@@ -326,9 +326,9 @@ 
  *
  * @uses  Give()->session->set()
  */
-function give_set_purchase_session( $purchase_data = array() ) {
-	Give()->session->set( 'give_purchase', $purchase_data );
-	Give()->session->set( 'give_email', $purchase_data['user_email'] );
+function give_set_purchase_session($purchase_data = array()) {
+	Give()->session->set('give_purchase', $purchase_data);
+	Give()->session->set('give_email', $purchase_data['user_email']);
 }
 
 /**
@@ -342,7 +342,7 @@ 
  * @return mixed array | false
  */
 function give_get_purchase_session() {
-	return Give()->session->get( 'give_purchase' );
+	return Give()->session->get('give_purchase');
 }
 
 /**
@@ -357,14 +357,14 @@ 
  *
  * @return string
  */
-function give_get_purchase_summary( $purchase_data, $email = true ) {
+function give_get_purchase_summary($purchase_data, $email = true) {
 	$summary = '';
 
-	if ( $email ) {
-		$summary .= $purchase_data['user_email'] . ' - ';
+	if ($email) {
+		$summary .= $purchase_data['user_email'].' - ';
 	}
 
-	$summary .= get_the_title( $purchase_data['post_data']['give-form-id'] );
+	$summary .= get_the_title($purchase_data['post_data']['give-form-id']);
 
 	return $summary;
 }
@@ -381,31 +381,31 @@ 
 function give_get_host() {
 	$host = false;
 
-	if ( defined( 'WPE_APIKEY' ) ) {
+	if (defined('WPE_APIKEY')) {
 		$host = 'WP Engine';
-	} elseif ( defined( 'PAGELYBIN' ) ) {
+	} elseif (defined('PAGELYBIN')) {
 		$host = 'Pagely';
-	} elseif ( DB_HOST == 'localhost:/tmp/mysql5.sock' ) {
+	} elseif (DB_HOST == 'localhost:/tmp/mysql5.sock') {
 		$host = 'ICDSoft';
-	} elseif ( DB_HOST == 'mysqlv5' ) {
+	} elseif (DB_HOST == 'mysqlv5') {
 		$host = 'NetworkSolutions';
-	} elseif ( strpos( DB_HOST, 'ipagemysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipagemysql.com') !== false) {
 		$host = 'iPage';
-	} elseif ( strpos( DB_HOST, 'ipowermysql.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, 'ipowermysql.com') !== false) {
 		$host = 'IPower';
-	} elseif ( strpos( DB_HOST, '.gridserver.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.gridserver.com') !== false) {
 		$host = 'MediaTemple Grid';
-	} elseif ( strpos( DB_HOST, '.pair.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.pair.com') !== false) {
 		$host = 'pair Networks';
-	} elseif ( strpos( DB_HOST, '.stabletransit.com' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.stabletransit.com') !== false) {
 		$host = 'Rackspace Cloud';
-	} elseif ( strpos( DB_HOST, '.sysfix.eu' ) !== false ) {
+	} elseif (strpos(DB_HOST, '.sysfix.eu') !== false) {
 		$host = 'SysFix.eu Power Hosting';
-	} elseif ( strpos( $_SERVER['SERVER_NAME'], 'Flywheel' ) !== false ) {
+	} elseif (strpos($_SERVER['SERVER_NAME'], 'Flywheel') !== false) {
 		$host = 'Flywheel';
 	} else {
 		// Adding a general fallback for data gathering
-		$host = 'DBH: ' . DB_HOST . ', SRV: ' . $_SERVER['SERVER_NAME'];
+		$host = 'DBH: '.DB_HOST.', SRV: '.$_SERVER['SERVER_NAME'];
 	}
 
 	return $host;
@@ -421,67 +421,67 @@ 
  *
  * @return bool true if host matches, false if not
  */
-function give_is_host( $host = false ) {
+function give_is_host($host = false) {
 
 	$return = false;
 
-	if ( $host ) {
-		$host = str_replace( ' ', '', strtolower( $host ) );
+	if ($host) {
+		$host = str_replace(' ', '', strtolower($host));
 
-		switch ( $host ) {
+		switch ($host) {
 			case 'wpengine':
-				if ( defined( 'WPE_APIKEY' ) ) {
+				if (defined('WPE_APIKEY')) {
 					$return = true;
 				}
 				break;
 			case 'pagely':
-				if ( defined( 'PAGELYBIN' ) ) {
+				if (defined('PAGELYBIN')) {
 					$return = true;
 				}
 				break;
 			case 'icdsoft':
-				if ( DB_HOST == 'localhost:/tmp/mysql5.sock' ) {
+				if (DB_HOST == 'localhost:/tmp/mysql5.sock') {
 					$return = true;
 				}
 				break;
 			case 'networksolutions':
-				if ( DB_HOST == 'mysqlv5' ) {
+				if (DB_HOST == 'mysqlv5') {
 					$return = true;
 				}
 				break;
 			case 'ipage':
-				if ( strpos( DB_HOST, 'ipagemysql.com' ) !== false ) {
+				if (strpos(DB_HOST, 'ipagemysql.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'ipower':
-				if ( strpos( DB_HOST, 'ipowermysql.com' ) !== false ) {
+				if (strpos(DB_HOST, 'ipowermysql.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'mediatemplegrid':
-				if ( strpos( DB_HOST, '.gridserver.com' ) !== false ) {
+				if (strpos(DB_HOST, '.gridserver.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'pairnetworks':
-				if ( strpos( DB_HOST, '.pair.com' ) !== false ) {
+				if (strpos(DB_HOST, '.pair.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'rackspacecloud':
-				if ( strpos( DB_HOST, '.stabletransit.com' ) !== false ) {
+				if (strpos(DB_HOST, '.stabletransit.com') !== false) {
 					$return = true;
 				}
 				break;
 			case 'sysfix.eu':
 			case 'sysfix.eupowerhosting':
-				if ( strpos( DB_HOST, '.sysfix.eu' ) !== false ) {
+				if (strpos(DB_HOST, '.sysfix.eu') !== false) {
 					$return = true;
 				}
 				break;
 			case 'flywheel':
-				if ( strpos( $_SERVER['SERVER_NAME'], 'Flywheel' ) !== false ) {
+				if (strpos($_SERVER['SERVER_NAME'], 'Flywheel') !== false) {
 					$return = true;
 				}
 				break;
@@ -514,7 +514,7 @@ 
  * @param string $replacement Optional. The function that should have been called.
  * @param array  $backtrace   Optional. Contains stack backtrace of deprecated function.
  */
-function _give_deprecated_function( $function, $version, $replacement = null, $backtrace = null ) {
+function _give_deprecated_function($function, $version, $replacement = null, $backtrace = null) {
 
 	/**
 	 * Fires while give deprecated function call occurs.
@@ -527,19 +527,19 @@ 
 	 * @param string $replacement Optional. The function that should have been called.
 	 * @param string $version     The plugin version that deprecated the function.
 	 */
-	do_action( 'give_deprecated_function_run', $function, $replacement, $version );
+	do_action('give_deprecated_function_run', $function, $replacement, $version);
 
-	$show_errors = current_user_can( 'manage_options' );
+	$show_errors = current_user_can('manage_options');
 
 	// Allow plugin to filter the output error trigger
-	if ( WP_DEBUG && apply_filters( 'give_deprecated_function_trigger_error', $show_errors ) ) {
-		if ( ! is_null( $replacement ) ) {
-			trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since Give version %2$s! Use %3$s instead.', 'give' ), $function, $version, $replacement ) );
-			trigger_error( print_r( $backtrace, 1 ) ); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+	if (WP_DEBUG && apply_filters('give_deprecated_function_trigger_error', $show_errors)) {
+		if ( ! is_null($replacement)) {
+			trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since Give version %2$s! Use %3$s instead.', 'give'), $function, $version, $replacement));
+			trigger_error(print_r($backtrace, 1)); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
 			// Alternatively we could dump this to a file.
 		} else {
-			trigger_error( sprintf( __( '%1$s is <strong>deprecated</strong> since Give version %2$s with no alternative available.', 'give' ), $function, $version ) );
-			trigger_error( print_r( $backtrace, 1 ) );// Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
+			trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since Give version %2$s with no alternative available.', 'give'), $function, $version));
+			trigger_error(print_r($backtrace, 1)); // Limited to previous 1028 characters, but since we only need to move back 1 in stack that should be fine.
 			// Alternatively we could dump this to a file.
 		}
 	}
@@ -553,8 +553,8 @@ 
  * @return string $post_id
  */
 function give_get_admin_post_id() {
-	$post_id = isset( $_GET['post'] ) ? $_GET['post'] : null;
-	if ( ! $post_id && isset( $_POST['post_id'] ) ) {
+	$post_id = isset($_GET['post']) ? $_GET['post'] : null;
+	if ( ! $post_id && isset($_POST['post_id'])) {
 		$post_id = $_POST['post_id'];
 	}
 
@@ -568,7 +568,7 @@ 
  * @return string Arg separator output
  */
 function give_get_php_arg_separator_output() {
-	return ini_get( 'arg_separator.output' );
+	return ini_get('arg_separator.output');
 }
 
 
@@ -583,10 +583,10 @@ 
  *
  * @return string Short month name
  */
-function give_month_num_to_name( $n ) {
-	$timestamp = mktime( 0, 0, 0, $n, 1, 2005 );
+function give_month_num_to_name($n) {
+	$timestamp = mktime(0, 0, 0, $n, 1, 2005);
 
-	return date_i18n( "M", $timestamp );
+	return date_i18n("M", $timestamp);
 }
 
 
@@ -599,10 +599,10 @@ 
  *
  * @return bool Whether or not function is disabled.
  */
-function give_is_func_disabled( $function ) {
-	$disabled = explode( ',', ini_get( 'disable_functions' ) );
+function give_is_func_disabled($function) {
+	$disabled = explode(',', ini_get('disable_functions'));
 
-	return in_array( $function, $disabled );
+	return in_array($function, $disabled);
 }
 
 
@@ -613,31 +613,31 @@ 
  */
 function give_get_newsletter() { ?>
 
-	<p class="newsletter-intro"><?php esc_html_e( 'Be sure to sign up for the Give newsletter below to stay informed of important updates and news.', 'give' ); ?></p>
+	<p class="newsletter-intro"><?php esc_html_e('Be sure to sign up for the Give newsletter below to stay informed of important updates and news.', 'give'); ?></p>
 
 	<div class="give-newsletter-form-wrap">
 
 		<form action="//givewp.us3.list-manage.com/subscribe/post?u=3ccb75d68bda4381e2f45794c&amp;id=12a081aa13" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
 			<div class="give-newsletter-confirmation">
-				<p><?php esc_html_e( 'Thanks for Subscribing!', 'give' ); ?> :)</p>
+				<p><?php esc_html_e('Thanks for Subscribing!', 'give'); ?> :)</p>
 			</div>
 
 			<table class="form-table give-newsletter-form">
 				<tr valign="middle">
 					<td>
-						<label for="mce-EMAIL" class="screen-reader-text"><?php esc_html_e( 'Email Address (required)', 'give' ); ?></label>
-						<input type="email" name="EMAIL" id="mce-EMAIL" placeholder="<?php esc_attr_e( 'Email Address (required)', 'give' ); ?>" class="required email" value="">
+						<label for="mce-EMAIL" class="screen-reader-text"><?php esc_html_e('Email Address (required)', 'give'); ?></label>
+						<input type="email" name="EMAIL" id="mce-EMAIL" placeholder="<?php esc_attr_e('Email Address (required)', 'give'); ?>" class="required email" value="">
 					</td>
 					<td>
-						<label for="mce-FNAME" class="screen-reader-text"><?php esc_html_e( 'First Name', 'give' ); ?></label>
-						<input type="text" name="FNAME" id="mce-FNAME" placeholder="<?php esc_attr_e( 'First Name', 'give' ); ?>" class="" value="">
+						<label for="mce-FNAME" class="screen-reader-text"><?php esc_html_e('First Name', 'give'); ?></label>
+						<input type="text" name="FNAME" id="mce-FNAME" placeholder="<?php esc_attr_e('First Name', 'give'); ?>" class="" value="">
 					</td>
 					<td>
-						<label for="mce-LNAME" class="screen-reader-text"><?php esc_html_e( 'Last Name', 'give' ); ?></label>
-						<input type="text" name="LNAME" id="mce-LNAME" placeholder="<?php esc_attr_e( 'Last Name', 'give' ); ?>" class="" value="">
+						<label for="mce-LNAME" class="screen-reader-text"><?php esc_html_e('Last Name', 'give'); ?></label>
+						<input type="text" name="LNAME" id="mce-LNAME" placeholder="<?php esc_attr_e('Last Name', 'give'); ?>" class="" value="">
 					</td>
 					<td>
-						<input type="submit" name="subscribe" id="mc-embedded-subscribe" class="button" value="<?php esc_attr_e( 'Subscribe', 'give' ); ?>">
+						<input type="submit" name="subscribe" id="mc-embedded-subscribe" class="button" value="<?php esc_attr_e('Subscribe', 'give'); ?>">
 					</td>
 				</tr>
 			</table>
@@ -698,7 +698,7 @@ 
 		<a href="https://twitter.com/givewp" class="twitter-follow-button" data-show-count="false"><?php
 			printf(
 				/* translators: %s: Give twitter user @givewp */
-				esc_html_e( 'Follow %s', 'give' ),
+				esc_html_e('Follow %s', 'give'),
 				'@givewp'
 			);
 		?></a>
@@ -727,7 +727,7 @@ 
  *
  * @return string
  */
-function give_svg_icons( $icon ) {
+function give_svg_icons($icon) {
 
 	// Store your SVGs in an associative array
 	$svgs = array(
@@ -739,7 +739,7 @@ 
 	);
 
 	// Return the chosen icon's SVG string
-	return $svgs[ $icon ];
+	return $svgs[$icon];
 }
 
 /**
@@ -751,15 +751,15 @@ 
  *
  * @return mixed
  */
-function modify_nav_menu_meta_box_object( $post_type ) {
-	if ( isset( $post_type->name ) && $post_type->name == 'give_forms' ) {
-		$post_type->labels->name = esc_html__( 'Donation Forms', 'give' );
+function modify_nav_menu_meta_box_object($post_type) {
+	if (isset($post_type->name) && $post_type->name == 'give_forms') {
+		$post_type->labels->name = esc_html__('Donation Forms', 'give');
 	}
 
 	return $post_type;
 }
 
-add_filter( 'nav_menu_meta_box_object', 'modify_nav_menu_meta_box_object' );
+add_filter('nav_menu_meta_box_object', 'modify_nav_menu_meta_box_object');
 
 
 /**
@@ -773,7 +773,7 @@ 
  * @license    https://opensource.org/licenses/MIT MIT
  */
 
-if ( ! function_exists( 'array_column' ) ) {
+if ( ! function_exists('array_column')) {
 	/**
 	 * Returns the values from a single column of the input array, identified by
 	 * the $columnKey.
@@ -792,53 +792,53 @@ 
 	 *
 	 * @return array
 	 */
-	function array_column( $input = null, $columnKey = null, $indexKey = null ) {
+	function array_column($input = null, $columnKey = null, $indexKey = null) {
 		// Using func_get_args() in order to check for proper number of
 		// parameters and trigger errors exactly as the built-in array_column()
 		// does in PHP 5.5.
 		$argc   = func_num_args();
 		$params = func_get_args();
 
-		if ( $argc < 2 ) {
-			trigger_error( sprintf( esc_html__( 'array_column() expects at least 2 parameters, %s given.', 'give' ), $argc ), E_USER_WARNING );
+		if ($argc < 2) {
+			trigger_error(sprintf(esc_html__('array_column() expects at least 2 parameters, %s given.', 'give'), $argc), E_USER_WARNING);
 
 			return null;
 		}
 
-		if ( ! is_array( $params[0] ) ) {
-			trigger_error( sprintf( esc_html__( 'array_column() expects parameter 1 to be array, %s given.', 'give' ), gettype( $params[0] ) ), E_USER_WARNING );
+		if ( ! is_array($params[0])) {
+			trigger_error(sprintf(esc_html__('array_column() expects parameter 1 to be array, %s given.', 'give'), gettype($params[0])), E_USER_WARNING);
 
 			return null;
 		}
 
-		if ( ! is_int( $params[1] )
-		     && ! is_float( $params[1] )
-		     && ! is_string( $params[1] )
+		if ( ! is_int($params[1])
+		     && ! is_float($params[1])
+		     && ! is_string($params[1])
 		     && $params[1] !== null
-		     && ! ( is_object( $params[1] ) && method_exists( $params[1], '__toString' ) )
+		     && ! (is_object($params[1]) && method_exists($params[1], '__toString'))
 		) {
-			trigger_error( esc_html__( 'array_column(): The column key should be either a string or an integer.', 'give' ), E_USER_WARNING );
+			trigger_error(esc_html__('array_column(): The column key should be either a string or an integer.', 'give'), E_USER_WARNING);
 
 			return false;
 		}
 
-		if ( isset( $params[2] )
-		     && ! is_int( $params[2] )
-		     && ! is_float( $params[2] )
-		     && ! is_string( $params[2] )
-		     && ! ( is_object( $params[2] ) && method_exists( $params[2], '__toString' ) )
+		if (isset($params[2])
+		     && ! is_int($params[2])
+		     && ! is_float($params[2])
+		     && ! is_string($params[2])
+		     && ! (is_object($params[2]) && method_exists($params[2], '__toString'))
 		) {
-			trigger_error( esc_html__( 'array_column(): The index key should be either a string or an integer.', 'give' ), E_USER_WARNING );
+			trigger_error(esc_html__('array_column(): The index key should be either a string or an integer.', 'give'), E_USER_WARNING);
 
 			return false;
 		}
 
 		$paramsInput     = $params[0];
-		$paramsColumnKey = ( $params[1] !== null ) ? (string) $params[1] : null;
+		$paramsColumnKey = ($params[1] !== null) ? (string) $params[1] : null;
 
 		$paramsIndexKey = null;
-		if ( isset( $params[2] ) ) {
-			if ( is_float( $params[2] ) || is_int( $params[2] ) ) {
+		if (isset($params[2])) {
+			if (is_float($params[2]) || is_int($params[2])) {
 				$paramsIndexKey = (int) $params[2];
 			} else {
 				$paramsIndexKey = (string) $params[2];
@@ -847,26 +847,26 @@ 
 
 		$resultArray = array();
 
-		foreach ( $paramsInput as $row ) {
+		foreach ($paramsInput as $row) {
 			$key    = $value = null;
 			$keySet = $valueSet = false;
 
-			if ( $paramsIndexKey !== null && array_key_exists( $paramsIndexKey, $row ) ) {
+			if ($paramsIndexKey !== null && array_key_exists($paramsIndexKey, $row)) {
 				$keySet = true;
-				$key    = (string) $row[ $paramsIndexKey ];
+				$key    = (string) $row[$paramsIndexKey];
 			}
 
-			if ( $paramsColumnKey === null ) {
+			if ($paramsColumnKey === null) {
 				$valueSet = true;
 				$value    = $row;
-			} elseif ( is_array( $row ) && array_key_exists( $paramsColumnKey, $row ) ) {
+			} elseif (is_array($row) && array_key_exists($paramsColumnKey, $row)) {
 				$valueSet = true;
-				$value    = $row[ $paramsColumnKey ];
+				$value    = $row[$paramsColumnKey];
 			}
 
-			if ( $valueSet ) {
-				if ( $keySet ) {
-					$resultArray[ $key ] = $value;
+			if ($valueSet) {
+				if ($keySet) {
+					$resultArray[$key] = $value;
 				} else {
 					$resultArray[] = $value;
 				}
@@ -888,40 +888,40 @@ 
  *
  * @return bool Whether the receipt is visible or not.
  */
-function give_can_view_receipt( $payment_key = '' ) {
+function give_can_view_receipt($payment_key = '') {
 
 	$return = false;
 
-	if ( empty( $payment_key ) ) {
+	if (empty($payment_key)) {
 		return $return;
 	}
 
 	global $give_receipt_args;
 
-	$give_receipt_args['id'] = give_get_purchase_id_by_key( $payment_key );
+	$give_receipt_args['id'] = give_get_purchase_id_by_key($payment_key);
 
-	$user_id = (int) give_get_payment_user_id( $give_receipt_args['id'] );
+	$user_id = (int) give_get_payment_user_id($give_receipt_args['id']);
 
-	$payment_meta = give_get_payment_meta( $give_receipt_args['id'] );
+	$payment_meta = give_get_payment_meta($give_receipt_args['id']);
 
-	if ( is_user_logged_in() ) {
-		if ( $user_id === (int) get_current_user_id() ) {
+	if (is_user_logged_in()) {
+		if ($user_id === (int) get_current_user_id()) {
 			$return = true;
-		} elseif ( wp_get_current_user()->user_email === give_get_payment_user_email( $give_receipt_args['id'] ) ) {
+		} elseif (wp_get_current_user()->user_email === give_get_payment_user_email($give_receipt_args['id'])) {
 			$return = true;
-		} elseif ( current_user_can( 'view_give_sensitive_data' ) ) {
+		} elseif (current_user_can('view_give_sensitive_data')) {
 			$return = true;
 		}
 	}
 
 	$session = give_get_purchase_session();
-	if ( ! empty( $session ) && ! is_user_logged_in() ) {
-		if ( $session['purchase_key'] === $payment_meta['key'] ) {
+	if ( ! empty($session) && ! is_user_logged_in()) {
+		if ($session['purchase_key'] === $payment_meta['key']) {
 			$return = true;
 		}
 	}
 
-	return (bool) apply_filters( 'give_can_view_receipt', $return, $payment_key );
+	return (bool) apply_filters('give_can_view_receipt', $return, $payment_key);
 
 }
 
@@ -930,7 +930,7 @@ 
  *
  * Fallback in case the calendar extension is not loaded in PHP; Only supports Gregorian calendar
  */
-if ( ! function_exists( 'cal_days_in_month' ) ) {
+if ( ! function_exists('cal_days_in_month')) {
 	/**
 	 * cal_days_in_month
 	 *
@@ -940,8 +940,8 @@ 
 	 *
 	 * @return bool|string
 	 */
-	function cal_days_in_month( $calendar, $month, $year ) {
-		return date( 't', mktime( 0, 0, 0, $month, 1, $year ) );
+	function cal_days_in_month($calendar, $month, $year) {
+		return date('t', mktime(0, 0, 0, $month, 1, $year));
 	}
 }
 
@@ -960,42 +960,42 @@ 
  */
 function give_get_plugins() {
 	$plugins             = get_plugins();
-	$active_plugin_paths = (array) get_option( 'active_plugins', array() );
+	$active_plugin_paths = (array) get_option('active_plugins', array());
 
-	if ( is_multisite() ) {
-		$network_activated_plugin_paths = array_keys( get_site_option( 'active_sitewide_plugins', array() ) );
-		$active_plugin_paths            = array_merge( $active_plugin_paths, $network_activated_plugin_paths );
+	if (is_multisite()) {
+		$network_activated_plugin_paths = array_keys(get_site_option('active_sitewide_plugins', array()));
+		$active_plugin_paths            = array_merge($active_plugin_paths, $network_activated_plugin_paths);
 	}
 
-	foreach ( $plugins as $plugin_path => $plugin_data ) {
+	foreach ($plugins as $plugin_path => $plugin_data) {
 		// Is plugin active?
-		if ( in_array( $plugin_path, $active_plugin_paths ) ) {
-			$plugins[ $plugin_path ]['Status'] = 'active';
+		if (in_array($plugin_path, $active_plugin_paths)) {
+			$plugins[$plugin_path]['Status'] = 'active';
 		} else {
-			$plugins[ $plugin_path ]['Status'] = 'inactive';
+			$plugins[$plugin_path]['Status'] = 'inactive';
 		}
 
-		$dirname = strtolower( dirname( $plugin_path ) );
+		$dirname = strtolower(dirname($plugin_path));
 
 		// Is plugin a Give add-on by WordImpress?
-		if ( strstr( $dirname, 'give-' ) && strstr( $plugin_data['AuthorURI'], 'wordimpress.com' ) ) {
+		if (strstr($dirname, 'give-') && strstr($plugin_data['AuthorURI'], 'wordimpress.com')) {
 			// Plugin is a Give-addon.
-			$plugins[ $plugin_path ]['Type'] = 'add-on';
+			$plugins[$plugin_path]['Type'] = 'add-on';
 
 			// Get license info from database.
-			$plugin_name    = str_replace( 'Give - ', '', $plugin_data['Name'] );
-			$db_option      = 'give_' . preg_replace( '/[^a-zA-Z0-9_\s]/', '', str_replace( ' ', '_', strtolower( $plugin_name ) ) ) . '_license_active';
-			$license_active = get_option( $db_option );
+			$plugin_name    = str_replace('Give - ', '', $plugin_data['Name']);
+			$db_option      = 'give_'.preg_replace('/[^a-zA-Z0-9_\s]/', '', str_replace(' ', '_', strtolower($plugin_name))).'_license_active';
+			$license_active = get_option($db_option);
 
 			// Does a valid license exist?
-			if ( ! empty( $license_active ) && 'valid' === $license_active->license ) {
-				$plugins[ $plugin_path ]['License'] = true;
+			if ( ! empty($license_active) && 'valid' === $license_active->license) {
+				$plugins[$plugin_path]['License'] = true;
 			} else {
-				$plugins[ $plugin_path ]['License'] = false;
+				$plugins[$plugin_path]['License'] = false;
 			}
 		} else {
 			// Plugin is not a Give add-on.
-			$plugins[ $plugin_path ]['Type'] = 'other';
+			$plugins[$plugin_path]['Type'] = 'other';
 		}
 	}
 
@@ -1012,16 +1012,16 @@ 
  *
  * @return bool
  */
-function give_is_terms_enabled( $form_id ) {
-	$form_option = get_post_meta( $form_id, '_give_terms_option', true );
+function give_is_terms_enabled($form_id) {
+	$form_option = get_post_meta($form_id, '_give_terms_option', true);
 
 	if (
-		give_is_setting_enabled( $form_option, 'global' )
-		&& give_is_setting_enabled( give_get_option( 'terms' ) )
+		give_is_setting_enabled($form_option, 'global')
+		&& give_is_setting_enabled(give_get_option('terms'))
 	) {
 		return true;
 
-	} elseif ( give_is_setting_enabled( $form_option ) ) {
+	} elseif (give_is_setting_enabled($form_option)) {
 		return true;
 
 	} else {

includes/admin/reporting/class-donor-reports-table.php

Doc Comments +2 added lines, -2 removed lines

@@ -81,7 +81,7 @@ 
 	 * @param string $text     Label for the search box
 	 * @param string $input_id ID of the search box
 	 *
-	 * @return false
+	 * @return false|null
 	 */
 	public function search_box( $text, $input_id ) {
 		return;
@@ -253,7 +253,7 @@ 
 	 *
 	 * @access public
 	 * @since  1.0
-	 * @return mixed string If search is present, false otherwise
+	 * @return string|false string If search is present, false otherwise
 	 */
 	public function get_search() {
 		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;

Indentation +2 added lines, -2 removed lines

@@ -173,8 +173,8 @@
 
 			case 'num_purchases' :
 				$value = '<a href="' .
-				         admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
-				         ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
+						 admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
+						 ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
 				break;
 
 			case 'amount_spent' :

Spacing +61 added lines, -61 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -62,11 +62,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => esc_html__( 'Donor', 'give' ),     // Singular name of the listed records
-			'plural'   => esc_html__( 'Donors', 'give' ),    // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => esc_html__('Donor', 'give'), // Singular name of the listed records
+			'plural'   => esc_html__('Donors', 'give'), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
 	}
 
@@ -83,7 +83,7 @@ 
 	 *
 	 * @return false
 	 */
-	public function search_box( $text, $input_id ) {
+	public function search_box($text, $input_id) {
 		return;
 	}
 
@@ -98,20 +98,20 @@ 
 	 *
 	 * @return void
 	 */
-	public function give_search_box( $text, $input_id ) {
-		$input_id = $input_id . '-search-input';
+	public function give_search_box($text, $input_id) {
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
 		}
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if ( ! empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
 		}
 		?>
 		<p class="search-box donor-search" role="search">
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-			<?php submit_button( $text, 'button', false, false, array( 'ID' => 'search-submit' ) ); ?>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?>
 		</p>
 	<?php
 	}
@@ -124,33 +124,33 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav give-clearfix <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav give-clearfix <?php echo esc_attr($which); ?>">
 
-			<?php if ( 'top' === $which ) { ?>
+			<?php if ('top' === $which) { ?>
 				<h3 class="alignleft reports-earnings-title">
-					<span><?php esc_html_e( 'Donors Report', 'give' ); ?></span>
+					<span><?php esc_html_e('Donors Report', 'give'); ?></span>
 				</h3>
 			<?php } ?>
 
 			<div class="alignright tablenav-right">
 				<div class="actions bulkactions">
 					<?php
-					if ( 'top' === $which ) {
-						$this->give_search_box( esc_html__( 'Search Donors', 'give' ), 'give-donors-report-search' );
+					if ('top' === $which) {
+						$this->give_search_box(esc_html__('Search Donors', 'give'), 'give-donors-report-search');
 					}
 
-					$this->bulk_actions( $which ); ?>
+					$this->bulk_actions($which); ?>
 
 				</div>
 				<?php
-				$this->extra_tablenav( $which );
-				$this->pagination( $which );
+				$this->extra_tablenav($which);
+				$this->pagination($which);
 				?>
 			</div>
 
@@ -172,25 +172,25 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 
 			case 'num_purchases' :
-				$value = '<a href="' .
-				         admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $item['email'] )
-				         ) . '">' . esc_html( $item['num_purchases'] ) . '</a>';
+				$value = '<a href="'.
+				         admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.urlencode($item['email'])
+				         ).'">'.esc_html($item['num_purchases']).'</a>';
 				break;
 
 			case 'amount_spent' :
-				$value = give_currency_filter( give_format_amount( $item[ $column_name ] ) );
+				$value = give_currency_filter(give_format_amount($item[$column_name]));
 				break;
 
 			default:
-				$value = isset( $item[ $column_name ] ) ? $item[ $column_name ] : null;
+				$value = isset($item[$column_name]) ? $item[$column_name] : null;
 				break;
 		}
 
-		return apply_filters( "give_report_column_{$column_name}", $value, $item['id'] );
+		return apply_filters("give_report_column_{$column_name}", $value, $item['id']);
 	}
 
 	/**
@@ -202,14 +202,14 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'name'          => esc_html__( 'Name', 'give' ),
-			'id'            => esc_html__( 'ID', 'give' ),
-			'email'         => esc_html__( 'Email', 'give' ),
-			'num_purchases' => esc_html__( 'Donations', 'give' ),
-			'amount_spent'  => esc_html__( 'Total Donated', 'give' )
+			'name'          => esc_html__('Name', 'give'),
+			'id'            => esc_html__('ID', 'give'),
+			'email'         => esc_html__('Email', 'give'),
+			'num_purchases' => esc_html__('Donations', 'give'),
+			'amount_spent'  => esc_html__('Total Donated', 'give')
 		);
 
-		return apply_filters( 'give_report_donor_columns', $columns );
+		return apply_filters('give_report_donor_columns', $columns);
 
 	}
 
@@ -222,10 +222,10 @@ 
 	 */
 	public function get_sortable_columns() {
 		return array(
-			'id'            => array( 'id', true ),
-			'name'          => array( 'name', true ),
-			'num_purchases' => array( 'purchase_count', false ),
-			'amount_spent'  => array( 'purchase_value', false ),
+			'id'            => array('id', true),
+			'name'          => array('name', true),
+			'num_purchases' => array('purchase_count', false),
+			'amount_spent'  => array('purchase_value', false),
 		);
 	}
 
@@ -236,7 +236,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 
 	}
 
@@ -248,7 +248,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -259,7 +259,7 @@ 
 	 * @return mixed string If search is present, false otherwise
 	 */
 	public function get_search() {
-		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;
+		return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false;
 	}
 
 	/**
@@ -276,10 +276,10 @@ 
 
 		$data    = array();
 		$paged   = $this->get_paged();
-		$offset  = $this->per_page * ( $paged - 1 );
+		$offset  = $this->per_page * ($paged - 1);
 		$search  = $this->get_search();
-		$order   = isset( $_GET['order'] ) ? sanitize_text_field( $_GET['order'] ) : 'DESC';
-		$orderby = isset( $_GET['orderby'] ) ? sanitize_text_field( $_GET['orderby'] ) : 'id';
+		$order   = isset($_GET['order']) ? sanitize_text_field($_GET['order']) : 'DESC';
+		$orderby = isset($_GET['orderby']) ? sanitize_text_field($_GET['orderby']) : 'id';
 
 		$args = array(
 			'number'  => $this->per_page,
@@ -288,21 +288,21 @@ 
 			'orderby' => $orderby
 		);
 
-		if ( is_email( $search ) ) {
+		if (is_email($search)) {
 			$args['email'] = $search;
-		} elseif ( is_numeric( $search ) ) {
+		} elseif (is_numeric($search)) {
 			$args['id'] = $search;
 		}
 
-		$donors = Give()->customers->get_customers( $args );
+		$donors = Give()->customers->get_customers($args);
 
-		if ( $donors ) {
+		if ($donors) {
 
-			$this->count = count( $donors );
+			$this->count = count($donors);
 
-			foreach ( $donors as $donor ) {
+			foreach ($donors as $donor) {
 
-				$user_id = ! empty( $donor->user_id ) ? absint( $donor->user_id ) : 0;
+				$user_id = ! empty($donor->user_id) ? absint($donor->user_id) : 0;
 
 				$data[] = array(
 					'id'            => $donor->id,
@@ -335,16 +335,16 @@ 
 		$hidden   = array(); // No hidden columns
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$this->items = $this->reports_data();
 
 		$this->total = give_count_total_customers();
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $this->total,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $this->total / $this->per_page )
-		) );
+			'total_pages' => ceil($this->total / $this->per_page)
+		));
 	}
 }
\ 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');
 
 
 /**
@@ -67,63 +67,63 @@ 
 function give_tools_sysinfo_get() {
 	global $wpdb, $give_options;
 
-	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
@@ -132,205 +132,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;
 }
@@ -344,17 +344,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