WordImpress / Give

includes/admin/customers/customer-actions.php

Spacing +128 added lines, -128 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,15 +23,15 @@ 
  *
  * @return array $output Response messages
  */
-function give_edit_customer( $args ) {
+function give_edit_customer($args) {
 	
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
@@ -39,12 +39,12 @@ 
 	$customer_id   = (int) $args['customerinfo']['id'];
 	$nonce         = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-customer' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
@@ -54,23 +54,23 @@ 
 		'user_id' => 0
 	);
 
-	$customer_info = wp_parse_args( $customer_info, $defaults );
+	$customer_info = wp_parse_args($customer_info, $defaults);
 
-	if ( ! is_email( $customer_info['email'] ) ) {
-		give_set_error( 'give-invalid-email', __( 'Please enter a valid email address.', 'give' ) );
+	if ( ! is_email($customer_info['email'])) {
+		give_set_error('give-invalid-email', __('Please enter a valid email address.', 'give'));
 	}
 
-	if ( (int) $customer_info['user_id'] != (int) $customer->user_id ) {
+	if ((int) $customer_info['user_id'] != (int) $customer->user_id) {
 
 		// Make sure we don't already have this user attached to a customer
-		if ( ! empty( $customer_info['user_id'] ) && false !== Give()->customers->get_customer_by( 'user_id', $customer_info['user_id'] ) ) {
-			give_set_error( 'give-invalid-customer-user_id', sprintf( __( 'The User ID %d is already associated with a different donor.', 'give' ), $customer_info['user_id'] ) );
+		if ( ! empty($customer_info['user_id']) && false !== Give()->customers->get_customer_by('user_id', $customer_info['user_id'])) {
+			give_set_error('give-invalid-customer-user_id', sprintf(__('The User ID %d is already associated with a different donor.', 'give'), $customer_info['user_id']));
 		}
 
 		// Make sure it's actually a user
-		$user = get_user_by( 'id', $customer_info['user_id'] );
-		if ( ! empty( $customer_info['user_id'] ) && false === $user ) {
-			give_set_error( 'give-invalid-user_id', sprintf( __( 'The User ID %d does not exist. Please assign an existing user.', 'give' ), $customer_info['user_id'] ) );
+		$user = get_user_by('id', $customer_info['user_id']);
+		if ( ! empty($customer_info['user_id']) && false === $user) {
+			give_set_error('give-invalid-user_id', sprintf(__('The User ID %d does not exist. Please assign an existing user.', 'give'), $customer_info['user_id']));
 		}
 
 	}
@@ -78,82 +78,82 @@ 
 	// Record this for later
 	$previous_user_id = $customer->user_id;
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return;
 	}
 
 	// Setup the customer address, if present
 	$address = array();
-	if ( intval( $customer_info['user_id'] ) > 0 ) {
+	if (intval($customer_info['user_id']) > 0) {
 
-		$current_address = get_user_meta( $customer_info['user_id'], '_give_user_address', true );
+		$current_address = get_user_meta($customer_info['user_id'], '_give_user_address', true);
 
-		if ( false === $current_address ) {
-			$address['line1']   = isset( $customer_info['line1'] ) ? $customer_info['line1'] : '';
-			$address['line2']   = isset( $customer_info['line2'] ) ? $customer_info['line2'] : '';
-			$address['city']    = isset( $customer_info['city'] ) ? $customer_info['city'] : '';
-			$address['country'] = isset( $customer_info['country'] ) ? $customer_info['country'] : '';
-			$address['zip']     = isset( $customer_info['zip'] ) ? $customer_info['zip'] : '';
-			$address['state']   = isset( $customer_info['state'] ) ? $customer_info['state'] : '';
+		if (false === $current_address) {
+			$address['line1']   = isset($customer_info['line1']) ? $customer_info['line1'] : '';
+			$address['line2']   = isset($customer_info['line2']) ? $customer_info['line2'] : '';
+			$address['city']    = isset($customer_info['city']) ? $customer_info['city'] : '';
+			$address['country'] = isset($customer_info['country']) ? $customer_info['country'] : '';
+			$address['zip']     = isset($customer_info['zip']) ? $customer_info['zip'] : '';
+			$address['state']   = isset($customer_info['state']) ? $customer_info['state'] : '';
 		} else {
-			$current_address    = wp_parse_args( $current_address, array(
+			$current_address    = wp_parse_args($current_address, array(
 				'line1',
 				'line2',
 				'city',
 				'zip',
 				'state',
 				'country'
-			) );
-			$address['line1']   = isset( $customer_info['line1'] ) ? $customer_info['line1'] : $current_address['line1'];
-			$address['line2']   = isset( $customer_info['line2'] ) ? $customer_info['line2'] : $current_address['line2'];
-			$address['city']    = isset( $customer_info['city'] ) ? $customer_info['city'] : $current_address['city'];
-			$address['country'] = isset( $customer_info['country'] ) ? $customer_info['country'] : $current_address['country'];
-			$address['zip']     = isset( $customer_info['zip'] ) ? $customer_info['zip'] : $current_address['zip'];
-			$address['state']   = isset( $customer_info['state'] ) ? $customer_info['state'] : $current_address['state'];
+			));
+			$address['line1']   = isset($customer_info['line1']) ? $customer_info['line1'] : $current_address['line1'];
+			$address['line2']   = isset($customer_info['line2']) ? $customer_info['line2'] : $current_address['line2'];
+			$address['city']    = isset($customer_info['city']) ? $customer_info['city'] : $current_address['city'];
+			$address['country'] = isset($customer_info['country']) ? $customer_info['country'] : $current_address['country'];
+			$address['zip']     = isset($customer_info['zip']) ? $customer_info['zip'] : $current_address['zip'];
+			$address['state']   = isset($customer_info['state']) ? $customer_info['state'] : $current_address['state'];
 		}
 
 	}
 
 	// Sanitize the inputs
 	$customer_data            = array();
-	$customer_data['name']    = strip_tags( stripslashes( $customer_info['name'] ) );
+	$customer_data['name']    = strip_tags(stripslashes($customer_info['name']));
 	$customer_data['email']   = $customer_info['email'];
 	$customer_data['user_id'] = $customer_info['user_id'];
 
-	$customer_data = apply_filters( 'give_edit_customer_info', $customer_data, $customer_id );
-	$address       = apply_filters( 'give_edit_customer_address', $address, $customer_id );
+	$customer_data = apply_filters('give_edit_customer_info', $customer_data, $customer_id);
+	$address       = apply_filters('give_edit_customer_address', $address, $customer_id);
 
-	$customer_data = array_map( 'sanitize_text_field', $customer_data );
-	$address       = array_map( 'sanitize_text_field', $address );
+	$customer_data = array_map('sanitize_text_field', $customer_data);
+	$address       = array_map('sanitize_text_field', $address);
 
-	do_action( 'give_pre_edit_customer', $customer_id, $customer_data, $address );
+	do_action('give_pre_edit_customer', $customer_id, $customer_data, $address);
 
 	$output         = array();
 	$previous_email = $customer->email;
 
-	if ( $customer->update( $customer_data ) ) {
+	if ($customer->update($customer_data)) {
 
-		if ( ! empty( $customer->user_id ) && $customer->user_id > 0 ) {
-			update_user_meta( $customer->user_id, '_give_user_address', $address );
+		if ( ! empty($customer->user_id) && $customer->user_id > 0) {
+			update_user_meta($customer->user_id, '_give_user_address', $address);
 		}
 
 		// Update some payment meta if we need to
-		$payments_array = explode( ',', $customer->payment_ids );
+		$payments_array = explode(',', $customer->payment_ids);
 
-		if ( $customer->email != $previous_email ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, 'email', $customer->email );
+		if ($customer->email != $previous_email) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, 'email', $customer->email);
 			}
 		}
 
-		if ( $customer->user_id != $previous_user_id ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, '_give_payment_user_id', $customer->user_id );
+		if ($customer->user_id != $previous_user_id) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, '_give_payment_user_id', $customer->user_id);
 			}
 		}
 
 		$output['success']       = true;
-		$customer_data           = array_merge( $customer_data, $address );
+		$customer_data           = array_merge($customer_data, $address);
 		$output['customer_info'] = $customer_data;
 
 	} else {
@@ -162,11 +162,11 @@ 
 
 	}
 
-	do_action( 'give_post_edit_customer', $customer_id, $customer_data );
+	do_action('give_post_edit_customer', $customer_id, $customer_data);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -174,7 +174,7 @@ 
 
 }
 
-add_action( 'give_edit-customer', 'give_edit_customer', 10, 1 );
+add_action('give_edit-customer', 'give_edit_customer', 10, 1);
 
 /**
  * Save a customer note being added
@@ -185,53 +185,53 @@ 
  *
  * @return int         The Note ID that was saved, or 0 if nothing was saved
  */
-function give_customer_save_note( $args ) {
+function give_customer_save_note($args) {
 
-	$customer_view_role = apply_filters( 'give_view_customers_role', 'view_give_reports' );
+	$customer_view_role = apply_filters('give_view_customers_role', 'view_give_reports');
 
-	if ( ! is_admin() || ! current_user_can( $customer_view_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_view_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
-	$customer_note = trim( sanitize_text_field( $args['customer_note'] ) );
+	$customer_note = trim(sanitize_text_field($args['customer_note']));
 	$customer_id   = (int) $args['customer_id'];
 	$nonce         = $args['add_customer_note_nonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'add-customer-note' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'add-customer-note')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	if ( empty( $customer_note ) ) {
-		give_set_error( 'empty-customer-note', __( 'A note is required.', 'give' ) );
+	if (empty($customer_note)) {
+		give_set_error('empty-customer-note', __('A note is required.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return;
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	$new_note = $customer->add_note( $customer_note );
+	$customer = new Give_Customer($customer_id);
+	$new_note = $customer->add_note($customer_note);
 
-	do_action( 'give_pre_insert_customer_note', $customer_id, $new_note );
+	do_action('give_pre_insert_customer_note', $customer_id, $new_note);
 
-	if ( ! empty( $new_note ) && ! empty( $customer->id ) ) {
+	if ( ! empty($new_note) && ! empty($customer->id)) {
 
 		ob_start();
 		?>
 		<div class="customer-note-wrapper dashboard-comment-wrap comment-item">
 			<span class="note-content-wrap">
-				<?php echo stripslashes( $new_note ); ?>
+				<?php echo stripslashes($new_note); ?>
 			</span>
 		</div>
 		<?php
 		$output = ob_get_contents();
 		ob_end_clean();
 
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			echo $output;
 			exit;
 		}
@@ -244,7 +244,7 @@ 
 
 }
 
-add_action( 'give_add-customer-note', 'give_customer_save_note', 10, 1 );
+add_action('give_add-customer-note', 'give_customer_save_note', 10, 1);
 
 /**
  * Delete a customer
@@ -255,87 +255,87 @@ 
  *
  * @return int Whether it was a successful deletion
  */
-function give_customer_delete( $args ) {
+function give_customer_delete($args) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( __( 'You do not have permission to delete donors.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(__('You do not have permission to delete donors.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
 	$customer_id = (int) $args['customer_id'];
-	$confirm     = ! empty( $args['give-customer-delete-confirm'] ) ? true : false;
-	$remove_data = ! empty( $args['give-customer-delete-records'] ) ? true : false;
+	$confirm     = ! empty($args['give-customer-delete-confirm']) ? true : false;
+	$remove_data = ! empty($args['give-customer-delete-records']) ? true : false;
 	$nonce       = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'delete-customer' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'delete-customer')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	if ( ! $confirm ) {
-		give_set_error( 'customer-delete-no-confirm', __( 'Please confirm you want to delete this donor.', 'give' ) );
+	if ( ! $confirm) {
+		give_set_error('customer-delete-no-confirm', __('Please confirm you want to delete this donor.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
-		wp_redirect( admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer_id ) );
+	if (give_get_errors()) {
+		wp_redirect(admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer_id));
 		exit;
 	}
 
-	$customer = new Give_Customer( $customer_id );
+	$customer = new Give_Customer($customer_id);
 
-	do_action( 'give_pre_delete_customer', $customer_id, $confirm, $remove_data );
+	do_action('give_pre_delete_customer', $customer_id, $confirm, $remove_data);
 
 	$success = false;
 
-	if ( $customer->id > 0 ) {
+	if ($customer->id > 0) {
 
-		$payments_array = explode( ',', $customer->payment_ids );
-		$success        = Give()->customers->delete( $customer->id );
+		$payments_array = explode(',', $customer->payment_ids);
+		$success        = Give()->customers->delete($customer->id);
 
-		if ( $success ) {
+		if ($success) {
 
-			if ( $remove_data ) {
+			if ($remove_data) {
 
 				// Remove all payments, logs, etc
-				foreach ( $payments_array as $payment_id ) {
-					give_delete_purchase( $payment_id );
+				foreach ($payments_array as $payment_id) {
+					give_delete_purchase($payment_id);
 				}
 
 			} else {
 
 				// Just set the payments to customer_id of 0
-				foreach ( $payments_array as $payment_id ) {
-					give_update_payment_meta( $payment_id, '_give_payment_customer_id', 0 );
+				foreach ($payments_array as $payment_id) {
+					give_update_payment_meta($payment_id, '_give_payment_customer_id', 0);
 				}
 
 			}
 
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&give-message=customer-deleted' );
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&give-message=customer-deleted');
 
 		} else {
 
-			give_set_error( 'give-donor-delete-failed', __( 'Error deleting donor.', 'give' ) );
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $customer_id );
+			give_set_error('give-donor-delete-failed', __('Error deleting donor.', 'give'));
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$customer_id);
 
 		}
 
 	} else {
 
-		give_set_error( 'give-customer-delete-invalid-id', __( 'Invalid Donor ID.', 'give' ) );
-		$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors' );
+		give_set_error('give-customer-delete-invalid-id', __('Invalid Donor ID.', 'give'));
+		$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors');
 
 	}
 
-	wp_redirect( $redirect );
+	wp_redirect($redirect);
 	exit;
 
 }
 
-add_action( 'give_delete-customer', 'give_customer_delete', 10, 1 );
+add_action('give_delete-customer', 'give_customer_delete', 10, 1);
 
 /**
  * Disconnect a user ID from a donor
@@ -346,39 +346,39 @@ 
  *
  * @return bool        If the disconnect was successful
  */
-function give_disconnect_customer_user_id( $args ) {
+function give_disconnect_customer_user_id($args) {
 
-	$customer_edit_role = apply_filters( 'give_edit_customers_role', 'edit_give_payments' );
+	$customer_edit_role = apply_filters('give_edit_customers_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $customer_edit_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ) );
+	if ( ! is_admin() || ! current_user_can($customer_edit_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return;
 	}
 
 	$customer_id = (int) $args['customer_id'];
 	$nonce       = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-customer' ) ) {
-		wp_die( __( 'Cheatin\' eh?!', 'give' ) );
+	if ( ! wp_verify_nonce($nonce, 'edit-customer')) {
+		wp_die(__('Cheatin\' eh?!', 'give'));
 	}
 
-	$customer = new Give_Customer( $customer_id );
-	if ( empty( $customer->id ) ) {
+	$customer = new Give_Customer($customer_id);
+	if (empty($customer->id)) {
 		return false;
 	}
 
-	do_action( 'give_pre_customer_disconnect_user_id', $customer_id, $customer->user_id );
+	do_action('give_pre_customer_disconnect_user_id', $customer_id, $customer->user_id);
 
-	$customer_args = array( 'user_id' => 0 );
+	$customer_args = array('user_id' => 0);
 
-	if ( $customer->update( $customer_args ) ) {
+	if ($customer->update($customer_args)) {
 		global $wpdb;
 
-		if ( ! empty( $customer->payment_ids ) ) {
-			$wpdb->query( "UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $customer->payment_ids )" );
+		if ( ! empty($customer->payment_ids)) {
+			$wpdb->query("UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $customer->payment_ids )");
 		}
 
 		$output['success'] = true;
@@ -386,14 +386,14 @@ 
 	} else {
 
 		$output['success'] = false;
-		give_set_error( 'give-disconnect-user-fail', __( 'Failed to disconnect user from donor.', 'give' ) );
+		give_set_error('give-disconnect-user-fail', __('Failed to disconnect user from donor.', 'give'));
 	}
 
-	do_action( 'give_post_customer_disconnect_user_id', $customer_id );
+	do_action('give_post_customer_disconnect_user_id', $customer_id);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -401,4 +401,4 @@ 
 
 }
 
-add_action( 'give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1 );
+add_action('give_disconnect-userid', 'give_disconnect_customer_user_id', 10, 1);

includes/admin/EDD_SL_Plugin_Updater.php

Indentation +255 added lines, -255 removed lines

@@ -13,328 +13,328 @@
  * @version 1.6
  */
 class EDD_SL_Plugin_Updater {
-    private $api_url   = '';
-    private $api_data  = array();
-    private $name      = '';
-    private $slug      = '';
-
-    /**
-     * Class constructor.
-     *
-     * @uses plugin_basename()
-     * @uses hook()
-     *
-     * @param string  $_api_url     The URL pointing to the custom API endpoint.
-     * @param string  $_plugin_file Path to the plugin file.
-     * @param array   $_api_data    Optional data to send with API calls.
-     * @return void
-     */
-    function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
-        $this->api_url  = trailingslashit( $_api_url );
-        $this->api_data = $_api_data;
-        $this->name     = plugin_basename( $_plugin_file );
-        $this->slug     = basename( $_plugin_file, '.php' );
-        $this->version  = $_api_data['version'];
-
-        // Set up hooks.
-        $this->init();
-        add_action( 'admin_init', array( $this, 'show_changelog' ) );
-    }
-
-    /**
-     * Set up WordPress filters to hook into WP's update process.
-     *
-     * @uses add_filter()
-     *
-     * @return void
-     */
-    public function init() {
+	private $api_url   = '';
+	private $api_data  = array();
+	private $name      = '';
+	private $slug      = '';
+
+	/**
+	 * Class constructor.
+	 *
+	 * @uses plugin_basename()
+	 * @uses hook()
+	 *
+	 * @param string  $_api_url     The URL pointing to the custom API endpoint.
+	 * @param string  $_plugin_file Path to the plugin file.
+	 * @param array   $_api_data    Optional data to send with API calls.
+	 * @return void
+	 */
+	function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
+		$this->api_url  = trailingslashit( $_api_url );
+		$this->api_data = $_api_data;
+		$this->name     = plugin_basename( $_plugin_file );
+		$this->slug     = basename( $_plugin_file, '.php' );
+		$this->version  = $_api_data['version'];
+
+		// Set up hooks.
+		$this->init();
+		add_action( 'admin_init', array( $this, 'show_changelog' ) );
+	}
+
+	/**
+	 * Set up WordPress filters to hook into WP's update process.
+	 *
+	 * @uses add_filter()
+	 *
+	 * @return void
+	 */
+	public function init() {
 
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-        add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
 
-        add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
-    }
+		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+	}
 
-    /**
-     * Check for Updates at the defined API endpoint and modify the update array.
-     *
-     * This function dives into the update API just when WordPress creates its update array,
-     * then adds a custom API call and injects the custom plugin data retrieved from the API.
-     * It is reassembled from parts of the native WordPress plugin update code.
-     * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
-     *
-     * @uses api_request()
-     *
-     * @param array   $_transient_data Update array build by WordPress.
-     * @return array Modified update array with custom plugin data.
-     */
-    function check_update( $_transient_data ) {
+	/**
+	 * Check for Updates at the defined API endpoint and modify the update array.
+	 *
+	 * This function dives into the update API just when WordPress creates its update array,
+	 * then adds a custom API call and injects the custom plugin data retrieved from the API.
+	 * It is reassembled from parts of the native WordPress plugin update code.
+	 * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param array   $_transient_data Update array build by WordPress.
+	 * @return array Modified update array with custom plugin data.
+	 */
+	function check_update( $_transient_data ) {
 
-        global $pagenow;
+		global $pagenow;
 
-        if( ! is_object( $_transient_data ) ) {
-            $_transient_data = new stdClass;
-        }
+		if( ! is_object( $_transient_data ) ) {
+			$_transient_data = new stdClass;
+		}
 
-        if( 'plugins.php' == $pagenow && is_multisite() ) {
-            return $_transient_data;
-        }
+		if( 'plugins.php' == $pagenow && is_multisite() ) {
+			return $_transient_data;
+		}
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
 
-            $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-            if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
 
-                $this->did_check = true;
+				$this->did_check = true;
 
-                if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+				if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-                    $_transient_data->response[ $this->name ] = $version_info;
+					$_transient_data->response[ $this->name ] = $version_info;
 
-                }
+				}
 
-                $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
+				$_transient_data->last_checked = time();
+				$_transient_data->checked[ $this->name ] = $this->version;
 
-            }
+			}
 
-        }
+		}
 
-        return $_transient_data;
-    }
+		return $_transient_data;
+	}
 
-    /**
-     * show update nofication row -- needed for multisite subsites, because WP won't tell you otherwise!
-     *
-     * @param string  $file
-     * @param array   $plugin
-     */
-    public function show_update_notification( $file, $plugin ) {
+	/**
+	 * show update nofication row -- needed for multisite subsites, because WP won't tell you otherwise!
+	 *
+	 * @param string  $file
+	 * @param array   $plugin
+	 */
+	public function show_update_notification( $file, $plugin ) {
 
-        if( ! current_user_can( 'update_plugins' ) ) {
-            return;
-        }
+		if( ! current_user_can( 'update_plugins' ) ) {
+			return;
+		}
 
-        if( ! is_multisite() ) {
-            return;
-        }
+		if( ! is_multisite() ) {
+			return;
+		}
 
-        if ( $this->name != $file ) {
-            return;
-        }
+		if ( $this->name != $file ) {
+			return;
+		}
 
-        // Remove our filter on the site transient
-        remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
+		// Remove our filter on the site transient
+		remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
 
-        $update_cache = get_site_transient( 'update_plugins' );
+		$update_cache = get_site_transient( 'update_plugins' );
 
-        if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+		if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
 
-            $cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
-            $version_info = get_transient( $cache_key );
+			$cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
+			$version_info = get_transient( $cache_key );
 
-            if( false === $version_info ) {
+			if( false === $version_info ) {
 
-                $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-                set_transient( $cache_key, $version_info, 3600 );
-            }
+				set_transient( $cache_key, $version_info, 3600 );
+			}
 
 
-            if( ! is_object( $version_info ) ) {
-                return;
-            }
+			if( ! is_object( $version_info ) ) {
+				return;
+			}
 
-            if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+			if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-                $update_cache->response[ $this->name ] = $version_info;
+				$update_cache->response[ $this->name ] = $version_info;
 
-            }
+			}
 
-            $update_cache->last_checked = time();
-            $update_cache->checked[ $this->name ] = $this->version;
+			$update_cache->last_checked = time();
+			$update_cache->checked[ $this->name ] = $this->version;
 
-            set_site_transient( 'update_plugins', $update_cache );
+			set_site_transient( 'update_plugins', $update_cache );
 
-        } else {
+		} else {
 
-            $version_info = $update_cache->response[ $this->name ];
+			$version_info = $update_cache->response[ $this->name ];
 
-        }
+		}
 
-        // Restore our filter
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		// Restore our filter
+		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
 
-        if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-            // build a plugin list row, with update notification
-            $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-            echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+			// build a plugin list row, with update notification
+			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
+			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
 
-            $changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
 
-            if ( empty( $version_info->download_link ) ) {
-                printf(
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ),
-                    esc_html( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html( $version_info->new_version )
-                );
-            } else {
-                printf(
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ),
-                    esc_html( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html( $version_info->new_version ),
-                    esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
-                );
-            }
+			if ( empty( $version_info->download_link ) ) {
+				printf(
+					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ),
+					esc_html( $version_info->name ),
+					esc_url( $changelog_link ),
+					esc_html( $version_info->new_version )
+				);
+			} else {
+				printf(
+					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ),
+					esc_html( $version_info->name ),
+					esc_url( $changelog_link ),
+					esc_html( $version_info->new_version ),
+					esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
+				);
+			}
 
-            echo '</div></td></tr>';
-        }
-    }
+			echo '</div></td></tr>';
+		}
+	}
 
 
-    /**
-     * Updates information on the "View version x.x details" page with custom data.
-     *
-     * @uses api_request()
-     *
-     * @param mixed   $_data
-     * @param string  $_action
-     * @param object  $_args
-     * @return object $_data
-     */
-    function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+	/**
+	 * Updates information on the "View version x.x details" page with custom data.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param mixed   $_data
+	 * @param string  $_action
+	 * @param object  $_args
+	 * @return object $_data
+	 */
+	function plugins_api_filter( $_data, $_action = '', $_args = null ) {
 
 
-        if ( $_action != 'plugin_information' ) {
+		if ( $_action != 'plugin_information' ) {
 
-            return $_data;
+			return $_data;
 
-        }
+		}
 
-        if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
 
-            return $_data;
+			return $_data;
 
-        }
+		}
 
-        $to_send = array(
-            'slug'   => $this->slug,
-            'is_ssl' => is_ssl(),
-            'fields' => array(
-                'banners' => false, // These will be supported soon hopefully
-                'reviews' => false
-            )
-        );
+		$to_send = array(
+			'slug'   => $this->slug,
+			'is_ssl' => is_ssl(),
+			'fields' => array(
+				'banners' => false, // These will be supported soon hopefully
+				'reviews' => false
+			)
+		);
 
-        $api_response = $this->api_request( 'plugin_information', $to_send );
+		$api_response = $this->api_request( 'plugin_information', $to_send );
 
-        if ( false !== $api_response ) {
-            $_data = $api_response;
-        }
+		if ( false !== $api_response ) {
+			$_data = $api_response;
+		}
 
-        return $_data;
-    }
+		return $_data;
+	}
 
 
-    /**
-     * Disable SSL verification in order to prevent download update failures
-     *
-     * @param array   $args
-     * @param string  $url
-     * @return object $array
-     */
-    function http_request_args( $args, $url ) {
-        // If it is an https request and we are performing a package download, disable ssl verification
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
-            $args['sslverify'] = false;
-        }
-        return $args;
-    }
+	/**
+	 * Disable SSL verification in order to prevent download update failures
+	 *
+	 * @param array   $args
+	 * @param string  $url
+	 * @return object $array
+	 */
+	function http_request_args( $args, $url ) {
+		// If it is an https request and we are performing a package download, disable ssl verification
+		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+			$args['sslverify'] = false;
+		}
+		return $args;
+	}
 
-    /**
-     * Calls the API and, if successfull, returns the object delivered by the API.
-     *
-     * @uses get_bloginfo()
-     * @uses wp_remote_post()
-     * @uses is_wp_error()
-     *
-     * @param string  $_action The requested action.
-     * @param array   $_data   Parameters for the API action.
-     * @return false||object
-     */
-    private function api_request( $_action, $_data ) {
-
-        global $wp_version;
-
-        $data = array_merge( $this->api_data, $_data );
-
-        if ( $data['slug'] != $this->slug )
-            return;
-
-        if ( empty( $data['license'] ) )
-            return;
-
-        if( $this->api_url == home_url() ) {
-            return false; // Don't allow a plugin to ping itself
-        }
-
-        $api_params = array(
-            'edd_action' => 'get_version',
-            'license'    => $data['license'],
-            'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-            'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
-            'slug'       => $data['slug'],
-            'author'     => $data['author'],
-            'url'        => home_url()
-        );
+	/**
+	 * Calls the API and, if successfull, returns the object delivered by the API.
+	 *
+	 * @uses get_bloginfo()
+	 * @uses wp_remote_post()
+	 * @uses is_wp_error()
+	 *
+	 * @param string  $_action The requested action.
+	 * @param array   $_data   Parameters for the API action.
+	 * @return false||object
+	 */
+	private function api_request( $_action, $_data ) {
+
+		global $wp_version;
+
+		$data = array_merge( $this->api_data, $_data );
+
+		if ( $data['slug'] != $this->slug )
+			return;
+
+		if ( empty( $data['license'] ) )
+			return;
+
+		if( $this->api_url == home_url() ) {
+			return false; // Don't allow a plugin to ping itself
+		}
+
+		$api_params = array(
+			'edd_action' => 'get_version',
+			'license'    => $data['license'],
+			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
+			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'slug'       => $data['slug'],
+			'author'     => $data['author'],
+			'url'        => home_url()
+		);
 
-        $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
 
-        if ( ! is_wp_error( $request ) ) {
-            $request = json_decode( wp_remote_retrieve_body( $request ) );
-        }
+		if ( ! is_wp_error( $request ) ) {
+			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		}
 
-        if ( $request && isset( $request->sections ) ) {
-            $request->sections = maybe_unserialize( $request->sections );
-        } else {
-            $request = false;
-        }
+		if ( $request && isset( $request->sections ) ) {
+			$request->sections = maybe_unserialize( $request->sections );
+		} else {
+			$request = false;
+		}
 
-        return $request;
-    }
+		return $request;
+	}
 
-    public function show_changelog() {
+	public function show_changelog() {
 
 
-        if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
-            return;
-        }
+		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+			return;
+		}
 
-        if( empty( $_REQUEST['plugin'] ) ) {
-            return;
-        }
-
-        if( empty( $_REQUEST['slug'] ) ) {
-            return;
-        }
-
-        if( ! current_user_can( 'update_plugins' ) ) {
-            wp_die( __( 'You do not have permission to install plugin updates.', 'edd' ), __( 'Error', 'edd' ), array( 'response' => 403 ) );
-        }
-
-        $response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
-
-        if( $response && isset( $response->sections['changelog'] ) ) {
-            echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
-        }
-
-
-        exit;
-    }
+		if( empty( $_REQUEST['plugin'] ) ) {
+			return;
+		}
+
+		if( empty( $_REQUEST['slug'] ) ) {
+			return;
+		}
+
+		if( ! current_user_can( 'update_plugins' ) ) {
+			wp_die( __( 'You do not have permission to install plugin updates.', 'edd' ), __( 'Error', 'edd' ), array( 'response' => 403 ) );
+		}
+
+		$response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
+
+		if( $response && isset( $response->sections['changelog'] ) ) {
+			echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
+		}
+
+
+		exit;
+	}
 
 }

