WordImpress / Give

includes/admin/reporting/pdf-reports.php

Spacing +144 added lines, -144 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -25,75 +25,75 @@ 
  *
  * @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 = date_i18n( get_option( 'date_format' ), mktime( 0, 0, 0, 1, 1, date( 'Y' ) ) ) . ' ' . utf8_decode( __( 'to', 'give' ) ) . ' ' . date_i18n( get_option( 'date_format' ) );
+	$daterange = date_i18n(get_option('date_format'), mktime(0, 0, 0, 1, 1, date('Y'))).' '.utf8_decode(__('to', 'give')).' '.date_i18n(get_option('date_format'));
 
 	$pdf = new give_pdf();
-	$pdf->AddPage( 'L', 'A4' );
+	$pdf->AddPage('L', 'A4');
 
-	$pdf->SetTitle( utf8_decode( __( 'Donation report for the current year for all forms', 'give' ) ) );
-	$pdf->SetAuthor( utf8_decode( __( 'Give - Democratizing Generosity', 'give' ) ) );
-	$pdf->SetCreator( utf8_decode( __( 'Give - Democratizing Generosity', 'give' ) ) );
+	$pdf->SetTitle(utf8_decode(__('Donation report for the current year for all forms', 'give')));
+	$pdf->SetAuthor(utf8_decode(__('Give - Democratizing Generosity', 'give')));
+	$pdf->SetCreator(utf8_decode(__('Give - Democratizing Generosity', 'give')));
 
-	$pdf->Image( GIVE_PLUGIN_URL . 'assets/images/give-logo-small.png', 247, 8 );
+	$pdf->Image(GIVE_PLUGIN_URL.'assets/images/give-logo-small.png', 247, 8);
 
-	$pdf->SetMargins( 8, 8, 8 );
-	$pdf->SetX( 8 );
+	$pdf->SetMargins(8, 8, 8);
+	$pdf->SetX(8);
 
-	$pdf->SetFont( 'Helvetica', '', 16 );
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->Cell( 0, 3, utf8_decode( __( 'Donation report for the current year for all forms', 'give' ) ), 0, 2, 'L', false );
+	$pdf->SetFont('Helvetica', '', 16);
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->Cell(0, 3, utf8_decode(__('Donation report for the current year for all forms', 'give')), 0, 2, 'L', false);
 
-	$pdf->SetFont( 'Helvetica', '', 13 );
+	$pdf->SetFont('Helvetica', '', 13);
 	$pdf->Ln();
-	$pdf->SetTextColor( 150, 150, 150 );
-	$pdf->Cell( 0, 6, utf8_decode( __( 'Date Range: ', 'give' ) ) . $daterange, 0, 2, 'L', false );
+	$pdf->SetTextColor(150, 150, 150);
+	$pdf->Cell(0, 6, utf8_decode(__('Date Range: ', 'give')).$daterange, 0, 2, 'L', false);
 	$pdf->Ln();
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->SetFont( 'Helvetica', '', 14 );
-	$pdf->Cell( 0, 10, utf8_decode( __( 'Table View', 'give' ) ), 0, 2, 'L', false );
-	$pdf->SetFont( 'Helvetica', '', 12 );
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->SetFont('Helvetica', '', 14);
+	$pdf->Cell(0, 10, utf8_decode(__('Table View', 'give')), 0, 2, 'L', false);
+	$pdf->SetFont('Helvetica', '', 12);
 
