WordImpress / Give

includes/admin/tools/import/class-give-import-donations.php

Doc Comments +2 added lines, -2 removed lines

@@ -454,7 +454,7 @@ 
 
 		/**
 		 * @param $option_value
-		 * @param $value
+		 * @param boolean $value
 		 *
 		 * @return string
 		 */
@@ -544,7 +544,7 @@ 
 		 *
 		 * @since 1.8.14
 		 *
-		 * @param $file_id
+		 * @param integer $file_id
 		 *
 		 * @return bool|int
 		 */

Indentation +2 added lines, -2 removed lines

@@ -871,8 +871,8 @@
 		 */
 		private function is_donations_import_page() {
 			return 'import' === give_get_current_setting_tab() &&
-			       isset( $_GET['importer-type'] ) &&
-			       $this->importer_type === give_clean( $_GET['importer-type'] );
+				   isset( $_GET['importer-type'] ) &&
+				   $this->importer_type === give_clean( $_GET['importer-type'] );
 		}
 	}
 

Spacing +189 added lines, -195 removed lines

@@ -11,11 +11,11 @@ 
  * @since       1.8.14
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly
 }
 
-if ( ! class_exists( 'Give_Import_Donations' ) ) {
+if ( ! class_exists('Give_Import_Donations')) {
 
 	/**
 	 * Give_Import_Donations.
@@ -57,7 +57,7 @@ 
 		 * @access private
 		 */
 		private function __construct() {
-			self::$per_page  = ! empty( $_GET['per_page'] ) ? absint( $_GET['per_page'] ) : self::$per_page;
+			self::$per_page = ! empty($_GET['per_page']) ? absint($_GET['per_page']) : self::$per_page;
 		}
 
 		/**
@@ -69,7 +69,7 @@ 
 		 * @return static
 		 */
 		public static function get_instance() {
-			if ( null === static::$instance ) {
+			if (null === static::$instance) {
 				self::$instance = new static();
 			}
 
@@ -96,27 +96,27 @@ 
 		 * @return void
 		 */
 		private function setup_hooks() {
-			if ( ! $this->is_donations_import_page() ) {
+			if ( ! $this->is_donations_import_page()) {
 				return;
 			}
 
 			// Do not render main import tools page.
-			remove_action( 'give_admin_field_tools_import', array( 'Give_Settings_Import', 'render_import_field', ) );
+			remove_action('give_admin_field_tools_import', array('Give_Settings_Import', 'render_import_field',));
 
 
 			// Render donation import page
-			add_action( 'give_admin_field_tools_import', array( $this, 'render_page' ) );
+			add_action('give_admin_field_tools_import', array($this, 'render_page'));
 
 			// Print the HTML.
-			add_action( 'give_tools_import_donations_form_start', array( $this, 'html' ), 10 );
+			add_action('give_tools_import_donations_form_start', array($this, 'html'), 10);
 
 			// Run when form submit.
-			add_action( 'give-tools_save_import', array( $this, 'save' ) );
+			add_action('give-tools_save_import', array($this, 'save'));
 
-			add_action( 'give-tools_update_notices', array( $this, 'update_notices' ), 11, 1 );
+			add_action('give-tools_update_notices', array($this, 'update_notices'), 11, 1);
 
 			// Used to add submit button.
-			add_action( 'give_tools_import_donations_form_end', array( $this, 'submit' ), 10 );
+			add_action('give_tools_import_donations_form_end', array($this, 'submit'), 10);
 		}
 
 		/**
@@ -128,9 +128,9 @@ 
 		 *
 		 * @return mixed
 		 */
-		public function update_notices( $messages ) {
-			if ( ! empty( $_GET['tab'] ) && 'import' === give_clean( $_GET['tab'] ) ) {
-				unset( $messages['give-setting-updated'] );
+		public function update_notices($messages) {
+			if ( ! empty($_GET['tab']) && 'import' === give_clean($_GET['tab'])) {
+				unset($messages['give-setting-updated']);
 			}
 
 			return $messages;
@@ -142,7 +142,7 @@ 
 		 * @since 1.8.14
 		 */
 		public function submit() {
-			wp_nonce_field( 'give-save-settings', '_give-save-settings' );
+			wp_nonce_field('give-save-settings', '_give-save-settings');
 			?>
 			<input type="hidden" class="import-step" id="import-step" name="step" value="<?php echo $this->get_step(); ?>"/>
 			<input type="hidden" class="importer-type" value="<?php echo $this->importer_type; ?>"/>
@@ -164,7 +164,7 @@ 
 				<table class="widefat export-options-table give-table <?php echo "step-{$step}"; ?>" id="<?php echo "step-{$step}"; ?>">
 					<tbody>
 						<?php
-						switch ( $this->get_step() ) {
+						switch ($this->get_step()) {
 							case 1:
 								$this->render_media_csv();
 								break;
@@ -181,7 +181,7 @@ 
 								$this->import_success();
 						}
 
-						if ( false === $this->check_for_dropdown_or_import() ) {
+						if (false === $this->check_for_dropdown_or_import()) {
 							?>
 							<tr valign="top">
 								<th></th>
@@ -189,7 +189,7 @@ 
 									<input type="submit"
 										   class="button button-primary button-large button-secondary <?php echo "step-{$step}"; ?>"
 										   id="recount-stats-submit"
-										   value="<?php esc_attr_e( 'Submit', 'give' ); ?>"/>
+										   value="<?php esc_attr_e('Submit', 'give'); ?>"/>
 								</th>
 							</tr>
 							<?php
@@ -208,56 +208,56 @@ 
 		 */
 		public function import_success() {
 
-			$delete_csv = ( ! empty( $_GET['delete_csv'] ) ? absint( $_GET['delete_csv'] ) : false );
-			$csv        = ( ! empty( $_GET['csv'] ) ? absint( $_GET['csv'] ) : false );
-			if ( ! empty( $delete_csv ) && ! empty( $csv ) ) {
-				wp_delete_attachment( $csv, true );
+			$delete_csv = ( ! empty($_GET['delete_csv']) ? absint($_GET['delete_csv']) : false);
+			$csv        = ( ! empty($_GET['csv']) ? absint($_GET['csv']) : false);
+			if ( ! empty($delete_csv) && ! empty($csv)) {
+				wp_delete_attachment($csv, true);
 			}
 
 			$report      = give_import_donation_report();
 			$report_html = array(
 				'duplicate_donor'    => array(
-					__( '%s duplicate %s detected', 'give' ),
-					__( 'donor', 'give' ),
-					__( 'donors', 'give' ),
+					__('%s duplicate %s detected', 'give'),
+					__('donor', 'give'),
+					__('donors', 'give'),
 				),
 				'create_donor'       => array(
-					__( '%s %s created', 'give' ),
-					__( 'donor', 'give' ),
-					__( 'donors', 'give' ),
+					__('%s %s created', 'give'),
+					__('donor', 'give'),
+					__('donors', 'give'),
 				),
 				'create_form'        => array(
-					__( '%s donation %s created', 'give' ),
-					__( 'form', 'give' ),
-					__( 'forms', 'give' ),
+					__('%s donation %s created', 'give'),
+					__('form', 'give'),
+					__('forms', 'give'),
 				),
 				'duplicate_donation' => array(
-					__( '%s duplicate %s detected', 'give' ),
-					__( 'donation', 'give' ),
-					__( 'donations', 'give' ),
+					__('%s duplicate %s detected', 'give'),
+					__('donation', 'give'),
+					__('donations', 'give'),
 				),
 				'create_donation'    => array(
-					__( '%s %s imported', 'give' ),
-					__( 'donation', 'give' ),
-					__( 'donations', 'give' ),
+					__('%s %s imported', 'give'),
+					__('donation', 'give'),
+					__('donations', 'give'),
 				),
 			);
-			$total       = (int) $_GET['total'];
-			-- $total;
+			$total = (int) $_GET['total'];
+			--$total;
 			$success = (bool) $_GET['success'];
 			?>
 			<tr valign="top" class="give-import-dropdown">
 				<th colspan="2">
 					<h2>
 						<?php
-						if ( $success ) {
+						if ($success) {
 							echo sprintf(
-								__( 'Import complete! %s donations processed', 'give' ),
+								__('Import complete! %s donations processed', 'give'),
 								"<strong>{$total}</strong>"
 							);
 						} else {
 							echo sprintf(
-								__( 'Failed to import %s donations', 'give' ),
+								__('Failed to import %s donations', 'give'),
 								"<strong>{$total}</strong>"
 							);
 						}
@@ -265,25 +265,25 @@ 
 					</h2>
 
 					<?php
-					$text      = __( 'Import Donation', 'give' );
+					$text      = __('Import Donation', 'give');
 					$query_arg = array(
 						'post_type' => 'give_forms',
 						'page'      => 'give-tools',
 						'tab'       => 'import',
 					);
-					if ( $success ) {
+					if ($success) {
 						$query_arg = array(
 							'post_type' => 'give_forms',
 							'page'      => 'give-payment-history',
 						);
-						$text      = __( 'View Donations', 'give' );
+						$text = __('View Donations', 'give');
 					}
 
-					foreach ( $report as $key => $value ) {
-						if ( array_key_exists( $key, $report_html ) && ! empty( $value ) ) {
+					foreach ($report as $key => $value) {
+						if (array_key_exists($key, $report_html) && ! empty($value)) {
 							?>
 							<p>
-								<?php echo esc_html( wp_sprintf( $report_html[ $key ][0], $value, _n( $report_html[ $key ][1], $report_html[ $key ][2], $value, 'give' ) ) ); ?>
+								<?php echo esc_html(wp_sprintf($report_html[$key][0], $value, _n($report_html[$key][1], $report_html[$key][2], $value, 'give'))); ?>
 							</p>
 							<?php
 						}
@@ -291,7 +291,7 @@ 
 					?>
 
 					<p>
-						<a class="button button-large button-secondary" href="<?php echo add_query_arg( $query_arg, admin_url( 'edit.php' ) ); ?>"><?php echo $text; ?></a>
+						<a class="button button-large button-secondary" href="<?php echo add_query_arg($query_arg, admin_url('edit.php')); ?>"><?php echo $text; ?></a>
 					</p>
 				</th>
 			</tr>
@@ -308,26 +308,26 @@ 
 			give_import_donation_report_reset();
 
 			$csv         = (int) $_REQUEST['csv'];
-			$delimiter   = ( ! empty( $_REQUEST['delimiter'] ) ? give_clean( $_REQUEST['delimiter'] ) : 'csv' );
+			$delimiter   = ( ! empty($_REQUEST['delimiter']) ? give_clean($_REQUEST['delimiter']) : 'csv');
 			$index_start = 1;
 			$index_end   = 1;
 			$next        = true;
-			$total       = self::get_csv_total( $csv );
-			if ( self::$per_page < $total ) {
-				$total_ajax = ceil( $total / self::$per_page );
+			$total       = self::get_csv_total($csv);
+			if (self::$per_page < $total) {
+				$total_ajax = ceil($total / self::$per_page);
 				$index_end  = self::$per_page;
 			} else {
 				$total_ajax = 1;
 				$index_end  = $total;
 				$next       = false;
 			}
-			$current_percentage = 100 / ( $total_ajax + 1 );
+			$current_percentage = 100 / ($total_ajax + 1);
 
 			?>
 			<tr valign="top" class="give-import-dropdown">
 				<th colspan="2">
-					<h2 id="give-import-title"><?php esc_html_e( 'Importing', 'give' ) ?></h2>
-					<p class="give-field-description"><?php esc_html_e( 'Your donations are now being imported...', 'give' ) ?></p>
+					<h2 id="give-import-title"><?php esc_html_e('Importing', 'give') ?></h2>
+					<p class="give-field-description"><?php esc_html_e('Your donations are now being imported...', 'give') ?></p>
 				</th>
 			</tr>
 
@@ -346,7 +346,7 @@ 
 						<div style="width: <?php echo $current_percentage; ?>%"></div>
 					</div>
 					<input type="hidden" value="3" name="step">
-					<input type="hidden" value='<?php echo maybe_serialize( $_REQUEST['mapto'] ); ?>' name="mapto"
+					<input type="hidden" value='<?php echo maybe_serialize($_REQUEST['mapto']); ?>' name="mapto"
 						   class="mapto">
 					<input type="hidden" value="<?php echo $_REQUEST['csv']; ?>" name="csv" class="csv">
 					<input type="hidden" value="<?php echo $_REQUEST['mode']; ?>" name="mode" class="mode">
@@ -355,7 +355,7 @@ 
 					<input type="hidden" value="<?php echo $_REQUEST['delete_csv']; ?>" name="delete_csv"
 						   class="delete_csv">
 					<input type="hidden" value="<?php echo $delimiter; ?>" name="delimiter">
-					<input type="hidden" value='<?php echo maybe_serialize( self::get_importer( $csv, 0, $delimiter ) ); ?>'
+					<input type="hidden" value='<?php echo maybe_serialize(self::get_importer($csv, 0, $delimiter)); ?>'
 						   name="main_key"
 						   class="main_key">
 				</th>
@@ -376,20 +376,20 @@ 
 		 */
 		public function check_for_dropdown_or_import() {
 			$return = true;
-			if ( isset( $_REQUEST['mapto'] ) ) {
+			if (isset($_REQUEST['mapto'])) {
 				$mapto = (array) $_REQUEST['mapto'];
-				if ( false === in_array( 'form_title', $mapto ) && false === in_array( 'form_id', $mapto ) ) {
-					Give_Admin_Settings::add_error( 'give-import-csv-form', __( 'In order to import donations, a column must be mapped to either the "Donation Form Title" or "Donation Form ID" field. Please map a column to one of those fields.', 'give' ) );
+				if (false === in_array('form_title', $mapto) && false === in_array('form_id', $mapto)) {
+					Give_Admin_Settings::add_error('give-import-csv-form', __('In order to import donations, a column must be mapped to either the "Donation Form Title" or "Donation Form ID" field. Please map a column to one of those fields.', 'give'));
 					$return = false;
 				}
 
-				if ( false === in_array( 'amount', $mapto ) ) {
-					Give_Admin_Settings::add_error( 'give-import-csv-amount', __( 'In order to import donations, a column must be mapped to the "Amount" field. Please map a column to that field.', 'give' ) );
+				if (false === in_array('amount', $mapto)) {
+					Give_Admin_Settings::add_error('give-import-csv-amount', __('In order to import donations, a column must be mapped to the "Amount" field. Please map a column to that field.', 'give'));
 					$return = false;
 				}
 
-				if ( false === in_array( 'email', $mapto ) && false === in_array( 'donor_id', $mapto ) ) {
-					Give_Admin_Settings::add_error( 'give-import-csv-donor', __( 'In order to import donations, a column must be mapped to either the "Donor Email" or "Donor ID" field. Please map a column to that field.', 'give' ) );
+				if (false === in_array('email', $mapto) && false === in_array('donor_id', $mapto)) {
+					Give_Admin_Settings::add_error('give-import-csv-donor', __('In order to import donations, a column must be mapped to either the "Donor Email" or "Donor ID" field. Please map a column to that field.', 'give'));
 					$return = false;
 				}
 			} else {
@@ -406,10 +406,10 @@ 
 		 */
 		public function render_dropdown() {
 			$csv       = (int) $_GET['csv'];
-			$delimiter = ( ! empty( $_GET['delimiter'] ) ? give_clean( $_GET['delimiter'] ) : 'csv' );
+			$delimiter = ( ! empty($_GET['delimiter']) ? give_clean($_GET['delimiter']) : 'csv');
 
 			// TO check if the CSV files that is being add is valid or not if not then redirect to first step again
-			if ( ! $this->is_valid_csv( $csv ) ) {
+			if ( ! $this->is_valid_csv($csv)) {
 				$url = give_import_page_url();
 				?>
 				<script type="text/javascript">
@@ -420,27 +420,27 @@ 
 				?>
 				<tr valign="top" class="give-import-dropdown">
 					<th colspan="2">
-						<h2 id="give-import-title"><?php esc_html_e( 'Map CSV fields to donations', 'give' ) ?></h2>
-						<p class="give-field-description"><?php esc_html_e( 'Select fields from your CSV file to map against donations fields or to ignore during import.', 'give' ) ?></p>
+						<h2 id="give-import-title"><?php esc_html_e('Map CSV fields to donations', 'give') ?></h2>
+						<p class="give-field-description"><?php esc_html_e('Select fields from your CSV file to map against donations fields or to ignore during import.', 'give') ?></p>
 					</th>
 				</tr>
 
 				<tr valign="top" class="give-import-dropdown">
-					<th><b><?php esc_html_e( 'Column name', 'give' ); ?></b></th>
-					<th><b><?php esc_html_e( 'Map to field', 'give' ); ?></b></th>
+					<th><b><?php esc_html_e('Column name', 'give'); ?></b></th>
+					<th><b><?php esc_html_e('Map to field', 'give'); ?></b></th>
 				</tr>
 
 				<?php
-				$raw_key   = $this->get_importer( $csv, 0, $delimiter );
-				$mapto     = (array) ( isset( $_REQUEST['mapto'] ) ? $_REQUEST['mapto'] : array() );
+				$raw_key   = $this->get_importer($csv, 0, $delimiter);
+				$mapto     = (array) (isset($_REQUEST['mapto']) ? $_REQUEST['mapto'] : array());
 
-				foreach ( $raw_key as $index => $value ) {
+				foreach ($raw_key as $index => $value) {
 					?>
 					<tr valign="top" class="give-import-option">
 						<th><?php echo $value; ?></th>
 						<th>
 							<?php
-							$this->get_columns( $index, $value, $mapto );
+							$this->get_columns($index, $value, $mapto);
 							?>
 						</th>
 					</tr>
@@ -455,14 +455,14 @@ 
 		 *
 		 * @return string
 		 */
-		public function selected( $option_value, $value ) {
-			$option_value = strtolower( $option_value );
-			$value = strtolower( $value );
+		public function selected($option_value, $value) {
+			$option_value = strtolower($option_value);
+			$value = strtolower($value);
 
 			$selected = '';
-			if ( stristr( $value, $option_value ) ) {
+			if (stristr($value, $option_value)) {
 				$selected = 'selected';
-			} elseif ( strrpos( $value, '_' ) && stristr( $option_value, __( 'Import as Meta', 'give' ) ) ) {
+			} elseif (strrpos($value, '_') && stristr($option_value, __('Import as Meta', 'give'))) {
 				$selected = 'selected';
 			}
 
@@ -481,28 +481,28 @@ 
 		 *
 		 * @return void
 		 */
-		private function get_columns( $index, $value = false, $mapto = array() ) {
+		private function get_columns($index, $value = false, $mapto = array()) {
 			$default       = give_import_default_options();
-			$current_mapto = (string) ( ! empty( $mapto[ $index ] ) ? $mapto[ $index ] : '' );
+			$current_mapto = (string) ( ! empty($mapto[$index]) ? $mapto[$index] : '');
 			?>
 			<select name="mapto[<?php echo $index; ?>]">
-				<?php $this->get_dropdown_option_html( $default, $current_mapto, $value ); ?>
+				<?php $this->get_dropdown_option_html($default, $current_mapto, $value); ?>
 
-				<optgroup label="<?php _e( 'Donations', 'give' ); ?>">
+				<optgroup label="<?php _e('Donations', 'give'); ?>">
 					<?php
-					$this->get_dropdown_option_html( give_import_donations_options(), $current_mapto, $value );
+					$this->get_dropdown_option_html(give_import_donations_options(), $current_mapto, $value);
 					?>
 				</optgroup>
 
-				<optgroup label="<?php _e( 'Donors', 'give' ); ?>">
+				<optgroup label="<?php _e('Donors', 'give'); ?>">
 					<?php
-					$this->get_dropdown_option_html( give_import_donor_options(), $current_mapto, $value );
+					$this->get_dropdown_option_html(give_import_donor_options(), $current_mapto, $value);
 					?>
 				</optgroup>
 
-				<optgroup label="<?php _e( 'Forms', 'give' ); ?>">
+				<optgroup label="<?php _e('Forms', 'give'); ?>">
 					<?php
-					$this->get_dropdown_option_html( give_import_donation_form_options(), $current_mapto, $value );
+					$this->get_dropdown_option_html(give_import_donation_form_options(), $current_mapto, $value);
 					?>
 				</optgroup>
 
@@ -513,7 +513,7 @@ 
 				 *
 				 * @since 1.8.15
 				 */
-				do_action( 'give_import_dropdown_option', $index, $value, $mapto, $current_mapto );
+				do_action('give_import_dropdown_option', $index, $value, $mapto, $current_mapto);
 				?>
 			</select>
 			<?php
@@ -531,16 +531,16 @@ 
 		 *
 		 * @return void
 		 */
-		public function get_dropdown_option_html( $options, $current_mapto, $value = false ) {
-			foreach ( $options as $option => $option_value ) {
+		public function get_dropdown_option_html($options, $current_mapto, $value = false) {
+			foreach ($options as $option => $option_value) {
 				$option_value_texts = (array) $option_value;
 				$option_text = $option_value_texts[0];
 
-				$checked = ( ( $current_mapto === $option ) ? 'selected' : false );
-				if ( empty( $checked ) ) {
-					foreach ( $option_value_texts as $option_value_text ) {
-						$checked = $this->selected( $option_value_text, $value );
-						if ( $checked ) {
+				$checked = (($current_mapto === $option) ? 'selected' : false);
+				if (empty($checked)) {
+					foreach ($option_value_texts as $option_value_text) {
+						$checked = $this->selected($option_value_text, $value);
+						if ($checked) {
 							break;
 						}
 					}
@@ -564,13 +564,13 @@ 
 		 *
 		 * @return bool|int
 		 */
-		public function get_csv_total( $file_id ) {
+		public function get_csv_total($file_id) {
 			$total = false;
-			if ( $file_id ) {
-				$file_dir = get_attached_file( $file_id );
-				if ( $file_dir ) {
-					$file = new SplFileObject( $file_dir, 'r' );
-					$file->seek( PHP_INT_MAX );
+			if ($file_id) {
+				$file_dir = get_attached_file($file_id);
+				if ($file_dir) {
+					$file = new SplFileObject($file_dir, 'r');
+					$file->seek(PHP_INT_MAX);
 					$total = $file->key() + 1;
 				}
 			}
@@ -589,7 +589,7 @@ 
 		 *
 		 * @return array|bool $raw_data title of the CSV file fields
 		 */
-		public function get_importer( $file_id, $index = 0, $delimiter = 'csv' ) {
+		public function get_importer($file_id, $index = 0, $delimiter = 'csv') {
 			/**
 			 * Filter to modify delimiter of Import.
 			 *
@@ -597,16 +597,16 @@ 
 			 *
 			 * Return string $delimiter.
 			 */
-			$delimiter = (string) apply_filters( 'give_import_delimiter_set', $delimiter );
+			$delimiter = (string) apply_filters('give_import_delimiter_set', $delimiter);
 
 			$raw_data = false;
-			$file_dir = get_attached_file( $file_id );
-			if ( $file_dir ) {
-				if ( false !== ( $handle = fopen( $file_dir, 'r' ) ) ) {
-					$raw_data = fgetcsv( $handle, $index, $delimiter );
+			$file_dir = get_attached_file($file_id);
+			if ($file_dir) {
+				if (false !== ($handle = fopen($file_dir, 'r'))) {
+					$raw_data = fgetcsv($handle, $index, $delimiter);
 					// Remove BOM signature from the first item.
-					if ( isset( $raw_data[0] ) ) {
-						$raw_data[0] = $this->remove_utf8_bom( $raw_data[0] );
+					if (isset($raw_data[0])) {
+						$raw_data[0] = $this->remove_utf8_bom($raw_data[0]);
 					}
 				}
 			}
@@ -623,9 +623,9 @@ 
 		 *
 		 * @return string
 		 */
-		public function remove_utf8_bom( $string ) {
-			if ( 'efbbbf' === substr( bin2hex( $string ), 0, 6 ) ) {
-				$string = substr( $string, 3 );
+		public function remove_utf8_bom($string) {
+			if ('efbbbf' === substr(bin2hex($string), 0, 6)) {
+				$string = substr($string, 3);
 			}
 
 			return $string;
@@ -641,17 +641,17 @@ 
 			$step = $this->get_step();
 			?>
 			<ol class="give-progress-steps">
-				<li class="<?php echo( 1 === $step ? 'active' : '' ); ?>">
-					<?php esc_html_e( 'Upload CSV file', 'give' ); ?>
+				<li class="<?php echo(1 === $step ? 'active' : ''); ?>">
+					<?php esc_html_e('Upload CSV file', 'give'); ?>
 				</li>
-				<li class="<?php echo( 2 === $step ? 'active' : '' ); ?>">
-					<?php esc_html_e( 'Column mapping', 'give' ); ?>
+				<li class="<?php echo(2 === $step ? 'active' : ''); ?>">
+					<?php esc_html_e('Column mapping', 'give'); ?>
 				</li>
-				<li class="<?php echo( 3 === $step ? 'active' : '' ); ?>">
-					<?php esc_html_e( 'Import', 'give' ); ?>
+				<li class="<?php echo(3 === $step ? 'active' : ''); ?>">
+					<?php esc_html_e('Import', 'give'); ?>
 				</li>
-				<li class="<?php echo( 4 === $step ? 'active' : '' ); ?>">
-					<?php esc_html_e( 'Done!', 'give' ); ?>
+				<li class="<?php echo(4 === $step ? 'active' : ''); ?>">
+					<?php esc_html_e('Done!', 'give'); ?>
 				</li>
 			</ol>
 			<?php
@@ -665,16 +665,16 @@ 
 		 * @return int $step on which step doest the import is on.
 		 */
 		public function get_step() {
-			$step    = (int) ( isset( $_REQUEST['step'] ) ? give_clean( $_REQUEST['step'] ) : 0 );
+			$step    = (int) (isset($_REQUEST['step']) ? give_clean($_REQUEST['step']) : 0);
 			$on_step = 1;
 
-			if ( empty( $step ) || 1 === $step ) {
+			if (empty($step) || 1 === $step) {
 				$on_step = 1;
-			} elseif ( $this->check_for_dropdown_or_import() ) {
+			} elseif ($this->check_for_dropdown_or_import()) {
 				$on_step = 3;
-			} elseif ( 2 === $step ) {
+			} elseif (2 === $step) {
 				$on_step = 2;
-			} elseif ( 4 === $step ) {
+			} elseif (4 === $step) {
 				$on_step = 4;
 			}
 
@@ -687,7 +687,7 @@ 
 		 * @since 1.8.14
 		 */
 		public function render_page() {
-			include_once GIVE_PLUGIN_DIR . 'includes/admin/tools/views/html-admin-page-import-donations.php';
+			include_once GIVE_PLUGIN_DIR.'includes/admin/tools/views/html-admin-page-import-donations.php';
 		}
 
 		/**
@@ -702,37 +702,34 @@ 
 			?>
 			<tr valign="top">
 				<th colspan="2">
-					<h2 id="give-import-title"><?php esc_html_e( 'Import donations from a CSV file', 'give' ) ?></h2>
-					<p class="give-field-description"><?php esc_html_e( 'This tool allows you to import or add donation data to your give form(s) via a CSV file.', 'give' ) ?></p>
+					<h2 id="give-import-title"><?php esc_html_e('Import donations from a CSV file', 'give') ?></h2>
+					<p class="give-field-description"><?php esc_html_e('This tool allows you to import or add donation data to your give form(s) via a CSV file.', 'give') ?></p>
 				</th>
 			</tr>
 			<?php
-			$csv         = ( isset( $_POST['csv'] ) ? give_clean( $_POST['csv'] ) : '' );
-			$csv_id      = ( isset( $_POST['csv_id'] ) ? give_clean( $_POST['csv_id'] ) : '' );
-			$delimiter   = ( isset( $_POST['delimiter'] ) ? give_clean( $_POST['delimiter'] ) : 'csv' );
-			$mode        = empty( $_POST['mode'] ) ?
-				'disabled' :
-				( give_is_setting_enabled( give_clean( $_POST['mode'] ) ) ? 'enabled' : 'disabled' );
-			$create_user = empty( $_POST['create_user'] ) ?
-				'enabled' :
-				( give_is_setting_enabled( give_clean( $_POST['create_user'] ) ) ? 'enabled' : 'disabled' );
-			$delete_csv  = empty( $_POST['delete_csv'] ) ?
-				'enabled' :
-				( give_is_setting_enabled( give_clean( $_POST['delete_csv'] ) ) ? 'enabled' : 'disabled' );
+			$csv         = (isset($_POST['csv']) ? give_clean($_POST['csv']) : '');
+			$csv_id      = (isset($_POST['csv_id']) ? give_clean($_POST['csv_id']) : '');
+			$delimiter   = (isset($_POST['delimiter']) ? give_clean($_POST['delimiter']) : 'csv');
+			$mode        = empty($_POST['mode']) ?
+				'disabled' : (give_is_setting_enabled(give_clean($_POST['mode'])) ? 'enabled' : 'disabled');
+			$create_user = empty($_POST['create_user']) ?
+				'enabled' : (give_is_setting_enabled(give_clean($_POST['create_user'])) ? 'enabled' : 'disabled');
+			$delete_csv  = empty($_POST['delete_csv']) ?
+				'enabled' : (give_is_setting_enabled(give_clean($_POST['delete_csv'])) ? 'enabled' : 'disabled');
 
 			// Reset csv and csv_id if csv
-			if ( empty( $csv_id ) || ! $this->is_valid_csv( $csv_id, $csv ) ) {
+			if (empty($csv_id) || ! $this->is_valid_csv($csv_id, $csv)) {
 				$csv_id = $csv = '';
 			}
-			$per_page = isset( $_POST['per_page'] ) ? absint( $_POST['per_page'] ) : self::$per_page;
+			$per_page = isset($_POST['per_page']) ? absint($_POST['per_page']) : self::$per_page;
 
 			$settings = array(
 				array(
 					'id'          => 'csv',
-					'name'        => __( 'Choose a CSV file:', 'give' ),
+					'name'        => __('Choose a CSV file:', 'give'),
 					'type'        => 'file',
-					'attributes'  => array( 'editing' => 'false', 'library' => 'text' ),
-					'description' => __( 'The file must be a Comma Seperated Version (CSV) file type only.', 'give' ),
+					'attributes'  => array('editing' => 'false', 'library' => 'text'),
+					'description' => __('The file must be a Comma Seperated Version (CSV) file type only.', 'give'),
 					'fvalue'      => 'url',
 					'default'     => $csv,
 				),
@@ -743,61 +740,61 @@ 
 				),
 				array(
 					'id'          => 'delimiter',
-					'name'        => __( 'CSV Delimiter:', 'give' ),
-					'description' => __( 'In case your CSV file supports a different type of separator (or delimiter) -- like a tab or space -- you can set that here.', 'give' ),
+					'name'        => __('CSV Delimiter:', 'give'),
+					'description' => __('In case your CSV file supports a different type of separator (or delimiter) -- like a tab or space -- you can set that here.', 'give'),
 					'default'     => $delimiter,
 					'type'        => 'select',
 					'options'     => array(
-						'csv'                  => esc_html__( 'Comma', 'give' ),
-						'tab-separated-values' => esc_html__( 'Tab', 'give' ),
+						'csv'                  => esc_html__('Comma', 'give'),
+						'tab-separated-values' => esc_html__('Tab', 'give'),
 					),
 				),
 				array(
 					'id'          => 'mode',
-					'name'        => __( 'Test Mode:', 'give' ),
-					'description' => __( 'Test mode allows you to preview what this import would look like without making any actual changes to your site or your database.', 'give' ),
+					'name'        => __('Test Mode:', 'give'),
+					'description' => __('Test mode allows you to preview what this import would look like without making any actual changes to your site or your database.', 'give'),
 					'default'     => $mode,
 					'type'        => 'radio_inline',
 					'options'     => array(
-						'enabled'  => __( 'Enabled', 'give' ),
-						'disabled' => __( 'Disabled', 'give' ),
+						'enabled'  => __('Enabled', 'give'),
+						'disabled' => __('Disabled', 'give'),
 					),
 				),
 				array(
 					'id'          => 'create_user',
-					'name'        => __( 'Create WP users for new donors:', 'give' ),
-					'description' => __( 'The importer can create WordPress user accounts based on the names and email addresses of the donations in your CSV file. Enable this option if you\'d like the importer to do that.', 'give' ),
+					'name'        => __('Create WP users for new donors:', 'give'),
+					'description' => __('The importer can create WordPress user accounts based on the names and email addresses of the donations in your CSV file. Enable this option if you\'d like the importer to do that.', 'give'),
 					'default'     => $create_user,
 					'type'        => 'radio_inline',
 					'options'     => array(
-						'enabled'  => __( 'Enabled', 'give' ),
-						'disabled' => __( 'Disabled', 'give' ),
+						'enabled'  => __('Enabled', 'give'),
+						'disabled' => __('Disabled', 'give'),
 					),
 				),
 				array(
 					'id'          => 'delete_csv',
-					'name'        => __( 'Delete CSV after import:', 'give' ),
-					'description' => __( 'Your CSV file will be uploaded via the WordPress Media Library. It\'s a good idea to delete it after the import is finished so that your sensitive data is not accessible on the web. Disable this only if you plan to delete the file manually later.', 'give' ),
+					'name'        => __('Delete CSV after import:', 'give'),
+					'description' => __('Your CSV file will be uploaded via the WordPress Media Library. It\'s a good idea to delete it after the import is finished so that your sensitive data is not accessible on the web. Disable this only if you plan to delete the file manually later.', 'give'),
 					'default'     => $delete_csv,
 					'type'        => 'radio_inline',
 					'options'     => array(
-						'enabled'  => __( 'Enabled', 'give' ),
-						'disabled' => __( 'Disabled', 'give' ),
+						'enabled'  => __('Enabled', 'give'),
+						'disabled' => __('Disabled', 'give'),
 					),
 				),
 				array(
 					'id'          => 'per_page',
-					'name'        => __( 'Process Rows Per Batch:', 'give' ),
+					'name'        => __('Process Rows Per Batch:', 'give'),
 					'type'        => 'number',
-					'description' => __( 'Determine how many rows you would like to import per cycle.', 'give' ),
+					'description' => __('Determine how many rows you would like to import per cycle.', 'give'),
 					'default'     => $per_page,
 					'class'       => 'give-text-small',
 				),
 			);
 
-			$settings = apply_filters( 'give_import_file_upload_html', $settings );
+			$settings = apply_filters('give_import_file_upload_html', $settings);
 
-			Give_Admin_Settings::output_fields( $settings, 'give_settings' );
+			Give_Admin_Settings::output_fields($settings, 'give_settings');
 		}
 
 		/**
@@ -810,27 +807,24 @@ 
 			$step = $this->get_step();
 
 			// Validation for first step.
-			if ( 1 === $step ) {
-				$csv_id = absint( $_POST['csv_id'] );
+			if (1 === $step) {
+				$csv_id = absint($_POST['csv_id']);
 
-				if ( $this->is_valid_csv( $csv_id, esc_url( $_POST['csv'] ) ) ) {
+				if ($this->is_valid_csv($csv_id, esc_url($_POST['csv']))) {
 
-					$url = give_import_page_url( (array) apply_filters( 'give_import_step_two_url', array(
+					$url = give_import_page_url((array) apply_filters('give_import_step_two_url', array(
 						'step'          => '2',
 						'importer-type' => $this->importer_type,
 						'csv'           => $csv_id,
-						'delimiter'     => isset( $_REQUEST['delimiter'] ) ? give_clean( $_REQUEST['delimiter'] ) : 'csv',
-						'mode'          => empty( $_POST['mode'] ) ?
-							'0' :
-							( give_is_setting_enabled( give_clean( $_POST['mode'] ) ) ? '1' : '0' ),
-						'create_user'   => empty( $_POST['create_user'] ) ?
-							'0' :
-							( give_is_setting_enabled( give_clean( $_POST['create_user'] ) ) ? '1' : '0' ),
-						'delete_csv'    => empty( $_POST['delete_csv'] ) ?
-							'1' :
-							( give_is_setting_enabled( give_clean( $_POST['delete_csv'] ) ) ? '1' : '0' ),
-						'per_page'      => isset( $_POST['per_page'] ) ? absint( $_POST['per_page'] ) : self::$per_page,
-					) ) );
+						'delimiter'     => isset($_REQUEST['delimiter']) ? give_clean($_REQUEST['delimiter']) : 'csv',
+						'mode'          => empty($_POST['mode']) ?
+							'0' : (give_is_setting_enabled(give_clean($_POST['mode'])) ? '1' : '0'),
+						'create_user'   => empty($_POST['create_user']) ?
+							'0' : (give_is_setting_enabled(give_clean($_POST['create_user'])) ? '1' : '0'),
+						'delete_csv'    => empty($_POST['delete_csv']) ?
+							'1' : (give_is_setting_enabled(give_clean($_POST['delete_csv'])) ? '1' : '0'),
+						'per_page'      => isset($_POST['per_page']) ? absint($_POST['per_page']) : self::$per_page,
+					)));
 					?>
 					<script type="text/javascript">
 						window.location = "<?php echo $url; ?>"
@@ -851,25 +845,25 @@ 
 		 *
 		 * @return bool $has_error CSV is valid or not.
 		 */
-		private function is_valid_csv( $csv = false, $match_url = '' ) {
+		private function is_valid_csv($csv = false, $match_url = '') {
 			$is_valid_csv = true;
 
-			if ( $csv ) {
-				$csv_url = wp_get_attachment_url( $csv );
+			if ($csv) {
+				$csv_url = wp_get_attachment_url($csv);
 
-				$delimiter = ( ! empty( $_REQUEST['delimiter'] ) ? give_clean( $_REQUEST['delimiter'] ) : 'csv' );
+				$delimiter = ( ! empty($_REQUEST['delimiter']) ? give_clean($_REQUEST['delimiter']) : 'csv');
 
 				if (
 					! $csv_url ||
-					( ! empty( $match_url ) && ( $csv_url !== $match_url ) ) ||
-					( ( $mime_type = get_post_mime_type( $csv ) ) && ! strpos( $mime_type, $delimiter ) )
+					( ! empty($match_url) && ($csv_url !== $match_url)) ||
+					(($mime_type = get_post_mime_type($csv)) && ! strpos($mime_type, $delimiter))
 				) {
 					$is_valid_csv = false;
-					Give_Admin_Settings::add_error( 'give-import-csv', __( 'Please upload or provide a valid CSV file.', 'give' ) );
+					Give_Admin_Settings::add_error('give-import-csv', __('Please upload or provide a valid CSV file.', 'give'));
 				}
 			} else {
 				$is_valid_csv = false;
-				Give_Admin_Settings::add_error( 'give-import-csv', __( 'Please upload or provide a valid CSV file.', 'give' ) );
+				Give_Admin_Settings::add_error('give-import-csv', __('Please upload or provide a valid CSV file.', 'give'));
 			}
 
 			return $is_valid_csv;
@@ -885,8 +879,8 @@ 
 		 * @param $field
 		 * @param $option_value
 		 */
-		public function render_import_field( $field, $option_value ) {
-			include_once GIVE_PLUGIN_DIR . 'includes/admin/tools/views/html-admin-page-imports.php';
+		public function render_import_field($field, $option_value) {
+			include_once GIVE_PLUGIN_DIR.'includes/admin/tools/views/html-admin-page-imports.php';
 		}
 
 		/**
@@ -897,8 +891,8 @@ 
 		 */
 		private function is_donations_import_page() {
 			return 'import' === give_get_current_setting_tab() &&
-			       isset( $_GET['importer-type'] ) &&
-			       $this->importer_type === give_clean( $_GET['importer-type'] );
+			       isset($_GET['importer-type']) &&
+			       $this->importer_type === give_clean($_GET['importer-type']);
 		}
 	}
 

includes/class-give-donor.php

Doc Comments +2 added lines, -2 removed lines

@@ -902,7 +902,7 @@ 
 	 * @access public
 	 *
 	 * @param  string $meta_key Metadata key. Default is empty.
-	 * @param  mixed $meta_value Metadata value.
+	 * @param  integer $meta_value Metadata value.
 	 * @param  mixed $prev_value Optional. Previous value to check before removing. Default is empty.
 	 *
 	 * @return bool               False on failure, true if success.
@@ -918,7 +918,7 @@ 
 	 * @access public
 	 *
 	 * @param  string $meta_key Metadata name. Default is empty.
-	 * @param  mixed $meta_value Optional. Metadata value. Default is empty.
+	 * @param  string $meta_value Optional. Metadata value. Default is empty.
 	 *
 	 * @return bool               False for failure. True for success.
 	 */

Spacing +172 added lines, -172 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -139,32 +139,32 @@ 
 	 * @param bool $_id_or_email
 	 * @param bool $by_user_id
 	 */
-	public function __construct( $_id_or_email = false, $by_user_id = false ) {
+	public function __construct($_id_or_email = false, $by_user_id = false) {
 
 		$this->db = Give()->donors;
 
 		if (
 			false === $_id_or_email
-			|| ( is_numeric( $_id_or_email ) && (int) $_id_or_email !== absint( $_id_or_email ) )
+			|| (is_numeric($_id_or_email) && (int) $_id_or_email !== absint($_id_or_email))
 		) {
 			return false;
 		}
 
-		$by_user_id = is_bool( $by_user_id ) ? $by_user_id : false;
+		$by_user_id = is_bool($by_user_id) ? $by_user_id : false;
 
-		if ( is_numeric( $_id_or_email ) ) {
+		if (is_numeric($_id_or_email)) {
 			$field = $by_user_id ? 'user_id' : 'id';
 		} else {
 			$field = 'email';
 		}
 
-		$donor = $this->db->get_donor_by( $field, $_id_or_email );
+		$donor = $this->db->get_donor_by($field, $_id_or_email);
 
-		if ( empty( $donor ) || ! is_object( $donor ) ) {
+		if (empty($donor) || ! is_object($donor)) {
 			return false;
 		}
 
-		$this->setup_donor( $donor );
+		$this->setup_donor($donor);
 
 	}
 
@@ -180,15 +180,15 @@ 
 	 *
 	 * @return bool             If the setup was successful or not.
 	 */
-	private function setup_donor( $donor ) {
+	private function setup_donor($donor) {
 
-		if ( ! is_object( $donor ) ) {
+		if ( ! is_object($donor)) {
 			return false;
 		}
 
-		foreach ( $donor as $key => $value ) {
+		foreach ($donor as $key => $value) {
 
-			switch ( $key ) {
+			switch ($key) {
 
 				case 'notes':
 					$this->$key = $this->get_notes();
@@ -202,11 +202,11 @@ 
 		}
 
 		// Get donor's all email including primary email.
-		$this->emails = (array) $this->get_meta( 'additional_email', false );
-		$this->emails = array( 'primary' => $this->email ) + $this->emails;
+		$this->emails = (array) $this->get_meta('additional_email', false);
+		$this->emails = array('primary' => $this->email) + $this->emails;
 
 		// Donor ID and email are the only things that are necessary, make sure they exist.
-		if ( ! empty( $this->id ) && ! empty( $this->email ) ) {
+		if ( ! empty($this->id) && ! empty($this->email)) {
 			return true;
 		}
 
@@ -223,16 +223,16 @@ 
 	 *
 	 * @return mixed|\WP_Error
 	 */
-	public function __get( $key ) {
+	public function __get($key) {
 
-		if ( method_exists( $this, 'get_' . $key ) ) {
+		if (method_exists($this, 'get_'.$key)) {
 
-			return call_user_func( array( $this, 'get_' . $key ) );
+			return call_user_func(array($this, 'get_'.$key));
 
 		} else {
 
 			/* translators: %s: property key */
-			return new WP_Error( 'give-donor-invalid-property', sprintf( esc_html__( 'Can\'t get property %s.', 'give' ), $key ) );
+			return new WP_Error('give-donor-invalid-property', sprintf(esc_html__('Can\'t get property %s.', 'give'), $key));
 
 		}
 
@@ -248,9 +248,9 @@ 
 	 *
 	 * @return bool|int    False if not a valid creation, donor ID if user is found or valid creation.
 	 */
-	public function create( $data = array() ) {
+	public function create($data = array()) {
 
-		if ( $this->id != 0 || empty( $data ) ) {
+		if ($this->id != 0 || empty($data)) {
 			return false;
 		}
 
@@ -258,15 +258,15 @@ 
 			'payment_ids' => '',
 		);
 
-		$args = wp_parse_args( $data, $defaults );
-		$args = $this->sanitize_columns( $args );
+		$args = wp_parse_args($data, $defaults);
+		$args = $this->sanitize_columns($args);
 
-		if ( empty( $args['email'] ) || ! is_email( $args['email'] ) ) {
+		if (empty($args['email']) || ! is_email($args['email'])) {
 			return false;
 		}
 
-		if ( ! empty( $args['payment_ids'] ) && is_array( $args['payment_ids'] ) ) {
-			$args['payment_ids'] = implode( ',', array_unique( array_values( $args['payment_ids'] ) ) );
+		if ( ! empty($args['payment_ids']) && is_array($args['payment_ids'])) {
+			$args['payment_ids'] = implode(',', array_unique(array_values($args['payment_ids'])));
 		}
 
 		/**
@@ -276,18 +276,18 @@ 
 		 *
 		 * @param array $args Donor attributes.
 		 */
-		do_action( 'give_donor_pre_create', $args );
+		do_action('give_donor_pre_create', $args);
 
 		$created = false;
 
 		// The DB class 'add' implies an update if the donor being asked to be created already exists
-		if ( $this->db->add( $data ) ) {
+		if ($this->db->add($data)) {
 
 			// We've successfully added/updated the donor, reset the class vars with the new data
-			$donor = $this->db->get_donor_by( 'email', $args['email'] );
+			$donor = $this->db->get_donor_by('email', $args['email']);
 
 			// Setup the donor data with the values from DB
-			$this->setup_donor( $donor );
+			$this->setup_donor($donor);
 
 			$created = $this->id;
 		}
@@ -300,7 +300,7 @@ 
 		 * @param bool|int $created False if not a valid creation, donor ID if user is found or valid creation.
 		 * @param array $args Customer attributes.
 		 */
-		do_action( 'give_donor_post_create', $created, $args );
+		do_action('give_donor_post_create', $created, $args);
 
 		return $created;
 
@@ -316,13 +316,13 @@ 
 	 *
 	 * @return bool        If the update was successful or not.
 	 */
-	public function update( $data = array() ) {
+	public function update($data = array()) {
 
-		if ( empty( $data ) ) {
+		if (empty($data)) {
 			return false;
 		}
 
-		$data = $this->sanitize_columns( $data );
+		$data = $this->sanitize_columns($data);
 
 		/**
 		 * Fires before updating donors.
@@ -332,14 +332,14 @@ 
 		 * @param int $donor_id Donor id.
 		 * @param array $data Donor attributes.
 		 */
-		do_action( 'give_donor_pre_update', $this->id, $data );
+		do_action('give_donor_pre_update', $this->id, $data);
 
 		$updated = false;
 
-		if ( $this->db->update( $this->id, $data ) ) {
+		if ($this->db->update($this->id, $data)) {
 
-			$donor = $this->db->get_donor_by( 'id', $this->id );
-			$this->setup_donor( $donor );
+			$donor = $this->db->get_donor_by('id', $this->id);
+			$this->setup_donor($donor);
 
 			$updated = true;
 		}
@@ -353,7 +353,7 @@ 
 		 * @param int $donor_id Donor id.
 		 * @param array $data Donor attributes.
 		 */
-		do_action( 'give_donor_post_update', $updated, $this->id, $data );
+		do_action('give_donor_post_update', $updated, $this->id, $data);
 
 		return $updated;
 	}
@@ -371,27 +371,27 @@ 
 	 *
 	 * @return bool            If the attachment was successfully.
 	 */
-	public function attach_payment( $payment_id = 0, $update_stats = true ) {
+	public function attach_payment($payment_id = 0, $update_stats = true) {
 
-		if ( empty( $payment_id ) ) {
+		if (empty($payment_id)) {
 			return false;
 		}
 
-		if ( empty( $this->payment_ids ) ) {
+		if (empty($this->payment_ids)) {
 
 			$new_payment_ids = $payment_id;
 
 		} else {
 
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
 
-			if ( in_array( $payment_id, $payment_ids ) ) {
+			if (in_array($payment_id, $payment_ids)) {
 				$update_stats = false;
 			}
 
 			$payment_ids[] = $payment_id;
 
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 		}
 
@@ -403,20 +403,20 @@ 
 		 * @param int $payment_id Payment id.
 		 * @param int $donor_id Customer id.
 		 */
-		do_action( 'give_donor_pre_attach_payment', $payment_id, $this->id );
+		do_action('give_donor_pre_attach_payment', $payment_id, $this->id);
 
-		$payment_added = $this->update( array( 'payment_ids' => $new_payment_ids ) );
+		$payment_added = $this->update(array('payment_ids' => $new_payment_ids));
 
-		if ( $payment_added ) {
+		if ($payment_added) {
 
 			$this->payment_ids = $new_payment_ids;
 
 			// We added this payment successfully, increment the stats
-			if ( $update_stats ) {
-				$payment_amount = give_donation_amount( $payment_id );
+			if ($update_stats) {
+				$payment_amount = give_donation_amount($payment_id);
 
-				if ( ! empty( $payment_amount ) ) {
-					$this->increase_value( $payment_amount );
+				if ( ! empty($payment_amount)) {
+					$this->increase_value($payment_amount);
 				}
 
 				$this->increase_purchase_count();
@@ -432,7 +432,7 @@ 
 		 * @param int $payment_id Payment id.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_post_attach_payment', $payment_added, $payment_id, $this->id );
+		do_action('give_donor_post_attach_payment', $payment_added, $payment_id, $this->id);
 
 		return $payment_added;
 	}
@@ -450,33 +450,33 @@ 
 	 *
 	 * @return boolean               If the removal was successful.
 	 */
-	public function remove_payment( $payment_id = 0, $update_stats = true ) {
+	public function remove_payment($payment_id = 0, $update_stats = true) {
 
-		if ( empty( $payment_id ) ) {
+		if (empty($payment_id)) {
 			return false;
 		}
 
-		$payment = new Give_Payment( $payment_id );
+		$payment = new Give_Payment($payment_id);
 
-		if ( 'publish' !== $payment->status && 'revoked' !== $payment->status ) {
+		if ('publish' !== $payment->status && 'revoked' !== $payment->status) {
 			$update_stats = false;
 		}
 
 		$new_payment_ids = '';
 
-		if ( ! empty( $this->payment_ids ) ) {
+		if ( ! empty($this->payment_ids)) {
 
-			$payment_ids = array_map( 'absint', explode( ',', $this->payment_ids ) );
+			$payment_ids = array_map('absint', explode(',', $this->payment_ids));
 
-			$pos = array_search( $payment_id, $payment_ids );
-			if ( false === $pos ) {
+			$pos = array_search($payment_id, $payment_ids);
+			if (false === $pos) {
 				return false;
 			}
 
-			unset( $payment_ids[ $pos ] );
-			$payment_ids = array_filter( $payment_ids );
+			unset($payment_ids[$pos]);
+			$payment_ids = array_filter($payment_ids);
 
-			$new_payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+			$new_payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 		}
 
@@ -488,20 +488,20 @@ 
 		 * @param int $payment_id Payment id.
 		 * @param int $donor_id Customer id.
 		 */
-		do_action( 'give_donor_pre_remove_payment', $payment_id, $this->id );
+		do_action('give_donor_pre_remove_payment', $payment_id, $this->id);
 
-		$payment_removed = $this->update( array( 'payment_ids' => $new_payment_ids ) );
+		$payment_removed = $this->update(array('payment_ids' => $new_payment_ids));
 
-		if ( $payment_removed ) {
+		if ($payment_removed) {
 
 			$this->payment_ids = $new_payment_ids;
 
-			if ( $update_stats ) {
+			if ($update_stats) {
 				// We removed this payment successfully, decrement the stats
-				$payment_amount = give_donation_amount( $payment_id );
+				$payment_amount = give_donation_amount($payment_id);
 
-				if ( ! empty( $payment_amount ) ) {
-					$this->decrease_value( $payment_amount );
+				if ( ! empty($payment_amount)) {
+					$this->decrease_value($payment_amount);
 				}
 
 				$this->decrease_donation_count();
@@ -517,7 +517,7 @@ 
 		 * @param int $payment_id Payment id.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_post_remove_payment', $payment_removed, $payment_id, $this->id );
+		do_action('give_donor_post_remove_payment', $payment_removed, $payment_id, $this->id);
 
 		return $payment_removed;
 
@@ -533,10 +533,10 @@ 
 	 *
 	 * @return int        The donation count.
 	 */
-	public function increase_purchase_count( $count = 1 ) {
+	public function increase_purchase_count($count = 1) {
 
 		// Make sure it's numeric and not negative.
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
+		if ( ! is_numeric($count) || $count != absint($count)) {
 			return false;
 		}
 
@@ -550,9 +550,9 @@ 
 		 * @param int $count The number to increase by.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_pre_increase_donation_count', $count, $this->id );
+		do_action('give_donor_pre_increase_donation_count', $count, $this->id);
 
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
+		if ($this->update(array('purchase_count' => $new_total))) {
 			$this->purchase_count = $new_total;
 		}
 
@@ -565,7 +565,7 @@ 
 		 * @param int $count The number increased by.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_post_increase_donation_count', $this->purchase_count, $count, $this->id );
+		do_action('give_donor_post_increase_donation_count', $this->purchase_count, $count, $this->id);
 
 		return $this->purchase_count;
 	}
@@ -580,16 +580,16 @@ 
 	 *
 	 * @return mixed      If successful, the new count, otherwise false.
 	 */
-	public function decrease_donation_count( $count = 1 ) {
+	public function decrease_donation_count($count = 1) {
 
 		// Make sure it's numeric and not negative
-		if ( ! is_numeric( $count ) || $count != absint( $count ) ) {
+		if ( ! is_numeric($count) || $count != absint($count)) {
 			return false;
 		}
 
 		$new_total = (int) $this->purchase_count - (int) $count;
 
-		if ( $new_total < 0 ) {
+		if ($new_total < 0) {
 			$new_total = 0;
 		}
 
@@ -601,9 +601,9 @@ 
 		 * @param int $count The number to decrease by.
 		 * @param int $donor_id Customer id.
 		 */
-		do_action( 'give_donor_pre_decrease_donation_count', $count, $this->id );
+		do_action('give_donor_pre_decrease_donation_count', $count, $this->id);
 
-		if ( $this->update( array( 'purchase_count' => $new_total ) ) ) {
+		if ($this->update(array('purchase_count' => $new_total))) {
 			$this->purchase_count = $new_total;
 		}
 
@@ -616,7 +616,7 @@ 
 		 * @param int $count The number decreased by.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_post_decrease_donation_count', $this->purchase_count, $count, $this->id );
+		do_action('give_donor_post_decrease_donation_count', $this->purchase_count, $count, $this->id);
 
 		return $this->purchase_count;
 	}
@@ -631,9 +631,9 @@ 
 	 *
 	 * @return mixed        If successful, the new value, otherwise false.
 	 */
-	public function increase_value( $value = 0.00 ) {
+	public function increase_value($value = 0.00) {
 
-		$new_value = floatval( $this->purchase_value ) + $value;
+		$new_value = floatval($this->purchase_value) + $value;
 
 		/**
 		 * Fires before increasing donor lifetime value.
@@ -643,9 +643,9 @@ 
 		 * @param float $value The value to increase by.
 		 * @param int $donor_id Customer id.
 		 */
-		do_action( 'give_donor_pre_increase_value', $value, $this->id );
+		do_action('give_donor_pre_increase_value', $value, $this->id);
 
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
+		if ($this->update(array('purchase_value' => $new_value))) {
 			$this->purchase_value = $new_value;
 		}
 
@@ -658,7 +658,7 @@ 
 		 * @param float $value The value increased by.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_post_increase_value', $this->purchase_value, $value, $this->id );
+		do_action('give_donor_post_increase_value', $this->purchase_value, $value, $this->id);
 
 		return $this->purchase_value;
 	}
@@ -673,11 +673,11 @@ 
 	 *
 	 * @return mixed        If successful, the new value, otherwise false.
 	 */
-	public function decrease_value( $value = 0.00 ) {
+	public function decrease_value($value = 0.00) {
 
-		$new_value = floatval( $this->purchase_value ) - $value;
+		$new_value = floatval($this->purchase_value) - $value;
 
-		if ( $new_value < 0 ) {
+		if ($new_value < 0) {
 			$new_value = 0.00;
 		}
 
@@ -689,9 +689,9 @@ 
 		 * @param float $value The value to decrease by.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_pre_decrease_value', $value, $this->id );
+		do_action('give_donor_pre_decrease_value', $value, $this->id);
 
-		if ( $this->update( array( 'purchase_value' => $new_value ) ) ) {
+		if ($this->update(array('purchase_value' => $new_value))) {
 			$this->purchase_value = $new_value;
 		}
 
@@ -704,7 +704,7 @@ 
 		 * @param float $value The value decreased by.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_post_decrease_value', $this->purchase_value, $value, $this->id );
+		do_action('give_donor_post_decrease_value', $this->purchase_value, $value, $this->id);
 
 		return $this->purchase_value;
 	}
@@ -723,7 +723,7 @@ 
 	 *
 	 * @return mixed              If successful, the new donation stat value, otherwise false.
 	 */
-	public function update_donation_value( $curr_amount, $new_amount ) {
+	public function update_donation_value($curr_amount, $new_amount) {
 		/**
 		 * Payment total difference value can be:
 		 *  zero   (in case amount not change)
@@ -733,15 +733,15 @@ 
 		$payment_total_diff = $new_amount - $curr_amount;
 
 		// We do not need to update donation stat if donation did not change.
-		if ( ! $payment_total_diff ) {
+		if ( ! $payment_total_diff) {
 			return false;
 		}
 
-		if ( $payment_total_diff > 0 ) {
-			$this->increase_value( $payment_total_diff );
+		if ($payment_total_diff > 0) {
+			$this->increase_value($payment_total_diff);
 		} else {
 			// Pass payment total difference as +ve value to decrease amount from user lifetime stat.
-			$this->decrease_value( - $payment_total_diff );
+			$this->decrease_value( -$payment_total_diff );
 		}
 
 		return $this->purchase_value;
@@ -758,15 +758,15 @@ 
 	 *
 	 * @return array       The notes requested.
 	 */
-	public function get_notes( $length = 20, $paged = 1 ) {
+	public function get_notes($length = 20, $paged = 1) {
 
-		$length = is_numeric( $length ) ? $length : 20;
-		$offset = is_numeric( $paged ) && $paged != 1 ? ( ( absint( $paged ) - 1 ) * $length ) : 0;
+		$length = is_numeric($length) ? $length : 20;
+		$offset = is_numeric($paged) && $paged != 1 ? ((absint($paged) - 1) * $length) : 0;
 
 		$all_notes   = $this->get_raw_notes();
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
 
-		$desired_notes = array_slice( $notes_array, $offset, $length );
+		$desired_notes = array_slice($notes_array, $offset, $length);
 
 		return $desired_notes;
 
@@ -783,9 +783,9 @@ 
 	public function get_notes_count() {
 
 		$all_notes   = $this->get_raw_notes();
-		$notes_array = array_reverse( array_filter( explode( "\n\n", $all_notes ) ) );
+		$notes_array = array_reverse(array_filter(explode("\n\n", $all_notes)));
 
-		return count( $notes_array );
+		return count($notes_array);
 
 	}
 
@@ -798,7 +798,7 @@ 
 	 *
 	 * @return string|float
 	 */
-	public function get_total_donation_amount( $args = array() ) {
+	public function get_total_donation_amount($args = array()) {
 
 		/**
 		 * Filter total donation amount.
@@ -809,7 +809,7 @@ 
 		 * @param integer      $donor_id       Donor ID.
 		 * @param array        $args           Pass additional data.
 		 */
-		return apply_filters( 'give_get_total_donation_amount', $this->purchase_value, $this->id, $args );
+		return apply_filters('give_get_total_donation_amount', $this->purchase_value, $this->id, $args);
 	}
 
 	/**
@@ -822,22 +822,22 @@ 
 	 *
 	 * @return string|boolean The new note if added successfully, false otherwise.
 	 */
-	public function add_note( $note = '' ) {
+	public function add_note($note = '') {
 
-		$note = trim( $note );
-		if ( empty( $note ) ) {
+		$note = trim($note);
+		if (empty($note)) {
 			return false;
 		}
 
 		$notes = $this->get_raw_notes();
 
-		if ( empty( $notes ) ) {
+		if (empty($notes)) {
 			$notes = '';
 		}
 
-		$note_string = date_i18n( 'F j, Y H:i:s', current_time( 'timestamp' ) ) . ' - ' . $note;
-		$new_note    = apply_filters( 'give_customer_add_note_string', $note_string );
-		$notes       .= "\n\n" . $new_note;
+		$note_string = date_i18n('F j, Y H:i:s', current_time('timestamp')).' - '.$note;
+		$new_note    = apply_filters('give_customer_add_note_string', $note_string);
+		$notes .= "\n\n".$new_note;
 
 		/**
 		 * Fires before donor note is added.
@@ -847,11 +847,11 @@ 
 		 * @param string $new_note New note to add.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_pre_add_note', $new_note, $this->id );
+		do_action('give_donor_pre_add_note', $new_note, $this->id);
 
-		$updated = $this->update( array( 'notes' => $notes ) );
+		$updated = $this->update(array('notes' => $notes));
 
-		if ( $updated ) {
+		if ($updated) {
 			$this->notes = $this->get_notes();
 		}
 
@@ -864,7 +864,7 @@ 
 		 * @param string $new_note New note added.
 		 * @param int $donor_id Donor id.
 		 */
-		do_action( 'give_donor_post_add_note', $this->notes, $new_note, $this->id );
+		do_action('give_donor_post_add_note', $this->notes, $new_note, $this->id);
 
 		// Return the formatted note, so we can test, as well as update any displays
 		return $new_note;
@@ -881,7 +881,7 @@ 
 	 */
 	private function get_raw_notes() {
 
-		$all_notes = $this->db->get_column( 'notes', $this->id );
+		$all_notes = $this->db->get_column('notes', $this->id);
 
 		return $all_notes;
 
@@ -898,8 +898,8 @@ 
 	 *
 	 * @return mixed            Will be an array if $single is false. Will be value of meta data field if $single is true.
 	 */
-	public function get_meta( $meta_key = '', $single = true ) {
-		return Give()->donor_meta->get_meta( $this->id, $meta_key, $single );
+	public function get_meta($meta_key = '', $single = true) {
+		return Give()->donor_meta->get_meta($this->id, $meta_key, $single);
 	}
 
 	/**
@@ -914,8 +914,8 @@ 
 	 *
 	 * @return bool               False for failure. True for success.
 	 */
-	public function add_meta( $meta_key = '', $meta_value, $unique = false ) {
-		return Give()->donor_meta->add_meta( $this->id, $meta_key, $meta_value, $unique );
+	public function add_meta($meta_key = '', $meta_value, $unique = false) {
+		return Give()->donor_meta->add_meta($this->id, $meta_key, $meta_value, $unique);
 	}
 
 	/**
@@ -930,8 +930,8 @@ 
 	 *
 	 * @return bool               False on failure, true if success.
 	 */
-	public function update_meta( $meta_key = '', $meta_value, $prev_value = '' ) {
-		return Give()->donor_meta->update_meta( $this->id, $meta_key, $meta_value, $prev_value );
+	public function update_meta($meta_key = '', $meta_value, $prev_value = '') {
+		return Give()->donor_meta->update_meta($this->id, $meta_key, $meta_value, $prev_value);
 	}
 
 	/**
@@ -945,8 +945,8 @@ 
 	 *
 	 * @return bool               False for failure. True for success.
 	 */
-	public function delete_meta( $meta_key = '', $meta_value = '' ) {
-		return Give()->donor_meta->delete_meta( $this->id, $meta_key, $meta_value );
+	public function delete_meta($meta_key = '', $meta_value = '') {
+		return Give()->donor_meta->delete_meta($this->id, $meta_key, $meta_value);
 	}
 
 	/**
@@ -959,51 +959,51 @@ 
 	 *
 	 * @return array       The sanitized data, based off column defaults.
 	 */
-	private function sanitize_columns( $data ) {
+	private function sanitize_columns($data) {
 
 		$columns        = $this->db->get_columns();
 		$default_values = $this->db->get_column_defaults();
 
-		foreach ( $columns as $key => $type ) {
+		foreach ($columns as $key => $type) {
 
 			// Only sanitize data that we were provided
-			if ( ! array_key_exists( $key, $data ) ) {
+			if ( ! array_key_exists($key, $data)) {
 				continue;
 			}
 
-			switch ( $type ) {
+			switch ($type) {
 
 				case '%s':
-					if ( 'email' == $key ) {
-						$data[ $key ] = sanitize_email( $data[ $key ] );
-					} elseif ( 'notes' == $key ) {
-						$data[ $key ] = strip_tags( $data[ $key ] );
+					if ('email' == $key) {
+						$data[$key] = sanitize_email($data[$key]);
+					} elseif ('notes' == $key) {
+						$data[$key] = strip_tags($data[$key]);
 					} else {
-						$data[ $key ] = sanitize_text_field( $data[ $key ] );
+						$data[$key] = sanitize_text_field($data[$key]);
 					}
 					break;
 
 				case '%d':
-					if ( ! is_numeric( $data[ $key ] ) || (int) $data[ $key ] !== absint( $data[ $key ] ) ) {
-						$data[ $key ] = $default_values[ $key ];
+					if ( ! is_numeric($data[$key]) || (int) $data[$key] !== absint($data[$key])) {
+						$data[$key] = $default_values[$key];
 					} else {
-						$data[ $key ] = absint( $data[ $key ] );
+						$data[$key] = absint($data[$key]);
 					}
 					break;
 
 				case '%f':
 					// Convert what was given to a float
-					$value = floatval( $data[ $key ] );
+					$value = floatval($data[$key]);
 
-					if ( ! is_float( $value ) ) {
-						$data[ $key ] = $default_values[ $key ];
+					if ( ! is_float($value)) {
+						$data[$key] = $default_values[$key];
 					} else {
-						$data[ $key ] = $value;
+						$data[$key] = $value;
 					}
 					break;
 
 				default:
-					$data[ $key ] = sanitize_text_field( $data[ $key ] );
+					$data[$key] = sanitize_text_field($data[$key]);
 					break;
 
 			}
@@ -1023,33 +1023,33 @@ 
 	 *
 	 * @return bool            If the email was added successfully
 	 */
-	public function add_email( $email = '', $primary = false ) {
-		if ( ! is_email( $email ) ) {
+	public function add_email($email = '', $primary = false) {
+		if ( ! is_email($email)) {
 			return false;
 		}
-		$existing = new Give_Donor( $email );
+		$existing = new Give_Donor($email);
 
-		if ( $existing->id > 0 ) {
+		if ($existing->id > 0) {
 			// Email address already belongs to another donor
 			return false;
 		}
 
-		if ( email_exists( $email ) ) {
-			$user = get_user_by( 'email', $email );
-			if ( $user->ID != $this->user_id ) {
+		if (email_exists($email)) {
+			$user = get_user_by('email', $email);
+			if ($user->ID != $this->user_id) {
 				return false;
 			}
 		}
 
-		do_action( 'give_donor_pre_add_email', $email, $this->id, $this );
+		do_action('give_donor_pre_add_email', $email, $this->id, $this);
 
 		// Add is used to ensure duplicate emails are not added
-		$ret = (bool) $this->add_meta( 'additional_email', $email );
+		$ret = (bool) $this->add_meta('additional_email', $email);
 
-		do_action( 'give_donor_post_add_email', $email, $this->id, $this );
+		do_action('give_donor_post_add_email', $email, $this->id, $this);
 
-		if ( $ret && true === $primary ) {
-			$this->set_primary_email( $email );
+		if ($ret && true === $primary) {
+			$this->set_primary_email($email);
 		}
 
 		return $ret;
@@ -1065,16 +1065,16 @@ 
 	 *
 	 * @return bool          If the email was removed successfully.
 	 */
-	public function remove_email( $email = '' ) {
-		if ( ! is_email( $email ) ) {
+	public function remove_email($email = '') {
+		if ( ! is_email($email)) {
 			return false;
 		}
 
-		do_action( 'give_donor_pre_remove_email', $email, $this->id, $this );
+		do_action('give_donor_pre_remove_email', $email, $this->id, $this);
 
-		$ret = (bool) $this->delete_meta( 'additional_email', $email );
+		$ret = (bool) $this->delete_meta('additional_email', $email);
 
-		do_action( 'give_donor_post_remove_email', $email, $this->id, $this );
+		do_action('give_donor_post_remove_email', $email, $this->id, $this);
 
 		return $ret;
 	}
@@ -1091,16 +1091,16 @@ 
 	 *
 	 * @return bool                      If the email was set as primary successfully.
 	 */
-	public function set_primary_email( $new_primary_email = '' ) {
-		if ( ! is_email( $new_primary_email ) ) {
+	public function set_primary_email($new_primary_email = '') {
+		if ( ! is_email($new_primary_email)) {
 			return false;
 		}
 
-		do_action( 'give_donor_pre_set_primary_email', $new_primary_email, $this->id, $this );
+		do_action('give_donor_pre_set_primary_email', $new_primary_email, $this->id, $this);
 
-		$existing = new Give_Donor( $new_primary_email );
+		$existing = new Give_Donor($new_primary_email);
 
-		if ( $existing->id > 0 && (int) $existing->id !== (int) $this->id ) {
+		if ($existing->id > 0 && (int) $existing->id !== (int) $this->id) {
 			// This email belongs to another donor.
 			return false;
 		}
@@ -1108,21 +1108,21 @@ 
 		$old_email = $this->email;
 
 		// Update donor record with new email.
-		$update = $this->update( array( 'email' => $new_primary_email ) );
+		$update = $this->update(array('email' => $new_primary_email));
 
 		// Remove new primary from list of additional emails.
-		$remove = $this->remove_email( $new_primary_email );
+		$remove = $this->remove_email($new_primary_email);
 
 		// Add old email to additional emails list.
-		$add = $this->add_email( $old_email );
+		$add = $this->add_email($old_email);
 
 		$ret = $update && $remove && $add;
 
-		if ( $ret ) {
+		if ($ret) {
 			$this->email = $new_primary_email;
 		}
 
-		do_action( 'give_donor_post_set_primary_email', $new_primary_email, $this->id, $this );
+		do_action('give_donor_post_set_primary_email', $new_primary_email, $this->id, $this);
 
 		return $ret;
 	}

templates/shortcode-profile-editor.php

Braces +8 added lines, -3 removed lines

@@ -185,10 +185,13 @@ 
 						}
 						?>
 						</select>
-					<?php else : ?>
+					<?php else {
+	: ?>
 						<input type="text" size="6" name="give_address_state" id="give_address_state"
 						       class="give_address_state give-input"
-						       placeholder="<?php echo $label; ?>" value="<?php echo $selected_state; ?>"/>
+						       placeholder="<?php echo $label;
+}
+?>" value="<?php echo $selected_state; ?>"/>
 					<?php endif;
 					?>
 				</p>
@@ -289,7 +292,9 @@ 
 	?>
 
 	<?php
-else:
+else {
+	:
 	_e( 'You need to login to edit your profile.', 'give' );
+}
 	echo give_login_form();
 endif;

Spacing +68 added lines, -68 removed lines

@@ -7,22 +7,22 @@ 
  * @copyright    Copyright (c) 2016, WordImpress
  * @license      https://opensource.org/licenses/gpl-license GNU Public License
  */
-$current_user     = wp_get_current_user();
+$current_user = wp_get_current_user();
 
-if ( is_user_logged_in() ):
+if (is_user_logged_in()):
 	$user_id = get_current_user_id();
-	$first_name   = get_user_meta( $user_id, 'first_name', true );
-	$last_name    = get_user_meta( $user_id, 'last_name', true );
+	$first_name   = get_user_meta($user_id, 'first_name', true);
+	$last_name    = get_user_meta($user_id, 'last_name', true);
 	$display_name = $current_user->display_name;
-	$address      = give_get_donor_address( $user_id );
+	$address      = give_get_donor_address($user_id);
 
-	if ( isset( $_GET['updated'] ) && $_GET['updated'] == true && ! give_get_errors() ): ?>
+	if (isset($_GET['updated']) && $_GET['updated'] == true && ! give_get_errors()): ?>
 		<p class="give_success">
-			<strong><?php esc_html_e( 'Success:', 'give' ); ?></strong> <?php esc_html_e( 'Your profile has been updated.', 'give' ); ?>
+			<strong><?php esc_html_e('Success:', 'give'); ?></strong> <?php esc_html_e('Your profile has been updated.', 'give'); ?>
 		</p>
 	<?php endif; ?>
 
-	<?php Give()->notices->render_frontend_notices( 0 ); ?>
+	<?php Give()->notices->render_frontend_notices(0); ?>
 
 	<?php
 	/**
@@ -32,42 +32,42 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_profile_editor_before' );
+	do_action('give_profile_editor_before');
 	?>
 
 	<form id="give_profile_editor_form" class="give-form" action="<?php echo give_get_current_page_url(); ?>" method="post">
 
 		<fieldset>
-			<legend id="give_profile_name_label"><?php _e( 'Profile', 'give' ); ?></legend>
+			<legend id="give_profile_name_label"><?php _e('Profile', 'give'); ?></legend>
 
-			<h3 id="give_personal_information_label" class="give-section-break"><?php _e( 'Change your Name', 'give' ); ?></h3>
+			<h3 id="give_personal_information_label" class="give-section-break"><?php _e('Change your Name', 'give'); ?></h3>
 
 			<p id="give_profile_first_name_wrap" class="form-row form-row-first form-row-responsive">
 				<label for="give_first_name">
-					<?php _e( 'First Name', 'give' ); ?>
+					<?php _e('First Name', 'give'); ?>
 					<span class="give-required-indicator  ">*</span>
 				</label>
-				<input name="give_first_name" id="give_first_name" class="text give-input" type="text" value="<?php echo esc_attr( $first_name ); ?>"/>
+				<input name="give_first_name" id="give_first_name" class="text give-input" type="text" value="<?php echo esc_attr($first_name); ?>"/>
 			</p>
 
 			<p id="give_profile_last_name_wrap" class="form-row form-row-last form-row-responsive">
-				<label for="give_last_name"><?php _e( 'Last Name', 'give' ); ?></label>
-				<input name="give_last_name" id="give_last_name" class="text give-input" type="text" value="<?php echo esc_attr( $last_name ); ?>"/>
+				<label for="give_last_name"><?php _e('Last Name', 'give'); ?></label>
+				<input name="give_last_name" id="give_last_name" class="text give-input" type="text" value="<?php echo esc_attr($last_name); ?>"/>
 			</p>
 
 			<p id="give_profile_display_name_wrap" class="form-row form-row-first form-row-responsive">
-				<label for="give_display_name"><?php _e( 'Display Name', 'give' ); ?></label>
+				<label for="give_display_name"><?php _e('Display Name', 'give'); ?></label>
 				<select name="give_display_name" id="give_display_name" class="select give-select">
-					<?php if ( ! empty( $current_user->first_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->first_name ); ?> value="<?php echo esc_attr( $current_user->first_name ); ?>"><?php echo esc_html( $current_user->first_name ); ?></option>
+					<?php if ( ! empty($current_user->first_name)): ?>
+						<option <?php selected($display_name, $current_user->first_name); ?> value="<?php echo esc_attr($current_user->first_name); ?>"><?php echo esc_html($current_user->first_name); ?></option>
 					<?php endif; ?>
-					<option <?php selected( $display_name, $current_user->user_nicename ); ?> value="<?php echo esc_attr( $current_user->user_nicename ); ?>"><?php echo esc_html( $current_user->user_nicename ); ?></option>
-					<?php if ( ! empty( $current_user->last_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->last_name ); ?> value="<?php echo esc_attr( $current_user->last_name ); ?>"><?php echo esc_html( $current_user->last_name ); ?></option>
+					<option <?php selected($display_name, $current_user->user_nicename); ?> value="<?php echo esc_attr($current_user->user_nicename); ?>"><?php echo esc_html($current_user->user_nicename); ?></option>
+					<?php if ( ! empty($current_user->last_name)): ?>
+						<option <?php selected($display_name, $current_user->last_name); ?> value="<?php echo esc_attr($current_user->last_name); ?>"><?php echo esc_html($current_user->last_name); ?></option>
 					<?php endif; ?>
-					<?php if ( ! empty( $current_user->first_name ) && ! empty( $current_user->last_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->first_name . ' ' . $current_user->last_name ); ?> value="<?php echo esc_attr( $current_user->first_name . ' ' . $current_user->last_name ); ?>"><?php echo esc_html( $current_user->first_name . ' ' . $current_user->last_name ); ?></option>
-						<option <?php selected( $display_name, $current_user->last_name . ' ' . $current_user->first_name ); ?> value="<?php echo esc_attr( $current_user->last_name . ' ' . $current_user->first_name ); ?>"><?php echo esc_html( $current_user->last_name . ' ' . $current_user->first_name ); ?></option>
+					<?php if ( ! empty($current_user->first_name) && ! empty($current_user->last_name)): ?>
+						<option <?php selected($display_name, $current_user->first_name.' '.$current_user->last_name); ?> value="<?php echo esc_attr($current_user->first_name.' '.$current_user->last_name); ?>"><?php echo esc_html($current_user->first_name.' '.$current_user->last_name); ?></option>
+						<option <?php selected($display_name, $current_user->last_name.' '.$current_user->first_name); ?> value="<?php echo esc_attr($current_user->last_name.' '.$current_user->first_name); ?>"><?php echo esc_html($current_user->last_name.' '.$current_user->first_name); ?></option>
 					<?php endif; ?>
 				</select>
 				<?php
@@ -78,7 +78,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_name' );
+				do_action('give_profile_editor_name');
 				?>
 			</p>
 
@@ -90,15 +90,15 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_name' );
+			do_action('give_profile_editor_after_name');
 			?>
 
 			<p class="form-row form-row-last form-row-responsive">
 				<label for="give_email">
-					<?php _e( 'Email Address', 'give' ); ?>
+					<?php _e('Email Address', 'give'); ?>
 					<span class="give-required-indicator  ">*</span>
 				</label>
-				<input name="give_email" id="give_email" class="text give-input required" type="email" value="<?php echo esc_attr( $current_user->user_email ); ?>" required aria-required="true"/>
+				<input name="give_email" id="give_email" class="text give-input required" type="email" value="<?php echo esc_attr($current_user->user_email); ?>" required aria-required="true"/>
 				<?php
 				/**
 				 * Fires in the profile editor shortcode, to the email section.
@@ -107,7 +107,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_email' );
+				do_action('give_profile_editor_email');
 				?>
 			</p>
 
@@ -119,33 +119,33 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_email' );
+			do_action('give_profile_editor_after_email');
 			?>
 
-			<h3 id="give_profile_billing_address_label" class="give-section-break"><?php _e( 'Change your Billing Address', 'give' ); ?></h3>
+			<h3 id="give_profile_billing_address_label" class="give-section-break"><?php _e('Change your Billing Address', 'give'); ?></h3>
 
 			<div id="give_profile_billing_address_wrap">
 				<?php
 				// Get selected country from address.
-				$selected_country = ( ! empty( $address['country'] ) ? $address['country'] : give_get_option('base_country') );
+				$selected_country = ( ! empty($address['country']) ? $address['country'] : give_get_option('base_country'));
 
 				$selected_state = '';
-				if ( $selected_country === give_get_country() ) {
+				if ($selected_country === give_get_country()) {
 					// Get default selected state by admin.
 					$selected_state = give_get_state();
 				}
 
 				// Get selected state from address.
-				$selected_state = ! empty( $address['state'] ) ? $address['state'] : $selected_state;
+				$selected_state = ! empty($address['state']) ? $address['state'] : $selected_state;
 
-				$label        = __( 'State', 'give' );
+				$label        = __('State', 'give');
 				$states_label = give_get_states_label();
 				// Check if $country code exists in the array key for states label.
-				if ( array_key_exists( $selected_country, $states_label ) ) {
-					$label = $states_label[ $selected_country ];
+				if (array_key_exists($selected_country, $states_label)) {
+					$label = $states_label[$selected_country];
 				}
 
-				$states = give_get_states( $selected_country );
+				$states = give_get_states($selected_country);
 
 				// Get the country list that do not have any states init.
 				$no_states_country = give_no_states_country_list();
@@ -156,55 +156,55 @@ 
 
 				<p id="give-card-country-wrap" class="form-row form-row-wide">
 					<label for="give_address_country">
-						<?php _e( 'Country', 'give' ); ?>
+						<?php _e('Country', 'give'); ?>
 						<span class="give-required-indicator  ">*</span>
 					</label>
 					<select name="give_address_country" id="give_address_country" class="select give-select">
-						<?php foreach ( give_get_country_list() as $key => $country ) : ?>
-							<option value="<?php echo $key; ?>"<?php selected( $selected_country, $key ); ?>><?php echo esc_html( $country ); ?></option>
+						<?php foreach (give_get_country_list() as $key => $country) : ?>
+							<option value="<?php echo $key; ?>"<?php selected($selected_country, $key); ?>><?php echo esc_html($country); ?></option>
 						<?php endforeach; ?>
 					</select>
 				</p>
 
 				<p id="give-card-address-wrap" class="form-row form-row-wide">
 					<label for="give_address_line1">
-						<?php _e( 'Address 1', 'give' ); ?>
+						<?php _e('Address 1', 'give'); ?>
 						<span class="give-required-indicator  ">*</span>
 					</label>
 					<input name="give_address_line1" id="give_address_line1" class="text give-input" type="text"
-					       value="<?php echo esc_attr( $address['line1'] ); ?>"/>
+					       value="<?php echo esc_attr($address['line1']); ?>"/>
 				</p>
 
 				<p id="give-card-address-2-wrap" class="form-row form-row-wide">
-					<label for="give_address_line2"><?php _e( 'Address 2', 'give' ); ?></label>
+					<label for="give_address_line2"><?php _e('Address 2', 'give'); ?></label>
 					<input name="give_address_line2" id="give_address_line2" class="text give-input" type="text"
-					       value="<?php echo esc_attr( $address['line2'] ); ?>"/>
+					       value="<?php echo esc_attr($address['line2']); ?>"/>
 				</p>
 
 				<p id="give-card-city-wrap" class="form-row form-row-wide">
 					<label for="give_address_city">
-						<?php _e( 'City', 'give' ); ?>
+						<?php _e('City', 'give'); ?>
 						<span class="give-required-indicator  ">*</span>
 					</label>
 					<input name="give_address_city" id="give_address_city" class="text give-input" type="text"
-					       value="<?php echo esc_attr( $address['city'] ); ?>"/>
+					       value="<?php echo esc_attr($address['city']); ?>"/>
 				</p>
 
 				<p id="give-card-state-wrap"
-				   class="form-row form-row-first form-row-responsive <?php echo ( ! empty( $selected_country ) && array_key_exists( $selected_country, $no_states_country ) ) ? 'give-hidden' : ''; ?>">
+				   class="form-row form-row-first form-row-responsive <?php echo ( ! empty($selected_country) && array_key_exists($selected_country, $no_states_country)) ? 'give-hidden' : ''; ?>">
 					<label for="give_address_state">
-						<?php _e( 'State / Province / County', 'give' ); ?>
+						<?php _e('State / Province / County', 'give'); ?>
 						<span class="give-required-indicator  ">*</span>
 					</label>
 					<?php
-					if ( ! empty( $states ) ) : ?>
+					if ( ! empty($states)) : ?>
 						<select
 								name="give_address_state"
 								id="give_address_state"
 								class="give_address_state"
 						<?php
-						foreach ( $states as $state_code => $state ) {
-							echo '<option value="' . $state_code . '"' . selected( $state_code, $selected_state, false ) . '>' . $state . '</option>';
+						foreach ($states as $state_code => $state) {
+							echo '<option value="'.$state_code.'"'.selected($state_code, $selected_state, false).'>'.$state.'</option>';
 						}
 						?>
 						</select>
@@ -216,13 +216,13 @@ 
 					?>
 				</p>
 
-				<p id="give-card-zip-wrap" class="form-row <?php echo ( ! empty( $selected_country ) && array_key_exists( $selected_country, $no_states_country ) ) ? 'form-row-wide' : 'form-row-last'; ?> form-row-responsive">
+				<p id="give-card-zip-wrap" class="form-row <?php echo ( ! empty($selected_country) && array_key_exists($selected_country, $no_states_country)) ? 'form-row-wide' : 'form-row-last'; ?> form-row-responsive">
 					<label for="give_address_zip">
-						<?php _e( 'Zip / Postal Code', 'give' ); ?>
+						<?php _e('Zip / Postal Code', 'give'); ?>
 						<span class="give-required-indicator  ">*</span>
 					</label>
 					<input name="give_address_zip" id="give_address_zip" class="text give-input" type="text"
-					       value="<?php echo esc_attr( $address['zip'] ); ?>"/>
+					       value="<?php echo esc_attr($address['zip']); ?>"/>
 				</p>
 
 				<?php
@@ -233,7 +233,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_address' );
+				do_action('give_profile_editor_address');
 				?>
 
 			</div>
@@ -246,19 +246,19 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_address' );
+			do_action('give_profile_editor_after_address');
 			?>
 
-			<h3 id="give_profile_password_label" class="give-section-break"><?php _e( 'Change your Password', 'give' ); ?></h3>
+			<h3 id="give_profile_password_label" class="give-section-break"><?php _e('Change your Password', 'give'); ?></h3>
 
 			<div id="give_profile_password_wrap" class="give-clearfix">
 				<p id="give_profile_password_wrap_1" class="form-row form-row-first form-row-responsive">
-					<label for="give_new_user_pass1"><?php _e( 'New Password', 'give' ); ?></label>
+					<label for="give_new_user_pass1"><?php _e('New Password', 'give'); ?></label>
 					<input name="give_new_user_pass1" id="give_new_user_pass1" class="password give-input" type="password"/>
 				</p>
 
 				<p id="give_profile_password_wrap_2" class="form-row form-row-last form-row-responsive">
-					<label for="give_new_user_pass2"><?php _e( 'Re-enter Password', 'give' ); ?></label>
+					<label for="give_new_user_pass2"><?php _e('Re-enter Password', 'give'); ?></label>
 					<input name="give_new_user_pass2" id="give_new_user_pass2" class="password give-input" type="password"/>
 					<?php
 					/**
@@ -268,12 +268,12 @@ 
 					 *
 					 * @since 1.0
 					 */
-					do_action( 'give_profile_editor_password' );
+					do_action('give_profile_editor_password');
 					?>
 				</p>
 			</div>
 
-			<p class="give_password_change_notice"><?php _e( 'Please note after changing your password, you must log back in.', 'give' ); ?></p>
+			<p class="give_password_change_notice"><?php _e('Please note after changing your password, you must log back in.', 'give'); ?></p>
 
 			<?php
 			/**
@@ -283,14 +283,14 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_password' );
+			do_action('give_profile_editor_after_password');
 			?>
 
 			<p id="give_profile_submit_wrap">
-				<input type="hidden" name="give_profile_editor_nonce" value="<?php echo wp_create_nonce( 'give-profile-editor-nonce' ); ?>"/>
+				<input type="hidden" name="give_profile_editor_nonce" value="<?php echo wp_create_nonce('give-profile-editor-nonce'); ?>"/>
 				<input type="hidden" name="give_action" value="edit_user_profile"/>
-				<input type="hidden" name="give_redirect" value="<?php echo esc_url( give_get_current_page_url() ); ?>"/>
-				<input name="give_profile_editor_submit" id="give_profile_editor_submit" type="submit" class="give_submit" value="<?php _e( 'Save Changes', 'give' ); ?>"/>
+				<input type="hidden" name="give_redirect" value="<?php echo esc_url(give_get_current_page_url()); ?>"/>
+				<input name="give_profile_editor_submit" id="give_profile_editor_submit" type="submit" class="give_submit" value="<?php _e('Save Changes', 'give'); ?>"/>
 			</p>
 
 		</fieldset>
@@ -305,11 +305,11 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_profile_editor_after' );
+	do_action('give_profile_editor_after');
 	?>
 
 	<?php
 else:
-	_e( 'You need to login to edit your profile.', 'give' );
+	_e('You need to login to edit your profile.', 'give');
 	echo give_login_form();
 endif;

includes/admin/donors/donor-functions.php

Spacing +28 added lines, -28 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,7 +23,7 @@ 
  *
  * @return array        The altered list of views.
  */
-function give_register_default_donor_views( $views ) {
+function give_register_default_donor_views($views) {
 
 	$default_views = array(
 		'overview' => 'give_donor_view',
@@ -31,11 +31,11 @@ 
 		'notes'    => 'give_donor_notes_view',
 	);
 
-	return array_merge( $views, $default_views );
+	return array_merge($views, $default_views);
 
 }
 
-add_filter( 'give_donor_views', 'give_register_default_donor_views', 1, 1 );
+add_filter('give_donor_views', 'give_register_default_donor_views', 1, 1);
 
 /**
  * Register a tab for the single donor view.
@@ -46,23 +46,23 @@ 
  *
  * @return array       The altered list of tabs
  */
-function give_register_default_donor_tabs( $tabs ) {
+function give_register_default_donor_tabs($tabs) {
 
 	$default_tabs = array(
 		'overview' => array(
 			'dashicon' => 'dashicons-admin-users',
-			'title' => __( 'Donor Profile', 'give' ),
+			'title' => __('Donor Profile', 'give'),
 		),
 		'notes'    => array(
 			'dashicon' => 'dashicons-admin-comments',
-			'title' => __( 'Donor Notes', 'give' ),
+			'title' => __('Donor Notes', 'give'),
 		),
 	);
 
-	return array_merge( $tabs, $default_tabs );
+	return array_merge($tabs, $default_tabs);
 }
 
-add_filter( 'give_donor_tabs', 'give_register_default_donor_tabs', 1, 1 );
+add_filter('give_donor_tabs', 'give_register_default_donor_tabs', 1, 1);
 
 /**
  * Register the Delete icon as late as possible so it's at the bottom.
@@ -73,17 +73,17 @@ 
  *
  * @return array       The altered list of tabs, with 'delete' at the bottom.
  */
-function give_register_delete_donor_tab( $tabs ) {
+function give_register_delete_donor_tab($tabs) {
 
 	$tabs['delete'] = array(
 		'dashicon' => 'dashicons-trash',
-		'title'    => __( 'Delete Donor', 'give' ),
+		'title'    => __('Delete Donor', 'give'),
 	);
 
 	return $tabs;
 }
 
-add_filter( 'give_donor_tabs', 'give_register_delete_donor_tab', PHP_INT_MAX, 1 );
+add_filter('give_donor_tabs', 'give_register_delete_donor_tab', PHP_INT_MAX, 1);
 
 /**
  * Connect and Reconnect Donor with User profile.
@@ -96,7 +96,7 @@ 
  *
  * @return array
  */
-function give_connect_user_donor_profile( $donor, $donor_data, $address ) {
+function give_connect_user_donor_profile($donor, $donor_data, $address) {
 
 	$donor_id         = $donor->id;
 	$previous_user_id = $donor->user_id;
@@ -110,40 +110,40 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_pre_edit_donor', $donor_id, $donor_data, $address );
+	do_action('give_pre_edit_donor', $donor_id, $donor_data, $address);
 
 	$output = array();
 
-	if ( $donor->update( $donor_data ) ) {
+	if ($donor->update($donor_data)) {
 
-		if ( ! empty( $donor->user_id ) && $donor->user_id > 0 ) {
-			update_user_meta( $donor->user_id, '_give_user_address', $address );
+		if ( ! empty($donor->user_id) && $donor->user_id > 0) {
+			update_user_meta($donor->user_id, '_give_user_address', $address);
 		}
 
 		// Update some donation meta if we need to.
-		$payments_array = explode( ',', $donor->payment_ids );
+		$payments_array = explode(',', $donor->payment_ids);
 
-		if ( $donor->user_id !== $previous_user_id ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, '_give_payment_user_id', $donor->user_id );
+		if ($donor->user_id !== $previous_user_id) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, '_give_payment_user_id', $donor->user_id);
 			}
 		}
 
 		// Fetch disconnected user id, if exists.
-		$disconnected_user_id = $donor->get_meta( '_give_disconnected_user_id', true );
+		$disconnected_user_id = $donor->get_meta('_give_disconnected_user_id', true);
 
 		// Flag User and Donor Disconnection.
-		delete_user_meta( $disconnected_user_id, '_give_is_donor_disconnected' );
+		delete_user_meta($disconnected_user_id, '_give_is_donor_disconnected');
 
 		// Check whether the disconnected user id and the reconnected user id are same or not.
 		// If both are same then delete user id store in donor meta.
-		if( $donor_data['user_id'] === $disconnected_user_id ) {
-			delete_user_meta( $disconnected_user_id, '_give_disconnected_donor_id' );
-			$donor->delete_meta( '_give_disconnected_user_id' );
+		if ($donor_data['user_id'] === $disconnected_user_id) {
+			delete_user_meta($disconnected_user_id, '_give_disconnected_donor_id');
+			$donor->delete_meta('_give_disconnected_user_id');
 		}
 
 		$output['success']       = true;
-		$donor_data              = array_merge( $donor_data, $address );
+		$donor_data              = array_merge($donor_data, $address);
 		$output['customer_info'] = $donor_data;
 
 	} else {
@@ -160,7 +160,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_post_edit_donor', $donor_id, $donor_data );
+	do_action('give_post_edit_donor', $donor_id, $donor_data);
 
 
 	return $output;

includes/admin/upgrades/views/upgrades-complete.php

Spacing +3 added lines, -3 removed lines

@@ -10,17 +10,17 @@
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 ?>
 <div class="wrap" id="poststuff">
 	<div id="give-updates">
-		<h1 id="give-updates-h1"><?php esc_html_e( 'Give - Updates Complete', 'give' ); ?></h1>
+		<h1 id="give-updates-h1"><?php esc_html_e('Give - Updates Complete', 'give'); ?></h1>
 		<hr class="wp-header-end">
 
 		<div class="give-update-panel-content">
-			<p><?php esc_html_e( 'Congratulations! You are running the latest versions of Give and it\'s add-ons.', 'give' ); ?></p>
+			<p><?php esc_html_e('Congratulations! You are running the latest versions of Give and it\'s add-ons.', 'give'); ?></p>
 		</div>
 
 	</div>

includes/admin/upgrades/views/upgrades.php

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -18,33 +18,33 @@ 
 ?>
 <div class="wrap" id="poststuff">
 	<div id="give-updates">
-		<h1 id="give-updates-h1"><?php esc_html_e( 'Give - Updates', 'give' ); ?></h1>
+		<h1 id="give-updates-h1"><?php esc_html_e('Give - Updates', 'give'); ?></h1>
 		<hr class="wp-header-end">
 
 		<div class="give-update-panel-content">
-			<p><?php printf( __( 'Give regularly receives new features, bug fixes, and enhancements. It is important to always stay up-to-date with latest version of Give core and its add-ons.  Please create a backup of your site before updating. To update add-ons be sure your <a href="%1$s">license keys</a> are activated.', 'give' ), 'https://givewp.com/my-account/' ); ?></p>
+			<p><?php printf(__('Give regularly receives new features, bug fixes, and enhancements. It is important to always stay up-to-date with latest version of Give core and its add-ons.  Please create a backup of your site before updating. To update add-ons be sure your <a href="%1$s">license keys</a> are activated.', 'give'), 'https://givewp.com/my-account/'); ?></p>
 		</div>
 
 		<?php $update_counter = 1; ?>
 
 		<?php $db_updates = $give_updates->get_db_update_count(); ?>
-		<?php if ( ! empty( $db_updates ) ) : ?>
-			<?php $db_update_url = add_query_arg( array(
+		<?php if ( ! empty($db_updates)) : ?>
+			<?php $db_update_url = add_query_arg(array(
 				'type' => 'database',
-			) ); ?>
+			)); ?>
 			<div id="give-db-updates">
 				<div class="postbox-container">
 					<div class="postbox">
-						<h2 class="hndle"><?php _e( 'Database Updates', 'give' ); ?></h2>
+						<h2 class="hndle"><?php _e('Database Updates', 'give'); ?></h2>
 						<div class="inside">
 							<div class="panel-content">
-								<p class="give-update-button"><?php echo sprintf( __( 'Give needs to update the database. <a href="%s">Update now</a>', 'give' ), $db_update_url ); ?></p>
+								<p class="give-update-button"><?php echo sprintf(__('Give needs to update the database. <a href="%s">Update now</a>', 'give'), $db_update_url); ?></p>
 							</div>
 							<div class="progress-container give-hidden">
 								<p class="update-message"
 								   data-update-count="<?php echo $db_updates; ?>"
 								   data-resume-update="<?php echo $give_updates->resume_updates(); ?>">
-									<strong><?php echo sprintf( __( 'Update 1 of %s', 'give' ), $db_updates ); ?></strong>
+									<strong><?php echo sprintf(__('Update 1 of %s', 'give'), $db_updates); ?></strong>
 								</p>
 								<div class="progress-content"></div>
 							</div>
@@ -61,17 +61,17 @@ 
 		<?php endif; ?>
 
 		<?php $plugin_updates = $give_updates->get_plugin_update_count(); ?>
-		<?php if ( ! empty( $plugin_updates ) ) : ?>
-			<?php $plugin_update_url = add_query_arg( array(
+		<?php if ( ! empty($plugin_updates)) : ?>
+			<?php $plugin_update_url = add_query_arg(array(
 				's' => 'Give',
-			), admin_url( '/plugins.php' ) ); ?>
+			), admin_url('/plugins.php')); ?>
 			<div id="give-plugin-updates">
 				<div class="postbox-container">
 					<div class="postbox">
-						<h2 class="hndle"><?php _e( 'Add-on Updates', 'give' ); ?></h2>
+						<h2 class="hndle"><?php _e('Add-on Updates', 'give'); ?></h2>
 						<div class="inside">
 							<div class="panel-content">
-								<p><?php echo sprintf( __( 'There %1$s %2$s Give %3$s that %4$s to be updated. <a href="%5$s">Update now</a>', 'give' ), _n( 'is', 'are', $plugin_updates, 'give' ), $plugin_updates, _n( 'add-on', 'add-ons', $plugin_updates, 'give' ), _n( 'needs', 'need', $plugin_updates, 'give' ), $plugin_update_url  ); ?></p>
+								<p><?php echo sprintf(__('There %1$s %2$s Give %3$s that %4$s to be updated. <a href="%5$s">Update now</a>', 'give'), _n('is', 'are', $plugin_updates, 'give'), $plugin_updates, _n('add-on', 'add-ons', $plugin_updates, 'give'), _n('needs', 'need', $plugin_updates, 'give'), $plugin_update_url); ?></p>
 								<?php include_once 'plugins-update-section.php'; ?>
 							</div>
 						</div>

includes/admin/payments/payments-history.php

Spacing +22 added lines, -22 removed lines

@@ -10,7 +10,7 @@ 
 */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,12 +25,12 @@ 
 */
 function give_payment_history_page() {
 
-	$give_payment = get_post_type_object( 'give_payment' );
+	$give_payment = get_post_type_object('give_payment');
 
-	if ( isset( $_GET['view'] ) && 'view-payment-details' == $_GET['view'] ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/payments/view-payment-details.php';
+	if (isset($_GET['view']) && 'view-payment-details' == $_GET['view']) {
+		require_once GIVE_PLUGIN_DIR.'includes/admin/payments/view-payment-details.php';
 	} else {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/payments/class-payments-table.php';
+		require_once GIVE_PLUGIN_DIR.'includes/admin/payments/class-payments-table.php';
 		$payments_table = new Give_Payment_History_Table();
 		$payments_table->prepare_items();
 	?>
@@ -44,18 +44,18 @@ 
 		 *
 		 * @since 1.7
 		 */
-		do_action( 'give_payments_page_top' );
+		do_action('give_payments_page_top');
 		?>
 		<hr class="wp-header-end">
 
-		<form id="give-payments-advanced-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history' ); ?>">
+		<form id="give-payments-advanced-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history'); ?>">
 			<input type="hidden" name="post_type" value="give_forms" />
 			<input type="hidden" name="page" value="give-payment-history" />
 			<?php $payments_table->views() ?>
 			<?php $payments_table->advanced_filters(); ?>
 		</form>
 
-		<form id="give-payments-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history' ); ?>">
+		<form id="give-payments-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history'); ?>">
 			<input type="hidden" name="post_type" value="give_forms" />
 			<input type="hidden" name="page" value="give-payment-history" />
 			<?php $payments_table->display() ?>
@@ -67,7 +67,7 @@ 
 		 *
 		 * @since 1.7
 		 */
-		do_action( 'give_payments_page_bottom' );
+		do_action('give_payments_page_bottom');
 		?>
 
 	</div>
@@ -84,29 +84,29 @@ 
  * @param $title
  * @return string
  */
-function give_view_order_details_title( $admin_title, $title ) {
+function give_view_order_details_title($admin_title, $title) {
 
-	if ( 'give_forms_page_give-payment-history' != get_current_screen()->base ) {
+	if ('give_forms_page_give-payment-history' != get_current_screen()->base) {
 		return $admin_title;
 	}
 
-	if( ! isset( $_GET['give-action'] ) ) {
+	if ( ! isset($_GET['give-action'])) {
 		return $admin_title;
 	}
 
-	switch( $_GET['give-action'] ) :
+	switch ($_GET['give-action']) :
 
 		case 'view-payment-details' :
 			$title = sprintf(
 				/* translators: %s: admin title */
-				esc_html__( 'View Donation Details - %s', 'give' ),
+				esc_html__('View Donation Details - %s', 'give'),
 				$admin_title
 			);
 			break;
 		case 'edit-payment' :
 			$title = sprintf(
 				/* translators: %s: admin title */
-				esc_html__( 'Edit Donation - %s', 'give' ),
+				esc_html__('Edit Donation - %s', 'give'),
 				$admin_title
 			);
 			break;
@@ -117,7 +117,7 @@ 
 
 	return $title;
 }
-add_filter( 'admin_title', 'give_view_order_details_title', 10, 2 );
+add_filter('admin_title', 'give_view_order_details_title', 10, 2);
 
 /**
  * Intercept default Edit post links for Give payments and rewrite them to the View Order Details screen.
@@ -129,20 +129,20 @@ 
  * @param $context
  * @return string
  */
-function give_override_edit_post_for_payment_link( $url, $post_id = 0, $context ) {
+function give_override_edit_post_for_payment_link($url, $post_id = 0, $context) {
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	if( ! $post ) {
+	if ( ! $post) {
 		return $url;
 	}
 
-	if( 'give_payment' != $post->post_type ) {
+	if ('give_payment' != $post->post_type) {
 		return $url;
 	}
 
-	$url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id=' . $post_id );
+	$url = admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id='.$post_id);
 
 	return $url;
 }
-add_filter( 'get_edit_post_link', 'give_override_edit_post_for_payment_link', 10, 3 );
+add_filter('get_edit_post_link', 'give_override_edit_post_for_payment_link', 10, 3);

includes/admin/add-ons.php

Spacing +11 added lines, -11 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,13 +26,13 @@ 
 	ob_start(); ?>
 	<div class="wrap" id="give-add-ons">
 		<h1><?php echo get_admin_page_title(); ?>
-			&nbsp;&mdash;&nbsp;<a href="https://givewp.com/addons/" class="button-primary give-view-addons-all" target="_blank"><?php esc_html_e( 'View All Add-ons', 'give' ); ?>
+			&nbsp;&mdash;&nbsp;<a href="https://givewp.com/addons/" class="button-primary give-view-addons-all" target="_blank"><?php esc_html_e('View All Add-ons', 'give'); ?>
 				<span class="dashicons dashicons-external"></span></a>
 		</h1>
 
 		<hr class="wp-header-end">
 
-		<p><?php esc_html_e( 'The following Add-ons extend the functionality of Give.', 'give' ); ?></p>
+		<p><?php esc_html_e('The following Add-ons extend the functionality of Give.', 'give'); ?></p>
 		<?php echo give_add_ons_get_feed(); ?>
 	</div>
 	<?php
@@ -50,20 +50,20 @@ 
 function give_add_ons_get_feed() {
 
 	$addons_debug = false; //set to true to debug
-	$cache        = Give_Cache::get( 'give_add_ons_feed', true );
+	$cache        = Give_Cache::get('give_add_ons_feed', true);
 
-	if ( $cache === false || $addons_debug === true && WP_DEBUG === true ) {
-		$feed = wp_remote_get( 'https://givewp.com/downloads/feed/', array( 'sslverify' => false ) );
+	if ($cache === false || $addons_debug === true && WP_DEBUG === true) {
+		$feed = wp_remote_get('https://givewp.com/downloads/feed/', array('sslverify' => false));
 
-		if ( ! is_wp_error( $feed ) ) {
-			if ( isset( $feed['body'] ) && strlen( $feed['body'] ) > 0 ) {
-				$cache = wp_remote_retrieve_body( $feed );
-				Give_Cache::set( 'give_add_ons_feed', $cache, HOUR_IN_SECONDS, true );
+		if ( ! is_wp_error($feed)) {
+			if (isset($feed['body']) && strlen($feed['body']) > 0) {
+				$cache = wp_remote_retrieve_body($feed);
+				Give_Cache::set('give_add_ons_feed', $cache, HOUR_IN_SECONDS, true);
 			}
 		} else {
 			$cache = sprintf(
 				'<div class="error"><p>%s</p></div>',
-				esc_html__( 'There was an error retrieving the Give Add-ons list from the server. Please try again later.', 'give' )
+				esc_html__('There was an error retrieving the Give Add-ons list from the server. Please try again later.', 'give')
 			);
 		}
 	}

includes/price-functions.php

Spacing +22 added lines, -22 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,13 +23,13 @@ 
  *
  * @return bool true if has variable prices, false otherwise
  */
-function give_has_variable_prices( $form_id = 0 ) {
+function give_has_variable_prices($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
 	return $form->has_variable_prices();
 }
@@ -44,13 +44,13 @@ 
  *
  * @return array|bool Variable prices
  */
-function give_get_variable_prices( $form_id = 0 ) {
+function give_get_variable_prices($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
 	return $form->prices;
 
@@ -65,13 +65,13 @@ 
  *
  * @return array Variable prices
  */
-function give_get_variable_price_ids( $form_id = 0 ) {
-	if( ! ( $prices = give_get_variable_prices( $form_id ) ) ) {
+function give_get_variable_price_ids($form_id = 0) {
+	if ( ! ($prices = give_get_variable_prices($form_id))) {
 		return array();
 	}
 
 	$price_ids = array();
-	foreach ( $prices as $price ){
+	foreach ($prices as $price) {
 		$price_ids[] = $price['_give_id']['level_id'];
 	}
 
@@ -89,13 +89,13 @@ 
  *
  * @return string $default_price
  */
-function give_get_default_multilevel_amount( $form_id ) {
+function give_get_default_multilevel_amount($form_id) {
 	$default_price = '1.00';
-	$prices        = apply_filters( 'give_form_variable_prices', give_get_variable_prices( $form_id ), $form_id );
+	$prices        = apply_filters('give_form_variable_prices', give_get_variable_prices($form_id), $form_id);
 
-	foreach ( $prices as $price ) {
+	foreach ($prices as $price) {
 
-		if ( isset( $price['_give_default'] ) && $price['_give_default'] === 'default' ) {
+		if (isset($price['_give_default']) && $price['_give_default'] === 'default') {
 			$default_price = $price['_give_amount'];
 		}
 
@@ -116,19 +116,19 @@ 
  * @return string $default_price
  * @since      1.0
  */
-function give_get_default_form_amount( $form_id ) {
+function give_get_default_form_amount($form_id) {
 
-	if ( give_has_variable_prices( $form_id ) ) {
+	if (give_has_variable_prices($form_id)) {
 
-		$default_amount = give_get_default_multilevel_amount( $form_id );
+		$default_amount = give_get_default_multilevel_amount($form_id);
 
 	} else {
 
-		$default_amount = give_get_meta( $form_id, '_give_set_price', true );
+		$default_amount = give_get_meta($form_id, '_give_set_price', true);
 
 	}
 
-	return apply_filters( 'give_default_form_amount', $default_amount, $form_id );
+	return apply_filters('give_default_form_amount', $default_amount, $form_id);
 
 }
 
@@ -146,13 +146,13 @@ 
  *
  * @return bool
  */
-function give_is_custom_price_mode( $form_id = 0 ) {
+function give_is_custom_price_mode($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
 	return $form->is_custom_price_mode();
 }
\ No newline at end of file