WordImpress / Give

includes/emails/functions.php

Spacing +71 added lines, -71 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,16 +26,16 @@ 
  *
  * @return void
  */
-function give_email_donation_receipt( $payment_id, $admin_notice = true ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_donation_receipt($payment_id, $admin_notice = true) {
+	$payment = new Give_Payment($payment_id);
 
 	/**
 	 * Fire the action
 	 */
-	do_action( 'give_donation-receipt_email_notification', $payment_id );
+	do_action('give_donation-receipt_email_notification', $payment_id);
 
 	// If admin notifications are on, send the admin notice.
-	if ( $admin_notice && give_is_setting_enabled( Give_Email_Notification::get_instance('new-donation' )->get_notification_status() ) ) {
+	if ($admin_notice && give_is_setting_enabled(Give_Email_Notification::get_instance('new-donation')->get_notification_status())) {
 		/**
 		 * Fires in the donation email receipt.
 		 *
@@ -46,7 +46,7 @@ 
 		 * @param int   $payment_id   Payment id.
 		 * @param mixed $payment_data Payment meta data.
 		 */
-		do_action( 'give_new-donation_email_notification', $payment_id, $payment->payment_meta );
+		do_action('give_new-donation_email_notification', $payment_id, $payment->payment_meta);
 	}
 }
 
@@ -59,7 +59,7 @@ 
  *
  * @return void
  */
-function give_admin_email_notice( $payment_id ) {
+function give_admin_email_notice($payment_id) {
 	/**
 	 * Fires in the donation email receipt.
 	 *
@@ -70,10 +70,10 @@ 
 	 * @param int   $payment_id   Payment id.
 	 * @param mixed $payment_data Payment meta data.
 	 */
-	do_action( 'give_new-donation_email_notification', $payment_id );
+	do_action('give_new-donation_email_notification', $payment_id);
 }
 
-add_action( 'give_admin_donation_email', 'give_admin_email_notice' );
+add_action('give_admin_donation_email', 'give_admin_email_notice');
 
 
 /**
@@ -86,16 +86,16 @@ 
  */
 function give_get_default_donation_notification_email() {
 
-	$default_email_body = __( 'Hi there,', 'give' ) . "\n\n";
-	$default_email_body .= __( 'This email is to inform you that a new donation has been made on your website:', 'give' ) . ' <a href="' . get_bloginfo( 'url' ) . '" target="_blank">' . get_bloginfo( 'url' ) . '</a>' . ".\n\n";
-	$default_email_body .= '<strong>' . __( 'Donor:', 'give' ) . '</strong> {name}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation:', 'give' ) . '</strong> {donation}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Amount:', 'give' ) . '</strong> {amount}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment Method:', 'give' ) . '</strong> {payment_method}' . "\n\n";
-	$default_email_body .= __( 'Thank you,', 'give' ) . "\n\n";
-	$default_email_body .= '{sitename}' . "\n";
+	$default_email_body = __('Hi there,', 'give')."\n\n";
+	$default_email_body .= __('This email is to inform you that a new donation has been made on your website:', 'give').' <a href="'.get_bloginfo('url').'" target="_blank">'.get_bloginfo('url').'</a>'.".\n\n";
+	$default_email_body .= '<strong>'.__('Donor:', 'give').'</strong> {name}'."\n";
+	$default_email_body .= '<strong>'.__('Donation:', 'give').'</strong> {donation}'."\n";
+	$default_email_body .= '<strong>'.__('Amount:', 'give').'</strong> {amount}'."\n";
+	$default_email_body .= '<strong>'.__('Payment Method:', 'give').'</strong> {payment_method}'."\n\n";
+	$default_email_body .= __('Thank you,', 'give')."\n\n";
+	$default_email_body .= '{sitename}'."\n";
 
-	return apply_filters( 'give_default_donation_notification_email', $default_email_body );
+	return apply_filters('give_default_donation_notification_email', $default_email_body);
 }
 
 
@@ -109,21 +109,21 @@ 
  */
 function give_get_default_donation_receipt_email() {
 
-	$default_email_body = __( 'Dear', 'give' ) . " {name},\n\n";
-	$default_email_body .= __( 'Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give' ) . "\n\n";
-	$default_email_body .= '<strong>' . __( 'Donor:', 'give' ) . '</strong> {fullname}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation:', 'give' ) . '</strong> {donation}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation Date:', 'give' ) . '</strong> {date}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Amount:', 'give' ) . '</strong> {amount}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment Method:', 'give' ) . '</strong> {payment_method}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment ID:', 'give' ) . '</strong> {payment_id}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Receipt ID:', 'give' ) . '</strong> {receipt_id}' . "\n\n";
-	$default_email_body .= '{receipt_link}' . "\n\n";
+	$default_email_body = __('Dear', 'give')." {name},\n\n";
+	$default_email_body .= __('Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give')."\n\n";
+	$default_email_body .= '<strong>'.__('Donor:', 'give').'</strong> {fullname}'."\n";
+	$default_email_body .= '<strong>'.__('Donation:', 'give').'</strong> {donation}'."\n";
+	$default_email_body .= '<strong>'.__('Donation Date:', 'give').'</strong> {date}'."\n";
+	$default_email_body .= '<strong>'.__('Amount:', 'give').'</strong> {amount}'."\n";
+	$default_email_body .= '<strong>'.__('Payment Method:', 'give').'</strong> {payment_method}'."\n";
+	$default_email_body .= '<strong>'.__('Payment ID:', 'give').'</strong> {payment_id}'."\n";
+	$default_email_body .= '<strong>'.__('Receipt ID:', 'give').'</strong> {receipt_id}'."\n\n";
+	$default_email_body .= '{receipt_link}'."\n\n";
 	$default_email_body .= "\n\n";
-	$default_email_body .= __( 'Sincerely,', 'give' ) . "\n";
-	$default_email_body .= '{sitename}' . "\n";
+	$default_email_body .= __('Sincerely,', 'give')."\n";
+	$default_email_body .= '{sitename}'."\n";
 
-	return apply_filters( 'give_default_donation_receipt_email', $default_email_body );
+	return apply_filters('give_default_donation_receipt_email', $default_email_body);
 }
 
 /**
@@ -136,22 +136,22 @@ 
  *
  * @return array $email_names
  */
