WordImpress / Give

includes/admin/reporting/reports.php

Spacing +107 added lines, -107 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,36 +29,36 @@ 
  * @return void
  */
 function give_reports_page() {
-	$current_page = admin_url( 'edit.php?post_type=give_forms&page=give-reports' );
-	$active_tab   = isset( $_GET['tab'] ) ? $_GET['tab'] : 'reports';
+	$current_page = admin_url('edit.php?post_type=give_forms&page=give-reports');
+	$active_tab   = isset($_GET['tab']) ? $_GET['tab'] : 'reports';
 	?>
 	<div class="wrap">
 		<h1 class="nav-tab-wrapper">
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'reports',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Reports', 'give' ); ?></a>
-			<?php if ( current_user_can( 'export_give_reports' ) ) { ?>
-				<a href="<?php echo esc_url( add_query_arg( array(
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e('Reports', 'give'); ?></a>
+			<?php if (current_user_can('export_give_reports')) { ?>
+				<a href="<?php echo esc_url(add_query_arg(array(
 					'tab'              => 'export',
 					'settings-updated' => false
-				), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'give' ); ?></a>
+				), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'give'); ?></a>
 			<?php } ?>
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'logs',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Logs', 'give' ); ?></a>
-			<a href="<?php echo esc_url( add_query_arg( array(
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php _e('Logs', 'give'); ?></a>
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'tools',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'tools' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Tools', 'give' ); ?></a>
-			<?php do_action( 'give_reports_tabs' ); ?>
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'tools' ? 'nav-tab-active' : ''; ?>"><?php _e('Tools', 'give'); ?></a>
+			<?php do_action('give_reports_tabs'); ?>
 		</h1>
 
 		<?php
-		do_action( 'give_reports_page_top' );
-		do_action( 'give_reports_tab_' . $active_tab );
-		do_action( 'give_reports_page_bottom' );
+		do_action('give_reports_page_top');
+		do_action('give_reports_tab_'.$active_tab);
+		do_action('give_reports_page_bottom');
 		?>
 	</div><!-- .wrap -->
 	<?php
@@ -72,13 +72,13 @@ 
  */
 function give_reports_default_views() {
 	$views = array(
-		'earnings' => __( 'Income', 'give' ),
+		'earnings' => __('Income', 'give'),
 		'forms'    => give_get_forms_label_plural(),
-		'donors'   => __( 'Donors', 'give' ),
-		'gateways' => __( 'Payment Methods', 'give' )
+		'donors'   => __('Donors', 'give'),
+		'gateways' => __('Payment Methods', 'give')
 	);
 
-	$views = apply_filters( 'give_report_views', $views );
+	$views = apply_filters('give_report_views', $views);
 
 	return $views;
 }
@@ -94,15 +94,15 @@ 
  * @return string $view Report View
  *
  */
