WordImpress / Give

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

Spacing +55 added lines, -55 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];
 		}
 	}
 
@@ -97,11 +97,11 @@ 
 	public function get_columns() {
 		$columns = array(
 			'title'            => give_get_forms_label_singular(),
-			'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' )
+			'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 esc_attr_e( $which ); ?>">
+		<div class="tablenav give-clearfix <?php esc_attr_e($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/export/class-batch-export-customers.php

Spacing +71 added lines, -71 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,36 +70,36 @@ 
 
 		$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();
 
-		if ( empty( $columns ) ) {
+		if (empty($columns)) {
 			return false;
 		}
-		if ( ! empty( $columns['full_name'] ) ) {
-			$cols['full_name'] = esc_html__( 'Full Name', 'give' );
+		if ( ! empty($columns['full_name'])) {
+			$cols['full_name'] = esc_html__('Full Name', 'give');
 		}
-		if ( ! empty( $columns['email'] ) ) {
-			$cols['email'] = esc_html__( 'Email Address', 'give' );
+		if ( ! empty($columns['email'])) {
+			$cols['email'] = esc_html__('Email Address', 'give');
 		}
-		if ( ! empty( $columns['address'] ) ) {
-			$cols['address_line1']   = esc_html__( 'Address', 'give' );
-			$cols['address_line2']   = esc_html__( 'Address (Line 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' );
+		if ( ! empty($columns['address'])) {
+			$cols['address_line1']   = esc_html__('Address', 'give');
+			$cols['address_line2']   = esc_html__('Address (Line 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');
 		}
-		if ( ! empty( $columns['userid'] ) ) {
-			$cols['userid'] = esc_html__( 'User ID', 'give' );
+		if ( ! empty($columns['userid'])) {
+			$cols['userid'] = esc_html__('User ID', 'give');
 		}
-		if ( ! empty( $columns['date_first_donated'] ) ) {
-			$cols['date_first_donated'] = esc_html__( 'First Donation Date', 'give' );
+		if ( ! empty($columns['date_first_donated'])) {
+			$cols['date_first_donated'] = esc_html__('First Donation Date', 'give');
 		}
-		if ( ! empty( $columns['donations'] ) ) {
-			$cols['donations'] = esc_html__( 'Number of Donations', 'give' );
+		if ( ! empty($columns['donations'])) {
+			$cols['donations'] = esc_html__('Number of Donations', 'give');
 		}
-		if ( ! empty( $columns['donation_sum'] ) ) {
-			$cols['donation_sum'] = esc_html__( 'Sum of Donations', 'give' );
+		if ( ! empty($columns['donation_sum'])) {
+			$cols['donation_sum'] = esc_html__('Sum of Donations', 'give');
 		}
 
 		return $cols;
@@ -119,20 +119,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',
@@ -141,33 +141,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;
 	}
@@ -183,19 +183,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;
 		}
 
@@ -207,46 +207,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'] ) ) {
+		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'] : '';
+			$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( get_option( 'date_format' ), strtotime( $donor->date_created ) );
+		if ( ! empty($columns['date_first_donated'])) {
+			$data[$i]['date_first_donated'] = date_i18n(get_option('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];
 
 	}
 

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

Spacing +80 added lines, -80 removed lines

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

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

Spacing +33 added lines, -33 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) exit;
+if ( ! defined('ABSPATH')) exit;
 
 /**
  * Give_Batch_Export Class
@@ -104,14 +104,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;
 		}
 
@@ -127,20 +127,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;
@@ -160,14 +160,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;
 
@@ -186,23 +186,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;
 		}
@@ -230,18 +230,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);
 
 		}
 
@@ -255,18 +255,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;
 
 	}
 
@@ -284,7 +284,7 @@ 
 
 		$file = $this->get_file();
 
-		@unlink( $this->file );
+		@unlink($this->file);
 
 		echo $file;
 
@@ -297,7 +297,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/export-functions.php

Spacing +32 added lines, -32 removed lines

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

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

Spacing +28 added lines, -28 removed lines

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

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

Spacing +53 added lines, -53 removed lines

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

includes/admin/reporting/class-export.php

Spacing +27 added lines, -27 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -37,7 +37,7 @@ 
 	 * @return bool Whether we can export or not
 	 */
 	public function can_export() {
-		return (bool) apply_filters( 'give_export_capability', current_user_can( 'export_give_reports' ) );
+		return (bool) apply_filters('give_export_capability', current_user_can('export_give_reports'));
 	}
 
 	/**
@@ -48,16 +48,16 @@ 
 	 * @return void
 	 */
 	public function headers() {
-		ignore_user_abort( true );
+		ignore_user_abort(true);
 
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
+		if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+			set_time_limit(0);
 		}
 
 		nocache_headers();
-		header( 'Content-Type: text/csv; charset=utf-8' );
-		header( 'Content-Disposition: attachment; filename=give-export-' . $this->export_type . '-' . date( 'm-d-Y' ) . '.csv' );
-		header( "Expires: 0" );
+		header('Content-Type: text/csv; charset=utf-8');
+		header('Content-Disposition: attachment; filename=give-export-'.$this->export_type.'-'.date('m-d-Y').'.csv');
+		header("Expires: 0");
 	}
 
 	/**
@@ -69,8 +69,8 @@ 
 	 */
 	public function csv_cols() {
 		$cols = array(
-			'id'   => esc_html__( 'ID', 'give' ),
-			'date' => esc_html__( 'Date', 'give' )
+			'id'   => esc_html__('ID', 'give'),
+			'date' => esc_html__('Date', 'give')
 		);
 
 		return $cols;
@@ -86,7 +86,7 @@ 
 	public function get_csv_cols() {
 		$cols = $this->csv_cols();
 
-		return apply_filters( 'give_export_csv_cols_' . $this->export_type, $cols );
+		return apply_filters('give_export_csv_cols_'.$this->export_type, $cols);
 	}
 
 	/**
@@ -100,10 +100,10 @@ 
 	public function csv_cols_out() {
 		$cols = $this->get_csv_cols();
 		$i    = 1;
-		foreach ( $cols as $col_id => $column ) {
-			echo '"' . addslashes( $column ) . '"';
-			echo $i == count( $cols ) ? '' : ',';
-			$i ++;
+		foreach ($cols as $col_id => $column) {
+			echo '"'.addslashes($column).'"';
+			echo $i == count($cols) ? '' : ',';
+			$i++;
 		}
 		echo "\r\n";
 	}
@@ -120,16 +120,16 @@ 
 		$data = array(
 			0 => array(
 				'id'   => '',
-				'data' => date( 'F j, Y' )
+				'data' => date('F j, Y')
 			),
 			1 => array(
 				'id'   => '',
-				'data' => date( 'F j, Y' )
+				'data' => date('F j, Y')
 			)
 		);
 
-		$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;
 	}
@@ -147,14 +147,14 @@ 
 		$cols = $this->get_csv_cols();
 
 		// 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 ) ) {
-					echo '"' . addslashes( $column ) . '"';
-					echo $i == count( $cols ) ? '' : ',';
-					$i ++;
+				if (array_key_exists($col_id, $cols)) {
+					echo '"'.addslashes($column).'"';
+					echo $i == count($cols) ? '' : ',';
+					$i++;
 				}
 			}
 			echo "\r\n";
@@ -173,8 +173,8 @@ 
 	 * @return void
 	 */
 	public function export() {
-		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));
 		}
 
 		// Set headers

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 */
-			__( '%1$s to %2$s', 'give' ),
-			date_i18n( get_option( 'date_format' ), mktime( 0, 0, 0, 1, 1, date( 'Y' ) ) ),
-			date_i18n( get_option( 'date_format' ) )
+			__('%1$s to %2$s', 'give'),
+			date_i18n(get_option('date_format'), mktime(0, 0, 0, 1, 1, date('Y'))),
+			date_i18n(get_option('date_format'))
 		)
 	);	
 
 	$pdf = new give_pdf();
-	$pdf->AddPage( 'L', 'A4' );
+	$pdf->AddPage('L', 'A4');
 
-	$pdf->SetTitle( utf8_decode( __( 'Donation report for the current year for all forms', 'give' ) ) );
-	$pdf->SetAuthor( utf8_decode( __( 'Give - Democratizing Generosity', 'give' ) ) );
-	$pdf->SetCreator( utf8_decode( __( 'Give - Democratizing Generosity', 'give' ) ) );
+	$pdf->SetTitle(utf8_decode(__('Donation report for the current year for all forms', 'give')));
+	$pdf->SetAuthor(utf8_decode(__('Give - Democratizing Generosity', 'give')));
+	$pdf->SetCreator(utf8_decode(__('Give - Democratizing Generosity', 'give')));
 
-	$pdf->Image( GIVE_PLUGIN_URL . 'assets/images/give-logo-small.png', 247, 8 );
+	$pdf->Image(GIVE_PLUGIN_URL.'assets/images/give-logo-small.png', 247, 8);
 
-	$pdf->SetMargins( 8, 8, 8 );
-	$pdf->SetX( 8 );
+	$pdf->SetMargins(8, 8, 8);
+	$pdf->SetX(8);
 
-	$pdf->SetFont( 'Helvetica', '', 16 );
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->Cell( 0, 3, utf8_decode( __( 'Donation report for the current year for all forms', 'give' ) ), 0, 2, 'L', false );
+	$pdf->SetFont('Helvetica', '', 16);
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->Cell(0, 3, utf8_decode(__('Donation report for the current year for all forms', 'give')), 0, 2, 'L', false);
 
-	$pdf->SetFont( 'Helvetica', '', 13 );
+	$pdf->SetFont('Helvetica', '', 13);
 	$pdf->Ln();
-	$pdf->SetTextColor( 150, 150, 150 );
-	$pdf->Cell( 0, 6, utf8_decode( __( 'Date Range: ', 'give' ) ) . $daterange, 0, 2, 'L', false );
+	$pdf->SetTextColor(150, 150, 150);
+	$pdf->Cell(0, 6, utf8_decode(__('Date Range: ', 'give')).$daterange, 0, 2, 'L', false);
 	$pdf->Ln();
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->SetFont( 'Helvetica', '', 14 );
-	$pdf->Cell( 0, 10, utf8_decode( __( 'Table View', 'give' ) ), 0, 2, 'L', false );
-	$pdf->SetFont( 'Helvetica', '', 12 );
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->SetFont('Helvetica', '', 14);
+	$pdf->Cell(0, 10, utf8_decode(__('Table View', 'give')), 0, 2, 'L', false);
+	$pdf->SetFont('Helvetica', '', 12);
 
-	$pdf->SetFillColor( 238, 238, 238 );
-	$pdf->Cell( 70, 6, utf8_decode( __( 'Form Name', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 30, 6, utf8_decode( __( 'Price', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 50, 6, utf8_decode( __( 'Categories', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 50, 6, utf8_decode( __( 'Tags', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 45, 6, utf8_decode( __( 'Number of Donations', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 35, 6, utf8_decode( __( 'Income to Date', 'give' ) ), 1, 1, 'L', true );
+	$pdf->SetFillColor(238, 238, 238);
+	$pdf->Cell(70, 6, utf8_decode(__('Form Name', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(30, 6, utf8_decode(__('Price', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(50, 6, utf8_decode(__('Categories', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(50, 6, utf8_decode(__('Tags', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(45, 6, utf8_decode(__('Number of Donations', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(35, 6, utf8_decode(__('Income to Date', 'give')), 1, 1, 'L', true);
 
-	$year       = date( 'Y' );
-	$give_forms = get_posts( array( 'post_type' => 'give_forms', 'year' => $year, 'posts_per_page' => - 1 ) );
+	$year       = date('Y');
+	$give_forms = get_posts(array('post_type' => 'give_forms', 'year' => $year, 'posts_per_page' => -1));
 
-	if ( $give_forms ):
-		$pdf->SetWidths( array( 70, 30, 50, 50, 45, 35 ) );
+	if ($give_forms):
+		$pdf->SetWidths(array(70, 30, 50, 50, 45, 35));
 
-		foreach ( $give_forms as $form ):
-			$pdf->SetFillColor( 255, 255, 255 );
+		foreach ($give_forms as $form):
+			$pdf->SetFillColor(255, 255, 255);
 
 			$title = $form->post_title;
 
-			if ( give_has_variable_prices( $form->ID ) ) {
+			if (give_has_variable_prices($form->ID)) {
 
-				$prices = give_get_variable_prices( $form->ID );
+				$prices = give_get_variable_prices($form->ID);
 
 				$first = $prices[0]['_give_amount'];
-				$last  = array_pop( $prices );
+				$last  = array_pop($prices);
 				$last  = $last['_give_amount'];
 
-				if ( $first < $last ) {
+				if ($first < $last) {
 					$min = $first;
 					$max = $last;
 				} else {
@@ -108,57 +108,57 @@ 
 					$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 ) );
+		$pdf->SetWidths(array(280));
 		$title = utf8_decode(
 			sprintf(
 				/* translators: %s: form plural label */
-				__( 'No %s found.', 'give' ),
+				__('No %s found.', 'give'),
 				give_get_forms_label_plural()
 			)
 		);
-		$pdf->Row( array( $title ) );
+		$pdf->Row(array($title));
 	endif;
 
 	$pdf->Ln();
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->SetFont( 'Helvetica', '', 14 );
-	$pdf->Cell( 0, 10, utf8_decode( __( 'Graph View', 'give' ) ), 0, 2, 'L', false );
-	$pdf->SetFont( 'Helvetica', '', 12 );
-
-	$image = html_entity_decode( urldecode( give_draw_chart_image() ) );
-	$image = str_replace( ' ', '%20', $image );
-
-	$pdf->SetX( 25 );
-	$pdf->Image( $image . '&file=.png' );
-	$pdf->Ln( 7 );
-	$pdf->Output( apply_filters( 'give_sales_earnings_pdf_export_filename', 'give-report-' . date_i18n( 'Y-m-d' ) ) . '.pdf', 'D' );
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->SetFont('Helvetica', '', 14);
+	$pdf->Cell(0, 10, utf8_decode(__('Graph View', 'give')), 0, 2, 'L', false);
+	$pdf->SetFont('Helvetica', '', 12);
+
+	$image = html_entity_decode(urldecode(give_draw_chart_image()));
+	$image = str_replace(' ', '%20', $image);
+
+	$pdf->SetX(25);
+	$pdf->Image($image.'&file=.png');
+	$pdf->Ln(7);
+	$pdf->Output(apply_filters('give_sales_earnings_pdf_export_filename', 'give-report-'.date_i18n('Y-m-d')).'.pdf', 'D');
 }
 
-add_action( 'give_generate_pdf', 'give_generate_pdf' );
+add_action('give_generate_pdf', 'give_generate_pdf');
 
 /**
  * Draws Chart for PDF Report
@@ -175,38 +175,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],
@@ -219,25 +219,25 @@ 
 		$earnings_array[9],
 		$earnings_array[10],
 		$earnings_array[11]
-	) );
+	));
 
-	$data->setLegend( __( 'Income', 'give' ) );
-	$data->setColor( '1b58a3' );
-	$chart->addData( $data );
+	$data->setLegend(__('Income', 'give'));
+	$data->setColor('1b58a3');
+	$chart->addData($data);
 
-	$shape_marker = new GoogleChartShapeMarker( GoogleChartShapeMarker::CIRCLE );
-	$shape_marker->setColor( '000000' );
-	$shape_marker->setSize( 7 );
-	$shape_marker->setBorder( 2 );
-	$shape_marker->setData( $data );
-	$chart->addMarker( $shape_marker );
+	$shape_marker = new GoogleChartShapeMarker(GoogleChartShapeMarker::CIRCLE);
+	$shape_marker->setColor('000000');
+	$shape_marker->setSize(7);
+	$shape_marker->setBorder(2);
+	$shape_marker->setData($data);
+	$chart->addMarker($shape_marker);
 
-	$value_marker = new GoogleChartTextMarker( GoogleChartTextMarker::VALUE );
-	$value_marker->setColor( '000000' );
-	$value_marker->setData( $data );
-	$chart->addMarker( $value_marker );
+	$value_marker = new GoogleChartTextMarker(GoogleChartTextMarker::VALUE);
+	$value_marker->setColor('000000');
+	$value_marker->setData($data);
+	$chart->addMarker($value_marker);
 
-	$data = new GoogleChartData( array(
+	$data = new GoogleChartData(array(
 		$sales_array[0],
 		$sales_array[1],
 		$sales_array[2],
@@ -250,46 +250,46 @@ 
 		$sales_array[9],
 		$sales_array[10],
 		$sales_array[11]
-	) );
-	$data->setLegend( __( 'Donations', 'give' ) );
-	$data->setColor( 'ff6c1c' );
-	$chart->addData( $data );
-
-	$chart->setTitle( __( 'Donations by Month for all Give Forms', 'give' ), '336699', 18 );
-
-	$chart->setScale( 0, $max_earnings );
-
-	$y_axis = new GoogleChartAxis( 'y' );
-	$y_axis->setDrawTickMarks( true )->setLabels( array( 0, $max_earnings ) );
-	$chart->addAxis( $y_axis );
-
-	$x_axis = new GoogleChartAxis( 'x' );
-	$x_axis->setTickMarks( 5 );
-	$x_axis->setLabels( array(
-		__( 'Jan', 'give' ),
-		__( 'Feb', 'give' ),
-		__( 'Mar', 'give' ),
-		__( 'Apr', 'give' ),
-		__( 'May', 'give' ),
-		__( 'June', 'give' ),
-		__( 'July', 'give' ),
-		__( 'Aug', 'give' ),
-		__( 'Sept', 'give' ),
-		__( 'Oct', 'give' ),
-		__( 'Nov', 'give' ),
-		__( 'Dec', 'give' )
-	) );
-	$chart->addAxis( $x_axis );
-
-	$shape_marker = new GoogleChartShapeMarker( GoogleChartShapeMarker::CIRCLE );
-	$shape_marker->setSize( 6 );
-	$shape_marker->setBorder( 2 );
-	$shape_marker->setData( $data );
-	$chart->addMarker( $shape_marker );
-
-	$value_marker = new GoogleChartTextMarker( GoogleChartTextMarker::VALUE );
-	$value_marker->setData( $data );
-	$chart->addMarker( $value_marker );
+	));
+	$data->setLegend(__('Donations', 'give'));
+	$data->setColor('ff6c1c');
+	$chart->addData($data);
+
+	$chart->setTitle(__('Donations by Month for all Give Forms', 'give'), '336699', 18);
+
+	$chart->setScale(0, $max_earnings);
+
+	$y_axis = new GoogleChartAxis('y');
+	$y_axis->setDrawTickMarks(true)->setLabels(array(0, $max_earnings));
+	$chart->addAxis($y_axis);
+
+	$x_axis = new GoogleChartAxis('x');
+	$x_axis->setTickMarks(5);
+	$x_axis->setLabels(array(
+		__('Jan', 'give'),
+		__('Feb', 'give'),
+		__('Mar', 'give'),
+		__('Apr', 'give'),
+		__('May', 'give'),
+		__('June', 'give'),
+		__('July', 'give'),
+		__('Aug', 'give'),
+		__('Sept', 'give'),
+		__('Oct', 'give'),
+		__('Nov', 'give'),
+		__('Dec', 'give')
+	));
+	$chart->addAxis($x_axis);
+
+	$shape_marker = new GoogleChartShapeMarker(GoogleChartShapeMarker::CIRCLE);
+	$shape_marker->setSize(6);
+	$shape_marker->setBorder(2);
+	$shape_marker->setData($data);
+	$chart->addMarker($shape_marker);
+
+	$value_marker = new GoogleChartTextMarker(GoogleChartTextMarker::VALUE);
+	$value_marker->setData($data);
+	$chart->addMarker($value_marker);
 
 	return $chart->getUrl();
 }