WordImpress / Give

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

Spacing +92 added lines, -92 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', 'give' ),
+			'description' => __('The name of completed donation form', '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;
 }
@@ -522,11 +522,11 @@ 
  *
  * @return string $form_title
  */
-function give_email_tag_donation( $payment_id ) {
-	$payment    = new Give_Payment( $payment_id );
-	$form_title = get_the_title( $payment->form_id );
+function give_email_tag_donation($payment_id) {
+	$payment    = new Give_Payment($payment_id);
+	$form_title = get_the_title($payment->form_id);
 
-	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');
 
 }
 
@@ -538,9 +538,9 @@ 
  *
  * @return string gateway
  */
-function give_email_tag_payment_method( $payment_id ) {
-	$payment = new Give_Payment( $payment_id );
-	return give_get_gateway_checkout_label( $payment->gateway );
+function give_email_tag_payment_method($payment_id) {
+	$payment = new Give_Payment($payment_id);
+	return give_get_gateway_checkout_label($payment->gateway);
 }
 
 /**
@@ -551,8 +551,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);
 }
 
 /**
@@ -564,15 +564,15 @@ 
  *
  * @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( __( '%1$sView it in your browser %2$s', 'give' ), '<a href="' . $receipt_url . '">', '&raquo;</a>' );
+	), home_url()));
+	$formatted = sprintf(__('%1$sView it in your browser %2$s', 'give'), '<a href="'.$receipt_url.'">', '&raquo;</a>');
 
-	if ( give_get_option( 'email_template' ) !== 'none' ) {
+	if (give_get_option('email_template') !== 'none') {
 		return $formatted;
 	} else {
 		return $receipt_url;

includes/emails/functions.php

Spacing +93 added lines, -93 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,39 +26,39 @@ 
  *
  * @return void
  */
-function give_email_donation_receipt( $payment_id, $admin_notice = true ) {
+function give_email_donation_receipt($payment_id, $admin_notice = true) {
 
-	$payment_data = give_get_payment_meta( $payment_id );
+	$payment_data = give_get_payment_meta($payment_id);
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_from_address', $from_email, $payment_id, $payment_data);
 
-	$to_email = give_get_payment_user_email( $payment_id );
+	$to_email = give_get_payment_user_email($payment_id);
 
-	$subject = give_get_option( 'donation_subject', __( 'Donation Receipt', 'give' ) );
-	$subject = apply_filters( 'give_donation_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = give_get_option('donation_subject', __('Donation Receipt', 'give'));
+	$subject = apply_filters('give_donation_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$attachments = apply_filters( 'give_receipt_attachments', array(), $payment_id, $payment_data );
-	$message     = give_do_email_tags( give_get_email_body_content( $payment_id, $payment_data ), $payment_id );
+	$attachments = apply_filters('give_receipt_attachments', array(), $payment_id, $payment_data);
+	$message     = give_do_email_tags(give_get_email_body_content($payment_id, $payment_data), $payment_id);
 
 	$emails = Give()->emails;
 
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', __( 'Donation Receipt', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', __('Donation Receipt', 'give'));
 
 
-	$headers = apply_filters( 'give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data );
-	$emails->__set( 'headers', $headers );
+	$headers = apply_filters('give_receipt_headers', $emails->get_headers(), $payment_id, $payment_data);
+	$emails->__set('headers', $headers);
 
-	$emails->send( $to_email, $subject, $message, $attachments );
+	$emails->send($to_email, $subject, $message, $attachments);
 
-	if ( $admin_notice && ! give_admin_notices_disabled( $payment_id ) ) {
-		do_action( 'give_admin_sale_notice', $payment_id, $payment_data );
+	if ($admin_notice && ! give_admin_notices_disabled($payment_id)) {
+		do_action('give_admin_sale_notice', $payment_id, $payment_data);
 	}
 }
 
@@ -71,29 +71,29 @@ 
  */
 function give_email_test_donation_receipt() {
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, 0, array() );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, 0, array());
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, 0, array() );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_from_address', $from_email, 0, array());
 
-	$subject = give_get_option( 'donation_subject', __( 'Donation Receipt', 'give' ) );
-	$subject = apply_filters( 'give_donation_subject', wp_strip_all_tags( $subject ), 0 );
-	$subject = give_do_email_tags( $subject, 0 );
+	$subject = give_get_option('donation_subject', __('Donation Receipt', 'give'));
+	$subject = apply_filters('give_donation_subject', wp_strip_all_tags($subject), 0);
+	$subject = give_do_email_tags($subject, 0);
 
-	$attachments = apply_filters( 'give_receipt_attachments', array(), 0, array() );
+	$attachments = apply_filters('give_receipt_attachments', array(), 0, array());
 
-	$message = give_email_preview_template_tags( give_get_email_body_content( 0, array() ) );
+	$message = give_email_preview_template_tags(give_get_email_body_content(0, array()));
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'heading', __( 'Donation Receipt', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('heading', __('Donation Receipt', 'give'));
 
-	$headers = apply_filters( 'give_receipt_headers', $emails->get_headers(), 0, array() );
-	$emails->__set( 'headers', $headers );
+	$headers = apply_filters('give_receipt_headers', $emails->get_headers(), 0, array());
+	$emails->__set('headers', $headers);
 
-	$emails->send( give_get_admin_notice_emails(), $subject, $message, $attachments );
+	$emails->send(give_get_admin_notice_emails(), $subject, $message, $attachments);
 
 }
 
@@ -107,49 +107,49 @@ 
  *
  * @return void
  */
-function give_admin_email_notice( $payment_id = 0, $payment_data = array() ) {
+function give_admin_email_notice($payment_id = 0, $payment_data = array()) {
 
-	$payment_id = absint( $payment_id );
+	$payment_id = absint($payment_id);
 
-	if ( empty( $payment_id ) ) {
+	if (empty($payment_id)) {
 		return;
 	}
 
-	if ( ! give_get_payment_by( 'id', $payment_id ) ) {
+	if ( ! give_get_payment_by('id', $payment_id)) {
 		return;
 	}
 
-	$from_name = give_get_option( 'from_name', wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ) );
-	$from_name = apply_filters( 'give_purchase_from_name', $from_name, $payment_id, $payment_data );
+	$from_name = give_get_option('from_name', wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES));
+	$from_name = apply_filters('give_purchase_from_name', $from_name, $payment_id, $payment_data);
 
-	$from_email = give_get_option( 'from_email', get_bloginfo( 'admin_email' ) );
-	$from_email = apply_filters( 'give_purchase_from_address', $from_email, $payment_id, $payment_data );
+	$from_email = give_get_option('from_email', get_bloginfo('admin_email'));
+	$from_email = apply_filters('give_purchase_from_address', $from_email, $payment_id, $payment_data);
 
-	$subject = give_get_option( 'donation_notification_subject', sprintf( __( 'New Donation - Payment #%1$s', 'give' ), $payment_id ) );
-	$subject = apply_filters( 'give_admin_donation_notification_subject', wp_strip_all_tags( $subject ), $payment_id );
-	$subject = give_do_email_tags( $subject, $payment_id );
+	$subject = give_get_option('donation_notification_subject', sprintf(__('New Donation - Payment #%1$s', 'give'), $payment_id));
+	$subject = apply_filters('give_admin_donation_notification_subject', wp_strip_all_tags($subject), $payment_id);
+	$subject = give_do_email_tags($subject, $payment_id);
 
-	$headers = "From: " . stripslashes_deep( html_entity_decode( $from_name, ENT_COMPAT, 'UTF-8' ) ) . " <$from_email>\r\n";
-	$headers .= "Reply-To: " . $from_email . "\r\n";
+	$headers = "From: ".stripslashes_deep(html_entity_decode($from_name, ENT_COMPAT, 'UTF-8'))." <$from_email>\r\n";
+	$headers .= "Reply-To: ".$from_email."\r\n";
 	//$headers  .= "MIME-Version: 1.0\r\n";
 	$headers .= "Content-Type: text/html; charset=utf-8\r\n";
-	$headers = apply_filters( 'give_admin_donation_notification_headers', $headers, $payment_id, $payment_data );
+	$headers = apply_filters('give_admin_donation_notification_headers', $headers, $payment_id, $payment_data);
 
-	$attachments = apply_filters( 'give_admin_donation_notification_attachments', array(), $payment_id, $payment_data );
+	$attachments = apply_filters('give_admin_donation_notification_attachments', array(), $payment_id, $payment_data);
 
-	$message = give_get_donation_notification_body_content( $payment_id, $payment_data );
+	$message = give_get_donation_notification_body_content($payment_id, $payment_data);
 
 	$emails = Give()->emails;
-	$emails->__set( 'from_name', $from_name );
-	$emails->__set( 'from_email', $from_email );
-	$emails->__set( 'headers', $headers );
-	$emails->__set( 'heading', __( 'New Donation!', 'give' ) );
+	$emails->__set('from_name', $from_name);
+	$emails->__set('from_email', $from_email);
+	$emails->__set('headers', $headers);
+	$emails->__set('heading', __('New Donation!', 'give'));
 
-	$emails->send( give_get_admin_notice_emails(), $subject, $message, $attachments );
+	$emails->send(give_get_admin_notice_emails(), $subject, $message, $attachments);
 
 }
 
-add_action( 'give_admin_sale_notice', 'give_admin_email_notice', 10, 2 );
+add_action('give_admin_sale_notice', 'give_admin_email_notice', 10, 2);
 
 /**
  * Retrieves the emails for which admin notifications are sent to (these can be
@@ -162,10 +162,10 @@ 
 function give_get_admin_notice_emails() {
 	global $give_options;
 
-	$emails = isset( $give_options['admin_notice_emails'] ) && strlen( trim( $give_options['admin_notice_emails'] ) ) > 0 ? $give_options['admin_notice_emails'] : get_bloginfo( 'admin_email' );
-	$emails = array_map( 'trim', explode( "\n", $emails ) );
+	$emails = isset($give_options['admin_notice_emails']) && strlen(trim($give_options['admin_notice_emails'])) > 0 ? $give_options['admin_notice_emails'] : get_bloginfo('admin_email');
+	$emails = array_map('trim', explode("\n", $emails));
 
-	return apply_filters( 'give_admin_notice_emails', $emails );
+	return apply_filters('give_admin_notice_emails', $emails);
 }
 
 /**
@@ -177,11 +177,11 @@ 
  *
  * @return mixed
  */
-function give_admin_notices_disabled( $payment_id = 0 ) {
+function give_admin_notices_disabled($payment_id = 0) {
 	global $give_options;
-	$retval = isset( $give_options['disable_admin_notices'] );
+	$retval = isset($give_options['disable_admin_notices']);
 
-	return apply_filters( 'give_admin_notices_disabled', $retval, $payment_id );
+	return apply_filters('give_admin_notices_disabled', $retval, $payment_id);
 }
 
 /**
@@ -195,16 +195,16 @@ 
 function give_get_default_donation_notification_email() {
 	global $give_options;
 
-	$default_email_body = __( 'Hi there,', 'give' ) . "\n\n" . __( 'This email is to inform you that a new donation has been made on your website: ', 'give' ) . '<a href="' . get_bloginfo( 'url' ) . '" target="_blank">' . get_bloginfo( 'url' ) . '</a>' . ".\n\n";
-	$default_email_body .= '<strong>' . __( 'Donor: ', 'give' ) . '</strong> ' . ' {name}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation: ', 'give' ) . '</strong> ' . ' {donation}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Amount: ', 'give' ) . '</strong> ' . ' {price}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment Method: ', 'give' ) . '</strong> ' . ' {payment_method}' . "\n\n";
-	$default_email_body .= __( 'Thank you,', 'give' ) . "\n\n" . '{sitename}';
+	$default_email_body = __('Hi there,', 'give')."\n\n".__('This email is to inform you that a new donation has been made on your website: ', 'give').'<a href="'.get_bloginfo('url').'" target="_blank">'.get_bloginfo('url').'</a>'.".\n\n";
+	$default_email_body .= '<strong>'.__('Donor: ', 'give').'</strong> '.' {name}'."\n";
+	$default_email_body .= '<strong>'.__('Donation: ', 'give').'</strong> '.' {donation}'."\n";
+	$default_email_body .= '<strong>'.__('Amount: ', 'give').'</strong> '.' {price}'."\n";
+	$default_email_body .= '<strong>'.__('Payment Method: ', 'give').'</strong> '.' {payment_method}'."\n\n";
+	$default_email_body .= __('Thank you,', 'give')."\n\n".'{sitename}';
 
-	$message = ( isset( $give_options['donation_notification'] ) && ! empty( $give_options['donation_notification'] ) ) ? $give_options['donation_notification'] : $default_email_body;
+	$message = (isset($give_options['donation_notification']) && ! empty($give_options['donation_notification'])) ? $give_options['donation_notification'] : $default_email_body;
 
-	return apply_filters( 'give_default_donation_notification_email', $message );
+	return apply_filters('give_default_donation_notification_email', $message);
 }
 
 
@@ -219,24 +219,24 @@ 
 function give_get_default_donation_receipt_email() {
 	global $give_options;
 
-	$default_email_body = __( 'Dear', 'give' ) . " {name},\n\n";
-	$default_email_body .= __( 'Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give' ) . "\n\n";
-	$default_email_body .= '<strong>' . __( 'Donor', 'give' ) . ':</strong> ' . '{fullname}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation', 'give' ) . ':</strong> ' . '{donation}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Donation Date', 'give' ) . ':</strong> ' . '{date}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Amount', 'give' ) . ':</strong> ' . '{price}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment Method', 'give' ) . ':</strong> ' . '{payment_method}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Payment ID', 'give' ) . ':</strong> ' . '{payment_id}' . "\n";
-	$default_email_body .= '<strong>' . __( 'Receipt ID', 'give' ) . ':</strong> ' . '{receipt_id}' . "\n\n";
-	$default_email_body .= '{receipt_link}' . "\n\n";
+	$default_email_body = __('Dear', 'give')." {name},\n\n";
+	$default_email_body .= __('Thank you for your donation. Your generosity is appreciated! Here are the details of your donation:', 'give')."\n\n";
+	$default_email_body .= '<strong>'.__('Donor', 'give').':</strong> '.'{fullname}'."\n";
+	$default_email_body .= '<strong>'.__('Donation', 'give').':</strong> '.'{donation}'."\n";
+	$default_email_body .= '<strong>'.__('Donation Date', 'give').':</strong> '.'{date}'."\n";
+	$default_email_body .= '<strong>'.__('Amount', 'give').':</strong> '.'{price}'."\n";
+	$default_email_body .= '<strong>'.__('Payment Method', 'give').':</strong> '.'{payment_method}'."\n";
+	$default_email_body .= '<strong>'.__('Payment ID', 'give').':</strong> '.'{payment_id}'."\n";
+	$default_email_body .= '<strong>'.__('Receipt ID', 'give').':</strong> '.'{receipt_id}'."\n\n";
+	$default_email_body .= '{receipt_link}'."\n\n";
 
 	$default_email_body .= "\n\n";
-	$default_email_body .= __( 'Sincerely,', 'give' );
-	$default_email_body .= "\n" . '{sitename}' . "\n";
+	$default_email_body .= __('Sincerely,', 'give');
+	$default_email_body .= "\n".'{sitename}'."\n";
 
-	$message = ( isset( $give_options['donation_receipt'] ) && ! empty( $give_options['donation_receipt'] ) ) ? $give_options['donation_receipt'] : $default_email_body;
+	$message = (isset($give_options['donation_receipt']) && ! empty($give_options['donation_receipt'])) ? $give_options['donation_receipt'] : $default_email_body;
 
-	return apply_filters( 'give_default_donation_receipt_email', $message );
+	return apply_filters('give_default_donation_receipt_email', $message);
 }
 
 /**
@@ -248,19 +248,19 @@ 
  *
  * @return array $email_names
  */
-function give_get_email_names( $user_info ) {
+function give_get_email_names($user_info) {
 	$email_names = array();
-	$user_info   = maybe_unserialize( $user_info );
+	$user_info   = maybe_unserialize($user_info);
 
 	$email_names['fullname'] = '';
-	if ( isset( $user_info['id'] ) && $user_info['id'] > 0 && isset( $user_info['first_name'] ) ) {
-		$user_data               = get_userdata( $user_info['id'] );
+	if (isset($user_info['id']) && $user_info['id'] > 0 && isset($user_info['first_name'])) {
+		$user_data               = get_userdata($user_info['id']);
 		$email_names['name']     = $user_info['first_name'];
-		$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+		$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 		$email_names['username'] = $user_data->user_login;
-	} elseif ( isset( $user_info['first_name'] ) ) {
+	} elseif (isset($user_info['first_name'])) {
 		$email_names['name']     = $user_info['first_name'];
-		$email_names['fullname'] = $user_info['first_name'] . ' ' . $user_info['last_name'];
+		$email_names['fullname'] = $user_info['first_name'].' '.$user_info['last_name'];
 		$email_names['username'] = $user_info['first_name'];
 	} else {
 		$email_names['name']     = $user_info['email'];

includes/admin/payments/view-order-details.php

Spacing +126 added lines, -126 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,27 +20,27 @@ 
  * @since 1.0
  * @return void
  */
-if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-	wp_die( __( 'Donation ID not supplied. Please try again', 'give' ), __( 'Error', 'give' ) );
+if ( ! isset($_GET['id']) || ! is_numeric($_GET['id'])) {
+	wp_die(__('Donation ID not supplied. Please try again', 'give'), __('Error', 'give'));
 }
 
 // Setup the variables
-$payment_id = absint( $_GET['id'] );
-$payment    = new Give_Payment( $payment_id );
+$payment_id = absint($_GET['id']);
+$payment    = new Give_Payment($payment_id);
 
 // Sanity check... fail if purchase ID is invalid
 $payment_exists = $payment->ID;
-if ( empty( $payment_exists ) ) {
-	wp_die( __( 'The specified ID does not belong to a payment. Please try again', 'give' ), __( 'Error', 'give' ) );
+if (empty($payment_exists)) {
+	wp_die(__('The specified ID does not belong to a payment. Please try again', 'give'), __('Error', 'give'));
 }
 
 $number         = $payment->number;
 $payment_meta   = $payment->get_meta();
-$transaction_id = esc_attr( $payment->transaction_id );
+$transaction_id = esc_attr($payment->transaction_id);
 $user_id        = $payment->user_id;
 $customer_id    = $payment->customer_id;
-$payment_date   = strtotime( $payment->date );
-$user_info      = give_get_payment_meta_user_info( $payment_id );
+$payment_date   = strtotime($payment->date);
+$user_info      = give_get_payment_meta_user_info($payment_id);
 $address        = $payment->address;
 $gateway        = $payment->gateway;
 $currency_code  = $payment->currency;
@@ -49,72 +49,72 @@ 
 $payment_mode   = $payment->mode;
 ?>
 <div class="wrap give-wrap">
-	<h1 id="transaction-details-heading"><?php printf( __( 'Payment %s', 'give' ), $number ); ?><?php if ( $payment_mode == 'test' ) {
-			echo '<span id="test-payment-label" class="give-item-label give-item-label-orange" data-tooltip="' . __( 'This payment was made in Test Mode', 'give' ) . '" data-tooltip-my-position="center left" data-tooltip-target-position="center right">' . __( 'Test Payment', 'give' ) . '</span>';
+	<h1 id="transaction-details-heading"><?php printf(__('Payment %s', 'give'), $number); ?><?php if ($payment_mode == 'test') {
+			echo '<span id="test-payment-label" class="give-item-label give-item-label-orange" data-tooltip="'.__('This payment was made in Test Mode', 'give').'" data-tooltip-my-position="center left" data-tooltip-target-position="center right">'.__('Test Payment', 'give').'</span>';
 		} ?></h1>
 
-	<?php do_action( 'give_view_order_details_before', $payment_id ); ?>
+	<?php do_action('give_view_order_details_before', $payment_id); ?>
 	<form id="give-edit-order-form" method="post">
-		<?php do_action( 'give_view_order_details_form_top', $payment_id ); ?>
+		<?php do_action('give_view_order_details_form_top', $payment_id); ?>
 		<div id="poststuff">
 			<div id="give-dashboard-widgets-wrap">
 				<div id="post-body" class="metabox-holder columns-2">
 					<div id="postbox-container-1" class="postbox-container">
 						<div id="side-sortables" class="meta-box-sortables ui-sortable">
 
-							<?php do_action( 'give_view_order_details_sidebar_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_sidebar_before', $payment_id); ?>
 
 
 							<div id="give-order-update" class="postbox give-order-data">
 
 								<h3 class="hndle">
-									<span><?php _e( 'Update Payment', 'give' ); ?></span>
+									<span><?php _e('Update Payment', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
 									<div class="give-admin-box">
 
-										<?php do_action( 'give_view_order_details_totals_before', $payment_id ); ?>
+										<?php do_action('give_view_order_details_totals_before', $payment_id); ?>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Status:', 'give' ); ?></span>&nbsp;
+												<span class="label"><?php _e('Status:', 'give'); ?></span>&nbsp;
 												<select name="give-payment-status" class="medium-text">
-													<?php foreach ( give_get_payment_statuses() as $key => $status ) : ?>
-														<option value="<?php echo esc_attr( $key ); ?>"<?php selected( $payment->status, $key, true ); ?>><?php echo esc_html( $status ); ?></option>
+													<?php foreach (give_get_payment_statuses() as $key => $status) : ?>
+														<option value="<?php echo esc_attr($key); ?>"<?php selected($payment->status, $key, true); ?>><?php echo esc_html($status); ?></option>
 													<?php endforeach; ?>
 												</select>
-												<span class="give-donation-status status-<?php echo sanitize_title( $payment->status ); ?>"><span class="give-donation-status-icon"></span></span>
+												<span class="give-donation-status status-<?php echo sanitize_title($payment->status); ?>"><span class="give-donation-status-icon"></span></span>
 											</p>
 										</div>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Date:', 'give' ); ?></span>&nbsp;
-												<input type="text" name="give-payment-date" value="<?php echo esc_attr( date( 'm/d/Y', $payment_date ) ); ?>" class="medium-text give_datepicker"/>
+												<span class="label"><?php _e('Date:', 'give'); ?></span>&nbsp;
+												<input type="text" name="give-payment-date" value="<?php echo esc_attr(date('m/d/Y', $payment_date)); ?>" class="medium-text give_datepicker"/>
 											</p>
 										</div>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Time:', 'give' ); ?></span>&nbsp;
-												<input type="number" step="1" max="24" name="give-payment-time-hour" value="<?php echo esc_attr( date_i18n( 'H', $payment_date ) ); ?>" class="small-text give-payment-time-hour"/>&nbsp;:&nbsp;
-												<input type="number" step="1" max="59" name="give-payment-time-min" value="<?php echo esc_attr( date( 'i', $payment_date ) ); ?>" class="small-text give-payment-time-min"/>
+												<span class="label"><?php _e('Time:', 'give'); ?></span>&nbsp;
+												<input type="number" step="1" max="24" name="give-payment-time-hour" value="<?php echo esc_attr(date_i18n('H', $payment_date)); ?>" class="small-text give-payment-time-hour"/>&nbsp;:&nbsp;
+												<input type="number" step="1" max="59" name="give-payment-time-min" value="<?php echo esc_attr(date('i', $payment_date)); ?>" class="small-text give-payment-time-min"/>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_update_inner', $payment_id ); ?>
+										<?php do_action('give_view_order_details_update_inner', $payment_id); ?>
 
 										<?php
 										//@TODO: Fees
-										$fees = give_get_payment_fees( $payment_id );
-										if ( ! empty( $fees ) ) : ?>
+										$fees = give_get_payment_fees($payment_id);
+										if ( ! empty($fees)) : ?>
 											<div class="give-order-fees give-admin-box-inside">
-												<p class="strong"><?php _e( 'Fees', 'give' ); ?>:</p>
+												<p class="strong"><?php _e('Fees', 'give'); ?>:</p>
 												<ul class="give-payment-fees">
-													<?php foreach ( $fees as $fee ) : ?>
+													<?php foreach ($fees as $fee) : ?>
 														<li>
-															<span class="fee-label"><?php echo $fee['label'] . ':</span> ' . '<span class="fee-amount" data-fee="' . esc_attr( $fee['amount'] ) . '">' . give_currency_filter( $fee['amount'], $currency_code ); ?></span>
+															<span class="fee-label"><?php echo $fee['label'].':</span> '.'<span class="fee-amount" data-fee="'.esc_attr($fee['amount']).'">'.give_currency_filter($fee['amount'], $currency_code); ?></span>
 														</li>
 													<?php endforeach; ?>
 												</ul>
@@ -124,12 +124,12 @@ 
 
 										<div class="give-order-payment give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Total Donation', 'give' ); ?>:</span>&nbsp;
-												<?php echo give_currency_symbol( $payment->currency ); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr( give_format_amount( give_get_payment_amount( $payment_id ) ) ); ?>"/>
+												<span class="label"><?php _e('Total Donation', 'give'); ?>:</span>&nbsp;
+												<?php echo give_currency_symbol($payment->currency); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr(give_format_amount(give_get_payment_amount($payment_id))); ?>"/>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_totals_after', $payment_id ); ?>
+										<?php do_action('give_view_order_details_totals_after', $payment_id); ?>
 
 									</div>
 									<!-- /.give-admin-box -->
@@ -138,20 +138,20 @@ 
 								<!-- /.inside -->
 
 								<div class="give-order-update-box give-admin-box">
-									<?php do_action( 'give_view_order_details_update_before', $payment_id ); ?>
+									<?php do_action('give_view_order_details_update_before', $payment_id); ?>
 									<div id="major-publishing-actions">
 										<div id="publishing-action">
-											<input type="submit" class="button button-primary right" value="<?php esc_attr_e( 'Save Payment', 'give' ); ?>"/>
-											<?php if ( give_is_payment_complete( $payment_id ) ) : ?>
-												<a href="<?php echo esc_url( add_query_arg( array(
+											<input type="submit" class="button button-primary right" value="<?php esc_attr_e('Save Payment', 'give'); ?>"/>
+											<?php if (give_is_payment_complete($payment_id)) : ?>
+												<a href="<?php echo esc_url(add_query_arg(array(
 													'give-action' => 'email_links',
 													'purchase_id' => $payment_id
-												) ) ); ?>" id="give-resend-receipt" class="button-secondary right"><?php _e( 'Resend Receipt', 'give' ); ?></a>
+												))); ?>" id="give-resend-receipt" class="button-secondary right"><?php _e('Resend Receipt', 'give'); ?></a>
 											<?php endif; ?>
 										</div>
 										<div class="clear"></div>
 									</div>
-									<?php do_action( 'give_view_order_details_update_after', $payment_id ); ?>
+									<?php do_action('give_view_order_details_update_after', $payment_id); ?>
 								</div>
 								<!-- /.give-order-update-box -->
 
@@ -161,55 +161,55 @@ 
 							<div id="give-order-details" class="postbox give-order-data">
 
 								<h3 class="hndle">
-									<span><?php _e( 'Payment Meta', 'give' ); ?></span>
+									<span><?php _e('Payment Meta', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
 									<div class="give-admin-box">
 
-										<?php do_action( 'give_view_order_details_payment_meta_before', $payment_id ); ?>
+										<?php do_action('give_view_order_details_payment_meta_before', $payment_id); ?>
 
 										<?php
-										$gateway = give_get_payment_gateway( $payment_id );
-										if ( $gateway ) : ?>
+										$gateway = give_get_payment_gateway($payment_id);
+										if ($gateway) : ?>
 											<div class="give-order-gateway give-admin-box-inside">
 												<p>
-													<span class="label"><?php _e( 'Gateway:', 'give' ); ?></span>&nbsp;
-													<?php echo give_get_gateway_admin_label( $gateway ); ?>
+													<span class="label"><?php _e('Gateway:', 'give'); ?></span>&nbsp;
+													<?php echo give_get_gateway_admin_label($gateway); ?>
 												</p>
 											</div>
 										<?php endif; ?>
 
 										<div class="give-order-payment-key give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Key:', 'give' ); ?></span>&nbsp;
-												<span><?php echo give_get_payment_key( $payment_id ); ?></span>
+												<span class="label"><?php _e('Key:', 'give'); ?></span>&nbsp;
+												<span><?php echo give_get_payment_key($payment_id); ?></span>
 											</p>
 										</div>
 
 										<div class="give-order-ip give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'IP:', 'give' ); ?></span>&nbsp;
-												<span><?php echo esc_html( give_get_payment_user_ip( $payment_id ) ); ?></span>
+												<span class="label"><?php _e('IP:', 'give'); ?></span>&nbsp;
+												<span><?php echo esc_html(give_get_payment_user_ip($payment_id)); ?></span>
 											</p>
 										</div>
 
-										<?php if ( $transaction_id ) : ?>
+										<?php if ($transaction_id) : ?>
 											<div class="give-order-tx-id give-admin-box-inside">
 												<p>
-													<span class="label"><?php _e( 'Transaction ID:', 'give' ); ?></span>&nbsp;
-													<span><?php echo apply_filters( 'give_payment_details_transaction_id-' . $gateway, $transaction_id, $payment_id ); ?></span>
+													<span class="label"><?php _e('Transaction ID:', 'give'); ?></span>&nbsp;
+													<span><?php echo apply_filters('give_payment_details_transaction_id-'.$gateway, $transaction_id, $payment_id); ?></span>
 												</p>
 											</div>
 										<?php endif; ?>
 
 										<div class="give-admin-box-inside">
-											<p><?php $purchase_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . esc_attr( give_get_payment_user_email( $payment_id ) ) ); ?>
-												<a href="<?php echo $purchase_url; ?>"><?php _e( 'View all donations for this donor', 'give' ); ?> &raquo;</a>
+											<p><?php $purchase_url = admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.esc_attr(give_get_payment_user_email($payment_id))); ?>
+												<a href="<?php echo $purchase_url; ?>"><?php _e('View all donations for this donor', 'give'); ?> &raquo;</a>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_payment_meta_after', $payment_id ); ?>
+										<?php do_action('give_view_order_details_payment_meta_after', $payment_id); ?>
 
 									</div>
 									<!-- /.column-container -->
@@ -220,7 +220,7 @@ 
 							</div>
 							<!-- /#give-order-data -->
 
-							<?php do_action( 'give_view_order_details_sidebar_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_sidebar_after', $payment_id); ?>
 
 						</div>
 						<!-- /#side-sortables -->
@@ -231,12 +231,12 @@ 
 
 						<div id="normal-sortables" class="meta-box-sortables ui-sortable">
 
-							<?php do_action( 'give_view_order_details_main_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_main_before', $payment_id); ?>
 
 							<?php $column_count = 'columns-3'; ?>
 							<div id="give-donation-overview" class="postbox <?php echo $column_count; ?>">
 								<h3 class="hndle">
-									<span><?php _e( 'Donation Information', 'give' ); ?></span>
+									<span><?php _e('Donation Information', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
@@ -244,29 +244,29 @@ 
 									<table style="width:100%;text-align:left;">
 										<thead>
 										<tr>
-											<?php do_action( 'give_donation_details_thead_before', $payment_id ); ?>
-											<th><?php _e( 'Donation Form ID', 'give' ) ?></th>
-											<th><?php _e( 'Donation Form Title', 'give' ) ?></th>
-											<th><?php _e( 'Donation Level', 'give' ) ?></th>
-											<th><?php _e( 'Donation Date', 'give' ) ?></th>
-											<th><?php _e( 'Total Donation', 'give' ) ?></th>
-											<?php do_action( 'give_donation_details_thead_after', $payment_id ); ?>
+											<?php do_action('give_donation_details_thead_before', $payment_id); ?>
+											<th><?php _e('Donation Form ID', 'give') ?></th>
+											<th><?php _e('Donation Form Title', 'give') ?></th>
+											<th><?php _e('Donation Level', 'give') ?></th>
+											<th><?php _e('Donation Date', 'give') ?></th>
+											<th><?php _e('Total Donation', 'give') ?></th>
+											<?php do_action('give_donation_details_thead_after', $payment_id); ?>
 										</tr>
 										</thead>
 										<tr>
-											<?php do_action( 'give_donation_details_tbody_before', $payment_id ); ?>
+											<?php do_action('give_donation_details_tbody_before', $payment_id); ?>
 											<td>
 												<?php echo $payment_meta['form_id']; ?>
 											</td>
 											<td>
-												<a href="<?php echo get_permalink( $payment_meta['form_id'] ); ?>"><?php echo $payment_meta['form_title']; ?></a>
+												<a href="<?php echo get_permalink($payment_meta['form_id']); ?>"><?php echo $payment_meta['form_title']; ?></a>
 											</td>
 											<td>
 												<?php
 												//Level ID
-												$level_title = give_get_payment_form_title( $payment_meta, true );
-												if ( empty( $level_title ) ) {
-													echo __( 'n/a', 'give' );
+												$level_title = give_get_payment_form_title($payment_meta, true);
+												if (empty($level_title)) {
+													echo __('n/a', 'give');
 												} else {
 													echo $level_title;
 												} ?>
@@ -274,13 +274,13 @@ 
 											<td>
 												<?php
 												//Transaction Date
-												$date_format = get_option( 'date_format' );
-												echo date_i18n( $date_format, strtotime( $payment_date ) );
+												$date_format = get_option('date_format');
+												echo date_i18n($date_format, strtotime($payment_date));
 												?>
 											</td>
 											<td>
-												<?php echo esc_html( give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) ) ); ?></td>
-											<?php do_action( 'give_donation_details_tbody_after', $payment_id ); ?>
+												<?php echo esc_html(give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)))); ?></td>
+											<?php do_action('give_donation_details_tbody_after', $payment_id); ?>
 
 										</tr>
 									</table>
@@ -292,64 +292,64 @@ 
 							</div>
 							<!-- /#give-donation-overview -->
 
-							<?php do_action( 'give_view_order_details_files_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_files_after', $payment_id); ?>
 
-							<?php do_action( 'give_view_order_details_billing_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_billing_before', $payment_id); ?>
 
 
 							<div id="give-customer-details" class="postbox">
 								<h3 class="hndle">
-									<span><?php _e( 'Donor Details', 'give' ); ?></span>
+									<span><?php _e('Donor Details', 'give'); ?></span>
 								</h3>
 
 								<div class="inside give-clearfix">
 
-									<?php $customer = new Give_Customer( $customer_id ); ?>
+									<?php $customer = new Give_Customer($customer_id); ?>
 
 									<div class="column-container customer-info">
 										<div class="column">
-											<?php echo Give()->html->donor_dropdown( array(
+											<?php echo Give()->html->donor_dropdown(array(
 												'selected' => $customer->id,
 												'name'     => 'customer-id'
-											) ); ?>
+											)); ?>
 										</div>
 										<div class="column">
 											<input type="hidden" name="give-current-customer" value="<?php echo $customer->id; ?>"/>
 										</div>
 										<div class="column">
-											<?php if ( ! empty( $customer->id ) ) : ?>
-												<?php $customer_url = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ); ?>
-												<a href="<?php echo $customer_url; ?>" title="<?php _e( 'View Donor Details', 'give' ); ?>"><?php _e( 'View Donor Details', 'give' ); ?></a>
+											<?php if ( ! empty($customer->id)) : ?>
+												<?php $customer_url = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id); ?>
+												<a href="<?php echo $customer_url; ?>" title="<?php _e('View Donor Details', 'give'); ?>"><?php _e('View Donor Details', 'give'); ?></a>
 												&nbsp;|&nbsp;
 											<?php endif; ?>
-											<a href="#new" class="give-payment-new-customer" title="<?php _e( 'New Donor', 'give' ); ?>"><?php _e( 'New Donor', 'give' ); ?></a>
+											<a href="#new" class="give-payment-new-customer" title="<?php _e('New Donor', 'give'); ?>"><?php _e('New Donor', 'give'); ?></a>
 										</div>
 									</div>
 
 									<div class="column-container new-customer" style="display: none">
 										<div class="column">
-											<strong><?php _e( 'Name:', 'give' ); ?></strong>&nbsp;
+											<strong><?php _e('Name:', 'give'); ?></strong>&nbsp;
 											<input type="text" name="give-new-customer-name" value="" class="medium-text"/>
 										</div>
 										<div class="column">
-											<strong><?php _e( 'Email:', 'give' ); ?></strong>&nbsp;
+											<strong><?php _e('Email:', 'give'); ?></strong>&nbsp;
 											<input type="email" name="give-new-customer-email" value="" class="medium-text"/>
 										</div>
 										<div class="column">
 											<input type="hidden" id="give-new-customer" name="give-new-customer" value="0"/>
-											<a href="#cancel" class="give-payment-new-customer-cancel give-delete"><?php _e( 'Cancel', 'give' ); ?></a>
+											<a href="#cancel" class="give-payment-new-customer-cancel give-delete"><?php _e('Cancel', 'give'); ?></a>
 										</div>
 										<div class="column">
 											<small>
-												<em>*<?php _e( 'Click "Save Payment" to create new donor', 'give' ); ?></em>
+												<em>*<?php _e('Click "Save Payment" to create new donor', 'give'); ?></em>
 											</small>
 										</div>
 									</div>
 
 									<?php
 									// The give_payment_personal_details_list hook is left here for backwards compatibility
-									do_action( 'give_payment_personal_details_list', $payment_meta, $user_info );
-									do_action( 'give_payment_view_details', $payment_id );
+									do_action('give_payment_personal_details_list', $payment_meta, $user_info);
+									do_action('give_payment_view_details', $payment_id);
 									?>
 
 								</div>
@@ -360,7 +360,7 @@ 
 
 							<div id="give-billing-details" class="postbox">
 								<h3 class="hndle">
-									<span><?php _e( 'Billing Address', 'give' ); ?></span>
+									<span><?php _e('Billing Address', 'give'); ?></span>
 								</h3>
 
 								<div class="inside give-clearfix">
@@ -371,62 +371,62 @@ 
 											<div class="data column-container">
 												<div class="column">
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'Street Address Line 1:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][line1]" value="<?php echo esc_attr( $address['line1'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('Street Address Line 1:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][line1]" value="<?php echo esc_attr($address['line1']); ?>" class="medium-text"/>
 													</p>
 
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'Street Address Line 2:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][line2]" value="<?php echo esc_attr( $address['line2'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('Street Address Line 2:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][line2]" value="<?php echo esc_attr($address['line2']); ?>" class="medium-text"/>
 													</p>
 
 												</div>
 												<div class="column">
 													<p>