-function give_get_email_names( $user_info, $payment = false ) {
+function give_get_email_names($user_info, $payment = false) {
 	$email_names = array();
 
-	if ( is_a( $payment, 'Give_Payment' ) ) {
+	if (is_a($payment, 'Give_Payment')) {
 
-		if ( $payment->user_id > 0 ) {
+		if ($payment->user_id > 0) {
 
-			$user_data               = get_userdata( $payment->user_id );
+			$user_data               = get_userdata($payment->user_id);
 			$email_names['name']     = $payment->first_name;
-			$email_names['fullname'] = trim( $payment->first_name . ' ' . $payment->last_name );
+			$email_names['fullname'] = trim($payment->first_name.' '.$payment->last_name);
 			$email_names['username'] = $user_data->user_login;
 
-		} elseif ( ! empty( $payment->first_name ) ) {
+		} elseif ( ! empty($payment->first_name)) {
 
 			$email_names['name']     = $payment->first_name;
-			$email_names['fullname'] = trim( $payment->first_name . ' ' . $payment->last_name );
+			$email_names['fullname'] = trim($payment->first_name.' '.$payment->last_name);
 			$email_names['username'] = $payment->first_name;
 
 		} else {
@@ -164,30 +164,30 @@ 
 	} else {
 
 		// Support for old serialized data.
-		if ( is_serialized( $user_info ) ) {
+		if (is_serialized($user_info)) {
 
 			// Security check.
-			preg_match( '/[oO]\s*:\s*\d+\s*:\s*"\s*(?!(?i)(stdClass))/', $user_info, $matches );
-			if ( ! empty( $matches ) ) {
+			preg_match('/[oO]\s*:\s*\d+\s*:\s*"\s*(?!(?i)(stdClass))/', $user_info, $matches);
+			if ( ! empty($matches)) {
 				return array(
 					'name'     => '',
 					'fullname' => '',
 					'username' => '',
 				);
 			} else {
-				$user_info = maybe_unserialize( $user_info );
+				$user_info = maybe_unserialize($user_info);
 			}
 
 		}
 
-		if ( isset( $user_info['id'] ) && $user_info['id'] > 0 && isset( $user_info['first_name'] ) ) {
-			$user_data               = get_userdata( $user_info['id'] );
+		if (isset($user_info['id']) && $user_info['id'] > 0 && isset($user_info['first_name'])) {
+			$user_data               = get_userdata($user_info['id']);
 			$email_names['name']     = $user_info['first_name'];
-			$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+			$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 			$email_names['username'] = $user_data->user_login;
-		} elseif ( isset( $user_info['first_name'] ) ) {
+		} elseif (isset($user_info['first_name'])) {
 			$email_names['name']     = $user_info['first_name'];
-			$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+			$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 			$email_names['username'] = $user_info['first_name'];
 		} else {
 			$email_names['name']     = $user_info['email'];
@@ -207,37 +207,37 @@ 
  *
  * @since 1.8.14
  */
-function give_admin_email_user_donor_disconnection( $user_id, $donor_id ) {
+function give_admin_email_user_donor_disconnection($user_id, $donor_id) {
 
-	$user_id  = absint( $user_id );
-	$donor_id = absint( $donor_id );
+	$user_id  = absint($user_id);
+	$donor_id = absint($donor_id);
 
 	// Bail Out, if user id doesn't exists.
-	if ( empty( $user_id ) ) {
+	if (empty($user_id)) {
 		return;
 	}
 
 	// Bail Out, if donor id doesn't exists.
-	if ( empty( $donor_id ) ) {
+	if (empty($donor_id)) {
 		return;
 	}
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
 
 	/* translators: %s: payment id */
-	$subject = __( 'Attention: User tries to login whose Donor profile is disconnected!', 'give' );
+	$subject = __('Attention: User tries to login whose Donor profile is disconnected!', 'give');
 
 	/**
 	 * Filters the Donor-User Disconnection notification subject.
 	 *
 	 * @since 1.8.14
 	 */
-	$subject = apply_filters( 'give_admin_donor_user_disconnection_notification_subject', wp_strip_all_tags( $subject ) );
+	$subject = apply_filters('give_admin_donor_user_disconnection_notification_subject', wp_strip_all_tags($subject));
 
-	$headers = "From: " . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
-	$headers .= "Reply-To: " . $from_email . "\r\n";
+	$headers = "From: ".stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8'))." <$from_email>\r\n";
+	$headers .= "Reply-To: ".$from_email."\r\n";
 	$headers .= "Content-Type: text/html; charset=utf-8\r\n";
 
 	/**
@@ -245,25 +245,25 @@ 
 	 *
 	 * @since 1.8.14
 	 */
-	$headers = apply_filters( 'give_admin_donor_user_disconnection_notification_headers', $headers );
+	$headers = apply_filters('give_admin_donor_user_disconnection_notification_headers', $headers);
 
-	$message = __( 'Hi Admin,', 'give' ) . "\n\n";
-	$message .= __( 'This email is to inform you that a user has tried logging in. But, User was unable to login due to User-Donor profile disconnection.', 'give' ) . "\n\n";
-	$message .= __( 'Do you want to reconnect User and Donor profile again?', 'give' ) . "\n\n";
+	$message = __('Hi Admin,', 'give')."\n\n";
+	$message .= __('This email is to inform you that a user has tried logging in. But, User was unable to login due to User-Donor profile disconnection.', 'give')."\n\n";
+	$message .= __('Do you want to reconnect User and Donor profile again?', 'give')."\n\n";
 	$message .= sprintf(
 		'<a href="%1$s">%2$s</a>',
-		esc_url( admin_url() . 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor_id . '&user_id=' . $user_id . '&give-message=reconnect-user' ),
-		__( 'Reconnect User', 'give' ) . "\n\n"
+		esc_url(admin_url().'edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor_id.'&user_id='.$user_id.'&give-message=reconnect-user'),
+		__('Reconnect User', 'give')."\n\n"
 	);
-	$message .= __( 'Thank you,', 'give' ) . "\n\n";
-	$message .= '{sitename}' . "\n";
+	$message .= __('Thank you,', 'give')."\n\n";
+	$message .= '{sitename}'."\n";
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'headers', $headers );
-	$emails->__set( 'heading', __( 'User - Donor Profile Disconnection', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('headers', $headers);
+	$emails->__set('heading', __('User - Donor Profile Disconnection', 'give'));
 
-	$emails->send( give_get_admin_notice_emails(), $subject, give_do_email_tags( $message ) );
+	$emails->send(give_get_admin_notice_emails(), $subject, give_do_email_tags($message));
 
 }

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

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;

Spacing +245 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()
 			)
 
@@ -336,13 +334,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;
 		}
 
@@ -351,25 +349,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;
 	}
@@ -386,31 +384,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();
 		}
@@ -426,53 +424,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)]);
 						}
 					}
 				}
@@ -482,52 +480,52 @@ 
 		/**
 		 * 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 {
-				delete_site_transient( self::$background_updater->get_identifier() . '_process_lock' );
-				wp_clear_scheduled_hook( self::$background_updater->get_cron_identifier() );
+				delete_site_transient(self::$background_updater->get_identifier().'_process_lock');
+				wp_clear_scheduled_hook(self::$background_updater->get_cron_identifier());
 
 				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);
 
-			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 {
 
-				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();
@@ -538,25 +536,25 @@ 
 		/**
 		 * Fix give_doing_upgrade option
 		 */
-		$fresh_new_db_count = $this->get_total_new_db_update_count( true );
+		$fresh_new_db_count = $this->get_total_new_db_update_count(true);
 
-		update_option( 'give_db_update_count', $fresh_new_db_count );
+		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['total_percentage'] = $this->get_db_update_processing_percentage( true );
+		$doing_upgrade_args['heading']          = sprintf('Update %s of %s', 1, $fresh_new_db_count);
+		$doing_upgrade_args['total_percentage'] = $this->get_db_update_processing_percentage(true);
 
 		// Remove already completed update from info.
-		if ( give_has_upgrade_completed( $doing_upgrade_args['update_info']['id'] ) ) {
-			$doing_upgrade_args['update_info'] = current( array_values( $batch->data ) );
+		if (give_has_upgrade_completed($doing_upgrade_args['update_info']['id'])) {
+			$doing_upgrade_args['update_info'] = current(array_values($batch->data));
 			$doing_upgrade_args['step']        = 1;
 		}
 
-		update_option( 'give_doing_upgrade', $doing_upgrade_args );
+		update_option('give_doing_upgrade', $doing_upgrade_args);
 
-		$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' );
+		$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');
 	}
 
 
@@ -568,66 +566,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,
 				)
 			);
@@ -636,45 +634,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,
-			) );
+			));
 		}
 	}
 
@@ -685,7 +683,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';
 	}
 
 	/**
@@ -695,7 +693,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';
 	}
 
 	/**
@@ -706,26 +704,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();
 	}
@@ -739,14 +737,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;
 	}
 
 
@@ -761,7 +758,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();
@@ -769,7 +766,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();
 		}
 
@@ -788,34 +785,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);
 	}
 
 	/**
@@ -827,7 +824,7 @@ 
 	 * @param        $data
 	 * @param string $type
 	 */
-	public function send_ajax_response( $data, $type = '' ) {
+	public function send_ajax_response($data, $type = '') {
 		$default = array(
 			'message'    => '',
 			'heading'    => '',
@@ -837,24 +834,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;
 		}
 	}
@@ -868,12 +865,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;
 	}
 
 	/**
@@ -886,22 +883,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;
 			}
@@ -918,7 +915,7 @@ 
 	 * @return bool
 	 */
 	public function is_doing_updates() {
-		return (bool) get_option( 'give_doing_upgrade' );
+		return (bool) get_option('give_doing_upgrade');
 	}
 
 
@@ -932,7 +929,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' );
 		//
@@ -958,33 +955,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;
@@ -1001,7 +998,7 @@ 
 	 * @return int
 	 */
 	public function get_total_plugin_update_count() {
-		return count( $this->get_updates( 'plugin' ) );
+		return count($this->get_updates('plugin'));
 	}
 
 	/**
@@ -1016,7 +1013,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);
 	}
 
 	/**
@@ -1028,7 +1025,7 @@ 
 	 * @return int
 	 */
 	public function get_pending_db_update_count() {
-		return count( $this->get_updates( 'database', 'new' ) );
+		return count($this->get_updates('database', 'new'));
 	}
 
 	/**
@@ -1040,7 +1037,7 @@ 
 	 * @return int
 	 */
 	public function get_total_db_update_count() {
-		return count( $this->get_updates( 'database', 'all' ) );
+		return count($this->get_updates('database', 'all'));
 	}
 
 	/**
@@ -1053,10 +1050,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;
 	}
@@ -1071,11 +1067,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'];
 		}
 
@@ -1092,25 +1088,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;
 	}
 
 
@@ -1122,8 +1116,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;
 	}
@@ -1138,10 +1132,9 @@ 
 	 *
 	 * @return float|int
 	 */
-	public function get_offset( $process_item_count ) {
-		return ( 1 === $this->step ) ?
-			0 :
-			( $this->step - 1 ) * $process_item_count;
+	public function get_offset($process_item_count) {
+		return (1 === $this->step) ?
+			0 : ($this->step - 1) * $process_item_count;
 	}
 }
 

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/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/class-give-background-updater.php

Indentation +2 added lines, -2 removed lines

