WordImpress / Give

includes/admin/upgrades/class-give-updates.php

Spacing +246 added lines, -252 removed lines

@@ -80,34 +80,34 @@ 
 	 *
 	 * @param array $args
 	 */
-	public function register( $args ) {
+	public function register($args) {
 		$args_default = array(
 			'id'       => '',
 			'version'  => '',
 			'callback' => '',
 		);
 
-		$args = wp_parse_args( $args, $args_default );
+		$args = wp_parse_args($args, $args_default);
 
 		// You can only register database upgrade.
 		$args['type'] = 'database';
 
 		// Bailout.
 		if (
-			empty( $args['id'] ) ||
-			empty( $args['version'] ) ||
-			empty( $args['callback'] ) ||
-			! is_callable( $args['callback'] )
+			empty($args['id']) ||
+			empty($args['version']) ||
+			empty($args['callback']) ||
+			! is_callable($args['callback'])
 		) {
 			return;
 		}
 
 		// Change depend param to array.
-		if ( isset( $args['depend'] ) && is_string( $args['depend'] ) ) {
-			$args['depend'] = array( $args['depend'] );
+		if (isset($args['depend']) && is_string($args['depend'])) {
+			$args['depend'] = array($args['depend']);
 		}
 
-		$this->updates[ $args['type'] ][] = $args;
+		$this->updates[$args['type']][] = $args;
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	 * @return static
 	 */
 	static function get_instance() {
-		if ( is_null( self::$instance ) ) {
+		if (is_null(self::$instance)) {
 			self::$instance = new self();
 		}
 
@@ -136,27 +136,27 @@ 
 		/**
 		 * Load file
 		 */
-		require_once GIVE_PLUGIN_DIR . 'includes/class-give-background-updater.php';
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/upgrades/upgrade-functions.php';
+		require_once GIVE_PLUGIN_DIR.'includes/class-give-background-updater.php';
+		require_once GIVE_PLUGIN_DIR.'includes/admin/upgrades/upgrade-functions.php';
 
 		self::$background_updater = new Give_Background_Updater();
 
 		/**
 		 * Setup hooks.
 		 */
-		add_action( 'init', array( $this, '__register_upgrade' ), 9999 );
-		add_action( 'give_set_upgrade_completed', array( $this, '__flush_resume_updates' ), 9999 );
-		add_action( 'wp_ajax_give_db_updates_info', array( $this, '__give_db_updates_info' ) );
-		add_action( 'wp_ajax_give_run_db_updates', array( $this, '__give_start_updating' ) );
-		add_action( 'admin_init', array( $this, '__redirect_admin' ) );
-		add_action( 'admin_init', array( $this, '__pause_db_update' ), - 1 );
-		add_action( 'admin_init', array( $this, '__restart_db_update' ), - 1 );
-		add_action( 'admin_notices', array( $this, '__show_notice' ) );
-		add_action( 'give_restart_db_upgrade', array( $this, '__health_background_update' ) );
-
-		if ( is_admin() ) {
-			add_action( 'admin_init', array( $this, '__change_donations_label' ), 9999 );
-			add_action( 'admin_menu', array( $this, '__register_menu' ), 9999 );
+		add_action('init', array($this, '__register_upgrade'), 9999);
+		add_action('give_set_upgrade_completed', array($this, '__flush_resume_updates'), 9999);
+		add_action('wp_ajax_give_db_updates_info', array($this, '__give_db_updates_info'));
+		add_action('wp_ajax_give_run_db_updates', array($this, '__give_start_updating'));
+		add_action('admin_init', array($this, '__redirect_admin'));
+		add_action('admin_init', array($this, '__pause_db_update'), - 1);
+		add_action('admin_init', array($this, '__restart_db_update'), - 1);
+		add_action('admin_notices', array($this, '__show_notice'));
+		add_action('give_restart_db_upgrade', array($this, '__health_background_update'));
+
+		if (is_admin()) {
+			add_action('admin_init', array($this, '__change_donations_label'), 9999);
+			add_action('admin_menu', array($this, '__register_menu'), 9999);
 		}
 	}
 
@@ -170,12 +170,12 @@ 
 		$addons         = give_get_plugins();
 		$plugin_updates = get_plugin_updates();
 
-		foreach ( $addons as $key => $info ) {
-			if ( 'active' != $info['Status'] || 'add-on' != $info['Type'] || empty( $plugin_updates[ $key ] ) ) {
+		foreach ($addons as $key => $info) {
+			if ('active' != $info['Status'] || 'add-on' != $info['Type'] || empty($plugin_updates[$key])) {
 				continue;
 			}
 
-			$this->updates['plugin'][] = array_merge( $info, (array) $plugin_updates[ $key ] );
+			$this->updates['plugin'][] = array_merge($info, (array) $plugin_updates[$key]);
 		}
 	}
 
@@ -187,7 +187,7 @@ 
 	 * @access public
 	 */
 	public function __register_upgrade() {
-		if ( ! is_admin() ) {
+		if ( ! is_admin()) {
 			return;
 		}
 
@@ -196,7 +196,7 @@ 
 		 *
 		 * @since 1.8.12
 		 */
-		do_action( 'give_register_updates', $this );
+		do_action('give_register_updates', $this);
 	}
 
 	/**
@@ -209,23 +209,22 @@ 
 		global $menu;
 
 		// Bailout.
-		if ( empty( $menu ) || ! $this->get_total_update_count() ) {
+		if (empty($menu) || ! $this->get_total_update_count()) {
 			return;
 		}
 
-		$is_update = ( $this->is_doing_updates() && ! self::$background_updater->is_paused_process() );
+		$is_update = ($this->is_doing_updates() && ! self::$background_updater->is_paused_process());
 
-		foreach ( $menu as $index => $menu_item ) {
-			if ( 'edit.php?post_type=give_forms' !== $menu_item[2] ) {
+		foreach ($menu as $index => $menu_item) {
+			if ('edit.php?post_type=give_forms' !== $menu_item[2]) {
 				continue;
 			}
 
-			$menu[ $index ][0] = sprintf(
+			$menu[$index][0] = sprintf(
 				'%1$s <span class="update-plugins"><span class="plugin-count give-update-progress-count">%2$s%3$s</span></span>',
-				__( 'Donations', 'give' ),
+				__('Donations', 'give'),
 				$is_update ?
-					$this->get_db_update_processing_percentage() :
-					$this->get_total_update_count(),
+					$this->get_db_update_processing_percentage() : $this->get_total_update_count(),
 				$is_update ? '%' : ''
 			);
 
@@ -241,7 +240,7 @@ 
 	 */
 	public function __register_menu() {
 		// Bailout.
-		if ( ! give_test_ajax_works() ) {
+		if ( ! give_test_ajax_works()) {
 			return;
 		}
 
@@ -249,41 +248,40 @@ 
 		$this->__register_plugin_addon_updates();
 
 		// Bailout.
-		if ( ! $this->get_total_update_count() ) {
+		if ( ! $this->get_total_update_count()) {
 			// Show complete update message if still on update setting page.
-			if ( isset( $_GET['page'] ) && 'give-updates' === $_GET['page'] ) {
+			if (isset($_GET['page']) && 'give-updates' === $_GET['page']) {
 				// Upgrades
 				add_submenu_page(
 					'edit.php?post_type=give_forms',
-					esc_html__( 'Give Updates Complete', 'give' ),
-					__( 'Updates', 'give' ),
+					esc_html__('Give Updates Complete', 'give'),
+					__('Updates', 'give'),
 					'manage_give_settings',
 					'give-updates',
-					array( $this, 'render_complete_page' )
+					array($this, 'render_complete_page')
 				);
 			}
 
 			return;
 		}
 
-		$is_update = ( $this->is_doing_updates() && ! self::$background_updater->is_paused_process() );
+		$is_update = ($this->is_doing_updates() && ! self::$background_updater->is_paused_process());
 
 		// Upgrades
 		add_submenu_page(
 			'edit.php?post_type=give_forms',
-			esc_html__( 'Give Updates', 'give' ),
+			esc_html__('Give Updates', 'give'),
 			sprintf(
 				'%1$s <span class="update-plugins"%2$s><span class="plugin-count give-update-progress-count">%3$s%4$s</span></span>',
-				__( 'Updates', 'give' ),
-				isset( $_GET['give-pause-db-upgrades'] ) ? ' style="display:none;"' : '',
+				__('Updates', 'give'),
+				isset($_GET['give-pause-db-upgrades']) ? ' style="display:none;"' : '',
 				$is_update ?
-					$this->get_db_update_processing_percentage() :
-					$this->get_total_update_count(),
+					$this->get_db_update_processing_percentage() : $this->get_total_update_count(),
 				$is_update ? '%' : ''
 			),
 			'manage_give_settings',
 			'give-updates',
-			array( $this, 'render_page' )
+			array($this, 'render_page')
 		);
 	}
 
@@ -298,13 +296,13 @@ 
 		// Show db upgrade completed notice.
 		if (
 			! wp_doing_ajax() &&
-			current_user_can( 'manage_give_settings' ) &&
-			get_option( 'give_show_db_upgrade_complete_notice' ) &&
-			! isset( $_GET['give-db-update-completed'] )
+			current_user_can('manage_give_settings') &&
+			get_option('give_show_db_upgrade_complete_notice') &&
+			! isset($_GET['give-db-update-completed'])
 		) {
-			delete_option( 'give_show_db_upgrade_complete_notice' );
+			delete_option('give_show_db_upgrade_complete_notice');
 
-			wp_redirect( add_query_arg( array( 'give-db-update-completed' => 'give_db_upgrade_completed' ) ) );
+			wp_redirect(add_query_arg(array('give-db-update-completed' => 'give_db_upgrade_completed')));
 			exit();
 		}
 	}
@@ -320,15 +318,15 @@ 
 	 *
 	 * @return bool
 	 */
-	public function __pause_db_update( $force = false ) {
+	public function __pause_db_update($force = false) {
 		// Bailout.
 		if (
 			! $force &&
 			(
 				wp_doing_ajax() ||
-				! isset( $_GET['page'] ) ||
+				! isset($_GET['page']) ||
 				'give-updates' !== $_GET['page'] ||
-				! isset( $_GET['give-pause-db-upgrades'] ) ||
+				! isset($_GET['give-pause-db-upgrades']) ||
 				self::$background_updater->is_paused_process() ||
 				! self::$background_updater->has_queue()
 			)
@@ -337,13 +335,13 @@ 
 			return false;
 		}
 
-		delete_option( 'give_upgrade_error' );
+		delete_option('give_upgrade_error');
 
-		$this->__health_background_update( $this );
+		$this->__health_background_update($this);
 		$batch = self::$background_updater->get_all_batch();
 
 		// Bailout: if batch is empty
-		if ( empty( $batch->data ) ) {
+		if (empty($batch->data)) {
 			return false;
 		}
 
@@ -352,25 +350,25 @@ 
 
 		// Do not stop background process immediately if task running.
 		// @see Give_Background_Updater::lock_process
-		if ( ! $force && self::$background_updater->is_process_running() ) {
-			update_option( 'give_pause_upgrade', 1 );
+		if ( ! $force && self::$background_updater->is_process_running()) {
+			update_option('give_pause_upgrade', 1);
 
 			return true;
 		}
 
-		update_option( 'give_paused_batches', $batch, 'no' );
-		delete_option( $batch->key );
-		delete_site_transient( self::$background_updater->get_identifier() . '_process_lock' );
-		wp_clear_scheduled_hook( self::$background_updater->get_cron_identifier() );
+		update_option('give_paused_batches', $batch, 'no');
+		delete_option($batch->key);
+		delete_site_transient(self::$background_updater->get_identifier().'_process_lock');
+		wp_clear_scheduled_hook(self::$background_updater->get_cron_identifier());
 
-		Give()->logs->add( 'Update Pause', print_r( $batch, true ), 0, 'update' );
+		Give()->logs->add('Update Pause', print_r($batch, true), 0, 'update');
 
 		/**
 		 * Fire action when pause db updates
 		 *
 		 * @since 2.0.1
 		 */
-		do_action( 'give_pause_db_upgrade', $this );
+		do_action('give_pause_db_upgrade', $this);
 
 		return true;
 	}
@@ -387,31 +385,31 @@ 
 		// Bailout.
 		if (
 			wp_doing_ajax() ||
-			! isset( $_GET['page'] ) ||
+			! isset($_GET['page']) ||
 			'give-updates' !== $_GET['page'] ||
-			! isset( $_GET['give-restart-db-upgrades'] ) ||
+			! isset($_GET['give-restart-db-upgrades']) ||
 			! self::$background_updater->is_paused_process()
 		) {
 			return false;
 		}
 
 		Give_Background_Updater::flush_cache();
-		$batch = get_option( 'give_paused_batches' );
+		$batch = get_option('give_paused_batches');
 
-		if ( ! empty( $batch ) ) {
-			wp_cache_delete( $batch->key, 'options' );
-			update_option( $batch->key, $batch->data );
+		if ( ! empty($batch)) {
+			wp_cache_delete($batch->key, 'options');
+			update_option($batch->key, $batch->data);
 
-			delete_option( 'give_paused_batches' );
+			delete_option('give_paused_batches');
 
-			Give()->logs->add( 'Update Restart', print_r( $batch, true ), 0, 'update' );
+			Give()->logs->add('Update Restart', print_r($batch, true), 0, 'update');
 
 
 			/** Fire action when restart db updates
 			 *
 			 * @since 2.0.1
 			 */
-			do_action( 'give_restart_db_upgrade', $this );
+			do_action('give_restart_db_upgrade', $this);
 
 			self::$background_updater->dispatch();
 		}
@@ -427,53 +425,53 @@ 
 	 *
 	 * @param Give_Updates $give_updates
 	 */
-	public function __health_background_update( $give_updates ) {
-		if ( ! $this->is_doing_updates() ) {
+	public function __health_background_update($give_updates) {
+		if ( ! $this->is_doing_updates()) {
 			return;
 		}
 
 		Give_Background_Updater::flush_cache();
 
 		$batch                = Give_Updates::$background_updater->get_all_batch();
-		$batch_data_count     = count( $batch->data );
-		$all_updates          = $give_updates->get_updates( 'database', 'all' );
-		$all_update_ids       = wp_list_pluck( $all_updates, 'id' );
-		$all_batch_update_ids = ! empty( $batch->data ) ? wp_list_pluck( $batch->data, 'id' ) : array();
+		$batch_data_count     = count($batch->data);
+		$all_updates          = $give_updates->get_updates('database', 'all');
+		$all_update_ids       = wp_list_pluck($all_updates, 'id');
+		$all_batch_update_ids = ! empty($batch->data) ? wp_list_pluck($batch->data, 'id') : array();
 		$log_data             = '';
-		$doing_upgrade_args   = get_option( 'give_doing_upgrade' );
+		$doing_upgrade_args   = get_option('give_doing_upgrade');
 
-		if ( ! empty( $doing_upgrade_args ) ) {
-			$log_data .= 'Doing update:' . "\n";
-			$log_data .= print_r( $doing_upgrade_args, true ) . "\n";
+		if ( ! empty($doing_upgrade_args)) {
+			$log_data .= 'Doing update:'."\n";
+			$log_data .= print_r($doing_upgrade_args, true)."\n";
 		}
 
 		/**
 		 * Add remove upgrade from batch
 		 */
-		if ( ! empty( $batch->data ) ) {
+		if ( ! empty($batch->data)) {
 
-			foreach ( $batch->data as $index => $update ) {
-				$log_data = print_r( $update, true ) . "\n";
+			foreach ($batch->data as $index => $update) {
+				$log_data = print_r($update, true)."\n";
 
-				if ( ! is_callable( $update['callback'] ) ) {
-					$log_data .= 'Removing missing callback update: ' . "{$update['id']}\n";
-					unset( $batch->data[ $index ] );
-				} elseif ( give_has_upgrade_completed( $update['id'] ) ) {
-					$log_data .= 'Removing already completed update: ' . "{$update['id']}\n";
-					unset( $batch->data[ $index ] );
+				if ( ! is_callable($update['callback'])) {
+					$log_data .= 'Removing missing callback update: '."{$update['id']}\n";
+					unset($batch->data[$index]);
+				} elseif (give_has_upgrade_completed($update['id'])) {
+					$log_data .= 'Removing already completed update: '."{$update['id']}\n";
+					unset($batch->data[$index]);
 				}
 
-				if ( ! empty( $update['depend'] ) ) {
+				if ( ! empty($update['depend'])) {
 
-					foreach ( $update['depend'] as $depend ) {
-						if ( give_has_upgrade_completed( $depend ) ) {
-							$log_data .= 'Completed update: ' . "{$depend}\n";
+					foreach ($update['depend'] as $depend) {
+						if (give_has_upgrade_completed($depend)) {
+							$log_data .= 'Completed update: '."{$depend}\n";
 							continue;
 						}
 
-						if ( in_array( $depend, $all_update_ids ) && ! in_array( $depend, $all_batch_update_ids ) ) {
-							$log_data .= 'Adding missing update: ' . "{$depend}\n";
-							array_unshift( $batch->data, $all_updates[ array_search( $depend, $all_update_ids ) ] );
+						if (in_array($depend, $all_update_ids) && ! in_array($depend, $all_batch_update_ids)) {
+							$log_data .= 'Adding missing update: '."{$depend}\n";
+							array_unshift($batch->data, $all_updates[array_search($depend, $all_update_ids)]);
 						}
 					}
 				}
@@ -483,60 +481,60 @@ 
 		/**
 		 * Add new upgrade to batch
 		 */
-		if ( $new_updates = $this->get_updates( 'database', 'new' ) ) {
-			$all_batch_update_ids = ! empty( $batch->data ) ? wp_list_pluck( $batch->data, 'id' ) : array();
+		if ($new_updates = $this->get_updates('database', 'new')) {
+			$all_batch_update_ids = ! empty($batch->data) ? wp_list_pluck($batch->data, 'id') : array();
 
-			foreach ( $new_updates as $index => $new_update ) {
-				if ( give_has_upgrade_completed( $new_update['id'] ) || in_array( $new_update['id'], $all_batch_update_ids ) ) {
-					unset( $new_updates[ $index ] );
+			foreach ($new_updates as $index => $new_update) {
+				if (give_has_upgrade_completed($new_update['id']) || in_array($new_update['id'], $all_batch_update_ids)) {
+					unset($new_updates[$index]);
 				}
 			}
 
-			if ( ! empty( $new_updates ) ) {
-				$log_data .= 'Adding new update: ' . "\n";
-				$log_data .= print_r( $new_updates, true ) . "\n";
+			if ( ! empty($new_updates)) {
+				$log_data .= 'Adding new update: '."\n";
+				$log_data .= print_r($new_updates, true)."\n";
 
-				$batch->data = array_merge( (array) $batch->data, $new_updates );
-				update_option( 'give_db_update_count', ( absint( get_option( 'give_db_update_count' ) ) + count( $new_updates ) ) );
+				$batch->data = array_merge((array) $batch->data, $new_updates);
+				update_option('give_db_update_count', (absint(get_option('give_db_update_count')) + count($new_updates)));
 			}
 		}
 
 		/**
 		 * Fix batch
 		 */
-		if ( empty( $batch->data ) ) {
+		if (empty($batch->data)) {
 			// Complete batch if do not have any data to process.
-			self::$background_updater->delete( $batch->key );
+			self::$background_updater->delete($batch->key);
 
-			if ( self::$background_updater->has_queue() ) {
-				$this->__health_background_update( $this );
+			if (self::$background_updater->has_queue()) {
+				$this->__health_background_update($this);
 			} else {
 				self::$background_updater->complete();
 			}
 
-		} elseif ( $batch_data_count !== count( $batch->data ) ) {
+		} elseif ($batch_data_count !== count($batch->data)) {
 
-			$log_data .= 'Updating batch' . "\n";
-			$log_data .= print_r( $batch, true );
+			$log_data .= 'Updating batch'."\n";
+			$log_data .= print_r($batch, true);
 
-			$doing_upgrade_args['heading']          = sprintf( 'Update %s of %s', $doing_upgrade_args['update'], get_option( 'give_db_update_count' ) );
+			$doing_upgrade_args['heading']          = sprintf('Update %s of %s', $doing_upgrade_args['update'], get_option('give_db_update_count'));
 			$doing_upgrade_args['total_percentage'] = $this->get_db_update_processing_percentage();
-			update_option( 'give_doing_upgrade', $doing_upgrade_args );
+			update_option('give_doing_upgrade', $doing_upgrade_args);
 
-			if ( ! empty( $batch->key ) ) {
-				wp_cache_delete( $batch->key, 'options' );
-				update_option( $batch->key, $batch->data );
+			if ( ! empty($batch->key)) {
+				wp_cache_delete($batch->key, 'options');
+				update_option($batch->key, $batch->data);
 			} else {
 
-				update_option( 'give_db_update_count', count( $batch->data ) );
+				update_option('give_db_update_count', count($batch->data));
 
 				$doing_upgrade_args['update']  = $give_updates->update;
-				$doing_upgrade_args['heading'] = sprintf( 'Update %s of %s', 1, count( $batch->data ) );
+				$doing_upgrade_args['heading'] = sprintf('Update %s of %s', 1, count($batch->data));
 
-				update_option( 'give_doing_upgrade', $doing_upgrade_args );
+				update_option('give_doing_upgrade', $doing_upgrade_args);
 
-				foreach ( $batch->data as $data ) {
-					Give_Updates::$background_updater->push_to_queue( $data );
+				foreach ($batch->data as $data) {
+					Give_Updates::$background_updater->push_to_queue($data);
 				}
 
 				Give_Updates::$background_updater->save();
@@ -548,27 +546,27 @@ 
 		 * Fix give_doing_upgrade option
 		 */
 		$update_option = false;
-		$fresh_new_db_count = $this->get_total_new_db_update_count( true );
-		if ( $fresh_new_db_count < $doing_upgrade_args['update'] ) {
-			update_option( 'give_db_update_count', $fresh_new_db_count );
+		$fresh_new_db_count = $this->get_total_new_db_update_count(true);
+		if ($fresh_new_db_count < $doing_upgrade_args['update']) {
+			update_option('give_db_update_count', $fresh_new_db_count);
 			$doing_upgrade_args['update']  = 1;
-			$doing_upgrade_args['heading'] = sprintf( 'Update %s of %s', 1, $fresh_new_db_count );
+			$doing_upgrade_args['heading'] = sprintf('Update %s of %s', 1, $fresh_new_db_count);
 			$update_option                 = true;
 		}
 
-		if ( 101 < $doing_upgrade_args['total_percentage'] ) {
-			$doing_upgrade_args['total_percentage'] = $this->get_db_update_processing_percentage( true );
+		if (101 < $doing_upgrade_args['total_percentage']) {
+			$doing_upgrade_args['total_percentage'] = $this->get_db_update_processing_percentage(true);
 			$update_option                          = true;
 		}
 
-		if ( $update_option ) {
-			update_option( 'give_doing_upgrade', $doing_upgrade_args );
+		if ($update_option) {
+			update_option('give_doing_upgrade', $doing_upgrade_args);
 
-			$log_data .= 'Updated doing update:' . "\n";
-			$log_data .= print_r( $doing_upgrade_args, true ) . "\n";
+			$log_data .= 'Updated doing update:'."\n";
+			$log_data .= print_r($doing_upgrade_args, true)."\n";
 		}
 
-		Give()->logs->add( 'Update Health Check', $log_data, 0, 'update' );
+		Give()->logs->add('Update Health Check', $log_data, 0, 'update');
 	}
 
 
@@ -580,66 +578,66 @@ 
 	 */
 	public function __show_notice() {
 		// Bailout.
-		if ( ! current_user_can( 'manage_give_settings' ) ) {
+		if ( ! current_user_can('manage_give_settings')) {
 			return;
 		}
 
 		// Run DB updates.
-		if ( ! empty( $_GET['give-run-db-update'] ) ) {
+		if ( ! empty($_GET['give-run-db-update'])) {
 			$this->run_db_update();
 		}
 
 
 		// Bailout.
-		if ( isset( $_GET['page'] ) && 'give-updates' === $_GET['page'] ) {
+		if (isset($_GET['page']) && 'give-updates' === $_GET['page']) {
 			return;
 		}
 
 		// Show notice if upgrade paused.
-		if ( self::$background_updater->is_paused_process() ) {
+		if (self::$background_updater->is_paused_process()) {
 			ob_start();
 
-			$upgrade_error = get_option( 'give_upgrade_error' );
-			if ( ! $upgrade_error ) : ?>
-				<strong><?php _e( 'Database Update', 'give' ); ?></strong>
-				&nbsp;&#8211;&nbsp;<?php _e( 'GiveWP needs to update your database to the latest version. The following process will make updates to your site\'s database. Please create a backup before proceeding.', 'give' ); ?>
+			$upgrade_error = get_option('give_upgrade_error');
+			if ( ! $upgrade_error) : ?>
+				<strong><?php _e('Database Update', 'give'); ?></strong>
+				&nbsp;&#8211;&nbsp;<?php _e('GiveWP needs to update your database to the latest version. The following process will make updates to your site\'s database. Please create a backup before proceeding.', 'give'); ?>
 				<br>
 				<br>
-				<a href="<?php echo esc_url( add_query_arg( array( 'give-restart-db-upgrades' => 1 ), admin_url( 'edit.php?post_type=give_forms&page=give-updates' ) ) ); ?>" class="button button-primary give-restart-updater-btn">
-					<?php _e( 'Restart the updater', 'give' ); ?>
+				<a href="<?php echo esc_url(add_query_arg(array('give-restart-db-upgrades' => 1), admin_url('edit.php?post_type=give_forms&page=give-updates'))); ?>" class="button button-primary give-restart-updater-btn">
+					<?php _e('Restart the updater', 'give'); ?>
 				</a>
 				<script type="text/javascript">
 					jQuery('.give-restart-updater-btn').click('click', function () {
-						return window.confirm('<?php echo esc_js( __( 'It is recommended that you backup your database before proceeding. Do you want to run the update now?', 'give' ) ); ?>'); // jshint ignore:line
+						return window.confirm('<?php echo esc_js(__('It is recommended that you backup your database before proceeding. Do you want to run the update now?', 'give')); ?>'); // jshint ignore:line
 					});
 				</script>
 			<?php else: ?>
-				<strong><?php _e( 'Database Update', 'give' ); ?></strong>
-				&nbsp;&#8211;&nbsp;<?php _e( 'An unexpected issue occurred during the database update which caused it to stop automatically. Please contact support for assistance.', 'give' ); ?>
+				<strong><?php _e('Database Update', 'give'); ?></strong>
+				&nbsp;&#8211;&nbsp;<?php _e('An unexpected issue occurred during the database update which caused it to stop automatically. Please contact support for assistance.', 'give'); ?>
 			<?php
 			endif;
 			$desc_html = ob_get_clean();
 
-			Give()->notices->register_notice( array(
+			Give()->notices->register_notice(array(
 				'id'          => 'give_upgrade_db',
 				'type'        => 'error',
 				'dismissible' => false,
 				'description' => $desc_html,
-			) );
+			));
 		}
 
 		// Bailout if doing upgrades.
-		if ( $this->is_doing_updates() ) {
+		if ($this->is_doing_updates()) {
 			return;
 		}
 
 		// Show notice if ajax is not working.
-		if ( ! give_test_ajax_works() ) {
+		if ( ! give_test_ajax_works()) {
 			Give()->notices->register_notice(
 				array(
 					'id'          => 'give_db_upgrade_ajax_inaccessible',
 					'type'        => 'error',
-					'description' => sprintf( '%1$s <a href="%2$s" target="_blank">%3$s</a>', __( 'Give needs to upgrade the database but cannot because AJAX does not appear accessible. This could be because your website is password protected, in maintenance mode, or has a specific hosting configuration or plugin active that is preventing access.', 'give' ), 'http://docs.givewp.com/admin-ajax-error', __( 'Read More', 'give' ) . ' &raquo;' ),
+					'description' => sprintf('%1$s <a href="%2$s" target="_blank">%3$s</a>', __('Give needs to upgrade the database but cannot because AJAX does not appear accessible. This could be because your website is password protected, in maintenance mode, or has a specific hosting configuration or plugin active that is preventing access.', 'give'), 'http://docs.givewp.com/admin-ajax-error', __('Read More', 'give').' &raquo;'),
 					'show'        => true,
 				)
 			);
@@ -648,45 +646,45 @@ 
 		}
 
 		// Show db upgrade completed notice.
-		if ( ! empty( $_GET['give-db-update-completed'] ) ) {
-			Give()->notices->register_notice( array(
+		if ( ! empty($_GET['give-db-update-completed'])) {
+			Give()->notices->register_notice(array(
 				'id'          => 'give_db_upgrade_completed',
 				'type'        => 'updated',
-				'description' => __( 'Give database updates completed successfully. Thank you for updating to the latest version!', 'give' ),
+				'description' => __('Give database updates completed successfully. Thank you for updating to the latest version!', 'give'),
 				'show'        => true,
-			) );
+			));
 
 			// Start update.
-		} elseif ( ! empty( $_GET['give-run-db-update'] ) ) {
+		} elseif ( ! empty($_GET['give-run-db-update'])) {
 			$this->run_db_update();
 
 			// Show run the update notice.
-		} elseif ( $this->get_total_new_db_update_count() ) {
+		} elseif ($this->get_total_new_db_update_count()) {
 			ob_start();
 			?>
 			<p>
-				<strong><?php _e( 'Database Update', 'give' ); ?></strong>
-				&nbsp;&#8211;&nbsp;<?php _e( 'GiveWP needs to update your database to the latest version. The following process will make updates to your site\'s database. Please create a complete backup before proceeding.', 'give' ); ?>
+				<strong><?php _e('Database Update', 'give'); ?></strong>
+				&nbsp;&#8211;&nbsp;<?php _e('GiveWP needs to update your database to the latest version. The following process will make updates to your site\'s database. Please create a complete backup before proceeding.', 'give'); ?>
 			</p>
 			<p class="submit">
-				<a href="<?php echo esc_url( add_query_arg( array( 'give-run-db-update' => 1 ), admin_url( 'edit.php?post_type=give_forms&page=give-updates' ) ) ); ?>" class="button button-primary give-run-update-now">
-					<?php _e( 'Run the updater', 'give' ); ?>
+				<a href="<?php echo esc_url(add_query_arg(array('give-run-db-update' => 1), admin_url('edit.php?post_type=give_forms&page=give-updates'))); ?>" class="button button-primary give-run-update-now">
+					<?php _e('Run the updater', 'give'); ?>
 				</a>
 			</p>
 			<script type="text/javascript">
 				jQuery('.give-run-update-now').click('click', function () {
-					return window.confirm('<?php echo esc_js( __( 'It is recommended that you backup your database before proceeding. Do you want to run the update now?', 'give' ) ); ?>'); // jshint ignore:line
+					return window.confirm('<?php echo esc_js(__('It is recommended that you backup your database before proceeding. Do you want to run the update now?', 'give')); ?>'); // jshint ignore:line
 				});
 			</script>
 			<?php
 			$desc_html = ob_get_clean();
 
-			Give()->notices->register_notice( array(
+			Give()->notices->register_notice(array(
 				'id'          => 'give_upgrade_db',
 				'type'        => 'updated',
 				'dismissible' => false,
 				'description' => $desc_html,
-			) );
+			));
 		}
 	}
 
@@ -697,7 +695,7 @@ 
 	 * @access public
 	 */
 	public function render_complete_page() {
-		include_once GIVE_PLUGIN_DIR . 'includes/admin/upgrades/views/upgrades-complete.php';
+		include_once GIVE_PLUGIN_DIR.'includes/admin/upgrades/views/upgrades-complete.php';
 	}
 
 	/**
@@ -707,7 +705,7 @@ 
 	 * @access public
 	 */
 	public function render_page() {
-		include_once GIVE_PLUGIN_DIR . 'includes/admin/upgrades/views/upgrades.php';
+		include_once GIVE_PLUGIN_DIR.'includes/admin/upgrades/views/upgrades.php';
 	}
 
 	/**
@@ -718,26 +716,26 @@ 
 	 */
 	private function run_db_update() {
 		// Bailout.
-		if ( $this->is_doing_updates() || ! $this->get_total_new_db_update_count() ) {
+		if ($this->is_doing_updates() || ! $this->get_total_new_db_update_count()) {
 			return;
 		}
 
-		$updates = $this->get_updates( 'database', 'new' );
+		$updates = $this->get_updates('database', 'new');
 
-		foreach ( $updates as $update ) {
-			self::$background_updater->push_to_queue( $update );
+		foreach ($updates as $update) {
+			self::$background_updater->push_to_queue($update);
 		}
 
-		add_option( 'give_db_update_count', count( $updates ), '', 'no' );
+		add_option('give_db_update_count', count($updates), '', 'no');
 
-		add_option( 'give_doing_upgrade', array(
+		add_option('give_doing_upgrade', array(
 			'update_info'      => $updates[0],
 			'step'             => 1,
 			'update'           => 1,
-			'heading'          => sprintf( 'Update %s of %s', 1, count( $updates ) ),
+			'heading'          => sprintf('Update %s of %s', 1, count($updates)),
 			'percentage'       => 0,
 			'total_percentage' => 0,
-		), '', 'no' );
+		), '', 'no');
 
 		self::$background_updater->save()->dispatch();
 	}
@@ -751,14 +749,13 @@ 
 	 */
 	public function __flush_resume_updates() {
 		//delete_option( 'give_doing_upgrade' );
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
 
 		// Reset counter.
 		$this->step = $this->percentage = 0;
 
-		$this->update = ( $this->get_total_db_update_count() > $this->update ) ?
-			( $this->update + 1 ) :
-			$this->update;
+		$this->update = ($this->get_total_db_update_count() > $this->update) ?
+			($this->update + 1) : $this->update;
 	}
 
 
@@ -773,7 +770,7 @@ 
 	public function __give_start_updating() {
 		// Check permission.
 		if (
-			! current_user_can( 'manage_give_settings' ) ||
+			! current_user_can('manage_give_settings') ||
 			$this->is_doing_updates()
 		) {
 			wp_send_json_error();
@@ -781,7 +778,7 @@ 
 
 		// @todo: validate nonce
 		// @todo: set http method to post
-		if ( empty( $_POST['run_db_update'] ) ) {
+		if (empty($_POST['run_db_update'])) {
 			wp_send_json_error();
 		}
 
@@ -800,34 +797,34 @@ 
 	 * @return string
 	 */
 	public function __give_db_updates_info() {
-		$update_info   = get_option( 'give_doing_upgrade' );
+		$update_info   = get_option('give_doing_upgrade');
 		$response_type = '';
 
-		if ( self::$background_updater->is_paused_process() ) {
+		if (self::$background_updater->is_paused_process()) {
 			$update_info = array(
-				'message'    => __( 'The updates have been paused.', 'give' ),
-				'heading'    => __( '', 'give' ),
+				'message'    => __('The updates have been paused.', 'give'),
+				'heading'    => __('', 'give'),
 				'percentage' => 0,
 			);
 
-			if ( get_option( 'give_upgrade_error' ) ) {
-				$update_info['message'] = __( 'An unexpected issue occurred during the database update which caused it to stop automatically. Please contact support for assistance.', 'give' );
+			if (get_option('give_upgrade_error')) {
+				$update_info['message'] = __('An unexpected issue occurred during the database update which caused it to stop automatically. Please contact support for assistance.', 'give');
 			}
 
 			$response_type = 'error';
 
-		} elseif ( empty( $update_info ) ) {
+		} elseif (empty($update_info)) {
 			$update_info   = array(
-				'message'    => __( 'Give database updates completed successfully. Thank you for updating to the latest version!', 'give' ),
-				'heading'    => __( 'Updates Completed.', 'give' ),
+				'message'    => __('Give database updates completed successfully. Thank you for updating to the latest version!', 'give'),
+				'heading'    => __('Updates Completed.', 'give'),
 				'percentage' => 0,
 			);
 			$response_type = 'success';
 
-			delete_option( 'give_show_db_upgrade_complete_notice' );
+			delete_option('give_show_db_upgrade_complete_notice');
 		}
 
-		$this->send_ajax_response( $update_info, $response_type );
+		$this->send_ajax_response($update_info, $response_type);
 	}
 
 	/**
@@ -839,7 +836,7 @@ 
 	 * @param        $data
 	 * @param string $type
 	 */
-	public function send_ajax_response( $data, $type = '' ) {
+	public function send_ajax_response($data, $type = '') {
 		$default = array(
 			'message'    => '',
 			'heading'    => '',
@@ -849,24 +846,24 @@ 
 		);
 
 		// Set data.
-		$data = wp_parse_args( $data, $default );
+		$data = wp_parse_args($data, $default);
 
 		// Enable cache.
 		Give_Cache::enable();
 
-		switch ( $type ) {
+		switch ($type) {
 			case 'success':
-				wp_send_json_success( $data );
+				wp_send_json_success($data);
 				break;
 
 			case 'error':
-				wp_send_json_error( $data );
+				wp_send_json_error($data);
 				break;
 
 			default:
-				wp_send_json( array(
+				wp_send_json(array(
 					'data' => $data,
-				) );
+				));
 				break;
 		}
 	}
@@ -880,12 +877,12 @@ 
 	 * @param $total
 	 * @param $current_total
 	 */
-	public function set_percentage( $total, $current_total ) {
+	public function set_percentage($total, $current_total) {
 		// Set percentage.
-		$this->percentage = $total ? ( ( $current_total ) / $total ) * 100 : 0;
+		$this->percentage = $total ? (($current_total) / $total) * 100 : 0;
 
 		// Verify percentage.
-		$this->percentage = ( 100 < $this->percentage ) ? 100 : $this->percentage;
+		$this->percentage = (100 < $this->percentage) ? 100 : $this->percentage;
 	}
 
 	/**
@@ -898,22 +895,22 @@ 
 	 *
 	 * @return bool|null
 	 */
-	public function is_parent_updates_completed( $update ) {
+	public function is_parent_updates_completed($update) {
 		// Bailout.
-		if ( empty( $update['depend'] ) ) {
+		if (empty($update['depend'])) {
 			return true;
 		}
 
 		// Check if dependency is valid or not.
-		if ( ! $this->has_valid_dependency( $update ) ) {
+		if ( ! $this->has_valid_dependency($update)) {
 			return null;
 		}
 
 		$is_dependency_completed = true;
 
-		foreach ( $update['depend'] as $depend ) {
+		foreach ($update['depend'] as $depend) {
 
-			if ( ! give_has_upgrade_completed( $depend ) ) {
+			if ( ! give_has_upgrade_completed($depend)) {
 				$is_dependency_completed = false;
 				break;
 			}
@@ -930,7 +927,7 @@ 
 	 * @return bool
 	 */
 	public function is_doing_updates() {
-		return (bool) get_option( 'give_doing_upgrade' );
+		return (bool) get_option('give_doing_upgrade');
 	}
 
 
@@ -944,7 +941,7 @@ 
 	 *
 	 * @return bool
 	 */
-	public function has_valid_dependency( $update ) {
+	public function has_valid_dependency($update) {
 		$is_valid_dependency = true;
 		// $update_ids          = wp_list_pluck( $this->get_updates( 'database', 'all' ), 'id' );
 		//
@@ -970,33 +967,33 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_updates( $update_type = '', $status = 'all' ) {
+	public function get_updates($update_type = '', $status = 'all') {
 		// return all updates.
-		if ( empty( $update_type ) ) {
+		if (empty($update_type)) {
 			return $this->updates;
 		}
 
 		// Get specific update.
-		$updates = ! empty( $this->updates[ $update_type ] ) ? $this->updates[ $update_type ] : array();
+		$updates = ! empty($this->updates[$update_type]) ? $this->updates[$update_type] : array();
 
 		// Bailout.
-		if ( empty( $updates ) ) {
+		if (empty($updates)) {
 			return $updates;
 		}
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'new':
 				// Remove already completed updates.
-				wp_cache_delete( 'give_completed_upgrades', 'options' );
+				wp_cache_delete('give_completed_upgrades', 'options');
 				$completed_updates = give_get_completed_upgrades();
 
-				if ( ! empty( $completed_updates ) ) {
-					foreach ( $updates as $index => $update ) {
-						if ( in_array( $update['id'], $completed_updates ) ) {
-							unset( $updates[ $index ] );
+				if ( ! empty($completed_updates)) {
+					foreach ($updates as $index => $update) {
+						if (in_array($update['id'], $completed_updates)) {
+							unset($updates[$index]);
 						}
 					}
-					$updates = array_values( $updates );
+					$updates = array_values($updates);
 				}
 
 				break;
@@ -1013,7 +1010,7 @@ 
 	 * @return int
 	 */
 	public function get_total_plugin_update_count() {
-		return count( $this->get_updates( 'plugin' ) );
+		return count($this->get_updates('plugin'));
 	}
 
 	/**
@@ -1028,7 +1025,7 @@ 
 		$db_update_count     = $this->get_pending_db_update_count();
 		$plugin_update_count = $this->get_total_plugin_update_count();
 
-		return ( $db_update_count + $plugin_update_count );
+		return ($db_update_count + $plugin_update_count);
 	}
 
 	/**
@@ -1040,7 +1037,7 @@ 
 	 * @return int
 	 */
 	public function get_pending_db_update_count() {
-		return count( $this->get_updates( 'database', 'new' ) );
+		return count($this->get_updates('database', 'new'));
 	}
 
 	/**
@@ -1052,7 +1049,7 @@ 
 	 * @return int
 	 */
 	public function get_total_db_update_count() {
-		return count( $this->get_updates( 'database', 'all' ) );
+		return count($this->get_updates('database', 'all'));
 	}
 
 	/**
@@ -1065,10 +1062,9 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_total_new_db_update_count( $refresh = false ) {
+	public function get_total_new_db_update_count($refresh = false) {
 		$update_count = $this->is_doing_updates() && ! $refresh ?
-			get_option( 'give_db_update_count' ) :
-			$this->get_pending_db_update_count();
+			get_option('give_db_update_count') : $this->get_pending_db_update_count();
 
 		return $update_count;
 	}
@@ -1083,11 +1079,11 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_running_db_update( $refresh = false ) {
+	public function get_running_db_update($refresh = false) {
 		$current_update = 1;
 
-		if ( $this->is_doing_updates() && ! $refresh ) {
-			$current_update = get_option( 'give_doing_upgrade' );
+		if ($this->is_doing_updates() && ! $refresh) {
+			$current_update = get_option('give_doing_upgrade');
 			$current_update = $current_update['update'];
 		}
 
@@ -1104,25 +1100,23 @@ 
 	 *
 	 * @return float|int
 	 */
-	public function get_db_update_processing_percentage( $refresh = false ) {
+	public function get_db_update_processing_percentage($refresh = false) {
 		// Bailout.
-		if ( ! $this->get_total_new_db_update_count( $refresh ) ) {
+		if ( ! $this->get_total_new_db_update_count($refresh)) {
 			return 0;
 		}
 
-		$resume_update            = get_option( 'give_doing_upgrade' );
-		$update_count_percentages = ( ( $this->get_running_db_update( $refresh ) - 1 ) / $this->get_total_new_db_update_count( $refresh ) ) * 100;
-		$update_percentage_share  = ( 1 / $this->get_total_new_db_update_count() ) * 100;
-		$upgrade_percentage       = ( ( $resume_update['percentage'] * $update_percentage_share ) / 100 );
+		$resume_update            = get_option('give_doing_upgrade');
+		$update_count_percentages = (($this->get_running_db_update($refresh) - 1) / $this->get_total_new_db_update_count($refresh)) * 100;
+		$update_percentage_share  = (1 / $this->get_total_new_db_update_count()) * 100;
+		$upgrade_percentage       = (($resume_update['percentage'] * $update_percentage_share) / 100);
 
 		$final_percentage = $update_count_percentages + $upgrade_percentage;
 
 		return $this->is_doing_updates() ?
-			( absint( $final_percentage ) ?
-				absint( $final_percentage ) :
-				round( $final_percentage, 2 )
-			) :
-			0;
+			(absint($final_percentage) ?
+				absint($final_percentage) : round($final_percentage, 2)
+			) : 0;
 	}
 
 
@@ -1134,8 +1128,8 @@ 
 	 * @return array
 	 */
 	public function get_update_ids() {
-		$all_updates    = $this->get_updates( 'database', 'all' );
-		$all_update_ids = wp_list_pluck( $all_updates, 'id' );
+		$all_updates    = $this->get_updates('database', 'all');
+		$all_update_ids = wp_list_pluck($all_updates, 'id');
 
 		return $all_update_ids;
 	}

Braces +5 added lines, -2 removed lines

@@ -613,8 +613,11 @@
 						return window.confirm('<?php echo esc_js( __( 'It is recommended that you backup your database before proceeding. Do you want to run the update now?', 'give' ) ); ?>'); // jshint ignore:line
 					});
 				</script>
-			<?php else: ?>
-				<strong><?php _e( 'Database Update', 'give' ); ?></strong>
+			<?php else {
+	: ?>
+				<strong><?php _e( 'Database Update', 'give' );
+}
+?></strong>
 				&nbsp;&#8211;&nbsp;<?php _e( 'An unexpected issue occurred during the database update which caused it to stop automatically. Please contact support for assistance.', 'give' ); ?>
 			<?php
 			endif;

includes/admin/upgrades/views/upgrades.php

Spacing +36 added lines, -37 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -18,56 +18,55 @@ 
 ?>
 <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 $db_updates = $give_updates->get_pending_db_update_count(); ?>
-		<?php if ( ! empty( $db_updates ) ) : ?>
+		<?php if ( ! empty($db_updates)) : ?>
 			<?php
 			$is_doing_updates = $give_updates->is_doing_updates();
-			$db_update_url    = add_query_arg( array( 'type' => 'database', ) );
-			$resume_updates   = get_option( 'give_doing_upgrade' );
-			$width            = ! empty( $resume_updates ) ? $resume_updates['percentage'] : 0;
+			$db_update_url    = add_query_arg(array('type' => 'database',));
+			$resume_updates   = get_option('give_doing_upgrade');
+			$width            = ! empty($resume_updates) ? $resume_updates['percentage'] : 0;
 			?>
-			<div id="give-db-updates" data-resume-update="<?php echo absint( $give_updates->is_doing_updates() ); ?>">
+			<div id="give-db-updates" data-resume-update="<?php echo absint($give_updates->is_doing_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">
-									<span class="give-doing-update-text-p" <?php echo Give_Updates::$background_updater->is_paused_process() ? 'style="display:none;"' : '';  ?>>
+									<span class="give-doing-update-text-p" <?php echo Give_Updates::$background_updater->is_paused_process() ? 'style="display:none;"' : ''; ?>>
 										<?php echo sprintf(
-										__( '%1$s <a href="%2$s" class="give-update-now %3$s">%4$s</a>', 'give' ),
+										__('%1$s <a href="%2$s" class="give-update-now %3$s">%4$s</a>', 'give'),
 										$is_doing_updates ?
-											__( 'Give is currently updating the database in the background.', 'give' ) :
-											__( 'Give needs to update the database.', 'give' ),
+											__('Give is currently updating the database in the background.', 'give') : __('Give needs to update the database.', 'give'),
 										$db_update_url,
-										( $is_doing_updates ? 'give-hidden' : '' ),
-										__( 'Update now', 'give' )
+										($is_doing_updates ? 'give-hidden' : ''),
+										__('Update now', 'give')
 									);
 									?>
 									</span>
-									<span class="give-update-paused-text-p" <?php echo ! Give_Updates::$background_updater->is_paused_process()  ? 'style="display:none;"' : '';  ?>>
-										<?php if ( get_option( 'give_upgrade_error' ) ) : ?>
-											&nbsp;<?php _e( 'An unexpected issue occurred during the database update which caused it to stop automatically. Please contact support for assistance.', 'give' ); ?>
+									<span class="give-update-paused-text-p" <?php echo ! Give_Updates::$background_updater->is_paused_process() ? 'style="display:none;"' : ''; ?>>
+										<?php if (get_option('give_upgrade_error')) : ?>
+											&nbsp;<?php _e('An unexpected issue occurred during the database update which caused it to stop automatically. Please contact support for assistance.', 'give'); ?>
 										<?php else : ?>
-											<?php _e( 'The updates have been paused.', 'give' ); ?>
+											<?php _e('The updates have been paused.', 'give'); ?>
 
 										<?php endif; ?>
 									</span>
 
-									<?php if ( Give_Updates::$background_updater->is_paused_process() ) : ?>
-										<?php  $is_disabled = isset( $_GET['give-restart-db-upgrades'] ) ? ' disabled' : ''; ?>
-										<button id="give-restart-upgrades" class="button button-primary alignright" data-redirect-url="<?php echo esc_url( admin_url( '/edit.php?post_type=give_forms&page=give-updates&give-restart-db-upgrades=1' ) ); ?>"<?php echo $is_disabled; ?>><?php _e( 'Restart Upgrades', 'give' ); ?></button>
-									<?php elseif( $give_updates->is_doing_updates() ): ?>
-										<?php  $is_disabled = isset( $_GET['give-pause-db-upgrades'] ) ? ' disabled' : ''; ?>
-										<button id="give-pause-upgrades" class="button button-primary alignright" data-redirect-url="<?php echo esc_url( admin_url( '/edit.php?post_type=give_forms&page=give-updates&give-pause-db-upgrades=1' ) ); ?>"<?php echo $is_disabled; ?>>
-											<?php _e( 'Pause Upgrades', 'give' ); ?>
+									<?php if (Give_Updates::$background_updater->is_paused_process()) : ?>
+										<?php  $is_disabled = isset($_GET['give-restart-db-upgrades']) ? ' disabled' : ''; ?>
+										<button id="give-restart-upgrades" class="button button-primary alignright" data-redirect-url="<?php echo esc_url(admin_url('/edit.php?post_type=give_forms&page=give-updates&give-restart-db-upgrades=1')); ?>"<?php echo $is_disabled; ?>><?php _e('Restart Upgrades', 'give'); ?></button>
+									<?php elseif ($give_updates->is_doing_updates()): ?>
+										<?php  $is_disabled = isset($_GET['give-pause-db-upgrades']) ? ' disabled' : ''; ?>
+										<button id="give-pause-upgrades" class="button button-primary alignright" data-redirect-url="<?php echo esc_url(admin_url('/edit.php?post_type=give_forms&page=give-updates&give-pause-db-upgrades=1')); ?>"<?php echo $is_disabled; ?>>
+											<?php _e('Pause Upgrades', 'give'); ?>
 										</button>
 									<?php endif; ?>
 
@@ -76,7 +75,7 @@ 
 											e.preventDefault();
 											jQuery('.give-doing-update-text-p').hide();
 											jQuery('.give-update-paused-text-p').show();
-											if (window.confirm('<?php echo esc_js( __( 'Do you want to stop the update process now?', 'give' ) ); ?>')) {
+											if (window.confirm('<?php echo esc_js(__('Do you want to stop the update process now?', 'give')); ?>')) {
 												window.location.assign(jQuery(this).data('redirect-url'));
 											}
 										});
@@ -84,7 +83,7 @@ 
 											e.preventDefault();
 											jQuery('.give-doing-update-text-p').show();
 											jQuery('.give-update-paused-text-p').hide();
-											if (window.confirm('<?php echo esc_js( __( 'Do you want to restart the update process?', 'give' ) ); ?>')) {
+											if (window.confirm('<?php echo esc_js(__('Do you want to restart the update process?', 'give')); ?>')) {
 												window.location.assign(jQuery(this).data('redirect-url'));
 											}
 										});
@@ -96,7 +95,7 @@ 
 									<strong>
 										<?php
 										echo sprintf(
-											__( 'Update %s of %s', 'give' ),
+											__('Update %s of %s', 'give'),
 											$give_updates->get_running_db_update(),
 											$give_updates->get_total_new_db_update_count()
 										);
@@ -104,10 +103,10 @@ 
 									</strong>
 								</p>
 								<div class="progress-content">
-									<?php if ( $is_doing_updates  ) : ?>
+									<?php if ($is_doing_updates) : ?>
 										<div class="notice-wrap give-clearfix">
 
-											<?php if ( ! Give_Updates::$background_updater->is_paused_process() ) :  ?>
+											<?php if ( ! Give_Updates::$background_updater->is_paused_process()) :  ?>
 												<span class="spinner is-active"></span>
 											<?php endif; ?>
 
@@ -119,7 +118,7 @@ 
 								</div>
 							</div>
 
-							<?php if ( ! $is_doing_updates ) : ?>
+							<?php if ( ! $is_doing_updates) : ?>
 								<div class="give-run-database-update"></div>
 							<?php endif; ?>
 						</div>
@@ -130,17 +129,17 @@ 
 		<?php endif; ?>
 
 		<?php $plugin_updates = $give_updates->get_total_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>

Braces +5 added lines, -2 removed lines

@@ -55,8 +55,11 @@
 									<span class="give-update-paused-text-p" <?php echo ! Give_Updates::$background_updater->is_paused_process()  ? 'style="display:none;"' : '';  ?>>
 										<?php if ( get_option( 'give_upgrade_error' ) ) : ?>
 											&nbsp;<?php _e( 'An unexpected issue occurred during the database update which caused it to stop automatically. Please contact support for assistance.', 'give' ); ?>
-										<?php else : ?>
-											<?php _e( 'The updates have been paused.', 'give' ); ?>
+										<?php else {
+	: ?>
+											<?php _e( 'The updates have been paused.', 'give' );
+}
+?>
 
 										<?php endif; ?>
 									</span>

includes/admin/settings/class-settings-general.php

Spacing +76 added lines, -76 removed lines

@@ -9,11 +9,11 @@ 
  * @since       1.8
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit; // Exit if accessed directly.
 }
 
-if ( ! class_exists( 'Give_Settings_General' ) ) :
+if ( ! class_exists('Give_Settings_General')) :
 
 	/**
 	 * Give_Settings_General.
@@ -27,7 +27,7 @@ 
 		 */
 		public function __construct() {
 			$this->id    = 'general';
-			$this->label = __( 'General', 'give' );
+			$this->label = __('General', 'give');
 
 			$this->default_tab = 'general-settings';
 
@@ -44,7 +44,7 @@ 
 			$settings        = array();
 			$current_section = give_get_current_setting_section();
 
-			switch ( $current_section ) {
+			switch ($current_section) {
 				case 'access-control':
 					$settings = array(
 						// Section 3: Access control.
@@ -54,20 +54,20 @@ 
 						),
 						array(
 							'id'      => 'session_lifetime',
-							'name'    => __( 'Session Lifetime', 'give' ),
-							'desc'    => __( 'The length of time a user\'s session is kept alive. Give starts a new session per user upon donation. Sessions allow donors to view their donation receipts without being logged in.', 'give' ),
+							'name'    => __('Session Lifetime', 'give'),
+							'desc'    => __('The length of time a user\'s session is kept alive. Give starts a new session per user upon donation. Sessions allow donors to view their donation receipts without being logged in.', 'give'),
 							'type'    => 'select',
 							'options' => array(
-								'86400'  => __( '24 Hours', 'give' ),
-								'172800' => __( '48 Hours', 'give' ),
-								'259200' => __( '72 Hours', 'give' ),
-								'604800' => __( '1 Week', 'give' ),
+								'86400'  => __('24 Hours', 'give'),
+								'172800' => __('48 Hours', 'give'),
+								'259200' => __('72 Hours', 'give'),
+								'604800' => __('1 Week', 'give'),
 							),
 						),
 						array(
 							'id'         => 'limit_display_donations',
-							'name'       => __( 'Limit Donations Displayed', 'give' ),
-							'desc'       => __( 'Adjusts the number of donations displayed to a non logged-in user when they attempt to access the Donation History page without an active session. For security reasons, it\'s best to leave this at 1-3 donations.', 'give' ),
+							'name'       => __('Limit Donations Displayed', 'give'),
+							'desc'       => __('Adjusts the number of donations displayed to a non logged-in user when they attempt to access the Donation History page without an active session. For security reasons, it\'s best to leave this at 1-3 donations.', 'give'),
 							'default'    => '1',
 							'type'       => 'number',
 							'css'        => 'width:50px;',
@@ -77,47 +77,47 @@ 
 							),
 						),
 						array(
-							'name'    => __( 'Email Access', 'give' ),
-							'desc'    => __( 'Would you like your donors to be able to access their donation history using only email? Donors whose sessions have expired and do not have an account may still access their donation history via a temporary email access link.', 'give' ),
+							'name'    => __('Email Access', 'give'),
+							'desc'    => __('Would you like your donors to be able to access their donation history using only email? Donors whose sessions have expired and do not have an account may still access their donation history via a temporary email access link.', 'give'),
 							'id'      => 'email_access',
 							'type'    => 'radio_inline',
 							'default' => 'disabled',
 							'options' => array(
-								'enabled'  => __( 'Enabled', 'give' ),
-								'disabled' => __( 'Disabled', 'give' ),
+								'enabled'  => __('Enabled', 'give'),
+								'disabled' => __('Disabled', 'give'),
 							),
 						),
 						array(
-							'name'    => __( 'Enable reCAPTCHA', 'give' ),
-							'desc'    => __( 'Would you like to enable the reCAPTCHA feature?', 'give' ),
+							'name'    => __('Enable reCAPTCHA', 'give'),
+							'desc'    => __('Would you like to enable the reCAPTCHA feature?', 'give'),
 							'id'      => 'enable_recaptcha',
 							'type'    => 'radio_inline',
 							'default' => 'disabled',
 							'options' => array(
-								'enabled'  => __( 'Enabled', 'give' ),
-								'disabled' => __( 'Disabled', 'give' ),
+								'enabled'  => __('Enabled', 'give'),
+								'disabled' => __('Disabled', 'give'),
 							),
 						),
 						array(
 							'id'      => 'recaptcha_key',
-							'name'    => __( 'reCAPTCHA Site Key', 'give' ),
+							'name'    => __('reCAPTCHA Site Key', 'give'),
 							/* translators: %s: https://www.google.com/recaptcha/ */
-							'desc'    => sprintf( __( 'If you would like to prevent spam on the email access form navigate to <a href="%s" target="_blank">the reCAPTCHA website</a> and sign up for an API key and paste your reCAPTCHA site key here. The reCAPTCHA uses Google\'s user-friendly single click verification method.', 'give' ), esc_url( 'http://docs.givewp.com/recaptcha' ) ),
+							'desc'    => sprintf(__('If you would like to prevent spam on the email access form navigate to <a href="%s" target="_blank">the reCAPTCHA website</a> and sign up for an API key and paste your reCAPTCHA site key here. The reCAPTCHA uses Google\'s user-friendly single click verification method.', 'give'), esc_url('http://docs.givewp.com/recaptcha')),
 							'default' => '',
 							'type'    => 'text',
 						),
 						array(
 							'id'      => 'recaptcha_secret',
-							'name'    => __( 'reCAPTCHA Secret Key', 'give' ),
-							'desc'    => __( 'Please paste the reCAPTCHA secret key here from your  reCAPTCHA API Keys panel.', 'give' ),
+							'name'    => __('reCAPTCHA Secret Key', 'give'),
+							'desc'    => __('Please paste the reCAPTCHA secret key here from your  reCAPTCHA API Keys panel.', 'give'),
 							'default' => '',
 							'type'    => 'text',
 						),
 						array(
-							'name'  => __( 'Access Control Docs Link', 'give' ),
+							'name'  => __('Access Control Docs Link', 'give'),
 							'id'    => 'access_control_docs_link',
-							'url'   => esc_url( 'http://docs.givewp.com/settings-access-control' ),
-							'title' => __( 'Access Control', 'give' ),
+							'url'   => esc_url('http://docs.givewp.com/settings-access-control'),
+							'title' => __('Access Control', 'give'),
 							'type'  => 'give_docs_link',
 						),
 						array(
@@ -128,8 +128,8 @@ 
 					break;
 
 				case 'currency-settings' :
-					$currency_position_before = __( 'Before - %s&#x200e;10', 'give' );
-					$currency_position_after  = __( 'After - 10%s&#x200f;', 'give' );
+					$currency_position_before = __('Before - %s&#x200e;10', 'give');
+					$currency_position_after  = __('After - 10%s&#x200f;', 'give');
 
 					$settings = array(
 						// Section 2: Currency
@@ -138,14 +138,14 @@ 
 							'id'   => 'give_title_general_settings_2',
 						),
 						array(
-							'name' => __( 'Currency Settings', 'give' ),
+							'name' => __('Currency Settings', 'give'),
 							'desc' => '',
 							'type' => 'give_title',
 							'id'   => 'give_title_general_settings_2',
 						),
 						array(
-							'name'    => __( 'Currency', 'give' ),
-							'desc'    => __( 'The donation currency. Note that some payment gateways have currency restrictions.', 'give' ),
+							'name'    => __('Currency', 'give'),
+							'desc'    => __('The donation currency. Note that some payment gateways have currency restrictions.', 'give'),
 							'id'      => 'currency',
 							'class'   => 'give-select-chosen',
 							'type'    => 'select',
@@ -153,51 +153,51 @@ 
 							'default' => 'USD',
 						),
 						array(
-							'name'       => __( 'Currency Position', 'give' ),
-							'desc'       => __( 'The position of the currency symbol.', 'give' ),
+							'name'       => __('Currency Position', 'give'),
+							'desc'       => __('The position of the currency symbol.', 'give'),
 							'id'         => 'currency_position',
 							'type'       => 'select',
 							'options'    => array(
 								/* translators: %s: currency symbol */
-								'before' => sprintf( $currency_position_before, give_currency_symbol( give_get_currency() ) ),
+								'before' => sprintf($currency_position_before, give_currency_symbol(give_get_currency())),
 								/* translators: %s: currency symbol */
-								'after'  => sprintf( $currency_position_after, give_currency_symbol( give_get_currency() ) ),
+								'after'  => sprintf($currency_position_after, give_currency_symbol(give_get_currency())),
 							),
 							'default'    => 'before',
 							'attributes' => array(
-								'data-before-template' => sprintf( $currency_position_before, '{currency_pos}' ),
-								'data-after-template' => sprintf( $currency_position_after, '{currency_pos}' ),
+								'data-before-template' => sprintf($currency_position_before, '{currency_pos}'),
+								'data-after-template' => sprintf($currency_position_after, '{currency_pos}'),
 							),
 						),
 						array(
-							'name'    => __( 'Thousands Separator', 'give' ),
-							'desc'    => __( 'The symbol (typically , or .) to separate thousands.', 'give' ),
+							'name'    => __('Thousands Separator', 'give'),
+							'desc'    => __('The symbol (typically , or .) to separate thousands.', 'give'),
 							'id'      => 'thousands_separator',
 							'type'    => 'text',
 							'default' => ',',
 							'css'     => 'width:12em;',
 						),
 						array(
-							'name'    => __( 'Decimal Separator', 'give' ),
-							'desc'    => __( 'The symbol (usually , or .) to separate decimal points.', 'give' ),
+							'name'    => __('Decimal Separator', 'give'),
+							'desc'    => __('The symbol (usually , or .) to separate decimal points.', 'give'),
 							'id'      => 'decimal_separator',
 							'type'    => 'text',
 							'default' => '.',
 							'css'     => 'width:12em;',
 						),
 						array(
-							'name'    => __( 'Number of Decimals', 'give' ),
-							'desc'    => __( 'The number of decimal points displayed in amounts.', 'give' ),
+							'name'    => __('Number of Decimals', 'give'),
+							'desc'    => __('The number of decimal points displayed in amounts.', 'give'),
 							'id'      => 'number_decimals',
 							'type'    => 'text',
 							'default' => 2,
 							'css'     => 'width:12em;',
 						),
 						array(
-							'name'  => __( 'Currency Options Docs Link', 'give' ),
+							'name'  => __('Currency Options Docs Link', 'give'),
 							'id'    => 'currency_settings_docs_link',
-							'url'   => esc_url( 'http://docs.givewp.com/settings-currency' ),
-							'title' => __( 'Currency Settings', 'give' ),
+							'url'   => esc_url('http://docs.givewp.com/settings-currency'),
+							'title' => __('Currency Settings', 'give'),
 							'type'  => 'give_docs_link',
 						),
 						array(
@@ -213,7 +213,7 @@ 
 					$country = give_get_country();
 
 					// get the list of the states of which default country is selected.
-					$states = give_get_states( $country );
+					$states = give_get_states($country);
 
 					// Get the country list that does not have any states init.
 					$no_states_country = give_no_states_country_list();
@@ -225,46 +225,46 @@ 
 							'id'   => 'give_title_general_settings_1',
 						),
 						array(
-							'name' => __( 'General Settings', 'give' ),
+							'name' => __('General Settings', 'give'),
 							'desc' => '',
 							'type' => 'give_title',
 							'id'   => 'give_title_general_settings_1',
 						),
 						array(
-							'name'    => __( 'Success Page', 'give' ),
+							'name'    => __('Success Page', 'give'),
 							/* translators: %s: [give_receipt] */
-							'desc'    => sprintf( __( 'The page donors are sent to after completing their donations. The %s shortcode should be on this page.', 'give' ), '<code>[give_receipt]</code>' ),
+							'desc'    => sprintf(__('The page donors are sent to after completing their donations. The %s shortcode should be on this page.', 'give'), '<code>[give_receipt]</code>'),
 							'id'      => 'success_page',
 							'type'    => 'select',
-							'options' => give_cmb2_get_post_options( array(
+							'options' => give_cmb2_get_post_options(array(
 								'post_type'   => 'page',
 								'numberposts' => 999,
-							) ),
+							)),
 						),
 						array(
-							'name'    => __( 'Failed Donation Page', 'give' ),
-							'desc'    => __( 'The page donors are sent to if their donation is cancelled or fails.', 'give' ),
+							'name'    => __('Failed Donation Page', 'give'),
+							'desc'    => __('The page donors are sent to if their donation is cancelled or fails.', 'give'),
 							'id'      => 'failure_page',
 							'type'    => 'select',
-							'options' => give_cmb2_get_post_options( array(
+							'options' => give_cmb2_get_post_options(array(
 								'post_type'   => 'page',
 								'numberposts' => 999,
-							) ),
+							)),
 						),
 						array(
-							'name'    => __( 'Donation History Page', 'give' ),
+							'name'    => __('Donation History Page', 'give'),
 							/* translators: %s: [donation_history] */
-							'desc'    => sprintf( __( 'The page showing a complete donation history for the current user. The %s shortcode should be on this page.', 'give' ), '<code>[donation_history]</code>' ),
+							'desc'    => sprintf(__('The page showing a complete donation history for the current user. The %s shortcode should be on this page.', 'give'), '<code>[donation_history]</code>'),
 							'id'      => 'history_page',
 							'type'    => 'select',
-							'options' => give_cmb2_get_post_options( array(
+							'options' => give_cmb2_get_post_options(array(
 								'post_type'   => 'page',
 								'numberposts' => 999,
-							) ),
+							)),
 						),
 						array(
-							'name'    => __( 'Base Country', 'give' ),
-							'desc'    => __( 'The country your site operates from.', 'give' ),
+							'name'    => __('Base Country', 'give'),
+							'desc'    => __('The country your site operates from.', 'give'),
 							'id'      => 'base_country',
 							'type'    => 'select',
 							'options' => give_get_country_list(),
@@ -275,18 +275,18 @@ 
 						 * @since 1.8.14
 						 */
 						array(
-							'wrapper_class' => ( array_key_exists( $country, $no_states_country ) ? 'give-hidden' : '' ),
-							'name'          => __( 'Base State/Province', 'give' ),
-							'desc'          => __( 'The state/province your site operates from.', 'give' ),
+							'wrapper_class' => (array_key_exists($country, $no_states_country) ? 'give-hidden' : ''),
+							'name'          => __('Base State/Province', 'give'),
+							'desc'          => __('The state/province your site operates from.', 'give'),
 							'id'            => 'base_state',
-							'type'          => ( empty( $states ) ? 'text' : 'select' ),
+							'type'          => (empty($states) ? 'text' : 'select'),
 							'options'       => $states,
 						),
 						array(
-							'name'  => __( 'General Options Docs Link', 'give' ),
+							'name'  => __('General Options Docs Link', 'give'),
 							'id'    => 'general_options_docs_link',
-							'url'   => esc_url( 'http://docs.givewp.com/settings-general' ),
-							'title' => __( 'General Options', 'give' ),
+							'url'   => esc_url('http://docs.givewp.com/settings-general'),
+							'title' => __('General Options', 'give'),
 							'type'  => 'give_docs_link',
 						),
 						array(
@@ -301,7 +301,7 @@ 
 			 * Filter the general settings.
 			 * Backward compatibility: Please do not use this filter. This filter is deprecated in 1.8
 			 */
-			$settings = apply_filters( 'give_settings_general', $settings );
+			$settings = apply_filters('give_settings_general', $settings);
 
 			/**
 			 * Filter the settings.
@@ -310,7 +310,7 @@ 
 			 *
 			 * @param  array $settings
 			 */
-			$settings = apply_filters( 'give_get_settings_' . $this->id, $settings );
+			$settings = apply_filters('give_get_settings_'.$this->id, $settings);
 
 			// Output.
 			return $settings;
@@ -324,12 +324,12 @@ 
 		 */
 		public function get_sections() {
 			$sections = array(
-				'general-settings'  => __( 'General', 'give' ),
-				'currency-settings' => __( 'Currency', 'give' ),
-				'access-control'    => __( 'Access Control', 'give' ),
+				'general-settings'  => __('General', 'give'),
+				'currency-settings' => __('Currency', 'give'),
+				'access-control'    => __('Access Control', 'give'),
 			);
 
-			return apply_filters( 'give_get_sections_' . $this->id, $sections );
+			return apply_filters('give_get_sections_'.$this->id, $sections);
 		}
 	}
 

includes/admin/payments/class-payments-table.php

Spacing +217 added lines, -218 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded.
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -136,15 +136,15 @@ 
 		// Set parent defaults.
 		parent::__construct(
 			array(
-				'singular' => give_get_forms_label_singular(),    // Singular name of the listed records.
-				'plural'   => give_get_forms_label_plural(),      // Plural name of the listed records.
-				'ajax'     => false,                              // Does this table support ajax?
+				'singular' => give_get_forms_label_singular(), // Singular name of the listed records.
+				'plural'   => give_get_forms_label_plural(), // Plural name of the listed records.
+				'ajax'     => false, // Does this table support ajax?
 			)
 		);
 
 		$this->process_bulk_action();
 		$this->get_payment_counts();
-		$this->base_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history' );
+		$this->base_url = admin_url('edit.php?post_type=give_forms&page=give-payment-history');
 	}
 
 	/**
@@ -153,31 +153,31 @@ 
 	 * @return void
 	 */
 	public function advanced_filters() {
-		$start_date = isset( $_GET['start-date'] ) ? give_clean( $_GET['start-date'] ) : null;
-		$end_date   = isset( $_GET['end-date'] ) ? give_clean( $_GET['end-date'] ) : null;
-		$status     = isset( $_GET['status'] ) ? give_clean( $_GET['status'] ) : '';
-		$donor      = isset( $_GET['donor'] ) ? absint( $_GET['donor'] ) : '';
-		$search     = isset( $_GET['s'] ) ? give_clean( $_GET['s'] ) : '';
-		$form_id    = ! empty( $_GET['form_id'] ) ? absint( $_GET['form_id'] ) : 0;
+		$start_date = isset($_GET['start-date']) ? give_clean($_GET['start-date']) : null;
+		$end_date   = isset($_GET['end-date']) ? give_clean($_GET['end-date']) : null;
+		$status     = isset($_GET['status']) ? give_clean($_GET['status']) : '';
+		$donor      = isset($_GET['donor']) ? absint($_GET['donor']) : '';
+		$search     = isset($_GET['s']) ? give_clean($_GET['s']) : '';
+		$form_id    = ! empty($_GET['form_id']) ? absint($_GET['form_id']) : 0;
 		?>
 		<div id="give-payment-filters" class="give-filters">
-			<?php $this->search_box( __( 'Search', 'give' ), 'give-payments' ); ?>
+			<?php $this->search_box(__('Search', 'give'), 'give-payments'); ?>
 			<div id="give-payment-date-filters">
 				<div class="give-filter give-filter-half">
 					<label for="start-date"
-					       class="give-start-date-label"><?php _e( 'Start Date', 'give' ); ?></label>
+					       class="give-start-date-label"><?php _e('Start Date', 'give'); ?></label>
 					<input type="text" id="start-date" name="start-date" class="give_datepicker"
 					       value="<?php echo $start_date; ?>" placeholder="mm/dd/yyyy"/>
 				</div>
 				<div class="give-filter give-filter-half">
-					<label for="end-date" class="give-end-date-label"><?php _e( 'End Date', 'give' ); ?></label>
+					<label for="end-date" class="give-end-date-label"><?php _e('End Date', 'give'); ?></label>
 					<input type="text" id="end-date" name="end-date" class="give_datepicker"
 					       value="<?php echo $end_date; ?>" placeholder="mm/dd/yyyy"/>
 				</div>
 			</div>
 			<div id="give-payment-form-filter" class="give-filter">
 				<label for="give-donation-forms-filter"
-				       class="give-donation-forms-filter-label"><?php _e( 'Form', 'give' ); ?></label>
+				       class="give-donation-forms-filter-label"><?php _e('Form', 'give'); ?></label>
 				<?php
 				// Filter Donations by Donation Forms.
 				echo Give()->html->forms_dropdown(
@@ -187,7 +187,7 @@ 
 						'class'    => 'give-donation-forms-filter',
 						'selected' => $form_id, // Make sure to have $form_id set to 0, if there is no selection.
 						'chosen'   => true,
-						'number'   => - 1,
+						'number'   => -1,
 					)
 				);
 				?>
@@ -199,26 +199,26 @@ 
 			 *
 			 * @since 1.8.18
 			 */
-			do_action( 'give_payment_table_advanced_filters' );
+			do_action('give_payment_table_advanced_filters');
 
 
-			if ( ! empty( $status ) ) {
-				echo sprintf( '<input type="hidden" name="status" value="%s"/>', esc_attr( $status ) );
+			if ( ! empty($status)) {
+				echo sprintf('<input type="hidden" name="status" value="%s"/>', esc_attr($status));
 			}
 
-			if ( ! empty( $donor ) ) {
-				echo sprintf( '<input type="hidden" name="donor" value="%s"/>', absint( $donor ) );
+			if ( ! empty($donor)) {
+				echo sprintf('<input type="hidden" name="donor" value="%s"/>', absint($donor));
 			}
 			?>
 
 			<div class="give-filter">
-				<?php submit_button( __( 'Apply', 'give' ), 'secondary', '', false ); ?>
+				<?php submit_button(__('Apply', 'give'), 'secondary', '', false); ?>
 				<?php
 				// Clear active filters button.
-				if ( ! empty( $start_date ) || ! empty( $end_date ) || ! empty( $donor ) || ! empty( $search ) || ! empty( $status ) || ! empty( $form_id ) ) :
+				if ( ! empty($start_date) || ! empty($end_date) || ! empty($donor) || ! empty($search) || ! empty($status) || ! empty($form_id)) :
 					?>
-					<a href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history' ); ?>"
-					   class="button give-clear-filters-button"><?php _e( 'Clear Filters', 'give' ); ?></a>
+					<a href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history'); ?>"
+					   class="button give-clear-filters-button"><?php _e('Clear Filters', 'give'); ?></a>
 				<?php endif; ?>
 			</div>
 		</div>
@@ -237,18 +237,18 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
-		if ( empty( $_REQUEST['s'] ) && ! $this->has_items() ) {
+	public function search_box($text, $input_id) {
+		if (empty($_REQUEST['s']) && ! $this->has_items()) {
 			return;
 		}
 
-		$input_id = $input_id . '-search-input';
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
 		}
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if ( ! empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
 		}
 		?>
 		<div class="give-filter give-filter-search" role="search">
@@ -260,13 +260,13 @@ 
 			 *
 			 * @since 1.7
 			 */
-			do_action( 'give_payment_history_search' );
+			do_action('give_payment_history_search');
 			?>
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>"/>
-			<?php submit_button( $text, 'button', false, false, array(
+			<?php submit_button($text, 'button', false, false, array(
 				'ID' => 'search-submit',
-			) ); ?><br/>
+			)); ?><br/>
 		</div>
 		<?php
 	}
@@ -281,48 +281,48 @@ 
 	 */
 	public function get_views() {
 
-		$current = isset( $_GET['status'] ) ? $_GET['status'] : '';
+		$current = isset($_GET['status']) ? $_GET['status'] : '';
 		$views   = array();
 		$tabs    = array(
 			'all'         => array(
 				'total_count',
-				__( 'All', 'give' ),
+				__('All', 'give'),
 			),
 			'publish'     => array(
 				'complete_count',
-				__( 'Completed', 'give' ),
+				__('Completed', 'give'),
 			),
 			'pending'     => array(
 				'pending_count',
-				__( 'Pending', 'give' ),
+				__('Pending', 'give'),
 			),
 			'processing'  => array(
 				'processing_count',
-				__( 'Processing', 'give' ),
+				__('Processing', 'give'),
 			),
 			'refunded'    => array(
 				'refunded_count',
-				__( 'Refunded', 'give' ),
+				__('Refunded', 'give'),
 			),
 			'revoked'     => array(
 				'revoked_count',
-				__( 'Revoked', 'give' ),
+				__('Revoked', 'give'),
 			),
 			'failed'      => array(
 				'failed_count',
-				__( 'Failed', 'give' ),
+				__('Failed', 'give'),
 			),
 			'cancelled'   => array(
 				'cancelled_count',
-				__( 'Cancelled', 'give' ),
+				__('Cancelled', 'give'),
 			),
 			'abandoned'   => array(
 				'abandoned_count',
-				__( 'Abandoned', 'give' ),
+				__('Abandoned', 'give'),
 			),
 			'preapproval' => array(
 				'preapproval_count',
-				__( 'Preapproval Pending', 'give' ),
+				__('Preapproval Pending', 'give'),
 			),
 		);
 
@@ -331,12 +331,12 @@ 
 		 *
 		 * @since 1.8.18
 		 */
-		$args = (array) apply_filters( 'give_payments_table_status_remove_query_arg', array( 'paged', '_wpnonce', '_wp_http_referer' ) );
+		$args = (array) apply_filters('give_payments_table_status_remove_query_arg', array('paged', '_wpnonce', '_wp_http_referer'));
 
 		// Build URL.
-		$staus_url = remove_query_arg( $args );
+		$staus_url = remove_query_arg($args);
 
-		foreach ( $tabs as $key => $tab ) {
+		foreach ($tabs as $key => $tab) {
 			$count_key = $tab[0];
 			$name      = $tab[1];
 			$count     = $this->$count_key;
@@ -351,16 +351,15 @@ 
 			 *
 			 * @since 1.8.12
 			 */
-			if ( 'all' === $key || $key === $current || apply_filters( 'give_payments_table_show_all_status', 0 < $count, $key, $count ) ) {
+			if ('all' === $key || $key === $current || apply_filters('give_payments_table_show_all_status', 0 < $count, $key, $count)) {
 
 				$staus_url = 'all' === $key ?
-					add_query_arg( array( 'status' => false ), $staus_url ) :
-					add_query_arg( array( 'status' => $key ), $staus_url );
+					add_query_arg(array('status' => false), $staus_url) : add_query_arg(array('status' => $key), $staus_url);
 
-				$views[ $key ] = sprintf(
+				$views[$key] = sprintf(
 					'<a href="%s"%s>%s&nbsp;<span class="count">(%s)</span></a>',
-					esc_url( $staus_url ),
-					( ( 'all' === $key && empty( $current ) ) ) ? ' class="current"' : ( $current == $key ? 'class="current"' : '' ),
+					esc_url($staus_url),
+					(('all' === $key && empty($current))) ? ' class="current"' : ($current == $key ? 'class="current"' : ''),
 					$name,
 					$count
 				);
@@ -375,7 +374,7 @@ 
 		 * @param array $views
 		 * @param Give_Payment_History_Table
 		 */
-		return apply_filters( 'give_payments_table_views', $views, $this );
+		return apply_filters('give_payments_table_views', $views, $this);
 	}
 
 	/**
@@ -389,18 +388,18 @@ 
 	public function get_columns() {
 		$columns = array(
 			'cb'            => '<input type="checkbox" />', // Render a checkbox instead of text.
-			'donation'      => __( 'Donation', 'give' ),
-			'donation_form' => __( 'Donation Form', 'give' ),
-			'status'        => __( 'Status', 'give' ),
-			'date'          => __( 'Date', 'give' ),
-			'amount'        => __( 'Amount', 'give' ),
+			'donation'      => __('Donation', 'give'),
+			'donation_form' => __('Donation Form', 'give'),
+			'status'        => __('Status', 'give'),
+			'date'          => __('Date', 'give'),
+			'amount'        => __('Amount', 'give'),
 		);
 
-		if ( current_user_can( 'view_give_payments' ) ) {
-			$columns['details'] = __( 'Details', 'give' );
+		if (current_user_can('view_give_payments')) {
+			$columns['details'] = __('Details', 'give');
 		}
 
-		return apply_filters( 'give_payments_table_columns', $columns );
+		return apply_filters('give_payments_table_columns', $columns);
 	}
 
 	/**
@@ -413,14 +412,14 @@ 
 	 */
 	public function get_sortable_columns() {
 		$columns = array(
-			'donation'      => array( 'ID', true ),
-			'donation_form' => array( 'donation_form', false ),
-			'status'        => array( 'status', false ),
-			'amount'        => array( 'amount', false ),
-			'date'          => array( 'date', false ),
+			'donation'      => array('ID', true),
+			'donation_form' => array('donation_form', false),
+			'status'        => array('status', false),
+			'amount'        => array('amount', false),
+			'date'          => array('date', false),
 		);
 
-		return apply_filters( 'give_payments_table_sortable_columns', $columns );
+		return apply_filters('give_payments_table_sortable_columns', $columns);
 	}
 
 	/**
@@ -446,43 +445,43 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $payment, $column_name ) {
+	public function column_default($payment, $column_name) {
 
-		$single_donation_url = esc_url( add_query_arg( 'id', $payment->ID, admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details' ) ) );
-		$row_actions         = $this->get_row_actions( $payment );
+		$single_donation_url = esc_url(add_query_arg('id', $payment->ID, admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details')));
+		$row_actions         = $this->get_row_actions($payment);
 		$value               = '';
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'donation' :
-				if ( current_user_can( 'view_give_payments' ) ) {
-					$value = Give()->tooltips->render_link( array(
-						'label'       => sprintf( __( 'View Donation #%s', 'give' ), $payment->ID ),
+				if (current_user_can('view_give_payments')) {
+					$value = Give()->tooltips->render_link(array(
+						'label'       => sprintf(__('View Donation #%s', 'give'), $payment->ID),
 						'tag_content' => "#$payment->ID",
 						'link'        => $single_donation_url,
-					) );
+					));
 				} else {
 					$value = "#{$payment->ID}";
 				}
 
 				$value .= sprintf(
 					'&nbsp;%1$s&nbsp;%2$s<br>',
-					__( 'by', 'give' ),
-					$this->get_donor( $payment )
+					__('by', 'give'),
+					$this->get_donor($payment)
 				);
 
-				$value .= $this->get_donor_email( $payment );
-				$value .= $this->row_actions( $row_actions );
+				$value .= $this->get_donor_email($payment);
+				$value .= $this->row_actions($row_actions);
 				break;
 
 			case 'amount':
-				$amount = ! empty( $payment->total ) ? $payment->total : 0;
-				$value  = give_donation_amount( $payment, true );
-				$value .= sprintf( '<br><small>%1$s %2$s</small>', __( 'via', 'give' ), give_get_gateway_admin_label( $payment->gateway ) );
+				$amount = ! empty($payment->total) ? $payment->total : 0;
+				$value  = give_donation_amount($payment, true);
+				$value .= sprintf('<br><small>%1$s %2$s</small>', __('via', 'give'), give_get_gateway_admin_label($payment->gateway));
 				break;
 
 			case 'donation_form':
-				$form_title = empty( $payment->form_title ) ? sprintf( __( 'Untitled (#%s)', 'give' ), $payment->form_id ) : $payment->form_title;
-				$value      = '<a href="' . admin_url( 'post.php?post=' . $payment->form_id . '&action=edit' ) . '">' . $form_title . '</a>';
+				$form_title = empty($payment->form_title) ? sprintf(__('Untitled (#%s)', 'give'), $payment->form_id) : $payment->form_title;
+				$value      = '<a href="'.admin_url('post.php?post='.$payment->form_id.'&action=edit').'">'.$form_title.'</a>';
 				$level      = give_get_donation_form_title(
 					$payment,
 					array(
@@ -490,44 +489,44 @@ 
 					)
 				);
 
-				if ( ! empty( $level ) ) {
+				if ( ! empty($level)) {
 					$value .= $level;
 				}
 
 				break;
 
 			case 'date':
-				$date  = strtotime( $payment->date );
-				$value = date_i18n( give_date_format(), $date );
+				$date  = strtotime($payment->date);
+				$value = date_i18n(give_date_format(), $date);
 				break;
 
 			case 'status':
-				$value = $this->get_payment_status( $payment );
+				$value = $this->get_payment_status($payment);
 				break;
 
 
 			case 'details' :
-				if ( current_user_can( 'view_give_payments' ) ) {
-					$value = Give()->tooltips->render_link( array(
-						'label'       => sprintf( __( 'View Donation #%s', 'give' ), $payment->ID ),
+				if (current_user_can('view_give_payments')) {
+					$value = Give()->tooltips->render_link(array(
+						'label'       => sprintf(__('View Donation #%s', 'give'), $payment->ID),
 						'tag_content' => '<span class="dashicons dashicons-visibility"></span>',
 						'link'        => $single_donation_url,
 						'attributes'  => array(
 							'class' => 'give-payment-details-link button button-small',
 						),
-					) );
+					));
 
 					$value = "<div class=\"give-payment-details-link-wrap\">{$value}</div>";
 				}
 				break;
 
 			default:
-				$value = isset( $payment->$column_name ) ? $payment->$column_name : '';
+				$value = isset($payment->$column_name) ? $payment->$column_name : '';
 				break;
 
 		}// End switch().
 
-		return apply_filters( 'give_payments_table_column', $value, $payment->ID, $column_name );
+		return apply_filters('give_payments_table_column', $value, $payment->ID, $column_name);
 	}
 
 	/**
@@ -540,22 +539,22 @@ 
 	 *
 	 * @return string Data shown in the Email column
 	 */
-	public function get_donor_email( $payment ) {
+	public function get_donor_email($payment) {
 
-		$email = give_get_payment_user_email( $payment->ID );
+		$email = give_get_payment_user_email($payment->ID);
 
-		if ( empty( $email ) ) {
-			$email = __( '(unknown)', 'give' );
+		if (empty($email)) {
+			$email = __('(unknown)', 'give');
 		}
 
 
-		$value = Give()->tooltips->render_link( array(
+		$value = Give()->tooltips->render_link(array(
 			'link'        => "mailto:{$email}",
-			'label'       => __( 'Email donor', 'give' ),
+			'label'       => __('Email donor', 'give'),
 			'tag_content' => $email,
-		) );
+		));
 
-		return apply_filters( 'give_payments_table_column', $value, $payment->ID, 'email' );
+		return apply_filters('give_payments_table_column', $value, $payment->ID, 'email');
 	}
 
 	/**
@@ -567,18 +566,18 @@ 
 	 *
 	 * @return array $actions
 	 */
-	function get_row_actions( $payment ) {
+	function get_row_actions($payment) {
 
 		$actions = array();
-		$email   = give_get_payment_user_email( $payment->ID );
+		$email   = give_get_payment_user_email($payment->ID);
 
 		// Add search term string back to base URL.
-		$search_terms = ( isset( $_GET['s'] ) ? trim( $_GET['s'] ) : '' );
-		if ( ! empty( $search_terms ) ) {
-			$this->base_url = add_query_arg( 's', $search_terms, $this->base_url );
+		$search_terms = (isset($_GET['s']) ? trim($_GET['s']) : '');
+		if ( ! empty($search_terms)) {
+			$this->base_url = add_query_arg('s', $search_terms, $this->base_url);
 		}
 
-		if ( give_is_payment_complete( $payment->ID ) && ! empty( $email ) ) {
+		if (give_is_payment_complete($payment->ID) && ! empty($email)) {
 
 			$actions['email_links'] = sprintf(
 				'<a class="resend-single-donation-receipt" href="%1$s" aria-label="%2$s">%3$s</a>', wp_nonce_url(
@@ -588,12 +587,12 @@ 
 						'purchase_id' => $payment->ID,
 					), $this->base_url
 				), 'give_payment_nonce'
-			), sprintf( __( 'Resend Donation %s Receipt', 'give' ), $payment->ID ), __( 'Resend Receipt', 'give' )
+			), sprintf(__('Resend Donation %s Receipt', 'give'), $payment->ID), __('Resend Receipt', 'give')
 			);
 
 		}
 
-		if ( current_user_can( 'view_give_payments' ) ) {
+		if (current_user_can('view_give_payments')) {
 			$actions['delete'] = sprintf(
 				'<a class="delete-single-donation" href="%1$s" aria-label="%2$s">%3$s</a>',
 				wp_nonce_url(
@@ -603,11 +602,11 @@ 
 							'purchase_id' => $payment->ID,
 						), $this->base_url
 					), 'give_donation_nonce'
-				), sprintf( __( 'Delete Donation %s', 'give' ), $payment->ID ), __( 'Delete', 'give' )
+				), sprintf(__('Delete Donation %s', 'give'), $payment->ID), __('Delete', 'give')
 			);
 		}
 
-		return apply_filters( 'give_payment_row_actions', $actions, $payment );
+		return apply_filters('give_payment_row_actions', $actions, $payment);
 	}
 
 
@@ -621,30 +620,30 @@ 
 	 *
 	 * @return string Data shown in the Email column
 	 */
-	function get_payment_status( $payment ) {
+	function get_payment_status($payment) {
 		$value = sprintf(
 			'<div class="give-donation-status status-%1$s"><span class="give-donation-status-icon"></span>&nbsp;%2$s</div>',
 			$payment->status,
-			give_get_payment_status( $payment, true )
+			give_get_payment_status($payment, true)
 		);
 
-		if ( $payment->mode == 'test' ) {
-			$value .= Give()->tooltips->render_span( array(
-				'label'       => __( 'This donation was made in test mode.', 'give' ),
-				'tag_content' => __( 'Test', 'give' ),
+		if ($payment->mode == 'test') {
+			$value .= Give()->tooltips->render_span(array(
+				'label'       => __('This donation was made in test mode.', 'give'),
+				'tag_content' => __('Test', 'give'),
 				'attributes'  => array(
 					'class' => 'give-item-label give-item-label-orange give-test-mode-transactions-label',
 				),
 
 
-			) );
+			));
 		}
 
-		if ( true === $payment->import && true === (bool) apply_filters( 'give_payment_show_importer_label', false ) ) {
+		if (true === $payment->import && true === (bool) apply_filters('give_payment_show_importer_label', false)) {
 			$value .= sprintf(
 				'&nbsp;<span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="%1$s">%2$s</span>',
-				__( 'This donation was imported.', 'give' ),
-				__( 'Import', 'give' )
+				__('This donation was imported.', 'give'),
+				__('Import', 'give')
 			);
 		}
 
@@ -661,8 +660,8 @@ 
 	 *
 	 * @return string Displays a checkbox.
 	 */
-	public function column_cb( $payment ) {
-		return sprintf( '<input type="checkbox" name="%1$s[]" value="%2$s" />', 'payment', $payment->ID );
+	public function column_cb($payment) {
+		return sprintf('<input type="checkbox" name="%1$s[]" value="%2$s" />', 'payment', $payment->ID);
 	}
 
 	/**
@@ -675,8 +674,8 @@ 
 	 *
 	 * @return string Displays a checkbox.
 	 */
-	public function get_payment_id( $payment ) {
-		return '<span class="give-payment-id">' . give_get_payment_number( $payment->ID ) . '</span>';
+	public function get_payment_id($payment) {
+		return '<span class="give-payment-id">'.give_get_payment_number($payment->ID).'</span>';
 	}
 
 	/**
@@ -689,32 +688,32 @@ 
 	 *
 	 * @return string Data shown in the User column
 	 */
-	public function get_donor( $payment ) {
+	public function get_donor($payment) {
 
-		$donor_id           = give_get_payment_donor_id( $payment->ID );
-		$donor_billing_name = give_get_donor_name_by( $payment->ID, 'donation' );
-		$donor_name         = give_get_donor_name_by( $donor_id, 'donor' );
+		$donor_id           = give_get_payment_donor_id($payment->ID);
+		$donor_billing_name = give_get_donor_name_by($payment->ID, 'donation');
+		$donor_name         = give_get_donor_name_by($donor_id, 'donor');
 
 		$value = '';
-		if ( ! empty( $donor_id ) ) {
+		if ( ! empty($donor_id)) {
 
 			// Check whether the donor name and WP_User name is same or not.
-			if ( sanitize_title( $donor_billing_name ) !== sanitize_title( $donor_name ) ) {
-				$value .= $donor_billing_name . ' (';
+			if (sanitize_title($donor_billing_name) !== sanitize_title($donor_name)) {
+				$value .= $donor_billing_name.' (';
 			}
 
-			$value .= '<a href="' . esc_url( admin_url( "edit.php?post_type=give_forms&page=give-donors&view=overview&id=$donor_id" ) ) . '">' . $donor_name . '</a>';
+			$value .= '<a href="'.esc_url(admin_url("edit.php?post_type=give_forms&page=give-donors&view=overview&id=$donor_id")).'">'.$donor_name.'</a>';
 
 			// Check whether the donor name and WP_User name is same or not.
-			if ( sanitize_title( $donor_billing_name ) != sanitize_title( $donor_name ) ) {
+			if (sanitize_title($donor_billing_name) != sanitize_title($donor_name)) {
 				$value .= ')';
 			}
 		} else {
-			$email  = give_get_payment_user_email( $payment->ID );
-			$value .= '<a href="' . esc_url( admin_url( "edit.php?post_type=give_forms&page=give-payment-history&s=$email" ) ) . '">' . __( '(donor missing)', 'give' ) . '</a>';
+			$email  = give_get_payment_user_email($payment->ID);
+			$value .= '<a href="'.esc_url(admin_url("edit.php?post_type=give_forms&page=give-payment-history&s=$email")).'">'.__('(donor missing)', 'give').'</a>';
 		}
 
-		return apply_filters( 'give_payments_table_column', $value, $payment->ID, 'donor' );
+		return apply_filters('give_payments_table_column', $value, $payment->ID, 'donor');
 	}
 
 	/**
@@ -727,20 +726,20 @@ 
 	 */
 	public function get_bulk_actions() {
 		$actions = array(
-			'delete'                 => __( 'Delete', 'give' ),
-			'set-status-publish'     => __( 'Set To Completed', 'give' ),
-			'set-status-pending'     => __( 'Set To Pending', 'give' ),
-			'set-status-processing'  => __( 'Set To Processing', 'give' ),
-			'set-status-refunded'    => __( 'Set To Refunded', 'give' ),
-			'set-status-revoked'     => __( 'Set To Revoked', 'give' ),
-			'set-status-failed'      => __( 'Set To Failed', 'give' ),
-			'set-status-cancelled'   => __( 'Set To Cancelled', 'give' ),
-			'set-status-abandoned'   => __( 'Set To Abandoned', 'give' ),
-			'set-status-preapproval' => __( 'Set To Preapproval', 'give' ),
-			'resend-receipt'         => __( 'Resend Email Receipts', 'give' ),
+			'delete'                 => __('Delete', 'give'),
+			'set-status-publish'     => __('Set To Completed', 'give'),
+			'set-status-pending'     => __('Set To Pending', 'give'),
+			'set-status-processing'  => __('Set To Processing', 'give'),
+			'set-status-refunded'    => __('Set To Refunded', 'give'),
+			'set-status-revoked'     => __('Set To Revoked', 'give'),
+			'set-status-failed'      => __('Set To Failed', 'give'),
+			'set-status-cancelled'   => __('Set To Cancelled', 'give'),
+			'set-status-abandoned'   => __('Set To Abandoned', 'give'),
+			'set-status-preapproval' => __('Set To Preapproval', 'give'),
+			'resend-receipt'         => __('Resend Email Receipts', 'give'),
 		);
 
-		return apply_filters( 'give_payments_table_bulk_actions', $actions );
+		return apply_filters('give_payments_table_bulk_actions', $actions);
 	}
 
 	/**
@@ -752,59 +751,59 @@ 
 	 * @return void
 	 */
 	public function process_bulk_action() {
-		$ids    = isset( $_GET['payment'] ) ? $_GET['payment'] : false;
+		$ids    = isset($_GET['payment']) ? $_GET['payment'] : false;
 		$action = $this->current_action();
 
-		if ( ! is_array( $ids ) ) {
-			$ids = array( $ids );
+		if ( ! is_array($ids)) {
+			$ids = array($ids);
 		}
 
-		if ( empty( $action ) ) {
+		if (empty($action)) {
 			return;
 		}
 
-		foreach ( $ids as $id ) {
+		foreach ($ids as $id) {
 
 			// Detect when a bulk action is being triggered.
-			switch ( $this->current_action() ) {
+			switch ($this->current_action()) {
 
 				case 'delete':
-					give_delete_donation( $id );
+					give_delete_donation($id);
 					break;
 
 				case 'set-status-publish':
-					give_update_payment_status( $id, 'publish' );
+					give_update_payment_status($id, 'publish');
 					break;
 
 				case 'set-status-pending':
-					give_update_payment_status( $id, 'pending' );
+					give_update_payment_status($id, 'pending');
 					break;
 
 				case 'set-status-processing':
-					give_update_payment_status( $id, 'processing' );
+					give_update_payment_status($id, 'processing');
 					break;
 
 				case 'set-status-refunded':
-					give_update_payment_status( $id, 'refunded' );
+					give_update_payment_status($id, 'refunded');
 					break;
 				case 'set-status-revoked':
-					give_update_payment_status( $id, 'revoked' );
+					give_update_payment_status($id, 'revoked');
 					break;
 
 				case 'set-status-failed':
-					give_update_payment_status( $id, 'failed' );
+					give_update_payment_status($id, 'failed');
 					break;
 
 				case 'set-status-cancelled':
-					give_update_payment_status( $id, 'cancelled' );
+					give_update_payment_status($id, 'cancelled');
 					break;
 
 				case 'set-status-abandoned':
-					give_update_payment_status( $id, 'abandoned' );
+					give_update_payment_status($id, 'abandoned');
 					break;
 
 				case 'set-status-preapproval':
-					give_update_payment_status( $id, 'preapproval' );
+					give_update_payment_status($id, 'preapproval');
 					break;
 
 				case 'resend-receipt':
@@ -813,7 +812,7 @@ 
 					 *
 					 * @since 2.0
 					 */
-					do_action( 'give_donation-receipt_email_notification', $id );
+					do_action('give_donation-receipt_email_notification', $id);
 					break;
 			}// End switch().
 
@@ -825,7 +824,7 @@ 
 			 *
 			 * @since 1.7
 			 */
-			do_action( 'give_payments_table_do_bulk_action', $id, $this->current_action() );
+			do_action('give_payments_table_do_bulk_action', $id, $this->current_action());
 		}// End foreach().
 
 	}
@@ -842,32 +841,32 @@ 
 
 		$args = array();
 
-		if ( isset( $_GET['user'] ) ) {
-			$args['user'] = urldecode( $_GET['user'] );
-		} elseif ( isset( $_GET['donor'] ) ) {
-			$args['donor'] = absint( $_GET['donor'] );
-		} elseif ( isset( $_GET['s'] ) ) {
-			$is_user = strpos( $_GET['s'], strtolower( 'user:' ) ) !== false;
-			if ( $is_user ) {
-				$args['user'] = absint( trim( str_replace( 'user:', '', strtolower( $_GET['s'] ) ) ) );
-				unset( $args['s'] );
+		if (isset($_GET['user'])) {
+			$args['user'] = urldecode($_GET['user']);
+		} elseif (isset($_GET['donor'])) {
+			$args['donor'] = absint($_GET['donor']);
+		} elseif (isset($_GET['s'])) {
+			$is_user = strpos($_GET['s'], strtolower('user:')) !== false;
+			if ($is_user) {
+				$args['user'] = absint(trim(str_replace('user:', '', strtolower($_GET['s']))));
+				unset($args['s']);
 			} else {
-				$args['s'] = sanitize_text_field( $_GET['s'] );
+				$args['s'] = sanitize_text_field($_GET['s']);
 			}
 		}
 
-		if ( ! empty( $_GET['start-date'] ) ) {
-			$args['start-date'] = urldecode( $_GET['start-date'] );
+		if ( ! empty($_GET['start-date'])) {
+			$args['start-date'] = urldecode($_GET['start-date']);
 		}
 
-		if ( ! empty( $_GET['end-date'] ) ) {
-			$args['end-date'] = urldecode( $_GET['end-date'] );
+		if ( ! empty($_GET['end-date'])) {
+			$args['end-date'] = urldecode($_GET['end-date']);
 		}
 
-		$args['form_id'] = ! empty( $_GET['form_id'] ) ? absint( $_GET['form_id'] ) : null;
-		$args['gateway'] = ! empty( $_GET['gateway'] ) ? give_clean( $_GET['gateway'] ) : null;
+		$args['form_id'] = ! empty($_GET['form_id']) ? absint($_GET['form_id']) : null;
+		$args['gateway'] = ! empty($_GET['gateway']) ? give_clean($_GET['gateway']) : null;
 
-		$payment_count           = give_count_payments( $args );
+		$payment_count           = give_count_payments($args);
 		$this->complete_count    = $payment_count->publish;
 		$this->pending_count     = $payment_count->pending;
 		$this->processing_count  = $payment_count->processing;
@@ -878,7 +877,7 @@ 
 		$this->abandoned_count   = $payment_count->abandoned;
 		$this->preapproval_count = $payment_count->preapproval;
 
-		foreach ( $payment_count as $count ) {
+		foreach ($payment_count as $count) {
 			$this->total_count += $count;
 		}
 
@@ -896,25 +895,25 @@ 
 	public function payments_data() {
 
 		$per_page   = $this->per_page;
-		$orderby    = isset( $_GET['orderby'] ) ? urldecode( $_GET['orderby'] ) : 'ID';
-		$order      = isset( $_GET['order'] ) ? $_GET['order'] : 'DESC';
-		$user       = isset( $_GET['user'] ) ? $_GET['user'] : null;
-		$donor      = isset( $_GET['donor'] ) ? $_GET['donor'] : null;
-		$status     = isset( $_GET['status'] ) ? $_GET['status'] : give_get_payment_status_keys();
-		$meta_key   = isset( $_GET['meta_key'] ) ? $_GET['meta_key'] : null;
-		$year       = isset( $_GET['year'] ) ? $_GET['year'] : null;
-		$month      = isset( $_GET['m'] ) ? $_GET['m'] : null;
-		$day        = isset( $_GET['day'] ) ? $_GET['day'] : null;
-		$search     = isset( $_GET['s'] ) ? sanitize_text_field( $_GET['s'] ) : null;
-		$start_date = isset( $_GET['start-date'] ) ? sanitize_text_field( $_GET['start-date'] ) : null;
-		$end_date   = isset( $_GET['end-date'] ) ? sanitize_text_field( $_GET['end-date'] ) : $start_date;
-		$form_id    = ! empty( $_GET['form_id'] ) ? absint( $_GET['form_id'] ) : null;
-		$gateway    = ! empty( $_GET['gateway'] ) ? give_clean( $_GET['gateway'] ) : null;
+		$orderby    = isset($_GET['orderby']) ? urldecode($_GET['orderby']) : 'ID';
+		$order      = isset($_GET['order']) ? $_GET['order'] : 'DESC';
+		$user       = isset($_GET['user']) ? $_GET['user'] : null;
+		$donor      = isset($_GET['donor']) ? $_GET['donor'] : null;
+		$status     = isset($_GET['status']) ? $_GET['status'] : give_get_payment_status_keys();
+		$meta_key   = isset($_GET['meta_key']) ? $_GET['meta_key'] : null;
+		$year       = isset($_GET['year']) ? $_GET['year'] : null;
+		$month      = isset($_GET['m']) ? $_GET['m'] : null;
+		$day        = isset($_GET['day']) ? $_GET['day'] : null;
+		$search     = isset($_GET['s']) ? sanitize_text_field($_GET['s']) : null;
+		$start_date = isset($_GET['start-date']) ? sanitize_text_field($_GET['start-date']) : null;
+		$end_date   = isset($_GET['end-date']) ? sanitize_text_field($_GET['end-date']) : $start_date;
+		$form_id    = ! empty($_GET['form_id']) ? absint($_GET['form_id']) : null;
+		$gateway    = ! empty($_GET['gateway']) ? give_clean($_GET['gateway']) : null;
 
 		$args = array(
 			'output'     => 'payments',
 			'number'     => $per_page,
-			'page'       => isset( $_GET['paged'] ) ? $_GET['paged'] : null,
+			'page'       => isset($_GET['paged']) ? $_GET['paged'] : null,
 			'orderby'    => $orderby,
 			'order'      => $order,
 			'user'       => $user,
@@ -931,9 +930,9 @@ 
 			'give_forms' => $form_id,
 		);
 
-		if ( is_string( $search ) && false !== strpos( $search, 'txn:' ) ) {
+		if (is_string($search) && false !== strpos($search, 'txn:')) {
 			$args['search_in_notes'] = true;
-			$args['s']               = trim( str_replace( 'txn:', '', $args['s'] ) );
+			$args['s']               = trim(str_replace('txn:', '', $args['s']));
 		}
 
 		/**
@@ -941,9 +940,9 @@ 
 		 *
 		 * @since 1.8.18
 		 */
-		$args = (array) apply_filters( 'give_payment_table_payments_query', $args );
+		$args = (array) apply_filters('give_payment_table_payments_query', $args);
 
-		$p_query = new Give_Payments_Query( $args );
+		$p_query = new Give_Payments_Query($args);
 
 		return $p_query->get_payments();
 
@@ -964,17 +963,17 @@ 
 	 */
 	public function prepare_items() {
 
-		wp_reset_vars( array( 'action', 'payment', 'orderby', 'order', 's' ) );
+		wp_reset_vars(array('action', 'payment', 'orderby', 'order', 's'));
 
 		$columns  = $this->get_columns();
 		$hidden   = array(); // No hidden columns.
 		$sortable = $this->get_sortable_columns();
 		$data     = $this->payments_data();
-		$status   = isset( $_GET['status'] ) ? $_GET['status'] : 'any';
+		$status   = isset($_GET['status']) ? $_GET['status'] : 'any';
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
-		switch ( $status ) {
+		switch ($status) {
 			case 'publish':
 				$total_items = $this->complete_count;
 				break;
@@ -1007,8 +1006,8 @@ 
 				break;
 			default:
 				// Retrieve the count of the non-default-Give status.
-				$count       = wp_count_posts( 'give_payment' );
-				$total_items = isset( $count->{$status} ) ? $count->{$status} : 0;
+				$count       = wp_count_posts('give_payment');
+				$total_items = isset($count->{$status} ) ? $count->{$status} : 0;
 				break;
 		}
 
@@ -1019,7 +1018,7 @@ 
 		 *
 		 * @since 1.8.19
 		 */
-		$total_items = (int) apply_filters( 'give_payment_table_pagination_total_count', $total_items, $this );
+		$total_items = (int) apply_filters('give_payment_table_pagination_total_count', $total_items, $this);
 
 		$this->set_pagination_args(
 			array(
@@ -1027,7 +1026,7 @@ 
 				// We have to calculate the total number of items.
 				'per_page'    => $this->per_page,
 				// We have to determine how many items to show on a page.
-				'total_pages' => ceil( $total_items / $this->per_page ),
+				'total_pages' => ceil($total_items / $this->per_page),
 				// We have to calculate the total number of pages.
 			)
 		);

includes/admin/emails/class-email-setting-field.php

Spacing +77 added lines, -77 removed lines

@@ -21,33 +21,33 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_setting_fields( Give_Email_Notification $email, $form_id = null ) {
-		$setting_fields = self::get_default_setting_fields( $email, $form_id );
+	public static function get_setting_fields(Give_Email_Notification $email, $form_id = null) {
+		$setting_fields = self::get_default_setting_fields($email, $form_id);
 
 		// Recipient field.
-		if ( Give_Email_Notification_Util::has_recipient_field( $email ) ) {
-			$setting_fields[] = self::get_recipient_setting_field( $email, $form_id );
+		if (Give_Email_Notification_Util::has_recipient_field($email)) {
+			$setting_fields[] = self::get_recipient_setting_field($email, $form_id);
 		}
 
 
 		// Add extra setting field.
-		if ( $extra_setting_field = $email->get_extra_setting_fields( $form_id ) ) {
-			$setting_fields = array_merge( $setting_fields, $extra_setting_field );
+		if ($extra_setting_field = $email->get_extra_setting_fields($form_id)) {
+			$setting_fields = array_merge($setting_fields, $extra_setting_field);
 		}
 
 		// Preview field.
-		if ( Give_Email_Notification_Util::has_preview( $email ) ) {
-			$setting_fields[] = self::get_preview_setting_field( $email, $form_id );
+		if (Give_Email_Notification_Util::has_preview($email)) {
+			$setting_fields[] = self::get_preview_setting_field($email, $form_id);
 		}
 
-		$setting_fields = self::add_section_end( $email, $setting_fields );
+		$setting_fields = self::add_section_end($email, $setting_fields);
 
 		/**
 		 * Filter the email notification settings.
 		 *
 		 * @since 2.0
 		 */
-		return apply_filters( 'give_email_notification_setting_fields', $setting_fields, $email, $form_id );
+		return apply_filters('give_email_notification_setting_fields', $setting_fields, $email, $form_id);
 	}
 
 
@@ -61,11 +61,11 @@ 
 	 *
 	 * @return bool
 	 */
-	public static function has_section_end( $setting ) {
-		$last_field      = end( $setting );
+	public static function has_section_end($setting) {
+		$last_field      = end($setting);
 		$has_section_end = false;
 
-		if ( 'sectionend' === $last_field['type'] ) {
+		if ('sectionend' === $last_field['type']) {
 			$has_section_end = true;
 		}
 
@@ -83,7 +83,7 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_section_start( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_section_start(Give_Email_Notification $email, $form_id = null) {
 		// Add section end field.
 		$setting = array(
 			'id'    => "give_title_email_settings_{$email->config['id']}",
@@ -105,8 +105,8 @@ 
 	 *
 	 * @return array
 	 */
-	public static function add_section_end( Give_Email_Notification $email, $setting ) {
-		if ( ! self::has_section_end( $setting ) ) {
+	public static function add_section_end(Give_Email_Notification $email, $setting) {
+		if ( ! self::has_section_end($setting)) {
 			// Add section end field.
 			$setting[] = array(
 				'id'   => "give_title_email_settings_{$email->config['id']}",
@@ -128,25 +128,25 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_default_setting_fields( Give_Email_Notification $email, $form_id = null ) {
-		$settings[] = self::get_section_start( $email, $form_id );
-		$settings[] = self::get_notification_status_field( $email, $form_id );
+	public static function get_default_setting_fields(Give_Email_Notification $email, $form_id = null) {
+		$settings[] = self::get_section_start($email, $form_id);
+		$settings[] = self::get_notification_status_field($email, $form_id);
 
-		if ( ! Give_Email_Notification_Util::is_notification_status_editable( $email ) ) {
-			if( $form_id || give_is_add_new_form_page() ){
+		if ( ! Give_Email_Notification_Util::is_notification_status_editable($email)) {
+			if ($form_id || give_is_add_new_form_page()) {
 				// Do not allow admin to disable notification on perform basis.
-				unset( $settings[1]['options']['disabled'] );
-			} else{
+				unset($settings[1]['options']['disabled']);
+			} else {
 				// Do not allow admin to edit notification status globally.
-				unset( $settings[1] );
+				unset($settings[1]);
 			}
 		}
 
-		$settings[] = self::get_email_subject_field( $email, $form_id );
-		$settings[] = self::get_email_message_field( $email, $form_id );
+		$settings[] = self::get_email_subject_field($email, $form_id);
+		$settings[] = self::get_email_message_field($email, $form_id);
 
-		if( Give_Email_Notification_Util::is_content_type_editable( $email ) ) {
-			$settings[] = self::get_email_content_type_field( $email, $form_id );
+		if (Give_Email_Notification_Util::is_content_type_editable($email)) {
+			$settings[] = self::get_email_content_type_field($email, $form_id);
 		}
 
 		return $settings;
@@ -163,31 +163,31 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_notification_status_field( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_notification_status_field(Give_Email_Notification $email, $form_id = null) {
 		$option = array(
-			'enabled'  => __( 'Enabled', 'give' ),
-			'disabled' => __( 'Disabled', 'give' ),
+			'enabled'  => __('Enabled', 'give'),
+			'disabled' => __('Disabled', 'give'),
 		);
 
 		$default_value = $email->get_notification_status();
 
 		// Add global options.
-		if ( $form_id || give_is_add_new_form_page() ) {
+		if ($form_id || give_is_add_new_form_page()) {
 			$option = array(
-				'global'   => __( 'Global Options' ),
-				'enabled'  => __( 'Customize', 'give' ),
-				'disabled' => __( 'Disabled', 'give' ),
+				'global'   => __('Global Options'),
+				'enabled'  => __('Customize', 'give'),
+				'disabled' => __('Disabled', 'give'),
 			);
 
 			$default_value = 'global';
 		}
 
-		$description = isset($_GET['page']) && 'give-settings' === $_GET['page'] ? __('Choose whether you want this email enabled or not.', 'give') : sprintf( __( 'Global Options are set <a href="%s">in Give settings</a>. You may override them for this form here.', 'give' ), admin_url( 'edit.php?post_type=give_forms&page=give-settings&tab=emails' ) );
+		$description = isset($_GET['page']) && 'give-settings' === $_GET['page'] ? __('Choose whether you want this email enabled or not.', 'give') : sprintf(__('Global Options are set <a href="%s">in Give settings</a>. You may override them for this form here.', 'give'), admin_url('edit.php?post_type=give_forms&page=give-settings&tab=emails'));
 
 		return array(
-			'name'          => esc_html__( 'Notification', 'give' ),
+			'name'          => esc_html__('Notification', 'give'),
 			'desc'          => $description,
-			'id'            => self::get_prefix( $email, $form_id ) . 'notification',
+			'id'            => self::get_prefix($email, $form_id).'notification',
 			'type'          => 'radio_inline',
 			'default'       => $default_value,
 			'options'       => $option,
@@ -206,11 +206,11 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_email_subject_field( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_email_subject_field(Give_Email_Notification $email, $form_id = null) {
 		return array(
-			'id'      => self::get_prefix( $email, $form_id ) . 'email_subject',
-			'name'    => esc_html__( 'Email Subject', 'give' ),
-			'desc'    => esc_html__( 'Enter the email subject line.', 'give' ),
+			'id'      => self::get_prefix($email, $form_id).'email_subject',
+			'name'    => esc_html__('Email Subject', 'give'),
+			'desc'    => esc_html__('Enter the email subject line.', 'give'),
 			'default' => $email->config['default_email_subject'],
 			'type'    => 'text',
 		);
@@ -227,28 +227,28 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_email_message_field( Give_Email_Notification $email, $form_id = null ) {
-		$desc = esc_html__( 'Enter the email message.', 'give' );
+	public static function get_email_message_field(Give_Email_Notification $email, $form_id = null) {
+		$desc = esc_html__('Enter the email message.', 'give');
 
-		if ( $email_tag_list = $email->get_allowed_email_tags( true ) ) {
+		if ($email_tag_list = $email->get_allowed_email_tags(true)) {
 			$desc = sprintf(
 				'%1$s <br> %2$s: %3$s %4$s',
-				__( 'The email that is sent to users after completing a successful donation. HTML is accepted.', 'give' ),
-				__( 'Available template tags', 'give' ),
+				__('The email that is sent to users after completing a successful donation. HTML is accepted.', 'give'),
+				__('Available template tags', 'give'),
 				$email_tag_list,
 				sprintf(
 					'<br><a href="%1$s" target="_blank">%2$s</a> %3$s',
 					esc_url('http://docs.givewp.com/meta-email-tags'),
-					__( 'See our documentation', 'give' ),
-					__( 'for examples of how to use custom meta email tags to output additional donor or donation information in your Give emails.', 'give' )
+					__('See our documentation', 'give'),
+					__('for examples of how to use custom meta email tags to output additional donor or donation information in your Give emails.', 'give')
 				)
 			);
 
 		}
 
 		return array(
-			'id'      => self::get_prefix( $email, $form_id ) . 'email_message',
-			'name'    => esc_html__( 'Email message', 'give' ),
+			'id'      => self::get_prefix($email, $form_id).'email_message',
+			'name'    => esc_html__('Email message', 'give'),
 			'desc'    => $desc,
 			'type'    => 'wysiwyg',
 			'default' => $email->config['default_email_message'],
@@ -266,15 +266,15 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_email_content_type_field( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_email_content_type_field(Give_Email_Notification $email, $form_id = null) {
 		return array(
-			'id'      => self::get_prefix( $email, $form_id ) . 'email_content_type',
-			'name'    => esc_html__( 'Email Content Type', 'give' ),
-			'desc'    => __( 'Choose email type.', 'give' ),
+			'id'      => self::get_prefix($email, $form_id).'email_content_type',
+			'name'    => esc_html__('Email Content Type', 'give'),
+			'desc'    => __('Choose email type.', 'give'),
 			'type'    => 'select',
 			'options' => array(
-				'text/html'  => Give_Email_Notification_Util::get_formatted_email_type( 'text/html' ),
-				'text/plain' => Give_Email_Notification_Util::get_formatted_email_type( 'text/plain' ),
+				'text/html'  => Give_Email_Notification_Util::get_formatted_email_type('text/html'),
+				'text/plain' => Give_Email_Notification_Util::get_formatted_email_type('text/plain'),
 			),
 			'default' => $email->config['content_type'],
 		);
@@ -293,29 +293,29 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_recipient_setting_field( Give_Email_Notification $email, $form_id = null ) {
-		$recipient =  array(
-			'id'               => self::get_prefix( $email, $form_id ) . 'recipient',
-			'name'             => esc_html__( 'Email Recipients', 'give' ),
-			'desc'             => __( 'Enter the email address(es) that should receive a notification.', 'give' ),
+	public static function get_recipient_setting_field(Give_Email_Notification $email, $form_id = null) {
+		$recipient = array(
+			'id'               => self::get_prefix($email, $form_id).'recipient',
+			'name'             => esc_html__('Email Recipients', 'give'),
+			'desc'             => __('Enter the email address(es) that should receive a notification.', 'give'),
 			'type'             => 'email',
-			'default'          => get_bloginfo( 'admin_email' ),
+			'default'          => get_bloginfo('admin_email'),
 			'repeat'           => true,
-			'repeat_btn_title' => esc_html__( 'Add Recipient', 'give' ),
+			'repeat_btn_title' => esc_html__('Add Recipient', 'give'),
 		);
 
-		if ( $form_id || give_is_add_new_form_page() ) {
-			$recipient['name']    = __( 'Email', 'give' );
+		if ($form_id || give_is_add_new_form_page()) {
+			$recipient['name']    = __('Email', 'give');
 			$recipient['default'] = '';
 			$recipient['id']      = 'email';
-			$recipient['desc']    = __( 'Enter the email address that should receive a notification.', 'give' );
+			$recipient['desc']    = __('Enter the email address that should receive a notification.', 'give');
 
 			$recipient = array(
-				'id'      => self::get_prefix( $email, $form_id ) . 'recipient',
+				'id'      => self::get_prefix($email, $form_id).'recipient',
 				'type'    => 'group',
 				'options' => array(
-					'add_button'    => __( 'Add Email', 'give' ),
-					'header_title'  => __( 'Email Recipient', 'give' ),
+					'add_button'    => __('Add Email', 'give'),
+					'header_title'  => __('Email Recipient', 'give'),
 					'remove_button' => '<span class="dashicons dashicons-no"></span>',
 				),
 				'fields'  => array(
@@ -338,12 +338,12 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_preview_setting_field( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_preview_setting_field(Give_Email_Notification $email, $form_id = null) {
 		return array(
-			'name' => __( 'Preview Email', 'give' ),
-			'desc' => __( 'Click the "Preview Email" button to preview the email in your browser. Click the "Send Test Email" button to send a test email directly to your inbox.',
-				'give' ),
-			'id'   => self::get_prefix( $email, $form_id ) . 'preview_buttons',
+			'name' => __('Preview Email', 'give'),
+			'desc' => __('Click the "Preview Email" button to preview the email in your browser. Click the "Send Test Email" button to send a test email directly to your inbox.',
+				'give'),
+			'id'   => self::get_prefix($email, $form_id).'preview_buttons',
 			'type' => 'email_preview_buttons',
 		);
 	}
@@ -360,10 +360,10 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_prefix( Give_Email_Notification $email, $form_id = null  ) {
+	public static function get_prefix(Give_Email_Notification $email, $form_id = null) {
 		$meta_key = "{$email->config['id']}_";
 
-		if( $form_id || give_is_add_new_form_page() ) {
+		if ($form_id || give_is_add_new_form_page()) {
 			$meta_key = "_give_{$email->config['id']}_";
 		}
 

includes/admin/emails/abstract-email-notification.php

Spacing +156 added lines, -157 removed lines

@@ -12,11 +12,11 @@ 
  */
 
 // Exit if access directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-if ( ! class_exists( 'Give_Email_Notification' ) ) :
+if ( ! class_exists('Give_Email_Notification')) :
 
 	/**
 	 * Give_Email_Notification
@@ -93,14 +93,14 @@ 
 		 *
 		 * @return Give_Email_Notification
 		 */
-		public static function get_instance( $email_notification_id = '' ) {
+		public static function get_instance($email_notification_id = '') {
 			$class = '';
 
-			if ( ! empty( $email_notification_id ) ) {
+			if ( ! empty($email_notification_id)) {
 				/* @var Give_Email_Notification $class */
-				foreach ( self::$singleton as $class ) {
-					if ( $email_notification_id === $class->config['id'] ) {
-						$class = get_class( $class );
+				foreach (self::$singleton as $class) {
+					if ($email_notification_id === $class->config['id']) {
+						$class = get_class($class);
 						break;
 					}
 				}
@@ -108,11 +108,11 @@ 
 				$class = get_called_class();
 			}
 
-			if ( ! empty( $class ) && ( ! array_key_exists( $class, self::$singleton ) || is_null( self::$singleton[ $class ] ) ) ) {
-				self::$singleton[ $class ] = new $class();
+			if ( ! empty($class) && ( ! array_key_exists($class, self::$singleton) || is_null(self::$singleton[$class]))) {
+				self::$singleton[$class] = new $class();
 			}
 
-			return ( isset( self::$singleton[ $class ] ) ? self::$singleton[ $class ] : null );
+			return (isset(self::$singleton[$class]) ? self::$singleton[$class] : null);
 		}
 
 		/**
@@ -123,35 +123,35 @@ 
 		 *
 		 * @param array $config
 		 */
-		public function load( $config ) {
+		public function load($config) {
 			// Set notification configuration.
-			$this->config = wp_parse_args( $config, $this->config );
+			$this->config = wp_parse_args($config, $this->config);
 
 			// Set email preview header status.
 			$this->config['has_preview_header'] = $this->config['has_preview'] && $this->config['has_preview_header'] ? true : false;
 
 			// Set email content type
-			$this->config['content_type'] = empty( $this->config['content_type'] ) || ! in_array( $this->config['content_type'], array(
+			$this->config['content_type'] = empty($this->config['content_type']) || ! in_array($this->config['content_type'], array(
 				'text/html',
 				'text/plain',
-			) )
+			))
 				? Give()->emails->get_content_type()
 				: $this->config['content_type'];
-			$this->config['content_type'] = give_get_option( Give_Email_Setting_Field::get_prefix( $this ) . 'email_content_type', $this->config['content_type'] );
+			$this->config['content_type'] = give_get_option(Give_Email_Setting_Field::get_prefix($this).'email_content_type', $this->config['content_type']);
 
 			// Set email template type.
-			$this->config['email_template'] = empty( $this->config['email_template'] )
-				? give_get_option( 'email_template' )
+			$this->config['email_template'] = empty($this->config['email_template'])
+				? give_get_option('email_template')
 				: $this->config['email_template'];
 
 			// Set recipient group name.
-			$this->config['recipient_group_name'] = empty( $this->config['recipient_group_name'] )
-				? ( ! Give_Email_Notification_Util::has_recipient_field( $this ) ? __( 'Donor', 'give' ) : '' )
+			$this->config['recipient_group_name'] = empty($this->config['recipient_group_name'])
+				? ( ! Give_Email_Notification_Util::has_recipient_field($this) ? __('Donor', 'give') : '')
 				: $this->config['recipient_group_name'];
 
 			// Non notification status editable notice.
-			$this->config['notices']['non-notification-status-editable'] = empty( $this->config['notices']['non-notification-status-editable'] )
-				? __( 'You can not edit notification status from here.', 'give' )
+			$this->config['notices']['non-notification-status-editable'] = empty($this->config['notices']['non-notification-status-editable'])
+				? __('You can not edit notification status from here.', 'give')
 				: $this->config['notices']['non-notification-status-editable'];
 
 			/**
@@ -162,7 +162,7 @@ 
 			 * @param                         array                   Give_Email_Notification::config
 			 * @param Give_Email_Notification $this
 			 */
-			$this->config = apply_filters( 'give_email_api_notification_config', $this->config, $this );
+			$this->config = apply_filters('give_email_api_notification_config', $this->config, $this);
 
 			// Setup filters.
 			$this->setup_filters();
@@ -177,7 +177,7 @@ 
 		 */
 		private function setup_filters() {
 			// Apply filter only for current email notification section.
-			if ( give_get_current_setting_section() === $this->config['id'] ) {
+			if (give_get_current_setting_section() === $this->config['id']) {
 				// Initialize email context for email notification.
 				$this->config['email_tag_context'] = apply_filters(
 					"give_{$this->config['id']}_email_tag_context",
@@ -187,23 +187,23 @@ 
 			}
 
 			// Setup setting fields.
-			if( $this->config['show_on_emails_setting_page'] ) {
-				add_filter( 'give_get_settings_emails', array( $this, 'add_setting_fields' ), 10, 2 );
+			if ($this->config['show_on_emails_setting_page']) {
+				add_filter('give_get_settings_emails', array($this, 'add_setting_fields'), 10, 2);
 			}
 
-			if ( $this->config['form_metabox_setting'] ) {
+			if ($this->config['form_metabox_setting']) {
 				add_filter(
 					'give_email_notification_options_metabox_fields',
-					array( $this, 'add_metabox_setting_field' ),
+					array($this, 'add_metabox_setting_field'),
 					10,
 					2
 				);
 			}
 
-			if( $this->config['has_recipient_field'] ) {
+			if ($this->config['has_recipient_field']) {
 				add_action(
 						"give_save__give_{$this->config['id']}_recipient",
-						array( $this, 'validate_form_recipient_field_value' ),
+						array($this, 'validate_form_recipient_field_value'),
 						10,
 						3
 				);
@@ -241,8 +241,8 @@ 
 		 *
 		 * @return array
 		 */
-		public function add_section( $sections ) {
-			$sections[ $this->config['id'] ] = $this->config['label'];
+		public function add_section($sections) {
+			$sections[$this->config['id']] = $this->config['label'];
 
 			return $sections;
 		}
@@ -256,7 +256,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function hide_section( $hide_section ) {
+		public function hide_section($hide_section) {
 			$hide_section = true;
 
 			return $hide_section;
@@ -272,8 +272,8 @@ 
 		 *
 		 * @return  array
 		 */
-		public function add_setting_fields( $settings ) {
-			if ( $this->config['id'] === give_get_current_setting_section() ) {
+		public function add_setting_fields($settings) {
+			if ($this->config['id'] === give_get_current_setting_section()) {
 				$settings = $this->get_setting_fields();
 			}
 
@@ -291,8 +291,8 @@ 
 		 *
 		 * @return array
 		 */
-		public function get_setting_fields( $form_id = null ) {
-			return Give_Email_Setting_Field::get_setting_fields( $this, $form_id );
+		public function get_setting_fields($form_id = null) {
+			return Give_Email_Setting_Field::get_setting_fields($this, $form_id);
 		}
 
 
@@ -307,13 +307,13 @@ 
 		 *
 		 * @return array
 		 */
-		public function add_metabox_setting_field( $settings, $form_id ) {
+		public function add_metabox_setting_field($settings, $form_id) {
 
-			if( Give_Email_Notification_Util::is_email_notification_active( $this ) ) {
+			if (Give_Email_Notification_Util::is_email_notification_active($this)) {
 				$settings[] = array(
 					'id'     => $this->config['id'],
 					'title'  => $this->config['label'],
-					'fields' => $this->get_setting_fields( $form_id ),
+					'fields' => $this->get_setting_fields($form_id),
 				);
 			}
 
@@ -331,7 +331,7 @@ 
 		 *
 		 * @return array
 		 */
-		public function get_extra_setting_fields( $form_id = null ) {
+		public function get_extra_setting_fields($form_id = null) {
 			return array();
 		}
 
@@ -348,11 +348,11 @@ 
 		 *
 		 * @return string|array
 		 */
-		public function get_recipient( $form_id = null ) {
-			if ( empty( $this->recipient_email ) && $this->config['has_recipient_field'] ) {
+		public function get_recipient($form_id = null) {
+			if (empty($this->recipient_email) && $this->config['has_recipient_field']) {
 				$this->recipient_email = Give_Email_Notification_Util::get_value(
 						$this,
-						Give_Email_Setting_Field::get_prefix( $this, $form_id ) . 'recipient',
+						Give_Email_Setting_Field::get_prefix($this, $form_id).'recipient',
 						$form_id
 				);
 
@@ -363,7 +363,7 @@ 
 				 * @since 1.0
 				 * @deprecated 2.0
 				 */
-				$this->recipient_email = apply_filters( 'give_admin_notice_emails', $this->recipient_email, $this, $form_id );
+				$this->recipient_email = apply_filters('give_admin_notice_emails', $this->recipient_email, $this, $form_id);
 			}
 
 			/**
@@ -393,10 +393,10 @@ 
 		 *
 		 * @return bool
 		 */
-		public function get_notification_status( $form_id = null ) {
-			$notification_status = empty( $form_id )
-				? give_get_option( "{$this->config['id']}_notification", $this->config['notification_status'] )
-				: give_get_meta( $form_id, Give_Email_Setting_Field::get_prefix( $this, $form_id ) . 'notification', true, 'global' );
+		public function get_notification_status($form_id = null) {
+			$notification_status = empty($form_id)
+				? give_get_option("{$this->config['id']}_notification", $this->config['notification_status'])
+				: give_get_meta($form_id, Give_Email_Setting_Field::get_prefix($this, $form_id).'notification', true, 'global');
 
 			/**
 			 * Filter the notification status.
@@ -421,11 +421,11 @@ 
 		 *
 		 * @return string
 		 */
-		function get_email_subject( $form_id = null ) {
+		function get_email_subject($form_id = null) {
 			$subject = wp_strip_all_tags(
 				Give_Email_Notification_Util::get_value(
 					$this,
-					Give_Email_Setting_Field::get_prefix( $this, $form_id ) . 'email_subject',
+					Give_Email_Setting_Field::get_prefix($this, $form_id).'email_subject',
 					$form_id,
 					$this->config['default_email_subject']
 				)
@@ -454,10 +454,10 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_email_message( $form_id = null ) {
+		public function get_email_message($form_id = null) {
 			$message = Give_Email_Notification_Util::get_value(
 				$this,
-				Give_Email_Setting_Field::get_prefix( $this, $form_id ) . 'email_message',
+				Give_Email_Setting_Field::get_prefix($this, $form_id).'email_message',
 				$form_id,
 				$this->config['default_email_message']
 			);
@@ -486,10 +486,10 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_email_content_type( $form_id ) {
+		public function get_email_content_type($form_id) {
 			$content_type = Give_Email_Notification_Util::get_value(
 				$this,
-				Give_Email_Setting_Field::get_prefix( $this, $form_id ) . 'email_content_type',
+				Give_Email_Setting_Field::get_prefix($this, $form_id).'email_content_type',
 				$form_id,
 				$this->config['content_type']
 			);
@@ -517,15 +517,14 @@ 
 		 *
 		 * @return string
 		 */
-		public function get_email_template( $form_id ) {
-			$email_template = give_get_meta( $form_id, '_give_email_template', true );
+		public function get_email_template($form_id) {
+			$email_template = give_get_meta($form_id, '_give_email_template', true);
 			$email_template = Give_Email_Notification_Util::get_value(
 				$this,
-				Give_Email_Setting_Field::get_prefix( $this, $form_id ) .'email_template',
+				Give_Email_Setting_Field::get_prefix($this, $form_id).'email_template',
 				$form_id,
-				! empty( $email_template ) && Give_Email_Notification_Util::can_use_form_email_options( $this, $form_id ) ?
-					$email_template :
-					$this->config['email_template']
+				! empty($email_template) && Give_Email_Notification_Util::can_use_form_email_options($this, $form_id) ?
+					$email_template : $this->config['email_template']
 			);
 
 			/**
@@ -552,34 +551,34 @@ 
 		 *
 		 * @return array
 		 */
-		public function get_allowed_email_tags( $formatted = false ) {
+		public function get_allowed_email_tags($formatted = false) {
 			// Get all email tags.
 			$email_tags = Give()->email_tags->get_tags();
 
 			// Skip if all email template tags context setup exit.
-			if ( $this->config['email_tag_context'] && 'all' !== $this->config['email_tag_context'] ) {
-				if ( is_array( $this->config['email_tag_context'] ) ) {
-					foreach ( $email_tags as $index => $email_tag ) {
-						if ( in_array( $email_tag['context'], $this->config['email_tag_context'] ) ) {
+			if ($this->config['email_tag_context'] && 'all' !== $this->config['email_tag_context']) {
+				if (is_array($this->config['email_tag_context'])) {
+					foreach ($email_tags as $index => $email_tag) {
+						if (in_array($email_tag['context'], $this->config['email_tag_context'])) {
 							continue;
 						}
 
-						unset( $email_tags[ $index ] );
+						unset($email_tags[$index]);
 					}
 				} else {
-					foreach ( $email_tags as $index => $email_tag ) {
-						if ( $this->config['email_tag_context'] === $email_tag['context'] ) {
+					foreach ($email_tags as $index => $email_tag) {
+						if ($this->config['email_tag_context'] === $email_tag['context']) {
 							continue;
 						}
 
-						unset( $email_tags[ $index ] );
+						unset($email_tags[$index]);
 					}
 				}
 			}
 
-			if ( count( $email_tags ) && $formatted ) : ob_start() ?>
+			if (count($email_tags) && $formatted) : ob_start() ?>
 				<ul class="give-email-tags-wrap">
-					<?php foreach ( $email_tags as $email_tag ) : ?>
+					<?php foreach ($email_tags as $email_tag) : ?>
 						<li class="give_<?php echo $email_tag['tag']; ?>_tag">
 							<code>{<?php echo $email_tag['tag']; ?>}</code> - <?php echo $email_tag['description']; ?>
 						</li>
@@ -602,8 +601,8 @@ 
 		 *
 		 * @return array|string
 		 */
-		public function get_preview_email_recipient( $form_id = null ) {
-			$recipients = $this->get_recipient( $form_id );
+		public function get_preview_email_recipient($form_id = null) {
+			$recipients = $this->get_recipient($form_id);
 
 			/**
 			 * Filter the preview email recipients.
@@ -613,7 +612,7 @@ 
 			 * @param string|array            $recipients List of recipients.
 			 * @param Give_Email_Notification $this
 			 */
-			$recipients = apply_filters( 'give_get_preview_email_recipient', $recipients, $this, $form_id );
+			$recipients = apply_filters('give_get_preview_email_recipient', $recipients, $this, $form_id);
 
 			return $recipients;
 		}
@@ -628,13 +627,13 @@ 
 		 *
 		 * @return array
 		 */
-		public function get_email_attachments( $form_id = null ) {
+		public function get_email_attachments($form_id = null) {
 			/**
 			 * Filter the attachment.
 			 *
 			 * @since 2.0
 			 */
-			return apply_filters( "give_{$this->config['id']}_get_email_attachments", array(), $this, $form_id );
+			return apply_filters("give_{$this->config['id']}_get_email_attachments", array(), $this, $form_id);
 		}
 
 
@@ -646,37 +645,37 @@ 
 		 */
 		public function send_preview_email() {
 			// Get form id
-			$form_id = ! empty( $_GET['form_id'] ) ? absint( $_GET['form_id'] ) : null;
+			$form_id = ! empty($_GET['form_id']) ? absint($_GET['form_id']) : null;
 
 			// setup email data.
 			$this->setup_email_data();
 
 			$attachments  = $this->get_email_attachments();
-			$message      = $this->preview_email_template_tags( $this->get_email_message( $form_id ) );
-			$subject      = $this->preview_email_template_tags( $this->get_email_subject( $form_id ) );
-			$content_type = $this->get_email_content_type( $form_id );
+			$message      = $this->preview_email_template_tags($this->get_email_message($form_id));
+			$subject      = $this->preview_email_template_tags($this->get_email_subject($form_id));
+			$content_type = $this->get_email_content_type($form_id);
 
 			// Setup email content type.
-			Give()->emails->__set( 'content_type', $content_type );
-			Give()->emails->__set( 'html', true );
+			Give()->emails->__set('content_type', $content_type);
+			Give()->emails->__set('html', true);
 
 			// Setup email template
-			Give()->emails->__set( 'template', $this->get_email_template( $form_id ) );
+			Give()->emails->__set('template', $this->get_email_template($form_id));
 
 			// Format plain content type email.
-			if ( 'text/plain' === $content_type ) {
-				Give()->emails->__set( 'html', false );
-				Give()->emails->__set( 'template', 'none' );
-				$message = strip_tags( $message );
+			if ('text/plain' === $content_type) {
+				Give()->emails->__set('html', false);
+				Give()->emails->__set('template', 'none');
+				$message = strip_tags($message);
 			}
 
-			if ( Give_Email_Notification_Util::can_use_form_email_options( $this, $form_id ) ) {
+			if (Give_Email_Notification_Util::can_use_form_email_options($this, $form_id)) {
 				Give()->emails->form_id      = $form_id;
-				Give()->emails->from_name    = give_get_meta( $form_id, '_give_from_name', true );
-				Give()->emails->from_address = give_get_meta( $form_id, '_give_from_email', true );
+				Give()->emails->from_name    = give_get_meta($form_id, '_give_from_name', true);
+				Give()->emails->from_address = give_get_meta($form_id, '_give_from_email', true);
 			}
 
-			return Give()->emails->send( $this->get_preview_email_recipient( $form_id ), $subject, $message, $attachments );
+			return Give()->emails->send($this->get_preview_email_recipient($form_id), $subject, $message, $attachments);
 		}
 
 
@@ -697,7 +696,7 @@ 
 		 *
 		 * @return bool
 		 */
-		public function send_email_notification( $email_tag_args = array() ) {
+		public function send_email_notification($email_tag_args = array()) {
 			// Add email content type email tags.
 			$email_tag_args['email_content_type'] = $this->config['content_type'];
 
@@ -706,16 +705,16 @@ 
 			 *
 			 * @since 2.0
 			 */
-			$email_tag_args = apply_filters( "give_{$this->config['id']}_email_tag_args", $email_tag_args, $this );
+			$email_tag_args = apply_filters("give_{$this->config['id']}_email_tag_args", $email_tag_args, $this);
 
 			// Get form id.
-			$form_id = ! empty( $email_tag_args['form_id'] )
-				? absint( $email_tag_args['form_id'] )
-				: ( ! empty( $email_tag_args['payment_id'] ) ? give_get_payment_form_id( $email_tag_args['payment_id'] ) : null );
+			$form_id = ! empty($email_tag_args['form_id'])
+				? absint($email_tag_args['form_id'])
+				: ( ! empty($email_tag_args['payment_id']) ? give_get_payment_form_id($email_tag_args['payment_id']) : null);
 
 
 			// Do not send email if notification is disable.
-			if ( ! Give_Email_Notification_Util::is_email_notification_active( $this, $form_id ) ) {
+			if ( ! Give_Email_Notification_Util::is_email_notification_active($this, $form_id)) {
 				return false;
 			}
 
@@ -724,41 +723,41 @@ 
 			 *
 			 * @since 2.0
 			 */
-			do_action( "give_{$this->config['id']}_email_send_before", $this, $form_id );
+			do_action("give_{$this->config['id']}_email_send_before", $this, $form_id);
 
 			$attachments  = $this->get_email_attachments();
-			$message      = give_do_email_tags( $this->get_email_message( $form_id ), $email_tag_args );
-			$subject      = give_do_email_tags( $this->get_email_subject( $form_id ), $email_tag_args );
-			$content_type = $this->get_email_content_type( $form_id );
+			$message      = give_do_email_tags($this->get_email_message($form_id), $email_tag_args);
+			$subject      = give_do_email_tags($this->get_email_subject($form_id), $email_tag_args);
+			$content_type = $this->get_email_content_type($form_id);
 
 			// Setup email content type.
-			Give()->emails->__set( 'content_type', $content_type );
-			Give()->emails->__set( 'html', true );
+			Give()->emails->__set('content_type', $content_type);
+			Give()->emails->__set('html', true);
 
 			// Set email template.
-			Give()->emails->__set( 'template', $this->get_email_template( $form_id ) );
+			Give()->emails->__set('template', $this->get_email_template($form_id));
 
-			if ( 'text/plain' === $content_type ) {
-				Give()->emails->__set( 'html', false );
-				Give()->emails->__set( 'template', 'none' );
-				$message = strip_tags( $message );
+			if ('text/plain' === $content_type) {
+				Give()->emails->__set('html', false);
+				Give()->emails->__set('template', 'none');
+				$message = strip_tags($message);
 			}
 
-			if ( Give_Email_Notification_Util::can_use_form_email_options( $this, $form_id ) ) {
+			if (Give_Email_Notification_Util::can_use_form_email_options($this, $form_id)) {
 				Give()->emails->form_id      = $form_id;
-				Give()->emails->from_name    = give_get_meta( $form_id, '_give_from_name', true );
-				Give()->emails->from_address = give_get_meta( $form_id, '_give_from_email', true );
+				Give()->emails->from_name    = give_get_meta($form_id, '_give_from_name', true);
+				Give()->emails->from_address = give_get_meta($form_id, '_give_from_email', true);
 			}
 
 			// Send email.
-			$email_status = Give()->emails->send( $this->get_recipient( $form_id ), $subject, $message, $attachments );
+			$email_status = Give()->emails->send($this->get_recipient($form_id), $subject, $message, $attachments);
 
 			/**
 			 * Fire action after after email send.
 			 *
 			 * @since 2.0
 			 */
-			do_action( "give_{$this->config['id']}_email_send_after", $email_status, $this, $form_id );
+			do_action("give_{$this->config['id']}_email_send_after", $email_status, $this, $form_id);
 
 			return $email_status;
 		}
@@ -773,67 +772,67 @@ 
 		 *
 		 * @return string
 		 */
-		public function preview_email_template_tags( $message ) {
+		public function preview_email_template_tags($message) {
 			// Set Payment.
-			$payment_id = give_check_variable( give_clean( $_GET ), 'isset_empty', 0, 'preview_id' );
-			$payment    = $payment_id ? new Give_Payment( $payment_id ) : new stdClass();
+			$payment_id = give_check_variable(give_clean($_GET), 'isset_empty', 0, 'preview_id');
+			$payment    = $payment_id ? new Give_Payment($payment_id) : new stdClass();
 
 			// Set donor.
 			$user_id = $payment_id
 				? $payment->user_id
-				: give_check_variable( give_clean( $_GET ), 'isset_empty', 0, 'user_id' );
+				: give_check_variable(give_clean($_GET), 'isset_empty', 0, 'user_id');
 			$user_id = $user_id ? $user_id : wp_get_current_user()->ID;
 
 			// Set receipt.
-			$receipt_id = strtolower( md5( uniqid() ) );
+			$receipt_id = strtolower(md5(uniqid()));
 
-			$receipt_link_url = esc_url( add_query_arg( array(
+			$receipt_link_url = esc_url(add_query_arg(array(
 				'payment_key' => $receipt_id,
-			), give_get_history_page_uri() ) );
+			), give_get_history_page_uri()));
 
 			$receipt_link = sprintf(
 				'<a href="%1$s">%2$s</a>',
 				$receipt_link_url,
-				esc_html__( 'View the receipt in your browser &raquo;', 'give' )
+				esc_html__('View the receipt in your browser &raquo;', 'give')
 			);
 
 			// Set default values for tags.
 			$this->config['preview_email_tags_values'] = wp_parse_args(
 				$this->config['preview_email_tags_values'],
 				array(
-					'name'              => give_email_tag_first_name( array(
+					'name'              => give_email_tag_first_name(array(
 						'payment_id' => $payment_id,
 						'user_id'    => $user_id,
-					) ),
-					'fullname'          => give_email_tag_fullname( array(
+					)),
+					'fullname'          => give_email_tag_fullname(array(
 						'payment_id' => $payment_id,
 						'user_id'    => $user_id,
-					) ),
-					'username'          => give_email_tag_username( array(
+					)),
+					'username'          => give_email_tag_username(array(
 						'payment_id' => $payment_id,
 						'user_id'    => $user_id,
-					) ),
-					'user_email'        => give_email_tag_user_email( array(
+					)),
+					'user_email'        => give_email_tag_user_email(array(
 						'payment_id' => $payment_id,
 						'user_id'    => $user_id,
-					) ),
-					'payment_total'     => $payment_id ? give_email_tag_payment_total( array( 'payment_id' => $payment_id ) ) : give_currency_filter( '10.50' ),
-					'amount'            => $payment_id ? give_email_tag_amount( array( 'payment_id' => $payment_id ) ) : give_currency_filter( '10.50' ),
-					'price'             => $payment_id ? give_email_tag_price( array( 'payment_id' => $payment_id ) ) : give_currency_filter( '10.50' ),
-					'payment_method'    => $payment_id ? give_email_tag_payment_method( array( 'payment_id' => $payment_id ) ) : __( 'PayPal', 'give' ),
+					)),
+					'payment_total'     => $payment_id ? give_email_tag_payment_total(array('payment_id' => $payment_id)) : give_currency_filter('10.50'),
+					'amount'            => $payment_id ? give_email_tag_amount(array('payment_id' => $payment_id)) : give_currency_filter('10.50'),
+					'price'             => $payment_id ? give_email_tag_price(array('payment_id' => $payment_id)) : give_currency_filter('10.50'),
+					'payment_method'    => $payment_id ? give_email_tag_payment_method(array('payment_id' => $payment_id)) : __('PayPal', 'give'),
 					'receipt_id'        => $receipt_id,
-					'payment_id'        => $payment_id ? $payment_id : rand( 2000, 2050 ),
+					'payment_id'        => $payment_id ? $payment_id : rand(2000, 2050),
 					'receipt_link_url'  => $receipt_link_url,
 					'receipt_link'      => $receipt_link,
-					'date'              => $payment_id ? date( give_date_format(), strtotime( $payment->date ) ) : date( give_date_format(), current_time( 'timestamp' ) ),
-					'donation'          => $payment_id ? give_email_tag_donation( array( 'payment_id' => $payment_id ) ) : esc_html__( 'Sample Donation Form Title', 'give' ),
-					'form_title'        => $payment_id ? give_email_tag_form_title( array( 'payment_id' => $payment_id ) ) : esc_html__( 'Sample Donation Form Title - Sample Donation Level', 'give' ),
-					'sitename'          => $payment_id ? give_email_tag_sitename( array( 'payment_id' => $payment_id ) ) : get_bloginfo( 'name' ),
+					'date'              => $payment_id ? date(give_date_format(), strtotime($payment->date)) : date(give_date_format(), current_time('timestamp')),
+					'donation'          => $payment_id ? give_email_tag_donation(array('payment_id' => $payment_id)) : esc_html__('Sample Donation Form Title', 'give'),
+					'form_title'        => $payment_id ? give_email_tag_form_title(array('payment_id' => $payment_id)) : esc_html__('Sample Donation Form Title - Sample Donation Level', 'give'),
+					'sitename'          => $payment_id ? give_email_tag_sitename(array('payment_id' => $payment_id)) : get_bloginfo('name'),
 					'pdf_receipt'       => sprintf(
 						'<a href="#">%s</a>',
-						__( 'Download Receipt', 'give' )
+						__('Download Receipt', 'give')
 					),
-					'billing_address'   => $payment_id ? give_email_tag_billing_address( array( 'payment_id' => $payment_id ) ) : '',
+					'billing_address'   => $payment_id ? give_email_tag_billing_address(array('payment_id' => $payment_id)) : '',
 					'email_access_link' => sprintf(
 						'<a href="%1$s">%2$s</a>',
 						add_query_arg(
@@ -842,20 +841,20 @@ 
 							),
 							give_get_history_page_uri()
 						),
-						__( 'View your donation history &raquo;', 'give' )
+						__('View your donation history &raquo;', 'give')
 					),
-					'reset_password_link' => $user_id ? give_email_tag_reset_password_link( array( 'user_id' => $user_id ), $payment_id ) : '',
+					'reset_password_link' => $user_id ? give_email_tag_reset_password_link(array('user_id' => $user_id), $payment_id) : '',
 				)
 			);
 
 			// Decode tags.
-			foreach ( $this->config['preview_email_tags_values'] as $preview_tag => $value ) {
-				if ( isset( $this->config['preview_email_tags_values'][ $preview_tag ] ) ) {
-					$message = str_replace( "{{$preview_tag}}", $this->config['preview_email_tags_values'][ $preview_tag ], $message );
+			foreach ($this->config['preview_email_tags_values'] as $preview_tag => $value) {
+				if (isset($this->config['preview_email_tags_values'][$preview_tag])) {
+					$message = str_replace("{{$preview_tag}}", $this->config['preview_email_tags_values'][$preview_tag], $message);
 				}
 			}
 
-			return apply_filters( 'give_email_preview_template_tags', $message );
+			return apply_filters('give_email_preview_template_tags', $message);
 		}
 
 		/**
@@ -880,17 +879,17 @@ 
 		 * @param $post_id
 		 *
 		 */
-		public function validate_form_recipient_field_value( $form_meta_key, $form_meta_value, $post_id ) {
+		public function validate_form_recipient_field_value($form_meta_key, $form_meta_value, $post_id) {
 			// Get valid emails.
-			$new_form_meta_value = array_filter( $form_meta_value, function ( $value ) {
-				return ! empty( $value['email'] ) && is_email( $value['email'] );
+			$new_form_meta_value = array_filter($form_meta_value, function($value) {
+				return ! empty($value['email']) && is_email($value['email']);
 			} );
 
 			// Remove duplicate emails from array.
 			$email_arr = array();
-			foreach ( $new_form_meta_value as $index => $email ) {
-				if( in_array( $email['email'], $email_arr  ) ) {
-					unset( $new_form_meta_value[$index] );
+			foreach ($new_form_meta_value as $index => $email) {
+				if (in_array($email['email'], $email_arr)) {
+					unset($new_form_meta_value[$index]);
 					continue;
 				}
 
@@ -899,25 +898,25 @@ 
 
 			$update = false;
 
-			if ( empty( $new_form_meta_value ) ) {
+			if (empty($new_form_meta_value)) {
 				// Set default recipient.
 				$form_meta_value = array(
 					array(
-						'email' => get_bloginfo( 'admin_email' )
+						'email' => get_bloginfo('admin_email')
 					),
 				);
 
 				$update = true;
 
-			} elseif ( count( $new_form_meta_value ) !== count( $form_meta_value ) ) {
+			} elseif (count($new_form_meta_value) !== count($form_meta_value)) {
 				// Filter recipient emails.
 				$form_meta_value = $new_form_meta_value;
 
 				$update = true;
 			}
 
-			if( $update ) {
-				give_update_meta( $post_id, $form_meta_key, $form_meta_value );
+			if ($update) {
+				give_update_meta($post_id, $form_meta_key, $form_meta_value);
 			}
 		}
 	}

includes/admin/shortcodes/abstract-shortcode-generator.php

Spacing +64 added lines, -64 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -62,11 +62,11 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __construct( $shortcode ) {
+	public function __construct($shortcode) {
 
 		$this->shortcode_tag = $shortcode;
 
-		add_action( 'admin_init', array( $this, 'init' ) );
+		add_action('admin_init', array($this, 'init'));
 
 	}
 
@@ -77,9 +77,9 @@ 
 	 */
 	public function init() {
 
-		if ( $this->shortcode_tag ) {
+		if ($this->shortcode_tag) {
 
-			$this->self = get_class( $this );
+			$this->self = get_class($this);
 
 			$this->errors   = array();
 			$this->required = array();
@@ -88,18 +88,18 @@ 
 			$fields = $this->get_fields();
 
 			$defaults = array(
-				'btn_close' => esc_html__( 'Close', 'give' ),
-				'btn_okay'  => esc_html__( 'Insert Shortcode', 'give' ),
+				'btn_close' => esc_html__('Close', 'give'),
+				'btn_okay'  => esc_html__('Insert Shortcode', 'give'),
 				'errors'    => $this->errors,
 				'fields'    => $fields,
-				'label'     => '[' . $this->shortcode_tag . ']',
+				'label'     => '['.$this->shortcode_tag.']',
 				'required'  => $this->required,
-				'title'     => esc_html__( 'Insert Shortcode', 'give' ),
+				'title'     => esc_html__('Insert Shortcode', 'give'),
 			);
 
-			if ( user_can_richedit() ) {
+			if (user_can_richedit()) {
 
-				Give_Shortcode_Button::$shortcodes[ $this->shortcode_tag ] = wp_parse_args( $this->shortcode, $defaults );
+				Give_Shortcode_Button::$shortcodes[$this->shortcode_tag] = wp_parse_args($this->shortcode, $defaults);
 
 			}
 		}
@@ -128,13 +128,13 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_fields( $defined_fields ) {
+	protected function generate_fields($defined_fields) {
 
 		$fields = array();
 
-		if ( is_array( $defined_fields ) ) {
+		if (is_array($defined_fields)) {
 
-			foreach ( $defined_fields as $field ) {
+			foreach ($defined_fields as $field) {
 
 				$defaults = array(
 					'label'       => false,
@@ -145,14 +145,14 @@ 
 					'type'        => '',
 				);
 
-				$field  = wp_parse_args( (array) $field, $defaults );
-				$method = 'generate_' . strtolower( $field['type'] );
+				$field  = wp_parse_args((array) $field, $defaults);
+				$method = 'generate_'.strtolower($field['type']);
 
-				if ( method_exists( $this, $method ) ) {
+				if (method_exists($this, $method)) {
 
-					$field = call_user_func( array( $this, $method ), $field );
+					$field = call_user_func(array($this, $method), $field);
 
-					if ( $field ) {
+					if ($field) {
 						$fields[] = $field;
 					}
 				}
@@ -172,23 +172,23 @@ 
 	protected function get_fields() {
 
 		$defined_fields   = $this->define_fields();
-		$generated_fields = $this->generate_fields( $defined_fields );
+		$generated_fields = $this->generate_fields($defined_fields);
 
 		$errors = array();
 
-		if ( ! empty( $this->errors ) ) {
-			foreach ( $this->required as $name => $alert ) {
+		if ( ! empty($this->errors)) {
+			foreach ($this->required as $name => $alert) {
 				// Using WordPress function in place of array_column wp_list_pluck as it support older version as well.
-				if ( false === array_search( $name, give_list_pluck( $generated_fields, 'name' ) ) ) {
+				if (false === array_search($name, give_list_pluck($generated_fields, 'name'))) {
 
-					$errors[] = $this->errors[ $name ];
+					$errors[] = $this->errors[$name];
 				}
 			}
 
 			$this->errors = $errors;
 		}
 
-		if ( ! empty( $errors ) ) {
+		if ( ! empty($errors)) {
 
 			return $errors;
 		}
@@ -205,9 +205,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_container( $field ) {
+	protected function generate_container($field) {
 
-		if ( array_key_exists( 'html', $field ) ) {
+		if (array_key_exists('html', $field)) {
 
 			return array(
 				'type' => $field['type'],
@@ -227,9 +227,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_listbox( $field ) {
+	protected function generate_listbox($field) {
 
-		$listbox = shortcode_atts( array(
+		$listbox = shortcode_atts(array(
 			'label'    => '',
 			'minWidth' => '',
 			'name'     => false,
@@ -237,27 +237,27 @@ 
 			'type'     => '',
 			'value'    => '',
 			'classes'  => ''
-		), $field );
+		), $field);
 
-		if ( $this->validate( $field ) ) {
+		if ($this->validate($field)) {
 
 			$new_listbox = array();
 
-			foreach ( $listbox as $key => $value ) {
+			foreach ($listbox as $key => $value) {
 
-				if ( $key == 'value' && empty( $value ) ) {
-					$new_listbox[ $key ] = $listbox['name'];
-				} else if ( $value ) {
-					$new_listbox[ $key ] = $value;
+				if ($key == 'value' && empty($value)) {
+					$new_listbox[$key] = $listbox['name'];
+				} else if ($value) {
+					$new_listbox[$key] = $value;
 				}
 			}
 
 			// do not reindex array!
 			$field['options'] = array(
-				                    '' => ( $field['placeholder'] ? $field['placeholder'] : esc_attr__( '- Select -', 'give' ) ),
+				                    '' => ($field['placeholder'] ? $field['placeholder'] : esc_attr__('- Select -', 'give')),
 			                    ) + $field['options'];
 
-			foreach ( $field['options'] as $value => $text ) {
+			foreach ($field['options'] as $value => $text) {
 				$new_listbox['values'][] = array(
 					'text'  => $text,
 					'value' => $value,
@@ -279,7 +279,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_post( $field ) {
+	protected function generate_post($field) {
 
 		$args = array(
 			'post_type'      => 'post',
@@ -289,26 +289,26 @@ 
 			'posts_per_page' => 500,
 		);
 
-		$args    = wp_parse_args( (array) $field['query_args'], $args );
-		$posts   = new WP_Query( $args );
+		$args    = wp_parse_args((array) $field['query_args'], $args);
+		$posts   = new WP_Query($args);
 		$options = array();
 
-		if ( $posts->have_posts() ) {
-			while ( $posts->have_posts() ) {
+		if ($posts->have_posts()) {
+			while ($posts->have_posts()) {
 				$posts->the_post();
 				$post_title = get_the_title();
 				$post_id = get_the_ID();
-				$options[ absint( $post_id ) ] = ( empty( $post_title ) ? sprintf( __( 'Untitled (#%s)', 'give' ), $post_id ) : $post_title );
+				$options[absint($post_id)] = (empty($post_title) ? sprintf(__('Untitled (#%s)', 'give'), $post_id) : $post_title);
 			}
 
 			$field['type']    = 'listbox';
 			$field['options'] = $options;
 
-			return $this->generate_listbox( $field );
+			return $this->generate_listbox($field);
 		}
 
 		// perform validation here before returning false
-		$this->validate( $field );
+		$this->validate($field);
 
 		return false;
 	}
@@ -322,9 +322,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_textbox( $field ) {
+	protected function generate_textbox($field) {
 
-		$textbox = shortcode_atts( array(
+		$textbox = shortcode_atts(array(
 			'label'     => '',
 			'maxLength' => '',
 			'minHeight' => '',
@@ -335,10 +335,10 @@ 
 			'type'      => '',
 			'value'     => '',
 			'classes'   => ''
-		), $field );
+		), $field);
 
-		if ( $this->validate( $field ) ) {
-			return array_filter( $textbox, array( $this, 'return_textbox_value' ) );
+		if ($this->validate($field)) {
+			return array_filter($textbox, array($this, 'return_textbox_value'));
 		}
 
 		return false;
@@ -351,7 +351,7 @@ 
 	 *
 	 * @return bool
 	 */
-	function return_textbox_value( $value ) {
+	function return_textbox_value($value) {
 		return $value !== '';
 	}
 
@@ -367,9 +367,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function validate( $field ) {
+	protected function validate($field) {
 
-		extract( shortcode_atts(
+		extract(shortcode_atts(
 				array(
 					'name'     => false,
 					'required' => false,
@@ -377,36 +377,36 @@ 
 				), $field )
 		);
 
-		if ( $name ) {
+		if ($name) {
 
-			if ( isset( $required['error'] ) ) {
+			if (isset($required['error'])) {
 
 				$error = array(
 					'type' => 'container',
 					'html' => $required['error'],
 				);
 
-				$this->errors[ $name ] = $this->generate_container( $error );
+				$this->errors[$name] = $this->generate_container($error);
 			}
 
-			if ( ! ! $required || is_array( $required ) ) {
+			if ( ! ! $required || is_array($required)) {
 
-				$alert = esc_html__( 'Some of the shortcode options are required.', 'give' );
+				$alert = esc_html__('Some of the shortcode options are required.', 'give');
 
-				if ( isset( $required['alert'] ) ) {
+				if (isset($required['alert'])) {
 
 					$alert = $required['alert'];
 
-				} else if ( ! empty( $label ) ) {
+				} else if ( ! empty($label)) {
 
 					$alert = sprintf(
 					/* translators: %s: option label */
-						esc_html__( 'The "%s" option is required.', 'give' ),
-						str_replace( ':', '', $label )
+						esc_html__('The "%s" option is required.', 'give'),
+						str_replace(':', '', $label)
 					);
 				}
 
-				$this->required[ $name ] = $alert;
+				$this->required[$name] = $alert;
 			}
 
 			return true;

includes/admin/dashboard-widgets.php

Spacing +32 added lines, -32 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,12 +21,12 @@ 
  * @return void
  */
 function give_register_dashboard_widgets() {
-	if ( current_user_can( apply_filters( 'give_dashboard_stats_cap', 'view_give_reports' ) ) ) {
-		wp_add_dashboard_widget( 'give_dashboard_sales', __( 'Give: Donation Statistics', 'give' ), 'give_dashboard_sales_widget' );
+	if (current_user_can(apply_filters('give_dashboard_stats_cap', 'view_give_reports'))) {
+		wp_add_dashboard_widget('give_dashboard_sales', __('Give: Donation Statistics', 'give'), 'give_dashboard_sales_widget');
 	}
 }
 
-add_action( 'wp_dashboard_setup', 'give_register_dashboard_widgets', 10 );
+add_action('wp_dashboard_setup', 'give_register_dashboard_widgets', 10);
 
 /**
  * Sales Summary Dashboard Widget
@@ -38,7 +38,7 @@ 
  */
 function give_dashboard_sales_widget() {
 
-	if ( ! current_user_can( apply_filters( 'give_dashboard_stats_cap', 'view_give_reports' ) ) ) {
+	if ( ! current_user_can(apply_filters('give_dashboard_stats_cap', 'view_give_reports'))) {
 		return;
 	}
 	$stats = new Give_Payment_Stats(); ?>
@@ -46,27 +46,27 @@ 
 	<div class="give-dashboard-widget">
 
 		<div class="give-dashboard-today give-clearfix">
-			<h3 class="give-dashboard-date-today"><?php echo date_i18n( _x( 'F j, Y', 'dashboard widget', 'give' ) ); ?></h3>
+			<h3 class="give-dashboard-date-today"><?php echo date_i18n(_x('F j, Y', 'dashboard widget', 'give')); ?></h3>
 
 			<p class="give-dashboard-happy-day"><?php
 				printf(
 				/* translators: %s: day of the week */
-					__( 'Happy %s!', 'give' ),
-					date_i18n( 'l', current_time( 'timestamp' ) )
+					__('Happy %s!', 'give'),
+					date_i18n('l', current_time('timestamp'))
 				);
 			?></p>
 
 			<p class="give-dashboard-today-earnings"><?php
-				$earnings_today = $stats->get_earnings( 0, 'today', false );
-				echo give_currency_filter( give_format_amount( $earnings_today, array( 'sanitize' => false ) ) );
+				$earnings_today = $stats->get_earnings(0, 'today', false);
+				echo give_currency_filter(give_format_amount($earnings_today, array('sanitize' => false)));
 			?></p>
 
 			<p class="give-donations-today"><?php
-				$donations_today = $stats->get_sales( 0, 'today', false );
+				$donations_today = $stats->get_sales(0, 'today', false);
 				printf(
 					/* translators: %s: daily donation count */
-					__( '%s donations today', 'give' ),
-					give_format_amount( $donations_today, array( 'decimal' => false, 'sanitize' => false ) )
+					__('%s donations today', 'give'),
+					give_format_amount($donations_today, array('decimal' => false, 'sanitize' => false))
 				);
 			?></p>
 
@@ -76,34 +76,34 @@ 
 		<table class="give-table-stats">
 			<thead style="display: none;">
 			<tr>
-				<th><?php _e( 'This Week', 'give' ); ?></th>
-				<th><?php _e( 'This Month', 'give' ); ?></th>
-				<th><?php _e( 'Past 30 Days', 'give' ); ?></th>
+				<th><?php _e('This Week', 'give'); ?></th>
+				<th><?php _e('This Month', 'give'); ?></th>
+				<th><?php _e('Past 30 Days', 'give'); ?></th>
 			</tr>
 			</thead>
 			<tbody>
 			<tr id="give-table-stats-tr-1">
 				<td>
-					<p class="give-dashboard-stat-total"><?php echo give_currency_filter( give_format_amount( $stats->get_earnings( 0, 'this_week' ), array( 'sanitize' => false ) ) ); ?></p>
+					<p class="give-dashboard-stat-total"><?php echo give_currency_filter(give_format_amount($stats->get_earnings(0, 'this_week'), array('sanitize' => false))); ?></p>
 
-					<p class="give-dashboard-stat-total-label"><?php _e( 'This Week', 'give' ); ?></p>
+					<p class="give-dashboard-stat-total-label"><?php _e('This Week', 'give'); ?></p>
 				</td>
 				<td>
-					<p class="give-dashboard-stat-total"><?php echo give_currency_filter( give_format_amount( $stats->get_earnings( 0, 'this_month' ), array( 'sanitize' => false ) ) ); ?></p>
+					<p class="give-dashboard-stat-total"><?php echo give_currency_filter(give_format_amount($stats->get_earnings(0, 'this_month'), array('sanitize' => false))); ?></p>
 
-					<p class="give-dashboard-stat-total-label"><?php _e( 'This Month', 'give' ); ?></p>
+					<p class="give-dashboard-stat-total-label"><?php _e('This Month', 'give'); ?></p>
 				</td>
 			</tr>
 			<tr id="give-table-stats-tr-2">
 				<td>
-					<p class="give-dashboard-stat-total"><?php echo give_currency_filter( give_format_amount( $stats->get_earnings( 0, 'last_month' ), array( 'sanitize' => false ) ) ) ?></p>
+					<p class="give-dashboard-stat-total"><?php echo give_currency_filter(give_format_amount($stats->get_earnings(0, 'last_month'), array('sanitize' => false))) ?></p>
 
-					<p class="give-dashboard-stat-total-label"><?php _e( 'Last Month', 'give' ); ?></p>
+					<p class="give-dashboard-stat-total-label"><?php _e('Last Month', 'give'); ?></p>
 				</td>
 				<td>
-					<p class="give-dashboard-stat-total"><?php echo give_currency_filter( give_format_amount( give_get_total_earnings(), array( 'sanitize' => false ) ) ) ?></p>
+					<p class="give-dashboard-stat-total"><?php echo give_currency_filter(give_format_amount(give_get_total_earnings(), array('sanitize' => false))) ?></p>
 
-					<p class="give-dashboard-stat-total-label"><?php _e( 'This Year', 'give' ); ?></p>
+					<p class="give-dashboard-stat-total-label"><?php _e('This Year', 'give'); ?></p>
 				</td>
 			</tr>
 			</tbody>
@@ -123,24 +123,24 @@ 
  *
  * @return array
  */
-function give_dashboard_at_a_glance_widget( $items ) {
+function give_dashboard_at_a_glance_widget($items) {
 
-	$num_posts = wp_count_posts( 'give_forms' );
+	$num_posts = wp_count_posts('give_forms');
 
-	if ( $num_posts && $num_posts->publish ) {
+	if ($num_posts && $num_posts->publish) {
 
 		$text = sprintf(
 			/* translators: %s: number of posts published */
-			_n( '%s Give Form', '%s Give Forms', $num_posts->publish, 'give' ),
+			_n('%s Give Form', '%s Give Forms', $num_posts->publish, 'give'),
 			$num_posts->publish
 		);
 
-		$text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
+		$text = sprintf($text, number_format_i18n($num_posts->publish));
 
-		if ( current_user_can( 'edit_give_forms', get_current_user_id() ) ) {
+		if (current_user_can('edit_give_forms', get_current_user_id())) {
 			$text = sprintf(
 				'<a class="give-forms-count" href="%1$s">%2$s</a>',
-				admin_url( 'edit.php?post_type=give_forms' ),
+				admin_url('edit.php?post_type=give_forms'),
 				$text
 			);
 		} else {
@@ -156,4 +156,4 @@ 
 	return $items;
 }
 
-add_filter( 'dashboard_glance_items', 'give_dashboard_at_a_glance_widget', 1, 1 );
+add_filter('dashboard_glance_items', 'give_dashboard_at_a_glance_widget', 1, 1);

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

Spacing +196 added lines, -202 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,8 +189,8 @@ 
 									<input type="submit"
 									       class=" button button-primary button-large button-secondary <?php echo "step-{$step}"; ?>"
 									       id="recount-stats-submit"
-									       <?php echo ( 2 === $step ) ? 'disabled' : ''; ?>
-									       value="<?php esc_attr_e( 'Submit', 'give' ); ?>"/>
+									       <?php echo (2 === $step) ? 'disabled' : ''; ?>
+									       value="<?php esc_attr_e('Submit', 'give'); ?>"/>
 								</th>
 							</tr>
 							<?php
@@ -209,57 +209,57 @@ 
 		 */
 		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) {
 							printf(
-								_n( 'Import complete! %s donation processed', 'Import complete! %s donations processed', $total, 'give' ),
+								_n('Import complete! %s donation processed', 'Import complete! %s donations processed', $total, 'give'),
 								"<strong>{$total}</strong>"
 							);
 						} else {
 							printf(
-								_n( 'Failed to import %s donation', 'Failed to import %s donations', $total, 'give' ),
+								_n('Failed to import %s donation', 'Failed to import %s donations', $total, 'give'),
 								"<strong>{$total}</strong>"
 							);
 						}
@@ -267,25 +267,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
 						}
@@ -293,7 +293,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>
@@ -310,26 +310,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>
 
@@ -348,7 +348,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">
@@ -357,7 +357,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>
@@ -378,20 +378,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 {
@@ -408,10 +408,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">
@@ -422,18 +422,18 @@ 
 				?>
 				<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>
+						<h2 id="give-import-title"><?php esc_html_e('Map CSV fields to donations', 'give') ?></h2>
 
-						<p class="give-import-donation-required-fields-title"><?php _e( 'Required Fields' ); ?></p>
+						<p class="give-import-donation-required-fields-title"><?php _e('Required Fields'); ?></p>
 
-						<p class="give-field-description"><?php _e( 'These fields are required for the import to submitted' ); ?></p>
+						<p class="give-field-description"><?php _e('These fields are required for the import to submitted'); ?></p>
 
 						<ul class="give-import-donation-required-fields">
 							<li class="give-import-donation-required-email" title="Please configure all required fields to start the import process.">
 								<span class="give-import-donation-required-symbol dashicons dashicons-no-alt"></span>
 								<span class="give-import-donation-required-text">
 									<?php
-									_e( 'Email Access', 'give' );
+									_e('Email Access', 'give');
 									?>
 								</span>
 							</li>
@@ -442,7 +442,7 @@ 
 								<span class="give-import-donation-required-symbol dashicons dashicons-no-alt"></span>
 								<span class="give-import-donation-required-text">
 									<?php
-									_e( 'First Name', 'give' );
+									_e('First Name', 'give');
 									?>
 								</span>
 							</li>
@@ -451,7 +451,7 @@ 
 								<span class="give-import-donation-required-symbol dashicons dashicons-no-alt"></span>
 								<span class="give-import-donation-required-text">
 									<?php
-									_e( 'Donation Amount', 'give' );
+									_e('Donation Amount', 'give');
 									?>
 								</span>
 							</li>
@@ -460,32 +460,32 @@ 
 								<span class="give-import-donation-required-symbol dashicons dashicons-no-alt"></span>
 								<span class="give-import-donation-required-text">
 									<?php
-									_e( 'Form Title or ID', 'give' );
+									_e('Form Title or ID', 'give');
 									?>
 								</span>
 							</li>
 						</ul>
 
-						<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>
+						<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>
@@ -500,14 +500,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';
 			}
 
@@ -526,28 +526,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>
 
@@ -558,7 +558,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
@@ -576,16 +576,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;
 						}
 					}
@@ -609,13 +609,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;
 				}
 			}
@@ -634,7 +634,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.
 			 *
@@ -642,16 +642,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]);
 					}
 				}
 			}
@@ -668,9 +668,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;
@@ -686,17 +686,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
@@ -710,16 +710,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;
 			}
 
@@ -732,7 +732,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';
 		}
 
 		/**
@@ -747,37 +747,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,
 				),
@@ -788,61 +785,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');
 		}
 
 		/**
@@ -855,27 +852,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; ?>"
@@ -896,25 +890,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;
@@ -930,8 +924,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';
 		}
 
 		/**
@@ -942,8 +936,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']);
 		}
 	}