WordImpress / Give

includes/admin/tools/export/pdf-reports.php

Indentation +41 added lines, -41 removed lines

@@ -47,8 +47,8 @@ 
 		)
 	);
 
-    $categories_enabled = give_is_setting_enabled( give_get_option( 'categories', 'disabled' ) );
-    $tags_enabled = give_is_setting_enabled( give_get_option( 'tags', 'disabled' ) );
+	$categories_enabled = give_is_setting_enabled( give_get_option( 'categories', 'disabled' ) );
+	$tags_enabled = give_is_setting_enabled( give_get_option( 'tags', 'disabled' ) );
 
 	$pdf = new give_pdf();
 	$pdf->AddPage( 'L', 'A4' );
@@ -80,15 +80,15 @@ 
 	$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 );
 
-    // Display Categories Heading only, if user has opted for it.
-    if ( $categories_enabled ) {
+	// Display Categories Heading only, if user has opted for it.
+	if ( $categories_enabled ) {
 	   $pdf->Cell( 45, 6, utf8_decode( __( 'Categories', 'give' ) ), 1, 0, 'L', true );
-    }
+	}
 
-    // Display Tags Heading only, if user has opted for it.
-    if ( $tags_enabled ) {
+	// Display Tags Heading only, if user has opted for it.
+	if ( $tags_enabled ) {
 	   $pdf->Cell( 45, 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( 45, 6, utf8_decode( __( 'Income to Date', 'give' ) ), 1, 1, 'L', true );
@@ -125,17 +125,17 @@ 
 				$price = give_currency_filter( give_get_form_price( $form->ID ), '', true );
 			}
 
-            // Display Categories Data only, if user has opted for it.
-            if ( $categories_enabled ) {
-                $categories = get_the_term_list( $form->ID, 'give_forms_category', '', ', ', '' );
-                $categories = ! is_wp_error( $categories ) ? strip_tags( $categories ) : '';
-            }
+			// Display Categories Data only, if user has opted for it.
+			if ( $categories_enabled ) {
+				$categories = get_the_term_list( $form->ID, 'give_forms_category', '', ', ', '' );
+				$categories = ! is_wp_error( $categories ) ? strip_tags( $categories ) : '';
+			}
 
-            // Display Tags Data only, if user has opted for it.
-            if ( $tags_enabled ) {
-                $tags = get_the_term_list( $form->ID, 'give_forms_tag', '', ', ', '' );
-                $tags = ! is_wp_error( $tags ) ? strip_tags( $tags ) : '';
-            }
+			// Display Tags Data only, if user has opted for it.
+			if ( $tags_enabled ) {
+				$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 );
@@ -147,38 +147,38 @@ 
 				$earnings = iconv( 'UTF-8', 'windows-1252', utf8_encode( $earnings ) );
 			}
 
-            // This will help filter data before appending it to PDF Receipt.
-            $prepare_pdf_data = array();
-            $prepare_pdf_data[] = $title;
-            $prepare_pdf_data[] = $price;
+			// This will help filter data before appending it to PDF Receipt.
+			$prepare_pdf_data = array();
+			$prepare_pdf_data[] = $title;
+			$prepare_pdf_data[] = $price;
 
-            // Append Categories Data only, if user has opted for it.
-            if ( $categories_enabled ) {
-                $prepare_pdf_data[] = $categories;
-            }
+			// Append Categories Data only, if user has opted for it.
+			if ( $categories_enabled ) {
+				$prepare_pdf_data[] = $categories;
+			}
 
-            // Append Tags Data only, if user has opted for it.
-            if ( $tags_enabled ) {
-                $prepare_pdf_data[] = $tags;
-            }
+			// Append Tags Data only, if user has opted for it.
+			if ( $tags_enabled ) {
+				$prepare_pdf_data[] = $tags;
+			}
 
-            $prepare_pdf_data[] = $sales;
-            $prepare_pdf_data[] = $earnings;
+			$prepare_pdf_data[] = $sales;
+			$prepare_pdf_data[] = $earnings;
 
 			$pdf->Row( $prepare_pdf_data );
 		endforeach;
 	} else {
 
-        // Fix: Minor Styling Alignment Issue for PDF
-        if( $categories_enabled && $tags_enabled ) {
-            $pdf->SetWidths( array( 280 ) );
-        } elseif( $categories_enabled || $tags_enabled ) {
-            $pdf->SetWidths( array( 235 ) );
-        } else {
-            $pdf->SetWidths( array( 190 ) );
-        }
+		// Fix: Minor Styling Alignment Issue for PDF
+		if( $categories_enabled && $tags_enabled ) {
+			$pdf->SetWidths( array( 280 ) );
+		} elseif( $categories_enabled || $tags_enabled ) {
+			$pdf->SetWidths( array( 235 ) );
+		} else {
+			$pdf->SetWidths( array( 190 ) );
+		}
 
-        $title = utf8_decode( __( 'No forms found.', 'give' ) );
+		$title = utf8_decode( __( 'No forms found.', 'give' ) );
 		$pdf->Row( array( $title ) );
 	}
 

Spacing +158 added lines, -158 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly..
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,94 +25,94 @@ 
  *
  * @uses   give_pdf
  */