Spacing +78 added lines, -78 removed lines

@@ -4,7 +4,7 @@ 
 //set_site_transient( 'update_plugins', null );
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Allows plugins to use their own update API.
@@ -29,16 +29,16 @@ 
      * @param array   $_api_data    Optional data to send with API calls.
      * @return void
      */
-    function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
-        $this->api_url  = trailingslashit( $_api_url );
+    function __construct($_api_url, $_plugin_file, $_api_data = null) {
+        $this->api_url  = trailingslashit($_api_url);
         $this->api_data = $_api_data;
-        $this->name     = plugin_basename( $_plugin_file );
-        $this->slug     = basename( $_plugin_file, '.php' );
+        $this->name     = plugin_basename($_plugin_file);
+        $this->slug     = basename($_plugin_file, '.php');
         $this->version  = $_api_data['version'];
 
         // Set up hooks.
         $this->init();
-        add_action( 'admin_init', array( $this, 'show_changelog' ) );
+        add_action('admin_init', array($this, 'show_changelog'));
     }
 
     /**
@@ -50,10 +50,10 @@ 
      */
     public function init() {
 
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-        add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+        add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
+        add_filter('plugins_api', array($this, 'plugins_api_filter'), 10, 3);
 
-        add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+        add_action('after_plugin_row_'.$this->name, array($this, 'show_update_notification'), 10, 2);
     }
 
     /**
@@ -69,34 +69,34 @@ 
      * @param array   $_transient_data Update array build by WordPress.
      * @return array Modified update array with custom plugin data.
      */
