WordImpress / Give

includes/class-give-gravatars.php

Spacing +95 added lines, -95 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -62,50 +62,50 @@ 
 	 *
 	 * @return bool If the gravatar exists or not
 	 */
-	public function validate_gravatar( $id_or_email ) {
+	public 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;
@@ -122,19 +122,19 @@ 
 	 *
 	 * @return array        IDs if logs, false otherwise
 	 */
-	public function get_log_ids( $form_id = '' ) {
+	public 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) {
 			$log_ids = array();
 
 			// make an array with all the donor IDs
-			foreach ( $logs as $log ) {
+			foreach ($logs as $log) {
 				$log_ids[] = $log->ID;
 			}
 
@@ -155,51 +155,51 @@ 
 	 *
 	 * @return mixed
 	 */
-	public function get_payment_ids( $form_id = '' ) {
+	public function get_payment_ids($form_id = '') {
 
 		$give_options = give_get_settings();
 
-		$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 donated 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_donors_gravatars_has_gravatar_account'] ) ) {
-					if ( ! $this->validate_gravatar( $email ) ) {
+				if (isset ($give_options['give_donors_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);
 
 			}
 
 			$unique_ids = array();
 
 			// 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_donors_gravatars_random_gravatars'] ) ) {
-				shuffle( $unique_ids );
+			if (isset($give_options['give_donors_gravatars_random_gravatars'])) {
+				shuffle($unique_ids);
 			}
 
 			// return our unique IDs
@@ -220,22 +220,22 @@ 
 	 *
 	 * @return string
 	 */
-	public function gravatars( $form_id = false, $title = '' ) {
+	public 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);
 
 		$give_options = give_get_settings();
 
 		// return if no ID
-		if ( ! $form_id ) {
+		if ( ! $form_id) {
 			return;
 		}
 
 		// minimum amount of donations 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_donors_gravatars_min_purchases_required'] ) && '' != $give_options['give_donors_gravatars_min_purchases_required'] ) {
-			if ( ! ( count( $payment_ids ) >= $give_options['give_donors_gravatars_min_purchases_required'] ) ) {
+		if (isset($give_options['give_donors_gravatars_min_purchases_required']) && '' != $give_options['give_donors_gravatars_min_purchases_required']) {
+			if ( ! (count($payment_ids) >= $give_options['give_donors_gravatars_min_purchases_required'])) {
 				return;
 			}
 		}
@@ -246,51 +246,51 @@ 
 		echo '<div id="give-purchase-gravatars">';
 
 
-		if ( isset ( $title ) ) {
+		if (isset ($title)) {
 
-			if ( $title ) {
-				echo apply_filters( 'give_donors_gravatars_title', '<h3 class="give-gravatars-title">' . esc_attr( $title ) . '</h3>' );
-			} elseif ( isset( $give_options['give_donors_gravatars_heading'] ) ) {
-				echo apply_filters( 'give_donors_gravatars_title', '<h3 class="give-gravatars-title">' . esc_attr( $give_options['give_donors_gravatars_heading'] ) . '</h2>' );
+			if ($title) {
+				echo apply_filters('give_donors_gravatars_title', '<h3 class="give-gravatars-title">'.esc_attr($title).'</h3>');
+			} elseif (isset($give_options['give_donors_gravatars_heading'])) {
+				echo apply_filters('give_donors_gravatars_title', '<h3 class="give-gravatars-title">'.esc_attr($give_options['give_donors_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_donors_gravatars_maximum_number'] ) && '' != $give_options['give_donors_gravatars_maximum_number'] && $i == $give_options['give_donors_gravatars_maximum_number'] ) {
+				if (isset($give_options['give_donors_gravatars_maximum_number']) && '' != $give_options['give_donors_gravatars_maximum_number'] && $i == $give_options['give_donors_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_donors_gravatars_gravatar_size'] ) ? apply_filters( 'give_donors_gravatars_gravatar_size', $give_options['give_donors_gravatars_gravatar_size'] ) : '';
+				$size = isset($give_options['give_donors_gravatars_gravatar_size']) ? apply_filters('give_donors_gravatars_gravatar_size', $give_options['give_donors_gravatars_gravatar_size']) : '';
 
 				// default image
-				$default_image = apply_filters( 'give_donors_gravatars_gravatar_default_image', false );
+				$default_image = apply_filters('give_donors_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
 		}
@@ -299,7 +299,7 @@ 
 		echo '</ul>';
 		echo '</div>';
 
-		return apply_filters( 'give_donors_gravatars', ob_get_clean() );
+		return apply_filters('give_donors_gravatars', ob_get_clean());
 	}
 
 	/**
@@ -311,7 +311,7 @@ 
 	 * @return void
 	 */
 	public function register_widget() {
-		register_widget( 'Give_Donors_Gravatars_Widget' );
+		register_widget('Give_Donors_Gravatars_Widget');
 	}
 
 	/**
@@ -327,19 +327,19 @@ 
 	 *
 	 * @todo   Set the ID to get_the_ID() if ID parameter is not passed through. Otherwise it will incorrectly get other gravatars
 	 */
-	public function shortcode( $atts, $content = null ) {
+	public function shortcode($atts, $content = null) {
 
-		$atts = shortcode_atts( array(
+		$atts = shortcode_atts(array(
 			'id'    => '',
 			'title' => ''
-		), $atts, 'give_donors_gravatars' );
+		), $atts, 'give_donors_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;
 
@@ -355,56 +355,56 @@ 
 	 *
 	 * @return array           Gravatar settings.
 	 */
-	public function settings( $settings ) {
+	public function settings($settings) {
 
 		$give_gravatar_settings = array(
 			array(
-				'name' => esc_html__( 'Donator Gravatars', 'give' ),
+				'name' => esc_html__('Donator Gravatars', 'give'),
 				'desc' => '<hr>',
 				'id'   => 'give_title',
 				'type' => 'give_title'
 			),
 			array(
-				'name' => esc_html__( 'Heading', 'give' ),
-				'desc' => esc_html__( 'The heading to display above the Gravatars.', 'give' ),
+				'name' => esc_html__('Heading', 'give'),
+				'desc' => esc_html__('The heading to display above the Gravatars.', 'give'),
 				'type' => 'text',
 				'id'   => 'give_donors_gravatars_heading'
 			),
 			array(
-				'name'    => esc_html__( 'Gravatar Size', 'give' ),
-				'desc'    => esc_html__( 'The size of each Gravatar in pixels (512px maximum).', 'give' ),
+				'name'    => esc_html__('Gravatar Size', 'give'),
+				'desc'    => esc_html__('The size of each Gravatar in pixels (512px maximum).', 'give'),
 				'type'    => 'text_small',
 				'id'      => 'give_donors_gravatars_gravatar_size',
 				'default' => '64'
 			),
 			array(
-				'name' => esc_html__( 'Minimum Unique Donations Required', 'give' ),
-				'desc' => esc_html__( 'The minimum number of unique donations a form must have before the Gravatars are shown. Leave blank for no minimum.', 'give' ),
+				'name' => esc_html__('Minimum Unique Donations Required', 'give'),
+				'desc' => esc_html__('The minimum number of unique donations a form must have before the Gravatars are shown. Leave blank for no minimum.', 'give'),
 				'type' => 'text_small',
 				'id'   => 'give_donors_gravatars_min_purchases_required',
 			),
 			array(
-				'name'    => esc_html__( 'Maximum Gravatars To Show', 'give' ),
-				'desc'    => esc_html__( 'The maximum number of gravatars to show. Leave blank for no limit.', 'give' ),
+				'name'    => esc_html__('Maximum Gravatars To Show', 'give'),
+				'desc'    => esc_html__('The maximum number of gravatars to show. Leave blank for no limit.', 'give'),
 				'type'    => 'text',
 				'id'      => 'give_donors_gravatars_maximum_number',
 				'default' => '20',
 			),
 			array(
-				'name' => esc_html__( 'Gravatar Visibility', 'give' ),
-				'desc' => esc_html__( 'Show only donors with a Gravatar account.', 'give' ),
+				'name' => esc_html__('Gravatar Visibility', 'give'),
+				'desc' => esc_html__('Show only donors with a Gravatar account.', 'give'),
 				'id'   => 'give_donors_gravatars_has_gravatar_account',
 				'type' => 'checkbox',
 			),
 			array(
-				'name' => esc_html__( 'Randomize Gravatars', 'give' ),
-				'desc' => esc_html__( 'Randomize the Gravatars.', 'give' ),
+				'name' => esc_html__('Randomize Gravatars', 'give'),
+				'desc' => esc_html__('Randomize the Gravatars.', 'give'),
 				'id'   => 'give_donors_gravatars_random_gravatars',
 				'type' => 'checkbox',
 			),
 		);
 
-		return array_merge( $settings, $give_gravatar_settings );
+		return array_merge($settings, $give_gravatar_settings);
 	}
 
 }
@@ -430,7 +430,7 @@ 
 		// widget settings
 		$widget_ops = array(
 			'classname'   => 'give-donors-gravatars',
-			'description' => esc_html__( 'Displays gravatars of people who have donated using your your form. Will only show on the single form page.', 'give' ),
+			'description' => esc_html__('Displays gravatars of people who have donated using your your form. Will only show on the single form page.', 'give'),
 		);
 
 		// widget control settings
@@ -443,7 +443,7 @@ 
 		// create the widget
 		parent::__construct(
 			'give_donors_gravatars_widget',
-			esc_html__( 'Give Donors Gravatars', 'give' ),
+			esc_html__('Give Donors Gravatars', 'give'),
 			$widget_ops,
 			$control_ops
 		);
@@ -463,29 +463,29 @@ 
 	 *
 	 * @return void
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 
 		//@TODO: Don't extract it!!!
-		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_Donors_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;
@@ -505,11 +505,11 @@ 
 	 *
 	 * @return array Updated settings to save.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public 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;
 
@@ -527,19 +527,19 @@ 
 	 *
 	 * @return void
 	 */
-	public function form( $instance ) {
+	public 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 esc_html_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 esc_html_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>
 
 		<?php

includes/admin/reporting/class-sales-logs-list-table.php

Spacing +75 added lines, -75 removed lines

@@ -9,13 +9,13 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -44,13 +44,13 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
-		add_action( 'give_log_view_actions', array( $this, 'give_forms_filter' ) );
+		add_action('give_log_view_actions', array($this, 'give_forms_filter'));
 	}
 
 	/**
@@ -64,37 +64,37 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
+	public function column_default($item, $column_name) {
 
-		$payment = give_get_payment_by( 'id', $item['payment_id'] );
+		$payment = give_get_payment_by('id', $item['payment_id']);
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'form' :
-				return '<a href="' . esc_url( add_query_arg( 'form', $item[ $column_name ] ) ) . '" >' . get_the_title( $item[ $column_name ] ) . '</a>';
+				return '<a href="'.esc_url(add_query_arg('form', $item[$column_name])).'" >'.get_the_title($item[$column_name]).'</a>';
 
 			case 'user_id' :
-				return '<a href="' .
-				       admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . ( ! empty( $item['user_id'] ) ? urlencode( $item['user_id'] ) : give_get_payment_user_email( $item['payment_id'] ) ) ) .
-				       '">' . $item['user_name'] . '</a>';
+				return '<a href="'.
+				       admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.( ! empty($item['user_id']) ? urlencode($item['user_id']) : give_get_payment_user_email($item['payment_id']))).
+				       '">'.$item['user_name'].'</a>';
 
 			case 'amount' :
-				return give_currency_filter( give_format_amount( $item['amount'] ) );
+				return give_currency_filter(give_format_amount($item['amount']));
 
 			case 'status' :
 
-				$value = '<div class="give-donation-status status-' . sanitize_title( give_get_payment_status( $payment, true ) ) . '"><span class="give-donation-status-icon"></span> ' . give_get_payment_status( $payment, true ) . '</div>';
+				$value = '<div class="give-donation-status status-'.sanitize_title(give_get_payment_status($payment, true)).'"><span class="give-donation-status-icon"></span> '.give_get_payment_status($payment, true).'</div>';
 
-				if ( $payment->mode == 'test' ) {
-					$value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="' . esc_attr__( 'This donation was made in test mode.', 'give' ) . '">' . esc_html__( 'Test', 'give' ) . '</span>';
+				if ($payment->mode == 'test') {
+					$value .= ' <span class="give-item-label give-item-label-orange give-test-mode-transactions-label" data-tooltip="'.esc_attr__('This donation was made in test mode.', 'give').'">'.esc_html__('Test', 'give').'</span>';
 				}
 
 				return $value;
 
 			case 'payment_id' :
-				return '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id=' . $item['payment_id'] ) . '">' . give_get_payment_number( $item['payment_id'] ) . '</a>';
+				return '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-payment-history&view=view-order-details&id='.$item['payment_id']).'">'.give_get_payment_number($item['payment_id']).'</a>';
 
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -107,13 +107,13 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'ID'         => esc_html__( 'Log ID', 'give' ),
-			'user_id'    => esc_html__( 'Donor', 'give' ),
-			'form'       => esc_html__( 'Form', 'give' ),
-			'amount'     => esc_html__( 'Donation Amount', 'give' ),
-			'status'     => esc_html__( 'Status', 'give' ),
-			'payment_id' => esc_html__( 'Transaction ID', 'give' ),
-			'date'       => esc_html__( 'Date', 'give' )
+			'ID'         => esc_html__('Log ID', 'give'),
+			'user_id'    => esc_html__('Donor', 'give'),
+			'form'       => esc_html__('Form', 'give'),
+			'amount'     => esc_html__('Donation Amount', 'give'),
+			'status'     => esc_html__('Status', 'give'),
+			'payment_id' => esc_html__('Transaction ID', 'give'),
+			'date'       => esc_html__('Date', 'give')
 		);
 
 		return $columns;
@@ -127,7 +127,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 	/**
@@ -138,7 +138,7 @@ 
 	 * @return mixed int If User ID, string If Email/Login
 	 */
 	public function get_filtered_user() {
-		return isset( $_GET['user'] ) ? absint( $_GET['user'] ) : false;
+		return isset($_GET['user']) ? absint($_GET['user']) : false;
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 * @return int Download ID
 	 */
 	public function get_filtered_give_form() {
-		return ! empty( $_GET['form'] ) ? absint( $_GET['form'] ) : false;
+		return ! empty($_GET['form']) ? absint($_GET['form']) : false;
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 	 * @return mixed string If search is present, false otherwise
 	 */
 	public function get_search() {
-		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;
+		return ! empty($_GET['s']) ? urldecode(trim($_GET['s'])) : false;
 	}
 
 
@@ -176,20 +176,20 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' === $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' === $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav <?php echo esc_attr($which); ?>">
 
 			<div class="alignleft actions bulkactions">
-				<?php $this->bulk_actions( $which ); ?>
+				<?php $this->bulk_actions($which); ?>
 			</div>
 			<?php
-			$this->extra_tablenav( $which );
-			$this->pagination( $which );
+			$this->extra_tablenav($which);
+			$this->pagination($which);
 			?>
 
 			<br class="clear"/>
@@ -212,7 +212,7 @@ 
 
 		$meta_query = array();
 
-		if ( $user ) {
+		if ($user) {
 			// Show only logs from a specific user
 			$meta_query[] = array(
 				'key'   => '_give_log_user_id',
@@ -221,8 +221,8 @@ 
 		}
 
 		$search = $this->get_search();
-		if ( $search ) {
-			if ( is_email( $search ) ) {
+		if ($search) {
+			if (is_email($search)) {
 				// This is an email search. We use this to ensure it works for guest users and logged-in users
 				$key     = '_give_log_user_info';
 				$compare = 'LIKE';
@@ -231,32 +231,32 @@ 
 				$key     = '_give_log_user_id';
 				$compare = 'LIKE';
 
-				if ( ! is_numeric( $search ) ) {
+				if ( ! is_numeric($search)) {
 					// Searching for user by username
-					$user = get_user_by( 'login', $search );
+					$user = get_user_by('login', $search);
 
-					if ( $user ) {
+					if ($user) {
 						// Found one, set meta value to user's ID
 						$search = $user->ID;
 					} else {
 						// No user found so let's do a real search query
-						$users = new WP_User_Query( array(
+						$users = new WP_User_Query(array(
 							'search'         => $search,
-							'search_columns' => array( 'user_url', 'user_nicename' ),
+							'search_columns' => array('user_url', 'user_nicename'),
 							'number'         => 1,
 							'fields'         => 'ids'
-						) );
+						));
 
 						$found_user = $users->get_results();
 
-						if ( $found_user ) {
+						if ($found_user) {
 							$search = $found_user[0];
 						}
 					}
 				}
 			}
 
-			if ( ! $this->file_search ) {
+			if ( ! $this->file_search) {
 				// Meta query only works for non file name searche
 				$meta_query[] = array(
 					'key'     => $key,
@@ -277,7 +277,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	function bulk_actions( $which = '' ) {
+	function bulk_actions($which = '') {
 		give_log_views();
 	}
 
@@ -289,22 +289,22 @@ 
 	 * @return void
 	 */
 	public function give_forms_filter() {
-		$give_forms = get_posts( array(
+		$give_forms = get_posts(array(
 			'post_type'              => 'give_forms',
 			'post_status'            => 'any',
-			'posts_per_page'         => - 1,
+			'posts_per_page'         => -1,
 			'orderby'                => 'title',
 			'order'                  => 'ASC',
 			'fields'                 => 'ids',
 			'update_post_meta_cache' => false,
 			'update_post_term_cache' => false
-		) );
+		));
 
-		if ( $give_forms ) {
+		if ($give_forms) {
 			echo '<select name="form" id="give-log-form-filter">';
-			echo '<option value="0">' . esc_html__( 'All', 'give' ) . '</option>';
-			foreach ( $give_forms as $form ) {
-				echo '<option value="' . $form . '"' . selected( $form, $this->get_filtered_give_form() ) . '>' . esc_html( get_the_title( $form ) ) . '</option>';
+			echo '<option value="0">'.esc_html__('All', 'give').'</option>';
+			foreach ($give_forms as $form) {
+				echo '<option value="'.$form.'"'.selected($form, $this->get_filtered_give_form()).'>'.esc_html(get_the_title($form)).'</option>';
 			}
 			echo '</select>';
 		}
@@ -322,11 +322,11 @@ 
 		global $give_logs;
 
 		// Prevent the queries from getting cached. Without this there are occasional memory issues for some installs
-		wp_suspend_cache_addition( true );
+		wp_suspend_cache_addition(true);
 
 		$logs_data = array();
 		$paged     = $this->get_paged();
-		$give_form = empty( $_GET['s'] ) ? $this->get_filtered_give_form() : null;
+		$give_form = empty($_GET['s']) ? $this->get_filtered_give_form() : null;
 		$user      = $this->get_filtered_user();
 
 		$log_query = array(
@@ -336,26 +336,26 @@ 
 			'meta_query'  => $this->get_meta_query()
 		);
 
-		$logs = $give_logs->get_connected_logs( $log_query );
+		$logs = $give_logs->get_connected_logs($log_query);
 
-		if ( $logs ) {
-			foreach ( $logs as $log ) {
-				$payment_id = get_post_meta( $log->ID, '_give_log_payment_id', true );
+		if ($logs) {
+			foreach ($logs as $log) {
+				$payment_id = get_post_meta($log->ID, '_give_log_payment_id', true);
 
 				// Make sure this payment hasn't been deleted
-				if ( get_post( $payment_id ) ) :
-					$user_info      = give_get_payment_meta_user_info( $payment_id );
-					$payment_meta   = give_get_payment_meta( $payment_id );
-					$payment_amount = give_get_payment_amount( $payment_id );
+				if (get_post($payment_id)) :
+					$user_info      = give_get_payment_meta_user_info($payment_id);
+					$payment_meta   = give_get_payment_meta($payment_id);
+					$payment_amount = give_get_payment_amount($payment_id);
 
 					$logs_data[] = array(
-						'ID'         => '<span class="give-item-label give-item-label-gray">' . $log->ID . '</span>',
+						'ID'         => '<span class="give-item-label give-item-label-gray">'.$log->ID.'</span>',
 						'payment_id' => $payment_id,
 						'form'       => $log->post_parent,
 						'amount'     => $payment_amount,
 						'user_id'    => $user_info['id'],
-						'user_name'  => $user_info['first_name'] . ' ' . $user_info['last_name'],
-						'date'       => get_post_field( 'post_date', $payment_id )
+						'user_name'  => $user_info['first_name'].' '.$user_info['last_name'],
+						'date'       => get_post_field('post_date', $payment_id)
 					);
 
 				endif;
@@ -384,15 +384,15 @@ 
 		$columns               = $this->get_columns();
 		$hidden                = array();
 		$sortable              = $this->get_sortable_columns();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 		$current_page          = $this->get_pagenum();
 		$this->items           = $this->get_logs();
-		$total_items           = $give_logs->get_log_count( $this->get_filtered_give_form(), 'sale', $this->get_meta_query() );
+		$total_items           = $give_logs->get_log_count($this->get_filtered_give_form(), 'sale', $this->get_meta_query());
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $total_items / $this->per_page )
+				'total_pages' => ceil($total_items / $this->per_page)
 			)
 		);
 	}

includes/admin/reporting/reports.php

Spacing +108 added lines, -108 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -29,32 +29,32 @@ 
  * @return void
  */
 function give_reports_page() {
-	$current_page = admin_url( 'edit.php?post_type=give_forms&page=give-reports' );
-	$active_tab   = isset( $_GET['tab'] ) ? $_GET['tab'] : 'reports';
+	$current_page = admin_url('edit.php?post_type=give_forms&page=give-reports');
+	$active_tab   = isset($_GET['tab']) ? $_GET['tab'] : 'reports';
 	?>
 	<div class="wrap">
 
 		<h1 class="screen-reader-text"><?php echo get_admin_page_title(); ?></h1>
 
 		<h2 class="nav-tab-wrapper">
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'reports',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Reports', 'give' ); ?></a>
-			<?php if ( current_user_can( 'export_give_reports' ) ) { ?>
-				<a href="<?php echo esc_url( add_query_arg( array(
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'reports' ? 'nav-tab-active' : ''; ?>"><?php esc_html_e('Reports', 'give'); ?></a>
+			<?php if (current_user_can('export_give_reports')) { ?>
+				<a href="<?php echo esc_url(add_query_arg(array(
 					'tab'              => 'export',
 					'settings-updated' => false
-				), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Export', 'give' ); ?></a>
+				), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'export' ? 'nav-tab-active' : ''; ?>"><?php esc_html_e('Export', 'give'); ?></a>
 			<?php } ?>
-			<a href="<?php echo esc_url( add_query_arg( array(
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'logs',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Logs', 'give' ); ?></a>
-			<a href="<?php echo esc_url( add_query_arg( array(
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'logs' ? 'nav-tab-active' : ''; ?>"><?php esc_html_e('Logs', 'give'); ?></a>
+			<a href="<?php echo esc_url(add_query_arg(array(
 				'tab'              => 'tools',
 				'settings-updated' => false
-			), $current_page ) ); ?>" class="nav-tab <?php echo $active_tab == 'tools' ? 'nav-tab-active' : ''; ?>"><?php esc_html_e( 'Tools', 'give' ); ?></a>
+			), $current_page)); ?>" class="nav-tab <?php echo $active_tab == 'tools' ? 'nav-tab-active' : ''; ?>"><?php esc_html_e('Tools', 'give'); ?></a>
 			<?php
 			/**
 			 * Fires in the report tabs.
@@ -63,7 +63,7 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_reports_tabs' );
+			do_action('give_reports_tabs');
 			?>
 		</h2>
 
@@ -73,21 +73,21 @@ 
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_reports_page_top' );
+		do_action('give_reports_page_top');
 
 		/**
 		 * Fires the report page active tab.
 		 *
 		 * @since 1.0
 		 */
-		do_action( "give_reports_tab_{$active_tab}" );
+		do_action("give_reports_tab_{$active_tab}");
 
 		/**
 		 * Fires after the report page.
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_reports_page_bottom' );
+		do_action('give_reports_page_bottom');
 		?>
 	</div><!-- .wrap -->
 	<?php
@@ -101,13 +101,13 @@ 
  */
 function give_reports_default_views() {
 	$views = array(
-		'earnings' => esc_html__( 'Income', 'give' ),
-		'forms'    => esc_html__( 'Forms', 'give' ),
-		'donors'   => esc_html__( 'Donors', 'give' ),
-		'gateways' => esc_html__( 'Payment Methods', 'give' )
+		'earnings' => esc_html__('Income', 'give'),
+		'forms'    => esc_html__('Forms', 'give'),
+		'donors'   => esc_html__('Donors', 'give'),
+		'gateways' => esc_html__('Payment Methods', 'give')
 	);
 
-	$views = apply_filters( 'give_report_views', $views );
+	$views = apply_filters('give_report_views', $views);
 
 	return $views;
 }
@@ -123,15 +123,15 @@ 
  * @return string $view Report View
  *
  */
-function give_get_reporting_view( $default = 'earnings' ) {
+function give_get_reporting_view($default = 'earnings') {
 
-	if ( ! isset( $_GET['view'] ) || ! in_array( $_GET['view'], array_keys( give_reports_default_views() ) ) ) {
+	if ( ! isset($_GET['view']) || ! in_array($_GET['view'], array_keys(give_reports_default_views()))) {
 		$view = $default;
 	} else {
 		$view = $_GET['view'];
 	}
 
-	return apply_filters( 'give_get_reporting_view', $view );
+	return apply_filters('give_get_reporting_view', $view);
 }
 
 /**
@@ -144,7 +144,7 @@ 
 	$current_view = 'earnings';
 	$views        = give_reports_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $views)) {
 		$current_view = $_GET['view'];
 	}
 
@@ -153,10 +153,10 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( "give_reports_view_{$current_view}" );
+	do_action("give_reports_view_{$current_view}");
 }
 
-add_action( 'give_reports_tab_reports', 'give_reports_tab_reports' );
+add_action('give_reports_tab_reports', 'give_reports_tab_reports');
 
 /**
  * Renders the Reports Page Views Drop Downs
@@ -166,19 +166,19 @@ 
  */
 function give_report_views() {
 	$views        = give_reports_default_views();
-	$current_view = isset( $_GET['view'] ) ? $_GET['view'] : 'earnings';
+	$current_view = isset($_GET['view']) ? $_GET['view'] : 'earnings';
 	/**
 	 * Fires before the report page actions form.
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_report_view_actions_before' );
+	do_action('give_report_view_actions_before');
 	?>
 	<form id="give-reports-filter" method="get">
 		<select id="give-reports-view" name="view">
-			<option value="-1"><?php esc_html_e( 'Report Type', 'give' ); ?></option>
-			<?php foreach ( $views as $view_id => $label ) : ?>
-				<option value="<?php echo esc_attr( $view_id ); ?>" <?php selected( $view_id, $current_view ); ?>><?php echo $label; ?></option>
+			<option value="-1"><?php esc_html_e('Report Type', 'give'); ?></option>
+			<?php foreach ($views as $view_id => $label) : ?>
+				<option value="<?php echo esc_attr($view_id); ?>" <?php selected($view_id, $current_view); ?>><?php echo $label; ?></option>
 			<?php endforeach; ?>
 		</select>
 
@@ -190,12 +190,12 @@ 
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_report_view_actions' );
+		do_action('give_report_view_actions');
 		?>
 
 		<input type="hidden" name="post_type" value="give_forms"/>
 		<input type="hidden" name="page" value="give-reports"/>
-		<?php submit_button( esc_html__( 'Show', 'give' ), 'secondary', 'submit', false ); ?>
+		<?php submit_button(esc_html__('Show', 'give'), 'secondary', 'submit', false); ?>
 	</form>
 	<?php
 	/**
@@ -203,7 +203,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_report_view_actions_after' );
+	do_action('give_report_view_actions_after');
 }
 
 /**
@@ -216,18 +216,18 @@ 
  */
 function give_reports_forms_table() {
 
-	if ( isset( $_GET['form-id'] ) ) {
+	if (isset($_GET['form-id'])) {
 		return;
 	}
 
-	include( dirname( __FILE__ ) . '/class-form-reports-table.php' );
+	include(dirname(__FILE__).'/class-form-reports-table.php');
 
 	$give_table = new Give_Form_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_forms_table' );
+add_action('give_reports_view_forms', 'give_reports_forms_table');
 
 /**
  * Renders the detailed report for a specific give form
@@ -236,7 +236,7 @@ 
  * @return void
  */
 function give_reports_form_details() {
-	if ( ! isset( $_GET['form-id'] ) ) {
+	if ( ! isset($_GET['form-id'])) {
 		return;
 	}
 	?>
@@ -244,14 +244,14 @@ 
 		<div class="actions bulkactions">
 			<?php give_report_views(); ?>
 			&nbsp;
-			<button onclick="history.go(-1);" class="button-secondary"><?php esc_html_e( 'Go Back', 'give' ); ?></button>
+			<button onclick="history.go(-1);" class="button-secondary"><?php esc_html_e('Go Back', 'give'); ?></button>
 		</div>
 	</div>
 	<?php
-	give_reports_graph_of_form( absint( $_GET['form-id'] ) );
+	give_reports_graph_of_form(absint($_GET['form-id']));
 }
 
-add_action( 'give_reports_view_forms', 'give_reports_form_details' );
+add_action('give_reports_view_forms', 'give_reports_form_details');
 
 /**
  * Renders the Reports Donors Table
@@ -262,7 +262,7 @@ 
  * @return void
  */
 function give_reports_donors_table() {
-	include( dirname( __FILE__ ) . '/class-donor-reports-table.php' );
+	include(dirname(__FILE__).'/class-donor-reports-table.php');
 
 	$give_table = new Give_Donor_Reports_Table();
 	$give_table->prepare_items();
@@ -274,11 +274,11 @@ 
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_logs_donors_table_top' );
+		do_action('give_logs_donors_table_top');
 		?>
-		<form id="give-donors-filter" method="get" action="<?php echo admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=donors' ); ?>">
+		<form id="give-donors-filter" method="get" action="<?php echo admin_url('edit.php?post_type=give_forms&page=give-reports&view=donors'); ?>">
 			<?php
-			$give_table->search_box( esc_html__( 'Search', 'give' ), 'give-donors' );
+			$give_table->search_box(esc_html__('Search', 'give'), 'give-donors');
 			$give_table->display();
 			?>
 			<input type="hidden" name="post_type" value="give_forms"/>
@@ -291,13 +291,13 @@ 
 		 *
 		 * @since 1.0
 		 */
-		do_action( 'give_logs_donors_table_bottom' );
+		do_action('give_logs_donors_table_bottom');
 		?>
 	</div>
 	<?php
 }
 
-add_action( 'give_reports_view_donors', 'give_reports_donors_table' );
+add_action('give_reports_view_donors', 'give_reports_donors_table');
 
 
 /**
@@ -309,14 +309,14 @@ 
  * @return void
  */
 function give_reports_gateways_table() {
-	include( dirname( __FILE__ ) . '/class-gateways-reports-table.php' );
+	include(dirname(__FILE__).'/class-gateways-reports-table.php');
 
 	$give_table = new Give_Gateawy_Reports_Table();
 	$give_table->prepare_items();
 	$give_table->display();
 }
 
-add_action( 'give_reports_view_gateways', 'give_reports_gateways_table' );
+add_action('give_reports_view_gateways', 'give_reports_gateways_table');
 
 
 /**
@@ -328,7 +328,7 @@ 
 function give_reports_earnings() {
 	?>
 	<div class="tablenav top reports-table-nav">
-		<h3 class="alignleft reports-earnings-title"><span><?php esc_html_e( 'Income Over Time', 'give' ); ?></span></h3>
+		<h3 class="alignleft reports-earnings-title"><span><?php esc_html_e('Income Over Time', 'give'); ?></span></h3>
 
 		<div class="alignright actions reports-views-wrap"><?php give_report_views(); ?></div>
 	</div>
@@ -336,7 +336,7 @@ 
 	give_reports_graph();
 }
 
-add_action( 'give_reports_view_earnings', 'give_reports_earnings' );
+add_action('give_reports_view_earnings', 'give_reports_earnings');
 
 
 /**
@@ -357,14 +357,14 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_reports_tab_export_content_top' );
+				do_action('give_reports_tab_export_content_top');
 				?>
 
 				<table class="widefat export-options-table give-table">
 					<thead>
 					<tr>
-						<th scope="col"><?php esc_html_e( 'Export Type', 'give' ); ?></th>
-						<th scope="col"><?php esc_html_e( 'Export Options', 'give' ); ?></th>
+						<th scope="col"><?php esc_html_e('Export Type', 'give'); ?></th>
+						<th scope="col"><?php esc_html_e('Export Options', 'give'); ?></th>
 					</tr>
 					</thead>
 					<tbody>
@@ -376,41 +376,41 @@ 
 					 *
 					 * @since 1.0
 					 */
-					do_action( 'give_reports_tab_export_table_top' );
+					do_action('give_reports_tab_export_table_top');
 					?>
 					<tr class="give-export-pdf-sales-earnings">
 						<td scope="row" class="row-title">
-							<h3><span><?php esc_html_e( 'Export PDF of Donations and Income', 'give' ); ?></span></h3>
-							<p><?php esc_html_e( 'Download a PDF of Donations and Income reports for all forms for the current year.', 'give' ); ?></p>
+							<h3><span><?php esc_html_e('Export PDF of Donations and Income', 'give'); ?></span></h3>
+							<p><?php esc_html_e('Download a PDF of Donations and Income reports for all forms for the current year.', 'give'); ?></p>
 						</td>
 						<td>
-							<a class="button" href="<?php echo wp_nonce_url( add_query_arg( array( 'give-action' => 'generate_pdf' ) ), 'give_generate_pdf' ); ?>"><?php esc_html_e( 'Generate PDF', 'give' ); ?></a>
+							<a class="button" href="<?php echo wp_nonce_url(add_query_arg(array('give-action' => 'generate_pdf')), 'give_generate_pdf'); ?>"><?php esc_html_e('Generate PDF', 'give'); ?></a>
 						</td>
 					</tr>
 					<tr class="alternate give-export-sales-earnings">
 						<td scope="row" class="row-title">
-							<h3><span><?php esc_html_e( 'Export Income and Donation Stats', 'give' ); ?></span></h3>
-							<p><?php esc_html_e( 'Download a CSV of income and donations over time.', 'give' ); ?></p>
+							<h3><span><?php esc_html_e('Export Income and Donation Stats', 'give'); ?></span></h3>
+							<p><?php esc_html_e('Download a CSV of income and donations over time.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post">
 								<?php
 									printf(
 										/* translators: 1: start date dropdown 2: end date dropdown */
-										esc_html__( '%1$s to %2$s', 'give' ),
-										Give()->html->year_dropdown( 'start_year' ) . ' ' . Give()->html->month_dropdown( 'start_month' ),
-										Give()->html->year_dropdown( 'end_year' )   . ' ' . Give()->html->month_dropdown( 'end_month' )
+										esc_html__('%1$s to %2$s', 'give'),
+										Give()->html->year_dropdown('start_year').' '.Give()->html->month_dropdown('start_month'),
+										Give()->html->year_dropdown('end_year').' '.Give()->html->month_dropdown('end_month')
 									);
 								?>
 								<input type="hidden" name="give-action" value="earnings_export"/>
-								<input type="submit" value="<?php esc_attr_e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+								<input type="submit" value="<?php esc_attr_e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 							</form>
 						</td>
 					</tr>
 					<tr class="give-export-payment-history">
 						<td scope="row" class="row-title">
-							<h3><span><?php esc_html_e( 'Export Donation History', 'give' ); ?></span></h3>
-							<p><?php esc_html_e( 'Download a CSV of all donations recorded.', 'give' ); ?></p>
+							<h3><span><?php esc_html_e('Export Donation History', 'give'); ?></span></h3>
+							<p><?php esc_html_e('Download a CSV of all donations recorded.', 'give'); ?></p>
 						</td>
 						<td>
 							<form id="give-export-payments" class="give-export-form" method="post">
@@ -418,29 +418,29 @@ 
 								$args = array(
 									'id'          => 'give-payment-export-start',
 									'name'        => 'start',
-									'placeholder' => esc_attr__( 'Start date', 'give' )
+									'placeholder' => esc_attr__('Start date', 'give')
 								);
-								echo Give()->html->date_field( $args ); ?>
+								echo Give()->html->date_field($args); ?>
 								<?php
 								$args = array(
 									'id'          => 'give-payment-export-end',
 									'name'        => 'end',
-									'placeholder' => esc_attr__( 'End date', 'give' )
+									'placeholder' => esc_attr__('End date', 'give')
 								);
-								echo Give()->html->date_field( $args ); ?>
+								echo Give()->html->date_field($args); ?>
 								<select name="status">
-									<option value="any"><?php esc_html_e( 'All Statuses', 'give' ); ?></option>
+									<option value="any"><?php esc_html_e('All Statuses', 'give'); ?></option>
 									<?php
 									$statuses = give_get_payment_statuses();
-									foreach ( $statuses as $status => $label ) {
-										echo '<option value="' . $status . '">' . $label . '</option>';
+									foreach ($statuses as $status => $label) {
+										echo '<option value="'.$status.'">'.$label.'</option>';
 									}
 									?>
 								</select>
-								<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+								<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 								<input type="hidden" name="give-export-class" value="Give_Batch_Payments_Export"/>
 								<span>
-									<input type="submit" value="<?php esc_attr_e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+									<input type="submit" value="<?php esc_attr_e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 									<span class="spinner"></span>
 								</span>
 							</form>
@@ -448,8 +448,8 @@ 
 					</tr>
 					<tr class="alternate give-export-donors">
 						<td scope="row" class="row-title">
-							<h3><span><?php esc_html_e( 'Export Donors in CSV', 'give' ); ?></span></h3>
-							<p><?php esc_html_e( 'Download an export of donors for all donation forms or only those who have given to a particular form.', 'give' ); ?></p>
+							<h3><span><?php esc_html_e('Export Donors in CSV', 'give'); ?></span></h3>
+							<p><?php esc_html_e('Download an export of donors for all donation forms or only those who have given to a particular form.', 'give'); ?></p>
 						</td>
 						<td>
 							<form method="post" id="give_donor_export" class="give-export-form">
@@ -460,44 +460,44 @@ 
 										'id'     => 'give_customer_export_form',
 										'chosen' => true
 									);
-									echo Give()->html->forms_dropdown( $args ); ?>
+									echo Give()->html->forms_dropdown($args); ?>
 								
-								<input type="submit" value="<?php esc_attr_e( 'Generate CSV', 'give' ); ?>" class="button-secondary"/>
+								<input type="submit" value="<?php esc_attr_e('Generate CSV', 'give'); ?>" class="button-secondary"/>
 
 								<div id="export-donor-options-wrap" class="give-clearfix">
-									<p><?php esc_html_e( 'Export Columns:', 'give' ); ?></p>
+									<p><?php esc_html_e('Export Columns:', 'give'); ?></p>
 									<ul id="give-export-option-ul">
 										<li>
-											<label for="give-export-fullname"><input type="checkbox" checked name="give_export_option[full_name]" id="give-export-fullname"><?php esc_html_e( 'Name', 'give' ); ?>
+											<label for="give-export-fullname"><input type="checkbox" checked name="give_export_option[full_name]" id="give-export-fullname"><?php esc_html_e('Name', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-email"><input type="checkbox" checked name="give_export_option[email]" id="give-export-email"><?php esc_html_e( 'Email', 'give' ); ?>
+											<label for="give-export-email"><input type="checkbox" checked name="give_export_option[email]" id="give-export-email"><?php esc_html_e('Email', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-address"><input type="checkbox" checked name="give_export_option[address]" id="give-export-address"><?php esc_html_e( 'Address', 'give' ); ?>
+											<label for="give-export-address"><input type="checkbox" checked name="give_export_option[address]" id="give-export-address"><?php esc_html_e('Address', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-userid"><input type="checkbox" checked name="give_export_option[userid]" id="give-export-userid"><?php esc_html_e( 'User ID', 'give' ); ?>
+											<label for="give-export-userid"><input type="checkbox" checked name="give_export_option[userid]" id="give-export-userid"><?php esc_html_e('User ID', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-first-donation-date"><input type="checkbox" checked name="give_export_option[date_first_donated]" id="give-export-first-donation-date"><?php esc_html_e( 'First Donation Date', 'give' ); ?>
+											<label for="give-export-first-donation-date"><input type="checkbox" checked name="give_export_option[date_first_donated]" id="give-export-first-donation-date"><?php esc_html_e('First Donation Date', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-donation-number"><input type="checkbox" checked name="give_export_option[donations]" id="give-export-donation-number"><?php esc_html_e( 'Number of Donations', 'give' ); ?>
+											<label for="give-export-donation-number"><input type="checkbox" checked name="give_export_option[donations]" id="give-export-donation-number"><?php esc_html_e('Number of Donations', 'give'); ?>
 											</label>
 										</li>
 										<li>
-											<label for="give-export-donation-sum"><input type="checkbox" checked name="give_export_option[donation_sum]" id="give-export-donation-sum"><?php esc_html_e( 'Total Donated', 'give' ); ?>
+											<label for="give-export-donation-sum"><input type="checkbox" checked name="give_export_option[donation_sum]" id="give-export-donation-sum"><?php esc_html_e('Total Donated', 'give'); ?>
 											</label>
 										</li>
 									</ul>
 								</div>
-								<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+								<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 								<input type="hidden" name="give-export-class" value="Give_Batch_Customers_Export"/>
 								<input type="hidden" name="give-action" value="email_export"/>
 							</form>
@@ -511,7 +511,7 @@ 
 					 *
 					 * @since 1.0
 					 */
-					do_action( 'give_reports_tab_export_table_bottom' );
+					do_action('give_reports_tab_export_table_bottom');
 					?>
 					</tbody>
 				</table>
@@ -522,7 +522,7 @@ 
 				 *
 				 * @since 1.0
 				 */
-				do_action( 'give_reports_tab_export_content_bottom' );
+				do_action('give_reports_tab_export_content_bottom');
 				?>
 
 			</div>
@@ -533,7 +533,7 @@ 
 	<?php
 }
 
-add_action( 'give_reports_tab_export', 'give_reports_tab_export' );
+add_action('give_reports_tab_export', 'give_reports_tab_export');
 
 /**
  * Renders the Reports page
@@ -543,12 +543,12 @@ 
  */
 function give_reports_tab_logs() {
 
-	require( GIVE_PLUGIN_DIR . 'includes/admin/reporting/logs.php' );
+	require(GIVE_PLUGIN_DIR.'includes/admin/reporting/logs.php');
 
 	$current_view = 'sales';
 	$log_views    = give_log_default_views();
 
-	if ( isset( $_GET['view'] ) && array_key_exists( $_GET['view'], $log_views ) ) {
+	if (isset($_GET['view']) && array_key_exists($_GET['view'], $log_views)) {
 		$current_view = $_GET['view'];
 	}
 
@@ -557,10 +557,10 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( "give_logs_view_{$current_view}" );
+	do_action("give_logs_view_{$current_view}");
 }
 
-add_action( 'give_reports_tab_logs', 'give_reports_tab_logs' );
+add_action('give_reports_tab_logs', 'give_reports_tab_logs');
 
 /**
  * Retrieves estimated monthly earnings and sales
@@ -570,9 +570,9 @@ 
  */
 function give_estimated_monthly_stats() {
 
-	$estimated = get_transient( 'give_estimated_monthly_stats' );
+	$estimated = get_transient('give_estimated_monthly_stats');
 
-	if ( false === $estimated ) {
+	if (false === $estimated) {
 
 		$estimated = array(
 			'earnings' => 0,
@@ -581,20 +581,20 @@ 
 
 		$stats = new Give_Payment_Stats;
 
-		$to_date_earnings = $stats->get_earnings( 0, 'this_month' );
-		$to_date_sales    = $stats->get_sales( 0, 'this_month' );
+		$to_date_earnings = $stats->get_earnings(0, 'this_month');
+		$to_date_sales    = $stats->get_sales(0, 'this_month');
 
-		$current_day   = date( 'd', current_time( 'timestamp' ) );
-		$current_month = date( 'n', current_time( 'timestamp' ) );
-		$current_year  = date( 'Y', current_time( 'timestamp' ) );
-		$days_in_month = cal_days_in_month( CAL_GREGORIAN, $current_month, $current_year );
+		$current_day   = date('d', current_time('timestamp'));
+		$current_month = date('n', current_time('timestamp'));
+		$current_year  = date('Y', current_time('timestamp'));
+		$days_in_month = cal_days_in_month(CAL_GREGORIAN, $current_month, $current_year);
 
-		$estimated['earnings'] = ( $to_date_earnings / $current_day ) * $days_in_month;
-		$estimated['sales']    = ( $to_date_sales / $current_day ) * $days_in_month;
+		$estimated['earnings'] = ($to_date_earnings / $current_day) * $days_in_month;
+		$estimated['sales']    = ($to_date_sales / $current_day) * $days_in_month;
 
 		// Cache for one day
-		set_transient( 'give_estimated_monthly_stats', $estimated, 86400 );
+		set_transient('give_estimated_monthly_stats', $estimated, 86400);
 	}
 
-	return maybe_unserialize( $estimated );
+	return maybe_unserialize($estimated);
 }

includes/admin/reporting/class-form-reports-table.php

Spacing +56 added lines, -56 removed lines

@@ -10,13 +10,13 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
 // Load WP_List_Table if not loaded
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+	require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 /**
@@ -50,13 +50,13 @@ 
 		global $status, $page;
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => give_get_forms_label_singular(),    // Singular name of the listed records
-			'plural'   => give_get_forms_label_plural(),        // Plural name of the listed records
+		parent::__construct(array(
+			'singular' => give_get_forms_label_singular(), // Singular name of the listed records
+			'plural'   => give_get_forms_label_plural(), // Plural name of the listed records
 			'ajax'     => false                        // Does this table support ajax?
-		) );
+		));
 
-		add_action( 'give_report_view_actions', array( $this, 'category_filter' ) );
+		add_action('give_report_view_actions', array($this, 'category_filter'));
 		$this->query();
 
 	}
@@ -72,18 +72,18 @@ 
 	 *
 	 * @return string Column Name
 	 */
-	public function column_default( $item, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($item, $column_name) {
+		switch ($column_name) {
 			case 'earnings' :
-				return give_currency_filter( give_format_amount( $item[ $column_name ] ) );
+				return give_currency_filter(give_format_amount($item[$column_name]));
 			case 'average_sales' :
-				return round( $item[ $column_name ] );
+				return round($item[$column_name]);
 			case 'average_earnings' :
-				return give_currency_filter( give_format_amount( $item[ $column_name ] ) );
+				return give_currency_filter(give_format_amount($item[$column_name]));
 			case 'details' :
-				return '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=forms&form-id=' . $item['ID'] ) . '">' . esc_html__( 'View Detailed Report', 'give' ) . '</a>';
+				return '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-reports&view=forms&form-id='.$item['ID']).'">'.esc_html__('View Detailed Report', 'give').'</a>';
 			default:
-				return $item[ $column_name ];
+				return $item[$column_name];
 		}
 	}
 
@@ -96,12 +96,12 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'title'            => esc_html__( 'Form', 'give' ),
-			'sales'            => esc_html__( 'Donations', 'give' ),
-			'earnings'         => esc_html__( 'Income', 'give' ),
-			'average_sales'    => esc_html__( 'Monthly Average Donations', 'give' ),
-			'average_earnings' => esc_html__( 'Monthly Average Income', 'give' ),
-			'details'          => esc_html__( 'Detailed Report', 'give' )
+			'title'            => esc_html__('Form', 'give'),
+			'sales'            => esc_html__('Donations', 'give'),
+			'earnings'         => esc_html__('Income', 'give'),
+			'average_sales'    => esc_html__('Monthly Average Donations', 'give'),
+			'average_earnings' => esc_html__('Monthly Average Income', 'give'),
+			'details'          => esc_html__('Detailed Report', 'give')
 		);
 
 		return $columns;
@@ -116,9 +116,9 @@ 
 	 */
 	public function get_sortable_columns() {
 		return array(
-			'title'    => array( 'title', true ),
-			'sales'    => array( 'sales', false ),
-			'earnings' => array( 'earnings', false ),
+			'title'    => array('title', true),
+			'sales'    => array('sales', false),
+			'earnings' => array('earnings', false),
 		);
 	}
 
@@ -130,7 +130,7 @@ 
 	 * @return int Current page number
 	 */
 	public function get_paged() {
-		return isset( $_GET['paged'] ) ? absint( $_GET['paged'] ) : 1;
+		return isset($_GET['paged']) ? absint($_GET['paged']) : 1;
 	}
 
 
@@ -142,7 +142,7 @@ 
 	 * @return int Category ID
 	 */
 	public function get_category() {
-		return isset( $_GET['category'] ) ? absint( $_GET['category'] ) : 0;
+		return isset($_GET['category']) ? absint($_GET['category']) : 0;
 	}
 
 
@@ -155,8 +155,8 @@ 
 	 */
 	public function get_total_forms() {
 		$total  = 0;
-		$counts = wp_count_posts( 'give_forms', 'readable' );
-		foreach ( $counts as $status => $count ) {
+		$counts = wp_count_posts('give_forms', 'readable');
+		foreach ($counts as $status => $count) {
 			$total += $count;
 		}
 
@@ -170,7 +170,7 @@ 
 	 * @since  1.0
 	 * @return void
 	 */
-	public function bulk_actions( $which = '' ) {
+	public function bulk_actions($which = '') {
 		// These aren't really bulk actions but this outputs the markup in the right place
 		give_report_views();
 	}
@@ -183,23 +183,23 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function display_tablenav( $which ) {
+	protected function display_tablenav($which) {
 
-		if ( 'top' == $which ) {
-			wp_nonce_field( 'bulk-' . $this->_args['plural'] );
+		if ('top' == $which) {
+			wp_nonce_field('bulk-'.$this->_args['plural']);
 		}
 		?>
-		<div class="tablenav give-clearfix <?php echo esc_attr( $which ); ?>">
+		<div class="tablenav give-clearfix <?php echo esc_attr($which); ?>">
 
-			<h3 class="alignleft reports-earnings-title"><span><?php esc_html_e( 'Donation Forms Report', 'give' ); ?></span></h3>
+			<h3 class="alignleft reports-earnings-title"><span><?php esc_html_e('Donation Forms Report', 'give'); ?></span></h3>
 
 			<div class="alignright tablenav-right">
 				<div class="actions bulkactions">
-					<?php $this->bulk_actions( $which ); ?>
+					<?php $this->bulk_actions($which); ?>
 				</div>
 				<?php
-				$this->extra_tablenav( $which );
-				$this->pagination( $which );
+				$this->extra_tablenav($which);
+				$this->pagination($which);
 				?>
 			</div>
 
@@ -219,9 +219,9 @@ 
 	 */
 	public function category_filter() {
 
-		$categories = get_terms( 'form_category' );
-		if ( $categories && ! is_wp_error( $categories ) ) {
-			echo Give()->html->category_dropdown( 'category', $this->get_category() );
+		$categories = get_terms('form_category');
+		if ($categories && ! is_wp_error($categories)) {
+			echo Give()->html->category_dropdown('category', $this->get_category());
 		}
 	}
 
@@ -235,8 +235,8 @@ 
 	 */
 	public function query() {
 
-		$orderby  = isset( $_GET['orderby'] ) ? $_GET['orderby'] : 'title';
-		$order    = isset( $_GET['order'] ) ? $_GET['order'] : 'DESC';
+		$orderby  = isset($_GET['orderby']) ? $_GET['orderby'] : 'title';
+		$order    = isset($_GET['order']) ? $_GET['order'] : 'DESC';
 		$category = $this->get_category();
 
 		$args = array(
@@ -249,7 +249,7 @@ 
 			'suppress_filters' => true
 		);
 
-		if ( ! empty( $category ) ) {
+		if ( ! empty($category)) {
 			$args['tax_query'] = array(
 				array(
 					'taxonomy' => 'form_category',
@@ -258,7 +258,7 @@ 
 			);
 		}
 
-		switch ( $orderby ) :
+		switch ($orderby) :
 			case 'title' :
 				$args['orderby'] = 'title';
 				break;
@@ -274,9 +274,9 @@ 
 				break;
 		endswitch;
 
-		$args = apply_filters( 'give_form_reports_prepare_items_args', $args, $this );
+		$args = apply_filters('give_form_reports_prepare_items_args', $args, $this);
 
-		$this->products = new WP_Query( $args );
+		$this->products = new WP_Query($args);
 
 	}
 
@@ -292,15 +292,15 @@ 
 
 		$give_forms = $this->products->posts;
 
-		if ( $give_forms ) {
-			foreach ( $give_forms as $form ) {
+		if ($give_forms) {
+			foreach ($give_forms as $form) {
 				$reports_data[] = array(
 					'ID'               => $form,
-					'title'            => get_the_title( $form ),
-					'sales'            => give_get_form_sales_stats( $form ),
-					'earnings'         => give_get_form_earnings_stats( $form ),
-					'average_sales'    => give_get_average_monthly_form_sales( $form ),
-					'average_earnings' => give_get_average_monthly_form_earnings( $form )
+					'title'            => get_the_title($form),
+					'sales'            => give_get_form_sales_stats($form),
+					'earnings'         => give_get_form_earnings_stats($form),
+					'average_sales'    => give_get_average_monthly_form_sales($form),
+					'average_earnings' => give_get_average_monthly_form_earnings($form)
 				);
 			}
 		}
@@ -328,7 +328,7 @@ 
 
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$data = $this->reports_data();
 
@@ -336,10 +336,10 @@ 
 
 		$this->items = $data;
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 				'total_items' => $total_items,
 				'per_page'    => $this->per_page,
-				'total_pages' => ceil( $total_items / $this->per_page )
+				'total_pages' => ceil($total_items / $this->per_page)
 			)
 		);
 	}

includes/admin/reporting/graphing.php

Spacing +243 added lines, -243 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,7 +25,7 @@ 
 	$dates = give_get_report_dates();
 
 	// Determine graph options
-	switch ( $dates['range'] ) :
+	switch ($dates['range']) :
 		case 'today' :
 		case 'yesterday' :
 			$day_by_day = true;
@@ -37,7 +37,7 @@ 
 			$day_by_day = false;
 			break;
 		case 'other' :
-			if ( $dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] && ( $dates['m_start'] != '12' && $dates['m_end'] != '1' ) ) {
+			if ($dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] && ($dates['m_start'] != '12' && $dates['m_end'] != '1')) {
 				$day_by_day = false;
 			} else {
 				$day_by_day = true;
@@ -49,61 +49,61 @@ 
 	endswitch;
 
 	$earnings_totals = 0.00; // Total earnings for time period shown
-	$sales_totals    = 0;            // Total sales for time period shown
+	$sales_totals    = 0; // Total sales for time period shown
 
 	$earnings_data = array();
 	$sales_data    = array();
 
-	if ( $dates['range'] == 'today' || $dates['range'] == 'yesterday' ) {
+	if ($dates['range'] == 'today' || $dates['range'] == 'yesterday') {
 		// Hour by hour
 		$hour  = 1;
-		$month = date( 'n', current_time( 'timestamp' ) );
-		while ( $hour <= 23 ) :
+		$month = date('n', current_time('timestamp'));
+		while ($hour <= 23) :
 
-			$sales    = give_get_sales_by_date( $dates['day'], $month, $dates['year'], $hour );
-			$earnings = give_get_earnings_by_date( $dates['day'], $month, $dates['year'], $hour );
+			$sales    = give_get_sales_by_date($dates['day'], $month, $dates['year'], $hour);
+			$earnings = give_get_earnings_by_date($dates['day'], $month, $dates['year'], $hour);
 
 			$sales_totals += $sales;
 			$earnings_totals += $earnings;
 
-			$date            = mktime( $hour, 0, 0, $month, $dates['day'], $dates['year'] ) * 1000;
-			$sales_data[]    = array( $date, $sales );
-			$earnings_data[] = array( $date, $earnings );
+			$date            = mktime($hour, 0, 0, $month, $dates['day'], $dates['year']) * 1000;
+			$sales_data[]    = array($date, $sales);
+			$earnings_data[] = array($date, $earnings);
 
-			$hour ++;
+			$hour++;
 		endwhile;
 
-	} elseif ( $dates['range'] == 'this_week' || $dates['range'] == 'last_week' ) {
+	} elseif ($dates['range'] == 'this_week' || $dates['range'] == 'last_week') {
 
 		// Day by day
 		$day     = $dates['day'];
 		$day_end = $dates['day_end'];
 		$month   = $dates['m_start'];
-		while ( $day <= $day_end ) :
-			$sales = give_get_sales_by_date( $day, $month, $dates['year'] );
+		while ($day <= $day_end) :
+			$sales = give_get_sales_by_date($day, $month, $dates['year']);
 			$sales_totals += $sales;
 
-			$earnings = give_get_earnings_by_date( $day, $month, $dates['year'] );
+			$earnings = give_get_earnings_by_date($day, $month, $dates['year']);
 			$earnings_totals += $earnings;
 
-			$date            = mktime( 0, 0, 0, $month, $day, $dates['year'] ) * 1000;
-			$sales_data[]    = array( $date, $sales );
-			$earnings_data[] = array( $date, $earnings );
-			$day ++;
+			$date            = mktime(0, 0, 0, $month, $day, $dates['year']) * 1000;
+			$sales_data[]    = array($date, $sales);
+			$earnings_data[] = array($date, $earnings);
+			$day++;
 		endwhile;
 
 	} else {
 
 		$y = $dates['year'];
-		while ( $y <= $dates['year_end'] ) :
+		while ($y <= $dates['year_end']) :
 
-			if ( $dates['year'] == $dates['year_end'] ) {
+			if ($dates['year'] == $dates['year_end']) {
 				$month_start = $dates['m_start'];
 				$month_end   = $dates['m_end'];
-			} elseif ( $y == $dates['year'] ) {
+			} elseif ($y == $dates['year']) {
 				$month_start = $dates['m_start'];
 				$month_end   = 12;
-			} elseif ( $y == $dates['year_end'] ) {
+			} elseif ($y == $dates['year_end']) {
 				$month_start = 1;
 				$month_end   = $dates['m_end'];
 			} else {
@@ -112,48 +112,48 @@ 
 			}
 
 			$i = $month_start;
-			while ( $i <= $month_end ) :
+			while ($i <= $month_end) :
 
-				if ( $day_by_day ) {
+				if ($day_by_day) {
 
-					if ( $i == $month_end ) {
+					if ($i == $month_end) {
 
 						$num_of_days = $dates['day_end'];
 
 					} else {
 
-						$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+						$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
 					}
 
 					$d = $dates['day'];
 
-					while ( $d <= $num_of_days ) :
+					while ($d <= $num_of_days) :
 
-						$sales = give_get_sales_by_date( $d, $i, $y );
+						$sales = give_get_sales_by_date($d, $i, $y);
 						$sales_totals += $sales;
 
-						$earnings = give_get_earnings_by_date( $d, $i, $y );
+						$earnings = give_get_earnings_by_date($d, $i, $y);
 						$earnings_totals += $earnings;
 
-						$date            = mktime( 0, 0, 0, $i, $d, $y ) * 1000;
-						$sales_data[]    = array( $date, $sales );
-						$earnings_data[] = array( $date, $earnings );
-						$d ++;
+						$date            = mktime(0, 0, 0, $i, $d, $y) * 1000;
+						$sales_data[]    = array($date, $sales);
+						$earnings_data[] = array($date, $earnings);
+						$d++;
 
 					endwhile;
 
 				} else {
 
-					$sales = give_get_sales_by_date( null, $i, $y );
+					$sales = give_get_sales_by_date(null, $i, $y);
 					$sales_totals += $sales;
 
-					$earnings = give_get_earnings_by_date( null, $i, $y );
+					$earnings = give_get_earnings_by_date(null, $i, $y);
 					$earnings_totals += $earnings;
 
-					if ( $i == $month_end ) {
+					if ($i == $month_end) {
 
-						$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+						$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
 					} else {
 
@@ -161,24 +161,24 @@ 
 
 					}
 
-					$date            = mktime( 0, 0, 0, $i, $num_of_days, $y ) * 1000;
-					$sales_data[]    = array( $date, $sales );
-					$earnings_data[] = array( $date, $earnings );
+					$date            = mktime(0, 0, 0, $i, $num_of_days, $y) * 1000;
+					$sales_data[]    = array($date, $sales);
+					$earnings_data[] = array($date, $earnings);
 
 				}
 
-				$i ++;
+				$i++;
 
 			endwhile;
 
-			$y ++;
+			$y++;
 		endwhile;
 
 	}
 
 	$data = array(
-		esc_html__( 'Income', 'give' )    => $earnings_data,
-		esc_html__( 'Donations', 'give' ) => $sales_data
+		esc_html__('Income', 'give')    => $earnings_data,
+		esc_html__('Donations', 'give') => $sales_data
 	);
 
 	// start our own output buffer
@@ -190,12 +190,12 @@ 
 			<div class="postbox">
 				<div class="inside">
 					<?php
-					$graph = new Give_Graph( $data );
-					$graph->set( 'x_mode', 'time' );
-					$graph->set( 'multiple_y_axes', true );
+					$graph = new Give_Graph($data);
+					$graph->set('x_mode', 'time');
+					$graph->set('multiple_y_axes', true);
 					$graph->display();
 
-					if ( 'this_month' == $dates['range'] ) {
+					if ('this_month' == $dates['range']) {
 						$estimated = give_estimated_monthly_stats();
 					}
 					?>
@@ -205,21 +205,21 @@ 
 			<table class="widefat reports-table alignleft" style="max-width:450px">
 				<tbody>
 				<tr>
-					<th scope="row"><strong><?php esc_html_e( 'Total income for period:', 'give' ); ?></strong></th>
-					<td><?php echo give_currency_filter( give_format_amount( $earnings_totals ) ); ?></td>
+					<th scope="row"><strong><?php esc_html_e('Total income for period:', 'give'); ?></strong></th>
+					<td><?php echo give_currency_filter(give_format_amount($earnings_totals)); ?></td>
 				</tr>
 				<tr class="alternate">
-					<th scope="row"><strong><?php esc_html_e( 'Total donations for period:', 'give' ); ?><strong></th>
+					<th scope="row"><strong><?php esc_html_e('Total donations for period:', 'give'); ?><strong></th>
 					<td><?php echo $sales_totals; ?></td>
 				</tr>
-				<?php if ( 'this_month' == $dates['range'] ) : ?>
+				<?php if ('this_month' == $dates['range']) : ?>
 					<tr>
-						<th scope="row"><strong><?php esc_html_e( 'Estimated monthly income:', 'give' ); ?></strong></th>
-						<td><?php echo give_currency_filter( give_format_amount( $estimated['earnings'] ) ); ?></td>
+						<th scope="row"><strong><?php esc_html_e('Estimated monthly income:', 'give'); ?></strong></th>
+						<td><?php echo give_currency_filter(give_format_amount($estimated['earnings'])); ?></td>
 					</tr>
 					<tr class="alternate">
-						<th scope="row"><strong><?php esc_html_e( 'Estimated monthly donations:', 'give' ); ?></strong></th>
-						<td><?php echo floor( $estimated['sales'] ); ?></td>
+						<th scope="row"><strong><?php esc_html_e('Estimated monthly donations:', 'give'); ?></strong></th>
+						<td><?php echo floor($estimated['sales']); ?></td>
 					</tr>
 				<?php endif; ?>
 			</table>
@@ -232,7 +232,7 @@ 
 			 *
 			 * @since 1.0
 			 */
-			do_action( 'give_reports_graph_additional_stats' );
+			do_action('give_reports_graph_additional_stats');
 			?>
 
 		</div>
@@ -251,12 +251,12 @@ 
  * @since 1.0
  * @return void
  */
-function give_reports_graph_of_form( $form_id = 0 ) {
+function give_reports_graph_of_form($form_id = 0) {
 	// Retrieve the queried dates
 	$dates = give_get_report_dates();
 
 	// Determine graph options
-	switch ( $dates['range'] ) :
+	switch ($dates['range']) :
 		case 'today' :
 		case 'yesterday' :
 			$day_by_day = true;
@@ -274,7 +274,7 @@ 
 			$day_by_day = false;
 			break;
 		case 'other' :
-			if ( $dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year'] ) {
+			if ($dates['m_end'] - $dates['m_start'] >= 2 || $dates['year_end'] > $dates['year']) {
 				$day_by_day = false;
 			} else {
 				$day_by_day = true;
@@ -286,75 +286,75 @@ 
 	endswitch;
 
 	$earnings_totals = (float) 0.00; // Total earnings for time period shown
-	$sales_totals    = 0;            // Total sales for time period shown
+	$sales_totals    = 0; // Total sales for time period shown
 
 	$earnings_data = array();
 	$sales_data    = array();
 	$stats         = new Give_Payment_Stats;
 
-	if ( $dates['range'] == 'today' || $dates['range'] == 'yesterday' ) {
+	if ($dates['range'] == 'today' || $dates['range'] == 'yesterday') {
 
 		// Hour by hour
 		$month  = $dates['m_start'];
 		$hour   = 1;
 		$minute = 0;
 		$second = 0;
-		while ( $hour <= 23 ) :
+		while ($hour <= 23) :
 
-			if ( $hour == 23 ) {
+			if ($hour == 23) {
 				$minute = $second = 59;
 			}
 
-			$date     = mktime( $hour, $minute, $second, $month, $dates['day'], $dates['year'] );
-			$date_end = mktime( $hour + 1, $minute, $second, $month, $dates['day'], $dates['year'] );
+			$date     = mktime($hour, $minute, $second, $month, $dates['day'], $dates['year']);
+			$date_end = mktime($hour + 1, $minute, $second, $month, $dates['day'], $dates['year']);
 
-			$sales = $stats->get_sales( $form_id, $date, $date_end );
+			$sales = $stats->get_sales($form_id, $date, $date_end);
 			$sales_totals += $sales;
 
-			$earnings = $stats->get_earnings( $form_id, $date, $date_end );
+			$earnings = $stats->get_earnings($form_id, $date, $date_end);
 			$earnings_totals += $earnings;
 
-			$sales_data[]    = array( $date * 1000, $sales );
-			$earnings_data[] = array( $date * 1000, $earnings );
+			$sales_data[]    = array($date * 1000, $sales);
+			$earnings_data[] = array($date * 1000, $earnings);
 
-			$hour ++;
+			$hour++;
 		endwhile;
 
-	} elseif ( $dates['range'] == 'this_week' || $dates['range'] == 'last_week' ) {
+	} elseif ($dates['range'] == 'this_week' || $dates['range'] == 'last_week') {
 
 		//Day by day
 		$day     = $dates['day'];
 		$day_end = $dates['day_end'];
 		$month   = $dates['m_start'];
-		while ( $day <= $day_end ) :
+		while ($day <= $day_end) :
 
-			$date     = mktime( 0, 0, 0, $month, $day, $dates['year'] );
-			$date_end = mktime( 0, 0, 0, $month, $day + 1, $dates['year'] );
-			$sales    = $stats->get_sales( $form_id, $date, $date_end );
+			$date     = mktime(0, 0, 0, $month, $day, $dates['year']);
+			$date_end = mktime(0, 0, 0, $month, $day + 1, $dates['year']);
+			$sales    = $stats->get_sales($form_id, $date, $date_end);
 			$sales_totals += $sales;
 
-			$earnings = $stats->get_earnings( $form_id, $date, $date_end );
+			$earnings = $stats->get_earnings($form_id, $date, $date_end);
 			$earnings_totals += $earnings;
 
-			$sales_data[]    = array( $date * 1000, $sales );
-			$earnings_data[] = array( $date * 1000, $earnings );
+			$sales_data[]    = array($date * 1000, $sales);
+			$earnings_data[] = array($date * 1000, $earnings);
 
-			$day ++;
+			$day++;
 		endwhile;
 
 	} else {
 
 		$y = $dates['year'];
 
-		while ( $y <= $dates['year_end'] ) :
+		while ($y <= $dates['year_end']) :
 
 			$last_year = false;
 
-			if ( $dates['year'] == $dates['year_end'] ) {
+			if ($dates['year'] == $dates['year_end']) {
 				$month_start = $dates['m_start'];
 				$month_end   = $dates['m_end'];
 				$last_year   = true;
-			} elseif ( $y == $dates['year'] ) {
+			} elseif ($y == $dates['year']) {
 				$month_start = $dates['m_start'];
 				$month_end   = 12;
 			} else {
@@ -363,76 +363,76 @@ 
 			}
 
 			$i = $month_start;
-			while ( $i <= $month_end ) :
+			while ($i <= $month_end) :
 
-				if ( $day_by_day ) {
+				if ($day_by_day) {
 
-					if ( $i == $month_end && $last_year ) {
+					if ($i == $month_end && $last_year) {
 
 						$num_of_days = $dates['day_end'];
 
 					} else {
 
-						$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+						$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
 					}
 
 					$d = $dates['day'];
-					while ( $d <= $num_of_days ) :
+					while ($d <= $num_of_days) :
 
-						$date     = mktime( 0, 0, 0, $i, $d, $y );
-						$end_date = mktime( 23, 59, 59, $i, $d, $y );
+						$date     = mktime(0, 0, 0, $i, $d, $y);
+						$end_date = mktime(23, 59, 59, $i, $d, $y);
 
-						$sales = $stats->get_sales( $form_id, $date, $end_date );
+						$sales = $stats->get_sales($form_id, $date, $end_date);
 						$sales_totals += $sales;
 
-						$earnings = $stats->get_earnings( $form_id, $date, $end_date );
+						$earnings = $stats->get_earnings($form_id, $date, $end_date);
 						$earnings_totals += $earnings;
 
-						$sales_data[]    = array( $date * 1000, $sales );
-						$earnings_data[] = array( $date * 1000, $earnings );
-						$d ++;
+						$sales_data[]    = array($date * 1000, $sales);
+						$earnings_data[] = array($date * 1000, $earnings);
+						$d++;
 
 					endwhile;
 
 				} else {
 
-					$num_of_days = cal_days_in_month( CAL_GREGORIAN, $i, $y );
+					$num_of_days = cal_days_in_month(CAL_GREGORIAN, $i, $y);
 
-					$date     = mktime( 0, 0, 0, $i, 1, $y );
-					$end_date = mktime( 23, 59, 59, $i, $num_of_days, $y );
+					$date     = mktime(0, 0, 0, $i, 1, $y);
+					$end_date = mktime(23, 59, 59, $i, $num_of_days, $y);
 
-					$sales = $stats->get_sales( $form_id, $date, $end_date );
+					$sales = $stats->get_sales($form_id, $date, $end_date);
 					$sales_totals += $sales;
 
-					$earnings = $stats->get_earnings( $form_id, $date, $end_date );
+					$earnings = $stats->get_earnings($form_id, $date, $end_date);
 					$earnings_totals += $earnings;
 
-					$sales_data[]    = array( $date * 1000, $sales );
-					$earnings_data[] = array( $date * 1000, $earnings );
+					$sales_data[]    = array($date * 1000, $sales);
+					$earnings_data[] = array($date * 1000, $earnings);
 
 				}
 
-				$i ++;
+				$i++;
 
 			endwhile;
 
-			$y ++;
+			$y++;
 		endwhile;
 
 	}
 
 	$data = array(
-		esc_html__( 'Income', 'give' )    => $earnings_data,
-		esc_html__( 'Donations', 'give' ) => $sales_data
+		esc_html__('Income', 'give')    => $earnings_data,
+		esc_html__('Donations', 'give') => $sales_data
 	);
 
 	?>
 	<h3><span><?php
 		printf(
 			/* translators: %s: form title */
-			esc_html__( 'Income Over Time for %s', 'give' ),
-			get_the_title( $form_id )
+			esc_html__('Income Over Time for %s', 'give'),
+			get_the_title($form_id)
 		);
 	?></span></h3>
 
@@ -440,9 +440,9 @@ 
 		<div class="postbox">
 			<div class="inside">
 				<?php
-				$graph = new Give_Graph( $data );
-				$graph->set( 'x_mode', 'time' );
-				$graph->set( 'multiple_y_axes', true );
+				$graph = new Give_Graph($data);
+				$graph->set('x_mode', 'time');
+				$graph->set('multiple_y_axes', true);
 				$graph->display();
 				?>
 			</div>
@@ -451,20 +451,20 @@ 
 		<table class="widefat reports-table alignleft" style="max-width:450px">
 			<tbody>
 			<tr>
-				<th scope="row"><strong><?php esc_html_e( 'Total income for period:', 'give' ); ?></strong></th>
-				<td><?php echo give_currency_filter( give_format_amount( $earnings_totals ) ); ?></td>
+				<th scope="row"><strong><?php esc_html_e('Total income for period:', 'give'); ?></strong></th>
+				<td><?php echo give_currency_filter(give_format_amount($earnings_totals)); ?></td>
 			</tr>
 			<tr class="alternate">
-				<th scope="row"><strong><?php esc_html_e( 'Total donations for period:', 'give' ); ?></strong></th>
+				<th scope="row"><strong><?php esc_html_e('Total donations for period:', 'give'); ?></strong></th>
 				<td><?php echo $sales_totals; ?></td>
 			</tr>
 			<tr>
-				<th scope="row"><strong><?php esc_html_e( 'Average monthly income:', 'give' ); ?></strong></th>
-				<td><?php echo give_currency_filter( give_format_amount( give_get_average_monthly_form_earnings( $form_id ) ) ); ?></td>
+				<th scope="row"><strong><?php esc_html_e('Average monthly income:', 'give'); ?></strong></th>
+				<td><?php echo give_currency_filter(give_format_amount(give_get_average_monthly_form_earnings($form_id))); ?></td>
 			</tr>
 			<tr class="alternate">
-				<th scope="row"><strong><?php esc_html_e( 'Average monthly donations:', 'give' ); ?></strong></th>
-				<td><?php echo number_format( give_get_average_monthly_form_sales( $form_id ), 0 ); ?></td>
+				<th scope="row"><strong><?php esc_html_e('Average monthly donations:', 'give'); ?></strong></th>
+				<td><?php echo number_format(give_get_average_monthly_form_sales($form_id), 0); ?></td>
 			</tr>
 			</tbody>
 		</table>
@@ -481,26 +481,26 @@ 
  * @return void
  */
 function give_reports_graph_controls() {
-	$date_options = apply_filters( 'give_report_date_options', array(
-		'today'        => esc_html__( 'Today', 'give' ),
-		'yesterday'    => esc_html__( 'Yesterday', 'give' ),
-		'this_week'    => esc_html__( 'This Week', 'give' ),
-		'last_week'    => esc_html__( 'Last Week', 'give' ),
-		'this_month'   => esc_html__( 'This Month', 'give' ),
-		'last_month'   => esc_html__( 'Last Month', 'give' ),
-		'this_quarter' => esc_html__( 'This Quarter', 'give' ),
-		'last_quarter' => esc_html__( 'Last Quarter', 'give' ),
-		'this_year'    => esc_html__( 'This Year', 'give' ),
-		'last_year'    => esc_html__( 'Last Year', 'give' ),
-		'other'        => esc_html__( 'Custom', 'give' )
-	) );
+	$date_options = apply_filters('give_report_date_options', array(
+		'today'        => esc_html__('Today', 'give'),
+		'yesterday'    => esc_html__('Yesterday', 'give'),
+		'this_week'    => esc_html__('This Week', 'give'),
+		'last_week'    => esc_html__('Last Week', 'give'),
+		'this_month'   => esc_html__('This Month', 'give'),
+		'last_month'   => esc_html__('Last Month', 'give'),
+		'this_quarter' => esc_html__('This Quarter', 'give'),
+		'last_quarter' => esc_html__('Last Quarter', 'give'),
+		'this_year'    => esc_html__('This Year', 'give'),
+		'last_year'    => esc_html__('Last Year', 'give'),
+		'other'        => esc_html__('Custom', 'give')
+	));
 
 	$dates   = give_get_report_dates();
 	$display = $dates['range'] == 'other' ? '' : 'style="display:none;"';
 	$view    = give_get_reporting_view();
 
-	if ( empty( $dates['day_end'] ) ) {
-		$dates['day_end'] = cal_days_in_month( CAL_GREGORIAN, date( 'n' ), date( 'Y' ) );
+	if (empty($dates['day_end'])) {
+		$dates['day_end'] = cal_days_in_month(CAL_GREGORIAN, date('n'), date('Y'));
 	}
 
 	/**
@@ -508,7 +508,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_report_graph_controls_before' );
+	do_action('give_report_graph_controls_before');
 	?>
 	<form id="give-graphs-filter" method="get" class="alignright">
 		<div class="tablenav top alignright">
@@ -516,53 +516,53 @@ 
 
 				<input type="hidden" name="post_type" value="give_forms" />
 				<input type="hidden" name="page" value="give-reports" />
-				<input type="hidden" name="view" value="<?php echo esc_attr( $view ); ?>" />
+				<input type="hidden" name="view" value="<?php echo esc_attr($view); ?>" />
 
-				<?php if ( isset( $_GET['form-id'] ) ) : ?>
-					<input type="hidden" name="form-id" value="<?php echo absint( $_GET['form-id'] ); ?>" />
+				<?php if (isset($_GET['form-id'])) : ?>
+					<input type="hidden" name="form-id" value="<?php echo absint($_GET['form-id']); ?>" />
 				<?php endif; ?>
 
 				<div id="give-graphs-date-options-wrap" class="alignright">
 					<select id="give-graphs-date-options" name="range">
-						<?php foreach ( $date_options as $key => $option ) : ?>
-							<option value="<?php echo esc_attr( $key ); ?>"<?php selected( $key, $dates['range'] ); ?>><?php echo esc_html( $option ); ?></option>
+						<?php foreach ($date_options as $key => $option) : ?>
+							<option value="<?php echo esc_attr($key); ?>"<?php selected($key, $dates['range']); ?>><?php echo esc_html($option); ?></option>
 						<?php endforeach; ?>
 					</select>
 
-					<input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Filter', 'give' ); ?>" />
+					<input type="submit" class="button-secondary" value="<?php esc_attr_e('Filter', 'give'); ?>" />
 				</div>
 
 				<div id="give-date-range-options" <?php echo $display; ?>>
-					<span><?php esc_html_e( 'From', 'give' ); ?>&nbsp;</span>
+					<span><?php esc_html_e('From', 'give'); ?>&nbsp;</span>
 					<select id="give-graphs-month-start" name="m_start">
-						<?php for ( $i = 1; $i <= 12; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['m_start'] ); ?>><?php echo give_month_num_to_name( $i ); ?></option>
+						<?php for ($i = 1; $i <= 12; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['m_start']); ?>><?php echo give_month_num_to_name($i); ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-day-start" name="day">
-						<?php for ( $i = 1; $i <= 31; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['day'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 1; $i <= 31; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['day']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-year-start" name="year">
-						<?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['year'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 2007; $i <= date('Y'); $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['year']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
-					<span><?php esc_html_e( 'To', 'give' ); ?>&nbsp;</span>
+					<span><?php esc_html_e('To', 'give'); ?>&nbsp;</span>
 					<select id="give-graphs-month-end" name="m_end">
-						<?php for ( $i = 1; $i <= 12; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['m_end'] ); ?>><?php echo give_month_num_to_name( $i ); ?></option>
+						<?php for ($i = 1; $i <= 12; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['m_end']); ?>><?php echo give_month_num_to_name($i); ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-day-end" name="day_end">
-						<?php for ( $i = 1; $i <= 31; $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['day_end'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 1; $i <= 31; $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['day_end']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
 					<select id="give-graphs-year-end" name="year_end">
-						<?php for ( $i = 2007; $i <= date( 'Y' ); $i ++ ) : ?>
-							<option value="<?php echo absint( $i ); ?>" <?php selected( $i, $dates['year_end'] ); ?>><?php echo $i; ?></option>
+						<?php for ($i = 2007; $i <= date('Y'); $i++) : ?>
+							<option value="<?php echo absint($i); ?>" <?php selected($i, $dates['year_end']); ?>><?php echo $i; ?></option>
 						<?php endfor; ?>
 					</select>
 				</div>
@@ -577,7 +577,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	do_action( 'give_report_graph_controls_after' );
+	do_action('give_report_graph_controls_after');
 }
 
 /**
@@ -592,65 +592,65 @@ 
 function give_get_report_dates() {
 	$dates = array();
 
-	$current_time = current_time( 'timestamp' );
+	$current_time = current_time('timestamp');
 
-	$dates['range']    = isset( $_GET['range'] ) ? $_GET['range'] : 'this_month';
-	$dates['year']     = isset( $_GET['year'] ) ? $_GET['year'] : date( 'Y' );
-	$dates['year_end'] = isset( $_GET['year_end'] ) ? $_GET['year_end'] : date( 'Y' );
-	$dates['m_start']  = isset( $_GET['m_start'] ) ? $_GET['m_start'] : 1;
-	$dates['m_end']    = isset( $_GET['m_end'] ) ? $_GET['m_end'] : 12;
-	$dates['day']      = isset( $_GET['day'] ) ? $_GET['day'] : 1;
-	$dates['day_end']  = isset( $_GET['day_end'] ) ? $_GET['day_end'] : cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] );
+	$dates['range']    = isset($_GET['range']) ? $_GET['range'] : 'this_month';
+	$dates['year']     = isset($_GET['year']) ? $_GET['year'] : date('Y');
+	$dates['year_end'] = isset($_GET['year_end']) ? $_GET['year_end'] : date('Y');
+	$dates['m_start']  = isset($_GET['m_start']) ? $_GET['m_start'] : 1;
+	$dates['m_end']    = isset($_GET['m_end']) ? $_GET['m_end'] : 12;
+	$dates['day']      = isset($_GET['day']) ? $_GET['day'] : 1;
+	$dates['day_end']  = isset($_GET['day_end']) ? $_GET['day_end'] : cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']);
 
 	// Modify dates based on predefined ranges
-	switch ( $dates['range'] ) :
+	switch ($dates['range']) :
 
 		case 'this_month' :
-			$dates['m_start']  = date( 'n', $current_time );
-			$dates['m_end']    = date( 'n', $current_time );
+			$dates['m_start']  = date('n', $current_time);
+			$dates['m_end']    = date('n', $current_time);
 			$dates['day']      = 1;
-			$dates['day_end']  = cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] );
-			$dates['year']     = date( 'Y' );
-			$dates['year_end'] = date( 'Y' );
+			$dates['day_end']  = cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']);
+			$dates['year']     = date('Y');
+			$dates['year_end'] = date('Y');
 			break;
 
 		case 'last_month' :
-			if ( date( 'n' ) == 1 ) {
+			if (date('n') == 1) {
 				$dates['m_start']  = 12;
 				$dates['m_end']    = 12;
-				$dates['year']     = date( 'Y', $current_time ) - 1;
-				$dates['year_end'] = date( 'Y', $current_time ) - 1;
+				$dates['year']     = date('Y', $current_time) - 1;
+				$dates['year_end'] = date('Y', $current_time) - 1;
 			} else {
-				$dates['m_start']  = date( 'n' ) - 1;
-				$dates['m_end']    = date( 'n' ) - 1;
+				$dates['m_start']  = date('n') - 1;
+				$dates['m_end']    = date('n') - 1;
 				$dates['year_end'] = $dates['year'];
 			}
-			$dates['day_end'] = cal_days_in_month( CAL_GREGORIAN, $dates['m_end'], $dates['year'] );
+			$dates['day_end'] = cal_days_in_month(CAL_GREGORIAN, $dates['m_end'], $dates['year']);
 			break;
 
 		case 'today' :
-			$dates['day']     = date( 'd', $current_time );
-			$dates['m_start'] = date( 'n', $current_time );
-			$dates['m_end']   = date( 'n', $current_time );
-			$dates['year']    = date( 'Y', $current_time );
+			$dates['day']     = date('d', $current_time);
+			$dates['m_start'] = date('n', $current_time);
+			$dates['m_end']   = date('n', $current_time);
+			$dates['year']    = date('Y', $current_time);
 			break;
 
 		case 'yesterday' :
 
-			$year  = date( 'Y', $current_time );
-			$month = date( 'n', $current_time );
-			$day   = date( 'd', $current_time );
+			$year  = date('Y', $current_time);
+			$month = date('n', $current_time);
+			$day   = date('d', $current_time);
 
-			if ( $month == 1 && $day == 1 ) {
+			if ($month == 1 && $day == 1) {
 
 				$year -= 1;
 				$month = 12;
-				$day   = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+				$day   = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
-			} elseif ( $month > 1 && $day == 1 ) {
+			} elseif ($month > 1 && $day == 1) {
 
 				$month -= 1;
-				$day = cal_days_in_month( CAL_GREGORIAN, $month, $year );
+				$day = cal_days_in_month(CAL_GREGORIAN, $month, $year);
 
 			} else {
 
@@ -666,91 +666,91 @@ 
 			break;
 
 		case 'this_week' :
-			$dates['day'] = date( 'd', $current_time - ( date( 'w', $current_time ) - 1 ) * 60 * 60 * 24 ) - 1;
-			$dates['day'] += get_option( 'start_of_week' );
+			$dates['day'] = date('d', $current_time - (date('w', $current_time) - 1) * 60 * 60 * 24) - 1;
+			$dates['day'] += get_option('start_of_week');
 			$dates['day_end'] = $dates['day'] + 6;
-			$dates['m_start'] = date( 'n', $current_time );
-			$dates['m_end']   = date( 'n', $current_time );
-			$dates['year']    = date( 'Y', $current_time );
+			$dates['m_start'] = date('n', $current_time);
+			$dates['m_end']   = date('n', $current_time);
+			$dates['year']    = date('Y', $current_time);
 			break;
 
 		case 'last_week' :
-			$dates['day'] = date( 'd', $current_time - ( date( 'w' ) - 1 ) * 60 * 60 * 24 ) - 8;
-			$dates['day'] += get_option( 'start_of_week' );
+			$dates['day'] = date('d', $current_time - (date('w') - 1) * 60 * 60 * 24) - 8;
+			$dates['day'] += get_option('start_of_week');
 			$dates['day_end'] = $dates['day'] + 6;
-			$dates['year']    = date( 'Y' );
-
-			if ( date( 'j', $current_time ) <= 7 ) {
-				$dates['m_start'] = date( 'n', $current_time ) - 1;
-				$dates['m_end']   = date( 'n', $current_time ) - 1;
-				if ( $dates['m_start'] <= 1 ) {
-					$dates['year']     = date( 'Y', $current_time ) - 1;
-					$dates['year_end'] = date( 'Y', $current_time ) - 1;
+			$dates['year']    = date('Y');
+
+			if (date('j', $current_time) <= 7) {
+				$dates['m_start'] = date('n', $current_time) - 1;
+				$dates['m_end']   = date('n', $current_time) - 1;
+				if ($dates['m_start'] <= 1) {
+					$dates['year']     = date('Y', $current_time) - 1;
+					$dates['year_end'] = date('Y', $current_time) - 1;
 				}
 			} else {
-				$dates['m_start'] = date( 'n', $current_time );
-				$dates['m_end']   = date( 'n', $current_time );
+				$dates['m_start'] = date('n', $current_time);
+				$dates['m_end']   = date('n', $current_time);
 			}
 			break;
 
 		case 'this_quarter' :
-			$month_now = date( 'n', $current_time );
+			$month_now = date('n', $current_time);
 
-			if ( $month_now <= 3 ) {
+			if ($month_now <= 3) {
 
 				$dates['m_start'] = 1;
 				$dates['m_end']   = 4;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
-			} else if ( $month_now <= 6 ) {
+			} else if ($month_now <= 6) {
 
 				$dates['m_start'] = 4;
 				$dates['m_end']   = 7;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
-			} else if ( $month_now <= 9 ) {
+			} else if ($month_now <= 9) {
 
 				$dates['m_start'] = 7;
 				$dates['m_end']   = 10;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
 			} else {
 
 				$dates['m_start']  = 10;
 				$dates['m_end']    = 1;
-				$dates['year']     = date( 'Y', $current_time );
-				$dates['year_end'] = date( 'Y', $current_time ) + 1;
+				$dates['year']     = date('Y', $current_time);
+				$dates['year_end'] = date('Y', $current_time) + 1;
 
 			}
 			break;
 
 		case 'last_quarter' :
-			$month_now = date( 'n' );
+			$month_now = date('n');
 
-			if ( $month_now <= 3 ) {
+			if ($month_now <= 3) {
 
 				$dates['m_start']  = 10;
 				$dates['m_end']    = 12;
-				$dates['year']     = date( 'Y', $current_time ) - 1; // Previous year
-				$dates['year_end'] = date( 'Y', $current_time ) - 1; // Previous year
+				$dates['year']     = date('Y', $current_time) - 1; // Previous year
+				$dates['year_end'] = date('Y', $current_time) - 1; // Previous year
 
-			} else if ( $month_now <= 6 ) {
+			} else if ($month_now <= 6) {
 
 				$dates['m_start'] = 1;
 				$dates['m_end']   = 3;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
-			} else if ( $month_now <= 9 ) {
+			} else if ($month_now <= 9) {
 
 				$dates['m_start'] = 4;
 				$dates['m_end']   = 6;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
 			} else {
 
 				$dates['m_start'] = 7;
 				$dates['m_end']   = 9;
-				$dates['year']    = date( 'Y', $current_time );
+				$dates['year']    = date('Y', $current_time);
 
 			}
 			break;
@@ -758,19 +758,19 @@ 
 		case 'this_year' :
 			$dates['m_start'] = 1;
 			$dates['m_end']   = 12;
-			$dates['year']    = date( 'Y', $current_time );
+			$dates['year']    = date('Y', $current_time);
 			break;
 
 		case 'last_year' :
 			$dates['m_start']  = 1;
 			$dates['m_end']    = 12;
-			$dates['year']     = date( 'Y', $current_time ) - 1;
-			$dates['year_end'] = date( 'Y', $current_time ) - 1;
+			$dates['year']     = date('Y', $current_time) - 1;
+			$dates['year_end'] = date('Y', $current_time) - 1;
 			break;
 
 	endswitch;
 
-	return apply_filters( 'give_report_dates', $dates );
+	return apply_filters('give_report_dates', $dates);
 }
 
 /**
@@ -780,17 +780,17 @@ 
  *
  * @param $data
  */
-function give_parse_report_dates( $data ) {
+function give_parse_report_dates($data) {
 	$dates = give_get_report_dates();
 
 	$view = give_get_reporting_view();
-	$id   = isset( $_GET['form-id'] ) ? $_GET['form-id'] : null;
+	$id   = isset($_GET['form-id']) ? $_GET['form-id'] : null;
 
-	wp_redirect( add_query_arg( $dates, admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=' . esc_attr( $view ) . '&form-id=' . absint( $id ) ) ) );
+	wp_redirect(add_query_arg($dates, admin_url('edit.php?post_type=give_forms&page=give-reports&view='.esc_attr($view).'&form-id='.absint($id))));
 	give_die();
 }
 
-add_action( 'give_filter_reports', 'give_parse_report_dates' );
+add_action('give_filter_reports', 'give_parse_report_dates');
 
 
 /**
@@ -802,16 +802,16 @@ 
  */
 function give_reports_refresh_button() {
 
-	$url = wp_nonce_url( add_query_arg( array(
+	$url = wp_nonce_url(add_query_arg(array(
 		'give_action'  => 'refresh_reports_transients',
 		'give-message' => 'refreshed-reports'
-	) ), 'give-refresh-reports' );
+	)), 'give-refresh-reports');
 
-	echo '<a href="' . $url . '" data-tooltip="' . esc_attr__( 'Clicking this will clear the reports cache.', 'give' ) . '" data-tooltip-my-position="right center"  data-tooltip-target-position="left center" class="button alignright give-refresh-reports-button give-tooltip">' . esc_html__( 'Refresh Reports', 'give' ) . '</a>';
+	echo '<a href="'.$url.'" data-tooltip="'.esc_attr__('Clicking this will clear the reports cache.', 'give').'" data-tooltip-my-position="right center"  data-tooltip-target-position="left center" class="button alignright give-refresh-reports-button give-tooltip">'.esc_html__('Refresh Reports', 'give').'</a>';
 
 }
 
-add_action( 'give_reports_graph_additional_stats', 'give_reports_refresh_button' );
+add_action('give_reports_graph_additional_stats', 'give_reports_refresh_button');
 
 /**
  * Trigger the refresh of reports transients
@@ -822,18 +822,18 @@ 
  *
  * @return void
  */
-function give_run_refresh_reports_transients( $data ) {
+function give_run_refresh_reports_transients($data) {
 
-	if ( ! wp_verify_nonce( $data['_wpnonce'], 'give-refresh-reports' ) ) {
+	if ( ! wp_verify_nonce($data['_wpnonce'], 'give-refresh-reports')) {
 		return;
 	}
 
 	//Delete transients
-	delete_transient( 'give_estimated_monthly_stats' );
-	delete_transient( 'give_earnings_total' );
-	delete_transient( md5( 'give_earnings_this_monththis_month' ) );
-	delete_transient( md5( 'give_earnings_todaytoday' ) );
+	delete_transient('give_estimated_monthly_stats');
+	delete_transient('give_earnings_total');
+	delete_transient(md5('give_earnings_this_monththis_month'));
+	delete_transient(md5('give_earnings_todaytoday'));
 
 }
 
-add_action( 'give_refresh_reports_transients', 'give_run_refresh_reports_transients' );
\ No newline at end of file
+add_action('give_refresh_reports_transients', 'give_run_refresh_reports_transients');
\ No newline at end of file

includes/admin/reporting/pdf-reports.php

Spacing +146 added lines, -146 removed lines

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

includes/admin/reporting/tools.php

Spacing +27 added lines, -27 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -22,7 +22,7 @@ 
  */
 function give_tools_recount_stats_display() {
 
-	if ( ! current_user_can( 'manage_give_settings' ) ) {
+	if ( ! current_user_can('manage_give_settings')) {
 		return;
 	}
 
@@ -31,27 +31,27 @@ 
 	 *
 	 * @since 1.5
 	 */
-	do_action( 'give_tools_recount_stats_before' );
+	do_action('give_tools_recount_stats_before');
 	?>
 	<div id="poststuff">
 		<div class="postbox">
 
-			<h2 class="hndle ui-sortable-handle"><span><?php esc_html_e( 'Recount Stats', 'give' ); ?></span></h2>
+			<h2 class="hndle ui-sortable-handle"><span><?php esc_html_e('Recount Stats', 'give'); ?></span></h2>
 
 			<div class="inside recount-stats-controls">
-				<p><?php esc_html_e( 'Use these tools to recount stats, delete test transactions, or reset stats.', 'give' ); ?></p>
+				<p><?php esc_html_e('Use these tools to recount stats, delete test transactions, or reset stats.', 'give'); ?></p>
 				<form method="post" id="give-tools-recount-form" class="give-export-form">
 
-					<?php wp_nonce_field( 'give_ajax_export', 'give_ajax_export' ); ?>
+					<?php wp_nonce_field('give_ajax_export', 'give_ajax_export'); ?>
 
 					<select name="give-export-class" id="recount-stats-type">
-						<option value="0" selected="selected" disabled="disabled"><?php esc_html_e( 'Please select an option', 'give' ); ?></option>
-						<option data-type="recount-stats" value="Give_Tools_Recount_Income"><?php esc_html_e( 'Recalculate Total Donation Income Amount', 'give' ); ?></option>
-						<option data-type="recount-form" value="Give_Tools_Recount_Form_Stats"><?php esc_html_e( 'Recalculate Income Amount and Donation Counts for a Form', 'give' ); ?></option>
-						<option data-type="recount-all" value="Give_Tools_Recount_All_Stats"><?php esc_html_e( 'Recalculate Income Amount and Donation Counts for All Forms', 'give' ); ?></option>
-						<option data-type="recount-customer-stats" value="Give_Tools_Recount_Customer_Stats"><?php esc_html_e( 'Recalculate Donor Statistics', 'give' ); ?></option>
-						<option data-type="delete-test-transactions" value="Give_Tools_Delete_Test_Transactions"><?php esc_html_e( 'Delete Test Transactions', 'give' ); ?></option>
-						<option data-type="reset-stats" value="Give_Tools_Reset_Stats"><?php esc_html_e( 'Delete All Data', 'give' ); ?></option>
+						<option value="0" selected="selected" disabled="disabled"><?php esc_html_e('Please select an option', 'give'); ?></option>
+						<option data-type="recount-stats" value="Give_Tools_Recount_Income"><?php esc_html_e('Recalculate Total Donation Income Amount', 'give'); ?></option>
+						<option data-type="recount-form" value="Give_Tools_Recount_Form_Stats"><?php esc_html_e('Recalculate Income Amount and Donation Counts for a Form', 'give'); ?></option>
+						<option data-type="recount-all" value="Give_Tools_Recount_All_Stats"><?php esc_html_e('Recalculate Income Amount and Donation Counts for All Forms', 'give'); ?></option>
+						<option data-type="recount-customer-stats" value="Give_Tools_Recount_Customer_Stats"><?php esc_html_e('Recalculate Donor Statistics', 'give'); ?></option>
+						<option data-type="delete-test-transactions" value="Give_Tools_Delete_Test_Transactions"><?php esc_html_e('Delete Test Transactions', 'give'); ?></option>
+						<option data-type="reset-stats" value="Give_Tools_Reset_Stats"><?php esc_html_e('Delete All Data', 'give'); ?></option>
 						<?php
 						/**
 						 * Fires in the recount stats selectbox.
@@ -60,7 +60,7 @@ 
 						 *
 						 * @since 1.5
 						 */
-						do_action( 'give_recount_tool_options' );
+						do_action('give_recount_tool_options');
 						?>
 					</select>
 
@@ -68,22 +68,22 @@ 
 						<?php
 						$args = array(
 							'name'   => 'form_id',
-							'number' => - 1,
+							'number' => -1,
 							'chosen' => true,
 						);
-						echo Give()->html->forms_dropdown( $args );
+						echo Give()->html->forms_dropdown($args);
 						?>
 					</span>
 
-					<input type="submit" id="recount-stats-submit" value="<?php esc_attr_e( 'Submit', 'give' ); ?>" class="button-secondary"/>
+					<input type="submit" id="recount-stats-submit" value="<?php esc_attr_e('Submit', 'give'); ?>" class="button-secondary"/>
 
 					<br/>
 
 					<span class="give-recount-stats-descriptions">
-						<span id="recount-stats"><?php esc_html_e( 'Recalculates the overall donation income amount.', 'give' ); ?></span>
-						<span id="recount-form"><?php esc_html_e( 'Recalculates the donation and income stats for a specific form.', 'give' ); ?></span>
-						<span id="recount-all"><?php esc_html_e( 'Recalculates the earnings and sales stats for all forms.', 'give' ); ?></span>
-						<span id="recount-customer-stats"><?php esc_html_e( 'Recalculates the lifetime value and donation counts for all donors.', 'give' ); ?></span>
+						<span id="recount-stats"><?php esc_html_e('Recalculates the overall donation income amount.', 'give'); ?></span>
+						<span id="recount-form"><?php esc_html_e('Recalculates the donation and income stats for a specific form.', 'give'); ?></span>
+						<span id="recount-all"><?php esc_html_e('Recalculates the earnings and sales stats for all forms.', 'give'); ?></span>
+						<span id="recount-customer-stats"><?php esc_html_e('Recalculates the lifetime value and donation counts for all donors.', 'give'); ?></span>
 						<?php
 						/**
 						 * Fires in the recount stats description area.
@@ -92,10 +92,10 @@ 
 						 *
 						 * @since 1.5
 						 */
-						do_action( 'give_recount_tool_descriptions' );
+						do_action('give_recount_tool_descriptions');
 						?>
-						<span id="delete-test-transactions"><?php _e( '<strong>Deletes</strong> all TEST donations, donors, and related log entries.', 'give' ); ?></span>
-						<span id="reset-stats"><?php _e( '<strong>Deletes</strong> ALL donations, donors, and related log entries regardless of test or live mode.', 'give' ); ?></span>
+						<span id="delete-test-transactions"><?php _e('<strong>Deletes</strong> all TEST donations, donors, and related log entries.', 'give'); ?></span>
+						<span id="reset-stats"><?php _e('<strong>Deletes</strong> ALL donations, donors, and related log entries regardless of test or live mode.', 'give'); ?></span>
 					</span>
 
 					<span class="spinner"></span>
@@ -109,7 +109,7 @@ 
 				 *
 				 * @since 1.5
 				 */
-				do_action( 'give_tools_recount_forms' );
+				do_action('give_tools_recount_forms');
 				?>
 			</div><!-- .inside -->
 		</div><!-- .postbox -->
@@ -120,7 +120,7 @@ 
 	 *
 	 * @since 1.5
 	 */
-	do_action( 'give_tools_recount_stats_after' );
+	do_action('give_tools_recount_stats_after');
 }
 
-add_action( 'give_reports_tab_tools', 'give_tools_recount_stats_display' );
+add_action('give_reports_tab_tools', 'give_tools_recount_stats_display');

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

Spacing +33 added lines, -33 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -106,14 +106,14 @@ 
 	 * @param $_step int The step to process
 	 * @since 1.5
 	 */
-	public function __construct( $_step = 1 ) {
+	public function __construct($_step = 1) {
 
 		$upload_dir       = wp_upload_dir();
 		$this->filetype   = '.csv';
-		$this->filename   = 'give-' . $this->export_type . $this->filetype;
-		$this->file       = trailingslashit( $upload_dir['basedir'] ) . $this->filename;
+		$this->filename   = 'give-'.$this->export_type.$this->filetype;
+		$this->file       = trailingslashit($upload_dir['basedir']).$this->filename;
 
-		if ( ! is_writeable( $upload_dir['basedir'] ) ) {
+		if ( ! is_writeable($upload_dir['basedir'])) {
 			$this->is_writable = false;
 		}
 
@@ -129,20 +129,20 @@ 
 	 */
 	public function process_step() {
 
-		if ( ! $this->can_export() ) {
-			wp_die( esc_html__( 'You do not have permission to export data.', 'give' ), esc_html__( 'Error', 'give' ), array( 'response' => 403 ) );
+		if ( ! $this->can_export()) {
+			wp_die(esc_html__('You do not have permission to export data.', 'give'), esc_html__('Error', 'give'), array('response' => 403));
 		}
 
-		if( $this->step < 2 ) {
+		if ($this->step < 2) {
 
 			// Make sure we start with a fresh file on step 1
-			@unlink( $this->file );
+			@unlink($this->file);
 			$this->print_csv_cols();
 		}
 
 		$rows = $this->print_csv_rows();
 
-		if( $rows ) {
+		if ($rows) {
 			return true;
 		} else {
 			return false;
@@ -162,14 +162,14 @@ 
 		$col_data = '';
 		$cols = $this->get_csv_cols();
 		$i = 1;
-		foreach( $cols as $col_id => $column ) {
-			$col_data .= '"' . addslashes( $column ) . '"';
-			$col_data .= $i == count( $cols ) ? '' : ',';
+		foreach ($cols as $col_id => $column) {
+			$col_data .= '"'.addslashes($column).'"';
+			$col_data .= $i == count($cols) ? '' : ',';
 			$i++;
 		}
 		$col_data .= "\r\n";
 
-		$this->stash_step_data( $col_data );
+		$this->stash_step_data($col_data);
 
 		return $col_data;
 
@@ -188,23 +188,23 @@ 
 		$data     = $this->get_data();
 		$cols     = $this->get_csv_cols();
 
-		if( $data ) {
+		if ($data) {
 
 			// Output each row
-			foreach ( $data as $row ) {
+			foreach ($data as $row) {
 				$i = 1;
-				foreach ( $row as $col_id => $column ) {
+				foreach ($row as $col_id => $column) {
 					// Make sure the column is valid
-					if ( array_key_exists( $col_id, $cols ) ) {
-						$row_data .= '"' . addslashes( preg_replace( "/\"/","'", $column ) ) . '"';
-						$row_data .= $i == count( $cols ) ? '' : ',';
+					if (array_key_exists($col_id, $cols)) {
+						$row_data .= '"'.addslashes(preg_replace("/\"/", "'", $column)).'"';
+						$row_data .= $i == count($cols) ? '' : ',';
 						$i++;
 					}
 				}
 				$row_data .= "\r\n";
 			}
 
-			$this->stash_step_data( $row_data );
+			$this->stash_step_data($row_data);
 
 			return $row_data;
 		}
@@ -232,18 +232,18 @@ 
 
 		$file = '';
 
-		if ( @file_exists( $this->file ) ) {
+		if (@file_exists($this->file)) {
 
-			if ( ! is_writeable( $this->file ) ) {
+			if ( ! is_writeable($this->file)) {
 				$this->is_writable = false;
 			}
 
-			$file = @file_get_contents( $this->file );
+			$file = @file_get_contents($this->file);
 
 		} else {
 
-			@file_put_contents( $this->file, '' );
-			@chmod( $this->file, 0664 );
+			@file_put_contents($this->file, '');
+			@chmod($this->file, 0664);
 
 		}
 
@@ -257,18 +257,18 @@ 
 	 * @param $data string The data to add to the file
 	 * @return void
 	 */
-	protected function stash_step_data( $data = '' ) {
+	protected function stash_step_data($data = '') {
 
 		$file = $this->get_file();
 		$file .= $data;
-		@file_put_contents( $this->file, $file );
+		@file_put_contents($this->file, $file);
 
 		// If we have no rows after this step, mark it as an empty export
-		$file_rows    = file( $this->file, FILE_SKIP_EMPTY_LINES);
+		$file_rows    = file($this->file, FILE_SKIP_EMPTY_LINES);
 		$default_cols = $this->get_csv_cols();
-		$default_cols = empty( $default_cols ) ? 0 : 1;
+		$default_cols = empty($default_cols) ? 0 : 1;
 
-		$this->is_empty = count( $file_rows ) == $default_cols ? true : false;
+		$this->is_empty = count($file_rows) == $default_cols ? true : false;
 
 	}
 
@@ -286,7 +286,7 @@ 
 
 		$file = $this->get_file();
 
-		@unlink( $this->file );
+		@unlink($this->file);
 
 		echo $file;
 
@@ -299,7 +299,7 @@ 
 	 * @since 1.5
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {}
+	public function set_properties($request) {}
 
 	/**
 	 * Allow for prefetching of data for the remainder of the exporter

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

Spacing +69 added lines, -69 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -46,16 +46,16 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
+	public function set_properties($request) {
 
 		//Set data from form submission
-		if ( isset( $_POST['form'] ) ) {
-			parse_str( $_POST['form'], $this->data );
+		if (isset($_POST['form'])) {
+			parse_str($_POST['form'], $this->data);
 		}
 
 		$this->form = $this->data['forms'];
 
-		$this->price_id = ! empty( $request['give_price_option'] ) && 0 !== $request['give_price_option'] ? absint( $request['give_price_option'] ) : null;
+		$this->price_id = ! empty($request['give_price_option']) && 0 !== $request['give_price_option'] ? absint($request['give_price_option']) : null;
 
 	}
 
@@ -70,14 +70,14 @@ 
 
 		$cols = array();
 
-		$columns = isset( $this->data['give_export_option'] ) ? $this->data['give_export_option'] : array();
+		$columns = isset($this->data['give_export_option']) ? $this->data['give_export_option'] : array();
 
 		//We need columns.
-		if ( empty( $columns ) ) {
+		if (empty($columns)) {
 			return false;
 		}
 
-		$cols = $this->get_cols( $columns );
+		$cols = $this->get_cols($columns);
 
 		return $cols;
 	}
@@ -85,38 +85,38 @@ 
 	/**
 	 * @param $column
 	 */
-	private function get_cols( $columns ) {
+	private function get_cols($columns) {
 
 		$cols = array();
 
-		foreach ( $columns as $key => $value ) {
+		foreach ($columns as $key => $value) {
 
-			switch ( $key ) {
+			switch ($key) {
 				case 'full_name' :
-					$cols['full_name'] = esc_html__( 'Full Name', 'give' );
+					$cols['full_name'] = esc_html__('Full Name', 'give');
 					break;
 				case 'email' :
-					$cols['email'] = esc_html__( 'Email Address', 'give' );
+					$cols['email'] = esc_html__('Email Address', 'give');
 					break;
 				case 'address' :
-					$cols['address_line1']   = esc_html__( 'Address', 'give' );
-					$cols['address_line2']   = esc_html__( 'Address 2', 'give' );
-					$cols['address_city']    = esc_html__( 'City', 'give' );
-					$cols['address_state']   = esc_html__( 'State', 'give' );
-					$cols['address_zip']     = esc_html__( 'Zip', 'give' );
-					$cols['address_country'] = esc_html__( 'Country', 'give' );
+					$cols['address_line1']   = esc_html__('Address', 'give');
+					$cols['address_line2']   = esc_html__('Address 2', 'give');
+					$cols['address_city']    = esc_html__('City', 'give');
+					$cols['address_state']   = esc_html__('State', 'give');
+					$cols['address_zip']     = esc_html__('Zip', 'give');
+					$cols['address_country'] = esc_html__('Country', 'give');
 					break;
 				case 'userid' :
-					$cols['userid'] = esc_html__( 'User ID', 'give' );
+					$cols['userid'] = esc_html__('User ID', 'give');
 					break;
 				case 'date_first_donated' :
-					$cols['date_first_donated'] = esc_html__( 'First Donation Date', 'give' );
+					$cols['date_first_donated'] = esc_html__('First Donation Date', 'give');
 					break;
 				case 'donations' :
-					$cols['donations'] = esc_html__( 'Number of Donations', 'give' );
+					$cols['donations'] = esc_html__('Number of Donations', 'give');
 					break;
 				case 'donation_sum' :
-					$cols['donation_sum'] = esc_html__( 'Sum of Donations', 'give' );
+					$cols['donation_sum'] = esc_html__('Sum of Donations', 'give');
 					break;
 			}
 		}
@@ -139,20 +139,20 @@ 
 
 		$i = 0;
 
-		if ( ! empty( $this->form ) ) {
+		if ( ! empty($this->form)) {
 
 			// Export donors of a specific product
 			global $give_logs;
 
 			$args = array(
-				'post_parent'    => absint( $this->form ),
+				'post_parent'    => absint($this->form),
 				'log_type'       => 'sale',
 				'posts_per_page' => 30,
 				'paged'          => $this->step
 			);
 
 			//Check for price option
-			if ( null !== $this->price_id ) {
+			if (null !== $this->price_id) {
 				$args['meta_query'] = array(
 					array(
 						'key'   => '_give_log_price_id',
@@ -161,33 +161,33 @@ 
 				);
 			}
 
-			$logs = $give_logs->get_connected_logs( $args );
+			$logs = $give_logs->get_connected_logs($args);
 
-			if ( $logs ) {
-				foreach ( $logs as $log ) {
-					$payment_id = get_post_meta( $log->ID, '_give_log_payment_id', true );
-					$payment    = new Give_Payment( $payment_id );
-					$donor      = Give()->customers->get_customer_by( 'id', $payment->customer_id );
-					$data[]     = $this->set_donor_data( $i, $data, $donor );
-					$i ++;
+			if ($logs) {
+				foreach ($logs as $log) {
+					$payment_id = get_post_meta($log->ID, '_give_log_payment_id', true);
+					$payment    = new Give_Payment($payment_id);
+					$donor      = Give()->customers->get_customer_by('id', $payment->customer_id);
+					$data[]     = $this->set_donor_data($i, $data, $donor);
+					$i++;
 				}
 			}
 
 		} else {
 
 			// Export all customers
-			$offset = 30 * ( $this->step - 1 );
-			$donors = Give()->customers->get_customers( array( 'number' => 30, 'offset' => $offset ) );
+			$offset = 30 * ($this->step - 1);
+			$donors = Give()->customers->get_customers(array('number' => 30, 'offset' => $offset));
 
-			foreach ( $donors as $donor ) {
+			foreach ($donors as $donor) {
 
-				$data[] = $this->set_donor_data( $i, $data, $donor );
-				$i ++;
+				$data[] = $this->set_donor_data($i, $data, $donor);
+				$i++;
 			}
 		}
 
-		$data = apply_filters( 'give_export_get_data', $data );
-		$data = apply_filters( "give_export_get_data_{$this->export_type}", $data );
+		$data = apply_filters('give_export_get_data', $data);
+		$data = apply_filters("give_export_get_data_{$this->export_type}", $data);
 
 		return $data;
 	}
@@ -203,19 +203,19 @@ 
 		$percentage = 0;
 
 		// We can't count the number when getting them for a specific form
-		if ( empty( $this->form ) ) {
+		if (empty($this->form)) {
 
 			$total = Give()->customers->count();
 
-			if ( $total > 0 ) {
+			if ($total > 0) {
 
-				$percentage = ( ( 30 * $this->step ) / $total ) * 100;
+				$percentage = ((30 * $this->step) / $total) * 100;
 
 			}
 
 		}
 
-		if ( $percentage > 100 ) {
+		if ($percentage > 100) {
 			$percentage = 100;
 		}
 
@@ -227,46 +227,46 @@ 
 	 *
 	 * @param $donor
 	 */
-	private function set_donor_data( $i, $data, $donor ) {
+	private function set_donor_data($i, $data, $donor) {
 
 		$columns = $this->csv_cols();
 
 		//Set address variable
 		$address = '';
-		if ( isset( $donor->user_id ) && $donor->user_id > 0 ) {
-			$address = give_get_donor_address( $donor->user_id );
+		if (isset($donor->user_id) && $donor->user_id > 0) {
+			$address = give_get_donor_address($donor->user_id);
 		}
 
 		//Set columns
-		if ( ! empty( $columns['full_name'] ) ) {
-			$data[ $i ]['full_name'] = $donor->name;
+		if ( ! empty($columns['full_name'])) {
+			$data[$i]['full_name'] = $donor->name;
 		}
-		if ( ! empty( $columns['email'] ) ) {
-			$data[ $i ]['email'] = $donor->email;
+		if ( ! empty($columns['email'])) {
+			$data[$i]['email'] = $donor->email;
 		}
-		if ( ! empty( $columns['address_line1'] ) ) {
-
-			$data[ $i ]['address_line1']   = isset( $address['line1'] ) ? $address['line1'] : '';
-			$data[ $i ]['address_line2']   = isset( $address['line2'] ) ? $address['line2'] : '';
-			$data[ $i ]['address_city']    = isset( $address['city'] ) ? $address['city'] : '';
-			$data[ $i ]['address_state']   = isset( $address['state'] ) ? $address['state'] : '';
-			$data[ $i ]['address_zip']     = isset( $address['zip'] ) ? $address['zip'] : '';
-			$data[ $i ]['address_country'] = isset( $address['country'] ) ? $address['country'] : '';
+		if ( ! empty($columns['address_line1'])) {
+
+			$data[$i]['address_line1']   = isset($address['line1']) ? $address['line1'] : '';
+			$data[$i]['address_line2']   = isset($address['line2']) ? $address['line2'] : '';
+			$data[$i]['address_city']    = isset($address['city']) ? $address['city'] : '';
+			$data[$i]['address_state']   = isset($address['state']) ? $address['state'] : '';
+			$data[$i]['address_zip']     = isset($address['zip']) ? $address['zip'] : '';
+			$data[$i]['address_country'] = isset($address['country']) ? $address['country'] : '';
 		}
-		if ( ! empty( $columns['userid'] ) ) {
-			$data[ $i ]['userid'] = ! empty( $donor->user_id ) ? $donor->user_id : '';
+		if ( ! empty($columns['userid'])) {
+			$data[$i]['userid'] = ! empty($donor->user_id) ? $donor->user_id : '';
 		}
-		if ( ! empty( $columns['date_first_donated'] ) ) {
-			$data[ $i ]['date_first_donated'] = date_i18n( give_date_format(), strtotime( $donor->date_created ) );
+		if ( ! empty($columns['date_first_donated'])) {
+			$data[$i]['date_first_donated'] = date_i18n(give_date_format(), strtotime($donor->date_created));
 		}
-		if ( ! empty( $columns['donations'] ) ) {
-			$data[ $i ]['donations'] = $donor->purchase_count;
+		if ( ! empty($columns['donations'])) {
+			$data[$i]['donations'] = $donor->purchase_count;
 		}
-		if ( ! empty( $columns['donation_sum'] ) ) {
-			$data[ $i ]['donation_sum'] = give_format_amount( $donor->purchase_value );
+		if ( ! empty($columns['donation_sum'])) {
+			$data[$i]['donation_sum'] = give_format_amount($donor->purchase_value);
 		}
 
-		return $data[ $i ];
+		return $data[$i];
 
 	}