WordImpress / Give

includes/admin/tools/views/html-admin-page-system-info.php

Indentation +3 added lines, -3 removed lines

@@ -586,9 +586,9 @@
 					}
 
 					echo ' – '
-					     . sprintf( _x( 'by %s', 'by author', 'give' ), wp_kses( $author_name, wp_kses_allowed_html( 'post' ) ) )
-					     . ' – '
-					     . esc_html( $plugin_data['Version'] );
+						 . sprintf( _x( 'by %s', 'by author', 'give' ), wp_kses( $author_name, wp_kses_allowed_html( 'post' ) ) )
+						 . ' – '
+						 . esc_html( $plugin_data['Version'] );
 					?>
 				</td>
 			</tr>

Braces +16 added lines, -5 removed lines

@@ -57,7 +57,12 @@ 
 		<tr>
 			<td data-export-label="WP Multisite"><?php _e( 'WP Multisite', 'give' ); ?>:</td>
 			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether or not you have WordPress Multisite enabled.', 'give' ) ); ?>"></span></td>
-			<td><?php if ( is_multisite() ) echo '<span class="dashicons dashicons-yes"></span>'; else echo '&ndash;'; ?></td>
+			<td><?php if ( is_multisite() ) {
+	echo '<span class="dashicons dashicons-yes"></span>';
+} else {
+	echo '&ndash;';
+}
+?></td>
 		</tr>
 		<tr>
 			<td data-export-label="WP Memory Limit"><?php _e( 'WP Memory Limit', 'give' ); ?>:</td>
@@ -85,9 +90,12 @@ 
 			<td>
 				<?php if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) : ?>
 					<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>
-				<?php else : ?>
+				<?php else {
+	: ?>
 					<mark class="no">&ndash;</mark>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 			</td>
 		</tr>
 		<tr>
@@ -96,9 +104,12 @@ 
 			<td>
 				<?php if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) : ?>
 					<mark class="no">&ndash;</mark>
-				<?php else : ?>
+				<?php else {
+	: ?>
 					<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>
-				<?php endif; ?>
+				<?php endif;
+}
+?>
 			</td>
 		</tr>
 		<tr>

Spacing +290 added lines, -290 removed lines

@@ -3,7 +3,7 @@ 
  * Admin View: System Info
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -22,10 +22,10 @@ 
 ?>
 
 <div class="give-debug-report-wrapper updated">
-	<p><?php _e( 'Please copy and paste this information in your ticket when contacting support:', 'give' ); ?> </p>
+	<p><?php _e('Please copy and paste this information in your ticket when contacting support:', 'give'); ?> </p>
 	<p class="submit">
-		<a class="button-primary js-give-debug-report-button" href="#"><?php _e( 'Get System Report', 'give' ); ?></a>
-		<a class="button-secondary docs" href="http://docs.givewp.com/systeminfo" target="_blank"><?php _e( 'Understanding the System Report', 'give' ); ?></a>
+		<a class="button-primary js-give-debug-report-button" href="#"><?php _e('Get System Report', 'give'); ?></a>
+		<a class="button-secondary docs" href="http://docs.givewp.com/systeminfo" target="_blank"><?php _e('Understanding the System Report', 'give'); ?></a>
 	</p>
 	<div class="give-debug-report js-give-debug-report">
 		<textarea readonly="readonly"></textarea>
@@ -35,55 +35,55 @@ 
 <table class="give-status-table widefat" cellspacing="0" id="status">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="WordPress Environment"><h2><?php _e( 'WordPress Environment', 'give' ); ?></h2></th>