-														<strong class="order-data-address-line"><?php echo _x( 'City:', 'Address City', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][city]" value="<?php echo esc_attr( $address['city'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php echo _x('City:', 'Address City', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][city]" value="<?php echo esc_attr($address['city']); ?>" class="medium-text"/>
 
 													</p>
 
 													<p>
-														<strong class="order-data-address-line"><?php echo _x( 'Zip / Postal Code:', 'Zip / Postal code of address', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][zip]" value="<?php echo esc_attr( $address['zip'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php echo _x('Zip / Postal Code:', 'Zip / Postal code of address', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][zip]" value="<?php echo esc_attr($address['zip']); ?>" class="medium-text"/>
 
 													</p>
 												</div>
 												<div class="column">
 													<p id="give-order-address-country-wrap">
-														<strong class="order-data-address-line"><?php echo _x( 'Country:', 'Address country', 'give' ); ?></strong><br/>
+														<strong class="order-data-address-line"><?php echo _x('Country:', 'Address country', 'give'); ?></strong><br/>
 														<?php
-														echo Give()->html->select( array(
+														echo Give()->html->select(array(
 															'options'          => give_get_country_list(),
 															'name'             => 'give-payment-address[0][country]',
 															'selected'         => $address['country'],
 															'show_option_all'  => false,
 															'show_option_none' => false,
 															'chosen'           => true,
-															'placeholder'      => __( 'Select a country', 'give' )
-														) );
+															'placeholder'      => __('Select a country', 'give')
+														));
 														?>
 													</p>
 
 													<p id="give-order-address-state-wrap">
-														<strong class="order-data-address-line"><?php echo _x( 'State / Province:', 'State / province of address', 'give' ); ?></strong><br/>
+														<strong class="order-data-address-line"><?php echo _x('State / Province:', 'State / province of address', 'give'); ?></strong><br/>
 														<?php
-														$states = give_get_states( $address['country'] );
-														if ( ! empty( $states ) ) {
-															echo Give()->html->select( array(
+														$states = give_get_states($address['country']);
+														if ( ! empty($states)) {
+															echo Give()->html->select(array(
 																'options'          => $states,
 																'name'             => 'give-payment-address[0][state]',
 																'selected'         => $address['state'],
 																'show_option_all'  => false,
 																'show_option_none' => false,
 																'chosen'           => true,
-																'placeholder'      => __( 'Select a state', 'give' )
-															) );
+																'placeholder'      => __('Select a state', 'give')
+															));
 														} else {
 															?>
-															<input type="text" name="give-payment-address[0][state]" value="<?php echo esc_attr( $address['state'] ); ?>" class="medium-text"/>
+															<input type="text" name="give-payment-address[0][state]" value="<?php echo esc_attr($address['state']); ?>" class="medium-text"/>
 															<?php
 														} ?>
 													</p>
@@ -436,39 +436,39 @@ 
 									</div>
 									<!-- /#give-order-address -->
 
-									<?php do_action( 'give_payment_billing_details', $payment_id ); ?>
+									<?php do_action('give_payment_billing_details', $payment_id); ?>
 
 								</div>
 								<!-- /.inside -->
 							</div>
 							<!-- /#give-billing-details -->
 
-							<?php do_action( 'give_view_order_details_billing_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_billing_after', $payment_id); ?>
 
 							<div id="give-payment-notes" class="postbox">
-								<h3 class="hndle"><span><?php _e( 'Payment Notes', 'give' ); ?></span></h3>
+								<h3 class="hndle"><span><?php _e('Payment Notes', 'give'); ?></span></h3>
 
 								<div class="inside">
 									<div id="give-payment-notes-inner">
 										<?php
-										$notes = give_get_payment_notes( $payment_id );
-										if ( ! empty( $notes ) ) :
+										$notes = give_get_payment_notes($payment_id);
+										if ( ! empty($notes)) :
 											$no_notes_display = ' style="display:none;"';
-											foreach ( $notes as $note ) :
+											foreach ($notes as $note) :
 
-												echo give_get_payment_note_html( $note, $payment_id );
+												echo give_get_payment_note_html($note, $payment_id);
 
 											endforeach;
 										else :
 											$no_notes_display = '';
 										endif;
-										echo '<p class="give-no-payment-notes"' . $no_notes_display . '>' . __( 'No payment notes', 'give' ) . '</p>';
+										echo '<p class="give-no-payment-notes"'.$no_notes_display.'>'.__('No payment notes', 'give').'</p>';
 										?>
 									</div>
 									<textarea name="give-payment-note" id="give-payment-note" class="large-text"></textarea>
 
 									<p class="give-clearfix">
-										<button id="give-add-payment-note" class="button button-secondary button-small" data-payment-id="<?php echo absint( $payment_id ); ?>"><?php _e( 'Add Note', 'give' ); ?></button>
+										<button id="give-add-payment-note" class="button button-secondary button-small" data-payment-id="<?php echo absint($payment_id); ?>"><?php _e('Add Note', 'give'); ?></button>
 									</p>
 
 									<div class="clear"></div>
@@ -477,7 +477,7 @@ 
 							</div>
 							<!-- /#give-payment-notes -->
 
-							<?php do_action( 'give_view_order_details_main_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_main_after', $payment_id); ?>
 						</div>
 						<!-- /#normal-sortables -->
 					</div>
@@ -488,10 +488,10 @@ 
 			<!-- #give-dashboard-widgets-wrap -->
 		</div>
 		<!-- /#post-stuff -->
-		<?php do_action( 'give_view_order_details_form_bottom', $payment_id ); ?>
-		<?php wp_nonce_field( 'give_update_payment_details_nonce' ); ?>
-		<input type="hidden" name="give_payment_id" value="<?php echo esc_attr( $payment_id ); ?>"/>
+		<?php do_action('give_view_order_details_form_bottom', $payment_id); ?>
+		<?php wp_nonce_field('give_update_payment_details_nonce'); ?>
+		<input type="hidden" name="give_payment_id" value="<?php echo esc_attr($payment_id); ?>"/>
 		<input type="hidden" name="give_action" value="update_payment_details"/>
 	</form>
-	<?php do_action( 'give_view_order_details_after', $payment_id ); ?>
+	<?php do_action('give_view_order_details_after', $payment_id); ?>
 </div><!-- /.wrap -->

includes/admin/payments/actions.php

Spacing +96 added lines, -96 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -26,106 +26,106 @@ 
  * @return      void
  *
  */
-function give_update_payment_details( $data ) {
+function give_update_payment_details($data) {
 
-	if ( ! current_user_can( 'edit_give_payments', $data['give_payment_id'] ) ) {
-		wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $data['give_payment_id'])) {
+		wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	check_admin_referer( 'give_update_payment_details_nonce' );
+	check_admin_referer('give_update_payment_details_nonce');
 
 	// Retrieve the payment ID
-	$payment_id = absint( $data['edd_payment_id'] );
-	$payment    = new Give_Payment( $payment_id );
+	$payment_id = absint($data['edd_payment_id']);
+	$payment    = new Give_Payment($payment_id);
 
 	// Retrieve existing payment meta
 	$meta      = $payment->get_meta();
 	$user_info = $payment->user_info;
 
 	$status = $data['give-payment-status'];
-	$date   = sanitize_text_field( $data['give-payment-date'] );
-	$hour   = sanitize_text_field( $data['give-payment-time-hour'] );
+	$date   = sanitize_text_field($data['give-payment-date']);
+	$hour   = sanitize_text_field($data['give-payment-time-hour']);
 
 	// Restrict to our high and low
-	if ( $hour > 23 ) {
+	if ($hour > 23) {
 		$hour = 23;
-	} elseif ( $hour < 0 ) {
+	} elseif ($hour < 0) {
 		$hour = 00;
 	}
 
-	$minute = sanitize_text_field( $data['give-payment-time-min'] );
+	$minute = sanitize_text_field($data['give-payment-time-min']);
 
 	// Restrict to our high and low
-	if ( $minute > 59 ) {
+	if ($minute > 59) {
 		$minute = 59;
-	} elseif ( $minute < 0 ) {
+	} elseif ($minute < 0) {
 		$minute = 00;
 	}
 
-	$address = array_map( 'trim', $data['give-payment-address'][0] );
+	$address = array_map('trim', $data['give-payment-address'][0]);
 
-	$curr_total = give_sanitize_amount( $payment->total );
-	$new_total  = give_sanitize_amount( $_POST['give-payment-total'] );
-	$date       = date( 'Y-m-d', strtotime( $date ) ) . ' ' . $hour . ':' . $minute . ':00';
+	$curr_total = give_sanitize_amount($payment->total);
+	$new_total  = give_sanitize_amount($_POST['give-payment-total']);
+	$date       = date('Y-m-d', strtotime($date)).' '.$hour.':'.$minute.':00';
 
-	$curr_customer_id = sanitize_text_field( $data['give-current-customer'] );
-	$new_customer_id  = sanitize_text_field( $data['customer-id'] );
+	$curr_customer_id = sanitize_text_field($data['give-current-customer']);
+	$new_customer_id  = sanitize_text_field($data['customer-id']);
 
-	do_action( 'give_update_edited_purchase', $payment_id );
+	do_action('give_update_edited_purchase', $payment_id);
 
 	$payment->date = $date;
 	$updated       = $payment->save();
 
-	if ( 0 === $updated ) {
-		wp_die( esc_attr__( 'Error Updating Payment', 'give' ), esc_attr__( 'Error', 'give' ), array( 'response' => 400 ) );
+	if (0 === $updated) {
+		wp_die(esc_attr__('Error Updating Payment', 'give'), esc_attr__('Error', 'give'), array('response' => 400));
 	}
 
 	$customer_changed = false;
 
-	if ( isset( $data['give-new-customer'] ) && $data['give-new-customer'] == '1' ) {
+	if (isset($data['give-new-customer']) && $data['give-new-customer'] == '1') {
 
-		$email = isset( $data['give-new-customer-email'] ) ? sanitize_text_field( $data['give-new-customer-email'] ) : '';
-		$names = isset( $data['give-new-customer-name'] ) ? sanitize_text_field( $data['give-new-customer-name'] ) : '';
+		$email = isset($data['give-new-customer-email']) ? sanitize_text_field($data['give-new-customer-email']) : '';
+		$names = isset($data['give-new-customer-name']) ? sanitize_text_field($data['give-new-customer-name']) : '';
 
-		if ( empty( $email ) || empty( $names ) ) {
-			wp_die( esc_attr__( 'New Customers require a name and email address', 'give' ) );
+		if (empty($email) || empty($names)) {
+			wp_die(esc_attr__('New Customers require a name and email address', 'give'));
 		}
 
-		$customer = new Give_Customer( $email );
-		if ( empty( $customer->id ) ) {
-			$customer_data = array( 'name' => $names, 'email' => $email );
-			$user_id       = email_exists( $email );
-			if ( false !== $user_id ) {
+		$customer = new Give_Customer($email);
+		if (empty($customer->id)) {
+			$customer_data = array('name' => $names, 'email' => $email);
+			$user_id       = email_exists($email);
+			if (false !== $user_id) {
 				$customer_data['user_id'] = $user_id;
 			}
 
-			if ( ! $customer->create( $customer_data ) ) {
+			if ( ! $customer->create($customer_data)) {
 				// Failed to crete the new donor, assume the previous donor
 				$customer_changed = false;
-				$customer         = new Give_Customer( $curr_customer_id );
-				give_set_error( 'give-payment-new-customer-fail', __( 'Error creating new donor', 'give' ) );
+				$customer         = new Give_Customer($curr_customer_id);
+				give_set_error('give-payment-new-customer-fail', __('Error creating new donor', 'give'));
 			}
 		}
 
 		$new_customer_id = $customer->id;
 
-		$previous_customer = new Give_Customer( $curr_customer_id );
+		$previous_customer = new Give_Customer($curr_customer_id);
 
 		$customer_changed = true;
 
-	} elseif ( $curr_customer_id !== $new_customer_id ) {
+	} elseif ($curr_customer_id !== $new_customer_id) {
 
-		$customer = new Give_Customer( $new_customer_id );
+		$customer = new Give_Customer($new_customer_id);
 		$email    = $customer->email;
 		$names    = $customer->name;
 
-		$previous_customer = new Give_Customer( $curr_customer_id );
+		$previous_customer = new Give_Customer($curr_customer_id);
 
 		$customer_changed = true;
 
 	} else {
 
-		$customer = new Give_Customer( $curr_customer_id );
+		$customer = new Give_Customer($curr_customer_id);
 		$email    = $customer->email;
 		$names    = $customer->name;
 
@@ -133,29 +133,29 @@ 
 
 
 	// Setup first and last name from input values
-	$names      = explode( ' ', $names );
-	$first_name = ! empty( $names[0] ) ? $names[0] : '';
+	$names      = explode(' ', $names);
+	$first_name = ! empty($names[0]) ? $names[0] : '';
 	$last_name  = '';
-	if ( ! empty( $names[1] ) ) {
-		unset( $names[0] );
-		$last_name = implode( ' ', $names );
+	if ( ! empty($names[1])) {
+		unset($names[0]);
+		$last_name = implode(' ', $names);
 	}
 
 
-	if ( $customer_changed ) {
+	if ($customer_changed) {
 
 		// Remove the stats and payment from the previous customer and attach it to the new customer
-		$previous_customer->remove_payment( $payment_id, false );
-		$customer->attach_payment( $payment_id, false );
+		$previous_customer->remove_payment($payment_id, false);
+		$customer->attach_payment($payment_id, false);
 
 		// If purchase was completed and not ever refunded, adjust stats of customers
-		if ( 'revoked' == $status || 'publish' == $status ) {
+		if ('revoked' == $status || 'publish' == $status) {
 
 			$previous_customer->decrease_purchase_count();
-			$previous_customer->decrease_value( $new_total );
+			$previous_customer->decrease_value($new_total);
 
 			$customer->increase_purchase_count();
-			$customer->increase_value( $new_total );
+			$customer->increase_value($new_total);
 		}
 
 		$payment->customer_id = $customer->id;
@@ -171,10 +171,10 @@ 
 
 
 	// Check for payment notes
-	if ( ! empty( $data['give-payment-note'] ) ) {
+	if ( ! empty($data['give-payment-note'])) {
 
-		$note = wp_kses( $data['give-payment-note'], array() );
-		give_insert_payment_note( $payment_id, $note );
+		$note = wp_kses($data['give-payment-note'], array());
+		give_insert_payment_note($payment_id, $note);
 
 	}
 
@@ -182,17 +182,17 @@ 
 	$payment->status = $status;
 
 	// Adjust total store earnings if the payment total has been changed
-	if ( $new_total !== $curr_total && ( 'publish' == $status || 'revoked' == $status ) ) {
+	if ($new_total !== $curr_total && ('publish' == $status || 'revoked' == $status)) {
 
-		if ( $new_total > $curr_total ) {
+		if ($new_total > $curr_total) {
 			// Increase if our new total is higher
 			$difference = $new_total - $curr_total;
-			give_increase_total_earnings( $difference );
+			give_increase_total_earnings($difference);
 
-		} elseif ( $curr_total > $new_total ) {
+		} elseif ($curr_total > $new_total) {
 			// Decrease if our new total is lower
 			$difference = $curr_total - $new_total;
-			give_decrease_total_earnings( $difference );
+			give_decrease_total_earnings($difference);
 
 		}
 
@@ -200,13 +200,13 @@ 
 
 	$payment->save();
 
-	do_action( 'give_updated_edited_purchase', $payment_id );
+	do_action('give_updated_edited_purchase', $payment_id);
 
-	wp_safe_redirect( admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=payment-updated&id=' . $payment_id ) );
+	wp_safe_redirect(admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=payment-updated&id='.$payment_id));
 	exit;
 }
 
-add_action( 'give_update_payment_details', 'give_update_payment_details' );
+add_action('give_update_payment_details', 'give_update_payment_details');
 
 /**
  * Trigger a Purchase Deletion
@@ -217,48 +217,48 @@ 
  *
  * @return void
  */
-function give_trigger_purchase_delete( $data ) {
-	if ( wp_verify_nonce( $data['_wpnonce'], 'give_payment_nonce' ) ) {
+function give_trigger_purchase_delete($data) {
+	if (wp_verify_nonce($data['_wpnonce'], 'give_payment_nonce')) {
 
-		$payment_id = absint( $data['purchase_id'] );
+		$payment_id = absint($data['purchase_id']);
 
-		if ( ! current_user_can( 'edit_give_payments', $payment_id ) ) {
-			wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ( ! current_user_can('edit_give_payments', $payment_id)) {
+			wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 		}
 
-		give_delete_purchase( $payment_id );
-		wp_redirect( admin_url( '/edit.php?post_type=give_forms&page=give-payment-history&give-message=payment_deleted' ) );
+		give_delete_purchase($payment_id);
+		wp_redirect(admin_url('/edit.php?post_type=give_forms&page=give-payment-history&give-message=payment_deleted'));
 		give_die();
 	}
 }
 
-add_action( 'give_delete_payment', 'give_trigger_purchase_delete' );
+add_action('give_delete_payment', 'give_trigger_purchase_delete');
 
 /**
  * AJAX Store Payment Note
  */
 function give_ajax_store_payment_note() {
 
-	$payment_id = absint( $_POST['payment_id'] );
-	$note       = wp_kses( $_POST['note'], array() );
+	$payment_id = absint($_POST['payment_id']);
+	$note       = wp_kses($_POST['note'], array());
 
-	if ( ! current_user_can( 'edit_give_payments', $payment_id ) ) {
-		wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $payment_id)) {
+		wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	if ( empty( $payment_id ) ) {
-		die( '-1' );
+	if (empty($payment_id)) {
+		die('-1');
 	}
 
-	if ( empty( $note ) ) {
-		die( '-1' );
+	if (empty($note)) {
+		die('-1');
 	}
 
-	$note_id = give_insert_payment_note( $payment_id, $note );
-	die( give_get_payment_note_html( $note_id ) );
+	$note_id = give_insert_payment_note($payment_id, $note);
+	die(give_get_payment_note_html($note_id));
 }
 
-add_action( 'wp_ajax_give_insert_payment_note', 'give_ajax_store_payment_note' );
+add_action('wp_ajax_give_insert_payment_note', 'give_ajax_store_payment_note');
 
 /**
  * Triggers a payment note deletion without ajax
@@ -269,24 +269,24 @@ 
  *
  * @return void
  */
-function give_trigger_payment_note_deletion( $data ) {
+function give_trigger_payment_note_deletion($data) {
 
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give_delete_payment_note_' . $data['note_id'] ) ) {
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give_delete_payment_note_'.$data['note_id'])) {
 		return;
 	}
 
-	if ( ! current_user_can( 'edit_give_payments', $data['payment_id'] ) ) {
-		wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $data['payment_id'])) {
+		wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	$edit_order_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=payment-note-deleted&id=' . absint( $data['payment_id'] ) );
+	$edit_order_url = admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&give-message=payment-note-deleted&id='.absint($data['payment_id']));
 
-	give_delete_payment_note( $data['note_id'], $data['payment_id'] );
+	give_delete_payment_note($data['note_id'], $data['payment_id']);
 
-	wp_redirect( $edit_order_url );
+	wp_redirect($edit_order_url);
 }
 
-add_action( 'give_delete_payment_note', 'give_trigger_payment_note_deletion' );
+add_action('give_delete_payment_note', 'give_trigger_payment_note_deletion');
 
 /**
  * Delete a payment note deletion with ajax
@@ -299,16 +299,16 @@ 
  */
 function give_ajax_delete_payment_note() {
 
-	if ( ! current_user_can( 'edit_give_payments', $_POST['payment_id'] ) ) {
-		wp_die( __( 'You do not have permission to edit this payment record', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('edit_give_payments', $_POST['payment_id'])) {
+		wp_die(__('You do not have permission to edit this payment record', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	if ( give_delete_payment_note( $_POST['note_id'], $_POST['payment_id'] ) ) {
-		die( '1' );
+	if (give_delete_payment_note($_POST['note_id'], $_POST['payment_id'])) {
+		die('1');
 	} else {
-		die( '-1' );
+		die('-1');
 	}
 
 }
 
-add_action( 'wp_ajax_give_delete_payment_note', 'give_ajax_delete_payment_note' );
\ No newline at end of file
+add_action('wp_ajax_give_delete_payment_note', 'give_ajax_delete_payment_note');
\ No newline at end of file

includes/admin/forms/metabox.php

Spacing +182 added lines, -182 removed lines

@@ -10,11 +10,11 @@ 
  */

 

 // Exit if accessed directly

-if ( ! defined( 'ABSPATH' ) ) {

+if ( ! defined('ABSPATH')) {

 	exit;

 }

 

-add_filter( 'cmb2_meta_boxes', 'give_single_forms_cmb2_metaboxes' );

+add_filter('cmb2_meta_boxes', 'give_single_forms_cmb2_metaboxes');

 

 /**

  * Define the metabox and field configurations.

@@ -23,23 +23,23 @@ 
  *

  * @return array

  */

-function give_single_forms_cmb2_metaboxes( array $meta_boxes ) {

+function give_single_forms_cmb2_metaboxes(array $meta_boxes) {

 

 	$post_id               = give_get_admin_post_id();

-	$price                 = give_get_form_price( $post_id );

-	$custom_amount_minimum = give_get_form_minimum_price( $post_id );

-	$goal                  = give_get_form_goal( $post_id );

-	$variable_pricing      = give_has_variable_prices( $post_id );

-	$prices                = give_get_variable_prices( $post_id );

+	$price                 = give_get_form_price($post_id);

+	$custom_amount_minimum = give_get_form_minimum_price($post_id);

+	$goal                  = give_get_form_goal($post_id);

+	$variable_pricing      = give_has_variable_prices($post_id);

+	$prices                = give_get_variable_prices($post_id);

 

 	//No empty prices - min. 1.00 for new forms

-	if ( empty( $price ) && is_null( $post_id ) ) {

-		$price = esc_attr( give_format_amount( '1.00' ) );

+	if (empty($price) && is_null($post_id)) {

+		$price = esc_attr(give_format_amount('1.00'));

 	}

 

 	//Min. $1.00 for new forms

-	if ( empty( $custom_amount_minimum ) ) {

-		$custom_amount_minimum = esc_attr( give_format_amount( '1.00' ) );

+	if (empty($custom_amount_minimum)) {

+		$custom_amount_minimum = esc_attr(give_format_amount('1.00'));

 	}

 

 	// Start with an underscore to hide fields from custom fields list

@@ -48,302 +48,302 @@ 
 	/**

 	 * Repeatable Field Groups

 	 */

-	$meta_boxes['form_field_options'] = apply_filters( 'give_forms_field_options', array(

+	$meta_boxes['form_field_options'] = apply_filters('give_forms_field_options', array(

 		'id'           => 'form_field_options',

-		'title'        => __( 'Donation Options', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => __('Donation Options', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

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

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

 				//Donation Option

 				array(

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

-					'description' => __( 'Would you like this form to have one set donation price or multiple levels (for example, $10, $20, $50)?', 'give' ),

-					'id'          => $prefix . 'price_option',

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

+					'description' => __('Would you like this form to have one set donation price or multiple levels (for example, $10, $20, $50)?', 'give'),

+					'id'          => $prefix.'price_option',

 					'type'        => 'radio_inline',

 					'default'     => 'set',

-					'options'     => apply_filters( 'give_forms_price_options', array(

-						'set'   => __( 'Set Donation', 'give' ),

-						'multi' => __( 'Multi-level Donation', 'give' ),

-					) ),

+					'options'     => apply_filters('give_forms_price_options', array(

+						'set'   => __('Set Donation', 'give'),

+						'multi' => __('Multi-level Donation', 'give'),

+					)),

 				),

 				array(

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

-					'description'  => __( 'This is the set donation amount for this form. If you have a "Custom Amount Minimum" set, make sure it is less than this amount.', 'give' ),

-					'id'           => $prefix . 'set_price',

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

+					'description'  => __('This is the set donation amount for this form. If you have a "Custom Amount Minimum" set, make sure it is less than this amount.', 'give'),

+					'id'           => $prefix.'set_price',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '1.00' ),

-						'value'       => give_format_amount( $price ),

+						'placeholder' => give_format_amount('1.00'),

+						'value'       => give_format_amount($price),

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 				//Donation levels: Header

 				array(

-					'id'   => $prefix . 'levels_header',

+					'id'   => $prefix.'levels_header',

 					'type' => 'levels_repeater_header',

 				),

 				//Donation Levels: Repeatable CMB2 Group

 				array(

-					'id'          => $prefix . 'donation_levels',

+					'id'          => $prefix.'donation_levels',

 					'type'        => 'group',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'add_button'    => __( 'Add Level', 'give' ),

-						'remove_button' => __( '<span class="dashicons dashicons-no"></span>', 'give' ),

+						'add_button'    => __('Add Level', 'give'),

+						'remove_button' => __('<span class="dashicons dashicons-no"></span>', 'give'),

 						'sortable'      => true, // beta

 					),

 					// Fields array works the same, except id's only need to be unique for this group. Prefix is not needed.

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

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

 						array(

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

-							'id'   => $prefix . 'id',

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

+							'id'   => $prefix.'id',

 							'type' => 'levels_id',

 						),

 						array(

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

-							'id'           => $prefix . 'amount',

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

+							'id'           => $prefix.'amount',

 							'type'         => 'text_small',

-							'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol  give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-							'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol  give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+							'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol  give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+							'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol  give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 							'attributes'   => array(

-								'placeholder' => give_format_amount( '1.00' ),

+								'placeholder' => give_format_amount('1.00'),

 								'class'       => 'cmb-type-text-small give-money-field',

 							),

 							'before'       => 'give_format_admin_multilevel_amount',

 						),

 						array(

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

-							'id'         => $prefix . 'text',

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

+							'id'         => $prefix.'text',

 							'type'       => 'text',

 							'attributes' => array(

-								'placeholder' => __( 'Donation Level', 'give' ),

+								'placeholder' => __('Donation Level', 'give'),

 								'class'       => 'give-multilevel-text-field',

 							),

 						),

 						array(

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

-							'id'   => $prefix . 'default',

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

+							'id'   => $prefix.'default',

 							'type' => 'give_default_radio_inline'

 						),

-					) ),

+					)),

 				),

 				//Display Style

 				array(

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

-					'description' => __( 'Set how the donations levels will display on the form.', 'give' ),

-					'id'          => $prefix . 'display_style',

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

+					'description' => __('Set how the donations levels will display on the form.', 'give'),

+					'id'          => $prefix.'display_style',

 					'type'        => 'radio_inline',

 					'default'     => 'buttons',

 					'options'     => array(

-						'buttons'  => __( 'Buttons', 'give' ),

-						'radios'   => __( 'Radios', 'give' ),

-						'dropdown' => __( 'Dropdown', 'give' ),

+						'buttons'  => __('Buttons', 'give'),

+						'radios'   => __('Radios', 'give'),

+						'dropdown' => __('Dropdown', 'give'),

 					),

 				),

 				//Custom Amount

 				array(

-					'name'        => __( 'Custom Amount', 'give' ),

-					'description' => __( 'Do you want the user to be able to input their own donation amount?', 'give' ),

-					'id'          => $prefix . 'custom_amount',

+					'name'        => __('Custom Amount', 'give'),

+					'description' => __('Do you want the user to be able to input their own donation amount?', 'give'),

+					'id'          => $prefix.'custom_amount',

 					'type'        => 'radio_inline',

 					'default'     => 'no',

 					'options'     => array(

-						'yes' => __( 'Yes', 'give' ),

-						'no'  => __( 'No', 'give' ),

+						'yes' => __('Yes', 'give'),

+						'no'  => __('No', 'give'),

 					),

 				),

 				array(

-					'name'         => __( 'Custom Amount Minimum', 'give' ),

-					'description'  => __( 'If you would like to set a minimum custom donation amount please enter it here.', 'give' ),

-					'id'           => $prefix . 'custom_amount_minimum',

+					'name'         => __('Custom Amount Minimum', 'give'),

+					'description'  => __('If you would like to set a minimum custom donation amount please enter it here.', 'give'),

+					'id'           => $prefix.'custom_amount_minimum',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '1.00' ),

-						'value'       => give_format_amount( $custom_amount_minimum ),

+						'placeholder' => give_format_amount('1.00'),

+						'value'       => give_format_amount($custom_amount_minimum),

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 				array(

-					'name'        => __( 'Custom Amount Text', 'give' ),

-					'description' => __( 'This text appears as a label below the custom amount field for set donation forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option).', 'give' ),

-					'id'          => $prefix . 'custom_amount_text',

+					'name'        => __('Custom Amount Text', 'give'),

+					'description' => __('This text appears as a label below the custom amount field for set donation forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option).', 'give'),

+					'id'          => $prefix.'custom_amount_text',

 					'type'        => 'text',

 					'row_classes' => 'give-subfield',

 					'attributes'  => array(

 						'rows'        => 3,

-						'placeholder' => __( 'Give a Custom Amount', 'give' ),

+						'placeholder' => __('Give a Custom Amount', 'give'),

 					),

 				),

 				//Goals

 				array(

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

-					'description' => __( 'Do you want to set a donation goal for this form?', 'give' ),

-					'id'          => $prefix . 'goal_option',

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

+					'description' => __('Do you want to set a donation goal for this form?', 'give'),

+					'id'          => $prefix.'goal_option',

 					'type'        => 'radio_inline',

 					'default'     => 'no',

 					'options'     => array(

-						'yes' => __( 'Yes', 'give' ),

-						'no'  => __( 'No', 'give' ),

+						'yes' => __('Yes', 'give'),

+						'no'  => __('No', 'give'),

 					),

 				),

 				array(

-					'name'         => __( 'Goal Amount', 'give' ),

-					'description'  => __( 'This is the monetary goal amount you want to reach for this donation form.', 'give' ),

-					'id'           => $prefix . 'set_goal',

+					'name'         => __('Goal Amount', 'give'),

+					'description'  => __('This is the monetary goal amount you want to reach for this donation form.', 'give'),

+					'id'           => $prefix.'set_goal',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '0.00' ),

-						'value'       => isset( $goal ) ? esc_attr( give_format_amount( $goal ) ) : '',

+						'placeholder' => give_format_amount('0.00'),

+						'value'       => isset($goal) ? esc_attr(give_format_amount($goal)) : '',

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 

 				array(

-					'name'        => __( 'Goal Format', 'give' ),

-					'description' => __( 'Would you like to display the total amount raised based on your monetary goal or a percentage? For instance, "$500 of $1,000 raised" or "50% funded".', 'give' ),

-					'id'          => $prefix . 'goal_format',

+					'name'        => __('Goal Format', 'give'),

+					'description' => __('Would you like to display the total amount raised based on your monetary goal or a percentage? For instance, "$500 of $1,000 raised" or "50% funded".', 'give'),

+					'id'          => $prefix.'goal_format',

 					'type'        => 'radio_inline',

 					'default'     => 'amount',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'amount'     => __( 'Amount ', 'give' ),

-						'percentage' => __( 'Percentage', 'give' ),

+						'amount'     => __('Amount ', 'give'),

+						'percentage' => __('Percentage', 'give'),

 					),

 				),

 				array(

-					'name'        => __( 'Goal Progress Bar Color', 'give' ),

-					'id'          => $prefix . 'goal_color',

+					'name'        => __('Goal Progress Bar Color', 'give'),

+					'id'          => $prefix.'goal_color',

 					'type'        => 'colorpicker',

 					'row_classes' => 'give-subfield',

 					'default'     => '#2bc253',

 				),

 			)

 		)

-	) );

+	));

 

 

 	/**

 	 * Content Field

 	 */

-	$meta_boxes['form_content_options'] = apply_filters( 'give_forms_content_options', array(

+	$meta_boxes['form_content_options'] = apply_filters('give_forms_content_options', array(

 		'id'           => 'form_content_options',

-		'title'        => __( 'Form Content', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => __('Form Content', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

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

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

 				//Donation Option

 				array(

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

-					'description' => __( 'Do you want to display content? If you select "Yes" a WYSIWYG editor will appear which you will be able to enter content to display above or below the form.', 'give' ),

-					'id'          => $prefix . 'content_option',

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

+					'description' => __('Do you want to display content? If you select "Yes" a WYSIWYG editor will appear which you will be able to enter content to display above or below the form.', 'give'),

+					'id'          => $prefix.'content_option',

 					'type'        => 'select',

-					'options'     => apply_filters( 'give_forms_content_options_select', array(

-							'none'           => __( 'No content', 'give' ),

-							'give_pre_form'  => __( 'Yes, display content ABOVE the form fields', 'give' ),

-							'give_post_form' => __( 'Yes, display content BELOW the form fields', 'give' ),

+					'options'     => apply_filters('give_forms_content_options_select', array(

+							'none'           => __('No content', 'give'),

+							'give_pre_form'  => __('Yes, display content ABOVE the form fields', 'give'),

+							'give_post_form' => __('Yes, display content BELOW the form fields', 'give'),

 						)

 					),

 					'default'     => 'none',

 				),

 				array(

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

-					'description' => __( 'This content will display on the single give form page.', 'give' ),

-					'id'          => $prefix . 'form_content',

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

+					'description' => __('This content will display on the single give form page.', 'give'),

+					'id'          => $prefix.'form_content',

 					'row_classes' => 'give-subfield',

 					'type'        => 'wysiwyg'

 				),

 			)

 		)

-	) );

+	));

 

 

 	/**

 	 * Display Options

 	 */

-	$meta_boxes['form_display_options'] = apply_filters( 'give_form_display_options', array(

+	$meta_boxes['form_display_options'] = apply_filters('give_form_display_options', array(

 			'id'           => 'form_display_options',

-			'title'        => __( 'Form Display Options', 'give' ),

-			'object_types' => array( 'give_forms' ),

+			'title'        => __('Form Display Options', 'give'),

+			'object_types' => array('give_forms'),

 			'context'      => 'normal', //  'normal', 'advanced', or 'side'

 			'priority'     => 'high', //Show above Content WYSIWYG

 			'show_names'   => true, // Show field names on the left

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

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

 					array(

-						'name'    => __( 'Payment Fields', 'give' ),

-						'desc'    => __( 'How would you like to display payment information for this form? The "Show on Page" option will display the entire form when the page loads. "Reveal Upon Click" places a button below the donation fields and upon click slides into view the rest of the fields. "Modal Window Upon Click" is a similar option, rather than sliding into view the fields they will open in a shadow box or "modal" window.', 'give' ),

-						'id'      => $prefix . 'payment_display',

+						'name'    => __('Payment Fields', 'give'),

+						'desc'    => __('How would you like to display payment information for this form? The "Show on Page" option will display the entire form when the page loads. "Reveal Upon Click" places a button below the donation fields and upon click slides into view the rest of the fields. "Modal Window Upon Click" is a similar option, rather than sliding into view the fields they will open in a shadow box or "modal" window.', 'give'),

+						'id'      => $prefix.'payment_display',

 						'type'    => 'select',

 						'options' => array(

-							'onpage' => __( 'Show on Page', 'give' ),

-							'reveal' => __( 'Reveal Upon Click', 'give' ),

-							'modal'  => __( 'Modal Window Upon Click', 'give' ),

+							'onpage' => __('Show on Page', 'give'),

+							'reveal' => __('Reveal Upon Click', 'give'),

+							'modal'  => __('Modal Window Upon Click', 'give'),

 						),

 						'default' => 'onpage',

 					),

 					array(

-						'id'          => $prefix . 'reveal_label',

-						'name'        => __( 'Reveal / Modal Open Text', 'give' ),

-						'desc'        => __( 'The button label for completing the donation.', 'give' ),

+						'id'          => $prefix.'reveal_label',

+						'name'        => __('Reveal / Modal Open Text', 'give'),

+						'desc'        => __('The button label for completing the donation.', 'give'),

 						'type'        => 'text_small',

 						'row_classes' => 'give-subfield',

 						'attributes'  => array(

-							'placeholder' => __( 'Donate Now', 'give' ),

+							'placeholder' => __('Donate Now', 'give'),

 						),

 					),

 					array(

-						'id'         => $prefix . 'checkout_label',

-						'name'       => __( 'Complete Donation Text', 'give' ),

-						'desc'       => __( 'The button label for completing a donation.', 'give' ),

+						'id'         => $prefix.'checkout_label',

+						'name'       => __('Complete Donation Text', 'give'),

+						'desc'       => __('The button label for completing a donation.', 'give'),

 						'type'       => 'text_small',

 						'attributes' => array(

-							'placeholder' => __( 'Donate Now', 'give' ),

+							'placeholder' => __('Donate Now', 'give'),

 						),

 					),

 					array(

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

-						'desc' => __( 'By default, the gateway for this form will inherit the global default gateway (set under Give > Settings > Payment Gateways). This option allows you to customize the default gateway for this form only.', 'give' ),

-						'id'   => $prefix . 'default_gateway',

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

+						'desc' => __('By default, the gateway for this form will inherit the global default gateway (set under Give > Settings > Payment Gateways). This option allows you to customize the default gateway for this form only.', 'give'),

+						'id'   => $prefix.'default_gateway',

 						'type' => 'default_gateway'

 					),

 					array(

-						'name' => __( 'Disable Guest Donations', 'give' ),

-						'desc' => __( 'Do you want to require users be logged-in to make donations?', 'give' ),

-						'id'   => $prefix . 'logged_in_only',

+						'name' => __('Disable Guest Donations', 'give'),

+						'desc' => __('Do you want to require users be logged-in to make donations?', 'give'),

+						'id'   => $prefix.'logged_in_only',

 						'type' => 'checkbox'

 					),

 					array(

-						'name'    => __( 'Register / Login Form', 'give' ),

-						'desc'    => __( 'Display the registration and login forms in the payment section for non-logged-in users.', 'give' ),

-						'id'      => $prefix . 'show_register_form',

+						'name'    => __('Register / Login Form', 'give'),

+						'desc'    => __('Display the registration and login forms in the payment section for non-logged-in users.', 'give'),

+						'id'      => $prefix.'show_register_form',

 						'type'    => 'select',

 						'options' => array(

-							'both'         => __( 'Registration and Login Forms', 'give' ),

-							'registration' => __( 'Registration Form Only', 'give' ),

-							'login'        => __( 'Login Form Only', 'give' ),

-							'none'         => __( 'None', 'give' ),

+							'both'         => __('Registration and Login Forms', 'give'),

+							'registration' => __('Registration Form Only', 'give'),

+							'login'        => __('Login Form Only', 'give'),

+							'none'         => __('None', 'give'),

 						),

 						'default' => 'none',

 					),

 					array(

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

-						'desc'    => sprintf( __( 'Select the <a href="%s" target="_blank">floating labels</a> setting for this Give form.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give' ), esc_url( "http://bradfrost.com/blog/post/float-label-pattern/" ) ),

-						'id'      => $prefix . 'form_floating_labels',

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

+						'desc'    => sprintf(__('Select the <a href="%s" target="_blank">floating labels</a> setting for this Give form.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give'), esc_url("http://bradfrost.com/blog/post/float-label-pattern/")),

+						'id'      => $prefix.'form_floating_labels',

 						'type'    => 'select',

 						'options' => array(

-							''         => __( 'Use the global setting', 'give' ),

-							'enabled'  => __( 'Enabled', 'give' ),

-							'disabled' => __( 'Disabled', 'give' ),

+							''         => __('Use the global setting', 'give'),

+							'enabled'  => __('Enabled', 'give'),

+							'disabled' => __('Disabled', 'give'),

 						),

 						'default' => 'none',

 					)

@@ -355,47 +355,47 @@ 
 	/**

 	 * Terms & Conditions

 	 */

-	$meta_boxes['form_terms_options'] = apply_filters( 'give_forms_terms_options', array(

+	$meta_boxes['form_terms_options'] = apply_filters('give_forms_terms_options', array(

 		'id'           => 'form_terms_options',

-		'title'        => __( 'Terms and Conditions', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => __('Terms and Conditions', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

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

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

 				//Donation Option

 				array(

-					'name'        => __( 'Terms and Conditions', 'give' ),

-					'description' => __( 'Do you want to require the user to agree to terms and conditions prior to being able to complete their donation?', 'give' ),

-					'id'          => $prefix . 'terms_option',

+					'name'        => __('Terms and Conditions', 'give'),

+					'description' => __('Do you want to require the user to agree to terms and conditions prior to being able to complete their donation?', 'give'),

+					'id'          => $prefix.'terms_option',

 					'type'        => 'select',

-					'options'     => apply_filters( 'give_forms_content_options_select', array(

-							'none' => __( 'No', 'give' ),

-							'yes'  => __( 'Yes', 'give' ),

+					'options'     => apply_filters('give_forms_content_options_select', array(

+							'none' => __('No', 'give'),

+							'yes'  => __('Yes', 'give'),

 						)

 					),

 					'default'     => 'none',

 				),

 				array(

-					'id'          => $prefix . 'agree_label',

-					'name'        => __( 'Agree to Terms Label', 'give' ),

-					'desc'        => __( 'The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder.', 'give' ),

+					'id'          => $prefix.'agree_label',

+					'name'        => __('Agree to Terms Label', 'give'),

+					'desc'        => __('The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder.', 'give'),

 					'type'        => 'text',

 					'row_classes' => 'give-subfield',

 					'size'        => 'regular',

 					'attributes'  => array(

-						'placeholder' => __( 'Agree to Terms?', 'give' ),

+						'placeholder' => __('Agree to Terms?', 'give'),

 					),

 				),

 				array(

-					'id'          => $prefix . 'agree_text',

+					'id'          => $prefix.'agree_text',

 					'row_classes' => 'give-subfield',

-					'name'        => __( 'Agreement Text', 'give' ),

-					'desc'        => __( 'This is the actual text which the user will have to agree to in order to make a donation.', 'give' ),

+					'name'        => __('Agreement Text', 'give'),

+					'desc'        => __('This is the actual text which the user will have to agree to in order to make a donation.', 'give'),

 					'type'        => 'wysiwyg'

 				),

 			)

 		)

-	) );

+	));

 

 	return $meta_boxes;

 

@@ -409,18 +409,18 @@ 
 

 	<div class="table-container">

 		<div class="table-row">

-			<div class="table-cell col-amount"><?php _e( 'Amount', 'give' ); ?></div>

-			<div class="table-cell col-text"><?php _e( 'Text', 'give' ); ?></div>

-			<div class="table-cell col-default"><?php _e( 'Default', 'give' ); ?></div>

-			<?php do_action( 'give_donation_levels_table_head' ); ?>

-			<div class="table-cell col-sort"><?php _e( 'Sort', 'give' ); ?></div>

+			<div class="table-cell col-amount"><?php _e('Amount', 'give'); ?></div>

+			<div class="table-cell col-text"><?php _e('Text', 'give'); ?></div>

+			<div class="table-cell col-default"><?php _e('Default', 'give'); ?></div>

+			<?php do_action('give_donation_levels_table_head'); ?>

+			<div class="table-cell col-sort"><?php _e('Sort', 'give'); ?></div>

 

 		</div>

 	</div>

 

 	<?php

 }

-add_action( 'cmb2_render_levels_repeater_header', 'give_cmb_render_levels_repeater_header', 10 );

+add_action('cmb2_render_levels_repeater_header', 'give_cmb_render_levels_repeater_header', 10);

 

 

 /**

@@ -437,24 +437,24 @@ 
  * @param $object_type

  * @param $field_type_object

  */

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

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

 

-	$escaped_value = ( isset( $escaped_value['level_id'] ) ? $escaped_value['level_id'] : '' );

+	$escaped_value = (isset($escaped_value['level_id']) ? $escaped_value['level_id'] : '');

 

 	$field_options_array = array(

 		'class' => 'give-hidden give-level-id-input',

-		'name'  => $field_type_object->_name( '[level_id]' ),

-		'id'    => $field_type_object->_id( '_level_id' ),

+		'name'  => $field_type_object->_name('[level_id]'),

+		'id'    => $field_type_object->_id('_level_id'),

 		'value' => $escaped_value,

 		'type'  => 'number',

 		'desc'  => '',

 	);

 

-	echo '<p class="give-level-id">' . $escaped_value . '</p>';

-	echo $field_type_object->input( $field_options_array );

+	echo '<p class="give-level-id">'.$escaped_value.'</p>';

+	echo $field_type_object->input($field_options_array);

 

 }

-add_action( 'cmb2_render_levels_id', 'give_cmb_render_levels_id', 10, 5 );

+add_action('cmb2_render_levels_id', 'give_cmb_render_levels_id', 10, 5);

 

 

 /**

@@ -466,13 +466,13 @@ 
  * @param $object_type

  * @param $field_type_object

  */

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

-	echo '<input type="radio" class="cmb2-option donation-level-radio" name="' . $field_object->args['_name'] . '" id="' . $field_object->args['id'] . '" value="default" ' . checked( 'default', $escaped_value, false ) . '>';

-	echo '<label for="' . $field_object->args['id'] . '">Default</label>';

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

+	echo '<input type="radio" class="cmb2-option donation-level-radio" name="'.$field_object->args['_name'].'" id="'.$field_object->args['id'].'" value="default" '.checked('default', $escaped_value, false).'>';

+	echo '<label for="'.$field_object->args['id'].'">Default</label>';

 

 }

 

-add_action( 'cmb2_render_give_default_radio_inline', 'give_cmb_give_default_radio_inline', 10, 5 );

+add_action('cmb2_render_give_default_radio_inline', 'give_cmb_give_default_radio_inline', 10, 5);

 

 

 /**

@@ -482,20 +482,20 @@ 
  */

 function give_add_shortcode_to_publish_metabox() {

 

-	if ( 'give_forms' !== get_post_type() ) {

+	if ('give_forms' !== get_post_type()) {

 		return false;

 	}

 

 	global $post;

 

 	//Only enqueue scripts for CPT on post type screen

-	if ( 'give_forms' === $post->post_type ) {

+	if ('give_forms' === $post->post_type) {

 		//Shortcode column with select all input

-		$shortcode = htmlentities( '[give_form id="' . $post->ID . '"]' );

-		echo '<div class="shortcode-wrap box-sizing"><label>' . __( 'Give Form Shortcode:', 'give' ) . '</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="' . $shortcode . '"></div>';

+		$shortcode = htmlentities('[give_form id="'.$post->ID.'"]');

+		echo '<div class="shortcode-wrap box-sizing"><label>'.__('Give Form Shortcode:', 'give').'</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="'.$shortcode.'"></div>';

 

 	}

 

 }

 

-add_action( 'post_submitbox_misc_actions', 'give_add_shortcode_to_publish_metabox' );

+add_action('post_submitbox_misc_actions', 'give_add_shortcode_to_publish_metabox');

includes/admin/reporting/reports.php

Spacing +109 added lines, -109 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,36 +29,36 @@ 
  * @return void
  */
 function give_reports_page() {
-	$current_page = admin_url( 'edit.php?post_type=give_forms&page=give-reports' );
-	$active_tab   = isset( $_GET['tab'] ) ? $_GET['tab'] : 'reports';
+	$current_page = admin_url('edit.php?post_type=give_forms&page=give-reports');
+	$active_tab   = isset($_GET['tab']) ? $_GET['tab'] : 'reports';
 	?>
 	<div class="wrap">
 		<h1 class="nav-tab-wrapper">
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'reports',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Reports', 'give' ); ?></a>
-			<?php if ( current_user_can( 'export_give_reports' ) ) { ?>
-				<a href="<?php echo esc_url( add_query_arg( array(
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php _e('Reports', 'give'); ?></a>
+			<?php if (current_user_can('export_give_reports')) { ?>
+				<a href="<?php echo esc_url(add_query_arg(array(
 					'tab'              => 'export',
 					'settings-updated' => false
-				), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Export', 'give' ); ?></a>
+				), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php _e('Export', 'give'); ?></a>
 			<?php } ?>
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'logs',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Logs', 'give' ); ?></a>
-			<a href="<?php echo esc_url( add_query_arg( array(
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php _e('Logs', 'give'); ?></a>
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'tools',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'tools' ? 'nav-tab-active' : ''; ?>"><?php _e( 'Tools', 'give' ); ?></a>
-			<?php do_action( 'give_reports_tabs' ); ?>
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'tools' ? 'nav-tab-active' : ''; ?>"><?php _e('Tools', 'give'); ?></a>
+			<?php do_action('give_reports_tabs'); ?>
 		</h1>
 
 		<?php
-		do_action( 'give_reports_page_top' );
-		do_action( 'give_reports_tab_' . $active_tab );
-		do_action( 'give_reports_page_bottom' );
+		do_action('give_reports_page_top');
+		do_action('give_reports_tab_'.$active_tab);
+		do_action('give_reports_page_bottom');
 		?>
 	</div><!-- .wrap -->
 	<?php
@@ -72,13 +72,13 @@ 
  */
 function give_reports_default_views() {
 	$views = array(
-		'earnings' => __( 'Income', 'give' ),
+		'earnings' => __('Income', 'give'),
 		'forms'    => give_get_forms_label_plural(),
-		'donors'   => __( 'Donors', 'give' ),
-		'gateways' => __( 'Payment Methods', 'give' )
+		'donors'   => __('Donors', 'give'),
+		'gateways' => __('Payment Methods', 'give')
 	);
 
-	$views = apply_filters( 'give_report_views', $views );
+	$views = apply_filters('give_report_views', $views);
 
 	return $views;
 }
@@ -94,15 +94,15 @@ 
  * @return string $view Report View
  *
  */
-function give_get_reporting_view( $default = 'earnings' ) {
+function give_get_reporting_view($default = 'earnings') {
 
-	if ( ! isset( $_GET['view'] ) || ! in_array( $_GET['view'], array_keys( give_reports_default_views() ) ) ) {
+	if ( ! isset($_GET['view']) || ! in_array($_GET['view'], array_keys(give_reports_default_views()))) {
 		$view = $default;
 	} else {
 		$view = $_GET['view'];
 	}
 
-	return apply_filters( 'give_get_reporting_view', $view );
+	return apply_filters('give_get_reporting_view', $view);
 }
 
 /**
@@ -115,14 +115,14 @@ 
 	$current_view = 'earnings';
 	$views        = give_reports_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $views)) {
 		$current_view = $_GET['view'];
 	}
 
-	do_action( 'give_reports_view_' . $current_view );
+	do_action('give_reports_view_'.$current_view);
 }
 
-add_action( 'give_reports_tab_reports', 'give_reports_tab_reports' );
+add_action('give_reports_tab_reports', 'give_reports_tab_reports');
 
 /**
  * Renders the Reports Page Views Drop Downs
@@ -132,25 +132,25 @@ 
  */
 function give_report_views() {
 	$views        = give_reports_default_views();
-	$current_view = isset( $_GET['view'] ) ? $_GET['view'] : 'earnings';
-	do_action( 'give_report_view_actions_before' );
+	$current_view = isset($_GET['view']) ? $_GET['view'] : 'earnings';
+	do_action('give_report_view_actions_before');
 	?>
 	<form id="give-reports-filter" method="get">
 		<select id="give-reports-view" name="view">
-			<option value="-1"><?php _e( 'Report Type', 'give' ); ?></option>
-			<?php foreach ( $views as $view_id => $label ) : ?>
-				<option value="<?php echo esc_attr( $view_id ); ?>" <?php selected( $view_id, $current_view ); ?>><?php echo $label; ?></option>
+			<option value="-1"><?php _e('Report Type', 'give'); ?></option>
+			<?php foreach ($views as $view_id => $label) : ?>
+				<option value="<?php echo esc_attr($view_id); ?>" <?php selected($view_id, $current_view); ?>><?php echo $label; ?></option>
 			<?php endforeach; ?>
 		</select>
 
-		<?php do_action( 'give_report_view_actions' ); ?>
+		<?php do_action('give_report_view_actions'); ?>
 
 		<input type="hidden" name="post_type" value="give_forms"/>
 		<input type="hidden" name="page" value="give-reports"/>
-		<?php submit_button( __( 'Show', 'give' ), 'secondary', 'submit', false ); ?>
+		<?php submit_button(__('Show', 'give'), 'secondary', 'submit', false); ?>
 	</form>
 	<?php
-	do_action( 'give_report_view_actions_after' );
+	do_action('give_report_view_actions_after');
 }
 
 /**
@@ -163,18 +163,18 @@ 
  */
 function give_reports_forms_table() {
 
-	if ( isset( $_GET['form-id'] ) ) {
+	if (isset($_GET['form-id'])) {
 		return;
 	}
 
-	include( dirname( __FILE__ ) . '/class-form-reports-table.php' );
+	include(dirname(__FILE__).'/class-form-reports-table.php');
 
 	$give_table = new Give_Form_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_forms_table' );
+add_action('give_reports_view_forms', 'give_reports_forms_table');
 
 /**
  * Renders the detailed report for a specific give form
@@ -183,7 +183,7 @@ 
  * @return void
  */
 function give_reports_form_details() {
-	if ( ! isset( $_GET['form-id'] ) ) {
+	if ( ! isset($_GET['form-id'])) {
 		return;
 	}
 	?>
@@ -191,14 +191,14 @@ 
 		<div class="actions bulkactions">
 			<?php give_report_views(); ?>
 			&nbsp;
-			<button onclick="history.go(-1);" class="button-secondary"><?php _e( 'Go Back', 'give' ); ?></button>
+			<button onclick="history.go(-1);" class="button-secondary"><?php _e('Go Back', 'give'); ?></button>
 		</div>
 	</div>
 	<?php
-	give_reports_graph_of_form( absint( $_GET['form-id'] ) );
+	give_reports_graph_of_form(absint($_GET['form-id']));
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_form_details' );
+add_action('give_reports_view_forms', 'give_reports_form_details');
 
 /**
  * Renders the Reports Donors Table
@@ -209,28 +209,28 @@ 
  * @return void
  */
 function give_reports_donors_table() {
-	include( dirname( __FILE__ ) . '/class-donor-reports-table.php' );
+	include(dirname(__FILE__).'/class-donor-reports-table.php');
 
 	$give_table = new Give_Donor_Reports_Table();
 	$give_table->prepare_items();
 	?>
 	<div class="wrap give-reports-donors-wrap">
-		<?php do_action( 'give_logs_donors_table_top' ); ?>
-		<form id="give-donors-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=donors' ); ?>">
+		<?php do_action('give_logs_donors_table_top'); ?>
+		<form id="give-donors-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-reports&view=donors'); ?>">
 			<?php
-			$give_table->search_box( __( 'Search', 'give' ), 'give-donors' );
+			$give_table->search_box(__('Search', 'give'), 'give-donors');
 			$give_table->display();
 			?>
 			<input type="hidden" name="post_type" value="give_forms"/>
 			<input type="hidden" name="page" value="give-reports"/>
 			<input type="hidden" name="view" value="donors"/>
 		</form>
-		<?php do_action( 'give_logs_donors_table_bottom' ); ?>
+		<?php do_action('give_logs_donors_table_bottom'); ?>
 	</div>
 	<?php
 }
 
-add_action( 'give_reports_view_donors', 'give_reports_donors_table' );
+add_action('give_reports_view_donors', 'give_reports_donors_table');
 
 
 /**
@@ -242,14 +242,14 @@ 
  * @return void
  */
 function give_reports_gateways_table() {
-	include( dirname( __FILE__ ) . '/class-gateways-reports-table.php' );
+	include(dirname(__FILE__).'/class-gateways-reports-table.php');
 
 	$give_table = new Give_Gateawy_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_gateways', 'give_reports_gateways_table' );
+add_action('give_reports_view_gateways', 'give_reports_gateways_table');
 
 
 /**
@@ -261,7 +261,7 @@ 
 function give_reports_earnings() {
 	?>
 	<div class="tablenav top reports-table-nav">
-		<h3 class="alignleft reports-earnings-title"><span><?php _e( 'Income Over Time', 'give' ); ?></span></h3>
+		<h3 class="alignleft reports-earnings-title"><span><?php _e('Income Over Time', 'give'); ?></span></h3>
 
 		<div class="alignright actions reports-views-wrap"><?php give_report_views(); ?></div>
 	</div>
@@ -269,7 +269,7 @@ 
 	give_reports_graph();
 }
 
-add_action( 'give_reports_view_earnings', 'give_reports_earnings' );
+add_action('give_reports_view_earnings', 'give_reports_earnings');
 
 
 /**
@@ -284,51 +284,51 @@ 
 		<div id="post-body">
 			<div id="post-body-content">
 
-				<?php do_action( 'give_reports_tab_export_content_top' ); ?>
+				<?php do_action('give_reports_tab_export_content_top'); ?>
 
 
 				<table class="widefat export-options-table give-table">
 					<thead>
 					<tr>
-						<th class="row-title"><?php _e( 'Export Type', 'give' ); ?></th>
-						<th><?php _e( 'Export Options', 'give' ); ?></th>
+						<th class="row-title"><?php _e('Export Type', 'give'); ?></th>
+						<th><?php _e('Export Options', 'give'); ?></th>
 					</tr>
 					</thead>
 					<tbody>
-					<?php do_action( 'give_reports_tab_export_table_top' ); ?>
+					<?php do_action('give_reports_tab_export_table_top'); ?>
 					<tr class="give-export-pdf-sales-earnings">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export PDF of Donations and Income', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export PDF of Donations and Income', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a PDF of Donations and Income reports for all forms for the current year.', 'give' ); ?></p>
+							<p><?php _e('Download a PDF of Donations and Income reports for all forms for the current year.', 'give'); ?></p>
 						</td>
 						<td>
-							<a class="button" href="<?php echo wp_nonce_url( add_query_arg( array( 'give-action' => 'generate_pdf' ) ), 'give_generate_pdf' ); ?>"><?php _e( 'Generate PDF', 'give' ); ?></a>
+							<a class="button" href="<?php echo wp_nonce_url(add_query_arg(array('give-action' => 'generate_pdf')), 'give_generate_pdf'); ?>"><?php _e('Generate PDF', 'give'); ?></a>
 						</td>
 					</tr>
 					<tr class="alternate give-export-sales-earnings">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Income and Donation Stats', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Income and Donation Stats', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of income and donations over time.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of income and donations over time.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post">
-								<?php echo Give()->html->year_dropdown( 'start_year' ); ?>
-								<?php echo Give()->html->month_dropdown( 'start_month' ); ?>
-								<?php echo _x( 'to', 'Date one to date two', 'give' ); ?>
-								<?php echo Give()->html->year_dropdown( 'end_year' ); ?>
-								<?php echo Give()->html->month_dropdown( 'end_month' ); ?>
+								<?php echo Give()->html->year_dropdown('start_year'); ?>
+								<?php echo Give()->html->month_dropdown('start_month'); ?>
+								<?php echo _x('to', 'Date one to date two', 'give'); ?>
+								<?php echo Give()->html->year_dropdown('end_year'); ?>
+								<?php echo Give()->html->month_dropdown('end_month'); ?>
 								<input type="hidden" name="give-action" value="earnings_export"/>
-								<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+								<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 							</form>
 						</td>
 					</tr>
 					<tr class="give-export-payment-history">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Donation History', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Donation History', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of all donations recorded.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of all donations recorded.', 'give'); ?></p>
 						</td>
 						<td>
 							<form id="give-export-payments" class="give-export-form"  method="post">
@@ -336,29 +336,29 @@ 
 								$args = array(
 									'id'          => 'give-payment-export-start',
 									'name'        => 'start',
-									'placeholder' => __( 'Start date', 'give' )
+									'placeholder' => __('Start date', 'give')
 								);
-								echo Give()->html->date_field( $args ); ?>
+								echo Give()->html->date_field($args); ?>
 								<?php
 								$args = array(
 									'id'          => 'give-payment-export-end',
 									'name'        => 'end',
-									'placeholder' => __( 'End date', 'give' )
+									'placeholder' => __('End date', 'give')
 								);
-								echo Give()->html->date_field( $args ); ?>
+								echo Give()->html->date_field($args); ?>
 								<select name="status">
-									<option value="any"><?php _e( 'All Statuses', 'give' ); ?></option>
+									<option value="any"><?php _e('All Statuses', 'give'); ?></option>
 									<?php
 									$statuses = give_get_payment_statuses();
-									foreach ( $statuses as $status => $label ) {
-										echo '<option value="' . $status . '">' . $label . '</option>';
+									foreach ($statuses as $status => $label) {
+										echo '<option value="'.$status.'">'.$label.'</option>';
 									}
 									?>
 								</select>
-								<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+								<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 								<input type="hidden" name="give-export-class" value="Give_Batch_Payments_Export"/>
 								<span>
-									<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary" />
+									<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary" />
 									<span class="spinner"></span>
 								</span>
 							</form>
@@ -367,41 +367,41 @@ 
 					</tr>
 					<tr class="alternate give-export-donors">
 						<td class="row-title">
-							<h3><span><?php _e( 'Export Donors in CSV', 'give' ); ?></span></h3>
+							<h3><span><?php _e('Export Donors in CSV', 'give'); ?></span></h3>
 
-							<p><?php _e( 'Download a CSV of all donors\' emails. Optionally export only donors that have donated to a particular form. Note: if you have a large number of donors, exporting the donation stats may fail.', 'give' ); ?></p>
+							<p><?php _e('Download a CSV of all donors\' emails. Optionally export only donors that have donated to a particular form. Note: if you have a large number of donors, exporting the donation stats may fail.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post" id="give_donor_export">
 								<select name="give_export_download" id="give_donor_export_download">
-									<option value="0"><?php printf( __( 'All %s', 'give' ), give_get_forms_label_plural() ); ?></option>
+									<option value="0"><?php printf(__('All %s', 'give'), give_get_forms_label_plural()); ?></option>
 									<?php
-									$forms = get_posts( array(
+									$forms = get_posts(array(
 										'post_type'      => 'give_forms',
-										'posts_per_page' => - 1
-									) );
-									if ( $forms ) {
-										foreach ( $forms as $form ) {
-											echo '<option value="' . $form->ID . '">' . get_the_title( $form->ID ) . '</option>';
+										'posts_per_page' => -1
+									));
+									if ($forms) {
+										foreach ($forms as $form) {
+											echo '<option value="'.$form->ID.'">'.get_the_title($form->ID).'</option>';
 										}
 									}
 									?>
 								</select>
 								<select name="give_export_option" id="give_donor_export_option">
-									<option value="emails"><?php _e( 'Emails', 'give' ); ?></option>
-									<option value="emails_and_names"><?php _e( 'Emails and Names', 'give' ); ?></option>
-									<option value="full"><?php _e( 'Emails, Names, and Purchase Stats', 'give' ); ?></option>
+									<option value="emails"><?php _e('Emails', 'give'); ?></option>
+									<option value="emails_and_names"><?php _e('Emails and Names', 'give'); ?></option>
+									<option value="full"><?php _e('Emails, Names, and Purchase Stats', 'give'); ?></option>
 								</select>
 								<input type="hidden" name="give-action" value="email_export"/>
-								<input type="submit" value="<?php _e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+								<input type="submit" value="<?php _e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 							</form>
 						</td>
 					</tr>
-					<?php do_action( 'give_reports_tab_export_table_bottom' ); ?>
+					<?php do_action('give_reports_tab_export_table_bottom'); ?>
 					</tbody>
 				</table>
 
-				<?php do_action( 'give_reports_tab_export_content_bottom' ); ?>
+				<?php do_action('give_reports_tab_export_content_bottom'); ?>
 
 			</div>
 			<!-- .post-body-content -->
@@ -411,7 +411,7 @@ 
 	<?php
 }
 
-add_action( 'give_reports_tab_export', 'give_reports_tab_export' );
+add_action('give_reports_tab_export', 'give_reports_tab_export');
 
 /**
  * Renders the Reports page
@@ -420,19 +420,19 @@ 
  * @return void
  */
 function give_reports_tab_logs() {
-	require( GIVE_PLUGIN_DIR . 'includes/admin/reporting/logs.php' );
+	require(GIVE_PLUGIN_DIR.'includes/admin/reporting/logs.php');
 
 	$current_view = 'sales';
 	$log_views    = give_log_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $log_views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $log_views)) {
 		$current_view = $_GET['view'];
 	}
 
-	do_action( 'give_logs_view_' . $current_view );
+	do_action('give_logs_view_'.$current_view);
 }
 
-add_action( 'give_reports_tab_logs', 'give_reports_tab_logs' );
+add_action('give_reports_tab_logs', 'give_reports_tab_logs');
 
 /**
  * Retrieves estimated monthly earnings and sales
@@ -442,9 +442,9 @@ 
  */
 function give_estimated_monthly_stats() {
 
-	$estimated = get_transient( 'give_estimated_monthly_stats' );
+	$estimated = get_transient('give_estimated_monthly_stats');
 
-	if ( false === $estimated ) {
+	if (false === $estimated) {
 
 		$estimated = array(
 			'earnings' => 0,
@@ -453,20 +453,20 @@ 
 
 		$stats = new Give_Payment_Stats;
 
-		$to_date_earnings = $stats->get_earnings( 0, 'this_month' );
-		$to_date_sales    = $stats->get_sales( 0, 'this_month' );
+		$to_date_earnings = $stats->get_earnings(0, 'this_month');
+		$to_date_sales    = $stats->get_sales(0, 'this_month');
 
-		$current_day   = date( 'd', current_time( 'timestamp' ) );
-		$current_month = date( 'n', current_time( 'timestamp' ) );
-		$current_year  = date( 'Y', current_time( 'timestamp' ) );
-		$days_in_month = cal_days_in_month( CAL_GREGORIAN, $current_month, $current_year );
+		$current_day   = date('d', current_time('timestamp'));
+		$current_month = date('n', current_time('timestamp'));
+		$current_year  = date('Y', current_time('timestamp'));
+		$days_in_month = cal_days_in_month(CAL_GREGORIAN, $current_month, $current_year);
 
-		$estimated['earnings'] = ( $to_date_earnings / $current_day ) * $days_in_month;
-		$estimated['sales']    = ( $to_date_sales / $current_day ) * $days_in_month;
+		$estimated['earnings'] = ($to_date_earnings / $current_day) * $days_in_month;
+		$estimated['sales']    = ($to_date_sales / $current_day) * $days_in_month;
 
 		// Cache for one day
-		set_transient( 'give_estimated_monthly_stats', $estimated, 86400 );
+		set_transient('give_estimated_monthly_stats', $estimated, 86400);
 	}
 
-	return maybe_unserialize( $estimated );
+	return maybe_unserialize($estimated);
 }

includes/admin/reporting/export/class-batch-export-forms.php

Spacing +53 added lines, -53 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -41,20 +41,20 @@ 
 	public function csv_cols() {
 
 		$cols = array(
-			'ID'                      => __( 'ID', 'give' ),
-			'post_name'               => __( 'Slug', 'give' ),
-			'post_title'              => __( 'Name', 'give' ),
-			'post_date'               => __( 'Date Created', 'give' ),
-			'post_author'             => __( 'Author', 'give' ),
-			'post_content'            => __( 'Description', 'give' ),
-			'post_excerpt'            => __( 'Excerpt', 'give' ),
-			'post_status'             => __( 'Status', 'give' ),
-			'categories'              => __( 'Categories', 'give' ),
-			'tags'                    => __( 'Tags', 'give' ),
-			'give_price'              => __( 'Price', 'give' ),
-			'_thumbnail_id'           => __( 'Featured Image', 'give' ),
-			'_give_form_sales'        => __( 'Donations', 'give' ),
-			'_give_download_earnings' => __( 'Income', 'give' ),
+			'ID'                      => __('ID', 'give'),
+			'post_name'               => __('Slug', 'give'),
+			'post_title'              => __('Name', 'give'),
+			'post_date'               => __('Date Created', 'give'),
+			'post_author'             => __('Author', 'give'),
+			'post_content'            => __('Description', 'give'),
+			'post_excerpt'            => __('Excerpt', 'give'),
+			'post_status'             => __('Status', 'give'),
+			'categories'              => __('Categories', 'give'),
+			'tags'                    => __('Tags', 'give'),
+			'give_price'              => __('Price', 'give'),
+			'_thumbnail_id'           => __('Featured Image', 'give'),
+			'_give_form_sales'        => __('Donations', 'give'),
+			'_give_download_earnings' => __('Income', 'give'),
 		);
 
 		return $cols;
@@ -86,43 +86,43 @@ 
 			'paged'          => $this->step
 		);
 
-		$downloads = new WP_Query( $args );
+		$downloads = new WP_Query($args);
 
-		if ( $downloads->posts ) {
-			foreach ( $downloads->posts as $download ) {
+		if ($downloads->posts) {
+			foreach ($downloads->posts as $download) {
 
 				$row = array();
 
-				foreach ( $this->csv_cols() as $key => $value ) {
+				foreach ($this->csv_cols() as $key => $value) {
 
 					// Setup default value
-					$row[ $key ] = '';
+					$row[$key] = '';
 
-					if ( in_array( $key, $meta ) ) {
+					if (in_array($key, $meta)) {
 
-						switch ( $key ) {
+						switch ($key) {
 
 							case '_thumbnail_id' :
 
-								$image_id    = get_post_thumbnail_id( $download->ID );
-								$row[ $key ] = wp_get_attachment_url( $image_id );
+								$image_id    = get_post_thumbnail_id($download->ID);
+								$row[$key] = wp_get_attachment_url($image_id);
 
 								break;
 
 							case 'give_price' :
 
-								if ( give_has_variable_prices( $download->ID ) ) {
+								if (give_has_variable_prices($download->ID)) {
 
 									$prices = array();
-									foreach ( give_get_variable_prices( $download->ID ) as $price ) {
-										$prices[] = $price['name'] . ': ' . $price['amount'];
+									foreach (give_get_variable_prices($download->ID) as $price) {
+										$prices[] = $price['name'].': '.$price['amount'];
 									}
 
-									$row[ $key ] = implode( ' | ', $prices );
+									$row[$key] = implode(' | ', $prices);
 
 								} else {
 
-									$row[ $key ] = give_get_download_price( $download->ID );
+									$row[$key] = give_get_download_price($download->ID);
 
 								}
 
@@ -132,54 +132,54 @@ 
 
 
 								$files = array();
-								foreach ( give_get_download_files( $download->ID ) as $file ) {
+								foreach (give_get_download_files($download->ID) as $file) {
 									$files[] = $file['file'];
 								}
 
-								$row[ $key ] = implode( ' | ', $files );
+								$row[$key] = implode(' | ', $files);
 
 								break;
 
 							default :
 
-								$row[ $key ] = get_post_meta( $download->ID, $key, true );
+								$row[$key] = get_post_meta($download->ID, $key, true);
 
 								break;
 
 						}
 
-					} elseif ( isset( $download->$key ) ) {
+					} elseif (isset($download->$key)) {
 
-						switch ( $key ) {
+						switch ($key) {
 
 							case 'post_author' :
 
-								$row[ $key ] = get_the_author_meta( 'user_login', $download->post_author );
+								$row[$key] = get_the_author_meta('user_login', $download->post_author);
 
 								break;
 
 							default :
 
-								$row[ $key ] = $download->$key;
+								$row[$key] = $download->$key;
 
 								break;
 						}
 
-					} elseif ( 'tags' == $key ) {
+					} elseif ('tags' == $key) {
 
-						$terms = get_the_terms( $download->ID, 'download_tag' );
-						if ( $terms ) {
-							$terms       = wp_list_pluck( $terms, 'name' );
-							$row[ $key ] = implode( ' | ', $terms );
+						$terms = get_the_terms($download->ID, 'download_tag');
+						if ($terms) {
+							$terms       = wp_list_pluck($terms, 'name');
+							$row[$key] = implode(' | ', $terms);
 						}
 
 
-					} elseif ( 'categories' == $key ) {
+					} elseif ('categories' == $key) {
 
-						$terms = get_the_terms( $download->ID, 'download_category' );
-						if ( $terms ) {
-							$terms       = wp_list_pluck( $terms, 'name' );
-							$row[ $key ] = implode( ' | ', $terms );
+						$terms = get_the_terms($download->ID, 'download_category');
+						if ($terms) {
+							$terms       = wp_list_pluck($terms, 'name');
+							$row[$key] = implode(' | ', $terms);
 						}
 
 					}
@@ -190,8 +190,8 @@ 
 
 			}
 
-			$data = apply_filters( 'give_export_get_data', $data );
-			$data = apply_filters( 'give_export_get_data_' . $this->export_type, $data );
+			$data = apply_filters('give_export_get_data', $data);
+			$data = apply_filters('give_export_get_data_'.$this->export_type, $data);
 
 			return $data;
 		}
@@ -210,20 +210,20 @@ 
 
 		$args = array(
 			'post_type'      => 'give_forms',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'post_status'    => 'any',
 			'fields'         => 'ids',
 		);
 
-		$downloads  = new WP_Query( $args );
+		$downloads  = new WP_Query($args);
 		$total      = (int) $downloads->post_count;
 		$percentage = 100;
 
-		if ( $total > 0 ) {
-			$percentage = ( ( 30 * $this->step ) / $total ) * 100;
+		if ($total > 0) {
+			$percentage = ((30 * $this->step) / $total) * 100;
 		}
 
-		if ( $percentage > 100 ) {
+		if ($percentage > 100) {
 			$percentage = 100;
 		}
 

includes/admin/reporting/export/class-batch-export-payments.php

Spacing +80 added lines, -80 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -39,29 +39,29 @@ 
 	 */
 	public function csv_cols() {
 		$cols = array(
-			'id'       => __( 'ID', 'give' ), // unaltered payment ID (use for querying)
-			'seq_id'   => __( 'Payment Number', 'give' ), // sequential payment ID
-			'email'    => __( 'Email', 'give' ),
-			'first'    => __( 'First Name', 'give' ),
-			'last'     => __( 'Last Name', 'give' ),
-			'address1' => __( 'Address', 'give' ),
-			'address2' => __( 'Address (Line 2)', 'give' ),
-			'city'     => __( 'City', 'give' ),
-			'state'    => __( 'State', 'give' ),
-			'country'  => __( 'Country', 'give' ),
-			'zip'      => __( 'Zip / Postal Code', 'give' ),
-			'products' => __( 'Products', 'give' ),
-			'amount'   => __( 'Amount', 'give' ) . ' (' . html_entity_decode( give_currency_filter( '' ) ) . ')',
-			'gateway'  => __( 'Payment Method', 'give' ),
-			'trans_id' => __( 'Transaction ID', 'give' ),
-			'key'      => __( 'Purchase Key', 'give' ),
-			'date'     => __( 'Date', 'give' ),
-			'user'     => __( 'User', 'give' ),
-			'status'   => __( 'Status', 'give' )
+			'id'       => __('ID', 'give'), // unaltered payment ID (use for querying)
+			'seq_id'   => __('Payment Number', 'give'), // sequential payment ID
+			'email'    => __('Email', 'give'),
+			'first'    => __('First Name', 'give'),
+			'last'     => __('Last Name', 'give'),
+			'address1' => __('Address', 'give'),
+			'address2' => __('Address (Line 2)', 'give'),
+			'city'     => __('City', 'give'),
+			'state'    => __('State', 'give'),
+			'country'  => __('Country', 'give'),
+			'zip'      => __('Zip / Postal Code', 'give'),
+			'products' => __('Products', 'give'),
+			'amount'   => __('Amount', 'give').' ('.html_entity_decode(give_currency_filter('')).')',
+			'gateway'  => __('Payment Method', 'give'),
+			'trans_id' => __('Transaction ID', 'give'),
+			'key'      => __('Purchase Key', 'give'),
+			'date'     => __('Date', 'give'),
+			'user'     => __('User', 'give'),
+			'status'   => __('Status', 'give')
 		);
 
-		if ( ! give_get_option( 'enable_sequential' ) ) {
-			unset( $cols['seq_id'] );
+		if ( ! give_get_option('enable_sequential')) {
+			unset($cols['seq_id']);
 		}
 
 		return $cols;
@@ -87,12 +87,12 @@ 
 			'status' => $this->status
 		);
 
-		if ( ! empty( $this->start ) || ! empty( $this->end ) ) {
+		if ( ! empty($this->start) || ! empty($this->end)) {
 
 			$args['date_query'] = array(
 				array(
-					'after'     => date( 'Y-n-d 00:00:00', strtotime( $this->start ) ),
-					'before'    => date( 'Y-n-d 23:59:59', strtotime( $this->end ) ),
+					'after'     => date('Y-n-d 00:00:00', strtotime($this->start)),
+					'before'    => date('Y-n-d 23:59:59', strtotime($this->end)),
 					'inclusive' => true
 				)
 			);
@@ -101,104 +101,104 @@ 
 
 		//echo json_encode($args ); exit;
 
-		$payments = give_get_payments( $args );
+		$payments = give_get_payments($args);
 
-		if ( $payments ) {
+		if ($payments) {
 
-			foreach ( $payments as $payment ) {
-				$payment_meta = give_get_payment_meta( $payment->ID );
-				$user_info    = give_get_payment_meta_user_info( $payment->ID );
-				$total        = give_get_payment_amount( $payment->ID );
-				$user_id      = isset( $user_info['id'] ) && $user_info['id'] != - 1 ? $user_info['id'] : $user_info['email'];
+			foreach ($payments as $payment) {
+				$payment_meta = give_get_payment_meta($payment->ID);
+				$user_info    = give_get_payment_meta_user_info($payment->ID);
+				$total        = give_get_payment_amount($payment->ID);
+				$user_id      = isset($user_info['id']) && $user_info['id'] != - 1 ? $user_info['id'] : $user_info['email'];
 				$products     = '';
 				$skus         = '';
 
-				if ( $downloads ) {
-					foreach ( $downloads as $key => $download ) {
+				if ($downloads) {
+					foreach ($downloads as $key => $download) {
 
 						// Form ID
-						$id  = isset( $payment_meta['cart_details'] ) ? $download['id'] : $download;
-						$qty = isset( $download['quantity'] ) ? $download['quantity'] : 1;
+						$id  = isset($payment_meta['cart_details']) ? $download['id'] : $download;
+						$qty = isset($download['quantity']) ? $download['quantity'] : 1;
 
-						if ( isset( $download['price'] ) ) {
+						if (isset($download['price'])) {
 							$price = $download['price'];
 						} else {
 							// If the download has variable prices, override the default price
-							$price_override = isset( $payment_meta['cart_details'] ) ? $download['price'] : null;
-							$price          = give_get_download_final_price( $id, $user_info, $price_override );
+							$price_override = isset($payment_meta['cart_details']) ? $download['price'] : null;
+							$price          = give_get_download_final_price($id, $user_info, $price_override);
 						}
 
 
 						// Display the Downoad Name
-						$products .= html_entity_decode( get_the_title( $id ) );
+						$products .= html_entity_decode(get_the_title($id));
 
-						if ( $qty > 1 ) {
-							$products .= html_entity_decode( ' (' . $qty . ')' );
+						if ($qty > 1) {
+							$products .= html_entity_decode(' ('.$qty.')');
 						}
 
 						$products .= ' - ';
 
-						if ( give_use_skus() ) {
-							$sku = give_get_download_sku( $id );
+						if (give_use_skus()) {
+							$sku = give_get_download_sku($id);
 
-							if ( ! empty( $sku ) ) {
+							if ( ! empty($sku)) {
 								$skus .= $sku;
 							}
 						}
 
-						if ( isset( $downloads[ $key ]['item_number'] ) && isset( $downloads[ $key ]['item_number']['options'] ) ) {
-							$price_options = $downloads[ $key ]['item_number']['options'];
+						if (isset($downloads[$key]['item_number']) && isset($downloads[$key]['item_number']['options'])) {
+							$price_options = $downloads[$key]['item_number']['options'];
 
-							if ( isset( $price_options['price_id'] ) ) {
-								$products .= html_entity_decode( give_get_price_option_name( $id, $price_options['price_id'], $payment->ID ) ) . ' - ';
+							if (isset($price_options['price_id'])) {
+								$products .= html_entity_decode(give_get_price_option_name($id, $price_options['price_id'], $payment->ID)).' - ';
 							}
 						}
 
-						$products .= html_entity_decode( give_currency_filter( give_format_amount( $price ) ) );
+						$products .= html_entity_decode(give_currency_filter(give_format_amount($price)));
 
-						if ( $key != ( count( $downloads ) - 1 ) ) {
+						if ($key != (count($downloads) - 1)) {
 							$products .= ' / ';
 
-							if ( give_use_skus() ) {
+							if (give_use_skus()) {
 								$skus .= ' / ';
 							}
 						}
 					}
 				}
 
-				if ( is_numeric( $user_id ) ) {
-					$user = get_userdata( $user_id );
+				if (is_numeric($user_id)) {
+					$user = get_userdata($user_id);
 				} else {
 					$user = false;
 				}
 
 				$data[] = array(
 					'id'       => $payment->ID,
-					'seq_id'   => give_get_payment_number( $payment->ID ),
+					'seq_id'   => give_get_payment_number($payment->ID),
 					'email'    => $payment_meta['email'],
 					'first'    => $user_info['first_name'],
 					'last'     => $user_info['last_name'],
-					'address1' => isset( $user_info['address']['line1'] ) ? $user_info['address']['line1'] : '',
-					'address2' => isset( $user_info['address']['line2'] ) ? $user_info['address']['line2'] : '',
-					'city'     => isset( $user_info['address']['city'] ) ? $user_info['address']['city'] : '',
-					'state'    => isset( $user_info['address']['state'] ) ? $user_info['address']['state'] : '',
-					'country'  => isset( $user_info['address']['country'] ) ? $user_info['address']['country'] : '',
-					'zip'      => isset( $user_info['address']['zip'] ) ? $user_info['address']['zip'] : '',
+					'address1' => isset($user_info['address']['line1']) ? $user_info['address']['line1'] : '',
+					'address2' => isset($user_info['address']['line2']) ? $user_info['address']['line2'] : '',
+					'city'     => isset($user_info['address']['city']) ? $user_info['address']['city'] : '',
+					'state'    => isset($user_info['address']['state']) ? $user_info['address']['state'] : '',
+					'country'  => isset($user_info['address']['country']) ? $user_info['address']['country'] : '',
+					'zip'      => isset($user_info['address']['zip']) ? $user_info['address']['zip'] : '',
 					'products' => $products,
 					'skus'     => $skus,
-					'amount'   => html_entity_decode( give_format_amount( $total ) ),
-					'gateway'  => give_get_gateway_admin_label( get_post_meta( $payment->ID, '_give_payment_gateway', true ) ),
-					'trans_id' => give_get_payment_transaction_id( $payment->ID ),
+					'amount'   => html_entity_decode(give_format_amount($total)),
+					'gateway'  => give_get_gateway_admin_label(get_post_meta($payment->ID, '_give_payment_gateway', true)),
+					'trans_id' => give_get_payment_transaction_id($payment->ID),
 					'key'      => $payment_meta['key'],
 					'date'     => $payment->post_date,
-					'user'     => $user ? $user->display_name : __( 'guest', 'give' ),
-					'status'   => give_get_payment_status( $payment, true )
+					'user'     => $user ? $user->display_name : __('guest', 'give'),
+					'status'   => give_get_payment_status($payment, true)
 				);
 
 			}
 
-			$data = apply_filters( 'give_export_get_data', $data );
-			$data = apply_filters( 'give_export_get_data_' . $this->export_type, $data );
+			$data = apply_filters('give_export_get_data', $data);
+			$data = apply_filters('give_export_get_data_'.$this->export_type, $data);
 
 			return $data;
 
@@ -218,27 +218,27 @@ 
 
 		$status = $this->status;
 		$args   = array(
-			'start-date' => date( 'n/d/Y', strtotime( $this->start ) ),
-			'end-date'   => date( 'n/d/Y', strtotime( $this->end ) ),
+			'start-date' => date('n/d/Y', strtotime($this->start)),
+			'end-date'   => date('n/d/Y', strtotime($this->end)),
 		);
 
-		if ( 'any' == $status ) {
+		if ('any' == $status) {
 
-			$total = array_sum( (array) give_count_payments( $args ) );
+			$total = array_sum((array) give_count_payments($args));
 
 		} else {
 
-			$total = give_count_payments( $args )->$status;
+			$total = give_count_payments($args)->$status;
 
 		}
 
 		$percentage = 100;
 
-		if ( $total > 0 ) {
-			$percentage = ( ( 30 * $this->step ) / $total ) * 100;
+		if ($total > 0) {
+			$percentage = ((30 * $this->step) / $total) * 100;
 		}
 
-		if ( $percentage > 100 ) {
+		if ($percentage > 100) {
 			$percentage = 100;
 		}
 
@@ -252,9 +252,9 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
-		$this->start  = isset( $request['start'] ) ? sanitize_text_field( $request['start'] ) : '';
-		$this->end    = isset( $request['end'] ) ? sanitize_text_field( $request['end'] ) : '';
-		$this->status = isset( $request['status'] ) ? sanitize_text_field( $request['status'] ) : 'complete';
+	public function set_properties($request) {
+		$this->start  = isset($request['start']) ? sanitize_text_field($request['start']) : '';
+		$this->end    = isset($request['end']) ? sanitize_text_field($request['end']) : '';
+		$this->status = isset($request['status']) ? sanitize_text_field($request['status']) : 'complete';
 	}
 }

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

Spacing +30 added lines, -30 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_Customers_Export();
 
 	$customer_export->export();
 }
 
-add_action( 'give_email_export', 'give_export_all_customers' );
+add_action('give_email_export', 'give_export_all_customers');
 
 /**
  * Exports all the downloads to a CSV file using the Give_Export class.
@@ -82,14 +82,14 @@ 
  * @return void
  */
 function give_export_all_downloads_history() {
-	require_once GIVE_PLUGIN_DIR . 'includes/admin/reporting/class-export-download-history.php';
+	require_once GIVE_PLUGIN_DIR.'includes/admin/reporting/class-export-download-history.php';
 
 	$file_download_export = new Give_Download_History_Export();
 
 	$file_download_export->export();
 }
 
-add_action( 'give_downloads_history_export', 'give_export_all_downloads_history' );
+add_action('give_downloads_history_export', 'give_export_all_downloads_history');
 
 /**
  * Add a hook allowing extensions to register a hook on the batch export process
@@ -98,22 +98,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_processer', 10, 1 );
+	add_action('give_batch_export_class_include', 'give_include_payments_batch_processer', 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
@@ -124,10 +124,10 @@ 
  *
  * @return void
  */
-function give_include_payments_batch_processer( $class ) {
+function give_include_payments_batch_processer($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';
 	}
 
 }
@@ -137,10 +137,10 @@ 
  * @since  1.5.2
  */
 function give_register_customers_batch_export() {
-	add_action( 'give_batch_export_class_include', 'give_include_customers_batch_processer', 10, 1 );
+	add_action('give_batch_export_class_include', 'give_include_customers_batch_processer', 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
@@ -151,10 +151,10 @@ 
  *
  * @return void
  */
-function give_include_customers_batch_processer( $class ) {
+function give_include_customers_batch_processer($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';
 	}
 
 }
@@ -165,10 +165,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
@@ -179,10 +179,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