WordImpress / Give

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

Spacing +79 added lines, -79 removed lines

@@ -21,30 +21,30 @@ 
 	 *
 	 * @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.
-		$setting_fields[] = self::get_recipient_setting_field( $email, $form_id, Give_Email_Notification_Util::has_recipient_field( $email ) );
+		$setting_fields[] = self::get_recipient_setting_field($email, $form_id, Give_Email_Notification_Util::has_recipient_field($email));
 
 		// 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);
 	}
 
 
@@ -58,11 +58,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;
 		}
 
@@ -80,7 +80,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']}",
@@ -102,8 +102,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']}",
@@ -125,25 +125,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'] );
+				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;
@@ -160,31 +160,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,
@@ -203,11 +203,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',
 		);
@@ -224,28 +224,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' )
+					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')
 				)
 			);
 
 		}
 
 		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'],
@@ -263,15 +263,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'],
 		);
@@ -291,29 +291,29 @@ 
 	 *
 	 * @return array
 	 */
-	public static function get_recipient_setting_field( Give_Email_Notification $email, $form_id = null, $edit_recipient = true ) {
+	public static function get_recipient_setting_field(Give_Email_Notification $email, $form_id = null, $edit_recipient = true) {
 		$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' ),
+			'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(
@@ -324,16 +324,16 @@ 
 
 		// Disable field if email donor has recipient field.
 		// @see https://github.com/WordImpress/Give/issues/2657
-		if ( ! $edit_recipient ) {
-			if ( 'group' == $recipient['type'] ) {
-				$recipient         = current( $recipient['fields'] );
+		if ( ! $edit_recipient) {
+			if ('group' == $recipient['type']) {
+				$recipient         = current($recipient['fields']);
 				$recipient['type'] = 'text';
 			}
 
 			$recipient['attributes']['disabled'] = 'disabled';
 			$recipient['value']                  = $recipient['default'] = '{donor_email}';
 			$recipient['repeat']                 = false;
-			$recipient['desc']                   = __( 'This email is automatically sent to the donor and the recipient cannot be customized.', 'give' );
+			$recipient['desc']                   = __('This email is automatically sent to the donor and the recipient cannot be customized.', 'give');
 		}
 
 		return $recipient;
@@ -350,12 +350,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',
 		);
 	}
@@ -372,10 +372,10 @@ 
 	 *
 	 * @return string
 	 */
-	public static function get_prefix( Give_Email_Notification $email, $form_id = null ) {
+	public static function get_prefix(Give_Email_Notification $email, $form_id = null) {
 		$meta_key = "{$email->config['id']}_";
 
-		if ( $form_id || give_is_add_new_form_page() ) {
+		if ($form_id || give_is_add_new_form_page()) {
 			$meta_key = "_give_{$email->config['id']}_";
 		}
 

includes/admin/plugins.php

Spacing +75 added lines, -76 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,19 +23,19 @@ 
  *
  * @return array An array of updated action links.
  */
-function give_plugin_action_links( $actions ) {
+function give_plugin_action_links($actions) {
 	$new_actions = array(
 		'settings' => sprintf(
 			'<a href="%1$s">%2$s</a>',
-			admin_url( 'edit.php?post_type=give_forms&page=give-settings' ),
-			__( 'Settings', 'give' )
+			admin_url('edit.php?post_type=give_forms&page=give-settings'),
+			__('Settings', 'give')
 		),
 	);
 
-	return array_merge( $new_actions, $actions );
+	return array_merge($new_actions, $actions);
 }
 
-add_filter( 'plugin_action_links_' . GIVE_PLUGIN_BASENAME, 'give_plugin_action_links' );
+add_filter('plugin_action_links_'.GIVE_PLUGIN_BASENAME, 'give_plugin_action_links');
 
 
 /**
@@ -48,8 +48,8 @@ 
  *
  * @return array
  */
-function give_plugin_row_meta( $plugin_meta, $plugin_file ) {
-	if ( GIVE_PLUGIN_BASENAME !== $plugin_file ) {
+function give_plugin_row_meta($plugin_meta, $plugin_file) {
+	if (GIVE_PLUGIN_BASENAME !== $plugin_file) {
 		return $plugin_meta;
 	}
 
@@ -65,7 +65,7 @@ 
 					), 'https://givewp.com/documentation/'
 				)
 			),
-			__( 'Documentation', 'give' )
+			__('Documentation', 'give')
 		),
 		sprintf(
 			'<a href="%1$s" target="_blank">%2$s</a>',
@@ -78,14 +78,14 @@ 
 					), 'https://givewp.com/addons/'
 				)
 			),
-			__( 'Add-ons', 'give' )
+			__('Add-ons', 'give')
 		),
 	);
 
-	return array_merge( $plugin_meta, $new_meta_links );
+	return array_merge($plugin_meta, $new_meta_links);
 }
 