-function give_generate_pdf( $data ) {
+function give_generate_pdf($data) {
 
-	if ( ! current_user_can( 'view_give_reports' ) ) {
-		wp_die( __( 'You do not have permission to generate PDF sales reports.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! current_user_can('view_give_reports')) {
+		wp_die(__('You do not have permission to generate PDF sales reports.', 'give'), __('Error', 'give'), array('response' => 403));
 	}
 
-	if ( ! wp_verify_nonce( $_GET['_wpnonce'], 'give_generate_pdf' ) ) {
-		wp_die( __( 'Nonce verification failed.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+	if ( ! wp_verify_nonce($_GET['_wpnonce'], 'give_generate_pdf')) {
+		wp_die(__('Nonce verification failed.', 'give'), __('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( give_date_format(), mktime( 0, 0, 0, 1, 1, date( 'Y' ) ) ),
-			date_i18n( give_date_format() )
+			__('%1$s to %2$s', 'give'),
+			date_i18n(give_date_format(), mktime(0, 0, 0, 1, 1, date('Y'))),
+			date_i18n(give_date_format())
 		)
 	);
 
-    $categories_enabled = give_is_setting_enabled( give_get_option( 'categories', 'disabled' ) );
-    $tags_enabled = give_is_setting_enabled( give_get_option( 'tags', 'disabled' ) );
+    $categories_enabled = give_is_setting_enabled(give_get_option('categories', 'disabled'));
+    $tags_enabled = give_is_setting_enabled(give_get_option('tags', 'disabled'));
 
 	$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->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);
 
     // Display Categories Heading only, if user has opted for it.
-    if ( $categories_enabled ) {
-	   $pdf->Cell( 45, 6, utf8_decode( __( 'Categories', 'give' ) ), 1, 0, 'L', true );
+    if ($categories_enabled) {
+	   $pdf->Cell(45, 6, utf8_decode(__('Categories', 'give')), 1, 0, 'L', true);
     }
 
     // Display Tags Heading only, if user has opted for it.
-    if ( $tags_enabled ) {
-	   $pdf->Cell( 45, 6, utf8_decode( __( 'Tags', 'give' ) ), 1, 0, 'L', true );
+    if ($tags_enabled) {
+	   $pdf->Cell(45, 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( 45, 6, utf8_decode( __( 'Income to Date', 'give' ) ), 1, 1, 'L', true );
+	$pdf->Cell(45, 6, utf8_decode(__('Number of Donations', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(45, 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, 45, 45, 45, 45 ) );
+	if ($give_forms) {
+		$pdf->SetWidths(array(70, 30, 45, 45, 45, 45));
 
-		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 {
@@ -120,31 +120,31 @@ 
 					$max = $first;
 				}
 
-				$price = give_currency_filter( give_format_amount( $min ), '', true ) . ' - ' . give_currency_filter( give_format_amount( $max ), '', true );
+				$price = give_currency_filter(give_format_amount($min), '', true).' - '.give_currency_filter(give_format_amount($max), '', true);
 			} else {
-				$price = give_currency_filter( give_get_form_price( $form->ID ), '', true );
+				$price = give_currency_filter(give_get_form_price($form->ID), '', true);
 			}
 
             // Display Categories Data only, if user has opted for it.
-            if ( $categories_enabled ) {
-                $categories = get_the_term_list( $form->ID, 'give_forms_category', '', ', ', '' );
-                $categories = ! is_wp_error( $categories ) ? strip_tags( $categories ) : '';
+            if ($categories_enabled) {
+                $categories = get_the_term_list($form->ID, 'give_forms_category', '', ', ', '');
+                $categories = ! is_wp_error($categories) ? strip_tags($categories) : '';
             }
 
             // Display Tags Data only, if user has opted for it.
-            if ( $tags_enabled ) {
-                $tags = get_the_term_list( $form->ID, 'give_forms_tag', '', ', ', '' );
-                $tags = ! is_wp_error( $tags ) ? strip_tags( $tags ) : '';
+            if ($tags_enabled) {
+                $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 = give_currency_filter( give_get_form_earnings_stats( $form->ID ), '', true );
+			$sales    = give_get_form_sales_stats($form->ID);
+			$link     = get_permalink($form->ID);
+			$earnings = give_currency_filter(give_get_form_earnings_stats($form->ID), '', true);
 
-			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));
 			}
 
             // This will help filter data before appending it to PDF Receipt.
@@ -153,51 +153,51 @@ 
             $prepare_pdf_data[] = $price;
 
             // Append Categories Data only, if user has opted for it.
-            if ( $categories_enabled ) {
+            if ($categories_enabled) {
                 $prepare_pdf_data[] = $categories;
             }
 
             // Append Tags Data only, if user has opted for it.
-            if ( $tags_enabled ) {
+            if ($tags_enabled) {
                 $prepare_pdf_data[] = $tags;
             }
 
             $prepare_pdf_data[] = $sales;
             $prepare_pdf_data[] = $earnings;
 
-			$pdf->Row( $prepare_pdf_data );
+			$pdf->Row($prepare_pdf_data);
 		endforeach;
 	} else {
 
         // Fix: Minor Styling Alignment Issue for PDF
-        if( $categories_enabled && $tags_enabled ) {
-            $pdf->SetWidths( array( 280 ) );
-        } elseif( $categories_enabled || $tags_enabled ) {
-            $pdf->SetWidths( array( 235 ) );
+        if ($categories_enabled && $tags_enabled) {
+            $pdf->SetWidths(array(280));
+        } elseif ($categories_enabled || $tags_enabled) {
+            $pdf->SetWidths(array(235));
         } else {
-            $pdf->SetWidths( array( 190 ) );
+            $pdf->SetWidths(array(190));
         }
 
-        $title = utf8_decode( __( 'No forms found.', 'give' ) );
-		$pdf->Row( array( $title ) );
+        $title = utf8_decode(__('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.
@@ -214,38 +214,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],
@@ -258,25 +258,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],
@@ -289,46 +289,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();
 }

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

Spacing +71 added lines, -71 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -39,30 +39,30 @@ 
 	 */
 	public function csv_cols() {
 		$cols = array(
-			'id'        => __( 'ID', 'give' ), // unaltered payment ID (use for querying).
-			'seq_id'    => __( 'Payment Number', 'give' ), // sequential payment ID.
-			'email'     => __( 'Email', 'give' ),
-			'first'     => __( 'First Name', 'give' ),
-			'last'      => __( 'Last Name', 'give' ),
-			'address1'  => __( 'Address 1', 'give' ),
-			'address2'  => __( 'Address 2', 'give' ),
-			'city'      => __( 'City', 'give' ),
-			'state'     => __( 'State', 'give' ),
-			'country'   => __( 'Country', 'give' ),
-			'zip'       => __( 'Zip / Postal Code', 'give' ),
-			'form_id'   => __( 'Form ID', 'give' ),
-			'form_name' => __( 'Form Name', 'give' ),
-			'amount'    => __( 'Amount', 'give' ) . ' (' . give_currency_symbol( '', true ) . ')',
-			'gateway'   => __( 'Payment Method', 'give' ),
-			'trans_id'  => __( 'Transaction ID', 'give' ),
-			'key'       => __( 'Key', 'give' ),
-			'date'      => __( 'Date', 'give' ),
-			'user'      => __( 'User', 'give' ),
-			'status'    => __( 'Status', 'give' )
+			'id'        => __('ID', 'give'), // unaltered payment ID (use for querying).
+			'seq_id'    => __('Payment Number', 'give'), // sequential payment ID.
+			'email'     => __('Email', 'give'),
+			'first'     => __('First Name', 'give'),
+			'last'      => __('Last Name', 'give'),
+			'address1'  => __('Address 1', 'give'),
+			'address2'  => __('Address 2', 'give'),
+			'city'      => __('City', 'give'),
+			'state'     => __('State', 'give'),
+			'country'   => __('Country', 'give'),
+			'zip'       => __('Zip / Postal Code', 'give'),
+			'form_id'   => __('Form ID', 'give'),
+			'form_name' => __('Form Name', 'give'),
+			'amount'    => __('Amount', 'give').' ('.give_currency_symbol('', true).')',
+			'gateway'   => __('Payment Method', 'give'),
+			'trans_id'  => __('Transaction ID', 'give'),
+			'key'       => __('Key', 'give'),
+			'date'      => __('Date', 'give'),
+			'user'      => __('User', 'give'),
+			'status'    => __('Status', 'give')
 		);
 
-		if ( ! give_get_option( 'enable_sequential' ) ) {
-			unset( $cols['seq_id'] );
+		if ( ! give_get_option('enable_sequential')) {
+			unset($cols['seq_id']);
 		}
 
 		return $cols;
@@ -86,12 +86,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
 				)
 			);
@@ -99,11 +99,11 @@ 
 		}
 
 		// Add category or tag to payment query if any.
-		if ( ! empty( $this->categories ) || ! empty( $this->tags ) ) {
+		if ( ! empty($this->categories) || ! empty($this->tags)) {
 			$form_args = array(
 				'post_type'      => 'give_forms',
 				'post_status'    => 'publish',
-				'posts_per_page' => - 1,
+				'posts_per_page' => -1,
 				'fields'         => 'ids',
 				'tax_query'      => array(
 					'relation' => 'AND',
@@ -111,72 +111,72 @@ 
 			);
 
 
-			if ( ! empty( $this->categories ) ) {
+			if ( ! empty($this->categories)) {
 				$form_args['tax_query'][] = array(
 					'taxonomy' => 'give_forms_category',
 					'terms'    => $this->categories,
 				);
 			}
 
-			if ( ! empty( $this->tags ) ) {
+			if ( ! empty($this->tags)) {
 				$form_args['tax_query'][] = array(
 					'taxonomy' => 'give_forms_tag',
 					'terms'    => $this->tags,
 				);
 			}
 
-			$forms = new WP_Query( $form_args );
+			$forms = new WP_Query($form_args);
 
-			if ( empty( $forms->posts ) ) {
+			if (empty($forms->posts)) {
 				return array();
 			}
 
 			$args['give_forms'] = $forms->posts;
 		}
 
-		$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'];
 
-				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'] : '',
-					'form_id'   => isset( $payment_meta['form_id'] ) ? $payment_meta['form_id'] : '',
-					'form_name' => isset( $payment_meta['form_title'] ) ? $payment_meta['form_title'] : '',
-					'amount'    => html_entity_decode( give_format_amount( $total ) ),
-					'gateway'   => give_get_gateway_admin_label( give_get_meta( $payment->ID, '_give_payment_gateway', true ) ),
-					'trans_id'  => give_get_payment_transaction_id( $payment->ID ),
+					'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'] : '',
+					'form_id'   => isset($payment_meta['form_id']) ? $payment_meta['form_id'] : '',
+					'form_name' => isset($payment_meta['form_title']) ? $payment_meta['form_title'] : '',
+					'amount'    => html_entity_decode(give_format_amount($total)),
+					'gateway'   => give_get_gateway_admin_label(give_get_meta($payment->ID, '_give_payment_gateway', true)),
+					'trans_id'  => give_get_payment_transaction_id($payment->ID),
 					'key'       => $payment_meta['key'],
 					'date'      => $payment->post_date,
-					'user'      => $user ? $user->display_name : __( 'guest', 'give' ),
-					'status'    => give_get_payment_status( $payment, true )
+					'user'      => $user ? $user->display_name : __('guest', 'give'),
+					'status'    => give_get_payment_status($payment, true)
 				);
 
 			}
 
-			$data = apply_filters( 'give_export_get_data', $data );
-			$data = apply_filters( "give_export_get_data_{$this->export_type}", $data );
+			$data = apply_filters('give_export_get_data', $data);
+			$data = apply_filters("give_export_get_data_{$this->export_type}", $data);
 
 			return $data;
 
@@ -196,27 +196,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;
 		}
 
@@ -230,11 +230,11 @@ 
 	 *
 	 * @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';
-		$this->categories = isset( $request['give_forms_categories'] ) ? give_clean( $request['give_forms_categories'] ) : array();
-		$this->tags       = isset( $request['give_forms_tags'] ) ? give_clean( $request['give_forms_tags'] ) : array();
+	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';
+		$this->categories = isset($request['give_forms_categories']) ? give_clean($request['give_forms_categories']) : array();
+		$this->tags       = isset($request['give_forms_tags']) ? give_clean($request['give_forms_tags']) : array();
 	}
 }

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

Spacing +51 added lines, -51 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -41,20 +41,20 @@ 
 	public function csv_cols() {
 
 		$cols = array(
-			'ID'                      => __( 'ID', 'give' ),
-			'post_name'               => __( 'Slug', 'give' ),
-			'post_title'              => __( 'Name', 'give' ),
-			'post_date'               => __( 'Date Created', 'give' ),
-			'post_author'             => __( 'Author', 'give' ),
-			'post_content'            => __( 'Description', 'give' ),
-			'post_excerpt'            => __( 'Excerpt', 'give' ),
-			'post_status'             => __( 'Status', 'give' ),
-			'categories'              => __( 'Categories', 'give' ),
-			'tags'                    => __( 'Tags', 'give' ),
-			'give_price'              => __( 'Price', 'give' ),
-			'_thumbnail_id'           => __( 'Featured Image', 'give' ),
-			'_give_form_sales'        => __( 'Donations', 'give' ),
-			'_give_download_earnings' => __( 'Income', 'give' ),
+			'ID'                      => __('ID', 'give'),
+			'post_name'               => __('Slug', 'give'),
+			'post_title'              => __('Name', 'give'),
+			'post_date'               => __('Date Created', 'give'),
+			'post_author'             => __('Author', 'give'),
+			'post_content'            => __('Description', 'give'),
+			'post_excerpt'            => __('Excerpt', 'give'),
+			'post_status'             => __('Status', 'give'),
+			'categories'              => __('Categories', 'give'),
+			'tags'                    => __('Tags', 'give'),
+			'give_price'              => __('Price', 'give'),
+			'_thumbnail_id'           => __('Featured Image', 'give'),
+			'_give_form_sales'        => __('Donations', 'give'),
+			'_give_download_earnings' => __('Income', 'give'),
 		);
 
 		return $cols;
@@ -84,43 +84,43 @@ 
 			'paged'          => $this->step
 		);
 
-		$forms = new WP_Query( $args );
+		$forms = new WP_Query($args);
 
-		if ( $forms->posts ) {
-			foreach ( $forms->posts as $form ) {
+		if ($forms->posts) {
+			foreach ($forms->posts as $form) {
 
 				$row = [];
 
-				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( $form->ID );
-								$row[ $key ] = wp_get_attachment_url( $image_id );
+								$image_id    = get_post_thumbnail_id($form->ID);
+								$row[$key] = wp_get_attachment_url($image_id);
 
 								break;
 
 							case 'give_price' :
 
-								if ( give_has_variable_prices( $form->ID ) ) {
+								if (give_has_variable_prices($form->ID)) {
 
 									$prices = [];
-									foreach ( give_get_variable_prices( $form->ID ) as $price ) {
-										$prices[] = $price['name'] . ': ' . $price['amount'];
+									foreach (give_get_variable_prices($form->ID) as $price) {
+										$prices[] = $price['name'].': '.$price['amount'];
 									}
 
-									$row[ $key ] = implode( ' | ', $prices );
+									$row[$key] = implode(' | ', $prices);
 
 								} else {
 
-									$row[ $key ] = give_get_form_price( $form->ID );
+									$row[$key] = give_get_form_price($form->ID);
 
 								}
 
@@ -128,44 +128,44 @@ 
 
 							default :
 
-								$row[ $key ] = give_get_meta( $form->ID, $key, TRUE );
+								$row[$key] = give_get_meta($form->ID, $key, TRUE);
 
 								break;
 
 						}
 
-					} elseif ( isset( $form->$key ) ) {
+					} elseif (isset($form->$key)) {
 
-						switch ( $key ) {
+						switch ($key) {
 
 							case 'post_author' :
 
-								$row[ $key ] = get_the_author_meta( 'user_login', $form->post_author );
+								$row[$key] = get_the_author_meta('user_login', $form->post_author);
 
 								break;
 
 							default :
 
-								$row[ $key ] = $form->$key;
+								$row[$key] = $form->$key;
 
 								break;
 						}
 
-					} elseif ( 'tags' == $key ) {
+					} elseif ('tags' == $key) {
 
-						$terms = get_the_terms( $form->ID, 'form_tag' );
-						if ( $terms ) {
-							$terms       = wp_list_pluck( $terms, 'name' );
-							$row[ $key ] = implode( ' | ', $terms );
+						$terms = get_the_terms($form->ID, 'form_tag');
+						if ($terms) {
+							$terms       = wp_list_pluck($terms, 'name');
+							$row[$key] = implode(' | ', $terms);
 						}
 
 
-					} elseif ( 'categories' == $key ) {
+					} elseif ('categories' == $key) {
 
-						$terms = get_the_terms( $form->ID, 'form_category' );
-						if ( $terms ) {
-							$terms       = wp_list_pluck( $terms, 'name' );
-							$row[ $key ] = implode( ' | ', $terms );
+						$terms = get_the_terms($form->ID, 'form_category');
+						if ($terms) {
+							$terms       = wp_list_pluck($terms, 'name');
+							$row[$key] = implode(' | ', $terms);
 						}
 
 					}
@@ -176,8 +176,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;
 
@@ -197,20 +197,20 @@ 
 
 		$args = array(
 			'post_type'      => 'give_forms',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'post_status'    => 'any',
 			'fields'         => 'ids',
 		);
 
-		$forms  = new WP_Query( $args );
+		$forms = new WP_Query($args);
 		$total      = (int) $forms->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/actions.php

Doc Comments -1 removed lines

@@ -216,7 +216,6 @@
 /**
  * Set Donation Amount for Multi Level Donation Forms
  *
- * @param int    $form_id
  * @param object $form
  *
  * @since 1.8.9

Spacing +52 added lines, -52 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,14 +25,14 @@ 
  */
 function give_get_actions() {
 
-	$_get_action = ! empty( $_GET['give_action'] ) ? $_GET['give_action'] : null;
+	$_get_action = ! empty($_GET['give_action']) ? $_GET['give_action'] : null;
 
 	// Add backward compatibility to give-action param ( $_GET )
-	if(  empty( $_get_action ) ) {
-		$_get_action = ! empty( $_GET['give-action'] ) ? $_GET['give-action'] : null;
+	if (empty($_get_action)) {
+		$_get_action = ! empty($_GET['give-action']) ? $_GET['give-action'] : null;
 	}
 
-	if ( isset( $_get_action ) ) {
+	if (isset($_get_action)) {
 		/**
 		 * Fires in WordPress init or admin init, when give_action is present in $_GET.
 		 *
@@ -40,12 +40,12 @@ 
 		 *
 		 * @param array $_GET Array of HTTP GET variables.
 		 */
-		do_action( "give_{$_get_action}", $_GET );
+		do_action("give_{$_get_action}", $_GET);
 	}
 
 }
 
-add_action( 'init', 'give_get_actions' );
+add_action('init', 'give_get_actions');
 
 /**
  * Hooks Give actions, when present in the $_POST super global. Every give_action
@@ -58,15 +58,15 @@ 
  */
 function give_post_actions() {
 
-	$_post_action = ! empty( $_POST['give_action'] ) ? $_POST['give_action'] : null;
+	$_post_action = ! empty($_POST['give_action']) ? $_POST['give_action'] : null;
 
 
 	// Add backward compatibility to give-action param ( $_POST ).
-	if(  empty( $_post_action ) ) {
-		$_post_action = ! empty( $_POST['give-action'] ) ? $_POST['give-action'] : null;
+	if (empty($_post_action)) {
+		$_post_action = ! empty($_POST['give-action']) ? $_POST['give-action'] : null;
 	}
 
-	if ( isset( $_post_action ) ) {
+	if (isset($_post_action)) {
 		/**
 		 * Fires in WordPress init or admin init, when give_action is present in $_POST.
 		 *
@@ -74,12 +74,12 @@ 
 		 *
 		 * @param array $_POST Array of HTTP POST variables.
 		 */
-		do_action( "give_{$_post_action}", $_POST );
+		do_action("give_{$_post_action}", $_POST);
 	}
 
 }
 
-add_action( 'init', 'give_post_actions' );
+add_action('init', 'give_post_actions');
 
 /**
  * Connect WordPress user with Donor.
@@ -89,28 +89,28 @@ 
  * @param  array $user_data User Data
  * @return void
  */
-function give_connect_donor_to_wpuser( $user_id, $user_data ){
+function give_connect_donor_to_wpuser($user_id, $user_data) {
 	/* @var Give_Donor $donor */
-	$donor = new Give_Donor( $user_data['user_email'] );
+	$donor = new Give_Donor($user_data['user_email']);
 
 	// Validate donor id and check if do nor is already connect to wp user or not.
-	if( $donor->id && ! $donor->user_id ) {
+	if ($donor->id && ! $donor->user_id) {
 
 		// Update donor user_id.
-		if( $donor->update( array( 'user_id' => $user_id ) ) ) {
-			$donor_note = sprintf( esc_html__( 'WordPress user #%d is connected to #%d', 'give' ), $user_id, $donor->id );
-			$donor->add_note( $donor_note );
+		if ($donor->update(array('user_id' => $user_id))) {
+			$donor_note = sprintf(esc_html__('WordPress user #%d is connected to #%d', 'give'), $user_id, $donor->id);
+			$donor->add_note($donor_note);
 
 			// Update user_id meta in payments.
-			if( ! empty( $donor->payment_ids ) && ( $donations = explode( ',', $donor->payment_ids ) ) ) {
-				foreach ( $donations as $donation  ) {
-					give_update_meta( $donation, '_give_payment_user_id', $user_id );
+			if ( ! empty($donor->payment_ids) && ($donations = explode(',', $donor->payment_ids))) {
+				foreach ($donations as $donation) {
+					give_update_meta($donation, '_give_payment_user_id', $user_id);
 				}
 			}
 		}
 	}
 }
-add_action( 'give_insert_user', 'give_connect_donor_to_wpuser', 10, 2 );
+add_action('give_insert_user', 'give_connect_donor_to_wpuser', 10, 2);
 
 
 /**
@@ -124,24 +124,24 @@ 
 function give_validate_license_when_site_migrated() {
 	// Store current site address if not already stored.
 	$homeurl = home_url();
-	if( ! get_option( 'give_site_address_before_migrate' ) ) {
+	if ( ! get_option('give_site_address_before_migrate')) {
 		// Update site address.
-		update_option( 'give_site_address_before_migrate', $homeurl );
+		update_option('give_site_address_before_migrate', $homeurl);
 
 		return;
 	}
 
-	if( $homeurl !== get_option( 'give_site_address_before_migrate' ) ) {
+	if ($homeurl !== get_option('give_site_address_before_migrate')) {
 		// Immediately run cron.
-		wp_schedule_single_event( time() , 'give_validate_license_when_site_migrated' );
+		wp_schedule_single_event(time(), 'give_validate_license_when_site_migrated');
 
 		// Update site address.
-		update_option( 'give_site_address_before_migrate', home_url() );
+		update_option('give_site_address_before_migrate', home_url());
 	}
 
 }
-add_action( 'init', 'give_validate_license_when_site_migrated' );
-add_action( 'admin_init', 'give_validate_license_when_site_migrated' );
+add_action('init', 'give_validate_license_when_site_migrated');
+add_action('admin_init', 'give_validate_license_when_site_migrated');
 
 
 /**
@@ -150,18 +150,18 @@ 
  * @since 1.8
  * @param $data
  */
-function give_donor_batch_export_complete( $data ) {
+function give_donor_batch_export_complete($data) {
 	// Remove donor ids cache.
-	if(
-		isset( $data['class'] )
+	if (
+		isset($data['class'])
 		&& 'Give_Batch_Donors_Export' === $data['class']
-		&& ! empty( $data['forms'] )
-		&& isset( $data['give_export_option']['query_id'] )
+		&& ! empty($data['forms'])
+		&& isset($data['give_export_option']['query_id'])
 	) {
-		Give_Cache::delete( Give_Cache::get_key( $data['give_export_option']['query_id'] ) );
+		Give_Cache::delete(Give_Cache::get_key($data['give_export_option']['query_id']));
 	}
 }
-add_action('give_file_export_complete', 'give_donor_batch_export_complete' );
+add_action('give_file_export_complete', 'give_donor_batch_export_complete');
 
 /**
  * Print css for wordpress setting pages.
@@ -172,12 +172,12 @@ 
 	/* @var WP_Screen $screen */
 	$screen = get_current_screen();
 
-	if( ! ( $screen instanceof WP_Screen ) ) {
+	if ( ! ($screen instanceof WP_Screen)) {
 		return false;
 	}
 
-	switch ( true ) {
-		case ( 'plugins' === $screen->base ):
+	switch (true) {
+		case ('plugins' === $screen->base):
 			?>
 			<style>
 				tr.active.update + tr.give-addon-notice-tr td{
@@ -210,7 +210,7 @@ 
 			<?php
 	}
 }
-add_action( 'admin_head', 'give_admin_quick_css' );
+add_action('admin_head', 'give_admin_quick_css');
 
 
 /**
@@ -223,25 +223,25 @@ 
  *
  * @return void
  */
-function give_set_donation_levels_max_min_amount( $form_id ) {
+function give_set_donation_levels_max_min_amount($form_id) {
 	if (
-		( 'set' === $_POST['_give_price_option'] ) ||
-		( in_array( '_give_donation_levels', $_POST ) && count( $_POST['_give_donation_levels'] ) <= 0 ) ||
-		! ( $donation_levels_amounts = wp_list_pluck( $_POST['_give_donation_levels'], '_give_amount' ) )
+		('set' === $_POST['_give_price_option']) ||
+		(in_array('_give_donation_levels', $_POST) && count($_POST['_give_donation_levels']) <= 0) ||
+		! ($donation_levels_amounts = wp_list_pluck($_POST['_give_donation_levels'], '_give_amount'))
 	) {
 		// Delete old meta.
-		give_delete_meta( $form_id, '_give_levels_minimum_amount' );
-		give_delete_meta( $form_id, '_give_levels_maximum_amount' );
+		give_delete_meta($form_id, '_give_levels_minimum_amount');
+		give_delete_meta($form_id, '_give_levels_maximum_amount');
 
 		return;
 	}
 
-	$min_amount = min( $donation_levels_amounts );
-	$max_amount = max( $donation_levels_amounts );
+	$min_amount = min($donation_levels_amounts);
+	$max_amount = max($donation_levels_amounts);
 
 	// Set Minimum and Maximum amount for Multi Level Donation Forms
-	give_update_meta( $form_id, '_give_levels_minimum_amount', $min_amount ? give_sanitize_amount( $min_amount ) : 0 );
-	give_update_meta( $form_id, '_give_levels_maximum_amount', $max_amount? give_sanitize_amount( $max_amount ) : 0 );
+	give_update_meta($form_id, '_give_levels_minimum_amount', $min_amount ? give_sanitize_amount($min_amount) : 0);
+	give_update_meta($form_id, '_give_levels_maximum_amount', $max_amount ? give_sanitize_amount($max_amount) : 0);
 }
 
-add_action( 'give_pre_process_give_forms_meta', 'give_set_donation_levels_max_min_amount', 30 );
\ No newline at end of file
+add_action('give_pre_process_give_forms_meta', 'give_set_donation_levels_max_min_amount', 30);
\ No newline at end of file

includes/admin/donors/class-donor-table.php

Doc Comments +1 added lines, -1 removed lines

@@ -253,7 +253,7 @@
 	 *
 	 * @access public
 	 * @since  1.0
-	 * @return mixed string If search is present, false otherwise.
+	 * @return string|false string If search is present, false otherwise.
 	 */
 	public function get_search() {
 		return ! empty( $_GET['s'] ) ? urldecode( trim( $_GET['s'] ) ) : false;

Spacing +65 added lines, -65 removed lines

@@ -12,13 +12,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';
 }
 
 /**
@@ -61,11 +61,11 @@ 
 	public function __construct() {
 
 		// Set parent defaults
-		parent::__construct( array(
-			'singular' => __( 'Donor', 'give' ),     // Singular name of the listed records.
-			'plural'   => __( 'Donors', 'give' ),    // Plural name of the listed records.
-			'ajax'     => false,// Does this table support ajax?.
-		) );
+		parent::__construct(array(
+			'singular' => __('Donor', 'give'), // Singular name of the listed records.
+			'plural'   => __('Donors', 'give'), // Plural name of the listed records.
+			'ajax'     => false, // Does this table support ajax?.
+		));
 
 	}
 
@@ -80,22 +80,22 @@ 
 	 *
 	 * @return void
 	 */
-	public function search_box( $text, $input_id ) {
-		$input_id = $input_id . '-search-input';
+	public function search_box($text, $input_id) {
+		$input_id = $input_id.'-search-input';
 
-		if ( ! empty( $_REQUEST['orderby'] ) ) {
-			echo '<input type="hidden" name="orderby" value="' . esc_attr( $_REQUEST['orderby'] ) . '" />';
+		if ( ! empty($_REQUEST['orderby'])) {
+			echo '<input type="hidden" name="orderby" value="'.esc_attr($_REQUEST['orderby']).'" />';
 		}
-		if ( ! empty( $_REQUEST['order'] ) ) {
-			echo '<input type="hidden" name="order" value="' . esc_attr( $_REQUEST['order'] ) . '" />';
+		if ( ! empty($_REQUEST['order'])) {
+			echo '<input type="hidden" name="order" value="'.esc_attr($_REQUEST['order']).'" />';
 		}
 		?>
 		<p class="search-box" role="search">
 			<label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
 			<input type="search" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>"/>
-			<?php submit_button( $text, 'button', false, false, array(
+			<?php submit_button($text, 'button', false, false, array(
 				'ID' => 'search-submit',
-			) ); ?>
+			)); ?>
 		</p>
 		<?php
 	}
@@ -111,27 +111,27 @@ 
 	 *
 	 * @return string Column Name.
 	 */
-	public function column_default( $donor, $column_name ) {
-		switch ( $column_name ) {
+	public function column_default($donor, $column_name) {
+		switch ($column_name) {
 
 			case 'num_donations' :
-				$value = '<a href="' . admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&donor=' . urlencode( $donor['id'] ) ) . '&status=publish' . ' ">' . esc_html( $donor['num_donations'] ) . '</a>';
+				$value = '<a href="'.admin_url('edit.php?post_type=give_forms&page=give-payment-history&donor='.urlencode($donor['id'])).'&status=publish'.' ">'.esc_html($donor['num_donations']).'</a>';
 				break;
 
 			case 'amount_spent' :
-				$value = give_currency_filter( give_format_amount( $donor[ $column_name ] ) );
+				$value = give_currency_filter(give_format_amount($donor[$column_name]));
 				break;
 
 			case 'date_created' :
-				$value = date_i18n( give_date_format(), strtotime( $donor['date_created'] ) );
+				$value = date_i18n(give_date_format(), strtotime($donor['date_created']));
 				break;
 
 			default:
-				$value = isset( $donor[ $column_name ] ) ? $donor[ $column_name ] : null;
+				$value = isset($donor[$column_name]) ? $donor[$column_name] : null;
 				break;
 		}
 
-		return apply_filters( "give_report_column_{$column_name}", $value, $donor['id'] );
+		return apply_filters("give_report_column_{$column_name}", $value, $donor['id']);
 
 	}
 
@@ -142,13 +142,13 @@ 
 	 *
 	 * @return string
 	 */
-	public function column_name( $donor ) {
-		$name     = '#' . $donor['id'] . ' ';
-		$name     .= ! empty( $donor['name'] ) ? $donor['name'] : '<em>' . esc_html__( 'Unnamed Donor', 'give' ) . '</em>';
-		$view_url = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor['id'] );
-		$actions  = $this->get_row_actions( $donor );
+	public function column_name($donor) {
+		$name     = '#'.$donor['id'].' ';
+		$name .= ! empty($donor['name']) ? $donor['name'] : '<em>'.esc_html__('Unnamed Donor', 'give').'</em>';
+		$view_url = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor['id']);
+		$actions  = $this->get_row_actions($donor);
 
-		return '<a href="' . esc_url( $view_url ) . '">' . $name . '</a>' . $this->row_actions( $actions );
+		return '<a href="'.esc_url($view_url).'">'.$name.'</a>'.$this->row_actions($actions);
 	}
 
 	/**
@@ -160,14 +160,14 @@ 
 	 */
 	public function get_columns() {
 		$columns = array(
-			'name'          => __( 'Name', 'give' ),
-			'email'         => __( 'Email', 'give' ),
-			'num_donations' => __( 'Donations', 'give' ),
-			'amount_spent'  => __( 'Total Donated', 'give' ),
-			'date_created'  => __( 'Date Created', 'give' ),
+			'name'          => __('Name', 'give'),
+			'email'         => __('Email', 'give'),
+			'num_donations' => __('Donations', 'give'),
+			'amount_spent'  => __('Total Donated', 'give'),
+			'date_created'  => __('Date Created', 'give'),
 		);
 
-		return apply_filters( 'give_list_donors_columns', $columns );
+		return apply_filters('give_list_donors_columns', $columns);
 
 	}
 
@@ -181,13 +181,13 @@ 
 	public function get_sortable_columns() {
 
 		$columns = array(
-			'date_created'  => array( 'date_created', true ),
-			'name'          => array( 'name', true ),
-			'num_donations' => array( 'purchase_count', false ),
-			'amount_spent'  => array( 'purchase_value', false ),
+			'date_created'  => array('date_created', true),
+			'name'          => array('name', true),
+			'num_donations' => array('purchase_count', false),
+			'amount_spent'  => array('purchase_value', false),
 		);
 
-		return apply_filters( 'give_list_donors_sortable_columns', $columns );
+		return apply_filters('give_list_donors_sortable_columns', $columns);
 	}
 
 	/**
@@ -200,19 +200,19 @@ 
 	 *
 	 * @return array An array of action links.
 	 */
-	public function get_row_actions( $donor ) {
+	public function get_row_actions($donor) {
 
 		$actions = array(
 
-			'view' => sprintf( '<a href="%1$s" aria-label="%2$s">%3$s</a>', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor['id'] ), sprintf( esc_attr__( 'View "%s"', 'give' ), $donor['name'] ), __( 'View Donor', 'give' ) ),
+			'view' => sprintf('<a href="%1$s" aria-label="%2$s">%3$s</a>', admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor['id']), sprintf(esc_attr__('View "%s"', 'give'), $donor['name']), __('View Donor', 'give')),
 
-			'notes' => sprintf( '<a href="%1$s" aria-label="%2$s">%3$s</a>', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=notes&id=' . $donor['id'] ), sprintf( esc_attr__( 'Notes for "%s"', 'give' ), $donor['name'] ), __( 'Notes', 'give' ) ),
+			'notes' => sprintf('<a href="%1$s" aria-label="%2$s">%3$s</a>', admin_url('edit.php?post_type=give_forms&page=give-donors&view=notes&id='.$donor['id']), sprintf(esc_attr__('Notes for "%s"', 'give'), $donor['name']), __('Notes', 'give')),
 
-			'delete' => sprintf( '<a href="%1$s" aria-label="%2$s">%3$s</a>', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $donor['id'] ), sprintf( esc_attr__( 'Delete "%s"', 'give' ), $donor['name'] ), __( 'Delete', 'give' ) ),
+			'delete' => sprintf('<a href="%1$s" aria-label="%2$s">%3$s</a>', admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$donor['id']), sprintf(esc_attr__('Delete "%s"', 'give'), $donor['name']), __('Delete', 'give')),
 
 		);
 
-		return apply_filters( 'give_donor_row_actions', $actions, $donor );
+		return apply_filters('give_donor_row_actions', $actions, $donor);
 
 	}
 
@@ -226,7 +226,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.
 	}
 
@@ -238,7 +238,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;
 	}
 
 	/**
@@ -249,7 +249,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;
 	}
 
 	/**
@@ -266,13 +266,13 @@ 
 
 		// Get donor query.
 		$args   = $this->get_donor_query();
-		$donors = Give()->donors->get_donors( $args );
+		$donors = Give()->donors->get_donors($args);
 
-		if ( $donors ) {
+		if ($donors) {
 
-			foreach ( $donors as $donor ) {
+			foreach ($donors as $donor) {
 
-				$user_id = ! empty( $donor->user_id ) ? intval( $donor->user_id ) : 0;
+				$user_id = ! empty($donor->user_id) ? intval($donor->user_id) : 0;
 
 				$data[] = array(
 					'id'            => $donor->id,
@@ -286,7 +286,7 @@ 
 			}
 		}
 
-		return apply_filters( 'give_donors_column_query_data', $data );
+		return apply_filters('give_donors_column_query_data', $data);
 	}
 
 	/**
@@ -300,9 +300,9 @@ 
 		$_donor_query = $this->get_donor_query();
 
 		$_donor_query['number'] = - 1;
-		$donors                 = Give()->donors->get_donors( $_donor_query );
+		$donors                 = Give()->donors->get_donors($_donor_query);
 
-		return count( $donors );
+		return count($donors);
 	}
 
 	/**
@@ -314,10 +314,10 @@ 
 	 */
 	public function get_donor_query() {
 		$paged   = $this->get_paged();
-		$offset  = $this->per_page * ( $paged - 1 );
+		$offset  = $this->per_page * ($paged - 1);
 		$search  = $this->get_search();
-		$order   = isset( $_GET['order'] ) ? sanitize_text_field( $_GET['order'] ) : 'DESC';
-		$orderby = isset( $_GET['orderby'] ) ? sanitize_text_field( $_GET['orderby'] ) : 'id';
+		$order   = isset($_GET['order']) ? sanitize_text_field($_GET['order']) : 'DESC';
+		$orderby = isset($_GET['orderby']) ? sanitize_text_field($_GET['orderby']) : 'id';
 
 		$args = array(
 			'number'  => $this->per_page,
@@ -326,10 +326,10 @@ 
 			'orderby' => $orderby,
 		);
 
-		if ( $search ) {
-			if ( is_email( $search ) ) {
+		if ($search) {
+			if (is_email($search)) {
 				$args['email'] = $search;
-			} elseif ( is_numeric( $search ) ) {
+			} elseif (is_numeric($search)) {
 				$args['id'] = $search;
 			} else {
 				$args['name'] = $search;
@@ -352,16 +352,16 @@ 
 		$hidden   = array(); // No hidden columns.
 		$sortable = $this->get_sortable_columns();
 
-		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->_column_headers = array($columns, $hidden, $sortable);
 
 		$this->items = $this->donor_data();
 
 		$this->total = $this->get_donor_count();
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $this->total,
 			'per_page'    => $this->per_page,
-			'total_pages' => ceil( $this->total / $this->per_page ),
-		) );
+			'total_pages' => ceil($this->total / $this->per_page),
+		));
 	}
 }

includes/admin/donors/donor-actions.php

Doc Comments +3 added lines, -3 removed lines

@@ -272,7 +272,7 @@ 
  *
  * @param  array $args The $_POST array being passed.
  *
- * @return int Whether it was a successful deletion.
+ * @return false|null Whether it was a successful deletion.
  */
 function give_donor_delete( $args ) {
 
@@ -546,7 +546,7 @@ 
  * Remove an email address to the donor from within the admin and log a donor note and redirect back to the donor interface for feedback.
  *
  * @since  1.7
- * @return bool|null
+ * @return false|null
  */
 function give_remove_donor_email() {
 	if ( empty( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
@@ -589,7 +589,7 @@ 
  * and redirect back to the donor interface for feedback
  *
  * @since  1.7
- * @return bool|null
+ * @return false|null
  */
 function give_set_donor_primary_email() {
 	if ( empty( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {

Spacing +193 added lines, -193 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -23,17 +23,17 @@ 
  *
  * @return array|bool $output Response messages
  */
-function give_edit_donor( $args ) {
+function give_edit_donor($args) {
 
-	$donor_edit_role = apply_filters( 'give_edit_donors_role', 'edit_give_payments' );
+	$donor_edit_role = apply_filters('give_edit_donors_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $donor_edit_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ), __( 'Error', 'give' ), array(
+	if ( ! is_admin() || ! current_user_can($donor_edit_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'), __('Error', 'give'), array(
 			'response' => 403,
-		) );
+		));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return false;
 	}
 
@@ -41,15 +41,15 @@ 
 	$donor_id   = (int) $args['customerinfo']['id'];
 	$nonce      = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-donor' ) ) {
-		wp_die( __( 'Cheatin’ uh?', 'give' ), __( 'Error', 'give' ), array(
+	if ( ! wp_verify_nonce($nonce, 'edit-donor')) {
+		wp_die(__('Cheatin’ uh?', 'give'), __('Error', 'give'), array(
 			'response' => 400,
-		) );
+		));
 	}
 
-	$donor = new Give_Donor( $donor_id );
+	$donor = new Give_Donor($donor_id);
 
-	if ( empty( $donor->id ) ) {
+	if (empty($donor->id)) {
 		return false;
 	}
 
@@ -58,70 +58,70 @@ 
 		'user_id' => 0,
 	);
 
-	$donor_info = wp_parse_args( $donor_info, $defaults );
+	$donor_info = wp_parse_args($donor_info, $defaults);
 
-	if ( (int) $donor_info['user_id'] !== (int) $donor->user_id ) {
+	if ((int) $donor_info['user_id'] !== (int) $donor->user_id) {
 
 		// Make sure we don't already have this user attached to a donor.
-		if ( ! empty( $donor_info['user_id'] ) && false !== Give()->donors->get_donor_by( 'user_id', $donor_info['user_id'] ) ) {
-			give_set_error( 'give-invalid-donor-user_id', sprintf( __( 'The User ID #%d is already associated with a different donor.', 'give' ), $donor_info['user_id'] ) );
+		if ( ! empty($donor_info['user_id']) && false !== Give()->donors->get_donor_by('user_id', $donor_info['user_id'])) {
+			give_set_error('give-invalid-donor-user_id', sprintf(__('The User ID #%d is already associated with a different donor.', 'give'), $donor_info['user_id']));
 		}
 
 		// Make sure it's actually a user.
-		$user = get_user_by( 'id', $donor_info['user_id'] );
-		if ( ! empty( $donor_info['user_id'] ) && false === $user ) {
-			give_set_error( 'give-invalid-user_id', sprintf( __( 'The User ID #%d does not exist. Please assign an existing user.', 'give' ), $donor_info['user_id'] ) );
+		$user = get_user_by('id', $donor_info['user_id']);
+		if ( ! empty($donor_info['user_id']) && false === $user) {
+			give_set_error('give-invalid-user_id', sprintf(__('The User ID #%d does not exist. Please assign an existing user.', 'give'), $donor_info['user_id']));
 		}
 	}
 
 	// Record this for later.
 	$previous_user_id = $donor->user_id;
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return false;
 	}
 
 	// Setup the donor address, if present.
 	$address = array();
-	if ( intval( $donor_info['user_id'] ) > 0 ) {
+	if (intval($donor_info['user_id']) > 0) {
 
-		$current_address = get_user_meta( $donor_info['user_id'], '_give_user_address', true );
+		$current_address = get_user_meta($donor_info['user_id'], '_give_user_address', true);
 
-		if ( false === $current_address ) {
-			$address['line1']   = isset( $donor_info['line1'] ) ? $donor_info['line1'] : '';
-			$address['line2']   = isset( $donor_info['line2'] ) ? $donor_info['line2'] : '';
-			$address['city']    = isset( $donor_info['city'] ) ? $donor_info['city'] : '';
-			$address['country'] = isset( $donor_info['country'] ) ? $donor_info['country'] : '';
-			$address['zip']     = isset( $donor_info['zip'] ) ? $donor_info['zip'] : '';
-			$address['state']   = isset( $donor_info['state'] ) ? $donor_info['state'] : '';
+		if (false === $current_address) {
+			$address['line1']   = isset($donor_info['line1']) ? $donor_info['line1'] : '';
+			$address['line2']   = isset($donor_info['line2']) ? $donor_info['line2'] : '';
+			$address['city']    = isset($donor_info['city']) ? $donor_info['city'] : '';
+			$address['country'] = isset($donor_info['country']) ? $donor_info['country'] : '';
+			$address['zip']     = isset($donor_info['zip']) ? $donor_info['zip'] : '';
+			$address['state']   = isset($donor_info['state']) ? $donor_info['state'] : '';
 		} else {
-			$current_address    = wp_parse_args( $current_address, array(
+			$current_address    = wp_parse_args($current_address, array(
 				'line1',
 				'line2',
 				'city',
 				'zip',
 				'state',
 				'country',
-			) );
-			$address['line1']   = isset( $donor_info['line1'] ) ? $donor_info['line1'] : $current_address['line1'];
-			$address['line2']   = isset( $donor_info['line2'] ) ? $donor_info['line2'] : $current_address['line2'];
-			$address['city']    = isset( $donor_info['city'] ) ? $donor_info['city'] : $current_address['city'];
-			$address['country'] = isset( $donor_info['country'] ) ? $donor_info['country'] : $current_address['country'];
-			$address['zip']     = isset( $donor_info['zip'] ) ? $donor_info['zip'] : $current_address['zip'];
-			$address['state']   = isset( $donor_info['state'] ) ? $donor_info['state'] : $current_address['state'];
+			));
+			$address['line1']   = isset($donor_info['line1']) ? $donor_info['line1'] : $current_address['line1'];
+			$address['line2']   = isset($donor_info['line2']) ? $donor_info['line2'] : $current_address['line2'];
+			$address['city']    = isset($donor_info['city']) ? $donor_info['city'] : $current_address['city'];
+			$address['country'] = isset($donor_info['country']) ? $donor_info['country'] : $current_address['country'];
+			$address['zip']     = isset($donor_info['zip']) ? $donor_info['zip'] : $current_address['zip'];
+			$address['state']   = isset($donor_info['state']) ? $donor_info['state'] : $current_address['state'];
 		}
 	}
 
 	// Sanitize the inputs
 	$donor_data            = array();
-	$donor_data['name']    = strip_tags( stripslashes( $donor_info['name'] ) );
+	$donor_data['name']    = strip_tags(stripslashes($donor_info['name']));
 	$donor_data['user_id'] = $donor_info['user_id'];
 
-	$donor_data = apply_filters( 'give_edit_donor_info', $donor_data, $donor_id );
-	$address    = apply_filters( 'give_edit_donor_address', $address, $donor_id );
+	$donor_data = apply_filters('give_edit_donor_info', $donor_data, $donor_id);
+	$address    = apply_filters('give_edit_donor_address', $address, $donor_id);
 
-	$donor_data = array_map( 'sanitize_text_field', $donor_data );
-	$address    = array_map( 'sanitize_text_field', $address );
+	$donor_data = array_map('sanitize_text_field', $donor_data);
+	$address    = array_map('sanitize_text_field', $address);
 
 	/**
 	 * Fires before editing a donor.
@@ -132,27 +132,27 @@ 
 	 * @param array $donor_data The donor data.
 	 * @param array $address    The donor's address.
 	 */
-	do_action( 'give_pre_edit_donor', $donor_id, $donor_data, $address );
+	do_action('give_pre_edit_donor', $donor_id, $donor_data, $address);
 
 	$output = array();
 
-	if ( $donor->update( $donor_data ) ) {
+	if ($donor->update($donor_data)) {
 
-		if ( ! empty( $donor->user_id ) && $donor->user_id > 0 ) {
-			update_user_meta( $donor->user_id, '_give_user_address', $address );
+		if ( ! empty($donor->user_id) && $donor->user_id > 0) {
+			update_user_meta($donor->user_id, '_give_user_address', $address);
 		}
 
 		// Update some donation meta if we need to.
-		$payments_array = explode( ',', $donor->payment_ids );
+		$payments_array = explode(',', $donor->payment_ids);
 
-		if ( $donor->user_id != $previous_user_id ) {
-			foreach ( $payments_array as $payment_id ) {
-				give_update_payment_meta( $payment_id, '_give_payment_user_id', $donor->user_id );
+		if ($donor->user_id != $previous_user_id) {
+			foreach ($payments_array as $payment_id) {
+				give_update_payment_meta($payment_id, '_give_payment_user_id', $donor->user_id);
 			}
 		}
 
 		$output['success']       = true;
-		$donor_data              = array_merge( $donor_data, $address );
+		$donor_data              = array_merge($donor_data, $address);
 		$output['customer_info'] = $donor_data;
 
 	} else {
@@ -169,11 +169,11 @@ 
 	 * @param int   $donor_id   The ID of the donor.
 	 * @param array $donor_data The donor data.
 	 */
-	do_action( 'give_post_edit_donor', $donor_id, $donor_data );
+	do_action('give_post_edit_donor', $donor_id, $donor_data);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -181,7 +181,7 @@ 
 
 }
 
-add_action( 'give_edit-donor', 'give_edit_donor', 10, 1 );
+add_action('give_edit-donor', 'give_edit_donor', 10, 1);
 
 /**
  * Save a donor note.
@@ -192,40 +192,40 @@ 
  *
  * @return int         The Note ID that was saved, or 0 if nothing was saved.
  */
-function give_donor_save_note( $args ) {
+function give_donor_save_note($args) {
 
-	$donor_view_role = apply_filters( 'give_view_donors_role', 'view_give_reports' );
+	$donor_view_role = apply_filters('give_view_donors_role', 'view_give_reports');
 
-	if ( ! is_admin() || ! current_user_can( $donor_view_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ), __( 'Error', 'give' ), array(
+	if ( ! is_admin() || ! current_user_can($donor_view_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'), __('Error', 'give'), array(
 			'response' => 403,
-		) );
+		));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return false;
 	}
 
-	$donor_note = trim( sanitize_text_field( $args['donor_note'] ) );
+	$donor_note = trim(sanitize_text_field($args['donor_note']));
 	$donor_id   = (int) $args['customer_id'];
 	$nonce      = $args['add_donor_note_nonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'add-donor-note' ) ) {
-		wp_die( __( 'Cheatin’ uh?', 'give' ), __( 'Error', 'give' ), array(
+	if ( ! wp_verify_nonce($nonce, 'add-donor-note')) {
+		wp_die(__('Cheatin’ uh?', 'give'), __('Error', 'give'), array(
 			'response' => 400,
-		) );
+		));
 	}
 
-	if ( empty( $donor_note ) ) {
-		give_set_error( 'empty-donor-note', __( 'A note is required.', 'give' ) );
+	if (empty($donor_note)) {
+		give_set_error('empty-donor-note', __('A note is required.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
+	if (give_get_errors()) {
 		return false;
 	}
 
-	$donor    = new Give_Donor( $donor_id );
-	$new_note = $donor->add_note( $donor_note );
+	$donor    = new Give_Donor($donor_id);
+	$new_note = $donor->add_note($donor_note);
 
 	/**
 	 * Fires before inserting donor note.
@@ -235,22 +235,22 @@ 
 	 * @param int    $donor_id The ID of the donor.
 	 * @param string $new_note Note content.
 	 */
-	do_action( 'give_pre_insert_donor_note', $donor_id, $new_note );
+	do_action('give_pre_insert_donor_note', $donor_id, $new_note);
 
-	if ( ! empty( $new_note ) && ! empty( $donor->id ) ) {
+	if ( ! empty($new_note) && ! empty($donor->id)) {
 
 		ob_start();
 		?>
 		<div class="donor-note-wrapper dashboard-comment-wrap comment-item">
 			<span class="note-content-wrap">
-				<?php echo stripslashes( $new_note ); ?>
+				<?php echo stripslashes($new_note); ?>
 			</span>
 		</div>
 		<?php
 		$output = ob_get_contents();
 		ob_end_clean();
 
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			echo $output;
 			exit;
 		}
@@ -263,7 +263,7 @@ 
 
 }
 
-add_action( 'give_add-donor-note', 'give_donor_save_note', 10, 1 );
+add_action('give_add-donor-note', 'give_donor_save_note', 10, 1);
 
 /**
  * Delete a donor.
@@ -274,41 +274,41 @@ 
  *
  * @return int Whether it was a successful deletion.
  */
-function give_donor_delete( $args ) {
+function give_donor_delete($args) {
 
-	$donor_edit_role = apply_filters( 'give_edit_donors_role', 'edit_give_payments' );
+	$donor_edit_role = apply_filters('give_edit_donors_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $donor_edit_role ) ) {
-		wp_die( __( 'You do not have permission to delete donors.', 'give' ), __( 'Error', 'give' ), array(
+	if ( ! is_admin() || ! current_user_can($donor_edit_role)) {
+		wp_die(__('You do not have permission to delete donors.', 'give'), __('Error', 'give'), array(
 			'response' => 403,
-		) );
+		));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return false;
 	}
 
 	$donor_id    = (int) $args['customer_id'];
-	$confirm     = ! empty( $args['give-donor-delete-confirm'] ) ? true : false;
-	$remove_data = ! empty( $args['give-donor-delete-records'] ) ? true : false;
+	$confirm     = ! empty($args['give-donor-delete-confirm']) ? true : false;
+	$remove_data = ! empty($args['give-donor-delete-records']) ? true : false;
 	$nonce       = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'delete-donor' ) ) {
-		wp_die( __( 'Cheatin&#8217; uh?', 'give' ), __( 'Error', 'give' ), array(
+	if ( ! wp_verify_nonce($nonce, 'delete-donor')) {
+		wp_die(__('Cheatin&#8217; uh?', 'give'), __('Error', 'give'), array(
 			'response' => 400,
-		) );
+		));
 	}
 
-	if ( ! $confirm ) {
-		give_set_error( 'donor-delete-no-confirm', __( 'Please confirm you want to delete this donor.', 'give' ) );
+	if ( ! $confirm) {
+		give_set_error('donor-delete-no-confirm', __('Please confirm you want to delete this donor.', 'give'));
 	}
 
-	if ( give_get_errors() ) {
-		wp_redirect( admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor_id ) );
+	if (give_get_errors()) {
+		wp_redirect(admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor_id));
 		exit;
 	}
 
-	$donor = new Give_Donor( $donor_id );
+	$donor = new Give_Donor($donor_id);
 
 	/**
 	 * Fires before deleting donor.
@@ -319,50 +319,50 @@ 
 	 * @param bool $confirm     Delete confirmation.
 	 * @param bool $remove_data Records delete confirmation.
 	 */
-	do_action( 'give_pre_delete_donor', $donor_id, $confirm, $remove_data );
+	do_action('give_pre_delete_donor', $donor_id, $confirm, $remove_data);
 
-	if ( $donor->id > 0 ) {
+	if ($donor->id > 0) {
 
-		$payments_array = explode( ',', $donor->payment_ids );
-		$success        = Give()->donors->delete( $donor->id );
+		$payments_array = explode(',', $donor->payment_ids);
+		$success        = Give()->donors->delete($donor->id);
 
-		if ( $success ) {
+		if ($success) {
 
-			if ( $remove_data ) {
+			if ($remove_data) {
 
 				// Remove all donations, logs, etc
-				foreach ( $payments_array as $payment_id ) {
-					give_delete_donation( $payment_id );
+				foreach ($payments_array as $payment_id) {
+					give_delete_donation($payment_id);
 				}
 			} else {
 
 				// Just set the donations to customer_id of 0
-				foreach ( $payments_array as $payment_id ) {
-					give_update_payment_meta( $payment_id, '_give_payment_customer_id', 0 );
+				foreach ($payments_array as $payment_id) {
+					give_update_payment_meta($payment_id, '_give_payment_customer_id', 0);
 				}
 			}
 
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&give-message=donor-deleted' );
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&give-message=donor-deleted');
 
 		} else {
 
-			give_set_error( 'give-donor-delete-failed', esc_html__( 'Error deleting donor.', 'give' ) );
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=delete&id=' . $donor_id );
+			give_set_error('give-donor-delete-failed', esc_html__('Error deleting donor.', 'give'));
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&view=delete&id='.$donor_id);
 
 		}
 	} else {
 
-		give_set_error( 'give-donor-delete-invalid-id', esc_html__( 'Invalid Donor ID.', 'give' ) );
-		$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors' );
+		give_set_error('give-donor-delete-invalid-id', esc_html__('Invalid Donor ID.', 'give'));
+		$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors');
 
 	}
 
-	wp_redirect( $redirect );
+	wp_redirect($redirect);
 	exit;
 
 }
 
-add_action( 'give_delete-donor', 'give_donor_delete', 10, 1 );
+add_action('give_delete-donor', 'give_donor_delete', 10, 1);
 
 /**
  * Disconnect a user ID from a donor
@@ -373,17 +373,17 @@ 
  *
  * @return bool|array        If the disconnect was successful.
  */
-function give_disconnect_donor_user_id( $args ) {
+function give_disconnect_donor_user_id($args) {
 
-	$donor_edit_role = apply_filters( 'give_edit_donors_role', 'edit_give_payments' );
+	$donor_edit_role = apply_filters('give_edit_donors_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $donor_edit_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'give' ), __( 'Error', 'give' ), array(
+	if ( ! is_admin() || ! current_user_can($donor_edit_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'give'), __('Error', 'give'), array(
 			'response' => 403,
-		) );
+		));
 	}
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		return false;
 	}
 
@@ -391,14 +391,14 @@ 
 
 	$nonce = $args['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'edit-donor' ) ) {
-		wp_die( __( 'Cheatin&#8217; uh?', 'give' ), __( 'Error', 'give' ), array(
+	if ( ! wp_verify_nonce($nonce, 'edit-donor')) {
+		wp_die(__('Cheatin&#8217; uh?', 'give'), __('Error', 'give'), array(
 			'response' => 400,
-		) );
+		));
 	}
 
-	$donor = new Give_Donor( $donor_id );
-	if ( empty( $donor->id ) ) {
+	$donor = new Give_Donor($donor_id);
+	if (empty($donor->id)) {
 		return false;
 	}
 
@@ -412,18 +412,18 @@ 
 	 * @param int $donor_id The ID of the donor.
 	 * @param int $user_id  The ID of the user.
 	 */
-	do_action( 'give_pre_donor_disconnect_user_id', $donor_id, $user_id );
+	do_action('give_pre_donor_disconnect_user_id', $donor_id, $user_id);
 
 	$output     = array();
 	$donor_args = array(
 		'user_id' => 0,
 	);
 
-	if ( $donor->update( $donor_args ) ) {
+	if ($donor->update($donor_args)) {
 		global $wpdb;
 
-		if ( ! empty( $donor->payment_ids ) ) {
-			$wpdb->query( "UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $donor->payment_ids )" );
+		if ( ! empty($donor->payment_ids)) {
+			$wpdb->query("UPDATE $wpdb->postmeta SET meta_value = 0 WHERE meta_key = '_give_payment_user_id' AND post_id IN ( $donor->payment_ids )");
 		}
 
 		$output['success'] = true;
@@ -431,7 +431,7 @@ 
 	} else {
 
 		$output['success'] = false;
-		give_set_error( 'give-disconnect-user-fail', __( 'Failed to disconnect user from donor.', 'give' ) );
+		give_set_error('give-disconnect-user-fail', __('Failed to disconnect user from donor.', 'give'));
 	}
 
 	/**
@@ -441,11 +441,11 @@ 
 	 *
 	 * @param int $donor_id The ID of the donor.
 	 */
-	do_action( 'give_post_donor_disconnect_user_id', $donor_id );
+	do_action('give_post_donor_disconnect_user_id', $donor_id);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
@@ -453,7 +453,7 @@ 
 
 }
 
-add_action( 'give_disconnect-userid', 'give_disconnect_donor_user_id', 10, 1 );
+add_action('give_disconnect-userid', 'give_disconnect_donor_user_id', 10, 1);
 
 /**
  * Add an email address to the donor from within the admin and log a donor note.
@@ -464,82 +464,82 @@ 
  *
  * @return mixed        If DOING_AJAX echos out JSON, otherwise returns array of success (bool) and message (string).
  */
-function give_add_donor_email( $args ) {
-	$donor_edit_role = apply_filters( 'give_edit_donors_role', 'edit_give_payments' );
+function give_add_donor_email($args) {
+	$donor_edit_role = apply_filters('give_edit_donors_role', 'edit_give_payments');
 
-	if ( ! is_admin() || ! current_user_can( $donor_edit_role ) ) {
-		wp_die( __( 'You do not have permission to edit this donor.', 'edit' ) );
+	if ( ! is_admin() || ! current_user_can($donor_edit_role)) {
+		wp_die(__('You do not have permission to edit this donor.', 'edit'));
 	}
 
 	$output = array();
-	if ( empty( $args ) || empty( $args['email'] ) || empty( $args['customer_id'] ) ) {
+	if (empty($args) || empty($args['email']) || empty($args['customer_id'])) {
 		$output['success'] = false;
-		if ( empty( $args['email'] ) ) {
-			$output['message'] = __( 'Email address is required.', 'give' );
-		} elseif ( empty( $args['customer_id'] ) ) {
-			$output['message'] = __( 'Donor ID is required.', 'give' );
+		if (empty($args['email'])) {
+			$output['message'] = __('Email address is required.', 'give');
+		} elseif (empty($args['customer_id'])) {
+			$output['message'] = __('Donor ID is required.', 'give');
 		} else {
-			$output['message'] = __( 'An error has occurred. Please try again.', 'give' );
+			$output['message'] = __('An error has occurred. Please try again.', 'give');
 		}
-	} elseif ( ! wp_verify_nonce( $args['_wpnonce'], 'give_add_donor_email' ) ) {
+	} elseif ( ! wp_verify_nonce($args['_wpnonce'], 'give_add_donor_email')) {
 		$output = array(
 			'success' => false,
-			'message' => esc_html__( 'Nonce verification failed.', 'give' ),
+			'message' => esc_html__('Nonce verification failed.', 'give'),
 		);
-	} elseif ( ! is_email( $args['email'] ) ) {
+	} elseif ( ! is_email($args['email'])) {
 		$output = array(
 			'success' => false,
-			'message' => esc_html__( 'Invalid email.', 'give' ),
+			'message' => esc_html__('Invalid email.', 'give'),
 		);
 	} else {
-		$email    = sanitize_email( $args['email'] );
+		$email    = sanitize_email($args['email']);
 		$donor_id = (int) $args['customer_id'];
 		$primary  = 'true' === $args['primary'] ? true : false;
-		$donor    = new Give_Donor( $donor_id );
-		if ( false === $donor->add_email( $email, $primary ) ) {
-			if ( in_array( $email, $donor->emails ) ) {
+		$donor    = new Give_Donor($donor_id);
+		if (false === $donor->add_email($email, $primary)) {
+			if (in_array($email, $donor->emails)) {
 				$output = array(
 					'success' => false,
-					'message' => __( 'Email already associated with this donor.', 'give' ),
+					'message' => __('Email already associated with this donor.', 'give'),
 				);
 			} else {
 				$output = array(
 					'success' => false,
-					'message' => __( 'Email address is already associated with another donor.', 'give' ),
+					'message' => __('Email address is already associated with another donor.', 'give'),
 				);
 			}
 		} else {
-			$redirect = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor_id . '&give-message=email-added' );
+			$redirect = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor_id.'&give-message=email-added');
 			$output   = array(
 				'success'  => true,
-				'message'  => __( 'Email successfully added to donor.', 'give' ),
+				'message'  => __('Email successfully added to donor.', 'give'),
 				'redirect' => $redirect,
 			);
 
 			$user       = wp_get_current_user();
-			$user_login = ! empty( $user->user_login ) ? $user->user_login : __( 'System', 'give' );
-			$donor_note = sprintf( __( 'Email address %1$s added by %2$s', 'give' ), $email, $user_login );
-			$donor->add_note( $donor_note );
+			$user_login = ! empty($user->user_login) ? $user->user_login : __('System', 'give');
+			$donor_note = sprintf(__('Email address %1$s added by %2$s', 'give'), $email, $user_login);
+			$donor->add_note($donor_note);
 
-			if ( $primary ) {
-				$donor_note = sprintf( __( 'Email address %1$s set as primary by %2$s', 'give' ), $email, $user_login );
-				$donor->add_note( $donor_note );
+			if ($primary) {
+				$donor_note = sprintf(__('Email address %1$s set as primary by %2$s', 'give'), $email, $user_login);
+				$donor->add_note($donor_note);
 			}
 		}
 	}// End if().
 
-	do_action( 'give_post_add_donor_email', $donor_id, $args );
+	do_action('give_post_add_donor_email', $donor_id, $args);
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
-		header( 'Content-Type: application/json' );
-		echo json_encode( $output );
+	if (defined('DOING_AJAX') && DOING_AJAX) {
+		header('Content-Type: application/json');
+		echo json_encode($output);
 		wp_die();
 	}
 
 	return $output;
 }
 
-add_action( 'give_add_donor_email', 'give_add_donor_email', 10, 1 );
+add_action('give_add_donor_email', 'give_add_donor_email', 10, 1);
 
 
 /**
@@ -549,39 +549,39 @@ 
  * @return bool|null
  */
 function give_remove_donor_email() {
-	if ( empty( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
+	if (empty($_GET['id']) || ! is_numeric($_GET['id'])) {
 		return false;
 	}
-	if ( empty( $_GET['email'] ) || ! is_email( $_GET['email'] ) ) {
+	if (empty($_GET['email']) || ! is_email($_GET['email'])) {
 		return false;
 	}
-	if ( empty( $_GET['_wpnonce'] ) ) {
+	if (empty($_GET['_wpnonce'])) {
 		return false;
 	}
 
 	$nonce = $_GET['_wpnonce'];
-	if ( ! wp_verify_nonce( $nonce, 'give-remove-donor-email' ) ) {
-		wp_die( esc_html__( 'Nonce verification failed', 'give' ), esc_html__( 'Error', 'give' ), array(
+	if ( ! wp_verify_nonce($nonce, 'give-remove-donor-email')) {
+		wp_die(esc_html__('Nonce verification failed', 'give'), esc_html__('Error', 'give'), array(
 			'response' => 403,
-		) );
+		));
 	}
 
-	$donor = new Give_Donor( $_GET['id'] );
-	if ( $donor->remove_email( $_GET['email'] ) ) {
-		$url        = add_query_arg( 'give-message', 'email-removed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
+	$donor = new Give_Donor($_GET['id']);
+	if ($donor->remove_email($_GET['email'])) {
+		$url        = add_query_arg('give-message', 'email-removed', admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id));
 		$user       = wp_get_current_user();
-		$user_login = ! empty( $user->user_login ) ? $user->user_login : __( 'System', 'give' );
-		$donor_note = sprintf( __( 'Email address %1$s removed by %2$s', 'give' ), $_GET['email'], $user_login );
-		$donor->add_note( $donor_note );
+		$user_login = ! empty($user->user_login) ? $user->user_login : __('System', 'give');
+		$donor_note = sprintf(__('Email address %1$s removed by %2$s', 'give'), $_GET['email'], $user_login);
+		$donor->add_note($donor_note);
 	} else {
-		$url = add_query_arg( 'give-message', 'email-remove-failed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
+		$url = add_query_arg('give-message', 'email-remove-failed', admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id));
 	}
 
-	wp_safe_redirect( $url );
+	wp_safe_redirect($url);
 	exit;
 }
 
-add_action( 'give_remove_donor_email', 'give_remove_donor_email', 10 );
+add_action('give_remove_donor_email', 'give_remove_donor_email', 10);
 
 
 /**
@@ -592,41 +592,41 @@ 
  * @return bool|null
  */
 function give_set_donor_primary_email() {
-	if ( empty( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
+	if (empty($_GET['id']) || ! is_numeric($_GET['id'])) {
 		return false;
 	}
 
-	if ( empty( $_GET['email'] ) || ! is_email( $_GET['email'] ) ) {
+	if (empty($_GET['email']) || ! is_email($_GET['email'])) {
 		return false;
 	}
 
-	if ( empty( $_GET['_wpnonce'] ) ) {
+	if (empty($_GET['_wpnonce'])) {
 		return false;
 	}
 
 	$nonce = $_GET['_wpnonce'];
 
-	if ( ! wp_verify_nonce( $nonce, 'give-set-donor-primary-email' ) ) {
-		wp_die( esc_html__( 'Nonce verification failed', 'give' ), esc_html__( 'Error', 'give' ), array(
+	if ( ! wp_verify_nonce($nonce, 'give-set-donor-primary-email')) {
+		wp_die(esc_html__('Nonce verification failed', 'give'), esc_html__('Error', 'give'), array(
 			'response' => 403,
-		) );
+		));
 	}
 
-	$donor = new Give_Donor( $_GET['id'] );
+	$donor = new Give_Donor($_GET['id']);
 
-	if ( $donor->set_primary_email( $_GET['email'] ) ) {
-		$url        = add_query_arg( 'give-message', 'primary-email-updated', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
+	if ($donor->set_primary_email($_GET['email'])) {
+		$url        = add_query_arg('give-message', 'primary-email-updated', admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id));
 		$user       = wp_get_current_user();
-		$user_login = ! empty( $user->user_login ) ? $user->user_login : esc_html__( 'System', 'give' );
-		$donor_note = sprintf( __( 'Email address %1$s set as primary by %2$s', 'give' ), $_GET['email'], $user_login );
+		$user_login = ! empty($user->user_login) ? $user->user_login : esc_html__('System', 'give');
+		$donor_note = sprintf(__('Email address %1$s set as primary by %2$s', 'give'), $_GET['email'], $user_login);
 
-		$donor->add_note( $donor_note );
+		$donor->add_note($donor_note);
 	} else {
-		$url = add_query_arg( 'give-message', 'primary-email-failed', admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $donor->id ) );
+		$url = add_query_arg('give-message', 'primary-email-failed', admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$donor->id));
 	}
 
-	wp_safe_redirect( $url );
+	wp_safe_redirect($url);
 	exit;
 }
 
-add_action( 'give_set_donor_primary_email', 'give_set_donor_primary_email', 10 );
+add_action('give_set_donor_primary_email', 'give_set_donor_primary_email', 10);

includes/admin/tools/data/class-give-tools-recount-donor-stats.php

Doc Comments +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 	 * @access public
 	 * @since 1.5
 	 *
-	 * @return array $data The data for the CSV file
+	 * @return boolean $data The data for the CSV file
 	 */
 	public function get_data() {
 

Spacing +38 added lines, -38 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -57,32 +57,32 @@ 
 
 		$args = array(
 			'number'  => $this->per_step,
-			'offset'  => $this->per_step * ( $this->step - 1 ),
+			'offset'  => $this->per_step * ($this->step - 1),
 			'orderby' => 'id',
 			'order'   => 'DESC',
 		);
 
-		$donors = Give()->donors->get_donors( $args );
+		$donors = Give()->donors->get_donors($args);
 
-		if ( $donors ) {
+		if ($donors) {
 
-			$allowed_payment_status = apply_filters( 'give_recount_donors_donation_statuses', give_get_payment_status_keys() );
+			$allowed_payment_status = apply_filters('give_recount_donors_donation_statuses', give_get_payment_status_keys());
 
-			foreach ( $donors as $donor ) {
+			foreach ($donors as $donor) {
 
-				$attached_payment_ids = explode( ',', $donor->payment_ids );
+				$attached_payment_ids = explode(',', $donor->payment_ids);
 
 				$attached_args = array(
 					'post__in' => $attached_payment_ids,
-					'number'   => - 1,
+					'number'   => -1,
 					'status'   => $allowed_payment_status,
 				);
 
-				$attached_payments = (array) give_get_payments( $attached_args );
+				$attached_payments = (array) give_get_payments($attached_args);
 
 				$unattached_args = array(
 					'post__not_in' => $attached_payment_ids,
-					'number'       => - 1,
+					'number'       => -1,
 					'status'       => $allowed_payment_status,
 					'meta_query'   => array(
 						array(
@@ -93,29 +93,29 @@ 
 					),
 				);
 
-				$unattached_payments = give_get_payments( $unattached_args );
+				$unattached_payments = give_get_payments($unattached_args);
 
-				$payments = array_merge( $attached_payments, $unattached_payments );
+				$payments = array_merge($attached_payments, $unattached_payments);
 
 				$purchase_value = 0.00;
 				$purchase_count = 0;
 				$payment_ids    = array();
 
-				if ( $payments ) {
+				if ($payments) {
 
-					foreach ( $payments as $payment ) {
+					foreach ($payments as $payment) {
 
 						$should_process_payment = 'publish' == $payment->post_status ? true : false;
-						$should_process_payment = apply_filters( 'give_donor_recount_should_process_donation', $should_process_payment, $payment );
+						$should_process_payment = apply_filters('give_donor_recount_should_process_donation', $should_process_payment, $payment);
 
-						if ( true === $should_process_payment ) {
+						if (true === $should_process_payment) {
 
-							if ( apply_filters( 'give_donor_recount_should_increase_value', true, $payment ) ) {
-								$purchase_value += give_get_payment_amount( $payment->ID );
+							if (apply_filters('give_donor_recount_should_increase_value', true, $payment)) {
+								$purchase_value += give_get_payment_amount($payment->ID);
 							}
 
-							if ( apply_filters( 'give_donor_recount_should_increase_count', true, $payment ) ) {
-								$purchase_count ++;
+							if (apply_filters('give_donor_recount_should_increase_count', true, $payment)) {
+								$purchase_count++;
 							}
 						}
 
@@ -123,7 +123,7 @@ 
 					}
 				}
 
-				$payment_ids = implode( ',', $payment_ids );
+				$payment_ids = implode(',', $payment_ids);
 
 				$donor_update_data = array(
 					'purchase_count' => $purchase_count,
@@ -131,8 +131,8 @@ 
 					'payment_ids'    => $payment_ids,
 				);
 
-				$donor_instance = new Give_Donor( $donor->id );
-				$donor_instance->update( $donor_update_data );
+				$donor_instance = new Give_Donor($donor->id);
+				$donor_instance->update($donor_update_data);
 
 			}// End foreach().
 
@@ -152,21 +152,21 @@ 
 	public function get_percentage_complete() {
 
 		$args = array(
-			'number'  => - 1,
+			'number'  => -1,
 			'orderby' => 'id',
 			'order'   => 'DESC',
 		);
 
-		$donors = Give()->donors->get_donors( $args );
-		$total     = count( $donors );
+		$donors = Give()->donors->get_donors($args);
+		$total = count($donors);
 
 		$percentage = 100;
 
-		if ( $total > 0 ) {
-			$percentage = ( ( $this->per_step * $this->step ) / $total ) * 100;
+		if ($total > 0) {
+			$percentage = (($this->per_step * $this->step) / $total) * 100;
 		}
 
-		if ( $percentage > 100 ) {
+		if ($percentage > 100) {
 			$percentage = 100;
 		}
 
@@ -180,7 +180,7 @@ 
 	 *
 	 * @param array $request The Form Data passed into the batch processing
 	 */
-	public function set_properties( $request ) {
+	public function set_properties($request) {
 	}
 
 	/**
@@ -191,21 +191,21 @@ 
 	 */
 	public function process_step() {
 
-		if ( ! $this->can_export() ) {
-			wp_die( esc_html__( 'You do not have permission to recount stats.', 'give' ), esc_html__( 'Error', 'give' ), array(
+		if ( ! $this->can_export()) {
+			wp_die(esc_html__('You do not have permission to recount stats.', 'give'), esc_html__('Error', 'give'), array(
 				'response' => 403,
-			) );
+			));
 		}
 
 		$had_data = $this->get_data();
 
-		if ( $had_data ) {
+		if ($had_data) {
 			$this->done = false;
 
 			return true;
 		} else {
 			$this->done    = true;
-			$this->message = esc_html__( 'Donor stats have been successfully recounted.', 'give' );
+			$this->message = esc_html__('Donor stats have been successfully recounted.', 'give');
 
 			return false;
 		}
@@ -215,10 +215,10 @@ 
 	 * Headers
 	 */
 	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);
 		}
 	}
 

includes/api/class-give-api.php

Doc Comments +3 added lines, -3 removed lines

@@ -216,7 +216,7 @@ 
 	 *
 	 * @access public
 	 * @since  1.1
-	 * @return array
+	 * @return string
 	 */
 	public function get_versions() {
 		return $this->versions;
@@ -302,7 +302,7 @@ 
 	 * @uses   Give_API::invalid_key()
 	 * @uses   Give_API::invalid_auth()
 	 * @since  1.1
-	 * @return bool
+	 * @return false|null
 	 */
 	private function validate_request() {
 		global $wp_query;
@@ -694,7 +694,7 @@ 
 	 *
 	 * @param array $args Arguments to override defaults
 	 *
-	 * @return array $dates
+	 * @return integer|null $dates
 	 */
 	public function get_dates( $args = array() ) {
 		$dates = array();

Spacing +512 added lines, -512 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -141,27 +141,27 @@ 
 			'v1' => 'GIVE_API_V1',
 		);
 
-		foreach ( $this->get_versions() as $version => $class ) {
-			require_once GIVE_PLUGIN_DIR . 'includes/api/class-give-api-' . $version . '.php';
+		foreach ($this->get_versions() as $version => $class) {
+			require_once GIVE_PLUGIN_DIR.'includes/api/class-give-api-'.$version.'.php';
 		}
 
-		add_action( 'init', array( $this, 'add_endpoint' ) );
-		add_action( 'wp', array( $this, 'process_query' ), - 1 );
-		add_filter( 'query_vars', array( $this, 'query_vars' ) );
-		add_action( 'show_user_profile', array( $this, 'user_key_field' ) );
-		add_action( 'edit_user_profile', array( $this, 'user_key_field' ) );
-		add_action( 'personal_options_update', array( $this, 'update_key' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'update_key' ) );
-		add_action( 'give_process_api_key', array( $this, 'process_api_key' ) );
+		add_action('init', array($this, 'add_endpoint'));
+		add_action('wp', array($this, 'process_query'), - 1);
+		add_filter('query_vars', array($this, 'query_vars'));
+		add_action('show_user_profile', array($this, 'user_key_field'));
+		add_action('edit_user_profile', array($this, 'user_key_field'));
+		add_action('personal_options_update', array($this, 'update_key'));
+		add_action('edit_user_profile_update', array($this, 'update_key'));
+		add_action('give_process_api_key', array($this, 'process_api_key'));
 
 		// Setup a backwards compatibility check for user API Keys
-		add_filter( 'get_user_metadata', array( $this, 'api_key_backwards_compat' ), 10, 4 );
+		add_filter('get_user_metadata', array($this, 'api_key_backwards_compat'), 10, 4);
 
 		// Determine if JSON_PRETTY_PRINT is available
-		$this->pretty_print = defined( 'JSON_PRETTY_PRINT' ) ? JSON_PRETTY_PRINT : null;
+		$this->pretty_print = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : null;
 
 		// Allow API request logging to be turned off
-		$this->log_requests = apply_filters( 'give_api_log_requests', $this->log_requests );
+		$this->log_requests = apply_filters('give_api_log_requests', $this->log_requests);
 
 		// Setup Give_Payment_Stats instance
 		$this->stats = new Give_Payment_Stats();
@@ -177,8 +177,8 @@ 
 	 *
 	 * @since  1.1
 	 */
-	public function add_endpoint( $rewrite_rules ) {
-		add_rewrite_endpoint( 'give-api', EP_ALL );
+	public function add_endpoint($rewrite_rules) {
+		add_rewrite_endpoint('give-api', EP_ALL);
 	}
 
 	/**
@@ -191,7 +191,7 @@ 
 	 *
 	 * @return string[] $vars New query vars
 	 */
-	public function query_vars( $vars ) {
+	public function query_vars($vars) {
 
 		$vars[] = 'token';
 		$vars[] = 'key';
@@ -242,11 +242,11 @@ 
 	 */
 	public function get_default_version() {
 
-		$version = get_option( 'give_default_api_version' );
+		$version = get_option('give_default_api_version');
 
-		if ( defined( 'GIVE_API_VERSION' ) ) {
+		if (defined('GIVE_API_VERSION')) {
 			$version = GIVE_API_VERSION;
-		} elseif ( ! $version ) {
+		} elseif ( ! $version) {
 			$version = 'v1';
 		}
 
@@ -267,14 +267,14 @@ 
 
 		$version = $wp_query->query_vars['give-api'];
 
-		if ( strpos( $version, '/' ) ) {
+		if (strpos($version, '/')) {
 
-			$version = explode( '/', $version );
-			$version = strtolower( $version[0] );
+			$version = explode('/', $version);
+			$version = strtolower($version[0]);
 
-			$wp_query->query_vars['give-api'] = str_replace( $version . '/', '', $wp_query->query_vars['give-api'] );
+			$wp_query->query_vars['give-api'] = str_replace($version.'/', '', $wp_query->query_vars['give-api']);
 
-			if ( array_key_exists( $version, $this->versions ) ) {
+			if (array_key_exists($version, $this->versions)) {
 
 				$this->queried_version = $version;
 
@@ -310,26 +310,26 @@ 
 		$this->override = false;
 
 		// Make sure we have both user and api key
-		if ( ! empty( $wp_query->query_vars['give-api'] ) && ( $wp_query->query_vars['give-api'] !== 'forms' || ! empty( $wp_query->query_vars['token'] ) ) ) {
+		if ( ! empty($wp_query->query_vars['give-api']) && ($wp_query->query_vars['give-api'] !== 'forms' || ! empty($wp_query->query_vars['token']))) {
 
-			if ( empty( $wp_query->query_vars['token'] ) || empty( $wp_query->query_vars['key'] ) ) {
+			if (empty($wp_query->query_vars['token']) || empty($wp_query->query_vars['key'])) {
 				$this->missing_auth();
 				return false;
 			}
 
 			// Retrieve the user by public API key and ensure they exist
-			if ( ! ( $user = $this->get_user( $wp_query->query_vars['key'] ) ) ) {
+			if ( ! ($user = $this->get_user($wp_query->query_vars['key']))) {
 
 				$this->invalid_key();
 				return false;
 
 			} else {
 
-				$token  = urldecode( $wp_query->query_vars['token'] );
-				$secret = $this->get_user_secret_key( $user );
-				$public = urldecode( $wp_query->query_vars['key'] );
+				$token  = urldecode($wp_query->query_vars['token']);
+				$secret = $this->get_user_secret_key($user);
+				$public = urldecode($wp_query->query_vars['key']);
 
-				if ( hash_equals( md5( $secret . $public ), $token ) ) {
+				if (hash_equals(md5($secret.$public), $token)) {
 					$this->is_valid_request = true;
 				} else {
 					$this->invalid_auth();
@@ -337,9 +337,9 @@ 
 				}
 
 			}
-		} elseif ( ! empty( $wp_query->query_vars['give-api'] ) && $wp_query->query_vars['give-api'] === 'forms' ) {
+		} elseif ( ! empty($wp_query->query_vars['give-api']) && $wp_query->query_vars['give-api'] === 'forms') {
 			$this->is_valid_request = true;
-			$wp_query->set( 'key', 'public' );
+			$wp_query->set('key', 'public');
 		}
 	}
 
@@ -355,25 +355,25 @@ 
 	 *
 	 * @return bool if user ID is found, false otherwise
 	 */
-	public function get_user( $key = '' ) {
+	public function get_user($key = '') {
 		global $wpdb, $wp_query;
 
-		if ( empty( $key ) ) {
-			$key = urldecode( $wp_query->query_vars['key'] );
+		if (empty($key)) {
+			$key = urldecode($wp_query->query_vars['key']);
 		}
 
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		$user = Give_Cache::get( md5( 'give_api_user_' . $key ), true );
+		$user = Give_Cache::get(md5('give_api_user_'.$key), true);
 
-		if ( false === $user ) {
-			$user = $wpdb->get_var( $wpdb->prepare( "SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s LIMIT 1", $key ) );
-			Give_Cache::set( md5( 'give_api_user_' . $key ), $user, DAY_IN_SECONDS, true );
+		if (false === $user) {
+			$user = $wpdb->get_var($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s LIMIT 1", $key));
+			Give_Cache::set(md5('give_api_user_'.$key), $user, DAY_IN_SECONDS, true);
 		}
 
-		if ( $user != null ) {
+		if ($user != null) {
 			$this->user_id = $user;
 
 			return $user;
@@ -389,19 +389,19 @@ 
 	 *
 	 * @return mixed|null|string
 	 */
-	public function get_user_public_key( $user_id = 0 ) {
+	public function get_user_public_key($user_id = 0) {
 		global $wpdb;
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return '';
 		}
 
-		$cache_key       = md5( 'give_api_user_public_key' . $user_id );
-		$user_public_key = Give_Cache::get( $cache_key, true );
+		$cache_key       = md5('give_api_user_public_key'.$user_id);
+		$user_public_key = Give_Cache::get($cache_key, true);
 
-		if ( empty( $user_public_key ) ) {
-			$user_public_key = $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_public_key' AND user_id = %d", $user_id ) );
-			Give_Cache::set( $cache_key, $user_public_key, HOUR_IN_SECONDS, true );
+		if (empty($user_public_key)) {
+			$user_public_key = $wpdb->get_var($wpdb->prepare("SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_public_key' AND user_id = %d", $user_id));
+			Give_Cache::set($cache_key, $user_public_key, HOUR_IN_SECONDS, true);
 		}
 
 		return $user_public_key;
@@ -414,19 +414,19 @@ 
 	 *
 	 * @return mixed|null|string
 	 */
-	public function get_user_secret_key( $user_id = 0 ) {
+	public function get_user_secret_key($user_id = 0) {
 		global $wpdb;
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return '';
 		}
 
-		$cache_key       = md5( 'give_api_user_secret_key' . $user_id );
-		$user_secret_key = Give_Cache::get( $cache_key, true );
+		$cache_key       = md5('give_api_user_secret_key'.$user_id);
+		$user_secret_key = Give_Cache::get($cache_key, true);
 
-		if ( empty( $user_secret_key ) ) {
-			$user_secret_key = $wpdb->get_var( $wpdb->prepare( "SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_secret_key' AND user_id = %d", $user_id ) );
-			Give_Cache::set( $cache_key, $user_secret_key, HOUR_IN_SECONDS, true );
+		if (empty($user_secret_key)) {
+			$user_secret_key = $wpdb->get_var($wpdb->prepare("SELECT meta_key FROM $wpdb->usermeta WHERE meta_value = 'give_user_secret_key' AND user_id = %d", $user_id));
+			Give_Cache::set($cache_key, $user_secret_key, HOUR_IN_SECONDS, true);
 		}
 
 		return $user_secret_key;
@@ -442,10 +442,10 @@ 
 	 */
 	private function missing_auth() {
 		$error          = array();
-		$error['error'] = esc_html__( 'You must specify both a token and API key.', 'give' );
+		$error['error'] = esc_html__('You must specify both a token and API key.', 'give');
 
 		$this->data = $error;
-		$this->output( 401 );
+		$this->output(401);
 	}
 
 	/**
@@ -459,10 +459,10 @@ 
 	 */
 	private function invalid_auth() {
 		$error          = array();
-		$error['error'] = esc_html__( 'Your request could not be authenticated.', 'give' );
+		$error['error'] = esc_html__('Your request could not be authenticated.', 'give');
 
 		$this->data = $error;
-		$this->output( 403 );
+		$this->output(403);
 	}
 
 	/**
@@ -476,10 +476,10 @@ 
 	 */
 	private function invalid_key() {
 		$error          = array();
-		$error['error'] = esc_html__( 'Invalid API key.', 'give' );
+		$error['error'] = esc_html__('Invalid API key.', 'give');
 
 		$this->data = $error;
-		$this->output( 403 );
+		$this->output(403);
 	}
 
 	/**
@@ -492,10 +492,10 @@ 
 	 */
 	private function invalid_version() {
 		$error          = array();
-		$error['error'] = esc_html__( 'Invalid API version.', 'give' );
+		$error['error'] = esc_html__('Invalid API version.', 'give');
 
 		$this->data = $error;
-		$this->output( 404 );
+		$this->output(404);
 	}
 
 	/**
@@ -511,10 +511,10 @@ 
 		global $wp_query;
 
 		// Start logging how long the request takes for logging
-		$before = microtime( true );
+		$before = microtime(true);
 
 		// Check for give-api var. Get out if not present
-		if ( empty( $wp_query->query_vars['give-api'] ) ) {
+		if (empty($wp_query->query_vars['give-api'])) {
 			return;
 		}
 
@@ -528,45 +528,45 @@ 
 		$this->validate_request();
 
 		// Only proceed if no errors have been noted
-		if ( ! $this->is_valid_request ) {
+		if ( ! $this->is_valid_request) {
 			return;
 		}
 
-		if ( ! defined( 'GIVE_DOING_API' ) ) {
-			define( 'GIVE_DOING_API', true );
+		if ( ! defined('GIVE_DOING_API')) {
+			define('GIVE_DOING_API', true);
 		}
 
 		$data         = array();
 		$this->routes = new $this->versions[$this->get_queried_version()];
 		$this->routes->validate_request();
 
-		switch ( $this->endpoint ) :
+		switch ($this->endpoint) :
 
 			case 'stats' :
 
-				$data = $this->routes->get_stats( array(
-					'type'      => isset( $wp_query->query_vars['type'] ) ? $wp_query->query_vars['type'] : null,
-					'form'      => isset( $wp_query->query_vars['form'] ) ? $wp_query->query_vars['form'] : null,
-					'date'      => isset( $wp_query->query_vars['date'] ) ? $wp_query->query_vars['date'] : null,
-					'startdate' => isset( $wp_query->query_vars['startdate'] ) ? $wp_query->query_vars['startdate'] : null,
-					'enddate'   => isset( $wp_query->query_vars['enddate'] ) ? $wp_query->query_vars['enddate'] : null,
-				) );
+				$data = $this->routes->get_stats(array(
+					'type'      => isset($wp_query->query_vars['type']) ? $wp_query->query_vars['type'] : null,
+					'form'      => isset($wp_query->query_vars['form']) ? $wp_query->query_vars['form'] : null,
+					'date'      => isset($wp_query->query_vars['date']) ? $wp_query->query_vars['date'] : null,
+					'startdate' => isset($wp_query->query_vars['startdate']) ? $wp_query->query_vars['startdate'] : null,
+					'enddate'   => isset($wp_query->query_vars['enddate']) ? $wp_query->query_vars['enddate'] : null,
+				));
 
 				break;
 
 			case 'forms' :
 
-				$form = isset( $wp_query->query_vars['form'] ) ? $wp_query->query_vars['form'] : null;
+				$form = isset($wp_query->query_vars['form']) ? $wp_query->query_vars['form'] : null;
 
-				$data = $this->routes->get_forms( $form );
+				$data = $this->routes->get_forms($form);
 
 				break;
 
 			case 'donors' :
 
-				$donor = isset( $wp_query->query_vars['donor'] ) ? $wp_query->query_vars['donor'] : null;
+				$donor = isset($wp_query->query_vars['donor']) ? $wp_query->query_vars['donor'] : null;
 
-				$data = $this->routes->get_donors( $donor );
+				$data = $this->routes->get_donors($donor);
 
 				break;
 
@@ -579,25 +579,25 @@ 
 				 * @params date startdate | required when date = range and format to be YYYYMMDD (i.e. 20170524)
 				 * @params date enddate | required when date = range and format to be YYYYMMDD (i.e. 20170524)
 				 */
-				$data = $this->routes->get_recent_donations( array(
-					'date'      => isset( $wp_query->query_vars['date'] ) ? $wp_query->query_vars['date'] : null,
-					'startdate' => isset( $wp_query->query_vars['startdate'] ) ? $wp_query->query_vars['startdate'] : null,
-					'enddate'   => isset( $wp_query->query_vars['enddate'] ) ? $wp_query->query_vars['enddate'] : null,
-				) );
+				$data = $this->routes->get_recent_donations(array(
+					'date'      => isset($wp_query->query_vars['date']) ? $wp_query->query_vars['date'] : null,
+					'startdate' => isset($wp_query->query_vars['startdate']) ? $wp_query->query_vars['startdate'] : null,
+					'enddate'   => isset($wp_query->query_vars['enddate']) ? $wp_query->query_vars['enddate'] : null,
+				));
 
 				break;
 
 		endswitch;
 
 		// Allow extensions to setup their own return data
-		$this->data = apply_filters( 'give_api_output_data', $data, $this->endpoint, $this );
+		$this->data = apply_filters('give_api_output_data', $data, $this->endpoint, $this);
 
-		$after                       = microtime( true );
-		$request_time                = ( $after - $before );
+		$after                       = microtime(true);
+		$request_time                = ($after - $before);
 		$this->data['request_speed'] = $request_time;
 
 		// Log this API request, if enabled. We log it here because we have access to errors.
-		$this->log_request( $this->data );
+		$this->log_request($this->data);
 
 		// Send out data to the output function
 		$this->output();
@@ -627,25 +627,25 @@ 
 		global $wp_query;
 
 		// Whitelist our query options
-		$accepted = apply_filters( 'give_api_valid_query_modes', array(
+		$accepted = apply_filters('give_api_valid_query_modes', array(
 			'stats',
 			'forms',
 			'donors',
 			'donations',
-		) );
+		));
 
-		$query = isset( $wp_query->query_vars['give-api'] ) ? $wp_query->query_vars['give-api'] : null;
-		$query = str_replace( $this->queried_version . '/', '', $query );
+		$query = isset($wp_query->query_vars['give-api']) ? $wp_query->query_vars['give-api'] : null;
+		$query = str_replace($this->queried_version.'/', '', $query);
 
 		$error = array();
 
 		// Make sure our query is valid
-		if ( ! in_array( $query, $accepted ) ) {
-			$error['error'] = esc_html__( 'Invalid query.', 'give' );
+		if ( ! in_array($query, $accepted)) {
+			$error['error'] = esc_html__('Invalid query.', 'give');
 
 			$this->data = $error;
 			// 400 is Bad Request
-			$this->output( 400 );
+			$this->output(400);
 		}
 
 		$this->endpoint = $query;
@@ -662,7 +662,7 @@ 
 	public function get_paged() {
 		global $wp_query;
 
-		return isset( $wp_query->query_vars['page'] ) ? $wp_query->query_vars['page'] : 1;
+		return isset($wp_query->query_vars['page']) ? $wp_query->query_vars['page'] : 1;
 	}
 
 
@@ -677,13 +677,13 @@ 
 	public function per_page() {
 		global $wp_query;
 
-		$per_page = isset( $wp_query->query_vars['number'] ) ? $wp_query->query_vars['number'] : 10;
+		$per_page = isset($wp_query->query_vars['number']) ? $wp_query->query_vars['number'] : 10;
 
-		if ( $per_page < 0 && $this->get_query_mode() == 'donors' ) {
+		if ($per_page < 0 && $this->get_query_mode() == 'donors') {
 			$per_page = 99999999;
 		} // End if().
 
-		return apply_filters( 'give_api_results_per_page', $per_page );
+		return apply_filters('give_api_results_per_page', $per_page);
 	}
 
 	/**
@@ -696,7 +696,7 @@ 
 	 *
 	 * @return array $dates
 	 */
-	public function get_dates( $args = array() ) {
+	public function get_dates($args = array()) {
 		$dates = array();
 
 		$defaults = array(
@@ -707,60 +707,60 @@ 
 			'enddate'   => null,
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$current_time = current_time( 'timestamp' );
+		$current_time = current_time('timestamp');
 
-		if ( 'range' === $args['date'] ) {
-			$startdate          = strtotime( $args['startdate'] );
-			$enddate            = strtotime( $args['enddate'] );
-			$dates['day_start'] = date( 'd', $startdate );
-			$dates['day_end']   = date( 'd', $enddate );
-			$dates['m_start']   = date( 'n', $startdate );
-			$dates['m_end']     = date( 'n', $enddate );
-			$dates['year']      = date( 'Y', $startdate );
-			$dates['year_end']  = date( 'Y', $enddate );
+		if ('range' === $args['date']) {
+			$startdate          = strtotime($args['startdate']);
+			$enddate            = strtotime($args['enddate']);
+			$dates['day_start'] = date('d', $startdate);
+			$dates['day_end']   = date('d', $enddate);
+			$dates['m_start']   = date('n', $startdate);
+			$dates['m_end']     = date('n', $enddate);
+			$dates['year']      = date('Y', $startdate);
+			$dates['year_end']  = date('Y', $enddate);
 		} else {
 			// Modify dates based on predefined ranges
-			switch ( $args['date'] ) :
+			switch ($args['date']) :
 
 				case 'this_month' :
 					$dates['day']     = null;
-					$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_month' :
 					$dates['day']     = null;
-					$dates['m_start'] = date( 'n', $current_time ) == 1 ? 12 : date( 'n', $current_time ) - 1;
+					$dates['m_start'] = date('n', $current_time) == 1 ? 12 : date('n', $current_time) - 1;
 					$dates['m_end']   = $dates['m_start'];
-					$dates['year']    = date( 'n', $current_time ) == 1 ? date( 'Y', $current_time ) - 1 : date( 'Y', $current_time );
+					$dates['year']    = date('n', $current_time) == 1 ? date('Y', $current_time) - 1 : date('Y', $current_time);
 					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;
+						$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 {
 
@@ -776,65 +776,65 @@ 
 					break;
 
 				case 'this_quarter' :
-					$month_now = date( 'n', $current_time );
+					$month_now = date('n', $current_time);
 
 					$dates['day'] = null;
 
-					if ( $month_now <= 3 ) {
+					if ($month_now <= 3) {
 
 						$dates['m_start'] = 1;
 						$dates['m_end']   = 3;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
-					} elseif ( $month_now <= 6 ) {
+					} elseif ($month_now <= 6) {
 
 						$dates['m_start'] = 4;
 						$dates['m_end']   = 6;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
-					} elseif ( $month_now <= 9 ) {
+					} elseif ($month_now <= 9) {
 
 						$dates['m_start'] = 7;
 						$dates['m_end']   = 9;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					} else {
 
 						$dates['m_start'] = 10;
 						$dates['m_end']   = 12;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
 					}
 					break;
 
 				case 'last_quarter' :
-					$month_now = date( 'n', $current_time );
+					$month_now = date('n', $current_time);
 
 					$dates['day'] = null;
 
-					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']    = date('Y', $current_time) - 1; // Previous year
 
-					} elseif ( $month_now <= 6 ) {
+					} elseif ($month_now <= 6) {
 
 						$dates['m_start'] = 1;
 						$dates['m_end']   = 3;
-						$dates['year']    = date( 'Y', $current_time );
+						$dates['year']    = date('Y', $current_time);
 
-					} elseif ( $month_now <= 9 ) {
+					} elseif ($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;
@@ -843,14 +843,14 @@ 
 					$dates['day']     = null;
 					$dates['m_start'] = null;
 					$dates['m_end']   = null;
-					$dates['year']    = date( 'Y', $current_time );
+					$dates['year']    = date('Y', $current_time);
 					break;
 
 				case 'last_year' :
 					$dates['day']     = null;
 					$dates['m_start'] = null;
 					$dates['m_end']   = null;
-					$dates['year']    = date( 'Y', $current_time ) - 1;
+					$dates['year']    = date('Y', $current_time) - 1;
 					break;
 
 			endswitch;
@@ -863,7 +863,7 @@ 
 		 *
 		 * @param array $dates The dates used for retrieving earnings.
 		 */
-		return apply_filters( 'give_api_stat_dates', $dates );
+		return apply_filters('give_api_stat_dates', $dates);
 	}
 
 	/**
@@ -877,78 +877,78 @@ 
 	 *
 	 * @return array $donors Multidimensional array of the donors.
 	 */
-	public function get_donors( $donor = null ) {
+	public function get_donors($donor = null) {
 
 		$donors = array();
 		$error  = array();
-		if ( ! user_can( $this->user_id, 'view_give_sensitive_data' ) && ! $this->override ) {
+		if ( ! user_can($this->user_id, 'view_give_sensitive_data') && ! $this->override) {
 			return $donors;
 		}
 
 		$paged    = $this->get_paged();
 		$per_page = $this->per_page();
-		$offset   = $per_page * ( $paged - 1 );
+		$offset   = $per_page * ($paged - 1);
 
-		if ( is_numeric( $donor ) ) {
+		if (is_numeric($donor)) {
 			$field = 'id';
 		} else {
 			$field = 'email';
 		}
 
-		$donor_query = Give()->donors->get_donors( array(
+		$donor_query = Give()->donors->get_donors(array(
 			'number' => $per_page,
 			'offset' => $offset,
 			$field   => $donor,
-		) );
+		));
 		$donor_count = 0;
 
-		if ( $donor_query ) {
+		if ($donor_query) {
 
-			foreach ( $donor_query as $donor_obj ) {
+			foreach ($donor_query as $donor_obj) {
 
-				$names      = explode( ' ', $donor_obj->name );
-				$first_name = ! empty( $names[0] ) ? $names[0] : '';
+				$names      = explode(' ', $donor_obj->name);
+				$first_name = ! empty($names[0]) ? $names[0] : '';
 				$last_name  = '';
-				if ( ! empty( $names[1] ) ) {
-					unset( $names[0] );
-					$last_name = implode( ' ', $names );
+				if ( ! empty($names[1])) {
+					unset($names[0]);
+					$last_name = implode(' ', $names);
 				}
 
-				$donors['donors'][ $donor_count ]['info']['user_id']      = '';
-				$donors['donors'][ $donor_count ]['info']['username']     = '';
-				$donors['donors'][ $donor_count ]['info']['display_name'] = '';
-				$donors['donors'][ $donor_count ]['info']['donor_id']     = $donor_obj->id;
-				$donors['donors'][ $donor_count ]['info']['first_name']   = $first_name;
-				$donors['donors'][ $donor_count ]['info']['last_name']    = $last_name;
-				$donors['donors'][ $donor_count ]['info']['email']        = $donor_obj->email;
+				$donors['donors'][$donor_count]['info']['user_id']      = '';
+				$donors['donors'][$donor_count]['info']['username']     = '';
+				$donors['donors'][$donor_count]['info']['display_name'] = '';
+				$donors['donors'][$donor_count]['info']['donor_id']     = $donor_obj->id;
+				$donors['donors'][$donor_count]['info']['first_name']   = $first_name;
+				$donors['donors'][$donor_count]['info']['last_name']    = $last_name;
+				$donors['donors'][$donor_count]['info']['email']        = $donor_obj->email;
 
-				if ( ! empty( $donor_obj->user_id ) ) {
+				if ( ! empty($donor_obj->user_id)) {
 
-					$user_data = get_userdata( $donor_obj->user_id );
+					$user_data = get_userdata($donor_obj->user_id);
 
 					// Donor with registered account.
-					$donors['donors'][ $donor_count ]['info']['user_id']      = $donor_obj->user_id;
-					$donors['donors'][ $donor_count ]['info']['username']     = $user_data->user_login;
-					$donors['donors'][ $donor_count ]['info']['display_name'] = $user_data->display_name;
+					$donors['donors'][$donor_count]['info']['user_id']      = $donor_obj->user_id;
+					$donors['donors'][$donor_count]['info']['username']     = $user_data->user_login;
+					$donors['donors'][$donor_count]['info']['display_name'] = $user_data->display_name;
 
 				}
 
-				$donors['donors'][ $donor_count ]['stats']['total_donations'] = $donor_obj->purchase_count;
-				$donors['donors'][ $donor_count ]['stats']['total_spent']     = $donor_obj->purchase_value;
+				$donors['donors'][$donor_count]['stats']['total_donations'] = $donor_obj->purchase_count;
+				$donors['donors'][$donor_count]['stats']['total_spent']     = $donor_obj->purchase_value;
 
-				$donor_count ++;
+				$donor_count++;
 
 			}
-		} elseif ( $donor ) {
+		} elseif ($donor) {
 
 			$error['error'] = sprintf( /* translators: %s: donor */
-				esc_html__( 'Donor %s not found.', 'give' ), $donor );
+				esc_html__('Donor %s not found.', 'give'), $donor );
 
 			return $error;
 
 		} else {
 
-			$error['error'] = esc_html__( 'No donors found.', 'give' );
+			$error['error'] = esc_html__('No donors found.', 'give');
 
 			return $error;
 
@@ -967,37 +967,37 @@ 
 	 *
 	 * @return array $donors Multidimensional array of the forms.
 	 */
-	public function get_forms( $form = null ) {
+	public function get_forms($form = null) {
 
 		$forms = array();
 		$error = array();
 
-		if ( $form == null ) {
+		if ($form == null) {
 			$forms['forms'] = array();
 
-			$form_list = get_posts( array(
+			$form_list = get_posts(array(
 				'post_type'        => 'give_forms',
 				'posts_per_page'   => $this->per_page(),
 				'suppress_filters' => true,
 				'paged'            => $this->get_paged(),
-			) );
+			));
 
-			if ( $form_list ) {
+			if ($form_list) {
 				$i = 0;
-				foreach ( $form_list as $form_info ) {
-					$forms['forms'][ $i ] = $this->get_form_data( $form_info );
-					$i ++;
+				foreach ($form_list as $form_info) {
+					$forms['forms'][$i] = $this->get_form_data($form_info);
+					$i++;
 				}
 			}
 		} else {
-			if ( get_post_type( $form ) == 'give_forms' ) {
-				$form_info = get_post( $form );
+			if (get_post_type($form) == 'give_forms') {
+				$form_info = get_post($form);
 
-				$forms['forms'][0] = $this->get_form_data( $form_info );
+				$forms['forms'][0] = $this->get_form_data($form_info);
 
 			} else {
 				$error['error'] = sprintf( /* translators: %s: form */
-					esc_html__( 'Form %s not found.', 'give' ), $form );
+					esc_html__('Form %s not found.', 'give'), $form );
 
 				return $error;
 			}
@@ -1015,7 +1015,7 @@ 
 	 *
 	 * @return array                Array of post data to return back in the API.
 	 */
-	private function get_form_data( $form_info ) {
+	private function get_form_data($form_info) {
 
 		$form = array();
 
@@ -1025,60 +1025,60 @@ 
 		$form['info']['create_date']   = $form_info->post_date;
 		$form['info']['modified_date'] = $form_info->post_modified;
 		$form['info']['status']        = $form_info->post_status;
-		$form['info']['link']          = html_entity_decode( $form_info->guid );
-		$form['info']['content']       = give_get_meta( $form_info->ID, '_give_form_content', true );
-		$form['info']['thumbnail']     = wp_get_attachment_url( get_post_thumbnail_id( $form_info->ID ) );
+		$form['info']['link']          = html_entity_decode($form_info->guid);
+		$form['info']['content']       = give_get_meta($form_info->ID, '_give_form_content', true);
+		$form['info']['thumbnail']     = wp_get_attachment_url(get_post_thumbnail_id($form_info->ID));
 
-		if ( give_is_setting_enabled( give_get_option( 'categories', 'disabled' ) ) ) {
-			$form['info']['category'] = get_the_terms( $form_info, 'give_forms_category' );
-			$form['info']['tags']     = get_the_terms( $form_info, 'give_forms_tag' );
+		if (give_is_setting_enabled(give_get_option('categories', 'disabled'))) {
+			$form['info']['category'] = get_the_terms($form_info, 'give_forms_category');
+			$form['info']['tags']     = get_the_terms($form_info, 'give_forms_tag');
 		}
-		if ( give_is_setting_enabled( give_get_option( 'tags', 'disabled' ) ) ) {
-			$form['info']['tags'] = get_the_terms( $form_info, 'give_forms_tag' );
+		if (give_is_setting_enabled(give_get_option('tags', 'disabled'))) {
+			$form['info']['tags'] = get_the_terms($form_info, 'give_forms_tag');
 		}
 
 		// Check whether any goal is to be achieved for the donation form.
-		$goal_option = give_get_meta( $form_info->ID, '_give_goal_option', true );
-		$goal_amount = give_get_meta( $form_info->ID, '_give_set_goal', true );
-		if ( give_is_setting_enabled( $goal_option ) && $goal_amount ) {
-			$total_income = give_get_form_earnings_stats( $form_info->ID );
-			$goal_percentage_completed = ( $total_income < $goal_amount ) ? round( ( $total_income / $goal_amount ) * 100, 2 ) : 100;
-			$form['goal']['amount']               = isset( $goal_amount ) ? $goal_amount : '';
-			$form['goal']['percentage_completed'] = isset( $goal_percentage_completed ) ? $goal_percentage_completed : '';
+		$goal_option = give_get_meta($form_info->ID, '_give_goal_option', true);
+		$goal_amount = give_get_meta($form_info->ID, '_give_set_goal', true);
+		if (give_is_setting_enabled($goal_option) && $goal_amount) {
+			$total_income = give_get_form_earnings_stats($form_info->ID);
+			$goal_percentage_completed = ($total_income < $goal_amount) ? round(($total_income / $goal_amount) * 100, 2) : 100;
+			$form['goal']['amount']               = isset($goal_amount) ? $goal_amount : '';
+			$form['goal']['percentage_completed'] = isset($goal_percentage_completed) ? $goal_percentage_completed : '';
 		}
 
-		if ( user_can( $this->user_id, 'view_give_reports' ) || $this->override ) {
-			$form['stats']['total']['donations']           = give_get_form_sales_stats( $form_info->ID );
-			$form['stats']['total']['earnings']            = give_get_form_earnings_stats( $form_info->ID );
-			$form['stats']['monthly_average']['donations'] = give_get_average_monthly_form_sales( $form_info->ID );
-			$form['stats']['monthly_average']['earnings']  = give_get_average_monthly_form_earnings( $form_info->ID );
+		if (user_can($this->user_id, 'view_give_reports') || $this->override) {
+			$form['stats']['total']['donations']           = give_get_form_sales_stats($form_info->ID);
+			$form['stats']['total']['earnings']            = give_get_form_earnings_stats($form_info->ID);
+			$form['stats']['monthly_average']['donations'] = give_get_average_monthly_form_sales($form_info->ID);
+			$form['stats']['monthly_average']['earnings']  = give_get_average_monthly_form_earnings($form_info->ID);
 		}
 
 		$counter = 0;
-		if ( give_has_variable_prices( $form_info->ID ) ) {
-			foreach ( give_get_variable_prices( $form_info->ID ) as $price ) {
-				$counter ++;
+		if (give_has_variable_prices($form_info->ID)) {
+			foreach (give_get_variable_prices($form_info->ID) as $price) {
+				$counter++;
 				// multi-level item
-				$level                                     = isset( $price['_give_text'] ) ? $price['_give_text'] : 'level-' . $counter;
-				$form['pricing'][ sanitize_key( $level ) ] = $price['_give_amount'];
+				$level                                     = isset($price['_give_text']) ? $price['_give_text'] : 'level-'.$counter;
+				$form['pricing'][sanitize_key($level)] = $price['_give_amount'];
 
 			}
 		} else {
-			$form['pricing']['amount'] = give_get_form_price( $form_info->ID );
+			$form['pricing']['amount'] = give_get_form_price($form_info->ID);
 		}
 
-		if ( user_can( $this->user_id, 'view_give_sensitive_data' ) || $this->override ) {
+		if (user_can($this->user_id, 'view_give_sensitive_data') || $this->override) {
 
 			/**
 			 * Fires when generating API sensitive data.
 			 *
 			 * @since 1.1
 			 */
-			do_action( 'give_api_sensitive_data' );
+			do_action('give_api_sensitive_data');
 
 		}
 
-		return apply_filters( 'give_api_forms_form', $form );
+		return apply_filters('give_api_forms_form', $form);
 
 	}
 
@@ -1093,7 +1093,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_stats( $args = array() ) {
+	public function get_stats($args = array()) {
 		$defaults = array(
 			'type'      => null,
 			'form'      => null,
@@ -1102,9 +1102,9 @@ 
 			'enddate'   => null,
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		$dates = $this->get_dates( $args );
+		$dates = $this->get_dates($args);
 
 		$stats    = array();
 		$earnings = array(
@@ -1115,40 +1115,40 @@ 
 		);
 		$error    = array();
 
-		if ( ! user_can( $this->user_id, 'view_give_reports' ) && ! $this->override ) {
+		if ( ! user_can($this->user_id, 'view_give_reports') && ! $this->override) {
 			return $stats;
 		}
 
-		if ( $args['type'] == 'donations' ) {
+		if ($args['type'] == 'donations') {
 
-			if ( $args['form'] == null ) {
-				if ( $args['date'] == null ) {
+			if ($args['form'] == null) {
+				if ($args['date'] == null) {
 					$sales = $this->get_default_sales_stats();
-				} elseif ( $args['date'] === 'range' ) {
+				} elseif ($args['date'] === 'range') {
 					// Return donations for a date range.
 					// Ensure the end date is later than the start date.
-					if ( $args['enddate'] < $args['startdate'] ) {
-						$error['error'] = esc_html__( 'The end date must be later than the start date.', 'give' );
+					if ($args['enddate'] < $args['startdate']) {
+						$error['error'] = esc_html__('The end date must be later than the start date.', 'give');
 					}
 
 					// Ensure both the start and end date are specified
-					if ( empty( $args['startdate'] ) || empty( $args['enddate'] ) ) {
-						$error['error'] = esc_html__( 'Invalid or no date range specified.', 'give' );
+					if (empty($args['startdate']) || empty($args['enddate'])) {
+						$error['error'] = esc_html__('Invalid or no date range specified.', 'give');
 					}
 
 					$total = 0;
 
 					// Loop through the years
 					$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'] && $dates['year_end'] > $dates['year'] ) {
+						} elseif ($y == $dates['year'] && $dates['year_end'] > $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 {
@@ -1157,116 +1157,116 @@ 
 						}
 
 						$i = $month_start;
-						while ( $i <= $month_end ) :
+						while ($i <= $month_end) :
 
-							if ( $i == $dates['m_start'] ) {
+							if ($i == $dates['m_start']) {
 								$d = $dates['day_start'];
 							} else {
 								$d = 1;
 							}
 
-							if ( $i == $dates['m_end'] ) {
+							if ($i == $dates['m_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);
 							}
 
-							while ( $d <= $num_of_days ) :
-								$sale_count = give_get_sales_by_date( $d, $i, $y );
-								$date_key   = date( 'Ymd', strtotime( $y . '/' . $i . '/' . $d ) );
-								if ( ! isset( $sales['sales'][ $date_key ] ) ) {
-									$sales['sales'][ $date_key ] = 0;
+							while ($d <= $num_of_days) :
+								$sale_count = give_get_sales_by_date($d, $i, $y);
+								$date_key   = date('Ymd', strtotime($y.'/'.$i.'/'.$d));
+								if ( ! isset($sales['sales'][$date_key])) {
+									$sales['sales'][$date_key] = 0;
 								}
-								$sales['sales'][ $date_key ] += $sale_count;
+								$sales['sales'][$date_key] += $sale_count;
 								$total                       += $sale_count;
-								$d ++;
+								$d++;
 							endwhile;
-							$i ++;
+							$i++;
 						endwhile;
 
-						$y ++;
+						$y++;
 					endwhile;
 
 					$sales['totals'] = $total;
 				} else {
-					if ( $args['date'] == 'this_quarter' || $args['date'] == 'last_quarter' ) {
+					if ($args['date'] == 'this_quarter' || $args['date'] == 'last_quarter') {
 						$sales_count = 0;
 
 						// Loop through the months
 						$month = $dates['m_start'];
 
-						while ( $month <= $dates['m_end'] ) :
-							$sales_count += give_get_sales_by_date( null, $month, $dates['year'] );
-							$month ++;
+						while ($month <= $dates['m_end']) :
+							$sales_count += give_get_sales_by_date(null, $month, $dates['year']);
+							$month++;
 						endwhile;
 
-						$sales['donations'][ $args['date'] ] = $sales_count;
+						$sales['donations'][$args['date']] = $sales_count;
 					} else {
-						$sales['donations'][ $args['date'] ] = give_get_sales_by_date( $dates['day'], $dates['m_start'], $dates['year'] );
+						$sales['donations'][$args['date']] = give_get_sales_by_date($dates['day'], $dates['m_start'], $dates['year']);
 					}
 				}// End if().
-			} elseif ( $args['form'] == 'all' ) {
-				$forms = get_posts( array(
+			} elseif ($args['form'] == 'all') {
+				$forms = get_posts(array(
 					'post_type' => 'give_forms',
 					'nopaging'  => true,
-				) );
-				$i     = 0;
-				foreach ( $forms as $form_info ) {
-					$sales['donations'][ $i ] = array(
-						$form_info->post_name => give_get_form_sales_stats( $form_info->ID ),
+				));
+				$i = 0;
+				foreach ($forms as $form_info) {
+					$sales['donations'][$i] = array(
+						$form_info->post_name => give_get_form_sales_stats($form_info->ID),
 					);
-					$i ++;
+					$i++;
 				}
 			} else {
-				if ( get_post_type( $args['form'] ) == 'give_forms' ) {
-					$form_info             = get_post( $args['form'] );
+				if (get_post_type($args['form']) == 'give_forms') {
+					$form_info             = get_post($args['form']);
 					$sales['donations'][0] = array(
-						$form_info->post_name => give_get_form_sales_stats( $args['form'] ),
+						$form_info->post_name => give_get_form_sales_stats($args['form']),
 					);
 				} else {
 					$error['error'] = sprintf( /* translators: %s: form */
-						esc_html__( 'Form %s not found.', 'give' ), $args['form'] );
+						esc_html__('Form %s not found.', 'give'), $args['form'] );
 				}
 			}// End if().
 
-			if ( ! empty( $error ) ) {
+			if ( ! empty($error)) {
 				return $error;
 			}
 
 			return $sales;
 
-		} elseif ( $args['type'] == 'earnings' ) {
-			if ( $args['form'] == null ) {
-				if ( $args['date'] == null ) {
+		} elseif ($args['type'] == 'earnings') {
+			if ($args['form'] == null) {
+				if ($args['date'] == null) {
 					$earnings = $this->get_default_earnings_stats();
-				} elseif ( $args['date'] === 'range' ) {
+				} elseif ($args['date'] === 'range') {
 					// Return sales for a date range
 					// Ensure the end date is later than the start date
-					if ( $args['enddate'] < $args['startdate'] ) {
-						$error['error'] = esc_html__( 'The end date must be later than the start date.', 'give' );
+					if ($args['enddate'] < $args['startdate']) {
+						$error['error'] = esc_html__('The end date must be later than the start date.', 'give');
 					}
 
 					// Ensure both the start and end date are specified
-					if ( empty( $args['startdate'] ) || empty( $args['enddate'] ) ) {
-						$error['error'] = esc_html__( 'Invalid or no date range specified.', 'give' );
+					if (empty($args['startdate']) || empty($args['enddate'])) {
+						$error['error'] = esc_html__('Invalid or no date range specified.', 'give');
 					}
 
 					$total = (float) 0.00;
 
 					// Loop through the years
 					$y = $dates['year'];
-					if ( ! isset( $earnings['earnings'] ) ) {
+					if ( ! isset($earnings['earnings'])) {
 						$earnings['earnings'] = array();
 					}
-					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'] && $dates['year_end'] > $dates['year'] ) {
+						} elseif ($y == $dates['year'] && $dates['year_end'] > $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 {
@@ -1275,94 +1275,94 @@ 
 						}
 
 						$i = $month_start;
-						while ( $i <= $month_end ) :
+						while ($i <= $month_end) :
 
-							if ( $i == $dates['m_start'] ) {
+							if ($i == $dates['m_start']) {
 								$d = $dates['day_start'];
 							} else {
 								$d = 1;
 							}
 
-							if ( $i == $dates['m_end'] ) {
+							if ($i == $dates['m_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);
 							}
 
-							while ( $d <= $num_of_days ) :
-								$earnings_stat = give_get_earnings_by_date( $d, $i, $y );
-								$date_key      = date( 'Ymd', strtotime( $y . '/' . $i . '/' . $d ) );
-								if ( ! isset( $earnings['earnings'][ $date_key ] ) ) {
-									$earnings['earnings'][ $date_key ] = 0;
+							while ($d <= $num_of_days) :
+								$earnings_stat = give_get_earnings_by_date($d, $i, $y);
+								$date_key      = date('Ymd', strtotime($y.'/'.$i.'/'.$d));
+								if ( ! isset($earnings['earnings'][$date_key])) {
+									$earnings['earnings'][$date_key] = 0;
 								}
-								$earnings['earnings'][ $date_key ] += $earnings_stat;
+								$earnings['earnings'][$date_key] += $earnings_stat;
 								$total                             += $earnings_stat;
-								$d ++;
+								$d++;
 							endwhile;
 
-							$i ++;
+							$i++;
 						endwhile;
 
-						$y ++;
+						$y++;
 					endwhile;
 
 					$earnings['totals'] = $total;
 				} else {
-					if ( $args['date'] == 'this_quarter' || $args['date'] == 'last_quarter' ) {
+					if ($args['date'] == 'this_quarter' || $args['date'] == 'last_quarter') {
 						$earnings_count = (float) 0.00;
 
 						// Loop through the months
 						$month = $dates['m_start'];
 
-						while ( $month <= $dates['m_end'] ) :
-							$earnings_count += give_get_earnings_by_date( null, $month, $dates['year'] );
-							$month ++;
+						while ($month <= $dates['m_end']) :
+							$earnings_count += give_get_earnings_by_date(null, $month, $dates['year']);
+							$month++;
 						endwhile;
 
-						$earnings['earnings'][ $args['date'] ] = $earnings_count;
+						$earnings['earnings'][$args['date']] = $earnings_count;
 					} else {
-						$earnings['earnings'][ $args['date'] ] = give_get_earnings_by_date( $dates['day'], $dates['m_start'], $dates['year'] );
+						$earnings['earnings'][$args['date']] = give_get_earnings_by_date($dates['day'], $dates['m_start'], $dates['year']);
 					}
 				}// End if().
-			} elseif ( $args['form'] == 'all' ) {
-				$forms = get_posts( array(
+			} elseif ($args['form'] == 'all') {
+				$forms = get_posts(array(
 					'post_type' => 'give_forms',
 					'nopaging'  => true,
-				) );
+				));
 
 				$i = 0;
-				foreach ( $forms as $form_info ) {
-					$earnings['earnings'][ $i ] = array(
-						$form_info->post_name => give_get_form_earnings_stats( $form_info->ID ),
+				foreach ($forms as $form_info) {
+					$earnings['earnings'][$i] = array(
+						$form_info->post_name => give_get_form_earnings_stats($form_info->ID),
 					);
-					$i ++;
+					$i++;
 				}
 			} else {
-				if ( get_post_type( $args['form'] ) == 'give_forms' ) {
-					$form_info               = get_post( $args['form'] );
+				if (get_post_type($args['form']) == 'give_forms') {
+					$form_info               = get_post($args['form']);
 					$earnings['earnings'][0] = array(
-						$form_info->post_name => give_get_form_earnings_stats( $args['form'] ),
+						$form_info->post_name => give_get_form_earnings_stats($args['form']),
 					);
 				} else {
 					$error['error'] = sprintf( /* translators: %s: form */
-						esc_html__( 'Form %s not found.', 'give' ), $args['form'] );
+						esc_html__('Form %s not found.', 'give'), $args['form'] );
 				}
 			}// End if().
 
-			if ( ! empty( $error ) ) {
+			if ( ! empty($error)) {
 				return $error;
 			}
 
 			return $earnings;
-		} elseif ( $args['type'] == 'donors' ) {
+		} elseif ($args['type'] == 'donors') {
 			$donors                             = new Give_DB_Donors();
 			$stats['donations']['total_donors'] = $donors->count();
 
 			return $stats;
 
-		} elseif ( empty( $args['type'] ) ) {
-			$stats = array_merge( $stats, $this->get_default_sales_stats() );
-			$stats = array_merge( $stats, $this->get_default_earnings_stats() );
+		} elseif (empty($args['type'])) {
+			$stats = array_merge($stats, $this->get_default_sales_stats());
+			$stats = array_merge($stats, $this->get_default_earnings_stats());
 
 			return array(
 				'stats' => $stats,
@@ -1380,7 +1380,7 @@ 
 	 *
 	 * @return array
 	 */
-	public function get_recent_donations( $args = array() ) {
+	public function get_recent_donations($args = array()) {
 		global $wp_query;
 
 		$defaults = array(
@@ -1389,22 +1389,22 @@ 
 			'enddate'   => null,
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$sales = array();
 
-		if ( ! user_can( $this->user_id, 'view_give_reports' ) && ! $this->override ) {
+		if ( ! user_can($this->user_id, 'view_give_reports') && ! $this->override) {
 			return $sales;
 		}
 
-		if ( isset( $wp_query->query_vars['id'] ) ) {
+		if (isset($wp_query->query_vars['id'])) {
 			$query   = array();
-			$query[] = new Give_Payment( $wp_query->query_vars['id'] );
-		} elseif ( isset( $wp_query->query_vars['purchasekey'] ) ) {
+			$query[] = new Give_Payment($wp_query->query_vars['id']);
+		} elseif (isset($wp_query->query_vars['purchasekey'])) {
 			$query   = array();
-			$query[] = give_get_payment_by( 'key', $wp_query->query_vars['purchasekey'] );
-		} elseif ( isset( $wp_query->query_vars['email'] ) ) {
-			$args  = array(
+			$query[] = give_get_payment_by('key', $wp_query->query_vars['purchasekey']);
+		} elseif (isset($wp_query->query_vars['email'])) {
+			$args = array(
 				'fields'     => 'ids',
 				'meta_key'   => '_give_payment_user_email',
 				'meta_value' => $wp_query->query_vars['email'],
@@ -1412,11 +1412,11 @@ 
 				'page'       => $this->get_paged(),
 				'status'     => 'publish',
 			);
-			$query = give_get_payments( $args );
-		} elseif ( isset( $wp_query->query_vars['date'] ) ) {
+			$query = give_get_payments($args);
+		} elseif (isset($wp_query->query_vars['date'])) {
 
-			$current_time = current_time( 'timestamp' );
-			$dates        = $this->get_dates( $args );
+			$current_time = current_time('timestamp');
+			$dates        = $this->get_dates($args);
 
 			/**
 			 *  Switch case for date query argument
@@ -1427,27 +1427,27 @@ 
 			 * @params date startdate | required when date = range and format to be YYYYMMDD (i.e. 20170524)
 			 * @params date enddate | required when date = range and format to be YYYYMMDD (i.e. 20170524)
 			 */
-			switch ( $wp_query->query_vars['date'] ) {
+			switch ($wp_query->query_vars['date']) {
 
 				case 'today':
 
 					// Set and Format Start and End Date to be date of today.
-					$start_date = $end_date = date( 'Y/m/d', $current_time );
+					$start_date = $end_date = date('Y/m/d', $current_time);
 
 					break;
 
 				case 'yesterday':
 
 					// Set and Format Start and End Date to be date of yesterday.
-					$start_date = $end_date = date( 'Y/m', $current_time ) . '/' . ( date( 'd', $current_time ) - 1 );
+					$start_date = $end_date = date('Y/m', $current_time).'/'.(date('d', $current_time) - 1);
 
 					break;
 
 				case 'range':
 
 					// Format Start Date and End Date for filtering payment based on date range.
-					$start_date = $dates['year'] . '/' . $dates['m_start'] . '/' . $dates['day_start'];
-					$end_date   = $dates['year_end'] . '/' . $dates['m_end'] . '/' . $dates['day_end'];
+					$start_date = $dates['year'].'/'.$dates['m_start'].'/'.$dates['day_start'];
+					$end_date   = $dates['year_end'].'/'.$dates['m_end'].'/'.$dates['day_end'];
 
 					break;
 
@@ -1462,7 +1462,7 @@ 
 				'status'     => 'publish',
 			);
 
-			$query = give_get_payments( $args );
+			$query = give_get_payments($args);
 		} else {
 			$args  = array(
 				'fields' => 'ids',
@@ -1470,14 +1470,14 @@ 
 				'page'   => $this->get_paged(),
 				'status' => 'publish',
 			);
-			$query = give_get_payments( $args );
+			$query = give_get_payments($args);
 		}// End if().
-		if ( $query ) {
+		if ($query) {
 			$i = 0;
-			foreach ( $query as $payment ) {
+			foreach ($query as $payment) {
 
-				if ( is_numeric( $payment ) ) {
-					$payment      = new Give_Payment( $payment );
+				if (is_numeric($payment)) {
+					$payment      = new Give_Payment($payment);
 					$payment_meta = $payment->get_meta();
 					$user_info    = $payment->user_info;
 				} else {
@@ -1487,40 +1487,40 @@ 
 				$payment_meta = $payment->get_meta();
 				$user_info    = $payment->user_info;
 
-				$first_name = isset( $user_info['first_name'] ) ? $user_info['first_name'] : '';
-				$last_name  = isset( $user_info['last_name'] ) ? $user_info['last_name'] : '';
-
-				$sales['donations'][ $i ]['ID']             = $payment->number;
-				$sales['donations'][ $i ]['transaction_id'] = $payment->transaction_id;
-				$sales['donations'][ $i ]['key']            = $payment->key;
-				$sales['donations'][ $i ]['total']          = $payment->total;
-				$sales['donations'][ $i ]['gateway']        = $payment->gateway;
-				$sales['donations'][ $i ]['name']           = $first_name . ' ' . $last_name;
-				$sales['donations'][ $i ]['fname']          = $first_name;
-				$sales['donations'][ $i ]['lname']          = $last_name;
-				$sales['donations'][ $i ]['email']          = $payment->email;
-				$sales['donations'][ $i ]['date']           = $payment->date;
-
-				$form_id  = isset( $payment_meta['form_id'] ) ? $payment_meta['form_id'] : $payment_meta;
-				$price    = isset( $payment_meta['form_id'] ) ? give_get_form_price( $payment_meta['form_id'] ) : false;
-				$price_id = isset( $payment_meta['price_id'] ) ? $payment_meta['price_id'] : null;
-
-				$sales['donations'][ $i ]['form']['id']    = $form_id;
-				$sales['donations'][ $i ]['form']['name']  = get_the_title( $payment_meta['form_id'] );
-				$sales['donations'][ $i ]['form']['price'] = $price;
-
-				if ( give_has_variable_prices( $form_id ) ) {
-					if ( isset( $payment_meta['price_id'] ) ) {
-						$price_name                                     = give_get_price_option_name( $form_id, $payment_meta['price_id'], $payment->ID );
-						$sales['donations'][ $i ]['form']['price_name'] = $price_name;
-						$sales['donations'][ $i ]['form']['price_id']   = $price_id;
-						$sales['donations'][ $i ]['form']['price']      = give_get_price_option_amount( $form_id, $price_id );
+				$first_name = isset($user_info['first_name']) ? $user_info['first_name'] : '';
+				$last_name  = isset($user_info['last_name']) ? $user_info['last_name'] : '';
+
+				$sales['donations'][$i]['ID']             = $payment->number;
+				$sales['donations'][$i]['transaction_id'] = $payment->transaction_id;
+				$sales['donations'][$i]['key']            = $payment->key;
+				$sales['donations'][$i]['total']          = $payment->total;
+				$sales['donations'][$i]['gateway']        = $payment->gateway;
+				$sales['donations'][$i]['name']           = $first_name.' '.$last_name;
+				$sales['donations'][$i]['fname']          = $first_name;
+				$sales['donations'][$i]['lname']          = $last_name;
+				$sales['donations'][$i]['email']          = $payment->email;
+				$sales['donations'][$i]['date']           = $payment->date;
+
+				$form_id  = isset($payment_meta['form_id']) ? $payment_meta['form_id'] : $payment_meta;
+				$price    = isset($payment_meta['form_id']) ? give_get_form_price($payment_meta['form_id']) : false;
+				$price_id = isset($payment_meta['price_id']) ? $payment_meta['price_id'] : null;
+
+				$sales['donations'][$i]['form']['id']    = $form_id;
+				$sales['donations'][$i]['form']['name']  = get_the_title($payment_meta['form_id']);
+				$sales['donations'][$i]['form']['price'] = $price;
+
+				if (give_has_variable_prices($form_id)) {
+					if (isset($payment_meta['price_id'])) {
+						$price_name                                     = give_get_price_option_name($form_id, $payment_meta['price_id'], $payment->ID);
+						$sales['donations'][$i]['form']['price_name'] = $price_name;
+						$sales['donations'][$i]['form']['price_id']   = $price_id;
+						$sales['donations'][$i]['form']['price']      = give_get_price_option_amount($form_id, $price_id);
 
 					}
 				}
 
 				// Add custom meta to API
-				foreach ( $payment_meta as $meta_key => $meta_value ) {
+				foreach ($payment_meta as $meta_key => $meta_value) {
 
 					$exceptions = array(
 						'form_title',
@@ -1533,19 +1533,19 @@ 
 					);
 
 					// Don't clutter up results with dupes
-					if ( in_array( $meta_key, $exceptions ) ) {
+					if (in_array($meta_key, $exceptions)) {
 						continue;
 					}
 
-					$sales['donations'][ $i ]['payment_meta'][ $meta_key ] = $meta_value;
+					$sales['donations'][$i]['payment_meta'][$meta_key] = $meta_value;
 
 				}
 
-				$i ++;
+				$i++;
 			}// End foreach().
 		}// End if().
 
-		return apply_filters( 'give_api_donations_endpoint', $sales );
+		return apply_filters('give_api_donations_endpoint', $sales);
 	}
 
 	/**
@@ -1561,9 +1561,9 @@ 
 	public function get_output_format() {
 		global $wp_query;
 
-		$format = isset( $wp_query->query_vars['format'] ) ? $wp_query->query_vars['format'] : 'json';
+		$format = isset($wp_query->query_vars['format']) ? $wp_query->query_vars['format'] : 'json';
 
-		return apply_filters( 'give_api_output_format', $format );
+		return apply_filters('give_api_output_format', $format);
 	}
 
 
@@ -1580,8 +1580,8 @@ 
 	 *
 	 * @return void
 	 */
-	private function log_request( $data = array() ) {
-		if ( ! $this->log_requests ) {
+	private function log_request($data = array()) {
+		if ( ! $this->log_requests) {
 			return;
 		}
 
@@ -1597,36 +1597,36 @@ 
 
 		$query = array(
 			'give-api'    => $wp_query->query_vars['give-api'],
-			'key'         => isset( $wp_query->query_vars['key'] ) ? $wp_query->query_vars['key'] : null,
-			'token'       => isset( $wp_query->query_vars['token'] ) ? $wp_query->query_vars['token'] : null,
-			'query'       => isset( $wp_query->query_vars['query'] ) ? $wp_query->query_vars['query'] : null,
-			'type'        => isset( $wp_query->query_vars['type'] ) ? $wp_query->query_vars['type'] : null,
-			'form'        => isset( $wp_query->query_vars['form'] ) ? $wp_query->query_vars['form'] : null,
-			'donor'       => isset( $wp_query->query_vars['donor'] ) ? $wp_query->query_vars['donor'] : null,
-			'date'        => isset( $wp_query->query_vars['date'] ) ? $wp_query->query_vars['date'] : null,
-			'startdate'   => isset( $wp_query->query_vars['startdate'] ) ? $wp_query->query_vars['startdate'] : null,
-			'enddate'     => isset( $wp_query->query_vars['enddate'] ) ? $wp_query->query_vars['enddate'] : null,
-			'id'          => isset( $wp_query->query_vars['id'] ) ? $wp_query->query_vars['id'] : null,
-			'purchasekey' => isset( $wp_query->query_vars['purchasekey'] ) ? $wp_query->query_vars['purchasekey'] : null,
-			'email'       => isset( $wp_query->query_vars['email'] ) ? $wp_query->query_vars['email'] : null,
+			'key'         => isset($wp_query->query_vars['key']) ? $wp_query->query_vars['key'] : null,
+			'token'       => isset($wp_query->query_vars['token']) ? $wp_query->query_vars['token'] : null,
+			'query'       => isset($wp_query->query_vars['query']) ? $wp_query->query_vars['query'] : null,
+			'type'        => isset($wp_query->query_vars['type']) ? $wp_query->query_vars['type'] : null,
+			'form'        => isset($wp_query->query_vars['form']) ? $wp_query->query_vars['form'] : null,
+			'donor'       => isset($wp_query->query_vars['donor']) ? $wp_query->query_vars['donor'] : null,
+			'date'        => isset($wp_query->query_vars['date']) ? $wp_query->query_vars['date'] : null,
+			'startdate'   => isset($wp_query->query_vars['startdate']) ? $wp_query->query_vars['startdate'] : null,
+			'enddate'     => isset($wp_query->query_vars['enddate']) ? $wp_query->query_vars['enddate'] : null,
+			'id'          => isset($wp_query->query_vars['id']) ? $wp_query->query_vars['id'] : null,
+			'purchasekey' => isset($wp_query->query_vars['purchasekey']) ? $wp_query->query_vars['purchasekey'] : null,
+			'email'       => isset($wp_query->query_vars['email']) ? $wp_query->query_vars['email'] : null,
 		);
 
 		$log_data = array(
 			'log_type'     => 'api_request',
-			'post_excerpt' => http_build_query( $query ),
-			'post_content' => ! empty( $data['error'] ) ? $data['error'] : '',
+			'post_excerpt' => http_build_query($query),
+			'post_content' => ! empty($data['error']) ? $data['error'] : '',
 		);
 
 		$log_meta = array(
 			'request_ip' => give_get_ip(),
 			'user'       => $this->user_id,
-			'key'        => isset( $wp_query->query_vars['key'] ) ? $wp_query->query_vars['key'] : null,
-			'token'      => isset( $wp_query->query_vars['token'] ) ? $wp_query->query_vars['token'] : null,
+			'key'        => isset($wp_query->query_vars['key']) ? $wp_query->query_vars['key'] : null,
+			'token'      => isset($wp_query->query_vars['token']) ? $wp_query->query_vars['token'] : null,
 			'time'       => $data['request_speed'],
 			'version'    => $this->get_queried_version(),
 		);
 
-		$give_logs->insert_log( $log_data, $log_meta );
+		$give_logs->insert_log($log_data, $log_meta);
 	}
 
 
@@ -1650,11 +1650,11 @@ 
 	 *
 	 * @param int       $status_code
 	 */
-	public function output( $status_code = 200 ) {
+	public function output($status_code = 200) {
 
 		$format = $this->get_output_format();
 
-		status_header( $status_code );
+		status_header($status_code);
 
 		/**
 		 * Fires before outputting the API.
@@ -1665,25 +1665,25 @@ 
 		 * @param Give_API $this   The Give_API object.
 		 * @param string   $format Output format, XML or JSON. Default is JSON.
 		 */
-		do_action( 'give_api_output_before', $this->data, $this, $format );
+		do_action('give_api_output_before', $this->data, $this, $format);
 
-		switch ( $format ) :
+		switch ($format) :
 
 			case 'xml' :
 
-				require_once GIVE_PLUGIN_DIR . 'includes/libraries/array2xml.php';
-				$xml = Array2XML::createXML( 'give', $this->data );
+				require_once GIVE_PLUGIN_DIR.'includes/libraries/array2xml.php';
+				$xml = Array2XML::createXML('give', $this->data);
 				echo $xml->saveXML();
 
 				break;
 
 			case 'json' :
 
-				header( 'Content-Type: application/json' );
-				if ( ! empty( $this->pretty_print ) ) {
-					echo json_encode( $this->data, $this->pretty_print );
+				header('Content-Type: application/json');
+				if ( ! empty($this->pretty_print)) {
+					echo json_encode($this->data, $this->pretty_print);
 				} else {
-					echo json_encode( $this->data );
+					echo json_encode($this->data);
 				}
 
 				break;
@@ -1698,7 +1698,7 @@ 
 				 * @param array    $data Response data to return.
 				 * @param Give_API $this The Give_API object.
 				 */
-				do_action( "give_api_output_{$format}", $this->data, $this );
+				do_action("give_api_output_{$format}", $this->data, $this);
 
 				break;
 
@@ -1713,7 +1713,7 @@ 
 		 * @param Give_API $this   The Give_API object.
 		 * @param string   $format Output format, XML or JSON. Default is JSON.
 		 */
-		do_action( 'give_api_output_after', $this->data, $this, $format );
+		do_action('give_api_output_after', $this->data, $this, $format);
 
 		give_die();
 	}
@@ -1730,40 +1730,40 @@ 
 	 *
 	 * @return void
 	 */
-	function user_key_field( $user ) {
+	function user_key_field($user) {
 
-		if ( ( give_get_option( 'api_allow_user_keys', false ) || current_user_can( 'manage_give_settings' ) ) && current_user_can( 'edit_user', $user->ID ) ) {
-			$user = get_userdata( $user->ID );
+		if ((give_get_option('api_allow_user_keys', false) || current_user_can('manage_give_settings')) && current_user_can('edit_user', $user->ID)) {
+			$user = get_userdata($user->ID);
 			?>
 			<table class="form-table">
 				<tbody>
 				<tr>
 					<th>
-						<?php esc_html_e( 'Give API Keys', 'give' ); ?>
+						<?php esc_html_e('Give API Keys', 'give'); ?>
 					</th>
 					<td>
 						<?php
-						$public_key = $this->get_user_public_key( $user->ID );
-						$secret_key = $this->get_user_secret_key( $user->ID );
+						$public_key = $this->get_user_public_key($user->ID);
+						$secret_key = $this->get_user_secret_key($user->ID);
 						?>
-						<?php if ( empty( $user->give_user_public_key ) ) { ?>
+						<?php if (empty($user->give_user_public_key)) { ?>
 							<input name="give_set_api_key" type="checkbox" id="give_set_api_key" value="0"/>
-							<span class="description"><?php esc_html_e( 'Generate API Key', 'give' ); ?></span>
+							<span class="description"><?php esc_html_e('Generate API Key', 'give'); ?></span>
 						<?php } else { ?>
-							<strong style="display:inline-block; width: 125px;"><?php esc_html_e( 'Public key:', 'give' ); ?>
+							<strong style="display:inline-block; width: 125px;"><?php esc_html_e('Public key:', 'give'); ?>
 								&nbsp;</strong>
-							<input type="text" disabled="disabled" class="regular-text" id="publickey" value="<?php echo esc_attr( $public_key ); ?>"/>
+							<input type="text" disabled="disabled" class="regular-text" id="publickey" value="<?php echo esc_attr($public_key); ?>"/>
 							<br/>
-							<strong style="display:inline-block; width: 125px;"><?php esc_html_e( 'Secret key:', 'give' ); ?>
+							<strong style="display:inline-block; width: 125px;"><?php esc_html_e('Secret key:', 'give'); ?>
 								&nbsp;</strong>
-							<input type="text" disabled="disabled" class="regular-text" id="privatekey" value="<?php echo esc_attr( $secret_key ); ?>"/>
+							<input type="text" disabled="disabled" class="regular-text" id="privatekey" value="<?php echo esc_attr($secret_key); ?>"/>
 							<br/>
-							<strong style="display:inline-block; width: 125px;"><?php esc_html_e( 'Token:', 'give' ); ?>
+							<strong style="display:inline-block; width: 125px;"><?php esc_html_e('Token:', 'give'); ?>
 								&nbsp;</strong>
-							<input type="text" disabled="disabled" class="regular-text" id="token" value="<?php echo esc_attr( $this->get_token( $user->ID ) ); ?>"/>
+							<input type="text" disabled="disabled" class="regular-text" id="token" value="<?php echo esc_attr($this->get_token($user->ID)); ?>"/>
 							<br/>
 							<input name="give_set_api_key" type="checkbox" id="give_set_api_key" value="0"/>
-							<span class="description"><label for="give_set_api_key"><?php esc_html_e( 'Revoke API Keys', 'give' ); ?></label></span>
+							<span class="description"><label for="give_set_api_key"><?php esc_html_e('Revoke API Keys', 'give'); ?></label></span>
 						<?php } ?>
 					</td>
 				</tr>
@@ -1782,61 +1782,61 @@ 
 	 *
 	 * @return void
 	 */
-	public function process_api_key( $args ) {
+	public function process_api_key($args) {
 
-		if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'give-api-nonce' ) ) {
-			wp_die( __( 'Nonce verification failed.', 'give' ), __( 'Error', 'give' ), array(
+		if ( ! wp_verify_nonce($_REQUEST['_wpnonce'], 'give-api-nonce')) {
+			wp_die(__('Nonce verification failed.', 'give'), __('Error', 'give'), array(
 				'response' => 403,
-			) );
+			));
 		}
 
-		if ( empty( $args['user_id'] ) ) {
-			wp_die( __( 'User ID Required.', 'give' ), __( 'Error', 'give' ), array(
+		if (empty($args['user_id'])) {
+			wp_die(__('User ID Required.', 'give'), __('Error', 'give'), array(
 				'response' => 401,
-			) );
+			));
 		}
 
-		if ( is_numeric( $args['user_id'] ) ) {
-			$user_id = isset( $args['user_id'] ) ? absint( $args['user_id'] ) : get_current_user_id();
+		if (is_numeric($args['user_id'])) {
+			$user_id = isset($args['user_id']) ? absint($args['user_id']) : get_current_user_id();
 		} else {
-			$userdata = get_user_by( 'login', $args['user_id'] );
+			$userdata = get_user_by('login', $args['user_id']);
 			$user_id  = $userdata->ID;
 		}
-		$process = isset( $args['give_api_process'] ) ? strtolower( $args['give_api_process'] ) : false;
+		$process = isset($args['give_api_process']) ? strtolower($args['give_api_process']) : false;
 
-		if ( $user_id == get_current_user_id() && ! give_get_option( 'allow_user_api_keys' ) && ! current_user_can( 'manage_give_settings' ) ) {
-			wp_die( sprintf( /* translators: %s: process */
-				esc_html__( 'You do not have permission to %s API keys for this user.', 'give' ), $process ), esc_html__( 'Error', 'give' ), array(
+		if ($user_id == get_current_user_id() && ! give_get_option('allow_user_api_keys') && ! current_user_can('manage_give_settings')) {
+			wp_die(sprintf( /* translators: %s: process */
+				esc_html__('You do not have permission to %s API keys for this user.', 'give'), $process ), esc_html__('Error', 'give'), array(
 				'response' => 403,
-			) );
-		} elseif ( ! current_user_can( 'manage_give_settings' ) ) {
-			wp_die( sprintf( /* translators: %s: process */
-				esc_html__( 'You do not have permission to %s API keys for this user.', 'give' ), $process ), esc_html__( 'Error', 'give' ), array(
+			));
+		} elseif ( ! current_user_can('manage_give_settings')) {
+			wp_die(sprintf( /* translators: %s: process */
+				esc_html__('You do not have permission to %s API keys for this user.', 'give'), $process ), esc_html__('Error', 'give'), array(
 				'response' => 403,
-			) );
+			));
 		}
 
-		switch ( $process ) {
+		switch ($process) {
 			case 'generate':
-				if ( $this->generate_api_key( $user_id ) ) {
-					Give_Cache::delete( Give_Cache::get_key( 'give_total_api_keys' ) );
-					wp_redirect( add_query_arg( 'give-message', 'api-key-generated', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+				if ($this->generate_api_key($user_id)) {
+					Give_Cache::delete(Give_Cache::get_key('give_total_api_keys'));
+					wp_redirect(add_query_arg('give-message', 'api-key-generated', 'edit.php?post_type=give_forms&page=give-tools&tab=api'));
 					exit();
 				} else {
-					wp_redirect( add_query_arg( 'give-message', 'api-key-failed', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+					wp_redirect(add_query_arg('give-message', 'api-key-failed', 'edit.php?post_type=give_forms&page=give-tools&tab=api'));
 					exit();
 				}
 				break;
 			case 'regenerate':
-				$this->generate_api_key( $user_id, true );
-				Give_Cache::delete( Give_Cache::get_key( 'give_total_api_keys' ) );
-				wp_redirect( add_query_arg( 'give-message', 'api-key-regenerated', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+				$this->generate_api_key($user_id, true);
+				Give_Cache::delete(Give_Cache::get_key('give_total_api_keys'));
+				wp_redirect(add_query_arg('give-message', 'api-key-regenerated', 'edit.php?post_type=give_forms&page=give-tools&tab=api'));
 				exit();
 				break;
 			case 'revoke':
-				$this->revoke_api_key( $user_id );
-				Give_Cache::delete( Give_Cache::get_key( 'give_total_api_keys' ) );
-				wp_redirect( add_query_arg( 'give-message', 'api-key-revoked', 'edit.php?post_type=give_forms&page=give-tools&tab=api' ) );
+				$this->revoke_api_key($user_id);
+				Give_Cache::delete(Give_Cache::get_key('give_total_api_keys'));
+				wp_redirect(add_query_arg('give-message', 'api-key-revoked', 'edit.php?post_type=give_forms&page=give-tools&tab=api'));
 				exit();
 				break;
 			default;
@@ -1855,34 +1855,34 @@ 
 	 *
 	 * @return boolean True if (re)generated succesfully, false otherwise.
 	 */
-	public function generate_api_key( $user_id = 0, $regenerate = false ) {
+	public function generate_api_key($user_id = 0, $regenerate = false) {
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return false;
 		}
 
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-		if ( ! $user ) {
+		if ( ! $user) {
 			return false;
 		}
 
-		$public_key = $this->get_user_public_key( $user_id );
-		$secret_key = $this->get_user_secret_key( $user_id );
+		$public_key = $this->get_user_public_key($user_id);
+		$secret_key = $this->get_user_secret_key($user_id);
 
-		if ( empty( $public_key ) || $regenerate == true ) {
-			$new_public_key = $this->generate_public_key( $user->user_email );
-			$new_secret_key = $this->generate_private_key( $user->ID );
+		if (empty($public_key) || $regenerate == true) {
+			$new_public_key = $this->generate_public_key($user->user_email);
+			$new_secret_key = $this->generate_private_key($user->ID);
 		} else {
 			return false;
 		}
 
-		if ( $regenerate == true ) {
-			$this->revoke_api_key( $user->ID );
+		if ($regenerate == true) {
+			$this->revoke_api_key($user->ID);
 		}
 
-		update_user_meta( $user_id, $new_public_key, 'give_user_public_key' );
-		update_user_meta( $user_id, $new_secret_key, 'give_user_secret_key' );
+		update_user_meta($user_id, $new_public_key, 'give_user_public_key');
+		update_user_meta($user_id, $new_secret_key, 'give_user_secret_key');
 
 		return true;
 	}
@@ -1897,26 +1897,26 @@ 
 	 *
 	 * @return bool
 	 */
-	public function revoke_api_key( $user_id = 0 ) {
+	public function revoke_api_key($user_id = 0) {
 
-		if ( empty( $user_id ) ) {
+		if (empty($user_id)) {
 			return false;
 		}
 
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-		if ( ! $user ) {
+		if ( ! $user) {
 			return false;
 		}
 
-		$public_key = $this->get_user_public_key( $user_id );
-		$secret_key = $this->get_user_secret_key( $user_id );
-		if ( ! empty( $public_key ) ) {
-			Give_Cache::delete( Give_Cache::get_key( md5( 'give_api_user_' . $public_key ) ) );
-			Give_Cache::delete( Give_Cache::get_key( md5( 'give_api_user_public_key' . $user_id ) ) );
-			Give_Cache::delete( Give_Cache::get_key( md5( 'give_api_user_secret_key' . $user_id ) ) );
-			delete_user_meta( $user_id, $public_key );
-			delete_user_meta( $user_id, $secret_key );
+		$public_key = $this->get_user_public_key($user_id);
+		$secret_key = $this->get_user_secret_key($user_id);
+		if ( ! empty($public_key)) {
+			Give_Cache::delete(Give_Cache::get_key(md5('give_api_user_'.$public_key)));
+			Give_Cache::delete(Give_Cache::get_key(md5('give_api_user_public_key'.$user_id)));
+			Give_Cache::delete(Give_Cache::get_key(md5('give_api_user_secret_key'.$user_id)));
+			delete_user_meta($user_id, $public_key);
+			delete_user_meta($user_id, $secret_key);
 		} else {
 			return false;
 		}
@@ -1941,22 +1941,22 @@ 
 	 *
 	 * @return void
 	 */
-	public function update_key( $user_id ) {
-		if ( current_user_can( 'edit_user', $user_id ) && isset( $_POST['give_set_api_key'] ) ) {
+	public function update_key($user_id) {
+		if (current_user_can('edit_user', $user_id) && isset($_POST['give_set_api_key'])) {
 
-			$user = get_userdata( $user_id );
+			$user = get_userdata($user_id);
 
-			$public_key = $this->get_user_public_key( $user_id );
-			$secret_key = $this->get_user_secret_key( $user_id );
+			$public_key = $this->get_user_public_key($user_id);
+			$secret_key = $this->get_user_secret_key($user_id);
 
-			if ( empty( $public_key ) ) {
-				$new_public_key = $this->generate_public_key( $user->user_email );
-				$new_secret_key = $this->generate_private_key( $user->ID );
+			if (empty($public_key)) {
+				$new_public_key = $this->generate_public_key($user->user_email);
+				$new_secret_key = $this->generate_private_key($user->ID);
 
-				update_user_meta( $user_id, $new_public_key, 'give_user_public_key' );
-				update_user_meta( $user_id, $new_secret_key, 'give_user_secret_key' );
+				update_user_meta($user_id, $new_public_key, 'give_user_public_key');
+				update_user_meta($user_id, $new_secret_key, 'give_user_secret_key');
 			} else {
-				$this->revoke_api_key( $user_id );
+				$this->revoke_api_key($user_id);
 			}
 		}
 	}
@@ -1971,9 +1971,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function generate_public_key( $user_email = '' ) {
-		$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-		$public   = hash( 'md5', $user_email . $auth_key . date( 'U' ) );
+	private function generate_public_key($user_email = '') {
+		$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+		$public   = hash('md5', $user_email.$auth_key.date('U'));
 
 		return $public;
 	}
@@ -1988,9 +1988,9 @@ 
 	 *
 	 * @return string
 	 */
-	private function generate_private_key( $user_id = 0 ) {
-		$auth_key = defined( 'AUTH_KEY' ) ? AUTH_KEY : '';
-		$secret   = hash( 'md5', $user_id . $auth_key . date( 'U' ) );
+	private function generate_private_key($user_id = 0) {
+		$auth_key = defined('AUTH_KEY') ? AUTH_KEY : '';
+		$secret   = hash('md5', $user_id.$auth_key.date('U'));
 
 		return $secret;
 	}
@@ -2005,8 +2005,8 @@ 
 	 *
 	 * @return string
 	 */
-	public function get_token( $user_id = 0 ) {
-		return hash( 'md5', $this->get_user_secret_key( $user_id ) . $this->get_user_public_key( $user_id ) );
+	public function get_token($user_id = 0) {
+		return hash('md5', $this->get_user_secret_key($user_id).$this->get_user_public_key($user_id));
 	}
 
 	/**
@@ -2020,9 +2020,9 @@ 
 
 		// Default sales return
 		$sales                               = array();
-		$sales['donations']['today']         = $this->stats->get_sales( 0, 'today' );
-		$sales['donations']['current_month'] = $this->stats->get_sales( 0, 'this_month' );
-		$sales['donations']['last_month']    = $this->stats->get_sales( 0, 'last_month' );
+		$sales['donations']['today']         = $this->stats->get_sales(0, 'today');
+		$sales['donations']['current_month'] = $this->stats->get_sales(0, 'this_month');
+		$sales['donations']['last_month']    = $this->stats->get_sales(0, 'last_month');
 		$sales['donations']['totals']        = give_get_total_donations();
 
 		return $sales;
@@ -2039,9 +2039,9 @@ 
 
 		// Default earnings return
 		$earnings                              = array();
-		$earnings['earnings']['today']         = $this->stats->get_earnings( 0, 'today' );
-		$earnings['earnings']['current_month'] = $this->stats->get_earnings( 0, 'this_month' );
-		$earnings['earnings']['last_month']    = $this->stats->get_earnings( 0, 'last_month' );
+		$earnings['earnings']['today']         = $this->stats->get_earnings(0, 'today');
+		$earnings['earnings']['current_month'] = $this->stats->get_earnings(0, 'this_month');
+		$earnings['earnings']['last_month']    = $this->stats->get_earnings(0, 'last_month');
 		$earnings['earnings']['totals']        = give_get_total_earnings();
 
 		return $earnings;
@@ -2061,25 +2061,25 @@ 
 	 *
 	 * @return string            The API key/secret for the user supplied
 	 */
-	public function api_key_backwards_compat( $check, $object_id, $meta_key, $single ) {
+	public function api_key_backwards_compat($check, $object_id, $meta_key, $single) {
 
-		if ( $meta_key !== 'give_user_public_key' && $meta_key !== 'give_user_secret_key' ) {
+		if ($meta_key !== 'give_user_public_key' && $meta_key !== 'give_user_secret_key') {
 			return $check;
 		}
 
 		$return = $check;
 
-		switch ( $meta_key ) {
+		switch ($meta_key) {
 			case 'give_user_public_key':
-				$return = Give()->api->get_user_public_key( $object_id );
+				$return = Give()->api->get_user_public_key($object_id);
 				break;
 			case 'give_user_secret_key':
-				$return = Give()->api->get_user_secret_key( $object_id );
+				$return = Give()->api->get_user_secret_key($object_id);
 				break;
 		}
 
-		if ( ! $single ) {
-			$return = array( $return );
+		if ( ! $single) {
+			$return = array($return);
 		}
 
 		return $return;

includes/class-give-db-donors.php

Doc Comments +3 added lines, -3 removed lines

@@ -161,7 +161,7 @@ 
 	 * @since  1.0
 	 * @access public
 	 *
-	 * @param  bool|string|int $_id_or_email
+	 * @param  integer $_id_or_email
 	 *
 	 * @return bool|int
 	 */
@@ -316,7 +316,7 @@ 
 	 * @param  int          $user_id       User ID.
 	 * @param  WP_User|bool $old_user_data User data.
 	 *
-	 * @return bool
+	 * @return false|null
 	 */
 	public function update_donor_email_on_user_update( $user_id = 0, $old_user_data = false ) {
 
@@ -373,7 +373,7 @@ 
 	 * @access public
 	 *
 	 * @param  string $field ID or email. Default is 'id'.
-	 * @param  mixed  $value The Customer ID or email to search. Default is 0.
+	 * @param  integer  $value The Customer ID or email to search. Default is 0.
 	 *
 	 * @return mixed         Upon success, an object of the donor. Upon failure, NULL
 	 */

Indentation +10 added lines, -10 removed lines

@@ -449,13 +449,13 @@ 
 	 *
 	 * @since  1.0
 	 * @access public
-     *
-     * @param  array $args
-     *
-     * @return array|object|null Customers array or object. Null if not found.
+	 *
+	 * @param  array $args
+	 *
+	 * @return array|object|null Customers array or object. Null if not found.
 	 */
 	public function get_donors( $args = array() ) {
-        /* @var WPDB $wpdb */
+		/* @var WPDB $wpdb */
 		global $wpdb;
 
 		$defaults = array(
@@ -580,13 +580,13 @@ 
 	 *
 	 * @since  1.0
 	 * @access public
-     *
-     * @param  array $args
-     *
-     * @return int         Total number of donors.
+	 *
+	 * @param  array $args
+	 *
+	 * @return int         Total number of donors.
 	 */
 	public function count( $args = array() ) {
-        /* @var WPDB $wpdb */
+		/* @var WPDB $wpdb */
 		global $wpdb;
 
 		$where = ' WHERE 1=1 ';

Spacing +134 added lines, -134 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -35,11 +35,11 @@ 
 		/* @var WPDB $wpdb */
 		global $wpdb;
 
-		$this->table_name  = $wpdb->prefix . 'give_customers';
+		$this->table_name  = $wpdb->prefix.'give_customers';
 		$this->primary_key = 'id';
 		$this->version     = '1.0';
 		
-		add_action( 'profile_update', array( $this, 'update_donor_email_on_user_update' ), 10, 2 );
+		add_action('profile_update', array($this, 'update_donor_email_on_user_update'), 10, 2);
 
 		// Install table.
 		$this->register_table();
@@ -85,7 +85,7 @@ 
 			'purchase_value' => 0.00,
 			'purchase_count' => 0,
 			'notes'          => '',
-			'date_created'   => date( 'Y-m-d H:i:s' ),
+			'date_created'   => date('Y-m-d H:i:s'),
 		);
 	}
 
@@ -99,40 +99,40 @@ 
 	 *
 	 * @return int|bool
 	 */
-	public function add( $data = array() ) {
+	public function add($data = array()) {
 
 		$defaults = array(
 			'payment_ids' => ''
 		);
 
-		$args = wp_parse_args( $data, $defaults );
+		$args = wp_parse_args($data, $defaults);
 
-		if ( empty( $args['email'] ) ) {
+		if (empty($args['email'])) {
 			return false;
 		}
 
-		if ( ! empty( $args['payment_ids'] ) && is_array( $args['payment_ids'] ) ) {
-			$args['payment_ids'] = implode( ',', array_unique( array_values( $args['payment_ids'] ) ) );
+		if ( ! empty($args['payment_ids']) && is_array($args['payment_ids'])) {
+			$args['payment_ids'] = implode(',', array_unique(array_values($args['payment_ids'])));
 		}
 
-		$donor = $this->get_donor_by( 'email', $args['email'] );
+		$donor = $this->get_donor_by('email', $args['email']);
 
 		// update an existing donor.
-		if ( $donor ) {
+		if ($donor) {
 
 			// Update the payment IDs attached to the donor
-			if ( ! empty( $args['payment_ids'] ) ) {
+			if ( ! empty($args['payment_ids'])) {
 
-				if ( empty( $donor->payment_ids ) ) {
+				if (empty($donor->payment_ids)) {
 
 					$donor->payment_ids = $args['payment_ids'];
 
 				} else {
 
-					$existing_ids          = array_map( 'absint', explode( ',', $donor->payment_ids ) );
-					$payment_ids           = array_map( 'absint', explode( ',', $args['payment_ids'] ) );
-					$payment_ids           = array_merge( $payment_ids, $existing_ids );
-					$donor->payment_ids = implode( ',', array_unique( array_values( $payment_ids ) ) );
+					$existing_ids          = array_map('absint', explode(',', $donor->payment_ids));
+					$payment_ids           = array_map('absint', explode(',', $args['payment_ids']));
+					$payment_ids           = array_merge($payment_ids, $existing_ids);
+					$donor->payment_ids = implode(',', array_unique(array_values($payment_ids)));
 
 				}
 
@@ -140,13 +140,13 @@ 
 
 			}
 
-			$this->update( $donor->id, $args );
+			$this->update($donor->id, $args);
 
 			return $donor->id;
 
 		} else {
 
-			return $this->insert( $args, 'donor' );
+			return $this->insert($args, 'donor');
 
 		}
 
@@ -165,20 +165,20 @@ 
 	 *
 	 * @return bool|int
 	 */
-	public function delete( $_id_or_email = false ) {
+	public function delete($_id_or_email = false) {
 
-		if ( empty( $_id_or_email ) ) {
+		if (empty($_id_or_email)) {
 			return false;
 		}
 
-		$column   = is_email( $_id_or_email ) ? 'email' : 'id';
-		$donor = $this->get_donor_by( $column, $_id_or_email );
+		$column = is_email($_id_or_email) ? 'email' : 'id';
+		$donor = $this->get_donor_by($column, $_id_or_email);
 
-		if ( $donor->id > 0 ) {
+		if ($donor->id > 0) {
 
 			global $wpdb;
 
-			return $wpdb->delete( $this->table_name, array( 'id' => $donor->id ), array( '%d' ) );
+			return $wpdb->delete($this->table_name, array('id' => $donor->id), array('%d'));
 
 		} else {
 			return false;
@@ -197,14 +197,14 @@ 
 	 *
 	 * @return bool          True is exists, false otherwise.
 	 */
-	public function exists( $value = '', $field = 'email' ) {
+	public function exists($value = '', $field = 'email') {
 		
 		$columns = $this->get_columns();
-		if ( ! array_key_exists( $field, $columns ) ) {
+		if ( ! array_key_exists($field, $columns)) {
 			return false;
 		}
 
-		return (bool) $this->get_column_by( 'id', $field, $value );
+		return (bool) $this->get_column_by('id', $field, $value);
 
 	}
 
@@ -219,16 +219,16 @@ 
 	 *
 	 * @return bool
 	 */
-	public function attach_payment( $donor_id = 0, $payment_id = 0 ) {
+	public function attach_payment($donor_id = 0, $payment_id = 0) {
 
-		$donor = new Give_Donor( $donor_id );
+		$donor = new Give_Donor($donor_id);
 
-		if ( empty( $donor->id ) ) {
+		if (empty($donor->id)) {
 			return false;
 		}
 
 		// Attach the payment, but don't increment stats, as this function previously did not
-		return $donor->attach_payment( $payment_id, false );
+		return $donor->attach_payment($payment_id, false);
 
 	}
 
@@ -243,16 +243,16 @@ 
 	 *
 	 * @return bool
 	 */
-	public function remove_payment( $donor_id = 0, $payment_id = 0 ) {
+	public function remove_payment($donor_id = 0, $payment_id = 0) {
 
-		$donor = new Give_Donor( $donor_id );
+		$donor = new Give_Donor($donor_id);
 
-		if ( ! $donor ) {
+		if ( ! $donor) {
 			return false;
 		}
 
 		// Remove the payment, but don't decrease stats, as this function previously did not
-		return $donor->remove_payment( $payment_id, false );
+		return $donor->remove_payment($payment_id, false);
 
 	}
 
@@ -266,18 +266,18 @@ 
 	 *
 	 * @return bool
 	 */
-	public function increment_stats( $donor_id = 0, $amount = 0.00 ) {
+	public function increment_stats($donor_id = 0, $amount = 0.00) {
 
-		$donor = new Give_Donor( $donor_id );
+		$donor = new Give_Donor($donor_id);
 
-		if ( empty( $donor->id ) ) {
+		if (empty($donor->id)) {
 			return false;
 		}
 
 		$increased_count = $donor->increase_purchase_count();
-		$increased_value = $donor->increase_value( $amount );
+		$increased_value = $donor->increase_value($amount);
 
-		return ( $increased_count && $increased_value ) ? true : false;
+		return ($increased_count && $increased_value) ? true : false;
 
 	}
 
@@ -292,18 +292,18 @@ 
 	 *
 	 * @return bool
 	 */
-	public function decrement_stats( $donor_id = 0, $amount = 0.00 ) {
+	public function decrement_stats($donor_id = 0, $amount = 0.00) {
 
-		$donor = new Give_Donor( $donor_id );
+		$donor = new Give_Donor($donor_id);
 
-		if ( ! $donor ) {
+		if ( ! $donor) {
 			return false;
 		}
 
 		$decreased_count = $donor->decrease_donation_count();
-		$decreased_value = $donor->decrease_value( $amount );
+		$decreased_value = $donor->decrease_value($amount);
 
-		return ( $decreased_count && $decreased_value ) ? true : false;
+		return ($decreased_count && $decreased_value) ? true : false;
 
 	}
 
@@ -318,31 +318,31 @@ 
 	 *
 	 * @return bool
 	 */
-	public function update_donor_email_on_user_update( $user_id = 0, $old_user_data = false ) {
+	public function update_donor_email_on_user_update($user_id = 0, $old_user_data = false) {
 
-		$donor = new Give_Donor( $user_id, true );
+		$donor = new Give_Donor($user_id, true);
 
-		if( ! $donor ) {
+		if ( ! $donor) {
 			return false;
 		}
 
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-		if( ! empty( $user ) && $user->user_email !== $donor->email ) {
+		if ( ! empty($user) && $user->user_email !== $donor->email) {
 
-			if( ! $this->get_donor_by( 'email', $user->user_email ) ) {
+			if ( ! $this->get_donor_by('email', $user->user_email)) {
 
-				$success = $this->update( $donor->id, array( 'email' => $user->user_email ) );
+				$success = $this->update($donor->id, array('email' => $user->user_email));
 
-				if( $success ) {
+				if ($success) {
 					// Update some payment meta if we need to
-					$payments_array = explode( ',', $donor->payment_ids );
+					$payments_array = explode(',', $donor->payment_ids);
 
-					if( ! empty( $payments_array ) ) {
+					if ( ! empty($payments_array)) {
 
-						foreach ( $payments_array as $payment_id ) {
+						foreach ($payments_array as $payment_id) {
 
-							give_update_payment_meta( $payment_id, 'email', $user->user_email );
+							give_update_payment_meta($payment_id, 'email', $user->user_email);
 
 						}
 
@@ -356,7 +356,7 @@ 
 					 * @param  WP_User       $user     WordPress User object.
 					 * @param  Give_Donor $donor Give donor object.
 					 */
-					do_action( 'give_update_donor_email_on_user_update', $user, $donor );
+					do_action('give_update_donor_email_on_user_update', $user, $donor);
 
 				}
 
@@ -377,46 +377,46 @@ 
 	 *
 	 * @return mixed         Upon success, an object of the donor. Upon failure, NULL
 	 */
-	public function get_donor_by( $field = 'id', $value = 0 ) {
+	public function get_donor_by($field = 'id', $value = 0) {
 		/* @var WPDB $wpdb */
 		global $wpdb;
 
-		if ( empty( $field ) || empty( $value ) ) {
+		if (empty($field) || empty($value)) {
 			return null;
 		}
 
-		if ( 'id' == $field || 'user_id' == $field ) {
+		if ('id' == $field || 'user_id' == $field) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) ) {
+			if ( ! is_numeric($value)) {
 				return false;
 			}
 
-			$value = intval( $value );
+			$value = intval($value);
 
-			if ( $value < 1 ) {
+			if ($value < 1) {
 				return false;
 			}
 
-		} elseif ( 'email' === $field ) {
+		} elseif ('email' === $field) {
 
-			if ( ! is_email( $value ) ) {
+			if ( ! is_email($value)) {
 				return false;
 			}
 
-			$value = trim( $value );
+			$value = trim($value);
 		}
 
-		if ( ! $value ) {
+		if ( ! $value) {
 			return false;
 		}
 
-		switch ( $field ) {
+		switch ($field) {
 			case 'id':
 				$db_field = 'id';
 				break;
 			case 'email':
-				$value    = sanitize_text_field( $value );
+				$value    = sanitize_text_field($value);
 				$db_field = 'email';
 				break;
 			case 'user_id':
@@ -426,15 +426,15 @@ 
 				return false;
 		}
 
-		if ( ! $donor = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $this->table_name WHERE $db_field = %s LIMIT 1", $value ) ) ) {
+		if ( ! $donor = $wpdb->get_row($wpdb->prepare("SELECT * FROM $this->table_name WHERE $db_field = %s LIMIT 1", $value))) {
 
 			// Look for donor from an additional email.
-			if( 'email' === $field ) {
-				$meta_table  = Give()->donor_meta->table_name;
-				$donor_id = $wpdb->get_var( $wpdb->prepare( "SELECT customer_id FROM {$meta_table} WHERE meta_key = 'additional_email' AND meta_value = %s LIMIT 1", $value ) );
+			if ('email' === $field) {
+				$meta_table = Give()->donor_meta->table_name;
+				$donor_id = $wpdb->get_var($wpdb->prepare("SELECT customer_id FROM {$meta_table} WHERE meta_key = 'additional_email' AND meta_value = %s LIMIT 1", $value));
 
-				if( ! empty( $donor_id ) ) {
-					return $this->get( $donor_id );
+				if ( ! empty($donor_id)) {
+					return $this->get($donor_id);
  				}
  			}
 
@@ -454,7 +454,7 @@ 
      *
      * @return array|object|null Customers array or object. Null if not found.
 	 */
-	public function get_donors( $args = array() ) {
+	public function get_donors($args = array()) {
         /* @var WPDB $wpdb */
 		global $wpdb;
 
@@ -466,21 +466,21 @@ 
 			'order'   => 'DESC'
 		);
 
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
-		if ( $args['number'] < 1 ) {
+		if ($args['number'] < 1) {
 			$args['number'] = 999999999999;
 		}
 
 		$where = ' WHERE 1=1 ';
 
 		// specific donors.
-		if ( ! empty( $args['id'] ) ) {
+		if ( ! empty($args['id'])) {
 
-			if ( is_array( $args['id'] ) ) {
-				$ids = implode( ',', array_map( 'intval', $args['id'] ) );
+			if (is_array($args['id'])) {
+				$ids = implode(',', array_map('intval', $args['id']));
 			} else {
-				$ids = intval( $args['id'] );
+				$ids = intval($args['id']);
 			}
 
 			$where .= " AND `id` IN( {$ids} ) ";
@@ -488,12 +488,12 @@ 
 		}
 
 		// donors for specific user accounts
-		if ( ! empty( $args['user_id'] ) ) {
+		if ( ! empty($args['user_id'])) {
 
-			if ( is_array( $args['user_id'] ) ) {
-				$user_ids = implode( ',', array_map( 'intval', $args['user_id'] ) );
+			if (is_array($args['user_id'])) {
+				$user_ids = implode(',', array_map('intval', $args['user_id']));
 			} else {
-				$user_ids = intval( $args['user_id'] );
+				$user_ids = intval($args['user_id']);
 			}
 
 			$where .= " AND `user_id` IN( {$user_ids} ) ";
@@ -501,41 +501,41 @@ 
 		}
 
 		//specific donors by email
-		if( ! empty( $args['email'] ) ) {
+		if ( ! empty($args['email'])) {
 
-			if( is_array( $args['email'] ) ) {
+			if (is_array($args['email'])) {
 
-				$emails_count       = count( $args['email'] );
-				$emails_placeholder = array_fill( 0, $emails_count, '%s' );
-				$emails             = implode( ', ', $emails_placeholder );
+				$emails_count       = count($args['email']);
+				$emails_placeholder = array_fill(0, $emails_count, '%s');
+				$emails             = implode(', ', $emails_placeholder);
 
-				$where .= $wpdb->prepare( " AND `email` IN( $emails ) ", $args['email'] );
+				$where .= $wpdb->prepare(" AND `email` IN( $emails ) ", $args['email']);
 			} else {
-				$where .= $wpdb->prepare( " AND `email` = %s ", $args['email'] );
+				$where .= $wpdb->prepare(" AND `email` = %s ", $args['email']);
 			}
 		}
 
 		// specific donors by name
-		if( ! empty( $args['name'] ) ) {
-			$where .= $wpdb->prepare( " AND `name` LIKE '%%%%" . '%s' . "%%%%' ", $args['name'] );
+		if ( ! empty($args['name'])) {
+			$where .= $wpdb->prepare(" AND `name` LIKE '%%%%".'%s'."%%%%' ", $args['name']);
 		}
 
 		// Donors created for a specific date or in a date range
-		if ( ! empty( $args['date'] ) ) {
+		if ( ! empty($args['date'])) {
 
-			if ( is_array( $args['date'] ) ) {
+			if (is_array($args['date'])) {
 
-				if ( ! empty( $args['date']['start'] ) ) {
+				if ( ! empty($args['date']['start'])) {
 
-					$start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
+					$start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
 
 					$where .= " AND `date_created` >= '{$start}'";
 
 				}
 
-				if ( ! empty( $args['date']['end'] ) ) {
+				if ( ! empty($args['date']['end'])) {
 
-					$end = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+					$end = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
 					$where .= " AND `date_created` <= '{$end}'";
 
@@ -543,31 +543,31 @@ 
 
 			} else {
 
-				$year  = date( 'Y', strtotime( $args['date'] ) );
-				$month = date( 'm', strtotime( $args['date'] ) );
-				$day   = date( 'd', strtotime( $args['date'] ) );
+				$year  = date('Y', strtotime($args['date']));
+				$month = date('m', strtotime($args['date']));
+				$day   = date('d', strtotime($args['date']));
 
 				$where .= " AND $year = YEAR ( date_created ) AND $month = MONTH ( date_created ) AND $day = DAY ( date_created )";
 			}
 
 		}
 
-		$args['orderby'] = ! array_key_exists( $args['orderby'], $this->get_columns() ) ? 'id' : $args['orderby'];
+		$args['orderby'] = ! array_key_exists($args['orderby'], $this->get_columns()) ? 'id' : $args['orderby'];
 
-		if ( 'purchase_value' == $args['orderby'] ) {
+		if ('purchase_value' == $args['orderby']) {
 			$args['orderby'] = 'purchase_value+0';
 		}
 
-		$cache_key = md5( 'give_donors_' . serialize( $args ) );
+		$cache_key = md5('give_donors_'.serialize($args));
 
-		$donors = wp_cache_get( $cache_key, 'donors' );
+		$donors = wp_cache_get($cache_key, 'donors');
 
-		$args['orderby'] = esc_sql( $args['orderby'] );
-		$args['order']   = esc_sql( $args['order'] );
+		$args['orderby'] = esc_sql($args['orderby']);
+		$args['order']   = esc_sql($args['order']);
 
-		if ( $donors === false ) {
-			$donors = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint( $args['offset'] ), absint( $args['number'] ) ) );
-			wp_cache_set( $cache_key, $donors, 'donors', 3600 );
+		if ($donors === false) {
+			$donors = $wpdb->get_results($wpdb->prepare("SELECT * FROM  $this->table_name $where ORDER BY {$args['orderby']} {$args['order']} LIMIT %d,%d;", absint($args['offset']), absint($args['number'])));
+			wp_cache_set($cache_key, $donors, 'donors', 3600);
 		}
 
 		return $donors;
@@ -585,26 +585,26 @@ 
      *
      * @return int         Total number of donors.
 	 */
-	public function count( $args = array() ) {
+	public function count($args = array()) {
         /* @var WPDB $wpdb */
 		global $wpdb;
 
 		$where = ' WHERE 1=1 ';
 
-		if ( ! empty( $args['date'] ) ) {
+		if ( ! empty($args['date'])) {
 
-			if ( is_array( $args['date'] ) ) {
+			if (is_array($args['date'])) {
 
-				$start = date( 'Y-m-d H:i:s', strtotime( $args['date']['start'] ) );
-				$end   = date( 'Y-m-d H:i:s', strtotime( $args['date']['end'] ) );
+				$start = date('Y-m-d H:i:s', strtotime($args['date']['start']));
+				$end   = date('Y-m-d H:i:s', strtotime($args['date']['end']));
 
 				$where .= " AND `date_created` >= '{$start}' AND `date_created` <= '{$end}'";
 
 			} else {
 
-				$year  = date( 'Y', strtotime( $args['date'] ) );
-				$month = date( 'm', strtotime( $args['date'] ) );
-				$day   = date( 'd', strtotime( $args['date'] ) );
+				$year  = date('Y', strtotime($args['date']));
+				$month = date('m', strtotime($args['date']));
+				$day   = date('d', strtotime($args['date']));
 
 				$where .= " AND $year = YEAR ( date_created ) AND $month = MONTH ( date_created ) AND $day = DAY ( date_created )";
 			}
@@ -612,16 +612,16 @@ 
 		}
 
 
-		$cache_key = md5( 'give_donors_count' . serialize( $args ) );
+		$cache_key = md5('give_donors_count'.serialize($args));
 
-		$count = wp_cache_get( $cache_key, 'donors' );
+		$count = wp_cache_get($cache_key, 'donors');
 
-		if ( $count === false ) {
-			$count = $wpdb->get_var( "SELECT COUNT($this->primary_key) FROM " . $this->table_name . "{$where};" );
-			wp_cache_set( $cache_key, $count, 'donors', 3600 );
+		if ($count === false) {
+			$count = $wpdb->get_var("SELECT COUNT($this->primary_key) FROM ".$this->table_name."{$where};");
+			wp_cache_set($cache_key, $count, 'donors', 3600);
 		}
 
-		return absint( $count );
+		return absint($count);
 
 	}
 
@@ -635,9 +635,9 @@ 
 	 */
 	public function create_table() {
 
-		require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+		require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
-		$sql = "CREATE TABLE " . $this->table_name . " (
+		$sql = "CREATE TABLE ".$this->table_name." (
 		id bigint(20) NOT NULL AUTO_INCREMENT,
 		user_id bigint(20) NOT NULL,
 		email varchar(50) NOT NULL,
@@ -652,9 +652,9 @@ 
 		KEY user (user_id)
 		) CHARACTER SET utf8 COLLATE utf8_general_ci;";
 
-		dbDelta( $sql );
+		dbDelta($sql);
 
-		update_option( $this->table_name . '_db_version', $this->version );
+		update_option($this->table_name.'_db_version', $this->version);
 	}
 	
 	/**
@@ -666,7 +666,7 @@ 
 	 * @return bool Returns if the donors table was installed and upgrade routine run.
 	 */
 	public function installed() {
-		return $this->table_exists( $this->table_name );
+		return $this->table_exists($this->table_name);
 	}
 
 }