WordImpress / Give

includes/emails/class-give-emails.php

Spacing +58 added lines, -58 removed lines

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

includes/emails/functions.php

Spacing +78 added lines, -78 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,39 +24,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);
 	}
 }
 
@@ -69,29 +69,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() ), 0 );
+	$message = give_email_preview_template_tags(give_get_email_body_content(0, array()), 0);
 
 	$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);
 
 }
 
@@ -105,49 +105,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
@@ -160,10 +160,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);
 }
 
 /**
@@ -175,11 +175,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);
 }
 
 /**
@@ -193,14 +193,14 @@ 
 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 $message;
 }
@@ -214,19 +214,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/emails/template.php

Spacing +70 added lines, -70 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -41,8 +41,8 @@ 
  *
  * @return string $message Fully formatted message
  */
-function give_email_template_tags( $message, $payment_data, $payment_id, $admin_notice = false ) {
-	return give_do_email_tags( $message, $payment_id );
+function give_email_template_tags($message, $payment_data, $payment_id, $admin_notice = false) {
+	return give_do_email_tags($message, $payment_id);
 }
 
 /**
@@ -55,37 +55,37 @@ 
  *
  * @return string $message Fully formatted message
  */
-function give_email_preview_template_tags( $message ) {
+function give_email_preview_template_tags($message) {
 	global $give_options;
 
-	$price = give_currency_filter( give_format_amount( 10.50 ) );
+	$price = give_currency_filter(give_format_amount(10.50));
 
 	$gateway = 'PayPal';
 
-	$receipt_id = strtolower( md5( uniqid() ) );
+	$receipt_id = strtolower(md5(uniqid()));
 
-	$notes = __( 'These are some sample notes added to a donation.', 'give' );
+	$notes = __('These are some sample notes added to a donation.', 'give');
 
-	$payment_id = rand( 1, 100 );
+	$payment_id = rand(1, 100);
 
 	$user = wp_get_current_user();
 
-	$message = str_replace( '{name}', $user->display_name, $message );
-	$message = str_replace( '{fullname}', $user->display_name, $message );
-	$message = str_replace( '{username}', $user->user_login, $message );
-	$message = str_replace( '{date}', date( get_option( 'date_format' ), current_time( 'timestamp' ) ), $message );
-	$message = str_replace( '{price}', $price, $message );
-	$message = str_replace( '{receipt_id}', $receipt_id, $message );
-	$message = str_replace( '{payment_method}', $gateway, $message );
-	$message = str_replace( '{sitename}', get_bloginfo( 'name' ), $message );
-	$message = str_replace( '{product_notes}', $notes, $message );
-	$message = str_replace( '{payment_id}', $payment_id, $message );
-	$message = str_replace( '{receipt_link}', sprintf( __( '%1$sView it in your browser.%2$s', 'give' ), '<a href="' . esc_url( add_query_arg( array(
+	$message = str_replace('{name}', $user->display_name, $message);
+	$message = str_replace('{fullname}', $user->display_name, $message);
+	$message = str_replace('{username}', $user->user_login, $message);
+	$message = str_replace('{date}', date(get_option('date_format'), current_time('timestamp')), $message);
+	$message = str_replace('{price}', $price, $message);
+	$message = str_replace('{receipt_id}', $receipt_id, $message);
+	$message = str_replace('{payment_method}', $gateway, $message);
+	$message = str_replace('{sitename}', get_bloginfo('name'), $message);
+	$message = str_replace('{product_notes}', $notes, $message);
+	$message = str_replace('{payment_id}', $payment_id, $message);
+	$message = str_replace('{receipt_link}', sprintf(__('%1$sView it in your browser.%2$s', 'give'), '<a href="'.esc_url(add_query_arg(array(
 			'payment_key' => $receipt_id,
 			'give_action' => 'view_receipt'
-		), home_url() ) ) . '">', '</a>' ), $message );
+		), home_url())).'">', '</a>'), $message);
 
-	return wpautop( apply_filters( 'give_email_preview_template_tags', $message ) );
+	return wpautop(apply_filters('give_email_preview_template_tags', $message));
 }
 
 /**
@@ -98,20 +98,20 @@ 
  * @since  1.0
  * @return array|bool
  */
-add_filter( 'give_settings_emails', 'give_email_template_preview' );
+add_filter('give_settings_emails', 'give_email_template_preview');
 
-function give_email_template_preview( $array ) {
+function give_email_template_preview($array) {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return false;
 	}
 	$custom_field = array(
-		'name' => __( 'Preview Email', 'give' ),
-		'desc' => __( 'Click the buttons to preview emails.', 'give' ),
+		'name' => __('Preview Email', 'give'),
+		'desc' => __('Click the buttons to preview emails.', 'give'),
 		'id'   => 'give_email_preview_buttons',
 		'type' => 'email_preview_buttons'
 	);
-	array_splice( $array, 5, 0, array( $custom_field ) );
+	array_splice($array, 5, 0, array($custom_field));
 
 	return $array; // splice in at position 3;
 }
@@ -127,11 +127,11 @@ 
 function give_email_preview_buttons_callback() {
 	ob_start();
 	?>
-	<a href="<?php echo esc_url( add_query_arg( array( 'give_action' => 'preview_email' ), home_url() ) ); ?>" class="button-secondary" target="_blank" title="<?php _e( 'Donation Receipt Preview', 'give' ); ?> "><?php _e( 'Preview Donation Receipt', 'give' ); ?></a>
-	<a href="<?php echo wp_nonce_url( add_query_arg( array(
+	<a href="<?php echo esc_url(add_query_arg(array('give_action' => 'preview_email'), home_url())); ?>" class="button-secondary" target="_blank" title="<?php _e('Donation Receipt Preview', 'give'); ?> "><?php _e('Preview Donation Receipt', 'give'); ?></a>
+	<a href="<?php echo wp_nonce_url(add_query_arg(array(
 		'give_action'  => 'send_test_email',
 		'give-message' => 'sent-test-email'
-	) ), 'give-test-email' ); ?>" title="<?php _e( 'This will send a demo donation receipt to the emails listed below.', 'give' ); ?>" class="button-secondary"><?php _e( 'Send Test Email', 'give' ); ?></a>
+	)), 'give-test-email'); ?>" title="<?php _e('This will send a demo donation receipt to the emails listed below.', 'give'); ?>" class="button-secondary"><?php _e('Send Test Email', 'give'); ?></a>
 	<?php
 	echo ob_get_clean();
 }