-	$pdf->SetFillColor( 238, 238, 238 );
-	$pdf->Cell( 70, 6, utf8_decode( __( 'Form Name', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 30, 6, utf8_decode( __( 'Price', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 50, 6, utf8_decode( __( 'Categories', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 50, 6, utf8_decode( __( 'Tags', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 45, 6, utf8_decode( __( 'Number of Donations', 'give' ) ), 1, 0, 'L', true );
-	$pdf->Cell( 35, 6, utf8_decode( __( 'Income to Date', 'give' ) ), 1, 1, 'L', true );
+	$pdf->SetFillColor(238, 238, 238);
+	$pdf->Cell(70, 6, utf8_decode(__('Form Name', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(30, 6, utf8_decode(__('Price', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(50, 6, utf8_decode(__('Categories', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(50, 6, utf8_decode(__('Tags', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(45, 6, utf8_decode(__('Number of Donations', 'give')), 1, 0, 'L', true);
+	$pdf->Cell(35, 6, utf8_decode(__('Income to Date', 'give')), 1, 1, 'L', true);
 
-	$year       = date( 'Y' );
-	$give_forms = get_posts( array( 'post_type' => 'give_forms', 'year' => $year, 'posts_per_page' => - 1 ) );
+	$year       = date('Y');
+	$give_forms = get_posts(array('post_type' => 'give_forms', 'year' => $year, 'posts_per_page' => -1));
 
-	if ( $give_forms ):
-		$pdf->SetWidths( array( 70, 30, 50, 50, 45, 35 ) );
+	if ($give_forms):
+		$pdf->SetWidths(array(70, 30, 50, 50, 45, 35));
 
-		foreach ( $give_forms as $form ):
-			$pdf->SetFillColor( 255, 255, 255 );
+		foreach ($give_forms as $form):
+			$pdf->SetFillColor(255, 255, 255);
 
 			$title = $form->post_title;
 
-			if ( give_has_variable_prices( $form->ID ) ) {
+			if (give_has_variable_prices($form->ID)) {
 
-				$prices = give_get_variable_prices( $form->ID );
+				$prices = give_get_variable_prices($form->ID);
 
 				$first = $prices[0]['_give_amount'];
-				$last  = array_pop( $prices );
+				$last  = array_pop($prices);
 				$last  = $last['_give_amount'];
 
-				if ( $first < $last ) {
+				if ($first < $last) {
 					$min = $first;
 					$max = $last;
 				} else {
@@ -101,57 +101,57 @@ 
 					$max = $first;
 				}
 
-				$price = html_entity_decode( give_currency_filter( give_format_amount( $min ) ) . ' - ' . give_currency_filter( give_format_amount( $max ) ) );
+				$price = html_entity_decode(give_currency_filter(give_format_amount($min)).' - '.give_currency_filter(give_format_amount($max)));
 			} else {
-				$price = html_entity_decode( give_currency_filter( give_get_form_price( $form->ID ) ) );
+				$price = html_entity_decode(give_currency_filter(give_get_form_price($form->ID)));
 			}
 
-			$categories = get_the_term_list( $form->ID, 'give_forms_category', '', ', ', '' );
-			$categories = ! is_wp_error( $categories ) ? strip_tags( $categories ) : '';
+			$categories = get_the_term_list($form->ID, 'give_forms_category', '', ', ', '');
+			$categories = ! is_wp_error($categories) ? strip_tags($categories) : '';
 
-			$tags = get_the_term_list( $form->ID, 'give_forms_tag', '', ', ', '' );
-			$tags = ! is_wp_error( $tags ) ? strip_tags( $tags ) : '';
+			$tags = get_the_term_list($form->ID, 'give_forms_tag', '', ', ', '');
+			$tags = ! is_wp_error($tags) ? strip_tags($tags) : '';
 
-			$sales    = give_get_form_sales_stats( $form->ID );
-			$link     = get_permalink( $form->ID );
-			$earnings = html_entity_decode( give_currency_filter( give_get_form_earnings_stats( $form->ID ) ) );
+			$sales    = give_get_form_sales_stats($form->ID);
+			$link     = get_permalink($form->ID);
+			$earnings = html_entity_decode(give_currency_filter(give_get_form_earnings_stats($form->ID)));
 
-			if ( function_exists( 'iconv' ) ) {
+			if (function_exists('iconv')) {
 				// Ensure characters like euro; are properly converted.
-				$price    = iconv( 'UTF-8', 'windows-1252', utf8_encode( $price ) );
-				$earnings = iconv( 'UTF-8', 'windows-1252', utf8_encode( $earnings ) );
+				$price    = iconv('UTF-8', 'windows-1252', utf8_encode($price));
+				$earnings = iconv('UTF-8', 'windows-1252', utf8_encode($earnings));
 			}
 
-			$pdf->Row( array( $title, $price, $categories, $tags, $sales, $earnings ) );
+			$pdf->Row(array($title, $price, $categories, $tags, $sales, $earnings));
 		endforeach;
 	else:
-		$pdf->SetWidths( array( 280 ) );
+		$pdf->SetWidths(array(280));
 		$title = utf8_decode(
 			sprintf(
 				/* translators: %s: form plural label */
-				__( 'No %s found.', 'give' ),
+				__('No %s found.', 'give'),
 				give_get_forms_label_plural()
 			)
 		);
-		$pdf->Row( array( $title ) );
+		$pdf->Row(array($title));
 	endif;
 
 	$pdf->Ln();
-	$pdf->SetTextColor( 50, 50, 50 );
-	$pdf->SetFont( 'Helvetica', '', 14 );
-	$pdf->Cell( 0, 10, utf8_decode( __( 'Graph View', 'give' ) ), 0, 2, 'L', false );
-	$pdf->SetFont( 'Helvetica', '', 12 );
-
-	$image = html_entity_decode( urldecode( give_draw_chart_image() ) );
-	$image = str_replace( ' ', '%20', $image );
-
-	$pdf->SetX( 25 );
-	$pdf->Image( $image . '&file=.png' );
-	$pdf->Ln( 7 );
-	$pdf->Output( apply_filters( 'give_sales_earnings_pdf_export_filename', 'give-report-' . date_i18n( 'Y-m-d' ) ) . '.pdf', 'D' );
+	$pdf->SetTextColor(50, 50, 50);
+	$pdf->SetFont('Helvetica', '', 14);
+	$pdf->Cell(0, 10, utf8_decode(__('Graph View', 'give')), 0, 2, 'L', false);
+	$pdf->SetFont('Helvetica', '', 12);
+
+	$image = html_entity_decode(urldecode(give_draw_chart_image()));
+	$image = str_replace(' ', '%20', $image);
+
+	$pdf->SetX(25);
+	$pdf->Image($image.'&file=.png');
+	$pdf->Ln(7);
+	$pdf->Output(apply_filters('give_sales_earnings_pdf_export_filename', 'give-report-'.date_i18n('Y-m-d')).'.pdf', 'D');
 }
 
-add_action( 'give_generate_pdf', 'give_generate_pdf' );
+add_action('give_generate_pdf', 'give_generate_pdf');
 
 /**
  * Draws Chart for PDF Report
@@ -168,38 +168,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],
@@ -212,25 +212,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],
@@ -243,46 +243,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/reporting/tools.php

Spacing +29 added lines, -29 removed lines

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

includes/admin/reporting/graphing.php

Spacing +244 added lines, -244 removed lines

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

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

Spacing +28 added lines, -28 removed lines

@@ -12,7 +12,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -38,16 +38,16 @@ 
 	 * @return void
 	 */
 	public function headers() {
-		ignore_user_abort( true );
+		ignore_user_abort(true);
 
-		if ( ! give_is_func_disabled( 'set_time_limit' ) && ! ini_get( 'safe_mode' ) ) {
-			set_time_limit( 0 );
+		if ( ! give_is_func_disabled('set_time_limit') && ! ini_get('safe_mode')) {
+			set_time_limit(0);
 		}
 
 		nocache_headers();
-		header( 'Content-Type: text/csv; charset=utf-8' );
-		header( 'Content-Disposition: attachment; filename=' . apply_filters( 'give_earnings_export_filename', 'give-export-' . $this->export_type . '-' . date( 'n' ) . '-' . date( 'Y' ) ) . '.csv' );
-		header( "Expires: 0" );
+		header('Content-Type: text/csv; charset=utf-8');
+		header('Content-Disposition: attachment; filename='.apply_filters('give_earnings_export_filename', 'give-export-'.$this->export_type.'-'.date('n').'-'.date('Y')).'.csv');
+		header("Expires: 0");
 
 	}
 
@@ -61,10 +61,10 @@ 
 	public function csv_cols() {
 
 		$cols = array(
-			'date'      => __( 'Date', 'give' ),
-			'donations' => __( 'Donations', 'give' ),
+			'date'      => __('Date', 'give'),
+			'donations' => __('Donations', 'give'),
 			/* translators: %s: currency */
-			'earnings'  => sprintf( __( 'Income (%s)', 'give' ), html_entity_decode( give_currency_filter( '' ) ) )
+			'earnings'  => sprintf(__('Income (%s)', 'give'), html_entity_decode(give_currency_filter('')))
 		);
 
 		return $cols;
@@ -79,28 +79,28 @@ 
 	 */
 	public function get_data() {
 
-		$start_year  = isset( $_POST['start_year'] ) ? absint( $_POST['start_year'] ) : date( 'Y' );
-		$end_year    = isset( $_POST['end_year'] ) ? absint( $_POST['end_year'] ) : date( 'Y' );
-		$start_month = isset( $_POST['start_month'] ) ? absint( $_POST['start_month'] ) : date( 'n' );
-		$end_month   = isset( $_POST['end_month'] ) ? absint( $_POST['end_month'] ) : date( 'n' );
+		$start_year  = isset($_POST['start_year']) ? absint($_POST['start_year']) : date('Y');
+		$end_year    = isset($_POST['end_year']) ? absint($_POST['end_year']) : date('Y');
+		$start_month = isset($_POST['start_month']) ? absint($_POST['start_month']) : date('n');
+		$end_month   = isset($_POST['end_month']) ? absint($_POST['end_month']) : date('n');
 
 		$data  = array();
 		$year  = $start_year;
 		$stats = new Give_Payment_Stats;
 
-		while ( $year <= $end_year ) {
+		while ($year <= $end_year) {
 
-			if ( $year == $start_year && $year == $end_year ) {
+			if ($year == $start_year && $year == $end_year) {
 
 				$m1 = $start_month;
 				$m2 = $end_month;
 
-			} elseif ( $year == $start_year ) {
+			} elseif ($year == $start_year) {
 
 				$m1 = $start_month;
 				$m2 = 12;
 
-			} elseif ( $year == $end_year ) {
+			} elseif ($year == $end_year) {
 
 				$m1 = 1;
 				$m2 = $end_month;
@@ -112,28 +112,28 @@ 
 
 			}
 
-			while ( $m1 <= $m2 ) {
+			while ($m1 <= $m2) {
 
-				$date1 = mktime( 0, 0, 0, $m1, 1, $year );
-				$date2 = mktime( 0, 0, 0, $m1, cal_days_in_month( CAL_GREGORIAN, $m1, $year ), $year );
+				$date1 = mktime(0, 0, 0, $m1, 1, $year);
+				$date2 = mktime(0, 0, 0, $m1, cal_days_in_month(CAL_GREGORIAN, $m1, $year), $year);
 
 				$data[] = array(
-					'date'      => date_i18n( 'F Y', $date1 ),
-					'donations' => $stats->get_sales( 0, $date1, $date2, array( 'publish', 'revoked' ) ),
-					'earnings'  => give_format_amount( $stats->get_earnings( 0, $date1, $date2 ) ),
+					'date'      => date_i18n('F Y', $date1),
+					'donations' => $stats->get_sales(0, $date1, $date2, array('publish', 'revoked')),
+					'earnings'  => give_format_amount($stats->get_earnings(0, $date1, $date2)),
 				);
 
-				$m1 ++;
+				$m1++;
 
 			}
 
 
-			$year ++;
+			$year++;
 
 		}
 
-		$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;
 	}

includes/admin/payments/view-order-details.php

Spacing +127 added lines, -127 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -20,27 +20,27 @@ 
  * @since 1.0
  * @return void
  */
-if ( ! isset( $_GET['id'] ) || ! is_numeric( $_GET['id'] ) ) {
-	wp_die( __( 'Donation ID not supplied. Please try again', 'give' ), __( 'Error', 'give' ) );
+if ( ! isset($_GET['id']) || ! is_numeric($_GET['id'])) {
+	wp_die(__('Donation ID not supplied. Please try again', 'give'), __('Error', 'give'));
 }
 
 // Setup the variables
-$payment_id = absint( $_GET['id'] );
-$payment    = new Give_Payment( $payment_id );
+$payment_id = absint($_GET['id']);
+$payment    = new Give_Payment($payment_id);
 
 // Sanity check... fail if purchase ID is invalid
 $payment_exists = $payment->ID;
-if ( empty( $payment_exists ) ) {
-	wp_die( __( 'The specified ID does not belong to a payment. Please try again', 'give' ), __( 'Error', 'give' ) );
+if (empty($payment_exists)) {
+	wp_die(__('The specified ID does not belong to a payment. Please try again', 'give'), __('Error', 'give'));
 }
 
 $number         = $payment->number;
 $payment_meta   = $payment->get_meta();
-$transaction_id = esc_attr( $payment->transaction_id );
+$transaction_id = esc_attr($payment->transaction_id);
 $user_id        = $payment->user_id;
 $customer_id    = $payment->customer_id;
-$payment_date   = strtotime( $payment->date );
-$user_info      = give_get_payment_meta_user_info( $payment_id );
+$payment_date   = strtotime($payment->date);
+$user_info      = give_get_payment_meta_user_info($payment_id);
 $address        = $payment->address;
 $gateway        = $payment->gateway;
 $currency_code  = $payment->currency;
@@ -52,76 +52,76 @@ 
 	<h1 id="transaction-details-heading"><?php
 		printf(
 			/* translators: %s: payment number */
-			__( 'Payment %s', 'give' ),
+			__('Payment %s', 'give'),
 			$number
 		);
-		if ( $payment_mode == 'test' ) {
-			echo '<span id="test-payment-label" class="give-item-label give-item-label-orange" data-tooltip="' . __( 'This payment was made in Test Mode', 'give' ) . '" data-tooltip-my-position="center left" data-tooltip-target-position="center right">' . __( 'Test Payment', 'give' ) . '</span>';
+		if ($payment_mode == 'test') {
+			echo '<span id="test-payment-label" class="give-item-label give-item-label-orange" data-tooltip="'.__('This payment was made in Test Mode', 'give').'" data-tooltip-my-position="center left" data-tooltip-target-position="center right">'.__('Test Payment', 'give').'</span>';
 		}
 	?></h1>
 
-	<?php do_action( 'give_view_order_details_before', $payment_id ); ?>
+	<?php do_action('give_view_order_details_before', $payment_id); ?>
 	<form id="give-edit-order-form" method="post">
-		<?php do_action( 'give_view_order_details_form_top', $payment_id ); ?>
+		<?php do_action('give_view_order_details_form_top', $payment_id); ?>
 		<div id="poststuff">
 			<div id="give-dashboard-widgets-wrap">
 				<div id="post-body" class="metabox-holder columns-2">
 					<div id="postbox-container-1" class="postbox-container">
 						<div id="side-sortables" class="meta-box-sortables ui-sortable">
 
-							<?php do_action( 'give_view_order_details_sidebar_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_sidebar_before', $payment_id); ?>
 
 
 							<div id="give-order-update" class="postbox give-order-data">
 
 								<h3 class="hndle">
-									<span><?php _e( 'Update Payment', 'give' ); ?></span>
+									<span><?php _e('Update Payment', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
 									<div class="give-admin-box">
 
-										<?php do_action( 'give_view_order_details_totals_before', $payment_id ); ?>
+										<?php do_action('give_view_order_details_totals_before', $payment_id); ?>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Status:', 'give' ); ?></span>&nbsp;
+												<span class="label"><?php _e('Status:', 'give'); ?></span>&nbsp;
 												<select name="give-payment-status" class="medium-text">
-													<?php foreach ( give_get_payment_statuses() as $key => $status ) : ?>
-														<option value="<?php echo esc_attr( $key ); ?>"<?php selected( $payment->status, $key, true ); ?>><?php echo esc_html( $status ); ?></option>
+													<?php foreach (give_get_payment_statuses() as $key => $status) : ?>
+														<option value="<?php echo esc_attr($key); ?>"<?php selected($payment->status, $key, true); ?>><?php echo esc_html($status); ?></option>
 													<?php endforeach; ?>
 												</select>
-												<span class="give-donation-status status-<?php echo sanitize_title( $payment->status ); ?>"><span class="give-donation-status-icon"></span></span>
+												<span class="give-donation-status status-<?php echo sanitize_title($payment->status); ?>"><span class="give-donation-status-icon"></span></span>
 											</p>
 										</div>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Date:', 'give' ); ?></span>&nbsp;
-												<input type="text" name="give-payment-date" value="<?php echo esc_attr( date( 'm/d/Y', $payment_date ) ); ?>" class="medium-text give_datepicker"/>
+												<span class="label"><?php _e('Date:', 'give'); ?></span>&nbsp;
+												<input type="text" name="give-payment-date" value="<?php echo esc_attr(date('m/d/Y', $payment_date)); ?>" class="medium-text give_datepicker"/>
 											</p>
 										</div>
 
 										<div class="give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Time:', 'give' ); ?></span>&nbsp;
-												<input type="number" step="1" max="24" name="give-payment-time-hour" value="<?php echo esc_attr( date_i18n( 'H', $payment_date ) ); ?>" class="small-text give-payment-time-hour"/>&nbsp;:&nbsp;
-												<input type="number" step="1" max="59" name="give-payment-time-min" value="<?php echo esc_attr( date( 'i', $payment_date ) ); ?>" class="small-text give-payment-time-min"/>
+												<span class="label"><?php _e('Time:', 'give'); ?></span>&nbsp;
+												<input type="number" step="1" max="24" name="give-payment-time-hour" value="<?php echo esc_attr(date_i18n('H', $payment_date)); ?>" class="small-text give-payment-time-hour"/>&nbsp;:&nbsp;
+												<input type="number" step="1" max="59" name="give-payment-time-min" value="<?php echo esc_attr(date('i', $payment_date)); ?>" class="small-text give-payment-time-min"/>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_update_inner', $payment_id ); ?>
+										<?php do_action('give_view_order_details_update_inner', $payment_id); ?>
 
 										<?php
 										//@TODO: Fees
-										$fees = give_get_payment_fees( $payment_id );
-										if ( ! empty( $fees ) ) : ?>
+										$fees = give_get_payment_fees($payment_id);
+										if ( ! empty($fees)) : ?>
 											<div class="give-order-fees give-admin-box-inside">
-												<p class="strong"><?php _e( 'Fees', 'give' ); ?>:</p>
+												<p class="strong"><?php _e('Fees', 'give'); ?>:</p>
 												<ul class="give-payment-fees">
-													<?php foreach ( $fees as $fee ) : ?>
+													<?php foreach ($fees as $fee) : ?>
 														<li>
-															<span class="fee-label"><?php echo $fee['label'] . ':</span> ' . '<span class="fee-amount" data-fee="' . esc_attr( $fee['amount'] ) . '">' . give_currency_filter( $fee['amount'], $currency_code ); ?></span>
+															<span class="fee-label"><?php echo $fee['label'].':</span> '.'<span class="fee-amount" data-fee="'.esc_attr($fee['amount']).'">'.give_currency_filter($fee['amount'], $currency_code); ?></span>
 														</li>
 													<?php endforeach; ?>
 												</ul>
@@ -131,12 +131,12 @@ 
 
 										<div class="give-order-payment give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Total Donation', 'give' ); ?>:</span>&nbsp;
-												<?php echo give_currency_symbol( $payment->currency ); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr( give_format_amount( give_get_payment_amount( $payment_id ) ) ); ?>"/>
+												<span class="label"><?php _e('Total Donation', 'give'); ?>:</span>&nbsp;
+												<?php echo give_currency_symbol($payment->currency); ?>&nbsp;<input name="give-payment-total" type="text" class="small-text give-price-field" value="<?php echo esc_attr(give_format_amount(give_get_payment_amount($payment_id))); ?>"/>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_totals_after', $payment_id ); ?>
+										<?php do_action('give_view_order_details_totals_after', $payment_id); ?>
 
 									</div>
 									<!-- /.give-admin-box -->
@@ -145,20 +145,20 @@ 
 								<!-- /.inside -->
 
 								<div class="give-order-update-box give-admin-box">
-									<?php do_action( 'give_view_order_details_update_before', $payment_id ); ?>
+									<?php do_action('give_view_order_details_update_before', $payment_id); ?>
 									<div id="major-publishing-actions">
 										<div id="publishing-action">
-											<input type="submit" class="button button-primary right" value="<?php esc_attr_e( 'Save Payment', 'give' ); ?>"/>
-											<?php if ( give_is_payment_complete( $payment_id ) ) : ?>
-												<a href="<?php echo esc_url( add_query_arg( array(
+											<input type="submit" class="button button-primary right" value="<?php esc_attr_e('Save Payment', 'give'); ?>"/>
+											<?php if (give_is_payment_complete($payment_id)) : ?>
+												<a href="<?php echo esc_url(add_query_arg(array(
 													'give-action' => 'email_links',
 													'purchase_id' => $payment_id
-												) ) ); ?>" id="give-resend-receipt" class="button-secondary right"><?php _e( 'Resend Receipt', 'give' ); ?></a>
+												))); ?>" id="give-resend-receipt" class="button-secondary right"><?php _e('Resend Receipt', 'give'); ?></a>
 											<?php endif; ?>
 										</div>
 										<div class="clear"></div>
 									</div>
-									<?php do_action( 'give_view_order_details_update_after', $payment_id ); ?>
+									<?php do_action('give_view_order_details_update_after', $payment_id); ?>
 								</div>
 								<!-- /.give-order-update-box -->
 
@@ -168,55 +168,55 @@ 
 							<div id="give-order-details" class="postbox give-order-data">
 
 								<h3 class="hndle">
-									<span><?php _e( 'Payment Meta', 'give' ); ?></span>
+									<span><?php _e('Payment Meta', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
 									<div class="give-admin-box">
 
-										<?php do_action( 'give_view_order_details_payment_meta_before', $payment_id ); ?>
+										<?php do_action('give_view_order_details_payment_meta_before', $payment_id); ?>
 
 										<?php
-										$gateway = give_get_payment_gateway( $payment_id );
-										if ( $gateway ) : ?>
+										$gateway = give_get_payment_gateway($payment_id);
+										if ($gateway) : ?>
 											<div class="give-order-gateway give-admin-box-inside">
 												<p>
-													<span class="label"><?php _e( 'Gateway:', 'give' ); ?></span>&nbsp;
-													<?php echo give_get_gateway_admin_label( $gateway ); ?>
+													<span class="label"><?php _e('Gateway:', 'give'); ?></span>&nbsp;
+													<?php echo give_get_gateway_admin_label($gateway); ?>
 												</p>
 											</div>
 										<?php endif; ?>
 
 										<div class="give-order-payment-key give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'Key:', 'give' ); ?></span>&nbsp;
-												<span><?php echo give_get_payment_key( $payment_id ); ?></span>
+												<span class="label"><?php _e('Key:', 'give'); ?></span>&nbsp;
+												<span><?php echo give_get_payment_key($payment_id); ?></span>
 											</p>
 										</div>
 
 										<div class="give-order-ip give-admin-box-inside">
 											<p>
-												<span class="label"><?php _e( 'IP:', 'give' ); ?></span>&nbsp;
-												<span><?php echo esc_html( give_get_payment_user_ip( $payment_id ) ); ?></span>
+												<span class="label"><?php _e('IP:', 'give'); ?></span>&nbsp;
+												<span><?php echo esc_html(give_get_payment_user_ip($payment_id)); ?></span>
 											</p>
 										</div>
 
-										<?php if ( $transaction_id ) : ?>
+										<?php if ($transaction_id) : ?>
 											<div class="give-order-tx-id give-admin-box-inside">
 												<p>
-													<span class="label"><?php _e( 'Transaction ID:', 'give' ); ?></span>&nbsp;
-													<span><?php echo apply_filters( 'give_payment_details_transaction_id-' . $gateway, $transaction_id, $payment_id ); ?></span>
+													<span class="label"><?php _e('Transaction ID:', 'give'); ?></span>&nbsp;
+													<span><?php echo apply_filters('give_payment_details_transaction_id-'.$gateway, $transaction_id, $payment_id); ?></span>
 												</p>
 											</div>
 										<?php endif; ?>
 
 										<div class="give-admin-box-inside">
-											<p><?php $purchase_url = admin_url( 'edit.php?post_type=give_forms&page=give-payment-history&user=' . esc_attr( give_get_payment_user_email( $payment_id ) ) ); ?>
-												<a href="<?php echo $purchase_url; ?>"><?php _e( 'View all donations for this donor', 'give' ); ?> &raquo;</a>
+											<p><?php $purchase_url = admin_url('edit.php?post_type=give_forms&page=give-payment-history&user='.esc_attr(give_get_payment_user_email($payment_id))); ?>
+												<a href="<?php echo $purchase_url; ?>"><?php _e('View all donations for this donor', 'give'); ?> &raquo;</a>
 											</p>
 										</div>
 
-										<?php do_action( 'give_view_order_details_payment_meta_after', $payment_id ); ?>
+										<?php do_action('give_view_order_details_payment_meta_after', $payment_id); ?>
 
 									</div>
 									<!-- /.column-container -->
@@ -227,7 +227,7 @@ 
 							</div>
 							<!-- /#give-order-data -->
 
-							<?php do_action( 'give_view_order_details_sidebar_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_sidebar_after', $payment_id); ?>
 
 						</div>
 						<!-- /#side-sortables -->
@@ -238,12 +238,12 @@ 
 
 						<div id="normal-sortables" class="meta-box-sortables ui-sortable">
 
-							<?php do_action( 'give_view_order_details_main_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_main_before', $payment_id); ?>
 
 							<?php $column_count = 'columns-3'; ?>
 							<div id="give-donation-overview" class="postbox <?php echo $column_count; ?>">
 								<h3 class="hndle">
-									<span><?php _e( 'Donation Information', 'give' ); ?></span>
+									<span><?php _e('Donation Information', 'give'); ?></span>
 								</h3>
 
 								<div class="inside">
@@ -251,29 +251,29 @@ 
 									<table style="width:100%;text-align:left;">
 										<thead>
 										<tr>
-											<?php do_action( 'give_donation_details_thead_before', $payment_id ); ?>
-											<th><?php _e( 'Donation Form ID', 'give' ) ?></th>
-											<th><?php _e( 'Donation Form Title', 'give' ) ?></th>
-											<th><?php _e( 'Donation Level', 'give' ) ?></th>
-											<th><?php _e( 'Donation Date', 'give' ) ?></th>
-											<th><?php _e( 'Total Donation', 'give' ) ?></th>
-											<?php do_action( 'give_donation_details_thead_after', $payment_id ); ?>
+											<?php do_action('give_donation_details_thead_before', $payment_id); ?>
+											<th><?php _e('Donation Form ID', 'give') ?></th>
+											<th><?php _e('Donation Form Title', 'give') ?></th>
+											<th><?php _e('Donation Level', 'give') ?></th>
+											<th><?php _e('Donation Date', 'give') ?></th>
+											<th><?php _e('Total Donation', 'give') ?></th>
+											<?php do_action('give_donation_details_thead_after', $payment_id); ?>
 										</tr>
 										</thead>
 										<tr>
-											<?php do_action( 'give_donation_details_tbody_before', $payment_id ); ?>
+											<?php do_action('give_donation_details_tbody_before', $payment_id); ?>
 											<td>
 												<?php echo $payment_meta['form_id']; ?>
 											</td>
 											<td>
-												<a href="<?php echo get_permalink( $payment_meta['form_id'] ); ?>"><?php echo $payment_meta['form_title']; ?></a>
+												<a href="<?php echo get_permalink($payment_meta['form_id']); ?>"><?php echo $payment_meta['form_title']; ?></a>
 											</td>
 											<td>
 												<?php
 												//Level ID
-												$level_title = give_get_payment_form_title( $payment_meta, true );
-												if ( empty( $level_title ) ) {
-													echo __( 'n/a', 'give' );
+												$level_title = give_get_payment_form_title($payment_meta, true);
+												if (empty($level_title)) {
+													echo __('n/a', 'give');
 												} else {
 													echo $level_title;
 												} ?>
@@ -281,13 +281,13 @@ 
 											<td>
 												<?php
 												//Transaction Date
-												$date_format = get_option( 'date_format' );
-												echo date_i18n( $date_format, strtotime( $payment_date ) );
+												$date_format = get_option('date_format');
+												echo date_i18n($date_format, strtotime($payment_date));
 												?>
 											</td>
 											<td>
-												<?php echo esc_html( give_currency_filter( give_format_amount( give_get_payment_amount( $payment_id ) ) ) ); ?></td>
-											<?php do_action( 'give_donation_details_tbody_after', $payment_id ); ?>
+												<?php echo esc_html(give_currency_filter(give_format_amount(give_get_payment_amount($payment_id)))); ?></td>
+											<?php do_action('give_donation_details_tbody_after', $payment_id); ?>
 
 										</tr>
 									</table>
@@ -299,64 +299,64 @@ 
 							</div>
 							<!-- /#give-donation-overview -->
 
-							<?php do_action( 'give_view_order_details_files_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_files_after', $payment_id); ?>
 
-							<?php do_action( 'give_view_order_details_billing_before', $payment_id ); ?>
+							<?php do_action('give_view_order_details_billing_before', $payment_id); ?>
 
 
 							<div id="give-customer-details" class="postbox">
 								<h3 class="hndle">
-									<span><?php _e( 'Donor Details', 'give' ); ?></span>
+									<span><?php _e('Donor Details', 'give'); ?></span>
 								</h3>
 
 								<div class="inside give-clearfix">
 
-									<?php $customer = new Give_Customer( $customer_id ); ?>
+									<?php $customer = new Give_Customer($customer_id); ?>
 
 									<div class="column-container customer-info">
 										<div class="column">
-											<?php echo Give()->html->donor_dropdown( array(
+											<?php echo Give()->html->donor_dropdown(array(
 												'selected' => $customer->id,
 												'name'     => 'customer-id'
-											) ); ?>
+											)); ?>
 										</div>
 										<div class="column">
 											<input type="hidden" name="give-current-customer" value="<?php echo $customer->id; ?>"/>
 										</div>
 										<div class="column">
-											<?php if ( ! empty( $customer->id ) ) : ?>
-												<?php $customer_url = admin_url( 'edit.php?post_type=give_forms&page=give-donors&view=overview&id=' . $customer->id ); ?>
-												<a href="<?php echo $customer_url; ?>" title="<?php _e( 'View Donor Details', 'give' ); ?>"><?php _e( 'View Donor Details', 'give' ); ?></a>
+											<?php if ( ! empty($customer->id)) : ?>
+												<?php $customer_url = admin_url('edit.php?post_type=give_forms&page=give-donors&view=overview&id='.$customer->id); ?>
+												<a href="<?php echo $customer_url; ?>" title="<?php _e('View Donor Details', 'give'); ?>"><?php _e('View Donor Details', 'give'); ?></a>
 												&nbsp;|&nbsp;
 											<?php endif; ?>
-											<a href="#new" class="give-payment-new-customer" title="<?php _e( 'New Donor', 'give' ); ?>"><?php _e( 'New Donor', 'give' ); ?></a>
+											<a href="#new" class="give-payment-new-customer" title="<?php _e('New Donor', 'give'); ?>"><?php _e('New Donor', 'give'); ?></a>
 										</div>
 									</div>
 
 									<div class="column-container new-customer" style="display: none">
 										<div class="column">
-											<strong><?php _e( 'Name:', 'give' ); ?></strong>&nbsp;
+											<strong><?php _e('Name:', 'give'); ?></strong>&nbsp;
 											<input type="text" name="give-new-customer-name" value="" class="medium-text"/>
 										</div>
 										<div class="column">
-											<strong><?php _e( 'Email:', 'give' ); ?></strong>&nbsp;
+											<strong><?php _e('Email:', 'give'); ?></strong>&nbsp;
 											<input type="email" name="give-new-customer-email" value="" class="medium-text"/>
 										</div>
 										<div class="column">
 											<input type="hidden" id="give-new-customer" name="give-new-customer" value="0"/>
-											<a href="#cancel" class="give-payment-new-customer-cancel give-delete"><?php _e( 'Cancel', 'give' ); ?></a>
+											<a href="#cancel" class="give-payment-new-customer-cancel give-delete"><?php _e('Cancel', 'give'); ?></a>
 										</div>
 										<div class="column">
 											<small>
-												<em>*<?php _e( 'Click "Save Payment" to create new donor', 'give' ); ?></em>
+												<em>*<?php _e('Click "Save Payment" to create new donor', 'give'); ?></em>
 											</small>
 										</div>
 									</div>
 
 									<?php
 									// The give_payment_personal_details_list hook is left here for backwards compatibility
-									do_action( 'give_payment_personal_details_list', $payment_meta, $user_info );
-									do_action( 'give_payment_view_details', $payment_id );
+									do_action('give_payment_personal_details_list', $payment_meta, $user_info);
+									do_action('give_payment_view_details', $payment_id);
 									?>
 
 								</div>
@@ -367,7 +367,7 @@ 
 
 							<div id="give-billing-details" class="postbox">
 								<h3 class="hndle">
-									<span><?php _e( 'Billing Address', 'give' ); ?></span>
+									<span><?php _e('Billing Address', 'give'); ?></span>
 								</h3>
 
 								<div class="inside give-clearfix">
@@ -378,62 +378,62 @@ 
 											<div class="data column-container">
 												<div class="column">
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'Street Address Line 1:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][line1]" value="<?php echo esc_attr( $address['line1'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('Street Address Line 1:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][line1]" value="<?php echo esc_attr($address['line1']); ?>" class="medium-text"/>
 													</p>
 
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'Street Address Line 2:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][line2]" value="<?php echo esc_attr( $address['line2'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('Street Address Line 2:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][line2]" value="<?php echo esc_attr($address['line2']); ?>" class="medium-text"/>
 													</p>
 
 												</div>
 												<div class="column">
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'City:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][city]" value="<?php echo esc_attr( $address['city'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('City:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][city]" value="<?php echo esc_attr($address['city']); ?>" class="medium-text"/>
 
 													</p>
 
 													<p>
-														<strong class="order-data-address-line"><?php _e( 'Zip / Postal Code:', 'give' ); ?></strong><br/>
-														<input type="text" name="give-payment-address[0][zip]" value="<?php echo esc_attr( $address['zip'] ); ?>" class="medium-text"/>
+														<strong class="order-data-address-line"><?php _e('Zip / Postal Code:', 'give'); ?></strong><br/>
+														<input type="text" name="give-payment-address[0][zip]" value="<?php echo esc_attr($address['zip']); ?>" class="medium-text"/>
 
 													</p>
 												</div>
 												<div class="column">
 													<p id="give-order-address-country-wrap">
-														<strong class="order-data-address-line"><?php _e( 'Country:', 'give' ); ?></strong><br/>
+														<strong class="order-data-address-line"><?php _e('Country:', 'give'); ?></strong><br/>
 														<?php
-														echo Give()->html->select( array(
+														echo Give()->html->select(array(
 															'options'          => give_get_country_list(),
 															'name'             => 'give-payment-address[0][country]',
 															'selected'         => $address['country'],
 															'show_option_all'  => false,
 															'show_option_none' => false,
 															'chosen'           => true,
-															'placeholder'      => __( 'Select a country', 'give' )
-														) );
+															'placeholder'      => __('Select a country', 'give')
+														));
 														?>
 													</p>
 
 													<p id="give-order-address-state-wrap">
-														<strong class="order-data-address-line"><?php _e( 'State / Province:', 'give' ); ?></strong><br/>
+														<strong class="order-data-address-line"><?php _e('State / Province:', 'give'); ?></strong><br/>
 														<?php
-														$states = give_get_states( $address['country'] );
-														if ( ! empty( $states ) ) {
-															echo Give()->html->select( array(
+														$states = give_get_states($address['country']);
+														if ( ! empty($states)) {
+															echo Give()->html->select(array(
 																'options'          => $states,
 																'name'             => 'give-payment-address[0][state]',
 																'selected'         => $address['state'],
 																'show_option_all'  => false,
 																'show_option_none' => false,
 																'chosen'           => true,
-																'placeholder'      => __( 'Select a state', 'give' )
-															) );
+																'placeholder'      => __('Select a state', 'give')
+															));
 														} else {
 															?>
-															<input type="text" name="give-payment-address[0][state]" value="<?php echo esc_attr( $address['state'] ); ?>" class="medium-text"/>
+															<input type="text" name="give-payment-address[0][state]" value="<?php echo esc_attr($address['state']); ?>" class="medium-text"/>
 															<?php
 														} ?>
 													</p>
@@ -443,39 +443,39 @@ 
 									</div>
 									<!-- /#give-order-address -->
 
-									<?php do_action( 'give_payment_billing_details', $payment_id ); ?>
+									<?php do_action('give_payment_billing_details', $payment_id); ?>
 
 								</div>
 								<!-- /.inside -->
 							</div>
 							<!-- /#give-billing-details -->
 
-							<?php do_action( 'give_view_order_details_billing_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_billing_after', $payment_id); ?>
 
 							<div id="give-payment-notes" class="postbox">
-								<h3 class="hndle"><span><?php _e( 'Payment Notes', 'give' ); ?></span></h3>
+								<h3 class="hndle"><span><?php _e('Payment Notes', 'give'); ?></span></h3>
 
 								<div class="inside">
 									<div id="give-payment-notes-inner">
 										<?php
-										$notes = give_get_payment_notes( $payment_id );
-										if ( ! empty( $notes ) ) :
+										$notes = give_get_payment_notes($payment_id);
+										if ( ! empty($notes)) :
 											$no_notes_display = ' style="display:none;"';
-											foreach ( $notes as $note ) :
+											foreach ($notes as $note) :
 
-												echo give_get_payment_note_html( $note, $payment_id );
+												echo give_get_payment_note_html($note, $payment_id);
 
 											endforeach;
 										else :
 											$no_notes_display = '';
 										endif;
-										echo '<p class="give-no-payment-notes"' . $no_notes_display . '>' . __( 'No payment notes', 'give' ) . '</p>';
+										echo '<p class="give-no-payment-notes"'.$no_notes_display.'>'.__('No payment notes', 'give').'</p>';
 										?>
 									</div>
 									<textarea name="give-payment-note" id="give-payment-note" class="large-text"></textarea>
 
 									<p class="give-clearfix">
-										<button id="give-add-payment-note" class="button button-secondary button-small" data-payment-id="<?php echo absint( $payment_id ); ?>"><?php _e( 'Add Note', 'give' ); ?></button>
+										<button id="give-add-payment-note" class="button button-secondary button-small" data-payment-id="<?php echo absint($payment_id); ?>"><?php _e('Add Note', 'give'); ?></button>
 									</p>
 
 									<div class="clear"></div>
@@ -484,7 +484,7 @@ 
 							</div>
 							<!-- /#give-payment-notes -->
 
-							<?php do_action( 'give_view_order_details_main_after', $payment_id ); ?>
+							<?php do_action('give_view_order_details_main_after', $payment_id); ?>
 						</div>
 						<!-- /#normal-sortables -->
 					</div>
@@ -495,10 +495,10 @@ 
 			<!-- #give-dashboard-widgets-wrap -->
 		</div>
 		<!-- /#post-stuff -->
-		<?php do_action( 'give_view_order_details_form_bottom', $payment_id ); ?>
-		<?php wp_nonce_field( 'give_update_payment_details_nonce' ); ?>
-		<input type="hidden" name="give_payment_id" value="<?php echo esc_attr( $payment_id ); ?>"/>
+		<?php do_action('give_view_order_details_form_bottom', $payment_id); ?>
+		<?php wp_nonce_field('give_update_payment_details_nonce'); ?>
+		<input type="hidden" name="give_payment_id" value="<?php echo esc_attr($payment_id); ?>"/>
 		<input type="hidden" name="give_action" value="update_payment_details"/>
 	</form>
-	<?php do_action( 'give_view_order_details_after', $payment_id ); ?>
+	<?php do_action('give_view_order_details_after', $payment_id); ?>
 </div><!-- /.wrap -->

includes/admin/EDD_SL_Plugin_Updater.php

Indentation +272 added lines, -272 removed lines

@@ -13,330 +13,330 @@
  * @version 1.6
  */
 class EDD_SL_Plugin_Updater {
-    private $api_url   = '';
-    private $api_data  = array();
-    private $name      = '';
-    private $slug      = '';
-
-    /**
-     * Class constructor.
-     *
-     * @uses plugin_basename()
-     * @uses hook()
-     *
-     * @param string  $_api_url     The URL pointing to the custom API endpoint.
-     * @param string  $_plugin_file Path to the plugin file.
-     * @param array   $_api_data    Optional data to send with API calls.
-     * @return void
-     */
-    function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
-        $this->api_url  = trailingslashit( $_api_url );
-        $this->api_data = $_api_data;
-        $this->name     = plugin_basename( $_plugin_file );
-        $this->slug     = basename( $_plugin_file, '.php' );
-        $this->version  = $_api_data['version'];
-
-        // Set up hooks.
-        $this->init();
-        add_action( 'admin_init', array( $this, 'show_changelog' ) );
-    }
-
-    /**
-     * Set up WordPress filters to hook into WP's update process.
-     *
-     * @uses add_filter()
-     *
-     * @return void
-     */
-    public function init() {
+	private $api_url   = '';
+	private $api_data  = array();
+	private $name      = '';
+	private $slug      = '';
+
+	/**
+	 * Class constructor.
+	 *
+	 * @uses plugin_basename()
+	 * @uses hook()
+	 *
+	 * @param string  $_api_url     The URL pointing to the custom API endpoint.
+	 * @param string  $_plugin_file Path to the plugin file.
+	 * @param array   $_api_data    Optional data to send with API calls.
+	 * @return void
+	 */
+	function __construct( $_api_url, $_plugin_file, $_api_data = null ) {
+		$this->api_url  = trailingslashit( $_api_url );
+		$this->api_data = $_api_data;
+		$this->name     = plugin_basename( $_plugin_file );
+		$this->slug     = basename( $_plugin_file, '.php' );
+		$this->version  = $_api_data['version'];
+
+		// Set up hooks.
+		$this->init();
+		add_action( 'admin_init', array( $this, 'show_changelog' ) );
+	}
+
+	/**
+	 * Set up WordPress filters to hook into WP's update process.
+	 *
+	 * @uses add_filter()
+	 *
+	 * @return void
+	 */
+	public function init() {
 
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
-        add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
+		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		add_filter( 'plugins_api', array( $this, 'plugins_api_filter' ), 10, 3 );
 
-        add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
-    }
+		add_action( 'after_plugin_row_' . $this->name, array( $this, 'show_update_notification' ), 10, 2 );
+	}
 
-    /**
-     * Check for Updates at the defined API endpoint and modify the update array.
-     *
-     * This function dives into the update API just when WordPress creates its update array,
-     * then adds a custom API call and injects the custom plugin data retrieved from the API.
-     * It is reassembled from parts of the native WordPress plugin update code.
-     * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
-     *
-     * @uses api_request()
-     *
-     * @param array   $_transient_data Update array build by WordPress.
-     * @return array Modified update array with custom plugin data.
-     */
-    function check_update( $_transient_data ) {
+	/**
+	 * Check for Updates at the defined API endpoint and modify the update array.
+	 *
+	 * This function dives into the update API just when WordPress creates its update array,
+	 * then adds a custom API call and injects the custom plugin data retrieved from the API.
+	 * It is reassembled from parts of the native WordPress plugin update code.
+	 * See wp-includes/update.php line 121 for the original wp_update_plugins() function.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param array   $_transient_data Update array build by WordPress.
+	 * @return array Modified update array with custom plugin data.
+	 */
+	function check_update( $_transient_data ) {
 
-        global $pagenow;
+		global $pagenow;
 
-        if( ! is_object( $_transient_data ) ) {
-            $_transient_data = new stdClass;
-        }
+		if( ! is_object( $_transient_data ) ) {
+			$_transient_data = new stdClass;
+		}
 
-        if( 'plugins.php' == $pagenow && is_multisite() ) {
-            return $_transient_data;
-        }
+		if( 'plugins.php' == $pagenow && is_multisite() ) {
+			return $_transient_data;
+		}
 
-        if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
+		if ( empty( $_transient_data->response ) || empty( $_transient_data->response[ $this->name ] ) ) {
 
-            $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+			$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-            if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
+			if ( false !== $version_info && is_object( $version_info ) && isset( $version_info->new_version ) ) {
 
-                $this->did_check = true;
+				$this->did_check = true;
 
-                if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+				if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-                    $_transient_data->response[ $this->name ] = $version_info;
+					$_transient_data->response[ $this->name ] = $version_info;
 
-                }
+				}
 
-                $_transient_data->last_checked = time();
-                $_transient_data->checked[ $this->name ] = $this->version;
+				$_transient_data->last_checked = time();
+				$_transient_data->checked[ $this->name ] = $this->version;
 
-            }
+			}
 
-        }
+		}
 
-        return $_transient_data;
-    }
+		return $_transient_data;
+	}
 
-    /**
-     * show update nofication row -- needed for multisite subsites, because WP won't tell you otherwise!
-     *
-     * @param string  $file
-     * @param array   $plugin
-     */
-    public function show_update_notification( $file, $plugin ) {
+	/**
+	 * show update nofication row -- needed for multisite subsites, because WP won't tell you otherwise!
+	 *
+	 * @param string  $file
+	 * @param array   $plugin
+	 */
+	public function show_update_notification( $file, $plugin ) {
 
-        if( ! current_user_can( 'update_plugins' ) ) {
-            return;
-        }
+		if( ! current_user_can( 'update_plugins' ) ) {
+			return;
+		}
 
-        if( ! is_multisite() ) {
-            return;
-        }
+		if( ! is_multisite() ) {
+			return;
+		}
 
-        if ( $this->name != $file ) {
-            return;
-        }
+		if ( $this->name != $file ) {
+			return;
+		}
 
-        // Remove our filter on the site transient
-        remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
+		// Remove our filter on the site transient
+		remove_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ), 10 );
 
-        $update_cache = get_site_transient( 'update_plugins' );
+		$update_cache = get_site_transient( 'update_plugins' );
 
-        if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
+		if ( ! is_object( $update_cache ) || empty( $update_cache->response ) || empty( $update_cache->response[ $this->name ] ) ) {
 
-            $cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
-            $version_info = get_transient( $cache_key );
+			$cache_key    = md5( 'edd_plugin_' .sanitize_key( $this->name ) . '_version_info' );
+			$version_info = get_transient( $cache_key );
 
-            if( false === $version_info ) {
+			if( false === $version_info ) {
 
-                $version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
+				$version_info = $this->api_request( 'plugin_latest_version', array( 'slug' => $this->slug ) );
 
-                set_transient( $cache_key, $version_info, 3600 );
-            }
+				set_transient( $cache_key, $version_info, 3600 );
+			}
 
 
-            if( ! is_object( $version_info ) ) {
-                return;
-            }
+			if( ! is_object( $version_info ) ) {
+				return;
+			}
 
-            if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
+			if( version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-                $update_cache->response[ $this->name ] = $version_info;
+				$update_cache->response[ $this->name ] = $version_info;
 
-            }
+			}
 
-            $update_cache->last_checked = time();
-            $update_cache->checked[ $this->name ] = $this->version;
+			$update_cache->last_checked = time();
+			$update_cache->checked[ $this->name ] = $this->version;
 
-            set_site_transient( 'update_plugins', $update_cache );
+			set_site_transient( 'update_plugins', $update_cache );
 
-        } else {
+		} else {
 
-            $version_info = $update_cache->response[ $this->name ];
+			$version_info = $update_cache->response[ $this->name ];
 
-        }
+		}
 
-        // Restore our filter
-        add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
+		// Restore our filter
+		add_filter( 'pre_set_site_transient_update_plugins', array( $this, 'check_update' ) );
 
-        if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
+		if ( ! empty( $update_cache->response[ $this->name ] ) && version_compare( $this->version, $version_info->new_version, '<' ) ) {
 
-            // build a plugin list row, with update notification
-            $wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
-            echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
+			// build a plugin list row, with update notification
+			$wp_list_table = _get_list_table( 'WP_Plugins_List_Table' );
+			echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
 
-            $changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
+			$changelog_link = self_admin_url( 'index.php?edd_sl_action=view_plugin_changelog&plugin=' . $this->name . '&slug=' . $this->slug . '&TB_iframe=true&width=772&height=911' );
 
-            if ( empty( $version_info->download_link ) ) {
-                printf(
+			if ( empty( $version_info->download_link ) ) {
+				printf(
 					/* translators: 1: name 2: changelog URL 3: version */
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ),
-                    esc_html( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html( $version_info->new_version )
-                );
-            } else {
-                printf(
+					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a>.', 'edd' ),
+					esc_html( $version_info->name ),
+					esc_url( $changelog_link ),
+					esc_html( $version_info->new_version )
+				);
+			} else {
+				printf(
 					/* translators: 1: name 2: changelog URL 3: version 4: update URL */
-                    __( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ),
-                    esc_html( $version_info->name ),
-                    esc_url( $changelog_link ),
-                    esc_html( $version_info->new_version ),
-                    esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
-                );
-            }
-
-            echo '</div></td></tr>';
-        }
-    }
-
-
-    /**
-     * Updates information on the "View version x.x details" page with custom data.
-     *
-     * @uses api_request()
-     *
-     * @param mixed   $_data
-     * @param string  $_action
-     * @param object  $_args
-     * @return object $_data
-     */
-    function plugins_api_filter( $_data, $_action = '', $_args = null ) {
-
-
-        if ( $_action != 'plugin_information' ) {
-
-            return $_data;
-
-        }
-
-        if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
-
-            return $_data;
-
-        }
-
-        $to_send = array(
-            'slug'   => $this->slug,
-            'is_ssl' => is_ssl(),
-            'fields' => array(
-                'banners' => false, // These will be supported soon hopefully
-                'reviews' => false
-            )
-        );
-
-        $api_response = $this->api_request( 'plugin_information', $to_send );
-
-        if ( false !== $api_response ) {
-            $_data = $api_response;
-        }
-
-        return $_data;
-    }
-
-
-    /**
-     * Disable SSL verification in order to prevent download update failures
-     *
-     * @param array   $args
-     * @param string  $url
-     * @return object $array
-     */
-    function http_request_args( $args, $url ) {
-        // If it is an https request and we are performing a package download, disable ssl verification
-        if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
-            $args['sslverify'] = false;
-        }
-        return $args;
-    }
-
-    /**
-     * Calls the API and, if successfull, returns the object delivered by the API.
-     *
-     * @uses get_bloginfo()
-     * @uses wp_remote_post()
-     * @uses is_wp_error()
-     *
-     * @param string  $_action The requested action.
-     * @param array   $_data   Parameters for the API action.
-     * @return false||object
-     */
-    private function api_request( $_action, $_data ) {
-
-        global $wp_version;
-
-        $data = array_merge( $this->api_data, $_data );
-
-        if ( $data['slug'] != $this->slug )
-            return;
-
-        if ( empty( $data['license'] ) )
-            return;
-
-        if( $this->api_url == home_url() ) {
-            return false; // Don't allow a plugin to ping itself
-        }
-
-        $api_params = array(
-            'edd_action' => 'get_version',
-            'license'    => $data['license'],
-            'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
-            'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
-            'slug'       => $data['slug'],
-            'author'     => $data['author'],
-            'url'        => home_url()
-        );
+					__( 'There is a new version of %1$s available. <a target="_blank" class="thickbox" href="%2$s">View version %3$s details</a> or <a href="%4$s">update now</a>.', 'edd' ),
+					esc_html( $version_info->name ),
+					esc_url( $changelog_link ),
+					esc_html( $version_info->new_version ),
+					esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) )
+				);
+			}
+
+			echo '</div></td></tr>';
+		}
+	}
+
+
+	/**
+	 * Updates information on the "View version x.x details" page with custom data.
+	 *
+	 * @uses api_request()
+	 *
+	 * @param mixed   $_data
+	 * @param string  $_action
+	 * @param object  $_args
+	 * @return object $_data
+	 */
+	function plugins_api_filter( $_data, $_action = '', $_args = null ) {
+
+
+		if ( $_action != 'plugin_information' ) {
+
+			return $_data;
+
+		}
+
+		if ( ! isset( $_args->slug ) || ( $_args->slug != $this->slug ) ) {
+
+			return $_data;
+
+		}
+
+		$to_send = array(
+			'slug'   => $this->slug,
+			'is_ssl' => is_ssl(),
+			'fields' => array(
+				'banners' => false, // These will be supported soon hopefully
+				'reviews' => false
+			)
+		);
+
+		$api_response = $this->api_request( 'plugin_information', $to_send );
+
+		if ( false !== $api_response ) {
+			$_data = $api_response;
+		}
+
+		return $_data;
+	}
+
+
+	/**
+	 * Disable SSL verification in order to prevent download update failures
+	 *
+	 * @param array   $args
+	 * @param string  $url
+	 * @return object $array
+	 */
+	function http_request_args( $args, $url ) {
+		// If it is an https request and we are performing a package download, disable ssl verification
+		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
+			$args['sslverify'] = false;
+		}
+		return $args;
+	}
+
+	/**
+	 * Calls the API and, if successfull, returns the object delivered by the API.
+	 *
+	 * @uses get_bloginfo()
+	 * @uses wp_remote_post()
+	 * @uses is_wp_error()
+	 *
+	 * @param string  $_action The requested action.
+	 * @param array   $_data   Parameters for the API action.
+	 * @return false||object
+	 */
+	private function api_request( $_action, $_data ) {
+
+		global $wp_version;
+
+		$data = array_merge( $this->api_data, $_data );
+
+		if ( $data['slug'] != $this->slug )
+			return;
+
+		if ( empty( $data['license'] ) )
+			return;
+
+		if( $this->api_url == home_url() ) {
+			return false; // Don't allow a plugin to ping itself
+		}
+
+		$api_params = array(
+			'edd_action' => 'get_version',
+			'license'    => $data['license'],
+			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
+			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
+			'slug'       => $data['slug'],
+			'author'     => $data['author'],
+			'url'        => home_url()
+		);
 
-        $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => false, 'body' => $api_params ) );
 
-        if ( ! is_wp_error( $request ) ) {
-            $request = json_decode( wp_remote_retrieve_body( $request ) );
-        }
+		if ( ! is_wp_error( $request ) ) {
+			$request = json_decode( wp_remote_retrieve_body( $request ) );
+		}
 
-        if ( $request && isset( $request->sections ) ) {
-            $request->sections = maybe_unserialize( $request->sections );
-        } else {
-            $request = false;
-        }
+		if ( $request && isset( $request->sections ) ) {
+			$request->sections = maybe_unserialize( $request->sections );
+		} else {
+			$request = false;
+		}
 
-        return $request;
-    }
+		return $request;
+	}
 
-    public function show_changelog() {
+	public function show_changelog() {
 
 
-        if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
-            return;
-        }
+		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
+			return;
+		}
 
-        if( empty( $_REQUEST['plugin'] ) ) {
-            return;
-        }
-
-        if( empty( $_REQUEST['slug'] ) ) {
-            return;
-        }
-
-        if( ! current_user_can( 'update_plugins' ) ) {
-            wp_die( __( 'You do not have permission to install plugin updates.', 'edd' ), __( 'Error', 'edd' ), array( 'response' => 403 ) );
-        }
-
-        $response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
-
-        if( $response && isset( $response->sections['changelog'] ) ) {
-            echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
-        }
-
-
-        exit;
-    }
+		if( empty( $_REQUEST['plugin'] ) ) {
+			return;
+		}
+
+		if( empty( $_REQUEST['slug'] ) ) {
+			return;
+		}
+
+		if( ! current_user_can( 'update_plugins' ) ) {
+			wp_die( __( 'You do not have permission to install plugin updates.', 'edd' ), __( 'Error', 'edd' ), array( 'response' => 403 ) );
+		}
+
+		$response = $this->api_request( 'plugin_latest_version', array( 'slug' => $_REQUEST['slug'] ) );
+
+		if( $response && isset( $response->sections['changelog'] ) ) {
+			echo '<div style="background:#fff;padding:10px;">' . $response->sections['changelog'] . '</div>';
+		}
+
+
+		exit;
+	}
 
 }

includes/admin/shortcodes/abstract-shortcode-generator.php

Spacing +64 added lines, -64 removed lines

@@ -11,7 +11,7 @@ 
  * @since       1.3.0
  */
 
-defined( 'ABSPATH' ) or exit;
+defined('ABSPATH') or exit;
 
 abstract class Give_Shortcode_Generator {
 
@@ -57,12 +57,12 @@ 
 	 *
 	 * @since 1.0
 	 */
-	public function __construct( $shortcode ) {
+	public function __construct($shortcode) {
 
 
 		$this->shortcode_tag = $shortcode;
 
-		add_action( 'admin_init', array( $this, 'init' ) );
+		add_action('admin_init', array($this, 'init'));
 
 	}
 
@@ -73,9 +73,9 @@ 
 	 */
 	public function init() {
 
-		if ( $this->shortcode_tag ) {
+		if ($this->shortcode_tag) {
 
-			$this->self = get_class( $this );
+			$this->self = get_class($this);
 
 			$this->errors   = array();
 			$this->required = array();
@@ -84,18 +84,18 @@ 
 			$fields = $this->get_fields();
 
 			$defaults = array(
-				'btn_close' => __( 'Close', 'give' ),
-				'btn_okay'  => __( 'Insert Shortcode', 'give' ),
+				'btn_close' => __('Close', 'give'),
+				'btn_okay'  => __('Insert Shortcode', 'give'),
 				'errors'    => $this->errors,
 				'fields'    => $fields,
-				'label'     => '[' . $this->shortcode_tag . ']',
+				'label'     => '['.$this->shortcode_tag.']',
 				'required'  => $this->required,
-				'title'     => __( 'Insert Shortcode', 'give' ),
+				'title'     => __('Insert Shortcode', 'give'),
 			);
 
-			if ( user_can_richedit() ) {
+			if (user_can_richedit()) {
 
-				Give_Shortcode_Button::$shortcodes[ $this->shortcode_tag ] = wp_parse_args( $this->shortcode, $defaults );
+				Give_Shortcode_Button::$shortcodes[$this->shortcode_tag] = wp_parse_args($this->shortcode, $defaults);
 
 			}
 		}
@@ -124,13 +124,13 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_fields( $defined_fields ) {
+	protected function generate_fields($defined_fields) {
 
 		$fields = array();
 
-		if ( is_array( $defined_fields ) ) {
+		if (is_array($defined_fields)) {
 
-			foreach ( $defined_fields as $field ) {
+			foreach ($defined_fields as $field) {
 
 				$defaults = array(
 					'label'       => false,
@@ -141,14 +141,14 @@ 
 					'type'        => '',
 				);
 
-				$field  = wp_parse_args( (array) $field, $defaults );
-				$method = 'generate_' . strtolower( $field['type'] );
+				$field  = wp_parse_args((array) $field, $defaults);
+				$method = 'generate_'.strtolower($field['type']);
 
-				if ( method_exists( $this, $method ) ) {
+				if (method_exists($this, $method)) {
 
-					$field = call_user_func( array( $this, $method ), $field );
+					$field = call_user_func(array($this, $method), $field);
 
-					if ( $field ) {
+					if ($field) {
 						$fields[] = $field;
 					}
 				}
@@ -168,22 +168,22 @@ 
 	protected function get_fields() {
 
 		$defined_fields   = $this->define_fields();
-		$generated_fields = $this->generate_fields( $defined_fields );
+		$generated_fields = $this->generate_fields($defined_fields);
 
 		$errors = array();
 
-		if ( ! empty( $this->errors ) ) {
-			foreach ( $this->required as $name => $alert ) {
-				if ( false === array_search( $name, array_column( $generated_fields, 'name' ) ) ) {
+		if ( ! empty($this->errors)) {
+			foreach ($this->required as $name => $alert) {
+				if (false === array_search($name, array_column($generated_fields, 'name'))) {
 
-					$errors[] = $this->errors[ $name ];
+					$errors[] = $this->errors[$name];
 				}
 			}
 
 			$this->errors = $errors;
 		}
 
-		if ( ! empty( $errors ) ) {
+		if ( ! empty($errors)) {
 
 			return $errors;
 		}
@@ -200,9 +200,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_container( $field ) {
+	protected function generate_container($field) {
 
-		if ( array_key_exists( 'html', $field ) ) {
+		if (array_key_exists('html', $field)) {
 
 			return array(
 				'type' => $field['type'],
@@ -222,36 +222,36 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_listbox( $field ) {
+	protected function generate_listbox($field) {
 
-		$listbox = shortcode_atts( array(
+		$listbox = shortcode_atts(array(
 			'label'    => '',
 			'minWidth' => '',
 			'name'     => false,
 			'tooltip'  => '',
 			'type'     => '',
 			'value'    => '',
-		), $field );
+		), $field);
 
-		if ( $this->validate( $field ) ) {
+		if ($this->validate($field)) {
 
 			$new_listbox = array();
 
-			foreach ( $listbox as $key => $value ) {
+			foreach ($listbox as $key => $value) {
 
-				if ( $key == 'value' && empty( $value ) ) {
-					$new_listbox[ $key ] = $listbox['name'];
-				} else if ( $value ) {
-					$new_listbox[ $key ] = $value;
+				if ($key == 'value' && empty($value)) {
+					$new_listbox[$key] = $listbox['name'];
+				} else if ($value) {
+					$new_listbox[$key] = $value;
 				}
 			}
 
 			// do not reindex array!
 			$field['options'] = array(
-				                    '' => ( $field['placeholder'] ? $field['placeholder'] : __( '- Select -', 'give' ) ),
+				                    '' => ($field['placeholder'] ? $field['placeholder'] : __('- Select -', 'give')),
 			                    ) + $field['options'];
 
-			foreach ( $field['options'] as $value => $text ) {
+			foreach ($field['options'] as $value => $text) {
 				$new_listbox['values'][] = array(
 					'text'  => $text,
 					'value' => $value,
@@ -273,7 +273,7 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_post( $field ) {
+	protected function generate_post($field) {
 
 		$args = array(
 			'post_type'      => 'post',
@@ -282,23 +282,23 @@ 
 			'posts_per_page' => 30,
 		);
 
-		$args    = wp_parse_args( (array) $field['query_args'], $args );
-		$posts   = get_posts( $args );
+		$args    = wp_parse_args((array) $field['query_args'], $args);
+		$posts   = get_posts($args);
 		$options = array();
 
-		if ( $posts ) {
-			foreach ( $posts as $post ) {
-				$options[ absint( $post->ID ) ] = esc_html( $post->post_title );
+		if ($posts) {
+			foreach ($posts as $post) {
+				$options[absint($post->ID)] = esc_html($post->post_title);
 			}
 
 			$field['type']    = 'listbox';
 			$field['options'] = $options;
 
-			return $this->generate_listbox( $field );
+			return $this->generate_listbox($field);
 		}
 
 		// perform validation here before returning false
-		$this->validate( $field );
+		$this->validate($field);
 
 		return false;
 	}
@@ -312,9 +312,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function generate_textbox( $field ) {
+	protected function generate_textbox($field) {
 
-		$textbox = shortcode_atts( array(
+		$textbox = shortcode_atts(array(
 			'label'     => '',
 			'maxLength' => '',
 			'minHeight' => '',
@@ -324,10 +324,10 @@ 
 			'tooltip'   => '',
 			'type'      => '',
 			'value'     => '',
-		), $field );
+		), $field);
 
-		if ( $this->validate( $field ) ) {
-			return array_filter( $textbox, array( $this, 'return_textbox_value' ) );
+		if ($this->validate($field)) {
+			return array_filter($textbox, array($this, 'return_textbox_value'));
 		}
 
 		return false;
@@ -340,7 +340,7 @@ 
 	 *
 	 * @return bool
 	 */
-	function return_textbox_value( $value ) {
+	function return_textbox_value($value) {
 		return $value !== '';
 	}
 
@@ -356,9 +356,9 @@ 
 	 *
 	 * @since 1.0
 	 */
-	protected function validate( $field ) {
+	protected function validate($field) {
 
-		extract( shortcode_atts(
+		extract(shortcode_atts(
 				array(
 					'name'     => false,
 					'required' => false,
@@ -366,36 +366,36 @@ 
 				), $field )
 		);
 
-		if ( $name ) {
+		if ($name) {
 
-			if ( isset( $required['error'] ) ) {
+			if (isset($required['error'])) {
 
 				$error = array(
 					'type' => 'container',
 					'html' => $required['error'],
 				);
 
-				$this->errors[ $name ] = $this->generate_container( $error );
+				$this->errors[$name] = $this->generate_container($error);
 			}
 
-			if ( ! ! $required || is_array( $required ) ) {
+			if ( ! ! $required || is_array($required)) {
 
-				$alert = __( 'Some of the Shortcode options are required.', 'give' );
+				$alert = __('Some of the Shortcode options are required.', 'give');
 
-				if ( isset( $required['alert'] ) ) {
+				if (isset($required['alert'])) {
 
 					$alert = $required['alert'];
 
-				} else if ( ! empty( $label ) ) {
+				} else if ( ! empty($label)) {
 
 					$alert = sprintf(
 						/* translators: %s: option lable */
-						__( 'The "%s" option is required.', 'give' ),
-						str_replace( ':', '', $label )
+						__('The "%s" option is required.', 'give'),
+						str_replace(':', '', $label)
 					);
 				}
 
-				$this->required[ $name ] = $alert;
+				$this->required[$name] = $alert;
 			}
 
 			return true;

includes/admin/forms/dashboard-columns.php

Spacing +83 added lines, -83 removed lines

@@ -10,7 +10,7 @@ 
  */
 
 // Exit if accessed directly
-if ( ! defined( 'ABSPATH' ) ) {
+if ( ! defined('ABSPATH')) {
 	exit;
 }
 
@@ -27,34 +27,34 @@ 
  * @return array $form_columns Updated array of forms columns
  *  Post Type List Table
  */
-function give_form_columns( $give_form_columns ) {
+function give_form_columns($give_form_columns) {
 
 	//Standard columns
 	$give_form_columns = array(
 		'cb'            => '<input type="checkbox"/>',
-		'title'         => __( 'Name', 'give' ),
-		'form_category' => __( 'Categories', 'give' ),
-		'form_tag'      => __( 'Tags', 'give' ),
-		'price'         => __( 'Price', 'give' ),
-		'goal'          => __( 'Goal', 'give' ),
-		'donations'     => __( 'Donations', 'give' ),
-		'earnings'      => __( 'Income', 'give' ),
-		'shortcode'     => __( 'Shortcode', 'give' ),
-		'date'          => __( 'Date', 'give' )
+		'title'         => __('Name', 'give'),
+		'form_category' => __('Categories', 'give'),
+		'form_tag'      => __('Tags', 'give'),
+		'price'         => __('Price', 'give'),
+		'goal'          => __('Goal', 'give'),
+		'donations'     => __('Donations', 'give'),
+		'earnings'      => __('Income', 'give'),
+		'shortcode'     => __('Shortcode', 'give'),
+		'date'          => __('Date', 'give')
 	);
 
 	//Does the user want categories / tags?
-	if ( give_get_option( 'enable_categories' ) !== 'on' ) {
-		unset( $give_form_columns['form_category'] );
+	if (give_get_option('enable_categories') !== 'on') {
+		unset($give_form_columns['form_category']);
 	}
-	if ( give_get_option( 'enable_tags' ) !== 'on' ) {
-		unset( $give_form_columns['form_tag'] );
+	if (give_get_option('enable_tags') !== 'on') {
+		unset($give_form_columns['form_tag']);
 	}
 
-	return apply_filters( 'give_forms_columns', $give_form_columns );
+	return apply_filters('give_forms_columns', $give_form_columns);
 }
 
-add_filter( 'manage_edit-give_forms_columns', 'give_form_columns' );
+add_filter('manage_edit-give_forms_columns', 'give_form_columns');
 
 /**
  * Render Give Form Columns
@@ -66,67 +66,67 @@ 
  *
  * @return void
  */
-function give_render_form_columns( $column_name, $post_id ) {
-	if ( get_post_type( $post_id ) == 'give_forms' ) {
+function give_render_form_columns($column_name, $post_id) {
+	if (get_post_type($post_id) == 'give_forms') {
 		global $give_options;
 
-		$style = isset( $give_options['button_style'] ) ? $give_options['button_style'] : 'button';
-		$color = isset( $give_options['checkout_color'] ) ? $give_options['checkout_color'] : 'blue';
-		$color = ( $color == 'inherit' ) ? '' : $color;
+		$style = isset($give_options['button_style']) ? $give_options['button_style'] : 'button';
+		$color = isset($give_options['checkout_color']) ? $give_options['checkout_color'] : 'blue';
+		$color = ($color == 'inherit') ? '' : $color;
 
-		$purchase_text = ! empty( $give_options['add_to_cart_text'] ) ? $give_options['add_to_cart_text'] : __( 'Purchase', 'give' );
+		$purchase_text = ! empty($give_options['add_to_cart_text']) ? $give_options['add_to_cart_text'] : __('Purchase', 'give');
 
-		switch ( $column_name ) {
+		switch ($column_name) {
 			case 'form_category':
-				echo get_the_term_list( $post_id, 'give_forms_category', '', ', ', '' );
+				echo get_the_term_list($post_id, 'give_forms_category', '', ', ', '');
 				break;
 			case 'form_tag':
-				echo get_the_term_list( $post_id, 'give_forms_tag', '', ', ', '' );
+				echo get_the_term_list($post_id, 'give_forms_tag', '', ', ', '');
 				break;
 			case 'price':
-				if ( give_has_variable_prices( $post_id ) ) {
-					echo give_price_range( $post_id );
+				if (give_has_variable_prices($post_id)) {
+					echo give_price_range($post_id);
 				} else {
-					echo give_price( $post_id, false );
-					echo '<input type="hidden" class="formprice-' . $post_id . '" value="' . give_get_form_price( $post_id ) . '" />';
+					echo give_price($post_id, false);
+					echo '<input type="hidden" class="formprice-'.$post_id.'" value="'.give_get_form_price($post_id).'" />';
 				}
 				break;
 			case 'goal':
-				$goal_option = get_post_meta( $post_id, '_give_goal_option', true );
-				if ( ! empty( $goal_option ) && $goal_option === 'yes' ) {
-					echo give_goal( $post_id, false );
+				$goal_option = get_post_meta($post_id, '_give_goal_option', true);
+				if ( ! empty($goal_option) && $goal_option === 'yes') {
+					echo give_goal($post_id, false);
 				} else {
-					echo __( 'No Goal Set', 'give' );
+					echo __('No Goal Set', 'give');
 				}
 
-				echo '<input type="hidden" class="formgoal-' . $post_id . '" value="' . give_get_form_goal( $post_id ) . '" />';
+				echo '<input type="hidden" class="formgoal-'.$post_id.'" value="'.give_get_form_goal($post_id).'" />';
 				break;
 			case 'donations':
-				if ( current_user_can( 'view_give_forms_stats', $post_id ) ) {
-					echo '<a href="' . esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-reports&tab=logs&view=sales&form=' . $post_id ) ) . '">';
-					echo give_get_form_sales_stats( $post_id );
+				if (current_user_can('view_give_forms_stats', $post_id)) {
+					echo '<a href="'.esc_url(admin_url('edit.php?post_type=give_forms&page=give-reports&tab=logs&view=sales&form='.$post_id)).'">';
+					echo give_get_form_sales_stats($post_id);
 					echo '</a>';
 				} else {
 					echo '-';
 				}
 				break;
 			case 'earnings':
-				if ( current_user_can( 'view_give_forms_stats', $post_id ) ) {
-					echo '<a href="' . esc_url( admin_url( 'edit.php?post_type=give_forms&page=give-reports&view=forms&form-id=' . $post_id ) ) . '">';
-					echo give_currency_filter( give_format_amount( give_get_form_earnings_stats( $post_id ) ) );
+				if (current_user_can('view_give_forms_stats', $post_id)) {
+					echo '<a href="'.esc_url(admin_url('edit.php?post_type=give_forms&page=give-reports&view=forms&form-id='.$post_id)).'">';
+					echo give_currency_filter(give_format_amount(give_get_form_earnings_stats($post_id)));
 					echo '</a>';
 				} else {
 					echo '-';
 				}
 				break;
 			case 'shortcode':
-				echo '<input onclick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly="" value="[give_form id=&#34;' . absint( $post_id ) . '&#34;]">';
+				echo '<input onclick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly="" value="[give_form id=&#34;'.absint($post_id).'&#34;]">';
 				break;
 		}
 	}
 }
 
-add_action( 'manage_posts_custom_column', 'give_render_form_columns', 10, 2 );
+add_action('manage_posts_custom_column', 'give_render_form_columns', 10, 2);
 
 /**
  * Registers the sortable columns in the list table
@@ -137,7 +137,7 @@ 
  *
  * @return array $columns Array of sortable columns
  */
-function give_sortable_form_columns( $columns ) {
+function give_sortable_form_columns($columns) {
 	$columns['price']    = 'price';
 	$columns['sales']    = 'sales';
 	$columns['earnings'] = 'earnings';
@@ -146,7 +146,7 @@ 
 	return $columns;
 }
 
-add_filter( 'manage_edit-give_forms_sortable_columns', 'give_sortable_form_columns' );
+add_filter('manage_edit-give_forms_sortable_columns', 'give_sortable_form_columns');
 
 /**
  * Sorts Columns in the Forms List Table
@@ -157,11 +157,11 @@ 
  *
  * @return array $vars Array of all the sort variables
  */
-function give_sort_forms( $vars ) {
+function give_sort_forms($vars) {
 	// Check if we're viewing the "give_forms" post type
-	if ( isset( $vars['post_type'] ) && 'give_forms' == $vars['post_type'] ) {
+	if (isset($vars['post_type']) && 'give_forms' == $vars['post_type']) {
 		// Check if 'orderby' is set to "sales"
-		if ( isset( $vars['orderby'] ) && 'sales' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'sales' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -172,7 +172,7 @@ 
 		}
 
 		// Check if "orderby" is set to "earnings"
-		if ( isset( $vars['orderby'] ) && 'earnings' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'earnings' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -183,7 +183,7 @@ 
 		}
 
 		// Check if "orderby" is set to "price"
-		if ( isset( $vars['orderby'] ) && 'price' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'price' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -194,7 +194,7 @@ 
 		}
 
 		// Check if "orderby" is set to "goal"
-		if ( isset( $vars['orderby'] ) && 'goal' == $vars['orderby'] ) {
+		if (isset($vars['orderby']) && 'goal' == $vars['orderby']) {
 			$vars = array_merge(
 				$vars,
 				array(
@@ -217,16 +217,16 @@ 
  *
  * @return array       Array of all sort variables
  */
-function give_filter_forms( $vars ) {
-	if ( isset( $vars['post_type'] ) && 'give_forms' == $vars['post_type'] ) {
+function give_filter_forms($vars) {
+	if (isset($vars['post_type']) && 'give_forms' == $vars['post_type']) {
 
 		// If an author ID was passed, use it
-		if ( isset( $_REQUEST['author'] ) && ! current_user_can( 'view_give_reports' ) ) {
+		if (isset($_REQUEST['author']) && ! current_user_can('view_give_reports')) {
 
 			$author_id = $_REQUEST['author'];
-			if ( (int) $author_id !== get_current_user_id() ) {
+			if ((int) $author_id !== get_current_user_id()) {
 				// Tried to view the products of another person, sorry
-				wp_die( __( 'You do not have permission to view this data.', 'give' ), __( 'Error', 'give' ), array( 'response' => 403 ) );
+				wp_die(__('You do not have permission to view this data.', 'give'), __('Error', 'give'), array('response' => 403));
 			}
 			$vars = array_merge(
 				$vars,
@@ -251,11 +251,11 @@ 
  * @return void
  */
 function give_forms_load() {
-	add_filter( 'request', 'give_sort_forms' );
-	add_filter( 'request', 'give_filter_forms' );
+	add_filter('request', 'give_sort_forms');
+	add_filter('request', 'give_filter_forms');
 }
 
-add_action( 'load-edit.php', 'give_forms_load', 9999 );
+add_action('load-edit.php', 'give_forms_load', 9999);
 
 /**
  * Remove Forms Month Filter
@@ -269,17 +269,17 @@ 
  * @global      $typenow The post type we are viewing
  * @return array Empty array disables the dropdown
  */
-function give_remove_month_filter( $dates ) {
+function give_remove_month_filter($dates) {
 	global $typenow;
 
-	if ( $typenow == 'give_forms' ) {
+	if ($typenow == 'give_forms') {
 		$dates = array();
 	}
 
 	return $dates;
 }
 
-add_filter( 'months_dropdown_results', 'give_remove_month_filter', 99 );
+add_filter('months_dropdown_results', 'give_remove_month_filter', 99);
 
 /**
  * Adds price field to Quick Edit options
@@ -291,8 +291,8 @@ 
  *
  * @return void
  */
-function give_price_field_quick_edit( $column_name, $post_type ) {
-	if ( $column_name != 'price' || $post_type != 'give_forms' ) {
+function give_price_field_quick_edit($column_name, $post_type) {
+	if ($column_name != 'price' || $post_type != 'give_forms') {
 		return;
 	}
 	?>
@@ -301,12 +301,12 @@ 
 			<h4><?php 
 				printf(
 					/* translators: %s: forms singular label */
-					__( '%s Configuration', 'give' ),
+					__('%s Configuration', 'give'),
 					give_get_forms_label_singular()
 				);
 			?></h4>
 			<label>
-				<span class="title"><?php _e( 'Price', 'give' ); ?></span>
+				<span class="title"><?php _e('Price', 'give'); ?></span>
 				<span class="input-text-wrap">
 					<input type="text" name="_give_regprice" class="text regprice" />
 				</span>
@@ -317,8 +317,8 @@ 
 	<?php
 }
 
-add_action( 'quick_edit_custom_box', 'give_price_field_quick_edit', 10, 2 );
-add_action( 'bulk_edit_custom_box', 'give_price_field_quick_edit', 10, 2 );
+add_action('quick_edit_custom_box', 'give_price_field_quick_edit', 10, 2);
+add_action('bulk_edit_custom_box', 'give_price_field_quick_edit', 10, 2);
 
 /**
  * Updates price when saving post
@@ -329,23 +329,23 @@ 
  *
  * @return void
  */
-function give_price_save_quick_edit( $post_id ) {
-	if ( ! isset( $_POST['post_type'] ) || 'give_forms' !== $_POST['post_type'] ) {
+function give_price_save_quick_edit($post_id) {
+	if ( ! isset($_POST['post_type']) || 'give_forms' !== $_POST['post_type']) {
 		return;
 	}
-	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+	if ( ! current_user_can('edit_post', $post_id)) {
 		return $post_id;
 	}
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
 		return $post_id;
 	}
 
-	if ( isset( $_REQUEST['_give_regprice'] ) ) {
-		update_post_meta( $post_id, '_give_set_price', strip_tags( stripslashes( $_REQUEST['_give_regprice'] ) ) );
+	if (isset($_REQUEST['_give_regprice'])) {
+		update_post_meta($post_id, '_give_set_price', strip_tags(stripslashes($_REQUEST['_give_regprice'])));
 	}
 }
 
-add_action( 'save_post', 'give_price_save_quick_edit' );
+add_action('save_post', 'give_price_save_quick_edit');
 
 /**
  * Process bulk edit actions via AJAX
@@ -355,18 +355,18 @@ 
  */
 function give_save_bulk_edit() {
 
-	$post_ids = ( isset( $_POST['post_ids'] ) && ! empty( $_POST['post_ids'] ) ) ? $_POST['post_ids'] : array();
+	$post_ids = (isset($_POST['post_ids']) && ! empty($_POST['post_ids'])) ? $_POST['post_ids'] : array();
 
-	if ( ! empty( $post_ids ) && is_array( $post_ids ) ) {
-		$price = isset( $_POST['price'] ) ? strip_tags( stripslashes( $_POST['price'] ) ) : 0;
-		foreach ( $post_ids as $post_id ) {
+	if ( ! empty($post_ids) && is_array($post_ids)) {
+		$price = isset($_POST['price']) ? strip_tags(stripslashes($_POST['price'])) : 0;
+		foreach ($post_ids as $post_id) {
 
-			if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			if ( ! current_user_can('edit_post', $post_id)) {
 				continue;
 			}
 
-			if ( ! empty( $price ) ) {
-				update_post_meta( $post_id, '_give_set_price', give_sanitize_amount( $price ) );
+			if ( ! empty($price)) {
+				update_post_meta($post_id, '_give_set_price', give_sanitize_amount($price));
 			}
 		}
 	}
@@ -374,4 +374,4 @@ 
 	die();
 }
 
-add_action( 'wp_ajax_give_save_bulk_edit', 'give_save_bulk_edit' );
+add_action('wp_ajax_give_save_bulk_edit', 'give_save_bulk_edit');

includes/admin/forms/metabox.php

Spacing +191 added lines, -191 removed lines

@@ -10,11 +10,11 @@ 
  */

 

 // Exit if accessed directly

-if ( ! defined( 'ABSPATH' ) ) {

+if ( ! defined('ABSPATH')) {

 	exit;

 }

 

-add_filter( 'cmb2_meta_boxes', 'give_single_forms_cmb2_metaboxes' );

+add_filter('cmb2_meta_boxes', 'give_single_forms_cmb2_metaboxes');

 

 /**

  * Define the metabox and field configurations.

@@ -23,23 +23,23 @@ 
  *

  * @return array

  */

-function give_single_forms_cmb2_metaboxes( array $meta_boxes ) {

+function give_single_forms_cmb2_metaboxes(array $meta_boxes) {

 

 	$post_id               = give_get_admin_post_id();

-	$price                 = give_get_form_price( $post_id );

-	$custom_amount_minimum = give_get_form_minimum_price( $post_id );

-	$goal                  = give_get_form_goal( $post_id );

-	$variable_pricing      = give_has_variable_prices( $post_id );

-	$prices                = give_get_variable_prices( $post_id );

+	$price                 = give_get_form_price($post_id);

+	$custom_amount_minimum = give_get_form_minimum_price($post_id);

+	$goal                  = give_get_form_goal($post_id);

+	$variable_pricing      = give_has_variable_prices($post_id);

+	$prices                = give_get_variable_prices($post_id);

 

 	//No empty prices - min. 1.00 for new forms

-	if ( empty( $price ) && is_null( $post_id ) ) {

-		$price = esc_attr( give_format_amount( '1.00' ) );

+	if (empty($price) && is_null($post_id)) {

+		$price = esc_attr(give_format_amount('1.00'));

 	}

 

 	//Min. $1.00 for new forms

-	if ( empty( $custom_amount_minimum ) ) {

-		$custom_amount_minimum = esc_attr( give_format_amount( '1.00' ) );

+	if (empty($custom_amount_minimum)) {

+		$custom_amount_minimum = esc_attr(give_format_amount('1.00'));

 	}

 

 	// Start with an underscore to hide fields from custom fields list

@@ -48,326 +48,326 @@ 
 	/**

 	 * Repeatable Field Groups

 	 */

-	$meta_boxes['form_field_options'] = apply_filters( 'give_forms_field_options', array(

+	$meta_boxes['form_field_options'] = apply_filters('give_forms_field_options', array(

 		'id'           => 'form_field_options',

-		'title'        => __( 'Donation Options', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => __('Donation Options', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

-		'fields'       => apply_filters( 'give_forms_donation_form_metabox_fields', array(

+		'fields'       => apply_filters('give_forms_donation_form_metabox_fields', array(

 				//Donation Option

 				array(

-					'name'        => __( 'Donation Option', 'give' ),

-					'description' => __( 'Would you like this form to have one set donation price or multiple levels (for example, $10, $20, $50)?', 'give' ),

-					'id'          => $prefix . 'price_option',

+					'name'        => __('Donation Option', 'give'),

+					'description' => __('Would you like this form to have one set donation price or multiple levels (for example, $10, $20, $50)?', 'give'),

+					'id'          => $prefix.'price_option',

 					'type'        => 'radio_inline',

 					'default'     => 'set',

-					'options'     => apply_filters( 'give_forms_price_options', array(

-						'set'   => __( 'Set Donation', 'give' ),

-						'multi' => __( 'Multi-level Donation', 'give' ),

-					) ),

+					'options'     => apply_filters('give_forms_price_options', array(

+						'set'   => __('Set Donation', 'give'),

+						'multi' => __('Multi-level Donation', 'give'),

+					)),

 				),

 				array(

-					'name'         => __( 'Set Donation', 'give' ),

-					'description'  => __( 'This is the set donation amount for this form. If you have a "Custom Amount Minimum" set, make sure it is less than this amount.', 'give' ),

-					'id'           => $prefix . 'set_price',

+					'name'         => __('Set Donation', 'give'),

+					'description'  => __('This is the set donation amount for this form. If you have a "Custom Amount Minimum" set, make sure it is less than this amount.', 'give'),

+					'id'           => $prefix.'set_price',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '1.00' ),

-						'value'       => give_format_amount( $price ),

+						'placeholder' => give_format_amount('1.00'),

+						'value'       => give_format_amount($price),

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 				//Donation levels: Header

 				array(

-					'id'   => $prefix . 'levels_header',

+					'id'   => $prefix.'levels_header',

 					'type' => 'levels_repeater_header',

 				),

 				//Donation Levels: Repeatable CMB2 Group

 				array(

-					'id'          => $prefix . 'donation_levels',

+					'id'          => $prefix.'donation_levels',

 					'type'        => 'group',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'add_button'    => __( 'Add Level', 'give' ),

-						'remove_button' => __( '<span class="dashicons dashicons-no"></span>', 'give' ),

+						'add_button'    => __('Add Level', 'give'),

+						'remove_button' => __('<span class="dashicons dashicons-no"></span>', 'give'),

 						'sortable'      => true, // beta

 					),

 					// Fields array works the same, except id's only need to be unique for this group. Prefix is not needed.

-					'fields'      => apply_filters( 'give_donation_levels_table_row', array(

+					'fields'      => apply_filters('give_donation_levels_table_row', array(

 						array(

-							'name' => __( 'ID', 'give' ),

-							'id'   => $prefix . 'id',

+							'name' => __('ID', 'give'),

+							'id'   => $prefix.'id',

 							'type' => 'levels_id',

 						),

 						array(

-							'name'         => __( 'Amount', 'give' ),

-							'id'           => $prefix . 'amount',

+							'name'         => __('Amount', 'give'),

+							'id'           => $prefix.'amount',

 							'type'         => 'text_small',

-							'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol  give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-							'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol  give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+							'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol  give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+							'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol  give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 							'attributes'   => array(

-								'placeholder' => give_format_amount( '1.00' ),

+								'placeholder' => give_format_amount('1.00'),

 								'class'       => 'cmb-type-text-small give-money-field',

 							),

 							'before'       => 'give_format_admin_multilevel_amount',

 						),

 						array(

-							'name'       => __( 'Text', 'give' ),

-							'id'         => $prefix . 'text',

+							'name'       => __('Text', 'give'),

+							'id'         => $prefix.'text',

 							'type'       => 'text',

 							'attributes' => array(

-								'placeholder' => __( 'Donation Level', 'give' ),

+								'placeholder' => __('Donation Level', 'give'),

 								'class'       => 'give-multilevel-text-field',

 							),

 						),

 						array(

-							'name' => __( 'Default', 'give' ),

-							'id'   => $prefix . 'default',

+							'name' => __('Default', 'give'),

+							'id'   => $prefix.'default',

 							'type' => 'give_default_radio_inline'

 						),

-					) ),

+					)),

 				),

 				//Display Style

 				array(

-					'name'        => __( 'Display Style', 'give' ),

-					'description' => __( 'Set how the donations levels will display on the form.', 'give' ),

-					'id'          => $prefix . 'display_style',

+					'name'        => __('Display Style', 'give'),

+					'description' => __('Set how the donations levels will display on the form.', 'give'),

+					'id'          => $prefix.'display_style',

 					'type'        => 'radio_inline',

 					'default'     => 'buttons',

 					'options'     => array(

-						'buttons'  => __( 'Buttons', 'give' ),

-						'radios'   => __( 'Radios', 'give' ),

-						'dropdown' => __( 'Dropdown', 'give' ),

+						'buttons'  => __('Buttons', 'give'),

+						'radios'   => __('Radios', 'give'),

+						'dropdown' => __('Dropdown', 'give'),

 					),

 				),

 				//Custom Amount

 				array(

-					'name'        => __( 'Custom Amount', 'give' ),

-					'description' => __( 'Do you want the user to be able to input their own donation amount?', 'give' ),

-					'id'          => $prefix . 'custom_amount',

+					'name'        => __('Custom Amount', 'give'),

+					'description' => __('Do you want the user to be able to input their own donation amount?', 'give'),

+					'id'          => $prefix.'custom_amount',

 					'type'        => 'radio_inline',

 					'default'     => 'no',

 					'options'     => array(

-						'yes' => __( 'Yes', 'give' ),

-						'no'  => __( 'No', 'give' ),

+						'yes' => __('Yes', 'give'),

+						'no'  => __('No', 'give'),

 					),

 				),

 				array(

-					'name'         => __( 'Custom Amount Minimum', 'give' ),

-					'description'  => __( 'If you would like to set a minimum custom donation amount please enter it here.', 'give' ),

-					'id'           => $prefix . 'custom_amount_minimum',

+					'name'         => __('Custom Amount Minimum', 'give'),

+					'description'  => __('If you would like to set a minimum custom donation amount please enter it here.', 'give'),

+					'id'           => $prefix.'custom_amount_minimum',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '1.00' ),

-						'value'       => give_format_amount( $custom_amount_minimum ),

+						'placeholder' => give_format_amount('1.00'),

+						'value'       => give_format_amount($custom_amount_minimum),

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 				array(

-					'name'        => __( 'Custom Amount Text', 'give' ),

-					'description' => __( 'This text appears as a label below the custom amount field for set donation forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option).', 'give' ),

-					'id'          => $prefix . 'custom_amount_text',

+					'name'        => __('Custom Amount Text', 'give'),

+					'description' => __('This text appears as a label below the custom amount field for set donation forms. For multi-level forms the text will appear as it\'s own level (ie button, radio, or select option).', 'give'),

+					'id'          => $prefix.'custom_amount_text',

 					'type'        => 'text',

 					'row_classes' => 'give-subfield',

 					'attributes'  => array(

 						'rows'        => 3,

-						'placeholder' => __( 'Give a Custom Amount', 'give' ),

+						'placeholder' => __('Give a Custom Amount', 'give'),

 					),

 				),

 				//Goals

 				array(

-					'name'        => __( 'Goal', 'give' ),

-					'description' => __( 'Do you want to set a donation goal for this form?', 'give' ),

-					'id'          => $prefix . 'goal_option',

+					'name'        => __('Goal', 'give'),

+					'description' => __('Do you want to set a donation goal for this form?', 'give'),

+					'id'          => $prefix.'goal_option',

 					'type'        => 'radio_inline',

 					'default'     => 'no',

 					'options'     => array(

-						'yes' => __( 'Yes', 'give' ),

-						'no'  => __( 'No', 'give' ),

+						'yes' => __('Yes', 'give'),

+						'no'  => __('No', 'give'),

 					),

 				),

 				array(

-					'name'         => __( 'Goal Amount', 'give' ),

-					'description'  => __( 'This is the monetary goal amount you want to reach for this donation form.', 'give' ),

-					'id'           => $prefix . 'set_goal',

+					'name'         => __('Goal Amount', 'give'),

+					'description'  => __('This is the monetary goal amount you want to reach for this donation form.', 'give'),

+					'id'           => $prefix.'set_goal',

 					'type'         => 'text_small',

 					'row_classes'  => 'give-subfield',

-					'before_field' => give_get_option( 'currency_position' ) == 'before' ? '<span class="give-money-symbol give-money-symbol-before">' . give_currency_symbol() . '</span>' : '',

-					'after_field'  => give_get_option( 'currency_position' ) == 'after' ? '<span class="give-money-symbol give-money-symbol-after">' . give_currency_symbol() . '</span>' : '',

+					'before_field' => give_get_option('currency_position') == 'before' ? '<span class="give-money-symbol give-money-symbol-before">'.give_currency_symbol().'</span>' : '',

+					'after_field'  => give_get_option('currency_position') == 'after' ? '<span class="give-money-symbol give-money-symbol-after">'.give_currency_symbol().'</span>' : '',

 					'attributes'   => array(

-						'placeholder' => give_format_amount( '0.00' ),

-						'value'       => isset( $goal ) ? esc_attr( give_format_amount( $goal ) ) : '',

+						'placeholder' => give_format_amount('0.00'),

+						'value'       => isset($goal) ? esc_attr(give_format_amount($goal)) : '',

 						'class'       => 'cmb-type-text-small give-money-field',

 					),

 				),

 

 				array(

-					'name'        => __( 'Goal Format', 'give' ),

-					'description' => __( 'Would you like to display the total amount raised based on your monetary goal or a percentage? For instance, "$500 of $1,000 raised" or "50% funded".', 'give' ),

-					'id'          => $prefix . 'goal_format',

+					'name'        => __('Goal Format', 'give'),

+					'description' => __('Would you like to display the total amount raised based on your monetary goal or a percentage? For instance, "$500 of $1,000 raised" or "50% funded".', 'give'),

+					'id'          => $prefix.'goal_format',

 					'type'        => 'radio_inline',

 					'default'     => 'amount',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'amount'     => __( 'Amount ', 'give' ),

-						'percentage' => __( 'Percentage', 'give' ),

+						'amount'     => __('Amount ', 'give'),

+						'percentage' => __('Percentage', 'give'),

 					),

 				),

 				array(

-					'name'        => __( 'Goal Progress Bar Color', 'give' ),

-					'id'          => $prefix . 'goal_color',

+					'name'        => __('Goal Progress Bar Color', 'give'),

+					'id'          => $prefix.'goal_color',

 					'type'        => 'colorpicker',

 					'row_classes' => 'give-subfield',

 					'default'     => '#2bc253',

 				),

 

 				array(

-					'name'        => __( 'Close Form when Goal Achieved', 'give' ),

-					'desc'        => __( 'Would you like to close the donation forms and stop accepting donations once this goal has been met?', 'give' ),

-					'id'          => $prefix . 'close_form_when_goal_achieved',

+					'name'        => __('Close Form when Goal Achieved', 'give'),

+					'desc'        => __('Would you like to close the donation forms and stop accepting donations once this goal has been met?', 'give'),

+					'id'          => $prefix.'close_form_when_goal_achieved',

 					'type'        => 'radio_inline',

 					'row_classes' => 'give-subfield',

 					'options'     => array(

-						'yes' => __( 'Yes', 'give' ),

-						'no'  => __( 'No', 'give' ),

+						'yes' => __('Yes', 'give'),

+						'no'  => __('No', 'give'),

 					),

 					'default'     => 'no',

 				),

 				array(

-					'name'        => __( 'Goal Achieved Message', 'give' ),

-					'desc'        => __( 'Would you like to display a custom message when the goal is closed? If none is provided the default message will be displayed', 'give' ),

-					'id'          => $prefix . 'form_goal_achieved_message',

+					'name'        => __('Goal Achieved Message', 'give'),

+					'desc'        => __('Would you like to display a custom message when the goal is closed? If none is provided the default message will be displayed', 'give'),

+					'id'          => $prefix.'form_goal_achieved_message',

 					'type'        => 'textarea',

 					'row_classes' => 'give-subfield',

 					'attributes'  => array(

-						'placeholder' => __( 'Thank you to all our donors, we have met our fundraising goal.', 'give' ),

+						'placeholder' => __('Thank you to all our donors, we have met our fundraising goal.', 'give'),

 					),

 				)

 			)

 		)

-	) );

+	));

 

 

 	/**

 	 * Content Field

 	 */

-	$meta_boxes['form_content_options'] = apply_filters( 'give_forms_content_options', array(

+	$meta_boxes['form_content_options'] = apply_filters('give_forms_content_options', array(

 		'id'           => 'form_content_options',

-		'title'        => __( 'Form Content', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => __('Form Content', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

-		'fields'       => apply_filters( 'give_forms_content_options_metabox_fields', array(

+		'fields'       => apply_filters('give_forms_content_options_metabox_fields', array(

 				//Donation Option

 				array(

-					'name'        => __( 'Display Content', 'give' ),

-					'description' => __( 'Do you want to display content? If you select "Yes" a WYSIWYG editor will appear which you will be able to enter content to display above or below the form.', 'give' ),

-					'id'          => $prefix . 'content_option',

+					'name'        => __('Display Content', 'give'),

+					'description' => __('Do you want to display content? If you select "Yes" a WYSIWYG editor will appear which you will be able to enter content to display above or below the form.', 'give'),

+					'id'          => $prefix.'content_option',

 					'type'        => 'select',

-					'options'     => apply_filters( 'give_forms_content_options_select', array(

-							'none'           => __( 'No content', 'give' ),

-							'give_pre_form'  => __( 'Yes, display content ABOVE the form fields', 'give' ),

-							'give_post_form' => __( 'Yes, display content BELOW the form fields', 'give' ),

+					'options'     => apply_filters('give_forms_content_options_select', array(

+							'none'           => __('No content', 'give'),

+							'give_pre_form'  => __('Yes, display content ABOVE the form fields', 'give'),

+							'give_post_form' => __('Yes, display content BELOW the form fields', 'give'),

 						)

 					),

 					'default'     => 'none',

 				),

 				array(

-					'name'        => __( 'Content', 'give' ),

-					'description' => __( 'This content will display on the single give form page.', 'give' ),

-					'id'          => $prefix . 'form_content',

+					'name'        => __('Content', 'give'),

+					'description' => __('This content will display on the single give form page.', 'give'),

+					'id'          => $prefix.'form_content',

 					'row_classes' => 'give-subfield',

 					'type'        => 'wysiwyg'

 				),

 			)

 		)

-	) );

+	));

 

 

 	/**

 	 * Display Options

 	 */

-	$meta_boxes['form_display_options'] = apply_filters( 'give_form_display_options', array(

+	$meta_boxes['form_display_options'] = apply_filters('give_form_display_options', array(

 			'id'           => 'form_display_options',

-			'title'        => __( 'Form Display Options', 'give' ),

-			'object_types' => array( 'give_forms' ),

+			'title'        => __('Form Display Options', 'give'),

+			'object_types' => array('give_forms'),

 			'context'      => 'normal', //  'normal', 'advanced', or 'side'

 			'priority'     => 'high', //Show above Content WYSIWYG

 			'show_names'   => true, // Show field names on the left

-			'fields'       => apply_filters( 'give_forms_display_options_metabox_fields', array(

+			'fields'       => apply_filters('give_forms_display_options_metabox_fields', array(

 					array(

-						'name'    => __( 'Payment Fields', 'give' ),

-						'desc'    => __( 'How would you like to display payment information for this form? The "Show on Page" option will display the entire form when the page loads. "Reveal Upon Click" places a button below the donation fields and upon click slides into view the rest of the fields. "Modal Window Upon Click" is a similar option, rather than sliding into view the fields they will open in a shadow box or "modal" window.', 'give' ),

-						'id'      => $prefix . 'payment_display',

+						'name'    => __('Payment Fields', 'give'),

+						'desc'    => __('How would you like to display payment information for this form? The "Show on Page" option will display the entire form when the page loads. "Reveal Upon Click" places a button below the donation fields and upon click slides into view the rest of the fields. "Modal Window Upon Click" is a similar option, rather than sliding into view the fields they will open in a shadow box or "modal" window.', 'give'),

+						'id'      => $prefix.'payment_display',

 						'type'    => 'select',

 						'options' => array(

-							'onpage' => __( 'Show on Page', 'give' ),

-							'reveal' => __( 'Reveal Upon Click', 'give' ),

-							'modal'  => __( 'Modal Window Upon Click', 'give' ),

+							'onpage' => __('Show on Page', 'give'),

+							'reveal' => __('Reveal Upon Click', 'give'),

+							'modal'  => __('Modal Window Upon Click', 'give'),

 						),

 						'default' => 'onpage',

 					),

 					array(

-						'id'          => $prefix . 'reveal_label',

-						'name'        => __( 'Reveal / Modal Open Text', 'give' ),

-						'desc'        => __( 'The button label for completing the donation.', 'give' ),

+						'id'          => $prefix.'reveal_label',

+						'name'        => __('Reveal / Modal Open Text', 'give'),

+						'desc'        => __('The button label for completing the donation.', 'give'),

 						'type'        => 'text_small',

 						'row_classes' => 'give-subfield',

 						'attributes'  => array(

-							'placeholder' => __( 'Donate Now', 'give' ),

+							'placeholder' => __('Donate Now', 'give'),

 						),

 					),

 					array(

-						'id'         => $prefix . 'checkout_label',

-						'name'       => __( 'Complete Donation Text', 'give' ),

-						'desc'       => __( 'The button label for completing a donation.', 'give' ),

+						'id'         => $prefix.'checkout_label',

+						'name'       => __('Complete Donation Text', 'give'),

+						'desc'       => __('The button label for completing a donation.', 'give'),

 						'type'       => 'text_small',

 						'attributes' => array(

-							'placeholder' => __( 'Donate Now', 'give' ),

+							'placeholder' => __('Donate Now', 'give'),

 						),

 					),

 					array(

-						'name' => __( 'Default Gateway', 'give' ),

-						'desc' => __( 'By default, the gateway for this form will inherit the global default gateway (set under Give > Settings > Payment Gateways). This option allows you to customize the default gateway for this form only.', 'give' ),

-						'id'   => $prefix . 'default_gateway',

+						'name' => __('Default Gateway', 'give'),

+						'desc' => __('By default, the gateway for this form will inherit the global default gateway (set under Give > Settings > Payment Gateways). This option allows you to customize the default gateway for this form only.', 'give'),

+						'id'   => $prefix.'default_gateway',

 						'type' => 'default_gateway'

 					),

 					array(

-						'name' => __( 'Disable Guest Donations', 'give' ),

-						'desc' => __( 'Do you want to require users be logged-in to make donations?', 'give' ),

-						'id'   => $prefix . 'logged_in_only',

+						'name' => __('Disable Guest Donations', 'give'),

+						'desc' => __('Do you want to require users be logged-in to make donations?', 'give'),

+						'id'   => $prefix.'logged_in_only',

 						'type' => 'checkbox'

 					),

 					array(

-						'name'    => __( 'Register / Login Form', 'give' ),

-						'desc'    => __( 'Display the registration and login forms in the payment section for non-logged-in users.', 'give' ),

-						'id'      => $prefix . 'show_register_form',

+						'name'    => __('Register / Login Form', 'give'),

+						'desc'    => __('Display the registration and login forms in the payment section for non-logged-in users.', 'give'),

+						'id'      => $prefix.'show_register_form',

 						'type'    => 'select',

 						'options' => array(

-							'both'         => __( 'Registration and Login Forms', 'give' ),

-							'registration' => __( 'Registration Form Only', 'give' ),

-							'login'        => __( 'Login Form Only', 'give' ),

-							'none'         => __( 'None', 'give' ),

+							'both'         => __('Registration and Login Forms', 'give'),

+							'registration' => __('Registration Form Only', 'give'),

+							'login'        => __('Login Form Only', 'give'),

+							'none'         => __('None', 'give'),

 						),

 						'default' => 'none',

 					),

 					array(

-						'name'    => __( 'Floating Labels', 'give' ),

+						'name'    => __('Floating Labels', 'give'),

 						/* translators: %s: forms http://bradfrost.com/blog/post/float-label-pattern/ */

-						'desc'    => sprintf( __( 'Select the <a href="%s" target="_blank">floating labels</a> setting for this Give form.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give' ), esc_url( "http://bradfrost.com/blog/post/float-label-pattern/" ) ),

-						'id'      => $prefix . 'form_floating_labels',

+						'desc'    => sprintf(__('Select the <a href="%s" target="_blank">floating labels</a> setting for this Give form.<br>Be aware that if you have the "Disable CSS" option enabled, you will need to style the floating labels yourself.', 'give'), esc_url("http://bradfrost.com/blog/post/float-label-pattern/")),

+						'id'      => $prefix.'form_floating_labels',

 						'type'    => 'select',

 						'options' => array(

-							''         => __( 'Use the global setting', 'give' ),

-							'enabled'  => __( 'Enabled', 'give' ),

-							'disabled' => __( 'Disabled', 'give' ),

+							''         => __('Use the global setting', 'give'),

+							'enabled'  => __('Enabled', 'give'),

+							'disabled' => __('Disabled', 'give'),

 						),

 						'default' => 'none',

 					)

@@ -379,47 +379,47 @@ 
 	/**

 	 * Terms & Conditions

 	 */

-	$meta_boxes['form_terms_options'] = apply_filters( 'give_forms_terms_options', array(

+	$meta_boxes['form_terms_options'] = apply_filters('give_forms_terms_options', array(

 		'id'           => 'form_terms_options',

-		'title'        => __( 'Terms and Conditions', 'give' ),

-		'object_types' => array( 'give_forms' ),

+		'title'        => __('Terms and Conditions', 'give'),

+		'object_types' => array('give_forms'),

 		'context'      => 'normal',

 		'priority'     => 'high', //Show above Content WYSIWYG

-		'fields'       => apply_filters( 'give_forms_terms_options_metabox_fields', array(

+		'fields'       => apply_filters('give_forms_terms_options_metabox_fields', array(

 				//Donation Option

 				array(

-					'name'        => __( 'Terms and Conditions', 'give' ),

-					'description' => __( 'Do you want to require the user to agree to terms and conditions prior to being able to complete their donation?', 'give' ),

-					'id'          => $prefix . 'terms_option',

+					'name'        => __('Terms and Conditions', 'give'),

+					'description' => __('Do you want to require the user to agree to terms and conditions prior to being able to complete their donation?', 'give'),

+					'id'          => $prefix.'terms_option',

 					'type'        => 'select',

-					'options'     => apply_filters( 'give_forms_content_options_select', array(

-							'none' => __( 'No', 'give' ),

-							'yes'  => __( 'Yes', 'give' ),

+					'options'     => apply_filters('give_forms_content_options_select', array(

+							'none' => __('No', 'give'),

+							'yes'  => __('Yes', 'give'),

 						)

 					),

 					'default'     => 'none',

 				),

 				array(

-					'id'          => $prefix . 'agree_label',

-					'name'        => __( 'Agree to Terms Label', 'give' ),

-					'desc'        => __( 'The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder.', 'give' ),

+					'id'          => $prefix.'agree_label',

+					'name'        => __('Agree to Terms Label', 'give'),

+					'desc'        => __('The label shown next to the agree to terms check box. Add your own to customize or leave blank to use the default text placeholder.', 'give'),

 					'type'        => 'text',

 					'row_classes' => 'give-subfield',

 					'size'        => 'regular',

 					'attributes'  => array(

-						'placeholder' => __( 'Agree to Terms?', 'give' ),

+						'placeholder' => __('Agree to Terms?', 'give'),

 					),

 				),

 				array(

-					'id'          => $prefix . 'agree_text',

+					'id'          => $prefix.'agree_text',

 					'row_classes' => 'give-subfield',

-					'name'        => __( 'Agreement Text', 'give' ),

-					'desc'        => __( 'This is the actual text which the user will have to agree to in order to make a donation.', 'give' ),

+					'name'        => __('Agreement Text', 'give'),

+					'desc'        => __('This is the actual text which the user will have to agree to in order to make a donation.', 'give'),

 					'type'        => 'wysiwyg'

 				),

 			)

 		)

-	) );

+	));

 

 	return $meta_boxes;

 

@@ -433,11 +433,11 @@ 
 

 	<div class="table-container">

 		<div class="table-row">

-			<div class="table-cell col-amount"><?php _e( 'Amount', 'give' ); ?></div>

-			<div class="table-cell col-text"><?php _e( 'Text', 'give' ); ?></div>

-			<div class="table-cell col-default"><?php _e( 'Default', 'give' ); ?></div>

-			<?php do_action( 'give_donation_levels_table_head' ); ?>

-			<div class="table-cell col-sort"><?php _e( 'Sort', 'give' ); ?></div>

+			<div class="table-cell col-amount"><?php _e('Amount', 'give'); ?></div>

+			<div class="table-cell col-text"><?php _e('Text', 'give'); ?></div>

+			<div class="table-cell col-default"><?php _e('Default', 'give'); ?></div>

+			<?php do_action('give_donation_levels_table_head'); ?>

+			<div class="table-cell col-sort"><?php _e('Sort', 'give'); ?></div>

 

 		</div>

 	</div>

@@ -445,7 +445,7 @@ 
 	<?php

 }

 

-add_action( 'cmb2_render_levels_repeater_header', 'give_cmb_render_levels_repeater_header', 10 );

+add_action('cmb2_render_levels_repeater_header', 'give_cmb_render_levels_repeater_header', 10);

 

 

 /**

@@ -462,25 +462,25 @@ 
  * @param $object_type

  * @param $field_type_object

  */

-function give_cmb_render_levels_id( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

+function give_cmb_render_levels_id($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

 

-	$escaped_value = ( isset( $escaped_value['level_id'] ) ? $escaped_value['level_id'] : '' );

+	$escaped_value = (isset($escaped_value['level_id']) ? $escaped_value['level_id'] : '');

 

 	$field_options_array = array(

 		'class' => 'give-hidden give-level-id-input',

-		'name'  => $field_type_object->_name( '[level_id]' ),

-		'id'    => $field_type_object->_id( '_level_id' ),

+		'name'  => $field_type_object->_name('[level_id]'),

+		'id'    => $field_type_object->_id('_level_id'),

 		'value' => $escaped_value,

 		'type'  => 'number',

 		'desc'  => '',

 	);

 

-	echo '<p class="give-level-id">' . $escaped_value . '</p>';

-	echo $field_type_object->input( $field_options_array );

+	echo '<p class="give-level-id">'.$escaped_value.'</p>';

+	echo $field_type_object->input($field_options_array);

 

 }

 

-add_action( 'cmb2_render_levels_id', 'give_cmb_render_levels_id', 10, 5 );

+add_action('cmb2_render_levels_id', 'give_cmb_render_levels_id', 10, 5);

 

 

 /**

@@ -492,13 +492,13 @@ 
  * @param $object_type

  * @param $field_type_object

  */

-function give_cmb_give_default_radio_inline( $field_object, $escaped_value, $object_id, $object_type, $field_type_object ) {

-	echo '<input type="radio" class="cmb2-option donation-level-radio" name="' . $field_object->args['_name'] . '" id="' . $field_object->args['id'] . '" value="default" ' . checked( 'default', $escaped_value, false ) . '>';

-	echo '<label for="' . $field_object->args['id'] . '">Default</label>';

+function give_cmb_give_default_radio_inline($field_object, $escaped_value, $object_id, $object_type, $field_type_object) {

+	echo '<input type="radio" class="cmb2-option donation-level-radio" name="'.$field_object->args['_name'].'" id="'.$field_object->args['id'].'" value="default" '.checked('default', $escaped_value, false).'>';

+	echo '<label for="'.$field_object->args['id'].'">Default</label>';

 

 }

 

-add_action( 'cmb2_render_give_default_radio_inline', 'give_cmb_give_default_radio_inline', 10, 5 );

+add_action('cmb2_render_give_default_radio_inline', 'give_cmb_give_default_radio_inline', 10, 5);

 

 

 /**

@@ -508,20 +508,20 @@ 
  */

 function give_add_shortcode_to_publish_metabox() {

 

-	if ( 'give_forms' !== get_post_type() ) {

+	if ('give_forms' !== get_post_type()) {

 		return false;

 	}

 

 	global $post;

 

 	//Only enqueue scripts for CPT on post type screen

-	if ( 'give_forms' === $post->post_type ) {

+	if ('give_forms' === $post->post_type) {

 		//Shortcode column with select all input

-		$shortcode = htmlentities( '[give_form id="' . $post->ID . '"]' );

-		echo '<div class="shortcode-wrap box-sizing"><label>' . __( 'Give Form Shortcode:', 'give' ) . '</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="' . $shortcode . '"></div>';

+		$shortcode = htmlentities('[give_form id="'.$post->ID.'"]');

+		echo '<div class="shortcode-wrap box-sizing"><label>'.__('Give Form Shortcode:', 'give').'</label><input onClick="this.setSelectionRange(0, this.value.length)" type="text" class="shortcode-input" readonly value="'.$shortcode.'"></div>';

 

 	}

 

 }

 

-add_action( 'post_submitbox_misc_actions', 'give_add_shortcode_to_publish_metabox' );

+add_action('post_submitbox_misc_actions', 'give_add_shortcode_to_publish_metabox');