@@ -202,8 +202,8 @@
 		// 2. Processing percentage greater then 100%
 		if( (
 			101 < $resume_update['total_percentage'] ) ||
-		    ( $give_updates->get_total_db_update_count() < $resume_update['update'] ) ||
-		    ! in_array( $resume_update['update_info']['id'], $give_updates->get_update_ids() )
+			( $give_updates->get_total_db_update_count() < $resume_update['update'] ) ||
+			! in_array( $resume_update['update_info']['id'], $give_updates->get_update_ids() )
 		) {
 			if( ! $this->is_paused_process() ){
 				$give_updates->__pause_db_update(true);

Spacing +64 added lines, -64 removed lines

@@ -11,7 +11,7 @@ 
  * @category Class
  * @author   WordImpress
  */
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -55,7 +55,7 @@ 
 	 * @return bool
 	 */
 	public function has_queue() {
-		return ( ! parent::is_queue_empty() );
+		return ( ! parent::is_queue_empty());
 	}
 
 
@@ -71,12 +71,12 @@ 
 	 */
 	protected function lock_process() {
 		// Check if admin want to pause upgrade.
-		if( get_option('give_pause_upgrade') ) {
+		if (get_option('give_pause_upgrade')) {
 			self::flush_cache();
 
-			delete_option( 'give_paused_batches' );
+			delete_option('give_paused_batches');
 
-			Give_Updates::get_instance()->__pause_db_update( true );
+			Give_Updates::get_instance()->__pause_db_update(true);
 
 			delete_option('give_pause_upgrade');
 
@@ -85,7 +85,7 @@ 
 			 *
 			 * @since 2.0.1
 			 */
-			do_action( 'give_pause_db_upgrade', Give_Updates::get_instance() );
+			do_action('give_pause_db_upgrade', Give_Updates::get_instance());
 
 			wp_die();
 		}
@@ -93,10 +93,10 @@ 
 
 		$this->start_time = time(); // Set start time of current process.
 
-		$lock_duration = ( property_exists( $this, 'queue_lock_time' ) ) ? $this->queue_lock_time : 60; // 1 minute
-		$lock_duration = apply_filters( $this->identifier . '_queue_lock_time', $lock_duration );
+		$lock_duration = (property_exists($this, 'queue_lock_time')) ? $this->queue_lock_time : 60; // 1 minute
+		$lock_duration = apply_filters($this->identifier.'_queue_lock_time', $lock_duration);
 
-		set_site_transient( $this->identifier . '_process_lock', microtime(), $lock_duration );
+		set_site_transient($this->identifier.'_process_lock', microtime(), $lock_duration);
 	}
 
 	/**
@@ -106,12 +106,12 @@ 
 	 * and data exists in the queue.
 	 */
 	public function handle_cron_healthcheck() {
-		if ( $this->is_process_running() || $this->is_paused_process()  ) {
+		if ($this->is_process_running() || $this->is_paused_process()) {
 			// Background process already running.
 			return;
 		}
 
-		if ( $this->is_queue_empty() ) {
+		if ($this->is_queue_empty()) {
 			// No data to process.
 			$this->clear_scheduled_event();
 
@@ -125,8 +125,8 @@ 
 	 * Schedule fallback event.
 	 */
 	protected function schedule_event() {
-		if ( ! wp_next_scheduled( $this->cron_hook_identifier ) && ! $this->is_paused_process() ) {
-			wp_schedule_event( time() + 10, $this->cron_interval_identifier, $this->cron_hook_identifier );
+		if ( ! wp_next_scheduled($this->cron_hook_identifier) && ! $this->is_paused_process()) {
+			wp_schedule_event(time() + 10, $this->cron_interval_identifier, $this->cron_hook_identifier);
 		}
 	}
 
@@ -142,13 +142,13 @@ 
 	 *
 	 * @return mixed
 	 */
-	protected function task( $update ) {
+	protected function task($update) {
 		// Pause upgrade immediately if admin pausing upgrades.
-		if( $this->is_paused_process() ) {
+		if ($this->is_paused_process()) {
 			wp_die();
 		}
 
-		if ( empty( $update ) ) {
+		if (empty($update)) {
 			return false;
 		}
 
@@ -165,7 +165,7 @@ 
 				'update_info'      => $update,
 				'step'             => 1,
 				'update'           => 1,
-				'heading'          => sprintf( 'Update %s of {update_count}', 1 ),
+				'heading'          => sprintf('Update %s of {update_count}', 1),
 				'percentage'       => $give_updates->percentage,
 				'total_percentage' => 0,
 			)
@@ -174,22 +174,22 @@ 
 		// Continuously skip update if previous update does not complete yet.
 		if (
 			$resume_update['update_info']['id'] !== $update['id'] &&
-			! give_has_upgrade_completed( $resume_update['update_info']['id'] )
+			! give_has_upgrade_completed($resume_update['update_info']['id'])
 		) {
 			return $update;
 		}
 
 		// Set params.
 		$resume_update['update_info'] = $update;
-		$give_updates->step           = absint( $resume_update['step'] );
-		$give_updates->update         = absint( $resume_update['update'] );
-		$is_parent_update_completed   = $give_updates->is_parent_updates_completed( $update );
+		$give_updates->step           = absint($resume_update['step']);
+		$give_updates->update         = absint($resume_update['update']);
+		$is_parent_update_completed   = $give_updates->is_parent_updates_completed($update);
 
 
 		// Skip update if dependency update does not complete yet.
-		if ( empty( $is_parent_update_completed ) ) {
+		if (empty($is_parent_update_completed)) {
 			// @todo: set error when you have only one update with invalid dependency
-			if ( ! is_null( $is_parent_update_completed ) ) {
+			if ( ! is_null($is_parent_update_completed)) {
 				return $update;
 			}
 
@@ -200,23 +200,23 @@ 
 		// Pause upgrade immediately if found following:
 		// 1. Running update number greater then total update count
 		// 2. Processing percentage greater then 100%
-		if( (
+		if ((
 			101 < $resume_update['total_percentage'] ) ||
-		    ( $give_updates->get_total_db_update_count() < $resume_update['update'] ) ||
-		    ! in_array( $resume_update['update_info']['id'], $give_updates->get_update_ids() )
+		    ($give_updates->get_total_db_update_count() < $resume_update['update']) ||
+		    ! in_array($resume_update['update_info']['id'], $give_updates->get_update_ids())
 		) {
-			if( ! $this->is_paused_process() ){
+			if ( ! $this->is_paused_process()) {
 				$give_updates->__pause_db_update(true);
 			}
 
-			update_option( 'give_upgrade_error', 1 );
+			update_option('give_upgrade_error', 1);
 
-			$log_data = 'Update Task' . "\n";
+			$log_data = 'Update Task'."\n";
 			$log_data .= "Total update count: {$give_updates->get_total_db_update_count()}\n";
-			$log_data .= 'Update IDs: ' . print_r( $give_updates->get_update_ids() , true );
-			$log_data .= 'Update: ' . print_r( $resume_update , true );
+			$log_data .= 'Update IDs: '.print_r($give_updates->get_update_ids(), true);
+			$log_data .= 'Update: '.print_r($resume_update, true);
 
-			Give()->logs->add( 'Update Error', $log_data, 0, 'update' );
+			Give()->logs->add('Update Error', $log_data, 0, 'update');
 
 			wp_die();
 		}
@@ -224,25 +224,25 @@ 
 		// Disable cache.
 		Give_Cache::disable();
 
-		try{
+		try {
 			// Run update.
-			if ( is_array( $update['callback'] ) ) {
+			if (is_array($update['callback'])) {
 				$update['callback'][0]->$update['callback'][1]();
 			} else {
 				$update['callback']();
 			}
-		} catch ( Exception $e ){
+		} catch (Exception $e) {
 
-			if( ! $this->is_paused_process() ){
+			if ( ! $this->is_paused_process()) {
 				$give_updates->__pause_db_update(true);
 			}
 
-			$log_data = 'Update Task' . "\n";
-			$log_data .= print_r( $resume_update, true ) . "\n\n";
+			$log_data = 'Update Task'."\n";
+			$log_data .= print_r($resume_update, true)."\n\n";
 			$log_data .= "Error\n {$e->getMessage()}";
 
-			Give()->logs->add( 'Update Error', $log_data, 0, 'update' );
-			update_option( 'give_upgrade_error', 1 );
+			Give()->logs->add('Update Error', $log_data, 0, 'update');
+			update_option('give_upgrade_error', 1);
 
 			wp_die();
 		}
@@ -250,21 +250,21 @@ 
 		// Set update info.
 		$doing_upgrade_args = array(
 			'update_info'      => $update,
-			'step'             => ++ $give_updates->step,
+			'step'             => ++$give_updates->step,
 			'update'           => $give_updates->update,
-			'heading'          => sprintf( 'Update %s of %s', $give_updates->update, get_option( 'give_db_update_count' ) ),
+			'heading'          => sprintf('Update %s of %s', $give_updates->update, get_option('give_db_update_count')),
 			'percentage'       => $give_updates->percentage,
 			'total_percentage' => $give_updates->get_db_update_processing_percentage(),
 		);
 
 		// Cache upgrade.
-		update_option( 'give_doing_upgrade', $doing_upgrade_args );
+		update_option('give_doing_upgrade', $doing_upgrade_args);
 
 		// Enable cache.
 		Give_Cache::enable();
 
 		// Check if current update completed or not.
-		if ( give_has_upgrade_completed( $update['id'] ) ) {
+		if (give_has_upgrade_completed($update['id'])) {
 			return false;
 		}
 
@@ -278,23 +278,23 @@ 
 	 * performed, or, call parent::complete().
 	 */
 	public function complete() {
-		if ( $this->is_paused_process() ) {
+		if ($this->is_paused_process()) {
 			return false;
 		}
 
 		parent::complete();
 
-		delete_option( 'give_pause_upgrade' );
-		delete_option( 'give_upgrade_error' );
-		delete_option( 'give_db_update_count' );
-		delete_option( 'give_doing_upgrade' );
-		add_option( 'give_show_db_upgrade_complete_notice', 1, '', 'no' );
+		delete_option('give_pause_upgrade');
+		delete_option('give_upgrade_error');
+		delete_option('give_db_update_count');
+		delete_option('give_doing_upgrade');
+		add_option('give_show_db_upgrade_complete_notice', 1, '', 'no');
 
 		// Flush cache.
 		Give_Cache::get_instance()->flush_cache();
 
-		if ( $cache_keys = Give_Cache::get_options_like( '' ) ) {
-			Give_Cache::delete( $cache_keys );
+		if ($cache_keys = Give_Cache::get_options_like('')) {
+			Give_Cache::delete($cache_keys);
 		}
 	}
 
@@ -304,19 +304,19 @@ 
 	 * @return int
 	 */
 	protected function get_memory_limit() {
-		if ( function_exists( 'ini_get' ) ) {
-			$memory_limit = ini_get( 'memory_limit' );
+		if (function_exists('ini_get')) {
+			$memory_limit = ini_get('memory_limit');
 		} else {
 			// Sensible default.
 			$memory_limit = '128M';
 		}
 
-		if ( ! $memory_limit || '-1' === $memory_limit ) {
+		if ( ! $memory_limit || '-1' === $memory_limit) {
 			// Unlimited, set to 32GB.
 			$memory_limit = '32000M';
 		}
 
-		return intval( $memory_limit ) * 1024 * 1024;
+		return intval($memory_limit) * 1024 * 1024;
 	}
 
 	/**
@@ -329,17 +329,17 @@ 
 		// Don't lock up other requests while processing
 		session_write_close();
 
-		if ( $this->is_process_running() || $this->is_paused_process() ) {
+		if ($this->is_process_running() || $this->is_paused_process()) {
 			// Background process already running.
 			wp_die();
 		}
 
-		if ( $this->is_queue_empty() ) {
+		if ($this->is_queue_empty()) {
 			// No data to process.
 			wp_die();
 		}
 
-		check_ajax_referer( $this->identifier, 'nonce' );
+		check_ajax_referer($this->identifier, 'nonce');
 
 		$this->handle();
 
@@ -354,13 +354,13 @@ 
 	 * @access public
 	 * @return bool
 	 */
-	public function is_paused_process(){
+	public function is_paused_process() {
 		// Delete cache.
-		wp_cache_delete( 'give_paused_batches', 'options' );
+		wp_cache_delete('give_paused_batches', 'options');
 
 		$paused_batches = get_option('give_paused_batches');
 
-		return ! empty( $paused_batches );
+		return ! empty($paused_batches);
 	}
 
 
@@ -406,8 +406,8 @@ 
 		);
 
 
-		foreach ( $options as $option ) {
-			wp_cache_delete( $option, 'options' );
+		foreach ($options as $option) {
+			wp_cache_delete($option, 'options');
 		}
 	}
 }

templates/shortcode-profile-editor.php

Spacing +50 added lines, -50 removed lines

@@ -7,21 +7,21 @@ 
  * @copyright    Copyright (c) 2016, WordImpress
  * @license      https://opensource.org/licenses/gpl-license GNU Public License
  */
-$current_user     = wp_get_current_user();
+$current_user = wp_get_current_user();
 
-if ( is_user_logged_in() ) :
+if (is_user_logged_in()) :
 	$user_id      = get_current_user_id();
-	$first_name   = get_user_meta( $user_id, 'first_name', true );
-	$last_name    = get_user_meta( $user_id, 'last_name', true );
+	$first_name   = get_user_meta($user_id, 'first_name', true);
+	$last_name    = get_user_meta($user_id, 'last_name', true);
 	$display_name = $current_user->display_name;
-	$address      = give_get_donor_address( $user_id, array( 'address_type' => 'personal' ) );
+	$address      = give_get_donor_address($user_id, array('address_type' => 'personal'));
 
-	if ( isset( $_GET['updated'] ) && 'true' === $_GET['updated'] && ! give_get_errors() ) :
-		if ( isset( $_GET['update_code'] ) ) :?>
+	if (isset($_GET['updated']) && 'true' === $_GET['updated'] && ! give_get_errors()) :
+		if (isset($_GET['update_code'])) :?>
 				<?php
-				switch ( $_GET['update_code'] ) {
+				switch ($_GET['update_code']) {
 					case '1':
-						printf( '<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__( 'Success:', 'give' ), esc_html__( 'Your profile has been updated.', 'give' ) );
+						printf('<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__('Success:', 'give'), esc_html__('Your profile has been updated.', 'give'));
 						break;
 				}
 				?>
@@ -29,7 +29,7 @@ 
 		<?php endif; ?>
 	<?php endif; ?>
 
-	<?php Give()->notices->render_frontend_notices( 0 ); ?>
+	<?php Give()->notices->render_frontend_notices(0); ?>
 
 	<?php
 	/**
@@ -39,42 +39,42 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_profile_editor_before' );
+	do_action('give_profile_editor_before');
 	?>
 
 	<form id="give_profile_editor_form" class="give-form" action="<?php echo give_get_current_page_url(); ?>" method="post">
 
 		<fieldset>
-			<legend id="give_profile_name_label"><?php _e( 'Profile', 'give' ); ?></legend>
+			<legend id="give_profile_name_label"><?php _e('Profile', 'give'); ?></legend>
 
-			<h3 id="give_personal_information_label" class="give-section-break"><?php _e( 'Change your Name', 'give' ); ?></h3>
+			<h3 id="give_personal_information_label" class="give-section-break"><?php _e('Change your Name', 'give'); ?></h3>
 
 			<p id="give_profile_first_name_wrap" class="form-row form-row-first form-row-responsive">
 				<label for="give_first_name">
-					<?php _e( 'First Name', 'give' ); ?>
+					<?php _e('First Name', 'give'); ?>
 					<span class="give-required-indicator  ">*</span>
 				</label>
-				<input name="give_first_name" id="give_first_name" class="text give-input" type="text" value="<?php echo esc_attr( $first_name ); ?>"/>
+				<input name="give_first_name" id="give_first_name" class="text give-input" type="text" value="<?php echo esc_attr($first_name); ?>"/>
 			</p>
 
 			<p id="give_profile_last_name_wrap" class="form-row form-row-last form-row-responsive">
-				<label for="give_last_name"><?php _e( 'Last Name', 'give' ); ?></label>
-				<input name="give_last_name" id="give_last_name" class="text give-input" type="text" value="<?php echo esc_attr( $last_name ); ?>"/>
+				<label for="give_last_name"><?php _e('Last Name', 'give'); ?></label>
+				<input name="give_last_name" id="give_last_name" class="text give-input" type="text" value="<?php echo esc_attr($last_name); ?>"/>
 			</p>
 
 			<p id="give_profile_display_name_wrap" class="form-row form-row-first form-row-responsive">
-				<label for="give_display_name"><?php _e( 'Display Name', 'give' ); ?></label>
+				<label for="give_display_name"><?php _e('Display Name', 'give'); ?></label>
 				<select name="give_display_name" id="give_display_name" class="select give-select">
-					<?php if ( ! empty( $current_user->first_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->first_name ); ?> value="<?php echo esc_attr( $current_user->first_name ); ?>"><?php echo esc_html( $current_user->first_name ); ?></option>
+					<?php if ( ! empty($current_user->first_name)): ?>
+						<option <?php selected($display_name, $current_user->first_name); ?> value="<?php echo esc_attr($current_user->first_name); ?>"><?php echo esc_html($current_user->first_name); ?></option>
 					<?php endif; ?>
-					<option <?php selected( $display_name, $current_user->user_nicename ); ?> value="<?php echo esc_attr( $current_user->user_nicename ); ?>"><?php echo esc_html( $current_user->user_nicename ); ?></option>
-					<?php if ( ! empty( $current_user->last_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->last_name ); ?> value="<?php echo esc_attr( $current_user->last_name ); ?>"><?php echo esc_html( $current_user->last_name ); ?></option>
+					<option <?php selected($display_name, $current_user->user_nicename); ?> value="<?php echo esc_attr($current_user->user_nicename); ?>"><?php echo esc_html($current_user->user_nicename); ?></option>
+					<?php if ( ! empty($current_user->last_name)): ?>
+						<option <?php selected($display_name, $current_user->last_name); ?> value="<?php echo esc_attr($current_user->last_name); ?>"><?php echo esc_html($current_user->last_name); ?></option>
 					<?php endif; ?>
-					<?php if ( ! empty( $current_user->first_name ) && ! empty( $current_user->last_name ) ): ?>
-						<option <?php selected( $display_name, $current_user->first_name . ' ' . $current_user->last_name ); ?> value="<?php echo esc_attr( $current_user->first_name . ' ' . $current_user->last_name ); ?>"><?php echo esc_html( $current_user->first_name . ' ' . $current_user->last_name ); ?></option>
-						<option <?php selected( $display_name, $current_user->last_name . ' ' . $current_user->first_name ); ?> value="<?php echo esc_attr( $current_user->last_name . ' ' . $current_user->first_name ); ?>"><?php echo esc_html( $current_user->last_name . ' ' . $current_user->first_name ); ?></option>
+					<?php if ( ! empty($current_user->first_name) && ! empty($current_user->last_name)): ?>
+						<option <?php selected($display_name, $current_user->first_name.' '.$current_user->last_name); ?> value="<?php echo esc_attr($current_user->first_name.' '.$current_user->last_name); ?>"><?php echo esc_html($current_user->first_name.' '.$current_user->last_name); ?></option>
+						<option <?php selected($display_name, $current_user->last_name.' '.$current_user->first_name); ?> value="<?php echo esc_attr($current_user->last_name.' '.$current_user->first_name); ?>"><?php echo esc_html($current_user->last_name.' '.$current_user->first_name); ?></option>
 					<?php endif; ?>
 				</select>
 				<?php
@@ -85,7 +85,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_name' );
+				do_action('give_profile_editor_name');
 				?>
 			</p>
 
@@ -97,15 +97,15 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_name' );
+			do_action('give_profile_editor_after_name');
 			?>
 
 			<p class="form-row form-row-last form-row-responsive">
 				<label for="give_email">
-					<?php _e( 'Email Address', 'give' ); ?>
+					<?php _e('Email Address', 'give'); ?>
 					<span class="give-required-indicator  ">*</span>
 				</label>
-				<input name="give_email" id="give_email" class="text give-input required" type="email" value="<?php echo esc_attr( $current_user->user_email ); ?>" required aria-required="true"/>
+				<input name="give_email" id="give_email" class="text give-input required" type="email" value="<?php echo esc_attr($current_user->user_email); ?>" required aria-required="true"/>
 				<?php
 				/**
 				 * Fires in the profile editor shortcode, to the email section.
@@ -114,7 +114,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_profile_editor_email' );
+				do_action('give_profile_editor_email');
 				?>
 			</p>
 
@@ -126,19 +126,19 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_email' );
+			do_action('give_profile_editor_after_email');
 			?>
 
-			<h3 id="give_profile_password_label" class="give-section-break"><?php _e( 'Change your Password', 'give' ); ?></h3>
+			<h3 id="give_profile_password_label" class="give-section-break"><?php _e('Change your Password', 'give'); ?></h3>
 
 			<div id="give_profile_password_wrap" class="give-clearfix">
 				<p id="give_profile_password_wrap_1" class="form-row form-row-first form-row-responsive">
-					<label for="give_new_user_pass1"><?php _e( 'New Password', 'give' ); ?></label>
+					<label for="give_new_user_pass1"><?php _e('New Password', 'give'); ?></label>
 					<input name="give_new_user_pass1" id="give_new_user_pass1" class="password give-input" type="password"/>
 				</p>
 
 				<p id="give_profile_password_wrap_2" class="form-row form-row-last form-row-responsive">
-					<label for="give_new_user_pass2"><?php _e( 'Re-enter Password', 'give' ); ?></label>
+					<label for="give_new_user_pass2"><?php _e('Re-enter Password', 'give'); ?></label>
 					<input name="give_new_user_pass2" id="give_new_user_pass2" class="password give-input" type="password"/>
 					<?php
 					/**
@@ -148,12 +148,12 @@ 
 					 *
 					 * @since 1.0
 					 */
-					do_action( 'give_profile_editor_password' );
+					do_action('give_profile_editor_password');
 					?>
 				</p>
 			</div>
 
-			<p class="give_password_change_notice"><?php _e( 'Please note after changing your password, you must log back in.', 'give' ); ?></p>
+			<p class="give_password_change_notice"><?php _e('Please note after changing your password, you must log back in.', 'give'); ?></p>
 
 			<?php
 			/**
@@ -163,14 +163,14 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_profile_editor_after_password' );
+			do_action('give_profile_editor_after_password');
 			?>
 
 			<p id="give_profile_submit_wrap">
-				<input type="hidden" name="give_profile_editor_nonce" value="<?php echo wp_create_nonce( 'give-profile-editor-nonce' ); ?>"/>
+				<input type="hidden" name="give_profile_editor_nonce" value="<?php echo wp_create_nonce('give-profile-editor-nonce'); ?>"/>
 				<input type="hidden" name="give_action" value="edit_user_profile"/>
-				<input type="hidden" name="give_redirect" value="<?php echo esc_url( give_get_current_page_url() ); ?>"/>
-				<input name="give_profile_editor_submit" id="give_profile_editor_submit" type="submit" class="give_submit" value="<?php _e( 'Save Changes', 'give' ); ?>"/>
+				<input type="hidden" name="give_redirect" value="<?php echo esc_url(give_get_current_page_url()); ?>"/>
+				<input name="give_profile_editor_submit" id="give_profile_editor_submit" type="submit" class="give_submit" value="<?php _e('Save Changes', 'give'); ?>"/>
 			</p>
 
 		</fieldset>
@@ -185,23 +185,23 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_profile_editor_after' );
+	do_action('give_profile_editor_after');
 	?>
 
 	<?php
 else :
-	if ( isset( $_GET['updated'] ) && 'true' === $_GET['updated'] && ! give_get_errors() ) {
-		if ( isset( $_GET['update_code'] ) ) {
-			switch ( $_GET['update_code'] ) {
+	if (isset($_GET['updated']) && 'true' === $_GET['updated'] && ! give_get_errors()) {
+		if (isset($_GET['update_code'])) {
+			switch ($_GET['update_code']) {
 				case '2':
-					printf( '<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__( 'Success:', 'give' ), esc_html__( 'Your profile and password has been updated.', 'give' ) );
-					_e( 'Login with your new credentials.', 'give' );
+					printf('<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__('Success:', 'give'), esc_html__('Your profile and password has been updated.', 'give'));
+					_e('Login with your new credentials.', 'give');
 					echo give_login_form();
 					break;
 
 				case '3':
-					printf( '<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__( 'Success:', 'give' ), esc_html__( 'Your password has been updated.', 'give' ) );
-					_e( 'Login with your new credentials.', 'give' );
+					printf('<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__('Success:', 'give'), esc_html__('Your password has been updated.', 'give'));
+					_e('Login with your new credentials.', 'give');
 					echo give_login_form();
 					break;
 
@@ -210,7 +210,7 @@ 
 			}
 		}
 	} else {
-		_e( 'You need to login to edit your profile.', 'give' );
+		_e('You need to login to edit your profile.', 'give');
 		echo give_login_form();
 	}
 endif;

Braces +3 added lines, -1 removed lines

@@ -189,12 +189,14 @@
 	?>
 
 	<?php
-else :
+else {
+	:
 	if ( isset( $_GET['updated'] ) && 'true' === $_GET['updated'] && ! give_get_errors() ) {
 		if ( isset( $_GET['update_code'] ) ) {
 			switch ( $_GET['update_code'] ) {
 				case '2':
 					printf( '<p class="give_success"><strong>%1$s</strong> %2$s</p>', esc_html__( 'Success:', 'give' ), esc_html__( 'Your profile and password has been updated.', 'give' ) );
+}
 					_e( 'Login with your new credentials.', 'give' );
 					echo give_login_form();
 					break;

templates/email-login-form.php

Spacing +16 added lines, -16 removed lines

@@ -9,27 +9,27 @@ 
 global $give_access_form_outputted;
 
 // Only output the form once.
-if ( $give_access_form_outputted ) {
+if ($give_access_form_outputted) {
 	return;
 }
 
-$recaptcha_key    = give_get_option( 'recaptcha_key' );
-$recaptcha_secret = give_get_option( 'recaptcha_secret' );
+$recaptcha_key    = give_get_option('recaptcha_key');
+$recaptcha_secret = give_get_option('recaptcha_secret');
 
-$enable_recaptcha = ( give_is_setting_enabled( give_get_option( 'enable_recaptcha' ) ) ) && ! empty( $recaptcha_key ) && ! empty( $recaptcha_secret ) ? true : false;
+$enable_recaptcha = (give_is_setting_enabled(give_get_option('enable_recaptcha'))) && ! empty($recaptcha_key) && ! empty($recaptcha_secret) ? true : false;
 
 // Email already sent?
-if ( isset( $_POST['email-access-sent'] ) ) {
-	Give()->notices->print_frontend_notice( __( 'Please check your email and click on the link to access your complete donation history.', 'give' ), true, 'success' );
+if (isset($_POST['email-access-sent'])) {
+	Give()->notices->print_frontend_notice(__('Please check your email and click on the link to access your complete donation history.', 'give'), true, 'success');
 
 	return;
-} elseif ( isset( $_POST['email-access-exhausted'] ) ) {
+} elseif (isset($_POST['email-access-exhausted'])) {
 
 	// Too many emails sent?
 	Give()->notices->print_frontend_notice(
 		sprintf(
-			__( 'Too many access email requests detected. Please wait %s before requesting a new donation history access link.', 'give' ),
-			sprintf( _n( '%s minute', '%s minutes', Give()->email_access->verify_throttle / 60, 'give' ), Give()->email_access->verify_throttle / 60 )
+			__('Too many access email requests detected. Please wait %s before requesting a new donation history access link.', 'give'),
+			sprintf(_n('%s minute', '%s minutes', Give()->email_access->verify_throttle / 60, 'give'), Give()->email_access->verify_throttle / 60)
 		),
 		true,
 		'error'
@@ -44,7 +44,7 @@ 
  *
  * @since 1.8.17
  */
-do_action( 'give_email_access_form_login' );
+do_action('give_email_access_form_login');
 
 // Print any other messages & errors.
 Give()->notices->render_frontend_notices();
@@ -52,17 +52,17 @@ 
 ?>
 	<div class="give-form">
 		<form method="post" id="give-email-access-form">
-			<p><?php echo apply_filters( 'give_email_access_welcome_message', __( 'Please verify your email to access your donation history.', 'give' ) ); ?></p>
+			<p><?php echo apply_filters('give_email_access_welcome_message', __('Please verify your email to access your donation history.', 'give')); ?></p>
 
-			<label for="give-email"><?php _e( 'Donation Email:', 'give' ); ?></label>
+			<label for="give-email"><?php _e('Donation Email:', 'give'); ?></label>
 			<input id="give-email" type="email" name="give_email" value=""
-				   placeholder="<?php _e( 'Email Address', 'give' ); ?>"/>
-			<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce( 'give' ); ?>"/>
+				   placeholder="<?php _e('Email Address', 'give'); ?>"/>
+			<input type="hidden" name="_wpnonce" value="<?php echo wp_create_nonce('give'); ?>"/>
 			<input type="hidden" name="give_action" value="email_access_form_login"/>
 
 			<?php
 			// Enable reCAPTCHA?
-			if ( $enable_recaptcha ) :
+			if ($enable_recaptcha) :
 				?>
 				<script>
 					// IP verify for reCAPTCHA.
@@ -80,7 +80,7 @@ 
 				<input type="hidden" name="give_ip" class="give_ip" value=""/>
 			<?php endif; ?>
 
-			<input type="submit" class="give-submit" value="<?php _e( 'Verify Email', 'give' ); ?>"/>
+			<input type="submit" class="give-submit" value="<?php _e('Verify Email', 'give'); ?>"/>
 		</form>
 	</div>
 <?php

includes/scripts.php

Spacing +175 added lines, -175 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,26 +25,26 @@ 
  */
 function give_load_scripts() {
 
-	$js_dir         = GIVE_PLUGIN_URL . 'assets/js/frontend/';
-	$js_plugins     = GIVE_PLUGIN_URL . 'assets/js/plugins/';
-	$scripts_footer = ( give_is_setting_enabled( give_get_option( 'scripts_footer' ) ) ) ? true : false;
+	$js_dir         = GIVE_PLUGIN_URL.'assets/js/frontend/';
+	$js_plugins     = GIVE_PLUGIN_URL.'assets/js/plugins/';
+	$scripts_footer = (give_is_setting_enabled(give_get_option('scripts_footer'))) ? true : false;
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off.
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// Localize / PHP to AJAX vars.
-	$localize_give_vars = apply_filters( 'give_global_script_vars', array(
+	$localize_give_vars = apply_filters('give_global_script_vars', array(
 		'ajaxurl'             => give_get_ajax_url(),
-		'checkout_nonce'      => wp_create_nonce( 'give_checkout_nonce' ), // Do not use this nonce. Its deprecated.
+		'checkout_nonce'      => wp_create_nonce('give_checkout_nonce'), // Do not use this nonce. Its deprecated.
 		'currency'            => give_get_currency(),
-		'currency_sign'       => give_currency_filter( '' ),
+		'currency_sign'       => give_currency_filter(''),
 		'currency_pos'        => give_get_currency_position(),
 		'thousands_separator' => give_get_price_thousand_separator(),
 		'decimal_separator'   => give_get_price_decimal_separator(),
-		'no_gateway'          => __( 'Please select a payment method.', 'give' ),
-		'bad_minimum'         => __( 'The minimum custom donation amount for this form is', 'give' ),
-		'general_loading'     => __( 'Loading...', 'give' ),
-		'purchase_loading'    => __( 'Please Wait...', 'give' ),
+		'no_gateway'          => __('Please select a payment method.', 'give'),
+		'bad_minimum'         => __('The minimum custom donation amount for this form is', 'give'),
+		'general_loading'     => __('Loading...', 'give'),
+		'purchase_loading'    => __('Please Wait...', 'give'),
 		'number_decimals'     => give_get_price_decimals(),
 		'give_version'        => GIVE_VERSION,
 		'magnific_options'    => apply_filters(
@@ -58,83 +58,83 @@ 
 			'give_form_translation_js',
 			array(
 				// Field name               Validation message.
-				'payment-mode'           => __( 'Please select payment mode.', 'give' ),
-				'give_first'             => __( 'Please enter your first name.', 'give' ),
-				'give_email'             => __( 'Please enter a valid email address.', 'give' ),
-				'give_user_login'        => __( 'Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give' ),
-				'give_user_pass'         => __( 'Enter a password.', 'give' ),
-				'give_user_pass_confirm' => __( 'Enter the password confirmation.', 'give' ),
-				'give_agree_to_terms'    => __( 'You must agree to the terms and conditions.', 'give' ),
+				'payment-mode'           => __('Please select payment mode.', 'give'),
+				'give_first'             => __('Please enter your first name.', 'give'),
+				'give_email'             => __('Please enter a valid email address.', 'give'),
+				'give_user_login'        => __('Invalid username. Only lowercase letters (a-z) and numbers are allowed.', 'give'),
+				'give_user_pass'         => __('Enter a password.', 'give'),
+				'give_user_pass_confirm' => __('Enter the password confirmation.', 'give'),
+				'give_agree_to_terms'    => __('You must agree to the terms and conditions.', 'give'),
 			)
 		),
-		'confirm_email_sent_message'         => __( 'Please check your email and click on the link to access your complete donation history.', 'give' ),
-	) );
+		'confirm_email_sent_message'         => __('Please check your email and click on the link to access your complete donation history.', 'give'),
+	));
 
-	$localize_give_ajax = apply_filters( 'give_global_ajax_vars', array(
+	$localize_give_ajax = apply_filters('give_global_ajax_vars', array(
 		'ajaxurl'         => give_get_ajax_url(),
-		'ajaxNonce'       => wp_create_nonce( 'give_ajax_nonce' ),
-		'loading'         => __( 'Loading', 'give' ),
+		'ajaxNonce'       => wp_create_nonce('give_ajax_nonce'),
+		'loading'         => __('Loading', 'give'),
 		// General loading message.
-		'select_option'   => __( 'Please select an option', 'give' ),
+		'select_option'   => __('Please select an option', 'give'),
 		// Variable pricing error with multi-donation option enabled.
-		'default_gateway' => give_get_default_gateway( null ),
-		'permalinks'      => get_option( 'permalink_structure' ) ? '1' : '0',
+		'default_gateway' => give_get_default_gateway(null),
+		'permalinks'      => get_option('permalink_structure') ? '1' : '0',
 		'number_decimals' => give_get_price_decimals(),
-	) );
+	));
 
 	// DEBUG is On.
-	if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+	if (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) {
 
-		if ( give_is_cc_verify_enabled() ) {
-			wp_register_script( 'give-cc-validator', $js_plugins . 'jquery.payment' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-			wp_enqueue_script( 'give-cc-validator' );
+		if (give_is_cc_verify_enabled()) {
+			wp_register_script('give-cc-validator', $js_plugins.'jquery.payment'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+			wp_enqueue_script('give-cc-validator');
 		}
 
-		wp_register_script( 'give-float-labels', $js_plugins . 'float-labels' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-float-labels' );
+		wp_register_script('give-float-labels', $js_plugins.'float-labels'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-float-labels');
 
-		wp_register_script( 'give-blockui', $js_plugins . 'jquery.blockUI' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-blockui' );
+		wp_register_script('give-blockui', $js_plugins.'jquery.blockUI'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-blockui');
 
-		wp_register_script( 'give-accounting', $js_plugins . 'accounting' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-accounting' );
+		wp_register_script('give-accounting', $js_plugins.'accounting'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-accounting');
 
-		wp_register_script( 'give-magnific', $js_plugins . 'jquery.magnific-popup' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-magnific' );
+		wp_register_script('give-magnific', $js_plugins.'jquery.magnific-popup'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-magnific');
 
-		wp_register_script( 'give-checkout-global', $js_dir . 'give-donations' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-checkout-global' );
+		wp_register_script('give-checkout-global', $js_dir.'give-donations'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-checkout-global');
 
-		wp_register_script( 'give-hint.css', $js_plugins . 'give-hint.css' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-		wp_enqueue_script( 'give-hint.css' );
+		wp_register_script('give-hint.css', $js_plugins.'give-hint.css'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+		wp_enqueue_script('give-hint.css');
 
 		// General scripts.
-		wp_register_script( 'give-scripts', $js_dir . 'give' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-scripts' );
+		wp_register_script('give-scripts', $js_dir.'give'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-scripts');
 
 		// Load AJAX scripts, if enabled.
-		wp_register_script( 'give-ajax', $js_dir . 'give-ajax' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give-ajax' );
+		wp_register_script('give-ajax', $js_dir.'give-ajax'.$suffix.'.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give-ajax');
 
 		// Localize / Pass AJAX vars from PHP,
-		wp_localize_script( 'give-checkout-global', 'give_global_vars', $localize_give_vars );
-		wp_localize_script( 'give-ajax', 'give_scripts', $localize_give_ajax );
+		wp_localize_script('give-checkout-global', 'give_global_vars', $localize_give_vars);
+		wp_localize_script('give-ajax', 'give_scripts', $localize_give_ajax);
 
 	} else {
 
 		// DEBUG is OFF (one JS file to rule them all!).
-		wp_register_script( 'give', $js_dir . 'give.all.min.js', array( 'jquery' ), GIVE_VERSION, $scripts_footer );
-		wp_enqueue_script( 'give' );
+		wp_register_script('give', $js_dir.'give.all.min.js', array('jquery'), GIVE_VERSION, $scripts_footer);
+		wp_enqueue_script('give');
 
 		// Localize / Pass AJAX vars from PHP.
-		wp_localize_script( 'give', 'give_global_vars', $localize_give_vars );
-		wp_localize_script( 'give', 'give_scripts', $localize_give_ajax );
+		wp_localize_script('give', 'give_global_vars', $localize_give_vars);
+		wp_localize_script('give', 'give_scripts', $localize_give_ajax);
 
 	}
 
 }
 
-add_action( 'wp_enqueue_scripts', 'give_load_scripts' );
+add_action('wp_enqueue_scripts', 'give_load_scripts');
 
 /**
  * Register styles.
@@ -147,16 +147,16 @@ 
  */
 function give_register_styles() {
 
-	if ( ! give_is_setting_enabled( give_get_option( 'css' ) ) ) {
+	if ( ! give_is_setting_enabled(give_get_option('css'))) {
 		return;
 	}
 
-	wp_register_style( 'give-styles', give_get_stylesheet_uri(), array(), GIVE_VERSION, 'all' );
-	wp_enqueue_style( 'give-styles' );
+	wp_register_style('give-styles', give_get_stylesheet_uri(), array(), GIVE_VERSION, 'all');
+	wp_enqueue_style('give-styles');
 
 }
 
-add_action( 'wp_enqueue_scripts', 'give_register_styles' );
+add_action('wp_enqueue_scripts', 'give_register_styles');
 
 
 /**
@@ -169,19 +169,19 @@ 
 function give_get_stylesheet_uri() {
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off.
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// LTR or RTL files.
-	$direction = ( is_rtl() ) ? '-rtl' : '';
+	$direction = (is_rtl()) ? '-rtl' : '';
 
-	$file          = 'give' . $direction . $suffix . '.css';
+	$file          = 'give'.$direction.$suffix.'.css';
 	$templates_dir = give_get_theme_template_dir_name();
 
-	$child_theme_style_sheet    = trailingslashit( get_stylesheet_directory() ) . $templates_dir . $file;
-	$child_theme_style_sheet_2  = trailingslashit( get_stylesheet_directory() ) . $templates_dir . 'give' . $direction . '.css';
-	$parent_theme_style_sheet   = trailingslashit( get_template_directory() ) . $templates_dir . $file;
-	$parent_theme_style_sheet_2 = trailingslashit( get_template_directory() ) . $templates_dir . 'give' . $direction . '.css';
-	$give_plugin_style_sheet    = trailingslashit( give_get_templates_dir() ) . $file;
+	$child_theme_style_sheet    = trailingslashit(get_stylesheet_directory()).$templates_dir.$file;
+	$child_theme_style_sheet_2  = trailingslashit(get_stylesheet_directory()).$templates_dir.'give'.$direction.'.css';
+	$parent_theme_style_sheet   = trailingslashit(get_template_directory()).$templates_dir.$file;
+	$parent_theme_style_sheet_2 = trailingslashit(get_template_directory()).$templates_dir.'give'.$direction.'.css';
+	$give_plugin_style_sheet    = trailingslashit(give_get_templates_dir()).$file;
 
 	$uri = false;
 
@@ -191,23 +191,23 @@ 
 	 * followed by non minified version, even if SCRIPT_DEBUG is not enabled.
 	 * This allows users to copy just give.css to their theme.
 	 */
-	if ( file_exists( $child_theme_style_sheet ) || ( ! empty( $suffix ) && ( $nonmin = file_exists( $child_theme_style_sheet_2 ) ) ) ) {
-		if ( ! empty( $nonmin ) ) {
-			$uri = trailingslashit( get_stylesheet_directory_uri() ) . $templates_dir . 'give' . $direction . '.css';
+	if (file_exists($child_theme_style_sheet) || ( ! empty($suffix) && ($nonmin = file_exists($child_theme_style_sheet_2)))) {
+		if ( ! empty($nonmin)) {
+			$uri = trailingslashit(get_stylesheet_directory_uri()).$templates_dir.'give'.$direction.'.css';
 		} else {
-			$uri = trailingslashit( get_stylesheet_directory_uri() ) . $templates_dir . $file;
+			$uri = trailingslashit(get_stylesheet_directory_uri()).$templates_dir.$file;
 		}
-	} elseif ( file_exists( $parent_theme_style_sheet ) || ( ! empty( $suffix ) && ( $nonmin = file_exists( $parent_theme_style_sheet_2 ) ) ) ) {
-		if ( ! empty( $nonmin ) ) {
-			$uri = trailingslashit( get_template_directory_uri() ) . $templates_dir . 'give' . $direction . '.css';
+	} elseif (file_exists($parent_theme_style_sheet) || ( ! empty($suffix) && ($nonmin = file_exists($parent_theme_style_sheet_2)))) {
+		if ( ! empty($nonmin)) {
+			$uri = trailingslashit(get_template_directory_uri()).$templates_dir.'give'.$direction.'.css';
 		} else {
-			$uri = trailingslashit( get_template_directory_uri() ) . $templates_dir . $file;
+			$uri = trailingslashit(get_template_directory_uri()).$templates_dir.$file;
 		}
-	} elseif ( file_exists( $give_plugin_style_sheet ) || file_exists( $give_plugin_style_sheet ) ) {
-		$uri = trailingslashit( give_get_templates_url() ) . $file;
+	} elseif (file_exists($give_plugin_style_sheet) || file_exists($give_plugin_style_sheet)) {
+		$uri = trailingslashit(give_get_templates_url()).$file;
 	}
 
-	return apply_filters( 'give_get_stylesheet_uri', $uri );
+	return apply_filters('give_get_stylesheet_uri', $uri);
 
 }
 
@@ -224,80 +224,80 @@ 
  *
  * @return void
  */
-function give_load_admin_scripts( $hook ) {
+function give_load_admin_scripts($hook) {
 
 	global $post, $post_type;
 
 	$give_options = give_get_settings();
 
 	// Directories of assets.
-	$js_dir     = GIVE_PLUGIN_URL . 'assets/js/admin/';
-	$js_plugins = GIVE_PLUGIN_URL . 'assets/js/plugins/';
-	$css_dir    = GIVE_PLUGIN_URL . 'assets/css/';
+	$js_dir     = GIVE_PLUGIN_URL.'assets/js/admin/';
+	$js_plugins = GIVE_PLUGIN_URL.'assets/js/plugins/';
+	$css_dir    = GIVE_PLUGIN_URL.'assets/css/';
 
 	// Use minified libraries if SCRIPT_DEBUG is turned off.
-	$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+	$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 	// LTR or RTL files.
-	$direction = ( is_rtl() ) ? '-rtl' : '';
+	$direction = (is_rtl()) ? '-rtl' : '';
 
 	// Global Admin.
-	wp_register_style( 'give-admin-bar-notification', $css_dir . 'adminbar-style.css' );
-	wp_enqueue_style( 'give-admin-bar-notification' );
+	wp_register_style('give-admin-bar-notification', $css_dir.'adminbar-style.css');
+	wp_enqueue_style('give-admin-bar-notification');
 
 	// Give Admin Only.
-	if ( ! apply_filters( 'give_load_admin_scripts', give_is_admin_page(), $hook ) ) {
+	if ( ! apply_filters('give_load_admin_scripts', give_is_admin_page(), $hook)) {
 		return;
 	}
 
 	// CSS.
-	wp_register_style( 'jquery-ui-css', $css_dir . 'jquery-ui-fresh' . $suffix . '.css' );
-	wp_enqueue_style( 'jquery-ui-css' );
-	wp_register_style( 'give-admin', $css_dir . 'give-admin' . $direction . $suffix . '.css', array(), GIVE_VERSION );
-	wp_enqueue_style( 'give-admin' );
-	wp_enqueue_style( 'thickbox' );
-	wp_enqueue_style( 'wp-color-picker' );
+	wp_register_style('jquery-ui-css', $css_dir.'jquery-ui-fresh'.$suffix.'.css');
+	wp_enqueue_style('jquery-ui-css');
+	wp_register_style('give-admin', $css_dir.'give-admin'.$direction.$suffix.'.css', array(), GIVE_VERSION);
+	wp_enqueue_style('give-admin');
+	wp_enqueue_style('thickbox');
+	wp_enqueue_style('wp-color-picker');
 
 
 	// JS.
-	wp_register_script( 'give-selector-cache', $js_plugins . 'selector-cache' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-selector-cache' );
+	wp_register_script('give-selector-cache', $js_plugins.'selector-cache'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-selector-cache');
 
-	wp_register_script( 'give-ajaxify-fields', $js_plugins . 'give-ajaxify-fields' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-ajaxify-fields' );
+	wp_register_script('give-ajaxify-fields', $js_plugins.'give-ajaxify-fields'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-ajaxify-fields');
 
-	wp_register_script( 'jquery-chosen', $js_plugins . 'chosen.jquery' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION );
-	wp_enqueue_script( 'jquery-chosen' );
+	wp_register_script('jquery-chosen', $js_plugins.'chosen.jquery'.$suffix.'.js', array('jquery'), GIVE_VERSION);
+	wp_enqueue_script('jquery-chosen');
 
-	wp_register_script( 'give-accounting', $js_plugins . 'accounting' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-accounting' );
+	wp_register_script('give-accounting', $js_plugins.'accounting'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-accounting');
 
-	wp_enqueue_script( 'wp-color-picker' );
-	wp_enqueue_script( 'jquery-ui-datepicker' );
-	wp_enqueue_script( 'thickbox' );
+	wp_enqueue_script('wp-color-picker');
+	wp_enqueue_script('jquery-ui-datepicker');
+	wp_enqueue_script('thickbox');
 
-	wp_register_script( 'give-admin-scripts', $js_dir . 'admin-scripts' . $suffix . '.js', array( 'jquery', 'jquery-ui-datepicker', 'wp-color-picker', 'jquery-query' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-admin-scripts' );
+	wp_register_script('give-admin-scripts', $js_dir.'admin-scripts'.$suffix.'.js', array('jquery', 'jquery-ui-datepicker', 'wp-color-picker', 'jquery-query'), GIVE_VERSION, false);
+	wp_enqueue_script('give-admin-scripts');
 
-	wp_register_script( 'jquery-flot', $js_plugins . 'jquery.flot' . $suffix . '.js' );
-	wp_enqueue_script( 'jquery-flot' );
+	wp_register_script('jquery-flot', $js_plugins.'jquery.flot'.$suffix.'.js');
+	wp_enqueue_script('jquery-flot');
 
-	wp_register_script( 'give-repeatable-fields', $js_plugins . 'repeatable-fields' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-repeatable-fields' );
+	wp_register_script('give-repeatable-fields', $js_plugins.'repeatable-fields'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-repeatable-fields');
 
-	wp_register_script( 'give-hint.css', $js_plugins . 'give-hint.css' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-	wp_enqueue_script( 'give-hint.css' );
+	wp_register_script('give-hint.css', $js_plugins.'give-hint.css'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+	wp_enqueue_script('give-hint.css');
 
 	// Forms CPT Script.
-	if ( $post_type === 'give_forms' ) {
-		wp_register_script( 'give-admin-forms-scripts', $js_dir . 'admin-forms' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-		wp_enqueue_script( 'give-admin-forms-scripts' );
+	if ($post_type === 'give_forms') {
+		wp_register_script('give-admin-forms-scripts', $js_dir.'admin-forms'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+		wp_enqueue_script('give-admin-forms-scripts');
 	}
 
 	// Settings Scripts.
-	if ( isset( $_GET['page'] ) && $_GET['page'] == 'give-settings' ) {
-		wp_register_script( 'give-admin-settings-scripts', $js_dir . 'admin-settings' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
-		wp_enqueue_script( 'give-admin-settings-scripts' );
+	if (isset($_GET['page']) && $_GET['page'] == 'give-settings') {
+		wp_register_script('give-admin-settings-scripts', $js_dir.'admin-settings'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
+		wp_enqueue_script('give-admin-settings-scripts');
 	}
 
 	// Price Separators.
@@ -305,91 +305,91 @@ 
 	$decimal_separator  = give_get_price_decimal_separator();
 
 	// Localize strings & variables for JS.
-	wp_localize_script( 'give-admin-scripts', 'give_vars', array(
-		'post_id'                           => isset( $post->ID ) ? $post->ID : null,
+	wp_localize_script('give-admin-scripts', 'give_vars', array(
+		'post_id'                           => isset($post->ID) ? $post->ID : null,
 		'give_version'                      => GIVE_VERSION,
 		'thousands_separator'               => $thousand_separator,
 		'decimal_separator'                 => $decimal_separator,
-		'quick_edit_warning'                => __( 'Not available for variable priced forms.', 'give' ),
-		'delete_payment'                    => __( 'Are you sure you want to delete this payment?', 'give' ),
-		'delete_payment_note'               => __( 'Are you sure you want to delete this note?', 'give' ),
-		'revoke_api_key'                    => __( 'Are you sure you want to revoke this API key?', 'give' ),
-		'regenerate_api_key'                => __( 'Are you sure you want to regenerate this API key?', 'give' ),
-		'resend_receipt'                    => __( 'Are you sure you want to resend the donation receipt?', 'give' ),
-		'disconnect_user'                   => __( 'Are you sure you want to disconnect the user from this donor?', 'give' ),
-		'one_option'                        => __( 'Choose a form', 'give' ),
-		'one_or_more_option'                => __( 'Choose one or more forms', 'give' ),
-		'currency_sign'                     => give_currency_filter( '' ),
-		'currency_pos'                      => isset( $give_options['currency_position'] ) ? $give_options['currency_position'] : 'before',
+		'quick_edit_warning'                => __('Not available for variable priced forms.', 'give'),
+		'delete_payment'                    => __('Are you sure you want to delete this payment?', 'give'),
+		'delete_payment_note'               => __('Are you sure you want to delete this note?', 'give'),
+		'revoke_api_key'                    => __('Are you sure you want to revoke this API key?', 'give'),
+		'regenerate_api_key'                => __('Are you sure you want to regenerate this API key?', 'give'),
+		'resend_receipt'                    => __('Are you sure you want to resend the donation receipt?', 'give'),
+		'disconnect_user'                   => __('Are you sure you want to disconnect the user from this donor?', 'give'),
+		'one_option'                        => __('Choose a form', 'give'),
+		'one_or_more_option'                => __('Choose one or more forms', 'give'),
+		'currency_sign'                     => give_currency_filter(''),
+		'currency_pos'                      => isset($give_options['currency_position']) ? $give_options['currency_position'] : 'before',
 		'currency_decimals'                 => give_get_price_decimals(),
-		'batch_export_no_class'             => __( 'You must choose a method.', 'give' ),
-		'batch_export_no_reqs'              => __( 'Required fields not completed.', 'give' ),
-		'reset_stats_warn'                  => __( 'Are you sure you want to reset Give? This process is <strong><em>not reversible</em></strong> and will delete all data regardless of test or live mode. Please be sure you have a recent backup before proceeding.', 'give' ),
-		'delete_test_donor'                 => __( 'Are you sure you want to delete all the test donors? This process will also delete test donations as well.', 'give' ),
-		'delete_import_donor'               => __( 'Are you sure you want to delete all the imported donors? This process will also delete imported donations as well.', 'give' ),
-		'price_format_guide'                => sprintf( __( 'Please enter amount in monetary decimal ( %1$s ) format without thousand separator ( %2$s ) .', 'give' ), $decimal_separator, $thousand_separator ),
+		'batch_export_no_class'             => __('You must choose a method.', 'give'),
+		'batch_export_no_reqs'              => __('Required fields not completed.', 'give'),
+		'reset_stats_warn'                  => __('Are you sure you want to reset Give? This process is <strong><em>not reversible</em></strong> and will delete all data regardless of test or live mode. Please be sure you have a recent backup before proceeding.', 'give'),
+		'delete_test_donor'                 => __('Are you sure you want to delete all the test donors? This process will also delete test donations as well.', 'give'),
+		'delete_import_donor'               => __('Are you sure you want to delete all the imported donors? This process will also delete imported donations as well.', 'give'),
+		'price_format_guide'                => sprintf(__('Please enter amount in monetary decimal ( %1$s ) format without thousand separator ( %2$s ) .', 'give'), $decimal_separator, $thousand_separator),
 		/* translators : %s: Donation form options metabox */
-		'confirm_before_remove_row_text'    => __( 'Do you want to delete this item?', 'give' ),
-		'matched_success_failure_page'      => __( 'You cannot set the success and failed pages to the same page', 'give' ),
-		'dismiss_notice_text'               => __( 'Dismiss this notice.', 'give' ),
-		'search_placeholder'                => __( 'Type to search all forms', 'give' ),
-		'search_placeholder_donor'          => __( 'Type to search all donors', 'give' ),
-		'search_placeholder_country'        => __( 'Type to search all countries', 'give' ),
-		'search_placeholder_state'          => __( 'Type to search all states/provinces', 'give' ),
-		'unlock_donor_fields'            => __( 'To edit first name and last name, please go to user profile of the donor.', 'give' ),
-		'remove_from_bulk_delete'           => __( 'Remove from Bulk Delete', 'give' ),
+		'confirm_before_remove_row_text'    => __('Do you want to delete this item?', 'give'),
+		'matched_success_failure_page'      => __('You cannot set the success and failed pages to the same page', 'give'),
+		'dismiss_notice_text'               => __('Dismiss this notice.', 'give'),
+		'search_placeholder'                => __('Type to search all forms', 'give'),
+		'search_placeholder_donor'          => __('Type to search all donors', 'give'),
+		'search_placeholder_country'        => __('Type to search all countries', 'give'),
+		'search_placeholder_state'          => __('Type to search all states/provinces', 'give'),
+		'unlock_donor_fields'            => __('To edit first name and last name, please go to user profile of the donor.', 'give'),
+		'remove_from_bulk_delete'           => __('Remove from Bulk Delete', 'give'),
 		'donors_bulk_action'                => array(
-			'no_donor_selected'  => __( 'You must choose at least one or more donors to delete.', 'give' ),
-			'no_action_selected' => __( 'You must select a bulk action to proceed.', 'give' ),
+			'no_donor_selected'  => __('You must choose at least one or more donors to delete.', 'give'),
+			'no_action_selected' => __('You must select a bulk action to proceed.', 'give'),
 		),
 		'donations_bulk_action'             => array(
 			'delete'         => array(
-				'zero'     => __( 'You must choose at least one or more donations to delete.', 'give' ),
-				'single'   => __( 'Are you sure you want to permanently delete this donation?', 'give' ),
-				'multiple' => __( 'Are you sure you want to permanently delete the selected {payment_count} donations?', 'give' ),
+				'zero'     => __('You must choose at least one or more donations to delete.', 'give'),
+				'single'   => __('Are you sure you want to permanently delete this donation?', 'give'),
+				'multiple' => __('Are you sure you want to permanently delete the selected {payment_count} donations?', 'give'),
 			),
 			'resend-receipt' => array(
-				'zero'     => __( 'You must choose at least one or more recipients to resend the email receipt.', 'give' ),
-				'single'   => __( 'Are you sure you want to resend the email receipt to this recipient?', 'give' ),
-				'multiple' => __( 'Are you sure you want to resend the emails receipt to {payment_count} recipients?', 'give' ),
+				'zero'     => __('You must choose at least one or more recipients to resend the email receipt.', 'give'),
+				'single'   => __('Are you sure you want to resend the email receipt to this recipient?', 'give'),
+				'multiple' => __('Are you sure you want to resend the emails receipt to {payment_count} recipients?', 'give'),
 			),
 			'set-to-status'  => array(
-				'zero'     => __( 'You must choose at least one or more donations to set status to {status}.', 'give' ),
-				'single'   => __( 'Are you sure you want to set status of this donation to {status}?', 'give' ),
-				'multiple' => __( 'Are you sure you want to set status of {payment_count} donations to {status}?', 'give' ),
+				'zero'     => __('You must choose at least one or more donations to set status to {status}.', 'give'),
+				'single'   => __('Are you sure you want to set status of this donation to {status}?', 'give'),
+				'multiple' => __('Are you sure you want to set status of {payment_count} donations to {status}?', 'give'),
 			),
 		),
 		'updates' => array(
-			'ajax_error' => __( 'Please reload this page and try again', 'give' )
+			'ajax_error' => __('Please reload this page and try again', 'give')
 		),
 		'metabox_fields' => array(
 			'media' => array(
-				'button_title' => __( 'Choose Image', 'give' ),
+				'button_title' => __('Choose Image', 'give'),
 			),
 			'file'  => array(
-				'button_title' => __( 'Choose File', 'give' ),
+				'button_title' => __('Choose File', 'give'),
 			),
 		),
 		'chosen'                            => array(
-			'no_results_msg'  => __( 'No results match {search_term}', 'give' ),
-			'ajax_search_msg' => __( 'Searching results for match {search_term}', 'give' ),
+			'no_results_msg'  => __('No results match {search_term}', 'give'),
+			'ajax_search_msg' => __('Searching results for match {search_term}', 'give'),
 		),
-		'db_update_confirmation_msg_button' => __( 'Run Updates', 'give' ),
-		'db_update_confirmation_msg'        => __( 'The following process will make updates to your site\'s database. Please create a database backup before proceeding with updates.', 'give' ),
-		'error_message'                     => __( 'Something went wrong kindly try again!', 'give' ),
+		'db_update_confirmation_msg_button' => __('Run Updates', 'give'),
+		'db_update_confirmation_msg'        => __('The following process will make updates to your site\'s database. Please create a database backup before proceeding with updates.', 'give'),
+		'error_message'                     => __('Something went wrong kindly try again!', 'give'),
 		'give_donation_import'              => 'give_donation_import',
 		'core_settings_import'              => 'give_core_settings_import',
-		'setting_not_save_message'          => __( 'Changes you made may not be saved.', 'give' ),
-	) );
+		'setting_not_save_message'          => __('Changes you made may not be saved.', 'give'),
+	));
 
-	if ( function_exists( 'wp_enqueue_media' ) && version_compare( get_bloginfo( 'version' ), '3.5', '>=' ) ) {
+	if (function_exists('wp_enqueue_media') && version_compare(get_bloginfo('version'), '3.5', '>=')) {
 		// call for new media manager.
 		wp_enqueue_media();
 	}
 
 }
 
-add_action( 'admin_enqueue_scripts', 'give_load_admin_scripts', 100 );
+add_action('admin_enqueue_scripts', 'give_load_admin_scripts', 100);
 
 /**
  * Admin Give Icon
@@ -404,13 +404,13 @@ 
 	?>
 	<style type="text/css" media="screen">
 
-		<?php if ( version_compare( get_bloginfo( 'version' ), '3.8-RC', '>=' ) || version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) ) { ?>
+		<?php if (version_compare(get_bloginfo('version'), '3.8-RC', '>=') || version_compare(get_bloginfo('version'), '3.8', '>=')) { ?>
 		@font-face {
 			font-family: 'give-icomoon';
-			src: url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.eot?ngjl88'; ?>');
-			src: url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.eot?#iefixngjl88'?>') format('embedded-opentype'),
-			url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.woff?ngjl88'; ?>') format('woff'),
-			url('<?php echo GIVE_PLUGIN_URL . '/assets/fonts/icomoon.svg?ngjl88#icomoon'; ?>') format('svg');
+			src: url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.eot?ngjl88'; ?>');
+			src: url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.eot?#iefixngjl88'?>') format('embedded-opentype'),
+			url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.woff?ngjl88'; ?>') format('woff'),
+			url('<?php echo GIVE_PLUGIN_URL.'/assets/fonts/icomoon.svg?ngjl88#icomoon'; ?>') format('svg');
 			font-weight: normal;
 			font-style: normal;
 		}
@@ -429,4 +429,4 @@ 
 	<?php
 }
 
-add_action( 'admin_head', 'give_admin_icon' );
+add_action('admin_head', 'give_admin_icon');