-    function check_update( $_transient_data ) {
+    function check_update($_transient_data) {
 
         global $pagenow;
 
-        if( ! is_object( $_transient_data ) ) {
+        if ( ! is_object($_transient_data)) {
             $_transient_data = new stdClass;
         }
 
-        if( 'plugins.php' == $pagenow && is_multisite() ) {
+        if ('plugins.php' == $pagenow && is_multisite()) {
             return $_transient_data;
         }
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+        if (empty($_transient_data->response) || empty($_transient_data->response[$this->name])) {
 
-            $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+            $version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-            if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+            if (false !== $version_info && is_object($version_info) && isset($version_info->new_version)) {
 
                 $this->did_check = true;
 
-                if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+                if (version_compare($this->version, $version_info->new_version, '<')) {
 
-                    $_transient_data->response[ $this->name ] = $version_info;
+                    $_transient_data->response[$this->name] = $version_info;
 
                 }
 
                 $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
+                $_transient_data->checked[$this->name] = $this->version;
 
             }
 
@@ -111,84 +111,84 @@ 
      * @param string  $file
      * @param array   $plugin
      */
-    public function show_update_notification( $file, $plugin ) {
+    public function show_update_notification($file, $plugin) {
 
-        if( ! current_user_can( 'update_plugins' ) ) {
+        if ( ! current_user_can('update_plugins')) {
             return;
         }
 
-        if( ! is_multisite() ) {
+        if ( ! is_multisite()) {
             return;
         }
 
-        if ( $this->name != $file ) {
+        if ($this->name != $file) {
             return;
         }
 
         // Remove our filter on the site transient
-        remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
+        remove_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'), 10);
 
-        $update_cache = get_site_transient( 'update_plugins' );
+        $update_cache = get_site_transient('update_plugins');
 
-        if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+        if ( ! is_object($update_cache) || empty($update_cache->response) || empty($update_cache->response[$this->name])) {
 
-            $cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
-            $version_info = get_transient( $cache_key );
+            $cache_key    = md5('edd_plugin_'.sanitize_key($this->name).'_version_info');
+            $version_info = get_transient($cache_key);
 
-            if( false === $version_info ) {
+            if (false === $version_info) {
 
-                $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+                $version_info = $this->api_request('plugin_latest_version', array('slug' => $this->slug));
 
-                set_transient( $cache_key, $version_info, 3600 );
+                set_transient($cache_key, $version_info, 3600);
             }
 
 
-            if( ! is_object( $version_info ) ) {
+            if ( ! is_object($version_info)) {
                 return;
             }
 
-            if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+            if (version_compare($this->version, $version_info->new_version, '<')) {
 
-                $update_cache->response[ $this->name ] = $version_info;
+                $update_cache->response[$this->name] = $version_info;
 
             }
 
             $update_cache->last_checked = time();
-            $update_cache->checked[ $this->name ] = $this->version;
+            $update_cache->checked[$this->name] = $this->version;
 
-            set_site_transient( 'update_plugins', $update_cache );
+            set_site_transient('update_plugins', $update_cache);
 
         } else {
 
-            $version_info = $update_cache->response[ $this->name ];
+            $version_info = $update_cache->response[$this->name];
 
         }
 
         // Restore our filter
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+        add_filter('pre_set_site_transient_update_plugins', array($this, 'check_update'));
 
-        if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+        if ( ! empty($update_cache->response[$this->name]) && version_compare($this->version, $version_info->new_version, '<')) {
 
             // build a plugin list row, with update notification
-            $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-            echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+            $wp_list_table = _get_list_table('WP_Plugins_List_Table');
+            echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
 
-            $changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+            $changelog_link = self_admin_url('index.php?edd_sl_action=view_plugin_changelog&plugin='.$this->name.'&slug='.$this->slug.'&TB_iframe=true&width=772&height=911');
 
-            if ( empty( $version_info->download_link ) ) {
+            if (empty($version_info->download_link)) {
                 printf(
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ),
-                    esc_html( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html( $version_info->new_version )
+                    __('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd'),
+                    esc_html($version_info->name),
+                    esc_url($changelog_link),
+                    esc_html($version_info->new_version)
                 );
             } else {
                 printf(
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ),
-                    esc_html( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html( $version_info->new_version ),
-                    esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
+                    __('There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd'),
+                    esc_html($version_info->name),
+                    esc_url($changelog_link),
+                    esc_html($version_info->new_version),
+                    esc_url(wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$this->name, 'upgrade-plugin_'.$this->name))
                 );
             }
 
@@ -207,16 +207,16 @@ 
      * @param object  $_args
      * @return object $_data
      */
-    function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+    function plugins_api_filter($_data, $_action = '', $_args = null) {
 
 
-        if ( $_action != 'plugin_information' ) {
+        if ($_action != 'plugin_information') {
 
             return $_data;
 
         }
 
-        if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+        if ( ! isset($_args->slug) || ($_args->slug != $this->slug)) {
 
             return $_data;
 
@@ -231,9 +231,9 @@ 
             )
         );
 
-        $api_response = $this->api_request( 'plugin_information', $to_send );
+        $api_response = $this->api_request('plugin_information', $to_send);
 
-        if ( false !== $api_response ) {
+        if (false !== $api_response) {
             $_data = $api_response;
         }
 
@@ -248,9 +248,9 @@ 
      * @param string  $url
      * @return object $array
      */
-    function http_request_args( $args, $url ) {
+    function http_request_args($args, $url) {
         // If it is an https request and we are performing a package download, disable ssl verification
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+        if (strpos($url, 'https://') !== false && strpos($url, 'edd_action=package_download')) {
             $args['sslverify'] = false;
         }
         return $args;
@@ -267,40 +267,40 @@ 
      * @param array   $_data   Parameters for the API action.
      * @return false||object
      */
-    private function api_request( $_action, $_data ) {
+    private function api_request($_action, $_data) {
 
         global $wp_version;
 
-        $data = array_merge( $this->api_data, $_data );
+        $data = array_merge($this->api_data, $_data);
 
-        if ( $data['slug'] != $this->slug )
+        if ($data['slug'] != $this->slug)
             return;
 
-        if ( empty( $data['license'] ) )
+        if (empty($data['license']))
             return;
 
-        if( $this->api_url == home_url() ) {
+        if ($this->api_url == home_url()) {
             return false; // Don't allow a plugin to ping itself
         }
 
         $api_params = array(
             'edd_action' => 'get_version',
             'license'    => $data['license'],
-            'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-            'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+            'item_name'  => isset($data['item_name']) ? $data['item_name'] : false,
+            'item_id'    => isset($data['item_id']) ? $data['item_id'] : false,
             'slug'       => $data['slug'],
             'author'     => $data['author'],
             'url'        => home_url()
         );
 
-        $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+        $request = wp_remote_post($this->api_url, array('timeout' => 15, 'sslverify' => false, 'body' => $api_params));
 
-        if ( ! is_wp_error( $request ) ) {
-            $request = json_decode( wp_remote_retrieve_body( $request ) );
+        if ( ! is_wp_error($request)) {
+            $request = json_decode(wp_remote_retrieve_body($request));
         }
 
-        if ( $request && isset( $request->sections ) ) {
-            $request->sections = maybe_unserialize( $request->sections );
+        if ($request && isset($request->sections)) {
+            $request->sections = maybe_unserialize($request->sections);
         } else {
             $request = false;
         }
@@ -311,26 +311,26 @@ 
     public function show_changelog() {
 
 
-        if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+        if (empty($_REQUEST['edd_sl_action']) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action']) {
             return;
         }
 
-        if( empty( $_REQUEST['plugin'] ) ) {
+        if (empty($_REQUEST['plugin'])) {
             return;
         }
 
-        if( empty( $_REQUEST['slug'] ) ) {
+        if (empty($_REQUEST['slug'])) {
             return;
         }
 
-        if( ! current_user_can( 'update_plugins' ) ) {
-            wp_die( __( 'You do not have permission to install plugin updates.', 'edd' ), __( 'Error', 'edd' ), array( 'response' => 403 ) );
+        if ( ! current_user_can('update_plugins')) {
+            wp_die(__('You do not have permission to install plugin updates.', 'edd'), __('Error', 'edd'), array('response' => 403));
         }
 
-        $response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
+        $response = $this->api_request('plugin_latest_version', array('slug' => $_REQUEST['slug']));
 
-        if( $response && isset( $response->sections['changelog'] ) ) {
-            echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
+        if ($response && isset($response->sections['changelog'])) {
+            echo '<div style="background:#fff;padding:10px;">'.$response->sections['changelog'].'</div>';
         }
 
 

includes/admin/class-admin-notices.php

Spacing +49 added lines, -49 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -27,9 +27,9 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_notices', array( $this, 'show_notices' ) );
-		add_action( 'give_dismiss_notices', array( $this, 'dismiss_notices' ) );
-		add_action( 'admin_bar_menu', array( $this, 'give_admin_bar_menu' ), 1000 );
+		add_action('admin_notices', array($this, 'show_notices'));
+		add_action('give_dismiss_notices', array($this, 'dismiss_notices'));
+		add_action('admin_bar_menu', array($this, 'give_admin_bar_menu'), 1000);
 	}
 
 
@@ -42,18 +42,18 @@ 
 	public function give_admin_bar_menu() {
 		global $wp_admin_bar;
 
-		if ( ! give_is_test_mode() || ! current_user_can( 'view_give_reports' ) ) {
+		if ( ! give_is_test_mode() || ! current_user_can('view_give_reports')) {
 			return false;
 		}
 
 		//Add the main siteadmin menu item
-		$wp_admin_bar->add_menu( array(
+		$wp_admin_bar->add_menu(array(
 			'id'     => 'give-test-notice',
-			'href'   => admin_url() . 'edit.php?post_type=give_forms&page=give-settings&tab=gateways',
+			'href'   => admin_url().'edit.php?post_type=give_forms&page=give-settings&tab=gateways',
 			'parent' => 'top-secondary',
-			'title'  => __( 'Give Test Mode Active', 'give' ),
-			'meta'   => array( 'class' => 'give-test-mode-active' ),
-		) );
+			'title'  => __('Give Test Mode Active', 'give'),
+			'meta'   => array('class' => 'give-test-mode-active'),
+		));
 
 	}
 
@@ -68,97 +68,97 @@ 
 			'error'   => array()
 		);
 
-		if ( ! give_test_ajax_works() && ! get_user_meta( get_current_user_id(), '_give_admin_ajax_inaccessible_dismissed', true ) && current_user_can( 'manage_give_settings' ) ) {
+		if ( ! give_test_ajax_works() && ! get_user_meta(get_current_user_id(), '_give_admin_ajax_inaccessible_dismissed', true) && current_user_can('manage_give_settings')) {
 			echo '<div class="error">';
-			echo '<p>' . __( 'Your site appears to be blocking the WordPress ajax interface. This may cause issues with Give.', 'give' ) . '</p>';
-			echo '<p>' . sprintf( esc_attr__( 'Please see %1$sthis reference%2$s for possible solutions.', 'give' ), '<a href="https://givewp.com/documentation/core/troubleshooting/admin-ajax-blocked/" target="_blank">', '</a>' ) . '</p>';
-			echo '<p><a href="' . add_query_arg( array(
+			echo '<p>'.__('Your site appears to be blocking the WordPress ajax interface. This may cause issues with Give.', 'give').'</p>';
+			echo '<p>'.sprintf(esc_attr__('Please see %1$sthis reference%2$s for possible solutions.', 'give'), '<a href="https://givewp.com/documentation/core/troubleshooting/admin-ajax-blocked/" target="_blank">', '</a>').'</p>';
+			echo '<p><a href="'.add_query_arg(array(
 					'give_action' => 'dismiss_notices',
 					'give_notice' => 'admin_ajax_inaccessible'
-				) ) . '">' . esc_attr__( 'Dismiss Notice', 'give' ) . '</a></p>';
+				)).'">'.esc_attr__('Dismiss Notice', 'give').'</a></p>';
 			echo '</div>';
 		}
 
 
-		if ( isset( $_GET['give-message'] ) ) {
+		if (isset($_GET['give-message'])) {
 
 			// Donation reports errors
-			if ( current_user_can( 'view_give_reports' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('view_give_reports')) {
+				switch ($_GET['give-message']) {
 					case 'payment_deleted' :
-						$notices['updated']['give-payment-deleted'] = esc_attr__( 'The payment has been deleted.', 'give' );
+						$notices['updated']['give-payment-deleted'] = esc_attr__('The payment has been deleted.', 'give');
 						break;
 					case 'email_sent' :
-						$notices['updated']['give-payment-sent'] = esc_attr__( 'The donation receipt has been resent.', 'give' );
+						$notices['updated']['give-payment-sent'] = esc_attr__('The donation receipt has been resent.', 'give');
 						break;
 					case 'refreshed-reports' :
-						$notices['updated']['give-refreshed-reports'] = esc_attr__( 'The reports cache has been cleared.', 'give' );
+						$notices['updated']['give-refreshed-reports'] = esc_attr__('The reports cache has been cleared.', 'give');
 						break;
 					case 'payment-note-deleted' :
-						$notices['updated']['give-payment-note-deleted'] = esc_attr__( 'The payment note has been deleted.', 'give' );
+						$notices['updated']['give-payment-note-deleted'] = esc_attr__('The payment note has been deleted.', 'give');
 						break;
 				}
 			}
 
 			// Give settings notices and errors
-			if ( current_user_can( 'manage_give_settings' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('manage_give_settings')) {
+				switch ($_GET['give-message']) {
 					case 'settings-imported' :
-						$notices['updated']['give-settings-imported'] = esc_attr__( 'The settings have been imported.', 'give' );
+						$notices['updated']['give-settings-imported'] = esc_attr__('The settings have been imported.', 'give');
 						break;
 					case 'api-key-generated' :
-						$notices['updated']['give-api-key-generated'] = esc_attr__( 'API keys successfully generated.', 'give' );
+						$notices['updated']['give-api-key-generated'] = esc_attr__('API keys successfully generated.', 'give');
 						break;
 					case 'api-key-exists' :
-						$notices['error']['give-api-key-exists'] = esc_attr__( 'The specified user already has API keys.', 'give' );
+						$notices['error']['give-api-key-exists'] = esc_attr__('The specified user already has API keys.', 'give');
 						break;
 					case 'api-key-regenerated' :
-						$notices['updated']['give-api-key-regenerated'] = esc_attr__( 'API keys successfully regenerated.', 'give' );
+						$notices['updated']['give-api-key-regenerated'] = esc_attr__('API keys successfully regenerated.', 'give');
 						break;
 					case 'api-key-revoked' :
-						$notices['updated']['give-api-key-revoked'] = esc_attr__( 'API keys successfully revoked.', 'give' );
+						$notices['updated']['give-api-key-revoked'] = esc_attr__('API keys successfully revoked.', 'give');
 						break;
 					case 'sent-test-email' :
-						$notices['updated']['give-sent-test-email'] = esc_attr__( 'The test email has been sent.', 'give' );
+						$notices['updated']['give-sent-test-email'] = esc_attr__('The test email has been sent.', 'give');
 						break;
 				}
 			}
 			// Payments errors
-			if ( current_user_can( 'edit_give_payments' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('edit_give_payments')) {
+				switch ($_GET['give-message']) {
 					case 'note-added' :
-						$notices['updated']['give-note-added'] = esc_attr__( 'The payment note has been added successfully.', 'give' );
+						$notices['updated']['give-note-added'] = esc_attr__('The payment note has been added successfully.', 'give');
 						break;
 					case 'payment-updated' :
-						$notices['updated']['give-payment-updated'] = esc_attr__( 'The payment has been successfully updated.', 'give' );
+						$notices['updated']['give-payment-updated'] = esc_attr__('The payment has been successfully updated.', 'give');
 						break;
 				}
 			}
 
 			// Customer Notices
-			if ( current_user_can( 'edit_give_payments' ) ) {
-				switch ( $_GET['give-message'] ) {
+			if (current_user_can('edit_give_payments')) {
+				switch ($_GET['give-message']) {
 					case 'customer-deleted' :
-						$notices['updated']['give-customer-deleted'] = esc_attr__( 'Donor successfully deleted.', 'give' );
+						$notices['updated']['give-customer-deleted'] = esc_attr__('Donor successfully deleted.', 'give');
 						break;
 				}
 			}
 
 		}
 
-		if ( count( $notices['updated'] ) > 0 ) {
-			foreach ( $notices['updated'] as $notice => $message ) {
-				add_settings_error( 'give-notices', $notice, $message, 'updated' );
+		if (count($notices['updated']) > 0) {
+			foreach ($notices['updated'] as $notice => $message) {
+				add_settings_error('give-notices', $notice, $message, 'updated');
 			}
 		}
 
-		if ( count( $notices['error'] ) > 0 ) {
-			foreach ( $notices['error'] as $notice => $message ) {
-				add_settings_error( 'give-notices', $notice, $message, 'error' );
+		if (count($notices['error']) > 0) {
+			foreach ($notices['error'] as $notice => $message) {
+				add_settings_error('give-notices', $notice, $message, 'error');
 			}
 		}
 
-		settings_errors( 'give-notices' );
+		settings_errors('give-notices');
 
 	}
 
@@ -170,8 +170,8 @@ 
 	 * @return void
 	 */
 	function give_admin_addons_notices() {
-		add_settings_error( 'give-notices', 'give-addons-feed-error', esc_attr__( 'There seems to be an issue with the server. Please try again in a few minutes.', 'give' ), 'error' );
-		settings_errors( 'give-notices' );
+		add_settings_error('give-notices', 'give-addons-feed-error', esc_attr__('There seems to be an issue with the server. Please try again in a few minutes.', 'give'), 'error');
+		settings_errors('give-notices');
 	}
 
 
@@ -182,9 +182,9 @@ 
 	 * @return void
 	 */
 	function dismiss_notices() {
-		if ( isset( $_GET['give_notice'] ) ) {
-			update_user_meta( get_current_user_id(), '_give_' . $_GET['give_notice'] . '_dismissed', 1 );
-			wp_redirect( remove_query_arg( array( 'give_action', 'give_notice' ) ) );
+		if (isset($_GET['give_notice'])) {
+			update_user_meta(get_current_user_id(), '_give_'.$_GET['give_notice'].'_dismissed', 1);
+			wp_redirect(remove_query_arg(array('give_action', 'give_notice')));
 			exit;
 		}
 	}

includes/admin/class-give-settings.php

Spacing +311 added lines, -311 removed lines

@@ -49,26 +49,26 @@ 
 	 */

 	public function __construct() {

 

-		add_action( 'admin_init', array( $this, 'init' ) );

+		add_action('admin_init', array($this, 'init'));

 

 		//Customize CMB2 URL

-		add_filter( 'cmb2_meta_box_url', array( $this, 'give_update_cmb_meta_box_url' ) );

+		add_filter('cmb2_meta_box_url', array($this, 'give_update_cmb_meta_box_url'));

 

 		//Custom CMB2 Settings Fields

-		add_action( 'cmb2_render_give_title', 'give_title_callback', 10, 5 );

-		add_action( 'cmb2_render_give_description', 'give_description_callback', 10, 5 );

-		add_action( 'cmb2_render_enabled_gateways', 'give_enabled_gateways_callback', 10, 5 );

-		add_action( 'cmb2_render_default_gateway', 'give_default_gateway_callback', 10, 5 );

-		add_action( 'cmb2_render_email_preview_buttons', 'give_email_preview_buttons_callback', 10, 5 );

-		add_action( 'cmb2_render_system_info', 'give_system_info_callback', 10, 5 );

-		add_action( 'cmb2_render_api', 'give_api_callback', 10, 5 );

-		add_action( 'cmb2_render_license_key', 'give_license_key_callback', 10, 5 );

-		add_action( 'admin_notices', array( $this, 'settings_notices' ) );

+		add_action('cmb2_render_give_title', 'give_title_callback', 10, 5);

+		add_action('cmb2_render_give_description', 'give_description_callback', 10, 5);

+		add_action('cmb2_render_enabled_gateways', 'give_enabled_gateways_callback', 10, 5);

+		add_action('cmb2_render_default_gateway', 'give_default_gateway_callback', 10, 5);

+		add_action('cmb2_render_email_preview_buttons', 'give_email_preview_buttons_callback', 10, 5);

+		add_action('cmb2_render_system_info', 'give_system_info_callback', 10, 5);

+		add_action('cmb2_render_api', 'give_api_callback', 10, 5);

+		add_action('cmb2_render_license_key', 'give_license_key_callback', 10, 5);

+		add_action('admin_notices', array($this, 'settings_notices'));

 

 		// Include CMB CSS in the head to avoid FOUC

-		add_action( 'admin_print_styles-give_forms_page_give-settings', array( 'CMB2_hookup', 'enqueue_cmb_css' ) );

+		add_action('admin_print_styles-give_forms_page_give-settings', array('CMB2_hookup', 'enqueue_cmb_css'));

 

-		add_filter( 'cmb2_get_metabox_form_format', array( $this, 'give_modify_cmb2_form_output' ), 10, 3 );

+		add_filter('cmb2_get_metabox_form_format', array($this, 'give_modify_cmb2_form_output'), 10, 3);

 

 	}

 

@@ -78,7 +78,7 @@ 
 	 * @since  1.0

 	 */

 	public function init() {

-		register_setting( $this->key, $this->key );

+		register_setting($this->key, $this->key);

 

 	}

 

@@ -92,9 +92,9 @@ 
 	 *

 	 * @return mixed

 	 */

-	public function give_update_cmb_meta_box_url( $url ) {

+	public function give_update_cmb_meta_box_url($url) {

 		//Path to Give's CMB

-		return GIVE_PLUGIN_URL . '/includes/libraries/cmb2';

+		return GIVE_PLUGIN_URL.'/includes/libraries/cmb2';

 	}

 

 

@@ -106,27 +106,27 @@ 
 	 */

 	public function give_get_settings_tabs() {

 

-		$settings = $this->give_settings( null );

+		$settings = $this->give_settings(null);

 

 		$tabs             = array();

-		$tabs['general']  = __( 'General', 'give' );

-		$tabs['gateways'] = __( 'Payment Gateways', 'give' );

-		$tabs['display']  = __( 'Display Options', 'give' );

-		$tabs['emails']   = __( 'Emails', 'give' );

+		$tabs['general']  = __('General', 'give');

+		$tabs['gateways'] = __('Payment Gateways', 'give');

+		$tabs['display']  = __('Display Options', 'give');

+		$tabs['emails']   = __('Emails', 'give');

 

-		if ( ! empty( $settings['addons']['fields'] ) ) {

-			$tabs['addons'] = __( 'Add-ons', 'give' );

+		if ( ! empty($settings['addons']['fields'])) {

+			$tabs['addons'] = __('Add-ons', 'give');

 		}

 

-		if ( ! empty( $settings['licenses']['fields'] ) ) {

-			$tabs['licenses'] = __( 'Licenses', 'give' );

+		if ( ! empty($settings['licenses']['fields'])) {

+			$tabs['licenses'] = __('Licenses', 'give');

 		}

 

-		$tabs['advanced']    = __( 'Advanced', 'give' );

-		$tabs['api']         = __( 'API', 'give' );

-		$tabs['system_info'] = __( 'System Info', 'give' );

+		$tabs['advanced']    = __('Advanced', 'give');

+		$tabs['api']         = __('API', 'give');

+		$tabs['system_info'] = __('System Info', 'give');

 

-		return apply_filters( 'give_settings_tabs', $tabs );

+		return apply_filters('give_settings_tabs', $tabs);

 	}

 

 

@@ -136,7 +136,7 @@ 
 	 */

 	public function admin_page_display() {

 

-		$active_tab = isset( $_GET['tab'] ) && array_key_exists( $_GET['tab'], $this->give_get_settings_tabs() ) ? $_GET['tab'] : 'general';

+		$active_tab = isset($_GET['tab']) && array_key_exists($_GET['tab'], $this->give_get_settings_tabs()) ? $_GET['tab'] : 'general';

 

 		?>

 

@@ -144,20 +144,20 @@ 
 

 			<h1 class="nav-tab-wrapper">

 				<?php

-				foreach ( $this->give_get_settings_tabs() as $tab_id => $tab_name ) {

+				foreach ($this->give_get_settings_tabs() as $tab_id => $tab_name) {

 

 					//Support legacy tab creation conditions based off $_GET parameter

 					//We pass the $_GET['tab'] to conditions executed later

 					$_GET['tab'] = $tab_id;

 

-					$tab_url = esc_url( add_query_arg( array(

+					$tab_url = esc_url(add_query_arg(array(

 						'settings-updated' => false,

 						'tab'              => $tab_id

-					) ) );

+					)));

 

-					$active       = $active_tab == $tab_id ? ' nav-tab-active' : '';

+					$active = $active_tab == $tab_id ? ' nav-tab-active' : '';

 

-					echo '<a href="' . esc_url( $tab_url ) . '" title="' . esc_attr( $tab_name ) . '" class="nav-tab' . $active . '" id="tab-' . $tab_id . '">' . esc_html( $tab_name ) . '</a>';

+					echo '<a href="'.esc_url($tab_url).'" title="'.esc_attr($tab_name).'" class="nav-tab'.$active.'" id="tab-'.$tab_id.'">'.esc_html($tab_name).'</a>';

 

 				}

 				?>

@@ -165,20 +165,20 @@ 
 

 			<?php

 			//Loop through and output settings

-			foreach ( $this->give_get_settings_tabs() as $tab_id => $tab_name ) {

+			foreach ($this->give_get_settings_tabs() as $tab_id => $tab_name) {

 

 				//Support legacy tab creation conditions based off $_GET parameter

 				//We 'trick' the conditions into thinking this is the tab

 				$_GET['tab'] = $tab_id;

 

-				$tab_settings = $this->give_settings( $tab_id );

+				$tab_settings = $this->give_settings($tab_id);

 

 				//Pass active tab within $tab_settings so we can hide with CSS via PHP

-				if ( $active_tab == $tab_id ) {

+				if ($active_tab == $tab_id) {

 					$tab_settings['active_tab'] = true;

 				}

 

-				cmb2_metabox_form( $tab_settings, $this->key );

+				cmb2_metabox_form($tab_settings, $this->key);

 

 			} ?>

 

@@ -196,34 +196,34 @@ 
 	 * @since 1.5 Modified to CSS hide non-active tabs

 	 * @since 1.0

 	 */

-	function give_modify_cmb2_form_output( $form_format, $object_id, $cmb ) {

+	function give_modify_cmb2_form_output($form_format, $object_id, $cmb) {

 

 

-		$pagenow = isset( $_GET['page'] ) ? $_GET['page'] : '';

+		$pagenow = isset($_GET['page']) ? $_GET['page'] : '';

 

 		//only modify the give settings form

-		if ( 'give_settings' == $object_id && $pagenow == 'give-settings' ) {

+		if ('give_settings' == $object_id && $pagenow == 'give-settings') {

 

 			$style = '';

-			if ( ! isset( $cmb->meta_box['active_tab'] ) ) {

+			if ( ! isset($cmb->meta_box['active_tab'])) {

 				$style = 'style="display:none;"';

 			}

 

 			//Set ID based off tab name - protects backwards compatibility

-			$tab_id = isset( $_GET['tab'] ) ? $_GET['tab'] : $cmb->meta_box['id'];

+			$tab_id = isset($_GET['tab']) ? $_GET['tab'] : $cmb->meta_box['id'];

 

-			$save_button = apply_filters( 'give_save_button_markup', '<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="' . __( 'Save Settings', 'give' ) . '" class="button-primary"></div>' );

+			$save_button = apply_filters('give_save_button_markup', '<div class="give-submit-wrap"><input type="submit" name="submit-cmb" value="'.__('Save Settings', 'give').'" class="button-primary"></div>');

 

 			//Filter so some tabs won't have save settings

-			$no_save_button = apply_filters( 'give_settings_no_save_output', array(

+			$no_save_button = apply_filters('give_settings_no_save_output', array(

 				'system_info'

-			) );

+			));

 

-			if ( in_array( $tab_id, $no_save_button ) ) {

+			if (in_array($tab_id, $no_save_button)) {

 				$save_button = '';

 			}

 

-			$form_format = '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data" ' . $style . ' data-tab="' . $tab_id . '"><input type="hidden" name="give_settings_saved" value="true"><input type="hidden" name="object_id" value="%2$s">%3$s' . $save_button . '</form>';

+			$form_format = '<form class="cmb-form" method="post" id="%1$s" enctype="multipart/form-data" encoding="multipart/form-data" '.$style.' data-tab="'.$tab_id.'"><input type="hidden" name="give_settings_saved" value="true"><input type="hidden" name="object_id" value="%2$s">%3$s'.$save_button.'</form>';

 

 		}

 

@@ -240,7 +240,7 @@ 
 	 *

 	 * @return array

 	 */

-	public function give_settings( $active_tab ) {

+	public function give_settings($active_tab) {

 

 		$give_settings = array(

 			/**

@@ -248,60 +248,60 @@ 
 			 */

 			'general'     => array(

 				'id'         => 'general_settings',

-				'give_title' => __( 'General Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_general', array(

+				'give_title' => __('General Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_general', array(

 						array(

-							'name' => __( 'General Settings', 'give' ),

+							'name' => __('General Settings', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_1'

 						),

 						array(

-							'name'    => __( 'Success Page', 'give' ),

-							'desc'    => sprintf( __( 'This is the page donors are sent to after completing their donations. The %s shortcode should be on this page.', 'give' ), '<code>[give_receipt]</code>' ),

+							'name'    => __('Success Page', 'give'),

+							'desc'    => sprintf(__('This is the page donors are sent to after completing their donations. The %s shortcode should be on this page.', 'give'), '<code>[give_receipt]</code>'),

 							'id'      => 'success_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Failed Transaction Page', 'give' ),

-							'desc'    => __( 'This is the page donors are sent to if their transaction is cancelled or fails.', 'give' ),

+							'name'    => __('Failed Transaction Page', 'give'),

+							'desc'    => __('This is the page donors are sent to if their transaction is cancelled or fails.', 'give'),

 							'id'      => 'failure_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Donation History Page', 'give' ),

-							'desc'    => sprintf( __( 'This page shows a complete donation history for the current user. The %s shortcode should be on this page.', 'give' ), '<code>[donation_history]</code>' ),

+							'name'    => __('Donation History Page', 'give'),

+							'desc'    => sprintf(__('This page shows a complete donation history for the current user. The %s shortcode should be on this page.', 'give'), '<code>[donation_history]</code>'),

 							'id'      => 'history_page',

 							'type'    => 'select',

-							'options' => give_cmb2_get_post_options( array(

+							'options' => give_cmb2_get_post_options(array(

 								'post_type'   => 'page',

-								'numberposts' => - 1

-							) ),

+								'numberposts' => -1

+							)),

 						),

 						array(

-							'name'    => __( 'Base Country', 'give' ),

-							'desc'    => __( 'Where does your site operate from?', 'give' ),

+							'name'    => __('Base Country', 'give'),

+							'desc'    => __('Where does your site operate from?', 'give'),

 							'id'      => 'base_country',

 							'type'    => 'select',

 							'options' => give_get_country_list(),

 						),

 						array(

-							'name' => __( 'Currency Settings', 'give' ),

+							'name' => __('Currency Settings', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_general_settings_2'

 						),

 						array(

-							'name'    => __( 'Currency', 'give' ),

+							'name'    => __('Currency', 'give'),

 							'desc'    => 'Choose your currency. Note that some payment gateways have currency restrictions.',

 							'id'      => 'currency',

 							'type'    => 'select',

@@ -309,26 +309,26 @@ 
 							'default' => 'USD',

 						),

 						array(

-							'name'    => __( 'Currency Position', 'give' ),

+							'name'    => __('Currency Position', 'give'),

 							'desc'    => 'Choose the position of the currency sign.',

 							'id'      => 'currency_position',

 							'type'    => 'select',

 							'options' => array(

-								'before' => sprintf( __( 'Before - %s10', 'give' ), give_currency_symbol( give_get_currency() ) ),

-								'after'  => sprintf( __( 'After - 10%s', 'give' ), give_currency_symbol( give_get_currency() ) )

+								'before' => sprintf(__('Before - %s10', 'give'), give_currency_symbol(give_get_currency())),

+								'after'  => sprintf(__('After - 10%s', 'give'), give_currency_symbol(give_get_currency()))

 							),

 							'default' => 'before',

 						),

 						array(

-							'name'    => __( 'Thousands Separator', 'give' ),

-							'desc'    => __( 'The symbol (typically , or .) to separate thousands.', 'give' ),

+							'name'    => __('Thousands Separator', 'give'),

+							'desc'    => __('The symbol (typically , or .) to separate thousands.', 'give'),

 							'id'      => 'thousands_separator',

 							'type'    => 'text_small',

 							'default' => ',',

 						),

 						array(

-							'name'    => __( 'Decimal Separator', 'give' ),

-							'desc'    => __( 'The symbol (usually , or .) to separate decimal points.', 'give' ),

+							'name'    => __('Decimal Separator', 'give'),

+							'desc'    => __('The symbol (usually , or .) to separate decimal points.', 'give'),

 							'id'      => 'decimal_separator',

 							'type'    => 'text_small',

 							'default' => '.',

@@ -341,83 +341,83 @@ 
 			 */

 			'gateways'    => array(

 				'id'         => 'payment_gateways',

-				'give_title' => __( 'Payment Gateways', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_gateways', array(

+				'give_title' => __('Payment Gateways', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_gateways', array(

 						array(

-							'name' => __( 'Gateways Settings', 'give' ),

+							'name' => __('Gateways Settings', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_gateway_settings_1',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Test Mode', 'give' ),

-							'desc' => __( 'While in test mode no live transactions are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give' ),

+							'name' => __('Test Mode', 'give'),

+							'desc' => __('While in test mode no live transactions are processed. To fully use test mode, you must have a sandbox (test) account for the payment gateway you are testing.', 'give'),

 							'id'   => 'test_mode',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enabled Gateways', 'give' ),

-							'desc' => __( 'Choose the payment gateways you would like enabled. You can drag-and-drop payment gateways to reorder them.', 'give' ),

+							'name' => __('Enabled Gateways', 'give'),

+							'desc' => __('Choose the payment gateways you would like enabled. You can drag-and-drop payment gateways to reorder them.', 'give'),

 							'id'   => 'gateways',

 							'type' => 'enabled_gateways'

 						),

 						array(

-							'name' => __( 'Default Gateway', 'give' ),

-							'desc' => __( 'This is the gateway that will be selected by default.', 'give' ),

+							'name' => __('Default Gateway', 'give'),

+							'desc' => __('This is the gateway that will be selected by default.', 'give'),

 							'id'   => 'default_gateway',

 							'type' => 'default_gateway'

 						),

 						array(

-							'name' => __( 'PayPal Standard', 'give' ),

+							'name' => __('PayPal Standard', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_2',

 						),

 						array(

-							'name' => __( 'PayPal Email', 'give' ),

-							'desc' => __( 'Enter your PayPal account\'s email.', 'give' ),

+							'name' => __('PayPal Email', 'give'),

+							'desc' => __('Enter your PayPal account\'s email.', 'give'),

 							'id'   => 'paypal_email',

 							'type' => 'text_email',

 						),

 						array(

-							'name' => __( 'PayPal Page Style', 'give' ),

-							'desc' => __( 'Enter the name of the page style to use, or leave blank to use the default.', 'give' ),

+							'name' => __('PayPal Page Style', 'give'),

+							'desc' => __('Enter the name of the page style to use, or leave blank to use the default.', 'give'),

 							'id'   => 'paypal_page_style',

 							'type' => 'text',

 						),

 						array(

-							'name'    => __( 'PayPal Transaction Type', 'give' ),

-							'desc'    => __( 'Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give' ),

+							'name'    => __('PayPal Transaction Type', 'give'),

+							'desc'    => __('Nonprofits must verify their status to withdraw donations they receive via PayPal. PayPal users that are not verified nonprofits must demonstrate how their donations will be used, once they raise more than $10,000. By default, Give transactions are sent to PayPal as donations. You may change the transaction type using this option if you feel you may not meet PayPal\'s donation requirements.', 'give'),

 							'id'      => 'paypal_button_type',

 							'type'    => 'radio_inline',

 							'options' => array(

-								'donation' => __( 'Donation', 'give' ),

-								'standard' => __( 'Standard Transaction', 'give' )

+								'donation' => __('Donation', 'give'),

+								'standard' => __('Standard Transaction', 'give')

 							),

 							'default' => 'donation',

 						),

 						array(

-							'name' => __( 'Disable PayPal IPN Verification', 'give' ),

-							'desc' => __( 'If donations are not getting marked as complete, then check this box. This forces the site to use a slightly less secure method of verifying donations.', 'give' ),

+							'name' => __('Disable PayPal IPN Verification', 'give'),

+							'desc' => __('If donations are not getting marked as complete, then check this box. This forces the site to use a slightly less secure method of verifying donations.', 'give'),

 							'id'   => 'disable_paypal_verification',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Offline Donations', 'give' ),

+							'name' => __('Offline Donations', 'give'),

 							'desc' => '',

 							'type' => 'give_title',

 							'id'   => 'give_title_gateway_settings_3',

 						),

 						array(

-							'name' => __( 'Collect Billing Details', 'give' ),

-							'desc' => __( 'This option will enable the billing details section for offline donations. The fieldset will appear above the offline donation instructions. Note: You may customize this option per form as needed.', 'give' ),

+							'name' => __('Collect Billing Details', 'give'),

+							'desc' => __('This option will enable the billing details section for offline donations. The fieldset will appear above the offline donation instructions. Note: You may customize this option per form as needed.', 'give'),

 							'id'   => 'give_offline_donation_enable_billing_fields',

 							'type' => 'checkbox'

 						),

 						array(

-							'name'    => __( 'Offline Donation Instructions', 'give' ),

-							'desc'    => __( 'The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give' ),

+							'name'    => __('Offline Donation Instructions', 'give'),

+							'desc'    => __('The following content will appear for all forms when the user selects the offline donation payment option. Note: You may customize the content per form as needed.', 'give'),

 							'id'      => 'global_offline_donation_content',

 							'default' => give_get_default_offline_donation_content(),

 							'type'    => 'wysiwyg',

@@ -426,15 +426,15 @@ 
 							)

 						),

 						array(

-							'name'    => __( 'Offline Donation Email Instructions Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation receipt email.', 'give' ),

+							'name'    => __('Offline Donation Email Instructions Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation receipt email.', 'give'),

 							'id'      => 'offline_donation_subject',

-							'default' => __( '{donation} - Offline Donation Instructions', 'give' ),

+							'default' => __('{donation} - Offline Donation Instructions', 'give'),

 							'type'    => 'text'

 						),

 						array(

-							'name'    => __( 'Offline Donation Email Instructions', 'give' ),

-							'desc'    => __( 'Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give' ),

+							'name'    => __('Offline Donation Email Instructions', 'give'),

+							'desc'    => __('Enter the instructions you want emailed to the donor after they have submitted the donation form. Most likely this would include important information like mailing address and who to make the check out to.', 'give'),

 							'id'      => 'global_offline_donation_email',

 							'default' => give_get_default_offline_donation_email_content(),

 							'type'    => 'wysiwyg',

@@ -448,93 +448,93 @@ 
 			/** Display Settings */

 			'display'     => array(

 				'id'         => 'display_settings',

-				'give_title' => __( 'Display Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_display', array(

+				'give_title' => __('Display Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_display', array(

 						array(

-							'name' => __( 'Display Settings', 'give' ),

+							'name' => __('Display Settings', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_display_settings_1',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable CSS', 'give' ),

-							'desc' => __( 'Enable this option if you would like to disable all of Give\'s included CSS stylesheets.', 'give' ),

+							'name' => __('Disable CSS', 'give'),

+							'desc' => __('Enable this option if you would like to disable all of Give\'s included CSS stylesheets.', 'give'),

 							'id'   => 'disable_css',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enable Floating Labels', 'give' ),

-							'desc' => sprintf( esc_html__( 'Enable this option if you would like to enable %1$sfloating labels%2$s in Give\'s donation forms. %3$sBe aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give' ), '<a href="' . esc_url( "http://bradfrost.com/blog/post/float-label-pattern/" ) . '" target="_blank">', '</a>', '<br />' ),

+							'name' => __('Enable Floating Labels', 'give'),

+							'desc' => sprintf(esc_html__('Enable this option if you would like to enable %1$sfloating labels%2$s in Give\'s donation forms. %3$sBe aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give'), '<a href="'.esc_url("http://bradfrost.com/blog/post/float-label-pattern/").'" target="_blank">', '</a>', '<br />'),

 							'id'   => 'enable_floatlabels',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Welcome Screen', 'give' ),

-							'desc' => sprintf( esc_html__( 'Enable this option if you would like to disable the Give Welcome screen every time Give is activated and/or updated. You can always access the <a href="%s">Welcome Screen</a> if you want in the future.', 'give' ), esc_url( admin_url( 'index.php?page=give-about' ) ) ),

+							'name' => __('Disable Welcome Screen', 'give'),

+							'desc' => sprintf(esc_html__('Enable this option if you would like to disable the Give Welcome screen every time Give is activated and/or updated. You can always access the <a href="%s">Welcome Screen</a> if you want in the future.', 'give'), esc_url(admin_url('index.php?page=give-about'))),

 							'id'   => 'disable_welcome',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Post Types', 'give' ),

+							'name' => __('Post Types', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_display_settings_2',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Disable Form Single Views', 'give' ),

-							'desc' => __( 'By default, all forms have single views enabled which create a specific URL on your website for that form. This option disables the singular and archive views from being publicly viewable. Note: you will need to embed forms using a shortcode or widget if enabled.', 'give' ),

+							'name' => __('Disable Form Single Views', 'give'),

+							'desc' => __('By default, all forms have single views enabled which create a specific URL on your website for that form. This option disables the singular and archive views from being publicly viewable. Note: you will need to embed forms using a shortcode or widget if enabled.', 'give'),

 							'id'   => 'disable_forms_singular',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Archives', 'give' ),

-							'desc' => __( 'Archives pages list all the forms you have created. This option will disable only the form\'s archive page(s). The single form\'s view will remain in place. Note: you will need to refresh your permalinks after this option has been enabled.', 'give' ),

+							'name' => __('Disable Form Archives', 'give'),

+							'desc' => __('Archives pages list all the forms you have created. This option will disable only the form\'s archive page(s). The single form\'s view will remain in place. Note: you will need to refresh your permalinks after this option has been enabled.', 'give'),

 							'id'   => 'disable_forms_archives',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Form Excerpts', 'give' ),

-							'desc' => __( 'The excerpt is an optional summary or description of a donation form; in short, a summary as to why the user should give.', 'give' ),

+							'name' => __('Disable Form Excerpts', 'give'),

+							'desc' => __('The excerpt is an optional summary or description of a donation form; in short, a summary as to why the user should give.', 'give'),

 							'id'   => 'disable_forms_excerpt',

 							'type' => 'checkbox'

 						),

 

 						array(

-							'name'    => __( 'Featured Image Size', 'give' ),

-							'desc'    => __( 'The Featured Image is an image that is chosen as the representative image for a donation form. Some themes may have custom featured image sizes. Please select the size you would like to display for your single donation forms\' featured image.', 'give' ),

+							'name'    => __('Featured Image Size', 'give'),

+							'desc'    => __('The Featured Image is an image that is chosen as the representative image for a donation form. Some themes may have custom featured image sizes. Please select the size you would like to display for your single donation forms\' featured image.', 'give'),

 							'id'      => 'featured_image_size',

 							'type'    => 'select',

 							'default' => 'large',

 							'options' => give_get_featured_image_sizes()

 						),

 						array(

-							'name' => __( 'Disable Form Featured Image', 'give' ),

-							'desc' => __( 'If you do not wish to use the featured image functionality you can disable it using this option and it will not be displayed for single donation forms.', 'give' ),

+							'name' => __('Disable Form Featured Image', 'give'),

+							'desc' => __('If you do not wish to use the featured image functionality you can disable it using this option and it will not be displayed for single donation forms.', 'give'),

 							'id'   => 'disable_form_featured_img',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Disable Single Form Sidebar', 'give' ),

-							'desc' => __( 'The sidebar allows you to add additional widget to the Give single form view. If you don\'t plan on using the sidebar you may disable it with this option.', 'give' ),

+							'name' => __('Disable Single Form Sidebar', 'give'),

+							'desc' => __('The sidebar allows you to add additional widget to the Give single form view. If you don\'t plan on using the sidebar you may disable it with this option.', 'give'),

 							'id'   => 'disable_form_sidebar',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Taxonomies', 'give' ),

+							'name' => __('Taxonomies', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_display_settings_3',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Enable Form Categories', 'give' ),

-							'desc' => __( 'Check this option if you would like to categorize your donation forms. This option enables the form\'s category taxonomy.', 'give' ),

+							'name' => __('Enable Form Categories', 'give'),

+							'desc' => __('Check this option if you would like to categorize your donation forms. This option enables the form\'s category taxonomy.', 'give'),

 							'id'   => 'enable_categories',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Enable Form Tags', 'give' ),

-							'desc' => __( 'Check this option if you would like to tag your donation forms. This option enables the form\'s tag taxonomy.', 'give' ),

+							'name' => __('Enable Form Tags', 'give'),

+							'desc' => __('Check this option if you would like to tag your donation forms. This option enables the form\'s tag taxonomy.', 'give'),

 							'id'   => 'enable_tags',

 							'type' => 'checkbox'

 						),

@@ -547,93 +547,93 @@ 
 			 */

 			'emails'      => array(

 				'id'         => 'email_settings',

-				'give_title' => __( 'Email Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_emails', array(

+				'give_title' => __('Email Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_emails', array(

 						array(

-							'name' => __( 'Email Settings', 'give' ),

+							'name' => __('Email Settings', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_email_settings_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'email_template',

-							'name'    => __( 'Email Template', 'give' ),

-							'desc'    => __( 'Choose a template. Click "Save Changes" then "Preview Donation Receipt" to see the new template.', 'give' ),

+							'name'    => __('Email Template', 'give'),

+							'desc'    => __('Choose a template. Click "Save Changes" then "Preview Donation Receipt" to see the new template.', 'give'),

 							'type'    => 'select',

 							'options' => give_get_email_templates()

 						),

 						array(

 							'id'   => 'email_logo',

-							'name' => __( 'Logo', 'give' ),

-							'desc' => __( 'Upload or choose a logo to be displayed at the top of the donation receipt emails. Displayed on HTML emails only.', 'give' ),

+							'name' => __('Logo', 'give'),

+							'desc' => __('Upload or choose a logo to be displayed at the top of the donation receipt emails. Displayed on HTML emails only.', 'give'),

 							'type' => 'file'

 						),

 						array(

 							'id'      => 'from_name',

-							'name'    => __( 'From Name', 'give' ),

-							'desc'    => __( 'The name donation receipts are said to come from. This should probably be your site or shop name.', 'give' ),

-							'default' => get_bloginfo( 'name' ),

+							'name'    => __('From Name', 'give'),

+							'desc'    => __('The name donation receipts are said to come from. This should probably be your site or shop name.', 'give'),

+							'default' => get_bloginfo('name'),

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'from_email',

-							'name'    => __( 'From Email', 'give' ),

-							'desc'    => __( 'Email to send donation receipts from. This will act as the "from" and "reply-to" address.', 'give' ),

-							'default' => get_bloginfo( 'admin_email' ),

+							'name'    => __('From Email', 'give'),

+							'desc'    => __('Email to send donation receipts from. This will act as the "from" and "reply-to" address.', 'give'),

+							'default' => get_bloginfo('admin_email'),

 							'type'    => 'text'

 						),

 						array(

-							'name' => __( 'Donation Receipt', 'give' ),

+							'name' => __('Donation Receipt', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_email_settings_2',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_subject',

-							'name'    => __( 'Donation Email Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation receipt email.', 'give' ),

-							'default' => __( 'Donation Receipt', 'give' ),

+							'name'    => __('Donation Email Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation receipt email.', 'give'),

+							'default' => __('Donation Receipt', 'give'),

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'donation_receipt',

-							'name'    => __( 'Donation Receipt', 'give' ),

-							'desc'    => __( 'Enter the email that is sent to users after completing a successful donation. HTML is accepted. Available template tags:', 'give' ) . '<br/>' . give_get_emails_tags_list(),

+							'name'    => __('Donation Receipt', 'give'),

+							'desc'    => __('Enter the email that is sent to users after completing a successful donation. HTML is accepted. Available template tags:', 'give').'<br/>'.give_get_emails_tags_list(),

 							'type'    => 'wysiwyg',

 							'default' => give_get_default_donation_receipt_email()

 						),

 						array(

-							'name' => __( 'New Donation Notification', 'give' ),

+							'name' => __('New Donation Notification', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_email_settings_3',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'donation_notification_subject',

-							'name'    => __( 'Donation Notification Subject', 'give' ),

-							'desc'    => __( 'Enter the subject line for the donation notification email.', 'give' ),

+							'name'    => __('Donation Notification Subject', 'give'),

+							'desc'    => __('Enter the subject line for the donation notification email.', 'give'),

 							'type'    => 'text',

-							'default' => __( 'New Donation - #{payment_id}', 'give' )

+							'default' => __('New Donation - #{payment_id}', 'give')

 						),

 						array(

 							'id'      => 'donation_notification',

-							'name'    => __( 'Donation Notification', 'give' ),

-							'desc'    => __( 'Enter the email that is sent to donation notification emails after completion of a donation. HTML is accepted. Available template tags:', 'give' ) . '<br/>' . give_get_emails_tags_list(),

+							'name'    => __('Donation Notification', 'give'),

+							'desc'    => __('Enter the email that is sent to donation notification emails after completion of a donation. HTML is accepted. Available template tags:', 'give').'<br/>'.give_get_emails_tags_list(),

 							'type'    => 'wysiwyg',

 							'default' => give_get_default_donation_notification_email()

 						),

 						array(

 							'id'      => 'admin_notice_emails',

-							'name'    => __( 'Donation Notification Emails', 'give' ),

-							'desc'    => sprintf( __( 'Enter the email address(es) that should receive a notification anytime a donation is made, please only enter %1$sone email address per line%2$s and not separated by commas.', 'give' ), '<span class="give-underline">', '</span>' ),

+							'name'    => __('Donation Notification Emails', 'give'),

+							'desc'    => sprintf(__('Enter the email address(es) that should receive a notification anytime a donation is made, please only enter %1$sone email address per line%2$s and not separated by commas.', 'give'), '<span class="give-underline">', '</span>'),

 							'type'    => 'textarea',

-							'default' => get_bloginfo( 'admin_email' )

+							'default' => get_bloginfo('admin_email')

 						),

 						array(

 							'id'   => 'disable_admin_notices',

-							'name' => __( 'Disable Admin Notifications', 'give' ),

-							'desc' => __( 'Check this box if you do not want to receive emails when new donations are made.', 'give' ),

+							'name' => __('Disable Admin Notifications', 'give'),

+							'desc' => __('Check this box if you do not want to receive emails when new donations are made.', 'give'),

 							'type' => 'checkbox'

 						)

 					)

@@ -642,96 +642,96 @@ 
 			/** Extension Settings */

 			'addons'      => array(

 				'id'         => 'addons',

-				'give_title' => __( 'Give Add-ons Settings', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_addons', array()

+				'give_title' => __('Give Add-ons Settings', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_addons', array()

 				)

 			),

 			/** Licenses Settings */

 			'licenses'    => array(

 				'id'         => 'licenses',

-				'give_title' => __( 'Give Licenses', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_licenses', array()

+				'give_title' => __('Give Licenses', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_licenses', array()

 				)

 			),

 			/** Advanced Options */

 			'advanced'    => array(

 				'id'         => 'advanced_options',

-				'give_title' => __( 'Advanced Options', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_advanced', array(

+				'give_title' => __('Advanced Options', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_advanced', array(

 						array(

-							'name' => __( 'Access Control', 'give' ),

+							'name' => __('Access Control', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_session_control_1',

 							'type' => 'give_title'

 						),

 						array(

 							'id'      => 'session_lifetime',

-							'name'    => __( 'Session Lifetime', 'give' ),

-							'desc'    => __( 'Give will start a new session per user once they have donated. This option controls the lifetime a user\'s session is kept alive. An active session allows users to view donation receipts on your site without having to be logged in as long as they are using the same browser they used when donating.', 'give' ),

+							'name'    => __('Session Lifetime', 'give'),

+							'desc'    => __('Give will start a new session per user once they have donated. This option controls the lifetime a user\'s session is kept alive. An active session allows users to view donation receipts on your site without having to be logged in as long as they are using the same browser they used when donating.', 'give'),

 							'type'    => 'select',

 							'options' => array(

-								'86400'  => __( '24 Hours', 'give' ),

-								'172800' => __( '48 Hours', 'give' ),

-								'259200' => __( '72 Hours', 'give' ),

-								'604800' => __( '1 Week', 'give' ),

+								'86400'  => __('24 Hours', 'give'),

+								'172800' => __('48 Hours', 'give'),

+								'259200' => __('72 Hours', 'give'),

+								'604800' => __('1 Week', 'give'),

 							)

 						),

 						array(

-							'name' => __( 'Email Access', 'give' ),

-							'desc' => __( 'Would you like your donors to be able to access their donation history using only email? Donors whose sessions have expired and do not have an account may still access their donation history via a temporary email access link.', 'give' ),

+							'name' => __('Email Access', 'give'),

+							'desc' => __('Would you like your donors to be able to access their donation history using only email? Donors whose sessions have expired and do not have an account may still access their donation history via a temporary email access link.', 'give'),

 							'id'   => 'email_access',

 							'type' => 'checkbox',

 						),

 						array(

 							'id'      => 'recaptcha_key',

-							'name'    => __( 'reCAPTCHA Site Key', 'give' ),

-							'desc'    => sprintf( __( 'If you would like to prevent spam on the email access form navigate to %1$sthe reCAPTCHA website%2$s and sign up for an API key. The reCAPTCHA uses Google\'s user-friendly single click verification method.', 'give' ), '<a href="https://www.google.com/recaptcha/" target="_blank">', '</a>' ),

+							'name'    => __('reCAPTCHA Site Key', 'give'),

+							'desc'    => sprintf(__('If you would like to prevent spam on the email access form navigate to %1$sthe reCAPTCHA website%2$s and sign up for an API key. The reCAPTCHA uses Google\'s user-friendly single click verification method.', 'give'), '<a href="https://www.google.com/recaptcha/" target="_blank">', '</a>'),

 							'default' => '',

 							'type'    => 'text'

 						),

 						array(

 							'id'      => 'recaptcha_secret',

-							'name'    => __( 'reCAPTCHA Secret Key', 'give' ),

-							'desc'    => __( 'Please paste the reCAPTCHA secret key here from your manage reCAPTCHA API Keys panel.', 'give' ),

+							'name'    => __('reCAPTCHA Secret Key', 'give'),

+							'desc'    => __('Please paste the reCAPTCHA secret key here from your manage reCAPTCHA API Keys panel.', 'give'),

 							'default' => '',

 							'type'    => 'text'

 						),

 						array(

-							'name' => __( 'Data Control', 'give' ),

+							'name' => __('Data Control', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_data_control_2',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Remove All Data on Uninstall?', 'give' ),

-							'desc' => __( 'Check this box if you would like Give to completely remove all of its data when the plugin is deleted.', 'give' ),

+							'name' => __('Remove All Data on Uninstall?', 'give'),

+							'desc' => __('Check this box if you would like Give to completely remove all of its data when the plugin is deleted.', 'give'),

 							'id'   => 'uninstall_on_delete',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Filter Control', 'give' ),

+							'name' => __('Filter Control', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_filter_control',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => sprintf( __( 'Disable %s filter', 'give' ), '<code>the_content</code>' ),

-							'desc' => sprintf( __( 'If you are seeing extra social buttons, related posts, or other unwanted elements appearing within your forms then you can disable WordPress\' content filter. <a href="%1$s" target="_blank">Learn more</a> about %2$s filter.', 'give' ), esc_url( 'https://codex.wordpress.org/Plugin_API/Filter_Reference/the_content' ), '<code>the_content</code>' ),

+							'name' => sprintf(__('Disable %s filter', 'give'), '<code>the_content</code>'),

+							'desc' => sprintf(__('If you are seeing extra social buttons, related posts, or other unwanted elements appearing within your forms then you can disable WordPress\' content filter. <a href="%1$s" target="_blank">Learn more</a> about %2$s filter.', 'give'), esc_url('https://codex.wordpress.org/Plugin_API/Filter_Reference/the_content'), '<code>the_content</code>'),

 							'id'   => 'disable_the_content_filter',

 							'type' => 'checkbox'

 						),

 						array(

-							'name' => __( 'Script Loading', 'give' ),

+							'name' => __('Script Loading', 'give'),

 							'desc' => '',

 							'id'   => 'give_title_script_control',

 							'type' => 'give_title'

 						),

 						array(

-							'name' => __( 'Load Scripts in Footer?', 'give' ),

-							'desc' => __( 'Check this box if you would like Give to load all frontend JavaScript files in the footer.', 'give' ),

+							'name' => __('Load Scripts in Footer?', 'give'),

+							'desc' => __('Check this box if you would like Give to load all frontend JavaScript files in the footer.', 'give'),

 							'id'   => 'scripts_footer',

 							'type' => 'checkbox'

 						)

@@ -741,13 +741,13 @@ 
 			/** API Settings */

 			'api'         => array(

 				'id'         => 'api',

-				'give_title' => __( 'API', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

+				'give_title' => __('API', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

 				'show_names' => false, // Hide field names on the left

-				'fields'     => apply_filters( 'give_settings_system', array(

+				'fields'     => apply_filters('give_settings_system', array(

 						array(

 							'id'   => 'api',

-							'name' => __( 'API', 'give' ),

+							'name' => __('API', 'give'),

 							'type' => 'api'

 						)

 					)

@@ -756,13 +756,13 @@ 
 			/** Licenses Settings */

 			'system_info' => array(

 				'id'         => 'system_info',

-				'give_title' => __( 'System Info', 'give' ),

-				'show_on'    => array( 'key' => 'options-page', 'value' => array( $this->key, ), ),

-				'fields'     => apply_filters( 'give_settings_system', array(

+				'give_title' => __('System Info', 'give'),

+				'show_on'    => array('key' => 'options-page', 'value' => array($this->key,),),

+				'fields'     => apply_filters('give_settings_system', array(

 						array(

 							'id'   => 'system_info',

-							'name' => __( 'System Info', 'give' ),

-							'desc' => __( 'Please copy and paste this information in your ticket when contacting support.', 'give' ),

+							'name' => __('System Info', 'give'),

+							'desc' => __('Please copy and paste this information in your ticket when contacting support.', 'give'),

 							'type' => 'system_info'

 						)

 					)

@@ -771,15 +771,15 @@ 
 		);

 

 		//Return all settings array if no active tab

-		if ( $active_tab === null || ! isset( $give_settings[ $active_tab ] ) ) {

+		if ($active_tab === null || ! isset($give_settings[$active_tab])) {

 

-			return apply_filters( 'give_registered_settings', $give_settings );

+			return apply_filters('give_registered_settings', $give_settings);

 			

 		}

 

 

 		// Add other tabs and settings fields as needed

-		return apply_filters( 'give_registered_settings', $give_settings[ $active_tab ] );

+		return apply_filters('give_registered_settings', $give_settings[$active_tab]);

 

 	}

 

@@ -788,11 +788,11 @@ 
 	 */

 	public function settings_notices() {

 

-		if ( ! isset( $_POST['give_settings_saved'] ) ) {

+		if ( ! isset($_POST['give_settings_saved'])) {

 			return;

 		}

 

-		add_settings_error( 'give-notices', 'global-settings-updated', __( 'Settings updated.', 'give' ), 'updated' );

+		add_settings_error('give-notices', 'global-settings-updated', __('Settings updated.', 'give'), 'updated');

 

 	}

 

@@ -806,17 +806,17 @@ 
 	 *

 	 * @return mixed          Field value or exception is thrown

 	 */

-	public function __get( $field ) {

+	public function __get($field) {

 

 		// Allowed fields to retrieve

-		if ( in_array( $field, array( 'key', 'fields', 'give_title', 'options_page' ), true ) ) {

+		if (in_array($field, array('key', 'fields', 'give_title', 'options_page'), true)) {

 			return $this->{$field};

 		}

-		if ( 'option_metabox' === $field ) {

+		if ('option_metabox' === $field) {

 			return $this->option_metabox();

 		}

 

-		throw new Exception( 'Invalid property: ' . $field );

+		throw new Exception('Invalid property: '.$field);

 	}

 

 

@@ -833,12 +833,12 @@ 
  *

  * @return mixed        Option value

  */

-function give_get_option( $key = '', $default = false ) {

+function give_get_option($key = '', $default = false) {

 	global $give_options;

-	$value = ! empty( $give_options[ $key ] ) ? $give_options[ $key ] : $default;

-	$value = apply_filters( 'give_get_option', $value, $key, $default );

+	$value = ! empty($give_options[$key]) ? $give_options[$key] : $default;

+	$value = apply_filters('give_get_option', $value, $key, $default);

 

-	return apply_filters( 'give_get_option_' . $key, $value, $key, $default );

+	return apply_filters('give_get_option_'.$key, $value, $key, $default);

 }

 

 

@@ -856,33 +856,33 @@ 
  *

  * @return boolean True if updated, false if not.

  */

-function give_update_option( $key = '', $value = false ) {

+function give_update_option($key = '', $value = false) {

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

-	if ( empty( $value ) ) {

-		$remove_option = give_delete_option( $key );

+	if (empty($value)) {

+		$remove_option = give_delete_option($key);

 

 		return $remove_option;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

 	// Let's let devs alter that value coming in

-	$value = apply_filters( 'give_update_option', $value, $key );

+	$value = apply_filters('give_update_option', $value, $key);

 

 	// Next let's try to update the value

-	$options[ $key ] = $value;

-	$did_update      = update_option( 'give_settings', $options );

+	$options[$key] = $value;

+	$did_update      = update_option('give_settings', $options);

 

 	// If it updated, let's update the global variable

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

-		$give_options[ $key ] = $value;

+		$give_options[$key] = $value;

 	}

 

 	return $did_update;

@@ -899,27 +899,27 @@ 
  *

  * @return boolean True if updated, false if not.

  */

-function give_delete_option( $key = '' ) {

+function give_delete_option($key = '') {

 

 	// If no key, exit

-	if ( empty( $key ) ) {

+	if (empty($key)) {

 		return false;

 	}

 

 	// First let's grab the current settings

-	$options = get_option( 'give_settings' );

+	$options = get_option('give_settings');

 

 	// Next let's try to update the value

-	if ( isset( $options[ $key ] ) ) {

+	if (isset($options[$key])) {

 

-		unset( $options[ $key ] );

+		unset($options[$key]);

 

 	}

 

-	$did_update = update_option( 'give_settings', $options );

+	$did_update = update_option('give_settings', $options);

 

 	// If it updated, let's update the global variable

-	if ( $did_update ) {

+	if ($did_update) {

 		global $give_options;

 		$give_options = $options;

 	}

@@ -938,9 +938,9 @@ 
  */

 function give_get_settings() {

 

-	$settings = get_option( 'give_settings' );

+	$settings = get_option('give_settings');

 

-	return (array) apply_filters( 'give_get_settings', $settings );

+	return (array) apply_filters('give_get_settings', $settings);

 

 }

 

@@ -958,25 +958,25 @@ 
  *

  * @return array

  */

-function give_settings_array_insert( $array, $position, $insert ) {

-	if ( is_int( $position ) ) {

-		array_splice( $array, $position, 0, $insert );

+function give_settings_array_insert($array, $position, $insert) {

+	if (is_int($position)) {

+		array_splice($array, $position, 0, $insert);

 	} else {

 

-		foreach ( $array as $index => $subarray ) {

-			if ( isset( $subarray['id'] ) && $subarray['id'] == $position ) {

+		foreach ($array as $index => $subarray) {

+			if (isset($subarray['id']) && $subarray['id'] == $position) {

 				$pos = $index;

 			}

 		}

 

-		if ( ! isset( $pos ) ) {

+		if ( ! isset($pos)) {

 			return $array;

 		}

 

 		$array = array_merge(

-			array_slice( $array, 0, $pos ),

+			array_slice($array, 0, $pos),

 			$insert,

-			array_slice( $array, $pos )

+			array_slice($array, $pos)

 		);

 	}

 

@@ -999,31 +999,31 @@ 
  *

  * @return void

  */

-function give_enabled_gateways_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_enabled_gateways_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$field_description = $field_type_object->field->args['desc'];

-	$gateways          = give_get_ordered_payment_gateways( give_get_payment_gateways() );

+	$gateways          = give_get_ordered_payment_gateways(give_get_payment_gateways());

 

 	echo '<ul class="cmb2-checkbox-list cmb2-list">';

 

-	foreach ( $gateways as $key => $option ) :

+	foreach ($gateways as $key => $option) :

 

-		if ( is_array( $escaped_value ) && array_key_exists( $key, $escaped_value ) ) {

+		if (is_array($escaped_value) && array_key_exists($key, $escaped_value)) {

 			$enabled = '1';

 		} else {

 			$enabled = null;

 		}

 

-		echo '<li><span class="give-drag-handle"><span class="dashicons dashicons-menu"></span></span><input name="' . $id . '[' . $key . ']" id="' . $id . '[' . $key . ']" type="checkbox" value="1" ' . checked( '1', $enabled, false ) . '/>&nbsp;';

-		echo '<label for="' . $id . '[' . $key . ']">' . $option['admin_label'] . '</label></li>';

+		echo '<li><span class="give-drag-handle"><span class="dashicons dashicons-menu"></span></span><input name="'.$id.'['.$key.']" id="'.$id.'['.$key.']" type="checkbox" value="1" '.checked('1', $enabled, false).'/>&nbsp;';

+		echo '<label for="'.$id.'['.$key.']">'.$option['admin_label'].'</label></li>';

 

 	endforeach;

 

 	echo '</ul>';

 

-	if ( $field_description ) {

-		echo '<p class="cmb2-metabox-description">' . $field_description . '</p>';

+	if ($field_description) {

+		echo '<p class="cmb2-metabox-description">'.$field_description.'</p>';

 	}

 

 }

@@ -1039,31 +1039,31 @@ 
  *

  * @return void

  */

-function give_default_gateway_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_default_gateway_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$field_description = $field_type_object->field->args['desc'];

 	$gateways          = give_get_enabled_payment_gateways();

 

-	echo '<select class="cmb2_select" name="' . $id . '" id="' . $id . '">';

+	echo '<select class="cmb2_select" name="'.$id.'" id="'.$id.'">';

 

 	//Add a field to the Give Form admin single post view of this field

-	if ( $field_type_object->field->object_type === 'post' ) {

-		echo '<option value="global">' . __( 'Global Default', 'give' ) . '</option>';

+	if ($field_type_object->field->object_type === 'post') {

+		echo '<option value="global">'.__('Global Default', 'give').'</option>';

 	}

 

-	foreach ( $gateways as $key => $option ) :

+	foreach ($gateways as $key => $option) :

 

-		$selected = isset( $escaped_value ) ? selected( $key, $escaped_value, false ) : '';

+		$selected = isset($escaped_value) ? selected($key, $escaped_value, false) : '';

 

 

-		echo '<option value="' . esc_attr( $key ) . '"' . $selected . '>' . esc_html( $option['admin_label'] ) . '</option>';

+		echo '<option value="'.esc_attr($key).'"'.$selected.'>'.esc_html($option['admin_label']).'</option>';

 

 	endforeach;

 

 	echo '</select>';

 

-	echo '<p class="cmb2-metabox-description">' . $field_description . '</p>';

+	echo '<p class="cmb2-metabox-description">'.$field_description.'</p>';

 

 }

 

@@ -1078,13 +1078,13 @@ 
  *

  * @return void

  */

-function give_title_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_title_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$title             = $field_type_object->field->args['name'];

 	$field_description = $field_type_object->field->args['desc'];

 

-	echo '<hr>' . $field_description;

+	echo '<hr>'.$field_description;

 

 }

 

@@ -1099,7 +1099,7 @@ 
  *

  * @return void

  */

-function give_description_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_description_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$title             = $field_type_object->field->args['name'];

@@ -1119,25 +1119,25 @@ 
  * @see: https://github.com/WebDevStudios/CMB2/wiki/Adding-your-own-field-types

  * @return array An array of options that matches the CMB2 options array

  */

-function give_cmb2_get_post_options( $query_args, $force = false ) {

+function give_cmb2_get_post_options($query_args, $force = false) {

 

-	$post_options = array( '' => '' ); // Blank option

+	$post_options = array('' => ''); // Blank option

 

-	if ( ( ! isset( $_GET['page'] ) || 'give-settings' != $_GET['page'] ) && ! $force ) {

+	if (( ! isset($_GET['page']) || 'give-settings' != $_GET['page']) && ! $force) {

 		return $post_options;

 	}

 

-	$args = wp_parse_args( $query_args, array(

+	$args = wp_parse_args($query_args, array(

 		'post_type'   => 'page',

 		'numberposts' => 10,

-	) );

+	));

 

-	$posts = get_posts( $args );

+	$posts = get_posts($args);

 

-	if ( $posts ) {

-		foreach ( $posts as $post ) {

+	if ($posts) {

+		foreach ($posts as $post) {

 

-			$post_options[ $post->ID ] = $post->post_title;

+			$post_options[$post->ID] = $post->post_title;

 

 		}

 	}

@@ -1157,17 +1157,17 @@ 
 	global $_wp_additional_image_sizes;

 	$sizes = array();

 

-	foreach ( get_intermediate_image_sizes() as $_size ) {

+	foreach (get_intermediate_image_sizes() as $_size) {

 

-		if ( in_array( $_size, array( 'thumbnail', 'medium', 'medium_large', 'large' ) ) ) {

-			$sizes[ $_size ] = $_size . ' - ' . get_option( "{$_size}_size_w" ) . 'x' . get_option( "{$_size}_size_h" );

-		} elseif ( isset( $_wp_additional_image_sizes[ $_size ] ) ) {

-			$sizes[ $_size ] = $_size . ' - ' . $_wp_additional_image_sizes[ $_size ]['width'] . 'x' . $_wp_additional_image_sizes[ $_size ]['height'];

+		if (in_array($_size, array('thumbnail', 'medium', 'medium_large', 'large'))) {

+			$sizes[$_size] = $_size.' - '.get_option("{$_size}_size_w").'x'.get_option("{$_size}_size_h");

+		} elseif (isset($_wp_additional_image_sizes[$_size])) {

+			$sizes[$_size] = $_size.' - '.$_wp_additional_image_sizes[$_size]['width'].'x'.$_wp_additional_image_sizes[$_size]['height'];

 		}

 

 	}

 

-	return apply_filters( 'give_get_featured_image_sizes', $sizes );

+	return apply_filters('give_get_featured_image_sizes', $sizes);

 }

 

 

@@ -1181,34 +1181,34 @@ 
  *

  * @return void

  */

-function give_license_key_callback( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_license_key_callback($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

 	$id                = $field_type_object->field->args['id'];

 	$field_description = $field_type_object->field->args['desc'];

-	$license_status    = get_option( $field_type_object->field->args['options']['is_valid_license_option'] );

+	$license_status    = get_option($field_type_object->field->args['options']['is_valid_license_option']);

 	$field_classes     = 'regular-text give-license-field';

-	$type              = empty( $escaped_value ) ? 'text' : 'password';

+	$type              = empty($escaped_value) ? 'text' : 'password';

 

-	if ( $license_status === 'valid' ) {

+	if ($license_status === 'valid') {

 		$field_classes .= ' give-license-active';

 	}

 

-	$html = $field_type_object->input( array(

+	$html = $field_type_object->input(array(

 		'class' => $field_classes,

 		'type'  => $type

-	) );

+	));

 

 	//License is active so show deactivate button

-	if ( $license_status === 'valid' ) {

-		$html .= '<input type="submit" class="button-secondary give-license-deactivate" name="' . $id . '_deactivate" value="' . __( 'Deactivate License', 'give' ) . '"/>';

+	if ($license_status === 'valid') {

+		$html .= '<input type="submit" class="button-secondary give-license-deactivate" name="'.$id.'_deactivate" value="'.__('Deactivate License', 'give').'"/>';

 	} else {

 		//This license is not valid so delete it

-		give_delete_option( $id );

+		give_delete_option($id);

 	}

 

-	$html .= '<label for="give_settings[' . $id . ']"> ' . $field_description . '</label>';

+	$html .= '<label for="give_settings['.$id.']"> '.$field_description.'</label>';

 

-	wp_nonce_field( $id . '-nonce', $id . '-nonce' );

+	wp_nonce_field($id.'-nonce', $id.'-nonce');

 

 	echo $html;

 }

@@ -1222,13 +1222,13 @@ 
  */

 function give_api_callback() {

 

-	if ( ! current_user_can( 'manage_give_settings' ) ) {

+	if ( ! current_user_can('manage_give_settings')) {

 		return;

 	}

 

-	do_action( 'give_tools_api_keys_before' );

+	do_action('give_tools_api_keys_before');

 

-	require_once GIVE_PLUGIN_DIR . 'includes/admin/class-api-keys-table.php';

+	require_once GIVE_PLUGIN_DIR.'includes/admin/class-api-keys-table.php';

 

 	$api_keys_table = new Give_API_Keys_Table();

 	$api_keys_table->prepare_items();

@@ -1236,17 +1236,17 @@ 
 	?>

 	<span class="cmb2-metabox-description api-description">

 		<?php echo sprintf(

-			__( 'You can create API keys for individual users within their profile edit screen. API keys allow users to use the <a href="%1$s" target="_blank">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%2$s" target="_blank">Zapier</a>.', 'give' ),

-			esc_url( 'https://givewp.com/documentation/give-api-reference/' ),

-			esc_url( 'https://givewp.com/addons/zapier/' )

+			__('You can create API keys for individual users within their profile edit screen. API keys allow users to use the <a href="%1$s" target="_blank">Give REST API</a> to retrieve donation data in JSON or XML for external applications or devices, such as <a href="%2$s" target="_blank">Zapier</a>.', 'give'),

+			esc_url('https://givewp.com/documentation/give-api-reference/'),

+			esc_url('https://givewp.com/addons/zapier/')

 		); ?>

 	</span>

 	<?php

 

-	do_action( 'give_tools_api_keys_after' );

+	do_action('give_tools_api_keys_after');

 }

 

-add_action( 'give_settings_tab_api_keys', 'give_api_callback' );

+add_action('give_settings_tab_api_keys', 'give_api_callback');

 

 /**

  * Hook Callback

@@ -1259,8 +1259,8 @@ 
  *

  * @return void

  */

-function give_hook_callback( $args ) {

-	do_action( 'give_' . $args['id'] );

+function give_hook_callback($args) {

+	do_action('give_'.$args['id']);

 }

 

 /**

@@ -1270,10 +1270,10 @@ 
  *

  */

 

-if ( file_exists( WP_PLUGIN_DIR . '/cmb2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once WP_PLUGIN_DIR . '/cmb2/init.php';

-} elseif ( file_exists( GIVE_PLUGIN_DIR . '/includes/libraries/cmb2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/cmb2/init.php';

-} elseif ( file_exists( GIVE_PLUGIN_DIR . '/includes/libraries/CMB2/init.php' ) && ! defined( 'CMB2_LOADED' ) ) {

-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/CMB2/init.php';

+if (file_exists(WP_PLUGIN_DIR.'/cmb2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once WP_PLUGIN_DIR.'/cmb2/init.php';

+} elseif (file_exists(GIVE_PLUGIN_DIR.'/includes/libraries/cmb2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/cmb2/init.php';

+} elseif (file_exists(GIVE_PLUGIN_DIR.'/includes/libraries/CMB2/init.php') && ! defined('CMB2_LOADED')) {

+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/CMB2/init.php';

 }
\ No newline at end of file

includes/admin/reporting/export/export-functions.php

Spacing +32 added lines, -32 removed lines

@@ -11,12 +11,12 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
-require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-export.php';
-require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/export-actions.php';
+require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/class-export.php';
+require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/export-actions.php';
 
 /**
  * Process batch exports via ajax
@@ -26,79 +26,79 @@ 
  */
 function give_do_ajax_export() {
 
-	require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export.php';
+	require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export.php';
 
-	parse_str( $_POST['form'], $form );
+	parse_str($_POST['form'], $form);
 
 	$_REQUEST = $form = (array) $form;
 
-	if ( ! wp_verify_nonce( $_REQUEST['give_ajax_export'], 'give_ajax_export' ) ) {
-		die( '-2' );
+	if ( ! wp_verify_nonce($_REQUEST['give_ajax_export'], 'give_ajax_export')) {
+		die('-2');
 	}
 
-	do_action( 'give_batch_export_class_include', $form['give-export-class'] );
+	do_action('give_batch_export_class_include', $form['give-export-class']);
 
-	$step   = absint( $_POST['step'] );
-	$class  = sanitize_text_field( $form['give-export-class'] );
+	$step   = absint($_POST['step']);
+	$class  = sanitize_text_field($form['give-export-class']);
 
-	$export = new $class( $step );
+	$export = new $class($step);
 
-	if ( ! $export->can_export() ) {
-		die( '-1' );
+	if ( ! $export->can_export()) {
+		die('-1');
 	}
 
-	if ( ! $export->is_writable ) {
+	if ( ! $export->is_writable) {
 		$json_args = array(
 			'error'   => true,
-			'message' => __( 'Export location or file not writable.', 'give' )
+			'message' => __('Export location or file not writable.', 'give')
 		);
 		echo json_encode($json_args);
 		exit;
 	}
 
-	$export->set_properties( $_REQUEST );
+	$export->set_properties($_REQUEST);
 
 	$export->pre_fetch();
 
-	$ret = $export->process_step( $step );
+	$ret = $export->process_step($step);
 
 	$percentage = $export->get_percentage_complete();
 
-	if ( $ret ) {
+	if ($ret) {
 
 		$step += 1;
-		echo json_encode( array( 'step' => $step, 'percentage' => $percentage ) );
+		echo json_encode(array('step' => $step, 'percentage' => $percentage));
 		exit;
 
-	} elseif ( true === $export->is_empty ) {
+	} elseif (true === $export->is_empty) {
 
-		echo json_encode( array(
+		echo json_encode(array(
 			'error'   => true,
-			'message' => __( 'No data found for export parameters.', 'give' )
-		) );
+			'message' => __('No data found for export parameters.', 'give')
+		));
 		exit;
 
-	} elseif ( true === $export->done && true === $export->is_void ) {
+	} elseif (true === $export->done && true === $export->is_void) {
 
-		$message = ! empty( $export->message ) ? $export->message : __( 'Batch Processing Complete', 'give' );
-		echo json_encode( array( 'success' => true, 'message' => $message ) );
+		$message = ! empty($export->message) ? $export->message : __('Batch Processing Complete', 'give');
+		echo json_encode(array('success' => true, 'message' => $message));
 		exit;
 
 	} else {
 		
-		$args = array_merge( $_REQUEST, array(
+		$args = array_merge($_REQUEST, array(
 			'step'        => $step,
 			'class'       => $class,
-			'nonce'       => wp_create_nonce( 'give-batch-export' ),
+			'nonce'       => wp_create_nonce('give-batch-export'),
 			'give_action' => 'form_batch_export',
-		) );
+		));
 
-		$download_url = add_query_arg( $args, admin_url() );
+		$download_url = add_query_arg($args, admin_url());
 
-		echo json_encode( array( 'step' => 'done', 'url' => $download_url ) );
+		echo json_encode(array('step' => 'done', 'url' => $download_url));
 		exit;
 
 	}
 }
 
-add_action( 'wp_ajax_give_do_ajax_export', 'give_do_ajax_export' );
+add_action('wp_ajax_give_do_ajax_export', 'give_do_ajax_export');

includes/admin/reporting/export/export-actions.php

Spacing +28 added lines, -28 removed lines

@@ -10,7 +10,7 @@ 
  * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
  */
 
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -22,20 +22,20 @@ 
  */
 function give_process_batch_export_form() {
 
-	if ( ! wp_verify_nonce( $_REQUEST['nonce'], 'give-batch-export' ) ) {
-		wp_die( __( 'Nonce verification failed.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($_REQUEST['nonce'], 'give-batch-export')) {
+		wp_die(__('Nonce verification failed.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export.php';
+	require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export.php';
 
-	do_action( 'give_batch_export_class_include', $_REQUEST['class'] );
+	do_action('give_batch_export_class_include', $_REQUEST['class']);
 
 	$export = new $_REQUEST['class'];
 	$export->export();
 
 }
 
-add_action( 'give_form_batch_export', 'give_process_batch_export_form' );
+add_action('give_form_batch_export', 'give_process_batch_export_form');
 
 /**
  * Exports earnings for a specified time period
@@ -46,14 +46,14 @@ 
  * @return void
  */
 function give_export_earnings() {
-	require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-export-earnings.php';
+	require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/class-export-earnings.php';
 
 	$earnings_export = new Give_Earnings_Export();
 
 	$earnings_export->export();
 }
 
-add_action( 'give_earnings_export', 'give_export_earnings' );
+add_action('give_earnings_export', 'give_export_earnings');
 
 
 /**
@@ -66,14 +66,14 @@ 
  * @return void
  */
 function give_export_all_customers() {
-	require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-export-customers.php';
+	require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/class-export-customers.php';
 
 	$customer_export = new Give_Donors_Export();
 
 	$customer_export->export();
 }
 
-add_action( 'give_email_export', 'give_export_all_customers' );
+add_action('give_email_export', 'give_export_all_customers');
 
 /**
  * Add a hook allowing extensions to register a hook on the batch export process
@@ -82,22 +82,22 @@ 
  * @return void
  */
 function give_register_batch_exporters() {
-	if ( is_admin() ) {
-		do_action( 'give_register_batch_exporter' );
+	if (is_admin()) {
+		do_action('give_register_batch_exporter');
 	}
 }
 
-add_action( 'plugins_loaded', 'give_register_batch_exporters' );
+add_action('plugins_loaded', 'give_register_batch_exporters');
 
 /**
  * Register the payments batch exporter
  * @since  1.5
  */
 function give_register_payments_batch_export() {
-	add_action( 'give_batch_export_class_include', 'give_include_payments_batch_processor', 10, 1 );
+	add_action('give_batch_export_class_include', 'give_include_payments_batch_processor', 10, 1);
 }
 
-add_action( 'give_register_batch_exporter', 'give_register_payments_batch_export', 10 );
+add_action('give_register_batch_exporter', 'give_register_payments_batch_export', 10);
 
 /**
  * Loads the payments batch process if needed
@@ -108,10 +108,10 @@ 
  *
  * @return void
  */
-function give_include_payments_batch_processor( $class ) {
+function give_include_payments_batch_processor($class) {
 
-	if ( 'Give_Batch_Payments_Export' === $class ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export-payments.php';
+	if ('Give_Batch_Payments_Export' === $class) {
+		require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export-payments.php';
 	}
 
 }
@@ -121,10 +121,10 @@ 
  * @since  1.5.2
  */
 function give_register_customers_batch_export() {
-	add_action( 'give_batch_export_class_include', 'give_include_customers_batch_processor', 10, 1 );
+	add_action('give_batch_export_class_include', 'give_include_customers_batch_processor', 10, 1);
 }
 
-add_action( 'give_register_batch_exporter', 'give_register_customers_batch_export', 10 );
+add_action('give_register_batch_exporter', 'give_register_customers_batch_export', 10);
 
 /**
  * Loads the customers batch process if needed
@@ -135,10 +135,10 @@ 
  *
  * @return void
  */
-function give_include_customers_batch_processor( $class ) {
+function give_include_customers_batch_processor($class) {
 
-	if ( 'Give_Batch_Customers_Export' === $class ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export-customers.php';
+	if ('Give_Batch_Customers_Export' === $class) {
+		require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export-customers.php';
 	}
 
 }
@@ -149,10 +149,10 @@ 
  * @since  1.5
  */
 function give_register_forms_batch_export() {
-	add_action( 'give_batch_export_class_include', 'give_include_forms_batch_processor', 10, 1 );
+	add_action('give_batch_export_class_include', 'give_include_forms_batch_processor', 10, 1);
 }
 
-add_action( 'give_register_batch_exporter', 'give_register_forms_batch_export', 10 );
+add_action('give_register_batch_exporter', 'give_register_forms_batch_export', 10);
 
 /**
  * Loads the file downloads batch process if needed
@@ -163,10 +163,10 @@ 
  *
  * @return void
  */
-function give_include_forms_batch_processor( $class ) {
+function give_include_forms_batch_processor($class) {
 
-	if ( 'Give_Batch_Forms_Export' === $class ) {
-		require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/export/class-batch-export-forms.php';
+	if ('Give_Batch_Forms_Export' === $class) {
+		require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/export/class-batch-export-forms.php';
 	}
 
 }
\ No newline at end of file

includes/admin/reporting/pdf-reports.php

Spacing +144 added lines, -144 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,75 +25,75 @@ 
  *
  * @uses   give_pdf
  */
-function give_generate_pdf( $data ) {
+function give_generate_pdf($data) {
 
-	if ( ! current_user_can( 'view_give_reports' ) ) {
-		wp_die( __( 'You do not have permission to generate PDF sales reports.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('view_give_reports')) {
+		wp_die(__('You do not have permission to generate PDF sales reports.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	if ( ! wp_verify_nonce( $_GET['_wpnonce'], 'give_generate_pdf' ) ) {
-		wp_die( __( 'Nonce verification failed.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($_GET['_wpnonce'], 'give_generate_pdf')) {
+		wp_die(__('Nonce verification failed.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/fpdf/fpdf.php';
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/fpdf/give_pdf.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/fpdf/fpdf.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/fpdf/give_pdf.php';
 
-	$daterange = date_i18n( get_option( 'date_format' ), mktime( 0, 0, 0, 1, 1, date( 'Y' ) ) ) . ' ' . utf8_decode( __( 'to', 'give' ) ) . ' ' . date_i18n( get_option( 'date_format' ) );
+	$daterange = date_i18n(get_option('date_format'), mktime(0, 0, 0, 1, 1, date('Y'))).' '.utf8_decode(__('to', 'give')).' '.date_i18n(get_option('date_format'));
 
 	$pdf = new give_pdf();
-	$pdf->AddPage( 'L', 'A4' );
+	$pdf->AddPage('L', 'A4');
 
-	$pdf->SetTitle( utf8_decode( __( 'Donation report for the current year for all forms', 'give' ) ) );
-	$pdf->SetAuthor( utf8_decode( __( 'Give - Democratizing Generosity', 'give' ) ) );
-	$pdf->SetCreator( utf8_decode( __( 'Give - Democratizing Generosity', 'give' ) ) );
+	$pdf->SetTitle(utf8_decode(__('Donation report for the current year for all forms', 'give')));
+	$pdf->SetAuthor(utf8_decode(__('Give - Democratizing Generosity', 'give')));
+	$pdf->SetCreator(utf8_decode(__('Give - Democratizing Generosity', 'give')));
 
-	$pdf->Image( GIVE_PLUGIN_URL . 'assets/images/give-logo-small.png', 247, 8 );
+	$pdf->Image(GIVE_PLUGIN_URL.'assets/images/give-logo-small.png', 247, 8);
 
-	$pdf->SetMargins( 8, 8, 8 );
-	$pdf->SetX( 8 );
+	$pdf->SetMargins(8, 8, 8);
+	$pdf->SetX(8);
 
-	$pdf->SetFont( 'Helvetica', '', 16 );
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->Cell( 0, 3, utf8_decode( __( 'Donation report for the current year for all forms', 'give' ) ), 0, 2, 'L', false );
+	$pdf->SetFont('Helvetica', '', 16);
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->Cell(0, 3, utf8_decode(__('Donation report for the current year for all forms', 'give')), 0, 2, 'L', false);
 
-	$pdf->SetFont( 'Helvetica', '', 13 );
+	$pdf->SetFont('Helvetica', '', 13);
 	$pdf->Ln();
-	$pdf->SetTextColor( 150, 150, 150 );
-	$pdf->Cell( 0, 6, utf8_decode( __( 'Date Range: ', 'give' ) ) . $daterange, 0, 2, 'L', false );
+	$pdf->SetTextColor(150, 150, 150);
+	$pdf->Cell(0, 6, utf8_decode(__('Date Range: ', 'give')).$daterange, 0, 2, 'L', false);
 	$pdf->Ln();
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->SetFont( 'Helvetica', '', 14 );
-	$pdf->Cell( 0, 10, utf8_decode( __( 'Table View', 'give' ) ), 0, 2, 'L', false );
-	$pdf->SetFont( 'Helvetica', '', 12 );
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->SetFont('Helvetica', '', 14);
+	$pdf->Cell(0, 10, utf8_decode(__('Table View', 'give')), 0, 2, 'L', false);
+	$pdf->SetFont('Helvetica', '', 12);
 
-	$pdf->SetFillColor( 238, 238, 238 );
-	$pdf->Cell( 70, 6, utf8_decode( __( 'Form Name', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 30, 6, utf8_decode( __( 'Price', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 50, 6, utf8_decode( __( 'Categories', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 50, 6, utf8_decode( __( 'Tags', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 45, 6, utf8_decode( __( 'Number of Donations', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 35, 6, utf8_decode( __( 'Income to Date', 'give' ) ), 1, 1, 'L', true );
+	$pdf->SetFillColor(238, 238, 238);
+	$pdf->Cell(70, 6, utf8_decode(__('Form Name', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(30, 6, utf8_decode(__('Price', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(50, 6, utf8_decode(__('Categories', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(50, 6, utf8_decode(__('Tags', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(45, 6, utf8_decode(__('Number of Donations', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(35, 6, utf8_decode(__('Income to Date', 'give')), 1, 1, 'L', true);
 
-	$year       = date( 'Y' );
-	$give_forms = get_posts( array( 'post_type' => 'give_forms', 'year' => $year, 'posts_per_page' => - 1 ) );
+	$year       = date('Y');
+	$give_forms = get_posts(array('post_type' => 'give_forms', 'year' => $year, 'posts_per_page' => -1));
 
-	if ( $give_forms ):
-		$pdf->SetWidths( array( 70, 30, 50, 50, 45, 35 ) );
+	if ($give_forms):
+		$pdf->SetWidths(array(70, 30, 50, 50, 45, 35));
 
-		foreach ( $give_forms as $form ):
-			$pdf->SetFillColor( 255, 255, 255 );
+		foreach ($give_forms as $form):
+			$pdf->SetFillColor(255, 255, 255);
 
 			$title = $form->post_title;
 
-			if ( give_has_variable_prices( $form->ID ) ) {
+			if (give_has_variable_prices($form->ID)) {
 
-				$prices = give_get_variable_prices( $form->ID );
+				$prices = give_get_variable_prices($form->ID);
 
 				$first = $prices[0]['_give_amount'];
-				$last  = array_pop( $prices );
+				$last  = array_pop($prices);
 				$last  = $last['_give_amount'];
 
-				if ( $first < $last ) {
+				if ($first < $last) {
 					$min = $first;
 					$max = $last;
 				} else {
@@ -101,51 +101,51 @@ 
 					$max = $first;
 				}
 
-				$price = html_entity_decode( give_currency_filter( give_format_amount( $min ) ) . ' - ' . give_currency_filter( give_format_amount( $max ) ) );
+				$price = html_entity_decode(give_currency_filter(give_format_amount($min)).' - '.give_currency_filter(give_format_amount($max)));
 			} else {
-				$price = html_entity_decode( give_currency_filter( give_get_form_price( $form->ID ) ) );
+				$price = html_entity_decode(give_currency_filter(give_get_form_price($form->ID)));
 			}
 
-			$categories = get_the_term_list( $form->ID, 'give_forms_category', '', ', ', '' );
-			$categories = ! is_wp_error( $categories ) ? strip_tags( $categories ) : '';
+			$categories = get_the_term_list($form->ID, 'give_forms_category', '', ', ', '');
+			$categories = ! is_wp_error($categories) ? strip_tags($categories) : '';
 
-			$tags = get_the_term_list( $form->ID, 'give_forms_tag', '', ', ', '' );
-			$tags = ! is_wp_error( $tags ) ? strip_tags( $tags ) : '';
+			$tags = get_the_term_list($form->ID, 'give_forms_tag', '', ', ', '');
+			$tags = ! is_wp_error($tags) ? strip_tags($tags) : '';
 
-			$sales    = give_get_form_sales_stats( $form->ID );
-			$link     = get_permalink( $form->ID );
-			$earnings = html_entity_decode( give_currency_filter( give_get_form_earnings_stats( $form->ID ) ) );
+			$sales    = give_get_form_sales_stats($form->ID);
+			$link     = get_permalink($form->ID);
+			$earnings = html_entity_decode(give_currency_filter(give_get_form_earnings_stats($form->ID)));
 
-			if ( function_exists( 'iconv' ) ) {
+			if (function_exists('iconv')) {
 				// Ensure characters like euro; are properly converted.
-				$price    = iconv( 'UTF-8', 'windows-1252', utf8_encode( $price ) );
-				$earnings = iconv( 'UTF-8', 'windows-1252', utf8_encode( $earnings ) );
+				$price    = iconv('UTF-8', 'windows-1252', utf8_encode($price));
+				$earnings = iconv('UTF-8', 'windows-1252', utf8_encode($earnings));
 			}
 
-			$pdf->Row( array( $title, $price, $categories, $tags, $sales, $earnings ) );
+			$pdf->Row(array($title, $price, $categories, $tags, $sales, $earnings));
 		endforeach;
 	else:
-		$pdf->SetWidths( array( 280 ) );
-		$title = utf8_decode( sprintf( __( 'No %s found.', 'give' ), give_get_forms_label_plural() ) );
-		$pdf->Row( array( $title ) );
+		$pdf->SetWidths(array(280));
+		$title = utf8_decode(sprintf(__('No %s found.', 'give'), give_get_forms_label_plural()));
+		$pdf->Row(array($title));
 	endif;
 
 	$pdf->Ln();
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->SetFont( 'Helvetica', '', 14 );
-	$pdf->Cell( 0, 10, utf8_decode( __( 'Graph View', 'give' ) ), 0, 2, 'L', false );
-	$pdf->SetFont( 'Helvetica', '', 12 );
-
-	$image = html_entity_decode( urldecode( give_draw_chart_image() ) );
-	$image = str_replace( ' ', '%20', $image );
-
-	$pdf->SetX( 25 );
-	$pdf->Image( $image . '&file=.png' );
-	$pdf->Ln( 7 );
-	$pdf->Output( apply_filters( 'give_sales_earnings_pdf_export_filename', 'give-report-' . date_i18n( 'Y-m-d' ) ) . '.pdf', 'D' );
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->SetFont('Helvetica', '', 14);
+	$pdf->Cell(0, 10, utf8_decode(__('Graph View', 'give')), 0, 2, 'L', false);
+	$pdf->SetFont('Helvetica', '', 12);
+
+	$image = html_entity_decode(urldecode(give_draw_chart_image()));
+	$image = str_replace(' ', '%20', $image);
+
+	$pdf->SetX(25);
+	$pdf->Image($image.'&file=.png');
+	$pdf->Ln(7);
+	$pdf->Output(apply_filters('give_sales_earnings_pdf_export_filename', 'give-report-'.date_i18n('Y-m-d')).'.pdf', 'D');
 }
 
-add_action( 'give_generate_pdf', 'give_generate_pdf' );
+add_action('give_generate_pdf', 'give_generate_pdf');
 
 /**
  * Draws Chart for PDF Report
@@ -162,38 +162,38 @@ 
  * @return string $chart->getUrl() URL for the Google Chart
  */
 function give_draw_chart_image() {
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/googlechartlib/GoogleChart.php';
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/googlechartlib/markers/GoogleChartShapeMarker.php';
-	require_once GIVE_PLUGIN_DIR . '/includes/libraries/googlechartlib/markers/GoogleChartTextMarker.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/googlechartlib/GoogleChart.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/googlechartlib/markers/GoogleChartShapeMarker.php';
+	require_once GIVE_PLUGIN_DIR.'/includes/libraries/googlechartlib/markers/GoogleChartTextMarker.php';
 
-	$chart = new GoogleChart( 'lc', 900, 330 );
+	$chart = new GoogleChart('lc', 900, 330);
 
 	$i        = 1;
 	$earnings = "";
 	$sales    = "";
 
-	while ( $i <= 12 ) :
-		$earnings .= give_get_earnings_by_date( null, $i, date( 'Y' ) ) . ",";
-		$sales .= give_get_sales_by_date( null, $i, date( 'Y' ) ) . ",";
-		$i ++;
+	while ($i <= 12) :
+		$earnings .= give_get_earnings_by_date(null, $i, date('Y')).",";
+		$sales .= give_get_sales_by_date(null, $i, date('Y')).",";
+		$i++;
 	endwhile;
 
-	$earnings_array = explode( ",", $earnings );
-	$sales_array    = explode( ",", $sales );
+	$earnings_array = explode(",", $earnings);
+	$sales_array    = explode(",", $sales);
 
 	$i = 0;
-	while ( $i <= 11 ) {
-		if ( empty( $sales_array[ $i ] ) ) {
-			$sales_array[ $i ] = 0;
+	while ($i <= 11) {
+		if (empty($sales_array[$i])) {
+			$sales_array[$i] = 0;
 		}
-		$i ++;
+		$i++;
 	}
 
 	$min_earnings   = 0;
-	$max_earnings   = max( $earnings_array );
-	$earnings_scale = round( $max_earnings, - 1 );
+	$max_earnings   = max($earnings_array);
+	$earnings_scale = round($max_earnings, - 1);
 
-	$data = new GoogleChartData( array(
+	$data = new GoogleChartData(array(
 		$earnings_array[0],
 		$earnings_array[1],
 		$earnings_array[2],
@@ -206,25 +206,25 @@ 
 		$earnings_array[9],
 		$earnings_array[10],
 		$earnings_array[11]
-	) );
+	));
 
-	$data->setLegend( __( 'Income', 'give' ) );
-	$data->setColor( '1b58a3' );
-	$chart->addData( $data );
+	$data->setLegend(__('Income', 'give'));
+	$data->setColor('1b58a3');
+	$chart->addData($data);
 
-	$shape_marker = new GoogleChartShapeMarker( GoogleChartShapeMarker::CIRCLE );
-	$shape_marker->setColor( '000000' );
-	$shape_marker->setSize( 7 );
-	$shape_marker->setBorder( 2 );
-	$shape_marker->setData( $data );
-	$chart->addMarker( $shape_marker );
+	$shape_marker = new GoogleChartShapeMarker(GoogleChartShapeMarker::CIRCLE);
+	$shape_marker->setColor('000000');
+	$shape_marker->setSize(7);
+	$shape_marker->setBorder(2);
+	$shape_marker->setData($data);
+	$chart->addMarker($shape_marker);
 
-	$value_marker = new GoogleChartTextMarker( GoogleChartTextMarker::VALUE );
-	$value_marker->setColor( '000000' );
-	$value_marker->setData( $data );
-	$chart->addMarker( $value_marker );
+	$value_marker = new GoogleChartTextMarker(GoogleChartTextMarker::VALUE);
+	$value_marker->setColor('000000');
+	$value_marker->setData($data);
+	$chart->addMarker($value_marker);
 
-	$data = new GoogleChartData( array(
+	$data = new GoogleChartData(array(
 		$sales_array[0],
 		$sales_array[1],
 		$sales_array[2],
@@ -237,46 +237,46 @@ 
 		$sales_array[9],
 		$sales_array[10],
 		$sales_array[11]
-	) );
-	$data->setLegend( __( 'Donations', 'give' ) );
-	$data->setColor( 'ff6c1c' );
-	$chart->addData( $data );
-
-	$chart->setTitle( __( 'Donations by Month for all Give Forms', 'give' ), '336699', 18 );
-
-	$chart->setScale( 0, $max_earnings );
-
-	$y_axis = new GoogleChartAxis( 'y' );
-	$y_axis->setDrawTickMarks( true )->setLabels( array( 0, $max_earnings ) );
-	$chart->addAxis( $y_axis );
-
-	$x_axis = new GoogleChartAxis( 'x' );
-	$x_axis->setTickMarks( 5 );
-	$x_axis->setLabels( array(
-		__( 'Jan', 'give' ),
-		__( 'Feb', 'give' ),
-		__( 'Mar', 'give' ),
-		__( 'Apr', 'give' ),
-		__( 'May', 'give' ),
-		__( 'June', 'give' ),
-		__( 'July', 'give' ),
-		__( 'Aug', 'give' ),
-		__( 'Sept', 'give' ),
-		__( 'Oct', 'give' ),
-		__( 'Nov', 'give' ),
-		__( 'Dec', 'give' )
-	) );
-	$chart->addAxis( $x_axis );
-
-	$shape_marker = new GoogleChartShapeMarker( GoogleChartShapeMarker::CIRCLE );
-	$shape_marker->setSize( 6 );
-	$shape_marker->setBorder( 2 );
-	$shape_marker->setData( $data );
-	$chart->addMarker( $shape_marker );
-
-	$value_marker = new GoogleChartTextMarker( GoogleChartTextMarker::VALUE );
-	$value_marker->setData( $data );
-	$chart->addMarker( $value_marker );
+	));
+	$data->setLegend(__('Donations', 'give'));
+	$data->setColor('ff6c1c');
+	$chart->addData($data);
+
+	$chart->setTitle(__('Donations by Month for all Give Forms', 'give'), '336699', 18);
+
+	$chart->setScale(0, $max_earnings);
+
+	$y_axis = new GoogleChartAxis('y');
+	$y_axis->setDrawTickMarks(true)->setLabels(array(0, $max_earnings));
+	$chart->addAxis($y_axis);
+
+	$x_axis = new GoogleChartAxis('x');
+	$x_axis->setTickMarks(5);
+	$x_axis->setLabels(array(
+		__('Jan', 'give'),
+		__('Feb', 'give'),
+		__('Mar', 'give'),
+		__('Apr', 'give'),
+		__('May', 'give'),
+		__('June', 'give'),
+		__('July', 'give'),
+		__('Aug', 'give'),
+		__('Sept', 'give'),
+		__('Oct', 'give'),
+		__('Nov', 'give'),
+		__('Dec', 'give')
+	));
+	$chart->addAxis($x_axis);
+
+	$shape_marker = new GoogleChartShapeMarker(GoogleChartShapeMarker::CIRCLE);
+	$shape_marker->setSize(6);
+	$shape_marker->setBorder(2);
+	$shape_marker->setData($data);
+	$chart->addMarker($shape_marker);
+
+	$value_marker = new GoogleChartTextMarker(GoogleChartTextMarker::VALUE);
+	$value_marker->setData($data);
+	$chart->addMarker($value_marker);
 
 	return $chart->getUrl();
 }

includes/emails/class-give-email-tags.php

Spacing +93 added lines, -93 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -54,9 +54,9 @@ 
 	 * @param string $tag Email tag to be replace in email
 	 * @param callable $func Hook to run when email tag is found
 	 */
-	public function add( $tag, $description, $func ) {
-		if ( is_callable( $func ) ) {
-			$this->tags[ $tag ] = array(
+	public function add($tag, $description, $func) {
+		if (is_callable($func)) {
+			$this->tags[$tag] = array(
 				'tag'         => $tag,
 				'description' => $description,
 				'func'        => $func
@@ -71,8 +71,8 @@ 
 	 *
 	 * @param string $tag Email tag to remove hook from
 	 */
-	public function remove( $tag ) {
-		unset( $this->tags[ $tag ] );
+	public function remove($tag) {
+		unset($this->tags[$tag]);
 	}
 
 	/**
@@ -84,8 +84,8 @@ 
 	 *
 	 * @return bool
 	 */
-	public function email_tag_exists( $tag ) {
-		return array_key_exists( $tag, $this->tags );
+	public function email_tag_exists($tag) {
+		return array_key_exists($tag, $this->tags);
 	}
 
 	/**
@@ -109,16 +109,16 @@ 
 	 *
 	 * @return string Content with email tags filtered out.
 	 */
-	public function do_tags( $content, $payment_id ) {
+	public function do_tags($content, $payment_id) {
 
 		// Check if there is atleast one tag added
-		if ( empty( $this->tags ) || ! is_array( $this->tags ) ) {
+		if (empty($this->tags) || ! is_array($this->tags)) {
 			return $content;
 		}
 
 		$this->payment_id = $payment_id;
 
-		$new_content = preg_replace_callback( "/{([A-z0-9\-\_]+)}/s", array( $this, 'do_tag' ), $content );
+		$new_content = preg_replace_callback("/{([A-z0-9\-\_]+)}/s", array($this, 'do_tag'), $content);
 
 		$this->payment_id = null;
 
@@ -134,17 +134,17 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function do_tag( $m ) {
+	public function do_tag($m) {
 
 		// Get tag
 		$tag = $m[1];
 
 		// Return tag if tag not set
-		if ( ! $this->email_tag_exists( $tag ) ) {
+		if ( ! $this->email_tag_exists($tag)) {
 			return $m[0];
 		}
 
-		return call_user_func( $this->tags[ $tag ]['func'], $this->payment_id, $tag );
+		return call_user_func($this->tags[$tag]['func'], $this->payment_id, $tag);
 	}
 
 }
@@ -158,8 +158,8 @@ 
  * @param string $description Description of the email tag added
  * @param callable $func Hook to run when email tag is found
  */
-function give_add_email_tag( $tag, $description, $func ) {
-	Give()->email_tags->add( $tag, $description, $func );
+function give_add_email_tag($tag, $description, $func) {
+	Give()->email_tags->add($tag, $description, $func);
 }
 
 /**
@@ -169,8 +169,8 @@ 
  *
  * @param string $tag Email tag to remove hook from
  */
-function give_remove_email_tag( $tag ) {
-	Give()->email_tags->remove( $tag );
+function give_remove_email_tag($tag) {
+	Give()->email_tags->remove($tag);
 }
 
 /**
@@ -182,8 +182,8 @@ 
  *
  * @return bool
  */
-function give_email_tag_exists( $tag ) {
-	return Give()->email_tags->email_tag_exists( $tag );
+function give_email_tag_exists($tag) {
+	return Give()->email_tags->email_tag_exists($tag);
 }
 
 /**
@@ -212,13 +212,13 @@ 
 	$email_tags = give_get_email_tags();
 
 	// Check
-	if ( count( $email_tags ) > 0 ) {
+	if (count($email_tags) > 0) {
 
 		// Loop
-		foreach ( $email_tags as $email_tag ) {
+		foreach ($email_tags as $email_tag) {
 
 			// Add email tag to list
-			$list .= '<code>{' . $email_tag['tag'] . '}</code> - ' . $email_tag['description'] . '<br/>';
+			$list .= '<code>{'.$email_tag['tag'].'}</code> - '.$email_tag['description'].'<br/>';
 
 		}
 
@@ -238,13 +238,13 @@ 
  *
  * @return string Content with email tags filtered out.
  */
-function give_do_email_tags( $content, $payment_id ) {
+function give_do_email_tags($content, $payment_id) {
 
 	// Replace all tags
-	$content = Give()->email_tags->do_tags( $content, $payment_id );
+	$content = Give()->email_tags->do_tags($content, $payment_id);
 
 	// Maintaining backwards compatibility
-	$content = apply_filters( 'give_email_template_tags', $content, give_get_payment_meta( $payment_id ), $payment_id );
+	$content = apply_filters('give_email_template_tags', $content, give_get_payment_meta($payment_id), $payment_id);
 
 	// Return content
 	return $content;
@@ -256,10 +256,10 @@ 
  * @since 1.0
  */
 function give_load_email_tags() {
-	do_action( 'give_add_email_tags' );
+	do_action('give_add_email_tags');
 }
 
-add_action( 'init', 'give_load_email_tags', - 999 );
+add_action('init', 'give_load_email_tags', - 999);
 
 /**
  * Add default Give email template tags
@@ -272,82 +272,82 @@ 
 	$email_tags = array(
 		array(
 			'tag'         => 'donation',
-			'description' => __( 'The name of completed donation form and the donation level chosen if applicable.', 'give' ),
+			'description' => __('The name of completed donation form and the donation level chosen if applicable.', 'give'),
 			'function'    => 'give_email_tag_donation'
 		),
 		array(
 			'tag'         => 'name',
-			'description' => __( 'The donor\'s first name.', 'give' ),
+			'description' => __('The donor\'s first name.', 'give'),
 			'function'    => 'give_email_tag_first_name'
 		),
 		array(
 			'tag'         => 'fullname',
-			'description' => __( 'The donor\'s full name, first and last.', 'give' ),
+			'description' => __('The donor\'s full name, first and last.', 'give'),
 			'function'    => 'give_email_tag_fullname'
 		),
 		array(
 			'tag'         => 'username',
-			'description' => __( 'The donor\'s user name on the site, if they registered an account.', 'give' ),
+			'description' => __('The donor\'s user name on the site, if they registered an account.', 'give'),
 			'function'    => 'give_email_tag_username'
 		),
 		array(
 			'tag'         => 'user_email',
-			'description' => __( 'The donor\'s email address.', 'give' ),
+			'description' => __('The donor\'s email address.', 'give'),
 			'function'    => 'give_email_tag_user_email'
 		),
 		array(
 			'tag'         => 'billing_address',
-			'description' => __( 'The donor\'s billing address.', 'give' ),
+			'description' => __('The donor\'s billing address.', 'give'),
 			'function'    => 'give_email_tag_billing_address'
 		),
 		array(
 			'tag'         => 'date',
-			'description' => __( 'The date of the donation.', 'give' ),
+			'description' => __('The date of the donation.', 'give'),
 			'function'    => 'give_email_tag_date'
 		),
 		array(
 			'tag'         => 'price',
-			'description' => __( 'The total price of the donation.', 'give' ),
+			'description' => __('The total price of the donation.', 'give'),
 			'function'    => 'give_email_tag_price'
 		),
 		array(
 			'tag'         => 'payment_id',
-			'description' => __( 'The unique ID number for this donation.', 'give' ),
+			'description' => __('The unique ID number for this donation.', 'give'),
 			'function'    => 'give_email_tag_payment_id'
 		),
 		array(
 			'tag'         => 'receipt_id',
-			'description' => __( 'The unique ID number for this donation receipt.', 'give' ),
+			'description' => __('The unique ID number for this donation receipt.', 'give'),
 			'function'    => 'give_email_tag_receipt_id'
 		),
 		array(
 			'tag'         => 'payment_method',
-			'description' => __( 'The method of payment used for this donation.', 'give' ),
+			'description' => __('The method of payment used for this donation.', 'give'),
 			'function'    => 'give_email_tag_payment_method'
 		),
 		array(
 			'tag'         => 'sitename',
-			'description' => __( 'Your site name', 'give' ),
+			'description' => __('Your site name', 'give'),
 			'function'    => 'give_email_tag_sitename'
 		),
 		array(
 			'tag'         => 'receipt_link',
-			'description' => __( 'Adds a link so users can view their receipt directly on your website if they are unable to view it in the browser correctly.', 'give' ),
+			'description' => __('Adds a link so users can view their receipt directly on your website if they are unable to view it in the browser correctly.', 'give'),
 			'function'    => 'give_email_tag_receipt_link'
 		),
 	);
 
 	// Apply give_email_tags filter
-	$email_tags = apply_filters( 'give_email_tags', $email_tags );
+	$email_tags = apply_filters('give_email_tags', $email_tags);
 
 	// Add email tags
-	foreach ( $email_tags as $email_tag ) {
-		give_add_email_tag( $email_tag['tag'], $email_tag['description'], $email_tag['function'] );
+	foreach ($email_tags as $email_tag) {
+		give_add_email_tag($email_tag['tag'], $email_tag['description'], $email_tag['function']);
 	}
 
 }
 
-add_action( 'give_add_email_tags', 'give_setup_email_tags' );
+add_action('give_add_email_tags', 'give_setup_email_tags');
 
 
 /**
@@ -358,15 +358,15 @@ 
  *
  * @return string name
  */
-function give_email_tag_first_name( $payment_id ) {
-	$payment   = new Give_Payment( $payment_id );
+function give_email_tag_first_name($payment_id) {
+	$payment   = new Give_Payment($payment_id);
 	$user_info = $payment->user_info;
 
-	if ( empty( $user_info ) ) {
+	if (empty($user_info)) {
 		return '';
 	}
 
-	$email_name = give_get_email_names( $user_info );
+	$email_name = give_get_email_names($user_info);
 
 	return $email_name['name'];
 }
@@ -379,15 +379,15 @@ 
  *
  * @return string fullname
  */
-function give_email_tag_fullname( $payment_id ) {
-	$payment   = new Give_Payment( $payment_id );
+function give_email_tag_fullname($payment_id) {
+	$payment   = new Give_Payment($payment_id);
 	$user_info = $payment->user_info;
 
-	if ( empty( $user_info ) ) {
+	if (empty($user_info)) {
 		return '';
 	}
 
-	$email_name = give_get_email_names( $user_info );
+	$email_name = give_get_email_names($user_info);
 
 	return $email_name['fullname'];
 }
@@ -400,15 +400,15 @@ 
  *
  * @return string username
  */
-function give_email_tag_username( $payment_id ) {
-	$payment   = new Give_Payment( $payment_id );
+function give_email_tag_username($payment_id) {
+	$payment   = new Give_Payment($payment_id);
 	$user_info = $payment->user_info;
 
-	if ( empty( $user_info ) ) {
+	if (empty($user_info)) {
 		return '';
 	}
 
-	$email_name = give_get_email_names( $user_info );
+	$email_name = give_get_email_names($user_info);
 
 	return $email_name['username'];
 }
@@ -421,8 +421,8 @@ 
  *
  * @return string user_email
  */
-function give_email_tag_user_email( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_user_email($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->email;
 }
@@ -435,10 +435,10 @@ 
  *
  * @return string billing_address
  */
-function give_email_tag_billing_address( $payment_id ) {
+function give_email_tag_billing_address($payment_id) {
 
-	$user_info    = give_get_payment_meta_user_info( $payment_id );
-	$user_address = ! empty( $user_info['address'] ) ? $user_info['address'] : array(
+	$user_info    = give_get_payment_meta_user_info($payment_id);
+	$user_address = ! empty($user_info['address']) ? $user_info['address'] : array(
 		'line1'   => '',
 		'line2'   => '',
 		'city'    => '',
@@ -447,11 +447,11 @@ 
 		'zip'     => ''
 	);
 
-	$return = $user_address['line1'] . "\n";
-	if ( ! empty( $user_address['line2'] ) ) {
-		$return .= $user_address['line2'] . "\n";
+	$return = $user_address['line1']."\n";
+	if ( ! empty($user_address['line2'])) {
+		$return .= $user_address['line2']."\n";
 	}
-	$return .= $user_address['city'] . ' ' . $user_address['zip'] . ' ' . $user_address['state'] . "\n";
+	$return .= $user_address['city'].' '.$user_address['zip'].' '.$user_address['state']."\n";
 	$return .= $user_address['country'];
 
 	return $return;
@@ -465,10 +465,10 @@ 
  *
  * @return string date
  */
-function give_email_tag_date( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_date($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
-	return date_i18n( get_option( 'date_format' ), strtotime( $payment->date ) );
+	return date_i18n(get_option('date_format'), strtotime($payment->date));
 }
 
 /**
@@ -479,11 +479,11 @@ 
  *
  * @return string price
  */
-function give_email_tag_price( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
-	$price   = give_currency_filter( give_format_amount( $payment->total ), $payment->currency );
+function give_email_tag_price($payment_id) {
+	$payment = new Give_Payment($payment_id);
+	$price   = give_currency_filter(give_format_amount($payment->total), $payment->currency);
 
-	return html_entity_decode( $price, ENT_COMPAT, 'UTF-8' );
+	return html_entity_decode($price, ENT_COMPAT, 'UTF-8');
 }
 
 /**
@@ -494,8 +494,8 @@ 
  *
  * @return int payment_id
  */
-function give_email_tag_payment_id( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_payment_id($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->number;
 }
@@ -508,8 +508,8 @@ 
  *
  * @return string receipt_id
  */
-function give_email_tag_receipt_id( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_receipt_id($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
 	return $payment->key;
 }
@@ -523,11 +523,11 @@ 
  *
  * @return string $form_title
  */
-function give_email_tag_donation( $payment_id ) {
-	$payment    = new Give_Payment( $payment_id );
-	$form_title = give_get_payment_form_title( $payment->meta, false, '-' );
+function give_email_tag_donation($payment_id) {
+	$payment    = new Give_Payment($payment_id);
+	$form_title = give_get_payment_form_title($payment->meta, false, '-');
 
-	return ! empty( $form_title ) ? $form_title : __( 'There was an error retrieving this donation title.', 'give' );
+	return ! empty($form_title) ? $form_title : __('There was an error retrieving this donation title.', 'give');
 
 }
 
@@ -539,10 +539,10 @@ 
  *
  * @return string gateway
  */
-function give_email_tag_payment_method( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
+function give_email_tag_payment_method($payment_id) {
+	$payment = new Give_Payment($payment_id);
 
-	return give_get_gateway_checkout_label( $payment->gateway );
+	return give_get_gateway_checkout_label($payment->gateway);
 }
 
 /**
@@ -553,8 +553,8 @@ 
  *
  * @return string sitename
  */
-function give_email_tag_sitename( $payment_id ) {
-	return wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES );
+function give_email_tag_sitename($payment_id) {
+	return wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES);
 }
 
 /**
@@ -566,19 +566,19 @@ 
  *
  * @return string receipt_link
  */
-function give_email_tag_receipt_link( $payment_id ) {
+function give_email_tag_receipt_link($payment_id) {
 
-	$receipt_url = esc_url( add_query_arg( array(
-		'payment_key' => give_get_payment_key( $payment_id ),
+	$receipt_url = esc_url(add_query_arg(array(
+		'payment_key' => give_get_payment_key($payment_id),
 		'give_action' => 'view_receipt'
-	), home_url() ) );
-	$formatted   = sprintf(
+	), home_url()));
+	$formatted = sprintf(
 		'<a href="%1$s">%2$s</a>',
 		$receipt_url,
-		__( 'View it in your browser', 'give' )
+		__('View it in your browser', 'give')
 	);
 
-	if ( give_get_option( 'email_template' ) !== 'none' ) {
+	if (give_get_option('email_template') !== 'none') {
 		return $formatted;
 	} else {
 		return $receipt_url;

includes/emails/class-give-emails.php

Spacing +58 added lines, -58 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -79,12 +79,12 @@ 
 	 */
 	public function __construct() {
 
-		if ( 'none' === $this->get_template() ) {
+		if ('none' === $this->get_template()) {
 			$this->html = false;
 		}
 
-		add_action( 'give_email_send_before', array( $this, 'send_before' ) );
-		add_action( 'give_email_send_after', array( $this, 'send_after' ) );
+		add_action('give_email_send_before', array($this, 'send_before'));
+		add_action('give_email_send_after', array($this, 'send_after'));
 
 	}
 
@@ -93,7 +93,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __set( $key, $value ) {
+	public function __set($key, $value) {
 		$this->$key = $value;
 	}
 
@@ -103,11 +103,11 @@ 
 	 * @since 1.0
 	 */
 	public function get_from_name() {
-		if ( ! $this->from_name ) {
-			$this->from_name = give_get_option( 'from_name', get_bloginfo( 'name' ) );
+		if ( ! $this->from_name) {
+			$this->from_name = give_get_option('from_name', get_bloginfo('name'));
 		}
 
-		return apply_filters( 'give_email_from_name', wp_specialchars_decode( $this->from_name ), $this );
+		return apply_filters('give_email_from_name', wp_specialchars_decode($this->from_name), $this);
 	}
 
 	/**
@@ -116,11 +116,11 @@ 
 	 * @since 1.0
 	 */
 	public function get_from_address() {
-		if ( ! $this->from_address ) {
-			$this->from_address = give_get_option( 'from_email', get_option( 'admin_email' ) );
+		if ( ! $this->from_address) {
+			$this->from_address = give_get_option('from_email', get_option('admin_email'));
 		}
 
-		return apply_filters( 'give_email_from_address', $this->from_address, $this );
+		return apply_filters('give_email_from_address', $this->from_address, $this);
 	}
 
 	/**
@@ -129,13 +129,13 @@ 
 	 * @since 1.0
 	 */
 	public function get_content_type() {
-		if ( ! $this->content_type && $this->html ) {
-			$this->content_type = apply_filters( 'give_email_default_content_type', 'text/html', $this );
-		} else if ( ! $this->html ) {
+		if ( ! $this->content_type && $this->html) {
+			$this->content_type = apply_filters('give_email_default_content_type', 'text/html', $this);
+		} else if ( ! $this->html) {
 			$this->content_type = 'text/plain';
 		}
 
-		return apply_filters( 'give_email_content_type', $this->content_type, $this );
+		return apply_filters('give_email_content_type', $this->content_type, $this);
 	}
 
 	/**
@@ -144,13 +144,13 @@ 
 	 * @since 1.0
 	 */
 	public function get_headers() {
-		if ( ! $this->headers ) {
+		if ( ! $this->headers) {
 			$this->headers = "From: {$this->get_from_name()} <{$this->get_from_address()}>\r\n";
 			$this->headers .= "Reply-To: {$this->get_from_address()}\r\n";
 			$this->headers .= "Content-Type: {$this->get_content_type()}; charset=utf-8\r\n";
 		}
 
-		return apply_filters( 'give_email_headers', $this->headers, $this );
+		return apply_filters('give_email_headers', $this->headers, $this);
 	}
 
 	/**
@@ -160,11 +160,11 @@ 
 	 */
 	public function get_templates() {
 		$templates = array(
-			'default' => __( 'Default Template', 'give' ),
-			'none'    => __( 'No template, plain text only', 'give' )
+			'default' => __('Default Template', 'give'),
+			'none'    => __('No template, plain text only', 'give')
 		);
 
-		return apply_filters( 'give_email_templates', $templates );
+		return apply_filters('give_email_templates', $templates);
 	}
 
 	/**
@@ -173,11 +173,11 @@ 
 	 * @since 1.0
 	 */
 	public function get_template() {
-		if ( ! $this->template ) {
-			$this->template = give_get_option( 'email_template', 'default' );
+		if ( ! $this->template) {
+			$this->template = give_get_option('email_template', 'default');
 		}
 
-		return apply_filters( 'give_email_template', $this->template );
+		return apply_filters('give_email_template', $this->template);
 	}
 
 	/**
@@ -186,7 +186,7 @@ 
 	 * @since 1.0
 	 */
 	public function get_heading() {
-		return apply_filters( 'give_email_heading', $this->heading );
+		return apply_filters('give_email_heading', $this->heading);
 	}
 
 	/**
@@ -196,7 +196,7 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function parse_tags( $content ) {
+	public function parse_tags($content) {
 		return $content;
 	}
 
@@ -205,36 +205,36 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function build_email( $message ) {
+	public function build_email($message) {
 
-		if ( false === $this->html ) {
-			return apply_filters( 'give_email_message', wp_strip_all_tags( $message ), $this );
+		if (false === $this->html) {
+			return apply_filters('give_email_message', wp_strip_all_tags($message), $this);
 		}
 
-		$message = $this->text_to_html( $message );
+		$message = $this->text_to_html($message);
 
 		ob_start();
 
-		give_get_template_part( 'emails/header', $this->get_template(), true );
+		give_get_template_part('emails/header', $this->get_template(), true);
 
-		do_action( 'give_email_header', $this );
+		do_action('give_email_header', $this);
 
-		if ( has_action( 'give_email_template_' . $this->get_template() ) ) {
-			do_action( 'give_email_template_' . $this->get_template() );
+		if (has_action('give_email_template_'.$this->get_template())) {
+			do_action('give_email_template_'.$this->get_template());
 		} else {
-			give_get_template_part( 'emails/body', $this->get_template(), true );
+			give_get_template_part('emails/body', $this->get_template(), true);
 		}
 
-		do_action( 'give_email_body', $this );
+		do_action('give_email_body', $this);
 
-		give_get_template_part( 'emails/footer', $this->get_template(), true );
+		give_get_template_part('emails/footer', $this->get_template(), true);
 
-		do_action( 'give_email_footer', $this );
+		do_action('give_email_footer', $this);
 
 		$body    = ob_get_clean();
-		$message = str_replace( '{email}', $message, $body );
+		$message = str_replace('{email}', $message, $body);
 
-		return apply_filters( 'give_email_message', $message, $this );
+		return apply_filters('give_email_message', $message, $this);
 	}
 
 	/**
@@ -247,26 +247,26 @@ 
 	 *
 	 * @return bool
 	 */
-	public function send( $to, $subject, $message, $attachments = '' ) {
+	public function send($to, $subject, $message, $attachments = '') {
 
-		if ( ! did_action( 'init' ) && ! did_action( 'admin_init' ) ) {
-			_doing_it_wrong( __FUNCTION__, __( 'You cannot send email with Give_Emails until init/admin_init has been reached.', 'give' ), null );
+		if ( ! did_action('init') && ! did_action('admin_init')) {
+			_doing_it_wrong(__FUNCTION__, __('You cannot send email with Give_Emails until init/admin_init has been reached.', 'give'), null);
 
 			return false;
 		}
 
-		do_action( 'give_email_send_before', $this );
+		do_action('give_email_send_before', $this);
 
-		$subject = $this->parse_tags( $subject );
-		$message = $this->parse_tags( $message );
+		$subject = $this->parse_tags($subject);
+		$message = $this->parse_tags($message);
 
-		$message = $this->build_email( $message );
+		$message = $this->build_email($message);
 
-		$attachments = apply_filters( 'give_email_attachments', $attachments, $this );
+		$attachments = apply_filters('give_email_attachments', $attachments, $this);
 
-		$sent = wp_mail( $to, $subject, $message, $this->get_headers(), $attachments );
+		$sent = wp_mail($to, $subject, $message, $this->get_headers(), $attachments);
 
-		do_action( 'give_email_send_after', $this );
+		do_action('give_email_send_after', $this);
 
 		return $sent;
 
@@ -278,9 +278,9 @@ 
 	 * @since 1.0
 	 */
 	public function send_before() {
-		add_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
-		add_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
-		add_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
+		add_filter('wp_mail_from', array($this, 'get_from_address'));
+		add_filter('wp_mail_from_name', array($this, 'get_from_name'));
+		add_filter('wp_mail_content_type', array($this, 'get_content_type'));
 	}
 
 	/**
@@ -289,9 +289,9 @@ 
 	 * @since 1.0
 	 */
 	public function send_after() {
-		remove_filter( 'wp_mail_from', array( $this, 'get_from_address' ) );
-		remove_filter( 'wp_mail_from_name', array( $this, 'get_from_name' ) );
-		remove_filter( 'wp_mail_content_type', array( $this, 'get_content_type' ) );
+		remove_filter('wp_mail_from', array($this, 'get_from_address'));
+		remove_filter('wp_mail_from_name', array($this, 'get_from_name'));
+		remove_filter('wp_mail_content_type', array($this, 'get_content_type'));
 
 		// Reset heading to an empty string
 		$this->heading = '';
@@ -302,10 +302,10 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function text_to_html( $message ) {
+	public function text_to_html($message) {
 
-		if ( 'text/html' == $this->content_type || true === $this->html ) {
-			$message = wpautop( $message );
+		if ('text/html' == $this->content_type || true === $this->html) {
+			$message = wpautop($message);
 		}
 
 		return $message;