@@ -144,27 +144,27 @@ 
  */
 function give_display_email_template_preview() {
 
-	if ( empty( $_GET['give_action'] ) ) {
+	if (empty($_GET['give_action'])) {
 		return;
 	}
 
-	if ( 'preview_email' !== $_GET['give_action'] ) {
+	if ('preview_email' !== $_GET['give_action']) {
 		return;
 	}
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 
-	Give()->emails->heading = __( 'Donation Receipt', 'give' );
+	Give()->emails->heading = __('Donation Receipt', 'give');
 
-	echo Give()->emails->build_email( give_email_preview_template_tags( give_get_email_body_content( 0, array() ) ) );
+	echo Give()->emails->build_email(give_email_preview_template_tags(give_get_email_body_content(0, array())));
 
 	exit;
 
 }
 
-add_action( 'template_redirect', 'give_display_email_template_preview' );
+add_action('template_redirect', 'give_display_email_template_preview');
 
 /**
  * Email Template Body
@@ -176,20 +176,20 @@ 
  *
  * @return string $email_body Body of the email
  */
-function give_get_email_body_content( $payment_id = 0, $payment_data = array() ) {
+function give_get_email_body_content($payment_id = 0, $payment_data = array()) {
 	global $give_options;
 
-	$default_email_body = __( "Dear", "give" ) . " {name},\n\n";
-	$default_email_body .= __( "Thank you for your donation. Your generosity is appreciated! Please click on the link below to view your receipt.", "give" ) . "\n\n" . '{receipt_link}';
+	$default_email_body = __("Dear", "give")." {name},\n\n";
+	$default_email_body .= __("Thank you for your donation. Your generosity is appreciated! Please click on the link below to view your receipt.", "give")."\n\n".'{receipt_link}';
 	$default_email_body .= "\n\nSincerely,\n{sitename}";
 
-	$email = isset( $give_options['donation_receipt'] ) ? stripslashes( $give_options['donation_receipt'] ) : $default_email_body;
+	$email = isset($give_options['donation_receipt']) ? stripslashes($give_options['donation_receipt']) : $default_email_body;
 
-	$email_body = wpautop( $email );
+	$email_body = wpautop($email);
 
-	$email_body = apply_filters( 'give_donation_receipt_' . Give()->emails->get_template(), $email_body, $payment_id, $payment_data );
+	$email_body = apply_filters('give_donation_receipt_'.Give()->emails->get_template(), $email_body, $payment_id, $payment_data);
 
-	return apply_filters( 'give_donation_receipt', $email_body, $payment_id, $payment_data );
+	return apply_filters('give_donation_receipt', $email_body, $payment_id, $payment_data);
 }
 
 /**
@@ -202,37 +202,37 @@ 
  *
  * @return string $email_body Body of the email
  */
-function give_get_donation_notification_body_content( $payment_id = 0, $payment_data = array() ) {
+function give_get_donation_notification_body_content($payment_id = 0, $payment_data = array()) {
 	global $give_options;
 
-	$user_info = maybe_unserialize( $payment_data['user_info'] );
-	$email     = give_get_payment_user_email( $payment_id );
+	$user_info = maybe_unserialize($payment_data['user_info']);
+	$email     = give_get_payment_user_email($payment_id);
 
-	if ( isset( $user_info['id'] ) && $user_info['id'] > 0 ) {
-		$user_data = get_userdata( $user_info['id'] );
+	if (isset($user_info['id']) && $user_info['id'] > 0) {
+		$user_data = get_userdata($user_info['id']);
 		$name      = $user_data->display_name;
-	} elseif ( isset( $user_info['first_name'] ) && isset( $user_info['last_name'] ) ) {
-		$name = $user_info['first_name'] . ' ' . $user_info['last_name'];
+	} elseif (isset($user_info['first_name']) && isset($user_info['last_name'])) {
+		$name = $user_info['first_name'].' '.$user_info['last_name'];
 	} else {
 		$name = $email;
 	}
 
-	$gateway = give_get_gateway_admin_label( get_post_meta( $payment_id, '_give_payment_gateway', true ) );
+	$gateway = give_get_gateway_admin_label(get_post_meta($payment_id, '_give_payment_gateway', true));
 
-	$default_email_body = __( 'Hello', 'give' ) . "\n\n" . __( 'A donation has been made', 'give' ) . ".\n\n";
-	$default_email_body .= sprintf( __( '%s sold:', 'give' ), give_get_forms_label_plural() ) . "\n\n";
+	$default_email_body = __('Hello', 'give')."\n\n".__('A donation has been made', 'give').".\n\n";
+	$default_email_body .= sprintf(__('%s sold:', 'give'), give_get_forms_label_plural())."\n\n";
 
-	$default_email_body .= __( 'Donor: ', 'give' ) . " " . html_entity_decode( $name, ENT_COMPAT, 'UTF-8' ) . "\n";
-	$default_email_body .= __( 'Amount: ', 'give' ) . " " . html_entity_decode( give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) ), ENT_COMPAT, 'UTF-8' ) . "\n";
-	$default_email_body .= __( 'Payment Method: ', 'give' ) . " " . $gateway . "\n\n";
+	$default_email_body .= __('Donor: ', 'give')." ".html_entity_decode($name, ENT_COMPAT, 'UTF-8')."\n";
+	$default_email_body .= __('Amount: ', 'give')." ".html_entity_decode(give_currency_filter(give_format_amount(give_get_payment_amount($payment_id))), ENT_COMPAT, 'UTF-8')."\n";
+	$default_email_body .= __('Payment Method: ', 'give')." ".$gateway."\n\n";
 
-	$default_email_body .= __( 'Thank you', 'give' );
+	$default_email_body .= __('Thank you', 'give');
 
-	$email = isset( $give_options['donation_notification'] ) ? stripslashes( $give_options['donation_notification'] ) : $default_email_body;
+	$email = isset($give_options['donation_notification']) ? stripslashes($give_options['donation_notification']) : $default_email_body;
 
-	$email_body = give_do_email_tags( $email, $payment_id );
+	$email_body = give_do_email_tags($email, $payment_id);
 
-	return apply_filters( 'give_donation_notification', wpautop( $email_body ), $payment_id, $payment_data );
+	return apply_filters('give_donation_notification', wpautop($email_body), $payment_id, $payment_data);
 }
 
 /**
@@ -245,15 +245,15 @@ 
  * @since  1.0
  */
 function give_render_receipt_in_browser() {
-	if ( ! isset( $_GET['payment_key'] ) ) {
-		wp_die( __( 'Missing donation key.', 'give' ), __( 'Error', 'give' ) );
+	if ( ! isset($_GET['payment_key'])) {
+		wp_die(__('Missing donation key.', 'give'), __('Error', 'give'));
 	}
 
-	$key = urlencode( $_GET['payment_key'] );
+	$key = urlencode($_GET['payment_key']);
 
 	ob_start();
 	//Disallows caching of the page
-	header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+	header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 	header("Cache-Control: no-store, no-cache, must-revalidate"); // HTTP/1.1
 	header("Cache-Control: post-check=0, pre-check=0", false);
 	header("Pragma: no-cache"); // HTTP/1.0
@@ -262,7 +262,7 @@ 
 	<!DOCTYPE html>
 	<html lang="en">
 		<head>
-			<title><?php _e( 'Donation Receipt', 'give' ); ?></title>
+			<title><?php _e('Donation Receipt', 'give'); ?></title>
 			<meta charset="utf-8" />
 
 			<!-- Further disallowing of caching of this page -->
@@ -276,12 +276,12 @@ 
 
 			<?php wp_head(); ?>
 		</head>
-		<body class="<?php echo apply_filters( 'give_receipt_page_body_class', 'give_receipt_page' ); ?>">
+		<body class="<?php echo apply_filters('give_receipt_page_body_class', 'give_receipt_page'); ?>">
 
 			<div id="give_receipt_wrapper">
-				<?php do_action( 'give_render_receipt_in_browser_before' ); ?>
-				<?php echo do_shortcode( '[give_receipt payment_key=' . $key . ']' ); ?>
-				<?php do_action( 'give_render_receipt_in_browser_after' ); ?>
+				<?php do_action('give_render_receipt_in_browser_before'); ?>
+				<?php echo do_shortcode('[give_receipt payment_key='.$key.']'); ?>
+				<?php do_action('give_render_receipt_in_browser_after'); ?>
 			</div>
 
 			<?php wp_footer(); ?>
@@ -292,4 +292,4 @@ 
 	die();
 }
 
-add_action( 'give_view_receipt', 'give_render_receipt_in_browser' );
+add_action('give_view_receipt', 'give_render_receipt_in_browser');

includes/error-tracking.php

Spacing +30 added lines, -30 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,33 +29,33 @@ 
  *
  * @return void
  */
-function give_print_errors( $form_id ) {
+function give_print_errors($form_id) {
 
 	$errors = give_get_errors();
 
-	$request_form_id = isset( $_REQUEST['form-id'] ) ? intval( $_REQUEST['form-id'] ) : 0;
+	$request_form_id = isset($_REQUEST['form-id']) ? intval($_REQUEST['form-id']) : 0;
 
 	//Sanity checks first: Ensure that gateway returned errors display on the appropriate form
-	if ( ! isset( $_POST['give_ajax'] ) && $request_form_id !== $form_id ) {
+	if ( ! isset($_POST['give_ajax']) && $request_form_id !== $form_id) {
 		return;
 	}
 
-	if ( $errors ) {
-		$classes = apply_filters( 'give_error_class', array(
+	if ($errors) {
+		$classes = apply_filters('give_error_class', array(
 			'give_errors'
-		) );
-		echo '<div class="' . implode( ' ', $classes ) . '">';
+		));
+		echo '<div class="'.implode(' ', $classes).'">';
 		// Loop error codes and display errors
-		foreach ( $errors as $error_id => $error ) {
-			echo '<div class="give_error" id="give_error_' . $error_id . '"><p><strong>' . __( 'Error', 'give' ) . '</strong>: ' . $error . '</p></div>';
+		foreach ($errors as $error_id => $error) {
+			echo '<div class="give_error" id="give_error_'.$error_id.'"><p><strong>'.__('Error', 'give').'</strong>: '.$error.'</p></div>';
 		}
 		echo '</div>';
 		give_clear_errors();
 	}
 }
 
-add_action( 'give_purchase_form_before_personal_info', 'give_print_errors' );
-add_action( 'give_ajax_checkout_errors', 'give_print_errors' );
+add_action('give_purchase_form_before_personal_info', 'give_print_errors');
+add_action('give_ajax_checkout_errors', 'give_print_errors');
 
 /**
  * Get Errors
@@ -68,7 +68,7 @@ 
  * @return mixed array if errors are present, false if none found
  */
 function give_get_errors() {
-	return Give()->session->get( 'give_errors' );
+	return Give()->session->get('give_errors');
 }
 
 /**
@@ -84,13 +84,13 @@ 
  *
  * @return void
  */
-function give_set_error( $error_id, $error_message ) {
+function give_set_error($error_id, $error_message) {
 	$errors = give_get_errors();
-	if ( ! $errors ) {
+	if ( ! $errors) {
 		$errors = array();
 	}
-	$errors[ $error_id ] = $error_message;
-	Give()->session->set( 'give_errors', $errors );
+	$errors[$error_id] = $error_message;
+	Give()->session->set('give_errors', $errors);
 }
 
 /**
@@ -101,7 +101,7 @@ 
  * @return void
  */
 function give_clear_errors() {
-	Give()->session->set( 'give_errors', null );
+	Give()->session->set('give_errors', null);
 }
 
 /**
@@ -114,11 +114,11 @@ 
  *
  * @return string
  */
-function give_unset_error( $error_id ) {
+function give_unset_error($error_id) {
 	$errors = give_get_errors();
-	if ( $errors ) {
-		unset( $errors[ $error_id ] );
-		Give()->session->set( 'give_errors', $errors );
+	if ($errors) {
+		unset($errors[$error_id]);
+		Give()->session->set('give_errors', $errors);
 	}
 }
 
@@ -129,7 +129,7 @@ 
  * @return void
  */
 function _give_die_handler() {
-	if ( defined( 'GIVE_UNIT_TESTS' ) ) {
+	if (defined('GIVE_UNIT_TESTS')) {
 		return '_give_die_handler';
 	} else {
 		die();
@@ -144,10 +144,10 @@ 
  * @since  1.0
  * @return void
  */
-function give_die( $message = '', $title = '', $status = 400 ) {
-	add_filter( 'wp_die_ajax_handler', '_give_die_handler', 10, 3 );
-	add_filter( 'wp_die_handler', '_give_die_handler', 10, 3 );
-	wp_die( $message, $title, array( 'response' => $status ) );
+function give_die($message = '', $title = '', $status = 400) {
+	add_filter('wp_die_ajax_handler', '_give_die_handler', 10, 3);
+	add_filter('wp_die_handler', '_give_die_handler', 10, 3);
+	wp_die($message, $title, array('response' => $status));
 }
 
 /**
@@ -162,10 +162,10 @@ 
  *
  * @return   string  $error
  */
-function give_output_error( $message, $echo = true, $error_id = 'warning' ) {
-	$error = '<div class="give_errors" id="give_error_' . $error_id . '"><p class="give_error  give_' . $error_id . '">' . $message . '</p></div>';
+function give_output_error($message, $echo = true, $error_id = 'warning') {
+	$error = '<div class="give_errors" id="give_error_'.$error_id.'"><p class="give_error  give_'.$error_id.'">'.$message.'</p></div>';
 
-	if ( $echo ) {
+	if ($echo) {
 		echo $error;
 	} else {
 		return $error;

Doc Comments +2 added lines, -2 removed lines

@@ -65,7 +65,7 @@ 
  *
  * @since 1.0
  * @uses  Give_Session::get()
- * @return mixed array if errors are present, false if none found
+ * @return string array if errors are present, false if none found
  */
 function give_get_errors() {
 	return Give()->session->get( 'give_errors' );
@@ -126,7 +126,7 @@ 
  * Register die handler for give_die()
  *
  * @since  1.0
- * @return void
+ * @return string|null
  */
 function _give_die_handler() {
 	if ( defined( 'GIVE_UNIT_TESTS' ) ) {

includes/forms/widget.php

Spacing +47 added lines, -47 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 /**
  * Give Form widget
@@ -31,18 +31,18 @@ 
 	 */
 	public function __construct()
 	{
-		$this->self = get_class( $this );
+		$this->self = get_class($this);
 
 		parent::__construct(
-			strtolower( $this->self ),
-			__( 'Give - Donation Form', 'give' ),
+			strtolower($this->self),
+			__('Give - Donation Form', 'give'),
 			array(
-				'description' => __( 'Display a Give Donation Form in your theme\'s widget powered sidebar.', 'give' )
+				'description' => __('Display a Give Donation Form in your theme\'s widget powered sidebar.', 'give')
 			)
 		);
 
-		add_action( 'widgets_init',          array( $this, 'widget_init' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_widget_scripts' ) );
+		add_action('widgets_init', array($this, 'widget_init'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_widget_scripts'));
 	}
 
 	/**
@@ -52,24 +52,24 @@ 
 	 *
 	 * @return void
 	 */
-	public function admin_widget_scripts( $hook )
+	public function admin_widget_scripts($hook)
 	{
 		// Directories of assets
-		$js_dir     = GIVE_PLUGIN_URL . 'assets/js/admin/';
-		$js_plugins = GIVE_PLUGIN_URL . 'assets/js/plugins/';
-		$css_dir    = GIVE_PLUGIN_URL . 'assets/css/';
+		$js_dir     = GIVE_PLUGIN_URL.'assets/js/admin/';
+		$js_plugins = GIVE_PLUGIN_URL.'assets/js/plugins/';
+		$css_dir    = GIVE_PLUGIN_URL.'assets/css/';
 
 		// Use minified libraries if SCRIPT_DEBUG is turned off
-		$suffix = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
+		$suffix = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
 
 		// Widget Script
-		if ( $hook == 'widgets.php' ) {
+		if ($hook == 'widgets.php') {
 
-			wp_enqueue_style( 'give-qtip-css', $css_dir . 'jquery.qtip' . $suffix . '.css' );
+			wp_enqueue_style('give-qtip-css', $css_dir.'jquery.qtip'.$suffix.'.css');
 
-			wp_enqueue_script( 'give-qtip', $js_plugins . 'jquery.qtip' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION );
+			wp_enqueue_script('give-qtip', $js_plugins.'jquery.qtip'.$suffix.'.js', array('jquery'), GIVE_VERSION);
 
-			wp_enqueue_script( 'give-admin-widgets-scripts', $js_dir . 'admin-widgets' . $suffix . '.js', array( 'jquery' ), GIVE_VERSION, false );
+			wp_enqueue_script('give-admin-widgets-scripts', $js_dir.'admin-widgets'.$suffix.'.js', array('jquery'), GIVE_VERSION, false);
 		}
 	}
 
@@ -80,24 +80,24 @@ 
 	 *                        before_widget, and after_widget.
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
-	public function widget( $args, $instance )
+	public function widget($args, $instance)
 	{
-		extract( $args );
+		extract($args);
 
-		$title = !empty( $instance['title'] ) ? $instance['title'] : '';
-		$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
+		$title = ! empty($instance['title']) ? $instance['title'] : '';
+		$title = apply_filters('widget_title', $title, $instance, $this->id_base);
 
 		echo $before_widget;
 
-		do_action( 'give_before_forms_widget' );
+		do_action('give_before_forms_widget');
 
-		echo $title ? $before_title . $title . $after_title : '';
+		echo $title ? $before_title.$title.$after_title : '';
 
-		give_get_donation_form( $instance );
+		give_get_donation_form($instance);
 
 		echo $after_widget;
 
-		do_action( 'give_after_forms_widget' );
+		do_action('give_after_forms_widget');
 	}
 
 	/**
@@ -107,7 +107,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function form( $instance )
+	public function form($instance)
 	{
 		$defaults = array(
 			'title'        => '',
@@ -115,51 +115,51 @@ 
 			'float_labels' => '',
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults );
+		$instance = wp_parse_args((array) $instance, $defaults);
 
-		extract( $instance );
+		extract($instance);
 
 		// Query Give Forms
 
 		$args = array(
 			'post_type'      => 'give_forms',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'post_status'    => 'publish',
 		);
 
-		$give_forms = get_posts( $args );
+		$give_forms = get_posts($args);
 
 		// Widget: Title
 
 		?><p>
-			<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'give' ); ?></label>
-			<input type="text" class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" value="<?php echo esc_attr( $title ); ?>" /><br>
-			<small><?php _e( 'Leave blank to hide the widget title.', 'give' ); ?></small>
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'give'); ?></label>
+			<input type="text" class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" value="<?php echo esc_attr($title); ?>" /><br>
+			<small><?php _e('Leave blank to hide the widget title.', 'give'); ?></small>
 		</p><?php
 
 		// Widget: Give Form
 
 		?><p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'id' ) ); ?>"><?php printf( __( 'Give %s:', 'give' ), give_get_forms_label_singular() ); ?></label>
-			<select class="widefat" name="<?php echo esc_attr( $this->get_field_name( 'id' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'id' ) ); ?>">
-				<option value="current"><?php _e( '— Select —', 'give' ); ?></option>
-				<?php foreach ( $give_forms as $give_form ) { ?>
-					<option <?php selected( absint( $id ), $give_form->ID ); ?> value="<?php echo esc_attr( $give_form->ID ); ?>"><?php echo $give_form->post_title; ?></option>
+			<label for="<?php echo esc_attr($this->get_field_id('id')); ?>"><?php printf(__('Give %s:', 'give'), give_get_forms_label_singular()); ?></label>
+			<select class="widefat" name="<?php echo esc_attr($this->get_field_name('id')); ?>" id="<?php echo esc_attr($this->get_field_id('id')); ?>">
+				<option value="current"><?php _e('— Select —', 'give'); ?></option>
+				<?php foreach ($give_forms as $give_form) { ?>
+					<option <?php selected(absint($id), $give_form->ID); ?> value="<?php echo esc_attr($give_form->ID); ?>"><?php echo $give_form->post_title; ?></option>
 				<?php } ?>
 			</select><br>
-			<small><?php _e( 'Select a Give Form to embed in this widget.', 'give' ); ?></small>
+			<small><?php _e('Select a Give Form to embed in this widget.', 'give'); ?></small>
 		</p><?php
 
 		// Widget: Floating Labels
 
 		?><p>
-			<label for="<?php echo esc_attr( $this->get_field_id( 'float_labels' ) ); ?>"><?php _e( 'Floating Labels (optional):', 'give' ); ?></label>
-			<select class="widefat" name="<?php echo esc_attr( $this->get_field_name( 'float_labels' ) ); ?>" id="<?php echo esc_attr( $this->get_field_id( 'float_labels' ) ); ?>">
-				<option value="" <?php selected( esc_attr( $float_labels ), '' ) ?>>– <?php _e( 'Select', 'give' ); ?> –</option>
-				<option value="enabled" <?php selected( esc_attr( $float_labels ), 'enabled' ) ?>><?php _e( 'Enabled', 'give' ); ?></option>
-				<option value="disabled" <?php selected( esc_attr( $float_labels ), 'disabled' ) ?>><?php _e( 'Disabled', 'give' ); ?></option>
+			<label for="<?php echo esc_attr($this->get_field_id('float_labels')); ?>"><?php _e('Floating Labels (optional):', 'give'); ?></label>
+			<select class="widefat" name="<?php echo esc_attr($this->get_field_name('float_labels')); ?>" id="<?php echo esc_attr($this->get_field_id('float_labels')); ?>">
+				<option value="" <?php selected(esc_attr($float_labels), '') ?>>– <?php _e('Select', 'give'); ?> –</option>
+				<option value="enabled" <?php selected(esc_attr($float_labels), 'enabled') ?>><?php _e('Enabled', 'give'); ?></option>
+				<option value="disabled" <?php selected(esc_attr($float_labels), 'disabled') ?>><?php _e('Disabled', 'give'); ?></option>
 			</select><br>
-			<small><?php printf( __( 'Override the <a href="%s" target="_blank">floating labels</a> setting for this Give form.', 'give' ), esc_url( "http://bradfrost.com/blog/post/float-label-pattern/" ) ); ?></small>
+			<small><?php printf(__('Override the <a href="%s" target="_blank">floating labels</a> setting for this Give form.', 'give'), esc_url("http://bradfrost.com/blog/post/float-label-pattern/")); ?></small>
 		</p><?php
 	}
 
@@ -170,7 +170,7 @@ 
 	 */
 	function widget_init()
 	{
-		register_widget( $this->self );
+		register_widget($this->self);
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function update( $new_instance, $old_instance )
+	public function update($new_instance, $old_instance)
 	{
 		$this->flush_widget_cache();
 
@@ -195,7 +195,7 @@ 
 	 */
 	public function flush_widget_cache()
 	{
-		wp_cache_delete( $this->self, 'widget' );
+		wp_cache_delete($this->self, 'widget');
 	}
 }
 

includes/gateways/actions.php

Spacing +13 added lines, -13 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -21,14 +21,14 @@ 
  *
  * @param $data
  */
-function give_process_gateway_select( $data ) {
-	if ( isset( $_POST['gateway_submit'] ) ) {
-		wp_redirect( esc_url( add_query_arg( 'payment-mode', $_POST['payment-mode'] ) ) );
+function give_process_gateway_select($data) {
+	if (isset($_POST['gateway_submit'])) {
+		wp_redirect(esc_url(add_query_arg('payment-mode', $_POST['payment-mode'])));
 		exit;
 	}
 }
 
-add_action( 'give_gateway_select', 'give_process_gateway_select' );
+add_action('give_gateway_select', 'give_process_gateway_select');
 
 /**
  * Loads a payment gateway via AJAX
@@ -37,14 +37,14 @@ 
  * @return void
  */
 function give_load_ajax_gateway() {
-	if ( isset( $_POST['give_payment_mode'] ) ) {
-		do_action( 'give_purchase_form', $_POST['give_form_id'] );
+	if (isset($_POST['give_payment_mode'])) {
+		do_action('give_purchase_form', $_POST['give_form_id']);
 		exit();
 	}
 }
 
-add_action( 'wp_ajax_give_load_gateway', 'give_load_ajax_gateway' );
-add_action( 'wp_ajax_nopriv_give_load_gateway', 'give_load_ajax_gateway' );
+add_action('wp_ajax_give_load_gateway', 'give_load_ajax_gateway');
+add_action('wp_ajax_nopriv_give_load_gateway', 'give_load_ajax_gateway');
 
 /**
  * Sets an error on checkout if no gateways are enabled
@@ -55,11 +55,11 @@ 
 function give_no_gateway_error() {
 	$gateways = give_get_enabled_payment_gateways();
 
-	if ( empty( $gateways ) ) {
-		give_set_error( 'no_gateways', __( 'You must enable a payment gateway to use Give', 'give' ) );
+	if (empty($gateways)) {
+		give_set_error('no_gateways', __('You must enable a payment gateway to use Give', 'give'));
 	} else {
-		give_unset_error( 'no_gateways' );
+		give_unset_error('no_gateways');
 	}
 }
 
-add_action( 'init', 'give_no_gateway_error' );
\ No newline at end of file
+add_action('init', 'give_no_gateway_error');
\ No newline at end of file

includes/gateways/functions.php

Indentation +4 added lines, -4 removed lines

@@ -97,10 +97,10 @@
 
 	//Single Form settings varies compared to the Global default settings
 	if ( ! empty( $form_default ) &&
-	     $form_id !== null &&
-	     $default !== $form_default &&
-	     $form_default !== 'global' &&
-	     give_is_gateway_active( $form_default )
+		 $form_id !== null &&
+		 $default !== $form_default &&
+		 $form_default !== 'global' &&
+		 give_is_gateway_active( $form_default )
 	) {
 		$default = $form_default;
 	}

Spacing +64 added lines, -64 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,17 +24,17 @@ 
 	// Default, built-in gateways
 	$gateways = array(
 		'paypal' => array(
-			'admin_label'    => __( 'PayPal Standard', 'give' ),
-			'checkout_label' => __( 'PayPal', 'give' ),
-			'supports'       => array( 'buy_now' )
+			'admin_label'    => __('PayPal Standard', 'give'),
+			'checkout_label' => __('PayPal', 'give'),
+			'supports'       => array('buy_now')
 		),
 		'manual' => array(
-			'admin_label'    => __( 'Test Payment', 'give' ),
-			'checkout_label' => __( 'Test Payment', 'give' )
+			'admin_label'    => __('Test Payment', 'give'),
+			'checkout_label' => __('Test Payment', 'give')
 		),
 	);
 
-	return apply_filters( 'give_payment_gateways', $gateways );
+	return apply_filters('give_payment_gateways', $gateways);
 
 }
 
@@ -48,17 +48,17 @@ 
 	global $give_options;
 
 	$gateways = give_get_payment_gateways();
-	$enabled  = isset( $give_options['gateways'] ) ? $give_options['gateways'] : false;
+	$enabled  = isset($give_options['gateways']) ? $give_options['gateways'] : false;
 
 	$gateway_list = array();
 
-	foreach ( $gateways as $key => $gateway ) {
-		if ( isset( $enabled[ $key ] ) && $enabled[ $key ] == 1 ) {
-			$gateway_list[ $key ] = $gateway;
+	foreach ($gateways as $key => $gateway) {
+		if (isset($enabled[$key]) && $enabled[$key] == 1) {
+			$gateway_list[$key] = $gateway;
 		}
 	}
 
-	return apply_filters( 'give_enabled_payment_gateways', $gateway_list );
+	return apply_filters('give_enabled_payment_gateways', $gateway_list);
 }
 
 /**
@@ -70,12 +70,12 @@ 
  *
  * @return boolean true if enabled, false otherwise
  */
-function give_is_gateway_active( $gateway ) {
+function give_is_gateway_active($gateway) {
 	$gateways = give_get_enabled_payment_gateways();
 
-	$ret = array_key_exists( $gateway, $gateways );
+	$ret = array_key_exists($gateway, $gateways);
 
-	return apply_filters( 'give_is_gateway_active', $ret, $gateway, $gateways );
+	return apply_filters('give_is_gateway_active', $ret, $gateway, $gateways);
 }
 
 /**
@@ -88,24 +88,24 @@ 
  *
  * @return string Gateway ID
  */
-function give_get_default_gateway( $form_id ) {
+function give_get_default_gateway($form_id) {
 
 	global $give_options;
 
-	$default      = isset( $give_options['default_gateway'] ) && give_is_gateway_active( $give_options['default_gateway'] ) ? $give_options['default_gateway'] : 'paypal';
-	$form_default = get_post_meta( $form_id, '_give_default_gateway', true );
+	$default      = isset($give_options['default_gateway']) && give_is_gateway_active($give_options['default_gateway']) ? $give_options['default_gateway'] : 'paypal';
+	$form_default = get_post_meta($form_id, '_give_default_gateway', true);
 
 	//Single Form settings varies compared to the Global default settings
-	if ( ! empty( $form_default ) &&
+	if ( ! empty($form_default) &&
 	     $form_id !== null &&
 	     $default !== $form_default &&
 	     $form_default !== 'global' &&
-	     give_is_gateway_active( $form_default )
+	     give_is_gateway_active($form_default)
 	) {
 		$default = $form_default;
 	}
 
-	return apply_filters( 'give_default_gateway', $default );
+	return apply_filters('give_default_gateway', $default);
 }
 
 /**
@@ -117,18 +117,18 @@ 
  *
  * @return string Gateway admin label
  */
-function give_get_gateway_admin_label( $gateway ) {
+function give_get_gateway_admin_label($gateway) {
 	$gateways = give_get_enabled_payment_gateways();
-	$label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['admin_label'] : $gateway;
-	$payment  = isset( $_GET['id'] ) ? absint( $_GET['id'] ) : false;
+	$label    = isset($gateways[$gateway]) ? $gateways[$gateway]['admin_label'] : $gateway;
+	$payment  = isset($_GET['id']) ? absint($_GET['id']) : false;
 
-	if ( $gateway == 'manual' && $payment ) {
-		if ( give_get_payment_amount( $payment ) == 0 ) {
-			$label = __( 'Test Donation', 'give' );
+	if ($gateway == 'manual' && $payment) {
+		if (give_get_payment_amount($payment) == 0) {
+			$label = __('Test Donation', 'give');
 		}
 	}
 
-	return apply_filters( 'give_gateway_admin_label', $label, $gateway );
+	return apply_filters('give_gateway_admin_label', $label, $gateway);
 }
 
 /**
@@ -140,15 +140,15 @@ 
  *
  * @return string Checkout label for the gateway
  */
-function give_get_gateway_checkout_label( $gateway ) {
+function give_get_gateway_checkout_label($gateway) {
 	$gateways = give_get_enabled_payment_gateways();
-	$label    = isset( $gateways[ $gateway ] ) ? $gateways[ $gateway ]['checkout_label'] : $gateway;
+	$label    = isset($gateways[$gateway]) ? $gateways[$gateway]['checkout_label'] : $gateway;
 
-	if ( $gateway == 'manual' ) {
-		$label = __( 'Test Donation', 'give' );
+	if ($gateway == 'manual') {
+		$label = __('Test Donation', 'give');
 	}
 
-	return apply_filters( 'give_gateway_checkout_label', $label, $gateway );
+	return apply_filters('give_gateway_checkout_label', $label, $gateway);
 }
 
 /**
@@ -160,11 +160,11 @@ 
  *
  * @return array Options the gateway supports
  */
-function give_get_gateway_supports( $gateway ) {
+function give_get_gateway_supports($gateway) {
 	$gateways = give_get_enabled_payment_gateways();
-	$supports = isset( $gateways[ $gateway ]['supports'] ) ? $gateways[ $gateway ]['supports'] : array();
+	$supports = isset($gateways[$gateway]['supports']) ? $gateways[$gateway]['supports'] : array();
 
-	return apply_filters( 'give_gateway_supports', $supports, $gateway );
+	return apply_filters('give_gateway_supports', $supports, $gateway);
 }
 
 /**
@@ -176,11 +176,11 @@ 
  *
  * @return bool
  */
-function give_gateway_supports_buy_now( $gateway ) {
-	$supports = give_get_gateway_supports( $gateway );
-	$ret      = in_array( 'buy_now', $supports );
+function give_gateway_supports_buy_now($gateway) {
+	$supports = give_get_gateway_supports($gateway);
+	$ret      = in_array('buy_now', $supports);
 
-	return apply_filters( 'give_gateway_supports_buy_now', $ret, $gateway );
+	return apply_filters('give_gateway_supports_buy_now', $ret, $gateway);
 }
 
 /**
@@ -193,16 +193,16 @@ 
 	$gateways = give_get_enabled_payment_gateways();
 	$ret      = false;
 
-	if ( $gateways ) {
-		foreach ( $gateways as $gateway_id => $gateway ) {
-			if ( give_gateway_supports_buy_now( $gateway_id ) ) {
+	if ($gateways) {
+		foreach ($gateways as $gateway_id => $gateway) {
+			if (give_gateway_supports_buy_now($gateway_id)) {
 				$ret = true;
 				break;
 			}
 		}
 	}
 
-	return apply_filters( 'give_give_supports_buy_now', $ret );
+	return apply_filters('give_give_supports_buy_now', $ret);
 }
 
 /**
@@ -215,12 +215,12 @@ 
  *
  * @return void
  */
-function give_send_to_gateway( $gateway, $payment_data ) {
+function give_send_to_gateway($gateway, $payment_data) {
 
-	$payment_data['gateway_nonce'] = wp_create_nonce( 'give-gateway' );
+	$payment_data['gateway_nonce'] = wp_create_nonce('give-gateway');
 
 	// $gateway must match the ID used when registering the gateway
-	do_action( 'give_gateway_' . $gateway, $payment_data );
+	do_action('give_gateway_'.$gateway, $payment_data);
 }
 
 
@@ -237,32 +237,32 @@ 
  *
  * @return string $enabled_gateway The slug of the gateway
  */
-function give_get_chosen_gateway( $form_id ) {
+function give_get_chosen_gateway($form_id) {
 	$gateways        = give_get_enabled_payment_gateways();
-	$request_form_id = isset( $_REQUEST['give_form_id'] ) ? $_REQUEST['give_form_id'] : 0;
-	if ( empty( $request_form_id ) ) {
-		$request_form_id = isset( $_REQUEST['form-id'] ) ? $_REQUEST['form-id'] : 0;
+	$request_form_id = isset($_REQUEST['give_form_id']) ? $_REQUEST['give_form_id'] : 0;
+	if (empty($request_form_id)) {
+		$request_form_id = isset($_REQUEST['form-id']) ? $_REQUEST['form-id'] : 0;
 	}
-	$chosen          = give_get_default_gateway( $form_id );
+	$chosen          = give_get_default_gateway($form_id);
 	$enabled_gateway = '';
 
 	//Take into account request Form ID args
-	if ( ! empty( $request_form_id ) && $form_id == $request_form_id ) {
+	if ( ! empty($request_form_id) && $form_id == $request_form_id) {
 		$chosen = $_REQUEST['payment-mode'];
 	}
 
-	if ( $chosen ) {
-		$enabled_gateway = urldecode( $chosen );
-	} else if ( count( $gateways ) >= 1 && ! $chosen ) {
-		foreach ( $gateways as $gateway_id => $gateway ):
+	if ($chosen) {
+		$enabled_gateway = urldecode($chosen);
+	} else if (count($gateways) >= 1 && ! $chosen) {
+		foreach ($gateways as $gateway_id => $gateway):
 			$enabled_gateway = $gateway_id;
 		endforeach;
 	} else {
-		$enabled_gateway = give_get_default_gateway( $form_id );
+		$enabled_gateway = give_get_default_gateway($form_id);
 	}
 
 
-	return apply_filters( 'give_chosen_gateway', $enabled_gateway );
+	return apply_filters('give_chosen_gateway', $enabled_gateway);
 }
 
 /**
@@ -279,8 +279,8 @@ 
  *
  * @return int ID of the new log entry
  */
-function give_record_gateway_error( $title = '', $message = '', $parent = 0 ) {
-	return give_record_log( $title, $message, $parent, 'gateway_error' );
+function give_record_gateway_error($title = '', $message = '', $parent = 0) {
+	return give_record_log($title, $message, $parent, 'gateway_error');
 }
 
 /**
@@ -293,7 +293,7 @@ 
  *
  * @return int
  */
-function give_count_sales_by_gateway( $gateway_id = 'paypal', $status = 'publish' ) {
+function give_count_sales_by_gateway($gateway_id = 'paypal', $status = 'publish') {
 
 	$ret  = 0;
 	$args = array(
@@ -305,9 +305,9 @@ 
 		'fields'      => 'ids'
 	);
 
-	$payments = new WP_Query( $args );
+	$payments = new WP_Query($args);
 
-	if ( $payments ) {
+	if ($payments) {
 		$ret = $payments->post_count;
 	}
 

includes/gateways/manual.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Manual Gateway
- *
- * @package     Give
- * @subpackage  Gateways
- * @copyright   Copyright (c) 2015, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+	 * Manual Gateway
+	 *
+	 * @package     Give
+	 * @subpackage  Gateways
+	 * @copyright   Copyright (c) 2015, WordImpress
+	 * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+	 * @since       1.0
+	 */
 
 // Exit if accessed directly
 if ( ! defined( 'ABSPATH' ) ) {

Spacing +12 added lines, -12 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,7 +20,7 @@ 
  * @since 1.0
  * @return void
  */
-add_action( 'give_manual_cc_form', '__return_false' );
+add_action('give_manual_cc_form', '__return_false');
 
 /**
  * Processes the purchase data and uses the Manual Payment gateway to record
@@ -33,12 +33,12 @@ 
  *
  * @return void
  */
-function give_manual_payment( $purchase_data ) {
+function give_manual_payment($purchase_data) {
 
 	global $give_options;
 
-	if ( ! wp_verify_nonce( $purchase_data['gateway_nonce'], 'give-gateway' ) ) {
-		wp_die( __( 'Nonce verification has failed', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($purchase_data['gateway_nonce'], 'give-gateway')) {
+		wp_die(__('Nonce verification has failed', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
 	/*
@@ -47,7 +47,7 @@ 
 	$payment_data = array(
 		'price'           => $purchase_data['price'],
 		'give_form_title' => $purchase_data['post_data']['give-form-title'],
-		'give_form_id'    => intval( $purchase_data['post_data']['give-form-id'] ),
+		'give_form_id'    => intval($purchase_data['post_data']['give-form-id']),
 		'date'            => $purchase_data['date'],
 		'user_email'      => $purchase_data['user_email'],
 		'purchase_key'    => $purchase_data['purchase_key'],
@@ -56,16 +56,16 @@ 
 		'status'          => 'pending'
 	);
 	// Record the pending payment
-	$payment = give_insert_payment( $payment_data );
+	$payment = give_insert_payment($payment_data);
 
-	if ( $payment ) {
-		give_update_payment_status( $payment, 'publish' );
+	if ($payment) {
+		give_update_payment_status($payment, 'publish');
 		give_send_to_success_page();
 	} else {
-		give_record_gateway_error( __( 'Payment Error', 'give' ), sprintf( __( 'Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'give' ), json_encode( $payment_data ) ), $payment );
+		give_record_gateway_error(__('Payment Error', 'give'), sprintf(__('Payment creation failed while processing a manual (free or test) purchase. Payment data: %s', 'give'), json_encode($payment_data)), $payment);
 		// If errors are present, send the user back to the purchase page so they can be corrected
-		give_send_back_to_checkout( '?payment-mode=' . $purchase_data['post_data']['give-gateway'] );
+		give_send_back_to_checkout('?payment-mode='.$purchase_data['post_data']['give-gateway']);
 	}
 }
 
-add_action( 'give_gateway_manual', 'give_manual_payment' );
+add_action('give_gateway_manual', 'give_manual_payment');

includes/login-register.php

Spacing +59 added lines, -59 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,10 +25,10 @@ 
  *
  * @return string Login form
  */
-function give_login_form( $redirect = '' ) {
+function give_login_form($redirect = '') {
 	global $give_options, $give_login_redirect;
 
-	if ( empty( $redirect ) ) {
+	if (empty($redirect)) {
 		$redirect = give_get_current_page_url();
 	}
 
@@ -36,9 +36,9 @@ 
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'login' );
+	give_get_template_part('shortcode', 'login');
 
-	return apply_filters( 'give_login_form', ob_get_clean() );
+	return apply_filters('give_login_form', ob_get_clean());
 }
 
 /**
@@ -52,10 +52,10 @@ 
  *
  * @return string Register form
  */
-function give_register_form( $redirect = '' ) {
+function give_register_form($redirect = '') {
 	global $give_options, $give_register_redirect;
 
-	if ( empty( $redirect ) ) {
+	if (empty($redirect)) {
 		$redirect = give_get_current_page_url();
 	}
 
@@ -63,11 +63,11 @@ 
 
 	ob_start();
 
-	if ( ! is_user_logged_in() ) {
-		give_get_template_part( 'shortcode', 'register' );
+	if ( ! is_user_logged_in()) {
+		give_get_template_part('shortcode', 'register');
 	}
 
-	return apply_filters( 'give_register_form', ob_get_clean() );
+	return apply_filters('give_register_form', ob_get_clean());
 }
 
 /**
@@ -79,34 +79,34 @@ 
  *
  * @return void
  */
-function give_process_login_form( $data ) {
-	if ( wp_verify_nonce( $data['give_login_nonce'], 'give-login-nonce' ) ) {
-		$user_data = get_user_by( 'login', $data['give_user_login'] );
-		if ( ! $user_data ) {
-			$user_data = get_user_by( 'email', $data['give_user_login'] );
+function give_process_login_form($data) {
+	if (wp_verify_nonce($data['give_login_nonce'], 'give-login-nonce')) {
+		$user_data = get_user_by('login', $data['give_user_login']);
+		if ( ! $user_data) {
+			$user_data = get_user_by('email', $data['give_user_login']);
 		}
-		if ( $user_data ) {
+		if ($user_data) {
 			$user_ID    = $user_data->ID;
 			$user_email = $user_data->user_email;
-			if ( wp_check_password( $data['give_user_pass'], $user_data->user_pass, $user_data->ID ) ) {
-				give_log_user_in( $user_data->ID, $data['give_user_login'], $data['give_user_pass'] );
+			if (wp_check_password($data['give_user_pass'], $user_data->user_pass, $user_data->ID)) {
+				give_log_user_in($user_data->ID, $data['give_user_login'], $data['give_user_pass']);
 			} else {
-				give_set_error( 'password_incorrect', __( 'The password you entered is incorrect', 'give' ) );
+				give_set_error('password_incorrect', __('The password you entered is incorrect', 'give'));
 			}
 		} else {
-			give_set_error( 'username_incorrect', __( 'The username you entered does not exist', 'give' ) );
+			give_set_error('username_incorrect', __('The username you entered does not exist', 'give'));
 		}
 		// Check for errors and redirect if none present
 		$errors = give_get_errors();
-		if ( ! $errors ) {
-			$redirect = apply_filters( 'give_login_redirect', $data['give_redirect'], $user_ID );
-			wp_redirect( $redirect );
+		if ( ! $errors) {
+			$redirect = apply_filters('give_login_redirect', $data['give_redirect'], $user_ID);
+			wp_redirect($redirect);
 			give_die();
 		}
 	}
 }
 
-add_action( 'give_user_login', 'give_process_login_form' );
+add_action('give_user_login', 'give_process_login_form');
 
 /**
  * Log User In
@@ -119,15 +119,15 @@ 
  *
  * @return void
  */
-function give_log_user_in( $user_id, $user_login, $user_pass ) {
-	if ( $user_id < 1 ) {
+function give_log_user_in($user_id, $user_login, $user_pass) {
+	if ($user_id < 1) {
 		return;
 	}
 
-	wp_set_auth_cookie( $user_id );
-	wp_set_current_user( $user_id, $user_login );
-	do_action( 'wp_login', $user_login, get_userdata( $user_id ) );
-	do_action( 'give_log_user_in', $user_id, $user_login, $user_pass );
+	wp_set_auth_cookie($user_id);
+	wp_set_current_user($user_id, $user_login);
+	do_action('wp_login', $user_login, get_userdata($user_id));
+	do_action('give_log_user_in', $user_id, $user_login, $user_pass);
 }
 
 
@@ -140,70 +140,70 @@ 
  *
  * @return void
  */
-function give_process_register_form( $data ) {
+function give_process_register_form($data) {
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		return;
 	}
 
-	if ( empty( $_POST['give_register_submit'] ) ) {
+	if (empty($_POST['give_register_submit'])) {
 		return;
 	}
 
-	do_action( 'give_pre_process_register_form' );
+	do_action('give_pre_process_register_form');
 
-	if ( empty( $data['give_user_login'] ) ) {
-		give_set_error( 'empty_username', __( 'Invalid username', 'give' ) );
+	if (empty($data['give_user_login'])) {
+		give_set_error('empty_username', __('Invalid username', 'give'));
 	}
 
-	if ( username_exists( $data['give_user_login'] ) ) {
-		give_set_error( 'username_unavailable', __( 'Username already taken', 'give' ) );
+	if (username_exists($data['give_user_login'])) {
+		give_set_error('username_unavailable', __('Username already taken', 'give'));
 	}
 
-	if ( ! validate_username( $data['give_user_login'] ) ) {
-		give_set_error( 'username_invalid', __( 'Invalid username', 'give' ) );
+	if ( ! validate_username($data['give_user_login'])) {
+		give_set_error('username_invalid', __('Invalid username', 'give'));
 	}
 
-	if ( email_exists( $data['give_user_email'] ) ) {
-		give_set_error( 'email_unavailable', __( 'Email address already taken', 'give' ) );
+	if (email_exists($data['give_user_email'])) {
+		give_set_error('email_unavailable', __('Email address already taken', 'give'));
 	}
 
-	if ( empty( $data['give_user_email'] ) || ! is_email( $data['give_user_email'] ) ) {
-		give_set_error( 'email_invalid', __( 'Invalid email', 'give' ) );
+	if (empty($data['give_user_email']) || ! is_email($data['give_user_email'])) {
+		give_set_error('email_invalid', __('Invalid email', 'give'));
 	}
 
-	if ( ! empty( $data['give_payment_email'] ) && $data['give_payment_email'] != $data['give_user_email'] && ! is_email( $data['give_payment_email'] ) ) {
-		give_set_error( 'payment_email_invalid', __( 'Invalid payment email', 'give' ) );
+	if ( ! empty($data['give_payment_email']) && $data['give_payment_email'] != $data['give_user_email'] && ! is_email($data['give_payment_email'])) {
+		give_set_error('payment_email_invalid', __('Invalid payment email', 'give'));
 	}
 
-	if ( empty( $_POST['give_user_pass'] ) ) {
-		give_set_error( 'empty_password', __( 'Please enter a password', 'give' ) );
+	if (empty($_POST['give_user_pass'])) {
+		give_set_error('empty_password', __('Please enter a password', 'give'));
 	}
 
-	if ( ( ! empty( $_POST['give_user_pass'] ) && empty( $_POST['give_user_pass2'] ) ) || ( $_POST['give_user_pass'] !== $_POST['give_user_pass2'] ) ) {
-		give_set_error( 'password_mismatch', __( 'Passwords do not match', 'give' ) );
+	if (( ! empty($_POST['give_user_pass']) && empty($_POST['give_user_pass2'])) || ($_POST['give_user_pass'] !== $_POST['give_user_pass2'])) {
+		give_set_error('password_mismatch', __('Passwords do not match', 'give'));
 	}
 
-	do_action( 'give_process_register_form' );
+	do_action('give_process_register_form');
 
 	// Check for errors and redirect if none present
 	$errors = give_get_errors();
 
-	if ( empty( $errors ) ) {
+	if (empty($errors)) {
 
-		$redirect = apply_filters( 'give_register_redirect', $data['give_redirect'] );
+		$redirect = apply_filters('give_register_redirect', $data['give_redirect']);
 
-		give_register_and_login_new_user( array(
+		give_register_and_login_new_user(array(
 			'user_login'      => $data['give_user_login'],
 			'user_pass'       => $data['give_user_pass'],
 			'user_email'      => $data['give_user_email'],
-			'user_registered' => date( 'Y-m-d H:i:s' ),
-			'role'            => get_option( 'default_role' )
-		) );
+			'user_registered' => date('Y-m-d H:i:s'),
+			'role'            => get_option('default_role')
+		));
 
-		wp_redirect( $redirect );
+		wp_redirect($redirect);
 		give_die();
 	}
 }
 
-add_action( 'give_user_register', 'give_process_register_form' );
\ No newline at end of file
+add_action('give_user_register', 'give_process_register_form');
\ No newline at end of file