+			<th colspan="3" data-export-label="WordPress Environment"><h2><?php _e('WordPress Environment', 'give'); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
-			<td data-export-label="Home URL"><?php _e( 'Home URL', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The URL of your site\'s homepage.', 'give' ) ); ?>"></span></td>
-			<td><?php form_option( 'home' ); ?></td>
+			<td data-export-label="Home URL"><?php _e('Home URL', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The URL of your site\'s homepage.', 'give')); ?>"></span></td>
+			<td><?php form_option('home'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Site URL"><?php _e( 'Site URL', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The root URL of your site.', 'give' ) ); ?>"></span></td>
-			<td><?php form_option( 'siteurl' ); ?></td>
+			<td data-export-label="Site URL"><?php _e('Site URL', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The root URL of your site.', 'give')); ?>"></span></td>
+			<td><?php form_option('siteurl'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="WP Version"><?php _e( 'WP Version', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The version of WordPress installed on your site.', 'give' ) ); ?>"></span></td>
+			<td data-export-label="WP Version"><?php _e('WP Version', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The version of WordPress installed on your site.', 'give')); ?>"></span></td>
 			<td><?php bloginfo('version'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="WP Multisite"><?php _e( 'WP Multisite', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether or not you have WordPress Multisite enabled.', 'give' ) ); ?>"></span></td>
-			<td><?php if ( is_multisite() ) echo '<span class="dashicons dashicons-yes"></span>'; else echo '&ndash;'; ?></td>
+			<td data-export-label="WP Multisite"><?php _e('WP Multisite', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether or not you have WordPress Multisite enabled.', 'give')); ?>"></span></td>
+			<td><?php if (is_multisite()) echo '<span class="dashicons dashicons-yes"></span>'; else echo '&ndash;'; ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="WP Memory Limit"><?php _e( 'WP Memory Limit', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The maximum amount of memory (RAM) that your site can use at one time.', 'give' ) ); ?>"></span></td>
+			<td data-export-label="WP Memory Limit"><?php _e('WP Memory Limit', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The maximum amount of memory (RAM) that your site can use at one time.', 'give')); ?>"></span></td>
 			<td>
 				<?php
-				$memory = give_let_to_num( WP_MEMORY_LIMIT );
+				$memory = give_let_to_num(WP_MEMORY_LIMIT);
 
-				if ( function_exists( 'memory_get_usage' ) ) {
-					$system_memory = give_let_to_num( @ini_get( 'memory_limit' ) );
-					$memory        = max( $memory, $system_memory );
+				if (function_exists('memory_get_usage')) {
+					$system_memory = give_let_to_num(@ini_get('memory_limit'));
+					$memory        = max($memory, $system_memory);
 				}
 
-				if ( $memory < 67108864 ) {
-					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( '%s - We recommend setting memory to at least 64 MB. See: %s', 'give' ), size_format( $memory ), '<a href="https://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP" target="_blank">' . __( 'Increasing memory allocated to PHP', 'give' ) . '</a>' ) . '</mark>';
+				if ($memory < 67108864) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> '.sprintf(__('%s - We recommend setting memory to at least 64 MB. See: %s', 'give'), size_format($memory), '<a href="https://codex.wordpress.org/Editing_wp-config.php#Increasing_memory_allocated_to_PHP" target="_blank">'.__('Increasing memory allocated to PHP', 'give').'</a>').'</mark>';
 				} else {
-					echo '<mark class="yes">' . size_format( $memory ) . '</mark>';
+					echo '<mark class="yes">'.size_format($memory).'</mark>';
 				}
 				?>
 			</td>
 		</tr>
 		<tr>
-			<td data-export-label="WP Debug Mode"><?php _e( 'WP Debug Mode', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Displays whether or not WordPress is in Debug Mode.', 'give' ) ); ?>"></span></td>
+			<td data-export-label="WP Debug Mode"><?php _e('WP Debug Mode', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Displays whether or not WordPress is in Debug Mode.', 'give')); ?>"></span></td>
 			<td>
-				<?php if ( defined( 'WP_DEBUG' ) && WP_DEBUG ) : ?>
+				<?php if (defined('WP_DEBUG') && WP_DEBUG) : ?>
 					<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>
 				<?php else : ?>
 					<mark class="no">&ndash;</mark>
@@ -91,10 +91,10 @@ 
 			</td>
 		</tr>
 		<tr>
-			<td data-export-label="WP Cron"><?php _e( 'WP Cron', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Displays whether or not WP Cron Jobs are enabled.', 'give' ) ); ?>"></span></td>
+			<td data-export-label="WP Cron"><?php _e('WP Cron', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Displays whether or not WP Cron Jobs are enabled.', 'give')); ?>"></span></td>
 			<td>
-				<?php if ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) : ?>
+				<?php if (defined('DISABLE_WP_CRON') && DISABLE_WP_CRON) : ?>
 					<mark class="no">&ndash;</mark>
 				<?php else : ?>
 					<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>
@@ -102,55 +102,55 @@ 
 			</td>
 		</tr>
 		<tr>
-			<td data-export-label="Language"><?php _e( 'Language', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The current language used by WordPress. Default = English', 'give' ) ); ?>"></span></td>
+			<td data-export-label="Language"><?php _e('Language', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The current language used by WordPress. Default = English', 'give')); ?>"></span></td>
 			<td><?php echo get_locale(); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Permalink Structure"><?php _e( 'Permalink Structure', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The permalink structure as defined in Settings.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( get_option( 'permalink_structure', __( 'Default', 'give' ) ) ); ?></td>
+			<td data-export-label="Permalink Structure"><?php _e('Permalink Structure', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The permalink structure as defined in Settings.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(get_option('permalink_structure', __('Default', 'give'))); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Show on Front"><?php _e( 'Show on Front', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether your front page is set to show posts or a static page.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( get_option( 'show_on_front', '&ndash;' ) ); ?></td>
+			<td data-export-label="Show on Front"><?php _e('Show on Front', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether your front page is set to show posts or a static page.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(get_option('show_on_front', '&ndash;')); ?></td>
 		</tr>
-		<?php if ( 'page' === get_option( 'show_on_front' ) ) : ?>
+		<?php if ('page' === get_option('show_on_front')) : ?>
 			<?php
-			$front_page_id = absint( get_option( 'page_on_front' ) );
-			$blog_page_id  = absint( get_option( 'page_for_posts' ) );
+			$front_page_id = absint(get_option('page_on_front'));
+			$blog_page_id  = absint(get_option('page_for_posts'));
 			?>
 			<tr>
-				<td data-export-label="Page on Front"><?php _e( 'Page on Front', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The page set to display as your front page.', 'give' ) ); ?>"></span></td>
-				<td><?php echo 0 !== $front_page_id ? esc_html( get_the_title( $front_page_id ) . ' (#' . $front_page_id . ')' ) : __( 'Unset', 'give' ); ?></td>
+				<td data-export-label="Page on Front"><?php _e('Page on Front', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The page set to display as your front page.', 'give')); ?>"></span></td>
+				<td><?php echo 0 !== $front_page_id ? esc_html(get_the_title($front_page_id).' (#'.$front_page_id.')') : __('Unset', 'give'); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="Page for Posts"><?php _e( 'Page for Posts', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The page set to display your posts.', 'give' ) ); ?>"></span></td>
-				<td><?php echo 0 !== $blog_page_id ? esc_html( get_the_title( $blog_page_id ) . ' (#' . $blog_page_id . ')' ) : __( 'Unset', 'give' ); ?></td>
+				<td data-export-label="Page for Posts"><?php _e('Page for Posts', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The page set to display your posts.', 'give')); ?>"></span></td>
+				<td><?php echo 0 !== $blog_page_id ? esc_html(get_the_title($blog_page_id).' (#'.$blog_page_id.')') : __('Unset', 'give'); ?></td>
 			</tr>
-		<?php endif;?>
+		<?php endif; ?>
 		<tr>
-			<td data-export-label="Table Prefix Length"><?php _e( 'Table Prefix Length', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The length of the table prefix used in your WordPress database.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( strlen( $wpdb->prefix ) ); ?></td>
+			<td data-export-label="Table Prefix Length"><?php _e('Table Prefix Length', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The length of the table prefix used in your WordPress database.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(strlen($wpdb->prefix)); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Table Prefix Status"><?php _e( 'Table Prefix Status', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The status of the table prefix used in your WordPress database.', 'give' ) ); ?>"></span></td>
-			<td><?php echo strlen( $wpdb->prefix ) > 16 ? esc_html( 'Error: Too long', 'give' ) : esc_html( 'Acceptable', 'give' ); ?></td>
+			<td data-export-label="Table Prefix Status"><?php _e('Table Prefix Status', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The status of the table prefix used in your WordPress database.', 'give')); ?>"></span></td>
+			<td><?php echo strlen($wpdb->prefix) > 16 ? esc_html('Error: Too long', 'give') : esc_html('Acceptable', 'give'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Admin AJAX"><?php _e( 'Admin AJAX', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether Admin AJAX is accessible.', 'give' ) ); ?>"></span></td>
-			<td><?php echo give_test_ajax_works() ? __( 'Accessible', 'give' ) : __( 'Inaccessible', 'give' ); ?></td>
+			<td data-export-label="Admin AJAX"><?php _e('Admin AJAX', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether Admin AJAX is accessible.', 'give')); ?>"></span></td>
+			<td><?php echo give_test_ajax_works() ? __('Accessible', 'give') : __('Inaccessible', 'give'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Registered Post Stati"><?php _e( 'Registered Post Stati', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'A list of all registered post stati.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( implode( ', ', get_post_stati() ) ); ?></td>
+			<td data-export-label="Registered Post Stati"><?php _e('Registered Post Stati', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('A list of all registered post stati.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(implode(', ', get_post_stati())); ?></td>
 		</tr>
 	</tbody>
 </table>
@@ -158,71 +158,71 @@ 
 <table class="give-status-table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Server Environment"><h2><?php _e( 'Server Environment', 'give' ); ?></h2></th>
+			<th colspan="3" data-export-label="Server Environment"><h2><?php _e('Server Environment', 'give'); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
-			<td data-export-label="Hosting Provider"><?php _e( 'Hosting Provider', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The hosting provider for this WordPress installation.', 'give' ) ); ?>"></span></td>
-			<td><?php echo give_get_host() ? esc_html( give_get_host() ) : __( 'Unknown', 'give' ); ?></td>
+			<td data-export-label="Hosting Provider"><?php _e('Hosting Provider', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The hosting provider for this WordPress installation.', 'give')); ?>"></span></td>
+			<td><?php echo give_get_host() ? esc_html(give_get_host()) : __('Unknown', 'give'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Server Info"><?php _e( 'Server Info', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Information about the web server that is currently hosting your site.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( $_SERVER['SERVER_SOFTWARE'] ); ?></td>
+			<td data-export-label="Server Info"><?php _e('Server Info', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Information about the web server that is currently hosting your site.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html($_SERVER['SERVER_SOFTWARE']); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="PHP Version"><?php _e( 'PHP Version', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The version of PHP installed on your hosting server.', 'give' ) ); ?>"></span></td>
+			<td data-export-label="PHP Version"><?php _e('PHP Version', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The version of PHP installed on your hosting server.', 'give')); ?>"></span></td>
 			<td><?php
 				// Check if phpversion function exists.
-				if ( function_exists( 'phpversion' ) ) {
+				if (function_exists('phpversion')) {
 					$php_version = phpversion();
 
-					if ( version_compare( $php_version, '5.6', '<' ) ) {
-						echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( '%s - We recommend a minimum PHP version of 5.6. See: %s', 'give' ), esc_html( $php_version ), '<a href="https://givewp.com/documentation/core/settings/system-info/" target="_blank">' . __( 'PHP Requirements in Give', 'give' ) . '</a>' ) . '</mark>';
+					if (version_compare($php_version, '5.6', '<')) {
+						echo '<mark class="error"><span class="dashicons dashicons-warning"></span> '.sprintf(__('%s - We recommend a minimum PHP version of 5.6. See: %s', 'give'), esc_html($php_version), '<a href="https://givewp.com/documentation/core/settings/system-info/" target="_blank">'.__('PHP Requirements in Give', 'give').'</a>').'</mark>';
 					} else {
-						echo '<mark class="yes">' . esc_html( $php_version ) . '</mark>';
+						echo '<mark class="yes">'.esc_html($php_version).'</mark>';
 					}
 				} else {
-					_e( "Couldn't determine PHP version because phpversion() doesn't exist.", 'give' );
+					_e("Couldn't determine PHP version because phpversion() doesn't exist.", 'give');
 				}
 				?></td>
 		</tr>
-		<?php if ( function_exists( 'ini_get' ) ) : ?>
+		<?php if (function_exists('ini_get')) : ?>
 			<tr>
-				<td data-export-label="PHP Post Max Size"><?php _e( 'PHP Post Max Size', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The largest filesize that can be contained in one post.', 'give' ) ); ?>"></span></td>
-				<td><?php echo size_format( give_let_to_num( ini_get( 'post_max_size' ) ) ); ?></td>
+				<td data-export-label="PHP Post Max Size"><?php _e('PHP Post Max Size', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The largest filesize that can be contained in one post.', 'give')); ?>"></span></td>
+				<td><?php echo size_format(give_let_to_num(ini_get('post_max_size'))); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="PHP Time Limit"><?php _e( 'PHP Time Limit', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The amount of time (in seconds) that your site will spend on a single operation before timing out (to avoid server lockups).', 'give' ) ); ?>"></span></td>
-				<td><?php echo ini_get( 'max_execution_time' ); ?></td>
+				<td data-export-label="PHP Time Limit"><?php _e('PHP Time Limit', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The amount of time (in seconds) that your site will spend on a single operation before timing out (to avoid server lockups).', 'give')); ?>"></span></td>
+				<td><?php echo ini_get('max_execution_time'); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="PHP Max Input Vars"><?php _e( 'PHP Max Input Vars', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The maximum number of variables your server can use for a single function to avoid overloads.', 'give' ) ); ?>"></span></td>
-				<td><?php echo ini_get( 'max_input_vars' ); ?></td>
+				<td data-export-label="PHP Max Input Vars"><?php _e('PHP Max Input Vars', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The maximum number of variables your server can use for a single function to avoid overloads.', 'give')); ?>"></span></td>
+				<td><?php echo ini_get('max_input_vars'); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="PHP Max Upload Size"><?php _e( 'PHP Max Upload Size', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The largest filesize that can be uploaded to your WordPress installation.', 'give' ) ); ?>"></span></td>
-				<td><?php echo size_format( wp_max_upload_size() ); ?></td>
+				<td data-export-label="PHP Max Upload Size"><?php _e('PHP Max Upload Size', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The largest filesize that can be uploaded to your WordPress installation.', 'give')); ?>"></span></td>
+				<td><?php echo size_format(wp_max_upload_size()); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="cURL Version"><?php _e( 'cURL Version', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The version of cURL installed on your server.', 'give' ) ); ?>"></span></td>
+				<td data-export-label="cURL Version"><?php _e('cURL Version', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The version of cURL installed on your server.', 'give')); ?>"></span></td>
 				<td>
 					<?php
-					if ( function_exists( 'curl_version' ) ) {
+					if (function_exists('curl_version')) {
 						$curl_version = curl_version();
 
-						if ( version_compare( $curl_version['version'], '7.40', '<' ) ) {
-							echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( '%s - We recommend a minimum cURL version of 7.40.', 'give' ), esc_html( $curl_version['version'] . ', ' . $curl_version['ssl_version'] ) ) . '</mark>';
+						if (version_compare($curl_version['version'], '7.40', '<')) {
+							echo '<mark class="error"><span class="dashicons dashicons-warning"></span> '.sprintf(__('%s - We recommend a minimum cURL version of 7.40.', 'give'), esc_html($curl_version['version'].', '.$curl_version['ssl_version'])).'</mark>';
 						} else {
-							echo '<mark class="yes">' . esc_html( $curl_version['version'] . ', ' . $curl_version['ssl_version'] ) . '</mark>';
+							echo '<mark class="yes">'.esc_html($curl_version['version'].', '.$curl_version['ssl_version']).'</mark>';
 						}
 					} else {
 						echo '&ndash';
@@ -231,42 +231,42 @@ 
 				</td>
 			</tr>
 			<tr>
-				<td data-export-label="SUHOSIN Installed"><?php _e( 'SUHOSIN Installed', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Suhosin is an advanced protection system for PHP installations. It was designed to protect your servers on the one hand against a number of well known problems in PHP applications and on the other hand against potential unknown vulnerabilities within these applications or the PHP core itself. If enabled on your server, Suhosin may need to be configured to increase its data submission limits.', 'give' ) ); ?>"></span></td>
-				<td><?php echo extension_loaded( 'suhosin' ) ? '<span class="dashicons dashicons-yes"></span>' : '&ndash;'; ?></td>
+				<td data-export-label="SUHOSIN Installed"><?php _e('SUHOSIN Installed', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Suhosin is an advanced protection system for PHP installations. It was designed to protect your servers on the one hand against a number of well known problems in PHP applications and on the other hand against potential unknown vulnerabilities within these applications or the PHP core itself. If enabled on your server, Suhosin may need to be configured to increase its data submission limits.', 'give')); ?>"></span></td>
+				<td><?php echo extension_loaded('suhosin') ? '<span class="dashicons dashicons-yes"></span>' : '&ndash;'; ?></td>
 			</tr>
 		<?php endif;
 
-		if ( $wpdb->use_mysqli ) {
-			$ver = mysqli_get_server_info( $wpdb->dbh );
+		if ($wpdb->use_mysqli) {
+			$ver = mysqli_get_server_info($wpdb->dbh);
 		} else {
 			$ver = mysql_get_server_info();
 		}
 
-		if ( ! empty( $wpdb->is_mysql ) && ! stristr( $ver, 'MariaDB' ) ) : ?>
+		if ( ! empty($wpdb->is_mysql) && ! stristr($ver, 'MariaDB')) : ?>
 			<tr>
-				<td data-export-label="MySQL Version"><?php _e( 'MySQL Version', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The version of MySQL installed on your hosting server.', 'give' ) ); ?>"></span></td>
+				<td data-export-label="MySQL Version"><?php _e('MySQL Version', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The version of MySQL installed on your hosting server.', 'give')); ?>"></span></td>
 				<td>
 					<?php
 					$mysql_version = $wpdb->db_version();
 
-					if ( version_compare( $mysql_version, '5.6', '<' ) ) {
-						echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( '%s - We recommend a minimum MySQL version of 5.6. See: %s', 'give' ), esc_html( $mysql_version ), '<a href="https://wordpress.org/about/requirements/" target="_blank">' . __( 'WordPress Requirements', 'give' ) . '</a>' ) . '</mark>';
+					if (version_compare($mysql_version, '5.6', '<')) {
+						echo '<mark class="error"><span class="dashicons dashicons-warning"></span> '.sprintf(__('%s - We recommend a minimum MySQL version of 5.6. See: %s', 'give'), esc_html($mysql_version), '<a href="https://wordpress.org/about/requirements/" target="_blank">'.__('WordPress Requirements', 'give').'</a>').'</mark>';
 					} else {
-						echo '<mark class="yes">' . esc_html( $mysql_version ) . '</mark>';
+						echo '<mark class="yes">'.esc_html($mysql_version).'</mark>';
 					}
 					?>
 				</td>
 			</tr>
 		<?php endif; ?>
 		<tr>
-			<td data-export-label="Default Timezone is UTC"><?php _e( 'Default Timezone is UTC', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The default timezone for your server.', 'give' ) ); ?>"></span></td>
+			<td data-export-label="Default Timezone is UTC"><?php _e('Default Timezone is UTC', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The default timezone for your server.', 'give')); ?>"></span></td>
 			<td><?php
 				$default_timezone = date_default_timezone_get();
-				if ( 'UTC' !== $default_timezone ) {
-					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> ' . sprintf( __( 'Default timezone is %s - it should be UTC', 'give' ), $default_timezone ) . '</mark>';
+				if ('UTC' !== $default_timezone) {
+					echo '<mark class="error"><span class="dashicons dashicons-warning"></span> '.sprintf(__('Default timezone is %s - it should be UTC', 'give'), $default_timezone).'</mark>';
 				} else {
 					echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark>';
 				} ?>
@@ -277,118 +277,118 @@ 
 
 		// fsockopen/cURL.
 		$posting['fsockopen_curl']['name'] = 'fsockopen/cURL';
-		$posting['fsockopen_curl']['help'] = __( 'Payment gateways can use cURL to communicate with remote servers to authorize payments, other plugins may also use it when communicating with remote services.', 'give' );
+		$posting['fsockopen_curl']['help'] = __('Payment gateways can use cURL to communicate with remote servers to authorize payments, other plugins may also use it when communicating with remote services.', 'give');
 
-		if ( function_exists( 'fsockopen' ) || function_exists( 'curl_init' ) ) {
+		if (function_exists('fsockopen') || function_exists('curl_init')) {
 			$posting['fsockopen_curl']['success'] = true;
 		} else {
 			$posting['fsockopen_curl']['success'] = false;
-			$posting['fsockopen_curl']['note']    = __( 'Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'give' );
+			$posting['fsockopen_curl']['note']    = __('Your server does not have fsockopen or cURL enabled - PayPal IPN and other scripts which communicate with other servers will not work. Contact your hosting provider.', 'give');
 		}
 
 		// SOAP.
 		$posting['soap_client']['name'] = 'SoapClient';
-		$posting['soap_client']['help'] = __( 'Some webservices like shipping use SOAP to get information from remote servers, for example, live shipping quotes from FedEx require SOAP to be installed.', 'give' );
+		$posting['soap_client']['help'] = __('Some webservices like shipping use SOAP to get information from remote servers, for example, live shipping quotes from FedEx require SOAP to be installed.', 'give');
 
-		if ( class_exists( 'SoapClient' ) ) {
+		if (class_exists('SoapClient')) {
 			$posting['soap_client']['success'] = true;
 		} else {
 			$posting['soap_client']['success'] = false;
-			$posting['soap_client']['note']    = sprintf( __( 'Your server does not have the %s class enabled - some gateway plugins which use SOAP may not work as expected.', 'give' ), '<a href="https://php.net/manual/en/class.soapclient.php">SoapClient</a>' );
+			$posting['soap_client']['note']    = sprintf(__('Your server does not have the %s class enabled - some gateway plugins which use SOAP may not work as expected.', 'give'), '<a href="https://php.net/manual/en/class.soapclient.php">SoapClient</a>');
 		}
 
 		// DOMDocument.
 		$posting['dom_document']['name'] = 'DOMDocument';
-		$posting['dom_document']['help'] = __( 'HTML/Multipart emails use DOMDocument to generate inline CSS in templates.', 'give' );
+		$posting['dom_document']['help'] = __('HTML/Multipart emails use DOMDocument to generate inline CSS in templates.', 'give');
 
-		if ( class_exists( 'DOMDocument' ) ) {
+		if (class_exists('DOMDocument')) {
 			$posting['dom_document']['success'] = true;
 		} else {
 			$posting['dom_document']['success'] = false;
-			$posting['dom_document']['note']    = sprintf( __( 'Your server does not have the %s class enabled - HTML/Multipart emails, and also some extensions, will not work without DOMDocument.', 'give' ), '<a href="https://php.net/manual/en/class.domdocument.php">DOMDocument</a>' );
+			$posting['dom_document']['note']    = sprintf(__('Your server does not have the %s class enabled - HTML/Multipart emails, and also some extensions, will not work without DOMDocument.', 'give'), '<a href="https://php.net/manual/en/class.domdocument.php">DOMDocument</a>');
 		}
 
 		// gzip.
 		$posting['gzip']['name'] = 'gzip';
-		$posting['gzip']['help'] = __( 'gzip is used for file compression and decompression.', 'give' );
+		$posting['gzip']['help'] = __('gzip is used for file compression and decompression.', 'give');
 
-		if ( is_callable( 'gzopen' ) ) {
+		if (is_callable('gzopen')) {
 			$posting['gzip']['success'] = true;
 		} else {
 			$posting['gzip']['success'] = false;
-			$posting['gzip']['note']    = sprintf( __( 'Your server does not support the %s function - this is used for file compression and decompression.', 'give' ), '<a href="https://php.net/manual/en/zlib.installation.php">gzopen</a>' );
+			$posting['gzip']['note']    = sprintf(__('Your server does not support the %s function - this is used for file compression and decompression.', 'give'), '<a href="https://php.net/manual/en/zlib.installation.php">gzopen</a>');
 		}
 
 		// GD Graphics Library.
 		$posting['gd']['name'] = 'GD Graphics Library';
-		$posting['gd']['help'] = __( 'GD Graphics Library is used for dynamically manipulating images.', 'give' );
-		$posting['gd']['success'] = extension_loaded( 'gd' ) && function_exists( 'gd_info' ) ? true : false;
+		$posting['gd']['help'] = __('GD Graphics Library is used for dynamically manipulating images.', 'give');
+		$posting['gd']['success'] = extension_loaded('gd') && function_exists('gd_info') ? true : false;
 
 		// Multibyte String.
 		$posting['mbstring']['name'] = 'Multibyte String';
-		$posting['mbstring']['help'] = __( 'Multibyte String (mbstring) is used to convert character encoding, like for emails or converting characters to lowercase.', 'give' );
+		$posting['mbstring']['help'] = __('Multibyte String (mbstring) is used to convert character encoding, like for emails or converting characters to lowercase.', 'give');
 
-		if ( extension_loaded( 'mbstring' ) ) {
+		if (extension_loaded('mbstring')) {
 			$posting['mbstring']['success'] = true;
 		} else {
 			$posting['mbstring']['success'] = false;
-			$posting['mbstring']['note']    = sprintf( __( 'Your server does not support the %s functions - this is required for better character encoding. Some fallbacks will be used instead for it.', 'give' ), '<a href="https://php.net/manual/en/mbstring.installation.php">mbstring</a>' );
+			$posting['mbstring']['note']    = sprintf(__('Your server does not support the %s functions - this is required for better character encoding. Some fallbacks will be used instead for it.', 'give'), '<a href="https://php.net/manual/en/mbstring.installation.php">mbstring</a>');
 		}
 
 		// WP Remote Post Check.
-		$posting['wp_remote_post']['name'] = __( 'Remote Post', 'give');
-		$posting['wp_remote_post']['help'] = __( 'PayPal uses this method of communicating when sending back transaction information.', 'give' );
+		$posting['wp_remote_post']['name'] = __('Remote Post', 'give');
+		$posting['wp_remote_post']['help'] = __('PayPal uses this method of communicating when sending back transaction information.', 'give');
 
-		$response = wp_safe_remote_post( 'https://www.paypal.com/cgi-bin/webscr', array(
+		$response = wp_safe_remote_post('https://www.paypal.com/cgi-bin/webscr', array(
 			'timeout'     => 60,
-			'user-agent'  => 'Give/' . GIVE_VERSION,
+			'user-agent'  => 'Give/'.GIVE_VERSION,
 			'httpversion' => '1.1',
 			'body'        => array(
 				'cmd'     => '_notify-validate'
 			)
-		) );
+		));
 
-		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+		if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 			$posting['wp_remote_post']['success'] = true;
 		} else {
-			$posting['wp_remote_post']['note']    = __( 'wp_remote_post() failed. PayPal IPN won\'t work with your server. Contact your hosting provider.', 'give' );
-			if ( is_wp_error( $response ) ) {
-				$posting['wp_remote_post']['note'] .= ' ' . sprintf( __( 'Error: %s', 'give' ), sanitize_text_field( $response->get_error_message() ) );
+			$posting['wp_remote_post']['note']    = __('wp_remote_post() failed. PayPal IPN won\'t work with your server. Contact your hosting provider.', 'give');
+			if (is_wp_error($response)) {
+				$posting['wp_remote_post']['note'] .= ' '.sprintf(__('Error: %s', 'give'), sanitize_text_field($response->get_error_message()));
 			} else {
-				$posting['wp_remote_post']['note'] .= ' ' . sprintf( __( 'Status code: %s', 'give' ), sanitize_text_field( $response['response']['code'] ) );
+				$posting['wp_remote_post']['note'] .= ' '.sprintf(__('Status code: %s', 'give'), sanitize_text_field($response['response']['code']));
 			}
 			$posting['wp_remote_post']['success'] = false;
 		}
 
 		// WP Remote Get Check.
-		$posting['wp_remote_get']['name'] = __( 'Remote Get', 'give');
-		$posting['wp_remote_get']['help'] = __( 'Give plugins may use this method of communication when checking for plugin updates.', 'give' );
+		$posting['wp_remote_get']['name'] = __('Remote Get', 'give');
+		$posting['wp_remote_get']['help'] = __('Give plugins may use this method of communication when checking for plugin updates.', 'give');
 
-		$response = wp_safe_remote_get( 'https://woocommerce.com/wc-api/product-key-api?request=ping&network=' . ( is_multisite() ? '1' : '0' ) );
+		$response = wp_safe_remote_get('https://woocommerce.com/wc-api/product-key-api?request=ping&network='.(is_multisite() ? '1' : '0'));
 
-		if ( ! is_wp_error( $response ) && $response['response']['code'] >= 200 && $response['response']['code'] < 300 ) {
+		if ( ! is_wp_error($response) && $response['response']['code'] >= 200 && $response['response']['code'] < 300) {
 			$posting['wp_remote_get']['success'] = true;
 		} else {
-			$posting['wp_remote_get']['note']    = __( 'wp_remote_get() failed. The WooCommerce plugin updater won\'t work with your server. Contact your hosting provider.', 'give' );
-			if ( is_wp_error( $response ) ) {
-				$posting['wp_remote_get']['note'] .= ' ' . sprintf( __( 'Error: %s', 'give' ), give_clean( $response->get_error_message() ) );
+			$posting['wp_remote_get']['note']    = __('wp_remote_get() failed. The WooCommerce plugin updater won\'t work with your server. Contact your hosting provider.', 'give');
+			if (is_wp_error($response)) {
+				$posting['wp_remote_get']['note'] .= ' '.sprintf(__('Error: %s', 'give'), give_clean($response->get_error_message()));
 			} else {
-				$posting['wp_remote_get']['note'] .= ' ' . sprintf( __( 'Status code: %s', 'give' ), give_clean( $response['response']['code'] ) );
+				$posting['wp_remote_get']['note'] .= ' '.sprintf(__('Status code: %s', 'give'), give_clean($response['response']['code']));
 			}
 			$posting['wp_remote_get']['success'] = false;
 		}
 
-		$posting = apply_filters( 'woocommerce_debug_posting', $posting );
+		$posting = apply_filters('woocommerce_debug_posting', $posting);
 
-		foreach ( $posting as $post ) {
-			$mark = ! empty( $post['success'] ) ? 'yes' : 'error';
+		foreach ($posting as $post) {
+			$mark = ! empty($post['success']) ? 'yes' : 'error';
 			?>
 			<tr>
-				<td data-export-label="<?php echo esc_html( $post['name'] ); ?>"><?php echo esc_html( $post['name'] ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( isset( $post['help'] ) ? $post['help'] : '' ); ?>"></span></td>
+				<td data-export-label="<?php echo esc_html($post['name']); ?>"><?php echo esc_html($post['name']); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(isset($post['help']) ? $post['help'] : ''); ?>"></span></td>
 				<td>
 					<mark class="<?php echo $mark; ?>">
-						<?php echo ! empty( $post['success'] ) ? '<span class="dashicons dashicons-yes"></span>' : '<span class="dashicons dashicons-no-alt"></span>'; ?> <?php echo ! empty( $post['note'] ) ? wp_kses_data( $post['note'] ) : ''; ?>
+						<?php echo ! empty($post['success']) ? '<span class="dashicons dashicons-yes"></span>' : '<span class="dashicons dashicons-no-alt"></span>'; ?> <?php echo ! empty($post['note']) ? wp_kses_data($post['note']) : ''; ?>
 					</mark>
 				</td>
 			</tr>
@@ -401,102 +401,102 @@ 
 <table class="give-status-table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Give Configuration"><h2><?php _e( 'Give Configuration', 'give' ); ?></h2></th>
+			<th colspan="3" data-export-label="Give Configuration"><h2><?php _e('Give Configuration', 'give'); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
-			<td data-export-label="Give Version"><?php _e( 'Give Version', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The version of Give installed on your site.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( GIVE_VERSION ); ?></td>
+			<td data-export-label="Give Version"><?php _e('Give Version', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The version of Give installed on your site.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(GIVE_VERSION); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Upgraded From"><?php _e( 'Upgraded From', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The version of Give installed prior to the last update.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( get_option( 'give_version_upgraded_from', '&ndash;' ) ); ?></td>
+			<td data-export-label="Upgraded From"><?php _e('Upgraded From', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The version of Give installed prior to the last update.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(get_option('give_version_upgraded_from', '&ndash;')); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Test Mode"><?php _e( 'Test Mode', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether Test Mode is enabled in Give settings.', 'give' ) ); ?>"></span></td>
-			<td><?php echo give_is_test_mode() ? __( 'Enabled', 'give' ) : __( 'Disabled', 'give' ); ?></td>
+			<td data-export-label="Test Mode"><?php _e('Test Mode', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether Test Mode is enabled in Give settings.', 'give')); ?>"></span></td>
+			<td><?php echo give_is_test_mode() ? __('Enabled', 'give') : __('Disabled', 'give'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Currency Code"><?php _e( 'Currency Code', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The currency code selected in Give settings.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( give_get_currency() ); ?></td>
+			<td data-export-label="Currency Code"><?php _e('Currency Code', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The currency code selected in Give settings.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(give_get_currency()); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Currency Position"><?php _e( 'Currency Position', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The currency position selected in Give settings.', 'give' ) ); ?>"></span></td>
-			<td><?php echo 'before' === give_get_option( 'currency_position' ) ? __( 'Before', 'give' ) : __( 'After', 'give' ); ?></td>
+			<td data-export-label="Currency Position"><?php _e('Currency Position', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The currency position selected in Give settings.', 'give')); ?>"></span></td>
+			<td><?php echo 'before' === give_get_option('currency_position') ? __('Before', 'give') : __('After', 'give'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Decimal Separator"><?php _e( 'Decimal Separator', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The decimal separator defined in Give settings.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( give_get_option( 'decimal_separator', '.' ) ); ?></td>
+			<td data-export-label="Decimal Separator"><?php _e('Decimal Separator', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The decimal separator defined in Give settings.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(give_get_option('decimal_separator', '.')); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Thousands Separator"><?php _e( 'Thousands Separator', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The thousands separator defined in Give settings.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( give_get_option( 'thousands_separator', ',' ) ); ?></td>
+			<td data-export-label="Thousands Separator"><?php _e('Thousands Separator', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The thousands separator defined in Give settings.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(give_get_option('thousands_separator', ',')); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Success Page"><?php _e( 'Success Page', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The page where donors land following a successful transaction.', 'give' ) ); ?>"></span></td>
-			<td><?php echo ! empty( $give_options['success_page'] ) ? esc_url( get_permalink( $give_options['success_page'] ) ) : '&ndash;'; ?></td>
+			<td data-export-label="Success Page"><?php _e('Success Page', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The page where donors land following a successful transaction.', 'give')); ?>"></span></td>
+			<td><?php echo ! empty($give_options['success_page']) ? esc_url(get_permalink($give_options['success_page'])) : '&ndash;'; ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Failure Page"><?php _e( 'Failure Page', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The page where donors land following a failed transaction.', 'give' ) ); ?>"></span></td>
-			<td><?php echo ! empty( $give_options['failure_page'] ) ? esc_url( get_permalink( $give_options['failure_page'] ) ) : '&ndash;'; ?></td>
+			<td data-export-label="Failure Page"><?php _e('Failure Page', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The page where donors land following a failed transaction.', 'give')); ?>"></span></td>
+			<td><?php echo ! empty($give_options['failure_page']) ? esc_url(get_permalink($give_options['failure_page'])) : '&ndash;'; ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Give Forms Slug"><?php _e( 'Give Forms Slug', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The slug used for Give donation forms.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( defined( 'GIVE_SLUG' ) ? '/' . GIVE_SLUG . '/' : '/donations/' ); ?></td>
+			<td data-export-label="Give Forms Slug"><?php _e('Give Forms Slug', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The slug used for Give donation forms.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html(defined('GIVE_SLUG') ? '/'.GIVE_SLUG.'/' : '/donations/'); ?></td>
 		</tr>
 		<?php
 		$active_gateways = give_get_enabled_payment_gateways();
 		$enabled_gateways = $default_gateway = '';
 
-		if ( $active_gateways ) {
-			$default_gateway_is_active = give_is_gateway_active( give_get_default_gateway( null ) );
+		if ($active_gateways) {
+			$default_gateway_is_active = give_is_gateway_active(give_get_default_gateway(null));
 
-			if ( $default_gateway_is_active ) {
-				$default_gateway = give_get_default_gateway( null );
-				$default_gateway = $active_gateways[ $default_gateway ]['admin_label'];
+			if ($default_gateway_is_active) {
+				$default_gateway = give_get_default_gateway(null);
+				$default_gateway = $active_gateways[$default_gateway]['admin_label'];
 			} else {
-				$default_gateway = __( 'Test Donation', 'give' );
+				$default_gateway = __('Test Donation', 'give');
 			}
 
 			$gateways = array();
 
-			foreach ( $active_gateways as $gateway ) {
+			foreach ($active_gateways as $gateway) {
 				$gateways[] = $gateway['admin_label'];
 			}
 
-			$enabled_gateways = implode( ', ', $gateways );
+			$enabled_gateways = implode(', ', $gateways);
 		}
 		?>
 		<tr>
-			<td data-export-label="Enabled Payment Gateways"><?php _e( 'Enabled Payment Gateways', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'All payment gateways enabled in Give settings.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( ! empty( $enabled_gateways ) ? $enabled_gateways : '&ndash;' ); ?></td>
+			<td data-export-label="Enabled Payment Gateways"><?php _e('Enabled Payment Gateways', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('All payment gateways enabled in Give settings.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html( ! empty($enabled_gateways) ? $enabled_gateways : '&ndash;'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Default Payment Gateway"><?php _e( 'Default Payment Gateway', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The default payment gateway selected in Give settings.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( ! empty( $default_gateway ) ? $default_gateway : '&ndash;' ); ?></td>
+			<td data-export-label="Default Payment Gateway"><?php _e('Default Payment Gateway', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The default payment gateway selected in Give settings.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html( ! empty($default_gateway) ? $default_gateway : '&ndash;'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Admin Email Notifications"><?php _e( 'Admin Email Notifications', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether admins receive email notifications of transactions.', 'give' ) ); ?>"></span></td>
-			<td><?php echo 'enabled' === give_get_option( 'admin_notices' ) ? __( 'Enabled', 'give' ) : __( 'Disabled', 'give' ); ?></td>
+			<td data-export-label="Admin Email Notifications"><?php _e('Admin Email Notifications', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether admins receive email notifications of transactions.', 'give')); ?>"></span></td>
+			<td><?php echo 'enabled' === give_get_option('admin_notices') ? __('Enabled', 'give') : __('Disabled', 'give'); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Donor Email Access"><?php _e( 'Donor Email Access', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether donors can access their donation history using only email.', 'give' ) ); ?>"></span></td>
-			<td><?php echo 'enabled' === give_get_option( 'email_access' ) ? __( 'Enabled', 'give' ) : __( 'Disabled', 'give' ); ?></td>
+			<td data-export-label="Donor Email Access"><?php _e('Donor Email Access', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether donors can access their donation history using only email.', 'give')); ?>"></span></td>
+			<td><?php echo 'enabled' === give_get_option('email_access') ? __('Enabled', 'give') : __('Disabled', 'give'); ?></td>
 		</tr>
 	</tbody>
 </table>
@@ -504,45 +504,45 @@ 
 <table class="give-status-table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Session Configuration"><h2><?php _e( 'Session Configuration', 'give' ); ?></h2></th>
+			<th colspan="3" data-export-label="Session Configuration"><h2><?php _e('Session Configuration', 'give'); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
-			<td data-export-label="Give Use Sessions"><?php _e( 'Give Use Sessions', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether PHP sessions are enforced, enabled, or disabled.', 'give' ) ); ?>"></span></td>
-			<td><?php echo defined( 'GIVE_USE_PHP_SESSIONS' ) && GIVE_USE_PHP_SESSIONS ? __( 'Enforced', 'give' ) : ( Give()->session->use_php_sessions() ? __( 'Enabled', 'give' ) : __( 'Disabled', 'give' ) ); ?></td>
+			<td data-export-label="Give Use Sessions"><?php _e('Give Use Sessions', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether PHP sessions are enforced, enabled, or disabled.', 'give')); ?>"></span></td>
+			<td><?php echo defined('GIVE_USE_PHP_SESSIONS') && GIVE_USE_PHP_SESSIONS ? __('Enforced', 'give') : (Give()->session->use_php_sessions() ? __('Enabled', 'give') : __('Disabled', 'give')); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Session"><?php _e( 'Session', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether a PHP session is currently set.', 'give' ) ); ?>"></span></td>
-			<td><?php echo isset( $_SESSION ) ? __( 'Enabled', 'give' ) : __( 'Disabled', 'give' ); ?></td>
+			<td data-export-label="Session"><?php _e('Session', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether a PHP session is currently set.', 'give')); ?>"></span></td>
+			<td><?php echo isset($_SESSION) ? __('Enabled', 'give') : __('Disabled', 'give'); ?></td>
 		</tr>
-		<?php if ( isset( $_SESSION ) ) { ?>
+		<?php if (isset($_SESSION)) { ?>
 			<tr>
-				<td data-export-label="Session Name"><?php _e( 'Session Name', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The name of the current PHP session.', 'give' ) ); ?>"></span></td>
-				<td><?php echo esc_html( ini_get( 'session.name' ) ); ?></td>
+				<td data-export-label="Session Name"><?php _e('Session Name', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The name of the current PHP session.', 'give')); ?>"></span></td>
+				<td><?php echo esc_html(ini_get('session.name')); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="Cookie Path"><?php _e( 'Cookie Path', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The cookie path of the current PHP session.', 'give' ) ); ?>"></span></td>
-				<td><?php echo esc_html( ini_get( 'session.cookie_path' ) ); ?></td>
+				<td data-export-label="Cookie Path"><?php _e('Cookie Path', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The cookie path of the current PHP session.', 'give')); ?>"></span></td>
+				<td><?php echo esc_html(ini_get('session.cookie_path')); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="Save Path"><?php _e( 'Save Path', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The save path of the current PHP session.', 'give' ) ); ?>"></span></td>
-				<td><?php echo esc_html( ini_get( 'session.save_path' ) ); ?></td>
+				<td data-export-label="Save Path"><?php _e('Save Path', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The save path of the current PHP session.', 'give')); ?>"></span></td>
+				<td><?php echo esc_html(ini_get('session.save_path')); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="Use Cookies"><?php _e( 'Use Cookies', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether the current PHP session is set to use cookies.', 'give' ) ); ?>"></span></td>
-				<td><?php echo ini_get( 'session.use_cookies' ) ? __( 'Enabled', 'give' ) : __( 'Disabled', 'give' ); ?></td>
+				<td data-export-label="Use Cookies"><?php _e('Use Cookies', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether the current PHP session is set to use cookies.', 'give')); ?>"></span></td>
+				<td><?php echo ini_get('session.use_cookies') ? __('Enabled', 'give') : __('Disabled', 'give'); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="Use Only Cookies"><?php _e( 'Use Only Cookies', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether the current PHP session is set to use only cookies.', 'give' ) ); ?>"></span></td>
-				<td><?php echo ini_get( 'session.use_only_cookies' ) ? __( 'Enabled', 'give' ) : __( 'Disabled', 'give' ); ?></td>
+				<td data-export-label="Use Only Cookies"><?php _e('Use Only Cookies', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether the current PHP session is set to use only cookies.', 'give')); ?>"></span></td>
+				<td><?php echo ini_get('session.use_only_cookies') ? __('Enabled', 'give') : __('Disabled', 'give'); ?></td>
 			</tr>
 		<?php } ?>
 	</tbody>
@@ -551,13 +551,13 @@ 
 <table class="give-status-table widefat" cellspacing="0">
 	<thead>
 	<tr>
-		<th colspan="3" data-export-label="Active Give Add-ons"><h2><?php _e( 'Active Give Add-ons', 'give' ); ?></h2></th>
+		<th colspan="3" data-export-label="Active Give Add-ons"><h2><?php _e('Active Give Add-ons', 'give'); ?></h2></th>
 	</tr>
 	</thead>
 	<tbody>
 		<?php
-		foreach ( $plugins as $plugin_data ) {
-			if ( 'active' != $plugin_data['Status'] ||  'add-on' != $plugin_data['Type'] ) {
+		foreach ($plugins as $plugin_data) {
+			if ('active' != $plugin_data['Status'] || 'add-on' != $plugin_data['Type']) {
 				continue;
 			}
 
@@ -565,30 +565,30 @@ 
 			$author_name = $plugin_data['Author'];
 
 			// Link the plugin name to the plugin URL if available.
-			if ( ! empty( $plugin_data['PluginURI'] ) ) {
-				$plugin_name = '<a href="' . esc_url( $plugin_data['PluginURI'] ) . '" title="' . esc_attr__( 'Visit plugin homepage' , 'give' ) . '">' . $plugin_name . '</a>';
+			if ( ! empty($plugin_data['PluginURI'])) {
+				$plugin_name = '<a href="'.esc_url($plugin_data['PluginURI']).'" title="'.esc_attr__('Visit plugin homepage', 'give').'">'.$plugin_name.'</a>';
 			}
 
 			// Link the author name to the author URL if available.
-			if ( ! empty( $plugin_data['AuthorURI'] ) ) {
-				$author_name = '<a href="' . esc_url( $plugin_data['AuthorURI'] ) . '" title="' . esc_attr__( 'Visit author homepage' , 'give' ) . '">' . $author_name . '</a>';
+			if ( ! empty($plugin_data['AuthorURI'])) {
+				$author_name = '<a href="'.esc_url($plugin_data['AuthorURI']).'" title="'.esc_attr__('Visit author homepage', 'give').'">'.$author_name.'</a>';
 			}
 			?>
 			<tr>
-				<td><?php echo wp_kses( $plugin_name, wp_kses_allowed_html( 'post' ) ); ?></td>
+				<td><?php echo wp_kses($plugin_name, wp_kses_allowed_html('post')); ?></td>
 				<td class="help">&nbsp;</td>
 				<td>
 					<?php
-					if ( true === $plugin_data['License'] ) {
-						echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark> ' . __( 'Licensed', 'give' );
+					if (true === $plugin_data['License']) {
+						echo '<mark class="yes"><span class="dashicons dashicons-yes"></span></mark> '.__('Licensed', 'give');
 					} else {
-						echo '<mark class="error"><span class="dashicons dashicons-no-alt"></span></mark> ' . __( 'Unlicensed', 'give' );
+						echo '<mark class="error"><span class="dashicons dashicons-no-alt"></span></mark> '.__('Unlicensed', 'give');
 					}
 
 					echo ' &ndash; '
-					     . sprintf( _x( 'by %s', 'by author', 'give' ), wp_kses( $author_name, wp_kses_allowed_html( 'post' ) ) )
+					     . sprintf(_x('by %s', 'by author', 'give'), wp_kses($author_name, wp_kses_allowed_html('post')))
 					     . ' &ndash; '
-					     . esc_html( $plugin_data['Version'] );
+					     . esc_html($plugin_data['Version']);
 					?>
 				</td>
 			</tr>
@@ -601,18 +601,18 @@ 
 <table class="give-status-table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Other Active Plugins"><h2><?php _e( 'Other Active Plugins', 'give' ); ?></h2></th>
+			<th colspan="3" data-export-label="Other Active Plugins"><h2><?php _e('Other Active Plugins', 'give'); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<?php
-		foreach ( $plugins as $plugin_data ) {
-			if ( 'active' != $plugin_data['Status'] ||  'other' != $plugin_data['Type'] ) {
+		foreach ($plugins as $plugin_data) {
+			if ('active' != $plugin_data['Status'] || 'other' != $plugin_data['Type']) {
 				continue;
 			}
 
 			// Do not show Give core plugin.
-			if ( 'Give - Donation Plugin' === $plugin_data['Name'] ) {
+			if ('Give - Donation Plugin' === $plugin_data['Name']) {
 				continue;
 			}
 
@@ -620,19 +620,19 @@ 
 			$author_name = $plugin_data['Author'];
 
 			// Link the plugin name to the plugin URL if available.
-			if ( ! empty( $plugin_data['PluginURI'] ) ) {
-				$plugin_name = '<a href="' . esc_url( $plugin_data['PluginURI'] ) . '" title="' . esc_attr__( 'Visit plugin homepage' , 'give' ) . '">' . $plugin_name . '</a>';
+			if ( ! empty($plugin_data['PluginURI'])) {
+				$plugin_name = '<a href="'.esc_url($plugin_data['PluginURI']).'" title="'.esc_attr__('Visit plugin homepage', 'give').'">'.$plugin_name.'</a>';
 			}
 
 			// Link the author name to the author URL if available.
-			if ( ! empty( $plugin_data['AuthorURI'] ) ) {
-				$author_name = '<a href="' . esc_url( $plugin_data['AuthorURI'] ) . '" title="' . esc_attr__( 'Visit author homepage' , 'give' ) . '">' . $author_name . '</a>';
+			if ( ! empty($plugin_data['AuthorURI'])) {
+				$author_name = '<a href="'.esc_url($plugin_data['AuthorURI']).'" title="'.esc_attr__('Visit author homepage', 'give').'">'.$author_name.'</a>';
 			}
 			?>
 			<tr>
-				<td><?php echo wp_kses( $plugin_name, wp_kses_allowed_html( 'post' ) ); ?></td>
+				<td><?php echo wp_kses($plugin_name, wp_kses_allowed_html('post')); ?></td>
 				<td class="help">&nbsp;</td>
-				<td><?php echo sprintf( _x( 'by %s', 'by author', 'give' ), wp_kses( $author_name, wp_kses_allowed_html( 'post' ) ) ) . ' &ndash; ' . esc_html( $plugin_data['Version'] ); ?></td>
+				<td><?php echo sprintf(_x('by %s', 'by author', 'give'), wp_kses($author_name, wp_kses_allowed_html('post'))).' &ndash; '.esc_html($plugin_data['Version']); ?></td>
 			</tr>
 		<?php
 		}
@@ -643,13 +643,13 @@ 
 <table class="give-status-table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Inactive Plugins"><h2><?php _e( 'Inactive Plugins', 'give' ); ?></h2></th>
+			<th colspan="3" data-export-label="Inactive Plugins"><h2><?php _e('Inactive Plugins', 'give'); ?></h2></th>
 		</tr>
 	</thead>
 	<tbody>
 		<?php
-		foreach ( $plugins as $plugin_data ) {
-			if ( 'inactive' != $plugin_data['Status'] ) {
+		foreach ($plugins as $plugin_data) {
+			if ('inactive' != $plugin_data['Status']) {
 				continue;
 			}
 
@@ -657,19 +657,19 @@ 
 			$author_name = $plugin_data['Author'];
 
 			// Link the plugin name to the plugin URL if available.
-			if ( ! empty( $plugin_data['PluginURI'] ) ) {
-				$plugin_name = '<a href="' . esc_url( $plugin_data['PluginURI'] ) . '" title="' . esc_attr__( 'Visit plugin homepage' , 'give' ) . '">' . $plugin_name . '</a>';
+			if ( ! empty($plugin_data['PluginURI'])) {
+				$plugin_name = '<a href="'.esc_url($plugin_data['PluginURI']).'" title="'.esc_attr__('Visit plugin homepage', 'give').'">'.$plugin_name.'</a>';
 			}
 
 			// Link the author name to the author URL if available.
-			if ( ! empty( $plugin_data['AuthorURI'] ) ) {
-				$author_name = '<a href="' . esc_url( $plugin_data['AuthorURI'] ) . '" title="' . esc_attr__( 'Visit author homepage' , 'give' ) . '">' . $author_name . '</a>';
+			if ( ! empty($plugin_data['AuthorURI'])) {
+				$author_name = '<a href="'.esc_url($plugin_data['AuthorURI']).'" title="'.esc_attr__('Visit author homepage', 'give').'">'.$author_name.'</a>';
 			}
 			?>
 			<tr>
-				<td><?php echo wp_kses( $plugin_name, wp_kses_allowed_html( 'post' ) ); ?></td>
+				<td><?php echo wp_kses($plugin_name, wp_kses_allowed_html('post')); ?></td>
 				<td class="help">&nbsp;</td>
-				<td><?php echo sprintf( _x( 'by %s', 'by author', 'give' ), wp_kses( $author_name, wp_kses_allowed_html( 'post' ) ) ) . ' &ndash; ' . esc_html( $plugin_data['Version'] ); ?></td>
+				<td><?php echo sprintf(_x('by %s', 'by author', 'give'), wp_kses($author_name, wp_kses_allowed_html('post'))).' &ndash; '.esc_html($plugin_data['Version']); ?></td>
 			</tr>
 			<?php
 		}
@@ -679,37 +679,37 @@ 
 
 <?php
 $active_mu_plugins = (array) get_mu_plugins();
-if ( ! empty( $active_mu_plugins ) ) {
+if ( ! empty($active_mu_plugins)) {
 ?>
 	<table class="give-status-table widefat" cellspacing="0">
 		<thead>
 			<tr>
-				<th colspan="3" data-export-label="Active MU Plugins"><h2><?php _e( 'Active MU Plugins', 'give' ); ?></h2></th>
+				<th colspan="3" data-export-label="Active MU Plugins"><h2><?php _e('Active MU Plugins', 'give'); ?></h2></th>
 			</tr>
 		</thead>
 		<tbody>
 			<?php
 
-			foreach ( $active_mu_plugins as $mu_plugin_data ) {
-				if ( ! empty( $mu_plugin_data['Name'] ) ) {
+			foreach ($active_mu_plugins as $mu_plugin_data) {
+				if ( ! empty($mu_plugin_data['Name'])) {
 					// Link the plugin name to the plugin URL if available.
-					$plugin_name = esc_html( $mu_plugin_data['Name'] );
+					$plugin_name = esc_html($mu_plugin_data['Name']);
 
-					if ( ! empty( $mu_plugin_data['PluginURI'] ) ) {
-						$plugin_name = '<a href="' . esc_url( $mu_plugin_data['PluginURI'] ) . '" title="' . esc_attr__( 'Visit plugin homepage' , 'give' ) . '">' . $plugin_name . '</a>';
+					if ( ! empty($mu_plugin_data['PluginURI'])) {
+						$plugin_name = '<a href="'.esc_url($mu_plugin_data['PluginURI']).'" title="'.esc_attr__('Visit plugin homepage', 'give').'">'.$plugin_name.'</a>';
 					}
 
 					// Link the author name to the author URL if available.
-					$author_name = esc_html( $mu_plugin_data['Author'] );
+					$author_name = esc_html($mu_plugin_data['Author']);
 
-					if ( ! empty( $mu_plugin_data['AuthorURI'] ) ) {
-						$author_name = '<a href="' . esc_url( $mu_plugin_data['AuthorURI'] ) . '">' . $author_name . '</a>';
+					if ( ! empty($mu_plugin_data['AuthorURI'])) {
+						$author_name = '<a href="'.esc_url($mu_plugin_data['AuthorURI']).'">'.$author_name.'</a>';
 					}
 					?>
 					<tr>
 						<td><?php echo $plugin_name; ?></td>
 						<td class="help">&nbsp;</td>
-						<td><?php echo sprintf( _x( 'by %s', 'by author', 'give' ), $author_name ) . ' &ndash; ' . esc_html( $mu_plugin_data['Version'] ); ?></td>
+						<td><?php echo sprintf(_x('by %s', 'by author', 'give'), $author_name).' &ndash; '.esc_html($mu_plugin_data['Version']); ?></td>
 					</tr>
 			<?php
 				}
@@ -722,53 +722,53 @@ 
 <table class="give-status-table widefat" cellspacing="0">
 	<thead>
 		<tr>
-			<th colspan="3" data-export-label="Theme"><h2><?php _e( 'Theme', 'give' ); ?></h2></th>
+			<th colspan="3" data-export-label="Theme"><h2><?php _e('Theme', 'give'); ?></h2></th>
 		</tr>
 	</thead>
 	<?php
-	include_once( ABSPATH . 'wp-admin/includes/theme-install.php' );
+	include_once(ABSPATH.'wp-admin/includes/theme-install.php');
 	$active_theme = wp_get_theme();
 	?>
 	<tbody>
 		<tr>
-			<td data-export-label="Name"><?php _e( 'Name', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The name of the current active theme.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( $active_theme->Name ); ?></td>
+			<td data-export-label="Name"><?php _e('Name', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The name of the current active theme.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html($active_theme->Name); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Version"><?php _e( 'Version', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The installed version of the current active theme.', 'give' ) ); ?>"></span></td>
-			<td><?php echo esc_html( $active_theme->Version ); ?></td>
+			<td data-export-label="Version"><?php _e('Version', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The installed version of the current active theme.', 'give')); ?>"></span></td>
+			<td><?php echo esc_html($active_theme->Version); ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Author URL"><?php _e( 'Author URL', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The theme developer\'s URL.', 'give' ) ); ?>"></span></td>
+			<td data-export-label="Author URL"><?php _e('Author URL', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The theme developer\'s URL.', 'give')); ?>"></span></td>
 			<td><?php echo $active_theme->{'Author URI'}; ?></td>
 		</tr>
 		<tr>
-			<td data-export-label="Child Theme"><?php _e( 'Child Theme', 'give' ); ?>:</td>
-			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'Whether the current theme is a child theme.', 'give' ) ); ?>"></span></td>
+			<td data-export-label="Child Theme"><?php _e('Child Theme', 'give'); ?>:</td>
+			<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('Whether the current theme is a child theme.', 'give')); ?>"></span></td>
 			<td><?php
-				echo is_child_theme() ? __( 'Yes', 'give' ) : __( 'No', 'give' ) . ' &ndash; ' . sprintf( __( 'If you\'re modifying Give on a parent theme you didn\'t build personally, then we recommend using a child theme. See: <a href="%s" target="_blank">How to Create a Child Theme</a>', 'give' ), 'https://codex.wordpress.org/Child_Themes' );
+				echo is_child_theme() ? __('Yes', 'give') : __('No', 'give').' &ndash; '.sprintf(__('If you\'re modifying Give on a parent theme you didn\'t build personally, then we recommend using a child theme. See: <a href="%s" target="_blank">How to Create a Child Theme</a>', 'give'), 'https://codex.wordpress.org/Child_Themes');
 				?></td>
 		</tr>
 		<?php
-		if( is_child_theme() ) {
-			$parent_theme = wp_get_theme( $active_theme->Template );
+		if (is_child_theme()) {
+			$parent_theme = wp_get_theme($active_theme->Template);
 		?>
 			<tr>
-				<td data-export-label="Parent Theme Name"><?php _e( 'Parent Theme Name', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The name of the parent theme.', 'give' ) ); ?>"></span></td>
-				<td><?php echo esc_html( $parent_theme->Name ); ?></td>
+				<td data-export-label="Parent Theme Name"><?php _e('Parent Theme Name', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The name of the parent theme.', 'give')); ?>"></span></td>
+				<td><?php echo esc_html($parent_theme->Name); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="Parent Theme Version"><?php _e( 'Parent Theme Version', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The installed version of the parent theme.', 'give' ) ); ?>"></span></td>
-				<td><?php echo esc_html( $parent_theme->Version ); ?></td>
+				<td data-export-label="Parent Theme Version"><?php _e('Parent Theme Version', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The installed version of the parent theme.', 'give')); ?>"></span></td>
+				<td><?php echo esc_html($parent_theme->Version); ?></td>
 			</tr>
 			<tr>
-				<td data-export-label="Parent Theme Author URL"><?php _e( 'Parent Theme Author URL', 'give' ); ?>:</td>
-				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr( __( 'The parent theme developers URL.', 'give' ) ); ?>"></span></td>
+				<td data-export-label="Parent Theme Author URL"><?php _e('Parent Theme Author URL', 'give'); ?>:</td>
+				<td class="help"><span class="give-tooltip give-icon give-icon-question" data-tooltip="<?php echo esc_attr(__('The parent theme developers URL.', 'give')); ?>"></span></td>
 				<td><?php echo $parent_theme->{'Author URI'}; ?></td>
 			</tr>
 		<?php } ?>

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

Spacing +57 added lines, -57 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -50,13 +50,13 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
-		add_action( 'give_report_view_actions', array( $this, 'category_filter' ) );
+		add_action('give_report_view_actions', array($this, 'category_filter'));
 		$this->query();
 
 	}
@@ -72,18 +72,18 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 			case 'earnings' :
-				return give_currency_filter( give_format_amount( $item[ $column_name ] ) );
+				return give_currency_filter(give_format_amount($item[$column_name]));
 			case 'average_sales' :
-				return round( $item[ $column_name ] );
+				return round($item[$column_name]);
 			case 'average_earnings' :
-				return give_currency_filter( give_format_amount( $item[ $column_name ] ) );
+				return give_currency_filter(give_format_amount($item[$column_name]));
 			case 'details' :
-				return '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-reports&tab=forms&form-id=' . $item['ID'] ) . '">' . esc_html__( 'View Detailed Report', 'give' ) . '</a>';
+				return '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-reports&tab=forms&form-id='.$item['ID']).'">'.esc_html__('View Detailed Report', 'give').'</a>';
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -96,12 +96,12 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'title'            => esc_html__( 'Form', 'give' ),
-			'sales'            => esc_html__( 'Donations', 'give' ),
-			'earnings'         => esc_html__( 'Income', 'give' ),
-			'average_sales'    => esc_html__( 'Monthly Average Donations', 'give' ),
-			'average_earnings' => esc_html__( 'Monthly Average Income', 'give' ),
-			'details'          => esc_html__( 'Detailed Report', 'give' )
+			'title'            => esc_html__('Form', 'give'),
+			'sales'            => esc_html__('Donations', 'give'),
+			'earnings'         => esc_html__('Income', 'give'),
+			'average_sales'    => esc_html__('Monthly Average Donations', 'give'),
+			'average_earnings' => esc_html__('Monthly Average Income', 'give'),
+			'details'          => esc_html__('Detailed Report', 'give')
 		);
 
 		return $columns;
@@ -116,9 +116,9 @@ 
 	 */
 	public function get_sortable_columns() {
 		return array(
-			'title'    => array( 'title', true ),
-			'sales'    => array( 'sales', false ),
-			'earnings' => array( 'earnings', false ),
+			'title'    => array('title', true),
+			'sales'    => array('sales', false),
+			'earnings' => array('earnings', false),
 		);
 	}
 
@@ -130,7 +130,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 
@@ -142,7 +142,7 @@ 
 	 * @return int Category ID
 	 */
 	public function get_category() {
-		return isset( $_GET['category'] ) ? absint( $_GET['category'] ) : 0;
+		return isset($_GET['category']) ? absint($_GET['category']) : 0;
 	}
 
 
@@ -155,8 +155,8 @@ 
 	 */
 	public function get_total_forms() {
 		$total  = 0;
-		$counts = wp_count_posts( 'give_forms', 'readable' );
-		foreach ( $counts as $status => $count ) {
+		$counts = wp_count_posts('give_forms', 'readable');
+		foreach ($counts as $status => $count) {
 			$total += $count;
 		}
 
@@ -170,7 +170,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 
 	}
 
@@ -182,27 +182,27 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav give-clearfix <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav give-clearfix <?php echo esc_attr($which); ?>">
 
-			<?php if ( 'top' === $which ) { ?>
+			<?php if ('top' === $which) { ?>
 				<h3 class="alignleft reports-earnings-title">
-					<span><?php esc_html_e( 'Donation Forms Report', 'give' ); ?></span>
+					<span><?php esc_html_e('Donation Forms Report', 'give'); ?></span>
 				</h3>
 			<?php } ?>
 
 			<div class="alignright tablenav-right">
 				<div class="actions bulkactions">
-					<?php $this->bulk_actions( $which ); ?>
+					<?php $this->bulk_actions($which); ?>
 				</div>
 				<?php
-				$this->extra_tablenav( $which );
-				$this->pagination( $which );
+				$this->extra_tablenav($which);
+				$this->pagination($which);
 				?>
 			</div>
 
@@ -222,9 +222,9 @@ 
 	 */
 	public function category_filter() {
 
-		$categories = get_terms( 'form_category' );
-		if ( $categories && ! is_wp_error( $categories ) ) {
-			echo Give()->html->category_dropdown( 'category', $this->get_category() );
+		$categories = get_terms('form_category');
+		if ($categories && ! is_wp_error($categories)) {
+			echo Give()->html->category_dropdown('category', $this->get_category());
 		}
 	}
 
@@ -238,8 +238,8 @@ 
 	 */
 	public function query() {
 
-		$orderby  = isset( $_GET['orderby'] ) ? $_GET['orderby'] : 'title';
-		$order    = isset( $_GET['order'] ) ? $_GET['order'] : 'DESC';
+		$orderby  = isset($_GET['orderby']) ? $_GET['orderby'] : 'title';
+		$order    = isset($_GET['order']) ? $_GET['order'] : 'DESC';
 		$category = $this->get_category();
 
 		$args = array(
@@ -252,7 +252,7 @@ 
 			'suppress_filters' => true
 		);
 
-		if ( ! empty( $category ) ) {
+		if ( ! empty($category)) {
 			$args['tax_query'] = array(
 				array(
 					'taxonomy' => 'form_category',
@@ -261,7 +261,7 @@ 
 			);
 		}
 
-		switch ( $orderby ) :
+		switch ($orderby) :
 			case 'title' :
 				$args['orderby'] = 'title';
 				break;
@@ -277,9 +277,9 @@ 
 				break;
 		endswitch;
 
-		$args = apply_filters( 'give_form_reports_prepare_items_args', $args, $this );
+		$args = apply_filters('give_form_reports_prepare_items_args', $args, $this);
 
-		$this->products = new WP_Query( $args );
+		$this->products = new WP_Query($args);
 
 	}
 
@@ -295,15 +295,15 @@ 
 
 		$give_forms = $this->products->posts;
 
-		if ( $give_forms ) {
-			foreach ( $give_forms as $form ) {
+		if ($give_forms) {
+			foreach ($give_forms as $form) {
 				$reports_data[] = array(
 					'ID'               => $form,
-					'title'            => get_the_title( $form ),
-					'sales'            => give_get_form_sales_stats( $form ),
-					'earnings'         => give_get_form_earnings_stats( $form ),
-					'average_sales'    => give_get_average_monthly_form_sales( $form ),
-					'average_earnings' => give_get_average_monthly_form_earnings( $form )
+					'title'            => get_the_title($form),
+					'sales'            => give_get_form_sales_stats($form),
+					'earnings'         => give_get_form_earnings_stats($form),
+					'average_sales'    => give_get_average_monthly_form_sales($form),
+					'average_earnings' => give_get_average_monthly_form_earnings($form)
 				);
 			}
 		}
@@ -331,7 +331,7 @@ 
 
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$data = $this->reports_data();
 
@@ -339,10 +339,10 @@ 
 
 		$this->items = $data;
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $total_items / $this->per_page )
+				'total_pages' => ceil($total_items / $this->per_page)
 			)
 		);
 	}

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

Spacing +34 added lines, -34 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -45,11 +45,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
 	}
 
@@ -64,10 +64,10 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -80,11 +80,11 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'label'           => esc_attr__( 'Gateway', 'give' ),
-			'complete_sales'  => esc_attr__( 'Complete Transactions', 'give' ),
-			'pending_sales'   => esc_attr__( 'Pending / Failed Transactions', 'give' ),
-			'total_sales'     => esc_attr__( 'Total Transactions', 'give' ),
-			'total_donations' => esc_attr__( 'Total Donated', 'give' )
+			'label'           => esc_attr__('Gateway', 'give'),
+			'complete_sales'  => esc_attr__('Complete Transactions', 'give'),
+			'pending_sales'   => esc_attr__('Pending / Failed Transactions', 'give'),
+			'total_sales'     => esc_attr__('Total Transactions', 'give'),
+			'total_donations' => esc_attr__('Total Donated', 'give')
 		);
 
 		return $columns;
@@ -99,7 +99,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 
@@ -110,7 +110,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 
 	}
 
@@ -122,27 +122,27 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav gateways-report-tablenav give-clearfix <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav gateways-report-tablenav give-clearfix <?php echo esc_attr($which); ?>">
 
-			<?php if ( 'top' === $which ) { ?>
+			<?php if ('top' === $which) { ?>
 				<h3 class="alignleft reports-earnings-title">
-					<span><?php esc_html_e( 'Donation Methods Report', 'give' ); ?></span>
+					<span><?php esc_html_e('Donation Methods Report', 'give'); ?></span>
 				</h3>
 			<?php } ?>
 
 			<div class="alignright tablenav-right">
 				<div class="actions bulkactions">
-					<?php $this->bulk_actions( $which ); ?>
+					<?php $this->bulk_actions($which); ?>
 				</div>
 				<?php
-				$this->extra_tablenav( $which );
-				$this->pagination( $which );
+				$this->extra_tablenav($which);
+				$this->pagination($which);
 				?>
 			</div>
 
@@ -167,18 +167,18 @@ 
 		$gateways     = give_get_payment_gateways();
 		$stats        = new Give_Payment_Stats();
 
-		foreach ( $gateways as $gateway_id => $gateway ) {
+		foreach ($gateways as $gateway_id => $gateway) {
 
-			$complete_count = give_count_sales_by_gateway( $gateway_id, 'publish' );
-			$pending_count  = give_count_sales_by_gateway( $gateway_id, array( 'pending', 'failed' ) );
+			$complete_count = give_count_sales_by_gateway($gateway_id, 'publish');
+			$pending_count  = give_count_sales_by_gateway($gateway_id, array('pending', 'failed'));
 
 			$reports_data[] = array(
 				'ID'              => $gateway_id,
 				'label'           => $gateway['admin_label'],
-				'complete_sales'  => give_format_amount( $complete_count, false ),
-				'pending_sales'   => give_format_amount( $pending_count, false ),
-				'total_sales'     => give_format_amount( $complete_count + $pending_count, false ),
-				'total_donations' => give_currency_filter( give_format_amount( $stats->get_earnings( 0, 0, 0, $gateway_id ) ) )
+				'complete_sales'  => give_format_amount($complete_count, false),
+				'pending_sales'   => give_format_amount($pending_count, false),
+				'total_sales'     => give_format_amount($complete_count + $pending_count, false),
+				'total_donations' => give_currency_filter(give_format_amount($stats->get_earnings(0, 0, 0, $gateway_id)))
 			);
 		}
 
@@ -200,7 +200,7 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->reports_data();
 
 	}

includes/admin/upgrades/upgrade-functions.php

Spacing +129 added lines, -129 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,34 +25,34 @@ 
  */
 function give_do_automatic_upgrades() {
 	$did_upgrade  = false;
-	$give_version = preg_replace( '/[^0-9.].*/', '', get_option( 'give_version' ) );
+	$give_version = preg_replace('/[^0-9.].*/', '', 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';
 	}
 
-	switch ( true ) {
+	switch (true) {
 
-		case version_compare( $give_version, '1.6', '<' ) :
+		case version_compare($give_version, '1.6', '<') :
 			give_v16_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.7', '<' ) :
+		case version_compare($give_version, '1.7', '<') :
 			give_v17_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.8', '<' ) :
+		case version_compare($give_version, '1.8', '<') :
 			give_v18_upgrades();
 			$did_upgrade = true;
 	}
 
-	if ( $did_upgrade ) {
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
+	if ($did_upgrade) {
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
 	}
 }
 
-add_action( 'admin_init', 'give_do_automatic_upgrades' );
+add_action('admin_init', 'give_do_automatic_upgrades');
 
 /**
  * Display Upgrade Notices
@@ -62,18 +62,18 @@ 
  */
 function give_show_upgrade_notices() {
 	// Don't show notices on the upgrades page.
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-upgrades' ) {
+	if (isset($_GET['page']) && $_GET['page'] == 'give-upgrades') {
 		return;
 	}
 
-	$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:
@@ -84,27 +84,27 @@ 
 	 */
 
 	// 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(
 		/* translators: %s: upgrade URL */
-			'<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(
 		/* translators: %s: upgrade URL */
-			'<div class="updated"><p>' . __( 'Give needs to upgrade the donations 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 donations 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'))
 		);
 	}
 
 	// End 'Stepped' upgrade process notices.
 }
 
-add_action( 'admin_notices', 'give_show_upgrade_notices' );
+add_action('admin_notices', 'give_show_upgrade_notices');
 
 /**
  * Triggers all upgrade functions
@@ -116,26 +116,26 @@ 
  */
 function give_trigger_upgrades() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('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
@@ -146,15 +146,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);
 
 }
 
@@ -167,9 +167,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;
 	}
 
@@ -177,9 +177,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);
 }
 
 /**
@@ -190,9 +190,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();
 	}
 
@@ -209,29 +209,29 @@ 
  */
 function give_v132_upgrade_give_payment_customer_id() {
 	global $wpdb;
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('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
@@ -244,14 +244,14 @@ 
 
 	global $wpdb;
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('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.
@@ -261,31 +261,31 @@ 
 	$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');
 
 /**
  * Cleanup User Roles
@@ -296,17 +296,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.
@@ -353,9 +353,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);
 			}
 		}
 
@@ -365,15 +365,15 @@ 
 		$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' );
+add_action('admin_init', 'give_v152_cleanup_users');
 
 /**
  * 1.6 Upgrade routine to create the customer meta table.
@@ -413,53 +413,53 @@ 
 
 	// Get addons license key.
 	$addons = array();
-	foreach ( $give_options as $key => $value ) {
-		if ( false !== strpos( $key, '_license_key' ) ) {
-			$addons[ $key ] = $value;
+	foreach ($give_options as $key => $value) {
+		if (false !== strpos($key, '_license_key')) {
+			$addons[$key] = $value;
 		}
 	}
 
 	// Bailout: We do not have any addon license data to upgrade.
-	if ( empty( $addons ) ) {
+	if (empty($addons)) {
 		return false;
 	}
 
-	foreach ( $addons as $key => $addon_license ) {
+	foreach ($addons as $key => $addon_license) {
 
 		// Get addon shortname.
-		$shortname = str_replace( '_license_key', '', $key );
+		$shortname = str_replace('_license_key', '', $key);
 
 		// Addon license option name.
-		$addon_license_option_name = $shortname . '_license_active';
+		$addon_license_option_name = $shortname.'_license_active';
 
 		// bailout if license is empty.
-		if ( empty( $addon_license ) ) {
-			delete_option( $addon_license_option_name );
+		if (empty($addon_license)) {
+			delete_option($addon_license_option_name);
 			continue;
 		}
 
 		// Get addon name.
 		$addon_name       = array();
-		$addon_name_parts = explode( '_', str_replace( 'give_', '', $shortname ) );
-		foreach ( $addon_name_parts as $name_part ) {
+		$addon_name_parts = explode('_', str_replace('give_', '', $shortname));
+		foreach ($addon_name_parts as $name_part) {
 
 			// Fix addon name
-			switch ( $name_part ) {
+			switch ($name_part) {
 				case 'authorizenet' :
 					$name_part = 'authorize.net';
 					break;
 			}
 
-			$addon_name[] = ucfirst( $name_part );
+			$addon_name[] = ucfirst($name_part);
 		}
 
-		$addon_name = implode( ' ', $addon_name );
+		$addon_name = implode(' ', $addon_name);
 
 		// Data to send to the API
 		$api_params = array(
 			'edd_action' => 'activate_license', //never change from "edd_" to "give_"!
 			'license'    => $addon_license,
-			'item_name'  => urlencode( $addon_name ),
+			'item_name'  => urlencode($addon_name),
 			'url'        => home_url()
 		);
 
@@ -474,17 +474,17 @@ 
 		);
 
 		// Make sure there are no errors.
-		if ( is_wp_error( $response ) ) {
-			delete_option( $addon_license_option_name );
+		if (is_wp_error($response)) {
+			delete_option($addon_license_option_name);
 			continue;
 		}
 
 		// Tell WordPress to look for updates.
-		set_site_transient( 'update_plugins', null );
+		set_site_transient('update_plugins', null);
 
 		// Decode license data.
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
-		update_option( $addon_license_option_name, $license_data );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
+		update_option($addon_license_option_name, $license_data);
 	}
 }
 
@@ -514,9 +514,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);
 		}
 	}
 
@@ -552,7 +552,7 @@ 
 function give_v18_upgrades_core_setting() {
 	// Core settings which changes from checkbox to radio.
 	$core_setting_names = array_merge(
-		array_keys( give_v18_renamed_core_settings() ),
+		array_keys(give_v18_renamed_core_settings()),
 		array(
 			'uninstall_on_delete',
 			'scripts_footer',
@@ -564,44 +564,44 @@ 
 	);
 
 	// Bailout: If not any setting define.
-	if ( $give_settings = get_option( 'give_settings' ) ) {
+	if ($give_settings = get_option('give_settings')) {
 
 		$setting_changed = false;
 
 		// Loop: check each setting field.
-		foreach ( $core_setting_names as $setting_name ) {
+		foreach ($core_setting_names as $setting_name) {
 			// New setting name.
-			$new_setting_name = preg_replace( '/^(enable_|disable_)/', '', $setting_name );
+			$new_setting_name = preg_replace('/^(enable_|disable_)/', '', $setting_name);
 
 			// Continue: If setting already set.
 			if (
-				array_key_exists( $new_setting_name, $give_settings )
-				&& in_array( $give_settings[ $new_setting_name ], array( 'enabled', 'disabled' ) )
+				array_key_exists($new_setting_name, $give_settings)
+				&& in_array($give_settings[$new_setting_name], array('enabled', 'disabled'))
 			) {
 				continue;
 			}
 
 			// Set checkbox value to radio value.
-			$give_settings[ $setting_name ] = ( ! empty( $give_settings[ $setting_name ] ) && 'on' === $give_settings[ $setting_name ] ? 'enabled' : 'disabled' );
+			$give_settings[$setting_name] = ( ! empty($give_settings[$setting_name]) && 'on' === $give_settings[$setting_name] ? 'enabled' : 'disabled');
 
 			// @see https://github.com/WordImpress/Give/issues/1063
-			if ( false !== strpos( $setting_name, 'disable_' ) ) {
+			if (false !== strpos($setting_name, 'disable_')) {
 
-				$give_settings[ $new_setting_name ] = ( give_is_setting_enabled( $give_settings[ $setting_name ] ) ? 'disabled' : 'enabled' );
-			} elseif ( false !== strpos( $setting_name, 'enable_' ) ) {
+				$give_settings[$new_setting_name] = (give_is_setting_enabled($give_settings[$setting_name]) ? 'disabled' : 'enabled');
+			} elseif (false !== strpos($setting_name, 'enable_')) {
 
-				$give_settings[ $new_setting_name ] = ( give_is_setting_enabled( $give_settings[ $setting_name ] ) ? 'enable' : 'disabled' );
+				$give_settings[$new_setting_name] = (give_is_setting_enabled($give_settings[$setting_name]) ? 'enable' : 'disabled');
 			}
 
 			// Tell bot to update core setting to db.
-			if ( ! $setting_changed ) {
+			if ( ! $setting_changed) {
 				$setting_changed = true;
 			}
 		}
 
 		// Update setting only if they changed.
-		if ( $setting_changed ) {
-			update_option( 'give_settings', $give_settings );
+		if ($setting_changed) {
+			update_option('give_settings', $give_settings);
 		}
 	}
 }
@@ -613,25 +613,25 @@ 
  * @return void
  */
 function give_v18_upgrades_form_metadata() {
-	$forms = new WP_Query( array(
+	$forms = new WP_Query(array(
 			'post_type'      => 'give_forms',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 		)
 	);
 
-	if ( $forms->have_posts() ) {
-		while ( $forms->have_posts() ) {
+	if ($forms->have_posts()) {
+		while ($forms->have_posts()) {
 			$forms->the_post();
 
 			// Form content.
 			// Note in version 1.8 display content setting split into display content and content placement setting.
-			$show_content = get_post_meta( get_the_ID(), '_give_content_option', true );
-			if ( $show_content && ! get_post_meta( get_the_ID(), '_give_display_content', true ) ) {
-				$field_value = ( 'none' !== $show_content ? 'enabled' : 'disabled' );
-				update_post_meta( get_the_ID(), '_give_display_content', $field_value );
+			$show_content = get_post_meta(get_the_ID(), '_give_content_option', true);
+			if ($show_content && ! get_post_meta(get_the_ID(), '_give_display_content', true)) {
+				$field_value = ('none' !== $show_content ? 'enabled' : 'disabled');
+				update_post_meta(get_the_ID(), '_give_display_content', $field_value);
 
-				$field_value = ( 'none' !== $show_content ? $show_content : 'give_pre_form' );
-				update_post_meta( get_the_ID(), '_give_content_option', $field_value );
+				$field_value = ('none' !== $show_content ? $show_content : 'give_pre_form');
+				update_post_meta(get_the_ID(), '_give_content_option', $field_value);
 			}
 
 
@@ -660,15 +660,15 @@ 
 			);
 
 
-			foreach ( $form_radio_settings as $meta_key ) {
+			foreach ($form_radio_settings as $meta_key) {
 				// Get value.
-				$field_value = get_post_meta( get_the_ID(), $meta_key, true );
+				$field_value = get_post_meta(get_the_ID(), $meta_key, true);
 
 				// Convert meta value only if it is in yes/no/none.
-				if ( in_array( $field_value, array( 'yes', 'on', 'no', 'none' ) ) ) {
+				if (in_array($field_value, array('yes', 'on', 'no', 'none'))) {
 
-					$field_value = ( in_array( $field_value, array( 'yes', 'on' ) ) ? 'enabled' : 'disabled' );
-					update_post_meta( get_the_ID(), $meta_key, $field_value );
+					$field_value = (in_array($field_value, array('yes', 'on')) ? 'enabled' : 'disabled');
+					update_post_meta(get_the_ID(), $meta_key, $field_value);
 				}
 
 			}

includes/gateways/manual.php

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,7 +20,7 @@ 
  * @since 1.0
  * @return void
  */
-add_action( 'give_manual_cc_form', '__return_false' );
+add_action('give_manual_cc_form', '__return_false');
 
 /**
  * Processes the donation data and uses the Manual Payment gateway to record
@@ -32,17 +32,17 @@ 
  *
  * @return void
  */
-function give_manual_payment( $purchase_data ) {
+function give_manual_payment($purchase_data) {
 
-	if ( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'give-gateway' ) ) {
-		wp_die( esc_html__( 'Nonce verification failed.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($purchase_data['gateway_nonce'], 'give-gateway')) {
+		wp_die(esc_html__('Nonce verification failed.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 	
 	//Create payment_data array
 	$payment_data = array(
 		'price'           => $purchase_data['price'],
 		'give_form_title' => $purchase_data['post_data']['give-form-title'],
-		'give_form_id'    => intval( $purchase_data['post_data']['give-form-id'] ),
+		'give_form_id'    => intval($purchase_data['post_data']['give-form-id']),
 		'give_price_id'   => isset($purchase_data['post_data']['give-price-id']) ? $purchase_data['post_data']['give-price-id'] : '',
 		'date'            => $purchase_data['date'],
 		'user_email'      => $purchase_data['user_email'],
@@ -52,24 +52,24 @@ 
 		'status'          => 'pending'
 	);
 	// Record the pending payment
-	$payment = give_insert_payment( $payment_data );
+	$payment = give_insert_payment($payment_data);
 
-	if ( $payment ) {
-		give_update_payment_status( $payment, 'publish' );
+	if ($payment) {
+		give_update_payment_status($payment, 'publish');
 		give_send_to_success_page();
 	} else {
 		give_record_gateway_error(
-			esc_html__( 'Payment Error', 'give' ),
+			esc_html__('Payment Error', 'give'),
 			sprintf(
 				/* translators: %s: payment data */
-				esc_html__( 'The payment creation failed while processing a manual (free or test) donation. Payment data: %s', 'give' ),
-				json_encode( $payment_data )
+				esc_html__('The payment creation failed while processing a manual (free or test) donation. Payment data: %s', 'give'),
+				json_encode($payment_data)
 			),
 			$payment
 		);
 		// If errors are present, send the user back to the donation page so they can be corrected
-		give_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['give-gateway'] );
+		give_send_back_to_checkout('?payment-mode='.$purchase_data['post_data']['give-gateway']);
 	}
 }
 
-add_action( 'give_gateway_manual', 'give_manual_payment' );
+add_action('give_gateway_manual', 'give_manual_payment');

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

Spacing +19 added lines, -19 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,10 +23,10 @@ 
 	 */
 	public function __construct() {
 
-		$this->shortcode['title'] = esc_html__( 'Donation Form Goal', 'give' );
-		$this->shortcode['label'] = esc_html__( 'Donation Form Goal', 'give' );
+		$this->shortcode['title'] = esc_html__('Donation Form Goal', 'give');
+		$this->shortcode['label'] = esc_html__('Donation Form Goal', 'give');
 
-		parent::__construct( 'give_goal' );
+		parent::__construct('give_goal');
 	}
 
 	/**
@@ -38,8 +38,8 @@ 
 
 		$create_form_link = sprintf(
 		/* translators: %s: create new form URL */
-			__( '<a href="%s">Create</a> a new Donation Form.', 'give' ),
-			admin_url( 'post-new.php?post_type=give_forms' )
+			__('<a href="%s">Create</a> a new Donation Form.', 'give'),
+			admin_url('post-new.php?post_type=give_forms')
 		);
 
 		return array(
@@ -49,35 +49,35 @@ 
 					'post_type' => 'give_forms',
 				),
 				'name'        => 'id',
-				'tooltip'     => esc_attr__( 'Select a Donation Form', 'give' ),
-				'placeholder' => '- ' . esc_attr__( 'Select a Donation Form', 'give' ) . ' -',
+				'tooltip'     => esc_attr__('Select a Donation Form', 'give'),
+				'placeholder' => '- '.esc_attr__('Select a Donation Form', 'give').' -',
 				'required'    => array(
-					'alert' => esc_html__( 'You must first select a Form!', 'give' ),
-					'error' => sprintf( '<p class="strong">%s</p><p class="no-margin">%s</p>', esc_html__( 'No forms found.', 'give' ), $create_form_link ),
+					'alert' => esc_html__('You must first select a Form!', 'give'),
+					'error' => sprintf('<p class="strong">%s</p><p class="no-margin">%s</p>', esc_html__('No forms found.', 'give'), $create_form_link),
 				),
 			),
 			array(
 				'type' => 'container',
-				'html' => sprintf( '<p class="strong margin-top">%s</p>', esc_html__( 'Optional settings', 'give' ) ),
+				'html' => sprintf('<p class="strong margin-top">%s</p>', esc_html__('Optional settings', 'give')),
 			),
 			array(
 				'type'    => 'listbox',
 				'name'    => 'show_text',
-				'label'   => esc_attr__( 'Show Text:', 'give' ),
-				'tooltip' => esc_attr__( 'This text displays the amount of income raised compared to the goal.', 'give' ),
+				'label'   => esc_attr__('Show Text:', 'give'),
+				'tooltip' => esc_attr__('This text displays the amount of income raised compared to the goal.', 'give'),
 				'options' => array(
-					'true'  => esc_html__( 'Show', 'give' ),
-					'false' => esc_html__( 'Hide', 'give' ),
+					'true'  => esc_html__('Show', 'give'),
+					'false' => esc_html__('Hide', 'give'),
 				),
 			),
 			array(
 				'type'    => 'listbox',
 				'name'    => 'show_bar',
-				'label'   => esc_attr__( 'Show Progress Bar:', 'give' ),
-				'tooltip' => esc_attr__( 'Do you want to display the goal\'s progress bar?', 'give' ),
+				'label'   => esc_attr__('Show Progress Bar:', 'give'),
+				'tooltip' => esc_attr__('Do you want to display the goal\'s progress bar?', 'give'),
 				'options' => array(
-					'true'  => esc_html__( 'Show', 'give' ),
-					'false' => esc_html__( 'Hide', 'give' ),
+					'true'  => esc_html__('Show', 'give'),
+					'false' => esc_html__('Hide', 'give'),
 				),
 			),
 		);

includes/admin/admin-actions.php

Doc Comments +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
  * @param $field_args
  * @param $field
  *
- * @return bool
+ * @return false|null
  */
 function give_format_admin_multilevel_amount( $field_args, $field ) {
 

Spacing +26 added lines, -26 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,53 +24,53 @@ 
 function give_hide_subscription_notices() {
 
 	// Hide subscription notices permanently.
-	if ( ! empty( $_GET['_give_hide_license_notices_permanently'] ) ) {
+	if ( ! empty($_GET['_give_hide_license_notices_permanently'])) {
 		$current_user = wp_get_current_user();
 
 		// check previously disabled notice ids.
-		$already_dismiss_notices = ( $already_dismiss_notices = get_user_meta( $current_user->ID, '_give_hide_license_notices_permanently', true ) )
+		$already_dismiss_notices = ($already_dismiss_notices = get_user_meta($current_user->ID, '_give_hide_license_notices_permanently', true))
 			? $already_dismiss_notices
 			: array();
 
 		// Get notice id.
-		$notice_id = sanitize_text_field( $_GET['_give_hide_license_notices_permanently'] );
+		$notice_id = sanitize_text_field($_GET['_give_hide_license_notices_permanently']);
 
-		if ( ! in_array( $notice_id, $already_dismiss_notices ) ) {
+		if ( ! in_array($notice_id, $already_dismiss_notices)) {
 			$already_dismiss_notices[] = $notice_id;
 		}
 
 		// Store subscription ids.
-		update_user_meta( $current_user->ID, '_give_hide_license_notices_permanently', $already_dismiss_notices );
+		update_user_meta($current_user->ID, '_give_hide_license_notices_permanently', $already_dismiss_notices);
 
 		// Redirect user.
-		wp_safe_redirect( remove_query_arg( '_give_hide_license_notices_permanently', $_SERVER['REQUEST_URI'] ) );
+		wp_safe_redirect(remove_query_arg('_give_hide_license_notices_permanently', $_SERVER['REQUEST_URI']));
 		exit();
 	}
 
 	// Hide subscription notices shortly.
-	if ( ! empty( $_GET['_give_hide_license_notices_shortly'] ) ) {
+	if ( ! empty($_GET['_give_hide_license_notices_shortly'])) {
 		$current_user = wp_get_current_user();
 
 		// Get notice id.
-		$notice_id = sanitize_text_field( $_GET['_give_hide_license_notices_shortly'] );
+		$notice_id = sanitize_text_field($_GET['_give_hide_license_notices_shortly']);
 
 		// Transient key name.
 		$transient_key = "_give_hide_license_notices_shortly_{$current_user->ID}_{$notice_id}";
 
-		if ( get_transient( $transient_key ) ) {
+		if (get_transient($transient_key)) {
 			return;
 		}
 
 		// Hide notice for 24 hours.
-		set_transient( $transient_key, true, 24 * HOUR_IN_SECONDS );
+		set_transient($transient_key, true, 24 * HOUR_IN_SECONDS);
 
 		// Redirect user.
-		wp_safe_redirect( remove_query_arg( '_give_hide_license_notices_shortly', $_SERVER['REQUEST_URI'] ) );
+		wp_safe_redirect(remove_query_arg('_give_hide_license_notices_shortly', $_SERVER['REQUEST_URI']));
 		exit();
 	}
 }
 
-add_action( 'admin_init', 'give_hide_subscription_notices' );
+add_action('admin_init', 'give_hide_subscription_notices');
 
 /**
  * Load wp editor by ajax.
@@ -78,19 +78,19 @@ 
  * @since 1.8
  */
 function give_load_wp_editor() {
-	if ( ! isset( $_POST['wp_editor'] ) ) {
+	if ( ! isset($_POST['wp_editor'])) {
 		die();
 	}
 
-	$wp_editor                     = json_decode( base64_decode( $_POST['wp_editor'] ), true );
+	$wp_editor                     = json_decode(base64_decode($_POST['wp_editor']), true);
 	$wp_editor[2]['textarea_name'] = $_POST['textarea_name'];
 
-	wp_editor( $wp_editor[0], $_POST['wp_editor_id'], $wp_editor[2] );
+	wp_editor($wp_editor[0], $_POST['wp_editor_id'], $wp_editor[2]);
 
 	die();
 }
 
-add_action( 'wp_ajax_give_load_wp_editor', 'give_load_wp_editor' );
+add_action('wp_ajax_give_load_wp_editor', 'give_load_wp_editor');
 
 
 /**
@@ -109,13 +109,13 @@ 
 	);
 
 	// Get current page.
-	$current_page = isset( $_GET['page'] ) ? esc_attr( $_GET['page'] ) : '';
+	$current_page = isset($_GET['page']) ? esc_attr($_GET['page']) : '';
 
 	// Bailout.
 	if (
-		empty( $current_page )
-		|| empty( $_GET['_wp_http_referer'] )
-		|| ! in_array( $current_page, $give_pages )
+		empty($current_page)
+		|| empty($_GET['_wp_http_referer'])
+		|| ! in_array($current_page, $give_pages)
 	) {
 		return false;
 	}
@@ -125,18 +125,18 @@ 
 	 *
 	 * @since 1.8
 	 */
-	$redirect = apply_filters( "give_validate_{$current_page}", true );
+	$redirect = apply_filters("give_validate_{$current_page}", true);
 
-	if ( $redirect ) {
+	if ($redirect) {
 		// Redirect.
 		wp_redirect(
 			remove_query_arg(
-				array( '_wp_http_referer', '_wpnonce' ),
-				wp_unslash( $_SERVER['REQUEST_URI'] )
+				array('_wp_http_referer', '_wpnonce'),
+				wp_unslash($_SERVER['REQUEST_URI'])
 			)
 		);
 		exit;
 	}
 }
 
-add_action( 'admin_init', 'give_redirect_to_clean_url_admin_pages' );
+add_action('admin_init', 'give_redirect_to_clean_url_admin_pages');

includes/admin/customers/customer-actions.php

Doc Comments +2 added lines, -2 removed lines

@@ -527,7 +527,7 @@ 
  * and redirect back to the donor interface for feedback
  *
  * @since  1.7
- * @return bool|null
+ * @return false|null
  */
 function give_remove_donor_email() {
 	if ( empty( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
@@ -568,7 +568,7 @@ 
  * and redirect back to the donor interface for feedback
  *
  * @since  1.7
- * @return bool|null
+ * @return false|null
  */
 function give_set_donor_primary_email() {
 	if ( empty( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {

Spacing +184 added lines, -184 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( esc_html__( 'You do not have permission to edit this donor.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(esc_html__('You do not have permission to edit this donor.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	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( esc_html__( 'Cheatin’ uh?', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 400 ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(esc_html__('Cheatin’ uh?', 'give'), esc_html__('Error', 'give'), array('response' => 400));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
@@ -53,70 +53,70 @@ 
 		'user_id' => 0,
 	);
 
-	$customer_info = wp_parse_args( $customer_info, $defaults );
+	$customer_info = wp_parse_args($customer_info, $defaults);
 
-	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( esc_html__( '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(esc_html__('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( esc_html__( '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(esc_html__('The User ID %d does not exist. Please assign an existing user.', 'give'), $customer_info['user_id']));
 		}
 	}
 
 	// 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['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);
 
 	/**
 	 * Fires before editing customer.
@@ -127,27 +127,27 @@ 
 	 * @param array $customer_data The customer data.
 	 * @param array $address       The customer 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();
 
-	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 donation meta if we need to
-		$payments_array = explode( ',', $customer->payment_ids );
+		$payments_array = explode(',', $customer->payment_ids);
 
-		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 {
@@ -164,11 +164,11 @@ 
 	 * @param int   $customer_id   The ID of the customer.
 	 * @param array $customer_data The customer data.
 	 */
-	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();
 	}
 
@@ -176,7 +176,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
@@ -187,36 +187,36 @@ 
  *
  * @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( esc_html__( 'You do not have permission to edit this donor.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! is_admin() || ! current_user_can($customer_view_role)) {
+		wp_die(esc_html__('You do not have permission to edit this donor.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	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( esc_html__( 'Cheatin’ uh?', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 400 ) );
+	if ( ! wp_verify_nonce($nonce, 'add-customer-note')) {
+		wp_die(esc_html__('Cheatin’ uh?', 'give'), esc_html__('Error', 'give'), array('response' => 400));
 	}
 
-	if ( empty( $customer_note ) ) {
-		give_set_error( 'empty-customer-note', esc_html__( 'A note is required.', 'give' ) );
+	if (empty($customer_note)) {
+		give_set_error('empty-customer-note', esc_html__('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);
 
 	/**
 	 * Fires before inserting customer note.
@@ -226,22 +226,22 @@ 
 	 * @param int    $customer_id The ID of the customer.
 	 * @param string $new_note    Note content.
 	 */
-	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;
 		}
@@ -254,7 +254,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
@@ -265,37 +265,37 @@ 
  *
  * @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( esc_html__( 'You do not have permission to delete donors.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(esc_html__('You do not have permission to delete donors.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	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( esc_html__( 'Cheatin&#8217; uh?', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 400 ) );
+	if ( ! wp_verify_nonce($nonce, 'delete-customer')) {
+		wp_die(esc_html__('Cheatin&#8217; uh?', 'give'), esc_html__('Error', 'give'), array('response' => 400));
 	}
 
-	if ( ! $confirm ) {
-		give_set_error( 'customer-delete-no-confirm', esc_html__( 'Please confirm you want to delete this donor.', 'give' ) );
+	if ( ! $confirm) {
+		give_set_error('customer-delete-no-confirm', esc_html__('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);
 
 	/**
 	 * Fires before deleting customer.
@@ -306,50 +306,50 @@ 
 	 * @param bool $confirm     Delete confirmation.
 	 * @param bool $remove_data Records delete confirmation.
 	 */
-	do_action( 'give_pre_delete_customer', $customer_id, $confirm, $remove_data );
+	do_action('give_pre_delete_customer', $customer_id, $confirm, $remove_data);
 
-	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 donations, 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 donations 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', esc_html__( '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', esc_html__('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', esc_html__( 'Invalid Donor ID.', 'give' ) );
-		$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors' );
+		give_set_error('give-customer-delete-invalid-id', esc_html__('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
@@ -360,27 +360,27 @@ 
  *
  * @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( esc_html__( 'You do not have permission to edit this donor.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(esc_html__('You do not have permission to edit this donor.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	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( esc_html__( 'Cheatin&#8217; uh?', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 400 ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(esc_html__('Cheatin&#8217; uh?', 'give'), esc_html__('Error', 'give'), array('response' => 400));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
@@ -394,16 +394,16 @@ 
 	 * @param int $customer_id The ID of the customer.
 	 * @param int $user_id     The ID of the user.
 	 */
-	do_action( 'give_pre_customer_disconnect_user_id', $customer_id, $user_id );
+	do_action('give_pre_customer_disconnect_user_id', $customer_id, $user_id);
 
 	$output        = array();
-	$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;
@@ -411,7 +411,7 @@ 
 	} else {
 
 		$output['success'] = false;
-		give_set_error( 'give-disconnect-user-fail', esc_html__( 'Failed to disconnect user from donor.', 'give' ) );
+		give_set_error('give-disconnect-user-fail', esc_html__('Failed to disconnect user from donor.', 'give'));
 	}
 
 	/**
@@ -421,11 +421,11 @@ 
 	 *
 	 * @param int $customer_id The ID of the customer.
 	 */
-	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();
 	}
 
@@ -433,7 +433,7 @@ 
 
 }
 
-add_action( 'give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1 );
+add_action('give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1);
 
 /**
  * Add an email address to the donor from within the admin and log a donor note
@@ -444,82 +444,82 @@ 
  *
  * @return mixed        If DOING_AJAX echos out JSON, otherwise returns array of success (bool) and message (string)
  */
-function give_add_donor_email( $args ) {
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+function give_add_donor_email($args) {
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( esc_html__( 'You do not have permission to edit this donor.', 'edit' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(esc_html__('You do not have permission to edit this donor.', 'edit'));
 	}
 
 	$output = array();
-	if ( empty( $args ) || empty( $args['email'] ) || empty( $args['customer_id'] ) ) {
+	if (empty($args) || empty($args['email']) || empty($args['customer_id'])) {
 		$output['success'] = false;
-		if ( empty( $args['email'] ) ) {
-			$output['message'] = esc_html__( 'Email address is required.', 'give' );
-		} elseif ( empty( $args['customer_id'] ) ) {
-			$output['message'] = esc_html__( 'Customer ID is required.', 'give' );
+		if (empty($args['email'])) {
+			$output['message'] = esc_html__('Email address is required.', 'give');
+		} elseif (empty($args['customer_id'])) {
+			$output['message'] = esc_html__('Customer ID is required.', 'give');
 		} else {
-			$output['message'] = esc_html__( 'An error has occurred. Please try again.', 'give' );
+			$output['message'] = esc_html__('An error has occurred. Please try again.', 'give');
 		}
-	} elseif ( ! wp_verify_nonce( $args['_wpnonce'], 'give_add_donor_email' ) ) {
+	} elseif ( ! wp_verify_nonce($args['_wpnonce'], 'give_add_donor_email')) {
 		$output = array(
 			'success' => false,
-			'message' => esc_html__( 'Nonce verification failed.', 'give' ),
+			'message' => esc_html__('Nonce verification failed.', 'give'),
 		);
-	} elseif ( ! is_email( $args['email'] ) ) {
+	} elseif ( ! is_email($args['email'])) {
 		$output = array(
 			'success' => false,
-			'message' => esc_html__( 'Invalid email.', 'give' ),
+			'message' => esc_html__('Invalid email.', 'give'),
 		);
 	} else {
-		$email       = sanitize_email( $args['email'] );
+		$email       = sanitize_email($args['email']);
 		$customer_id = (int) $args['customer_id'];
 		$primary     = 'true' === $args['primary'] ? true : false;
-		$customer    = new Give_Customer( $customer_id );
-		if ( false === $customer->add_email( $email, $primary ) ) {
-			if ( in_array( $email, $customer->emails ) ) {
+		$customer    = new Give_Customer($customer_id);
+		if (false === $customer->add_email($email, $primary)) {
+			if (in_array($email, $customer->emails)) {
 				$output = array(
 					'success' => false,
-					'message' => esc_html__( 'Email already associated with this donor.', 'give' ),
+					'message' => esc_html__('Email already associated with this donor.', 'give'),
 				);
 			} else {
 				$output = array(
 					'success' => false,
-					'message' => esc_html__( 'Email address is already associated with another donor.', 'give' ),
+					'message' => esc_html__('Email address is already associated with another donor.', 'give'),
 				);
 			}
 		} else {
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer_id . '&give-message=email-added' );
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer_id.'&give-message=email-added');
 			$output   = array(
 				'success'  => true,
-				'message'  => esc_html__( 'Email successfully added to donor.', 'give' ),
+				'message'  => esc_html__('Email successfully added to donor.', 'give'),
 				'redirect' => $redirect,
 			);
 
 			$user          = wp_get_current_user();
-			$user_login    = ! empty( $user->user_login ) ? $user->user_login : esc_html__( 'System', 'give' );
-			$customer_note = sprintf( __( 'Email address %1$s added by %2$s', 'give' ), $email, $user_login );
-			$customer->add_note( $customer_note );
+			$user_login    = ! empty($user->user_login) ? $user->user_login : esc_html__('System', 'give');
+			$customer_note = sprintf(__('Email address %1$s added by %2$s', 'give'), $email, $user_login);
+			$customer->add_note($customer_note);
 
-			if ( $primary ) {
-				$customer_note = sprintf( __( 'Email address %1$s set as primary by %2$s', 'give' ), $email, $user_login );
-				$customer->add_note( $customer_note );
+			if ($primary) {
+				$customer_note = sprintf(__('Email address %1$s set as primary by %2$s', 'give'), $email, $user_login);
+				$customer->add_note($customer_note);
 			}
 		}
 	}
 
-	do_action( 'give_post_add_customer_email', $customer_id, $args );
+	do_action('give_post_add_customer_email', $customer_id, $args);
 
-	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();
 	}
 
 	return $output;
 }
 
-add_action( 'give_add_donor_email', 'give_add_donor_email', 10, 1 );
+add_action('give_add_donor_email', 'give_add_donor_email', 10, 1);
 
 
 /**
@@ -530,37 +530,37 @@ 
  * @return bool|null
  */
 function give_remove_donor_email() {
-	if ( empty( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
+	if (empty($_GET['id']) || ! is_numeric($_GET['id'])) {
 		return false;
 	}
-	if ( empty( $_GET['email'] ) || ! is_email( $_GET['email'] ) ) {
+	if (empty($_GET['email']) || ! is_email($_GET['email'])) {
 		return false;
 	}
-	if ( empty( $_GET['_wpnonce'] ) ) {
+	if (empty($_GET['_wpnonce'])) {
 		return false;
 	}
 
 	$nonce = $_GET['_wpnonce'];
-	if ( ! wp_verify_nonce( $nonce, 'give-remove-donor-email' ) ) {
-		wp_die( esc_html__( 'Nonce verification failed', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($nonce, 'give-remove-donor-email')) {
+		wp_die(esc_html__('Nonce verification failed', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	$customer = new Give_Customer( $_GET['id'] );
-	if ( $customer->remove_email( $_GET['email'] ) ) {
-		$url           = add_query_arg( 'give-message', 'email-removed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ) );
+	$customer = new Give_Customer($_GET['id']);
+	if ($customer->remove_email($_GET['email'])) {
+		$url           = add_query_arg('give-message', 'email-removed', admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id));
 		$user          = wp_get_current_user();
-		$user_login    = ! empty( $user->user_login ) ? $user->user_login : esc_html__( 'System', 'give' );
-		$customer_note = sprintf( __( 'Email address %1$s removed by %2$s', 'give' ), $_GET['email'], $user_login );
-		$customer->add_note( $customer_note );
+		$user_login    = ! empty($user->user_login) ? $user->user_login : esc_html__('System', 'give');
+		$customer_note = sprintf(__('Email address %1$s removed by %2$s', 'give'), $_GET['email'], $user_login);
+		$customer->add_note($customer_note);
 	} else {
-		$url = add_query_arg( 'give-message', 'email-remove-failed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ) );
+		$url = add_query_arg('give-message', 'email-remove-failed', admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id));
 	}
 
-	wp_safe_redirect( $url );
+	wp_safe_redirect($url);
 	exit;
 }
 
-add_action( 'give_remove_donor_email', 'give_remove_donor_email', 10 );
+add_action('give_remove_donor_email', 'give_remove_donor_email', 10);
 
 
 /**
@@ -571,39 +571,39 @@ 
  * @return bool|null
  */
 function give_set_donor_primary_email() {
-	if ( empty( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
+	if (empty($_GET['id']) || ! is_numeric($_GET['id'])) {
 		return false;
 	}
 
-	if ( empty( $_GET['email'] ) || ! is_email( $_GET['email'] ) ) {
+	if (empty($_GET['email']) || ! is_email($_GET['email'])) {
 		return false;
 	}
 
-	if ( empty( $_GET['_wpnonce'] ) ) {
+	if (empty($_GET['_wpnonce'])) {
 		return false;
 	}
 
 	$nonce = $_GET['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'give-set-donor-primary-email' ) ) {
-		wp_die( esc_html__( 'Nonce verification failed', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($nonce, 'give-set-donor-primary-email')) {
+		wp_die(esc_html__('Nonce verification failed', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 	}
 
-	$donor = new Give_Customer( $_GET['id'] );
+	$donor = new Give_Customer($_GET['id']);
 
-	if ( $donor->set_primary_email( $_GET['email'] ) ) {
-		$url        = add_query_arg( 'give-message', 'primary-email-updated', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
+	if ($donor->set_primary_email($_GET['email'])) {
+		$url        = add_query_arg('give-message', 'primary-email-updated', admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id));
 		$user       = wp_get_current_user();
-		$user_login = ! empty( $user->user_login ) ? $user->user_login : esc_html__( 'System', 'give' );
-		$donor_note = sprintf( __( 'Email address %1$s set as primary by %1$s', 'give' ), $_GET['email'], $user_login );
+		$user_login = ! empty($user->user_login) ? $user->user_login : esc_html__('System', 'give');
+		$donor_note = sprintf(__('Email address %1$s set as primary by %1$s', 'give'), $_GET['email'], $user_login);
 
-		$donor->add_note( $donor_note );
+		$donor->add_note($donor_note);
 	} else {
-		$url = add_query_arg( 'give-message', 'primary-email-failed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
+		$url = add_query_arg('give-message', 'primary-email-failed', admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id));
 	}
 
-	wp_safe_redirect( $url );
+	wp_safe_redirect($url);
 	exit;
 }
 
-add_action( 'give_set_donor_primary_email', 'give_set_donor_primary_email', 10 );
+add_action('give_set_donor_primary_email', 'give_set_donor_primary_email', 10);

includes/admin/reporting/class-api-requests-logs-list-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -157,7 +157,7 @@
 	 *
 	 * @access public
 	 * @since  1.0
-	 * @return string|bool String if search is present, false otherwise
+	 * @return string|false String if search is present, false otherwise
 	 */
 	public function get_search() {
 		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;

Spacing +65 added lines, -65 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -45,11 +45,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
-			'ajax'     => false,// Does this table support ajax?
-		) );
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
+			'ajax'     => false, // Does this table support ajax?
+		));
 	}
 
 	/**
@@ -63,20 +63,20 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
-		$input_id = $input_id . '-search-input';
+	public function search_box($text, $input_id) {
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
 		}
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if ( ! empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
 		}
 		?>
 		<p class="search-box" role="search">
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>"/>
-			<?php submit_button( $text, 'button', false, false, array( 'ID' => 'search-submit' ) ); ?>
+			<?php submit_button($text, 'button', false, false, array('ID' => 'search-submit')); ?>
 		</p>
 		<?php
 	}
@@ -90,10 +90,10 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'ID'      => esc_html__( 'Log ID', 'give' ),
-			'details' => esc_html__( 'Request Details', 'give' ),
-			'ip'      => esc_html__( 'Request IP', 'give' ),
-			'date'    => esc_html__( 'Date', 'give' ),
+			'ID'      => esc_html__('Log ID', 'give'),
+			'details' => esc_html__('Request Details', 'give'),
+			'ip'      => esc_html__('Request IP', 'give'),
+			'date'    => esc_html__('Date', 'give'),
 		);
 
 		return $columns;
@@ -110,10 +110,10 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -127,26 +127,26 @@ 
 	 *
 	 * @return void
 	 */
-	public function column_details( $item ) {
+	public function column_details($item) {
 		?>
-		<a href="#TB_inline?width=640&amp;inlineId=log-details-<?php echo $item['ID']; ?>" class="thickbox"><?php esc_html_e( 'View Request', 'give' ); ?></a>
+		<a href="#TB_inline?width=640&amp;inlineId=log-details-<?php echo $item['ID']; ?>" class="thickbox"><?php esc_html_e('View Request', 'give'); ?></a>
 		<div id="log-details-<?php echo $item['ID']; ?>" style="display:none;">
 			<?php
 
-			$request = get_post_field( 'post_excerpt', $item['ID'] );
-			$error   = get_post_field( 'post_content', $item['ID'] );
-			echo '<p><strong>' . esc_html__( 'API Request:', 'give' ) . '</strong></p>';
-			echo '<div>' . $request . '</div>';
-			if ( ! empty( $error ) ) {
-				echo '<p><strong>' . esc_html__( 'Error', 'give' ) . '</strong></p>';
-				echo '<div>' . esc_html( $error ) . '</div>';
+			$request = get_post_field('post_excerpt', $item['ID']);
+			$error   = get_post_field('post_content', $item['ID']);
+			echo '<p><strong>'.esc_html__('API Request:', 'give').'</strong></p>';
+			echo '<div>'.$request.'</div>';
+			if ( ! empty($error)) {
+				echo '<p><strong>'.esc_html__('Error', 'give').'</strong></p>';
+				echo '<div>'.esc_html($error).'</div>';
 			}
-			echo '<p><strong>' . esc_html__( 'API User:', 'give' ) . '</strong></p>';
-			echo '<div>' . get_post_meta( $item['ID'], '_give_log_user', true ) . '</div>';
-			echo '<p><strong>' . esc_html__( 'API Key:', 'give' ) . '</strong></p>';
-			echo '<div>' . get_post_meta( $item['ID'], '_give_log_key', true ) . '</div>';
-			echo '<p><strong>' . esc_html__( 'Request Date:', 'give' ) . '</strong></p>';
-			echo '<div>' . get_post_field( 'post_date', $item['ID'] ) . '</div>';
+			echo '<p><strong>'.esc_html__('API User:', 'give').'</strong></p>';
+			echo '<div>'.get_post_meta($item['ID'], '_give_log_user', true).'</div>';
+			echo '<p><strong>'.esc_html__('API Key:', 'give').'</strong></p>';
+			echo '<div>'.get_post_meta($item['ID'], '_give_log_key', true).'</div>';
+			echo '<p><strong>'.esc_html__('Request Date:', 'give').'</strong></p>';
+			echo '<div>'.get_post_field('post_date', $item['ID']).'</div>';
 			?>
 		</div>
 		<?php
@@ -160,7 +160,7 @@ 
 	 * @return string|bool String if search is present, false otherwise
 	 */
 	public function get_search() {
-		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;
+		return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false;
 	}
 
 
@@ -176,19 +176,19 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+	protected function display_tablenav($which) {
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav <?php echo esc_attr($which); ?>">
 
 			<div class="alignleft actions bulkactions">
-				<?php $this->bulk_actions( $which ); ?>
+				<?php $this->bulk_actions($which); ?>
 			</div>
 			<?php
-			$this->extra_tablenav( $which );
-			$this->pagination( $which );
+			$this->extra_tablenav($which);
+			$this->pagination($which);
 			?>
 
 			<br class="clear"/>
@@ -210,31 +210,31 @@ 
 
 		$search = $this->get_search();
 
-		if ( $search ) {
-			if ( filter_var( $search, FILTER_VALIDATE_IP ) ) {
+		if ($search) {
+			if (filter_var($search, FILTER_VALIDATE_IP)) {
 				// This is an IP address search
 				$key = '_give_log_request_ip';
-			} elseif ( is_email( $search ) ) {
+			} elseif (is_email($search)) {
 				// This is an email search
-				$userdata = get_user_by( 'email', $search );
+				$userdata = get_user_by('email', $search);
 
-				if ( $userdata ) {
+				if ($userdata) {
 					$search = $userdata->ID;
 				}
 
 				$key = '_give_log_user';
-			} elseif ( strlen( $search ) == 32 ) {
+			} elseif (strlen($search) == 32) {
 				// Look for an API key
 				$key = '_give_log_key';
-			} elseif ( stristr( $search, 'token:' ) ) {
+			} elseif (stristr($search, 'token:')) {
 				// Look for an API token
-				$search = str_ireplace( 'token:', '', $search );
+				$search = str_ireplace('token:', '', $search);
 				$key    = '_give_log_token';
 			} else {
 				// This is (probably) a user ID search
-				$userdata = get_userdata( $search );
+				$userdata = get_userdata($search);
 
-				if ( $userdata ) {
+				if ($userdata) {
 					$search = $userdata->ID;
 				}
 
@@ -260,7 +260,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -270,7 +270,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	function bulk_actions( $which = '' ) {
+	function bulk_actions($which = '') {
 		give_log_views();
 	}
 
@@ -293,14 +293,14 @@ 
 			'meta_query' => $this->get_meta_query(),
 		);
 
-		$logs = $give_logs->get_connected_logs( $log_query );
+		$logs = $give_logs->get_connected_logs($log_query);
 
-		if ( $logs ) {
-			foreach ( $logs as $log ) {
+		if ($logs) {
+			foreach ($logs as $log) {
 
 				$logs_data[] = array(
 					'ID'   => $log->ID,
-					'ip'   => get_post_meta( $log->ID, '_give_log_request_ip', true ),
+					'ip'   => get_post_meta($log->ID, '_give_log_request_ip', true),
 					'date' => $log->post_date,
 				);
 			}
@@ -328,14 +328,14 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array(); // No hidden columns
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$this->items           = $this->get_logs();
-		$total_items           = $give_logs->get_log_count( 0, 'api_requests' );
+		$total_items           = $give_logs->get_log_count(0, 'api_requests');
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $total_items / $this->per_page ),
+				'total_pages' => ceil($total_items / $this->per_page),
 			)
 		);
 	}