-add_filter( 'plugin_row_meta', 'give_plugin_row_meta', 10, 2 );
+add_filter('plugin_row_meta', 'give_plugin_row_meta', 10, 2);
 
 
 /**
@@ -103,19 +103,18 @@ 
 	$title = '';
 	global $submenu, $plugin_page;
 
-	foreach ( array_keys( $submenu ) as $parent ) {
-		if ( 'edit.php?post_type=give_forms' !== $parent ) {
+	foreach (array_keys($submenu) as $parent) {
+		if ('edit.php?post_type=give_forms' !== $parent) {
 			continue;
 		}
 
-		foreach ( $submenu[ $parent ] as $submenu_array ) {
-			if ( $plugin_page !== $submenu_array[2] ) {
+		foreach ($submenu[$parent] as $submenu_array) {
+			if ($plugin_page !== $submenu_array[2]) {
 				continue;
 			}
 
-			$title = isset( $submenu_array[0] ) ?
-				$submenu_array[0] :
-				$submenu_array[3];
+			$title = isset($submenu_array[0]) ?
+				$submenu_array[0] : $submenu_array[3];
 		}
 	}
 
@@ -129,11 +128,11 @@ 
  */
 function give_recently_activated_addons() {
 	// Check if action is set.
-	if ( isset( $_REQUEST['action'] ) ) {
-		$plugin_action = ( '-1' !== $_REQUEST['action'] ) ? $_REQUEST['action'] : ( isset( $_REQUEST['action2'] ) ? $_REQUEST['action2'] : '' );
+	if (isset($_REQUEST['action'])) {
+		$plugin_action = ('-1' !== $_REQUEST['action']) ? $_REQUEST['action'] : (isset($_REQUEST['action2']) ? $_REQUEST['action2'] : '');
 		$plugins       = array();
 
-		switch ( $plugin_action ) {
+		switch ($plugin_action) {
 			case 'activate': // Single add-on activation.
 				$plugins[] = $_REQUEST['plugin'];
 				break;
@@ -142,25 +141,25 @@ 
 				break;
 		}
 
-		if ( ! empty( $plugins ) ) {
+		if ( ! empty($plugins)) {
 			$give_addons = array();
-			foreach ( $plugins as $plugin ) {
+			foreach ($plugins as $plugin) {
 				// Get plugins which has 'Give-' as prefix.
-				if ( stripos( $plugin, 'Give-' ) !== false ) {
+				if (stripos($plugin, 'Give-') !== false) {
 					$give_addons[] = $plugin;
 				}
 			}
 
-			if ( ! empty( $give_addons ) ) {
+			if ( ! empty($give_addons)) {
 				// Update the Give's activated add-ons.
-				update_option( 'give_recently_activated_addons', $give_addons );
+				update_option('give_recently_activated_addons', $give_addons);
 			}
 		}
 	}
 }
 
 // Add add-on plugins to wp option table.
-add_action( 'activated_plugin', 'give_recently_activated_addons', 10 );
+add_action('activated_plugin', 'give_recently_activated_addons', 10);
 
 /**
  * Create new menu in plugin section that include all the add-on
@@ -171,19 +170,19 @@ 
  *
  * @return mixed
  */
-function give_filter_addons_do_filter_addons( $plugin_menu ) {
+function give_filter_addons_do_filter_addons($plugin_menu) {
 	global $plugins;
 
-	foreach ( $plugins['all'] as $plugin_slug => $plugin_data ) {
+	foreach ($plugins['all'] as $plugin_slug => $plugin_data) {
 
-		if ( false !== strpos( $plugin_data['Name'], 'Give' ) && false !== strpos( $plugin_data['AuthorName'], 'WordImpress' ) ) {
-			$plugins['give'][ $plugin_slug ]           = $plugins['all'][ $plugin_slug ];
-			$plugins['give'][ $plugin_slug ]['plugin'] = $plugin_slug;
+		if (false !== strpos($plugin_data['Name'], 'Give') && false !== strpos($plugin_data['AuthorName'], 'WordImpress')) {
+			$plugins['give'][$plugin_slug]           = $plugins['all'][$plugin_slug];
+			$plugins['give'][$plugin_slug]['plugin'] = $plugin_slug;
 			// replicate the next step.
-			if ( current_user_can( 'update_plugins' ) ) {
-				$current = get_site_transient( 'update_plugins' );
-				if ( isset( $current->response[ $plugin_slug ] ) ) {
-					$plugins['give'][ $plugin_slug ]['update'] = true;
+			if (current_user_can('update_plugins')) {
+				$current = get_site_transient('update_plugins');
+				if (isset($current->response[$plugin_slug])) {
+					$plugins['give'][$plugin_slug]['update'] = true;
 				}
 			}
 		}
@@ -193,7 +192,7 @@ 
 
 }
 
-add_filter( 'show_advanced_plugins', 'give_filter_addons_do_filter_addons' );
+add_filter('show_advanced_plugins', 'give_filter_addons_do_filter_addons');
 
 /**
  * Make the Give Menu as an default menu and update the Menu Name
@@ -204,29 +203,29 @@ 
  *
  * @return mixed
  */
-function give_filter_addons_filter_addons( $views ) {
+function give_filter_addons_filter_addons($views) {
 
 	global $status, $plugins;
 
-	if ( ! empty( $plugins['give'] ) ) {
+	if ( ! empty($plugins['give'])) {
 		$class = '';
 
-		if ( 'give' === $status ) {
+		if ('give' === $status) {
 			$class = 'current';
 		}
 
 		$views['give'] = sprintf(
 			'<a class="%s" href="plugins.php?plugin_status=give"> %s <span class="count">(%s) </span></a>',
 			$class,
-			__( 'Give', 'give' ),
-			count( $plugins['give'] )
+			__('Give', 'give'),
+			count($plugins['give'])
 		);
 	}
 
 	return $views;
 }
 
-add_filter( 'views_plugins', 'give_filter_addons_filter_addons' );
+add_filter('views_plugins', 'give_filter_addons_filter_addons');
 
 /**
  * Set the Give as the Main menu when admin click on the Give Menu in Plugin section.
@@ -237,17 +236,17 @@ 
  *
  * @return mixed
  */
-function give_prepare_filter_addons( $plugins ) {
+function give_prepare_filter_addons($plugins) {
 	global $status;
 
-	if ( isset( $_REQUEST['plugin_status'] ) && 'give' === $_REQUEST['plugin_status'] ) {
+	if (isset($_REQUEST['plugin_status']) && 'give' === $_REQUEST['plugin_status']) {
 		$status = 'give';
 	}
 
 	return $plugins;
 }
 
-add_filter( 'all_plugins', 'give_prepare_filter_addons' );
+add_filter('all_plugins', 'give_prepare_filter_addons');
 
 
 /**
@@ -258,26 +257,26 @@ 
  *
  * @since 2.1
  */
-function give_in_plugin_update_message( $data, $response ) {
+function give_in_plugin_update_message($data, $response) {
 	$new_version           = $data['new_version'];
-	$current_version_parts = explode( '.', GIVE_VERSION );
-	$new_version_parts     = explode( '.', $new_version );
+	$current_version_parts = explode('.', GIVE_VERSION);
+	$new_version_parts     = explode('.', $new_version);
 
 	// If it is a minor upgrade then return.
-	if ( version_compare( $current_version_parts[0] . '.' . $current_version_parts[1], $new_version_parts[0] . '.' . $new_version_parts[1], '=' ) ) {
+	if (version_compare($current_version_parts[0].'.'.$current_version_parts[1], $new_version_parts[0].'.'.$new_version_parts[1], '=')) {
 
 		return;
 	}
 
 	// Get the upgrade notice from the trunk.
-	$upgrade_notice = give_get_plugin_upgrade_notice( $new_version );
+	$upgrade_notice = give_get_plugin_upgrade_notice($new_version);
 
 	// Display upgrade notice.
-	echo apply_filters( 'give_in_plugin_update_message', $upgrade_notice ? '</p>' . wp_kses_post( $upgrade_notice ) . '<p class="dummy">' : '' );
+	echo apply_filters('give_in_plugin_update_message', $upgrade_notice ? '</p>'.wp_kses_post($upgrade_notice).'<p class="dummy">' : '');
 }
 
 // Display upgrade notice.
-add_action( 'in_plugin_update_message-Give/give.php', 'give_in_plugin_update_message', 10, 2 );
+add_action('in_plugin_update_message-Give/give.php', 'give_in_plugin_update_message', 10, 2);
 
 
 /**
@@ -291,18 +290,18 @@ 
  *
  * @return string
  */
-function give_get_plugin_upgrade_notice( $new_version ) {
+function give_get_plugin_upgrade_notice($new_version) {
 
 	// Cache the upgrade notice.
 	$transient_name = "give_upgrade_notice_{$new_version}";
-	$upgrade_notice = get_transient( $transient_name );
+	$upgrade_notice = get_transient($transient_name);
 
-	if ( false === $upgrade_notice ) {
-		$response = wp_safe_remote_get( 'https://plugins.svn.wordpress.org/give/trunk/readme.txt' );
+	if (false === $upgrade_notice) {
+		$response = wp_safe_remote_get('https://plugins.svn.wordpress.org/give/trunk/readme.txt');
 
-		if ( ! is_wp_error( $response ) && ! empty( $response['body'] ) ) {
-			$upgrade_notice = give_parse_plugin_update_notice( $response['body'], $new_version );
-			set_transient( $transient_name, $upgrade_notice, DAY_IN_SECONDS );
+		if ( ! is_wp_error($response) && ! empty($response['body'])) {
+			$upgrade_notice = give_parse_plugin_update_notice($response['body'], $new_version);
+			set_transient($transient_name, $upgrade_notice, DAY_IN_SECONDS);
 		}
 	}
 
@@ -322,34 +321,34 @@ 
  *
  * @return string
  */
-function give_parse_plugin_update_notice( $content, $new_version ) {
-	$version_parts     = explode( '.', $new_version );
+function give_parse_plugin_update_notice($content, $new_version) {
+	$version_parts     = explode('.', $new_version);
 	$check_for_notices = array(
-		$version_parts[0] . '.0',
-		$version_parts[0] . '.0.0',
-		$version_parts[0] . '.' . $version_parts[1],
+		$version_parts[0].'.0',
+		$version_parts[0].'.0.0',
+		$version_parts[0].'.'.$version_parts[1],
 	);
 
 	// Regex to extract Upgrade notice from the readme.txt file.
-	$notice_regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( $new_version ) . '\s*=|$)~Uis';
+	$notice_regexp = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote($new_version).'\s*=|$)~Uis';
 
 	$upgrade_notice = '';
 
-	foreach ( $check_for_notices as $check_version ) {
-		if ( version_compare( GIVE_VERSION, $check_version, '>' ) ) {
+	foreach ($check_for_notices as $check_version) {
+		if (version_compare(GIVE_VERSION, $check_version, '>')) {
 			continue;
 		}
 
 		$matches = null;
 
-		if ( preg_match( $notice_regexp, $content, $matches ) ) {
-			$notices = (array) preg_split( '~[\r\n]+~', trim( $matches[2] ) );
+		if (preg_match($notice_regexp, $content, $matches)) {
+			$notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));
 
-			if ( version_compare( trim( $matches[1] ), $check_version, '=' ) ) {
+			if (version_compare(trim($matches[1]), $check_version, '=')) {
 				$upgrade_notice .= '<p class="give-plugin-upgrade-notice">';
 
-				foreach ( $notices as $index => $line ) {
-					$upgrade_notice .= preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line );
+				foreach ($notices as $index => $line) {
+					$upgrade_notice .= preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line);
 				}
 
 				$upgrade_notice .= '</p>';
@@ -359,7 +358,7 @@ 
 		}
 	}
 
-	return wp_kses_post( $upgrade_notice );
+	return wp_kses_post($upgrade_notice);
 }
 
 
@@ -396,4 +395,4 @@ 
 <?php
 }
 
-add_action( 'admin_head', 'give_plugin_notice_css' );
+add_action('admin_head', 'give_plugin_notice_css');

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

Braces +5 added lines, -2 removed lines

@@ -618,8 +618,11 @@
 				<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>
-			<?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 +247 added lines, -254 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 ? '%' : ''
 			);
 
@@ -244,41 +243,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')
 		);
 	}
 
@@ -293,13 +291,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( admin_url( 'edit.php?post_type=give_forms&page=give-updates&give-db-update-completed=give_db_upgrade_completed' ) );
+			wp_redirect(admin_url('edit.php?post_type=give_forms&page=give-updates&give-db-update-completed=give_db_upgrade_completed'));
 			exit();
 		}
 	}
@@ -315,15 +313,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()
 			)
 
@@ -331,13 +329,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;
 		}
 
@@ -346,25 +344,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;
 	}
@@ -381,31 +379,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();
 		}
@@ -421,53 +419,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)]);
 						}
 					}
 				}
@@ -477,52 +475,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();
@@ -533,31 +531,31 @@ 
 		/**
 		 * Fix give_doing_upgrade option
 		 */
-		if( $fresh_new_db_count = $this->get_total_new_db_update_count( true ) ) {
-			update_option( 'give_db_update_count', $fresh_new_db_count );
+		if ($fresh_new_db_count = $this->get_total_new_db_update_count(true)) {
+			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 (
-			empty( $doing_upgrade_args['update_info'] )
-			|| give_has_upgrade_completed( $doing_upgrade_args['update_info']['id'] )
+			empty($doing_upgrade_args['update_info'])
+			|| give_has_upgrade_completed($doing_upgrade_args['update_info']['id'])
 		) {
-			$doing_upgrade_args['update_info'] = current( array_values( $batch->data ) );
+			$doing_upgrade_args['update_info'] = current(array_values($batch->data));
 			$doing_upgrade_args['step']        = 1;
 		}
 
 		// Check if dependency completed or not.
-		if ( isset( $doing_upgrade_args['update_info']['depend'] ) ) {
-			foreach ( $doing_upgrade_args['update_info']['depend'] as $depend ) {
-				if ( give_has_upgrade_completed( $depend ) ) {
+		if (isset($doing_upgrade_args['update_info']['depend'])) {
+			foreach ($doing_upgrade_args['update_info']['depend'] as $depend) {
+				if (give_has_upgrade_completed($depend)) {
 					continue;
 				}
 
-				$doing_upgrade_args['update_info']      = $all_updates[ array_search( $depend, $all_update_ids ) ];
+				$doing_upgrade_args['update_info']      = $all_updates[array_search($depend, $all_update_ids)];
 				$doing_upgrade_args['step']             = 1;
 				$doing_upgrade_args['percentage']       = 0;
 				$doing_upgrade_args['total_percentage'] = 0;
@@ -566,14 +564,14 @@ 
 			}
 		}
 
-		if( ! empty( $doing_upgrade_args['update_info'] ) ) {
-			update_option( 'give_doing_upgrade', $doing_upgrade_args );
+		if ( ! empty($doing_upgrade_args['update_info'])) {
+			update_option('give_doing_upgrade', $doing_upgrade_args);
 
-			$log_data .= 'Updated doing update:' . "\n";
-			$log_data .= print_r( $doing_upgrade_args, true ) . "\n";
+			$log_data .= 'Updated doing update:'."\n";
+			$log_data .= print_r($doing_upgrade_args, true)."\n";
 		}
 
-		Give()->logs->add( 'Update Health Check', $log_data, 0, 'update' );
+		Give()->logs->add('Update Health Check', $log_data, 0, 'update');
 	}
 
 
@@ -587,61 +585,61 @@ 
 		$current_screen = get_current_screen();
 
 		// 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 ( in_array( $current_screen->base, array( 'give_forms_page_give-updates', 'update-core' ) ) ) {
+		if (in_array($current_screen->base, array('give_forms_page_give-updates', 'update-core'))) {
 			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>
 			<?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,
 				)
 			);
@@ -650,40 +648,40 @@ 
 		}
 
 		// 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>
 			<?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,
-			) );
+			));
 		}
 	}
 
@@ -694,7 +692,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';
 	}
 
 	/**
@@ -704,7 +702,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';
 	}
 
 	/**
@@ -715,26 +713,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();
 	}
@@ -748,14 +746,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;
 	}
 
 
@@ -770,7 +767,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();
@@ -778,7 +775,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();
 		}
 
@@ -797,34 +794,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' ),
+				'message'    => __('The updates have been paused.', 'give'),
 				'heading'    => '',
 				'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 ) || ! $this->get_total_new_db_update_count( true ) ) {
+		} elseif (empty($update_info) || ! $this->get_total_new_db_update_count(true)) {
 			$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);
 	}
 
 	/**
@@ -836,7 +833,7 @@ 
 	 * @param        $data
 	 * @param string $type
 	 */
-	public function send_ajax_response( $data, $type = '' ) {
+	public function send_ajax_response($data, $type = '') {
 		$default = array(
 			'message'    => '',
 			'heading'    => '',
@@ -846,24 +843,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;
 		}
 	}
@@ -877,12 +874,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;
 	}
 
 	/**
@@ -895,22 +892,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;
 			}
@@ -927,7 +924,7 @@ 
 	 * @return bool
 	 */
 	public function is_doing_updates() {
-		return (bool) get_option( 'give_doing_upgrade' );
+		return (bool) get_option('give_doing_upgrade');
 	}
 
 
@@ -941,7 +938,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' );
 		//
@@ -967,33 +964,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;
@@ -1010,7 +1007,7 @@ 
 	 * @return int
 	 */
 	public function get_total_plugin_update_count() {
-		return count( $this->get_updates( 'plugin' ) );
+		return count($this->get_updates('plugin'));
 	}
 
 	/**
@@ -1025,7 +1022,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);
 	}
 
 	/**
@@ -1037,7 +1034,7 @@ 
 	 * @return int
 	 */
 	public function get_pending_db_update_count() {
-		return count( $this->get_updates( 'database', 'new' ) );
+		return count($this->get_updates('database', 'new'));
 	}
 
 	/**
@@ -1049,7 +1046,7 @@ 
 	 * @return int
 	 */
 	public function get_total_db_update_count() {
-		return count( $this->get_updates( 'database', 'all' ) );
+		return count($this->get_updates('database', 'all'));
 	}
 
 	/**
@@ -1062,10 +1059,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;
 	}
@@ -1080,11 +1076,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'];
 		}
 
@@ -1101,25 +1097,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;
 	}
 
 
@@ -1131,8 +1125,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;
 	}
@@ -1147,10 +1141,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/upgrade-functions.php

Spacing +480 added lines, -480 removed lines

@@ -13,7 +13,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,70 +25,70 @@ 
  */
 function give_do_automatic_upgrades() {
 	$did_upgrade  = false;
-	$give_version = preg_replace( '/[^0-9.].*/', '', get_option( 'give_version' ) );
+	$give_version = preg_replace('/[^0-9.].*/', '', get_option('give_version'));
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it.
 		$give_version = '1.0';
 	}
 
-	switch ( true ) {
+	switch (true) {
 
-		case version_compare( $give_version, '1.6', '<' ) :
+		case version_compare($give_version, '1.6', '<') :
 			give_v16_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.7', '<' ) :
+		case version_compare($give_version, '1.7', '<') :
 			give_v17_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.8', '<' ) :
+		case version_compare($give_version, '1.8', '<') :
 			give_v18_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.8.7', '<' ) :
+		case version_compare($give_version, '1.8.7', '<') :
 			give_v187_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.8.8', '<' ) :
+		case version_compare($give_version, '1.8.8', '<') :
 			give_v188_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.8.9', '<' ) :
+		case version_compare($give_version, '1.8.9', '<') :
 			give_v189_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.8.12', '<' ) :
+		case version_compare($give_version, '1.8.12', '<') :
 			give_v1812_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.8.13', '<' ) :
+		case version_compare($give_version, '1.8.13', '<') :
 			give_v1813_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.8.17', '<' ) :
+		case version_compare($give_version, '1.8.17', '<') :
 			give_v1817_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '1.8.18', '<' ) :
+		case version_compare($give_version, '1.8.18', '<') :
 			give_v1818_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '2.0', '<' ) :
+		case version_compare($give_version, '2.0', '<') :
 			give_v20_upgrades();
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '2.0.1', '<' ) :
+		case version_compare($give_version, '2.0.1', '<') :
 			// Do nothing on fresh install.
-			if ( ! doing_action( 'give_upgrades' ) ) {
+			if ( ! doing_action('give_upgrades')) {
 				give_v201_create_tables();
-				Give_Updates::get_instance()->__health_background_update( Give_Updates::get_instance() );
+				Give_Updates::get_instance()->__health_background_update(Give_Updates::get_instance());
 				Give_Updates::$background_updater->dispatch();
 			}
 
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '2.0.2', '<' ) :
+		case version_compare($give_version, '2.0.2', '<') :
 			// Remove 2.0.1 update to rerun on 2.0.2
 			$completed_upgrades = give_get_completed_upgrades();
 			$v201_updates       = array(
@@ -98,35 +98,35 @@ 
 				'v201_logs_upgrades',
 			);
 
-			foreach ( $v201_updates as $v201_update ) {
-				if ( in_array( $v201_update, $completed_upgrades ) ) {
-					unset( $completed_upgrades[ array_search( $v201_update, $completed_upgrades ) ] );
+			foreach ($v201_updates as $v201_update) {
+				if (in_array($v201_update, $completed_upgrades)) {
+					unset($completed_upgrades[array_search($v201_update, $completed_upgrades)]);
 				}
 			}
 
-			update_option( 'give_completed_upgrades', $completed_upgrades );
+			update_option('give_completed_upgrades', $completed_upgrades);
 
 			// Do nothing on fresh install.
-			if ( ! doing_action( 'give_upgrades' ) ) {
+			if ( ! doing_action('give_upgrades')) {
 				give_v201_create_tables();
-				Give_Updates::get_instance()->__health_background_update( Give_Updates::get_instance() );
+				Give_Updates::get_instance()->__health_background_update(Give_Updates::get_instance());
 				Give_Updates::$background_updater->dispatch();
 			}
 
 			$did_upgrade = true;
 
-		case version_compare( $give_version, '2.0.3', '<' ) :
+		case version_compare($give_version, '2.0.3', '<') :
 			give_v203_upgrades();
 			$did_upgrade = true;
 	}
 
-	if ( $did_upgrade ) {
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
+	if ($did_upgrade) {
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
 	}
 }
 
-add_action( 'admin_init', 'give_do_automatic_upgrades' );
-add_action( 'give_upgrades', 'give_do_automatic_upgrades' );
+add_action('admin_init', 'give_do_automatic_upgrades');
+add_action('give_upgrades', 'give_do_automatic_upgrades');
 
 /**
  * Display Upgrade Notices.
@@ -140,7 +140,7 @@ 
  *
  * @return void
  */
-function give_show_upgrade_notices( $give_updates ) {
+function give_show_upgrade_notices($give_updates) {
 	// v1.3.2 Upgrades
 	$give_updates->register(
 		array(
@@ -206,32 +206,32 @@ 
 	);
 
 	// v1.8.17 Upgrades for donations.
-	$give_updates->register( array(
+	$give_updates->register(array(
 		'id'       => 'v1817_update_donation_iranian_currency_code',
 		'version'  => '1.8.17',
 		'callback' => 'give_v1817_update_donation_iranian_currency_code',
-	) );
+	));
 
 	// v1.8.17 Upgrades for cleanup of user roles.
-	$give_updates->register( array(
+	$give_updates->register(array(
 		'id'       => 'v1817_cleanup_user_roles',
 		'version'  => '1.8.17',
 		'callback' => 'give_v1817_cleanup_user_roles',
-	) );
+	));
 
 	// v1.8.18 Upgrades for assigning custom amount to existing set donations.
-	$give_updates->register( array(
+	$give_updates->register(array(
 		'id'       => 'v1818_assign_custom_amount_set_donation',
 		'version'  => '1.8.18',
 		'callback' => 'give_v1818_assign_custom_amount_set_donation',
-	) );
+	));
 
 	// v1.8.18 Cleanup the Give Worker Role Caps.
-	$give_updates->register( array(
+	$give_updates->register(array(
 		'id'       => 'v1818_give_worker_role_cleanup',
 		'version'  => '1.8.18',
 		'callback' => 'give_v1818_give_worker_role_cleanup',
-	) );
+	));
 
 	// v2.0.0 Upgrades
 	$give_updates->register(
@@ -285,7 +285,7 @@ 
 			'id'       => 'v20_move_metadata_into_new_table',
 			'version'  => '2.0.0',
 			'callback' => 'give_v20_move_metadata_into_new_table_callback',
-			'depend'   => array( 'v20_upgrades_payment_metadata', 'v20_upgrades_form_metadata' ),
+			'depend'   => array('v20_upgrades_payment_metadata', 'v20_upgrades_form_metadata'),
 		)
 	);
 
@@ -331,7 +331,7 @@ 
 			'id'       => 'v201_move_metadata_into_new_table',
 			'version'  => '2.0.1',
 			'callback' => 'give_v201_move_metadata_into_new_table_callback',
-			'depend'   => array( 'v201_upgrades_payment_metadata', 'v201_add_missing_donors' ),
+			'depend'   => array('v201_upgrades_payment_metadata', 'v201_add_missing_donors'),
 		)
 	);
 
@@ -355,7 +355,7 @@ 
 
 }
 
-add_action( 'give_register_updates', 'give_show_upgrade_notices' );
+add_action('give_register_updates', 'give_show_upgrade_notices');
 
 /**
  * Triggers all upgrade functions
@@ -367,29 +367,29 @@ 
  */
 function give_trigger_upgrades() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
-		wp_die( esc_html__( 'You do not have permission to do Give upgrades.', 'give' ), esc_html__( 'Error', 'give' ), array(
+	if ( ! current_user_can('manage_give_settings')) {
+		wp_die(esc_html__('You do not have permission to do Give upgrades.', 'give'), esc_html__('Error', 'give'), array(
 			'response' => 403,
-		) );
+		));
 	}
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it.
 		$give_version = '1.0';
-		add_option( 'give_version', $give_version );
+		add_option('give_version', $give_version);
 	}
 
-	update_option( 'give_version', GIVE_VERSION );
-	delete_option( 'give_doing_upgrade' );
+	update_option('give_version', GIVE_VERSION);
+	delete_option('give_doing_upgrade');
 
-	if ( DOING_AJAX ) {
-		die( 'complete' );
+	if (DOING_AJAX) {
+		die('complete');
 	} // End if().
 }
 
-add_action( 'wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades' );
+add_action('wp_ajax_give_trigger_upgrades', 'give_trigger_upgrades');
 
 
 /**
@@ -407,10 +407,10 @@ 
 
 	// UPDATE DB METAKEYS.
 	$sql   = "UPDATE $wpdb->postmeta SET meta_key = '_give_payment_customer_id' WHERE meta_key = '_give_payment_donor_id'";
-	$query = $wpdb->query( $sql );
+	$query = $wpdb->query($sql);
 
 	$give_updates->percentage = 100;
-	give_set_upgrade_complete( 'upgrade_give_payment_customer_id' );
+	give_set_upgrade_complete('upgrade_give_payment_customer_id');
 }
 
 
@@ -434,24 +434,24 @@ 
 	$where  .= "AND ( p.post_status = 'abandoned' )";
 	$where  .= "AND ( m.meta_key = '_give_payment_gateway' AND m.meta_value = 'offline' )";
 
-	$sql            = $select . $join . $where;
-	$found_payments = $wpdb->get_col( $sql );
+	$sql            = $select.$join.$where;
+	$found_payments = $wpdb->get_col($sql);
 
-	foreach ( $found_payments as $payment ) {
+	foreach ($found_payments as $payment) {
 
 		// Only change ones marked abandoned since our release last week because the admin may have marked some abandoned themselves.
-		$modified_time = get_post_modified_time( 'U', false, $payment );
+		$modified_time = get_post_modified_time('U', false, $payment);
 
 		// 1450124863 =  12/10/2015 20:42:25.
-		if ( $modified_time >= 1450124863 ) {
+		if ($modified_time >= 1450124863) {
 
-			give_update_payment_status( $payment, 'pending' );
+			give_update_payment_status($payment, 'pending');
 
 		}
 	}
 
 	$give_updates->percentage = 100;
-	give_set_upgrade_complete( 'upgrade_give_offline_status' );
+	give_set_upgrade_complete('upgrade_give_offline_status');
 }
 
 
@@ -464,17 +464,17 @@ 
  */
 function give_v152_cleanup_users() {
 
-	$give_version = get_option( 'give_version' );
+	$give_version = get_option('give_version');
 
-	if ( ! $give_version ) {
+	if ( ! $give_version) {
 		// 1.0 is the first version to use this option so we must add it.
 		$give_version = '1.0';
 	}
 
-	$give_version = preg_replace( '/[^0-9.].*/', '', $give_version );
+	$give_version = preg_replace('/[^0-9.].*/', '', $give_version);
 
 	// v1.5.2 Upgrades
-	if ( version_compare( $give_version, '1.5.2', '<' ) || ! give_has_upgrade_completed( 'upgrade_give_user_caps_cleanup' ) ) {
+	if (version_compare($give_version, '1.5.2', '<') || ! give_has_upgrade_completed('upgrade_give_user_caps_cleanup')) {
 
 		// Delete all caps with "ss".
 		// Also delete all unused "campaign" roles.
@@ -521,9 +521,9 @@ 
 		);
 
 		global $wp_roles;
-		foreach ( $delete_caps as $cap ) {
-			foreach ( array_keys( $wp_roles->roles ) as $role ) {
-				$wp_roles->remove_cap( $role, $cap );
+		foreach ($delete_caps as $cap) {
+			foreach (array_keys($wp_roles->roles) as $role) {
+				$wp_roles->remove_cap($role, $cap);
 			}
 		}
 
@@ -533,15 +533,15 @@ 
 		$roles->add_caps();
 
 		// The Update Ran.
-		update_option( 'give_version', preg_replace( '/[^0-9.].*/', '', GIVE_VERSION ) );
-		give_set_upgrade_complete( 'upgrade_give_user_caps_cleanup' );
-		delete_option( 'give_doing_upgrade' );
+		update_option('give_version', preg_replace('/[^0-9.].*/', '', GIVE_VERSION));
+		give_set_upgrade_complete('upgrade_give_user_caps_cleanup');
+		delete_option('give_doing_upgrade');
 
 	}// End if().
 
 }
 
-add_action( 'admin_init', 'give_v152_cleanup_users' );
+add_action('admin_init', 'give_v152_cleanup_users');
 
 /**
  * 1.6 Upgrade routine to create the customer meta table.
@@ -584,53 +584,53 @@ 
 
 	// Get addons license key.
 	$addons = array();
-	foreach ( $give_options as $key => $value ) {
-		if ( false !== strpos( $key, '_license_key' ) ) {
-			$addons[ $key ] = $value;
+	foreach ($give_options as $key => $value) {
+		if (false !== strpos($key, '_license_key')) {
+			$addons[$key] = $value;
 		}
 	}
 
 	// Bailout: We do not have any addon license data to upgrade.
-	if ( empty( $addons ) ) {
+	if (empty($addons)) {
 		return false;
 	}
 
-	foreach ( $addons as $key => $addon_license ) {
+	foreach ($addons as $key => $addon_license) {
 
 		// Get addon shortname.
-		$shortname = str_replace( '_license_key', '', $key );
+		$shortname = str_replace('_license_key', '', $key);
 
 		// Addon license option name.
-		$addon_license_option_name = $shortname . '_license_active';
+		$addon_license_option_name = $shortname.'_license_active';
 
 		// bailout if license is empty.
-		if ( empty( $addon_license ) ) {
-			delete_option( $addon_license_option_name );
+		if (empty($addon_license)) {
+			delete_option($addon_license_option_name);
 			continue;
 		}
 
 		// Get addon name.
 		$addon_name       = array();
-		$addon_name_parts = explode( '_', str_replace( 'give_', '', $shortname ) );
-		foreach ( $addon_name_parts as $name_part ) {
+		$addon_name_parts = explode('_', str_replace('give_', '', $shortname));
+		foreach ($addon_name_parts as $name_part) {
 
 			// Fix addon name
-			switch ( $name_part ) {
+			switch ($name_part) {
 				case 'authorizenet' :
 					$name_part = 'authorize.net';
 					break;
 			}
 
-			$addon_name[] = ucfirst( $name_part );
+			$addon_name[] = ucfirst($name_part);
 		}
 
-		$addon_name = implode( ' ', $addon_name );
+		$addon_name = implode(' ', $addon_name);
 
 		// Data to send to the API.
 		$api_params = array(
 			'edd_action' => 'activate_license', // never change from "edd_" to "give_"!
 			'license'    => $addon_license,
-			'item_name'  => urlencode( $addon_name ),
+			'item_name'  => urlencode($addon_name),
 			'url'        => home_url(),
 		);
 
@@ -645,17 +645,17 @@ 
 		);
 
 		// Make sure there are no errors.
-		if ( is_wp_error( $response ) ) {
-			delete_option( $addon_license_option_name );
+		if (is_wp_error($response)) {
+			delete_option($addon_license_option_name);
 			continue;
 		}
 
 		// Tell WordPress to look for updates.
-		set_site_transient( 'update_plugins', null );
+		set_site_transient('update_plugins', null);
 
 		// Decode license data.
-		$license_data = json_decode( wp_remote_retrieve_body( $response ) );
-		update_option( $addon_license_option_name, $license_data );
+		$license_data = json_decode(wp_remote_retrieve_body($response));
+		update_option($addon_license_option_name, $license_data);
 	}// End foreach().
 }
 
@@ -685,9 +685,9 @@ 
 	);
 
 	global $wp_roles;
-	foreach ( $delete_caps as $cap ) {
-		foreach ( array_keys( $wp_roles->roles ) as $role ) {
-			$wp_roles->remove_cap( $role, $cap );
+	foreach ($delete_caps as $cap) {
+		foreach (array_keys($wp_roles->roles) as $role) {
+			$wp_roles->remove_cap($role, $cap);
 		}
 	}
 
@@ -721,7 +721,7 @@ 
 function give_v18_upgrades_core_setting() {
 	// Core settings which changes from checkbox to radio.
 	$core_setting_names = array_merge(
-		array_keys( give_v18_renamed_core_settings() ),
+		array_keys(give_v18_renamed_core_settings()),
 		array(
 			'uninstall_on_delete',
 			'scripts_footer',
@@ -733,48 +733,48 @@ 
 	);
 
 	// Bailout: If not any setting define.
-	if ( $give_settings = get_option( 'give_settings' ) ) {
+	if ($give_settings = get_option('give_settings')) {
 
 		$setting_changed = false;
 
 		// Loop: check each setting field.
-		foreach ( $core_setting_names as $setting_name ) {
+		foreach ($core_setting_names as $setting_name) {
 			// New setting name.
-			$new_setting_name = preg_replace( '/^(enable_|disable_)/', '', $setting_name );
+			$new_setting_name = preg_replace('/^(enable_|disable_)/', '', $setting_name);
 
 			// Continue: If setting already set.
 			if (
-				array_key_exists( $new_setting_name, $give_settings )
-				&& in_array( $give_settings[ $new_setting_name ], array( 'enabled', 'disabled' ) )
+				array_key_exists($new_setting_name, $give_settings)
+				&& in_array($give_settings[$new_setting_name], array('enabled', 'disabled'))
 			) {
 				continue;
 			}
 
 			// Set checkbox value to radio value.
-			$give_settings[ $setting_name ] = ( ! empty( $give_settings[ $setting_name ] ) && 'on' === $give_settings[ $setting_name ] ? 'enabled' : 'disabled' );
+			$give_settings[$setting_name] = ( ! empty($give_settings[$setting_name]) && 'on' === $give_settings[$setting_name] ? 'enabled' : 'disabled');
 
 			// @see https://github.com/WordImpress/Give/issues/1063.
-			if ( false !== strpos( $setting_name, 'disable_' ) ) {
+			if (false !== strpos($setting_name, 'disable_')) {
 
-				$give_settings[ $new_setting_name ] = ( give_is_setting_enabled( $give_settings[ $setting_name ] ) ? 'disabled' : 'enabled' );
-			} elseif ( false !== strpos( $setting_name, 'enable_' ) ) {
+				$give_settings[$new_setting_name] = (give_is_setting_enabled($give_settings[$setting_name]) ? 'disabled' : 'enabled');
+			} elseif (false !== strpos($setting_name, 'enable_')) {
 
-				$give_settings[ $new_setting_name ] = ( give_is_setting_enabled( $give_settings[ $setting_name ] ) ? 'enabled' : 'disabled' );
+				$give_settings[$new_setting_name] = (give_is_setting_enabled($give_settings[$setting_name]) ? 'enabled' : 'disabled');
 			}
 
 			// Tell bot to update core setting to db.
-			if ( ! $setting_changed ) {
+			if ( ! $setting_changed) {
 				$setting_changed = true;
 			}
 		}
 
 		// Update setting only if they changed.
-		if ( $setting_changed ) {
-			update_option( 'give_settings', $give_settings );
+		if ($setting_changed) {
+			update_option('give_settings', $give_settings);
 		}
 	}// End if().
 
-	give_set_upgrade_complete( 'v18_upgrades_core_setting' );
+	give_set_upgrade_complete('v18_upgrades_core_setting');
 }
 
 /**
@@ -788,7 +788,7 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query
-	$forms = new WP_Query( array(
+	$forms = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'status'         => 'any',
 			'order'          => 'ASC',
@@ -797,41 +797,41 @@ 
 		)
 	);
 
-	if ( $forms->have_posts() ) {
-		$give_updates->set_percentage( $forms->found_posts, ( $give_updates->step * 20 ) );
+	if ($forms->have_posts()) {
+		$give_updates->set_percentage($forms->found_posts, ($give_updates->step * 20));
 
-		while ( $forms->have_posts() ) {
+		while ($forms->have_posts()) {
 			$forms->the_post();
 
 			// Form content.
 			// Note in version 1.8 display content setting split into display content and content placement setting.
 			// You can delete _give_content_option in future.
-			$show_content = give_get_meta( get_the_ID(), '_give_content_option', true );
-			if ( $show_content && ! give_get_meta( get_the_ID(), '_give_display_content', true ) ) {
-				$field_value = ( 'none' !== $show_content ? 'enabled' : 'disabled' );
-				give_update_meta( get_the_ID(), '_give_display_content', $field_value );
+			$show_content = give_get_meta(get_the_ID(), '_give_content_option', true);
+			if ($show_content && ! give_get_meta(get_the_ID(), '_give_display_content', true)) {
+				$field_value = ('none' !== $show_content ? 'enabled' : 'disabled');
+				give_update_meta(get_the_ID(), '_give_display_content', $field_value);
 
-				$field_value = ( 'none' !== $show_content ? $show_content : 'give_pre_form' );
-				give_update_meta( get_the_ID(), '_give_content_placement', $field_value );
+				$field_value = ('none' !== $show_content ? $show_content : 'give_pre_form');
+				give_update_meta(get_the_ID(), '_give_content_placement', $field_value);
 			}
 
 			// "Disable" Guest Donation. Checkbox.
 			// See: https://github.com/WordImpress/Give/issues/1470.
-			$guest_donation        = give_get_meta( get_the_ID(), '_give_logged_in_only', true );
-			$guest_donation_newval = ( in_array( $guest_donation, array( 'yes', 'on' ) ) ? 'disabled' : 'enabled' );
-			give_update_meta( get_the_ID(), '_give_logged_in_only', $guest_donation_newval );
+			$guest_donation        = give_get_meta(get_the_ID(), '_give_logged_in_only', true);
+			$guest_donation_newval = (in_array($guest_donation, array('yes', 'on')) ? 'disabled' : 'enabled');
+			give_update_meta(get_the_ID(), '_give_logged_in_only', $guest_donation_newval);
 
 			// Offline Donations.
 			// See: https://github.com/WordImpress/Give/issues/1579.
-			$offline_donation = give_get_meta( get_the_ID(), '_give_customize_offline_donations', true );
-			if ( 'no' === $offline_donation ) {
+			$offline_donation = give_get_meta(get_the_ID(), '_give_customize_offline_donations', true);
+			if ('no' === $offline_donation) {
 				$offline_donation_newval = 'global';
-			} elseif ( 'yes' === $offline_donation ) {
+			} elseif ('yes' === $offline_donation) {
 				$offline_donation_newval = 'enabled';
 			} else {
 				$offline_donation_newval = 'disabled';
 			}
-			give_update_meta( get_the_ID(), '_give_customize_offline_donations', $offline_donation_newval );
+			give_update_meta(get_the_ID(), '_give_customize_offline_donations', $offline_donation_newval);
 
 			// Convert yes/no setting field to enabled/disabled.
 			$form_radio_settings = array(
@@ -851,15 +851,15 @@ 
 				'_give_offline_donation_enable_billing_fields_single',
 			);
 
-			foreach ( $form_radio_settings as $meta_key ) {
+			foreach ($form_radio_settings as $meta_key) {
 				// Get value.
-				$field_value = give_get_meta( get_the_ID(), $meta_key, true );
+				$field_value = give_get_meta(get_the_ID(), $meta_key, true);
 
 				// Convert meta value only if it is in yes/no/none.
-				if ( in_array( $field_value, array( 'yes', 'on', 'no', 'none' ) ) ) {
+				if (in_array($field_value, array('yes', 'on', 'no', 'none'))) {
 
-					$field_value = ( in_array( $field_value, array( 'yes', 'on' ) ) ? 'enabled' : 'disabled' );
-					give_update_meta( get_the_ID(), $meta_key, $field_value );
+					$field_value = (in_array($field_value, array('yes', 'on')) ? 'enabled' : 'disabled');
+					give_update_meta(get_the_ID(), $meta_key, $field_value);
 				}
 			}
 		}// End while().
@@ -868,7 +868,7 @@ 
 
 	} else {
 		// No more forms found, finish up.
-		give_set_upgrade_complete( 'v18_upgrades_form_metadata' );
+		give_set_upgrade_complete('v18_upgrades_form_metadata');
 	}
 }
 
@@ -935,7 +935,7 @@ 
 				'%_transient_give_stats_%',
 				'give_cache%',
 				'%_transient_give_add_ons_feed%',
-				'%_transient__give_ajax_works' .
+				'%_transient__give_ajax_works'.
 				'%_transient_give_total_api_keys%',
 				'%_transient_give_i18n_give_promo_hide%',
 				'%_transient_give_contributors%',
@@ -962,24 +962,24 @@ 
 		ARRAY_A
 	);
 
-	if ( ! empty( $user_apikey_options ) ) {
-		foreach ( $user_apikey_options as $user ) {
-			$cached_options[] = '_transient_' . md5( 'give_api_user_' . $user['meta_key'] );
-			$cached_options[] = '_transient_' . md5( 'give_api_user_public_key' . $user['user_id'] );
-			$cached_options[] = '_transient_' . md5( 'give_api_user_secret_key' . $user['user_id'] );
+	if ( ! empty($user_apikey_options)) {
+		foreach ($user_apikey_options as $user) {
+			$cached_options[] = '_transient_'.md5('give_api_user_'.$user['meta_key']);
+			$cached_options[] = '_transient_'.md5('give_api_user_public_key'.$user['user_id']);
+			$cached_options[] = '_transient_'.md5('give_api_user_secret_key'.$user['user_id']);
 		}
 	}
 
-	if ( ! empty( $cached_options ) ) {
-		foreach ( $cached_options as $option ) {
-			switch ( true ) {
-				case ( false !== strpos( $option, 'transient' ) ):
-					$option = str_replace( '_transient_', '', $option );
-					delete_transient( $option );
+	if ( ! empty($cached_options)) {
+		foreach ($cached_options as $option) {
+			switch (true) {
+				case (false !== strpos($option, 'transient')):
+					$option = str_replace('_transient_', '', $option);
+					delete_transient($option);
 					break;
 
 				default:
-					delete_option( $option );
+					delete_option($option);
 			}
 		}
 	}
@@ -997,7 +997,7 @@ 
 	global $wp_roles;
 
 	// Get the role object.
-	$give_worker = get_role( 'give_worker' );
+	$give_worker = get_role('give_worker');
 
 	// A list of capabilities to add for give workers.
 	$caps_to_add = array(
@@ -1005,9 +1005,9 @@ 
 		'edit_pages',
 	);
 
-	foreach ( $caps_to_add as $cap ) {
+	foreach ($caps_to_add as $cap) {
 		// Add the capability.
-		$give_worker->add_cap( $cap );
+		$give_worker->add_cap($cap);
 	}
 
 }
@@ -1024,7 +1024,7 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query.
-	$donation_forms = new WP_Query( array(
+	$donation_forms = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'status'         => 'any',
 			'order'          => 'ASC',
@@ -1033,10 +1033,10 @@ 
 		)
 	);
 
-	if ( $donation_forms->have_posts() ) {
-		$give_updates->set_percentage( $donation_forms->found_posts, ( $give_updates->step * 20 ) );
+	if ($donation_forms->have_posts()) {
+		$give_updates->set_percentage($donation_forms->found_posts, ($give_updates->step * 20));
 
-		while ( $donation_forms->have_posts() ) {
+		while ($donation_forms->have_posts()) {
 			$donation_forms->the_post();
 			$form_id = get_the_ID();
 
@@ -1044,41 +1044,41 @@ 
 			update_post_meta(
 				$form_id,
 				'_give_set_price',
-				give_sanitize_amount( get_post_meta( $form_id, '_give_set_price', true ) )
+				give_sanitize_amount(get_post_meta($form_id, '_give_set_price', true))
 			);
 
 			// Remove formatting from _give_custom_amount_minimum.
 			update_post_meta(
 				$form_id,
 				'_give_custom_amount_minimum',
-				give_sanitize_amount( get_post_meta( $form_id, '_give_custom_amount_minimum', true ) )
+				give_sanitize_amount(get_post_meta($form_id, '_give_custom_amount_minimum', true))
 			);
 
 			// Bailout.
-			if ( 'set' === get_post_meta( $form_id, '_give_price_option', true ) ) {
+			if ('set' === get_post_meta($form_id, '_give_price_option', true)) {
 				continue;
 			}
 
-			$donation_levels = get_post_meta( $form_id, '_give_donation_levels', true );
+			$donation_levels = get_post_meta($form_id, '_give_donation_levels', true);
 
-			if ( ! empty( $donation_levels ) ) {
+			if ( ! empty($donation_levels)) {
 
-				foreach ( $donation_levels as $index => $donation_level ) {
-					if ( isset( $donation_level['_give_amount'] ) ) {
-						$donation_levels[ $index ]['_give_amount'] = give_sanitize_amount( $donation_level['_give_amount'] );
+				foreach ($donation_levels as $index => $donation_level) {
+					if (isset($donation_level['_give_amount'])) {
+						$donation_levels[$index]['_give_amount'] = give_sanitize_amount($donation_level['_give_amount']);
 					}
 				}
 
-				update_post_meta( $form_id, '_give_donation_levels', $donation_levels );
+				update_post_meta($form_id, '_give_donation_levels', $donation_levels);
 
-				$donation_levels_amounts = wp_list_pluck( $donation_levels, '_give_amount' );
+				$donation_levels_amounts = wp_list_pluck($donation_levels, '_give_amount');
 
-				$min_amount = min( $donation_levels_amounts );
-				$max_amount = max( $donation_levels_amounts );
+				$min_amount = min($donation_levels_amounts);
+				$max_amount = max($donation_levels_amounts);
 
 				// Set Minimum and Maximum amount for Multi Level Donation Forms
-				give_update_meta( $form_id, '_give_levels_minimum_amount', $min_amount ? give_sanitize_amount( $min_amount ) : 0 );
-				give_update_meta( $form_id, '_give_levels_maximum_amount', $max_amount ? give_sanitize_amount( $max_amount ) : 0 );
+				give_update_meta($form_id, '_give_levels_minimum_amount', $min_amount ? give_sanitize_amount($min_amount) : 0);
+				give_update_meta($form_id, '_give_levels_maximum_amount', $max_amount ? give_sanitize_amount($max_amount) : 0);
 			}
 
 		}
@@ -1087,7 +1087,7 @@ 
 		wp_reset_postdata();
 	} else {
 		// The Update Ran.
-		give_set_upgrade_complete( 'v189_upgrades_levels_post_meta' );
+		give_set_upgrade_complete('v189_upgrades_levels_post_meta');
 	}
 
 }
@@ -1137,7 +1137,7 @@ 
  */
 function give_v20_upgrades() {
 	// Update cache setting.
-	give_update_option( 'cache', 'enabled' );
+	give_update_option('cache', 'enabled');
 
 	// Upgrade email settings.
 	give_v20_upgrades_email_setting();
@@ -1156,7 +1156,7 @@ 
 	$all_setting = give_get_settings();
 
 	// Bailout on fresh install.
-	if ( empty( $all_setting ) ) {
+	if (empty($all_setting)) {
 		return;
 	}
 
@@ -1175,19 +1175,19 @@ 
 		'admin_notices'                 => 'new-donation_notification',
 	);
 
-	foreach ( $settings as $old_setting => $new_setting ) {
+	foreach ($settings as $old_setting => $new_setting) {
 		// Do not update already modified
-		if ( ! is_array( $new_setting ) ) {
-			if ( array_key_exists( $new_setting, $all_setting ) || ! array_key_exists( $old_setting, $all_setting ) ) {
+		if ( ! is_array($new_setting)) {
+			if (array_key_exists($new_setting, $all_setting) || ! array_key_exists($old_setting, $all_setting)) {
 				continue;
 			}
 		}
 
-		switch ( $old_setting ) {
+		switch ($old_setting) {
 			case 'admin_notices':
-				$notification_status = give_get_option( $old_setting, 'enabled' );
+				$notification_status = give_get_option($old_setting, 'enabled');
 
-				give_update_option( $new_setting, $notification_status );
+				give_update_option($new_setting, $notification_status);
 
 				// @todo: Delete this option later ( version > 2.0 ), We need this for per form email addon.
 				// give_delete_option( $old_setting );
@@ -1198,19 +1198,19 @@ 
 			case 'admin_notice_emails':
 				$recipients = give_get_admin_notice_emails();
 
-				foreach ( $new_setting as $setting ) {
+				foreach ($new_setting as $setting) {
 					// bailout if setting already exist.
-					if ( array_key_exists( $setting, $all_setting ) ) {
+					if (array_key_exists($setting, $all_setting)) {
 						continue;
 					}
 
-					give_update_option( $setting, $recipients );
+					give_update_option($setting, $recipients);
 				}
 				break;
 
 			default:
-				give_update_option( $new_setting, give_get_option( $old_setting ) );
-				give_delete_option( $old_setting );
+				give_update_option($new_setting, give_get_option($old_setting));
+				give_delete_option($old_setting);
 		}
 	}
 }
@@ -1227,22 +1227,22 @@ 
 	$give_settings        = give_get_settings();
 	$give_setting_updated = false;
 
-	if ( $give_settings['thousands_separator'] === $give_settings['decimal_separator'] ) {
+	if ($give_settings['thousands_separator'] === $give_settings['decimal_separator']) {
 		$give_settings['number_decimals']   = 0;
 		$give_settings['decimal_separator'] = '';
 		$give_setting_updated               = true;
 
-	} elseif ( empty( $give_settings['decimal_separator'] ) ) {
+	} elseif (empty($give_settings['decimal_separator'])) {
 		$give_settings['number_decimals'] = 0;
 		$give_setting_updated             = true;
 
-	} elseif ( 6 < absint( $give_settings['number_decimals'] ) ) {
+	} elseif (6 < absint($give_settings['number_decimals'])) {
 		$give_settings['number_decimals'] = 5;
 		$give_setting_updated             = true;
 	}
 
-	if ( $give_setting_updated ) {
-		update_option( 'give_settings', $give_settings );
+	if ($give_setting_updated) {
+		update_option('give_settings', $give_settings);
 	}
 }
 
@@ -1261,69 +1261,69 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query.
-	$donation_forms = new WP_Query( array(
+	$donation_forms = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'status'         => 'any',
 			'order'          => 'ASC',
-			'post_type'      => array( 'give_forms', 'give_payment' ),
+			'post_type'      => array('give_forms', 'give_payment'),
 			'posts_per_page' => 20,
 		)
 	);
-	if ( $donation_forms->have_posts() ) {
-		$give_updates->set_percentage( $donation_forms->found_posts, ( $give_updates->step * 20 ) );
+	if ($donation_forms->have_posts()) {
+		$give_updates->set_percentage($donation_forms->found_posts, ($give_updates->step * 20));
 
-		while ( $donation_forms->have_posts() ) {
+		while ($donation_forms->have_posts()) {
 			$donation_forms->the_post();
 			global $post;
 
-			$meta = get_post_meta( $post->ID );
+			$meta = get_post_meta($post->ID);
 
-			switch ( $post->post_type ) {
+			switch ($post->post_type) {
 				case 'give_forms':
 					// _give_set_price.
-					if ( ! empty( $meta['_give_set_price'][0] ) ) {
-						update_post_meta( $post->ID, '_give_set_price', give_sanitize_amount_for_db( $meta['_give_set_price'][0] ) );
+					if ( ! empty($meta['_give_set_price'][0])) {
+						update_post_meta($post->ID, '_give_set_price', give_sanitize_amount_for_db($meta['_give_set_price'][0]));
 					}
 
 					// _give_custom_amount_minimum.
-					if ( ! empty( $meta['_give_custom_amount_minimum'][0] ) ) {
-						update_post_meta( $post->ID, '_give_custom_amount_minimum', give_sanitize_amount_for_db( $meta['_give_custom_amount_minimum'][0] ) );
+					if ( ! empty($meta['_give_custom_amount_minimum'][0])) {
+						update_post_meta($post->ID, '_give_custom_amount_minimum', give_sanitize_amount_for_db($meta['_give_custom_amount_minimum'][0]));
 					}
 
 					// _give_levels_minimum_amount.
-					if ( ! empty( $meta['_give_levels_minimum_amount'][0] ) ) {
-						update_post_meta( $post->ID, '_give_levels_minimum_amount', give_sanitize_amount_for_db( $meta['_give_levels_minimum_amount'][0] ) );
+					if ( ! empty($meta['_give_levels_minimum_amount'][0])) {
+						update_post_meta($post->ID, '_give_levels_minimum_amount', give_sanitize_amount_for_db($meta['_give_levels_minimum_amount'][0]));
 					}
 
 					// _give_levels_maximum_amount.
-					if ( ! empty( $meta['_give_levels_maximum_amount'][0] ) ) {
-						update_post_meta( $post->ID, '_give_levels_maximum_amount', give_sanitize_amount_for_db( $meta['_give_levels_maximum_amount'][0] ) );
+					if ( ! empty($meta['_give_levels_maximum_amount'][0])) {
+						update_post_meta($post->ID, '_give_levels_maximum_amount', give_sanitize_amount_for_db($meta['_give_levels_maximum_amount'][0]));
 					}
 
 					// _give_set_goal.
-					if ( ! empty( $meta['_give_set_goal'][0] ) ) {
-						update_post_meta( $post->ID, '_give_set_goal', give_sanitize_amount_for_db( $meta['_give_set_goal'][0] ) );
+					if ( ! empty($meta['_give_set_goal'][0])) {
+						update_post_meta($post->ID, '_give_set_goal', give_sanitize_amount_for_db($meta['_give_set_goal'][0]));
 					}
 
 					// _give_form_earnings.
-					if ( ! empty( $meta['_give_form_earnings'][0] ) ) {
-						update_post_meta( $post->ID, '_give_form_earnings', give_sanitize_amount_for_db( $meta['_give_form_earnings'][0] ) );
+					if ( ! empty($meta['_give_form_earnings'][0])) {
+						update_post_meta($post->ID, '_give_form_earnings', give_sanitize_amount_for_db($meta['_give_form_earnings'][0]));
 					}
 
 					// _give_custom_amount_minimum.
-					if ( ! empty( $meta['_give_donation_levels'][0] ) ) {
-						$donation_levels = unserialize( $meta['_give_donation_levels'][0] );
+					if ( ! empty($meta['_give_donation_levels'][0])) {
+						$donation_levels = unserialize($meta['_give_donation_levels'][0]);
 
-						foreach ( $donation_levels as $index => $level ) {
-							if ( empty( $level['_give_amount'] ) ) {
+						foreach ($donation_levels as $index => $level) {
+							if (empty($level['_give_amount'])) {
 								continue;
 							}
 
-							$donation_levels[ $index ]['_give_amount'] = give_sanitize_amount_for_db( $level['_give_amount'] );
+							$donation_levels[$index]['_give_amount'] = give_sanitize_amount_for_db($level['_give_amount']);
 						}
 
 						$meta['_give_donation_levels'] = $donation_levels;
-						update_post_meta( $post->ID, '_give_donation_levels', $meta['_give_donation_levels'] );
+						update_post_meta($post->ID, '_give_donation_levels', $meta['_give_donation_levels']);
 					}
 
 
@@ -1331,8 +1331,8 @@ 
 
 				case 'give_payment':
 					// _give_payment_total.
-					if ( ! empty( $meta['_give_payment_total'][0] ) ) {
-						update_post_meta( $post->ID, '_give_payment_total', give_sanitize_amount_for_db( $meta['_give_payment_total'][0] ) );
+					if ( ! empty($meta['_give_payment_total'][0])) {
+						update_post_meta($post->ID, '_give_payment_total', give_sanitize_amount_for_db($meta['_give_payment_total'][0]));
 					}
 
 					break;
@@ -1343,7 +1343,7 @@ 
 		wp_reset_postdata();
 	} else {
 		// The Update Ran.
-		give_set_upgrade_complete( 'v1812_update_amount_values' );
+		give_set_upgrade_complete('v1812_update_amount_values');
 	}
 }
 
@@ -1362,22 +1362,22 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query.
-	$donors = Give()->donors->get_donors( array(
+	$donors = Give()->donors->get_donors(array(
 			'number' => 20,
-			'offset' => $give_updates->get_offset( 20 ),
+			'offset' => $give_updates->get_offset(20),
 		)
 	);
 
-	if ( ! empty( $donors ) ) {
-		$give_updates->set_percentage( Give()->donors->count(), $give_updates->get_offset( 20 ) );
+	if ( ! empty($donors)) {
+		$give_updates->set_percentage(Give()->donors->count(), $give_updates->get_offset(20));
 
 		/* @var Object $donor */
-		foreach ( $donors as $donor ) {
-			Give()->donors->update( $donor->id, array( 'purchase_value' => give_sanitize_amount_for_db( $donor->purchase_value ) ) );
+		foreach ($donors as $donor) {
+			Give()->donors->update($donor->id, array('purchase_value' => give_sanitize_amount_for_db($donor->purchase_value)));
 		}
 	} else {
 		// The Update Ran.
-		give_set_upgrade_complete( 'v1812_update_donor_purchase_values' );
+		give_set_upgrade_complete('v1812_update_donor_purchase_values');
 	}
 }
 
@@ -1391,25 +1391,25 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// Fetch all the existing donors.
-	$donors = Give()->donors->get_donors( array(
+	$donors = Give()->donors->get_donors(array(
 			'number' => 20,
-			'offset' => $give_updates->get_offset( 20 ),
+			'offset' => $give_updates->get_offset(20),
 		)
 	);
 
-	if ( ! empty( $donors ) ) {
-		$give_updates->set_percentage( Give()->donors->count(), $give_updates->get_offset( 20 ) );
+	if ( ! empty($donors)) {
+		$give_updates->set_percentage(Give()->donors->count(), $give_updates->get_offset(20));
 
 		/* @var Object $donor */
-		foreach ( $donors as $donor ) {
+		foreach ($donors as $donor) {
 			$user_id = $donor->user_id;
 
 			// Proceed, if donor is attached with user.
-			if ( $user_id ) {
-				$user = get_userdata( $user_id );
+			if ($user_id) {
+				$user = get_userdata($user_id);
 
 				// Update user role, if user has subscriber role.
-				if ( is_array( $user->roles ) && in_array( 'subscriber', $user->roles ) ) {
+				if (is_array($user->roles) && in_array('subscriber', $user->roles)) {
 					wp_update_user(
 						array(
 							'ID'   => $user_id,
@@ -1421,7 +1421,7 @@ 
 		}
 	} else {
 		// The Update Ran.
-		give_set_upgrade_complete( 'v1813_update_donor_user_roles' );
+		give_set_upgrade_complete('v1813_update_donor_user_roles');
 	}
 }
 
@@ -1433,7 +1433,7 @@ 
  */
 function give_v1813_upgrades() {
 	// Update admin setting.
-	give_update_option( 'donor_default_user_role', 'give_donor' );
+	give_update_option('donor_default_user_role', 'give_donor');
 
 	// Update Give roles.
 	$roles = new Give_Roles();
@@ -1451,33 +1451,33 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query.
-	$payments = new WP_Query( array(
+	$payments = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'status'         => 'any',
 			'order'          => 'ASC',
-			'post_type'      => array( 'give_payment' ),
+			'post_type'      => array('give_payment'),
 			'posts_per_page' => 100,
 		)
 	);
 
-	if ( $payments->have_posts() ) {
-		$give_updates->set_percentage( $payments->found_posts, ( $give_updates->step * 100 ) );
+	if ($payments->have_posts()) {
+		$give_updates->set_percentage($payments->found_posts, ($give_updates->step * 100));
 
-		while ( $payments->have_posts() ) {
+		while ($payments->have_posts()) {
 			$payments->the_post();
 
-			$payment_meta = give_get_payment_meta( get_the_ID() );
+			$payment_meta = give_get_payment_meta(get_the_ID());
 
-			if ( 'RIAL' === $payment_meta['currency'] ) {
+			if ('RIAL' === $payment_meta['currency']) {
 				$payment_meta['currency'] = 'IRR';
-				give_update_meta( get_the_ID(), '_give_payment_meta', $payment_meta );
+				give_update_meta(get_the_ID(), '_give_payment_meta', $payment_meta);
 			}
 
 		}
 
 	} else {
 		// The Update Ran.
-		give_set_upgrade_complete( 'v1817_update_donation_iranian_currency_code' );
+		give_set_upgrade_complete('v1817_update_donation_iranian_currency_code');
 	}
 }
 
@@ -1490,9 +1490,9 @@ 
 function give_v1817_upgrades() {
 	$give_settings = give_get_settings();
 
-	if ( 'RIAL' === $give_settings['currency'] ) {
+	if ('RIAL' === $give_settings['currency']) {
 		$give_settings['currency'] = 'IRR';
-		update_option( 'give_settings', $give_settings );
+		update_option('give_settings', $give_settings);
 	}
 }
 
@@ -1505,7 +1505,7 @@ 
 
 	global $wp_roles;
 
-	if ( ! ( $wp_roles instanceof WP_Roles ) ) {
+	if ( ! ($wp_roles instanceof WP_Roles)) {
 		return;
 	}
 
@@ -1529,15 +1529,15 @@ 
 		),
 	);
 
-	foreach ( $add_caps as $role => $caps ) {
-		foreach ( $caps as $cap ) {
-			$wp_roles->add_cap( $role, $cap );
+	foreach ($add_caps as $role => $caps) {
+		foreach ($caps as $cap) {
+			$wp_roles->add_cap($role, $cap);
 		}
 	}
 
-	foreach ( $remove_caps as $role => $caps ) {
-		foreach ( $caps as $cap ) {
-			$wp_roles->remove_cap( $role, $cap );
+	foreach ($remove_caps as $role => $caps) {
+		foreach ($caps as $cap) {
+			$wp_roles->remove_cap($role, $cap);
 		}
 	}
 
@@ -1561,7 +1561,7 @@ 
 	$roles->add_roles();
 	$roles->add_caps();
 
-	give_set_upgrade_complete( 'v1817_cleanup_user_roles' );
+	give_set_upgrade_complete('v1817_cleanup_user_roles');
 }
 
 /**
@@ -1572,7 +1572,7 @@ 
 function give_v1818_upgrades() {
 
 	// Remove email_access_installed from give_settings.
-	give_delete_option( 'email_access_installed' );
+	give_delete_option('email_access_installed');
 }
 
 /**
@@ -1585,23 +1585,23 @@ 
 	/* @var Give_Updates $give_updates */
 	$give_updates = Give_Updates::get_instance();
 
-	$donations = new WP_Query( array(
+	$donations = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'status'         => 'any',
 			'order'          => 'ASC',
-			'post_type'      => array( 'give_payment' ),
+			'post_type'      => array('give_payment'),
 			'posts_per_page' => 100,
 		)
 	);
 
-	if ( $donations->have_posts() ) {
-		$give_updates->set_percentage( $donations->found_posts, $give_updates->step * 100 );
+	if ($donations->have_posts()) {
+		$give_updates->set_percentage($donations->found_posts, $give_updates->step * 100);
 
-		while ( $donations->have_posts() ) {
+		while ($donations->have_posts()) {
 			$donations->the_post();
 
-			$form          = new Give_Donate_Form( give_get_meta( get_the_ID(), '_give_payment_form_id', true ) );
-			$donation_meta = give_get_payment_meta( get_the_ID() );
+			$form          = new Give_Donate_Form(give_get_meta(get_the_ID(), '_give_payment_form_id', true));
+			$donation_meta = give_get_payment_meta(get_the_ID());
 
 			// Update Donation meta with price_id set as custom, only if it is:
 			// 1. Donation Type = Set Donation.
@@ -1610,19 +1610,19 @@ 
 			if (
 				$form->ID &&
 				$form->is_set_type_donation_form() &&
-				( 'custom' !== $donation_meta['price_id'] ) &&
-				$form->is_custom_price( give_get_meta( get_the_ID(), '_give_payment_total', true ) )
+				('custom' !== $donation_meta['price_id']) &&
+				$form->is_custom_price(give_get_meta(get_the_ID(), '_give_payment_total', true))
 			) {
 				$donation_meta['price_id'] = 'custom';
-				give_update_meta( get_the_ID(), '_give_payment_meta', $donation_meta );
-				give_update_meta( get_the_ID(), '_give_payment_price_id', 'custom' );
+				give_update_meta(get_the_ID(), '_give_payment_meta', $donation_meta);
+				give_update_meta(get_the_ID(), '_give_payment_price_id', 'custom');
 			}
 		}
 
 		wp_reset_postdata();
 	} else {
 		// Update Ran Successfully.
-		give_set_upgrade_complete( 'v1818_assign_custom_amount_set_donation' );
+		give_set_upgrade_complete('v1818_assign_custom_amount_set_donation');
 	}
 }
 
@@ -1640,7 +1640,7 @@ 
 
 	global $wp_roles;
 
-	if ( ! ( $wp_roles instanceof WP_Roles ) ) {
+	if ( ! ($wp_roles instanceof WP_Roles)) {
 		return;
 	}
 
@@ -1658,9 +1658,9 @@ 
 		),
 	);
 
-	foreach ( $remove_caps as $role => $caps ) {
-		foreach ( $caps as $cap ) {
-			$wp_roles->remove_cap( $role, $cap );
+	foreach ($remove_caps as $role => $caps) {
+		foreach ($caps as $cap) {
+			$wp_roles->remove_cap($role, $cap);
 		}
 	}
 
@@ -1671,7 +1671,7 @@ 
 	$roles->add_roles();
 	$roles->add_caps();
 
-	give_set_upgrade_complete( 'v1818_give_worker_role_cleanup' );
+	give_set_upgrade_complete('v1818_give_worker_role_cleanup');
 }
 
 /**
@@ -1685,7 +1685,7 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query
-	$forms = new WP_Query( array(
+	$forms = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'status'         => 'any',
 			'order'          => 'ASC',
@@ -1694,22 +1694,22 @@ 
 		)
 	);
 
-	if ( $forms->have_posts() ) {
-		$give_updates->set_percentage( $forms->found_posts, ( $give_updates->step * 100 ) );
+	if ($forms->have_posts()) {
+		$give_updates->set_percentage($forms->found_posts, ($give_updates->step * 100));
 
-		while ( $forms->have_posts() ) {
+		while ($forms->have_posts()) {
 			$forms->the_post();
 			global $post;
 
 			// Update offline instruction email notification status.
-			$offline_instruction_notification_status = get_post_meta( get_the_ID(), '_give_customize_offline_donations', true );
-			$offline_instruction_notification_status = give_is_setting_enabled( $offline_instruction_notification_status, array(
+			$offline_instruction_notification_status = get_post_meta(get_the_ID(), '_give_customize_offline_donations', true);
+			$offline_instruction_notification_status = give_is_setting_enabled($offline_instruction_notification_status, array(
 				'enabled',
 				'global',
-			) )
+			))
 				? $offline_instruction_notification_status
 				: 'global';
-			update_post_meta( get_the_ID(), '_give_offline-donation-instruction_notification', $offline_instruction_notification_status );
+			update_post_meta(get_the_ID(), '_give_offline-donation-instruction_notification', $offline_instruction_notification_status);
 
 			// Update offline instruction email message.
 			update_post_meta(
@@ -1741,7 +1741,7 @@ 
 		wp_reset_postdata();
 	} else {
 		// No more forms found, finish up.
-		give_set_upgrade_complete( 'v20_upgrades_form_metadata' );
+		give_set_upgrade_complete('v20_upgrades_form_metadata');
 	}
 }
 
@@ -1758,7 +1758,7 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query
-	$forms = new WP_Query( array(
+	$forms = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'status'         => 'any',
 			'order'          => 'ASC',
@@ -1767,19 +1767,19 @@ 
 		)
 	);
 
-	if ( $forms->have_posts() ) {
-		$give_updates->set_percentage( $forms->found_posts, ( $give_updates->step * 100 ) );
+	if ($forms->have_posts()) {
+		$give_updates->set_percentage($forms->found_posts, ($give_updates->step * 100));
 
-		while ( $forms->have_posts() ) {
+		while ($forms->have_posts()) {
 			$forms->the_post();
 			global $post;
 
 			// Split _give_payment_meta meta.
 			// @todo Remove _give_payment_meta after releases 2.0
-			$payment_meta = give_get_meta( $post->ID, '_give_payment_meta', true );
+			$payment_meta = give_get_meta($post->ID, '_give_payment_meta', true);
 
-			if ( ! empty( $payment_meta ) ) {
-				_give_20_bc_split_and_save_give_payment_meta( $post->ID, $payment_meta );
+			if ( ! empty($payment_meta)) {
+				_give_20_bc_split_and_save_give_payment_meta($post->ID, $payment_meta);
 			}
 
 			$deprecated_meta_keys = array(
@@ -1788,9 +1788,9 @@ 
 				'_give_payment_user_ip'     => '_give_payment_donor_ip',
 			);
 
-			foreach ( $deprecated_meta_keys as $old_meta_key => $new_meta_key ) {
+			foreach ($deprecated_meta_keys as $old_meta_key => $new_meta_key) {
 				// Do not add new meta key if already exist.
-				if ( $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id=%d AND meta_key=%s", $post->ID, $new_meta_key ) ) ) {
+				if ($wpdb->get_var($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id=%d AND meta_key=%s", $post->ID, $new_meta_key))) {
 					continue;
 				}
 
@@ -1799,25 +1799,25 @@ 
 					array(
 						'post_id'    => $post->ID,
 						'meta_key'   => $new_meta_key,
-						'meta_value' => give_get_meta( $post->ID, $old_meta_key, true ),
+						'meta_value' => give_get_meta($post->ID, $old_meta_key, true),
 					)
 				);
 			}
 
 			// Bailout
-			if ( $donor_id = give_get_meta( $post->ID, '_give_payment_donor_id', true ) ) {
+			if ($donor_id = give_get_meta($post->ID, '_give_payment_donor_id', true)) {
 				/* @var Give_Donor $donor */
-				$donor = new Give_Donor( $donor_id );
+				$donor = new Give_Donor($donor_id);
 
-				$address['line1']   = give_get_meta( $post->ID, '_give_donor_billing_address1', true, '' );
-				$address['line2']   = give_get_meta( $post->ID, '_give_donor_billing_address2', true, '' );
-				$address['city']    = give_get_meta( $post->ID, '_give_donor_billing_city', true, '' );
-				$address['state']   = give_get_meta( $post->ID, '_give_donor_billing_state', true, '' );
-				$address['zip']     = give_get_meta( $post->ID, '_give_donor_billing_zip', true, '' );
-				$address['country'] = give_get_meta( $post->ID, '_give_donor_billing_country', true, '' );
+				$address['line1']   = give_get_meta($post->ID, '_give_donor_billing_address1', true, '');
+				$address['line2']   = give_get_meta($post->ID, '_give_donor_billing_address2', true, '');
+				$address['city']    = give_get_meta($post->ID, '_give_donor_billing_city', true, '');
+				$address['state']   = give_get_meta($post->ID, '_give_donor_billing_state', true, '');
+				$address['zip']     = give_get_meta($post->ID, '_give_donor_billing_zip', true, '');
+				$address['country'] = give_get_meta($post->ID, '_give_donor_billing_country', true, '');
 
 				// Save address.
-				$donor->add_address( 'billing[]', $address );
+				$donor->add_address('billing[]', $address);
 			}
 
 		}// End while().
@@ -1828,7 +1828,7 @@ 
 		// $wpdb->get_var( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE meta_key=%s", '_give_payment_user_id' ) );
 
 		// No more forms found, finish up.
-		give_set_upgrade_complete( 'v20_upgrades_payment_metadata' );
+		give_set_upgrade_complete('v20_upgrades_payment_metadata');
 	}
 }
 
@@ -1844,7 +1844,7 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query
-	$forms = new WP_Query( array(
+	$forms = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'order'          => 'DESC',
 			'post_type'      => 'give_log',
@@ -1853,20 +1853,20 @@ 
 		)
 	);
 
-	if ( $forms->have_posts() ) {
-		$give_updates->set_percentage( $forms->found_posts, $give_updates->step * 100 );
+	if ($forms->have_posts()) {
+		$give_updates->set_percentage($forms->found_posts, $give_updates->step * 100);
 
-		while ( $forms->have_posts() ) {
+		while ($forms->have_posts()) {
 			$forms->the_post();
 			global $post;
 
-			if ( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}give_logs WHERE ID=%d", $post->ID ) ) ) {
+			if ($wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}give_logs WHERE ID=%d", $post->ID))) {
 				continue;
 			}
 
-			$term      = get_the_terms( $post->ID, 'give_log_type' );
-			$term      = ! is_wp_error( $term ) && ! empty( $term ) ? $term[0] : array();
-			$term_name = ! empty( $term ) ? $term->slug : '';
+			$term      = get_the_terms($post->ID, 'give_log_type');
+			$term      = ! is_wp_error($term) && ! empty($term) ? $term[0] : array();
+			$term_name = ! empty($term) ? $term->slug : '';
 
 			$log_data = array(
 				'ID'           => $post->ID,
@@ -1879,29 +1879,29 @@ 
 			);
 			$log_meta = array();
 
-			if ( $old_log_meta = get_post_meta( $post->ID ) ) {
-				foreach ( $old_log_meta as $meta_key => $meta_value ) {
-					switch ( $meta_key ) {
+			if ($old_log_meta = get_post_meta($post->ID)) {
+				foreach ($old_log_meta as $meta_key => $meta_value) {
+					switch ($meta_key) {
 						case '_give_log_payment_id':
-							$log_data['log_parent']        = current( $meta_value );
+							$log_data['log_parent']        = current($meta_value);
 							$log_meta['_give_log_form_id'] = $post->post_parent;
 							break;
 
 						default:
-							$log_meta[ $meta_key ] = current( $meta_value );
+							$log_meta[$meta_key] = current($meta_value);
 					}
 				}
 			}
 
-			if ( 'api_request' === $term_name ) {
+			if ('api_request' === $term_name) {
 				$log_meta['_give_log_api_query'] = $post->post_excerpt;
 			}
 
-			$wpdb->insert( "{$wpdb->prefix}give_logs", $log_data );
+			$wpdb->insert("{$wpdb->prefix}give_logs", $log_data);
 
-			if ( ! empty( $log_meta ) ) {
-				foreach ( $log_meta as $meta_key => $meta_value ) {
-					Give()->logs->logmeta_db->update_meta( $post->ID, $meta_key, $meta_value );
+			if ( ! empty($log_meta)) {
+				foreach ($log_meta as $meta_key => $meta_value) {
+					Give()->logs->logmeta_db->update_meta($post->ID, $meta_key, $meta_value);
 				}
 			}
 
@@ -1943,7 +1943,7 @@ 
 		Give()->logs->delete_cache();
 
 		// No more forms found, finish up.
-		give_set_upgrade_complete( 'v20_logs_upgrades' );
+		give_set_upgrade_complete('v20_logs_upgrades');
 	}
 }
 
@@ -1959,19 +1959,19 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query
-	$payments = new WP_Query( array(
+	$payments = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'status'         => 'any',
 			'order'          => 'ASC',
-			'post_type'      => array( 'give_forms', 'give_payment' ),
+			'post_type'      => array('give_forms', 'give_payment'),
 			'posts_per_page' => 100,
 		)
 	);
 
-	if ( $payments->have_posts() ) {
-		$give_updates->set_percentage( $payments->found_posts, $give_updates->step * 100 );
+	if ($payments->have_posts()) {
+		$give_updates->set_percentage($payments->found_posts, $give_updates->step * 100);
 
-		while ( $payments->have_posts() ) {
+		while ($payments->have_posts()) {
 			$payments->the_post();
 			global $post;
 
@@ -1983,19 +1983,19 @@ 
 				ARRAY_A
 			);
 
-			if ( ! empty( $meta_data ) ) {
-				foreach ( $meta_data as $index => $data ) {
+			if ( ! empty($meta_data)) {
+				foreach ($meta_data as $index => $data) {
 					// Check for duplicate meta values.
-					if ( $result = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . ( 'give_forms' === $post->post_type ? $wpdb->formmeta : $wpdb->paymentmeta ) . " WHERE meta_id=%d", $data['meta_id'] ), ARRAY_A ) ) {
+					if ($result = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".('give_forms' === $post->post_type ? $wpdb->formmeta : $wpdb->paymentmeta)." WHERE meta_id=%d", $data['meta_id']), ARRAY_A)) {
 						continue;
 					}
 
-					switch ( $post->post_type ) {
+					switch ($post->post_type) {
 						case 'give_forms':
 							$data['form_id'] = $data['post_id'];
-							unset( $data['post_id'] );
+							unset($data['post_id']);
 
-							Give()->form_meta->insert( $data );
+							Give()->form_meta->insert($data);
 							// @todo: delete form meta from post meta table after releases 2.0.
 							/*delete_post_meta( get_the_ID(), $data['meta_key'] );*/
 
@@ -2003,9 +2003,9 @@ 
 
 						case 'give_payment':
 							$data['payment_id'] = $data['post_id'];
-							unset( $data['post_id'] );
+							unset($data['post_id']);
 
-							Give()->payment_meta->insert( $data );
+							Give()->payment_meta->insert($data);
 
 							// @todo: delete donation meta from post meta table after releases 2.0.
 							/*delete_post_meta( get_the_ID(), $data['meta_key'] );*/
@@ -2020,7 +2020,7 @@ 
 		wp_reset_postdata();
 	} else {
 		// No more forms found, finish up.
-		give_set_upgrade_complete( 'v20_move_metadata_into_new_table' );
+		give_set_upgrade_complete('v20_move_metadata_into_new_table');
 	}
 
 }
@@ -2036,44 +2036,44 @@ 
 	/* @var Give_Updates $give_updates */
 	$give_updates = Give_Updates::get_instance();
 
-	$donors = Give()->donors->get_donors( array(
+	$donors = Give()->donors->get_donors(array(
 		'paged'  => $give_updates->step,
 		'number' => 100,
-	) );
+	));
 
-	if ( $donors ) {
-		$give_updates->set_percentage( count( $donors ), $give_updates->step * 100 );
+	if ($donors) {
+		$give_updates->set_percentage(count($donors), $give_updates->step * 100);
 		// Loop through Donors
-		foreach ( $donors as $donor ) {
+		foreach ($donors as $donor) {
 
-			$donor_name       = explode( ' ', $donor->name, 2 );
-			$donor_first_name = Give()->donor_meta->get_meta( $donor->id, '_give_donor_first_name' );
-			$donor_last_name  = Give()->donor_meta->get_meta( $donor->id, '_give_donor_last_name' );
+			$donor_name       = explode(' ', $donor->name, 2);
+			$donor_first_name = Give()->donor_meta->get_meta($donor->id, '_give_donor_first_name');
+			$donor_last_name  = Give()->donor_meta->get_meta($donor->id, '_give_donor_last_name');
 
 			// If first name meta of donor is not created, then create it.
-			if ( ! $donor_first_name && isset( $donor_name[0] ) ) {
-				Give()->donor_meta->add_meta( $donor->id, '_give_donor_first_name', $donor_name[0] );
+			if ( ! $donor_first_name && isset($donor_name[0])) {
+				Give()->donor_meta->add_meta($donor->id, '_give_donor_first_name', $donor_name[0]);
 			}
 
 			// If last name meta of donor is not created, then create it.
-			if ( ! $donor_last_name && isset( $donor_name[1] ) ) {
-				Give()->donor_meta->add_meta( $donor->id, '_give_donor_last_name', $donor_name[1] );
+			if ( ! $donor_last_name && isset($donor_name[1])) {
+				Give()->donor_meta->add_meta($donor->id, '_give_donor_last_name', $donor_name[1]);
 			}
 
 			// If Donor is connected with WP User then update user meta.
-			if ( $donor->user_id ) {
-				if ( isset( $donor_name[0] ) ) {
-					update_user_meta( $donor->user_id, 'first_name', $donor_name[0] );
+			if ($donor->user_id) {
+				if (isset($donor_name[0])) {
+					update_user_meta($donor->user_id, 'first_name', $donor_name[0]);
 				}
-				if ( isset( $donor_name[1] ) ) {
-					update_user_meta( $donor->user_id, 'last_name', $donor_name[1] );
+				if (isset($donor_name[1])) {
+					update_user_meta($donor->user_id, 'last_name', $donor_name[1]);
 				}
 			}
 		}
 
 	} else {
 		// The Update Ran.
-		give_set_upgrade_complete( 'v20_upgrades_donor_name' );
+		give_set_upgrade_complete('v20_upgrades_donor_name');
 	}
 
 }
@@ -2102,15 +2102,15 @@ 
 
 	$users = $user_query->get_results();
 
-	if ( $users ) {
-		$give_updates->set_percentage( $user_query->get_total(), $give_updates->step * 100 );
+	if ($users) {
+		$give_updates->set_percentage($user_query->get_total(), $give_updates->step * 100);
 
 		// Loop through Donors
-		foreach ( $users as $user ) {
+		foreach ($users as $user) {
 			/* @var Give_Donor $donor */
-			$donor = new Give_Donor( $user->ID, true );
+			$donor = new Give_Donor($user->ID, true);
 
-			if ( ! $donor->id ) {
+			if ( ! $donor->id) {
 				continue;
 			}
 
@@ -2126,10 +2126,10 @@ 
 				)
 			);
 
-			if ( ! empty( $address ) ) {
-				$address = maybe_unserialize( $address );
-				$donor->add_address( 'personal', $address );
-				$donor->add_address( 'billing[]', $address );
+			if ( ! empty($address)) {
+				$address = maybe_unserialize($address);
+				$donor->add_address('personal', $address);
+				$donor->add_address('billing[]', $address);
 
 
 				// @todo: delete _give_user_address from user meta after releases 2.0.
@@ -2139,7 +2139,7 @@ 
 
 	} else {
 		// The Update Ran.
-		give_set_upgrade_complete( 'v20_upgrades_user_address' );
+		give_set_upgrade_complete('v20_upgrades_user_address');
 	}
 
 }
@@ -2163,15 +2163,15 @@ 
 	);
 
 	// Alter customer table
-	foreach ( $tables as $old_table => $new_table ) {
+	foreach ($tables as $old_table => $new_table) {
 		if (
-			$wpdb->query( $wpdb->prepare( "SHOW TABLES LIKE %s", $old_table ) ) &&
-			! $wpdb->query( $wpdb->prepare( "SHOW TABLES LIKE %s", $new_table ) )
+			$wpdb->query($wpdb->prepare("SHOW TABLES LIKE %s", $old_table)) &&
+			! $wpdb->query($wpdb->prepare("SHOW TABLES LIKE %s", $new_table))
 		) {
-			$wpdb->query( "ALTER TABLE {$old_table} RENAME TO {$new_table}" );
+			$wpdb->query("ALTER TABLE {$old_table} RENAME TO {$new_table}");
 
-			if ( "{$wpdb->prefix}give_donormeta" === $new_table ) {
-				$wpdb->query( "ALTER TABLE {$new_table} CHANGE COLUMN customer_id donor_id bigint(20)" );
+			if ("{$wpdb->prefix}give_donormeta" === $new_table) {
+				$wpdb->query("ALTER TABLE {$new_table} CHANGE COLUMN customer_id donor_id bigint(20)");
 			}
 		}
 	}
@@ -2179,7 +2179,7 @@ 
 	$give_updates->percentage = 100;
 
 	// No more forms found, finish up.
-	give_set_upgrade_complete( 'v20_rename_donor_tables' );
+	give_set_upgrade_complete('v20_rename_donor_tables');
 
 	// Re initiate donor classes.
 	Give()->donors     = new Give_DB_Donors();
@@ -2197,19 +2197,19 @@ 
 function give_v201_create_tables() {
 	global $wpdb;
 
-	if ( ! $wpdb->query( $wpdb->prepare( "SHOW TABLES LIKE %s", "{$wpdb->prefix}give_paymentmeta" ) ) ) {
+	if ( ! $wpdb->query($wpdb->prepare("SHOW TABLES LIKE %s", "{$wpdb->prefix}give_paymentmeta"))) {
 		Give()->payment_meta->create_table();
 	}
 
-	if ( ! $wpdb->query( $wpdb->prepare( "SHOW TABLES LIKE %s", "{$wpdb->prefix}give_formmeta" ) ) ) {
+	if ( ! $wpdb->query($wpdb->prepare("SHOW TABLES LIKE %s", "{$wpdb->prefix}give_formmeta"))) {
 		Give()->form_meta->create_table();
 	}
 
-	if ( ! $wpdb->query( $wpdb->prepare( "SHOW TABLES LIKE %s", "{$wpdb->prefix}give_logs" ) ) ) {
+	if ( ! $wpdb->query($wpdb->prepare("SHOW TABLES LIKE %s", "{$wpdb->prefix}give_logs"))) {
 		Give()->logs->log_db->create_table();
 	}
 
-	if ( ! $wpdb->query( $wpdb->prepare( "SHOW TABLES LIKE %s", "{$wpdb->prefix}give_logmeta" ) ) ) {
+	if ( ! $wpdb->query($wpdb->prepare("SHOW TABLES LIKE %s", "{$wpdb->prefix}give_logmeta"))) {
 		Give()->logs->logmeta_db->create_table();
 	}
 }
@@ -2234,31 +2234,31 @@ 
   				$wpdb->posts.post_date >= '2018-01-08 00:00:00'
 			)
 			AND $wpdb->posts.post_type = 'give_payment'
-			AND {$wpdb->posts}.post_status IN ('" . implode( "','", array_keys( give_get_payment_statuses() ) ) . "')
+			AND {$wpdb->posts}.post_status IN ('".implode("','", array_keys(give_get_payment_statuses()))."')
 			ORDER BY $wpdb->posts.post_date ASC 
 			LIMIT 100
-			OFFSET " . $give_updates->get_offset( 100 )
+			OFFSET ".$give_updates->get_offset(100)
 	);
 
-	if ( ! empty( $payments ) ) {
-		$give_updates->set_percentage( give_get_total_post_type_count( 'give_payment' ), ( $give_updates->step * 100 ) );
+	if ( ! empty($payments)) {
+		$give_updates->set_percentage(give_get_total_post_type_count('give_payment'), ($give_updates->step * 100));
 
-		foreach ( $payments as $payment_id ) {
-			$post = get_post( $payment_id );
-			setup_postdata( $post );
+		foreach ($payments as $payment_id) {
+			$post = get_post($payment_id);
+			setup_postdata($post);
 
 			// Do not add new meta keys if already refactored.
-			if ( $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id=%d AND meta_key=%s", $post->ID, '_give_payment_donor_id' ) ) ) {
+			if ($wpdb->get_var($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id=%d AND meta_key=%s", $post->ID, '_give_payment_donor_id'))) {
 				continue;
 			}
 
 
 			// Split _give_payment_meta meta.
 			// @todo Remove _give_payment_meta after releases 2.0
-			$payment_meta = give_get_meta( $post->ID, '_give_payment_meta', true );
+			$payment_meta = give_get_meta($post->ID, '_give_payment_meta', true);
 
-			if ( ! empty( $payment_meta ) ) {
-				_give_20_bc_split_and_save_give_payment_meta( $post->ID, $payment_meta );
+			if ( ! empty($payment_meta)) {
+				_give_20_bc_split_and_save_give_payment_meta($post->ID, $payment_meta);
 			}
 
 			$deprecated_meta_keys = array(
@@ -2267,9 +2267,9 @@ 
 				'_give_payment_user_ip'     => '_give_payment_donor_ip',
 			);
 
-			foreach ( $deprecated_meta_keys as $old_meta_key => $new_meta_key ) {
+			foreach ($deprecated_meta_keys as $old_meta_key => $new_meta_key) {
 				// Do not add new meta key if already exist.
-				if ( $wpdb->get_var( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id=%d AND meta_key=%s", $post->ID, $new_meta_key ) ) ) {
+				if ($wpdb->get_var($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id=%d AND meta_key=%s", $post->ID, $new_meta_key))) {
 					continue;
 				}
 
@@ -2278,25 +2278,25 @@ 
 					array(
 						'post_id'    => $post->ID,
 						'meta_key'   => $new_meta_key,
-						'meta_value' => give_get_meta( $post->ID, $old_meta_key, true ),
+						'meta_value' => give_get_meta($post->ID, $old_meta_key, true),
 					)
 				);
 			}
 
 			// Bailout
-			if ( $donor_id = give_get_meta( $post->ID, '_give_payment_donor_id', true ) ) {
+			if ($donor_id = give_get_meta($post->ID, '_give_payment_donor_id', true)) {
 				/* @var Give_Donor $donor */
-				$donor = new Give_Donor( $donor_id );
+				$donor = new Give_Donor($donor_id);
 
-				$address['line1']   = give_get_meta( $post->ID, '_give_donor_billing_address1', true, '' );
-				$address['line2']   = give_get_meta( $post->ID, '_give_donor_billing_address2', true, '' );
-				$address['city']    = give_get_meta( $post->ID, '_give_donor_billing_city', true, '' );
-				$address['state']   = give_get_meta( $post->ID, '_give_donor_billing_state', true, '' );
-				$address['zip']     = give_get_meta( $post->ID, '_give_donor_billing_zip', true, '' );
-				$address['country'] = give_get_meta( $post->ID, '_give_donor_billing_country', true, '' );
+				$address['line1']   = give_get_meta($post->ID, '_give_donor_billing_address1', true, '');
+				$address['line2']   = give_get_meta($post->ID, '_give_donor_billing_address2', true, '');
+				$address['city']    = give_get_meta($post->ID, '_give_donor_billing_city', true, '');
+				$address['state']   = give_get_meta($post->ID, '_give_donor_billing_state', true, '');
+				$address['zip']     = give_get_meta($post->ID, '_give_donor_billing_zip', true, '');
+				$address['country'] = give_get_meta($post->ID, '_give_donor_billing_country', true, '');
 
 				// Save address.
-				$donor->add_address( 'billing[]', $address );
+				$donor->add_address('billing[]', $address);
 			}
 
 		}// End while().
@@ -2307,7 +2307,7 @@ 
 		// $wpdb->get_var( $wpdb->prepare( "DELETE FROM $wpdb->postmeta WHERE meta_key=%s", '_give_payment_user_id' ) );
 
 		// No more forms found, finish up.
-		give_set_upgrade_complete( 'v201_upgrades_payment_metadata' );
+		give_set_upgrade_complete('v201_upgrades_payment_metadata');
 	}
 }
 
@@ -2327,21 +2327,21 @@ 
 			SELECT ID FROM $wpdb->posts 
 			WHERE 1=1
 			AND ( $wpdb->posts.post_type = 'give_payment' OR $wpdb->posts.post_type = 'give_forms' )
-			AND {$wpdb->posts}.post_status IN ('" . implode( "','", array_keys( give_get_payment_statuses() ) ) . "')
+			AND {$wpdb->posts}.post_status IN ('".implode("','", array_keys(give_get_payment_statuses()))."')
 			ORDER BY $wpdb->posts.post_date ASC 
 			LIMIT 100
-			OFFSET " . $give_updates->get_offset( 100 )
+			OFFSET ".$give_updates->get_offset(100)
 	);
 
-	if ( ! empty( $payments ) ) {
-		$give_updates->set_percentage( give_get_total_post_type_count( array(
+	if ( ! empty($payments)) {
+		$give_updates->set_percentage(give_get_total_post_type_count(array(
 			'give_forms',
 			'give_payment',
-		) ), $give_updates->step * 100 );
+		)), $give_updates->step * 100);
 
-		foreach ( $payments as $payment_id ) {
-			$post = get_post( $payment_id );
-			setup_postdata( $post );
+		foreach ($payments as $payment_id) {
+			$post = get_post($payment_id);
+			setup_postdata($post);
 
 			$meta_data = $wpdb->get_results(
 				$wpdb->prepare(
@@ -2351,19 +2351,19 @@ 
 				ARRAY_A
 			);
 
-			if ( ! empty( $meta_data ) ) {
-				foreach ( $meta_data as $index => $data ) {
+			if ( ! empty($meta_data)) {
+				foreach ($meta_data as $index => $data) {
 					// Check for duplicate meta values.
-					if ( $result = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . ( 'give_forms' === $post->post_type ? $wpdb->formmeta : $wpdb->paymentmeta ) . " WHERE meta_id=%d", $data['meta_id'] ), ARRAY_A ) ) {
+					if ($result = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".('give_forms' === $post->post_type ? $wpdb->formmeta : $wpdb->paymentmeta)." WHERE meta_id=%d", $data['meta_id']), ARRAY_A)) {
 						continue;
 					}
 
-					switch ( $post->post_type ) {
+					switch ($post->post_type) {
 						case 'give_forms':
 							$data['form_id'] = $data['post_id'];
-							unset( $data['post_id'] );
+							unset($data['post_id']);
 
-							Give()->form_meta->insert( $data );
+							Give()->form_meta->insert($data);
 							// @todo: delete form meta from post meta table after releases 2.0.
 							/*delete_post_meta( get_the_ID(), $data['meta_key'] );*/
 
@@ -2371,9 +2371,9 @@ 
 
 						case 'give_payment':
 							$data['payment_id'] = $data['post_id'];
-							unset( $data['post_id'] );
+							unset($data['post_id']);
 
-							Give()->payment_meta->insert( $data );
+							Give()->payment_meta->insert($data);
 
 							// @todo: delete donation meta from post meta table after releases 2.0.
 							/*delete_post_meta( get_the_ID(), $data['meta_key'] );*/
@@ -2388,7 +2388,7 @@ 
 		wp_reset_postdata();
 	} else {
 		// No more forms found, finish up.
-		give_set_upgrade_complete( 'v201_move_metadata_into_new_table' );
+		give_set_upgrade_complete('v201_move_metadata_into_new_table');
 	}
 
 }
@@ -2409,26 +2409,26 @@ 
 			SELECT ID FROM $wpdb->posts 
 			WHERE 1=1
 			AND $wpdb->posts.post_type = 'give_log'
-			AND {$wpdb->posts}.post_status IN ('" . implode( "','", array_keys( give_get_payment_statuses() ) ) . "')
+			AND {$wpdb->posts}.post_status IN ('".implode("','", array_keys(give_get_payment_statuses()))."')
 			ORDER BY $wpdb->posts.post_date ASC 
 			LIMIT 100
-			OFFSET " . $give_updates->get_offset( 100 )
+			OFFSET ".$give_updates->get_offset(100)
 	);
 
-	if ( ! empty( $logs ) ) {
-		$give_updates->set_percentage( give_get_total_post_type_count( 'give_log' ), $give_updates->step * 100 );
+	if ( ! empty($logs)) {
+		$give_updates->set_percentage(give_get_total_post_type_count('give_log'), $give_updates->step * 100);
 
-		foreach ( $logs as $log_id ) {
-			$post = get_post( $log_id );
-			setup_postdata( $post );
+		foreach ($logs as $log_id) {
+			$post = get_post($log_id);
+			setup_postdata($post);
 
-			if ( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}give_logs WHERE ID=%d", $post->ID ) ) ) {
+			if ($wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}give_logs WHERE ID=%d", $post->ID))) {
 				continue;
 			}
 
-			$term      = get_the_terms( $post->ID, 'give_log_type' );
-			$term      = ! is_wp_error( $term ) && ! empty( $term ) ? $term[0] : array();
-			$term_name = ! empty( $term ) ? $term->slug : '';
+			$term      = get_the_terms($post->ID, 'give_log_type');
+			$term      = ! is_wp_error($term) && ! empty($term) ? $term[0] : array();
+			$term_name = ! empty($term) ? $term->slug : '';
 
 			$log_data = array(
 				'ID'           => $post->ID,
@@ -2441,29 +2441,29 @@ 
 			);
 			$log_meta = array();
 
-			if ( $old_log_meta = get_post_meta( $post->ID ) ) {
-				foreach ( $old_log_meta as $meta_key => $meta_value ) {
-					switch ( $meta_key ) {
+			if ($old_log_meta = get_post_meta($post->ID)) {
+				foreach ($old_log_meta as $meta_key => $meta_value) {
+					switch ($meta_key) {
 						case '_give_log_payment_id':
-							$log_data['log_parent']        = current( $meta_value );
+							$log_data['log_parent']        = current($meta_value);
 							$log_meta['_give_log_form_id'] = $post->post_parent;
 							break;
 
 						default:
-							$log_meta[ $meta_key ] = current( $meta_value );
+							$log_meta[$meta_key] = current($meta_value);
 					}
 				}
 			}
 
-			if ( 'api_request' === $term_name ) {
+			if ('api_request' === $term_name) {
 				$log_meta['_give_log_api_query'] = $post->post_excerpt;
 			}
 
-			$wpdb->insert( "{$wpdb->prefix}give_logs", $log_data );
+			$wpdb->insert("{$wpdb->prefix}give_logs", $log_data);
 
-			if ( ! empty( $log_meta ) ) {
-				foreach ( $log_meta as $meta_key => $meta_value ) {
-					Give()->logs->logmeta_db->update_meta( $post->ID, $meta_key, $meta_value );
+			if ( ! empty($log_meta)) {
+				foreach ($log_meta as $meta_key => $meta_value) {
+					Give()->logs->logmeta_db->update_meta($post->ID, $meta_key, $meta_value);
 				}
 			}
 
@@ -2476,7 +2476,7 @@ 
 		Give()->logs->delete_cache();
 
 		// No more forms found, finish up.
-		give_set_upgrade_complete( 'v201_logs_upgrades' );
+		give_set_upgrade_complete('v201_logs_upgrades');
 	}
 }
 
@@ -2491,51 +2491,51 @@ 
 	global $wpdb;
 	give_v201_create_tables();
 
-	if ( $wpdb->query( $wpdb->prepare( "SHOW TABLES LIKE %s", "{$wpdb->prefix}give_customers" ) ) ) {
-		$customers  = wp_list_pluck( $wpdb->get_results( "SELECT id FROM {$wpdb->prefix}give_customers" ), 'id' );
-		$donors     = wp_list_pluck( $wpdb->get_results( "SELECT id FROM {$wpdb->prefix}give_donors" ), 'id' );
+	if ($wpdb->query($wpdb->prepare("SHOW TABLES LIKE %s", "{$wpdb->prefix}give_customers"))) {
+		$customers  = wp_list_pluck($wpdb->get_results("SELECT id FROM {$wpdb->prefix}give_customers"), 'id');
+		$donors     = wp_list_pluck($wpdb->get_results("SELECT id FROM {$wpdb->prefix}give_donors"), 'id');
 		$donor_data = array();
 
-		if ( $missing_donors = array_diff( $customers, $donors ) ) {
-			foreach ( $missing_donors as $donor_id ) {
+		if ($missing_donors = array_diff($customers, $donors)) {
+			foreach ($missing_donors as $donor_id) {
 				$donor_data[] = array(
-					'info' => $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}give_customers WHERE id=%d", $donor_id ) ),
-					'meta' => $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}give_customermeta WHERE customer_id=%d", $donor_id ) ),
+					'info' => $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}give_customers WHERE id=%d", $donor_id)),
+					'meta' => $wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}give_customermeta WHERE customer_id=%d", $donor_id)),
 
 				);
 			}
 		}
 
-		if ( ! empty( $donor_data ) ) {
+		if ( ! empty($donor_data)) {
 			$donor_table_name      = Give()->donors->table_name;
 			$donor_meta_table_name = Give()->donor_meta->table_name;
 
 			Give()->donors->table_name     = "{$wpdb->prefix}give_donors";
 			Give()->donor_meta->table_name = "{$wpdb->prefix}give_donormeta";
 
-			foreach ( $donor_data as $donor ) {
+			foreach ($donor_data as $donor) {
 				$donor['info'][0] = (array) $donor['info'][0];
 
 				// Prevent duplicate meta id issue.
-				if ( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}give_donors WHERE id=%d", $donor['info'][0]['id'] ) ) ) {
+				if ($wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}give_donors WHERE id=%d", $donor['info'][0]['id']))) {
 					continue;
 				}
 
-				$donor_id = Give()->donors->add( $donor['info'][0] );
+				$donor_id = Give()->donors->add($donor['info'][0]);
 
-				if ( ! empty( $donor['meta'] ) ) {
-					foreach ( $donor['meta'] as $donor_meta ) {
+				if ( ! empty($donor['meta'])) {
+					foreach ($donor['meta'] as $donor_meta) {
 						$donor_meta = (array) $donor_meta;
 
 						// Prevent duplicate meta id issue.
-						if ( $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$wpdb->prefix}give_donormeta WHERE meta_id=%d", $donor_meta['meta_id'] ) ) ) {
-							unset( $donor_meta['meta_id'] );
+						if ($wpdb->get_results($wpdb->prepare("SELECT * FROM {$wpdb->prefix}give_donormeta WHERE meta_id=%d", $donor_meta['meta_id']))) {
+							unset($donor_meta['meta_id']);
 						}
 
 						$donor_meta['donor_id'] = $donor_meta['customer_id'];
-						unset( $donor_meta['customer_id'] );
+						unset($donor_meta['customer_id']);
 
-						Give()->donor_meta->insert( $donor_meta );
+						Give()->donor_meta->insert($donor_meta);
 					}
 				}
 
@@ -2554,35 +2554,35 @@ 
 					)
 				);
 
-				$donor = new Give_Donor( $donor_id );
+				$donor = new Give_Donor($donor_id);
 
-				if ( ! empty( $address ) ) {
-					$address = maybe_unserialize( $address );
-					$donor->add_address( 'personal', $address );
-					$donor->add_address( 'billing[]', $address );
+				if ( ! empty($address)) {
+					$address = maybe_unserialize($address);
+					$donor->add_address('personal', $address);
+					$donor->add_address('billing[]', $address);
 				}
 
-				$donor_name       = explode( ' ', $donor->name, 2 );
-				$donor_first_name = Give()->donor_meta->get_meta( $donor->id, '_give_donor_first_name' );
-				$donor_last_name  = Give()->donor_meta->get_meta( $donor->id, '_give_donor_last_name' );
+				$donor_name       = explode(' ', $donor->name, 2);
+				$donor_first_name = Give()->donor_meta->get_meta($donor->id, '_give_donor_first_name');
+				$donor_last_name  = Give()->donor_meta->get_meta($donor->id, '_give_donor_last_name');
 
 				// If first name meta of donor is not created, then create it.
-				if ( ! $donor_first_name && isset( $donor_name[0] ) ) {
-					Give()->donor_meta->add_meta( $donor->id, '_give_donor_first_name', $donor_name[0] );
+				if ( ! $donor_first_name && isset($donor_name[0])) {
+					Give()->donor_meta->add_meta($donor->id, '_give_donor_first_name', $donor_name[0]);
 				}
 
 				// If last name meta of donor is not created, then create it.
-				if ( ! $donor_last_name && isset( $donor_name[1] ) ) {
-					Give()->donor_meta->add_meta( $donor->id, '_give_donor_last_name', $donor_name[1] );
+				if ( ! $donor_last_name && isset($donor_name[1])) {
+					Give()->donor_meta->add_meta($donor->id, '_give_donor_last_name', $donor_name[1]);
 				}
 
 				// If Donor is connected with WP User then update user meta.
-				if ( $donor->user_id ) {
-					if ( isset( $donor_name[0] ) ) {
-						update_user_meta( $donor->user_id, 'first_name', $donor_name[0] );
+				if ($donor->user_id) {
+					if (isset($donor_name[0])) {
+						update_user_meta($donor->user_id, 'first_name', $donor_name[0]);
 					}
-					if ( isset( $donor_name[1] ) ) {
-						update_user_meta( $donor->user_id, 'last_name', $donor_name[1] );
+					if (isset($donor_name[1])) {
+						update_user_meta($donor->user_id, 'last_name', $donor_name[1]);
 					}
 				}
 			}
@@ -2593,7 +2593,7 @@ 
 	}
 
 	Give_Updates::get_instance()->percentage = 100;
-	give_set_upgrade_complete( 'v201_add_missing_donors' );
+	give_set_upgrade_complete('v201_add_missing_donors');
 }
 
 
@@ -2606,14 +2606,14 @@ 
 	global $wpdb;
 
 	// Do not auto load option.
-	$wpdb->update( $wpdb->options, array( 'autoload' => 'no' ), array( 'option_name' => 'give_completed_upgrades' ) );
+	$wpdb->update($wpdb->options, array('autoload' => 'no'), array('option_name' => 'give_completed_upgrades'));
 
 	// Remove from cache.
 	$all_options = wp_load_alloptions();
 
-	if ( isset( $all_options['give_completed_upgrades'] ) ) {
-		unset( $all_options['give_completed_upgrades'] );
-		wp_cache_set( 'alloptions', $all_options, 'options' );
+	if (isset($all_options['give_completed_upgrades'])) {
+		unset($all_options['give_completed_upgrades']);
+		wp_cache_set('alloptions', $all_options, 'options');
 	}
 
 }
@@ -2628,7 +2628,7 @@ 
 	$give_updates = Give_Updates::get_instance();
 
 	// form query.
-	$donation_forms = new WP_Query( array(
+	$donation_forms = new WP_Query(array(
 			'paged'          => $give_updates->step,
 			'status'         => 'any',
 			'order'          => 'ASC',
@@ -2637,16 +2637,16 @@ 
 		)
 	);
 
-	if ( $donation_forms->have_posts() ) {
-		$give_updates->set_percentage( $donation_forms->found_posts, ( $give_updates->step * 20 ) );
+	if ($donation_forms->have_posts()) {
+		$give_updates->set_percentage($donation_forms->found_posts, ($give_updates->step * 20));
 
-		while ( $donation_forms->have_posts() ) {
+		while ($donation_forms->have_posts()) {
 			$donation_forms->the_post();
 			$form_id = get_the_ID();
 
-			$form_closed_status = give_get_meta( $form_id, '_give_form_status', true );
-			if ( empty( $form_closed_status ) ) {
-				give_set_form_closed_status( $form_id );
+			$form_closed_status = give_get_meta($form_id, '_give_form_status', true);
+			if (empty($form_closed_status)) {
+				give_set_form_closed_status($form_id);
 			}
 		}
 
@@ -2656,7 +2656,7 @@ 
 	} else {
 
 		// The Update Ran.
-		give_set_upgrade_complete( 'v210_verify_form_status_upgrades' );
+		give_set_upgrade_complete('v210_verify_form_status_upgrades');
 	}
 
 }
\ No newline at end of file

includes/admin/admin-footer.php

Spacing +6 added lines, -6 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,14 +24,14 @@ 
  *
  * @return      string
  */
-function give_admin_rate_us( $footer_text ) {
+function give_admin_rate_us($footer_text) {
 	global $typenow;
 
-	if ( 'give_forms' === $typenow ) {
+	if ('give_forms' === $typenow) {
 		$rate_text = sprintf(
 			/* translators: %s: Link to 5 star rating */
-			__( 'If you like <strong>Give</strong> please leave us a %s rating. It takes a minute and helps a lot. Thanks in advance!', 'give' ),
-			'<a href="https://wordpress.org/support/view/plugin-reviews/give?filter=5#postform" target="_blank" class="give-rating-link" style="text-decoration:none;" data-rated="' . esc_attr__( 'Thanks :)', 'give' ) . '">&#9733;&#9733;&#9733;&#9733;&#9733;</a>'
+			__('If you like <strong>Give</strong> please leave us a %s rating. It takes a minute and helps a lot. Thanks in advance!', 'give'),
+			'<a href="https://wordpress.org/support/view/plugin-reviews/give?filter=5#postform" target="_blank" class="give-rating-link" style="text-decoration:none;" data-rated="'.esc_attr__('Thanks :)', 'give').'">&#9733;&#9733;&#9733;&#9733;&#9733;</a>'
 		);
 
 		return $rate_text;
@@ -40,4 +40,4 @@ 
 	}
 }
 
-add_filter( 'admin_footer_text', 'give_admin_rate_us' );
+add_filter('admin_footer_text', 'give_admin_rate_us');

includes/admin/admin-pages.php

Spacing +81 added lines, -81 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -32,7 +32,7 @@ 
 	global $give_settings_page, $give_payments_page, $give_reports_page, $give_add_ons_page, $give_donors_page, $give_tools_page;
 
 	//Payments
-	$give_payment       = get_post_type_object( 'give_payment' );
+	$give_payment       = get_post_type_object('give_payment');
 	$give_payments_page = add_submenu_page(
 		'edit.php?post_type=give_forms',
 		$give_payment->labels->name,
@@ -45,8 +45,8 @@ 
 	//Donors
 	$give_donors_page = add_submenu_page(
 		'edit.php?post_type=give_forms',
-		esc_html__( 'Donors', 'give' ),
-		esc_html__( 'Donors', 'give' ),
+		esc_html__('Donors', 'give'),
+		esc_html__('Donors', 'give'),
 		'view_give_reports',
 		'give-donors',
 		'give_donors_page'
@@ -55,8 +55,8 @@ 
 	//Reports`
 	$give_reports_page = add_submenu_page(
 		'edit.php?post_type=give_forms',
-		esc_html__( 'Donation Reports', 'give' ),
-		esc_html__( 'Reports', 'give' ),
+		esc_html__('Donation Reports', 'give'),
+		esc_html__('Reports', 'give'),
 		'view_give_reports',
 		'give-reports',
 		array(
@@ -68,8 +68,8 @@ 
 	//Settings
 	$give_settings_page = add_submenu_page(
 		'edit.php?post_type=give_forms',
-		esc_html__( 'Give Settings', 'give' ),
-		esc_html__( 'Settings', 'give' ),
+		esc_html__('Give Settings', 'give'),
+		esc_html__('Settings', 'give'),
 		'manage_give_settings',
 		'give-settings',
 		array(
@@ -81,8 +81,8 @@ 
 	//Tools.
 	$give_tools_page = add_submenu_page(
 		'edit.php?post_type=give_forms',
-		esc_html__( 'Give Tools', 'give' ),
-		esc_html__( 'Tools', 'give' ),
+		esc_html__('Give Tools', 'give'),
+		esc_html__('Tools', 'give'),
 		'manage_give_settings',
 		'give-tools',
 		array(
@@ -94,15 +94,15 @@ 
 	//Add-ons
 	$give_add_ons_page = add_submenu_page(
 		'edit.php?post_type=give_forms',
-		esc_html__( 'Give Add-ons', 'give' ),
-		esc_html__( 'Add-ons', 'give' ),
+		esc_html__('Give Add-ons', 'give'),
+		esc_html__('Add-ons', 'give'),
 		'install_plugins',
 		'give-addons',
 		'give_add_ons_page'
 	);
 }
 
-add_action( 'admin_menu', 'give_add_options_links', 10 );
+add_action('admin_menu', 'give_add_options_links', 10);
 
 /**
  *  Determines whether the current admin page is a Give admin page.
@@ -118,28 +118,28 @@ 
  *
  * @return bool True if Give admin page.
  */
-function give_is_admin_page( $passed_page = '', $passed_view = '' ) {
+function give_is_admin_page($passed_page = '', $passed_view = '') {
 	global $pagenow, $typenow;
 
 	$found          = true;
-	$get_query_args = ! empty( $_GET ) ? @array_map( 'strtolower', $_GET ) : array();
+	$get_query_args = ! empty($_GET) ? @array_map('strtolower', $_GET) : array();
 
 	// Set default argument, if not passed.
-	$query_args = wp_parse_args( $get_query_args, array_fill_keys( array( 'post_type', 'action', 'taxonomy', 'page', 'view', 'tab' ), false ) );
+	$query_args = wp_parse_args($get_query_args, array_fill_keys(array('post_type', 'action', 'taxonomy', 'page', 'view', 'tab'), false));
 
-	switch ( $passed_page ) {
+	switch ($passed_page) {
 		case 'categories':
 		case 'tags':
-			$has_view = in_array( $passed_view, array( 'list-table', 'edit', 'new' ), true );
+			$has_view = in_array($passed_view, array('list-table', 'edit', 'new'), true);
 
 			if (
-				! in_array( $query_args['taxonomy'], array( 'give_forms_category', 'give_forms_tag' ), true ) &&
+				! in_array($query_args['taxonomy'], array('give_forms_category', 'give_forms_tag'), true) &&
 				'edit-tags.php' !== $pagenow &&
 				(
 					$has_view ||
 					(
-						( in_array( $passed_view, array( 'list-table', 'new' ), true ) && 'edit' === $query_args['action'] ) ||
-						( 'edit' !== $passed_view && 'edit' !== $query_args['action'] ) &&
+						(in_array($passed_view, array('list-table', 'new'), true) && 'edit' === $query_args['action']) ||
+						('edit' !== $passed_view && 'edit' !== $query_args['action']) &&
 						! $has_view
 					)
 				)
@@ -149,18 +149,18 @@ 
 			break;
 		// Give Donation form page.
 		case 'give_forms':
-			$has_view = in_array( $passed_view, array( 'new', 'list-table', 'edit' ), true );
+			$has_view = in_array($passed_view, array('new', 'list-table', 'edit'), true);
 
 			if (
 				'give_forms' !== $typenow &&
 				(
-					( 'list-table' !== $passed_view && 'edit.php' !== $pagenow ) &&
-					( 'edit' !== $passed_view && 'post.php' !== $pagenow ) &&
-					( 'new' !== $passed_view && 'post-new.php' !== $pagenow )
+					('list-table' !== $passed_view && 'edit.php' !== $pagenow) &&
+					('edit' !== $passed_view && 'post.php' !== $pagenow) &&
+					('new' !== $passed_view && 'post-new.php' !== $pagenow)
 				) ||
 				(
 					! $has_view &&
-					( 'post-new.php' !== $pagenow && 'give_forms' !== $query_args['post_type'] )
+					('post-new.php' !== $pagenow && 'give_forms' !== $query_args['post_type'])
 				)
 			) {
 				$found = false;
@@ -168,13 +168,13 @@ 
 			break;
 		// Give Donors page.
 		case 'donors':
-			$has_view = array_intersect( array( $passed_view, $query_args['view'] ), array( 'list-table', 'overview', 'notes' ) );
+			$has_view = array_intersect(array($passed_view, $query_args['view']), array('list-table', 'overview', 'notes'));
 
 			if (
-				( 'give-donors' !== $query_args['page'] || 'edit.php' !== $pagenow ) &&
+				('give-donors' !== $query_args['page'] || 'edit.php' !== $pagenow) &&
 				(
-					( $passed_view !== $query_args['view'] || ! empty( $has_view ) ) ||
-					( false !== $query_args['view'] && 'list-table' !== $passed_view )
+					($passed_view !== $query_args['view'] || ! empty($has_view)) ||
+					(false !== $query_args['view'] && 'list-table' !== $passed_view)
 				)
 			) {
 				$found = false;
@@ -183,12 +183,12 @@ 
 		// Give Donations page.
 		case 'payments':
 			if (
-				( 'give-payment-history' !== $query_args['page'] || 'edit.php' !== $pagenow ) &&
+				('give-payment-history' !== $query_args['page'] || 'edit.php' !== $pagenow) &&
 				(
-					! in_array( $passed_view, array( 'list-table', 'edit' ), true ) ||
+					! in_array($passed_view, array('list-table', 'edit'), true) ||
 					(
-						( 'list-table' !== $passed_view && false !== $query_args['view'] ) ||
-						( 'edit' !== $passed_view && 'view-payment-details' !== $query_args['view'] )
+						('list-table' !== $passed_view && false !== $query_args['view']) ||
+						('edit' !== $passed_view && 'view-payment-details' !== $query_args['view'])
 					)
 				)
 			) {
@@ -199,20 +199,20 @@ 
 		case 'settings':
 		case 'addons':
 			// Get current tab.
-			$current_tab       = empty( $passed_view ) ? $query_args['tab'] : $passed_view;
-			$give_setting_page = in_array( $query_args['page'], array( 'give-reports', 'give-settings', 'give-addons' ), true );
+			$current_tab       = empty($passed_view) ? $query_args['tab'] : $passed_view;
+			$give_setting_page = in_array($query_args['page'], array('give-reports', 'give-settings', 'give-addons'), true);
 
 			// Check if it's Give Setting page or not.
 			if (
-				( 'edit.php' !== $pagenow || ! $give_setting_page ) &&
-				! Give_Admin_Settings::is_setting_page( $current_tab )
+				('edit.php' !== $pagenow || ! $give_setting_page) &&
+				! Give_Admin_Settings::is_setting_page($current_tab)
 			) {
 				$found = false;
 			}
 			break;
 		default:
 			global $give_payments_page, $give_settings_page, $give_reports_page, $give_system_info_page, $give_add_ons_page, $give_settings_export, $give_donors_page, $give_tools_page;
-			$admin_pages = apply_filters( 'give_admin_pages', array(
+			$admin_pages = apply_filters('give_admin_pages', array(
 				$give_payments_page,
 				$give_settings_page,
 				$give_reports_page,
@@ -222,11 +222,11 @@ 
 				$give_donors_page,
 				$give_tools_page,
 				'widgets.php',
-			) );
+			));
 
-			$found = ( 'give_forms' === $typenow || in_array( $pagenow, array_merge( $admin_pages, array( 'index.php', 'post-new.php', 'post.php' ) ), true ) ) ? true : false;
+			$found = ('give_forms' === $typenow || in_array($pagenow, array_merge($admin_pages, array('index.php', 'post-new.php', 'post.php')), true)) ? true : false;
 	}
-	return (bool) apply_filters( 'give_is_admin_page', $found, $query_args['page'], $query_args['view'], $passed_page, $passed_view );
+	return (bool) apply_filters('give_is_admin_page', $found, $query_args['page'], $query_args['view'], $passed_page, $passed_view);
 }
 
 /**
@@ -236,37 +236,37 @@ 
  * @param  array $settings
  * @return array
  */
-function give_settings_page_pages( $settings ) {
-	include( 'abstract-admin-settings-page.php' );
-	include( 'settings/class-settings-cmb2-backward-compatibility.php' );
+function give_settings_page_pages($settings) {
+	include('abstract-admin-settings-page.php');
+	include('settings/class-settings-cmb2-backward-compatibility.php');
 
 	$settings = array(
 		// General settings.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/settings/class-settings-general.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/settings/class-settings-general.php'),
 
 		// Payment Gateways Settings.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/settings/class-settings-gateways.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/settings/class-settings-gateways.php'),
 
 		// Display settings.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/settings/class-settings-display.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/settings/class-settings-display.php'),
 
 		// Emails settings.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/settings/class-settings-email.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/settings/class-settings-email.php'),
 
 		// Addons settings.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/settings/class-settings-addon.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/settings/class-settings-addon.php'),
 
 		// License settings.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/settings/class-settings-license.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/settings/class-settings-license.php'),
 
 		// Advanced settings.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/settings/class-settings-advanced.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/settings/class-settings-advanced.php'),
 	);
 
 	// Output.
 	return $settings;
 }
-add_filter( 'give-settings_get_settings_pages', 'give_settings_page_pages', 0, 1 );
+add_filter('give-settings_get_settings_pages', 'give_settings_page_pages', 0, 1);
 
 
 /**
@@ -276,25 +276,25 @@ 
  * @param  array $settings
  * @return array
  */
-function give_reports_page_pages( $settings ) {
-	include( 'abstract-admin-settings-page.php' );
+function give_reports_page_pages($settings) {
+	include('abstract-admin-settings-page.php');
 
 	$settings = array(
 		// Earnings.
-		include( 'reports/class-earnings-report.php' ),
+		include('reports/class-earnings-report.php'),
 
 		// Forms.
-		include( 'reports/class-forms-report.php' ),
+		include('reports/class-forms-report.php'),
 
 		// Gateways.
-		include( 'reports/class-gateways-report.php' ),
+		include('reports/class-gateways-report.php'),
 
 	);
 
 	// Output.
 	return $settings;
 }
-add_filter( 'give-reports_get_settings_pages', 'give_reports_page_pages', 0, 1 );
+add_filter('give-reports_get_settings_pages', 'give_reports_page_pages', 0, 1);
 
 /**
  * Add setting tab to give-settings page
@@ -303,34 +303,34 @@ 
  * @param  array $settings
  * @return array
  */
-function give_tools_page_pages( $settings ) {
-	include( 'abstract-admin-settings-page.php' );
+function give_tools_page_pages($settings) {
+	include('abstract-admin-settings-page.php');
 
 	$settings = array(
 
 		// Export.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/tools/class-settings-export.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/tools/class-settings-export.php'),
 
 		// Import
-		include_once( GIVE_PLUGIN_DIR . 'includes/admin/tools/class-settings-import.php' ),
+		include_once(GIVE_PLUGIN_DIR.'includes/admin/tools/class-settings-import.php'),
 
 		// Logs.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/tools/class-settings-logs.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/tools/class-settings-logs.php'),
 
 		// API.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/tools/class-settings-api.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/tools/class-settings-api.php'),
 
 		// Data.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/tools/class-settings-data.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/tools/class-settings-data.php'),
 
 		// System Info.
-		include( GIVE_PLUGIN_DIR . 'includes/admin/tools/class-settings-system-info.php' ),
+		include(GIVE_PLUGIN_DIR.'includes/admin/tools/class-settings-system-info.php'),
 	);
 
 	// Output.
 	return $settings;
 }
-add_filter( 'give-tools_get_settings_pages', 'give_tools_page_pages', 0, 1 );
+add_filter('give-tools_get_settings_pages', 'give_tools_page_pages', 0, 1);
 
 /**
  * Set default tools page tab.
@@ -339,10 +339,10 @@ 
  * @param  string $default_tab Default tab name.
  * @return string
  */
-function give_set_default_tab_form_tools_page( $default_tab ) {
+function give_set_default_tab_form_tools_page($default_tab) {
 	return 'export';
 }
-add_filter( 'give_default_setting_tab_give-tools', 'give_set_default_tab_form_tools_page', 10, 1 );
+add_filter('give_default_setting_tab_give-tools', 'give_set_default_tab_form_tools_page', 10, 1);
 
 
 /**
@@ -352,10 +352,10 @@ 
  * @param  string $default_tab Default tab name.
  * @return string
  */
-function give_set_default_tab_form_reports_page( $default_tab ) {
+function give_set_default_tab_form_reports_page($default_tab) {
 	return 'earnings';
 }
-add_filter( 'give_default_setting_tab_give-reports', 'give_set_default_tab_form_reports_page', 10, 1 );
+add_filter('give_default_setting_tab_give-reports', 'give_set_default_tab_form_reports_page', 10, 1);
 
 
 /**
@@ -368,19 +368,19 @@ 
  *
  * @return array
  */
-function give_add_display_page_states( $post_states, $post ) {
+function give_add_display_page_states($post_states, $post) {
 
-	switch ( $post->ID ) {
-		case give_get_option( 'success_page' ):
-			$post_states['give_successfully_page'] = __( 'Donation Success Page', 'give' );
+	switch ($post->ID) {
+		case give_get_option('success_page'):
+			$post_states['give_successfully_page'] = __('Donation Success Page', 'give');
 			break;
 
-		case give_get_option( 'failure_page' ):
-			$post_states['give_failure_page'] = __( 'Donation Failed Page', 'give' );
+		case give_get_option('failure_page'):
+			$post_states['give_failure_page'] = __('Donation Failed Page', 'give');
 			break;
 
-		case give_get_option( 'history_page' ):
-			$post_states['give_history_page'] = __( 'Donation History Page', 'give' );
+		case give_get_option('history_page'):
+			$post_states['give_history_page'] = __('Donation History Page', 'give');
 			break;
 	}
 
@@ -388,4 +388,4 @@ 
 }
 
 // Add a post display state for special Give pages.
-add_filter( 'display_post_states', 'give_add_display_page_states', 10, 2 );
+add_filter('display_post_states', 'give_add_display_page_states', 10, 2);

includes/admin/class-api-keys-table.php

Spacing +66 added lines, -66 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -53,11 +53,11 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => esc_html__( 'API Key', 'give' ),     // Singular name of the listed records
-			'plural'   => esc_html__( 'API Keys', 'give' ),    // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => esc_html__('API Key', 'give'), // Singular name of the listed records
+			'plural'   => esc_html__('API Keys', 'give'), // Plural name of the listed records
 			'ajax'     => false, // Does this table support ajax?
-		) );
+		));
 
 		$this->query();
 	}
@@ -73,8 +73,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		return $item[ $column_name ];
+	public function column_default($item, $column_name) {
+		return $item[$column_name];
 	}
 
 	/**
@@ -87,8 +87,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_key( $item ) {
-		return '<input onClick="this.setSelectionRange(0, this.value.length)" readonly="readonly" type="text" class="large-text" value="' . esc_attr( $item['key'] ) . '"/>';
+	public function column_key($item) {
+		return '<input onClick="this.setSelectionRange(0, this.value.length)" readonly="readonly" type="text" class="large-text" value="'.esc_attr($item['key']).'"/>';
 	}
 
 	/**
@@ -101,8 +101,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_token( $item ) {
-		return '<input onClick="this.setSelectionRange(0, this.value.length)" readonly="readonly" type="text" class="large-text" value="' . esc_attr( $item['token'] ) . '"/>';
+	public function column_token($item) {
+		return '<input onClick="this.setSelectionRange(0, this.value.length)" readonly="readonly" type="text" class="large-text" value="'.esc_attr($item['token']).'"/>';
 	}
 
 	/**
@@ -115,8 +115,8 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_secret( $item ) {
-		return '<input onClick="this.setSelectionRange(0, this.value.length)" readonly="readonly" type="text" class="large-text" value="' . esc_attr( $item['secret'] ) . '"/>';
+	public function column_secret($item) {
+		return '<input onClick="this.setSelectionRange(0, this.value.length)" readonly="readonly" type="text" class="large-text" value="'.esc_attr($item['secret']).'"/>';
 	}
 
 	/**
@@ -126,46 +126,46 @@ 
 	 * @since  1.1
 	 * @return string
 	 */
-	public function column_user( $item ) {
+	public function column_user($item) {
 
 		$actions = array();
 
-		if ( apply_filters( 'give_api_log_requests', true ) ) {
+		if (apply_filters('give_api_log_requests', true)) {
 			$actions['view'] = sprintf(
 				'<a href="%s">%s</a>',
-				esc_url( add_query_arg( array(
+				esc_url(add_query_arg(array(
 					'section'   => 'api_requests',
 					'post_type' => 'give_forms',
 					'page'      => 'give-tools',
 					'tab'       => 'logs',
 					's'         => $item['email'],
-				), 'edit.php' ) ),
-				esc_html__( 'View API Log', 'give' )
+				), 'edit.php')),
+				esc_html__('View API Log', 'give')
 			);
 		}
 
 		$actions['reissue'] = sprintf(
 			'<a href="%s" class="give-regenerate-api-key">%s</a>',
-			esc_url( wp_nonce_url( add_query_arg( array(
+			esc_url(wp_nonce_url(add_query_arg(array(
 				'user_id'          => $item['id'],
 				'give_action'      => 'process_api_key',
 				'give_api_process' => 'regenerate',
-			) ), 'give-api-nonce' ) ),
-			esc_html__( 'Reissue', 'give' )
+			)), 'give-api-nonce')),
+			esc_html__('Reissue', 'give')
 		);
-		$actions['revoke']  = sprintf(
+		$actions['revoke'] = sprintf(
 			'<a href="%s" class="give-revoke-api-key give-delete">%s</a>',
-			esc_url( wp_nonce_url( add_query_arg( array(
+			esc_url(wp_nonce_url(add_query_arg(array(
 				'user_id'          => $item['id'],
 				'give_action'      => 'process_api_key',
 				'give_api_process' => 'revoke',
-			) ), 'give-api-nonce' ) ),
-			esc_html__( 'Revoke', 'give' )
+			)), 'give-api-nonce')),
+			esc_html__('Revoke', 'give')
 		);
 
-		$actions = apply_filters( 'give_api_row_actions', array_filter( $actions ) );
+		$actions = apply_filters('give_api_row_actions', array_filter($actions));
 
-		return sprintf( '%1$s %2$s', $item['user'], $this->row_actions( $actions ) );
+		return sprintf('%1$s %2$s', $item['user'], $this->row_actions($actions));
 	}
 
 	/**
@@ -189,10 +189,10 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'user'   => esc_html__( 'Username', 'give' ),
-			'key'    => esc_html__( 'Public Key', 'give' ),
-			'token'  => esc_html__( 'Token', 'give' ),
-			'secret' => esc_html__( 'Secret Key', 'give' ),
+			'user'   => esc_html__('Username', 'give'),
+			'key'    => esc_html__('Public Key', 'give'),
+			'token'  => esc_html__('Token', 'give'),
+			'secret' => esc_html__('Secret Key', 'give'),
 		);
 
 		return $columns;
@@ -206,20 +206,20 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+	protected function display_tablenav($which) {
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav <?php echo esc_attr($which); ?>">
 
 			<div class="alignleft actions bulkactions">
-				<?php $this->bulk_actions( $which ); ?>
+				<?php $this->bulk_actions($which); ?>
 			</div>
 
 			<?php
-			$this->extra_tablenav( $which );
-			$this->pagination( $which );
+			$this->extra_tablenav($which);
+			$this->pagination($which);
 			?>
 
 			<br class="clear"/>
@@ -237,18 +237,18 @@ 
 	 *
 	 * @return void
 	 */
-	function bulk_actions( $which = '' ) {
+	function bulk_actions($which = '') {
 		// These aren't really bulk actions but this outputs the markup in the right place.
 		static $give_api_is_bottom;
 
-		if ( $give_api_is_bottom ) {
+		if ($give_api_is_bottom) {
 			return;
 		}
 		?>
 		<input type="hidden" name="give_action" value="process_api_key"/>
 		<input type="hidden" name="give_api_process" value="generate"/>
 		<?php
-		wp_nonce_field( 'give-api-nonce' );
+		wp_nonce_field('give-api-nonce');
 		/**
 		 * API Key user search.
 		 */
@@ -257,9 +257,9 @@ 
 			'name' => 'user_id',
 		);
 
-		echo Give()->html->ajax_user_search( $args );
+		echo Give()->html->ajax_user_search($args);
 
-		submit_button( esc_html__( 'Generate New API Keys', 'give' ), 'secondary', 'submit', false );
+		submit_button(esc_html__('Generate New API Keys', 'give'), 'secondary', 'submit', false);
 
 		$give_api_is_bottom = true;
 	}
@@ -272,7 +272,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -283,21 +283,21 @@ 
 	 * @return array
 	 */
 	public function query() {
-		$users = get_users( array(
+		$users = get_users(array(
 			'meta_value' => 'give_user_secret_key',
 			'number'     => $this->per_page,
-			'offset'     => $this->per_page * ( $this->get_paged() - 1 ),
-		) );
-		$keys  = array();
-
-		foreach ( $users as $user ) {
-			$keys[ $user->ID ]['id']    = $user->ID;
-			$keys[ $user->ID ]['email'] = $user->user_email;
-			$keys[ $user->ID ]['user']  = '<a href="' . add_query_arg( 'user_id', $user->ID, 'user-edit.php' ) . '"><strong>' . $user->user_login . '</strong></a>';
-
-			$keys[ $user->ID ]['key']    = Give()->api->get_user_public_key( $user->ID );
-			$keys[ $user->ID ]['secret'] = Give()->api->get_user_secret_key( $user->ID );
-			$keys[ $user->ID ]['token']  = Give()->api->get_token( $user->ID );
+			'offset'     => $this->per_page * ($this->get_paged() - 1),
+		));
+		$keys = array();
+
+		foreach ($users as $user) {
+			$keys[$user->ID]['id']    = $user->ID;
+			$keys[$user->ID]['email'] = $user->user_email;
+			$keys[$user->ID]['user']  = '<a href="'.add_query_arg('user_id', $user->ID, 'user-edit.php').'"><strong>'.$user->user_login.'</strong></a>';
+
+			$keys[$user->ID]['key']    = Give()->api->get_user_public_key($user->ID);
+			$keys[$user->ID]['secret'] = Give()->api->get_user_secret_key($user->ID);
+			$keys[$user->ID]['token']  = Give()->api->get_token($user->ID);
 		}
 
 		return $keys;
@@ -314,9 +314,9 @@ 
 	public function total_items() {
 		global $wpdb;
 
-		$total_items = Give_Cache::get( 'give_total_api_keys', true );
+		$total_items = Give_Cache::get('give_total_api_keys', true);
 
-		if ( ! $total_items ) {
+		if ( ! $total_items) {
 			$total_items = $wpdb->get_var(
 				$wpdb->prepare(
 					"SELECT count(user_id)
@@ -325,7 +325,7 @@ 
 				)
 			);
 
-			Give_Cache::set( 'give_total_api_keys', $total_items, HOUR_IN_SECONDS, true );
+			Give_Cache::set('give_total_api_keys', $total_items, HOUR_IN_SECONDS, true);
 		}
 
 		return $total_items;
@@ -344,7 +344,7 @@ 
 		$hidden   = array(); // No hidden columns
 		$sortable = array(); // Not sortable... for now
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$data = $this->query();
 
@@ -352,10 +352,10 @@ 
 
 		$this->items = $data;
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $total_items / $this->per_page ),
-		) );
+			'total_pages' => ceil($total_items / $this->per_page),
+		));
 	}
 }

includes/admin/donors/donors.php

Spacing +218 added lines, -218 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,7 +25,7 @@ 
  *
  * @return string
  */
-function __give_get_format_address( $address, $address_args = array() ) {
+function __give_get_format_address($address, $address_args = array()) {
 	$address_html = '';
 	$address_args = wp_parse_args(
 		$address_args,
@@ -40,7 +40,7 @@ 
 	$address_id = $address_args['type'];
 
 	// Bailout.
-	if ( empty( $address ) || ! is_array( $address ) ) {
+	if (empty($address) || ! is_array($address)) {
 		return $address_html;
 	}
 
@@ -49,19 +49,19 @@ 
 	$address_html .= sprintf(
 		'<span data-address-type="line1">%1$s</span>%2$s',
 		$address['line1'],
-		( ! empty( $address['line2'] ) ? '<br>' : '' )
+		( ! empty($address['line2']) ? '<br>' : '')
 	);
 	$address_html .= sprintf(
 		'<span data-address-type="line2">%1$s</span>%2$s',
 		$address['line2'],
-		( ! empty( $address['city'] ) ? '<br>' : '' )
+		( ! empty($address['city']) ? '<br>' : '')
 	);
 	$address_html .= sprintf(
 		'<span data-address-type="city">%1$s</span><span data-address-type="state">%2$s</span><span data-address-type="zip">%3$s</span>%4$s',
 		$address['city'],
-		( ! empty( $address['state'] ) ? ", {$address['state']}" : '' ),
-		( ! empty( $address['zip'] ) ? " {$address['zip']}" : '' ),
-		( ! empty( $address['country'] ) ? '<br>' : '' )
+		( ! empty($address['state']) ? ", {$address['state']}" : ''),
+		( ! empty($address['zip']) ? " {$address['zip']}" : ''),
+		( ! empty($address['country']) ? '<br>' : '')
 	);
 	$address_html .= sprintf(
 		'<span data-address-type="country">%s</span><br>',
@@ -71,8 +71,8 @@ 
 	// Address action.
 	$address_html .= sprintf(
 		'<br><a href="#" class="js-edit">%1$s</a> | <a href="#" class="js-remove">%2$s</a>',
-		__( 'Edit', 'give' ),
-		__( 'Remove', 'give' )
+		__('Edit', 'give'),
+		__('Remove', 'give')
 	);
 
 	/**
@@ -80,14 +80,14 @@ 
 	 *
 	 * @since 2.0
 	 */
-	$address_label = apply_filters( "give_donor_{$address_args['type']}_address_label", ucfirst( $address_args['type'] ), $address_args );
+	$address_label = apply_filters("give_donor_{$address_args['type']}_address_label", ucfirst($address_args['type']), $address_args);
 
 	// Set unique id and index for multi type address.
-	if ( isset( $address_args['index'] ) ) {
+	if (isset($address_args['index'])) {
 		$address_label = "{$address_label} #{$address_args['index']}";
 	}
 
-	if ( isset( $address_args['id'] ) ) {
+	if (isset($address_args['id'])) {
 		$address_id = "{$address_id}_{$address_args['id']}";
 	}
 
@@ -112,9 +112,9 @@ 
  */
 function give_donors_page() {
 	$default_views  = give_donor_views();
-	$requested_view = isset( $_GET['view'] ) ? sanitize_text_field( $_GET['view'] ) : 'donors';
-	if ( array_key_exists( $requested_view, $default_views ) && function_exists( $default_views[ $requested_view ] ) ) {
-		give_render_donor_view( $requested_view, $default_views );
+	$requested_view = isset($_GET['view']) ? sanitize_text_field($_GET['view']) : 'donors';
+	if (array_key_exists($requested_view, $default_views) && function_exists($default_views[$requested_view])) {
+		give_render_donor_view($requested_view, $default_views);
 	} else {
 		give_donors_list();
 	}
@@ -130,7 +130,7 @@ 
 
 	$views = array();
 
-	return apply_filters( 'give_donor_views', $views );
+	return apply_filters('give_donor_views', $views);
 
 }
 
@@ -144,7 +144,7 @@ 
 
 	$tabs = array();
 
-	return apply_filters( 'give_donor_tabs', $tabs );
+	return apply_filters('give_donor_tabs', $tabs);
 
 }
 
@@ -156,7 +156,7 @@ 
  */
 function give_donors_list() {
 
-	include GIVE_PLUGIN_DIR . 'includes/admin/donors/class-donor-table.php';
+	include GIVE_PLUGIN_DIR.'includes/admin/donors/class-donor-table.php';
 
 	$donors_table = new Give_Donor_List_Table();
 	$donors_table->prepare_items();
@@ -169,12 +169,12 @@ 
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_donors_table_top' );
+		do_action('give_donors_table_top');
 		?>
 
 		<hr class="wp-header-end">
-		<form id="give-donors-search-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors' ); ?>">
-			<?php $donors_table->search_box( __( 'Search Donors', 'give' ), 'give-donors' ); ?>
+		<form id="give-donors-search-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors'); ?>">
+			<?php $donors_table->search_box(__('Search Donors', 'give'), 'give-donors'); ?>
 			<input type="hidden" name="post_type" value="give_forms" />
 			<input type="hidden" name="page" value="give-donors" />
 			<input type="hidden" name="view" value="donors" />
@@ -191,7 +191,7 @@ 
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_donors_table_bottom' );
+		do_action('give_donors_table_bottom');
 		?>
 	</div>
 	<?php
@@ -207,33 +207,33 @@ 
  *
  * @return void
  */
-function give_render_donor_view( $view, $callbacks ) {
+function give_render_donor_view($view, $callbacks) {
 
 	$render = true;
 
-	$donor_view_role = apply_filters( 'give_view_donors_role', 'view_give_reports' );
+	$donor_view_role = apply_filters('give_view_donors_role', 'view_give_reports');
 
-	if ( ! current_user_can( $donor_view_role ) ) {
-		give_set_error( 'give-no-access', __( 'You are not permitted to view this data.', 'give' ) );
+	if ( ! current_user_can($donor_view_role)) {
+		give_set_error('give-no-access', __('You are not permitted to view this data.', 'give'));
 		$render = false;
 	}
 
-	if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-		give_set_error( 'give-invalid_donor', __( 'Invalid Donor ID.', 'give' ) );
+	if ( ! isset($_GET['id']) || ! is_numeric($_GET['id'])) {
+		give_set_error('give-invalid_donor', __('Invalid Donor ID.', 'give'));
 		$render = false;
 	}
 
 	$donor_id          = (int) $_GET['id'];
-	$reconnect_user_id = ! empty( $_GET['user_id'] ) ? (int) $_GET['user_id'] : '';
-	$donor             = new Give_Donor( $donor_id );
+	$reconnect_user_id = ! empty($_GET['user_id']) ? (int) $_GET['user_id'] : '';
+	$donor             = new Give_Donor($donor_id);
 
 	// Reconnect User with Donor profile.
-	if ( $reconnect_user_id ) {
-		give_connect_user_donor_profile( $donor, array( 'user_id' => $reconnect_user_id ), array() );
+	if ($reconnect_user_id) {
+		give_connect_user_donor_profile($donor, array('user_id' => $reconnect_user_id), array());
 	}
 
-	if ( empty( $donor->id ) ) {
-		give_set_error( 'give-invalid_donor', __( 'Invalid Donor ID.', 'give' ) );
+	if (empty($donor->id)) {
+		give_set_error('give-invalid_donor', __('Invalid Donor ID.', 'give'));
 		$render = false;
 	}
 
@@ -242,9 +242,9 @@ 
 
 	<div class='wrap'>
 
-		<?php if ( give_get_errors() ) : ?>
+		<?php if (give_get_errors()) : ?>
 			<div class="error settings-error">
-				<?php Give()->notices->render_frontend_notices( 0 ); ?>
+				<?php Give()->notices->render_frontend_notices(0); ?>
 			</div>
 		<?php endif; ?>
 
@@ -252,7 +252,7 @@ 
 			<?php
 			printf(
 			/* translators: %s: donor first name */
-				__( 'Edit Donor: %s %s', 'give' ),
+				__('Edit Donor: %s %s', 'give'),
 				$donor->get_first_name(),
 				$donor->get_last_name()
 			);
@@ -261,26 +261,26 @@ 
 
 		<hr class="wp-header-end">
 
-		<?php if ( $donor && $render ) : ?>
+		<?php if ($donor && $render) : ?>
 
 			<h2 class="nav-tab-wrapper">
 				<?php
-				foreach ( $donor_tabs as $key => $tab ) :
+				foreach ($donor_tabs as $key => $tab) :
 					$active = $key === $view ? true : false;
 					$class  = $active ? 'nav-tab nav-tab-active' : 'nav-tab';
 					printf(
-						'<a href="%1$s" class="%2$s"><span class="dashicons %3$s"></span>%4$s</a>' . "\n",
-						esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=' . $key . '&id=' . $donor->id ) ),
-						esc_attr( $class ),
-						sanitize_html_class( $tab['dashicon'] ),
-						esc_html( $tab['title'] )
+						'<a href="%1$s" class="%2$s"><span class="dashicons %3$s"></span>%4$s</a>'."\n",
+						esc_url(admin_url('edit.php?post_type=give_forms&page=give-donors&view='.$key.'&id='.$donor->id)),
+						esc_attr($class),
+						sanitize_html_class($tab['dashicon']),
+						esc_html($tab['title'])
 					);
 				endforeach;
 				?>
 			</h2>
 
 			<div id="give-donor-card-wrapper">
-				<?php $callbacks[ $view ]( $donor ) ?>
+				<?php $callbacks[$view]($donor) ?>
 			</div>
 
 		<?php endif; ?>
@@ -300,9 +300,9 @@ 
  *
  * @return void
  */
-function give_donor_view( $donor ) {
+function give_donor_view($donor) {
 
-	$donor_edit_role = apply_filters( 'give_edit_donors_role', 'edit_give_payments' );
+	$donor_edit_role = apply_filters('give_edit_donors_role', 'edit_give_payments');
 
 	/**
 	 * Fires in donor profile screen, above the donor card.
@@ -311,11 +311,11 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_card_top', $donor );
+	do_action('give_donor_card_top', $donor);
 
 	// Set Read only to the fields which needs to be locked.
 	$read_only = '';
-	if ( $donor->user_id ) {
+	if ($donor->user_id) {
 		$read_only = 'readonly="readonly"';
 	}
 	?>
@@ -323,32 +323,32 @@ 
 	<div id="donor-summary" class="info-wrapper donor-section postbox">
 
 		<form id="edit-donor-info" method="post"
-		      action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ); ?>">
+		      action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id); ?>">
 
 			<div class="donor-info">
 
 				<div class="donor-bio-header clearfix">
 
 					<div class="avatar-wrap left" id="donor-avatar">
-						<?php echo get_avatar( $donor->email ); ?>
+						<?php echo get_avatar($donor->email); ?>
 					</div>
 
 					<div id="donor-name-wrap" class="left">
 						<span class="donor-name info-item edit-item">
 							<input <?php echo $read_only; ?> size="15" data-key="first_name"
 							                                 name="customerinfo[first_name]" type="text"
-							                                 value="<?php esc_attr_e( $donor->get_first_name() ); ?>"
-							                                 placeholder="<?php _e( 'First Name', 'give' ); ?>"/>
-							<?php if ( $donor->user_id ) : ?>
+							                                 value="<?php esc_attr_e($donor->get_first_name()); ?>"
+							                                 placeholder="<?php _e('First Name', 'give'); ?>"/>
+							<?php if ($donor->user_id) : ?>
 								<a href="#" class="give-lock-block">
 									<i class="give-icon give-icon-locked"></i>
 								</a>
 							<?php endif; ?>
 							<input <?php echo $read_only; ?> size="15" data-key="last_name"
 							                                 name="customerinfo[last_name]" type="text"
-							                                 value="<?php esc_attr_e( $donor->get_last_name() ); ?>"
-							                                 placeholder="<?php _e( 'Last Name', 'give' ); ?>"/>
-							<?php if ( $donor->user_id ) : ?>
+							                                 value="<?php esc_attr_e($donor->get_last_name()); ?>"
+							                                 placeholder="<?php _e('Last Name', 'give'); ?>"/>
+							<?php if ($donor->user_id) : ?>
 								<a href="#" class="give-lock-block">
 									<i class="give-icon give-icon-locked"></i>
 								</a>
@@ -358,12 +358,12 @@ 
 									data-key="name"><?php echo $donor->name; ?></span></span>
 					</div>
 					<p class="donor-since info-item">
-						<?php _e( 'Donor since', 'give' ); ?>
-						<?php echo date_i18n( give_date_format(), strtotime( $donor->date_created ) ) ?>
+						<?php _e('Donor since', 'give'); ?>
+						<?php echo date_i18n(give_date_format(), strtotime($donor->date_created)) ?>
 					</p>
-					<?php if ( current_user_can( $donor_edit_role ) ) : ?>
+					<?php if (current_user_can($donor_edit_role)) : ?>
 						<a href="#" id="edit-donor"
-						   class="button info-item editable donor-edit-link"><?php _e( 'Edit Donor', 'give' ); ?></a>
+						   class="button info-item editable donor-edit-link"><?php _e('Edit Donor', 'give'); ?></a>
 					<?php endif; ?>
 				</div>
 				<!-- /donor-bio-header -->
@@ -373,11 +373,11 @@ 
 					<table class="widefat striped">
 						<tbody>
 						<tr>
-							<th scope="col"><label for="tablecell"><?php _e( 'Donor ID:', 'give' ); ?></label></th>
+							<th scope="col"><label for="tablecell"><?php _e('Donor ID:', 'give'); ?></label></th>
 							<td><?php echo $donor->id; ?></td>
 						</tr>
 						<tr>
-							<th scope="col"><label for="tablecell"><?php _e( 'User ID:', 'give' ); ?></label></th>
+							<th scope="col"><label for="tablecell"><?php _e('User ID:', 'give'); ?></label></th>
 							<td>
 									<span class="donor-user-id info-item edit-item">
 										<?php
@@ -394,22 +394,22 @@ 
 											'data'  => $data_atts,
 										);
 
-										if ( ! empty( $user_id ) ) {
-											$userdata              = get_userdata( $user_id );
+										if ( ! empty($user_id)) {
+											$userdata              = get_userdata($user_id);
 											$user_args['selected'] = $user_id;
 										}
 
-										echo Give()->html->ajax_user_search( $user_args );
+										echo Give()->html->ajax_user_search($user_args);
 										?>
 									</span>
 
 								<span class="donor-user-id info-item editable">
-										<?php if ( ! empty( $userdata ) ) : ?>
-											<span data-key="user_id">#<?php echo $donor->user_id . ' - ' . $userdata->display_name; ?></span>
+										<?php if ( ! empty($userdata)) : ?>
+											<span data-key="user_id">#<?php echo $donor->user_id.' - '.$userdata->display_name; ?></span>
 										<?php else: ?>
-											<span data-key="user_id"><?php _e( 'Unregistered', 'give' ); ?></span>
+											<span data-key="user_id"><?php _e('Unregistered', 'give'); ?></span>
 										<?php endif; ?>
-									<?php if ( current_user_can( $donor_edit_role ) && intval( $donor->user_id ) > 0 ):
+									<?php if (current_user_can($donor_edit_role) && intval($donor->user_id) > 0):
 
 										echo sprintf(
 											'- <span class="disconnect-user">
@@ -418,11 +418,11 @@ 
 				                                       | <span class="view-user-profile">
  											                <a id="view-user-profile" href="%3$s" aria-label="%4$s">%5$s</a>
  										               </span>',
-											__( 'Disconnects the current user ID from this donor record.', 'give' ),
-											__( 'Disconnect User', 'give' ),
-											'user-edit.php?user_id=' . $donor->user_id,
-											__( 'View User Profile of current user ID.', 'give' ),
-											__( 'View User Profile', 'give' )
+											__('Disconnects the current user ID from this donor record.', 'give'),
+											__('Disconnect User', 'give'),
+											'user-edit.php?user_id='.$donor->user_id,
+											__('View User Profile of current user ID.', 'give'),
+											__('View User Profile', 'give')
 										);
 
 										endif; ?>
@@ -431,13 +431,13 @@ 
 						</tr>
 
 						<?php
-						$donor_company = $donor->get_meta( '_give_donor_company', true );
+						$donor_company = $donor->get_meta('_give_donor_company', true);
 
-						if ( ! empty( $donor_company ) ) {
+						if ( ! empty($donor_company)) {
 							?>
 							<tr class="alternate">
 								<th scope="col">
-									<label for="tablecell"><?php _e( 'Company Name:', 'give' ); ?></label>
+									<label for="tablecell"><?php _e('Company Name:', 'give'); ?></label>
 								</th>
 								<td><?php echo $donor_company; ?></td>
 							</tr>
@@ -453,11 +453,11 @@ 
 
 			<span id="donor-edit-actions" class="edit-item">
 				<input type="hidden" data-key="id" name="customerinfo[id]" value="<?php echo $donor->id; ?>"/>
-				<?php wp_nonce_field( 'edit-donor', '_wpnonce', false, true ); ?>
+				<?php wp_nonce_field('edit-donor', '_wpnonce', false, true); ?>
 				<input type="hidden" name="give_action" value="edit-donor"/>
 				<input type="submit" id="give-edit-donor-save" class="button-secondary"
-				       value="<?php _e( 'Update Donor', 'give' ); ?>"/>
-				<a id="give-edit-donor-cancel" href="" class="delete"><?php _e( 'Cancel', 'give' ); ?></a>
+				       value="<?php _e('Update Donor', 'give'); ?>"/>
+				<a id="give-edit-donor-cancel" href="" class="delete"><?php _e('Cancel', 'give'); ?></a>
 			</span>
 
 		</form>
@@ -472,24 +472,24 @@ 
 	 *
 	 * @param Give_Donor $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_before_stats', $donor );
+	do_action('give_donor_before_stats', $donor);
 	?>
 
 	<div id="donor-stats-wrapper" class="donor-section postbox clear">
 		<ul>
 			<li>
-				<a href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&donor=' . absint( $donor->id ) ); ?>">
+				<a href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-payment-history&donor='.absint($donor->id)); ?>">
 					<span class="dashicons dashicons-heart"></span>
 					<?php
 					// Completed Donations.
-					$completed_donations_text = sprintf( _n( '%d Completed Donation', '%d Completed Donations', $donor->purchase_count, 'give' ), $donor->purchase_count );
-					echo apply_filters( 'give_donor_completed_donations', $completed_donations_text, $donor );
+					$completed_donations_text = sprintf(_n('%d Completed Donation', '%d Completed Donations', $donor->purchase_count, 'give'), $donor->purchase_count);
+					echo apply_filters('give_donor_completed_donations', $completed_donations_text, $donor);
 					?>
 				</a>
 			</li>
 			<li>
 				<span class="dashicons dashicons-chart-area"></span>
-				<?php echo give_currency_filter( give_format_amount( $donor->get_total_donation_amount(), array( 'sanitize' => false ) ) ); ?> <?php _e( 'Lifetime Donations', 'give' ); ?>
+				<?php echo give_currency_filter(give_format_amount($donor->get_total_donation_amount(), array('sanitize' => false))); ?> <?php _e('Lifetime Donations', 'give'); ?>
 			</li>
 			<?php
 			/**
@@ -501,7 +501,7 @@ 
 			 *
 			 * @param object $donor The donor object being displayed.
 			 */
-			do_action( 'give_donor_stats_list', $donor );
+			do_action('give_donor_stats_list', $donor);
 			?>
 		</ul>
 	</div>
@@ -514,11 +514,11 @@ 
 	 *
 	 * @param Give_Donor $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_before_address', $donor );
+	do_action('give_donor_before_address', $donor);
 	?>
 
 	<div id="donor-address-wrapper" class="donor-section clear">
-		<h3><?php _e( 'Addresses', 'give' ); ?></h3>
+		<h3><?php _e('Addresses', 'give'); ?></h3>
 
 		<div class="postbox">
 			<div class="give-spinner-wrapper">
@@ -528,16 +528,16 @@ 
 				<div class="all-address">
 					<div class="give-grid-row">
 						<?php
-						if ( ! empty( $donor->address ) ) :
+						if ( ! empty($donor->address)) :
 							// Default address always will be at zero array index.
 							$is_set_as_default = null;
 
-							foreach ( $donor->address as $address_type => $addresses ) {
+							foreach ($donor->address as $address_type => $addresses) {
 
-								switch ( true ) {
-									case is_array( end( $addresses ) ):
+								switch (true) {
+									case is_array(end($addresses)):
 										$index = 1;
-										foreach ( $addresses as $id => $address ) {
+										foreach ($addresses as $id => $address) {
 											echo __give_get_format_address(
 												$address,
 												array(
@@ -547,11 +547,11 @@ 
 												)
 											);
 
-											$index ++;
+											$index++;
 										}
 										break;
 
-									case is_string( end( $addresses ) ):
+									case is_string(end($addresses)):
 										echo __give_get_format_address(
 											$addresses,
 											array(
@@ -564,13 +564,13 @@ 
 						endif;
 						?>
 					</div>
-					<span class="give-no-address-message<?php if ( ! empty( $donor->address ) ) {
+					<span class="give-no-address-message<?php if ( ! empty($donor->address)) {
 						echo ' give-hidden';
 					} ?>">
-						<?php _e( 'This donor does not have any addresses saved.', 'give' ); ?>
+						<?php _e('This donor does not have any addresses saved.', 'give'); ?>
 					</span>
 					<button class="button add-new-address">
-						<?php _e( 'Add Address', 'give' ); ?>
+						<?php _e('Add Address', 'give'); ?>
 					</button>
 				</div>
 
@@ -580,26 +580,26 @@ 
 							<tbody>
 							<tr>
 								<th class="col">
-									<label class="country"><?php esc_html_e( 'Country:', 'give' ); ?></label>
+									<label class="country"><?php esc_html_e('Country:', 'give'); ?></label>
 								</th>
 								<td>
 									<?php
-									echo Give()->html->select( array(
+									echo Give()->html->select(array(
 										'options'          => give_get_country_list(),
 										'name'             => 'country',
-										'selected'         => give_get_option( 'base_country' ),
+										'selected'         => give_get_option('base_country'),
 										'show_option_all'  => false,
 										'show_option_none' => false,
 										'chosen'           => true,
-										'placeholder'      => esc_attr__( 'Select a country', 'give' ),
-										'data'             => array( 'search-type' => 'no_ajax' ),
-									) );
+										'placeholder'      => esc_attr__('Select a country', 'give'),
+										'data'             => array('search-type' => 'no_ajax'),
+									));
 									?>
 								</td>
 							</tr>
 							<tr>
 								<th class="col">
-									<label for="line1"><?php esc_html_e( 'Address 1:', 'give' ); ?></label>
+									<label for="line1"><?php esc_html_e('Address 1:', 'give'); ?></label>
 								</th>
 								<td>
 									<input id="line1" name="line1" type="text" class="medium-text"/>
@@ -607,7 +607,7 @@ 
 							</tr>
 							<tr>
 								<th class="col">
-									<label for="line2"><?php esc_html_e( 'Address 2:', 'give' ); ?></label>
+									<label for="line2"><?php esc_html_e('Address 2:', 'give'); ?></label>
 								</th>
 								<td>
 									<input id="line2" type="text" name="line2" value="" class="medium-text"/>
@@ -616,7 +616,7 @@ 
 							</tr>
 							<tr>
 								<th class="col">
-									<label for="city"><?php esc_html_e( 'City:', 'give' ); ?></label>
+									<label for="city"><?php esc_html_e('City:', 'give'); ?></label>
 								</th>
 								<td>
 									<input id="city" type="text" name="city" value="" class="medium-text"/>
@@ -624,41 +624,41 @@ 
 							</tr>
 							<?php
 							$no_states_country = give_no_states_country_list();
-							$base_country      = give_get_option( 'base_country' );
-							if ( ! array_key_exists( $base_country, $no_states_country ) ) {
+							$base_country      = give_get_option('base_country');
+							if ( ! array_key_exists($base_country, $no_states_country)) {
 								?>
 								<tr class="give-field-wrap">
 									<th class="col">
-										<label for="state"><?php esc_html_e( 'State / Province / County:', 'give' ); ?></label>
+										<label for="state"><?php esc_html_e('State / Province / County:', 'give'); ?></label>
 									</th>
 									<td>
 										<?php
-										$states     = give_get_states( $base_country );
+										$states     = give_get_states($base_country);
 										$state_args = array(
 											'name'  => 'state',
 											'class' => 'regular-text',
 										);
 
-										if ( empty( $states ) ) {
+										if (empty($states)) {
 
 											// Show Text field, if empty states.
-											$state_args = wp_parse_args( $state_args, array(
-												'value' => give_get_option( 'base_state' ),
-											) );
-											echo Give()->html->text( $state_args );
+											$state_args = wp_parse_args($state_args, array(
+												'value' => give_get_option('base_state'),
+											));
+											echo Give()->html->text($state_args);
 										} else {
 
 											// Show Chosen DropDown, if states are not empty.
-											$state_args = wp_parse_args( $state_args, array(
+											$state_args = wp_parse_args($state_args, array(
 												'options'          => $states,
-												'selected'         => give_get_option( 'base_state' ),
+												'selected'         => give_get_option('base_state'),
 												'show_option_all'  => false,
 												'show_option_none' => false,
 												'chosen'           => true,
-												'placeholder'      => __( 'Select a state', 'give' ),
-												'data'             => array( 'search-type' => 'no_ajax' ),
-											) );
-											echo Give()->html->select( $state_args );
+												'placeholder'      => __('Select a state', 'give'),
+												'data'             => array('search-type' => 'no_ajax'),
+											));
+											echo Give()->html->select($state_args);
 										}
 										?>
 									</td>
@@ -668,7 +668,7 @@ 
 							?>
 							<tr>
 								<th class="col">
-									<label for="zip"><?php esc_html_e( 'Zip / Postal Code:', 'give' ); ?></label>
+									<label for="zip"><?php esc_html_e('Zip / Postal Code:', 'give'); ?></label>
 								</th>
 								<td>
 									<input id="zip" type="text" name="zip" value="" class="medium-text"/>
@@ -676,12 +676,12 @@ 
 							</tr>
 							<tr>
 								<td colspan="2">
-									<?php wp_nonce_field( 'give-manage-donor-addresses', '_wpnonce', false ); ?>
+									<?php wp_nonce_field('give-manage-donor-addresses', '_wpnonce', false); ?>
 									<input type="hidden" name="address-action" value="add">
 									<input type="hidden" name="address-id" value="">
 									<input type="submit" class="button button-primary js-save"
-									       value="<?php _e( 'Save', 'give' ); ?>">&nbsp;&nbsp;<button
-											class="button js-cancel"><?php _e( 'Cancel', 'give' ); ?></button>
+									       value="<?php _e('Save', 'give'); ?>">&nbsp;&nbsp;<button
+											class="button js-cancel"><?php _e('Cancel', 'give'); ?></button>
 								</td>
 							</tr>
 							</tbody>
@@ -700,7 +700,7 @@ 
 	 *
 	 * @param Give_Donor $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_before_tables_wrapper', $donor );
+	do_action('give_donor_before_tables_wrapper', $donor);
 	?>
 
 	<div id="donor-tables-wrapper" class="donor-section">
@@ -713,46 +713,46 @@ 
 		 *
 		 * @param object $donor The donor object being displayed.
 		 */
-		do_action( 'give_donor_before_tables', $donor );
+		do_action('give_donor_before_tables', $donor);
 		?>
 
-		<h3><?php _e( 'Donor Emails', 'give' ); ?></h3>
+		<h3><?php _e('Donor Emails', 'give'); ?></h3>
 
 		<table class="wp-list-table widefat striped emails">
 			<thead>
 			<tr>
-				<th><?php _e( 'Email', 'give' ); ?></th>
-				<th><?php _e( 'Actions', 'give' ); ?></th>
+				<th><?php _e('Email', 'give'); ?></th>
+				<th><?php _e('Actions', 'give'); ?></th>
 			</tr>
 			</thead>
 
 			<tbody>
-			<?php if ( ! empty( $donor->emails ) ) { ?>
+			<?php if ( ! empty($donor->emails)) { ?>
 
-				<?php foreach ( $donor->emails as $key => $email ) : ?>
+				<?php foreach ($donor->emails as $key => $email) : ?>
 					<tr data-key="<?php echo $key; ?>">
 						<td>
 							<?php echo $email; ?>
-							<?php if ( 'primary' === $key ) : ?>
+							<?php if ('primary' === $key) : ?>
 								<span class="dashicons dashicons-star-filled primary-email-icon"></span>
 							<?php endif; ?>
 						</td>
 						<td>
-							<?php if ( 'primary' !== $key ) : ?>
+							<?php if ('primary' !== $key) : ?>
 								<?php
-								$base_url    = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id );
-								$promote_url = wp_nonce_url( add_query_arg( array(
-									'email'       => rawurlencode( $email ),
+								$base_url    = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id);
+								$promote_url = wp_nonce_url(add_query_arg(array(
+									'email'       => rawurlencode($email),
 									'give_action' => 'set_donor_primary_email',
-								), $base_url ), 'give-set-donor-primary-email' );
-								$remove_url  = wp_nonce_url( add_query_arg( array(
-									'email'       => rawurlencode( $email ),
+								), $base_url), 'give-set-donor-primary-email');
+								$remove_url = wp_nonce_url(add_query_arg(array(
+									'email'       => rawurlencode($email),
 									'give_action' => 'remove_donor_email',
-								), $base_url ), 'give-remove-donor-email' );
+								), $base_url), 'give-remove-donor-email');
 								?>
-								<a href="<?php echo $promote_url; ?>"><?php _e( 'Make Primary', 'give' ); ?></a>
+								<a href="<?php echo $promote_url; ?>"><?php _e('Make Primary', 'give'); ?></a>
 								&nbsp;|&nbsp;
-								<a href="<?php echo $remove_url; ?>" class="delete"><?php _e( 'Remove', 'give' ); ?></a>
+								<a href="<?php echo $remove_url; ?>" class="delete"><?php _e('Remove', 'give'); ?></a>
 							<?php endif; ?>
 						</td>
 					</tr>
@@ -762,14 +762,14 @@ 
 					<td colspan="2" class="add-donor-email-td">
 						<div class="add-donor-email-wrapper">
 							<input type="hidden" name="donor-id" value="<?php echo $donor->id; ?>"/>
-							<?php wp_nonce_field( 'give_add_donor_email', 'add_email_nonce', false, true ); ?>
+							<?php wp_nonce_field('give_add_donor_email', 'add_email_nonce', false, true); ?>
 							<input type="email" name="additional-email" value=""
-							       placeholder="<?php _e( 'Email Address', 'give' ); ?>"/>&nbsp;
+							       placeholder="<?php _e('Email Address', 'give'); ?>"/>&nbsp;
 							<input type="checkbox" name="make-additional-primary" value="1"
 							       id="make-additional-primary"/>&nbsp;<label
-									for="make-additional-primary"><?php _e( 'Make Primary', 'give' ); ?></label>
+									for="make-additional-primary"><?php _e('Make Primary', 'give'); ?></label>
 							<button class="button-secondary give-add-donor-email"
-							        id="add-donor-email"><?php _e( 'Add Email', 'give' ); ?></button>
+							        id="add-donor-email"><?php _e('Add Email', 'give'); ?></button>
 							<span class="spinner"></span>
 						</div>
 						<div class="notice-wrap"></div>
@@ -777,50 +777,50 @@ 
 				</tr>
 			<?php } else { ?>
 				<tr>
-					<td colspan="2"><?php _e( 'No Emails Found', 'give' ); ?></td>
+					<td colspan="2"><?php _e('No Emails Found', 'give'); ?></td>
 				</tr>
 			<?php }// End if().
 			?>
 			</tbody>
 		</table>
 
-		<h3><?php _e( 'Recent Donations', 'give' ); ?></h3>
+		<h3><?php _e('Recent Donations', 'give'); ?></h3>
 		<?php
-		$payment_ids = explode( ',', $donor->payment_ids );
-		$payments    = give_get_payments( array(
+		$payment_ids = explode(',', $donor->payment_ids);
+		$payments    = give_get_payments(array(
 			'post__in' => $payment_ids,
-		) );
-		$payments    = array_slice( $payments, 0, 10 );
+		));
+		$payments    = array_slice($payments, 0, 10);
 		?>
 		<table class="wp-list-table widefat striped payments">
 			<thead>
 			<tr>
-				<th scope="col"><?php _e( 'ID', 'give' ); ?></th>
-				<th scope="col"><?php _e( 'Amount', 'give' ); ?></th>
-				<th scope="col"><?php _e( 'Date', 'give' ); ?></th>
-				<th scope="col"><?php _e( 'Status', 'give' ); ?></th>
-				<th scope="col"><?php _e( 'Actions', 'give' ); ?></th>
+				<th scope="col"><?php _e('ID', 'give'); ?></th>
+				<th scope="col"><?php _e('Amount', 'give'); ?></th>
+				<th scope="col"><?php _e('Date', 'give'); ?></th>
+				<th scope="col"><?php _e('Status', 'give'); ?></th>
+				<th scope="col"><?php _e('Actions', 'give'); ?></th>
 			</tr>
 			</thead>
 			<tbody>
-			<?php if ( ! empty( $payments ) ) { ?>
-				<?php foreach ( $payments as $payment ) : ?>
+			<?php if ( ! empty($payments)) { ?>
+				<?php foreach ($payments as $payment) : ?>
 					<tr>
-						<td><?php echo Give()->seq_donation_number->get_serial_code( $payment->ID ); ?></td>
-						<td><?php echo give_donation_amount( $payment->ID, array( 'currency' => true, 'amount' => true, 'type' => 'donor' ) ); ?></td>
-						<td><?php echo date_i18n( give_date_format(), strtotime( $payment->post_date ) ); ?></td>
-						<td><?php echo give_get_payment_status( $payment, true ); ?></td>
+						<td><?php echo Give()->seq_donation_number->get_serial_code($payment->ID); ?></td>
+						<td><?php echo give_donation_amount($payment->ID, array('currency' => true, 'amount' => true, 'type' => 'donor')); ?></td>
+						<td><?php echo date_i18n(give_date_format(), strtotime($payment->post_date)); ?></td>
+						<td><?php echo give_get_payment_status($payment, true); ?></td>
 						<td>
 							<?php
 							printf(
 								'<a href="%1$s" aria-label="%2$s">%3$s</a>',
-								admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id=' . $payment->ID ),
+								admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-payment-details&id='.$payment->ID),
 								sprintf(
 								/* translators: %s: Donation ID */
-									esc_attr__( 'View Donation %s.', 'give' ),
+									esc_attr__('View Donation %s.', 'give'),
 									$payment->ID
 								),
-								__( 'View Donation', 'give' )
+								__('View Donation', 'give')
 							);
 							?>
 
@@ -835,47 +835,47 @@ 
 							 * @param object $donor   The donor object being displayed.
 							 * @param object $payment The payment object being displayed.
 							 */
-							do_action( 'give_donor_recent_purchases_actions', $donor, $payment );
+							do_action('give_donor_recent_purchases_actions', $donor, $payment);
 							?>
 						</td>
 					</tr>
 				<?php endforeach; ?>
 			<?php } else { ?>
 				<tr>
-					<td colspan="5"><?php _e( 'No donations found.', 'give' ); ?></td>
+					<td colspan="5"><?php _e('No donations found.', 'give'); ?></td>
 				</tr>
 			<?php }// End if().
 			?>
 			</tbody>
 		</table>
 
-		<h3><?php _e( 'Completed Forms', 'give' ); ?></h3>
+		<h3><?php _e('Completed Forms', 'give'); ?></h3>
 		<?php
-		$donations = give_get_users_completed_donations( $donor->email );
+		$donations = give_get_users_completed_donations($donor->email);
 		?>
 		<table class="wp-list-table widefat striped donations">
 			<thead>
 			<tr>
-				<th scope="col"><?php _e( 'Form', 'give' ); ?></th>
-				<th scope="col" width="120px"><?php _e( 'Actions', 'give' ); ?></th>
+				<th scope="col"><?php _e('Form', 'give'); ?></th>
+				<th scope="col" width="120px"><?php _e('Actions', 'give'); ?></th>
 			</tr>
 			</thead>
 			<tbody>
-			<?php if ( ! empty( $donations ) ) { ?>
-				<?php foreach ( $donations as $donation ) : ?>
+			<?php if ( ! empty($donations)) { ?>
+				<?php foreach ($donations as $donation) : ?>
 					<tr>
 						<td><?php echo $donation->post_title; ?></td>
 						<td>
 							<?php
 							printf(
 								'<a href="%1$s" aria-label="%2$s">%3$s</a>',
-								esc_url( admin_url( 'post.php?action=edit&post=' . $donation->ID ) ),
+								esc_url(admin_url('post.php?action=edit&post='.$donation->ID)),
 								sprintf(
 								/* translators: %s: form name */
-									esc_attr__( 'View Form %s.', 'give' ),
+									esc_attr__('View Form %s.', 'give'),
 									$donation->post_title
 								),
-								__( 'View Form', 'give' )
+								__('View Form', 'give')
 							);
 							?>
 						</td>
@@ -883,7 +883,7 @@ 
 				<?php endforeach; ?>
 			<?php } else { ?>
 				<tr>
-					<td colspan="2"><?php _e( 'No completed donations found.', 'give' ); ?></td>
+					<td colspan="2"><?php _e('No completed donations found.', 'give'); ?></td>
 				</tr>
 			<?php } ?>
 			</tbody>
@@ -897,7 +897,7 @@ 
 		 *
 		 * @param object $donor The donor object being displayed.
 		 */
-		do_action( 'give_donor_after_tables', $donor );
+		do_action('give_donor_after_tables', $donor);
 		?>
 
 	</div>
@@ -910,7 +910,7 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_card_bottom', $donor );
+	do_action('give_donor_card_bottom', $donor);
 
 }
 
@@ -923,31 +923,31 @@ 
  *
  * @return void
  */
-function give_donor_notes_view( $donor ) {
+function give_donor_notes_view($donor) {
 
-	$paged       = isset( $_GET['paged'] ) && is_numeric( $_GET['paged'] ) ? $_GET['paged'] : 1;
-	$paged       = absint( $paged );
+	$paged       = isset($_GET['paged']) && is_numeric($_GET['paged']) ? $_GET['paged'] : 1;
+	$paged       = absint($paged);
 	$note_count  = $donor->get_notes_count();
-	$per_page    = apply_filters( 'give_donor_notes_per_page', 20 );
-	$total_pages = ceil( $note_count / $per_page );
-	$donor_notes = $donor->get_notes( $per_page, $paged );
+	$per_page    = apply_filters('give_donor_notes_per_page', 20);
+	$total_pages = ceil($note_count / $per_page);
+	$donor_notes = $donor->get_notes($per_page, $paged);
 	?>
 
 	<div id="donor-notes-wrapper">
 		<div class="donor-notes-header">
-			<?php echo get_avatar( $donor->email, 30 ); ?> <span><?php echo $donor->name; ?></span>
+			<?php echo get_avatar($donor->email, 30); ?> <span><?php echo $donor->name; ?></span>
 		</div>
-		<h3><?php _e( 'Notes', 'give' ); ?></h3>
+		<h3><?php _e('Notes', 'give'); ?></h3>
 
-		<?php if ( 1 == $paged ) : ?>
+		<?php if (1 == $paged) : ?>
 			<div style="display: block; margin-bottom: 55px;">
 				<form id="give-add-donor-note" method="post"
-				      action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=notes&id=' . $donor->id ); ?>">
+				      action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=notes&id='.$donor->id); ?>">
 					<textarea id="donor-note" name="donor_note" class="donor-note-input" rows="10"></textarea>
 					<br/>
 					<input type="hidden" id="donor-id" name="customer_id" value="<?php echo $donor->id; ?>"/>
 					<input type="hidden" name="give_action" value="add-donor-note"/>
-					<?php wp_nonce_field( 'add-donor-note', 'add_donor_note_nonce', true, true ); ?>
+					<?php wp_nonce_field('add-donor-note', 'add_donor_note_nonce', true, true); ?>
 					<input id="add-donor-note" class="right button-primary" type="submit" value="Add Note"/>
 				</form>
 			</div>
@@ -962,26 +962,26 @@ 
 			'show_all' => true,
 		);
 
-		echo paginate_links( $pagination_args );
+		echo paginate_links($pagination_args);
 		?>
 
 		<div id="give-donor-notes" class="postbox">
-			<?php if ( count( $donor_notes ) > 0 ) { ?>
-				<?php foreach ( $donor_notes as $key => $note ) : ?>
+			<?php if (count($donor_notes) > 0) { ?>
+				<?php foreach ($donor_notes as $key => $note) : ?>
 					<div class="donor-note-wrapper dashboard-comment-wrap comment-item">
 					<span class="note-content-wrap">
-						<?php echo stripslashes( $note ); ?>
+						<?php echo stripslashes($note); ?>
 					</span>
 					</div>
 				<?php endforeach; ?>
 			<?php } else { ?>
 				<div class="give-no-donor-notes">
-					<?php _e( 'No donor notes found.', 'give' ); ?>
+					<?php _e('No donor notes found.', 'give'); ?>
 				</div>
 			<?php } ?>
 		</div>
 
-		<?php echo paginate_links( $pagination_args ); ?>
+		<?php echo paginate_links($pagination_args); ?>
 
 	</div>
 
@@ -997,9 +997,9 @@ 
  *
  * @return void
  */
-function give_donor_delete_view( $donor ) {
+function give_donor_delete_view($donor) {
 
-	$donor_edit_role = apply_filters( 'give_edit_donors_role', 'edit_give_payments' );
+	$donor_edit_role = apply_filters('give_edit_donors_role', 'edit_give_payments');
 
 	/**
 	 * Fires in donor delete screen, above the content.
@@ -1008,16 +1008,16 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_delete_top', $donor );
+	do_action('give_donor_delete_top', $donor);
 	?>
 
 	<div class="info-wrapper donor-section">
 
 		<form id="delete-donor" method="post"
-		      action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $donor->id ); ?>">
+		      action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$donor->id); ?>">
 
 			<div class="donor-notes-header">
-				<?php echo get_avatar( $donor->email, 30 ); ?> <span><?php echo $donor->name; ?></span>
+				<?php echo get_avatar($donor->email, 30); ?> <span><?php echo $donor->name; ?></span>
 			</div>
 
 
@@ -1025,20 +1025,20 @@ 
 
 				<span class="delete-donor-options">
 					<p>
-						<?php echo Give()->html->checkbox( array(
+						<?php echo Give()->html->checkbox(array(
 							'name' => 'give-donor-delete-confirm',
-						) ); ?>
-						<label for="give-donor-delete-confirm"><?php _e( 'Are you sure you want to delete this donor?', 'give' ); ?></label>
+						)); ?>
+						<label for="give-donor-delete-confirm"><?php _e('Are you sure you want to delete this donor?', 'give'); ?></label>
 					</p>
 
 					<p>
-						<?php echo Give()->html->checkbox( array(
+						<?php echo Give()->html->checkbox(array(
 							'name'    => 'give-donor-delete-records',
 							'options' => array(
 								'disabled' => true,
 							),
-						) ); ?>
-						<label for="give-donor-delete-records"><?php _e( 'Delete all associated donations and records?', 'give' ); ?></label>
+						)); ?>
+						<label for="give-donor-delete-records"><?php _e('Delete all associated donations and records?', 'give'); ?></label>
 					</p>
 
 					<?php
@@ -1051,19 +1051,19 @@ 
 					 *
 					 * @param object $donor The donor object being displayed.
 					 */
-					do_action( 'give_donor_delete_inputs', $donor );
+					do_action('give_donor_delete_inputs', $donor);
 					?>
 				</span>
 
 				<span id="donor-edit-actions">
 					<input type="hidden" name="customer_id" value="<?php echo $donor->id; ?>"/>
-					<?php wp_nonce_field( 'delete-donor', '_wpnonce', false, true ); ?>
+					<?php wp_nonce_field('delete-donor', '_wpnonce', false, true); ?>
 					<input type="hidden" name="give_action" value="delete-donor"/>
 					<input type="submit" disabled="disabled" id="give-delete-donor" class="button-primary"
-					       value="<?php _e( 'Delete Donor', 'give' ); ?>"/>
+					       value="<?php _e('Delete Donor', 'give'); ?>"/>
 					<a id="give-delete-donor-cancel"
-					   href="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ); ?>"
-					   class="delete"><?php _e( 'Cancel', 'give' ); ?></a>
+					   href="<?php echo admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id); ?>"
+					   class="delete"><?php _e('Cancel', 'give'); ?></a>
 				</span>
 
 			</div>
@@ -1079,5 +1079,5 @@ 
 	 *
 	 * @param object $donor The donor object being displayed.
 	 */
-	do_action( 'give_donor_delete_bottom', $donor );
+	do_action('give_donor_delete_bottom', $donor);
 }

Braces +5 added lines, -2 removed lines

@@ -406,8 +406,11 @@
 								<span class="donor-user-id info-item editable">
 										<?php if ( ! empty( $userdata ) ) : ?>
 											<span data-key="user_id">#<?php echo $donor->user_id . ' - ' . $userdata->display_name; ?></span>
-										<?php else: ?>
-											<span data-key="user_id"><?php _e( 'Unregistered', 'give' ); ?></span>
+										<?php else {
+	: ?>
+											<span data-key="user_id"><?php _e( 'Unregistered', 'give' );
+}
+?></span>
 										<?php endif; ?>
 									<?php if ( current_user_can( $donor_edit_role ) && intval( $donor->user_id ) > 0 ):
 

includes/admin/add-ons.php

Spacing +15 added lines, -15 removed lines

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