WordImpress / Give

includes/payments/class-donators-gravatars.php

Spacing +96 added lines, -96 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -50,50 +50,50 @@ 
 	 */
 
 	// https://gist.github.com/justinph/5197810
-	function validate_gravatar( $id_or_email ) {
+	function validate_gravatar($id_or_email) {
 		//id or email code borrowed from wp-includes/pluggable.php
 		$email = '';
-		if ( is_numeric( $id_or_email ) ) {
+		if (is_numeric($id_or_email)) {
 			$id   = (int) $id_or_email;
-			$user = get_userdata( $id );
-			if ( $user ) {
+			$user = get_userdata($id);
+			if ($user) {
 				$email = $user->user_email;
 			}
-		} elseif ( is_object( $id_or_email ) ) {
+		} elseif (is_object($id_or_email)) {
 			// No avatar for pingbacks or trackbacks
-			$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-			if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+			$allowed_comment_types = apply_filters('get_avatar_comment_types', array('comment'));
+			if ( ! empty($id_or_email->comment_type) && ! in_array($id_or_email->comment_type, (array) $allowed_comment_types)) {
 				return false;
 			}
 
-			if ( ! empty( $id_or_email->user_id ) ) {
+			if ( ! empty($id_or_email->user_id)) {
 				$id   = (int) $id_or_email->user_id;
-				$user = get_userdata( $id );
-				if ( $user ) {
+				$user = get_userdata($id);
+				if ($user) {
 					$email = $user->user_email;
 				}
-			} elseif ( ! empty( $id_or_email->comment_author_email ) ) {
+			} elseif ( ! empty($id_or_email->comment_author_email)) {
 				$email = $id_or_email->comment_author_email;
 			}
 		} else {
 			$email = $id_or_email;
 		}
 
-		$hashkey = md5( strtolower( trim( $email ) ) );
-		$uri     = 'http://www.gravatar.com/avatar/' . $hashkey . '?d=404';
+		$hashkey = md5(strtolower(trim($email)));
+		$uri     = 'http://www.gravatar.com/avatar/'.$hashkey.'?d=404';
 
-		$data = wp_cache_get( $hashkey );
-		if ( false === $data ) {
-			$response = wp_remote_head( $uri );
-			if ( is_wp_error( $response ) ) {
+		$data = wp_cache_get($hashkey);
+		if (false === $data) {
+			$response = wp_remote_head($uri);
+			if (is_wp_error($response)) {
 				$data = 'not200';
 			} else {
 				$data = $response['response']['code'];
 			}
-			wp_cache_set( $hashkey, $data, $group = '', $expire = 60 * 5 );
+			wp_cache_set($hashkey, $data, $group = '', $expire = 60 * 5);
 
 		}
-		if ( $data == '200' ) {
+		if ($data == '200') {
 			return true;
 		} else {
 			return false;
@@ -108,17 +108,17 @@ 
 	 *
 	 * @param int $form_id
 	 */
-	function get_log_ids( $form_id = '' ) {
+	function get_log_ids($form_id = '') {
 
 		// get Give_Logging class
 		global $give_logs;
 
 		// get log for this form
-		$logs = $give_logs->get_logs( $form_id );
+		$logs = $give_logs->get_logs($form_id);
 
-		if ( $logs ) {
+		if ($logs) {
 			// make an array with all the donor IDs
-			foreach ( $logs as $log ) {
+			foreach ($logs as $log) {
 				$log_ids[] = $log->ID;
 			}
 
@@ -135,49 +135,49 @@ 
 	 *
 	 * @since 1.0
 	 */
-	function get_payment_ids( $form_id = '' ) {
+	function get_payment_ids($form_id = '') {
 
 		global $give_options;
 
-		$log_ids = $this->get_log_ids( $form_id );
+		$log_ids = $this->get_log_ids($form_id);
 
-		if ( $log_ids ) {
+		if ($log_ids) {
 
 			$payment_ids = array();
 
-			foreach ( $log_ids as $id ) {
+			foreach ($log_ids as $id) {
 				// get the payment ID for each corresponding log ID
-				$payment_ids[] = get_post_meta( $id, '_give_log_payment_id', true );
+				$payment_ids[] = get_post_meta($id, '_give_log_payment_id', true);
 			}
 
 			// remove donors who have purchased more than once so we can have unique avatars
 			$unique_emails = array();
 
-			foreach ( $payment_ids as $key => $id ) {
+			foreach ($payment_ids as $key => $id) {
 
-				$email = get_post_meta( $id, '_give_payment_user_email', true );
+				$email = get_post_meta($id, '_give_payment_user_email', true);
 
-				if ( isset ( $give_options['give_donators_gravatars_has_gravatar_account'] ) ) {
-					if ( ! $this->validate_gravatar( $email ) ) {
+				if (isset ($give_options['give_donators_gravatars_has_gravatar_account'])) {
+					if ( ! $this->validate_gravatar($email)) {
 						continue;
 					}
 				}
 
-				$unique_emails[ $id ] = get_post_meta( $id, '_give_payment_user_email', true );
+				$unique_emails[$id] = get_post_meta($id, '_give_payment_user_email', true);
 
 			}
 
 			// strip duplicate emails
-			$unique_emails = array_unique( $unique_emails );
+			$unique_emails = array_unique($unique_emails);
 
 			// convert the unique IDs back into simple array
-			foreach ( $unique_emails as $id => $email ) {
+			foreach ($unique_emails as $id => $email) {
 				$unique_ids[] = $id;
 			}
 
 			// randomize the payment IDs if enabled
-			if ( isset( $give_options['give_donators_gravatars_random_gravatars'] ) ) {
-				shuffle( $unique_ids );
+			if (isset($give_options['give_donators_gravatars_random_gravatars'])) {
+				shuffle($unique_ids);
 			}
 
 			// return our unique IDs
@@ -193,10 +193,10 @@ 
 	 *
 	 * @since 1.0
 	 */
-	function gravatars( $form_id = false, $title = '' ) {
+	function gravatars($form_id = false, $title = '') {
 
 		// unique $payment_ids 
-		$payment_ids = $this->get_payment_ids( $form_id );
+		$payment_ids = $this->get_payment_ids($form_id);
 
 		//			var_dump( $payment_ids );
 		//			 var_dump( $this->get_log_ids( get_the_ID() ) );
@@ -204,14 +204,14 @@ 
 		global $give_options;
 
 		// return if no ID
-		if ( ! $form_id ) {
+		if ( ! $form_id) {
 			return;
 		}
 
 		// minimum amount of purchases before showing gravatars
 		// if the number of items in array is not greater or equal to the number specified, then exit
-		if ( isset( $give_options['give_donators_gravatars_min_purchases_required'] ) && '' != $give_options['give_donators_gravatars_min_purchases_required'] ) {
-			if ( ! ( count( $payment_ids ) >= $give_options['give_donators_gravatars_min_purchases_required'] ) ) {
+		if (isset($give_options['give_donators_gravatars_min_purchases_required']) && '' != $give_options['give_donators_gravatars_min_purchases_required']) {
+			if ( ! (count($payment_ids) >= $give_options['give_donators_gravatars_min_purchases_required'])) {
 				return;
 			}
 		}
@@ -222,51 +222,51 @@ 
 		echo '<div id="give-purchase-gravatars">';
 
 
-		if ( isset ( $title ) ) {
+		if (isset ($title)) {
 
-			if ( $title ) {
-				echo apply_filters( 'give_donators_gravatars_title', '<h3 class="give-gravatars-title">' . esc_attr( $title ) . '</h3>' );
-			} elseif ( isset( $give_options['give_donators_gravatars_heading'] ) ) {
-				echo apply_filters( 'give_donators_gravatars_title', '<h3 class="give-gravatars-title">' . esc_attr( $give_options['give_donators_gravatars_heading'] ) . '</h2>' );
+			if ($title) {
+				echo apply_filters('give_donators_gravatars_title', '<h3 class="give-gravatars-title">'.esc_attr($title).'</h3>');
+			} elseif (isset($give_options['give_donators_gravatars_heading'])) {
+				echo apply_filters('give_donators_gravatars_title', '<h3 class="give-gravatars-title">'.esc_attr($give_options['give_donators_gravatars_heading']).'</h2>');
 			}
 
 		}
 		echo '<ul class="give-purchase-gravatars-list">';
 		$i = 0;
 
-		if ( $payment_ids ) {
-			foreach ( $payment_ids as $id ) {
+		if ($payment_ids) {
+			foreach ($payment_ids as $id) {
 
 				// Give saves a blank option even when the control is turned off, hence the extra check
-				if ( isset( $give_options['give_donators_gravatars_maximum_number'] ) && '' != $give_options['give_donators_gravatars_maximum_number'] && $i == $give_options['give_donators_gravatars_maximum_number'] ) {
+				if (isset($give_options['give_donators_gravatars_maximum_number']) && '' != $give_options['give_donators_gravatars_maximum_number'] && $i == $give_options['give_donators_gravatars_maximum_number']) {
 					continue;
 				}
 
 				// get the payment meta
-				$payment_meta = get_post_meta( $id, '_give_payment_meta', true );
+				$payment_meta = get_post_meta($id, '_give_payment_meta', true);
 
 				// unserialize the payment meta
-				$user_info = maybe_unserialize( $payment_meta['user_info'] );
+				$user_info = maybe_unserialize($payment_meta['user_info']);
 
 				// get donor's first name
 				$name = $user_info['first_name'];
 
 				// get donor's email
-				$email = get_post_meta( $id, '_give_payment_user_email', true );
+				$email = get_post_meta($id, '_give_payment_user_email', true);
 
 				// set gravatar size and provide filter
-				$size = isset( $give_options['give_donators_gravatars_gravatar_size'] ) ? apply_filters( 'give_donators_gravatars_gravatar_size', $give_options['give_donators_gravatars_gravatar_size'] ) : '';
+				$size = isset($give_options['give_donators_gravatars_gravatar_size']) ? apply_filters('give_donators_gravatars_gravatar_size', $give_options['give_donators_gravatars_gravatar_size']) : '';
 
 				// default image
-				$default_image = apply_filters( 'give_donators_gravatars_gravatar_default_image', false );
+				$default_image = apply_filters('give_donators_gravatars_gravatar_default_image', false);
 
 				// assemble output
 				$output .= '<li>';
 
-				$output .= get_avatar( $email, $size, $default_image, $name );
+				$output .= get_avatar($email, $size, $default_image, $name);
 				$output .= '</li>';
 
-				$i ++;
+				$i++;
 
 			} // end foreach
 		}
@@ -275,7 +275,7 @@ 
 		echo '</ul>';
 		echo '</div>';
 
-		return apply_filters( 'give_donators_gravatars', ob_get_clean() );
+		return apply_filters('give_donators_gravatars', ob_get_clean());
 	}
 
 	/**
@@ -284,7 +284,7 @@ 
 	 * @since 1.0
 	 */
 	function register_widget() {
-		register_widget( 'Give_Donators_Gravatars_Widget' );
+		register_widget('Give_Donators_Gravatars_Widget');
 	}
 
 	/**
@@ -293,19 +293,19 @@ 
 	 * @since 1.0
 	 * @todo  set the ID to get_the_ID() if ID parameter is not passed through. Otherwise it will incorrectly get other gravatars
 	 */
-	function shortcode( $atts, $content = null ) {
+	function shortcode($atts, $content = null) {
 
-		$atts = shortcode_atts( array(
+		$atts = shortcode_atts(array(
 			'id'    => '',
 			'title' => ''
-		), $atts, 'give_donators_gravatars' );
+		), $atts, 'give_donators_gravatars');
 
 		// if no ID is passed on single give_forms pages, get the correct ID
-		if ( is_singular( 'give_forms' ) ) {
+		if (is_singular('give_forms')) {
 			$id = get_the_ID();
 		}
 
-		$content = $this->gravatars( $atts['id'], $atts['title'] );
+		$content = $this->gravatars($atts['id'], $atts['title']);
 
 		return $content;
 
@@ -316,56 +316,56 @@ 
 	 *
 	 * @since 1.0
 	 */
-	function settings( $settings ) {
+	function settings($settings) {
 
 		$give_gravatar_settings = array(
 			array(
-				'name' => __( 'Donator Gravatars', 'give' ),
+				'name' => __('Donator Gravatars', 'give'),
 				'desc' => '<hr>',
 				'id'   => 'give_title',
 				'type' => 'give_title'
 			),
 			array(
-				'name' => __( 'Heading', 'give' ),
-				'desc' => __( 'The heading to display above the Gravatars', 'give' ),
+				'name' => __('Heading', 'give'),
+				'desc' => __('The heading to display above the Gravatars', 'give'),
 				'type' => 'text',
 				'id'   => 'give_donators_gravatars_heading'
 			),
 			array(
-				'name'    => __( 'Gravatar Size', 'give' ),
-				'desc'    => __( 'The size of each Gravatar in pixels (512px maximum)', 'give' ),
+				'name'    => __('Gravatar Size', 'give'),
+				'desc'    => __('The size of each Gravatar in pixels (512px maximum)', 'give'),
 				'type'    => 'text_small',
 				'id'      => 'give_donators_gravatars_gravatar_size',
 				'default' => '64'
 			),
 			array(
-				'name' => __( 'Minimum Unique Purchases Required', 'give' ),
-				'desc' => sprintf( __( 'The minimum number of unique purchases a %s must have before the Gravatars are shown. Leave blank for no minimum.', 'give' ), strtolower( give_get_forms_label_singular() ) ),
+				'name' => __('Minimum Unique Purchases Required', 'give'),
+				'desc' => sprintf(__('The minimum number of unique purchases a %s must have before the Gravatars are shown. Leave blank for no minimum.', 'give'), strtolower(give_get_forms_label_singular())),
 				'type' => 'text_small',
 				'id'   => 'give_donators_gravatars_min_purchases_required',
 			),
 			array(
-				'name'    => __( 'Maximum Gravatars To Show', 'give' ),
-				'desc'    => __( 'The maximum number of gravatars to show. Leave blank for no limit.', 'give' ),
+				'name'    => __('Maximum Gravatars To Show', 'give'),
+				'desc'    => __('The maximum number of gravatars to show. Leave blank for no limit.', 'give'),
 				'type'    => 'text',
 				'id'      => 'give_donators_gravatars_maximum_number',
 				'default' => '20',
 			),
 			array(
-				'name' => __( 'Gravatar Visibility', 'give' ),
-				'desc' => __( 'Only show donators with a Gravatar account', 'give' ),
+				'name' => __('Gravatar Visibility', 'give'),
+				'desc' => __('Only show donators with a Gravatar account', 'give'),
 				'id'   => 'give_donators_gravatars_has_gravatar_account',
 				'type' => 'checkbox',
 			),
 			array(
-				'name' => __( 'Randomize Gravatars', 'give' ),
-				'desc' => __( 'Randomize the Gravatars', 'give' ),
+				'name' => __('Randomize Gravatars', 'give'),
+				'desc' => __('Randomize the Gravatars', 'give'),
 				'id'   => 'give_donators_gravatars_random_gravatars',
 				'type' => 'checkbox',
 			),
 		);
 
-		return array_merge( $settings, $give_gravatar_settings );
+		return array_merge($settings, $give_gravatar_settings);
 	}
 
 }
@@ -383,12 +383,12 @@ 
 	 */
 	function give_donators_gravatars_widget() {
 
-		$give_label_singular = function_exists( 'give_get_forms_label_singular' ) ? strtolower( give_get_forms_label_singular() ) : null;
+		$give_label_singular = function_exists('give_get_forms_label_singular') ? strtolower(give_get_forms_label_singular()) : null;
 
 		// widget settings
 		$widget_ops = array(
 			'classname'   => 'give-donators-gravatars',
-			'description' => sprintf( __( 'Displays gravatars of people who have donated using your your %s. Will only show on the single %s page.', 'give' ), $give_label_singular, $give_label_singular )
+			'description' => sprintf(__('Displays gravatars of people who have donated using your your %s. Will only show on the single %s page.', 'give'), $give_label_singular, $give_label_singular)
 		);
 
 		// widget control settings
@@ -401,7 +401,7 @@ 
 		// create the widget
 		$this->WP_Widget(
 			'give_donators_gravatars_widget',
-			__( 'Give Donators Gravatars', 'give' ),
+			__('Give Donators Gravatars', 'give'),
 			$widget_ops,
 			$control_ops
 		);
@@ -412,29 +412,29 @@ 
 	/*
 	 * Outputs the content of the widget
 	 */
-	function widget( $args, $instance ) {
+	function widget($args, $instance) {
 		global $give_options;
 
-		extract( $args );
+		extract($args);
 
-		if ( ! is_singular( 'give_forms' ) ) {
+		if ( ! is_singular('give_forms')) {
 			return;
 		}
 
 		// Variables from widget settings
-		$title = apply_filters( 'widget_title', $instance['title'] );
+		$title = apply_filters('widget_title', $instance['title']);
 
 		// Used by themes. Opens the widget
 		echo $before_widget;
 
 		// Display the widget title
-		if ( $title ) {
-			echo $before_title . $title . $after_title;
+		if ($title) {
+			echo $before_title.$title.$after_title;
 		}
 
 		$gravatars = new Give_Donators_Gravatars();
 
-		echo $gravatars->gravatars( get_the_ID(), null ); // remove title
+		echo $gravatars->gravatars(get_the_ID(), null); // remove title
 
 		// Used by themes. Closes the widget
 		echo $after_widget;
@@ -444,11 +444,11 @@ 
 	/*
 	 * Update function. Processes widget options to be saved
 	 */
-	function update( $new_instance, $old_instance ) {
+	function update($new_instance, $old_instance) {
 
 		$instance = $old_instance;
 
-		$instance['title'] = strip_tags( $new_instance['title'] );
+		$instance['title'] = strip_tags($new_instance['title']);
 
 		return $instance;
 
@@ -457,19 +457,19 @@ 
 	/*
 	 * Form function. Displays the actual form on the widget page
 	 */
-	function form( $instance ) {
+	function form($instance) {
 
 		// Set up some default widget settings.
 		$defaults = array(
 			'title' => '',
 		);
 
-		$instance = wp_parse_args( (array) $instance, $defaults ); ?>
+		$instance = wp_parse_args((array) $instance, $defaults); ?>
 
 		<!-- Title -->
 		<p>
-			<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'give' ) ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $instance['title']; ?>" />
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'give') ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $instance['title']; ?>" />
 		</p>
 
 

includes/payments/class-payments-query.php

Spacing +116 added lines, -116 removed lines

@@ -50,10 +50,10 @@ 
 	 *
 	 * @param $args array The array of arguments that can be passed in and used for setting up this payment query.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		$defaults = array(
 			'output'          => 'payments', // Use 'posts' to get standard post objects
-			'post_type'       => array( 'give_payment' ),
+			'post_type'       => array('give_payment'),
 			'start_date'      => false,
 			'end_date'        => false,
 			'number'          => 20,
@@ -73,7 +73,7 @@ 
 			'give_forms'      => null
 		);
 
-		$this->args = wp_parse_args( $args, $defaults );
+		$this->args = wp_parse_args($args, $defaults);
 
 		$this->init();
 	}
@@ -84,11 +84,11 @@ 
 	 * @access public
 	 * @since  1.0
 	 */
-	public function __set( $query_var, $value ) {
-		if ( in_array( $query_var, array( 'meta_query', 'tax_query' ) ) ) {
-			$this->args[ $query_var ][] = $value;
+	public function __set($query_var, $value) {
+		if (in_array($query_var, array('meta_query', 'tax_query'))) {
+			$this->args[$query_var][] = $value;
 		} else {
-			$this->args[ $query_var ] = $value;
+			$this->args[$query_var] = $value;
 		}
 	}
 
@@ -98,8 +98,8 @@ 
 	 * @access public
 	 * @since  1.0
 	 */
-	public function __unset( $query_var ) {
-		unset( $this->args[ $query_var ] );
+	public function __unset($query_var) {
+		unset($this->args[$query_var]);
 	}
 
 	/**
@@ -111,19 +111,19 @@ 
 	 */
 	public function init() {
 
-		add_action( 'give_pre_get_payments', array( $this, 'date_filter_pre' ) );
-		add_action( 'give_post_get_payments', array( $this, 'date_filter_post' ) );
-
-		add_action( 'give_pre_get_payments', array( $this, 'orderby' ) );
-		add_action( 'give_pre_get_payments', array( $this, 'status' ) );
-		add_action( 'give_pre_get_payments', array( $this, 'month' ) );
-		add_action( 'give_pre_get_payments', array( $this, 'per_page' ) );
-		add_action( 'give_pre_get_payments', array( $this, 'page' ) );
-		add_action( 'give_pre_get_payments', array( $this, 'user' ) );
-		add_action( 'give_pre_get_payments', array( $this, 'search' ) );
-		add_action( 'give_pre_get_payments', array( $this, 'mode' ) );
-		add_action( 'give_pre_get_payments', array( $this, 'children' ) );
-		add_action( 'give_pre_get_payments', array( $this, 'give_forms' ) );
+		add_action('give_pre_get_payments', array($this, 'date_filter_pre'));
+		add_action('give_post_get_payments', array($this, 'date_filter_post'));
+
+		add_action('give_pre_get_payments', array($this, 'orderby'));
+		add_action('give_pre_get_payments', array($this, 'status'));
+		add_action('give_pre_get_payments', array($this, 'month'));
+		add_action('give_pre_get_payments', array($this, 'per_page'));
+		add_action('give_pre_get_payments', array($this, 'page'));
+		add_action('give_pre_get_payments', array($this, 'user'));
+		add_action('give_pre_get_payments', array($this, 'search'));
+		add_action('give_pre_get_payments', array($this, 'mode'));
+		add_action('give_pre_get_payments', array($this, 'children'));
+		add_action('give_pre_get_payments', array($this, 'give_forms'));
 	}
 
 	/**
@@ -139,16 +139,16 @@ 
 	 */
 	public function get_payments() {
 
-		do_action( 'give_pre_get_payments', $this );
+		do_action('give_pre_get_payments', $this);
 
-		$query = new WP_Query( $this->args );
+		$query = new WP_Query($this->args);
 
-		if ( 'payments' != $this->args['output'] ) {
+		if ('payments' != $this->args['output']) {
 			return $query->posts;
 		}
 
-		if ( $query->have_posts() ) {
-			while ( $query->have_posts() ) {
+		if ($query->have_posts()) {
+			while ($query->have_posts()) {
 				$query->the_post();
 
 				$details = new stdClass;
@@ -158,23 +158,23 @@ 
 				$details->ID          = $payment_id;
 				$details->date        = get_post()->post_date;
 				$details->post_status = get_post()->post_status;
-				$details->total       = give_get_payment_amount( $payment_id );
-				$details->fees        = give_get_payment_fees( $payment_id );
-				$details->key         = give_get_payment_key( $payment_id );
-				$details->gateway     = give_get_payment_gateway( $payment_id );
-				$details->user_info   = give_get_payment_meta_user_info( $payment_id );
-
-				if ( give_get_option( 'enable_sequential' ) ) {
-					$details->payment_number = give_get_payment_number( $payment_id );
+				$details->total       = give_get_payment_amount($payment_id);
+				$details->fees        = give_get_payment_fees($payment_id);
+				$details->key         = give_get_payment_key($payment_id);
+				$details->gateway     = give_get_payment_gateway($payment_id);
+				$details->user_info   = give_get_payment_meta_user_info($payment_id);
+
+				if (give_get_option('enable_sequential')) {
+					$details->payment_number = give_get_payment_number($payment_id);
 				}
 
-				$this->payments[] = apply_filters( 'give_payment', $details, $payment_id, $this );
+				$this->payments[] = apply_filters('give_payment', $details, $payment_id, $this);
 			}
 
 			wp_reset_postdata();
 		}
 
-		do_action( 'give_post_get_payments', $this );
+		do_action('give_post_get_payments', $this);
 
 		return $this->payments;
 	}
@@ -187,13 +187,13 @@ 
 	 * @return void
 	 */
 	public function date_filter_pre() {
-		if ( ! ( $this->args['start_date'] || $this->args['end_date'] ) ) {
+		if ( ! ($this->args['start_date'] || $this->args['end_date'])) {
 			return;
 		}
 
-		$this->setup_dates( $this->args['start_date'], $this->args['end_date'] );
+		$this->setup_dates($this->args['start_date'], $this->args['end_date']);
 
-		add_filter( 'posts_where', array( $this, 'payments_where' ) );
+		add_filter('posts_where', array($this, 'payments_where'));
 	}
 
 	/**
@@ -205,11 +205,11 @@ 
 	 * @return void
 	 */
 	public function date_filter_post() {
-		if ( ! ( $this->args['start_date'] || $this->args['end_date'] ) ) {
+		if ( ! ($this->args['start_date'] || $this->args['end_date'])) {
 			return;
 		}
 
-		remove_filter( 'posts_where', array( $this, 'payments_where' ) );
+		remove_filter('posts_where', array($this, 'payments_where'));
 	}
 
 	/**
@@ -220,12 +220,12 @@ 
 	 * @return void
 	 */
 	public function status() {
-		if ( ! isset ( $this->args['status'] ) ) {
+		if ( ! isset ($this->args['status'])) {
 			return;
 		}
 
-		$this->__set( 'post_status', $this->args['status'] );
-		$this->__unset( 'status' );
+		$this->__set('post_status', $this->args['status']);
+		$this->__unset('status');
 	}
 
 	/**
@@ -236,12 +236,12 @@ 
 	 * @return void
 	 */
 	public function page() {
-		if ( ! isset ( $this->args['page'] ) ) {
+		if ( ! isset ($this->args['page'])) {
 			return;
 		}
 
-		$this->__set( 'paged', $this->args['page'] );
-		$this->__unset( 'page' );
+		$this->__set('paged', $this->args['page']);
+		$this->__unset('page');
 	}
 
 	/**
@@ -253,17 +253,17 @@ 
 	 */
 	public function per_page() {
 
-		if ( ! isset( $this->args['number'] ) ) {
+		if ( ! isset($this->args['number'])) {
 			return;
 		}
 
-		if ( $this->args['number'] == - 1 ) {
-			$this->__set( 'nopaging', true );
+		if ($this->args['number'] == - 1) {
+			$this->__set('nopaging', true);
 		} else {
-			$this->__set( 'posts_per_page', $this->args['number'] );
+			$this->__set('posts_per_page', $this->args['number']);
 		}
 
-		$this->__unset( 'number' );
+		$this->__unset('number');
 	}
 
 	/**
@@ -274,12 +274,12 @@ 
 	 * @return void
 	 */
 	public function month() {
-		if ( ! isset ( $this->args['month'] ) ) {
+		if ( ! isset ($this->args['month'])) {
 			return;
 		}
 
-		$this->__set( 'monthnum', $this->args['month'] );
-		$this->__unset( 'month' );
+		$this->__set('monthnum', $this->args['month']);
+		$this->__unset('month');
 	}
 
 	/**
@@ -290,13 +290,13 @@ 
 	 * @return void
 	 */
 	public function orderby() {
-		switch ( $this->args['orderby'] ) {
+		switch ($this->args['orderby']) {
 			case 'amount' :
-				$this->__set( 'orderby', 'meta_value_num' );
-				$this->__set( 'meta_key', '_give_payment_total' );
+				$this->__set('orderby', 'meta_value_num');
+				$this->__set('meta_key', '_give_payment_total');
 				break;
 			default :
-				$this->__set( 'orderby', $this->args['orderby'] );
+				$this->__set('orderby', $this->args['orderby']);
 				break;
 		}
 	}
@@ -309,20 +309,20 @@ 
 	 * @return void
 	 */
 	public function user() {
-		if ( is_null( $this->args['user'] ) ) {
+		if (is_null($this->args['user'])) {
 			return;
 		}
 
-		if ( is_numeric( $this->args['user'] ) ) {
+		if (is_numeric($this->args['user'])) {
 			$user_key = '_give_payment_user_id';
 		} else {
 			$user_key = '_give_payment_user_email';
 		}
 
-		$this->__set( 'meta_query', array(
+		$this->__set('meta_query', array(
 			'key'   => $user_key,
 			'value' => $this->args['user']
-		) );
+		));
 	}
 
 	/**
@@ -334,33 +334,33 @@ 
 	 */
 	public function search() {
 
-		if ( ! isset( $this->args['s'] ) ) {
+		if ( ! isset($this->args['s'])) {
 			return;
 		}
 
-		$search = trim( $this->args['s'] );
+		$search = trim($this->args['s']);
 
-		if ( empty( $search ) ) {
+		if (empty($search)) {
 			return;
 		}
 
-		$is_email = is_email( $search ) || strpos( $search, '@' ) !== false;
-		$is_user  = strpos( $search, strtolower( 'user:' ) ) !== false;
+		$is_email = is_email($search) || strpos($search, '@') !== false;
+		$is_user  = strpos($search, strtolower('user:')) !== false;
 
-		if ( ! empty( $this->args['search_in_notes'] ) ) {
+		if ( ! empty($this->args['search_in_notes'])) {
 
-			$notes = give_get_payment_notes( 0, $search );
+			$notes = give_get_payment_notes(0, $search);
 
-			if ( ! empty( $notes ) ) {
+			if ( ! empty($notes)) {
 
-				$payment_ids = wp_list_pluck( (array) $notes, 'comment_post_ID' );
+				$payment_ids = wp_list_pluck((array) $notes, 'comment_post_ID');
 
-				$this->__set( 'post__in', $payment_ids );
+				$this->__set('post__in', $payment_ids);
 			}
 
-			$this->__unset( 's' );
+			$this->__unset('s');
 
-		} elseif ( $is_email || strlen( $search ) == 32 ) {
+		} elseif ($is_email || strlen($search) == 32) {
 
 			$key         = $is_email ? '_give_payment_user_email' : '_give_payment_purchase_key';
 			$search_meta = array(
@@ -369,19 +369,19 @@ 
 				'compare' => 'LIKE'
 			);
 
-			$this->__set( 'meta_query', $search_meta );
-			$this->__unset( 's' );
+			$this->__set('meta_query', $search_meta);
+			$this->__unset('s');
 
-		} elseif ( $is_user ) {
+		} elseif ($is_user) {
 
 			$search_meta = array(
 				'key'   => '_give_payment_user_id',
-				'value' => trim( str_replace( 'user:', '', strtolower( $search ) ) )
+				'value' => trim(str_replace('user:', '', strtolower($search)))
 			);
 
-			$this->__set( 'meta_query', $search_meta );
+			$this->__set('meta_query', $search_meta);
 
-			if ( give_get_option( 'enable_sequential' ) ) {
+			if (give_get_option('enable_sequential')) {
 
 				$search_meta = array(
 					'key'     => '_give_payment_number',
@@ -389,19 +389,19 @@ 
 					'compare' => 'LIKE'
 				);
 
-				$this->__set( 'meta_query', $search_meta );
+				$this->__set('meta_query', $search_meta);
 
 				$this->args['meta_query']['relation'] = 'OR';
 
 			}
 
-			$this->__unset( 's' );
+			$this->__unset('s');
 
 		} elseif (
-			give_get_option( 'enable_sequential' ) &&
+			give_get_option('enable_sequential') &&
 			(
-				false !== strpos( $search, give_get_option( 'sequential_prefix' ) ) ||
-				false !== strpos( $search, give_get_option( 'sequential_postfix' ) )
+				false !== strpos($search, give_get_option('sequential_prefix')) ||
+				false !== strpos($search, give_get_option('sequential_postfix'))
 			)
 		) {
 
@@ -411,28 +411,28 @@ 
 				'compare' => 'LIKE'
 			);
 
-			$this->__set( 'meta_query', $search_meta );
-			$this->__unset( 's' );
+			$this->__set('meta_query', $search_meta);
+			$this->__unset('s');
 
-		} elseif ( is_numeric( $search ) ) {
+		} elseif (is_numeric($search)) {
 
-			$post = get_post( $search );
+			$post = get_post($search);
 
-			if ( is_object( $post ) && $post->post_type == 'give_payment' ) {
+			if (is_object($post) && $post->post_type == 'give_payment') {
 
 				$arr   = array();
 				$arr[] = $search;
-				$this->__set( 'post__in', $arr );
-				$this->__unset( 's' );
+				$this->__set('post__in', $arr);
+				$this->__unset('s');
 			}
 
-		} elseif ( '#' == substr( $search, 0, 1 ) ) {
+		} elseif ('#' == substr($search, 0, 1)) {
 
-			$this->__set( 'give_forms', str_replace( '#', '', $search ) );
-			$this->__unset( 's' );
+			$this->__set('give_forms', str_replace('#', '', $search));
+			$this->__unset('s');
 
 		} else {
-			$this->__set( 's', $search );
+			$this->__set('s', $search);
 
 		}
 
@@ -446,16 +446,16 @@ 
 	 * @return void
 	 */
 	public function mode() {
-		if ( empty( $this->args['mode'] ) || $this->args['mode'] == 'all' ) {
-			$this->__unset( 'mode' );
+		if (empty($this->args['mode']) || $this->args['mode'] == 'all') {
+			$this->__unset('mode');
 
 			return;
 		}
 
-		$this->__set( 'meta_query', array(
+		$this->__set('meta_query', array(
 			'key'   => '_give_payment_mode',
 			'value' => $this->args['mode']
-		) );
+		));
 	}
 
 	/**
@@ -466,10 +466,10 @@ 
 	 * @return void
 	 */
 	public function children() {
-		if ( empty( $this->args['children'] ) ) {
-			$this->__set( 'post_parent', 0 );
+		if (empty($this->args['children'])) {
+			$this->__set('post_parent', 0);
 		}
-		$this->__unset( 'children' );
+		$this->__unset('children');
 	}
 
 	/**
@@ -481,7 +481,7 @@ 
 	 */
 	public function give_forms() {
 
-		if ( empty( $this->args['give_forms'] ) ) {
+		if (empty($this->args['give_forms'])) {
 			return;
 		}
 
@@ -490,7 +490,7 @@ 
 		$args = array(
 			//			'post_id'                => $this->args['give_forms'],
 			'log_type'               => 'sale',
-			'post_status'            => array( 'publish' ),
+			'post_status'            => array('publish'),
 			'nopaging'               => true,
 			'no_found_rows'          => true,
 			'update_post_term_cache' => false,
@@ -499,31 +499,31 @@ 
 			'fields'                 => 'ids'
 		);
 
-		if ( is_array( $this->args['give_forms'] ) ) {
-			unset( $args['post_parent'] );
+		if (is_array($this->args['give_forms'])) {
+			unset($args['post_parent']);
 			$args['post_parent__in'] = $this->args['give_forms'];
 		}
 
-		$sales = $give_logs->get_connected_logs( $args );
+		$sales = $give_logs->get_connected_logs($args);
 
-		if ( ! empty( $sales ) ) {
+		if ( ! empty($sales)) {
 
 			$payments = array();
 
-			foreach ( $sales as $sale ) {
-				$payments[] = get_post_meta( $sale, '_give_log_payment_id', true );
+			foreach ($sales as $sale) {
+				$payments[] = get_post_meta($sale, '_give_log_payment_id', true);
 			}
 
-			$this->__set( 'post__in', $payments );
+			$this->__set('post__in', $payments);
 
 		} else {
 
 			// Set post_parent to something crazy so it doesn't find anything
-			$this->__set( 'post_parent', 999999999999999 );
+			$this->__set('post_parent', 999999999999999);
 
 		}
 
-		$this->__unset( 'give_forms' );
+		$this->__unset('give_forms');
 
 	}
 }

includes/post-types.php

Spacing +162 added lines, -162 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,40 +23,40 @@ 
 function give_setup_post_types() {
 
 	/** Give Forms Post Type */
-	$give_forms_singular = give_get_option( 'disable_forms_singular' ) !== 'on' ? true : false;
+	$give_forms_singular = give_get_option('disable_forms_singular') !== 'on' ? true : false;
 
-	$give_forms_archives = give_get_option( 'disable_forms_archives' ) !== 'on' ? true : false;
+	$give_forms_archives = give_get_option('disable_forms_archives') !== 'on' ? true : false;
 
-	$give_forms_slug = defined( 'GIVE_SLUG' ) ? GIVE_SLUG : 'donations';
+	$give_forms_slug = defined('GIVE_SLUG') ? GIVE_SLUG : 'donations';
 	//support for old 'GIVE_FORMS_SLUG' constant
-	if ( defined( 'GIVE_FORMS_SLUG' ) ) {
+	if (defined('GIVE_FORMS_SLUG')) {
 		$give_forms_slug = GIVE_FORMS_SLUG;
 	}
 
-	$give_forms_rewrite = defined( 'GIVE_DISABLE_FORMS_REWRITE' ) && GIVE_DISABLE_FORMS_REWRITE ? false : array(
+	$give_forms_rewrite = defined('GIVE_DISABLE_FORMS_REWRITE') && GIVE_DISABLE_FORMS_REWRITE ? false : array(
 		'slug'       => $give_forms_slug,
 		'with_front' => false
 	);
 
-	$give_forms_labels = apply_filters( 'give_forms_labels', array(
-		'name'               => __( 'Donation %2$s', 'give' ),
+	$give_forms_labels = apply_filters('give_forms_labels', array(
+		'name'               => __('Donation %2$s', 'give'),
 		'singular_name'      => '%1$s',
-		'add_new'            => __( 'Add %1$s', 'give' ),
-		'add_new_item'       => __( 'Add New Donation %1$s', 'give' ),
-		'edit_item'          => __( 'Edit Donation %1$s', 'give' ),
-		'new_item'           => __( 'New %1$s', 'give' ),
-		'all_items'          => __( 'All %2$s', 'give' ),
-		'view_item'          => __( 'View %1$s', 'give' ),
-		'search_items'       => __( 'Search %2$s', 'give' ),
-		'not_found'          => __( 'No %2$s found', 'give' ),
-		'not_found_in_trash' => __( 'No %2$s found in Trash', 'give' ),
+		'add_new'            => __('Add %1$s', 'give'),
+		'add_new_item'       => __('Add New Donation %1$s', 'give'),
+		'edit_item'          => __('Edit Donation %1$s', 'give'),
+		'new_item'           => __('New %1$s', 'give'),
+		'all_items'          => __('All %2$s', 'give'),
+		'view_item'          => __('View %1$s', 'give'),
+		'search_items'       => __('Search %2$s', 'give'),
+		'not_found'          => __('No %2$s found', 'give'),
+		'not_found_in_trash' => __('No %2$s found in Trash', 'give'),
 		'parent_item_colon'  => '',
-		'menu_name'          => apply_filters( 'give_menu_name', __( 'Donations', 'give' ) ),
-		'name_admin_bar'     => apply_filters( 'give_name_admin_bar_name', __( 'Donation Form', 'give' ) )
-	) );
+		'menu_name'          => apply_filters('give_menu_name', __('Donations', 'give')),
+		'name_admin_bar'     => apply_filters('give_name_admin_bar_name', __('Donation Form', 'give'))
+	));
 
-	foreach ( $give_forms_labels as $key => $value ) {
-		$give_forms_labels[ $key ] = sprintf( $value, give_get_forms_label_singular(), give_get_forms_label_plural() );
+	foreach ($give_forms_labels as $key => $value) {
+		$give_forms_labels[$key] = sprintf($value, give_get_forms_label_singular(), give_get_forms_label_plural());
 	}
 
 	//Default give_forms supports
@@ -69,14 +69,14 @@ 
 	);
 
 	//Has the user disabled the excerpt
-	if ( give_get_option( 'disable_forms_excerpt' ) === 'on' ) {
-		unset( $give_form_supports[2] );
+	if (give_get_option('disable_forms_excerpt') === 'on') {
+		unset($give_form_supports[2]);
 	}
 
 	//Has user disabled the featured image?
-	if ( give_get_option( 'disable_form_featured_img' ) === 'on' ) {
-		unset( $give_form_supports[1] );
-		remove_action( 'give_before_single_form_summary', 'give_show_form_images' );
+	if (give_get_option('disable_form_featured_img') === 'on') {
+		unset($give_form_supports[1]);
+		remove_action('give_before_single_form_summary', 'give_show_form_images');
 	}
 
 	$give_forms_args = array(
@@ -92,36 +92,36 @@ 
 		'has_archive'        => $give_forms_archives,
 		'menu_icon'          => 'dashicons-give',
 		'hierarchical'       => false,
-		'supports'           => apply_filters( 'give_forms_supports', $give_form_supports ),
+		'supports'           => apply_filters('give_forms_supports', $give_form_supports),
 	);
-	register_post_type( 'give_forms', apply_filters( 'give_forms_post_type_args', $give_forms_args ) );
+	register_post_type('give_forms', apply_filters('give_forms_post_type_args', $give_forms_args));
 
 
 	/** Give Campaigns Post Type */
-	$give_campaigns_archives = defined( 'GIVE_DISABLE_CAMPAIGNS_ARCHIVE' ) && GIVE_DISABLE_CAMPAIGNS_ARCHIVE ? false : true;
-	$give_campaigns_slug     = defined( 'GIVE_CAMPAIGNS_SLUG' ) ? GIVE_CAMPAIGNS_SLUG : 'campaigns';
-	$give_campaigns_rewrite  = defined( 'GIVE_DISABLE_CAMPAIGNS_REWRITE' ) && GIVE_DISABLE_CAMPAIGNS_REWRITE ? false : array(
+	$give_campaigns_archives = defined('GIVE_DISABLE_CAMPAIGNS_ARCHIVE') && GIVE_DISABLE_CAMPAIGNS_ARCHIVE ? false : true;
+	$give_campaigns_slug     = defined('GIVE_CAMPAIGNS_SLUG') ? GIVE_CAMPAIGNS_SLUG : 'campaigns';
+	$give_campaigns_rewrite  = defined('GIVE_DISABLE_CAMPAIGNS_REWRITE') && GIVE_DISABLE_CAMPAIGNS_REWRITE ? false : array(
 		'slug'       => $give_campaigns_slug,
 		'with_front' => false
 	);
 
-	$give_campaigns_labels = apply_filters( 'give_campaign_labels', array(
+	$give_campaigns_labels = apply_filters('give_campaign_labels', array(
 		'name'               => '%2$s',
 		'singular_name'      => '%1$s',
-		'add_new'            => __( 'Add %1$s', 'give' ),
-		'add_new_item'       => __( 'Add New %1$s', 'give' ),
-		'edit_item'          => __( 'Edit %1$s', 'give' ),
-		'new_item'           => __( 'New %1$s', 'give' ),
-		'all_items'          => __( 'All %2$s', 'give' ),
-		'view_item'          => __( 'View %1$s', 'give' ),
-		'search_items'       => __( 'Search %2$s', 'give' ),
-		'not_found'          => __( 'No %2$s found', 'give' ),
-		'not_found_in_trash' => __( 'No %2$s found in Trash', 'give' ),
+		'add_new'            => __('Add %1$s', 'give'),
+		'add_new_item'       => __('Add New %1$s', 'give'),
+		'edit_item'          => __('Edit %1$s', 'give'),
+		'new_item'           => __('New %1$s', 'give'),
+		'all_items'          => __('All %2$s', 'give'),
+		'view_item'          => __('View %1$s', 'give'),
+		'search_items'       => __('Search %2$s', 'give'),
+		'not_found'          => __('No %2$s found', 'give'),
+		'not_found_in_trash' => __('No %2$s found in Trash', 'give'),
 		'parent_item_colon'  => '',
-	) );
+	));
 
-	foreach ( $give_campaigns_labels as $key => $value ) {
-		$give_campaigns_labels[ $key ] = sprintf( $value, give_get_campaigns_label_singular(), give_get_campaigns_label_plural() );
+	foreach ($give_campaigns_labels as $key => $value) {
+		$give_campaigns_labels[$key] = sprintf($value, give_get_campaigns_label_singular(), give_get_campaigns_label_plural());
 	}
 
 	$give_campaigns_args = array(
@@ -136,48 +136,48 @@ 
 		'capability_type'    => 'give_campaigns',
 		'has_archive'        => $give_campaigns_archives,
 		'hierarchical'       => false,
-		'supports'           => apply_filters( 'give_campaigns_supports', array(
+		'supports'           => apply_filters('give_campaigns_supports', array(
 			'title',
 			'thumbnail',
 			'excerpt',
 			'revisions',
 			'author'
-		) ),
+		)),
 	);
 	//	register_post_type( 'give_campaigns', apply_filters( 'give_campaigns_post_type_args', $give_campaigns_args ) );
 
 	/** Payment Post Type */
 	$payment_labels = array(
-		'name'               => _x( 'Donations', 'post type general name', 'give' ),
-		'singular_name'      => _x( 'Donation', 'post type singular name', 'give' ),
-		'add_new'            => __( 'Add New', 'give' ),
-		'add_new_item'       => __( 'Add New Donation', 'give' ),
-		'edit_item'          => __( 'Edit Donation', 'give' ),
-		'new_item'           => __( 'New Donation', 'give' ),
-		'all_items'          => __( 'All Donations', 'give' ),
-		'view_item'          => __( 'View Donation', 'give' ),
-		'search_items'       => __( 'Search Donations', 'give' ),
-		'not_found'          => __( 'No Donations found', 'give' ),
-		'not_found_in_trash' => __( 'No Donations found in Trash', 'give' ),
+		'name'               => _x('Donations', 'post type general name', 'give'),
+		'singular_name'      => _x('Donation', 'post type singular name', 'give'),
+		'add_new'            => __('Add New', 'give'),
+		'add_new_item'       => __('Add New Donation', 'give'),
+		'edit_item'          => __('Edit Donation', 'give'),
+		'new_item'           => __('New Donation', 'give'),
+		'all_items'          => __('All Donations', 'give'),
+		'view_item'          => __('View Donation', 'give'),
+		'search_items'       => __('Search Donations', 'give'),
+		'not_found'          => __('No Donations found', 'give'),
+		'not_found_in_trash' => __('No Donations found in Trash', 'give'),
 		'parent_item_colon'  => '',
-		'menu_name'          => __( 'Transactions', 'give' )
+		'menu_name'          => __('Transactions', 'give')
 	);
 
 	$payment_args = array(
-		'labels'          => apply_filters( 'give_payment_labels', $payment_labels ),
+		'labels'          => apply_filters('give_payment_labels', $payment_labels),
 		'public'          => false,
 		'query_var'       => false,
 		'rewrite'         => false,
 		'map_meta_cap'    => true,
 		'capability_type' => 'give_payment',
-		'supports'        => array( 'title' ),
+		'supports'        => array('title'),
 		'can_export'      => true
 	);
-	register_post_type( 'give_payment', $payment_args );
+	register_post_type('give_payment', $payment_args);
 
 }
 
-add_action( 'init', 'give_setup_post_types', 1 );
+add_action('init', 'give_setup_post_types', 1);
 
 
 /**
@@ -190,30 +190,30 @@ 
  */
 function give_setup_taxonomies() {
 
-	$slug = defined( 'GIVE_FORMS_SLUG' ) ? GIVE_FORMS_SLUG : 'donations';
+	$slug = defined('GIVE_FORMS_SLUG') ? GIVE_FORMS_SLUG : 'donations';
 
 	/** Categories */
 	$category_labels = array(
-		'name'              => sprintf( _x( '%s Categories', 'taxonomy general name', 'give' ), give_get_forms_label_singular() ),
-		'singular_name'     => _x( 'Category', 'taxonomy singular name', 'give' ),
-		'search_items'      => __( 'Search Categories', 'give' ),
-		'all_items'         => __( 'All Categories', 'give' ),
-		'parent_item'       => __( 'Parent Category', 'give' ),
-		'parent_item_colon' => __( 'Parent Category:', 'give' ),
-		'edit_item'         => __( 'Edit Category', 'give' ),
-		'update_item'       => __( 'Update Category', 'give' ),
-		'add_new_item'      => sprintf( __( 'Add New %s Category', 'give' ), give_get_forms_label_singular() ),
-		'new_item_name'     => __( 'New Category Name', 'give' ),
-		'menu_name'         => __( 'Categories', 'give' ),
+		'name'              => sprintf(_x('%s Categories', 'taxonomy general name', 'give'), give_get_forms_label_singular()),
+		'singular_name'     => _x('Category', 'taxonomy singular name', 'give'),
+		'search_items'      => __('Search Categories', 'give'),
+		'all_items'         => __('All Categories', 'give'),
+		'parent_item'       => __('Parent Category', 'give'),
+		'parent_item_colon' => __('Parent Category:', 'give'),
+		'edit_item'         => __('Edit Category', 'give'),
+		'update_item'       => __('Update Category', 'give'),
+		'add_new_item'      => sprintf(__('Add New %s Category', 'give'), give_get_forms_label_singular()),
+		'new_item_name'     => __('New Category Name', 'give'),
+		'menu_name'         => __('Categories', 'give'),
 	);
 
-	$category_args = apply_filters( 'give_forms_category_args', array(
+	$category_args = apply_filters('give_forms_category_args', array(
 			'hierarchical' => true,
-			'labels'       => apply_filters( 'give_forms_category_labels', $category_labels ),
+			'labels'       => apply_filters('give_forms_category_labels', $category_labels),
 			'show_ui'      => true,
 			'query_var'    => 'give_forms_category',
 			'rewrite'      => array(
-				'slug'         => $slug . '/category',
+				'slug'         => $slug.'/category',
 				'with_front'   => false,
 				'hierarchical' => true
 			),
@@ -227,34 +227,34 @@ 
 	);
 
 	//Does the user want categories?
-	if ( give_get_option( 'enable_categories' ) == 'on' ) {
-		register_taxonomy( 'give_forms_category', array( 'give_forms' ), $category_args );
-		register_taxonomy_for_object_type( 'give_forms_category', 'give_forms' );
+	if (give_get_option('enable_categories') == 'on') {
+		register_taxonomy('give_forms_category', array('give_forms'), $category_args);
+		register_taxonomy_for_object_type('give_forms_category', 'give_forms');
 	}
 
 
 	/** Tags */
 	$tag_labels = array(
-		'name'                  => sprintf( _x( '%s Tags', 'taxonomy general name', 'give' ), give_get_forms_label_singular() ),
-		'singular_name'         => _x( 'Tag', 'taxonomy singular name', 'give' ),
-		'search_items'          => __( 'Search Tags', 'give' ),
-		'all_items'             => __( 'All Tags', 'give' ),
-		'parent_item'           => __( 'Parent Tag', 'give' ),
-		'parent_item_colon'     => __( 'Parent Tag:', 'give' ),
-		'edit_item'             => __( 'Edit Tag', 'give' ),
-		'update_item'           => __( 'Update Tag', 'give' ),
-		'add_new_item'          => __( 'Add New Tag', 'give' ),
-		'new_item_name'         => __( 'New Tag Name', 'give' ),
-		'menu_name'             => __( 'Tags', 'give' ),
-		'choose_from_most_used' => sprintf( __( 'Choose from most used %s tags', 'give' ), give_get_forms_label_singular() ),
+		'name'                  => sprintf(_x('%s Tags', 'taxonomy general name', 'give'), give_get_forms_label_singular()),
+		'singular_name'         => _x('Tag', 'taxonomy singular name', 'give'),
+		'search_items'          => __('Search Tags', 'give'),
+		'all_items'             => __('All Tags', 'give'),
+		'parent_item'           => __('Parent Tag', 'give'),
+		'parent_item_colon'     => __('Parent Tag:', 'give'),
+		'edit_item'             => __('Edit Tag', 'give'),
+		'update_item'           => __('Update Tag', 'give'),
+		'add_new_item'          => __('Add New Tag', 'give'),
+		'new_item_name'         => __('New Tag Name', 'give'),
+		'menu_name'             => __('Tags', 'give'),
+		'choose_from_most_used' => sprintf(__('Choose from most used %s tags', 'give'), give_get_forms_label_singular()),
 	);
 
-	$tag_args = apply_filters( 'give_forms_tag_args', array(
+	$tag_args = apply_filters('give_forms_tag_args', array(
 			'hierarchical' => false,
-			'labels'       => apply_filters( 'give_forms_tag_labels', $tag_labels ),
+			'labels'       => apply_filters('give_forms_tag_labels', $tag_labels),
 			'show_ui'      => true,
 			'query_var'    => 'give_forms_tag',
-			'rewrite'      => array( 'slug' => $slug . '/tag', 'with_front' => false, 'hierarchical' => true ),
+			'rewrite'      => array('slug' => $slug.'/tag', 'with_front' => false, 'hierarchical' => true),
 			'capabilities' => array(
 				'manage_terms' => 'manage_give_forms_terms',
 				'edit_terms'   => 'edit_give_forms_terms',
@@ -265,15 +265,15 @@ 
 		)
 	);
 
-	if ( give_get_option( 'enable_tags' ) == 'on' ) {
-		register_taxonomy( 'give_forms_tag', array( 'give_forms' ), $tag_args );
-		register_taxonomy_for_object_type( 'give_forms_tag', 'give_forms' );
+	if (give_get_option('enable_tags') == 'on') {
+		register_taxonomy('give_forms_tag', array('give_forms'), $tag_args);
+		register_taxonomy_for_object_type('give_forms_tag', 'give_forms');
 	}
 
 
 }
 
-add_action( 'init', 'give_setup_taxonomies', 0 );
+add_action('init', 'give_setup_taxonomies', 0);
 
 
 /**
@@ -284,11 +284,11 @@ 
  */
 function give_get_default_form_labels() {
 	$defaults = array(
-		'singular' => __( 'Form', 'give' ),
-		'plural'   => __( 'Forms', 'give' )
+		'singular' => __('Form', 'give'),
+		'plural'   => __('Forms', 'give')
 	);
 
-	return apply_filters( 'give_default_form_name', $defaults );
+	return apply_filters('give_default_form_name', $defaults);
 }
 
 /**
@@ -299,11 +299,11 @@ 
  */
 function give_get_default_campaign_labels() {
 	$defaults = array(
-		'singular' => __( 'Campaign', 'give' ),
-		'plural'   => __( 'Campaigns', 'give' )
+		'singular' => __('Campaign', 'give'),
+		'plural'   => __('Campaigns', 'give')
 	);
 
-	return apply_filters( 'give_default_campaign_name', $defaults );
+	return apply_filters('give_default_campaign_name', $defaults);
 }
 
 /**
@@ -315,10 +315,10 @@ 
  *
  * @return string $defaults['singular'] Singular label
  */
-function give_get_forms_label_singular( $lowercase = false ) {
+function give_get_forms_label_singular($lowercase = false) {
 	$defaults = give_get_default_form_labels();
 
-	return ( $lowercase ) ? strtolower( $defaults['singular'] ) : $defaults['singular'];
+	return ($lowercase) ? strtolower($defaults['singular']) : $defaults['singular'];
 }
 
 /**
@@ -327,10 +327,10 @@ 
  * @since 1.0
  * @return string $defaults['plural'] Plural label
  */
-function give_get_forms_label_plural( $lowercase = false ) {
+function give_get_forms_label_plural($lowercase = false) {
 	$defaults = give_get_default_form_labels();
 
-	return ( $lowercase ) ? strtolower( $defaults['plural'] ) : $defaults['plural'];
+	return ($lowercase) ? strtolower($defaults['plural']) : $defaults['plural'];
 }
 
 /**
@@ -342,10 +342,10 @@ 
  *
  * @return string $defaults['singular'] Singular label
  */
-function give_get_campaigns_label_singular( $lowercase = false ) {
+function give_get_campaigns_label_singular($lowercase = false) {
 	$defaults = give_get_default_campaign_labels();
 
-	return ( $lowercase ) ? strtolower( $defaults['singular'] ) : $defaults['singular'];
+	return ($lowercase) ? strtolower($defaults['singular']) : $defaults['singular'];
 }
 
 /**
@@ -354,10 +354,10 @@ 
  * @since 1.0
  * @return string $defaults['plural'] Plural label
  */
-function give_get_campaigns_label_plural( $lowercase = false ) {
+function give_get_campaigns_label_plural($lowercase = false) {
 	$defaults = give_get_default_campaign_labels();
 
-	return ( $lowercase ) ? strtolower( $defaults['plural'] ) : $defaults['plural'];
+	return ($lowercase) ? strtolower($defaults['plural']) : $defaults['plural'];
 }
 
 /**
@@ -369,26 +369,26 @@ 
  *
  * @return string $title New placeholder text
  */
-function give_change_default_title( $title ) {
+function give_change_default_title($title) {
 	// If a frontend plugin uses this filter (check extensions before changing this function)
-	if ( ! is_admin() ) {
+	if ( ! is_admin()) {
 		$label = give_get_forms_label_singular();
-		$title = sprintf( __( 'Enter %s title here', 'give' ), $label );
+		$title = sprintf(__('Enter %s title here', 'give'), $label);
 
 		return $title;
 	}
 
 	$screen = get_current_screen();
 
-	if ( 'give_forms' == $screen->post_type ) {
+	if ('give_forms' == $screen->post_type) {
 		$label = give_get_forms_label_singular();
-		$title = sprintf( __( 'Enter %s title here', 'give' ), $label );
+		$title = sprintf(__('Enter %s title here', 'give'), $label);
 	}
 
 	return $title;
 }
 
-add_filter( 'enter_title_here', 'give_change_default_title' );
+add_filter('enter_title_here', 'give_change_default_title');
 
 /**
  * Registers Custom Post Statuses which are used by the Payments
@@ -398,42 +398,42 @@ 
  */
 function give_register_post_type_statuses() {
 	// Payment Statuses
-	register_post_status( 'refunded', array(
-		'label'                     => _x( 'Refunded', 'Refunded payment status', 'give' ),
+	register_post_status('refunded', array(
+		'label'                     => _x('Refunded', 'Refunded payment status', 'give'),
 		'public'                    => true,
 		'exclude_from_search'       => false,
 		'show_in_admin_all_list'    => true,
 		'show_in_admin_status_list' => true,
-		'label_count'               => _n_noop( 'Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'give' )
-	) );
-	register_post_status( 'failed', array(
-		'label'                     => _x( 'Failed', 'Failed payment status', 'give' ),
+		'label_count'               => _n_noop('Refunded <span class="count">(%s)</span>', 'Refunded <span class="count">(%s)</span>', 'give')
+	));
+	register_post_status('failed', array(
+		'label'                     => _x('Failed', 'Failed payment status', 'give'),
 		'public'                    => true,
 		'exclude_from_search'       => false,
 		'show_in_admin_all_list'    => true,
 		'show_in_admin_status_list' => true,
-		'label_count'               => _n_noop( 'Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'give' )
-	) );
-	register_post_status( 'revoked', array(
-		'label'                     => _x( 'Revoked', 'Revoked payment status', 'give' ),
+		'label_count'               => _n_noop('Failed <span class="count">(%s)</span>', 'Failed <span class="count">(%s)</span>', 'give')
+	));
+	register_post_status('revoked', array(
+		'label'                     => _x('Revoked', 'Revoked payment status', 'give'),
 		'public'                    => true,
 		'exclude_from_search'       => false,
 		'show_in_admin_all_list'    => true,
 		'show_in_admin_status_list' => true,
-		'label_count'               => _n_noop( 'Revoked <span class="count">(%s)</span>', 'Revoked <span class="count">(%s)</span>', 'give' )
-	) );
-	register_post_status( 'abandoned', array(
-		'label'                     => _x( 'Abandoned', 'Abandoned payment status', 'give' ),
+		'label_count'               => _n_noop('Revoked <span class="count">(%s)</span>', 'Revoked <span class="count">(%s)</span>', 'give')
+	));
+	register_post_status('abandoned', array(
+		'label'                     => _x('Abandoned', 'Abandoned payment status', 'give'),
 		'public'                    => true,
 		'exclude_from_search'       => false,
 		'show_in_admin_all_list'    => true,
 		'show_in_admin_status_list' => true,
-		'label_count'               => _n_noop( 'Abandoned <span class="count">(%s)</span>', 'Abandoned <span class="count">(%s)</span>', 'give' )
-	) );
+		'label_count'               => _n_noop('Abandoned <span class="count">(%s)</span>', 'Abandoned <span class="count">(%s)</span>', 'give')
+	));
 
 }
 
-add_action( 'init', 'give_register_post_type_statuses' );
+add_action('init', 'give_register_post_type_statuses');
 
 /**
  * Updated Messages
@@ -446,45 +446,45 @@ 
  *
  * @return array $messages New post updated messages
  */
-function give_updated_messages( $messages ) {
+function give_updated_messages($messages) {
 	global $post, $post_ID;
 
-	$url1 = '<a href="' . get_permalink( $post_ID ) . '">';
+	$url1 = '<a href="'.get_permalink($post_ID).'">';
 	$url2 = give_get_forms_label_singular();
 	$url3 = '</a>';
 
 	$messages['give_forms'] = array(
-		1 => sprintf( __( '%2$s updated. %1$sView %2$s%3$s.', 'give' ), $url1, $url2, $url3 ),
-		4 => sprintf( __( '%2$s updated. %1$sView %2$s%3$s.', 'give' ), $url1, $url2, $url3 ),
-		6 => sprintf( __( '%2$s published. %1$sView %2$s%3$s.', 'give' ), $url1, $url2, $url3 ),
-		7 => sprintf( __( '%2$s saved. %1$sView %2$s%3$s.', 'give' ), $url1, $url2, $url3 ),
-		8 => sprintf( __( '%2$s submitted. %1$sView %2$s%3$s.', 'give' ), $url1, $url2, $url3 )
+		1 => sprintf(__('%2$s updated. %1$sView %2$s%3$s.', 'give'), $url1, $url2, $url3),
+		4 => sprintf(__('%2$s updated. %1$sView %2$s%3$s.', 'give'), $url1, $url2, $url3),
+		6 => sprintf(__('%2$s published. %1$sView %2$s%3$s.', 'give'), $url1, $url2, $url3),
+		7 => sprintf(__('%2$s saved. %1$sView %2$s%3$s.', 'give'), $url1, $url2, $url3),
+		8 => sprintf(__('%2$s submitted. %1$sView %2$s%3$s.', 'give'), $url1, $url2, $url3)
 	);
 
 	return $messages;
 }
 
-add_filter( 'post_updated_messages', 'give_updated_messages' );
+add_filter('post_updated_messages', 'give_updated_messages');
 
 
 /**
  * Setup Post Type Images
  */
-add_action( 'after_setup_theme', 'give_add_thumbnail_support', 10 );
-add_action( 'after_setup_theme', 'give_add_image_sizes', 10 );
+add_action('after_setup_theme', 'give_add_thumbnail_support', 10);
+add_action('after_setup_theme', 'give_add_image_sizes', 10);
 
 /**
  * Ensure post thumbnail support is turned on
  */
 function give_add_thumbnail_support() {
-	if ( give_get_option( 'disable_form_featured_img' ) === 'on' ) {
+	if (give_get_option('disable_form_featured_img') === 'on') {
 		return;
 	}
-	if ( ! current_theme_supports( 'post-thumbnails' ) ) {
-		add_theme_support( 'post-thumbnails' );
+	if ( ! current_theme_supports('post-thumbnails')) {
+		add_theme_support('post-thumbnails');
 	}
-	add_post_type_support( 'give_forms', 'thumbnail' );
-	add_post_type_support( 'give_campaigns', 'thumbnail' );
+	add_post_type_support('give_forms', 'thumbnail');
+	add_post_type_support('give_campaigns', 'thumbnail');
 }
 
 /**
@@ -493,11 +493,11 @@ 
  * @since 1.0
  */
 function give_add_image_sizes() {
-	$give_form_thumbnail = give_get_image_size( 'give_form_thumbnail' );
-	$give_form_single    = give_get_image_size( 'give_form_single' );
+	$give_form_thumbnail = give_get_image_size('give_form_thumbnail');
+	$give_form_single    = give_get_image_size('give_form_single');
 
-	add_image_size( 'give_form_thumbnail', $give_form_thumbnail['width'], $give_form_thumbnail['height'], $give_form_thumbnail['crop'] );
-	add_image_size( 'give_form_single', $give_form_single['width'], $give_form_single['height'], $give_form_single['crop'] );
+	add_image_size('give_form_thumbnail', $give_form_thumbnail['width'], $give_form_thumbnail['height'], $give_form_thumbnail['crop']);
+	add_image_size('give_form_single', $give_form_single['width'], $give_form_single['height'], $give_form_single['crop']);
 }
 
 /**
@@ -509,19 +509,19 @@ 
 function give_widgets_init() {
 
 	//Single Give Forms (disabled if single turned off in settings)
-	if ( give_get_option( 'disable_forms_singular' ) !== 'on' && give_get_option( 'disable_form_sidebar' ) !== 'on' ) {
+	if (give_get_option('disable_forms_singular') !== 'on' && give_get_option('disable_form_sidebar') !== 'on') {
 
-		register_sidebar( apply_filters( 'give_forms_single_sidebar', array(
-			'name'          => __( 'Give Single Form Sidebar', 'give' ),
+		register_sidebar(apply_filters('give_forms_single_sidebar', array(
+			'name'          => __('Give Single Form Sidebar', 'give'),
 			'id'            => 'give-forms-sidebar',
-			'description'   => __( 'Widgets in this area will be shown on the single Give forms aside area. This sidebar will not display for embedded forms.', 'give' ),
+			'description'   => __('Widgets in this area will be shown on the single Give forms aside area. This sidebar will not display for embedded forms.', 'give'),
 			'before_widget' => '<div id="%1$s" class="widget %2$s">',
 			'after_widget'  => '</div>',
 			'before_title'  => '<h3 class="widgettitle widget-title">',
 			'after_title'   => '</h3>',
-		) ) );
+		)));
 
 	}
 }
 
-add_action( 'widgets_init', 'give_widgets_init', 999 );
\ No newline at end of file
+add_action('widgets_init', 'give_widgets_init', 999);
\ No newline at end of file

includes/price-functions.php

Spacing +15 added lines, -15 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,13 +23,13 @@ 
  *
  * @return bool true if has variable prices, false otherwise
  */
-function give_has_variable_prices( $form_id = 0 ) {
+function give_has_variable_prices($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
 	return $form->has_variable_prices();
 }
@@ -44,13 +44,13 @@ 
  *
  * @return array Variable prices
  */
-function give_get_variable_prices( $form_id = 0 ) {
+function give_get_variable_prices($form_id = 0) {
 
-	if ( empty( $form_id ) ) {
+	if (empty($form_id)) {
 		return false;
 	}
 
-	$form = new Give_Donate_Form( $form_id );
+	$form = new Give_Donate_Form($form_id);
 
 	return $form->prices;
 
@@ -67,13 +67,13 @@ 
  *
  * @return string $default_price
  */
-function give_get_default_multilevel_amount( $form_id ) {
+function give_get_default_multilevel_amount($form_id) {
 	$default_price = '1.00';
-	$prices        = apply_filters( 'give_form_variable_prices', give_get_variable_prices( $form_id ), $form_id );
+	$prices        = apply_filters('give_form_variable_prices', give_get_variable_prices($form_id), $form_id);
 
-	foreach ( $prices as $price ) {
+	foreach ($prices as $price) {
 
-		if ( isset( $price['_give_default'] ) && $price['_give_default'] === 'default' ) {
+		if (isset($price['_give_default']) && $price['_give_default'] === 'default') {
 			$default_price = $price['_give_amount'];
 		}
 
@@ -94,15 +94,15 @@ 
  * @return string $default_price
  * @since      1.0
  */
-function give_get_default_form_amount( $form_id ) {
+function give_get_default_form_amount($form_id) {
 
-	if ( give_has_variable_prices( $form_id ) ) {
+	if (give_has_variable_prices($form_id)) {
 
-		$default_amount = give_get_default_multilevel_amount( $form_id );
+		$default_amount = give_get_default_multilevel_amount($form_id);
 
 	} else {
 
-		$default_amount = get_post_meta( $form_id, '_give_set_price', true );
+		$default_amount = get_post_meta($form_id, '_give_set_price', true);
 
 	}
 

includes/shortcodes.php

Indentation +1 added lines, -1 removed lines

@@ -79,7 +79,7 @@
 
 		//validate display_style and float_labels value
 		if ( ( $key == 'display_style' && ! in_array( $value, array( 'onpage', 'reveal', 'modal' ) ) )
-		     || ( $key == 'float_labels' && ! in_array( $value, array( 'enabled', 'disabled' ) ) )
+			 || ( $key == 'float_labels' && ! in_array( $value, array( 'enabled', 'disabled' ) ) )
 		) {
 
 			$atts[ $key ] = '';

Spacing +99 added lines, -99 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -24,17 +24,17 @@ 
  * @return string
  */
 function give_donation_history() {
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		ob_start();
-		give_get_template_part( 'history', 'donations' );
+		give_get_template_part('history', 'donations');
 
 		return ob_get_clean();
 	} else {
-		echo apply_filters( 'give_donation_history_nonuser_message', '<div class="give_error give_warning"><p>' . __( 'You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give' ) . '</p></div>' );
+		echo apply_filters('give_donation_history_nonuser_message', '<div class="give_error give_warning"><p>'.__('You must be logged in to view your donation history. Please login using your account or create an account using the same email you used to donate with.', 'give').'</p></div>');
 	}
 }
 
-add_shortcode( 'donation_history', 'give_donation_history' );
+add_shortcode('donation_history', 'give_donation_history');
 
 /**
  * Donation Form Shortcode
@@ -48,53 +48,53 @@ 
  *
  * @return string
  */
-function give_form_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_form_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'id'            => '',
 		'show_title'    => true,
 		'show_goal'     => true,
 		'show_content'  => '',
 		'float_labels'  => '',
 		'display_style' => '',
-	), $atts, 'give_form' );
+	), $atts, 'give_form');
 
-	foreach ( $atts as $key => $value ) {
+	foreach ($atts as $key => $value) {
 		//convert shortcode_atts values to booleans
-		if ( $key == 'show_title' ) {
-			$atts[ $key ] = filter_var( $atts[ $key ], FILTER_VALIDATE_BOOLEAN );
-		} elseif ( $key == 'show_goal' ) {
-			$atts[ $key ] = filter_var( $atts[ $key ], FILTER_VALIDATE_BOOLEAN );
+		if ($key == 'show_title') {
+			$atts[$key] = filter_var($atts[$key], FILTER_VALIDATE_BOOLEAN);
+		} elseif ($key == 'show_goal') {
+			$atts[$key] = filter_var($atts[$key], FILTER_VALIDATE_BOOLEAN);
 		}
 
 		//validate show_content value
-		if ( $key == 'show_content' ) {
-			if ( ! in_array( $value, array( 'none', 'above', 'below' ) ) ) {
-				$atts[ $key ] = '';
-			} else if ( $value == 'above' ) {
-				$atts[ $key ] = 'give_pre_form';
-			} else if ( $value == 'below' ) {
-				$atts[ $key ] = 'give_post_form';
+		if ($key == 'show_content') {
+			if ( ! in_array($value, array('none', 'above', 'below'))) {
+				$atts[$key] = '';
+			} else if ($value == 'above') {
+				$atts[$key] = 'give_pre_form';
+			} else if ($value == 'below') {
+				$atts[$key] = 'give_post_form';
 			}
 		}
 
 		//validate display_style and float_labels value
-		if ( ( $key == 'display_style' && ! in_array( $value, array( 'onpage', 'reveal', 'modal' ) ) )
-		     || ( $key == 'float_labels' && ! in_array( $value, array( 'enabled', 'disabled' ) ) )
+		if (($key == 'display_style' && ! in_array($value, array('onpage', 'reveal', 'modal')))
+		     || ($key == 'float_labels' && ! in_array($value, array('enabled', 'disabled')))
 		) {
 
-			$atts[ $key ] = '';
+			$atts[$key] = '';
 		}
 	}
 
 	//get the Give Form
 	ob_start();
-	give_get_donation_form( $atts );
+	give_get_donation_form($atts);
 	$final_output = ob_get_clean();
 
-	return apply_filters( 'give_donate_form', $final_output, $atts );
+	return apply_filters('give_donate_form', $final_output, $atts);
 }
 
-add_shortcode( 'give_form', 'give_form_shortcode' );
+add_shortcode('give_form', 'give_form_shortcode');
 
 /**
  * Donation Form Goal Shortcode
@@ -108,37 +108,37 @@ 
  *
  * @return string
  */
-function give_goal_shortcode( $atts, $content = null ) {
-	$atts = shortcode_atts( array(
+function give_goal_shortcode($atts, $content = null) {
+	$atts = shortcode_atts(array(
 		'id'        => '',
 		'show_text' => true,
 		'show_bar'  => true,
-	), $atts, 'give_goal' );
+	), $atts, 'give_goal');
 
 
 	//get the Give Form
 	ob_start();
 
 	//Sanity check 1: ensure there is an ID Provided
-	if ( empty( $atts['id'] ) ) {
-		give_output_error( __( 'Error: No Donation form ID for the shortcode provided.', 'give' ), true );
+	if (empty($atts['id'])) {
+		give_output_error(__('Error: No Donation form ID for the shortcode provided.', 'give'), true);
 	}
 
 	//Sanity check 2: Check that this form even has Goals enabled
-	$goal_option = get_post_meta( $atts['id'], '_give_goal_option', true );
-	if ( empty( $goal_option ) || $goal_option !== 'yes' ) {
-		give_output_error( __( 'Error: This form does not have Goals enabled.', 'give' ), true );
+	$goal_option = get_post_meta($atts['id'], '_give_goal_option', true);
+	if (empty($goal_option) || $goal_option !== 'yes') {
+		give_output_error(__('Error: This form does not have Goals enabled.', 'give'), true);
 	} else {
 		//Passed all sanity checks: output Goal
-		give_show_goal_progress( $atts['id'], $atts );
+		give_show_goal_progress($atts['id'], $atts);
 	}
 
 	$final_output = ob_get_clean();
 
-	return apply_filters( 'give_goal_shortcode_output', $final_output, $atts );
+	return apply_filters('give_goal_shortcode_output', $final_output, $atts);
 }
 
-add_shortcode( 'give_goal', 'give_goal_shortcode' );
+add_shortcode('give_goal', 'give_goal_shortcode');
 
 
 /**
@@ -155,16 +155,16 @@ 
  * @uses  give_login_form()
  * @return string
  */
-function give_login_form_shortcode( $atts, $content = null ) {
-	extract( shortcode_atts( array(
+function give_login_form_shortcode($atts, $content = null) {
+	extract(shortcode_atts(array(
 			'redirect' => '',
-		), $atts, 'give_login' )
+		), $atts, 'give_login')
 	);
 
-	return give_login_form( $redirect );
+	return give_login_form($redirect);
 }
 
-add_shortcode( 'give_login', 'give_login_form_shortcode' );
+add_shortcode('give_login', 'give_login_form_shortcode');
 
 /**
  * Register Shortcode
@@ -179,16 +179,16 @@ 
  * @uses  give_register_form()
  * @return string
  */
-function give_register_form_shortcode( $atts, $content = null ) {
-	extract( shortcode_atts( array(
+function give_register_form_shortcode($atts, $content = null) {
+	extract(shortcode_atts(array(
 			'redirect' => '',
-		), $atts, 'give_register' )
+		), $atts, 'give_register')
 	);
 
-	return give_register_form( $redirect );
+	return give_register_form($redirect);
 }
 
-add_shortcode( 'give_register', 'give_register_form_shortcode' );
+add_shortcode('give_register', 'give_register_form_shortcode');
 
 
 /**
@@ -203,48 +203,48 @@ 
  *
  * @return string
  */
-function give_receipt_shortcode( $atts, $content = null ) {
+function give_receipt_shortcode($atts, $content = null) {
 
 	global $give_receipt_args;
 
-	$give_receipt_args = shortcode_atts( array(
-		'error'          => __( 'Sorry, it appears the viewing window for this donation receipt has expired or you do not have the permission to view this donation receipt.', 'give' ),
+	$give_receipt_args = shortcode_atts(array(
+		'error'          => __('Sorry, it appears the viewing window for this donation receipt has expired or you do not have the permission to view this donation receipt.', 'give'),
 		'price'          => true,
 		'date'           => true,
 		'payment_key'    => false,
 		'payment_method' => true,
 		'payment_id'     => true
-	), $atts, 'give_receipt' );
+	), $atts, 'give_receipt');
 
 	//set $session var
 	$session = give_get_purchase_session();
 
 	//set payment key var
-	if ( isset( $_GET['payment_key'] ) ) {
-		$payment_key = urldecode( $_GET['payment_key'] );
-	} elseif ( $session ) {
+	if (isset($_GET['payment_key'])) {
+		$payment_key = urldecode($_GET['payment_key']);
+	} elseif ($session) {
 		$payment_key = $session['purchase_key'];
-	} elseif ( $give_receipt_args['payment_key'] ) {
+	} elseif ($give_receipt_args['payment_key']) {
 		$payment_key = $give_receipt_args['payment_key'];
 	}
 
 	// No key found
-	if ( ! isset( $payment_key ) ) {
-		return '<div class="give_errors"><p class="give_error">' . $give_receipt_args['error'] . '</p></div>';
+	if ( ! isset($payment_key)) {
+		return '<div class="give_errors"><p class="give_error">'.$give_receipt_args['error'].'</p></div>';
 	}
 
-	$payment_id    = give_get_purchase_id_by_key( $payment_key );
-	$user_can_view = give_can_view_receipt( $payment_key );
+	$payment_id    = give_get_purchase_id_by_key($payment_key);
+	$user_can_view = give_can_view_receipt($payment_key);
 
 	// Key was provided, but user is logged out. Offer them the ability to login and view the receipt
-	if ( ! $user_can_view && ! empty( $payment_key ) && ! is_user_logged_in() && ! give_is_guest_payment( $payment_id ) ) {
+	if ( ! $user_can_view && ! empty($payment_key) && ! is_user_logged_in() && ! give_is_guest_payment($payment_id)) {
 		global $give_login_redirect;
 		$give_login_redirect = give_get_current_page_url();
 
 		ob_start();
-		echo '<div class="give_errors"><p class="give_error">' . __( 'You must be logged in to view this payment receipt.', 'give' ) . '</p></div>';
+		echo '<div class="give_errors"><p class="give_error">'.__('You must be logged in to view this payment receipt.', 'give').'</p></div>';
 
-		give_get_template_part( 'shortcode', 'login' );
+		give_get_template_part('shortcode', 'login');
 
 		$login_form = ob_get_clean();
 
@@ -263,13 +263,13 @@ 
 	 */
 
 
-	if ( ! apply_filters( 'give_user_can_view_receipt', $user_can_view, $give_receipt_args ) ) {
-		return '<p class="edd-alert edd-alert-error">' . $give_receipt_args['error'] . '</p>';
+	if ( ! apply_filters('give_user_can_view_receipt', $user_can_view, $give_receipt_args)) {
+		return '<p class="edd-alert edd-alert-error">'.$give_receipt_args['error'].'</p>';
 	}
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'receipt' );
+	give_get_template_part('shortcode', 'receipt');
 
 	$display = ob_get_clean();
 
@@ -278,7 +278,7 @@ 
 
 }
 
-add_shortcode( 'give_receipt', 'give_receipt_shortcode' );
+add_shortcode('give_receipt', 'give_receipt_shortcode');
 
 /**
  * Profile Editor Shortcode
@@ -298,18 +298,18 @@ 
  *
  * @return string Output generated from the profile editor
  */
-function give_profile_editor_shortcode( $atts, $content = null ) {
+function give_profile_editor_shortcode($atts, $content = null) {
 
 	ob_start();
 
-	give_get_template_part( 'shortcode', 'profile-editor' );
+	give_get_template_part('shortcode', 'profile-editor');
 
 	$display = ob_get_clean();
 
 	return $display;
 }
 
-add_shortcode( 'give_profile_editor', 'give_profile_editor_shortcode' );
+add_shortcode('give_profile_editor', 'give_profile_editor_shortcode');
 
 /**
  * Process Profile Updater Form
@@ -322,30 +322,30 @@ 
  *
  * @return false
  */
-function give_process_profile_editor_updates( $data ) {
+function give_process_profile_editor_updates($data) {
 	// Profile field change request
-	if ( empty( $_POST['give_profile_editor_submit'] ) && ! is_user_logged_in() ) {
+	if (empty($_POST['give_profile_editor_submit']) && ! is_user_logged_in()) {
 		return false;
 	}
 
 	// Nonce security
-	if ( ! wp_verify_nonce( $data['give_profile_editor_nonce'], 'give-profile-editor-nonce' ) ) {
+	if ( ! wp_verify_nonce($data['give_profile_editor_nonce'], 'give-profile-editor-nonce')) {
 		return false;
 	}
 
 	$user_id       = get_current_user_id();
-	$old_user_data = get_userdata( $user_id );
-
-	$display_name = isset( $data['give_display_name'] ) ? sanitize_text_field( $data['give_display_name'] ) : $old_user_data->display_name;
-	$first_name   = isset( $data['give_first_name'] ) ? sanitize_text_field( $data['give_first_name'] ) : $old_user_data->first_name;
-	$last_name    = isset( $data['give_last_name'] ) ? sanitize_text_field( $data['give_last_name'] ) : $old_user_data->last_name;
-	$email        = isset( $data['give_email'] ) ? sanitize_email( $data['give_email'] ) : $old_user_data->user_email;
-	$line1        = ( isset( $data['give_address_line1'] ) ? sanitize_text_field( $data['give_address_line1'] ) : '' );
-	$line2        = ( isset( $data['give_address_line2'] ) ? sanitize_text_field( $data['give_address_line2'] ) : '' );
-	$city         = ( isset( $data['give_address_city'] ) ? sanitize_text_field( $data['give_address_city'] ) : '' );
-	$state        = ( isset( $data['give_address_state'] ) ? sanitize_text_field( $data['give_address_state'] ) : '' );
-	$zip          = ( isset( $data['give_address_zip'] ) ? sanitize_text_field( $data['give_address_zip'] ) : '' );
-	$country      = ( isset( $data['give_address_country'] ) ? sanitize_text_field( $data['give_address_country'] ) : '' );
+	$old_user_data = get_userdata($user_id);
+
+	$display_name = isset($data['give_display_name']) ? sanitize_text_field($data['give_display_name']) : $old_user_data->display_name;
+	$first_name   = isset($data['give_first_name']) ? sanitize_text_field($data['give_first_name']) : $old_user_data->first_name;
+	$last_name    = isset($data['give_last_name']) ? sanitize_text_field($data['give_last_name']) : $old_user_data->last_name;
+	$email        = isset($data['give_email']) ? sanitize_email($data['give_email']) : $old_user_data->user_email;
+	$line1        = (isset($data['give_address_line1']) ? sanitize_text_field($data['give_address_line1']) : '');
+	$line2        = (isset($data['give_address_line2']) ? sanitize_text_field($data['give_address_line2']) : '');
+	$city         = (isset($data['give_address_city']) ? sanitize_text_field($data['give_address_city']) : '');
+	$state        = (isset($data['give_address_state']) ? sanitize_text_field($data['give_address_state']) : '');
+	$zip          = (isset($data['give_address_zip']) ? sanitize_text_field($data['give_address_zip']) : '');
+	$country      = (isset($data['give_address_country']) ? sanitize_text_field($data['give_address_country']) : '');
 
 	$userdata = array(
 		'ID'           => $user_id,
@@ -365,45 +365,45 @@ 
 		'country' => $country
 	);
 
-	do_action( 'give_pre_update_user_profile', $user_id, $userdata );
+	do_action('give_pre_update_user_profile', $user_id, $userdata);
 
 	// New password
-	if ( ! empty( $data['give_new_user_pass1'] ) ) {
-		if ( $data['give_new_user_pass1'] !== $data['give_new_user_pass2'] ) {
-			give_set_error( 'password_mismatch', __( 'The passwords you entered do not match. Please try again.', 'give' ) );
+	if ( ! empty($data['give_new_user_pass1'])) {
+		if ($data['give_new_user_pass1'] !== $data['give_new_user_pass2']) {
+			give_set_error('password_mismatch', __('The passwords you entered do not match. Please try again.', 'give'));
 		} else {
 			$userdata['user_pass'] = $data['give_new_user_pass1'];
 		}
 	}
 
 	// Make sure the new email doesn't belong to another user
-	if ( $email != $old_user_data->user_email ) {
-		if ( email_exists( $email ) ) {
-			give_set_error( 'email_exists', __( 'The email you entered belongs to another user. Please use another.', 'give' ) );
+	if ($email != $old_user_data->user_email) {
+		if (email_exists($email)) {
+			give_set_error('email_exists', __('The email you entered belongs to another user. Please use another.', 'give'));
 		}
 	}
 
 	// Check for errors
 	$errors = give_get_errors();
 
-	if ( $errors ) {
+	if ($errors) {
 		// Send back to the profile editor if there are errors
-		wp_redirect( $data['give_redirect'] );
+		wp_redirect($data['give_redirect']);
 		give_die();
 	}
 
 	// Update the user
-	$meta    = update_user_meta( $user_id, '_give_user_address', $address );
-	$updated = wp_update_user( $userdata );
+	$meta    = update_user_meta($user_id, '_give_user_address', $address);
+	$updated = wp_update_user($userdata);
 
-	if ( $updated ) {
-		do_action( 'give_user_profile_updated', $user_id, $userdata );
-		wp_redirect( add_query_arg( 'updated', 'true', $data['give_redirect'] ) );
+	if ($updated) {
+		do_action('give_user_profile_updated', $user_id, $userdata);
+		wp_redirect(add_query_arg('updated', 'true', $data['give_redirect']));
 		give_die();
 	}
 
 	return false;
 }
 
-add_action( 'give_edit_user_profile', 'give_process_profile_editor_updates' );
+add_action('give_edit_user_profile', 'give_process_profile_editor_updates');
 

uninstall.php

Spacing +35 added lines, -35 removed lines

@@ -10,83 +10,83 @@
  */
 
 // Exit if accessed directly
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if ( ! defined('WP_UNINSTALL_PLUGIN')) {
 	exit;
 }
 
 // Load Give file
-include_once( 'give.php' );
+include_once('give.php');
 
 global $wpdb, $wp_roles;
 
 
-if ( give_get_option( 'uninstall_on_delete' ) === 'on' ) {
+if (give_get_option('uninstall_on_delete') === 'on') {
 
 	// Delete All the Custom Post Types
-	$give_taxonomies = array( 'form_category', 'form_tag', 'give_log_type', );
-	$give_post_types = array( 'give_forms', 'give_payment', 'give_log' );
-	foreach ( $give_post_types as $post_type ) {
+	$give_taxonomies = array('form_category', 'form_tag', 'give_log_type',);
+	$give_post_types = array('give_forms', 'give_payment', 'give_log');
+	foreach ($give_post_types as $post_type) {
 
-		$give_taxonomies = array_merge( $give_taxonomies, get_object_taxonomies( $post_type ) );
-		$items           = get_posts( array(
+		$give_taxonomies = array_merge($give_taxonomies, get_object_taxonomies($post_type));
+		$items           = get_posts(array(
 			'post_type'   => $post_type,
 			'post_status' => 'any',
-			'numberposts' => - 1,
+			'numberposts' => -1,
 			'fields'      => 'ids'
-		) );
+		));
 
-		if ( $items ) {
-			foreach ( $items as $item ) {
-				wp_delete_post( $item, true );
+		if ($items) {
+			foreach ($items as $item) {
+				wp_delete_post($item, true);
 			}
 		}
 	}
 
 	// Delete All the Terms & Taxonomies
-	foreach ( array_unique( array_filter( $give_taxonomies ) ) as $taxonomy ) {
+	foreach (array_unique(array_filter($give_taxonomies)) as $taxonomy) {
 
-		$terms = $wpdb->get_results( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ('%s') ORDER BY t.name ASC", $taxonomy ) );
+		$terms = $wpdb->get_results($wpdb->prepare("SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ('%s') ORDER BY t.name ASC", $taxonomy));
 
 		// Delete Terms
-		if ( $terms ) {
-			foreach ( $terms as $term ) {
-				$wpdb->delete( $wpdb->term_taxonomy, array( 'term_taxonomy_id' => $term->term_taxonomy_id ) );
-				$wpdb->delete( $wpdb->terms, array( 'term_id' => $term->term_id ) );
+		if ($terms) {
+			foreach ($terms as $term) {
+				$wpdb->delete($wpdb->term_taxonomy, array('term_taxonomy_id' => $term->term_taxonomy_id));
+				$wpdb->delete($wpdb->terms, array('term_id' => $term->term_id));
 			}
 		}
 
 		// Delete Taxonomies
-		$wpdb->delete( $wpdb->term_taxonomy, array( 'taxonomy' => $taxonomy ), array( '%s' ) );
+		$wpdb->delete($wpdb->term_taxonomy, array('taxonomy' => $taxonomy), array('%s'));
 	}
 
 	// Delete the Plugin Pages
-	$give_created_pages = array( 'success_page', 'failure_page', 'history_page' );
-	foreach ( $give_created_pages as $p ) {
-		$page = give_get_option( $p, false );
-		if ( $page ) {
-			wp_delete_post( $page, true );
+	$give_created_pages = array('success_page', 'failure_page', 'history_page');
+	foreach ($give_created_pages as $p) {
+		$page = give_get_option($p, false);
+		if ($page) {
+			wp_delete_post($page, true);
 		}
 	}
 
 	// Delete all the Plugin Options
-	delete_option( 'give_settings' );
-	delete_option( 'give_version' );
+	delete_option('give_settings');
+	delete_option('give_version');
 
 	// Delete Capabilities
 	Give()->roles->remove_caps();
 
 	// Delete the Roles
-	$give_roles = array( 'give_manager', 'give_accountant', 'give_worker' );
-	foreach ( $give_roles as $role ) {
-		remove_role( $role );
+	$give_roles = array('give_manager', 'give_accountant', 'give_worker');
+	foreach ($give_roles as $role) {
+		remove_role($role);
 	}
 
 	// Remove all database tables
-	$wpdb->query( "DROP TABLE IF EXISTS " . $wpdb->prefix . "give_donors" );
-	$wpdb->query( "DROP TABLE IF EXISTS " . $wpdb->prefix . "give_customers" );
+	$wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."give_donors");
+	$wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."give_customers");
 
 	// Cleanup Cron Events
-	wp_clear_scheduled_hook( 'give_daily_scheduled_events' );
-	wp_clear_scheduled_hook( 'give_daily_cron' );
-	wp_clear_scheduled_hook( 'give_weekly_cron' );
+	wp_clear_scheduled_hook('give_daily_scheduled_events');
+	wp_clear_scheduled_hook('give_daily_cron');
+	wp_clear_scheduled_hook('give_weekly_cron');
 }

includes/formatting.php

Braces +3 added lines, -1 removed lines

@@ -142,8 +142,10 @@
 
 	if ( is_front_page() ) :
 		$page_url = home_url();
-	else :
+	else {
+		:
 		$page_url = 'http';
+	}
 
 		if ( isset( $_SERVER["HTTPS"] ) && $_SERVER["HTTPS"] == "on" ) {
 			$page_url .= "s";

Doc Comments +1 added lines, -1 removed lines

@@ -119,7 +119,7 @@
  * @param $field_args
  * @param $field
  *
- * @return bool
+ * @return false|null
  */
 function give_format_admin_multilevel_amount( $field_args, $field ) {
 

Spacing +65 added lines, -65 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,37 +25,37 @@ 
  *
  * @return string $amount Newly sanitized amount
  */
-function give_sanitize_amount( $amount ) {
+function give_sanitize_amount($amount) {
 	$is_negative   = false;
-	$thousands_sep = give_get_option( 'thousands_separator', ',' );
-	$decimal_sep   = give_get_option( 'decimal_separator', '.' );
+	$thousands_sep = give_get_option('thousands_separator', ',');
+	$decimal_sep   = give_get_option('decimal_separator', '.');
 
 	// Sanitize the amount
-	if ( $decimal_sep == ',' && false !== ( $found = strpos( $amount, $decimal_sep ) ) ) {
-		if ( ( $thousands_sep == '.' || $thousands_sep == ' ' ) && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-			$amount = str_replace( $thousands_sep, '', $amount );
-		} elseif ( empty( $thousands_sep ) && false !== ( $found = strpos( $amount, '.' ) ) ) {
-			$amount = str_replace( '.', '', $amount );
+	if ($decimal_sep == ',' && false !== ($found = strpos($amount, $decimal_sep))) {
+		if (($thousands_sep == '.' || $thousands_sep == ' ') && false !== ($found = strpos($amount, $thousands_sep))) {
+			$amount = str_replace($thousands_sep, '', $amount);
+		} elseif (empty($thousands_sep) && false !== ($found = strpos($amount, '.'))) {
+			$amount = str_replace('.', '', $amount);
 		}
 
-		$amount = str_replace( $decimal_sep, '.', $amount );
-	} elseif ( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-		$amount = str_replace( $thousands_sep, '', $amount );
+		$amount = str_replace($decimal_sep, '.', $amount);
+	} elseif ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+		$amount = str_replace($thousands_sep, '', $amount);
 	}
 
-	if ( $amount < 0 ) {
+	if ($amount < 0) {
 		$is_negative = true;
 	}
 
-	$amount   = preg_replace( '/[^0-9\.]/', '', $amount );
-	$decimals = apply_filters( 'give_sanitize_amount_decimals', 2, $amount );
-	$amount   = number_format( (double) $amount, $decimals, '.', '' );
+	$amount   = preg_replace('/[^0-9\.]/', '', $amount);
+	$decimals = apply_filters('give_sanitize_amount_decimals', 2, $amount);
+	$amount   = number_format((double) $amount, $decimals, '.', '');
 
-	if ( $is_negative ) {
+	if ($is_negative) {
 		$amount *= - 1;
 	}
 
-	return apply_filters( 'give_sanitize_amount', $amount );
+	return apply_filters('give_sanitize_amount', $amount);
 }
 
 /**
@@ -68,47 +68,47 @@ 
  *
  * @return string $amount Newly formatted amount or Price Not Available
  */
-function give_format_amount( $amount, $decimals = true ) {
+function give_format_amount($amount, $decimals = true) {
 
-	$thousands_sep = give_get_option( 'thousands_separator', ',' );
-	$decimal_sep   = give_get_option( 'decimal_separator', '.' );
+	$thousands_sep = give_get_option('thousands_separator', ',');
+	$decimal_sep   = give_get_option('decimal_separator', '.');
 
 	// Format the amount
-	if ( $decimal_sep == ',' && false !== ( $sep_found = strpos( $amount, $decimal_sep ) ) ) {
-		$whole  = substr( $amount, 0, $sep_found );
-		$part   = substr( $amount, $sep_found + 1, ( strlen( $amount ) - 1 ) );
-		$amount = $whole . '.' . $part;
+	if ($decimal_sep == ',' && false !== ($sep_found = strpos($amount, $decimal_sep))) {
+		$whole  = substr($amount, 0, $sep_found);
+		$part   = substr($amount, $sep_found + 1, (strlen($amount) - 1));
+		$amount = $whole.'.'.$part;
 	}
 
 	// Strip , from the amount (if set as the thousands separator)
-	if ( $thousands_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-		$amount = str_replace( ',', '', $amount );
+	if ($thousands_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+		$amount = str_replace(',', '', $amount);
 	}
 
 	// Strip . from the amount (if set as the thousands separator) AND , set to decimal separator
-	if ( $thousands_sep == '.' && $decimal_sep == ',' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-		$amount      = explode( '.', $amount );
-		$array_count = count( $amount );
-		if ( $decimals == true ) {
-			unset( $amount[ $array_count - 1 ] );
+	if ($thousands_sep == '.' && $decimal_sep == ',' && false !== ($found = strpos($amount, $thousands_sep))) {
+		$amount      = explode('.', $amount);
+		$array_count = count($amount);
+		if ($decimals == true) {
+			unset($amount[$array_count - 1]);
 		}
-		$amount = implode( '', $amount );
+		$amount = implode('', $amount);
 	}
 
 	// Strip ' ' from the amount (if set as the thousands separator)
-	if ( $thousands_sep == ' ' && false !== ( $found = strpos( $amount, $thousands_sep ) ) ) {
-		$amount = str_replace( ' ', '', $amount );
+	if ($thousands_sep == ' ' && false !== ($found = strpos($amount, $thousands_sep))) {
+		$amount = str_replace(' ', '', $amount);
 	}
 
-	if ( empty( $amount ) ) {
+	if (empty($amount)) {
 		$amount = 0;
 	}
 
-	$decimals = apply_filters( 'give_format_amount_decimals', $decimals ? 2 : 0, $amount );
+	$decimals = apply_filters('give_format_amount_decimals', $decimals ? 2 : 0, $amount);
 
-	$formatted = number_format( $amount, $decimals, $decimal_sep, $thousands_sep );
+	$formatted = number_format($amount, $decimals, $decimal_sep, $thousands_sep);
 
-	return apply_filters( 'give_format_amount', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep );
+	return apply_filters('give_format_amount', $formatted, $amount, $decimals, $decimal_sep, $thousands_sep);
 }
 
 /**
@@ -121,13 +121,13 @@ 
  *
  * @return bool
  */
-function give_format_admin_multilevel_amount( $field_args, $field ) {
+function give_format_admin_multilevel_amount($field_args, $field) {
 
-	if ( empty( $field->value ) ) {
+	if (empty($field->value)) {
 		return false;
 	}
 
-	$field->value = give_format_amount( $field->value );
+	$field->value = give_format_amount($field->value);
 
 }
 
@@ -141,24 +141,24 @@ 
  *
  * @return mixed|string|void
  */
-function give_currency_filter( $price = '', $currency = '' ) {
+function give_currency_filter($price = '', $currency = '') {
 
-	if ( empty( $currency ) ) {
+	if (empty($currency)) {
 		$currency = give_get_currency();
 	}
 
-	$position = give_get_option( 'currency_position', 'before' );
+	$position = give_get_option('currency_position', 'before');
 
 	$negative = $price < 0;
 
-	if ( $negative ) {
-		$price = substr( $price, 1 ); // Remove proceeding "-" -
+	if ($negative) {
+		$price = substr($price, 1); // Remove proceeding "-" -
 	}
 
-	$symbol = give_currency_symbol( $currency );
+	$symbol = give_currency_symbol($currency);
 
-	if ( $position == 'before' ):
-		switch ( $currency ):
+	if ($position == 'before'):
+		switch ($currency):
 			case 'GBP' :
 			case 'BRL' :
 			case 'EUR' :
@@ -184,18 +184,18 @@ 
 			case 'DKK' :
 			case 'HUF' :
 			case 'ILS' :
-				$formatted = $symbol . $price;
+				$formatted = $symbol.$price;
 				break;
 			case 'NOK' :
-				$formatted = $symbol . ' ' . $price;
+				$formatted = $symbol.' '.$price;
 				break;
 			default :
-				$formatted = $currency . ' ' . $price;
+				$formatted = $currency.' '.$price;
 				break;
 		endswitch;
-		$formatted = apply_filters( 'give_' . strtolower( $currency ) . '_currency_filter_before', $formatted, $currency, $price );
+		$formatted = apply_filters('give_'.strtolower($currency).'_currency_filter_before', $formatted, $currency, $price);
 	else :
-		switch ( $currency ) :
+		switch ($currency) :
 			case 'GBP' :
 			case 'BRL' :
 			case 'EUR' :
@@ -220,18 +220,18 @@ 
 			case 'HUF' :
 			case 'MYR' :
 			case 'ILS' :
-				$formatted = $price . $symbol;
+				$formatted = $price.$symbol;
 				break;
 			default :
-				$formatted = $price . ' ' . $currency;
+				$formatted = $price.' '.$currency;
 				break;
 		endswitch;
-		$formatted = apply_filters( 'give_' . strtolower( $currency ) . '_currency_filter_after', $formatted, $currency, $price );
+		$formatted = apply_filters('give_'.strtolower($currency).'_currency_filter_after', $formatted, $currency, $price);
 	endif;
 
-	if ( $negative ) {
+	if ($negative) {
 		// Prepend the mins sign before the currency sign
-		$formatted = '-' . $formatted;
+		$formatted = '-'.$formatted;
 	}
 
 	return $formatted;
@@ -246,11 +246,11 @@ 
  *
  * @return int $decimals
  */
-function give_currency_decimal_filter( $decimals = 2 ) {
+function give_currency_decimal_filter($decimals = 2) {
 
 	$currency = give_get_currency();
 
-	switch ( $currency ) {
+	switch ($currency) {
 		case 'RIAL' :
 		case 'JPY' :
 		case 'TWD' :
@@ -260,8 +260,8 @@ 
 			break;
 	}
 
-	return apply_filters( 'give_currency_decimal_count', $decimals, $currency );
+	return apply_filters('give_currency_decimal_count', $decimals, $currency);
 }
 
-add_filter( 'give_sanitize_amount_decimals', 'give_currency_decimal_filter' );
-add_filter( 'give_format_amount_decimals', 'give_currency_decimal_filter' );
\ No newline at end of file
+add_filter('give_sanitize_amount_decimals', 'give_currency_decimal_filter');
+add_filter('give_format_amount_decimals', 'give_currency_decimal_filter');
\ No newline at end of file

includes/admin/welcome.php

Spacing +104 added lines, -104 removed lines

@@ -11,7 +11,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -35,9 +35,9 @@ 
 	 * @since 1.0
 	 */
 	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'admin_menus' ) );
-		add_action( 'admin_head', array( $this, 'admin_head' ) );
-		add_action( 'admin_init', array( $this, 'welcome' ) );
+		add_action('admin_menu', array($this, 'admin_menus'));
+		add_action('admin_head', array($this, 'admin_head'));
+		add_action('admin_init', array($this, 'welcome'));
 	}
 
 	/**
@@ -51,38 +51,38 @@ 
 	public function admin_menus() {
 		// About Page
 		add_dashboard_page(
-			__( 'Welcome to Give', 'give' ),
-			__( 'Welcome to Give', 'give' ),
+			__('Welcome to Give', 'give'),
+			__('Welcome to Give', 'give'),
 			$this->minimum_capability,
 			'give-about',
-			array( $this, 'about_screen' )
+			array($this, 'about_screen')
 		);
 
 		// Changelog Page
 		add_dashboard_page(
-			__( 'Give Changelog', 'give' ),
-			__( 'Give Changelog', 'give' ),
+			__('Give Changelog', 'give'),
+			__('Give Changelog', 'give'),
 			$this->minimum_capability,
 			'give-changelog',
-			array( $this, 'changelog_screen' )
+			array($this, 'changelog_screen')
 		);
 
 		// Getting Started Page
 		add_dashboard_page(
-			__( 'Getting started with Give', 'give' ),
-			__( 'Getting started with Give', 'give' ),
+			__('Getting started with Give', 'give'),
+			__('Getting started with Give', 'give'),
 			$this->minimum_capability,
 			'give-getting-started',
-			array( $this, 'getting_started_screen' )
+			array($this, 'getting_started_screen')
 		);
 
 		// Credits Page
 		add_dashboard_page(
-			__( 'The people that build Give', 'give' ),
-			__( 'The people that build Give', 'give' ),
+			__('The people that build Give', 'give'),
+			__('The people that build Give', 'give'),
 			$this->minimum_capability,
 			'give-credits',
-			array( $this, 'credits_screen' )
+			array($this, 'credits_screen')
 		);
 	}
 
@@ -95,13 +95,13 @@ 
 	 */
 	public function admin_head() {
 
-		remove_submenu_page( 'index.php', 'give-about' );
-		remove_submenu_page( 'index.php', 'give-changelog' );
-		remove_submenu_page( 'index.php', 'give-getting-started' );
-		remove_submenu_page( 'index.php', 'give-credits' );
+		remove_submenu_page('index.php', 'give-about');
+		remove_submenu_page('index.php', 'give-changelog');
+		remove_submenu_page('index.php', 'give-getting-started');
+		remove_submenu_page('index.php', 'give-credits');
 
 		// Badge for welcome page
-		$badge_url = GIVE_PLUGIN_URL . 'assets/images/give-badge.png';
+		$badge_url = GIVE_PLUGIN_URL.'assets/images/give-badge.png';
 
 		?>
 		<style type="text/css" media="screen">
@@ -215,20 +215,20 @@ 
 	 * @return void
 	 */
 	public function tabs() {
-		$selected = isset( $_GET['page'] ) ? $_GET['page'] : 'give-about';
+		$selected = isset($_GET['page']) ? $_GET['page'] : 'give-about';
 		?>
 		<h1 class="nav-tab-wrapper">
-			<a class="nav-tab <?php echo $selected == 'give-about' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-about' ), 'index.php' ) ) ); ?>">
-				<?php _e( "About Give", 'give' ); ?>
+			<a class="nav-tab <?php echo $selected == 'give-about' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'give-about'), 'index.php'))); ?>">
+				<?php _e("About Give", 'give'); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'give-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-getting-started' ), 'index.php' ) ) ); ?>">
-				<?php _e( 'Getting Started', 'give' ); ?>
+			<a class="nav-tab <?php echo $selected == 'give-getting-started' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'give-getting-started'), 'index.php'))); ?>">
+				<?php _e('Getting Started', 'give'); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'give-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( add_query_arg( array( 'page' => 'give-credits' ), 'index.php' ) ) ); ?>">
-				<?php _e( 'Credits', 'give' ); ?>
+			<a class="nav-tab <?php echo $selected == 'give-credits' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(add_query_arg(array('page' => 'give-credits'), 'index.php'))); ?>">
+				<?php _e('Credits', 'give'); ?>
 			</a>
-			<a class="nav-tab <?php echo $selected == 'give-add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url( admin_url( null, 'index.php' ) ) . 'edit.php?post_type=give_forms&page=give-addons'; ?>">
-				<?php _e( 'Add-ons', 'give' ); ?>
+			<a class="nav-tab <?php echo $selected == 'give-add-ons' ? 'nav-tab-active' : ''; ?>" href="<?php echo esc_url(admin_url(null, 'index.php')).'edit.php?post_type=give_forms&page=give-addons'; ?>">
+				<?php _e('Add-ons', 'give'); ?>
 			</a>
 		</h1>
 	<?php
@@ -242,20 +242,20 @@ 
 	 * @return void
 	 */
 	public function about_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
-			<h1 class="welcome-h1"><?php printf( __( 'Welcome to Give %s', 'give' ), $display_version ); ?></h1>
+			<h1 class="welcome-h1"><?php printf(__('Welcome to Give %s', 'give'), $display_version); ?></h1>
 
 			<?php give_social_media_elements() ?>
 
-			<div class="about-text"><?php printf( __( 'Thank you for activating or updating to the latest version of Give! If you\'re a first time user, welcome! You\'re well on your way to empowering your cause. </You>We encourage you to check out the <a href="%s" title="View the Give plugin documentation online" target="_blank">plugin documentation</a> and getting started guide below.', 'give' ), 'https://givewp.com/documenation/' ); ?></div>
+			<div class="about-text"><?php printf(__('Thank you for activating or updating to the latest version of Give! If you\'re a first time user, welcome! You\'re well on your way to empowering your cause. </You>We encourage you to check out the <a href="%s" title="View the Give plugin documentation online" target="_blank">plugin documentation</a> and getting started guide below.', 'give'), 'https://givewp.com/documenation/'); ?></div>
 
-			<p class="newsletter-intro"><?php _e( 'Be sure to sign up for the Give newsletter below to stay informed of important updates and news.', 'give' ); ?></p>
+			<p class="newsletter-intro"><?php _e('Be sure to sign up for the Give newsletter below to stay informed of important updates and news.', 'give'); ?></p>
 
 			<?php give_get_newsletter() ?>
 
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 
 
@@ -264,15 +264,15 @@ 
 			<div class="feature-section clearfix introduction">
 
 				<div class="video feature-section-item">
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/give-form-mockup.png' ?>" title="A Give donation form" alt="A Give donation form">
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/give-form-mockup.png' ?>" title="A Give donation form" alt="A Give donation form">
 
 				</div>
 
 				<div class="content feature-section-item last-feature">
 
-					<h3><?php _e( 'Give - Democratizing Generosity', 'give' ); ?></h3>
+					<h3><?php _e('Give - Democratizing Generosity', 'give'); ?></h3>
 
-					<p><?php _e( 'Give empowers you to easily accept donations and setup fundraising campaigns, directly within WordPress. We created Give to provide a better donation experience for you and your users. Robust, flexible, and intuitive, the plugin is built from the ground up to be the goto donation solution for WordPress. Create powerful donation forms, embed them throughout your website, start a campaign, and exceed your fundraising goals with Give. This plugin is actively developed and proudly supported by folks who are dedicated to helping you and your cause.', 'give' ); ?></p>
+					<p><?php _e('Give empowers you to easily accept donations and setup fundraising campaigns, directly within WordPress. We created Give to provide a better donation experience for you and your users. Robust, flexible, and intuitive, the plugin is built from the ground up to be the goto donation solution for WordPress. Create powerful donation forms, embed them throughout your website, start a campaign, and exceed your fundraising goals with Give. This plugin is actively developed and proudly supported by folks who are dedicated to helping you and your cause.', 'give'); ?></p>
 					<a href="https://givewp.com" target="_blank" class="button-secondary" title="Visit the Give Website">Learn More
 						<span class="dashicons dashicons-external"></span></a>
 
@@ -285,9 +285,9 @@ 
 
 				<div class="content feature-section-item">
 
-					<h3><?php _e( 'Getting to Know Give', 'give' ); ?></h3>
+					<h3><?php _e('Getting to Know Give', 'give'); ?></h3>
 
-					<p><?php _e( 'Before you get started with Give we suggest you take a look at the online documentation. There you will find the getting started guide which will help you get up and running quickly. If you have an question, issue or bug with the Core plugin please submit an issue on the Give website. We also welcome your feedback and feature requests. Welcome to Give. We hope you much success with your cause.', 'give' ); ?></p>
+					<p><?php _e('Before you get started with Give we suggest you take a look at the online documentation. There you will find the getting started guide which will help you get up and running quickly. If you have an question, issue or bug with the Core plugin please submit an issue on the Give website. We also welcome your feedback and feature requests. Welcome to Give. We hope you much success with your cause.', 'give'); ?></p>
 					<a href="https://givewp.com/documentation" target="_blank" class="button-secondary" title="Visit the Give Website">View Documentation
 						<span class="dashicons dashicons-external"></span></a>
 
@@ -295,7 +295,7 @@ 
 
 				<div class="content  feature-section-item last-feature">
 
-					<img src="<?php echo GIVE_PLUGIN_URL . '/assets/images/give-logo-photo-mashup.png' ?>" title="Give" alt="Give">
+					<img src="<?php echo GIVE_PLUGIN_URL.'/assets/images/give-logo-photo-mashup.png' ?>" title="Give" alt="Give">
 
 				</div>
 
@@ -315,18 +315,18 @@ 
 	 * @return void
 	 */
 	public function changelog_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
-			<h1><?php _e( 'Give Changelog', 'give' ); ?></h1>
+			<h1><?php _e('Give Changelog', 'give'); ?></h1>
 
-			<div class="about-text"><?php printf( __( 'Thank you for updating to the latest version! Give %s is ready to make your online store faster, safer, and better!', 'give' ), $display_version ); ?></div>
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="about-text"><?php printf(__('Thank you for updating to the latest version! Give %s is ready to make your online store faster, safer, and better!', 'give'), $display_version); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 			<?php $this->tabs(); ?>
 
 			<div class="changelog">
-				<h3><?php _e( 'Full Changelog', 'give' ); ?></h3>
+				<h3><?php _e('Full Changelog', 'give'); ?></h3>
 
 				<div class="feature-section">
 					<?php echo $this->parse_readme(); ?>
@@ -334,10 +334,10 @@ 
 			</div>
 
 			<div class="return-to-dashboard">
-				<a href="<?php echo esc_url( admin_url( add_query_arg( array(
+				<a href="<?php echo esc_url(admin_url(add_query_arg(array(
 					'post_type' => 'give_forms',
 					'page'      => 'give-settings'
-				), 'edit.php' ) ) ); ?>"><?php _e( 'Go to Give Settings', 'give' ); ?></a>
+				), 'edit.php'))); ?>"><?php _e('Go to Give Settings', 'give'); ?></a>
 			</div>
 		</div>
 	<?php
@@ -351,35 +351,35 @@ 
 	 * @return void
 	 */
 	public function getting_started_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap get-started">
-			<h1 class="welcome-h1"><?php printf( __( 'Give %s - Getting Started Guide', 'give' ), $display_version ); ?></h1>
+			<h1 class="welcome-h1"><?php printf(__('Give %s - Getting Started Guide', 'give'), $display_version); ?></h1>
 
 			<?php give_social_media_elements() ?>
 
-			<div class="about-text"><?php _e( 'Welcome to the getting started guide.', 'give' ); ?></div>
+			<div class="about-text"><?php _e('Welcome to the getting started guide.', 'give'); ?></div>
 
-			<p class="newsletter-intro"><?php _e( 'Don\'t forget to sign up for the newsletter!', 'give' ); ?>.</p>
+			<p class="newsletter-intro"><?php _e('Don\'t forget to sign up for the newsletter!', 'give'); ?>.</p>
 
 			<?php give_get_newsletter() ?>
 
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 			<?php $this->tabs(); ?>
 
 
-			<div class="about-text"><?php printf( __( 'Getting started with Give is easy! We put together this quick start guide to help first time users of the plugin. Our goal is to get you up and running in no time. Let\'s begin!', 'give' ), $display_version ); ?></div>
+			<div class="about-text"><?php printf(__('Getting started with Give is easy! We put together this quick start guide to help first time users of the plugin. Our goal is to get you up and running in no time. Let\'s begin!', 'give'), $display_version); ?></div>
 
 
 			<div class="feature-section clearfix">
 
 				<div class="content feature-section-item">
-					<h3><?php _e( 'STEP 1: Create a New Form', 'give' ); ?></h3>
+					<h3><?php _e('STEP 1: Create a New Form', 'give'); ?></h3>
 
-					<p><?php _e( 'Give is driven by it\'s powerful form building features. But it is not simply a "form". From the "Add New Form" page you\'ll be able to choose how and where you want to receive your donations. You\'ll be able to set the donation amounts. You even get to choose whether you want to create a whole page for your form, or embed it on a different page of your site.', 'give' ); ?></p>
+					<p><?php _e('Give is driven by it\'s powerful form building features. But it is not simply a "form". From the "Add New Form" page you\'ll be able to choose how and where you want to receive your donations. You\'ll be able to set the donation amounts. You even get to choose whether you want to create a whole page for your form, or embed it on a different page of your site.', 'give'); ?></p>
 
-					<p><?php _e( 'But all of these features begin simply by going to the menu and choosing "Add New Form."', 'give' ); ?></p>
+					<p><?php _e('But all of these features begin simply by going to the menu and choosing "Add New Form."', 'give'); ?></p>
 				</div>
 
 				<div class="content feature-section-item last-feature">
@@ -396,9 +396,9 @@ 
 				</div>
 
 				<div class="content feature-section-item last-feature">
-					<h3><?php _e( 'STEP 2: Choose Your Levels', 'give' ); ?></h3>
+					<h3><?php _e('STEP 2: Choose Your Levels', 'give'); ?></h3>
 
-					<p><?php _e( 'Each Form can be set to receive either a pre-determined amount or have multiple suggested levels of giving. Choosing "Multi-level Donation" opens up the levels section where you can add as many levels as you like with your own custom names and amounts.', 'give' ); ?></p>
+					<p><?php _e('Each Form can be set to receive either a pre-determined amount or have multiple suggested levels of giving. Choosing "Multi-level Donation" opens up the levels section where you can add as many levels as you like with your own custom names and amounts.', 'give'); ?></p>
 				</div>
 
 			</div>
@@ -407,11 +407,11 @@ 
 			<div class="feature-section clearfix">
 
 				<div class="content feature-section-item add-content">
-					<h3><?php _e( 'STEP 3: Landing Page or Shortcode Mode?', 'give' ); ?></h3>
+					<h3><?php _e('STEP 3: Landing Page or Shortcode Mode?', 'give'); ?></h3>
 
-					<p><?php _e( 'Every form you create in Give can either become it\'s own stand-alone page, or it can be inserted into any other page or post throughout your site as a Shortcode.', 'give' ); ?></p>
+					<p><?php _e('Every form you create in Give can either become it\'s own stand-alone page, or it can be inserted into any other page or post throughout your site as a Shortcode.', 'give'); ?></p>
 
-					<p><?php _e( 'You can choose these different modes by going to the "Form Content" section. From there, you can choose to add content before or after the Donation form on a page, or if you choose "None" perhaps you want to instead use the shortcode. You can find the shortcode in the top right column directly under the Publish/Save button. This feature gives you the most amount of flexibility with controlling your content on your website all within the same page.', 'give' ); ?></p>
+					<p><?php _e('You can choose these different modes by going to the "Form Content" section. From there, you can choose to add content before or after the Donation form on a page, or if you choose "None" perhaps you want to instead use the shortcode. You can find the shortcode in the top right column directly under the Publish/Save button. This feature gives you the most amount of flexibility with controlling your content on your website all within the same page.', 'give'); ?></p>
 				</div>
 
 				<div class="content feature-section-item last-feature">
@@ -428,9 +428,9 @@ 
 				</div>
 
 				<div class="content feature-section-item last-feature">
-					<h3><?php _e( 'STEP 4: Configure Your Display Options', 'give' ); ?></h3>
+					<h3><?php _e('STEP 4: Configure Your Display Options', 'give'); ?></h3>
 
-					<p><?php _e( 'Lastly, you can present the form in a lot of different ways. With the "Display Options" section you can configure how the credit card field appears, the submit button text, which Gateway you want to use, whether Guests (non-logged in users) can donate or not, and a log-in form.', 'give' ); ?></p>
+					<p><?php _e('Lastly, you can present the form in a lot of different ways. With the "Display Options" section you can configure how the credit card field appears, the submit button text, which Gateway you want to use, whether Guests (non-logged in users) can donate or not, and a log-in form.', 'give'); ?></p>
 				</div>
 
 
@@ -450,26 +450,26 @@ 
 	 * @return void
 	 */
 	public function credits_screen() {
-		list( $display_version ) = explode( '-', GIVE_VERSION );
+		list($display_version) = explode('-', GIVE_VERSION);
 		?>
 		<div class="wrap about-wrap">
-			<h1 class="welcome-h1"><?php printf( __( 'Give %s - Credits', 'give' ), $display_version ); ?></h1>
+			<h1 class="welcome-h1"><?php printf(__('Give %s - Credits', 'give'), $display_version); ?></h1>
 
 			<?php give_social_media_elements() ?>
 
-			<div class="about-text"><?php printf( __( 'Thanks to all those who have contributed code directly or indirectly. ', 'give' ), $display_version ); ?></div>
+			<div class="about-text"><?php printf(__('Thanks to all those who have contributed code directly or indirectly. ', 'give'), $display_version); ?></div>
 
-			<div class="about-text"><?php _e( 'Welcome to the getting started guide.', 'give' ); ?></div>
+			<div class="about-text"><?php _e('Welcome to the getting started guide.', 'give'); ?></div>
 
 			<p class="newsletter-intro">Be sure to sign up for the Give newsletter below to stay informed of important updates and news.</p>
 
 			<?php give_get_newsletter() ?>
 
-			<div class="give-badge"><?php printf( __( 'Version %s', 'give' ), $display_version ); ?></div>
+			<div class="give-badge"><?php printf(__('Version %s', 'give'), $display_version); ?></div>
 
 			<?php $this->tabs(); ?>
 
-			<p class="about-description"><?php _e( 'Give is created by a dedicated team of developers. If you are interested in contributing please visit the <a href="https://github.com/WordImpress/give" target="_blank">GitHub Repo</a>.', 'give' ); ?></p>
+			<p class="about-description"><?php _e('Give is created by a dedicated team of developers. If you are interested in contributing please visit the <a href="https://github.com/WordImpress/give" target="_blank">GitHub Repo</a>.', 'give'); ?></p>
 
 			<?php echo $this->contributors(); ?>
 		</div>
@@ -484,21 +484,21 @@ 
 	 * @return string $readme HTML formatted readme file
 	 */
 	public function parse_readme() {
-		$file = file_exists( GIVE_PLUGIN_DIR . 'readme.txt' ) ? GIVE_PLUGIN_DIR . 'readme.txt' : null;
+		$file = file_exists(GIVE_PLUGIN_DIR.'readme.txt') ? GIVE_PLUGIN_DIR.'readme.txt' : null;
 
-		if ( ! $file ) {
-			$readme = '<p>' . __( 'No valid changlog was found.', 'give' ) . '</p>';
+		if ( ! $file) {
+			$readme = '<p>'.__('No valid changlog was found.', 'give').'</p>';
 		} else {
-			$readme = file_get_contents( $file );
-			$readme = nl2br( esc_html( $readme ) );
-			$readme = explode( '== Changelog ==', $readme );
-			$readme = end( $readme );
-
-			$readme = preg_replace( '/`(.*?)`/', '<code>\\1</code>', $readme );
-			$readme = preg_replace( '/[\040]\*\*(.*?)\*\*/', ' <strong>\\1</strong>', $readme );
-			$readme = preg_replace( '/[\040]\*(.*?)\*/', ' <em>\\1</em>', $readme );
-			$readme = preg_replace( '/= (.*?) =/', '<h4>\\1</h4>', $readme );
-			$readme = preg_replace( '/\[(.*?)\]\((.*?)\)/', '<a href="\\2">\\1</a>', $readme );
+			$readme = file_get_contents($file);
+			$readme = nl2br(esc_html($readme));
+			$readme = explode('== Changelog ==', $readme);
+			$readme = end($readme);
+
+			$readme = preg_replace('/`(.*?)`/', '<code>\\1</code>', $readme);
+			$readme = preg_replace('/[\040]\*\*(.*?)\*\*/', ' <strong>\\1</strong>', $readme);
+			$readme = preg_replace('/[\040]\*(.*?)\*/', ' <em>\\1</em>', $readme);
+			$readme = preg_replace('/= (.*?) =/', '<h4>\\1</h4>', $readme);
+			$readme = preg_replace('/\[(.*?)\]\((.*?)\)/', '<a href="\\2">\\1</a>', $readme);
 		}
 
 		return $readme;
@@ -515,21 +515,21 @@ 
 	public function contributors() {
 		$contributors = $this->get_contributors();
 
-		if ( empty( $contributors ) ) {
+		if (empty($contributors)) {
 			return '';
 		}
 
 		$contributor_list = '<ul class="wp-people-group">';
 
-		foreach ( $contributors as $contributor ) {
+		foreach ($contributors as $contributor) {
 			$contributor_list .= '<li class="wp-person">';
-			$contributor_list .= sprintf( '<a href="%s" title="%s">',
-				esc_url( 'https://github.com/' . $contributor->login ),
-				esc_html( sprintf( __( 'View %s', 'give' ), $contributor->login ) )
+			$contributor_list .= sprintf('<a href="%s" title="%s">',
+				esc_url('https://github.com/'.$contributor->login),
+				esc_html(sprintf(__('View %s', 'give'), $contributor->login))
 			);
-			$contributor_list .= sprintf( '<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url( $contributor->avatar_url ), esc_html( $contributor->login ) );
+			$contributor_list .= sprintf('<img src="%s" width="64" height="64" class="gravatar" alt="%s" />', esc_url($contributor->avatar_url), esc_html($contributor->login));
 			$contributor_list .= '</a>';
-			$contributor_list .= sprintf( '<a class="web" href="%s">%s</a>', esc_url( 'https://github.com/' . $contributor->login ), esc_html( $contributor->login ) );
+			$contributor_list .= sprintf('<a class="web" href="%s">%s</a>', esc_url('https://github.com/'.$contributor->login), esc_html($contributor->login));
 			$contributor_list .= '</a>';
 			$contributor_list .= '</li>';
 		}
@@ -547,25 +547,25 @@ 
 	 * @return array $contributors List of contributors
 	 */
 	public function get_contributors() {
-		$contributors = get_transient( 'give_contributors' );
+		$contributors = get_transient('give_contributors');
 
-		if ( false !== $contributors ) {
+		if (false !== $contributors) {
 			return $contributors;
 		}
 
-		$response = wp_remote_get( 'https://api.github.com/repos/WordImpress/Give/contributors', array( 'sslverify' => false ) );
+		$response = wp_remote_get('https://api.github.com/repos/WordImpress/Give/contributors', array('sslverify' => false));
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response)) {
 			return array();
 		}
 
-		$contributors = json_decode( wp_remote_retrieve_body( $response ) );
+		$contributors = json_decode(wp_remote_retrieve_body($response));
 
-		if ( ! is_array( $contributors ) ) {
+		if ( ! is_array($contributors)) {
 			return array();
 		}
 
-		set_transient( 'give_contributors', $contributors, 3600 );
+		set_transient('give_contributors', $contributors, 3600);
 
 		return $contributors;
 	}
@@ -584,24 +584,24 @@ 
 
 
 		// Bail if no activation redirect
-		if ( ! get_transient( '_give_activation_redirect' ) ) {
+		if ( ! get_transient('_give_activation_redirect')) {
 			return;
 		}
 
 		// Delete the redirect transient
-		delete_transient( '_give_activation_redirect' );
+		delete_transient('_give_activation_redirect');
 
 		// Bail if activating from network, or bulk
-		if ( is_network_admin() || isset( $_GET['activate-multi'] ) ) {
+		if (is_network_admin() || isset($_GET['activate-multi'])) {
 			return;
 		}
 
-		$upgrade = get_option( 'give_version_upgraded_from' );
+		$upgrade = get_option('give_version_upgraded_from');
 
-		if ( ! $upgrade ) { // First time install
-			wp_safe_redirect( admin_url( 'index.php?page=give-about' ) );
+		if ( ! $upgrade) { // First time install
+			wp_safe_redirect(admin_url('index.php?page=give-about'));
 			exit;
-		} elseif( isset( $give_options['disable_welcome'] ) ) { // Welcome is disabled in settings
+		} elseif (isset($give_options['disable_welcome'])) { // Welcome is disabled in settings
 
 		} else { // Welcome is NOT disabled in settings
 			wp_safe_redirect(admin_url('index.php?page=give-about'));

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

Indentation +21 added lines, -21 removed lines

@@ -1,26 +1,26 @@
 <?php
 /**
- * Give API for creating Email template tags
- *
- * Email tags are wrapped in { }
- *
- * A few examples:
- *
- * {name}
- * {sitename}
- *
- *
- * To replace tags in content, use: give_do_email_tags( $content, payment_id );
- *
- * To add tags, use: give_add_email_tag( $tag, $description, $func ). Be sure to wrap give_add_email_tag()
- * in a function hooked to the 'give_email_tags' action
- *
- * @package     Give
- * @subpackage  Emails
- * @copyright   Copyright (c) 2015, WordImpress
- * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
- * @since       1.0
- */
+	 * Give API for creating Email template tags
+	 *
+	 * Email tags are wrapped in { }
+	 *
+	 * A few examples:
+	 *
+	 * {name}
+	 * {sitename}
+	 *
+	 *
+	 * To replace tags in content, use: give_do_email_tags( $content, payment_id );
+	 *
+	 * To add tags, use: give_add_email_tag( $tag, $description, $func ). Be sure to wrap give_add_email_tag()
+	 * in a function hooked to the 'give_email_tags' action
+	 *
+	 * @package     Give
+	 * @subpackage  Emails
+	 * @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' ) ) {

Doc Comments +2 added lines, -1 removed lines

@@ -50,6 +50,7 @@ 
 	 *
 	 * @param string   $tag  Email tag to be replace in email
 	 * @param callable $func Hook to run when email tag is found
+	 * @param string $description
 	 */
 	public function add( $tag, $description, $func ) {
 		if ( is_callable( $func ) ) {
@@ -477,7 +478,7 @@ 
  *
  * @param int $payment_id
  *
- * @return int payment_id
+ * @return string payment_id
  */
 function give_email_tag_payment_id( $payment_id ) {
 	return give_get_payment_number( $payment_id );

Spacing +89 added lines, -89 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -51,9 +51,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
@@ -68,8 +68,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]);
 	}
 
 	/**
@@ -81,8 +81,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);
 	}
 
 	/**
@@ -106,16 +106,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;
 
@@ -131,17 +131,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);
 	}
 
 }
@@ -155,8 +155,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);
 }
 
 /**
@@ -166,8 +166,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);
 }
 
 /**
@@ -179,8 +179,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);
 }
 
 /**
@@ -209,13 +209,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/>';
 
 		}
 
@@ -235,13 +235,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;
@@ -253,10 +253,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
@@ -269,82 +269,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');
 
 
 /**
@@ -355,12 +355,12 @@ 
  *
  * @return string name
  */
-function give_email_tag_first_name( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_first_name($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['name'];
 }
@@ -373,12 +373,12 @@ 
  *
  * @return string fullname
  */
-function give_email_tag_fullname( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_fullname($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['fullname'];
 }
@@ -391,12 +391,12 @@ 
  *
  * @return string username
  */
-function give_email_tag_username( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	if ( empty( $payment_data['user_info'] ) ) {
+function give_email_tag_username($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	if (empty($payment_data['user_info'])) {
 		return '';
 	}
-	$email_name = give_get_email_names( $payment_data['user_info'] );
+	$email_name = give_get_email_names($payment_data['user_info']);
 
 	return $email_name['username'];
 }
@@ -409,8 +409,8 @@ 
  *
  * @return string user_email
  */
-function give_email_tag_user_email( $payment_id ) {
-	return give_get_payment_user_email( $payment_id );
+function give_email_tag_user_email($payment_id) {
+	return give_get_payment_user_email($payment_id);
 }
 
 /**
@@ -421,10 +421,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'    => '',
@@ -433,11 +433,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;
@@ -451,10 +451,10 @@ 
  *
  * @return string date
  */
-function give_email_tag_date( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
+function give_email_tag_date($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
 
-	return date_i18n( get_option( 'date_format' ), strtotime( $payment_data['date'] ) );
+	return date_i18n(get_option('date_format'), strtotime($payment_data['date']));
 }
 
 /**
@@ -465,10 +465,10 @@ 
  *
  * @return string price
  */
-function give_email_tag_price( $payment_id ) {
-	$price = give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ), give_get_payment_currency_code( $payment_id ) );
+function give_email_tag_price($payment_id) {
+	$price = give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)), give_get_payment_currency_code($payment_id));
 
-	return html_entity_decode( $price, ENT_COMPAT, 'UTF-8' );
+	return html_entity_decode($price, ENT_COMPAT, 'UTF-8');
 }
 
 /**
@@ -479,8 +479,8 @@ 
  *
  * @return int payment_id
  */
-function give_email_tag_payment_id( $payment_id ) {
-	return give_get_payment_number( $payment_id );
+function give_email_tag_payment_id($payment_id) {
+	return give_get_payment_number($payment_id);
 }
 
 /**
@@ -491,8 +491,8 @@ 
  *
  * @return string receipt_id
  */
-function give_email_tag_receipt_id( $payment_id ) {
-	return give_get_payment_key( $payment_id );
+function give_email_tag_receipt_id($payment_id) {
+	return give_get_payment_key($payment_id);
 }
 
 /**
@@ -503,9 +503,9 @@ 
  *
  * @return string $form_title
  */
-function give_email_tag_donation( $payment_id ) {
-	$payment_data = give_get_payment_meta( $payment_id );
-	$form_title   = ( ! empty( $payment_data['form_title'] ) ? $payment_data['form_title'] : __( 'There was an error retrieving this donation title', 'give' ) );
+function give_email_tag_donation($payment_id) {
+	$payment_data = give_get_payment_meta($payment_id);
+	$form_title   = ( ! empty($payment_data['form_title']) ? $payment_data['form_title'] : __('There was an error retrieving this donation title', 'give'));
 
 	return $form_title;
 }
@@ -518,8 +518,8 @@ 
  *
  * @return string gateway
  */
-function give_email_tag_payment_method( $payment_id ) {
-	return give_get_gateway_checkout_label( give_get_payment_gateway( $payment_id ) );
+function give_email_tag_payment_method($payment_id) {
+	return give_get_gateway_checkout_label(give_get_payment_gateway($payment_id));
 }
 
 /**
@@ -530,8 +530,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);
 }
 
 /**
@@ -543,15 +543,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 . '">', '</a>' );
+	), home_url()));
+	$formatted = sprintf(__('%1$sView it in your browser.%2$s', 'give'), '<a href="'.$receipt_url.'">', '</a>');
 
-	if(give_get_option('email_template') !== 'none') {
+	if (give_get_option('email_template') !== 'none') {
 		return $formatted;
 	} else {
 		return $receipt_url;