-function give_get_reporting_view( $default = 'earnings' ) {
+function give_get_reporting_view($default = 'earnings') {
 
-	if ( ! isset( $_GET['view'] ) || ! in_array( $_GET['view'], array_keys( give_reports_default_views() ) ) ) {
+	if ( ! isset($_GET['view']) || ! in_array($_GET['view'], array_keys(give_reports_default_views()))) {
 		$view = $default;
 	} else {
 		$view = $_GET['view'];
 	}
 
-	return apply_filters( 'give_get_reporting_view', $view );
+	return apply_filters('give_get_reporting_view', $view);
 }
 
 /**
@@ -115,14 +115,14 @@ 
 	$current_view = 'earnings';
 	$views        = give_reports_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $views)) {
 		$current_view = $_GET['view'];
 	}
 
-	do_action( 'give_reports_view_' . $current_view );
+	do_action('give_reports_view_'.$current_view);
 }
 
-add_action( 'give_reports_tab_reports', 'give_reports_tab_reports' );
+add_action('give_reports_tab_reports', 'give_reports_tab_reports');
 
 /**
  * Renders the Reports Page Views Drop Downs
@@ -132,25 +132,25 @@ 
  */
 function give_report_views() {
 	$views        = give_reports_default_views();
-	$current_view = isset( $_GET['view'] ) ? $_GET['view'] : 'earnings';
-	do_action( 'give_report_view_actions_before' );
+	$current_view = isset($_GET['view']) ? $_GET['view'] : 'earnings';
+	do_action('give_report_view_actions_before');
 	?>
 	<form id="give-reports-filter" method="get">
 		<select id="give-reports-view" name="view">
-			<option value="-1"><?php _e( 'Report Type', 'give' ); ?></option>
-			<?php foreach ( $views as $view_id => $label ) : ?>
-				<option value="<?php echo esc_attr( $view_id ); ?>" <?php selected( $view_id, $current_view ); ?>><?php echo $label; ?></option>
+			<option value="-1"><?php _e('Report Type', 'give'); ?></option>
+			<?php foreach ($views as $view_id => $label) : ?>
+				<option value="<?php echo esc_attr($view_id); ?>" <?php selected($view_id, $current_view); ?>><?php echo $label; ?></option>
 			<?php endforeach; ?>
 		</select>
 
-		<?php do_action( 'give_report_view_actions' ); ?>
+		<?php do_action('give_report_view_actions'); ?>
 
 		<input type="hidden" name="post_type" value="give_forms"/>
 		<input type="hidden" name="page" value="give-reports"/>
-		<?php submit_button( __( 'Show', 'give' ), 'secondary', 'submit', false ); ?>
+		<?php submit_button(__('Show', 'give'), 'secondary', 'submit', false); ?>
 	</form>
 	<?php
-	do_action( 'give_report_view_actions_after' );
+	do_action('give_report_view_actions_after');
 }
 
 /**
@@ -163,18 +163,18 @@ 
  */
 function give_reports_forms_table() {
 
-	if ( isset( $_GET['form-id'] ) ) {
+	if (isset($_GET['form-id'])) {
 		return;
 	}
 
-	include( dirname( __FILE__ ) . '/class-form-reports-table.php' );
+	include(dirname(__FILE__).'/class-form-reports-table.php');
 
 	$give_table = new Give_Form_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_forms_table' );
+add_action('give_reports_view_forms', 'give_reports_forms_table');
 
 /**
  * Renders the detailed report for a specific give form
@@ -183,7 +183,7 @@ 
  * @return void
  */
 function give_reports_form_details() {
-	if ( ! isset( $_GET['form-id'] ) ) {
+	if ( ! isset($_GET['form-id'])) {
 		return;
 	}
 	?>
@@ -191,14 +191,14 @@ 
 		<div class="actions bulkactions">
 			<?php give_report_views(); ?>
 			&nbsp;
-			<button onclick="history.go(-1);" class="button-secondary"><?php _e( 'Go Back', 'give' ); ?></button>
+			<button onclick="history.go(-1);" class="button-secondary"><?php _e('Go Back', 'give'); ?></button>
 		</div>
 	</div>
 	<?php
-	give_reports_graph_of_form( absint( $_GET['form-id'] ) );
+	give_reports_graph_of_form(absint($_GET['form-id']));
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_form_details' );
+add_action('give_reports_view_forms', 'give_reports_form_details');
 
 /**
  * Renders the Reports Donors Table
@@ -209,28 +209,28 @@ 
  * @return void
  */
 function give_reports_donors_table() {
-	include( dirname( __FILE__ ) . '/class-donor-reports-table.php' );
+	include(dirname(__FILE__).'/class-donor-reports-table.php');
 
 	$give_table = new Give_Donor_Reports_Table();
 	$give_table->prepare_items();
 	?>
 	<div class="wrap give-reports-donors-wrap">
-		<?php do_action( 'give_logs_donors_table_top' ); ?>
-		<form id="give-donors-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=donors' ); ?>">
+		<?php do_action('give_logs_donors_table_top'); ?>
+		<form id="give-donors-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-reports&view=donors'); ?>">
 			<?php
-			$give_table->search_box( __( 'Search', 'give' ), 'give-donors' );
+			$give_table->search_box(__('Search', 'give'), 'give-donors');
 			$give_table->display();
 			?>
 			<input type="hidden" name="post_type" value="give_forms"/>
 			<input type="hidden" name="page" value="give-reports"/>
 			<input type="hidden" name="view" value="donors"/>
 		</form>
-		<?php do_action( 'give_logs_donors_table_bottom' ); ?>
+		<?php do_action('give_logs_donors_table_bottom'); ?>
 	</div>
 	<?php
 }
 
-add_action( 'give_reports_view_donors', 'give_reports_donors_table' );
+add_action('give_reports_view_donors', 'give_reports_donors_table');
 
 
 /**
@@ -242,14 +242,14 @@ 
  * @return void
  */
 function give_reports_gateways_table() {
-	include( dirname( __FILE__ ) . '/class-gateways-reports-table.php' );
+	include(dirname(__FILE__).'/class-gateways-reports-table.php');
 
 	$give_table = new Give_Gateawy_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_gateways', 'give_reports_gateways_table' );
+add_action('give_reports_view_gateways', 'give_reports_gateways_table');
 
 
 /**
@@ -261,7 +261,7 @@ 
 function give_reports_earnings() {
 	?>
 	<div class="tablenav top reports-table-nav">
-		<h3 class="alignleft reports-earnings-title"><span><?php _e( 'Income Over Time', 'give' ); ?></span></h3>
+		<h3 class="alignleft reports-earnings-title"><span><?php _e('Income Over Time', 'give'); ?></span></h3>
 
 		<div class="alignright actions reports-views-wrap"><?php give_report_views(); ?></div>
 	</div>
@@ -269,7 +269,7 @@ 
 	give_reports_graph();
 }
 
-add_action( 'give_reports_view_earnings', 'give_reports_earnings' );
+add_action('give_reports_view_earnings', 'give_reports_earnings');
 
 
 /**
@@ -284,52 +284,52 @@ 
 		<div id="post-body">
 			<div id="post-body-content">
 
-				<?php do_action( 'give_reports_tab_export_content_top' ); ?>
+				<?php do_action('give_reports_tab_export_content_top'); ?>
 
 				<table class="widefat export-options-table give-table">
 					<thead>
 					<tr>
-						<th class="row-title"><?php _e( 'Export Type', 'give' ); ?></th>
-						<th><?php _e( 'Export Options', 'give' ); ?></th>
+						<th class="row-title"><?php _e('Export Type', 'give'); ?></th>
+						<th><?php _e('Export Options', 'give'); ?></th>
 					</tr>
 					</thead>
 					<tbody>
-					<?php do_action( 'give_reports_tab_export_table_top' ); ?>
+					<?php do_action('give_reports_tab_export_table_top'); ?>
 					<tr class="give-export-pdf-sales-earnings">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export PDF of Donations and Income', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export PDF of Donations and Income', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a PDF of Donations and Income reports for all forms for the current year.', 'give' ); ?></p>
+							<p><?php _e('Download a PDF of Donations and Income reports for all forms for the current year.', 'give'); ?></p>
 						</td>
 						<td>
-							<a class="button" href="<?php echo wp_nonce_url( add_query_arg( array( 'give-action' => 'generate_pdf' ) ), 'give_generate_pdf' ); ?>"><?php _e( 'Generate PDF', 'give' ); ?></a>
+							<a class="button" href="<?php echo wp_nonce_url(add_query_arg(array('give-action' => 'generate_pdf')), 'give_generate_pdf'); ?>"><?php _e('Generate PDF', 'give'); ?></a>
 						</td>
 					</tr>
 					<tr class="alternate give-export-sales-earnings">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Income and Donation Stats', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Income and Donation Stats', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of income and donations over time.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of income and donations over time.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post">
 								<?php
 									printf(
-										__( '%1$s to %2$s', 'give' ),
-										Give()->html->year_dropdown( 'start_year' ) . ' ' . Give()->html->month_dropdown( 'start_month' ),
-										Give()->html->year_dropdown( 'end_year' )   . ' ' . Give()->html->month_dropdown( 'end_month' )
+										__('%1$s to %2$s', 'give'),
+										Give()->html->year_dropdown('start_year').' '.Give()->html->month_dropdown('start_month'),
+										Give()->html->year_dropdown('end_year').' '.Give()->html->month_dropdown('end_month')
 									);
 								?>
 								<input type="hidden" name="give-action" value="earnings_export"/>
-								<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+								<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 							</form>
 						</td>
 					</tr>
 					<tr class="give-export-payment-history">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Donation History', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Donation History', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of all donations recorded.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of all donations recorded.', 'give'); ?></p>
 						</td>
 						<td>
 							<form id="give-export-payments" class="give-export-form" method="post">
@@ -337,29 +337,29 @@ 
 								$args = array(
 									'id'          => 'give-payment-export-start',
 									'name'        => 'start',
-									'placeholder' => __( 'Start date', 'give' )
+									'placeholder' => __('Start date', 'give')
 								);
-								echo Give()->html->date_field( $args ); ?>
+								echo Give()->html->date_field($args); ?>
 								<?php
 								$args = array(
 									'id'          => 'give-payment-export-end',
 									'name'        => 'end',
-									'placeholder' => __( 'End date', 'give' )
+									'placeholder' => __('End date', 'give')
 								);
-								echo Give()->html->date_field( $args ); ?>
+								echo Give()->html->date_field($args); ?>
 								<select name="status">
-									<option value="any"><?php _e( 'All Statuses', 'give' ); ?></option>
+									<option value="any"><?php _e('All Statuses', 'give'); ?></option>
 									<?php
 									$statuses = give_get_payment_statuses();
-									foreach ( $statuses as $status => $label ) {
-										echo '<option value="' . $status . '">' . $label . '</option>';
+									foreach ($statuses as $status => $label) {
+										echo '<option value="'.$status.'">'.$label.'</option>';
 									}
 									?>
 								</select>
-								<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+								<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 								<input type="hidden" name="give-export-class" value="Give_Batch_Payments_Export"/>
 								<span>
-									<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+									<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 									<span class="spinner"></span>
 								</span>
 							</form>
@@ -368,9 +368,9 @@ 
 					</tr>
 					<tr class="alternate give-export-donors">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Donors in CSV', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Donors in CSV', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download an export of donors for all donation forms or only those who have given to a particular form.', 'give' ); ?></p>
+							<p><?php _e('Download an export of donors for all donation forms or only those who have given to a particular form.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post" id="give_donor_export" class="give-export-form">
@@ -381,54 +381,54 @@ 
 										'id'     => 'give_customer_export_form',
 										'chosen' => true
 									);
-									echo Give()->html->forms_dropdown( $args ); ?>
+									echo Give()->html->forms_dropdown($args); ?>
 								
-								<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+								<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 
 								<div id="export-donor-options-wrap" class="give-clearfix">
-									<p><?php _e( 'Export Columns', 'give' ); ?>:</p>
+									<p><?php _e('Export Columns', 'give'); ?>:</p>
 									<ul id="give-export-option-ul">
 										<li>
-											<label for="give-export-fullname"><input type="checkbox" checked name="give_export_option[full_name]" id="give-export-fullname"><?php _e( 'Name', 'give' ); ?>
+											<label for="give-export-fullname"><input type="checkbox" checked name="give_export_option[full_name]" id="give-export-fullname"><?php _e('Name', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-email"><input type="checkbox" checked name="give_export_option[email]" id="give-export-email"><?php _e( 'Email', 'give' ); ?>
+											<label for="give-export-email"><input type="checkbox" checked name="give_export_option[email]" id="give-export-email"><?php _e('Email', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-address"><input type="checkbox" checked name="give_export_option[address]" id="give-export-address"><?php _e( 'Address', 'give' ); ?>
+											<label for="give-export-address"><input type="checkbox" checked name="give_export_option[address]" id="give-export-address"><?php _e('Address', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-userid"><input type="checkbox" checked name="give_export_option[userid]" id="give-export-userid"><?php _e( 'User ID', 'give' ); ?>
+											<label for="give-export-userid"><input type="checkbox" checked name="give_export_option[userid]" id="give-export-userid"><?php _e('User ID', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-first-donation-date"><input type="checkbox" checked name="give_export_option[date_first_donated]" id="give-export-first-donation-date"><?php _e( 'First Donation Date', 'give' ); ?>
+											<label for="give-export-first-donation-date"><input type="checkbox" checked name="give_export_option[date_first_donated]" id="give-export-first-donation-date"><?php _e('First Donation Date', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-donation-number"><input type="checkbox" checked name="give_export_option[donations]" id="give-export-donation-number"><?php _e( 'Number of Donations', 'give' ); ?>
+											<label for="give-export-donation-number"><input type="checkbox" checked name="give_export_option[donations]" id="give-export-donation-number"><?php _e('Number of Donations', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-donation-sum"><input type="checkbox" checked name="give_export_option[donation_sum]" id="give-export-donation-sum"><?php _e( 'Total Donated', 'give' ); ?>
+											<label for="give-export-donation-sum"><input type="checkbox" checked name="give_export_option[donation_sum]" id="give-export-donation-sum"><?php _e('Total Donated', 'give'); ?>
 											</label>
 										</li>
 									</ul>
 								</div>
-								<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+								<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 								<input type="hidden" name="give-export-class" value="Give_Batch_Customers_Export"/>
 								<input type="hidden" name="give-action" value="email_export"/>
 							</form>
 						</td>
 					</tr>
-					<?php do_action( 'give_reports_tab_export_table_bottom' ); ?>
+					<?php do_action('give_reports_tab_export_table_bottom'); ?>
 					</tbody>
 				</table>
 
-				<?php do_action( 'give_reports_tab_export_content_bottom' ); ?>
+				<?php do_action('give_reports_tab_export_content_bottom'); ?>
 
 			</div>
 			<!-- .post-body-content -->
@@ -438,7 +438,7 @@ 
 	<?php
 }
 
-add_action( 'give_reports_tab_export', 'give_reports_tab_export' );
+add_action('give_reports_tab_export', 'give_reports_tab_export');
 
 /**
  * Renders the Reports page
@@ -448,19 +448,19 @@ 
  */
 function give_reports_tab_logs() {
 
-	require( GIVE_PLUGIN_DIR . 'includes/admin/reporting/logs.php' );
+	require(GIVE_PLUGIN_DIR.'includes/admin/reporting/logs.php');
 
 	$current_view = 'sales';
 	$log_views    = give_log_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $log_views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $log_views)) {
 		$current_view = $_GET['view'];
 	}
 
-	do_action( 'give_logs_view_' . $current_view );
+	do_action('give_logs_view_'.$current_view);
 }
 
-add_action( 'give_reports_tab_logs', 'give_reports_tab_logs' );
+add_action('give_reports_tab_logs', 'give_reports_tab_logs');
 
 /**
  * Retrieves estimated monthly earnings and sales
@@ -470,9 +470,9 @@ 
  */
 function give_estimated_monthly_stats() {
 
-	$estimated = get_transient( 'give_estimated_monthly_stats' );
+	$estimated = get_transient('give_estimated_monthly_stats');
 
-	if ( false === $estimated ) {
+	if (false === $estimated) {
 
 		$estimated = array(
 			'earnings' => 0,
@@ -481,20 +481,20 @@ 
 
 		$stats = new Give_Payment_Stats;
 
-		$to_date_earnings = $stats->get_earnings( 0, 'this_month' );
-		$to_date_sales    = $stats->get_sales( 0, 'this_month' );
+		$to_date_earnings = $stats->get_earnings(0, 'this_month');
+		$to_date_sales    = $stats->get_sales(0, 'this_month');
 
-		$current_day   = date( 'd', current_time( 'timestamp' ) );
-		$current_month = date( 'n', current_time( 'timestamp' ) );
-		$current_year  = date( 'Y', current_time( 'timestamp' ) );
-		$days_in_month = cal_days_in_month( CAL_GREGORIAN, $current_month, $current_year );
+		$current_day   = date('d', current_time('timestamp'));
+		$current_month = date('n', current_time('timestamp'));
+		$current_year  = date('Y', current_time('timestamp'));
+		$days_in_month = cal_days_in_month(CAL_GREGORIAN, $current_month, $current_year);
 
-		$estimated['earnings'] = ( $to_date_earnings / $current_day ) * $days_in_month;
-		$estimated['sales']    = ( $to_date_sales / $current_day ) * $days_in_month;
+		$estimated['earnings'] = ($to_date_earnings / $current_day) * $days_in_month;
+		$estimated['sales']    = ($to_date_sales / $current_day) * $days_in_month;
 
 		// Cache for one day
-		set_transient( 'give_estimated_monthly_stats', $estimated, 86400 );
+		set_transient('give_estimated_monthly_stats', $estimated, 86400);
 	}
 
-	return maybe_unserialize( $estimated );
+	return maybe_unserialize($estimated);
 }

includes/admin/customers/customers.php

Braces +25 added lines, -10 removed lines

@@ -259,8 +259,11 @@ 
 								<span class="customer-user-id info-item editable">
 									<?php if ( intval( $customer->user_id ) > 0 ) : ?>
 										<span data-key="user_id"><?php echo $customer->user_id; ?></span>
-									<?php else : ?>
-										<span data-key="user_id"><?php _e( 'None', 'give' ); ?></span>
+									<?php else {
+	: ?>
+										<span data-key="user_id"><?php _e( 'None', 'give' );
+}
+?></span>
 									<?php endif; ?>
 									<?php if ( current_user_can( $customer_edit_role ) && intval( $customer->user_id ) > 0 ) : ?>
 										<span class="disconnect-user"> - <a id="disconnect-customer" href="#disconnect" title="<?php _e( 'Disconnects the current user ID from this customer record', 'give' ); ?>"><?php _e( 'Disconnect User', 'give' ); ?></a></span>
@@ -329,8 +332,11 @@ 
 													}
 													?>
 												</select>
-											<?php else : ?>
-												<input type="text" size="6" data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-input info-item" placeholder="<?php _e( 'State / Province', 'give' ); ?>" />
+											<?php else {
+	: ?>
+												<input type="text" size="6" data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-input info-item" placeholder="<?php _e( 'State / Province', 'give' );
+}
+?>" />
 											<?php endif; ?>
 											<input class="info-item" type="text" data-key="zip" name="customerinfo[zip]" placeholder="<?php _e( 'Postal', 'give' ); ?>" value="<?php echo $address['zip']; ?>" />
 													</span>
@@ -420,9 +426,12 @@ 
 						</td>
 					</tr>
 				<?php endforeach; ?>
-			<?php else: ?>
+			<?php else {
+	: ?>
 				<tr>
-					<td colspan="5"><?php _e( 'No Donations Found', 'give' ); ?></td>
+					<td colspan="5"><?php _e( 'No Donations Found', 'give' );
+}
+?></td>
 				</tr>
 			<?php endif; ?>
 			</tbody>
@@ -451,9 +460,12 @@ 
 						</td>
 					</tr>
 				<?php endforeach; ?>
-			<?php else: ?>
+			<?php else {
+	: ?>
 				<tr>
-					<td colspan="2"><?php _e( 'No Completed Donations Found', 'give' ); ?></td>
+					<td colspan="2"><?php _e( 'No Completed Donations Found', 'give' );
+}
+?></td>
 				</tr>
 			<?php endif; ?>
 			</tbody>
@@ -527,9 +539,12 @@ 
 					</span>
 					</div>
 				<?php endforeach; ?>
-			<?php else: ?>
+			<?php else {
+	: ?>
 				<div class="give-no-customer-notes">
-					<?php _e( 'No Donor Notes', 'give' ); ?>
+					<?php _e( 'No Donor Notes', 'give' );
+}
+?>
 				</div>
 			<?php endif; ?>
 		</div>

Spacing +142 added lines, -142 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,9 +24,9 @@ 
  */
 function give_customers_page() {
 	$default_views  = give_customer_views();
-	$requested_view = isset( $_GET['view'] ) ? sanitize_text_field( $_GET['view'] ) : 'customers';
-	if ( array_key_exists( $requested_view, $default_views ) && function_exists( $default_views[ $requested_view ] ) ) {
-		give_render_customer_view( $requested_view, $default_views );
+	$requested_view = isset($_GET['view']) ? sanitize_text_field($_GET['view']) : 'customers';
+	if (array_key_exists($requested_view, $default_views) && function_exists($default_views[$requested_view])) {
+		give_render_customer_view($requested_view, $default_views);
 	} else {
 		give_customers_list();
 	}
@@ -42,7 +42,7 @@ 
 
 	$views = array();
 
-	return apply_filters( 'give_customer_views', $views );
+	return apply_filters('give_customer_views', $views);
 
 }
 
@@ -56,7 +56,7 @@ 
 
 	$tabs = array();
 
-	return apply_filters( 'give_customer_tabs', $tabs );
+	return apply_filters('give_customer_tabs', $tabs);
 
 }
 
@@ -67,24 +67,24 @@ 
  * @return void
  */
 function give_customers_list() {
-	include( dirname( __FILE__ ) . '/class-customer-table.php' );
+	include(dirname(__FILE__).'/class-customer-table.php');
 
 	$customers_table = new Give_Customer_Reports_Table();
 	$customers_table->prepare_items();
 	?>
 	<div class="wrap">
-		<h2><?php _e( 'Donors', 'give' ); ?></h2>
-		<?php do_action( 'give_donors_table_top' ); ?>
-		<form id="give-donors-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors' ); ?>">
+		<h2><?php _e('Donors', 'give'); ?></h2>
+		<?php do_action('give_donors_table_top'); ?>
+		<form id="give-donors-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors'); ?>">
 			<?php
-			$customers_table->search_box( __( 'Search Donors', 'give' ), 'give-donors' );
+			$customers_table->search_box(__('Search Donors', 'give'), 'give-donors');
 			$customers_table->display();
 			?>
 			<input type="hidden" name="post_type" value="give_forms" />
 			<input type="hidden" name="page" value="give-donors" />
 			<input type="hidden" name="view" value="customers" />
 		</form>
-		<?php do_action( 'give_donors_table_bottom' ); ?>
+		<?php do_action('give_donors_table_bottom'); ?>
 	</div>
 	<?php
 }
@@ -99,27 +99,27 @@ 
  *
  * @return void
  */
-function give_render_customer_view( $view, $callbacks ) {
+function give_render_customer_view($view, $callbacks) {
 
 	$render = true;
 
-	$customer_view_role = apply_filters( 'give_view_customers_role', 'view_give_reports' );
+	$customer_view_role = apply_filters('give_view_customers_role', 'view_give_reports');
 
-	if ( ! current_user_can( $customer_view_role ) ) {
-		give_set_error( 'give-no-access', __( 'You are not permitted to view this data.', 'give' ) );
+	if ( ! current_user_can($customer_view_role)) {
+		give_set_error('give-no-access', __('You are not permitted to view this data.', 'give'));
 		$render = false;
 	}
  
-	if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-		give_set_error( 'give-invalid_customer', __( 'Invalid Donor ID Provided.', 'give' ) );
+	if ( ! isset($_GET['id']) || ! is_numeric($_GET['id'])) {
+		give_set_error('give-invalid_customer', __('Invalid Donor ID Provided.', 'give'));
 		$render = false;
 	}
 
 	$customer_id = (int) $_GET['id'];
-	$customer    = new Give_Customer( $customer_id );
+	$customer    = new Give_Customer($customer_id);
 
-	if ( empty( $customer->id ) ) {
-		give_set_error( 'give-invalid_customer', __( 'Invalid Donor ID Provided.', 'give' ) );
+	if (empty($customer->id)) {
+		give_set_error('give-invalid_customer', __('Invalid Donor ID Provided.', 'give'));
 		$render = false;
 	}
 
@@ -128,27 +128,27 @@ 
 
 	<div class='wrap'>
 
-		<?php if ( give_get_errors() ) : ?>
+		<?php if (give_get_errors()) : ?>
 			<div class="error settings-error">
-				<?php give_print_errors( 0 ); ?>
+				<?php give_print_errors(0); ?>
 			</div>
 		<?php endif; ?>
 
-		<?php if ( $customer && $render ) : ?>
+		<?php if ($customer && $render) : ?>
 
 			<div id="customer-tab-wrapper">
 				<ul id="customer-tab-wrapper-list" class="nav-tab-wrapper">
-					<?php foreach ( $customer_tabs as $key => $tab ) : ?>
+					<?php foreach ($customer_tabs as $key => $tab) : ?>
 						<?php $active = $key === $view ? true : false; ?>
 						<?php $class = $active ? 'active' : 'inactive'; ?>
 
-						<li class="<?php echo sanitize_html_class( $class ); ?>">
-							<?php if ( ! $active ) : ?>
-							<a title="<?php echo esc_attr( $tab['title'] ); ?>" aria-label="<?php echo esc_attr( $tab['title'] ); ?>" href="<?php echo esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=' . $key . '&id=' . $customer->id ) ); ?>">
+						<li class="<?php echo sanitize_html_class($class); ?>">
+							<?php if ( ! $active) : ?>
+							<a title="<?php echo esc_attr($tab['title']); ?>" aria-label="<?php echo esc_attr($tab['title']); ?>" href="<?php echo esc_url(admin_url('edit.php?post_type=give_forms&page=give-donors&view='.$key.'&id='.$customer->id)); ?>">
 								<?php endif; ?>
 
-								<span class="dashicons <?php echo sanitize_html_class( $tab['dashicon'] ); ?>"></span> <?php echo esc_attr( $tab['title'] ); ?>
-								<?php if ( ! $active ) : ?>
+								<span class="dashicons <?php echo sanitize_html_class($tab['dashicon']); ?>"></span> <?php echo esc_attr($tab['title']); ?>
+								<?php if ( ! $active) : ?>
 							</a>
 						<?php endif; ?>
 
@@ -160,7 +160,7 @@ 
 			</div>
 
 			<div id="give-customer-card-wrapper">
-				<?php $callbacks[ $view ]( $customer ) ?>
+				<?php $callbacks[$view]($customer) ?>
 			</div>
 
 		<?php endif; ?>
@@ -180,17 +180,17 @@ 
  *
  * @return void
  */
-function give_customers_view( $customer ) {
+function give_customers_view($customer) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
 	?>
 
-	<?php do_action( 'give_donor_card_top', $customer ); ?>
+	<?php do_action('give_donor_card_top', $customer); ?>
 
 	<div id="donor-summary" class="info-wrapper customer-section postbox">
 
-		<form id="edit-customer-info" method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ); ?>">
+		<form id="edit-customer-info" method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id); ?>">
 
 			<div class="customer-info">
 
@@ -198,22 +198,22 @@ 
 				<div class="donor-bio-header clearfix">
 
 					<div class="avatar-wrap left" id="customer-avatar">
-						<?php echo get_avatar( $customer->email ); ?>
+						<?php echo get_avatar($customer->email); ?>
 					</div>
 
 					<div class="customer-id" class="left">
 						#<?php echo $customer->id; ?>
 					</div>
 					<div id="customer-name-wrap" class="left">
-						<span class="customer-name info-item edit-item"><input size="15" data-key="name" name="customerinfo[name]" type="text" value="<?php echo esc_attr( $customer->name ); ?>" placeholder="<?php _e( 'Donor Name', 'give' ); ?>" /></span>
+						<span class="customer-name info-item edit-item"><input size="15" data-key="name" name="customerinfo[name]" type="text" value="<?php echo esc_attr($customer->name); ?>" placeholder="<?php _e('Donor Name', 'give'); ?>" /></span>
 						<span class="customer-name info-item editable"><span data-key="name"><?php echo $customer->name; ?></span></span>
 					</div>
 					<p class="customer-since info-item">
-						<?php _e( 'Donor since', 'give' ); ?>
-						<?php echo date_i18n( get_option( 'date_format' ), strtotime( $customer->date_created ) ) ?>
+						<?php _e('Donor since', 'give'); ?>
+						<?php echo date_i18n(get_option('date_format'), strtotime($customer->date_created)) ?>
 					</p>
-					<?php if ( current_user_can( $customer_edit_role ) ): ?>
-						<a title="<?php _e( 'Edit Donor', 'give' ); ?>" href="#" id="edit-customer" class="button info-item editable customer-edit-link"><?php _e( 'Edit Donor', 'give' ); ?></a>
+					<?php if (current_user_can($customer_edit_role)): ?>
+						<a title="<?php _e('Edit Donor', 'give'); ?>" href="#" id="edit-customer" class="button info-item editable customer-edit-link"><?php _e('Edit Donor', 'give'); ?></a>
 					<?php endif; ?>
 				</div>
 				<!-- /donor-bio-header -->
@@ -223,14 +223,14 @@ 
 					<table class="widefat">
 						<tbody>
 						<tr>
-							<td><label for="tablecell"><?php esc_attr_e( 'Email', 'give' ); ?></label>:</td>
+							<td><label for="tablecell"><?php esc_attr_e('Email', 'give'); ?></label>:</td>
 							<td class="row-title">
-								<span class="customer-name info-item edit-item"><input size="20" data-key="email" name="customerinfo[email]" type="text" value="<?php echo $customer->email; ?>" placeholder="<?php _e( 'Donor Email', 'give' ); ?>" /></span>
+								<span class="customer-name info-item edit-item"><input size="20" data-key="email" name="customerinfo[email]" type="text" value="<?php echo $customer->email; ?>" placeholder="<?php _e('Donor Email', 'give'); ?>" /></span>
 								<span class="customer-email info-item editable" data-key="email"><?php echo $customer->email; ?></span>
 							</td>
 						</tr>
 						<tr class="alternate">
-							<td><label for="tablecell"><?php esc_attr_e( 'User ID', 'give' ); ?></label>:</td>
+							<td><label for="tablecell"><?php esc_attr_e('User ID', 'give'); ?></label>:</td>
 							<td class="row-title">
 								<span class="customer-user-id info-item edit-item">
 									<?php
@@ -246,38 +246,38 @@ 
 										'data'  => $data_atts,
 									);
 
-									if ( ! empty( $user_id ) ) {
-										$userdata           = get_userdata( $user_id );
+									if ( ! empty($user_id)) {
+										$userdata           = get_userdata($user_id);
 										$user_args['value'] = $userdata->user_login;
 									}
 
-									echo Give()->html->ajax_user_search( $user_args );
+									echo Give()->html->ajax_user_search($user_args);
 									?>
 									<input type="hidden" name="customerinfo[user_id]" data-key="user_id" value="<?php echo $customer->user_id; ?>" />
 								</span>
 			
 								<span class="customer-user-id info-item editable">
-									<?php if ( intval( $customer->user_id ) > 0 ) : ?>
+									<?php if (intval($customer->user_id) > 0) : ?>
 										<span data-key="user_id"><?php echo $customer->user_id; ?></span>
 									<?php else : ?>
-										<span data-key="user_id"><?php _e( 'None', 'give' ); ?></span>
+										<span data-key="user_id"><?php _e('None', 'give'); ?></span>
 									<?php endif; ?>
-									<?php if ( current_user_can( $customer_edit_role ) && intval( $customer->user_id ) > 0 ) : ?>
-										<span class="disconnect-user"> - <a id="disconnect-customer" href="#disconnect" title="<?php _e( 'Disconnects the current user ID from this customer record', 'give' ); ?>"><?php _e( 'Disconnect User', 'give' ); ?></a></span>
+									<?php if (current_user_can($customer_edit_role) && intval($customer->user_id) > 0) : ?>
+										<span class="disconnect-user"> - <a id="disconnect-customer" href="#disconnect" title="<?php _e('Disconnects the current user ID from this customer record', 'give'); ?>"><?php _e('Disconnect User', 'give'); ?></a></span>
 									<?php endif; ?>
 								</span>
 							</td>
 						</tr>
-						<?php if ( isset( $customer->user_id ) && $customer->user_id > 0 ) : ?>
+						<?php if (isset($customer->user_id) && $customer->user_id > 0) : ?>
 
 							<tr>
-								<td><?php esc_attr_e( 'Address', 'give' ); ?>:</td>
+								<td><?php esc_attr_e('Address', 'give'); ?>:</td>
 								<td class="row-title">
 
 									<div class="customer-address-wrapper">
 
 										<?php
-										$address  = get_user_meta( $customer->user_id, '_give_user_address', true );
+										$address  = get_user_meta($customer->user_id, '_give_user_address', true);
 										$defaults = array(
 											'line1'   => '',
 											'line2'   => '',
@@ -287,10 +287,10 @@ 
 											'zip'     => ''
 										);
 
-										$address = wp_parse_args( $address, $defaults );
+										$address = wp_parse_args($address, $defaults);
 										?>
 
-										<?php if ( ! empty( $address ) ) { ?>
+										<?php if ( ! empty($address)) { ?>
 											<span class="customer-address info-item editable">
 												<span class="info-item" data-key="line1"><?php echo $address['line1']; ?></span>
 												<span class="info-item" data-key="line2"><?php echo $address['line2']; ?></span>
@@ -301,38 +301,38 @@ 
 											</span>
 										<?php } ?>
 										<span class="customer-address info-item edit-item">
-											<input class="info-item" type="text" data-key="line1" name="customerinfo[line1]" placeholder="<?php _e( 'Address 1', 'give' ); ?>" value="<?php echo $address['line1']; ?>" />
-											<input class="info-item" type="text" data-key="line2" name="customerinfo[line2]" placeholder="<?php _e( 'Address 2', 'give' ); ?>" value="<?php echo $address['line2']; ?>" />
-											<input class="info-item" type="text" data-key="city" name="customerinfo[city]" placeholder="<?php _e( 'City', 'give' ); ?>" value="<?php echo $address['city']; ?>" />
+											<input class="info-item" type="text" data-key="line1" name="customerinfo[line1]" placeholder="<?php _e('Address 1', 'give'); ?>" value="<?php echo $address['line1']; ?>" />
+											<input class="info-item" type="text" data-key="line2" name="customerinfo[line2]" placeholder="<?php _e('Address 2', 'give'); ?>" value="<?php echo $address['line2']; ?>" />
+											<input class="info-item" type="text" data-key="city" name="customerinfo[city]" placeholder="<?php _e('City', 'give'); ?>" value="<?php echo $address['city']; ?>" />
 											<select data-key="country" name="customerinfo[country]" id="billing_country" class="billing_country give-select edit-item">
 												<?php
 
 												$selected_country = $address['country'];
 
 												$countries = give_get_country_list();
-												foreach ( $countries as $country_code => $country ) {
-													echo '<option value="' . esc_attr( $country_code ) . '"' . selected( $country_code, $selected_country, false ) . '>' . $country . '</option>';
+												foreach ($countries as $country_code => $country) {
+													echo '<option value="'.esc_attr($country_code).'"'.selected($country_code, $selected_country, false).'>'.$country.'</option>';
 												}
 												?>
 											</select>
 											<?php
 											$selected_state = give_get_state();
-											$states         = give_get_states( $selected_country );
+											$states         = give_get_states($selected_country);
 
-											$selected_state = isset( $address['state'] ) ? $address['state'] : $selected_state;
+											$selected_state = isset($address['state']) ? $address['state'] : $selected_state;
 
-											if ( ! empty( $states ) ) : ?>
+											if ( ! empty($states)) : ?>
 												<select data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-select info-item">
 													<?php
-													foreach ( $states as $state_code => $state ) {
-														echo '<option value="' . $state_code . '"' . selected( $state_code, $selected_state, false ) . '>' . $state . '</option>';
+													foreach ($states as $state_code => $state) {
+														echo '<option value="'.$state_code.'"'.selected($state_code, $selected_state, false).'>'.$state.'</option>';
 													}
 													?>
 												</select>
 											<?php else : ?>
-												<input type="text" size="6" data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-input info-item" placeholder="<?php _e( 'State / Province', 'give' ); ?>" />
+												<input type="text" size="6" data-key="state" name="customerinfo[state]" id="card_state" class="card_state give-input info-item" placeholder="<?php _e('State / Province', 'give'); ?>" />
 											<?php endif; ?>
-											<input class="info-item" type="text" data-key="zip" name="customerinfo[zip]" placeholder="<?php _e( 'Postal', 'give' ); ?>" value="<?php echo $address['zip']; ?>" />
+											<input class="info-item" type="text" data-key="zip" name="customerinfo[zip]" placeholder="<?php _e('Postal', 'give'); ?>" value="<?php echo $address['zip']; ?>" />
 													</span>
 
 									</div>
@@ -350,98 +350,98 @@ 
 
 			<span id="customer-edit-actions" class="edit-item">
 				<input type="hidden" data-key="id" name="customerinfo[id]" value="<?php echo $customer->id; ?>" />
-				<?php wp_nonce_field( 'edit-customer', '_wpnonce', false, true ); ?>
+				<?php wp_nonce_field('edit-customer', '_wpnonce', false, true); ?>
 				<input type="hidden" name="give_action" value="edit-customer" />
-				<input type="submit" id="give-edit-customer-save" class="button-secondary" value="<?php _e( 'Update Donor', 'give' ); ?>" />
-				<a id="give-edit-customer-cancel" href="" class="delete"><?php _e( 'Cancel', 'give' ); ?></a>
+				<input type="submit" id="give-edit-customer-save" class="button-secondary" value="<?php _e('Update Donor', 'give'); ?>" />
+				<a id="give-edit-customer-cancel" href="" class="delete"><?php _e('Cancel', 'give'); ?></a>
 			</span>
 
 		</form>
 	</div>
 
-	<?php do_action( 'give_donor_before_stats', $customer ); ?>
+	<?php do_action('give_donor_before_stats', $customer); ?>
 
 	<div id="customer-stats-wrapper" class="customer-section postbox clear">
 		<ul>
 			<li>
-				<a title="<?php _e( 'View All Donations', 'give' ); ?>" href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . urlencode( $customer->email ) ); ?>">
+				<a title="<?php _e('View All Donations', 'give'); ?>" href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.urlencode($customer->email)); ?>">
 					<span class="dashicons dashicons-heart"></span>
 					<?php
 					//Completed Donations
-					$completed_donations_text = sprintf( _n( '%d Completed Donation', '%d Completed Donations', $customer->purchase_count, 'give' ), $customer->purchase_count );
-					echo apply_filters( 'give_donor_completed_donations', $completed_donations_text, $customer );
+					$completed_donations_text = sprintf(_n('%d Completed Donation', '%d Completed Donations', $customer->purchase_count, 'give'), $customer->purchase_count);
+					echo apply_filters('give_donor_completed_donations', $completed_donations_text, $customer);
 					?>
 				</a>
 			</li>
 			<li>
 				<span class="dashicons dashicons-chart-area"></span>
-				<?php echo give_currency_filter( give_format_amount( $customer->purchase_value ) ); ?> <?php _e( 'Lifetime Donations', 'give' ); ?>
+				<?php echo give_currency_filter(give_format_amount($customer->purchase_value)); ?> <?php _e('Lifetime Donations', 'give'); ?>
 			</li>
-			<?php do_action( 'give_donor_stats_list', $customer ); ?>
+			<?php do_action('give_donor_stats_list', $customer); ?>
 		</ul>
 	</div>
 
-	<?php do_action( 'give_donor_before_tables_wrapper', $customer ); ?>
+	<?php do_action('give_donor_before_tables_wrapper', $customer); ?>
 
 	<div id="customer-tables-wrapper" class="customer-section">
 
-		<?php do_action( 'give_donor_before_tables', $customer ); ?>
+		<?php do_action('give_donor_before_tables', $customer); ?>
 
-		<h3><?php _e( 'Recent Donations', 'give' ); ?></h3>
+		<h3><?php _e('Recent Donations', 'give'); ?></h3>
 		<?php
-		$payment_ids = explode( ',', $customer->payment_ids );
-		$payments    = give_get_payments( array( 'post__in' => $payment_ids ) );
-		$payments    = array_slice( $payments, 0, 10 );
+		$payment_ids = explode(',', $customer->payment_ids);
+		$payments    = give_get_payments(array('post__in' => $payment_ids));
+		$payments    = array_slice($payments, 0, 10);
 		?>
 		<table class="wp-list-table widefat striped payments">
 			<thead>
 			<tr>
-				<th><?php _e( 'ID', 'give' ); ?></th>
-				<th><?php _e( 'Amount', 'give' ); ?></th>
-				<th><?php _e( 'Date', 'give' ); ?></th>
-				<th><?php _e( 'Status', 'give' ); ?></th>
-				<th><?php _e( 'Actions', 'give' ); ?></th>
+				<th><?php _e('ID', 'give'); ?></th>
+				<th><?php _e('Amount', 'give'); ?></th>
+				<th><?php _e('Date', 'give'); ?></th>
+				<th><?php _e('Status', 'give'); ?></th>
+				<th><?php _e('Actions', 'give'); ?></th>
 			</tr>
 			</thead>
 			<tbody>
-			<?php if ( ! empty( $payments ) ) : ?>
-				<?php foreach ( $payments as $payment ) : ?>
+			<?php if ( ! empty($payments)) : ?>
+				<?php foreach ($payments as $payment) : ?>
 					<tr>
 						<td><?php echo $payment->ID; ?></td>
-						<td><?php echo give_payment_amount( $payment->ID ); ?></td>
-						<td><?php echo date_i18n( get_option( 'date_format' ), strtotime( $payment->post_date ) ); ?></td>
-						<td><?php echo give_get_payment_status( $payment, true ); ?></td>
+						<td><?php echo give_payment_amount($payment->ID); ?></td>
+						<td><?php echo date_i18n(get_option('date_format'), strtotime($payment->post_date)); ?></td>
+						<td><?php echo give_get_payment_status($payment, true); ?></td>
 						<td>
-							<a title="<?php _e( 'View Details for Donation', 'give' );
-							echo ' ' . $payment->ID; ?>" href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id=' . $payment->ID ); ?>">
-								<?php _e( 'View Details', 'give' ); ?>
+							<a title="<?php _e('View Details for Donation', 'give');
+							echo ' '.$payment->ID; ?>" href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id='.$payment->ID); ?>">
+								<?php _e('View Details', 'give'); ?>
 							</a>
-							<?php do_action( 'give_donor_recent_purchases_actions', $customer, $payment ); ?>
+							<?php do_action('give_donor_recent_purchases_actions', $customer, $payment); ?>
 						</td>
 					</tr>
 				<?php endforeach; ?>
 			<?php else: ?>
 				<tr>
-					<td colspan="5"><?php _e( 'No Donations Found', 'give' ); ?></td>
+					<td colspan="5"><?php _e('No Donations Found', 'give'); ?></td>
 				</tr>
 			<?php endif; ?>
 			</tbody>
 		</table>
 
-		<h3><?php _e( 'Completed Donations', 'give' ); ?></h3>
+		<h3><?php _e('Completed Donations', 'give'); ?></h3>
 		<?php
-		$donations = give_get_users_completed_donations( $customer->email );
+		$donations = give_get_users_completed_donations($customer->email);
 		?>
 		<table class="wp-list-table widefat striped donations">
 			<thead>
 			<tr>
 				<th><?php echo give_get_forms_label_singular(); ?></th>
-				<th width="120px"><?php _e( 'Actions', 'give' ); ?></th>
+				<th width="120px"><?php _e('Actions', 'give'); ?></th>
 			</tr>
 			</thead>
 			<tbody>
-			<?php if ( ! empty( $donations ) ) : ?>
-				<?php foreach ( $donations as $donation ) : ?>
+			<?php if ( ! empty($donations)) : ?>
+				<?php foreach ($donations as $donation) : ?>
 					<tr>
 						<td><?php echo $donation->post_title; ?></td>
 						<td>
@@ -449,15 +449,15 @@ 
 								echo esc_attr(
 									sprintf(
 										/* translators: %s: post title */
-										__( 'View %s', 'give' ),
+										__('View %s', 'give'),
 										$donation->post_title
 									)
-								); ?>" href="<?php echo esc_url( admin_url( 'post.php?action=edit&post=' . $donation->ID ) );
+								); ?>" href="<?php echo esc_url(admin_url('post.php?action=edit&post='.$donation->ID));
 							?>">
 								<?php
 									printf(
 										/* translators: %s: forms singular label */
-										__( 'View %s', 'give' ),
+										__('View %s', 'give'),
 										give_get_forms_label_singular()
 									);
 								?>
@@ -467,17 +467,17 @@ 
 				<?php endforeach; ?>
 			<?php else: ?>
 				<tr>
-					<td colspan="2"><?php _e( 'No Completed Donations Found', 'give' ); ?></td>
+					<td colspan="2"><?php _e('No Completed Donations Found', 'give'); ?></td>
 				</tr>
 			<?php endif; ?>
 			</tbody>
 		</table>
 
-		<?php do_action( 'give_donor_after_tables', $customer ); ?>
+		<?php do_action('give_donor_after_tables', $customer); ?>
 
 	</div>
 
-	<?php do_action( 'give_donor_card_bottom', $customer ); ?>
+	<?php do_action('give_donor_card_bottom', $customer); ?>
 
 	<?php
 }
@@ -491,30 +491,30 @@ 
  *
  * @return void
  */
-function give_customer_notes_view( $customer ) {
+function give_customer_notes_view($customer) {
 
-	$paged          = isset( $_GET['paged'] ) && is_numeric( $_GET['paged'] ) ? $_GET['paged'] : 1;
-	$paged          = absint( $paged );
+	$paged          = isset($_GET['paged']) && is_numeric($_GET['paged']) ? $_GET['paged'] : 1;
+	$paged          = absint($paged);
 	$note_count     = $customer->get_notes_count();
-	$per_page       = apply_filters( 'give_customer_notes_per_page', 20 );
-	$total_pages    = ceil( $note_count / $per_page );
-	$customer_notes = $customer->get_notes( $per_page, $paged );
+	$per_page       = apply_filters('give_customer_notes_per_page', 20);
+	$total_pages    = ceil($note_count / $per_page);
+	$customer_notes = $customer->get_notes($per_page, $paged);
 	?>
 
 	<div id="customer-notes-wrapper">
 		<div class="customer-notes-header">
-			<?php echo get_avatar( $customer->email, 30 ); ?> <span><?php echo $customer->name; ?></span>
+			<?php echo get_avatar($customer->email, 30); ?> <span><?php echo $customer->name; ?></span>
 		</div>
-		<h3><?php _e( 'Notes', 'give' ); ?></h3>
+		<h3><?php _e('Notes', 'give'); ?></h3>
 
-		<?php if ( 1 == $paged ) : ?>
+		<?php if (1 == $paged) : ?>
 			<div style="display: block; margin-bottom: 55px;">
-				<form id="give-add-customer-note" method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=notes&id=' . $customer->id ); ?>">
+				<form id="give-add-customer-note" method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=notes&id='.$customer->id); ?>">
 					<textarea id="customer-note" name="customer_note" class="customer-note-input" rows="10"></textarea>
 					<br />
 					<input type="hidden" id="customer-id" name="customer_id" value="<?php echo $customer->id; ?>" />
 					<input type="hidden" name="give_action" value="add-customer-note" />
-					<?php wp_nonce_field( 'add-customer-note', 'add_customer_note_nonce', true, true ); ?>
+					<?php wp_nonce_field('add-customer-note', 'add_customer_note_nonce', true, true); ?>
 					<input id="add-customer-note" class="right button-primary" type="submit" value="Add Note" />
 				</form>
 			</div>
@@ -529,46 +529,46 @@ 
 			'show_all' => true
 		);
 
-		echo paginate_links( $pagination_args );
+		echo paginate_links($pagination_args);
 		?>
 
 		<div id="give-customer-notes" class="postbox">
-			<?php if ( count( $customer_notes ) > 0 ) : ?>
-				<?php foreach ( $customer_notes as $key => $note ) : ?>
+			<?php if (count($customer_notes) > 0) : ?>
+				<?php foreach ($customer_notes as $key => $note) : ?>
 					<div class="customer-note-wrapper dashboard-comment-wrap comment-item">
 					<span class="note-content-wrap">
-						<?php echo stripslashes( $note ); ?>
+						<?php echo stripslashes($note); ?>
 					</span>
 					</div>
 				<?php endforeach; ?>
 			<?php else: ?>
 				<div class="give-no-customer-notes">
-					<?php _e( 'No Donor Notes', 'give' ); ?>
+					<?php _e('No Donor Notes', 'give'); ?>
 				</div>
 			<?php endif; ?>
 		</div>
 
-		<?php echo paginate_links( $pagination_args ); ?>
+		<?php echo paginate_links($pagination_args); ?>
 
 	</div>
 
 	<?php
 }
 
-function give_customers_delete_view( $customer ) {
+function give_customers_delete_view($customer) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
 	?>
 
-	<?php do_action( 'give_customer_delete_top', $customer ); ?>
+	<?php do_action('give_customer_delete_top', $customer); ?>
 
 	<div class="info-wrapper customer-section">
 
-		<form id="delete-customer" method="post" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $customer->id ); ?>">
+		<form id="delete-customer" method="post" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$customer->id); ?>">
 
 			<div class="customer-notes-header">
-				<?php echo get_avatar( $customer->email, 30 ); ?> <span><?php echo $customer->name; ?></span>
+				<?php echo get_avatar($customer->email, 30); ?> <span><?php echo $customer->name; ?></span>
 			</div>
 
 
@@ -576,27 +576,27 @@ 
 
 				<span class="delete-customer-options">
 					<p>
-						<?php echo Give()->html->checkbox( array( 'name' => 'give-customer-delete-confirm' ) ); ?>
-						<label for="give-customer-delete-confirm"><?php _e( 'Are you sure you want to delete this donor?', 'give' ); ?></label>
+						<?php echo Give()->html->checkbox(array('name' => 'give-customer-delete-confirm')); ?>
+						<label for="give-customer-delete-confirm"><?php _e('Are you sure you want to delete this donor?', 'give'); ?></label>
 					</p>
 
 					<p>
-						<?php echo Give()->html->checkbox( array(
+						<?php echo Give()->html->checkbox(array(
 							'name'    => 'give-customer-delete-records',
-							'options' => array( 'disabled' => true )
-						) ); ?>
-						<label for="give-customer-delete-records"><?php _e( 'Delete all associated payments and records?', 'give' ); ?></label>
+							'options' => array('disabled' => true)
+						)); ?>
+						<label for="give-customer-delete-records"><?php _e('Delete all associated payments and records?', 'give'); ?></label>
 					</p>
 
-					<?php do_action( 'give_customer_delete_inputs', $customer ); ?>
+					<?php do_action('give_customer_delete_inputs', $customer); ?>
 				</span>
 
 				<span id="customer-edit-actions">
 					<input type="hidden" name="customer_id" value="<?php echo $customer->id; ?>" />
-					<?php wp_nonce_field( 'delete-customer', '_wpnonce', false, true ); ?>
+					<?php wp_nonce_field('delete-customer', '_wpnonce', false, true); ?>
 					<input type="hidden" name="give_action" value="delete-customer" />
-					<input type="submit" disabled="disabled" id="give-delete-customer" class="button-primary" value="<?php _e( 'Delete Donor', 'give' ); ?>" />
-					<a id="give-delete-customer-cancel" href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ); ?>" class="delete"><?php _e( 'Cancel', 'give' ); ?></a>
+					<input type="submit" disabled="disabled" id="give-delete-customer" class="button-primary" value="<?php _e('Delete Donor', 'give'); ?>" />
+					<a id="give-delete-customer-cancel" href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id); ?>" class="delete"><?php _e('Cancel', 'give'); ?></a>
 				</span>
 
 			</div>
@@ -606,5 +606,5 @@ 
 
 	<?php
 
-	do_action( 'give_customer_delete_bottom', $customer );
+	do_action('give_customer_delete_bottom', $customer);
 }

includes/admin/upgrades/upgrade-functions.php

Spacing +68 added lines, -68 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,18 +25,18 @@ 
  */
 function give_show_upgrade_notices() {
 
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-upgrades' ) {
+	if (isset($_GET['page']) && $_GET['page'] == 'give-upgrades') {
 		return;
 	} // Don't show notices on the upgrades page
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
 	}
 
-	$give_version = preg_replace( '/[^0-9.].*/', '', $give_version );
+	$give_version = preg_replace('/[^0-9.].*/', '', $give_version);
 
 	/*
 	 *  NOTICE:
@@ -47,18 +47,18 @@ 
 	 */
 
 	//v1.3.2 Upgrades
-	if ( version_compare( $give_version, '1.3.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) {
+	if (version_compare($give_version, '1.3.2', '<') || ! give_has_upgrade_completed('upgrade_give_payment_customer_id')) {
 		printf(
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the donor database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_payment_customer_id'))
 		);
 	}
 
 	//v1.3.4 Upgrades //ensure the user has gone through 1.3.4
-	if ( version_compare( $give_version, '1.3.4', '<' ) || ( ! give_has_upgrade_completed( 'upgrade_give_offline_status' ) && give_has_upgrade_completed( 'upgrade_give_payment_customer_id' ) ) ) {
+	if (version_compare($give_version, '1.3.4', '<') || ( ! give_has_upgrade_completed('upgrade_give_offline_status') && give_has_upgrade_completed('upgrade_give_payment_customer_id'))) {
 		printf(
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give' ) . '</p></div>',
-			esc_url( admin_url( 'index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status' ) )
+			'<div class="updated"><p>'.__('Give needs to upgrade the transaction database, click <a href="%s">here</a> to start the upgrade.', 'give').'</p></div>',
+			esc_url(admin_url('index.php?page=give-upgrades&give-upgrade=upgrade_give_offline_status'))
 		);
 	}
 
@@ -68,7 +68,7 @@ 
 
 }
 
-add_action( 'admin_notices', 'give_show_upgrade_notices' );
+add_action('admin_notices', 'give_show_upgrade_notices');
 
 /**
  * Triggers all upgrade functions
@@ -80,26 +80,26 @@ 
  */
 function give_trigger_upgrades() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
-		add_option( 'give_version', $give_version );
+		add_option('give_version', $give_version);
 	}
 
-	update_option( 'give_version', GIVE_VERSION );
+	update_option('give_version', GIVE_VERSION);
 
-	if ( DOING_AJAX ) {
-		die( 'complete' );
+	if (DOING_AJAX) {
+		die('complete');
 	} // Let AJAX know that the upgrade is complete
 }
 
-add_action( 'wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades' );
+add_action('wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades');
 
 /**
  * Check if the upgrade routine has been run for a specific action
@@ -110,15 +110,15 @@ 
  *
  * @return bool                   If the action has been added to the completed actions array
  */
-function give_has_upgrade_completed( $upgrade_action = '' ) {
+function give_has_upgrade_completed($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
 	$completed_upgrades = give_get_completed_upgrades();
 
-	return in_array( $upgrade_action, $completed_upgrades );
+	return in_array($upgrade_action, $completed_upgrades);
 
 }
 
@@ -131,9 +131,9 @@ 
  *
  * @return bool                   If the function was successfully added
  */
-function give_set_upgrade_complete( $upgrade_action = '' ) {
+function give_set_upgrade_complete($upgrade_action = '') {
 
-	if ( empty( $upgrade_action ) ) {
+	if (empty($upgrade_action)) {
 		return false;
 	}
 
@@ -141,9 +141,9 @@ 
 	$completed_upgrades[] = $upgrade_action;
 
 	// Remove any blanks, and only show uniques
-	$completed_upgrades = array_unique( array_values( $completed_upgrades ) );
+	$completed_upgrades = array_unique(array_values($completed_upgrades));
 
-	return update_option( 'give_completed_upgrades', $completed_upgrades );
+	return update_option('give_completed_upgrades', $completed_upgrades);
 }
 
 /**
@@ -154,9 +154,9 @@ 
  */
 function give_get_completed_upgrades() {
 
-	$completed_upgrades = get_option( 'give_completed_upgrades' );
+	$completed_upgrades = get_option('give_completed_upgrades');
 
-	if ( false === $completed_upgrades ) {
+	if (false === $completed_upgrades) {
 		$completed_upgrades = array();
 	}
 
@@ -175,30 +175,30 @@ 
  */
 function give_v132_upgrade_give_payment_customer_id() {
 	global $wpdb;
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	//UPDATE DB METAKEYS
 	$sql   = "UPDATE $wpdb->postmeta SET meta_key = '_give_payment_customer_id' WHERE meta_key = '_give_payment_donor_id'";
-	$query = $wpdb->query( $sql );
+	$query = $wpdb->query($sql);
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_payment_customer_id' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_payment_customer_id');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id' );
+add_action('give_upgrade_give_payment_customer_id', 'give_v132_upgrade_give_payment_customer_id');
 
 /**
  * Upgrades the Offline Status
@@ -212,14 +212,14 @@ 
 
 	global $wpdb;
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( __( 'You do not have permission to do Give upgrades.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(__('You do not have permission to do Give upgrades.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	ignore_user_abort( true );
+	ignore_user_abort(true);
 
-	if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-		@set_time_limit( 0 );
+	if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+		@set_time_limit(0);
 	}
 
 	// Get abandoned offline payments
@@ -229,35 +229,35 @@ 
 	$where .= "AND ( p.post_status = 'abandoned' )";
 	$where .= "AND ( m.meta_key = '_give_payment_gateway' AND m.meta_value = 'offline' )";
 
-	$sql            = $select . $join . $where;
-	$found_payments = $wpdb->get_col( $sql );
+	$sql            = $select.$join.$where;
+	$found_payments = $wpdb->get_col($sql);
 
 
-	foreach ( $found_payments as $payment ) {
+	foreach ($found_payments as $payment) {
 
 		//Only change ones marked abandoned since our release last week
 		//because the admin may have marked some abandoned themselves
-		$modified_time = get_post_modified_time( 'U', false, $payment );
+		$modified_time = get_post_modified_time('U', false, $payment);
 
 		//1450124863 =  12/10/2015 20:42:25
-		if ( $modified_time >= 1450124863 ) {
+		if ($modified_time >= 1450124863) {
 
-			give_update_payment_status( $payment, 'pending' );
+			give_update_payment_status($payment, 'pending');
 
 		}
 
 	}
 
-	update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-	give_set_upgrade_complete( 'upgrade_give_offline_status' );
-	delete_option( 'give_doing_upgrade' );
-	wp_redirect( admin_url() );
+	update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+	give_set_upgrade_complete('upgrade_give_offline_status');
+	delete_option('give_doing_upgrade');
+	wp_redirect(admin_url());
 	exit;
 
 
 }
 
-add_action( 'give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status' );
+add_action('give_upgrade_give_offline_status', 'give_v134_upgrade_give_offline_status');
 
 
 /**
@@ -269,17 +269,17 @@ 
  */
 function give_v152_cleanup_users() {
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it
 		$give_version = '1.0';
 	}
 
-	$give_version = preg_replace( '/[^0-9.].*/', '', $give_version );
+	$give_version = preg_replace('/[^0-9.].*/', '', $give_version);
 
 	//v1.5.2 Upgrades
-	if ( version_compare( $give_version, '1.5.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_user_caps_cleanup' ) ) {
+	if (version_compare($give_version, '1.5.2', '<') || ! give_has_upgrade_completed('upgrade_give_user_caps_cleanup')) {
 
 		//Delete all caps with "ss"
 		//Also delete all unused "campaign" roles
@@ -326,9 +326,9 @@ 
 		);
 	
 		global $wp_roles;
-		foreach ( $delete_caps as $cap ) {
-			foreach ( array_keys( $wp_roles->roles ) as $role ) {
-				$wp_roles->remove_cap( $role, $cap );
+		foreach ($delete_caps as $cap) {
+			foreach (array_keys($wp_roles->roles) as $role) {
+				$wp_roles->remove_cap($role, $cap);
 			}
 		}
 	
@@ -338,12 +338,12 @@ 
 		$roles->add_caps();
 		
 		//The Update Ran
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-		give_set_upgrade_complete( 'upgrade_give_user_caps_cleanup' );
-		delete_option( 'give_doing_upgrade' );
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+		give_set_upgrade_complete('upgrade_give_user_caps_cleanup');
+		delete_option('give_doing_upgrade');
 
 	}
 
 }
 
-add_action( 'admin_init', 'give_v152_cleanup_users' );
\ No newline at end of file
+add_action('admin_init', 'give_v152_cleanup_users');
\ No newline at end of file

includes/emails/actions.php

Spacing +18 added lines, -18 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,17 +23,17 @@ 
  *
  * @return void
  */
-function give_trigger_donation_receipt( $payment_id ) {
+function give_trigger_donation_receipt($payment_id) {
 	// Make sure we don't send a purchase receipt while editing a payment
-	if ( isset( $_POST['give-action'] ) && 'edit_payment' == $_POST['give-action'] ) {
+	if (isset($_POST['give-action']) && 'edit_payment' == $_POST['give-action']) {
 		return;
 	}
 
 	// Send email
-	give_email_donation_receipt( $payment_id );
+	give_email_donation_receipt($payment_id);
 }
 
-add_action( 'give_complete_purchase', 'give_trigger_donation_receipt', 999, 1 );
+add_action('give_complete_purchase', 'give_trigger_donation_receipt', 999, 1);
 
 /**
  * Resend the Email Purchase Receipt. (This can be done from the Payment History page)
@@ -44,29 +44,29 @@ 
  *
  * @return void
  */
-function give_resend_donation_receipt( $data ) {
+function give_resend_donation_receipt($data) {
 
-	$purchase_id = absint( $data['purchase_id'] );
+	$purchase_id = absint($data['purchase_id']);
 
-	if ( empty( $purchase_id ) ) {
+	if (empty($purchase_id)) {
 		return;
 	}
 
-	if ( ! current_user_can( 'edit_give_payments', $purchase_id ) ) {
-		wp_die( __( 'You do not have permission to edit payment records.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $purchase_id)) {
+		wp_die(__('You do not have permission to edit payment records.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	give_email_donation_receipt( $purchase_id, false );
+	give_email_donation_receipt($purchase_id, false);
 
-	wp_redirect( add_query_arg( array(
+	wp_redirect(add_query_arg(array(
 		'give-message' => 'email_sent',
 		'give-action'  => false,
 		'purchase_id'  => false
-	) ) );
+	)));
 	exit;
 }
 
-add_action( 'give_email_links', 'give_resend_donation_receipt' );
+add_action('give_email_links', 'give_resend_donation_receipt');
 
 /**
  * Trigger the sending of a Test Email
@@ -77,8 +77,8 @@ 
  *
  * @return void
  */
-function give_send_test_email( $data ) {
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give-test-email' ) ) {
+function give_send_test_email($data) {
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give-test-email')) {
 		return;
 	}
 
@@ -86,8 +86,8 @@ 
 	give_email_test_donation_receipt();
 
 	// Remove the test email query arg
-	wp_redirect( remove_query_arg( 'give_action' ) );
+	wp_redirect(remove_query_arg('give_action'));
 	exit;
 }
 
-add_action( 'give_send_test_email', 'give_send_test_email' );
+add_action('give_send_test_email', 'give_send_test_email');

includes/gateways/actions.php

Spacing +13 added lines, -13 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,14 +21,14 @@ 
  *
  * @param $data
  */
-function give_process_gateway_select( $data ) {
-	if ( isset( $_POST['gateway_submit'] ) ) {
-		wp_redirect( esc_url( add_query_arg( 'payment-mode', $_POST['payment-mode'] ) ) );
+function give_process_gateway_select($data) {
+	if (isset($_POST['gateway_submit'])) {
+		wp_redirect(esc_url(add_query_arg('payment-mode', $_POST['payment-mode'])));
 		exit;
 	}
 }
 
-add_action( 'give_gateway_select', 'give_process_gateway_select' );
+add_action('give_gateway_select', 'give_process_gateway_select');
 
 /**
  * Loads a payment gateway via AJAX
@@ -37,14 +37,14 @@ 
  * @return void
  */
 function give_load_ajax_gateway() {
-	if ( isset( $_POST['give_payment_mode'] ) ) {
-		do_action( 'give_purchase_form', $_POST['give_form_id'] );
+	if (isset($_POST['give_payment_mode'])) {
+		do_action('give_purchase_form', $_POST['give_form_id']);
 		exit();
 	}
 }
 
-add_action( 'wp_ajax_give_load_gateway', 'give_load_ajax_gateway' );
-add_action( 'wp_ajax_nopriv_give_load_gateway', 'give_load_ajax_gateway' );
+add_action('wp_ajax_give_load_gateway', 'give_load_ajax_gateway');
+add_action('wp_ajax_nopriv_give_load_gateway', 'give_load_ajax_gateway');
 
 /**
  * Sets an error on checkout if no gateways are enabled
@@ -55,11 +55,11 @@ 
 function give_no_gateway_error() {
 	$gateways = give_get_enabled_payment_gateways();
 
-	if ( empty( $gateways ) ) {
-		give_set_error( 'no_gateways', __( 'You must enable a payment gateway to use Give.', 'give' ) );
+	if (empty($gateways)) {
+		give_set_error('no_gateways', __('You must enable a payment gateway to use Give.', 'give'));
 	} else {
-		give_unset_error( 'no_gateways' );
+		give_unset_error('no_gateways');
 	}
 }
 
-add_action( 'init', 'give_no_gateway_error' );
\ No newline at end of file
+add_action('init', 'give_no_gateway_error');
\ No newline at end of file

includes/admin/customers/customer-actions.php

Spacing +128 added lines, -128 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,15 +23,15 @@ 
  *
  * @return array $output Response messages
  */
-function give_edit_customer( $args ) {
+function give_edit_customer($args) {
 	
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
@@ -39,12 +39,12 @@ 
 	$customer_id   = (int) $args['customerinfo']['id'];
 	$nonce         = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-customer' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
@@ -54,23 +54,23 @@ 
 		'user_id' => 0
 	);
 
-	$customer_info = wp_parse_args( $customer_info, $defaults );
+	$customer_info = wp_parse_args($customer_info, $defaults);
 
-	if ( ! is_email( $customer_info['email'] ) ) {
-		give_set_error( 'give-invalid-email', __( 'Please enter a valid email address.', 'give' ) );
+	if ( ! is_email($customer_info['email'])) {
+		give_set_error('give-invalid-email', __('Please enter a valid email address.', 'give'));
 	}
 
-	if ( (int) $customer_info['user_id'] != (int) $customer->user_id ) {
+	if ((int) $customer_info['user_id'] != (int) $customer->user_id) {
 
 		// Make sure we don't already have this user attached to a customer
-		if ( ! empty( $customer_info['user_id'] ) && false !== Give()->customers->get_customer_by( 'user_id', $customer_info['user_id'] ) ) {
-			give_set_error( 'give-invalid-customer-user_id', sprintf( __( 'The User ID %d is already associated with a different donor.', 'give' ), $customer_info['user_id'] ) );
+		if ( ! empty($customer_info['user_id']) && false !== Give()->customers->get_customer_by('user_id', $customer_info['user_id'])) {
+			give_set_error('give-invalid-customer-user_id', sprintf(__('The User ID %d is already associated with a different donor.', 'give'), $customer_info['user_id']));
 		}
 
 		// Make sure it's actually a user
-		$user = get_user_by( 'id', $customer_info['user_id'] );
-		if ( ! empty( $customer_info['user_id'] ) && false === $user ) {
-			give_set_error( 'give-invalid-user_id', sprintf( __( 'The User ID %d does not exist. Please assign an existing user.', 'give' ), $customer_info['user_id'] ) );
+		$user = get_user_by('id', $customer_info['user_id']);
+		if ( ! empty($customer_info['user_id']) && false === $user) {
+			give_set_error('give-invalid-user_id', sprintf(__('The User ID %d does not exist. Please assign an existing user.', 'give'), $customer_info['user_id']));
 		}
 
 	}
@@ -78,82 +78,82 @@ 
 	// Record this for later
 	$previous_user_id = $customer->user_id;
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return;
 	}
 
 	// Setup the customer address, if present
 	$address = array();
-	if ( intval( $customer_info['user_id'] ) > 0 ) {
+	if (intval($customer_info['user_id']) > 0) {
 
-		$current_address = get_user_meta( $customer_info['user_id'], '_give_user_address', true );
+		$current_address = get_user_meta($customer_info['user_id'], '_give_user_address', true);
 
-		if ( false === $current_address ) {
-			$address['line1']   = isset( $customer_info['line1'] ) ? $customer_info['line1'] : '';
-			$address['line2']   = isset( $customer_info['line2'] ) ? $customer_info['line2'] : '';
-			$address['city']    = isset( $customer_info['city'] ) ? $customer_info['city'] : '';
-			$address['country'] = isset( $customer_info['country'] ) ? $customer_info['country'] : '';
-			$address['zip']     = isset( $customer_info['zip'] ) ? $customer_info['zip'] : '';
-			$address['state']   = isset( $customer_info['state'] ) ? $customer_info['state'] : '';
+		if (false === $current_address) {
+			$address['line1']   = isset($customer_info['line1']) ? $customer_info['line1'] : '';
+			$address['line2']   = isset($customer_info['line2']) ? $customer_info['line2'] : '';
+			$address['city']    = isset($customer_info['city']) ? $customer_info['city'] : '';
+			$address['country'] = isset($customer_info['country']) ? $customer_info['country'] : '';
+			$address['zip']     = isset($customer_info['zip']) ? $customer_info['zip'] : '';
+			$address['state']   = isset($customer_info['state']) ? $customer_info['state'] : '';
 		} else {
-			$current_address    = wp_parse_args( $current_address, array(
+			$current_address    = wp_parse_args($current_address, array(
 				'line1',
 				'line2',
 				'city',
 				'zip',
 				'state',
 				'country'
-			) );
-			$address['line1']   = isset( $customer_info['line1'] ) ? $customer_info['line1'] : $current_address['line1'];
-			$address['line2']   = isset( $customer_info['line2'] ) ? $customer_info['line2'] : $current_address['line2'];
-			$address['city']    = isset( $customer_info['city'] ) ? $customer_info['city'] : $current_address['city'];
-			$address['country'] = isset( $customer_info['country'] ) ? $customer_info['country'] : $current_address['country'];
-			$address['zip']     = isset( $customer_info['zip'] ) ? $customer_info['zip'] : $current_address['zip'];
-			$address['state']   = isset( $customer_info['state'] ) ? $customer_info['state'] : $current_address['state'];
+			));
+			$address['line1']   = isset($customer_info['line1']) ? $customer_info['line1'] : $current_address['line1'];
+			$address['line2']   = isset($customer_info['line2']) ? $customer_info['line2'] : $current_address['line2'];
+			$address['city']    = isset($customer_info['city']) ? $customer_info['city'] : $current_address['city'];
+			$address['country'] = isset($customer_info['country']) ? $customer_info['country'] : $current_address['country'];
+			$address['zip']     = isset($customer_info['zip']) ? $customer_info['zip'] : $current_address['zip'];
+			$address['state']   = isset($customer_info['state']) ? $customer_info['state'] : $current_address['state'];
 		}
 
 	}
 
 	// Sanitize the inputs
 	$customer_data            = array();
-	$customer_data['name']    = strip_tags( stripslashes( $customer_info['name'] ) );
+	$customer_data['name']    = strip_tags(stripslashes($customer_info['name']));
 	$customer_data['email']   = $customer_info['email'];
 	$customer_data['user_id'] = $customer_info['user_id'];
 
-	$customer_data = apply_filters( 'give_edit_customer_info', $customer_data, $customer_id );
-	$address       = apply_filters( 'give_edit_customer_address', $address, $customer_id );
+	$customer_data = apply_filters('give_edit_customer_info', $customer_data, $customer_id);
+	$address       = apply_filters('give_edit_customer_address', $address, $customer_id);
 
-	$customer_data = array_map( 'sanitize_text_field', $customer_data );
-	$address       = array_map( 'sanitize_text_field', $address );
+	$customer_data = array_map('sanitize_text_field', $customer_data);
+	$address       = array_map('sanitize_text_field', $address);
 
-	do_action( 'give_pre_edit_customer', $customer_id, $customer_data, $address );
+	do_action('give_pre_edit_customer', $customer_id, $customer_data, $address);
 
 	$output         = array();
 	$previous_email = $customer->email;
 
-	if ( $customer->update( $customer_data ) ) {
+	if ($customer->update($customer_data)) {
 
-		if ( ! empty( $customer->user_id ) && $customer->user_id > 0 ) {
-			update_user_meta( $customer->user_id, '_give_user_address', $address );
+		if ( ! empty($customer->user_id) && $customer->user_id > 0) {
+			update_user_meta($customer->user_id, '_give_user_address', $address);
 		}
 
 		// Update some payment meta if we need to
-		$payments_array = explode( ',', $customer->payment_ids );
+		$payments_array = explode(',', $customer->payment_ids);
 
-		if ( $customer->email != $previous_email ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, 'email', $customer->email );
+		if ($customer->email != $previous_email) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, 'email', $customer->email);
 			}
 		}
 
-		if ( $customer->user_id != $previous_user_id ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, '_give_payment_user_id', $customer->user_id );
+		if ($customer->user_id != $previous_user_id) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, '_give_payment_user_id', $customer->user_id);
 			}
 		}
 
 		$output['success']       = true;
-		$customer_data           = array_merge( $customer_data, $address );
+		$customer_data           = array_merge($customer_data, $address);
 		$output['customer_info'] = $customer_data;
 
 	} else {
@@ -162,11 +162,11 @@ 
 
 	}
 
-	do_action( 'give_post_edit_customer', $customer_id, $customer_data );
+	do_action('give_post_edit_customer', $customer_id, $customer_data);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -174,7 +174,7 @@ 
 
 }
 
-add_action( 'give_edit-customer', 'give_edit_customer', 10, 1 );
+add_action('give_edit-customer', 'give_edit_customer', 10, 1);
 
 /**
  * Save a customer note being added
@@ -185,53 +185,53 @@ 
  *
  * @return int         The Note ID that was saved, or 0 if nothing was saved
  */
-function give_customer_save_note( $args ) {
+function give_customer_save_note($args) {
 
-	$customer_view_role = apply_filters( 'give_view_customers_role', 'view_give_reports' );
+	$customer_view_role = apply_filters('give_view_customers_role', 'view_give_reports');
 
-	if ( ! is_admin() || ! current_user_can( $customer_view_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_view_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
-	$customer_note = trim( sanitize_text_field( $args['customer_note'] ) );
+	$customer_note = trim(sanitize_text_field($args['customer_note']));
 	$customer_id   = (int) $args['customer_id'];
 	$nonce         = $args['add_customer_note_nonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'add-customer-note' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'add-customer-note')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	if ( empty( $customer_note ) ) {
-		give_set_error( 'empty-customer-note', __( 'A note is required.', 'give' ) );
+	if (empty($customer_note)) {
+		give_set_error('empty-customer-note', __('A note is required.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return;
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	$new_note = $customer->add_note( $customer_note );
+	$customer = new Give_Customer($customer_id);
+	$new_note = $customer->add_note($customer_note);
 
-	do_action( 'give_pre_insert_customer_note', $customer_id, $new_note );
+	do_action('give_pre_insert_customer_note', $customer_id, $new_note);
 
-	if ( ! empty( $new_note ) && ! empty( $customer->id ) ) {
+	if ( ! empty($new_note) && ! empty($customer->id)) {
 
 		ob_start();
 		?>
 		<div class="customer-note-wrapper dashboard-comment-wrap comment-item">
 			<span class="note-content-wrap">
-				<?php echo stripslashes( $new_note ); ?>
+				<?php echo stripslashes($new_note); ?>
 			</span>
 		</div>
 		<?php
 		$output = ob_get_contents();
 		ob_end_clean();
 
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			echo $output;
 			exit;
 		}
@@ -244,7 +244,7 @@ 
 
 }
 
-add_action( 'give_add-customer-note', 'give_customer_save_note', 10, 1 );
+add_action('give_add-customer-note', 'give_customer_save_note', 10, 1);
 
 /**
  * Delete a customer
@@ -255,87 +255,87 @@ 
  *
  * @return int Whether it was a successful deletion
  */
-function give_customer_delete( $args ) {
+function give_customer_delete($args) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( __( 'You do not have permission to delete donors.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(__('You do not have permission to delete donors.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
 	$customer_id = (int) $args['customer_id'];
-	$confirm     = ! empty( $args['give-customer-delete-confirm'] ) ? true : false;
-	$remove_data = ! empty( $args['give-customer-delete-records'] ) ? true : false;
+	$confirm     = ! empty($args['give-customer-delete-confirm']) ? true : false;
+	$remove_data = ! empty($args['give-customer-delete-records']) ? true : false;
 	$nonce       = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'delete-customer' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'delete-customer')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	if ( ! $confirm ) {
-		give_set_error( 'customer-delete-no-confirm', __( 'Please confirm you want to delete this donor.', 'give' ) );
+	if ( ! $confirm) {
+		give_set_error('customer-delete-no-confirm', __('Please confirm you want to delete this donor.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
-		wp_redirect( admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer_id ) );
+	if (give_get_errors()) {
+		wp_redirect(admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer_id));
 		exit;
 	}
 
-	$customer = new Give_Customer( $customer_id );
+	$customer = new Give_Customer($customer_id);
 
-	do_action( 'give_pre_delete_customer', $customer_id, $confirm, $remove_data );
+	do_action('give_pre_delete_customer', $customer_id, $confirm, $remove_data);
 
 	$success = false;
 
-	if ( $customer->id > 0 ) {
+	if ($customer->id > 0) {
 
-		$payments_array = explode( ',', $customer->payment_ids );
-		$success        = Give()->customers->delete( $customer->id );
+		$payments_array = explode(',', $customer->payment_ids);
+		$success        = Give()->customers->delete($customer->id);
 
-		if ( $success ) {
+		if ($success) {
 
-			if ( $remove_data ) {
+			if ($remove_data) {
 
 				// Remove all payments, logs, etc
-				foreach ( $payments_array as $payment_id ) {
-					give_delete_purchase( $payment_id );
+				foreach ($payments_array as $payment_id) {
+					give_delete_purchase($payment_id);
 				}
 
 			} else {
 
 				// Just set the payments to customer_id of 0
-				foreach ( $payments_array as $payment_id ) {
-					give_update_payment_meta( $payment_id, '_give_payment_customer_id', 0 );
+				foreach ($payments_array as $payment_id) {
+					give_update_payment_meta($payment_id, '_give_payment_customer_id', 0);
 				}
 
 			}
 
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&give-message=customer-deleted' );
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&give-message=customer-deleted');
 
 		} else {
 
-			give_set_error( 'give-donor-delete-failed', __( 'Error deleting donor.', 'give' ) );
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $customer_id );
+			give_set_error('give-donor-delete-failed', __('Error deleting donor.', 'give'));
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$customer_id);
 
 		}
 
 	} else {
 
-		give_set_error( 'give-customer-delete-invalid-id', __( 'Invalid Donor ID.', 'give' ) );
-		$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors' );
+		give_set_error('give-customer-delete-invalid-id', __('Invalid Donor ID.', 'give'));
+		$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors');
 
 	}
 
-	wp_redirect( $redirect );
+	wp_redirect($redirect);
 	exit;
 
 }
 
-add_action( 'give_delete-customer', 'give_customer_delete', 10, 1 );
+add_action('give_delete-customer', 'give_customer_delete', 10, 1);
 
 /**
  * Disconnect a user ID from a donor
@@ -346,39 +346,39 @@ 
  *
  * @return bool        If the disconnect was successful
  */
-function give_disconnect_customer_user_id( $args ) {
+function give_disconnect_customer_user_id($args) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
 	$customer_id = (int) $args['customer_id'];
 	$nonce       = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-customer' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
-	do_action( 'give_pre_customer_disconnect_user_id', $customer_id, $customer->user_id );
+	do_action('give_pre_customer_disconnect_user_id', $customer_id, $customer->user_id);
 
-	$customer_args = array( 'user_id' => 0 );
+	$customer_args = array('user_id' => 0);
 
-	if ( $customer->update( $customer_args ) ) {
+	if ($customer->update($customer_args)) {
 		global $wpdb;
 
-		if ( ! empty( $customer->payment_ids ) ) {
-			$wpdb->query( "UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $customer->payment_ids )" );
+		if ( ! empty($customer->payment_ids)) {
+			$wpdb->query("UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $customer->payment_ids )");
 		}
 
 		$output['success'] = true;
@@ -386,14 +386,14 @@ 
 	} else {
 
 		$output['success'] = false;
-		give_set_error( 'give-disconnect-user-fail', __( 'Failed to disconnect user from donor.', 'give' ) );
+		give_set_error('give-disconnect-user-fail', __('Failed to disconnect user from donor.', 'give'));
 	}
 
-	do_action( 'give_post_customer_disconnect_user_id', $customer_id );
+	do_action('give_post_customer_disconnect_user_id', $customer_id);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -401,4 +401,4 @@ 
 
 }
 
-add_action( 'give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1 );
+add_action('give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1);

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

Spacing +32 added lines, -32 removed lines

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

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

Spacing +28 added lines, -28 removed lines

@@ -10,7 +10,7 @@ 
  * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -22,20 +22,20 @@ 
  */
 function give_process_batch_export_form() {
 
-	if ( ! wp_verify_nonce( $_REQUEST['nonce'], 'give-batch-export' ) ) {
-		wp_die( __( 'Nonce verification failed.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($_REQUEST['nonce'], 'give-batch-export')) {
+		wp_die(__('Nonce verification failed.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export.php';
+	require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export.php';
 
-	do_action( 'give_batch_export_class_include', $_REQUEST['class'] );
+	do_action('give_batch_export_class_include', $_REQUEST['class']);
 
 	$export = new $_REQUEST['class'];
 	$export->export();
 
 }
 
-add_action( 'give_form_batch_export', 'give_process_batch_export_form' );
+add_action('give_form_batch_export', 'give_process_batch_export_form');
 
 /**
  * Exports earnings for a specified time period
@@ -46,14 +46,14 @@ 
  * @return void
  */
 function give_export_earnings() {
-	require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-export-earnings.php';
+	require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/class-export-earnings.php';
 
 	$earnings_export = new Give_Earnings_Export();
 
 	$earnings_export->export();
 }
 
-add_action( 'give_earnings_export', 'give_export_earnings' );
+add_action('give_earnings_export', 'give_export_earnings');
 
 
 /**
@@ -66,14 +66,14 @@ 
  * @return void
  */
 function give_export_all_customers() {
-	require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-export-customers.php';
+	require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/class-export-customers.php';
 
 	$customer_export = new Give_Donors_Export();
 
 	$customer_export->export();
 }
 
-add_action( 'give_email_export', 'give_export_all_customers' );
+add_action('give_email_export', 'give_export_all_customers');
 
 /**
  * Add a hook allowing extensions to register a hook on the batch export process
@@ -82,22 +82,22 @@ 
  * @return void
  */
 function give_register_batch_exporters() {
-	if ( is_admin() ) {
-		do_action( 'give_register_batch_exporter' );
+	if (is_admin()) {
+		do_action('give_register_batch_exporter');
 	}
 }
 
-add_action( 'plugins_loaded', 'give_register_batch_exporters' );
+add_action('plugins_loaded', 'give_register_batch_exporters');
 
 /**
  * Register the payments batch exporter
  * @since  1.5
  */
 function give_register_payments_batch_export() {
-	add_action( 'give_batch_export_class_include', 'give_include_payments_batch_processor', 10, 1 );
+	add_action('give_batch_export_class_include', 'give_include_payments_batch_processor', 10, 1);
 }
 
-add_action( 'give_register_batch_exporter', 'give_register_payments_batch_export', 10 );
+add_action('give_register_batch_exporter', 'give_register_payments_batch_export', 10);
 
 /**
  * Loads the payments batch process if needed
@@ -108,10 +108,10 @@ 
  *
  * @return void
  */
-function give_include_payments_batch_processor( $class ) {
+function give_include_payments_batch_processor($class) {
 
-	if ( 'Give_Batch_Payments_Export' === $class ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export-payments.php';
+	if ('Give_Batch_Payments_Export' === $class) {
+		require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export-payments.php';
 	}
 
 }
@@ -121,10 +121,10 @@ 
  * @since  1.5.2
  */
 function give_register_customers_batch_export() {
-	add_action( 'give_batch_export_class_include', 'give_include_customers_batch_processor', 10, 1 );
+	add_action('give_batch_export_class_include', 'give_include_customers_batch_processor', 10, 1);
 }
 
-add_action( 'give_register_batch_exporter', 'give_register_customers_batch_export', 10 );
+add_action('give_register_batch_exporter', 'give_register_customers_batch_export', 10);
 
 /**
  * Loads the customers batch process if needed
@@ -135,10 +135,10 @@ 
  *
  * @return void
  */
-function give_include_customers_batch_processor( $class ) {
+function give_include_customers_batch_processor($class) {
 
-	if ( 'Give_Batch_Customers_Export' === $class ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export-customers.php';
+	if ('Give_Batch_Customers_Export' === $class) {
+		require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export-customers.php';
 	}
 
 }
@@ -149,10 +149,10 @@ 
  * @since  1.5
  */
 function give_register_forms_batch_export() {
-	add_action( 'give_batch_export_class_include', 'give_include_forms_batch_processor', 10, 1 );
+	add_action('give_batch_export_class_include', 'give_include_forms_batch_processor', 10, 1);
 }
 
-add_action( 'give_register_batch_exporter', 'give_register_forms_batch_export', 10 );
+add_action('give_register_batch_exporter', 'give_register_forms_batch_export', 10);
 
 /**
  * Loads the file downloads batch process if needed
@@ -163,10 +163,10 @@ 
  *
  * @return void
  */
-function give_include_forms_batch_processor( $class ) {
+function give_include_forms_batch_processor($class) {
 
-	if ( 'Give_Batch_Forms_Export' === $class ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export-forms.php';
+	if ('Give_Batch_Forms_Export' === $class) {
+		require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export-forms.php';
 	}
 
 }
\ No newline at end of file

includes/emails/class-give-emails.php

Spacing +58 added lines, -58 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -79,12 +79,12 @@ 
 	 */
 	public function __construct() {
 
-		if ( 'none' === $this->get_template() ) {
+		if ('none' === $this->get_template()) {
 			$this->html = false;
 		}
 
-		add_action( 'give_email_send_before', array( $this, 'send_before' ) );
-		add_action( 'give_email_send_after', array( $this, 'send_after' ) );
+		add_action('give_email_send_before', array($this, 'send_before'));
+		add_action('give_email_send_after', array($this, 'send_after'));
 
 	}
 
@@ -93,7 +93,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __set( $key, $value ) {
+	public function __set($key, $value) {
 		$this->$key = $value;
 	}
 
@@ -103,11 +103,11 @@ 
 	 * @since 1.0
 	 */
 	public function get_from_name() {
-		if ( ! $this->from_name ) {
-			$this->from_name = give_get_option( 'from_name', get_bloginfo( 'name' ) );
+		if ( ! $this->from_name) {
+			$this->from_name = give_get_option('from_name', get_bloginfo('name'));
 		}
 
-		return apply_filters( 'give_email_from_name', wp_specialchars_decode( $this->from_name ), $this );
+		return apply_filters('give_email_from_name', wp_specialchars_decode($this->from_name), $this);
 	}
 
 	/**
@@ -116,11 +116,11 @@ 
 	 * @since 1.0
 	 */
 	public function get_from_address() {
-		if ( ! $this->from_address ) {
-			$this->from_address = give_get_option( 'from_email', get_option( 'admin_email' ) );
+		if ( ! $this->from_address) {
+			$this->from_address = give_get_option('from_email', get_option('admin_email'));
 		}
 
-		return apply_filters( 'give_email_from_address', $this->from_address, $this );
+		return apply_filters('give_email_from_address', $this->from_address, $this);
 	}
 
 	/**
@@ -129,13 +129,13 @@ 
 	 * @since 1.0
 	 */
 	public function get_content_type() {
-		if ( ! $this->content_type && $this->html ) {
-			$this->content_type = apply_filters( 'give_email_default_content_type', 'text/html', $this );
-		} else if ( ! $this->html ) {
+		if ( ! $this->content_type && $this->html) {
+			$this->content_type = apply_filters('give_email_default_content_type', 'text/html', $this);
+		} else if ( ! $this->html) {
 			$this->content_type = 'text/plain';
 		}
 
-		return apply_filters( 'give_email_content_type', $this->content_type, $this );
+		return apply_filters('give_email_content_type', $this->content_type, $this);
 	}
 
 	/**
@@ -144,13 +144,13 @@ 
 	 * @since 1.0
 	 */
 	public function get_headers() {
-		if ( ! $this->headers ) {
+		if ( ! $this->headers) {
 			$this->headers = "From: {$this->get_from_name()} <{$this->get_from_address()}>\r\n";
 			$this->headers .= "Reply-To: {$this->get_from_address()}\r\n";
 			$this->headers .= "Content-Type: {$this->get_content_type()}; charset=utf-8\r\n";
 		}
 
-		return apply_filters( 'give_email_headers', $this->headers, $this );
+		return apply_filters('give_email_headers', $this->headers, $this);
 	}
 
 	/**
@@ -160,11 +160,11 @@ 
 	 */
 	public function get_templates() {
 		$templates = array(
-			'default' => __( 'Default Template', 'give' ),
-			'none'    => __( 'No template, plain text only', 'give' )
+			'default' => __('Default Template', 'give'),
+			'none'    => __('No template, plain text only', 'give')
 		);
 
-		return apply_filters( 'give_email_templates', $templates );
+		return apply_filters('give_email_templates', $templates);
 	}
 
 	/**
@@ -173,11 +173,11 @@ 
 	 * @since 1.0
 	 */
 	public function get_template() {
-		if ( ! $this->template ) {
-			$this->template = give_get_option( 'email_template', 'default' );
+		if ( ! $this->template) {
+			$this->template = give_get_option('email_template', 'default');
 		}
 
-		return apply_filters( 'give_email_template', $this->template );
+		return apply_filters('give_email_template', $this->template);
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 * @since 1.0
 	 */
 	public function get_heading() {
-		return apply_filters( 'give_email_heading', $this->heading );
+		return apply_filters('give_email_heading', $this->heading);
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function parse_tags( $content ) {
+	public function parse_tags($content) {
 		return $content;
 	}
 
@@ -205,36 +205,36 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function build_email( $message ) {
+	public function build_email($message) {
 
-		if ( false === $this->html ) {
-			return apply_filters( 'give_email_message', wp_strip_all_tags( $message ), $this );
+		if (false === $this->html) {
+			return apply_filters('give_email_message', wp_strip_all_tags($message), $this);
 		}
 
-		$message = $this->text_to_html( $message );
+		$message = $this->text_to_html($message);
 
 		ob_start();
 
-		give_get_template_part( 'emails/header', $this->get_template(), true );
+		give_get_template_part('emails/header', $this->get_template(), true);
 
-		do_action( 'give_email_header', $this );
+		do_action('give_email_header', $this);
 
-		if ( has_action( 'give_email_template_' . $this->get_template() ) ) {
-			do_action( 'give_email_template_' . $this->get_template() );
+		if (has_action('give_email_template_'.$this->get_template())) {
+			do_action('give_email_template_'.$this->get_template());
 		} else {
-			give_get_template_part( 'emails/body', $this->get_template(), true );
+			give_get_template_part('emails/body', $this->get_template(), true);
 		}
 
-		do_action( 'give_email_body', $this );
+		do_action('give_email_body', $this);
 
-		give_get_template_part( 'emails/footer', $this->get_template(), true );
+		give_get_template_part('emails/footer', $this->get_template(), true);
 
-		do_action( 'give_email_footer', $this );
+		do_action('give_email_footer', $this);
 
 		$body    = ob_get_clean();
-		$message = str_replace( '{email}', $message, $body );
+		$message = str_replace('{email}', $message, $body);
 
-		return apply_filters( 'give_email_message', $message, $this );
+		return apply_filters('give_email_message', $message, $this);
 	}
 
 	/**
@@ -247,26 +247,26 @@ 
 	 *
 	 * @return bool
 	 */
-	public function send( $to, $subject, $message, $attachments = '' ) {
+	public function send($to, $subject, $message, $attachments = '') {
 
-		if ( ! did_action( 'init' ) && ! did_action( 'admin_init' ) ) {
-			_doing_it_wrong( __FUNCTION__, __( 'You cannot send email with Give_Emails until init/admin_init has been reached.', 'give' ), null );
+		if ( ! did_action('init') && ! did_action('admin_init')) {
+			_doing_it_wrong(__FUNCTION__, __('You cannot send email with Give_Emails until init/admin_init has been reached.', 'give'), null);
 
 			return false;
 		}
 
-		do_action( 'give_email_send_before', $this );
+		do_action('give_email_send_before', $this);
 
-		$subject = $this->parse_tags( $subject );
-		$message = $this->parse_tags( $message );
+		$subject = $this->parse_tags($subject);
+		$message = $this->parse_tags($message);
 
-		$message = $this->build_email( $message );
+		$message = $this->build_email($message);
 
-		$attachments = apply_filters( 'give_email_attachments', $attachments, $this );
+		$attachments = apply_filters('give_email_attachments', $attachments, $this);
 
-		$sent = wp_mail( $to, $subject, $message, $this->get_headers(), $attachments );
+		$sent = wp_mail($to, $subject, $message, $this->get_headers(), $attachments);
 
-		do_action( 'give_email_send_after', $this );
+		do_action('give_email_send_after', $this);
 
 		return $sent;
 
@@ -278,9 +278,9 @@ 
 	 * @since 1.0
 	 */
 	public function send_before() {
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
+		add_filter('wp_mail_from', array($this, 'get_from_address'));
+		add_filter('wp_mail_from_name', array($this, 'get_from_name'));
+		add_filter('wp_mail_content_type', array($this, 'get_content_type'));
 	}
 
 	/**
@@ -289,9 +289,9 @@ 
 	 * @since 1.0
 	 */
 	public function send_after() {
-		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
+		remove_filter('wp_mail_from', array($this, 'get_from_address'));
+		remove_filter('wp_mail_from_name', array($this, 'get_from_name'));
+		remove_filter('wp_mail_content_type', array($this, 'get_content_type'));
 
 		// Reset heading to an empty string
 		$this->heading = '';
@@ -302,10 +302,10 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function text_to_html( $message ) {
+	public function text_to_html($message) {
 
-		if ( 'text/html' == $this->content_type || true === $this->html ) {
-			$message = wpautop( $message );
+		if ('text/html' == $this->content_type || true === $this->html) {
+			$message = wpautop($message);
 		}
 
 		return $message;